aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary filesJon Bratseth2017-06-147-810/+0
* Merge pull request #2769 from yahoo/bjorncs/docker-ciBjørn Christian Seime2017-06-142-1/+3
|\
| * Print executed commands to stdoutBjørn Christian Seime2017-06-142-0/+2
| * Increase heap size for MavenBjørn Christian Seime2017-06-141-1/+1
* | Merge pull request #2767 from yahoo/revert-2750-revert-2727-toregge/rename-fi...Geir Storli2017-06-148-7/+11
|\ \
| * | Revert "Revert "Rename filedistribution programs to have vespa- prefix.""Tor Egge2017-06-148-7/+11
* | | Merge pull request #2760 from yahoo/balder/make-hit-estimation-cheaperHåvard Pettersen2017-06-1412-258/+206
|\ \ \ | |/ / |/| |
| * | If more than 1k unique values we will just approximate.Henning Baldersheim2017-06-142-7/+5
| * | Code cleanup while considering options for hit estimation.Henning Baldersheim2017-06-1411-251/+201
* | | Merge pull request #2765 from yahoo/revert-2763-revert-2761-bratseth/correct-...Jon Bratseth2017-06-146-7/+9
|\ \ \
| * | | Encode boundary characters as octetsJon Bratseth2017-06-141-1/+3
| * | | Revert "Revert "Encode as UTF-8""Jon Bratseth2017-06-146-7/+7
* | | | Merge pull request #2766 from yahoo/kkraune/compile-sample-appsJon Bratseth2017-06-143-4/+2
|\ \ \ \ | |/ / / |/| | |
| * | | build sample appsKristian Aune2017-06-143-4/+2
* | | | Merge pull request #2762 from yahoo/bjorncs/remove-testHarald Musum2017-06-141-8/+0
|\ \ \ \
| * | | | Remove unstable testBjørn Christian Seime2017-06-141-8/+0
| | |_|/ | |/| |
* | | | Merge pull request #2763 from yahoo/revert-2761-bratseth/correct-encodingArnstein Ressem2017-06-146-7/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Encode as UTF-8"Tor Egge2017-06-146-7/+7
|/ / /
* | | Merge pull request #2737 from yahoo/freva/node-retirer-one-per-clusterValerij Fredriksen2017-06-145-60/+89
|\ \ \ | |/ / |/| |
| * | Allow simultaneous retirement of 1 node per clustervalerijf2017-06-133-57/+58
| * | Extend MockDeployer to allow multiple clusters per applicationvalerijf2017-06-132-3/+31
* | | Merge pull request #2761 from yahoo/bratseth/correct-encodingTor Egge2017-06-146-7/+7
|\ \ \
| * | | Encode as UTF-8Jon Bratseth2017-06-146-7/+7
* | | | Merge pull request #2759 from yahoo/toregge/send-signal-to-vespa-filedistribu...Harald Musum2017-06-141-1/+6
|\ \ \ \
| * | | | Pass a regexp to pkill that matches both new and old name forTor Egge2017-06-141-1/+6
| | |_|/ | |/| |
* | | | Merge pull request #2733 from yahoo/hmusum/16-distribution-bits-only-for-prodJon Bratseth2017-06-143-69/+84
|\ \ \ \
| * | | | Use zoneHarald Musum2017-06-141-4/+11
| * | | | Add testHarald Musum2017-06-142-60/+65
| * | | | Merge branch 'master' into hmusum/16-distribution-bits-only-for-prodHarald Musum2017-06-1468-2176/+450
| |\ \ \ \
| * | | | | Enable 16 distribution bits only for prod regionsHarald Musum2017-06-131-9/+12
* | | | | | Merge pull request #2756 from yahoo/kkraune/perl-depsArnstein Ressem2017-06-142-0/+8
|\ \ \ \ \ \
| * | | | | | add required perl dependenciesKristian Aune2017-06-142-0/+8
* | | | | | | Merge pull request #2758 from yahoo/bjorncs/log-docker-ciArnstein Ressem2017-06-143-2/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Checkout with detached headBjørn Christian Seime2017-06-141-1/+1
| * | | | | | Store build output to log fileBjørn Christian Seime2017-06-142-1/+3
* | | | | | | Merge pull request #2755 from yahoo/hmusum/minor-cleanupgjoranv2017-06-148-69/+53
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Minor cleanupHarald Musum2017-06-148-69/+53
* | | | | | | Merge pull request #2757 from yahoo/revert-2753-hmusum/handle-errors-when-rei...Henning Baldersheim2017-06-141-15/+2
|\ \ \ \ \ \ \
| * | | | | | | Revert "Handle errors when reinitializing file distributor"Harald Musum2017-06-141-15/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2746 from yahoo/bjorncs/upgrade-maven-install-plugingjoranv2017-06-147-7/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Upgrade maven-install-plugin to 2.5.2Bjørn Christian Seime2017-06-137-7/+1
* | | | | | | Overcommit number of threads (#2743)Bjørn Christian Seime2017-06-141-3/+4
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #2751 from yahoo/hmusum/use-only-one-deploystateGeir Storli2017-06-142-5/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Make sure to create DeployState only once (and simplify due to that)Harald Musum2017-06-132-5/+3
* | | | | | Merge pull request #2754 from yahoo/kkraune/dependencies-dockerHenning Baldersheim2017-06-143-8/+10
|\ \ \ \ \ \
| * | | | | | Add zstd to docker build and run imageKristian Aune2017-06-143-8/+10
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #2753 from yahoo/hmusum/handle-errors-when-reinitializing-...Henning Baldersheim2017-06-141-2/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Handle errors when reinitializing file distributorHarald Musum2017-06-141-2/+15
| |/ / / /
* | | | | Merge pull request #2752 from yahoo/gjoranv/refactor-instance-resolver2Harald Musum2017-06-141-17/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove last known usage of the default ctor on config classes.gjoranv2017-06-141-17/+9
|/ / / /