summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [7.110.36-1].vespa-7.110.36-1sd-buildbot2019-09-254-1/+2
* Merge pull request #10757 from vespa-engine/bratseth/cleanup-prelude-clusterHenning Baldersheim2019-09-215-223/+10
|\
| * Remove unused classes and unused metric cache_hit_ratioJon Bratseth2019-09-215-223/+10
* | Merge pull request #10751 from vespa-engine/bratseth/use-genericsJon Bratseth2019-09-211-218/+209
|\ \
| * | Use generics - no functional changeJon Bratseth2019-09-201-218/+209
| |/
* | Merge pull request #10728 from vespa-engine/gjoranv/remove-vespa6-export-pack...Harald Musum2019-09-211-12/+0
|\ \
| * | Remove Export-Package's added to support Vespa 6 bundles on 7.gjoranv2019-09-191-12/+0
* | | Merge pull request #10734 from vespa-engine/freva/remove-hardware-failureValerij Fredriksen2019-09-2047-316/+45
|\ \ \
| * \ \ Merge branch 'master' into freva/remove-hardware-failureValerij Fredriksen2019-09-2056-275/+861
| |\ \ \
| * | | | Remove hardwareFailure and hardwareDivergence from Status and ZKValerij Fredriksen2019-09-193-68/+12
| * | | | Remove hardwareFailure and hardwareDivergence from node-repo maintainersValerij Fredriksen2019-09-195-80/+25
| * | | | Remove hardwareDivergence from node-repository REST APIValerij Fredriksen2019-09-194-37/+1
| * | | | Remove hardwareFailure from node-repository REST APIValerij Fredriksen2019-09-1938-99/+7
| * | | | Remove hardwareFailure and hardwareDivergence from controller-apiValerij Fredriksen2019-09-191-33/+0
| | |/ / | |/| |
* | | | Merge pull request #10749 from vespa-engine/andreer/use-internal-ssl-context-...Andreas Eriksen2019-09-203-4/+17
|\ \ \ \
| * | | | use internal ssl context for tester appandreer2019-09-203-4/+17
| | |_|/ | |/| |
* | | | Merge pull request #10754 from vespa-engine/bratseth/non-functional-changes-a...Henning Baldersheim2019-09-205-117/+72
|\ \ \ \
| * | | | Cleanup - no functional changesJon Bratseth2019-09-205-117/+72
| |/ / /
* | | | Merge pull request #10755 from vespa-engine/bjorncs/fixHarald Musum2019-09-201-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Disable hostname verificationBjørn Christian Seime2019-09-201-1/+1
| |/ /
* | | Merge pull request #10745 from vespa-engine/musum/add-file-references-owned-b...Harald Musum2019-09-202-4/+6
|\ \ \ | |/ / |/| |
| * | Add file references owned by application to exception messageHarald Musum2019-09-202-4/+6
* | | Merge pull request #10747 from vespa-engine/revert-10743-revert-10739-bratset...Jon Bratseth2019-09-2016-124/+468
|\ \ \
| * | | Take streaming search up and also add unit test for it.Henning Baldersheim2019-09-202-21/+32
| * | | false is false, and true is true, can not be bothHenning Baldersheim2019-09-202-4/+21
| * | | Revert "Revert "Bratseth/vip logic take 2""Henning Baldersheim2019-09-2014-101/+417
* | | | Merge pull request #10716 from vespa-engine/freva/remove-flagValerij Fredriksen2019-09-204-28/+15
|\ \ \ \
| * | | | Remove default-resources feature flagValerij Fredriksen2019-09-194-28/+15
* | | | | Merge pull request #10733 from vespa-engine/vekterli/inhibit-merges-when-idea...Tor Brede Vekterli2019-09-204-34/+64
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Inhibit merges when ideal node is unavailable in pending stateTor Brede Vekterli2019-09-194-34/+64
* | | | | Merge pull request #10746 from vespa-engine/bratseth/serialize-int-in-same-el...Henning Baldersheim2019-09-201-4/+5
|\ \ \ \ \
| * | | | | Remove unnecessary importJon Bratseth2019-09-201-1/+0
| * | | | | Serialize int in SameItemJon Bratseth2019-09-201-4/+6
|/ / / / /
* | | | | Merge pull request #10725 from vespa-engine/mpolden/pause-os-upgradesMartin Polden2019-09-2012-56/+271
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Keep compatibility with legacy formatMartin Polden2019-09-192-2/+27
| * | | | Pause OS upgrade when coinciding with Vespa upgradeMartin Polden2019-09-1910-28/+251
| * | | | Read and write all versions on constructionMartin Polden2019-09-191-1/+6
| * | | | Write new OS versions formatMartin Polden2019-09-192-48/+10
* | | | | Merge pull request #10743 from vespa-engine/revert-10739-bratseth/vip-logic-t...Jon Marius Venstad2019-09-2014-417/+101
|\ \ \ \ \
| * | | | | Revert "Bratseth/vip logic take 2"Harald Musum2019-09-2014-417/+101
|/ / / / /
* | | | | Merge pull request #10739 from vespa-engine/bratseth/vip-logic-take-2Henning Baldersheim2019-09-1914-101/+417
|\ \ \ \ \
| * | | | | Drive the ping ourselves to avoid waiting for the monitor thread.Henning Baldersheim2019-09-193-4/+27
| * | | | | Remove printStaxkTraceJon Bratseth2019-09-191-1/+0
| * | | | | Update ABI specJon Bratseth2019-09-191-1/+1
| * | | | | No need to set up depending on coverageJon Bratseth2019-09-191-2/+1
| * | | | | Not at startup after we get failing infoJon Bratseth2019-09-194-2/+2
| * | | | | Transition from down to up initiallyJon Bratseth2019-09-1911-71/+78
| * | | | | Revert "Merge pull request #10735 from vespa-engine/revert-10732-bratseth/cla...Jon Bratseth2019-09-191-19/+17
| * | | | | Revert "Merge pull request #10736 from vespa-engine/revert-10727-balder/add-s...Jon Bratseth2019-09-193-5/+253
| * | | | | Revert "Merge pull request #10737 from vespa-engine/revert-10717-bratseth/vip...Jon Bratseth2019-09-1910-73/+114