summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use new vespa-dev image from Docker CloudBjørn Christian Seime2017-07-242-25/+2
* Merge pull request #2997 from yahoo/bjorncs/fix-cyclic-depBjørn Christian Seime2017-07-243-5/+88
|\
| * Remove cyclic dependency between vespajlib and bundle-pluginBjørn Christian Seime2017-07-243-5/+88
|/
* Merge pull request #2996 from yahoo/hmusum/add-SYS_ADMIN-capabilityHenning Baldersheim2017-07-241-1/+2
|\
| * Add SYS_ADMIN (CAP_SYS_ADMIN) capability to be able to run 'perf'Harald Musum2017-07-241-1/+2
|/
* Merge pull request #2994 from yahoo/hmusum/log-more-when-activattion-fails-to...Arnstein Ressem2017-07-241-1/+3
|\
| * Minor fix to languageHarald Musum2017-07-241-2/+2
| * Add possible cause to log message when activation failsHarald Musum2017-07-241-1/+3
* | Merge pull request #2992 from yahoo/bjorncs/cleanupJon Bratseth2017-07-2427-660/+0
|\ \
| * | Cleanup pom.xmlBjørn Christian Seime2017-07-241-14/+0
| * | Remove building of old osgi bundlesBjørn Christian Seime2017-07-2427-646/+0
|/ /
* | Merge pull request #2991 from yahoo/bjorncs/pom-cleanupArnstein Ressem2017-07-242-10/+3
|\ \
| * | Configgen is not a bundleBjørn Christian Seime2017-07-242-10/+3
| |/
* | Merge pull request #2990 from yahoo/bjorncs/scala-cleanupJon Bratseth2017-07-2421-414/+378
|\ \ | |/ |/|
| * 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 #2989 from yahoo/revert-2986-bjorncs/cleanupgjoranv2017-07-212-0/+14
|\ \
| * | Revert "Remove old manifest file"Arnstein Ressem2017-07-212-0/+14
|/ /
* | Merge pull request #2988 from yahoo/hmusum/make-var-scoreboards-writable-for-allLeandro Alves2017-07-211-1/+1
|\ \
| * | Make dir writable for anyoneHarald Musum2017-07-211-1/+1
* | | Merge pull request #2986 from yahoo/bjorncs/cleanupgjoranv2017-07-212-14/+0
|\ \ \ | |/ / |/| |
| * | Remove old manifest fileBjørn Christian Seime2017-07-212-14/+0
|/ /
* | Merge pull request #2984 from yahoo/bjorncs/dont-trigger-finalizationBjørn Christian Seime2017-07-212-2/+2
|\ \
| * | Triggering finalization does not guarantee that phantom references are enqueuedBjørn Christian Seime2017-07-202-2/+2
| |/
* | Merge pull request #2983 from yahoo/bjorncs/suppress-warningBjørn Christian Seime2017-07-212-9/+11
|\ \
| * | Suppress deprecation warning. Enable warnings-as-errorsBjørn Christian Seime2017-07-202-9/+11
| |/
* | Merge pull request #2982 from yahoo/gjoranv/remove-unused-methodHarald Musum2017-07-201-13/+0
|\ \ | |/ |/|
| * Remove LeafNode.initialize().gjoranv2017-07-201-13/+0
* | 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
|\