summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.140.53-1].vespa-6.140.53-1by-screwdriver2017-08-232-1/+2
| | | | | | Created by command: /usr/bin/tito tag --use-version=6.140.53 --no-auto-changelog
* Initialized to use tito.by-screwdriver2017-08-233-0/+8
|
* Merge pull request #3182 from vespa-engine/bratseth/cleanupJon Bratseth2017-08-2245-65/+62
|\ | | | | Nonfunctional changes only
| * Nonfunctional changes onlyJon Bratseth2017-08-2245-65/+62
| |
* | Merge pull request #3190 from ↵Jon Bratseth2017-08-221-1/+1
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/handle-host-being-null-for-a-service Handle host being null in toString method
| * | 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 stuff
| * | 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 cut
| * | | 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 file
| * | | 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.md
| * | | Update README-documentation.mdKristian Aune2017-08-221-77/+3
| | | |
* | | | Merge pull request #3185 from ↵Geir Storli2017-08-225-3/+48
|\ \ \ \ | |/ / / |/| | | | | | | | | | | vespa-engine/vekterli/clear-summary-transform-for-reference-summary-fields Clear summary transforms for reference summary fields
| * | | Clear summary transforms for reference summary fieldsTor Brede Vekterli2017-08-215-3/+48
| | | | | | | | | | | | | | | | | | | | Prevents confusing Proton into thinking it can fetch the field value directly from the attribute.
* | | | Merge pull request #3181 from ↵Torbjørn Smørgrav2017-08-223-3/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/only-create-docker-nodes-on-active-docker-hosts Only create Docker nodes for active Docker hosts
| * | | | Only create Docker nodes for active Docker hostsHarald Musum2017-08-223-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | * Make sure to only create Docker nodes when using dynamic allocation when Docker host is in active state
* | | | | Merge pull request #3183 from vespa-engine/bjorncs/typoArnstein Ressem2017-08-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Cannot use _smp_mflags as it contains the '-j' prefix
| * | | | | 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 method
| * | | | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | | Make node spec non-optional
| * | | | Remove unused argumentvalerijf2017-08-221-2/+2
| | | | |
| * | | | Make node spec non-optionalvalerijf2017-08-2215-50/+82
|/ / / /
* | | | Merge pull request #3173 from ↵Geir Storli2017-08-2210-2/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/vekterli/add-string-from-enum-lookup-to-iattributevector Add string from enum lookup to IAttributeVector
| * | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | Bjorncs/docker build cleanup
| * | | | 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 ↵gjoranv2017-08-225-44/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/gjoranv/support-def-package-in-bundle-model Gjoranv/support def package in bundle model
| * | | | Use 'package' as namespace for config-application-package:Bundle.DefEntrygjoranv2017-08-215-22/+56
| | | | | | | | | | | | | | | | | | | | | | | | | - If both 'package' and 'namespace' are present, the package will be used as namespace.
| * | | | Refactor test to prepare for adding more bundles.gjoranv2017-08-211-27/+31
| | | | | | | | | | | | | | | | | | | | + Rename methods to make comments redundant.
* | | | | Merge pull request #3179 from ↵Henning Baldersheim2017-08-2150-615/+67
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/balder/drop-the-last-usage-of-the-dreaded-linkedptr Balder/drop the last usage of the dreaded linkedptr
| * | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Increase timeout to 120 minutes
| * | | | | Increase timeout to 120 minutesBjørn Christian Seime2017-08-211-1/+1
|/ / / / /
* | | | | Merge pull request #3177 from vespa-engine/geirst/install-clion-in-centos-vmTor Brede Vekterli2017-08-211-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Geirst/install clion in centos vm
| * | | | | Give the vm a name.Geir Storli2017-08-211-0/+1
| | | | | |
| * | | | | Install newest clion.Geir Storli2017-08-211-0/+2
| | | | | |
* | | | | | Merge pull request #3172 from ↵Geir Storli2017-08-213-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/havardpe/return-feature-type-by-reference return feature type by reference
| * | | | | | return feature type by referenceHåvard Pettersen2017-08-213-3/+3
| | | | | | |
* | | | | | | Merge pull request #3168 from ↵Geir Storli2017-08-211-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | vespa-engine/aressem/usleep-from-initscripts-needed Add initscripts as a runtime dependency because usleep is used in our…
| * | | | | | Add initscripts as a runtime dependency because usleep is used in our scripts.Arnstein Ressem2017-08-211-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3175 from vespa-engine/bjorncs/fixBjørn Christian Seime2017-08-211-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Specify version of maven-antrun-plugin