summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.142.8-1].vespa-6.142.8-1by-screwdriver2017-08-292-1/+2
* Initialized to use tito.by-screwdriver2017-08-293-0/+8
* Merge pull request #3231 from vespa-engine/lesters/update-hadoop-versionBjørn Christian Seime2017-08-281-1/+1
|\
| * Merge branch 'master' into lesters/update-hadoop-versionBjørn Christian Seime2017-08-2899-265/+669
| |\ | |/ |/|
* | Merge pull request #3230 from vespa-engine/balder/move-databuffer-and-compres...Henning Baldersheim2017-08-2890-208/+239
|\ \
| * \ Merge branch 'master' into balder/move-databuffer-and-compression-to-vespalibHenning Baldersheim2017-08-289-57/+430
| |\ \ | |/ / |/| |
* | | Merge pull request #3228 from vespa-engine/mpolden/ignore-stale-job-dataJon Marius Venstad2017-08-289-57/+430
|\ \ \
| * \ \ Merge branch 'master' into mpolden/ignore-stale-job-dataJon Marius Venstad2017-08-289-48/+43
| |\ \ \ | |/ / / |/| | |
| * | | Ignore stale job data in failure re-deployerMartin Polden2017-08-285-3/+374
| * | | Include more details when retrying failed jobMartin Polden2017-08-285-55/+57
| | * | Merge branch 'master' into balder/move-databuffer-and-compression-to-vespalibHenning Baldersheim2017-08-282-2/+6
| | |\ \ | |_|/ / |/| | |
| | * | Must wait with enabling of mbus compression.Henning Baldersheim2017-08-281-5/+0
| | * | Also print the sessionId in text.Henning Baldersheim2017-08-281-4/+4
| | * | Moved databuffer and compresssion to vespalibHenning Baldersheim2017-08-2889-203/+240
| | * | remove unused codeHenning Baldersheim2017-08-281-1/+0
| | | * Update Hadoop version dependencyLester Solbakken2017-08-281-1/+1
| |_|/ |/| |
* | | Merge pull request #3226 from vespa-engine/hakon/log-when-nodeagent-starts-an...hakonhall2017-08-281-1/+5
|\ \ \
| * \ \ Merge branch 'master' into hakon/log-when-nodeagent-starts-and-stopshakonhall2017-08-288-47/+38
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3229 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-08-281-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Increase ccache sizeBjørn Christian Seime2017-08-281-1/+1
|/ / /
* | | Merge pull request #3225 from vespa-engine/freva/throw-exception-invalid-remo...Valerij Fredriksen2017-08-286-38/+37
|\ \ \
| * \ \ Merge branch 'master' into freva/throw-exception-invalid-remove-nodeValerij Fredriksen2017-08-281-8/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3227 from vespa-engine/balder/remove-unused-code-in-fasthitHenning Baldersheim2017-08-281-8/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove unused code.Henning Baldersheim2017-08-281-8/+0
|/ / /
| * | Merge remote-tracking branch 'origin/freva/throw-exception-invalid-remove-nod...valerijf2017-08-284-1/+59
| |\ \
| | * \ Merge branch 'master' into freva/throw-exception-invalid-remove-nodeValerij Fredriksen2017-08-284-1/+59
| | |\ \ | |_|/ / |/| | |
| * | | Make underlying method void as wellvalerijf2017-08-281-3/+1
| |/ /
| * | Throw exception of conditions for node remove are not metvalerijf2017-08-285-35/+36
| | * Remove redundant log.Håkon Hallingstad2017-08-281-5/+1
| | * Merge branch 'master' into hakon/log-when-nodeagent-starts-and-stopshakonhall2017-08-283-0/+58
| | |\ | |_|/ |/| |
* | | Merge pull request #3224 from vespa-engine/balder/add-tests-and-tracing-of-ca...Jon Bratseth2017-08-283-0/+58
|\ \ \
| * | | Add info about enabled caches and their keys.Henning Baldersheim2017-08-283-0/+58
|/ / /
| | * Log when NodeAgent starts and stopsHåkon Hallingstad2017-08-282-2/+10
| |/ |/|
* | Merge pull request #3223 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-08-251-1/+1
|\ \ | |/ |/|
| * Fix typoBjørn Christian Seime2017-08-251-1/+1
|/
* Merge pull request #3222 from vespa-engine/toregge/add-boundary-check-when-ma...Geir Storli2017-08-252-13/+14
|\
| * Style fix (indentation).Tor Egge2017-08-251-1/+1
| * Add boundary check when mapping to referenced lid, to avoidTor Egge2017-08-252-13/+14
|/
* Merge pull request #3221 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-08-252-1/+2
|\
| * Improve ccache loggingBjørn Christian Seime2017-08-252-1/+2
|/
* Merge pull request #3220 from vespa-engine/bjorncs/active-container-watchdogBjørn Christian Seime2017-08-251-1/+1
|\
| * Trigger GC more oftenBjørn Christian Seime2017-08-251-1/+1
|/
* Merge pull request #3212 from vespa-engine/balder/move-shared_ptr-when-possib...Henning Baldersheim2017-08-253-10/+11
|\
| * Merge branch 'master' into balder/move-shared_ptr-when-possible-2Henning Baldersheim2017-08-2533-128/+296
| |\ | |/ |/|
* | Merge pull request #3211 from vespa-engine/geirst/sort-document-types-in-topo...Bjørn Christian Seime2017-08-254-1/+143
|\ \
| * \ Merge branch 'master' into geirst/sort-document-types-in-topological-orderBjørn Christian Seime2017-08-25413-422/+22031
| |\ \ | |/ / |/| |
* | | Merge pull request #3219 from vespa-engine/toregge/avoid-race-between-readers...Geir Storli2017-08-253-4/+22
|\ \ \
| * \ \ Merge branch 'master' into toregge/avoid-race-between-readers-and-writerGeir Storli2017-08-251-2/+5
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3218 from vespa-engine/bjorncs/logging-on-reconfigJon Bratseth2017-08-251-2/+5
|\ \ \ \
| * | | | Log on reconfigBjørn Christian Seime2017-08-251-2/+5
|/ / / /