summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Revert "Merge pull request #10738 from vespa-engine/revert-10723-bratseth/upd...Jon Bratseth2019-09-191-0/+1
* | | | | | Merge pull request #10741 from vespa-engine/balder/random-code-hygieneJon Bratseth2019-09-192-8/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Random code cleanup while reading up on some code.Henning Baldersheim2019-09-192-8/+9
|/ / / / /
* | | | | Merge pull request #10738 from vespa-engine/revert-10723-bratseth/update-abi-...Håkon Hallingstad2019-09-191-1/+0
|\ \ \ \ \
| * | | | | Revert "Update spec"Håkon Hallingstad2019-09-191-1/+0
|/ / / / /
* | | | | Merge pull request #10737 from vespa-engine/revert-10717-bratseth/vip-logicHåkon Hallingstad2019-09-1910-114/+73
|\ \ \ \ \
| * | | | | Revert "Bratseth/vip logic"Håkon Hallingstad2019-09-1910-114/+73
|/ / / / /
* | | | | Merge pull request #10736 from vespa-engine/revert-10727-balder/add-searchclu...Håkon Hallingstad2019-09-193-253/+5
|\ \ \ \ \
| * | | | | Revert "Add test for in and out of vip and fix bug."Håkon Hallingstad2019-09-193-253/+5
|/ / / / /
* | | | | Merge pull request #10735 from vespa-engine/revert-10732-bratseth/clarifyHarald Musum2019-09-191-17/+19
|\ \ \ \ \
| * | | | | Revert "Clarify logic: No functional change"Harald Musum2019-09-191-17/+19
|/ / / / /
* | | | | Merge pull request #10731 from vespa-engine/olaa/array-formatted-metricpacket...Ola Aunrønning2019-09-192-5/+35
|\ \ \ \ \
| * | | | | Support array formatted metrics responseOla Aunrønning2019-09-192-5/+35
| | |_|_|/ | |/| | |
* | | | | Merge pull request #10730 from vespa-engine/lesters/avoid-constant-dimension-...Jon Bratseth2019-09-195-18/+10
|\ \ \ \ \
| * | | | | Avoid rename operations for tensorflow protobuf constantsLester Solbakken2019-09-195-18/+10
| | |/ / / | |/| | |
* | | | | Merge pull request #10732 from vespa-engine/bratseth/clarifyHenning Baldersheim2019-09-191-19/+17
|\ \ \ \ \
| * | | | | Clarify logic: No functional changeJon Bratseth2019-09-191-19/+17
| | |/ / / | |/| | |
* | | | | Merge pull request #10729 from vespa-engine/havardpe/matching-elements-matche...Håvard Pettersen2019-09-1912-0/+273
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | added function identifying which elements matchedHåvard Pettersen2019-09-1912-0/+273
| |/ / /
* | | | Merge pull request #10727 from vespa-engine/balder/add-searchcluster-test-wit...Jon Bratseth2019-09-193-5/+253
|\ \ \ \ | |/ / / |/| | |
| * | | Add test for in and out of vip and fix bug.Henning Baldersheim2019-09-193-5/+253
|/ / /
* | | 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