aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into hmusum/only-create-hosted-vespa-tenant-on-hostedHarald Musum2017-09-1721-103/+240
|\
| * Merge pull request #3382 from vespa-engine/bratseth/support-error-removalArne H Juul2017-09-136-13/+11
| |\
| | * Nonfunctional changes onlyJon Bratseth2017-09-116-13/+11
| * | Merge pull request #3389 from vespa-engine/hakon/add-component-managing-the-s...hakonhall2017-09-1211-80/+192
| |\ \ | | |/ | |/|
| | * Add component managing the SuperModelHåkon Hallingstad2017-09-1111-80/+192
| * | Throw exception when not getting activate lock within timeoutHarald Musum2017-09-111-1/+1
| |/
| * 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-071-2/+2
| * Revert "Revert "Return 409 if there is a conflict when activating""Harald Musum2017-09-054-6/+30
| * 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
* | Only create hosted-vespa tenant on hosted installationsHarald Musum2017-09-041-8/+11
|/
* Revert "Return 409 if there is a conflict when activating"gjoranv2017-09-014-30/+6
* Merge pull request #2934 from vespa-engine/hmusum/use-409-response-code-for-f...Jon Bratseth2017-08-314-6/+30
|\
| * Rename exceptionHarald Musum2017-08-313-7/+7
| * Return 409 if there is a conflict when activatingHarald Musum2017-07-104-6/+30
* | 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
* | | 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-283-92/+93
* | | Add one wimphy testJon Bratseth2017-08-284-8/+7
* | | 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-281-1/+1
* | | ProvisionInfo -> AllocatedHostsJon Bratseth2017-08-2810-68/+63
* | | Allocation consistency between model versionsJon Bratseth2017-08-2817-73/+118
* | | Allocation consistency between model versionsJon Bratseth2017-08-289-69/+112
* | | Nonfunctional changes onlyJon Bratseth2017-08-234-4/+0
|/ /
* / neutral default for VESPA_USERArne Juul2017-07-251-17/+23
|/
* import getDefaultsArne H Juul2017-06-192-7/+7
* VESPA_HOME should not end with / anymoreArne H Juul2017-06-175-34/+24
* Keep time outside ValidationOverridesJon Bratseth2017-06-1614-47/+91
* Update copyright headersJon Bratseth2017-06-14178-177/+178
* Revert "Update copyright headers"Jon Bratseth2017-06-14178-178/+177
* Update copyright headersJon Bratseth2017-06-14178-177/+178
* Remove carriage returnJon Bratseth2017-06-143-3/+3
* Revert "Revert "Rename filedistribution programs to have vespa- prefix.""Tor Egge2017-06-141-1/+1
* Revert "Rename filedistribution programs to have vespa- prefix."Harald Musum2017-06-131-1/+1
* Revert "Copyright header"Jon Bratseth2017-06-13178-181/+180
* Copyright headerJon Bratseth2017-06-13178-180/+181
* Rename logd programs to have vespa- prefix.Tor Egge2017-06-131-1/+1
* Merge pull request #2725 from yahoo/toregge/rename-configd-programsGeir Storli2017-06-132-7/+7
|\
| * Rename configd programs to have vespa- prefix.Tor Egge2017-06-132-7/+7
* | Rename filedistribution programs to have vespa- prefix.Tor Egge2017-06-131-1/+1
|/
* Rename configserver programs to have vespa- prefix.Tor Egge2017-06-121-0/+0