summaryrefslogtreecommitdiffstats
path: root/configserver
Commit message (Expand)AuthorAgeFilesLines
* Throw ActivationConflictException when unable to acquire activate lockHarald Musum2018-01-031-1/+1
* Revert "Revert "Revert "Revert "Jvenstad/zone cleanup 4""""Jon Marius Venstad2018-01-031-1/+1
* Don't test for exact version, just that we get oneHarald Musum2018-01-031-1/+1
* Ad some javadoc and do some minor tweaksHarald Musum2018-01-032-21/+16
* No need to override methods that the superclass does correctlyHarald Musum2018-01-021-9/+0
* Rewrite status handlerHarald Musum2018-01-028-201/+112
* Revert "Jvenstad/zone cleanup 4"Jon Marius Venstad2018-01-021-1/+1
* Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-0235-127/+147
|\
| * use new LoggingRequestHandler constructorArne Juul2017-12-2731-121/+131
| * Remove container-clustercontroller from list of services to checkHarald Musum2017-12-191-2/+0
| * Skip checking config convergence for clustercontrollerHarald Musum2017-12-191-1/+2
| * Use one supervisor and transport and shut it down once it not needed anymore.Henning Baldersheim2017-12-183-5/+16
* | ConflictsJon Marius Venstad2017-12-155-18/+19
|\|
| * Do async file distribution (when preparing application) when file distributor...Harald Musum2017-12-145-18/+19
* | Conflict resolvedJon Marius Venstad2017-12-147-15/+69
|\|
| * Set timeout for internal deployment in one placeHarald Musum2017-12-133-3/+19
| * Notify config proxy about starting downloads while preparingHarald Musum2017-12-134-12/+50
* | Moved ZoneId to controller-api and added ZonesJon Marius Venstad2017-12-141-1/+1
|/
* Remove duplicate unused code.Henning Baldersheim2017-12-111-10/+0
* Need to change new code as wellJon Marius Venstad2017-12-116-19/+129
|\
| * Merge pull request #4397 from vespa-engine/hmusum/settable-status-value-in-st...Harald Musum2017-12-093-3/+17
| |\
| | * Log when changing status and set status to 'down' when RPC server is shutdownHarald Musum2017-12-091-0/+1
| | * Make it possible to configure and change status code in /state/v1/health APIHarald Musum2017-12-083-3/+16
| * | Fix some issues related to RPC methods for file distributionHarald Musum2017-12-091-7/+4
| * | Let transfer method be config until it works fine.Henning Baldersheim2017-12-081-1/+6
| * | Use the LazyFileReferenceData to avoid filling memory.Henning Baldersheim2017-12-081-9/+5
| * | Implement the chunked transfer.Henning Baldersheim2017-12-081-4/+101
| * | Use a ByteChannel interface instead.Henning Baldersheim2017-12-082-2/+2
| * | Make a abstract FileReferenceData so it can cater for both whole files and ch...Henning Baldersheim2017-12-081-2/+3
| |/
* | Replaced inheritance with delegationJon Marius Venstad2017-12-081-1/+1
* | Revert "Factory constructor with region/env"Jon Marius Venstad2017-12-082-4/+4
* | Factory constructor with region/envJon Marius Venstad2017-12-082-4/+4
|/
* Make sure to return detached requestHarald Musum2017-12-071-0/+1
* Use different threadsPools for push and pull.Henning Baldersheim2017-12-071-4/+6
* Detach and serve from separate thread.Henning Baldersheim2017-12-072-33/+44
* Handle that a file reference is a directory with many filesHarald Musum2017-12-075-44/+139
* Split parent + container-dependency-versions from root pom.gjoranv2017-12-011-0/+1
* Revert "Gjoranv/split parent2"gjoranv2017-11-301-1/+0
* Split parent + container-dependency-versions from root pom.gjoranv2017-11-301-0/+1
* Do not assume anything about the default teanant, it is no longerHarald Musum2017-11-291-3/+0
* Revert "Remove zone from DeployProperties"Harald Musum2017-11-291-2/+5
* Merge pull request #4300 from vespa-engine/hmusum/set-sessions-path-correctly...Valerij Fredriksen2017-11-295-39/+36
|\
| * Set sessions path correctly in test constructorHarald Musum2017-11-295-39/+36
* | Remove zone from DeployPropertiesHarald Musum2017-11-281-5/+2
|/
* Merge pull request #4286 from vespa-engine/hmusum/more-wiring-for-disabling-f...Henning Baldersheim2017-11-284-9/+16
|\
| * More wiring for making it possible to disable filedistributorHarald Musum2017-11-274-9/+16
* | Merge pull request #4288 from vespa-engine/hmusum/make-tenants-handling-more-...Henning Baldersheim2017-11-283-12/+14
|\ \
| * | Do not create system tenants in constructor. Do not put into map of tenants u...Harald Musum2017-11-273-12/+14
| |/
* | Merge pull request #4287 from vespa-engine/freva/add-https-bindingsMorten Tokle2017-11-281-1/+33
|\ \ | |/ |/|
| * Add HTTPS bindings in configserver-app services.xmlValerij Fredriksen2017-11-271-1/+33