summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Reapply parts of the iterate-indexes commit.Henning Baldersheim2018-05-2719-65/+87
|/ / / / / / /
* | | | | | | Merge pull request #5951 from vespa-engine/revert-5942-bratseth/iterate-over-...Henning Baldersheim2018-05-2744-293/+255
|\ \ \ \ \ \ \
| * | | | | | | Revert "Bratseth/iterate over indexes not fields 2"Henning Baldersheim2018-05-2744-293/+255
|/ / / / / / /
* | | | | | | Merge pull request #5950 from vespa-engine/revert-5944-geirst/array-of-struct...Henning Baldersheim2018-05-279-198/+0
|\ \ \ \ \ \ \
| * | | | | | | Revert "Support that array of struct field is derived into array attributes."Henning Baldersheim2018-05-279-198/+0
|/ / / / / / /
* | | | | | | Merge pull request #5945 from vespa-engine/jvenstad/deblock-system-app-order-...Jon Marius Venstad2018-05-252-18/+23
|\ \ \ \ \ \ \
| * | | | | | | 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 vespa-engine/freva/use-force-option-when-compre...Håkon Hallingstad2018-05-251-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Use force option when compressingValerij Fredriksen2018-05-251-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5944 from vespa-engine/geirst/array-of-struct-field-is-de...Henning Baldersheim2018-05-259-0/+198
|\ \ \ \ \ \
| * | | | | | Support that array of struct field is derived into array attributes.Geir Storli2018-05-259-0/+198
* | | | | | | Merge pull request #5942 from vespa-engine/bratseth/iterate-over-indexes-not-...Jon Marius Venstad2018-05-2544-255/+293
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Iterate the old wayJon Bratseth2018-05-252-0/+25
| * | | | | | Revert "Merge pull request #5913 from vespa-engine/revert-5903-bratseth/itera...Jon Bratseth2018-05-2544-269/+282
| | |/ / / / | |/| | | |
* | | | | | 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)Harald Musum2018-05-247-16/+102
* | | | | | | Merge pull request #5939 from vespa-engine/hmusum/take-lockHarald Musum2018-05-251-6/+9
|\ \ \ \ \ \ \
| * | | | | | | No need to nest try statementsHarald Musum2018-05-251-5/+3
| * | | | | | | Really take lock before running maintainerHarald Musum2018-05-251-2/+7
* | | | | | | | Merge pull request #5940 from vespa-engine/revert-5938-gjoranv/reapply-aries-asmHenning Baldersheim2018-05-255-6/+19
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Revert "Remove aries.spifly and asm-debug-all."Harald Musum2018-05-255-6/+19
|/ / / / / / /
* | | | | | | Merge pull request #5938 from vespa-engine/gjoranv/reapply-aries-asmgjoranv2018-05-255-19/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove aries.spifly and asm-debug-all.gjoranv2018-05-245-19/+6
|/ / / / / /
* | | | | | Merge pull request #5924 from vespa-engine/balder/make-element-attribute-iter...Henning Baldersheim2018-05-2428-426/+472
|\ \ \ \ \ \
| * | | | | | Change tests and reintroduce assert.Henning Baldersheim2018-05-242-2/+2
| * | | | | | Backport correct initRange pattern to copy-paste source.Henning Baldersheim2018-05-241-1/+2
| * | | | | | Renaming and constification after code review comments.Henning Baldersheim2018-05-247-17/+18
| * | | | | | = defaultHenning Baldersheim2018-05-232-36/+18
| * | | | | | onCmp -> onFindHenning Baldersheim2018-05-2314-41/+41
| * | | | | | Only return the weight of the first match. Accumulate on the outside.Henning Baldersheim2018-05-237-58/+64
| * | | | | | Ensure conformance tests pass.Henning Baldersheim2018-05-232-15/+29
| * | | | | | Implement doUnpackHenning Baldersheim2018-05-233-8/+21
| * | | | | | Add attribute::ElementIteratorHenning Baldersheim2018-05-235-21/+71
| * | | | | | Refactored to allow iteration over matching elements.Henning Baldersheim2018-05-2318-203/+202
| * | | | | | std::make_unique - No sematic changes.Henning Baldersheim2018-05-233-112/+92
* | | | | | | Merge pull request #5936 from vespa-engine/gjoranv/upgrade-jettyHenning Baldersheim2018-05-242-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Upgrade to latest jetty.gjoranv2018-05-242-2/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #5923 from vespa-engine/balder/same-element-itemHenning Baldersheim2018-05-244-3/+108
|\ \ \ \ \ \ \
| * | | | | | | Add a more sane toString and minor followup after PR commentsHenning Baldersheim2018-05-243-7/+19
| * | | | | | | Add SameElementItem for struct search support.Henning Baldersheim2018-05-233-1/+94
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5937 from vespa-engine/revert-5899-ovirtanen/remove-scala...Håkon Hallingstad2018-05-2417-589/+605
|\ \ \ \ \ \ \
| * | | | | | | Revert "Replace Scala test code in application module with equivalent Java"gjoranv2018-05-2417-589/+605
|/ / / / / / /
* | | | | | | Merge pull request #5935 from vespa-engine/hakonhall/fix-component-pathsHåkon Hallingstad2018-05-241-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix component pathsHåkon Hallingstad2018-05-241-2/+2
|/ / / / / /
* | | | | | Merge pull request #5933 from vespa-engine/revert-5929-gjoranv/aries-asmBjørn Christian Seime2018-05-245-6/+19
|\ \ \ \ \ \
| * | | | | | Revert "Remove aries.spifly and asm-debug-all."gjoranv2018-05-245-6/+19
|/ / / / / /
* | | | | | Merge pull request #5931 from vespa-engine/bjorncs/athenzHåkon Hallingstad2018-05-243-11/+56
|\ \ \ \ \ \
| * | | | | | Use SiaUtils in SiaIdentityProviderBjørn Christian Seime2018-05-241-11/+6
| * | | | | | Add SIA utility classBjørn Christian Seime2018-05-241-0/+39