summaryrefslogtreecommitdiffstats
path: root/configserver
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3389 from vespa-engine/hakon/add-component-managing-the-s...hakonhall2017-09-1215-98/+209
|\
| * Add component managing the SuperModelHåkon Hallingstad2017-09-1115-98/+209
* | Throw exception when not getting activate lock within timeoutHarald Musum2017-09-111-1/+1
|/
* Fix deployment spec cast in container cluster modelMartin Polden2017-09-082-2/+2
* Avoid creating strings unless necessaryHarald Musum2017-09-071-2/+2
* Add request to log lineHarald Musum2017-09-071-2/+2
* Add debug log line for config generation for supermodel configsHarald Musum2017-09-071-1/+4
* Use a more specific error codeHarald Musum2017-09-072-3/+3
* Merge pull request #3327 from vespa-engine/revert-3308-revert-2934-hmusum/use...Harald Musum2017-09-065-15/+44
|\
| * Revert "Revert "Return 409 if there is a conflict when activating""Harald Musum2017-09-055-15/+44
* | Merge pull request #3287 from vespa-engine/revert-3275-revert-3260-hmusum/rem...gjoranv2017-09-0515-16/+0
|\ \ | |/ |/|
| * Merge branch 'master' into revert-3275-revert-3260-hmusum/remove-version-from...Harald Musum2017-08-311-4/+2
| |\
| * | Revert "Revert "version in def files are deprecated""Harald Musum2017-08-3015-16/+0
* | | Catch ThrowableHarald Musum2017-09-041-1/+1
* | | Catch Error and log at a place where thread will otherwise die silentlyHarald Musum2017-09-041-1/+1
* | | Revert "Return 409 if there is a conflict when activating"gjoranv2017-09-015-44/+15
* | | Merge pull request #2934 from vespa-engine/hmusum/use-409-response-code-for-f...Jon Bratseth2017-08-315-15/+44
|\ \ \
| * | | Rename exceptionHarald Musum2017-08-313-7/+7
| * | | Return 409 if there is a conflict when activatingHarald Musum2017-07-105-15/+44
* | | | Merge pull request #3251 from vespa-engine/bjorncs/reduce-mem-usage-configserverBjørn Christian Seime2017-08-311-0/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Reduce number of worker threads from default (500)Bjørn Christian Seime2017-08-291-0/+4
* | | | Nonfunctional changesJon Bratseth2017-08-301-4/+2
| |_|/ |/| |
* | | Revert "version in def files are deprecated"Harald Musum2017-08-3015-0/+16
* | | version in def files are deprecatedHarald Musum2017-08-3015-16/+0
* | | Remove warningJon Bratseth2017-08-291-1/+1
* | | Merge with masterJon Bratseth2017-08-282-4/+3
|\| |
| * | Add application id to logHarald Musum2017-08-243-6/+3
* | | ProvisionInfo -> AllocatedHostsJon Bratseth2017-08-287-102/+103
* | | Add one wimphy testJon Bratseth2017-08-289-29/+46
* | | Allow model evolution which removes clustersJon Bratseth2017-08-286-28/+73
* | | Explicitly pass the correct allocated hostsJon Bratseth2017-08-285-40/+27
* | | Track API changes, remove warningsJon Bratseth2017-08-283-3/+3
* | | ProvisionInfo -> AllocatedHostsJon Bratseth2017-08-2821-104/+98
* | | Allocation consistency between model versionsJon Bratseth2017-08-2817-73/+118
* | | Allocation consistency between model versionsJon Bratseth2017-08-2816-92/+129
* | | Nonfunctional changes onlyJon Bratseth2017-08-234-4/+0
|/ /
* | Minor refactoring of testsHarald Musum2017-07-2811-168/+180
* | neutral default for VESPA_USERArne Juul2017-07-251-17/+23
|/
* Refactor tests into one classHarald Musum2017-07-072-307/+231
* update error messageArne H Juul2017-06-191-1/+1
* import getDefaultsArne H Juul2017-06-193-11/+11
* VESPA_HOME should not end with / anymoreArne H Juul2017-06-175-34/+24
* Keep time outside ValidationOverridesJon Bratseth2017-06-1631-196/+282
* Update copyright headersJon Bratseth2017-06-14347-344/+347
* Revert "Update copyright headers"Jon Bratseth2017-06-14347-347/+344
* Update copyright headersJon Bratseth2017-06-14347-344/+347
* Remove carriage returnJon Bratseth2017-06-147-7/+7
* Revert "Revert "Rename filedistribution programs to have vespa- prefix.""Tor Egge2017-06-141-1/+1
* Merge pull request #2746 from yahoo/bjorncs/upgrade-maven-install-plugingjoranv2017-06-141-1/+0
|\
| * Upgrade maven-install-plugin to 2.5.2Bjørn Christian Seime2017-06-131-1/+0