summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2774 from yahoo/bratseth/update-copyright-headersJon Bratseth2017-06-1415393-14990/+15393
|\
| * Fix comment prefixJon Bratseth2017-06-145-5/+5
| * Update copyright headersJon Bratseth2017-06-1415393-14990/+15393
* | Merge pull request #2779 from yahoo/bjorncs/docker-ciBjørn Christian Seime2017-06-141-1/+1
|\ \
| * | Use ctest instead of make for running unit testsBjørn Christian Seime2017-06-141-1/+1
* | | Merge pull request #2780 from yahoo/bjorncs/fixBjørn Christian Seime2017-06-141-1/+1
|\ \ \
| * | | Fix typo: ctest -> ctest3Bjørn Christian Seime2017-06-141-1/+1
|/ / /
* | | Merge pull request #2778 from yahoo/bjorncs/readmeGeir Storli2017-06-141-1/+1
|\ \ \
| * | | Run tests with ctest instead of makeBjørn Christian Seime2017-06-141-1/+1
|/ / /
* | | Merge pull request #2776 from yahoo/toregge/rename-searchcore-programs-furtherGeir Storli2017-06-144-5/+5
|\ \ \
| * | | Rename vespa-fdispatch to vespa-dispatch.Tor Egge2017-06-144-5/+5
| | |/ | |/|
* | | Merge pull request #2775 from yahoo/kraune/fix-sampleappJon Bratseth2017-06-142-21/+12
|\ \ \
| * | | deployable, simplifyKristian Aune2017-06-142-21/+12
* | | | Merge pull request #2773 from yahoo/aressem/use-automatic-dependency-fetcher-...Kristian Aune2017-06-143-31/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Install deps in CI container.Arnstein Ressem2017-06-141-0/+1
| * | | Use yum-builddep to fetch direct build dependencies to avoid specifying this ...Arnstein Ressem2017-06-142-31/+3
* | | | Merge pull request #2745 from yahoo/balder/use-thread-local-stateTor Brede Vekterli2017-06-141-3/+34
|\ \ \ \
| * | | | Use modern c++ thread_localHenning Baldersheim2017-06-141-20/+6
| * | | | Use a thread local state for faster compression/decompression.Henning Baldersheim2017-06-131-2/+47
* | | | | Merge pull request #2764 from yahoo/gjoranv/use-builder-ctor-for-default-nodegjoranv2017-06-142-5/+17
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add comments about code that most likely can be removed.gjoranv2017-06-142-2/+2
| * | | | Use builder to instantiate default node.gjoranv2017-06-141-3/+15
* | | | | Merge pull request #2771 from yahoo/bratseth/remove-unnecessary-filesTor Egge2017-06-147-810/+0
|\ \ \ \ \
| * | | | | Remove unnecessary filesJon Bratseth2017-06-147-810/+0
* | | | | | Merge pull request #2770 from yahoo/bratseth/remove-carriage-returnTor Egge2017-06-14233-4699/+4699
|\ \ \ \ \ \
| * | | | | | Remove carriage returnJon Bratseth2017-06-14233-4699/+4699
| |/ / / / /
* | | | | | Merge pull request #2747 from yahoo/balder/add-some-more-debug-information-in...Henning Baldersheim2017-06-144-2/+16
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Avoid potential NullPtrException and add some more information in case someth...Henning Baldersheim2017-06-134-2/+16
* | | | | | Merge pull request #2772 from yahoo/aressem/use-yum-localinstall-to-avoid-lis...Kristian Aune2017-06-142-26/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merged master.Arnstein Ressem2017-06-14220-2955/+2455
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | 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