summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use junit 4.12Bjørn Christian Seime2017-08-184-9/+2
* Simplify vespa-ci buildBjørn Christian Seime2017-08-181-29/+2
* Use bootstrap-cpp.sh in vespa-ci scriptsBjørn Christian Seime2017-08-182-19/+5
* Merge pull request #3155 from vespa-engine/bjorncs/sync-session-timeoutTor Brede Vekterli2017-08-183-7/+104
|\
| * Allow user specified timeout for SyncSessionBjørn Christian Seime2017-08-183-7/+104
* | Interns/late changes (#3152)Sindre Grøstad2017-08-1860-123/+301
* | Merge pull request #3149 from vespa-engine/geirst/add-cpp-dev-env-for-centosGeir Storli2017-08-183-11/+74
|\ \ | |/ |/|
| * Add back reference to readme describing how to build C++ modules.Geir Storli2017-08-181-0/+4
| * Add C++ dev environment on CentOS using VirtualBox and Vagrant.Geir Storli2017-08-183-11/+70
* | Merge pull request #3151 from vespa-engine/gjoranv/copyrightHarald Musum2017-08-183-0/+3
|\ \
| * | Add missing copyright headersgjoranv2017-08-183-0/+3
|/ /
* | Merge pull request #3141 from vespa-engine/gjoranv/network-metricsgjoranv2017-08-183-2/+38
|\ \
| * | Add a new metric set for network metrics.gjoranv2017-08-173-2/+38
* | | Merge pull request #3150 from vespa-engine/revert-3147-mortent/prepare-centra...Morten Tokle2017-08-181-2/+2
|\ \ \
| * | | Revert "Attach javadocs"Arnstein Ressem2017-08-181-2/+2
|/ / /
* | | Merge pull request #3148 from vespa-engine/kkraune/remove-sampleappsArnstein Ressem2017-08-18118-7449/+0
|\ \ \
| * | | Sample apps moved to vespa-engine/sample-appsKristian Aune2017-08-18118-7449/+0
| | |/ | |/|
* | | Merge pull request #3147 from vespa-engine/mortent/prepare-central-deploymentArnstein Ressem2017-08-181-2/+2
|\ \ \ | |/ / |/| |
| * | Attach javadocsMorten Tokle2017-08-171-2/+2
| |/
* | Merge pull request #3144 from vespa-engine/bjorncs/travisGeir Storli2017-08-183-16/+4
|\ \
| * | The dummy-persistence artifact has now groupid 'com.yahoo.vespa'Bjørn Christian Seime2017-08-171-1/+0
| * | The devtoolset-6 script is not required for Java buildBjørn Christian Seime2017-08-171-1/+0
| * | Use bootstrap-cpp.shBjørn Christian Seime2017-08-171-14/+4
| |/
* | Merge pull request #3142 from vespa-engine/balder/do-the-read-in-indexing-threadTor Egge2017-08-172-39/+33
|\ \
| * | Read in the indexing thread instead as it can be costly.Henning Baldersheim2017-08-172-39/+33
|/ /
* | Merge pull request #3140 from vespa-engine/balder/fix-summar-y-typoHåvard Pettersen2017-08-172-3/+3
|\ \ | |/ |/|
| * wantsRPCSummarFill -> wantsRPCSummaryFillHenning Baldersheim2017-08-172-3/+3
* | Merge pull request #3122 from vespa-engine/bjorncs/remove-lifecycle-mappingBjørn Christian Seime2017-08-176-135/+0
|\ \
| * | Remove lifecycle_mappingBjørn Christian Seime2017-08-166-135/+0
* | | Merge pull request #3138 from vespa-engine/geirst/add-cpp-bootstrap-scriptGeir Storli2017-08-172-15/+39
|\ \ \ | |_|/ |/| |
| * | No need to set VALGRIND_UNIT_TESTS to false as this is the default in build_s...Geir Storli2017-08-171-1/+0
| * | Remove build rpath that is not needed.Geir Storli2017-08-171-1/+0
| * | Fix script to support relative input paths.Geir Storli2017-08-171-2/+2
| * | Add script to bootstrap cpp build.Geir Storli2017-08-172-15/+41
* | | Merge pull request #3136 from vespa-engine/balder/use-rank-profile-in-sessionidHenning Baldersheim2017-08-179-48/+71
|\ \ \
| * | | Remove unused imports in my open files.Henning Baldersheim2017-08-175-6/+0
| * | | Update comments and imports.Henning Baldersheim2017-08-173-7/+8
| * | | Use your own rankprofile, and avoid breaking public API.Henning Baldersheim2017-08-178-37/+60
| * | | Add rankprofile to the base sessionId.Henning Baldersheim2017-08-168-21/+26
* | | | Merge pull request #3133 from vespa-engine/gjoranv/config-def-packagegjoranv2017-08-1725-417/+306
|\ \ \ \
| * | | | Remove redundant def parameters.gjoranv2017-08-171-10/+9
| * | | | Remove redundant def files.gjoranv2017-08-1715-182/+0
| * | | | Add test for package and namespace.gjoranv2017-08-174-2/+46
| * | | | Allow 'package' in def files to specify java package.gjoranv2017-08-176-18/+180
| * | | | Store default package prefix 'com.yahoo.' in a constant.gjoranv2017-08-163-5/+10
| * | | | Refactor tests to remove duplicate code.gjoranv2017-08-162-203/+65
| * | | | Imports only.gjoranv2017-08-161-1/+0
* | | | | Merge pull request #3139 from vespa-engine/bjorncs/fix-groupidTor Brede Vekterli2017-08-171-1/+1
|\ \ \ \ \
| * | | | | Change groupid to 'com.yahoo.vespa'Bjørn Christian Seime2017-08-171-1/+1
|/ / / / /
* | | | | Merge pull request #3137 from vespa-engine/hmusum/use-vespa-get-configArnstein Ressem2017-08-171-3/+3
|\ \ \ \ \