summaryrefslogtreecommitdiffstats
path: root/config-model-api
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Revert "Revert "Jvenstad/zone cleanup 4""""Jon Marius Venstad2018-01-031-14/+4
* Revert "Revert "Revert "Jvenstad/zone cleanup 4"""Harald Musum2018-01-021-4/+14
* Revert "Revert "Jvenstad/zone cleanup 4""Jon Marius Venstad2018-01-021-14/+4
* Revert "Jvenstad/zone cleanup 4"Jon Marius Venstad2018-01-021-4/+14
* Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-022-9/+19
|\
| * Restore importJon Bratseth2017-12-201-0/+1
| * Merge branch 'master' into bratseth/long-dimensionsJon Bratseth2017-12-201-1/+12
| |\
| | * Revert "Revert "Restore public method""Jon Bratseth2017-12-191-4/+15
| * | Use longs for dimensions lengths in all API'sJon Bratseth2017-12-191-7/+15
| |/
| * Revert "Restore public method"Henning Baldersheim2017-12-191-15/+4
| * Restore public methodJon Bratseth2017-12-181-4/+15
| * Revert "Revert "Bratseth/tensorflow models""Jon Bratseth2017-12-181-3/+2
| * Revert "Bratseth/tensorflow models"gjoranv2017-12-171-2/+3
| * Merge with masterJon Bratseth2017-12-134-13/+16
| |\
| * | Don't write to System.out/errJon Bratseth2017-11-301-3/+2
* | | Conflict resolvedJon Marius Venstad2017-12-141-2/+11
|\ \ \ | | |/ | |/|
| * | Notify config proxy about starting downloads while preparingHarald Musum2017-12-131-2/+11
* | | Moved ZoneId to controller-api and added ZonesJon Marius Venstad2017-12-141-3/+2
|/ /
* | Replaced Zone with ZoneId two places where only that part was usedJon Marius Venstad2017-12-081-2/+3
* | Remove unused method from APIHarald Musum2017-12-061-9/+0
* | 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
* | Revert "Gjoranv/split parent"gjoranv2017-11-291-1/+0
* | Split parent + container-dependency-versions from root pom.gjoranv2017-11-291-0/+1
* | More wiring for making it possible to disable filedistributorHarald Musum2017-11-271-0/+1
|/
* Fix tests after refactorMorten Tokle2017-11-231-4/+4
* Move deployment spec ContainerCluster -> ContainerModelBuilderMorten Tokle2017-11-223-20/+25
* Move identity configuration services.xml -> deployment.xmlMorten Tokle2017-11-213-9/+125
* Resolved conflictJon Marius Venstad2017-11-171-1/+10
|\
| * Add new field for loadbalancername, deprecate loadbalanceraddressMorten Tokle2017-11-151-1/+10
* | Added TODO:Jon Marius Venstad2017-11-151-1/+0
|/
* Revert "Treat loadbalancer address as string and pass through"Harald Musum2017-11-141-1/+2
* Treat loadbalancer address as string and pass throughMorten Tokle2017-11-141-2/+1
* Remove unused interface no longer needed.Henning Baldersheim2017-11-081-2/+1
* Merge pull request #3954 from vespa-engine/mortent/propagate-lbaddressMorten Tokle2017-11-081-0/+2
|\
| * Propagate loadBalancerAddressMorten Tokle2017-11-071-0/+2
* | Merge branch 'master' into balder/add-filedist-rpc-to-configserverHarald Musum2017-11-082-6/+1
|\ \
| * | Remove duplicate regions in testHarald Musum2017-11-081-3/+1
| * | Name changes, minor refactoring, should be non-functional onlyJon Marius Venstad2017-11-071-3/+0
| |/
* / Add serveFile interface.Henning Baldersheim2017-11-071-1/+5
|/
* Remove deprecated, unused method and default implementation from interfaceHarald Musum2017-11-021-13/+2
* Add copyright headerJon Bratseth2017-10-273-0/+3
* Disallow parallel triggeringJon Bratseth2017-10-191-1/+1
* Let block-upgrade continue to workMartin Polden2017-10-162-5/+6
* Don't validate when reading stored applicationsJon Bratseth2017-10-162-3/+29
* Enforce order of block-changeJon Bratseth2017-10-113-13/+71
* Separate out XML readingJon Bratseth2017-10-112-118/+151
* Support blocking application changesJon Bratseth2017-10-092-3/+3
* block-upgrade -> block-change to support blocking revisionsJon Bratseth2017-10-092-22/+92