summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
| * | | | | Add AthenzService constructor taking full name as inputBjørn Christian Seime2018-05-241-0/+11
* | | | | | Merge pull request #5932 from vespa-engine/ovirtanen/convert-scala-to-java-in...Bjørn Christian Seime2018-05-247-336/+302
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Scala code replaced with Java equivalentOlli Virtanen2018-05-247-336/+302
| | |_|/ / | |/| | |
* | | | | Merge pull request #5927 from vespa-engine/hmusum/fix-maintainer-lock-pathHarald Musum2018-05-242-2/+54
|\ \ \ \ \
| * | | | | Run maintainer manuallyHarald Musum2018-05-241-2/+2
| * | | | | Use absolute path for lock and add testHarald Musum2018-05-242-2/+54
* | | | | | Merge pull request #5928 from vespa-engine/hakonhall/service-monitor-make-it-...Håkon Hallingstad2018-05-2418-216/+294
|\ \ \ \ \ \
| * | | | | | [service-monitor] Make it easier to add synthesized appsHåkon Hallingstad2018-05-2418-216/+294
* | | | | | | Merge pull request #5930 from vespa-engine/ovirtanen/convert-scala-to-java-in...Bjørn Christian Seime2018-05-247-74/+48
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Scala code converted to JavaOlli Virtanen2018-05-247-74/+48
|/ / / / / /
* | | | | | Merge pull request #5899 from vespa-engine/ovirtanen/remove-scala-dependency-...Bjørn Christian Seime2018-05-2417-605/+589
|\ \ \ \ \ \
| * | | | | | Corrected author informationOlli Virtanen2018-05-248-11/+20
| * | | | | | Sync style with intelliJ defaultsOlli Virtanen2018-05-169-466/+473
| * | | | | | Convert Scala test code to JavaOlli Virtanen2018-05-1516-594/+562
* | | | | | | Merge pull request #5929 from vespa-engine/gjoranv/aries-asmgjoranv2018-05-245-19/+6
|\ \ \ \ \ \ \
| * | | | | | | Remove aries.spifly and asm-debug-all.gjoranv2018-05-245-19/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5925 from vespa-engine/hmusum/cleanup-temp-dir-2Harald Musum2018-05-241-8/+20
|\ \ \ \ \ \ \
| * | | | | | | Use try-finally in caller to make sure temp dir is always deletedHarald Musum2018-05-241-6/+12