summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Keep using the deprecated createClassName method for now.gjoranv2017-09-052-5/+4
* Rewrite ConfigGenerator.createClassName to Java.gjoranv2017-09-052-13/+7
* Merge branch 'master' into revert-3275-revert-3260-hmusum/remove-version-from...Harald Musum2017-08-313-6/+5
|\
| * Update unit test with "libvespamallocd"Jon Marius Venstad2017-08-301-3/+3
| * Since we are having so many issues with libyell we need to use an allocator t...Henning Baldersheim2017-08-301-1/+1
| * Nonfunctional changesJon Bratseth2017-08-301-2/+1
* | Merge branch 'master' into revert-3275-revert-3260-hmusum/remove-version-from...Harald Musum2017-08-306-5/+67
|\|
| * Read parallel tag from deployment.xmlMartin Polden2017-08-306-5/+67
* | Revert "Revert "version in def files are deprecated""Harald Musum2017-08-302-2/+0
* | Revert "version in def files are deprecated"Harald Musum2017-08-302-0/+2
* | Merge pull request #3273 from vespa-engine/revert-3265-jvenstad/fix-unit-testHarald Musum2017-08-301-3/+3
|\ \
| * | Revert "Update unit test with "libvespamallocd""Arnstein Ressem2017-08-301-3/+3
* | | Merge pull request #3274 from vespa-engine/revert-3264-balder/use-malloc-libr...Harald Musum2017-08-301-1/+1
|\ \ \ | |/ / |/| |
| * | Revert "Since we are having so many issues with libyell we need to use an all...Arnstein Ressem2017-08-301-1/+1
* | | Merge pull request #3260 from vespa-engine/hmusum/remove-version-from-def-filesgjoranv2017-08-302-2/+0
|\ \ \ | |/ / |/| |
| * | version in def files are deprecatedHarald Musum2017-08-302-2/+0
| |/
* | Merge pull request #3265 from vespa-engine/jvenstad/fix-unit-testJon Bratseth2017-08-301-3/+3
|\ \
| * | Update unit test with "libvespamallocd"Jon Marius Venstad2017-08-301-3/+3
* | | Since we are having so many issues with libyell we need to use an allocator t...Henning Baldersheim2017-08-301-1/+1
| |/ |/|
* | Merge pull request #3234 from vespa-engine/bratseth/store-provisioninfo-witho...Jon Bratseth2017-08-307-21/+28
|\ \
| * \ Merge with masterJon Bratseth2017-08-285-38/+203
| |\ \
| * | | Add one wimphy testJon Bratseth2017-08-281-4/+14
| * | | Track API changes, remove warningsJon Bratseth2017-08-281-2/+3
| * | | ProvisionInfo -> AllocatedHostsJon Bratseth2017-08-282-8/+8
| * | | Allocation consistency between model versionsJon Bratseth2017-08-281-1/+1
| * | | Allocation consistency between model versionsJon Bratseth2017-08-284-11/+8
| * | | Nonfunctional changes onlyJon Bratseth2017-08-231-1/+0
* | | | Avoid validating XML twiceHarald Musum2017-08-291-1/+0
* | | | Merge two identical methodsHarald Musum2017-08-293-7/+5
* | | | Merge pull request #3233 from vespa-engine/hmusum/refactor-schema-validationgjoranv2017-08-296-16/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | Refactor schema validation setupHarald Musum2017-08-286-16/+19
| | |/ | |/|
* | | Merge pull request #3232 from vespa-engine/arnej/move-slobrokArnstein Ressem2017-08-281-1/+1
|\ \ \ | |/ / |/| |
| * | move slobrok binary to sbin/Arne Juul2017-08-161-1/+1
* | | Remove assert.Geir Storli2017-08-251-1/+0
* | | Simplify return statement.Geir Storli2017-08-251-2/+2
* | | Use forEach() directly, no need to go via stream.Geir Storli2017-08-251-2/+2
* | | Sort list of document types in topological order (according to document refer...Geir Storli2017-08-244-1/+144
* | | Merge pull request #3195 from vespa-engine/geirst/zero-visibility-delay-for-g...Tor Egge2017-08-232-37/+60
|\ \ \ | |_|/ |/| |
| * | Set visibility delay to zero for all global document types.Geir Storli2017-08-232-5/+31
| * | Rewrite to use joinLines().Geir Storli2017-08-231-33/+30
* | | Merge pull request #3182 from vespa-engine/bratseth/cleanupJon Bratseth2017-08-223-10/+9
|\ \ \
| * | | Nonfunctional changes onlyJon Bratseth2017-08-223-10/+9
* | | | Handle host being null in toString methodHarald Musum2017-08-221-1/+1
* | | | Merge pull request #3185 from vespa-engine/vekterli/clear-summary-transform-f...Geir Storli2017-08-225-3/+48
|\ \ \ \ | |_|/ / |/| | |
| * | | Clear summary transforms for reference summary fieldsTor Brede Vekterli2017-08-215-3/+48
| |/ /
* | | Use 'package' as namespace for config-application-package:Bundle.DefEntrygjoranv2017-08-214-14/+32
* | | Refactor test to prepare for adding more bundles.gjoranv2017-08-211-27/+31
|/ /
* | Add a new metric set for network metrics.gjoranv2017-08-173-2/+38
* | Fix bug in deriving of attributes config for imported fields.Geir Storli2017-08-162-9/+9
|/
* Merge pull request #3119 from vespa-engine/geirst/add-imported-attribute-fiel...Tor Egge2017-08-164-33/+159
|\