Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic commit of package [vespa] release [6.140.53-1].vespa-6.140.53-1 | by-screwdriver | 2017-08-23 | 2 | -1/+2 |
| | | | | | | Created by command: /usr/bin/tito tag --use-version=6.140.53 --no-auto-changelog | ||||
* | Initialized to use tito. | by-screwdriver | 2017-08-23 | 3 | -0/+8 |
| | |||||
* | Merge pull request #3182 from vespa-engine/bratseth/cleanup | Jon Bratseth | 2017-08-22 | 45 | -65/+62 |
|\ | | | | | Nonfunctional changes only | ||||
| * | Nonfunctional changes only | Jon Bratseth | 2017-08-22 | 45 | -65/+62 |
| | | |||||
* | | Merge pull request #3190 from ↵ | Jon Bratseth | 2017-08-22 | 1 | -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 method | Harald Musum | 2017-08-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3188 from vespa-engine/havardpe/clean-up-stuff | Henning Baldersheim | 2017-08-22 | 1 | -88/+10 |
|\ \ | | | | | | | clean up stuff | ||||
| * | | clean up stuff | Håvard Pettersen | 2017-08-22 | 1 | -88/+10 |
| | | | |||||
* | | | Merge pull request #3189 from vespa-engine/kkraune/contributing | Jon Bratseth | 2017-08-22 | 1 | -0/+33 |
|\ \ \ | | | | | | | | | skeleton doc, first cut | ||||
| * | | | skeleton doc, first cut | Kristian Aune | 2017-08-22 | 1 | -0/+33 |
|/ / / | |||||
* | | | Merge pull request #3187 from vespa-engine/kkraune/doc-readme | Kristian Aune | 2017-08-22 | 2 | -6/+1 |
|\ \ \ | | | | | | | | | remove empty file | ||||
| * | | | remove empty file | Kristian Aune | 2017-08-22 | 2 | -6/+1 |
|/ / / | |||||
* | | | Merge pull request #3186 from vespa-engine/kkraune/link-to-documentation | Kristian Aune | 2017-08-22 | 1 | -77/+3 |
|\ \ \ | | | | | | | | | Update README-documentation.md | ||||
| * | | | Update README-documentation.md | Kristian Aune | 2017-08-22 | 1 | -77/+3 |
| | | | | |||||
* | | | | Merge pull request #3185 from ↵ | Geir Storli | 2017-08-22 | 5 | -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 fields | Tor Brede Vekterli | 2017-08-21 | 5 | -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ørgrav | 2017-08-22 | 3 | -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 hosts | Harald Musum | 2017-08-22 | 3 | -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/typo | Arnstein Ressem | 2017-08-22 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Cannot use _smp_mflags as it contains the '-j' prefix | ||||
| * | | | | | Cannot use _smp_mflags as it contains the '-j' prefix | Bjørn Christian Seime | 2017-08-22 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #3176 from vespa-engine/bratseth/refactor-character-filtering | Bjørn Christian Seime | 2017-08-22 | 3 | -143/+98 |
|\ \ \ \ \ | | | | | | | | | | | | | Factor out string filtering method | ||||
| * | | | | | Factor out string filtering method | Jon Bratseth | 2017-08-21 | 3 | -143/+98 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #3180 from vespa-engine/freva/make-spec-non-optional | Harald Musum | 2017-08-22 | 15 | -52/+84 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Make node spec non-optional | ||||
| * | | | | Remove unused argument | valerijf | 2017-08-22 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Make node spec non-optional | valerijf | 2017-08-22 | 15 | -50/+82 |
|/ / / / | |||||
* | | | | Merge pull request #3173 from ↵ | Geir Storli | 2017-08-22 | 10 | -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 IAttributeVector | Tor Brede Vekterli | 2017-08-21 | 10 | -2/+49 |
| | | | | | |||||
* | | | | | Merge pull request #3169 from vespa-engine/bjorncs/docker-build-cleanup | Geir Storli | 2017-08-22 | 5 | -22/+6 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Bjorncs/docker build cleanup | ||||
| * | | | | Dependencies are already part of Docker image | Bjørn Christian Seime | 2017-08-21 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Pull image to ensure newest version is used | Bjørn Christian Seime | 2017-08-21 | 2 | -0/+2 |
| | | | | | |||||
| * | | | | Don't update snapshots | Bjørn Christian Seime | 2017-08-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Do minimal bootstrap | Bjørn Christian Seime | 2017-08-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Enable parallel Maven build | Bjørn Christian Seime | 2017-08-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use vespa-dev image | Bjørn Christian Seime | 2017-08-21 | 3 | -19/+2 |
| |/ / / | |||||
* | | | | Merge pull request #3171 from ↵ | gjoranv | 2017-08-22 | 5 | -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.DefEntry | gjoranv | 2017-08-21 | 5 | -22/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - If both 'package' and 'namespace' are present, the package will be used as namespace. | ||||
| * | | | | Refactor test to prepare for adding more bundles. | gjoranv | 2017-08-21 | 1 | -27/+31 |
| | | | | | | | | | | | | | | | | | | | | + Rename methods to make comments redundant. | ||||
* | | | | | Merge pull request #3179 from ↵ | Henning Baldersheim | 2017-08-21 | 50 | -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 Baldersheim | 2017-08-21 | 49 | -613/+66 |
| | | | | | | |||||
| * | | | | | override and include optimize. | Henning Baldersheim | 2017-08-21 | 1 | -2/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #3178 from vespa-engine/bjorncs/travis | Bjørn Christian Seime | 2017-08-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Increase timeout to 120 minutes | ||||
| * | | | | | Increase timeout to 120 minutes | Bjørn Christian Seime | 2017-08-21 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #3177 from vespa-engine/geirst/install-clion-in-centos-vm | Tor Brede Vekterli | 2017-08-21 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Geirst/install clion in centos vm | ||||
| * | | | | | Give the vm a name. | Geir Storli | 2017-08-21 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Install newest clion. | Geir Storli | 2017-08-21 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #3172 from ↵ | Geir Storli | 2017-08-21 | 3 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/havardpe/return-feature-type-by-reference return feature type by reference | ||||
| * | | | | | | return feature type by reference | Håvard Pettersen | 2017-08-21 | 3 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3168 from ↵ | Geir Storli | 2017-08-21 | 1 | -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 Ressem | 2017-08-21 | 1 | -0/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #3175 from vespa-engine/bjorncs/fix | Bjørn Christian Seime | 2017-08-21 | 1 | -0/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Specify version of maven-antrun-plugin |