aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Revert "Revert "Add Orchestrator application lock metrics""Håkon Hallingstad2019-10-228-15/+122
* | | | | Merge pull request #11032 from vespa-engine/revert-11027-revert-11025-revert-...Harald Musum2019-10-2212-2/+39
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 vespa-engine/revert-11036-hakonhall/add-orches...Morten Tokle2019-10-228-122/+15
|\ \ \ \ \
| * | | | | Revert "Add Orchestrator application lock metrics"Harald Musum2019-10-228-122/+15
|/ / / / /
* | | | | Merge pull request #11036 from vespa-engine/hakonhall/add-orchestrator-applic...Harald Musum2019-10-228-15/+122
|\ \ \ \ \
| * | | | | 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 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[]")Harald Musum2019-10-211-1/+2
* | | | | Merge pull request #11031 from vespa-engine/hakonhall/return-504-gateway-time...Harald Musum2019-10-217-13/+28
|\ \ \ \ \
| * | | | | Return 504 Gateway Timeout on lock timeout from OrchestratorHåkon Hallingstad2019-10-217-13/+28
* | | | | | Merge pull request #11027 from vespa-engine/revert-11025-revert-11012-revert-...Harald Musum2019-10-2110-23/+2
|\ \ \ \ \ \
| * | | | | | Revert "Reapply "Move ZooKeeperServer to another module"""Harald Musum2019-10-2110-23/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #11026 from vespa-engine/jvenstad/support-multi-prod-insta...Martin Polden2019-10-2111-130/+298
|\ \ \ \ \ \
| * | | | | | 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 vespa-engine/mpolden/configurable-trust-store-...Martin Polden2019-10-213-11/+53
|\ \ \ \ \ \
| * | | | | | Make SiaIdentityProvider trust store type configurableMartin Polden2019-10-213-11/+53
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #11029 from vespa-engine/toregge/use-ecmascript-syntax-in-...Henning Baldersheim2019-10-211-1/+1
|\ \ \ \ \ \
| * | | | | | Use modified ECMAScript regular expression grammar for filtering testsTor Egge2019-10-211-1/+1
| |/ / / / /
* | | | | | Merge pull request #11019 from vespa-engine/vekterli/avoid-wset-ordering-depe...Tor Brede Vekterli2019-10-216-43/+141
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Avoid dependency on weighted set ordering in unit testsTor Brede Vekterli2019-10-186-43/+141
* | | | | | 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