summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.140.34-1].vespa-6.140.34-1by-screwdriver2017-08-222-1/+2
| | | | | | Created by command: /usr/bin/tito tag --use-version=6.140.34 --no-auto-changelog
* Initialized to use tito.by-screwdriver2017-08-223-0/+8
|
* 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
| * | | | | Specify version of maven-antrun-pluginBjørn Christian Seime2017-08-211-0/+5
|/ / / / /
* | | | | Merge pull request #3174 from vespa-engine/bjorncs/travisMorten Tokle2017-08-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Increase output timeout to 30 min (default 10 min)
| * | | | | Increase output timeout to 30 min (default 10 min)Bjørn Christian Seime2017-08-211-1/+1
|/ / / / /
* | | | | Merge pull request #3170 from ↵Henning Baldersheim2017-08-211-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/balder/catch-expected-exception-and-just-quickly-exit Catch and log expected exception and exit quickly instead of dumping …
| * | | | | Catch and log expected exception and exit quickly instead of dumping core.Henning Baldersheim2017-08-211-2/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #3163 from vespa-engine/bratseth/better-timeoutgjoranv2017-08-212-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Generate an explicit timeout message
| * | | | | Generate an explicit timeout messageJon Bratseth2017-08-212-1/+3
| | | | | |
* | | | | | Merge pull request #3166 from vespa-engine/bjorncs/sync-session-timeoutBjørn Christian Seime2017-08-217-13/+26
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | More precise timeout semantics in Javadoc, deprecate SyncSession default ctor
| * | | | | Fix ambiguity in Javadoc regarding DocumentAccessExceptionBjørn Christian Seime2017-08-211-2/+2
| | | | | |
| * | | | | More precise timeout semantics in Javadoc, deprecate SyncSession default ctorBjørn Christian Seime2017-08-217-13/+26
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3167 from vespa-engine/bjorncs/pom-cleanupBjørn Christian Seime2017-08-211-26/+1
|\ \ \ \ \ | |/ / / / |/| | | | Bjorncs/pom cleanup
| * | | | Use properties-maven-plugin 1.0.0Bjørn Christian Seime2017-08-181-1/+1
| | | | |
| * | | | Remove unused pluginsBjørn Christian Seime2017-08-181-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Will stop Maven from downloading unnecessary artifacts when installing parent pom.
* | | | | Merge pull request #3164 from ↵Valerij Fredriksen2017-08-211-14/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | vespa-engine/freva/rethrow-all-runtime-exceptions-from-docker-java Rethrow all RuntimeExceptions from docker-java
| * | | | Rethrow all RuntimeExceptions from docker-javavalerijf2017-08-211-14/+14
| | | | |
* | | | | Merge pull request #3165 from ↵Henning Baldersheim2017-08-211-9/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | vespa-engine/toregge/remove-bad-obsolete-code-from-attribute-reprocessing-initializier Stop trying to get attribute field from old schema when determining if