summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow building with Java 9.gjoranv2018-04-303-8/+12
* Replace usage of apis deprecated in Java 9.gjoranv2018-04-301-2/+4
* Fix usage of apis deprecated from Java 9.gjoranv2018-04-302-16/+26
* Declare methods private and remove redundant comment.gjoranv2018-04-301-5/+2
* Don't use wildcard imports.gjoranv2018-04-301-2/+15
* Remove unnecessary boxing.gjoranv2018-04-301-8/+8
* Merge pull request #5753 from vespa-engine/toregge/remove-for-unknown-documen...Tor Brede Vekterli2018-04-306-43/+13
|\
| * Remove for an unknown document type is an error.Tor Egge2018-04-306-43/+13
|/
* Merge pull request #5747 from vespa-engine/revert-5744-revert-5715-bratseth/v...Jon Bratseth2018-04-308-7/+118
|\
| * Revert "Revert "Validate content type removal""Jon Bratseth2018-04-308-7/+118
* | Merge pull request #5742 from vespa-engine/bratseth/hit-cleanupJon Bratseth2018-04-3023-449/+107
|\ \
| * | Remove lazy decoding (not used)Jon Bratseth2018-04-276-218/+62
| * | Remove LazyField (not used)Jon Bratseth2018-04-272-69/+7
| * | Remove row+column supportJon Bratseth2018-04-2717-164/+40
* | | Merge pull request #5740 from vespa-engine/gjoranv/upgrade-felix-4.6gjoranv2018-04-303-1/+13
|\ \ \
| * | | Upgrade felix from 4.4 to 4.6gjoranv2018-04-273-1/+13
* | | | Merge pull request #5743 from vespa-engine/gjoranv/java9-prep-04gjoranv2018-04-305-2/+8
|\ \ \ \
| * | | | Allow building with Java 9.gjoranv2018-04-275-2/+8
* | | | | Merge pull request #5749 from vespa-engine/revert-5737-mortent/skip-ipaddress...Bjørn Christian Seime2018-04-303-28/+1
|\ \ \ \ \
| * | | | | Revert "Skip sending ipaddresses in CSR"Morten Tokle2018-04-303-28/+1
|/ / / / /
* | | | | Merge pull request #5748 from vespa-engine/hmusum/cleanup-2Valerij Fredriksen2018-04-3016-316/+254
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Cleanup of creation of tenants and tenant repoHarald Musum2018-04-3016-316/+254
|/ / / /
* | | | Merge pull request #5746 from vespa-engine/hmusum/cleanupHarald Musum2018-04-291-72/+50
|\ \ \ \
| * | | | Cleanup of testsHarald Musum2018-04-291-72/+50
* | | | | Merge pull request #5745 from vespa-engine/musum/revert-removing-CONFIG_SERVE...Valerij Fredriksen2018-04-281-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Still needed by some old Docker imagesHarald Musum2018-04-281-0/+1
|/ / / /
* | | | Merge pull request #5744 from vespa-engine/revert-5715-bratseth/validate-type...Jon Marius Venstad2018-04-278-118/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Validate content type removal"Jon Marius Venstad2018-04-278-118/+7
|/ / /
* | | Merge pull request #5738 from vespa-engine/bratseth/remove-junit-framework-usagegjoranv2018-04-2754-357/+706
|\ \ \
| * | | Remove usage of junit.frameworkJon Bratseth2018-04-2754-357/+706
| |/ /
* | | Merge pull request #5741 from vespa-engine/vekterli/avoid-test-candidate-stat...Tor Brede Vekterli2018-04-271-0/+15
|\ \ \
| * | | Avoid candidate state racing with published state in testsTor Brede Vekterli2018-04-271-0/+15
* | | | Merge pull request #5739 from vespa-engine/vekterli/ensure-commands-are-proce...Geir Storli2018-04-272-24/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Ensure commands are processed before shutting down persistence threadsTor Brede Vekterli2018-04-272-24/+28
| |/ /
* | | Merge pull request #5736 from vespa-engine/jvenstad/controller-shmanagedJon Marius Venstad2018-04-274-10/+13
|\ \ \
| * | | Differentiate between reachable and controller upgraded zonesJon Marius Venstad2018-04-274-10/+13
| |/ /
* | | Merge pull request #5641 from vespa-engine/freva/define-infrastructure-applic...Valerij Fredriksen2018-04-2713-14/+152
|\ \ \
| * | | Add ExportPackage for applicationValerij Fredriksen2018-04-201-0/+8
| * | | Always use cluster group 0Valerij Fredriksen2018-04-205-8/+7
| * | | Make variables private, add gettersValerij Fredriksen2018-04-202-8/+19
| * | | Move application out of internalValerij Fredriksen2018-04-2012-12/+12
| * | | Define infrastructure applicationsValerij Fredriksen2018-04-2012-14/+134
* | | | Merge pull request #5734 from vespa-engine/hmusum/rename-tenant-repoHarald Musum2018-04-2756-327/+304
|\ \ \ \
| * | | | Rename tenant repoHarald Musum2018-04-2756-327/+304
* | | | | Merge pull request #5715 from vespa-engine/bratseth/validate-type-removalJon Bratseth2018-04-278-7/+118
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix commentsJon Bratseth2018-04-272-3/+3
| * | | | Validate content type removalJon Bratseth2018-04-268-7/+118
* | | | | Merge pull request #5737 from vespa-engine/mortent/skip-ipaddresses-csrMorten Tokle2018-04-273-1/+28
|\ \ \ \ \
| * | | | | Skip sending ipaddresses in CSRMorten Tokle2018-04-273-1/+28
|/ / / / /
* | | | | Merge pull request #5726 from vespa-engine/jvenstad/DO-unifiedMartin Polden2018-04-275-153/+102
|\ \ \ \ \ | |_|_|_|/ |/| | | |