summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Upgrade to Scala 2.12.2"Bjørn Christian Seime2017-07-122-7/+7
* Merge pull request #2944 from yahoo/bjorncs/scala-stuffBjørn Christian Seime2017-07-1115-240/+53
|\
| * Fix bug where AOP version of Guice was includedBjørn Christian Seime2017-07-111-1/+15
| * Fix issue where Scala Maven plugin fails on Java compilationBjørn Christian Seime2017-07-111-1/+1
| * Remove dead Scala code that triggers a Scala compiler crashBjørn Christian Seime2017-07-114-209/+0
| * ShouldMatchersForJUnit is removed from scala-test v3Bjørn Christian Seime2017-07-117-22/+30
| * Upgrade to Scala 2.12.2Bjørn Christian Seime2017-07-112-7/+7
|/
* Merge pull request #2943 from yahoo/hakon/avoid-getting-permission-to-suspend...Harald Musum2017-07-112-69/+71
|\
| * Avoid getting permission to suspend Docker nodes when upgrading node adminHåkon Hallingstad2017-07-112-69/+71
* | Merge pull request #2942 from yahoo/revert-2941-bjorncs/scala-stuffBjørn Christian Seime2017-07-1114-38/+239
|\ \
| * | Revert "Bjorncs/scala stuff"Bjørn Christian Seime2017-07-1114-38/+239
|/ /
* | Merge pull request #2941 from yahoo/bjorncs/scala-stuffgjoranv2017-07-1114-239/+38
|\ \
| * | Fix issue where Scala Maven plugin fails on Java compilationBjørn Christian Seime2017-07-111-1/+1
| * | Remove dead Scala code that triggers a Scala compiler crashBjørn Christian Seime2017-07-114-209/+0
| * | ShouldMatchersForJUnit is removed from scala-test v3Bjørn Christian Seime2017-07-117-22/+30
| * | Upgrade to Scala 2.12.2Bjørn Christian Seime2017-07-112-7/+7
* | | Merge pull request #2940 from yahoo/havardpe/resolve-cleanupGeir Storli2017-07-1113-516/+48
|\ \ \ | |_|/ |/| |
| * | remove lazy resolverHaavard2017-07-116-497/+0
| * | Revert "use lazy resolver in fdispatch"Haavard2017-07-114-10/+2
| * | add max size to resolved host cacheHaavard2017-07-113-5/+40
| * | do not cache identity resolve resultsHaavard2017-07-112-4/+6
| |/
* | Merge pull request #2938 from yahoo/hakon/reduce-output-when-printing-storage...Harald Musum2017-07-111-1/+1
|\ \ | |/ |/|
| * Reduce output when printing StorageNodeImplHåkon Hallingstad2017-07-111-1/+1
|/
* Merge pull request #2935 from yahoo/havardpe/async-resolve-in-fnetGeir Storli2017-07-1111-25/+264
|\
| * handle async resolveHaavard2017-07-1011-25/+264
* | Merge pull request #2937 from yahoo/gjoranv/remove-setSizeHarald Musum2017-07-112-47/+21
|\ \
| * | Remove NodeVector.setSize()gjoranv2017-07-102-47/+21
| |/
* | Merge pull request #2936 from yahoo/hmusum/add-fastDisk-to-nodes-responseFrode Lundgren2017-07-1117-0/+17
|\ \ | |/ |/|
| * Add 'fastDisk' to nodes responseHarald Musum2017-07-1017-0/+17
|/
* Merge pull request #2871 from yahoo/balder/warn-on-body-headerKristian Aune2017-07-072-0/+6
|\
| * Update ContentCluster.javaKristian Aune2017-07-071-1/+1
| * Also warn on vds engine.Henning Baldersheim2017-06-231-0/+4
| * Emit warning when header/body is used in .sd file.Henning Baldersheim2017-06-231-0/+2
* | Merge pull request #2922 from yahoo/havardpe/async-resolverHåvard Pettersen2017-07-076-0/+618
|\ \
| * | add more testing and verificationHaavard2017-07-062-0/+24
| * | async resolverHaavard2017-07-056-0/+594
* | | Merge pull request #2932 from yahoo/revert-2927-toregge/remove-vespa-user-fal...Tor Egge2017-07-071-1/+5
|\ \ \
| * | | Revert "Remove fallback setting of VESPA_USER, it should already be set from"Geir Storli2017-07-071-1/+5
|/ / /
* | | Merge pull request #2931 from yahoo/hmusum/refactor-activation-testsValerij Fredriksen2017-07-072-307/+231
|\ \ \
| * | | Refactor tests into one classHarald Musum2017-07-072-307/+231
|/ / /
* | | Merge pull request #2930 from yahoo/toregge/move-chown-of-ylock-arenaGeir Storli2017-07-071-4/+0
|\ \ \
| * | | Remove chown, this is now handled elsewhere.Tor Egge2017-07-071-4/+0
* | | | Merge pull request #2927 from yahoo/toregge/remove-vespa-user-fallback-settingGeir Storli2017-07-071-5/+1
|\ \ \ \
| * | | | Remove fallback setting of VESPA_USER, it should already be set fromTor Egge2017-07-071-5/+1
| |/ / /
* | | | Merge pull request #2929 from yahoo/ldalves/jdisc-metricsgjoranv2017-07-071-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | fix the name of the jdisc metrics to exposeLeandro Alves2017-07-071-2/+2
|/ / /
* | | Merge pull request #2925 from yahoo/toregge/change-default-vespa-user-to-vespaGeir Storli2017-07-074-5/+5
|\ \ \
| * | | Change default vespa user to vespa.Tor Egge2017-07-064-5/+5
* | | | Merge pull request #2924 from yahoo/toregge/use-new-program-names-4Geir Storli2017-07-076-7/+7
|\ \ \ \
| * | | | Use new program names.Tor Egge2017-07-053-3/+3