aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add test with a bundle using artifact version as ExportPackagesgjoranv2019-10-2211-26/+205
| | | | | - Verify that useArtifactVersionForExportPackages is honoured also for a compile scoped bundle dependency.
* Add option to use artifact version as ExportPackage versiongjoranv2019-10-224-29/+62
|
* Restructure bundle-plugin-test to allow multiple test bundles.gjoranv2019-10-2210-88/+255
|
* Merge pull request #11048 from vespa-engine/bratseth/say-it-may-take-a-long-timeJon Marius Venstad2019-10-223-3/+4
|\ | | | | Say it may take a long time
| * Say it may take a long timeJon Bratseth2019-10-223-3/+4
|/
* Merge pull request #11046 from ↵gjoranv2019-10-2221-505/+127
|\ | | | | | | | | vespa-engine/revert-11035-gjoranv/artifact-version-for-exports2 Revert "Gjoranv/artifact version for exports2"
| * Revert "Gjoranv/artifact version for exports2"gjoranv2019-10-2221-505/+127
|/
* Merge pull request #11041 from ↵Harald Musum2019-10-2212-2/+36
|\ | | | | | | | | vespa-engine/revert-11040-revert-11032-revert-11027-revert-11025-revert-11012-revert-11010-hmusum/move-ZooKeeperServer Reapply "Move ZooKeeperServer to another module"
| * Copy from correct place, we are not using submodules yetHarald Musum2019-10-221-4/+1
| |
| * Revert "Revert "Reapply "move ZooKeeperServer to another module"""Harald Musum2019-10-2212-2/+39
| |
* | Merge pull request #11035 from ↵gjoranv2019-10-2221-127/+505
|\ \ | | | | | | | | | | | | vespa-engine/gjoranv/artifact-version-for-exports2 Gjoranv/artifact version for exports2
| * | Move tests to package c.y.container.plugingjoranv2019-10-212-3/+3
| | |
| * | Use surefire instead of failsafe plugin.gjoranv2019-10-215-19/+18
| | | | | | | | | | | | | | | - No need to use integration tests after test bundles have been moved to separate modules.
| * | Add test with a bundle using artifact version as ExportPackagesgjoranv2019-10-2111-26/+205
| | | | | | | | | | | | | | | - Verify that useArtifactVersionForExportPackages is honoured also for a compile scoped bundle dependency.
| * | Add option to use artifact version as ExportPackage versiongjoranv2019-10-194-29/+62
| | |
| * | Restructure bundle-plugin-test to allow multiple test bundles.gjoranv2019-10-1910-88/+255
| | |
* | | Merge pull request #11042 from vespa-engine/bratseth/skew-metricKristian Aune2019-10-224-2/+31
|\ \ \ | |_|/ |/| | Add metric hostedVespa.docker.skew to measure average host skew
| * | Add metric hostedVespa.docker.skew to measure average host skewJon Bratseth2019-10-224-2/+31
|/ /
* | Merge pull request #11040 from ↵Harald Musum2019-10-2212-39/+2
|\ \ | | | | | | | | | | | | vespa-engine/revert-11032-revert-11027-revert-11025-revert-11012-revert-11010-hmusum/move-ZooKeeperServer Revert "Reapply "move ZooKeeperServer to another module""
| * | Revert "Reapply "move ZooKeeperServer to another module""Håkon Hallingstad2019-10-2212-39/+2
|/ /
* | Merge pull request #11039 from ↵Håkon Hallingstad2019-10-228-15/+122
|\ \ | | | | | | | | | | | | vespa-engine/revert-11038-revert-11036-hakonhall/add-orchestrator-application-lock-metrics Add Orchestrator application lock metrics, try 2
| * | Revert "Revert "Add Orchestrator application lock metrics""Håkon Hallingstad2019-10-228-15/+122
| | |
* | | Merge pull request #11032 from ↵Harald Musum2019-10-2212-2/+39
|\ \ \ | |/ / |/| | | | | | | | vespa-engine/revert-11027-revert-11025-revert-11012-revert-11010-hmusum/move-ZooKeeperServer Reapply "move ZooKeeperServer to another module"
| * | Need to depend on slf4j-log4j12 in zkfacade as wellHarald Musum2019-10-222-0/+7
| | |
| * | Make sure slf4j-log4j12 is same version as slf4j-apiHarald Musum2019-10-211-0/+5
| | |
| * | Add zookeeper-server jar files to RPMHarald Musum2019-10-211-0/+4
| | |
| * | Revert "Revert "Reapply "Move ZooKeeperServer to another module""""Harald Musum2019-10-2110-2/+23
| | |
* | | Merge pull request #11038 from ↵Morten Tokle2019-10-228-122/+15
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/revert-11036-hakonhall/add-orchestrator-application-lock-metrics Revert "Add Orchestrator application lock metrics"
| * | | Revert "Add Orchestrator application lock metrics"Harald Musum2019-10-228-122/+15
|/ / /
* | | Merge pull request #11036 from ↵Harald Musum2019-10-228-15/+122
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/hakonhall/add-orchestrator-application-lock-metrics Add Orchestrator application lock metrics
| * | | Extract duration calculation into separate methodHåkon Hallingstad2019-10-211-2/+6
| | | |
| * | | Add Orchestrator application lock metricsHåkon Hallingstad2019-10-218-15/+118
| |/ /
* | | Merge pull request #11033 from vespa-engine/mpolden/app-package-downloadMartin Polden2019-10-218-19/+144
|\ \ \ | | | | | | | | Add support for downloading application package
| * | | Add support for downloading application packageMartin Polden2019-10-218-17/+141
| | | |
| * | | Avoid throwing exception in NodeRepositoryMockMartin Polden2019-10-211-2/+3
| |/ /
* | | Merge pull request #11028 from vespa-engine/hmusum/print-vespa-version-properlyHarald Musum2019-10-211-1/+2
|\ \ \ | |/ / |/| | Print version properly (without "Optional[]")
| * | Print version properly (without "Optional[]")Harald Musum2019-10-211-1/+2
| | |
* | | Merge pull request #11031 from ↵Harald Musum2019-10-217-13/+28
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/hakonhall/return-504-gateway-timeout-on-lock-timeout-from-orchestrator Return 504 Gateway Timeout on lock timeout from Orchestrator
| * | | Return 504 Gateway Timeout on lock timeout from OrchestratorHåkon Hallingstad2019-10-217-13/+28
| | | |
* | | | Merge pull request #11027 from ↵Harald Musum2019-10-2110-23/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-11025-revert-11012-revert-11010-hmusum/move-ZooKeeperServer Revert "Reapply "Move ZooKeeperServer to another module"""
| * | | | Revert "Reapply "Move ZooKeeperServer to another module"""Harald Musum2019-10-2110-23/+2
| | |/ / | |/| |
* | | | Merge pull request #11026 from ↵Martin Polden2019-10-2111-130/+298
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/support-multi-prod-instances Jvenstad/support multi prod instances
| * | | | Remove instance only when no longer referenced, plus some test fixesJon Marius Venstad2019-10-213-22/+18
| | | | |
| * | | | Assign rotations per instanceJon Marius Venstad2019-10-211-3/+6
| | | | |
| * | | | Create new instances as per spec, and clean up removed onesJon Marius Venstad2019-10-215-33/+74
| | | | |
| * | | | Convert a test to use i-testerJon Marius Venstad2019-10-211-31/+26
| | | | |
| * | | | Split job run in smaller parts in i-tester, with failure modesJon Marius Venstad2019-10-213-45/+140
| | | | |
| * | | | ApplicationId x JobType is now JobIdJon Marius Venstad2019-10-213-18/+56
| | |/ / | |/| |
* | | | Merge pull request #11030 from ↵Martin Polden2019-10-213-11/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/mpolden/configurable-trust-store-type Make SiaIdentityProvider trust store type configurable
| * | | | Make SiaIdentityProvider trust store type configurableMartin Polden2019-10-213-11/+53
| | |/ / | |/| |