summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Module only contains Scala test sourcesBjørn Christian Seime2017-07-211-22/+2
* Remove scalalibBjørn Christian Seime2017-07-2010-115/+13
* Rewrite ProjectBundleClassPaths to JavaBjørn Christian Seime2017-07-2010-92/+198
* Remove Scala from container-coreBjørn Christian Seime2017-07-203-185/+165
* Merge pull request #2980 from yahoo/hmusum/config-proxy-test-refactoringgjoranv2017-07-205-69/+52
|\
| * Delete Helper class (move code to ConfigTester)Harald Musum2017-07-205-69/+52
* | Merge pull request #2981 from yahoo/hmusum/add-container-name-to-log-messageMartin Polden2017-07-201-5/+5
|\ \
| * | Add container name to log messagesHarald Musum2017-07-201-5/+5
* | | Merge pull request #2978 from yahoo/bjorncs/upgrade-maven-javadoc-pluginArnstein Ressem2017-07-201-1/+1
|\ \ \ | |/ / |/| |
| * | Upgrade maven-javadoc-plugin to 2.10.4Bjørn Christian Seime2017-07-191-1/+1
| |/
* | Merge pull request #2979 from yahoo/bjorncs/error-on-warninggjoranv2017-07-192-9/+2
|\ \
| * | Fix warning and enable warning-as-errorBjørn Christian Seime2017-07-192-9/+2
| |/
* | Merge pull request #2977 from yahoo/bjorncs/fix-warningsLester Solbakken2017-07-191-0/+2
|\ \ | |/ |/|
| * Add missing version tagsBjørn Christian Seime2017-07-191-0/+2
|/
* Merge pull request #2976 from yahoo/gjoranv/cleanup-LeafNodeVector2Harald Musum2017-07-191-3/+2
|\
| * Minor cleanup: unnecessary annotation, use diamond operator.gjoranv2017-07-191-3/+2
* | Merge pull request #2975 from yahoo/hmusum/name-threadsgjoranv2017-07-191-1/+1
|\ \ | |/ |/|
| * Name threads in thread poolHarald Musum2017-07-191-1/+1
* | 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
|/ / /