summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ProvisionInfo -> AllocatedHostsJon Bratseth2017-08-288-113/+115
* Add one wimphy testJon Bratseth2017-08-2810-33/+60
* Allow model evolution which removes clustersJon Bratseth2017-08-287-28/+79
* Explicitly pass the correct allocated hostsJon Bratseth2017-08-286-40/+62
* Track API changes, remove warningsJon Bratseth2017-08-285-18/+13
* ProvisionInfo -> AllocatedHostsJon Bratseth2017-08-2828-208/+246
* Allocation consistency between model versionsJon Bratseth2017-08-2820-76/+121
* Allocation consistency between model versionsJon Bratseth2017-08-2829-172/+211
* Nonfunctional changes onlyJon Bratseth2017-08-238-7/+3
* Merge pull request #3191 from vespa-engine/kkraune/more-contributingJon Bratseth2017-08-231-6/+33
|\
| * more details and linksKristian Aune2017-08-231-6/+33
|/
* Merge pull request #3182 from vespa-engine/bratseth/cleanupJon Bratseth2017-08-2245-65/+62
|\
| * Nonfunctional changes onlyJon Bratseth2017-08-2245-65/+62
* | Merge pull request #3190 from vespa-engine/hmusum/handle-host-being-null-for-...Jon Bratseth2017-08-221-1/+1
|\ \
| * | Handle host being null in toString methodHarald Musum2017-08-221-1/+1
|/ /
* | Merge pull request #3188 from vespa-engine/havardpe/clean-up-stuffHenning Baldersheim2017-08-221-88/+10
|\ \
| * | clean up stuffHåvard Pettersen2017-08-221-88/+10
* | | Merge pull request #3189 from vespa-engine/kkraune/contributingJon Bratseth2017-08-221-0/+33
|\ \ \
| * | | skeleton doc, first cutKristian Aune2017-08-221-0/+33
|/ / /
* | | Merge pull request #3187 from vespa-engine/kkraune/doc-readmeKristian Aune2017-08-222-6/+1
|\ \ \
| * | | remove empty fileKristian Aune2017-08-222-6/+1
|/ / /
* | | Merge pull request #3186 from vespa-engine/kkraune/link-to-documentationKristian Aune2017-08-221-77/+3
|\ \ \
| * | | Update README-documentation.mdKristian Aune2017-08-221-77/+3
* | | | 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
* | | | Merge pull request #3181 from vespa-engine/hmusum/only-create-docker-nodes-on...Torbjørn Smørgrav2017-08-223-3/+23
|\ \ \ \
| * | | | Only create Docker nodes for active Docker hostsHarald Musum2017-08-223-3/+23
* | | | | Merge pull request #3183 from vespa-engine/bjorncs/typoArnstein Ressem2017-08-221-1/+1
|\ \ \ \ \
| * | | | | Cannot use _smp_mflags as it contains the '-j' prefixBjørn Christian Seime2017-08-221-1/+1
|/ / / / /
* | | | | Merge pull request #3176 from vespa-engine/bratseth/refactor-character-filteringBjørn Christian Seime2017-08-223-143/+98
|\ \ \ \ \
| * | | | | Factor out string filtering methodJon Bratseth2017-08-213-143/+98
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3180 from vespa-engine/freva/make-spec-non-optionalHarald Musum2017-08-2215-52/+84
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove unused argumentvalerijf2017-08-221-2/+2
| * | | | Make node spec non-optionalvalerijf2017-08-2215-50/+82
|/ / / /
* | | | Merge pull request #3173 from vespa-engine/vekterli/add-string-from-enum-look...Geir Storli2017-08-2210-2/+49
|\ \ \ \
| * | | | Add string from enum lookup to IAttributeVectorTor Brede Vekterli2017-08-2110-2/+49
* | | | | Merge pull request #3169 from vespa-engine/bjorncs/docker-build-cleanupGeir Storli2017-08-225-22/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Dependencies are already part of Docker imageBjørn Christian Seime2017-08-211-1/+0
| * | | | Pull image to ensure newest version is usedBjørn Christian Seime2017-08-212-0/+2
| * | | | Don't update snapshotsBjørn Christian Seime2017-08-211-1/+1
| * | | | Do minimal bootstrapBjørn Christian Seime2017-08-211-1/+1
| * | | | Enable parallel Maven buildBjørn Christian Seime2017-08-211-1/+1
| * | | | Use vespa-dev imageBjørn Christian Seime2017-08-213-19/+2
| |/ / /
* | | | Merge pull request #3171 from vespa-engine/gjoranv/support-def-package-in-bun...gjoranv2017-08-225-44/+82
|\ \ \ \
| * | | | Use 'package' as namespace for config-application-package:Bundle.DefEntrygjoranv2017-08-215-22/+56
| * | | | Refactor test to prepare for adding more bundles.gjoranv2017-08-211-27/+31
* | | | | Merge pull request #3179 from vespa-engine/balder/drop-the-last-usage-of-the-...Henning Baldersheim2017-08-2150-615/+67
|\ \ \ \ \
| * | | | | Drop the dangerous LinkedPtr.Henning Baldersheim2017-08-2149-613/+66
| * | | | | override and include optimize.Henning Baldersheim2017-08-211-2/+1
* | | | | | Merge pull request #3178 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-08-211-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |