summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| * | | | Use new program names.Tor Egge2017-07-053-4/+4
| | |/ / | |/| |
* | | | Merge pull request #2921 from yahoo/toregge/add-vespa-user-to-default-env-txtGeir Storli2017-07-071-0/+7
|\ \ \ \
| * | | | Add VESPA_USER override to default-env.txt.Tor Egge2017-07-051-0/+7
| |/ / /
* | | | Merge pull request #2923 from yahoo/lesters/faster-mapped-tensor-joinLester Solbakken2017-07-072-6/+87
|\ \ \ \
| * | | | Rename variableLester Solbakken2017-07-061-3/+3
| * | | | Small fixes to mapped hash joinLester Solbakken2017-07-062-26/+41
| * | | | Optimize general mapped tensor joinLester Solbakken2017-07-052-12/+78
| |/ / /
* | | | Merge pull request #2926 from yahoo/lesters/update-readmes-of-sample-appsKristian Aune2017-07-068-9/+50
|\ \ \ \ | |_|/ / |/| | |
| * | | Add basic README information to sample apps pointing to documentationLester Solbakken2017-07-068-9/+50
|/ / /
* | | Merge pull request #2917 from yahoo/lesters/update-blog-sample-appsKristian Aune2017-07-0533-2380/+180
|\ \ \ | |/ / |/| |
| * | Remove unused blog sample files moved to sharedLester Solbakken2017-07-0513-753/+0
| * | Update blog tutorial shared code READMELester Solbakken2017-07-051-4/+4
| * | Update blog recommendation sample appLester Solbakken2017-07-046-83/+17
| * | Remove local file paths in blog sample app shared codeLester Solbakken2017-07-043-67/+61
| * | Move blog-search-initial to blog-searchLester Solbakken2017-07-047-0/+0
| * | Remove blog-search sample appLester Solbakken2017-07-046-1375/+0
* | | Merge pull request #2920 from yahoo/bratseth/minimize-yamasJon Bratseth2017-07-0525-131/+110
|\ \ \
| * | | Don't use unnecessary specific namingJon Bratseth2017-07-0512-40/+35
| * | | Don't use unnecessary specific namingJon Bratseth2017-07-0515-92/+76
* | | | Merge pull request #2919 from yahoo/geirst/block-bucket-move-job-on-too-many-...Geir Storli2017-07-0512-135/+225
|\ \ \ \ | |/ / / |/| | |
| * | | Block bucket move job if it has too many outstanding move operations.Geir Storli2017-07-0512-135/+225