summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Put Instances in Application, and replace ALL THE THINGS!!!Jon Marius Venstad2019-09-2868-2317/+3152
* Deploy keys on application levelJon Marius Venstad2019-09-283-9/+13
* Change of plans (update doc) and optimize importsJon Marius Venstad2019-09-282-15/+14
* Use both Application and Instance when rendering application responseJon Marius Venstad2019-09-283-182/+31
* Remove unused methods in LockedApplication — now disjoint from LockedInstanceJon Marius Venstad2019-09-281-96/+0
* ProjectId and change management only in ApplicationJon Marius Venstad2019-09-287-64/+38
* Support deploy key only with instance, major version only without in app/v4Jon Marius Venstad2019-09-286-31/+35
* Replace some LockedInstance usages with LockedApplication, and remove unused ...Jon Marius Venstad2019-09-285-39/+4
* Register application in JobController on application levelJon Marius Venstad2019-09-283-41/+55
* Doc and name changes, non-functional onlyJon Marius Venstad2019-09-282-13/+15
* Temporarily lock both on application and instance level to modify eitherJon Marius Venstad2019-09-283-3/+7
* Let createApplication return an Application (and :dark_sunglasses:)Jon Marius Venstad2019-09-2828-907/+1200
* Sort applications and instances in CuratorDbJon Marius Venstad2019-09-282-7/+11
* Duplicate Instance to ApplicationJon Marius Venstad2019-09-287-0/+1403
* Rename applicationPath to oldApplicationPath in CuratorDbJon Marius Venstad2019-09-281-3/+23
* Read from new instance dataJon Marius Venstad2019-09-282-13/+8
* Merge pull request #10802 from vespa-engine/revert-10797-revert-10679-revert-...gjoranv2019-09-277-580/+19
|\
| * Revert "Reapply "upgrade to zookeeper 3.5""Harald Musum2019-09-277-580/+19
* | Merge pull request #10686 from vespa-engine/hakonhall/fix-name-of-maven-plugi...Håkon Hallingstad2019-09-271-2/+1
|\ \
| * | Remove no-op setting of nameHåkon Hallingstad2019-09-271-1/+0
| * | Fix name of maven-plugin artifactHåkon Hallingstad2019-09-171-2/+2
* | | Merge pull request #10794 from vespa-engine/toregge/add-filtering-support-to-...Geir Storli2019-09-2717-73/+249
|\ \ \ | |_|/ |/| |
| * | Wire in matchedattributeelementsfilter summary override.Tor Egge2019-09-271-0/+6
| * | Move ownership of MatchingElements to GetDocsumsState.Tor Egge2019-09-279-24/+16
| * | Add filtering support to attribute combiner dynamic field writer.Tor Egge2019-09-2516-49/+213
| * | Rewrite attribute combiner unit test to use GTest.Tor Egge2019-09-252-32/+46
* | | Merge pull request #10801 from vespa-engine/mortent/fix-importMorten Tokle2019-09-271-1/+1
|\ \ \
| * | | Fix importMorten Tokle2019-09-271-1/+1
* | | | Merge pull request #10779 from vespa-engine/jvenstad/lock-on-application-leve...Jon Marius Venstad2019-09-273-7/+124
|\ \ \ \ | |/ / / |/| | |
| * | | Lock instances on application levelJon Marius Venstad2019-09-242-7/+30
| * | | Add TenantAndApplicationId for controller tenant.app referencesJon Marius Venstad2019-09-241-0/+94
* | | | Merge pull request #10797 from vespa-engine/revert-10679-revert-10654-hmusum/...Harald Musum2019-09-277-19/+580
|\ \ \ \
| * \ \ \ Merge branch 'master' into revert-10679-revert-10654-hmusum/upgrade-to-zookee...Harald Musum2019-09-27140-10581/+680
| |\ \ \ \
| * | | | | Patch and make trustEmptySnapshot configurable.Harald Musum2019-09-273-1/+526
| * | | | | Revert "Revert "Hmusum/upgrade to zookeeper 3.5""Harald Musum2019-09-245-18/+54
* | | | | | Merge pull request #10800 from vespa-engine/vekterli/disable-old-non-determin...Bjørn Christian Seime2019-09-271-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Disable old, non-deterministic testTor Brede Vekterli2019-09-271-1/+1
|/ / / / /
* | | | | Merge pull request #10784 from vespa-engine/vekterli/add-config-option-for-us...Tor Brede Vekterli2019-09-2718-30/+106
|\ \ \ \ \
| * | | | | Add config option for using B-tree bucket DB in distributorTor Brede Vekterli2019-09-2418-30/+106
| |/ / / /
* | | | | Merge pull request #10791 from vespa-engine/freva/allow-deleting-in-dirtyMartin Polden2019-09-272-9/+9
|\ \ \ \ \
| * | | | | Allow removing host when children are in dirtyValerij Fredriksen2019-09-252-9/+9
* | | | | | Merge pull request #10799 from vespa-engine/jvenstad/memory-non-visibility-wo...Jon Marius Venstad2019-09-271-7/+13
|\ \ \ \ \ \
| * | | | | | Deployments are never timed out if they are so new they are not yet visibleJon Marius Venstad2019-09-271-7/+13
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #10795 from vespa-engine/balder/remove-fdispatchHenning Baldersheim2019-09-2769-10308/+0
|\ \ \ \ \ \
| * | | | | | Remove fdispatchHenning Baldersheim2019-09-2669-10308/+0
* | | | | | | Merge pull request #10796 from vespa-engine/gjoranv/improve-warningBjørn Christian Seime2019-09-271-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Improve warning for overlapping packagesgjoranv2019-09-261-2/+2
| |/ / / / / /
* | | | | | | Merge pull request #10793 from vespa-engine/gjoranv/parent-pom-fixesBjørn Christian Seime2019-09-272-38/+13
|\ \ \ \ \ \ \
| * | | | | | | Sort properties lexically, and group according to type.gjoranv2019-09-251-11/+13
| * | | | | | | Remove invalid TODOgjoranv2019-09-251-27/+0