Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Access files through application package | Jon Bratseth | 2018-01-16 | 1 | -10/+10 | |
| | | ||||||
* | | Declare | Jon Marius Venstad | 2018-01-17 | 1 | -1/+2 | |
| | | ||||||
* | | Prepare for removal of RuleConfigDeriver | Harald Musum | 2018-01-17 | 2 | -2/+7 | |
|/ | ||||||
* | Revert "Revert "Revert "Revert "Jvenstad/zone cleanup 4"""" | Jon Marius Venstad | 2018-01-03 | 2 | -6/+3 | |
| | | | | This reverts commit 7b99d259bf378c0e5c43c9a199efffdf056678f4. | |||||
* | Revert "Revert "Revert "Jvenstad/zone cleanup 4""" | Harald Musum | 2018-01-02 | 2 | -3/+6 | |
| | ||||||
* | Revert "Revert "Jvenstad/zone cleanup 4"" | Jon Marius Venstad | 2018-01-02 | 2 | -6/+3 | |
| | ||||||
* | Revert "Jvenstad/zone cleanup 4" | Jon Marius Venstad | 2018-01-02 | 2 | -3/+6 | |
| | ||||||
* | Moved ZoneId to controller-api and added Zones | Jon Marius Venstad | 2017-12-14 | 2 | -6/+3 | |
| | ||||||
* | Replaced inheritance with delegation | Jon Marius Venstad | 2017-12-08 | 1 | -7/+4 | |
| | ||||||
* | Replaced Zone with ZoneId two places where only that part was used | Jon Marius Venstad | 2017-12-08 | 1 | -2/+3 | |
| | ||||||
* | Revert "Factory constructor with region/env" | Jon Marius Venstad | 2017-12-08 | 1 | -3/+3 | |
| | | | | This reverts commit e5f2b434d614b49bef40038ec1fe1d391db62e1e. | |||||
* | Factory constructor with region/env | Jon Marius Venstad | 2017-12-08 | 1 | -3/+3 | |
| | ||||||
* | 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. | |||||
* | Revert "Revert "Wire in deployment so that we can copy the file in when the ↵ | Henning Baldersheim | 2017-11-13 | 3 | -31/+5 | |
| | | | | old way i…"" | |||||
* | Revert "Wire in deployment so that we can copy the file in when the old way ↵ | Henning Baldersheim | 2017-11-10 | 3 | -5/+31 | |
| | | | | i…" | |||||
* | Wire in deployment so that we can copy the file in when the old way is gone. | Henning Baldersheim | 2017-11-09 | 3 | -31/+5 | |
| | ||||||
* | Config definitions moved to another location. | Arnstein Ressem | 2017-10-20 | 2 | -2/+2 | |
| | ||||||
* | Update error message for bundled defs without package or namespace | gjoranv | 2017-10-18 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #3234 from ↵ | Jon Bratseth | 2017-08-30 | 2 | -3/+2 | |
|\ | | | | | | | | | vespa-engine/bratseth/store-provisioninfo-without-version Bratseth/store provisioninfo without version | |||||
| * | Allocation consistency between model versions | Jon Bratseth | 2017-08-28 | 1 | -2/+1 | |
| | | ||||||
| * | Nonfunctional changes only | Jon Bratseth | 2017-08-23 | 1 | -1/+1 | |
| | | ||||||
* | | Merge two identical methods | Harald Musum | 2017-08-29 | 2 | -9/+6 | |
| | | ||||||
* | | Refactor schema validation setup | Harald Musum | 2017-08-28 | 5 | -207/+251 | |
|/ | | | | | * Try to avoid hardcoding and having to specify version several times * Make sure to only copy schema files once | |||||
* | Validate validation-overrides.xml files | Jon Bratseth | 2017-07-31 | 2 | -23/+12 | |
| | ||||||
* | import getDefaults | Arne H Juul | 2017-06-19 | 1 | -3/+3 | |
| | ||||||
* | use underVespaHome | Arne H Juul | 2017-06-19 | 2 | -3/+3 | |
| | ||||||
* | Update copyright headers | Jon Bratseth | 2017-06-14 | 47 | -47/+47 | |
| | ||||||
* | Revert "Update copyright headers" | Jon Bratseth | 2017-06-14 | 47 | -47/+47 | |
| | ||||||
* | Update copyright headers | Jon Bratseth | 2017-06-14 | 47 | -47/+47 | |
| | ||||||
* | Remove carriage return | Jon Bratseth | 2017-06-14 | 1 | -1/+1 | |
| | ||||||
* | Revert "Copyright header" | Jon Bratseth | 2017-06-13 | 47 | -48/+48 | |
| | ||||||
* | Copyright header | Jon Bratseth | 2017-06-13 | 47 | -48/+48 | |
| | ||||||
* | always compile tests | Arne H Juul | 2017-05-18 | 1 | -0/+1 | |
| | ||||||
* | add comment about ugly workaround | Arne H Juul | 2017-05-18 | 1 | -0/+1 | |
| | ||||||
* | force building test-jars | Arne H Juul | 2017-05-17 | 1 | -0/+3 | |
| | | | | | | | * maven requires installed jar files for dependencies marked with scope "test" even when specifying -Dmaven.test.skip=true - this is a known bug. So we need to build test-jar files even when not compiling tests. | |||||
* | Default to prod only if env is not given | Jon Bratseth | 2017-04-20 | 1 | -2/+10 | |
| | ||||||
* | Merge branch 'master' into bratseth/receive-wanted-version | Jon Bratseth | 2017-04-18 | 3 | -4/+15 | |
|\ | ||||||
| * | Merge pull request #2167 from yahoo/gjoranv/add-flavor-to-zk-app | gjoranv | 2017-04-07 | 1 | -0/+6 | |
| |\ | | | | | | | Gjoranv/add flavor to zk app | |||||
| | * | Add configdefinitions dep in test scope. | gjoranv | 2017-04-07 | 1 | -0/+6 | |
| | | | | | | | | | | | | - Needed to compile FilesApplicationPackageTest. | |||||
| * | | Make nicer | Jon Bratseth | 2017-04-06 | 1 | -4/+7 | |
| | | | ||||||
| * | | Region overrides implies environment=prod | Jon Bratseth | 2017-04-06 | 2 | -2/+4 | |
| |/ | ||||||
* / | Pass wanted node Vespa version around | Jon Bratseth | 2017-04-07 | 5 | -29/+42 | |
|/ | ||||||
* | Simplify | Harald Musum | 2017-01-26 | 1 | -37/+8 | |
| | ||||||
* | Handle overrides correctly | Harald Musum | 2017-01-26 | 2 | -35/+61 | |
| | | | | * Make sure to process all elements before deciding which to retain | |||||
* | Revert "Revert "Handle overrides where multiple elements with same tag have ↵ | Harald Musum | 2017-01-26 | 2 | -37/+126 | |
| | | | | overrides"" | |||||
* | Revert "Handle overrides where multiple elements with same tag have overrides" | Harald Musum | 2017-01-26 | 2 | -126/+37 | |
| |