summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.161.146-1].vespa-6.161.146-1by-screwdriver2017-10-234-1/+2
* Merge pull request #3836 from vespa-engine/havardpe/static-functions-for-oper...Arne H Juul2017-10-212-81/+134
|\
| * use static functions for low-level operation evalHåvard Pettersen2017-10-202-81/+134
* | Merge pull request #3835 from vespa-engine/toregge/rename-makebucket-test-met...Tor Brede Vekterli2017-10-2026-203/+203
|\ \
| * | Rename storage::spi::test::makeBucket to storage::spi::test::makeSpiBucket.Tor Egge2017-10-2026-203/+203
* | | Merge pull request #3833 from vespa-engine/hmusum/remove-applications-from-mo...Håkon Hallingstad2017-10-202-6/+5
|\ \ \ | |/ / |/| |
| * | Actually remove applications that should not be activeHarald Musum2017-10-202-6/+5
* | | Merge pull request #3808 from vespa-engine/toregge/add-bucket-space-to-storag...Tor Brede Vekterli2017-10-2073-573/+236
|\ \ \ | |_|/ |/| |
| * | Add bucket space to StatBucketMessage.Tor Egge2017-10-207-15/+18
| * | Add bucket space to GetBucketListReply.Tor Egge2017-10-205-6/+9
| * | Adjust comment.Tor Egge2017-10-201-1/+1
| * | Add bucket space to GetBucketListMessage.Tor Egge2017-10-207-37/+21
| * | Move test function makeDocumentBucket to document module.Tor Egge2017-10-2045-95/+90
| * | Remove DocumentListCommand and DocumentListReply from storage api.Tor Egge2017-10-184-132/+0
| * | Remove DocBlockCommand and DocBlockReply from storage api.Tor Egge2017-10-187-219/+0
| * | Take document::Bucket instead of document::BucketId as constructorTor Egge2017-10-1816-70/+99
* | | Merge pull request #3831 from vespa-engine/hakonhall/ignore-current-wanted-st...Tor Brede Vekterli2017-10-202-10/+5
|\ \ \
| * | | Ignore current wanted state when safely setting state to upHåkon Hallingstad2017-10-202-10/+5
| | |/ | |/|
* | | Merge pull request #3828 from vespa-engine/hakonhall/remove-scala-servicemonitorBjørn Christian Seime2017-10-2013-784/+2
|\ \ \
| * | | Remove Scala code in testHåkon Hallingstad2017-10-203-62/+0
| * | | Remove Scala ServiceMonitorHåkon Hallingstad2017-10-2010-722/+2
* | | | Merge pull request #3832 from vespa-engine/havardpe/use-function-pointersArne H Juul2017-10-2010-24/+94
|\ \ \ \
| * | | | use raw function pointers for map/joinHåvard Pettersen2017-10-1910-24/+94
* | | | | Merge pull request #3829 from vespa-engine/aressem/config-definitions-movedArnstein Ressem2017-10-206-6/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Config definitions moved to another location.Arnstein Ressem2017-10-206-6/+7
* | | | | Merge pull request #3821 from vespa-engine/aressem/copr-requires-github-event...Jon Marius Venstad2017-10-201-0/+1
|\ \ \ \ \
| * | | | | Copr returns 500 if GitHub event type is not set.Arnstein Ressem2017-10-191-0/+1
* | | | | | Merge pull request #3827 from vespa-engine/hmusum/remove-rewrite-of-legacy-ap...Jon Bratseth2017-10-201-33/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove rewrite of legacy application idsHarald Musum2017-10-201-33/+0
* | | | | | Merge pull request #3826 from vespa-engine/revert-3818-revert-3615-hakon/prov...Arnstein Ressem2017-10-208-3/+29
|\ \ \ \ \ \
| * | | | | | Include orchestrator and service-model fat jarsHåkon Hallingstad2017-10-194-0/+8
| * | | | | | Revert "Revert "Provide service-monitor and application-model""Håkon Hallingstad2017-10-194-3/+21
| |/ / / / /
* | | | | | Merge pull request #3825 from vespa-engine/bratseth/dont-parallel-triggerMartin Polden2017-10-207-33/+197
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Disallow parallel triggeringJon Bratseth2017-10-197-33/+197
* | | | | | Merge pull request #3807 from vespa-engine/andreer/fail-divergent-ready-nodesMartin Polden2017-10-196-5/+51
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | actually mutate node repoAndreas Eriksen2017-10-192-4/+4
| * | | | | actually mutate node repoAndreas Eriksen2017-10-191-1/+2
| * | | | | test "null" divergence reportsAndreas Eriksen2017-10-191-0/+7
| * | | | | simplifyAndreas Eriksen2017-10-192-2/+2
| * | | | | remove quoted nulls from node repoAndreas Eriksen2017-10-183-4/+14
| * | | | | fail divergent ready nodesAndreas Eriksen2017-10-182-0/+28
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3824 from vespa-engine/revert-3724-bjorncs/add-back-keyst...Bjørn Christian Seime2017-10-193-57/+0
|\ \ \ \ \
| * | | | | Revert "Add back SslKeyStoreFactoryProvider as a temporary workaround"Bjørn Christian Seime2017-10-193-57/+0
* | | | | | Merge pull request #3822 from vespa-engine/bjorncs/athenzBjørn Christian Seime2017-10-199-22/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Rename TenantType.Athens -> TenantType.AthenzBjørn Christian Seime2017-10-199-22/+22
* | | | | | Merge pull request #3823 from vespa-engine/revert-3820-aressem/move-config-se...Arnstein Ressem2017-10-192-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert "Move config server defs and make sure VESPA_USER owns var/."Harald Musum2017-10-192-3/+2
|/ / / / /
* | | | | Merge pull request #3820 from vespa-engine/aressem/move-config-server-defsHarald Musum2017-10-192-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Move config server defs and make sure VESPA_USER owns var/.Arnstein Ressem2017-10-192-2/+3
| | |_|/ | |/| |
* | | | Merge pull request #3819 from vespa-engine/freva/use-unique-provision-id-lockValerij Fredriksen2017-10-191-1/+2
|\ \ \ \