summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Minor cleanup: unnecessary annotation, use diamond operator.gjoranv2017-07-191-3/+2
* Merge pull request #2974 from yahoo/gjoranv/cleanup-LeafNodeVectorHarald Musum2017-07-191-21/+17
|\
| * Declare helper methods static.gjoranv2017-07-191-9/+9
| * Refactor LeafNodeVectorgjoranv2017-07-191-20/+16
|/
* Merge pull request #2973 from yahoo/gjoranv/cleanup-InnerNodeVectorHarald Musum2017-07-193-52/+5
|\
| * Remove InnerNodeVector.defaultNode and add a new primary ctor.gjoranv2017-07-193-52/+5
|/
* Merge pull request #2972 from yahoo/gjoranv/remove-default-ctor5Harald Musum2017-07-181-5/+7
|\
| * Remove default ctor for the outer config class.gjoranv2017-07-181-5/+7
|/
* Merge pull request #2933 from yahoo/gjoranv/vespa-ci-improvementsBjørn Christian Seime2017-07-182-12/+61
|\
| * Send build output to separate log filesgjoranv2017-07-181-19/+27
| * No snapshot updates for java build.gjoranv2017-07-181-2/+2
| * Run c++ and java build/test in parallel.gjoranv2017-07-181-4/+38
| * Use two step parallel maven build.gjoranv2017-07-111-1/+5
| * Propagate exit status from 'docker run'gjoranv2017-07-071-0/+3
| * Output maven version.gjoranv2017-07-071-1/+1
* | Merge pull request #2971 from yahoo/kkraune/build-blog-searchKristian Aune2017-07-181-0/+1
|\ \
| * | build blog-searchKristian Aune2017-07-181-0/+1
|/ /
* | Merge pull request #2970 from yahoo/kkraune/build-tensor-sample-IIKristian Aune2017-07-182-2/+2
|\ \
| * | build tensor sample appKristian Aune2017-07-182-2/+2
|/ /
* | Merge pull request #2969 from yahoo/revert-2968-kkraune/build-tensor-sampleKristian Aune2017-07-181-1/+0
|\ \
| * | Revert "build tensor sample app"Kristian Aune2017-07-181-1/+0
|/ /
* | Merge pull request #2968 from yahoo/kkraune/build-tensor-sampleKristian Aune2017-07-181-0/+1
|\ \
| * | build tensor sample appKristian Aune2017-07-181-0/+1
|/ /
* | Merge pull request #2967 from yahoo/kkraune/update-artifact-namesKristian Aune2017-07-186-8/+6
|\ \
| * | correct artifact namesKristian Aune2017-07-186-8/+6
|/ /
* | Merge pull request #2966 from yahoo/bjorncs/activecontainer-watchdogBjørn Christian Seime2017-07-171-0/+2
|\ \
| * | Temporarily ignore testBjørn Christian Seime2017-07-171-0/+2
* | | Merge pull request #2961 from yahoo/bjorncs/deconstruct-non-daemon-threadgjoranv2017-07-171-1/+1
|\ \ \
| * | | Deconstruct components in non-daemon threadBjørn Christian Seime2017-07-141-1/+1
* | | | Merge pull request #2965 from yahoo/bjorncs/activecontainer-watchdog-contdBjørn Christian Seime2017-07-172-8/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Improve ActiveContainerDeactivationWatchdog unit testBjørn Christian Seime2017-07-172-7/+17
| * | | Log when scheduled tasks are triggeredBjørn Christian Seime2017-07-171-0/+3
| * | | Don't run jobs in parallelBjørn Christian Seime2017-07-171-1/+1
|/ / /
* | | Merge pull request #2964 from yahoo/bjorncs/activecontainer-watchdoggjoranv2017-07-172-3/+7
|\ \ \
| * | | Ensure that phantom references are enqueued to reference queueBjørn Christian Seime2017-07-172-3/+7
|/ / /
* | | Merge pull request #2962 from yahoo/hmusum/log-when-running-acl-commandMartin Polden2017-07-171-2/+8
|\ \ \
| * | | Add missing quote characterHarald Musum2017-07-171-2/+2
| * | | Log when running commandsHarald Musum2017-07-161-2/+8
|/ / /
* | | Merge pull request #2956 from yahoo/geirst/remove-temp-symlinks-used-when-ren...Arne H Juul2017-07-141-83/+0
|\ \ \ | |/ / |/| |
| * | Remove temporary symlinks used when renaming binaries.Geir Storli2017-07-131-83/+0
* | | Merge pull request #2959 from yahoo/hmusum/config-proxy-refactoringgjoranv2017-07-1410-78/+27
|\ \ \
| * | | Move code that puts config in cacheHarald Musum2017-07-1410-78/+27
* | | | Merge pull request #2958 from yahoo/geirst/add-logging-when-blocking-unblocki...Håvard Pettersen2017-07-142-38/+87
|\ \ \ \ | |/ / / |/| | |
| * | | Log detailed messages when flipping between blocking/un-blocking write operat...Geir Storli2017-07-132-38/+87
* | | | Merge pull request #2957 from yahoo/bjorncs/fixBjørn Christian Seime2017-07-134-42/+19
|\ \ \ \ | |/ / / |/| | |
| * | | Remove dead Scala codeBjørn Christian Seime2017-07-132-40/+10
| * | | Revert back to using deprecated http clientBjørn Christian Seime2017-07-132-2/+9
|/ / /
* | | Merge pull request #2955 from yahoo/geirst/basic-search-tensor-readmegjoranv2017-07-131-2/+4
|\ \ \
| * | | Small improvements plus link to tensor intro doc.Geir Storli2017-07-131-2/+4
| |/ /
* | | Merge pull request #2954 from yahoo/bjorncs/scala-improvementsgjoranv2017-07-1336-459/+208
|\ \ \ | |/ / |/| |