Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add new module fat-model-dependencies | gjoranv | 2018-05-29 | 5 | -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-message | Lester Solbakken | 2018-05-28 | 7 | -21/+23 |
|\ | | | | | Bratseth/better error message | ||||
| * | Merge with master | Jon Bratseth | 2018-05-28 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into bratseth/better-error-message | Jon Bratseth | 2018-05-28 | 74 | -486/+703 |
| |\ | |||||
| * | | More explanation on type mismatch | Jon Bratseth | 2018-05-25 | 6 | -20/+22 |
| | | | |||||
* | | | Merge pull request #5963 from ↵ | Harald Musum | 2018-05-28 | 2 | -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 tenant | Harald Musum | 2018-05-28 | 2 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #5943 from vespa-engine/bratseth/json-validation | Jon Bratseth | 2018-05-28 | 10 | -34/+219 |
|\ \ \ \ | |_|_|/ |/| | | | Bratseth/json validation | ||||
| * | | | Merge with master | Jon Bratseth | 2018-05-28 | 180 | -1690/+2466 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #5946 from vespa-engine/balder/yql-same-element | Jon Bratseth | 2018-05-28 | 5 | -160/+163 |
|\ \ \ \ | | | | | | | | | | | Add preliminary yql for sameElement | ||||
| * | | | | Add preliminary yql for sameElement | Henning Baldersheim | 2018-05-25 | 5 | -160/+163 |
| | | | | | |||||
* | | | | | Merge pull request #5962 from ↵ | Henning Baldersheim | 2018-05-28 | 2 | -23/+27 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | vespa-engine/revert-5959-balder/reapply-iterate-over-indexes-5 Revert "Remove the IndexCombinatorSearcher" | ||||
| * | | | | Revert "Remove the IndexCombinatorSearcher" | Henning Baldersheim | 2018-05-28 | 2 | -23/+27 |
|/ / / / | |||||
* | | | | Merge pull request #5961 from ↵ | Valerij Fredriksen | 2018-05-28 | 1 | -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 maintainers | Harald Musum | 2018-05-28 | 1 | -8/+23 |
| | | | | | |||||
* | | | | | Merge pull request #5949 from vespa-engine/hakonhall/add-uncheck-to-yolean | Håkon Hallingstad | 2018-05-28 | 3 | -0/+99 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add uncheck to yolean | ||||
| * | | | | Add uncheck to yolean | Håkon Hallingstad | 2018-05-25 | 3 | -0/+99 |
| | | | | | |||||
* | | | | | Merge pull request #5959 from vespa-engine/balder/reapply-iterate-over-indexes-5 | Henning Baldersheim | 2018-05-28 | 2 | -27/+23 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove the IndexCombinatorSearcher | ||||
| * | | | | | Remove the IndexCombinatorSearcher | Henning Baldersheim | 2018-05-27 | 2 | -27/+23 |
|/ / / / / | |||||
* | | | | | Merge pull request #5958 from vespa-engine/balder/reapply-iterate-over-indexes-4 | Henning Baldersheim | 2018-05-27 | 2 | -64/+48 |
|\ \ \ \ \ | | | | | | | | | | | | | Iterate over indexes for juniper searcher. | ||||
| * | | | | | Iterate over indexes for juniper searcher. | Henning Baldersheim | 2018-05-27 | 2 | -64/+48 |
|/ / / / / | |||||
* | | | | | Merge pull request #5957 from vespa-engine/toregge/use-fallthrough-attributes | Henning Baldersheim | 2018-05-27 | 15 | -56/+56 |
|\ \ \ \ \ | | | | | | | | | | | | | Use fallthrough attributes. | ||||
| * | | | | | Use fallthrough attributes. | Tor Egge | 2018-05-27 | 15 | -56/+56 |
| | | | | | | |||||
* | | | | | | Merge pull request #5953 from ↵ | Henning Baldersheim | 2018-05-27 | 4 | -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 Egge | 2018-05-27 | 4 | -0/+47 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Handle insertion of non-copyable keys in hash set. | ||||
* | | | | | | Merge pull request #5955 from ↵ | Henning Baldersheim | 2018-05-27 | 1 | -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 Egge | 2018-05-27 | 1 | -0/+32 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #5956 from vespa-engine/balder/reapply-iterate-over-indexes-3 | Henning Baldersheim | 2018-05-27 | 4 | -82/+61 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Iterate over indexes for ngram and quoting searcher. | ||||
| * | | | | | | Iterate over indexes for ngram and quoting searcher. | Henning Baldersheim | 2018-05-27 | 4 | -82/+61 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #5954 from vespa-engine/balder/reapply-iterate-over-indexes-2 | Henning Baldersheim | 2018-05-27 | 17 | -31/+62 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Second part of iterate-over-indexes | ||||
| * | | | | | Second part of iterate-over-indexes | Henning Baldersheim | 2018-05-27 | 17 | -31/+62 |
|/ / / / / | |||||
* | | | | | Merge pull request #5952 from vespa-engine/balder/reapply-iterate-over-indexes-1 | Henning Baldersheim | 2018-05-27 | 19 | -65/+87 |
|\ \ \ \ \ | | | | | | | | | | | | | Reapply parts of the iterate-indexes commit. | ||||
| * | | | | | Reapply parts of the iterate-indexes commit. | Henning Baldersheim | 2018-05-27 | 19 | -65/+87 |
|/ / / / / | |||||
* | | | | | Merge pull request #5951 from ↵ | Henning Baldersheim | 2018-05-27 | 44 | -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 Baldersheim | 2018-05-27 | 44 | -293/+255 |
|/ / / / / | |||||
* | | | | | Merge pull request #5950 from ↵ | Henning Baldersheim | 2018-05-27 | 9 | -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 Baldersheim | 2018-05-27 | 9 | -198/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #5945 from ↵ | Jon Marius Venstad | 2018-05-25 | 2 | -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 converged | Jon Marius Venstad | 2018-05-25 | 1 | -14/+9 |
| | | | | | | |||||
| * | | | | | Enforce upgrade order inside each zone, instead of across zones in a block | Jon Marius Venstad | 2018-05-25 | 2 | -13/+23 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #5947 from ↵ | Håkon Hallingstad | 2018-05-25 | 1 | -2/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | vespa-engine/freva/use-force-option-when-compressing Use force option when compressing | ||||
| * | | | | Use force option when compressing | Valerij Fredriksen | 2018-05-25 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #5944 from ↵ | Henning Baldersheim | 2018-05-25 | 9 | -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 Storli | 2018-05-25 | 9 | -0/+198 |
| | | | | | | |||||
* | | | | | | Merge pull request #5942 from ↵ | Jon Marius Venstad | 2018-05-25 | 44 | -255/+293 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | vespa-engine/bratseth/iterate-over-indexes-not-fields-2 Bratseth/iterate over indexes not fields 2 | ||||
| * | | | | | Iterate the old way | Jon Bratseth | 2018-05-25 | 2 | -0/+25 |
| | | | | | | |||||
| * | | | | | Revert "Merge pull request #5913 from ↵ | Jon Bratseth | 2018-05-25 | 44 | -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-maintainer | Harald Musum | 2018-05-25 | 7 | -16/+102 |
|\ \ \ \ \ | | | | | | | | | | | | | Add zookeeper data maintainer (removes unused file distribution data) | ||||
| * | | | | | Add zookeeper data maintainer (removes unused file distribution data) | Harald Musum | 2018-05-24 | 7 | -16/+102 |
| | | | | | | |||||
* | | | | | | Merge pull request #5939 from vespa-engine/hmusum/take-lock | Harald Musum | 2018-05-25 | 1 | -6/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Really take lock before running maintainer |