summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11020 from vespa-engine/hakonhall/use-mockito-core-310Martin Polden2019-10-2182-226/+217
|\
| * Use correct contains methodHåkon Hallingstad2019-10-181-3/+3
| * Remove mockito version overrides in node-admin and logserverHåkon Hallingstad2019-10-182-2/+0
| * Use mockito-core 3.1.0Håkon Hallingstad2019-10-1880-224/+217
* | Merge pull request #11022 from vespa-engine/hakonhall/avoid-retries-against-c...Harald Musum2019-10-213-7/+6
|\ \
| * | Avoid retries against config server if valid HTTP response code is receivedHåkon Hallingstad2019-10-183-7/+6
* | | Merge pull request #11025 from vespa-engine/revert-11012-revert-11010-hmusum/...Harald Musum2019-10-2110-2/+23
|\ \ \
| * | | Make zookeeper-server a preinstalled bundleHarald Musum2019-10-203-0/+8
| * | | Revert "Revert "Move ZooKeeperServer to another module""Harald Musum2019-10-208-2/+15
* | | | Merge pull request #11023 from vespa-engine/toregge/remove-unused-methods-in-...Henning Baldersheim2019-10-203-185/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unused methods in vespalib::Regexp.Tor Egge2019-10-193-185/+13
|/ / /
* | | Merge pull request #11021 from vespa-engine/toregge/use-std-regex-in-string-a...Tor Egge2019-10-195-8/+16
|\ \ \
| * | | Use std::regex in string attribute vector base.Tor Egge2019-10-185-8/+16
* | | | Merge pull request #11015 from vespa-engine/toregge/add-unit-test-for-matchin...Geir Storli2019-10-184-28/+426
|\ \ \ \
| * | | | Improve test name.Tor Egge2019-10-181-1/+1
| * | | | Improve test names. Note that maps are sorted on key.Tor Egge2019-10-181-14/+4
| * | | | Unit test matching elements filler for streaming search.Tor Egge2019-10-184-28/+436
* | | | | Merge pull request #11017 from vespa-engine/bratseth/select-and-query-profile...Jon Bratseth2019-10-1810-22/+98
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update ABI specJon Bratseth2019-10-181-0/+2
| * | | | Allow old style select with query profile typesJon Bratseth2019-10-189-23/+81
| * | | | Add testJon Bratseth2019-10-181-0/+16
* | | | | Merge pull request #11018 from vespa-engine/jvenstad/get-prod-deployments-for...Jon Marius Venstad2019-10-181-0/+30
|\ \ \ \ \
| * | | | | Add the test file >_<Jon Marius Venstad2019-10-181-0/+30
* | | | | | Merge pull request #11016 from vespa-engine/jvenstad/get-prod-deployments-for...Jon Marius Venstad2019-10-185-25/+64
|\| | | | |
| * | | | | Unit testJon Marius Venstad2019-10-182-2/+28
| * | | | | Use default production deployments for developer test configJon Marius Venstad2019-10-184-23/+36
| |/ / / /
* | | | | Merge pull request #11012 from vespa-engine/revert-11010-hmusum/move-ZooKeepe...Harald Musum2019-10-188-15/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "Move ZooKeeperServer to another module"Harald Musum2019-10-188-15/+2
* | | | | Merge pull request #10985 from vespa-engine/mpolden/remove-url-rewritingJon Marius Venstad2019-10-183-30/+7
|\ \ \ \ \
| * | | | | Remove obsolete endpoint URL rewriteMartin Polden2019-10-153-30/+7
* | | | | | Merge pull request #11013 from vespa-engine/hmusum/simplify-loggingHarald Musum2019-10-181-21/+13
|\ \ \ \ \ \
| * | | | | | Simplify loggingHarald Musum2019-10-181-21/+13
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #11014 from vespa-engine/jvenstad/delete-packages-only-whe...Jon Marius Venstad2019-10-181-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Delete all packages when the whole application is deleted :scream:Jon Marius Venstad2019-10-181-3/+3
|/ / / / /
* | | | | Merge pull request #11009 from vespa-engine/olaa/include-status-packetOla Aunrønning2019-10-181-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Include status code/messageOla Aunrønning2019-10-171-1/+1
* | | | | Merge pull request #10994 from vespa-engine/gjoranv/bsnversiongjoranv2019-10-1813-6/+465
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Implement FindHook for a consistent view of the installed bundles.gjoranv2019-10-163-12/+135
| * | | | Allow duplicate bsn+version for a given set of bundles.gjoranv2019-10-1613-6/+342
* | | | | Merge pull request #11010 from vespa-engine/hmusum/move-ZooKeeperServerHarald Musum2019-10-188-2/+15
|\ \ \ \ \
| * | | | | Move ZooKeeperServer to another moduleHarald Musum2019-10-178-2/+15
* | | | | | Merge pull request #11011 from vespa-engine/bratseth/balance-tenant-nodes-onlyJon Bratseth2019-10-171-2/+2
|\ \ \ \ \ \
| * | | | | | Only consider tenant nodesJon Bratseth2019-10-171-2/+2
|/ / / / / /
* | | | | | Merge pull request #11008 from vespa-engine/bratseth/rebalancingJon Bratseth2019-10-1721-78/+399
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Check node just once per iterationJon Bratseth2019-10-171-1/+1
| * | | | | Fix indentationJon Bratseth2019-10-171-2/+2
| * | | | | Only consider allocatable hostsJon Bratseth2019-10-173-9/+11
| * | | | | Remove obsoleted argumentJon Bratseth2019-10-173-19/+18
| * | | | | Schedule node balancing actsJon Bratseth2019-10-1717-46/+344
| * | | | | Refactor: Skew computation independent of node prioritizationJon Bratseth2019-10-177-27/+49