summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9823 from vespa-engine/hakonhall/remove-system-from-zoneidHåkon Hallingstad2019-06-165-23/+23
|\
| * Remove system from ZoneIdHåkon Hallingstad2019-06-165-23/+23
* | Merge pull request #9817 from vespa-engine/bratseth/serialization-warningHarald Musum2019-06-1612-0/+84
|\ \
| * | Add a comment warning about serialization format changesJon Bratseth2019-06-1512-0/+84
* | | Always upgrade tenant hostsValerij Fredriksen2019-06-141-3/+4
| |/ |/|
* | Merge pull request #9796 from vespa-engine/bratseth/application-instancesJon Bratseth2019-06-1427-256/+321
|\ \
| * | Merge with masterJon Bratseth2019-06-1424-271/+399
| |\|
| * | Support paths with instance after application in application/v4Jon Bratseth2019-06-1422-195/+202
| * | Point to instance-specific pathsJon Bratseth2019-06-135-6/+9
| * | application/v4 go-forward functionality for any instanceJon Bratseth2019-06-132-47/+64
| * | Support instancesJon Bratseth2019-06-113-3/+46
* | | Disable ClusterUtilizationMaintainer in publicMartin Polden2019-06-141-1/+3
* | | SimplifyMartin Polden2019-06-142-3/+4
* | | Merge pull request #9798 from vespa-engine/mpolden/remove-classpath-dependencyMartin Polden2019-06-141-1/+3
|\ \ \
| * | | Avoid using classpath to read test dataMartin Polden2019-06-141-1/+3
| | |/ | |/|
* | | Merge pull request #9801 from vespa-engine/jvenstad/tenant-cdJon Marius Venstad2019-06-141-9/+9
|\ \ \ | |/ / |/| |
| * | Expect exceptions from RoutingGenerator when looking for endpointsJon Marius Venstad2019-06-141-9/+9
* | | Log when name service request is queuedMartin Polden2019-06-141-0/+1
* | | Use a single lock when refreshing routing policiesMartin Polden2019-06-141-57/+52
|/ /
* | Merge pull request #9780 from vespa-engine/mpolden/wire-container-endpointsMartin Polden2019-06-142-3/+4
|\ \
| * | Add support for containerEndpoints deploy parameterMartin Polden2019-06-132-3/+4
* | | Merge pull request #9782 from vespa-engine/hakonhall/remove-cloud-from-zoneidHåkon Hallingstad2019-06-145-14/+14
|\ \ \
| * | | Remove cloud from ZoneIdHåkon Hallingstad2019-06-145-14/+14
* | | | New endpoints not yet readyJon Marius Venstad2019-06-132-5/+5
* | | | Prepare for removing unused methods, change to be empty default methodsHarald Musum2019-06-131-55/+32
| |/ / |/| |
* | | Merge pull request #9776 from vespa-engine/mpolden/log-ns-requestHarald Musum2019-06-131-0/+1
|\ \ \
| * | | Log name service requestMartin Polden2019-06-131-0/+1
* | | | Merge pull request #9775 from vespa-engine/mpolden/api-cleanupMartin Polden2019-06-133-20/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove artificial distinction between cnames and rotation namesMartin Polden2019-06-133-20/+17
| |/ /
* | | Merge pull request #9759 from vespa-engine/jvenstad/tenant-cdJon Marius Venstad2019-06-1316-94/+290
|\ \ \ | |/ / |/| |
| * | Avoid Optional<Collection<...>>Jon Marius Venstad2019-06-124-15/+17
| * | Sort on zone to ensure consistent order in unit testJon Marius Venstad2019-06-121-2/+3
| * | Expose test config under application/v4Jon Marius Venstad2019-06-1210-26/+67
| * | Filter on emptiness of endpoint mapJon Marius Venstad2019-06-121-2/+3
| * | Move things aroundJon Marius Venstad2019-06-126-80/+138
| * | Use cluster endpoints in test config, and test serialisationJon Marius Venstad2019-06-123-24/+66
| * | Expose endpoints per cluster in ApplicationController and test it for policiesJon Marius Venstad2019-06-122-1/+41
| * | Expose routing endpoints per cluster in RoutingGeneratorJon Marius Venstad2019-06-121-0/+11
| |/
* | Add accidentally removed methodValerij Fredriksen2019-06-121-0/+5
* | Merge pull request #9756 from vespa-engine/freva/remove-serverpool-from-zkMartin Polden2019-06-121-43/+4
|\ \
| * | Temporarily delete the unused pathsValerij Fredriksen2019-06-121-0/+4
| * | Remove unused curator db methodsValerij Fredriksen2019-06-121-43/+0
* | | Revert "Revert "Remove vaas""Harald Musum2019-06-121-1/+0
|/ /
* | Revert "Remove vaas"Harald Musum2019-06-121-0/+1
* | Remove vaasValerij Fredriksen2019-06-111-1/+0
|/
* Replace unnecessary usage of toDeprecatedIdHåkon Hallingstad2019-06-083-6/+6
* Remove usage of ZoneId w/cloud and systemHåkon Hallingstad2019-06-082-3/+1
* Be more specific in log messagesHåkon Hallingstad2019-06-082-2/+2
* Remove ZoneId from UpgradePolicyHåkon Hallingstad2019-06-081-6/+7
* Get ZoneApis from UpgradePolicy in upgradersHåkon Hallingstad2019-06-083-21/+24