Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use vespa-dev image | Bjørn Christian Seime | 2017-08-21 | 3 | -19/+2 |
| | |||||
* | Merge pull request #3164 from ↵ | Valerij Fredriksen | 2017-08-21 | 1 | -14/+14 |
|\ | | | | | | | | | vespa-engine/freva/rethrow-all-runtime-exceptions-from-docker-java Rethrow all RuntimeExceptions from docker-java | ||||
| * | Rethrow all RuntimeExceptions from docker-java | valerijf | 2017-08-21 | 1 | -14/+14 |
| | | |||||
* | | Merge pull request #3165 from ↵ | Henning Baldersheim | 2017-08-21 | 1 | -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 | ||||
| * | | Stop trying to get attribute field from old schema when determining if | Tor Egge | 2017-08-21 | 1 | -9/+0 |
| |/ | | | | | | | | | | | | | document store needs to be populated from attribute that is being removed. If attribute aspect removal has been delayed during an earlier reconfig then the old schema won't have information about the attribute. | ||||
* | | Merge pull request #3158 from ↵ | Geir Storli | 2017-08-21 | 8 | -57/+255 |
|\ \ | |/ |/| | | | | | vespa-engine/toregge/add-imported-attribute-vector-read-guard Add ImportedAttributeVectorReadGuard, used to handle imported attributes | ||||
| * | Add ImportedAttributeVectorReadGuard, used to handle imported attributes | Tor Egge | 2017-08-18 | 8 | -57/+255 |
| | | | | | | | | via ImportedAttributesContext in a safe manner. | ||||
* | | Merge pull request #3154 from ↵ | Valerij Fredriksen | 2017-08-21 | 2 | -40/+113 |
|\ \ | | | | | | | | | | | | | vespa-engine/freva/FailedExpired-park-nodes-with-hw-failure FailedExpirer move to parked if HW failure | ||||
| * | | Add log message | valerijf | 2017-08-21 | 1 | -4/+14 |
| | | | |||||
| * | | Fix HW fail count precedence | valerijf | 2017-08-21 | 2 | -18/+18 |
| | | | |||||
| * | | FailedExpirer move to parked if HW failure | valerijf | 2017-08-18 | 2 | -35/+98 |
| |/ | |||||
* | | Merge pull request #2960 from ↵ | Harald Musum | 2017-08-21 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | vespa-engine/hakon/tweak-log-of-nodeadminstateupdater Tweak log of NodeAdminStateUpdater | ||||
| * | | Tweak log of NodeAdminStateUpdater | Håkon Hallingstad | 2017-07-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3145 from vespa-engine/balder/reduce-includes-and-visibility | Henning Baldersheim | 2017-08-18 | 360 | -1504/+1524 |
|\ \ \ | | | | | | | | | Balder/reduce includes and visibility | ||||
| * | | | Include what you need. | Henning Baldersheim | 2017-08-18 | 106 | -229/+315 |
| | | | | |||||
| * | | | Use std::this_thread::sleep_for instead of FastOS_Thread::Sleep | Henning Baldersheim | 2017-08-18 | 1 | -2/+3 |
| | | | | |||||
| * | | | Include what you need. | Henning Baldersheim | 2017-08-18 | 2 | -17/+11 |
| | | | | |||||
| * | | | Remove some includes not needed. | Henning Baldersheim | 2017-08-18 | 6 | -24/+3 |
| | | | | |||||
| * | | | Fix up @vekterli's comments. | Henning Baldersheim | 2017-08-18 | 2 | -6/+1 |
| | | | | |||||
| * | | | NULL -> nullptr | Henning Baldersheim | 2017-08-18 | 47 | -356/+356 |
| | | | | |||||
| * | | | Remove unused. | Henning Baldersheim | 2017-08-18 | 1 | -2/+0 |
| | | | | |||||
| * | | | Hide the thread thread implementation a bit more. | Henning Baldersheim | 2017-08-18 | 7 | -40/+60 |
| | | | | |||||
| * | | | Remove more clutter in fastos/types.h | Henning Baldersheim | 2017-08-18 | 77 | -304/+180 |
| | | | | |||||
| * | | | Add missing file. | Henning Baldersheim | 2017-08-18 | 1 | -0/+26 |
| | | | | |||||
| * | | | Include only what you need. | Henning Baldersheim | 2017-08-18 | 169 | -539/+584 |
| | | | | |||||
* | | | | Merge pull request #3162 from vespa-engine/bjorncs/travis | gjoranv | 2017-08-18 | 5 | -16/+20 |
|\ \ \ \ | | | | | | | | | | | Travis does not do shallow clone for specific commit hash | ||||
| * | | | | Fix deprecation warnings | Bjørn Christian Seime | 2017-08-18 | 4 | -13/+20 |
| | | | | | |||||
| * | | | | Travis does not do shallow clone for specific commit hash | Bjørn Christian Seime | 2017-08-18 | 1 | -3/+0 |
|/ / / / | |||||
* | | | | Changed write location for diskbenchmark (#3159) | Sindre Grøstad | 2017-08-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3161 from vespa-engine/bjorncs/fix-filehelpertest | Valerij Fredriksen | 2017-08-18 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Adapt to junit 4.12 changes | ||||
| * | | | | Adapt to junit 4.12 changes | Bjørn Christian Seime | 2017-08-18 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #3160 from vespa-engine/bratseth/parse-random-feature | Kristian Aune | 2017-08-18 | 5 | -21/+23 |
|\ \ \ \ \ | |/ / / / |/| | | | | Distinguish the random feature and tensor function | ||||
| * | | | | Distinguish the random feature and tensor function | Jon Bratseth | 2017-08-18 | 5 | -21/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look ahead far enough to choose correctly between the tensor function 'random(tensor-type)' and the scalar feature 'tensor(literal'"random" feature. This also relaxes Context to allow arguments (to allow testing). | ||||
* | | | | | Merge pull request #3146 from vespa-engine/bratseth/add-copyright-headers | Kristian Aune | 2017-08-18 | 30 | -24/+31 |
|\ \ \ \ \ | | | | | | | | | | | | | Add copyright header | ||||
| * \ \ \ \ | Merge with master | Jon Bratseth | 2017-08-18 | 87 | -359/+1506 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3156 from vespa-engine/bjorncs/docker-script-cleanup | Bjørn Christian Seime | 2017-08-18 | 6 | -57/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use bootstrap-cpp.sh in vespa-ci scripts | ||||
| * | | | | | | Use junit 4.12 | Bjørn Christian Seime | 2017-08-18 | 4 | -9/+2 |
| | | | | | | | |||||
| * | | | | | | Simplify vespa-ci build | Bjørn Christian Seime | 2017-08-18 | 1 | -29/+2 |
| | | | | | | | |||||
| * | | | | | | Use bootstrap-cpp.sh in vespa-ci scripts | Bjørn Christian Seime | 2017-08-18 | 2 | -19/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #3143 from vespa-engine/lesters/max-reduce-prod-join-feature | Geir Storli | 2017-08-18 | 9 | -0/+498 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add internal feature for replacement of tensor expression | ||||
| * | | | | | | Make setup a bit more readable | Lester Solbakken | 2017-08-18 | 2 | -10/+19 |
| | | | | | | | |||||
| * | | | | | | Make pointer and reference symbol placement consistent | Lester Solbakken | 2017-08-18 | 3 | -14/+11 |
| | | | | | | | |||||
| * | | | | | | Make maxProduct more modern | Lester Solbakken | 2017-08-18 | 1 | -4/+6 |
| | | | | | | | |||||
| * | | | | | | Change from double to long in collection type single | Lester Solbakken | 2017-08-18 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Simplify setup test | Lester Solbakken | 2017-08-18 | 1 | -12/+6 |
| | | | | | | | |||||
| * | | | | | | Add some more tests | Lester Solbakken | 2017-08-18 | 1 | -7/+39 |
| | | | | | | | |||||
| * | | | | | | Clean up type and base type usage a bit | Lester Solbakken | 2017-08-18 | 1 | -6/+3 |
| | | | | | | | |||||
| * | | | | | | Add check for supported attribute types in blueprint setup | Lester Solbakken | 2017-08-18 | 4 | -8/+46 |
| | | | | | | | |||||
| * | | | | | | Fix comments related to PR | Lester Solbakken | 2017-08-18 | 3 | -21/+31 |
| | | | | | | | |||||
| * | | | | | | Rename max_reduce_prod_join feature header and source file | Lester Solbakken | 2017-08-18 | 4 | -3/+3 |
| | | | | | | |