summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't call lazyGetType in toString - it can have side effectsLester Solbakken2019-09-244-4/+4
* Avoid renaming batch reduced dimensionsLester Solbakken2019-09-241-0/+18
* Merge pull request #10724 from vespa-engine/revert-10700-mpolden/pause-os-upg...Valerij Fredriksen2019-09-1912-272/+77
|\
| * Revert "Pause OS upgrade when coinciding with Vespa upgrade"Martin Polden2019-09-1912-272/+77
|/
* Merge pull request #10723 from vespa-engine/bratseth/update-abi-specJon Bratseth2019-09-191-0/+1
|\
| * Update specJon Bratseth2019-09-191-0/+1
|/
* Merge pull request #10718 from vespa-engine/freva/remove-flavor-fixValerij Fredriksen2019-09-193-89/+9
|\
| * Revert "Use flavor instead of resources when deploying Vespa 6 tester applica...Valerij Fredriksen2019-09-193-89/+9
* | Merge pull request #10717 from vespa-engine/bratseth/vip-logicJon Bratseth2019-09-1910-73/+114
|\ \
| * | Be in service if we can reach any nodes regardless of whether they have dataJon Bratseth2019-09-191-3/+3
| * | Take symmetric vip actions. Only act on full infoJon Bratseth2019-09-195-37/+70
| * | Minor cleanup, no functional changesJon Bratseth2019-09-196-39/+47
* | | Merge pull request #10721 from vespa-engine/gjoranv/vespa6-cleanup-container-...Jon Bratseth2019-09-191-4/+0
|\ \ \
| * | | Remove comment looking forward to Vespa 6.gjoranv2019-09-191-4/+0
* | | | Merge pull request #10719 from vespa-engine/hmusum/rename-jar-fileHarald Musum2019-09-192-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Rename jar file to be the same as module nameHarald Musum2019-09-192-2/+1
* | | | Merge pull request #10708 from vespa-engine/toregge/port-fnet-info-test-to-da...Henning Baldersheim2019-09-191-5/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Reduce use of ifdef constructs.Tor Egge2019-09-191-14/+6
| * | | Port fnet_info test to darwin.Tor Egge2019-09-181-1/+13
* | | | Merge pull request #10704 from vespa-engine/vekterli/allow-get-operations-whe...Tor Brede Vekterli2019-09-192-4/+26
|\ \ \ \
| * | | | Allow Get operations through when content node is in Maintenance modeTor Brede Vekterli2019-09-182-4/+26
* | | | | Merge pull request #10710 from vespa-engine/andreer/use-complete-cert-chainMorten Tokle2019-09-191-2/+2
|\ \ \ \ \
| * | | | | set up tls using complete cert chain in config/fileandreer2019-09-191-2/+2
* | | | | | Merge pull request #10713 from vespa-engine/hmusum/add-cmake-files-for-zookee...Harald Musum2019-09-193-1/+4
|\ \ \ \ \ \
| * | | | | | Add CMake files for zookeeper-command-line-clientHarald Musum2019-09-193-1/+4
* | | | | | | Merge pull request #10715 from vespa-engine/jvenstad/display-pins-in-deployme...Jon Marius Venstad2019-09-193-6/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Use map instead of nested ternariesJon Marius Venstad2019-09-191-3/+3
| * | | | | | Indicate what change we are waiting for in deployment viewJon Marius Venstad2019-09-193-3/+3
|/ / / / / /
* | | | | | Merge pull request #10700 from vespa-engine/mpolden/pause-os-upgradesMartin Polden2019-09-1912-77/+272
|\ \ \ \ \ \
| * | | | | | Update testMartin Polden2019-09-181-1/+6
| * | | | | | Pause OS upgrade when coinciding with Vespa upgradeMartin Polden2019-09-1810-28/+251
| * | | | | | Read and write all versions on constructionMartin Polden2019-09-181-1/+6
| * | | | | | Write new OS versions formatMartin Polden2019-09-182-48/+10
* | | | | | | Merge pull request #10714 from vespa-engine/jvenstad/deploy-keys-3Jon Marius Venstad2019-09-195-9/+694
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Doc in OldCuratorDbJon Marius Venstad2019-09-191-4/+2
| * | | | | | Add simple test for data serialisation changeJon Marius Venstad2019-09-194-2/+691
| * | | | | | Revert reading new data immediately, as some some writes may be lost during u...Jon Marius Venstad2019-09-191-7/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #10707 from vespa-engine/freva/remove-vespa-6Harald Musum2019-09-196-45/+2
|\ \ \ \ \ \
| * | | | | | Remove special handling in CoreCollector for java 8Valerij Fredriksen2019-09-182-29/+1
| * | | | | | Do not set VESPA_TOTAL_MEMORY_MBValerij Fredriksen2019-09-182-9/+1
| * | | | | | Remove canonicalFlavor from FlavorValerij Fredriksen2019-09-182-4/+0
| * | | | | | Remove Vespa 6 mount pointsValerij Fredriksen2019-09-181-3/+0
* | | | | | | Merge pull request #10712 from vespa-engine/revert-10711-revert-10697-revert-...Henning Baldersheim2019-09-1980-7118/+157
|\ \ \ \ \ \ \
| * | | | | | | Invert compare to follow inverted logic.Henning Baldersheim2019-09-191-1/+1
| * | | | | | | Make the criteria for taking a node down clear.Henning Baldersheim2019-09-191-22/+33
| * | | | | | | Revert "Revert "Revert "Revert "Revert "Revert "Balder/no more fs4 dispatchin...Henning Baldersheim2019-09-1980-7099/+127
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #10706 from vespa-engine/gjoranv/dont-check-for-index-attr...Harald Musum2019-09-191-9/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Don't check for 'index' attribute on config arrays in services.xmlgjoranv2019-09-181-9/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #10694 from vespa-engine/hmusum/add-zookeeper-command-line...Harald Musum2019-09-194-0/+55
|\ \ \ \ \ \
| * | | | | | First step in creating a separate module for zookeeper command line clientsHarald Musum2019-09-184-0/+55