summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add new module fat-model-dependenciesgjoranv2018-05-295-186/+249
| | | | | | | | - Contains all compile scope deps for config-model-fat. - Added to avoid copying all these deps into amended fat model. - Necessary for maven-bundle-plugin 3 because its exclude mechanism has changed to exclude all transitive deps of an excluded artifact.
* Merge pull request #5964 from vespa-engine/bratseth/better-error-messageLester Solbakken2018-05-287-21/+23
|\ | | | | Bratseth/better error message
| * Merge with masterJon Bratseth2018-05-281-1/+1
| |
| * Merge branch 'master' into bratseth/better-error-messageJon Bratseth2018-05-2874-486/+703
| |\
| * | More explanation on type mismatchJon Bratseth2018-05-256-20/+22
| | |
* | | Merge pull request #5963 from ↵Harald Musum2018-05-282-0/+6
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/hmusum/do-not-delete-system-tenants-in-maintainer Don't delete hosted vespa tenant in maintainer
| * | | Don't delete hosted vespa tenantHarald Musum2018-05-282-0/+6
| | | |
* | | | Merge pull request #5943 from vespa-engine/bratseth/json-validationJon Bratseth2018-05-2810-34/+219
|\ \ \ \ | |_|_|/ |/| | | Bratseth/json validation
| * | | Merge with masterJon Bratseth2018-05-28180-1690/+2466
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #5946 from vespa-engine/balder/yql-same-elementJon Bratseth2018-05-285-160/+163
|\ \ \ \ | | | | | | | | | | Add preliminary yql for sameElement
| * | | | Add preliminary yql for sameElementHenning Baldersheim2018-05-255-160/+163
| | | | |
* | | | | Merge pull request #5962 from ↵Henning Baldersheim2018-05-282-23/+27
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | vespa-engine/revert-5959-balder/reapply-iterate-over-indexes-5 Revert "Remove the IndexCombinatorSearcher"
| * | | | Revert "Remove the IndexCombinatorSearcher"Henning Baldersheim2018-05-282-23/+27
|/ / / /
* | | | Merge pull request #5961 from ↵Valerij Fredriksen2018-05-281-8/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/refactory-intervals-for-config-server-maintainers Minor refactoring of how we set interval for maintainers
| * | | | Minor refactoring of how we set interval for maintainersHarald Musum2018-05-281-8/+23
| | | | |
* | | | | Merge pull request #5949 from vespa-engine/hakonhall/add-uncheck-to-yoleanHåkon Hallingstad2018-05-283-0/+99
|\ \ \ \ \ | |/ / / / |/| | | | Add uncheck to yolean
| * | | | Add uncheck to yoleanHåkon Hallingstad2018-05-253-0/+99
| | | | |
* | | | | Merge pull request #5959 from vespa-engine/balder/reapply-iterate-over-indexes-5Henning Baldersheim2018-05-282-27/+23
|\ \ \ \ \ | | | | | | | | | | | | Remove the IndexCombinatorSearcher
| * | | | | Remove the IndexCombinatorSearcherHenning Baldersheim2018-05-272-27/+23
|/ / / / /
* | | | | Merge pull request #5958 from vespa-engine/balder/reapply-iterate-over-indexes-4Henning Baldersheim2018-05-272-64/+48
|\ \ \ \ \ | | | | | | | | | | | | Iterate over indexes for juniper searcher.
| * | | | | Iterate over indexes for juniper searcher.Henning Baldersheim2018-05-272-64/+48
|/ / / / /
* | | | | Merge pull request #5957 from vespa-engine/toregge/use-fallthrough-attributesHenning Baldersheim2018-05-2715-56/+56
|\ \ \ \ \ | | | | | | | | | | | | Use fallthrough attributes.
| * | | | | Use fallthrough attributes.Tor Egge2018-05-2715-56/+56
| | | | | |
* | | | | | Merge pull request #5953 from ↵Henning Baldersheim2018-05-274-0/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/handle-noncopyable-insert-argument-in-vespalib-hash-map-and-hash-set Handle insertion of non-copyable keys and values in hash map.
| * | | | | | Handle insertion of non-copyable keys and values in hash map.Tor Egge2018-05-274-0/+47
| |/ / / / / | | | | | | | | | | | | | | | | | | Handle insertion of non-copyable keys in hash set.
* | | | | | Merge pull request #5955 from ↵Henning Baldersheim2018-05-271-0/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/add-more-valgrind-suppressions-for-vespa-cppunit-on-centos-7 Add more valgrind suppressions for vespa-cppunit on CentOS 7.
| * | | | | | Add more valgrind suppressions for vespa-cppunit on CentOS 7.Tor Egge2018-05-271-0/+32
| |/ / / / /
* | | | | | Merge pull request #5956 from vespa-engine/balder/reapply-iterate-over-indexes-3Henning Baldersheim2018-05-274-82/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | Iterate over indexes for ngram and quoting searcher.
| * | | | | | Iterate over indexes for ngram and quoting searcher.Henning Baldersheim2018-05-274-82/+61
|/ / / / / /
* | | | | | Merge pull request #5954 from vespa-engine/balder/reapply-iterate-over-indexes-2Henning Baldersheim2018-05-2717-31/+62
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Second part of iterate-over-indexes
| * | | | | Second part of iterate-over-indexesHenning Baldersheim2018-05-2717-31/+62
|/ / / / /
* | | | | Merge pull request #5952 from vespa-engine/balder/reapply-iterate-over-indexes-1Henning Baldersheim2018-05-2719-65/+87
|\ \ \ \ \ | | | | | | | | | | | | Reapply parts of the iterate-indexes commit.
| * | | | | Reapply parts of the iterate-indexes commit.Henning Baldersheim2018-05-2719-65/+87
|/ / / / /
* | | | | Merge pull request #5951 from ↵Henning Baldersheim2018-05-2744-293/+255
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-5942-bratseth/iterate-over-indexes-not-fields-2 Revert "Bratseth/iterate over indexes not fields 2"
| * | | | | Revert "Bratseth/iterate over indexes not fields 2"Henning Baldersheim2018-05-2744-293/+255
|/ / / / /
* | | | | Merge pull request #5950 from ↵Henning Baldersheim2018-05-279-198/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-5944-geirst/array-of-struct-field-is-derived-into-array-attributes Revert "Support that array of struct field is derived into array attributes."
| * | | | | Revert "Support that array of struct field is derived into array attributes."Henning Baldersheim2018-05-279-198/+0
|/ / / / /
* | | | | Merge pull request #5945 from ↵Jon Marius Venstad2018-05-252-18/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/deblock-system-app-order-across-parallel-zones Jvenstad/deblock system app order across parallel zones
| * | | | | Count exceptions getting current version as not convergedJon Marius Venstad2018-05-251-14/+9
| | | | | |
| * | | | | Enforce upgrade order inside each zone, instead of across zones in a blockJon Marius Venstad2018-05-252-13/+23
| | |_|_|/ | |/| | |
* | | | | Merge pull request #5947 from ↵Håkon Hallingstad2018-05-251-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | vespa-engine/freva/use-force-option-when-compressing Use force option when compressing
| * | | | Use force option when compressingValerij Fredriksen2018-05-251-2/+2
| | | | |
* | | | | Merge pull request #5944 from ↵Henning Baldersheim2018-05-259-0/+198
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/geirst/array-of-struct-field-is-derived-into-array-attributes Support that array of struct field is derived into array attributes.
| * | | | | Support that array of struct field is derived into array attributes.Geir Storli2018-05-259-0/+198
| | | | | |
* | | | | | Merge pull request #5942 from ↵Jon Marius Venstad2018-05-2544-255/+293
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | vespa-engine/bratseth/iterate-over-indexes-not-fields-2 Bratseth/iterate over indexes not fields 2
| * | | | | Iterate the old wayJon Bratseth2018-05-252-0/+25
| | | | | |
| * | | | | Revert "Merge pull request #5913 from ↵Jon Bratseth2018-05-2544-269/+282
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-5903-bratseth/iterate-over-indexes-not-fields" This reverts commit f14a7189ea46c33fb3469ec1c0fcbb7eb531f32a, reversing changes made to 7243f2edf5d05e128947560539f840658e7648bb.
* | | | | Merge pull request #5934 from vespa-engine/hmusum/add-zookeeper-data-maintainerHarald Musum2018-05-257-16/+102
|\ \ \ \ \ | | | | | | | | | | | | Add zookeeper data maintainer (removes unused file distribution data)
| * | | | | Add zookeeper data maintainer (removes unused file distribution data)Harald Musum2018-05-247-16/+102
| | | | | |
* | | | | | Merge pull request #5939 from vespa-engine/hmusum/take-lockHarald Musum2018-05-251-6/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Really take lock before running maintainer