summaryrefslogtreecommitdiffstats
path: root/configserver
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14736 from vespa-engine/hmusum/remove-stale-codeHarald Musum2020-10-063-32/+0
|\
| * Session locks are not used anymoreHarald Musum2020-10-063-32/+0
* | Remove flag configserver-distribute-application-packageHarald Musum2020-10-069-79/+21
|/
* Make sure to update session in SessionStateWatcher when status changesHarald Musum2020-10-052-7/+15
* Revert "Revert "Move code out of RemoteSesion""Harald Musum2020-10-0513-411/+410
* Revert "Move code out of RemoteSesion"Harald Musum2020-10-0513-410/+411
* Move code out of RemoteSesionHarald Musum2020-10-0313-411/+410
* Go back to creating waiter before prepareHarald Musum2020-10-021-1/+2
* Revert "Revert "Cleanup some config server code ""Harald Musum2020-10-028-55/+45
* Revert "Cleanup some config server code "Harald Musum2020-10-028-45/+55
* Merge pull request #14647 from vespa-engine/hakonhall/record-locks-taken-for-...Håkon Hallingstad2020-10-011-0/+5
|\
| * Fix merge conflictsHåkon Hallingstad2020-10-0110-30/+44
| |\
| * | Record locks taken for external deploysHåkon Hallingstad2020-09-301-0/+5
* | | Merge pull request #14636 from vespa-engine/hmusum/cleanup-1Harald Musum2020-10-018-55/+45
|\ \ \
| * \ \ Merge branch 'master' into hmusum/cleanup-1Harald Musum2020-10-0114-142/+69
| |\ \ \ | | | |/ | | |/|
| * | | SimplifyHarald Musum2020-09-305-26/+19
| * | | Move implementation of getActiveApplicationSet to SessionRepositoryHarald Musum2020-09-304-21/+18
| * | | Rename and simplify methodHarald Musum2020-09-303-10/+10
* | | | Merge pull request #14630 from vespa-engine/ogronnesby/quota-decimalØyvind Grønnesby2020-10-011-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Use BigDecimal for budget inside the QuotaØyvind Grønnesby2020-09-301-1/+1
| |/ /
* | | Merge pull request #14632 from vespa-engine/hmusum/cleanup-use-of-DeployLoggerHarald Musum2020-10-013-14/+19
|\ \ \
| * | | Cleanup use of DeployLoggerHarald Musum2020-09-303-14/+19
| |/ /
* | | Merge pull request #14649 from vespa-engine/bratseth/improve-error-messageJon Bratseth2020-09-301-1/+2
|\ \ \
| * | | Improve error messageJon Bratseth2020-09-301-1/+2
| |/ /
* | | Merge pull request #14645 from vespa-engine/hmusum/remove-loggingHarald Musum2020-09-301-2/+0
|\ \ \
| * | | Remove loggingHarald Musum2020-09-301-2/+0
| | |/ | |/|
* | | Merge pull request #14643 from vespa-engine/freva/deploy-contextHarald Musum2020-09-305-13/+23
|\ \ \ | |/ / |/| |
| * | Check timeout after preparing each modelValerij Fredriksen2020-09-301-1/+3
| * | Throw UncheckedTimeoutException on timeoutValerij Fredriksen2020-09-304-12/+20
| |/
* | Rever doc changeHarald Musum2020-09-301-1/+1
* | Update configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRe...Harald Musum2020-09-301-1/+1
* | SimplifyHarald Musum2020-09-292-19/+5
* | ZooKeeper data is deleted earlier on, no need for this here anymoreHarald Musum2020-09-291-11/+0
* | Do not use lock when deleting sessionHarald Musum2020-09-296-85/+23
|/
* Merge branch 'master' into bratseth/autoscaling-reconfiguration-eventsJon Bratseth2020-09-2860-735/+813
|\
| * Merge pull request #14598 from vespa-engine/freva/internal-restartValerij Fredriksen2020-09-288-55/+85
| |\
| | * withoutIgnoreForInternalRestart -> useForInternalRestartValerij Fredriksen2020-09-283-6/+6
| | * Support ignoring actions for internal redeployValerij Fredriksen2020-09-286-35/+82
| | * Remove useless mockValerij Fredriksen2020-09-282-20/+3
| * | Revert "Add maintainer for debugging zookeeper locks"Harald Musum2020-09-282-68/+0
| * | Synchronize when adding sessionHarald Musum2020-09-281-22/+12
| |/
| * Merge pull request #14567 from vespa-engine/freva/log-to-right-loggerValerij Fredriksen2020-09-251-5/+5
| |\
| | * Log to deploy logger, not class loggerValerij Fredriksen2020-09-251-5/+5
| * | Merge pull request #14558 from vespa-engine/bjorncs/feature-flag-new-restapi-...Bjørn Christian Seime2020-09-251-0/+6
| |\ \ | | |/ | |/|
| | * Add feature flag to enable new restapi handlerBjørn Christian Seime2020-09-251-0/+6
| * | Merge pull request #14556 from vespa-engine/freva/internal-restartValerij Fredriksen2020-09-259-116/+139
| |\ \ | | |/ | |/|
| | * Deploy with internal restart if flag is set in zoneValerij Fredriksen2020-09-252-6/+13
| | * Use same Deployment across prepare & activateValerij Fredriksen2020-09-252-5/+16
| | * Move internal restart to DeploymentValerij Fredriksen2020-09-252-17/+21
| | * Remove unused argumentValerij Fredriksen2020-09-257-23/+13