summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Reapply "Create seperate bundles compiled against different ZooKeeper...Harald Musum2019-10-2520-497/+49
* Merge pull request #11101 from vespa-engine/revert-11098-revert-11096-revert-...Harald Musum2019-10-2520-49/+497
|\
| * Revert "Revert "Reapply "Create seperate bundles compiled against different Z...Harald Musum2019-10-2520-49/+497
* | Merge pull request #11107 from vespa-engine/hmusum/add-addDirectoryHarald Musum2019-10-252-0/+12
|\ \
| * | Add method for adding a directoryHarald Musum2019-10-252-0/+12
* | | Merge pull request #11111 from vespa-engine/kkraune/capacity-checkerAndreas Eriksen2019-10-251-7/+2
|\ \ \
| * | | use node repo disk speed as-iskkraune2019-10-251-7/+2
* | | | Merge pull request #11105 from vespa-engine/bratseth/one-dispatcher-per-clusterJon Bratseth2019-10-2525-224/+306
|\ \ \ \
| * \ \ \ Merge with masterJon Bratseth2019-10-2536-346/+401
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Create one Dispatcher component per search clusterJon Bratseth2019-10-2525-223/+311
* | | | | Merge pull request #11109 from vespa-engine/jvenstad/migrate-more-testsMartin Polden2019-10-257-84/+80
|\ \ \ \ \
| * | | | | Fix testMartin Polden2019-10-251-2/+1
| * | | | | Update DeploymentExpirerTestJon Marius Venstad2019-10-252-12/+22
| * | | | | Update OutstandingChangeDeployerTestJon Marius Venstad2019-10-252-26/+29
| * | | | | Update JobRunnerTestJon Marius Venstad2019-10-251-12/+11
| * | | | | Update ApplicationOwnershipConfirmerTestJon Marius Venstad2019-10-252-32/+17
* | | | | | Merge pull request #11108 from vespa-engine/hmusum/rename-flagHåkon Hallingstad2019-10-251-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use major.minor as flag value and rename flagHarald Musum2019-10-251-3/+3
|/ / / / /
* | | | | Merge pull request #11087 from vespa-engine/olaa/add-metrics-for-cfgOla Aunrønning2019-10-2512-127/+219
|\ \ \ \ \
| * | | | | Close streamOla Aunrønning2019-10-251-2/+3
| * | | | | Reuse same coredump/host-life gatherersOla Aunrønning2019-10-2511-156/+141
| * | | | | Added metrics for cfgOla Aunrønning2019-10-245-16/+122
* | | | | | Merge pull request #11104 from vespa-engine/freva/pass-instance-to-logsValerij Fredriksen2019-10-252-4/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add logs binding with instance nameValerij Fredriksen2019-10-252-4/+5
* | | | | | Merge pull request #11103 from vespa-engine/hmusum/add-feature-flag-for-zooke...Harald Musum2019-10-251-0/+6
|\ \ \ \ \ \
| * | | | | | Add feature flag for zookeeper versionHarald Musum2019-10-251-0/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #11102 from vespa-engine/jvenstad/propagate-data-plane-key...Jon Marius Venstad2019-10-255-25/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Change property names expected by plugins and test framework for auth filesJon Marius Venstad2019-10-253-19/+19
| * | | | | Propagate more properties and rename some auth propertiesJon Marius Venstad2019-10-253-6/+10
|/ / / / /
* | | | | Merge pull request #11098 from vespa-engine/revert-11096-revert-11095-revert-...Harald Musum2019-10-2520-497/+49
|\ \ \ \ \
| * | | | | Revert "Reapply "Create seperate bundles compiled against different ZooKeeper...Harald Musum2019-10-2520-497/+49
| | |_|_|/ | |/| | |
* | | | | Merge pull request #11099 from vespa-engine/jvenstad/convert-more-deployment-...Martin Polden2019-10-253-43/+67
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Various fixes in InternalDeploymentTester, and convert DeploymentIssueReporte...Jon Marius Venstad2019-10-253-43/+67
* | | | | Merge pull request #11096 from vespa-engine/revert-11095-revert-11089-hmusum/...Harald Musum2019-10-2520-49/+497
|\ \ \ \ \
| * | | | | Revert "Revert "Create seperate bundles compiled against different ZooKeeper ...Harald Musum2019-10-2520-49/+497
| |/ / / /
* | | | | Merge pull request #11097 from vespa-engine/revert-11088-revert-11082-bjorncs...Bjørn Christian Seime2019-10-253-11/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "Revert "Bjorncs/system flags handler""Bjørn Christian Seime2019-10-253-11/+23
|/ / / /
* | | | Merge pull request #11095 from vespa-engine/revert-11089-hmusum/create-versio...Håkon Hallingstad2019-10-2520-497/+49
|\ \ \ \
| * | | | Revert "Create seperate bundles compiled against different ZooKeeper versions"Harald Musum2019-10-2520-497/+49
* | | | | Merge pull request #11086 from vespa-engine/vekterli/improve-multi-value-attr...Tor Brede Vekterli2019-10-253-62/+129
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make multi value attribute inserts O(n) instead of O(n^2)Tor Brede Vekterli2019-10-243-62/+129
* | | | | Merge pull request #11089 from vespa-engine/hmusum/create-versioned-zookeeper...Harald Musum2019-10-2520-49/+497
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'master' into hmusum/create-versioned-zookeeper-bundlesHarald Musum2019-10-243-27/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into hmusum/create-versioned-zookeeper-bundlesHarald Musum2019-10-2427-175/+270
| |\ \ \ \ \
| * | | | | | Fix dependencyHarald Musum2019-10-241-1/+1
| * | | | | | Fix dependencyHarald Musum2019-10-241-1/+1
| * | | | | | Create seperate bundles compiled against different ZooKeeper versionsHarald Musum2019-10-2418-47/+495
* | | | | | | Merge pull request #11079 from vespa-engine/mpolden/stop-using-deployment-testerJon Marius Venstad2019-10-252-32/+31
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Stop using DeploymentTester in MetricsReporterTestMartin Polden2019-10-242-32/+31
* | | | | | | Merge pull request #11093 from vespa-engine/revert-11092-revert-11090-balder/...Henning Baldersheim2019-10-243-27/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |