summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Stop trying to get attribute field from old schema when determining ifTor Egge2017-08-211-9/+0
| |/ / /
* | | | Merge pull request #3158 from vespa-engine/toregge/add-imported-attribute-vec...Geir Storli2017-08-218-57/+255
|\ \ \ \ | |/ / / |/| | |
| * | | Add ImportedAttributeVectorReadGuard, used to handle imported attributesTor Egge2017-08-188-57/+255
* | | | Merge pull request #3154 from vespa-engine/freva/FailedExpired-park-nodes-wit...Valerij Fredriksen2017-08-212-40/+113
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add log messagevalerijf2017-08-211-4/+14
| * | | Fix HW fail count precedencevalerijf2017-08-212-18/+18
| * | | FailedExpirer move to parked if HW failurevalerijf2017-08-182-35/+98
| |/ /
* | | Merge pull request #2960 from vespa-engine/hakon/tweak-log-of-nodeadminstateu...Harald Musum2017-08-211-1/+1
|\ \ \
| * | | Tweak log of NodeAdminStateUpdaterHåkon Hallingstad2017-07-141-1/+1
* | | | Merge pull request #3145 from vespa-engine/balder/reduce-includes-and-visibilityHenning Baldersheim2017-08-18360-1504/+1524
|\ \ \ \
| * | | | Include what you need.Henning Baldersheim2017-08-18106-229/+315
| * | | | Use std::this_thread::sleep_for instead of FastOS_Thread::SleepHenning Baldersheim2017-08-181-2/+3
| * | | | Include what you need.Henning Baldersheim2017-08-182-17/+11
| * | | | Remove some includes not needed.Henning Baldersheim2017-08-186-24/+3
| * | | | Fix up @vekterli's comments.Henning Baldersheim2017-08-182-6/+1
| * | | | NULL -> nullptrHenning Baldersheim2017-08-1847-356/+356
| * | | | Remove unused.Henning Baldersheim2017-08-181-2/+0
| * | | | Hide the thread thread implementation a bit more.Henning Baldersheim2017-08-187-40/+60
| * | | | Remove more clutter in fastos/types.hHenning Baldersheim2017-08-1877-304/+180
| * | | | Add missing file.Henning Baldersheim2017-08-181-0/+26
| * | | | Include only what you need.Henning Baldersheim2017-08-18169-539/+584
* | | | | Merge pull request #3162 from vespa-engine/bjorncs/travisgjoranv2017-08-185-16/+20
|\ \ \ \ \
| * | | | | Fix deprecation warningsBjørn Christian Seime2017-08-184-13/+20
| * | | | | Travis does not do shallow clone for specific commit hashBjørn Christian Seime2017-08-181-3/+0
|/ / / / /
* | | | | Changed write location for diskbenchmark (#3159)Sindre Grøstad2017-08-181-1/+1
* | | | | Merge pull request #3161 from vespa-engine/bjorncs/fix-filehelpertestValerij Fredriksen2017-08-181-2/+2
|\ \ \ \ \
| * | | | | Adapt to junit 4.12 changesBjørn Christian Seime2017-08-181-2/+2
* | | | | | Merge pull request #3160 from vespa-engine/bratseth/parse-random-featureKristian Aune2017-08-185-21/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Distinguish the random feature and tensor functionJon Bratseth2017-08-185-21/+23
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3146 from vespa-engine/bratseth/add-copyright-headersKristian Aune2017-08-1830-24/+31
|\ \ \ \ \
| * \ \ \ \ Merge with masterJon Bratseth2017-08-1887-359/+1506
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3156 from vespa-engine/bjorncs/docker-script-cleanupBjørn Christian Seime2017-08-186-57/+9
|\ \ \ \ \ \
| * | | | | | Use junit 4.12Bjørn Christian Seime2017-08-184-9/+2
| * | | | | | Simplify vespa-ci buildBjørn Christian Seime2017-08-181-29/+2
| * | | | | | Use bootstrap-cpp.sh in vespa-ci scriptsBjørn Christian Seime2017-08-182-19/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3143 from vespa-engine/lesters/max-reduce-prod-join-featureGeir Storli2017-08-189-0/+498
|\ \ \ \ \ \
| * | | | | | Make setup a bit more readableLester Solbakken2017-08-182-10/+19
| * | | | | | Make pointer and reference symbol placement consistentLester Solbakken2017-08-183-14/+11
| * | | | | | Make maxProduct more modernLester Solbakken2017-08-181-4/+6
| * | | | | | Change from double to long in collection type singleLester Solbakken2017-08-181-2/+2
| * | | | | | Simplify setup testLester Solbakken2017-08-181-12/+6
| * | | | | | Add some more testsLester Solbakken2017-08-181-7/+39
| * | | | | | Clean up type and base type usage a bitLester Solbakken2017-08-181-6/+3
| * | | | | | Add check for supported attribute types in blueprint setupLester Solbakken2017-08-184-8/+46
| * | | | | | Fix comments related to PRLester Solbakken2017-08-183-21/+31
| * | | | | | Rename max_reduce_prod_join feature header and source fileLester Solbakken2017-08-184-3/+3
| * | | | | | Complete renaming of internal feature testLester Solbakken2017-08-184-5/+5
| * | | | | | Rename internal_max_reduce_prod_join feature testLester Solbakken2017-08-183-0/+0
| * | | | | | DRY refactor in buffered and raw computationLester Solbakken2017-08-171-22/+19
| * | | | | | Add some extra asserts in feature testLester Solbakken2017-08-171-2/+4