Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Revert "Revert "Revert "Jvenstad/zone cleanup 4"""" | Jon Marius Venstad | 2018-01-03 | 1 | -14/+4 |
| | | | | This reverts commit 7b99d259bf378c0e5c43c9a199efffdf056678f4. | ||||
* | Revert "Revert "Revert "Jvenstad/zone cleanup 4""" | Harald Musum | 2018-01-02 | 1 | -4/+14 |
| | |||||
* | Revert "Revert "Jvenstad/zone cleanup 4"" | Jon Marius Venstad | 2018-01-02 | 1 | -14/+4 |
| | |||||
* | Revert "Jvenstad/zone cleanup 4" | Jon Marius Venstad | 2018-01-02 | 1 | -4/+14 |
| | |||||
* | Merge branch 'master' into jvenstad/zone-cleanup-4 | Jon Marius Venstad | 2018-01-02 | 2 | -9/+19 |
|\ | |||||
| * | Restore import | Jon Bratseth | 2017-12-20 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' into bratseth/long-dimensions | Jon Bratseth | 2017-12-20 | 1 | -1/+12 |
| |\ | |||||
| | * | Revert "Revert "Restore public method"" | Jon Bratseth | 2017-12-19 | 1 | -4/+15 |
| | | | |||||
| * | | Use longs for dimensions lengths in all API's | Jon Bratseth | 2017-12-19 | 1 | -7/+15 |
| |/ | | | | | | | | | This is to be able to support tensor dimensions with more than 2B elements in the future without API change. | ||||
| * | Revert "Restore public method" | Henning Baldersheim | 2017-12-19 | 1 | -15/+4 |
| | | |||||
| * | Restore public method | Jon Bratseth | 2017-12-18 | 1 | -4/+15 |
| | | |||||
| * | Revert "Revert "Bratseth/tensorflow models"" | Jon Bratseth | 2017-12-18 | 1 | -3/+2 |
| | | |||||
| * | Revert "Bratseth/tensorflow models" | gjoranv | 2017-12-17 | 1 | -2/+3 |
| | | |||||
| * | Merge with master | Jon Bratseth | 2017-12-13 | 4 | -13/+16 |
| |\ | |||||
| * | | Don't write to System.out/err | Jon Bratseth | 2017-11-30 | 1 | -3/+2 |
| | | | |||||
* | | | Conflict resolved | Jon Marius Venstad | 2017-12-14 | 1 | -2/+11 |
|\ \ \ | | |/ | |/| | |||||
| * | | Notify config proxy about starting downloads while preparing | Harald Musum | 2017-12-13 | 1 | -2/+11 |
| | | | | | | | | | | | | Code not activated yet | ||||
* | | | Moved ZoneId to controller-api and added Zones | Jon Marius Venstad | 2017-12-14 | 1 | -3/+2 |
|/ / | |||||
* | | Replaced Zone with ZoneId two places where only that part was used | Jon Marius Venstad | 2017-12-08 | 1 | -2/+3 |
| | | |||||
* | | Remove unused method from API | Harald Musum | 2017-12-06 | 1 | -9/+0 |
| | | |||||
* | | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-12-01 | 1 | -0/+1 |
| | | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | ||||
* | | Revert "Gjoranv/split parent2" | gjoranv | 2017-11-30 | 1 | -1/+0 |
| | | |||||
* | | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-11-30 | 1 | -0/+1 |
| | | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | ||||
* | | Revert "Gjoranv/split parent" | gjoranv | 2017-11-29 | 1 | -1/+0 |
| | | |||||
* | | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-11-29 | 1 | -0/+1 |
| | | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. | ||||
* | | More wiring for making it possible to disable filedistributor | Harald Musum | 2017-11-27 | 1 | -0/+1 |
|/ | |||||
* | Fix tests after refactor | Morten Tokle | 2017-11-23 | 1 | -4/+4 |
| | |||||
* | Move deployment spec ContainerCluster -> ContainerModelBuilder | Morten Tokle | 2017-11-22 | 3 | -20/+25 |
| | |||||
* | Move identity configuration services.xml -> deployment.xml | Morten Tokle | 2017-11-21 | 3 | -9/+125 |
| | |||||
* | Resolved conflict | Jon Marius Venstad | 2017-11-17 | 1 | -1/+10 |
|\ | |||||
| * | Add new field for loadbalancername, deprecate loadbalanceraddress | Morten Tokle | 2017-11-15 | 1 | -1/+10 |
| | | |||||
* | | Added TODO: | Jon Marius Venstad | 2017-11-15 | 1 | -1/+0 |
|/ | |||||
* | Revert "Treat loadbalancer address as string and pass through" | Harald Musum | 2017-11-14 | 1 | -1/+2 |
| | |||||
* | Treat loadbalancer address as string and pass through | Morten Tokle | 2017-11-14 | 1 | -2/+1 |
| | |||||
* | Remove unused interface no longer needed. | Henning Baldersheim | 2017-11-08 | 1 | -2/+1 |
| | |||||
* | Merge pull request #3954 from vespa-engine/mortent/propagate-lbaddress | Morten Tokle | 2017-11-08 | 1 | -0/+2 |
|\ | | | | | Propagate loadBalancerAddress | ||||
| * | Propagate loadBalancerAddress | Morten Tokle | 2017-11-07 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into balder/add-filedist-rpc-to-configserver | Harald Musum | 2017-11-08 | 2 | -6/+1 |
|\ \ | |||||
| * | | Remove duplicate regions in test | Harald Musum | 2017-11-08 | 1 | -3/+1 |
| | | | |||||
| * | | Name changes, minor refactoring, should be non-functional only | Jon Marius Venstad | 2017-11-07 | 1 | -3/+0 |
| |/ | |||||
* / | Add serveFile interface. | Henning Baldersheim | 2017-11-07 | 1 | -1/+5 |
|/ | |||||
* | Remove deprecated, unused method and default implementation from interface | Harald Musum | 2017-11-02 | 1 | -13/+2 |
| | |||||
* | Add copyright header | Jon Bratseth | 2017-10-27 | 3 | -0/+3 |
| | |||||
* | Disallow parallel triggering | Jon Bratseth | 2017-10-19 | 1 | -1/+1 |
| | | | | | | | - Disallow parallel triggering - Let triggerReadyJobs look at all jobs - Refuse to trigger an upgrade if a newer upgrade has started in the meantime (due to block + timeout) - More upgrade+block scenario tests | ||||
* | Let block-upgrade continue to work | Martin Polden | 2017-10-16 | 2 | -5/+6 |
| | |||||
* | Don't validate when reading stored applications | Jon Bratseth | 2017-10-16 | 2 | -3/+29 |
| | |||||
* | Enforce order of block-change | Jon Bratseth | 2017-10-11 | 3 | -13/+71 |
| | | | | | | | Enforce that the block-change tag is placed after any test and staging tag and before the prod tag. This is in case we want to allow multiple block points in the future (perhaps to block rolling out to the next instance when having multiple instances) such that the placement becomes significant. | ||||
* | Separate out XML reading | Jon Bratseth | 2017-10-11 | 2 | -118/+151 |
| | |||||
* | Support blocking application changes | Jon Bratseth | 2017-10-09 | 2 | -3/+3 |
| | |||||
* | block-upgrade -> block-change to support blocking revisions | Jon Bratseth | 2017-10-09 | 2 | -22/+92 |
| |