Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | No need to nest try statements | Harald Musum | 2018-05-25 | 1 | -5/+3 | |
| * | | | | | | Really take lock before running maintainer | Harald Musum | 2018-05-25 | 1 | -2/+7 | |
* | | | | | | | Merge pull request #5940 from vespa-engine/revert-5938-gjoranv/reapply-aries-asm | Henning Baldersheim | 2018-05-25 | 5 | -6/+19 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Revert "Remove aries.spifly and asm-debug-all." | Harald Musum | 2018-05-25 | 5 | -6/+19 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5938 from vespa-engine/gjoranv/reapply-aries-asm | gjoranv | 2018-05-25 | 5 | -19/+6 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Remove aries.spifly and asm-debug-all. | gjoranv | 2018-05-24 | 5 | -19/+6 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #5924 from vespa-engine/balder/make-element-attribute-iter... | Henning Baldersheim | 2018-05-24 | 28 | -426/+472 | |
|\ \ \ \ \ | ||||||
| * | | | | | Change tests and reintroduce assert. | Henning Baldersheim | 2018-05-24 | 2 | -2/+2 | |
| * | | | | | Backport correct initRange pattern to copy-paste source. | Henning Baldersheim | 2018-05-24 | 1 | -1/+2 | |
| * | | | | | Renaming and constification after code review comments. | Henning Baldersheim | 2018-05-24 | 7 | -17/+18 | |
| * | | | | | = default | Henning Baldersheim | 2018-05-23 | 2 | -36/+18 | |
| * | | | | | onCmp -> onFind | Henning Baldersheim | 2018-05-23 | 14 | -41/+41 | |
| * | | | | | Only return the weight of the first match. Accumulate on the outside. | Henning Baldersheim | 2018-05-23 | 7 | -58/+64 | |
| * | | | | | Ensure conformance tests pass. | Henning Baldersheim | 2018-05-23 | 2 | -15/+29 | |
| * | | | | | Implement doUnpack | Henning Baldersheim | 2018-05-23 | 3 | -8/+21 | |
| * | | | | | Add attribute::ElementIterator | Henning Baldersheim | 2018-05-23 | 5 | -21/+71 | |
| * | | | | | Refactored to allow iteration over matching elements. | Henning Baldersheim | 2018-05-23 | 18 | -203/+202 | |
| * | | | | | std::make_unique - No sematic changes. | Henning Baldersheim | 2018-05-23 | 3 | -112/+92 | |
* | | | | | | Merge pull request #5936 from vespa-engine/gjoranv/upgrade-jetty | Henning Baldersheim | 2018-05-24 | 2 | -2/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Upgrade to latest jetty. | gjoranv | 2018-05-24 | 2 | -2/+3 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #5923 from vespa-engine/balder/same-element-item | Henning Baldersheim | 2018-05-24 | 4 | -3/+108 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add a more sane toString and minor followup after PR comments | Henning Baldersheim | 2018-05-24 | 3 | -7/+19 | |
| * | | | | | | Add SameElementItem for struct search support. | Henning Baldersheim | 2018-05-23 | 3 | -1/+94 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #5937 from vespa-engine/revert-5899-ovirtanen/remove-scala... | Håkon Hallingstad | 2018-05-24 | 17 | -589/+605 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Revert "Replace Scala test code in application module with equivalent Java" | gjoranv | 2018-05-24 | 17 | -589/+605 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5935 from vespa-engine/hakonhall/fix-component-paths | Håkon Hallingstad | 2018-05-24 | 1 | -2/+2 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fix component paths | Håkon Hallingstad | 2018-05-24 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #5933 from vespa-engine/revert-5929-gjoranv/aries-asm | Bjørn Christian Seime | 2018-05-24 | 5 | -6/+19 | |
|\ \ \ \ \ | ||||||
| * | | | | | Revert "Remove aries.spifly and asm-debug-all." | gjoranv | 2018-05-24 | 5 | -6/+19 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #5931 from vespa-engine/bjorncs/athenz | Håkon Hallingstad | 2018-05-24 | 3 | -11/+56 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use SiaUtils in SiaIdentityProvider | Bjørn Christian Seime | 2018-05-24 | 1 | -11/+6 | |
| * | | | | | Add SIA utility class | Bjørn Christian Seime | 2018-05-24 | 1 | -0/+39 | |
| * | | | | | Add AthenzService constructor taking full name as input | Bjørn Christian Seime | 2018-05-24 | 1 | -0/+11 | |
* | | | | | | Merge pull request #5932 from vespa-engine/ovirtanen/convert-scala-to-java-in... | Bjørn Christian Seime | 2018-05-24 | 7 | -336/+302 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Scala code replaced with Java equivalent | Olli Virtanen | 2018-05-24 | 7 | -336/+302 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #5927 from vespa-engine/hmusum/fix-maintainer-lock-path | Harald Musum | 2018-05-24 | 2 | -2/+54 | |
|\ \ \ \ \ | ||||||
| * | | | | | Run maintainer manually | Harald Musum | 2018-05-24 | 1 | -2/+2 | |
| * | | | | | Use absolute path for lock and add test | Harald Musum | 2018-05-24 | 2 | -2/+54 | |
* | | | | | | Merge pull request #5928 from vespa-engine/hakonhall/service-monitor-make-it-... | Håkon Hallingstad | 2018-05-24 | 18 | -216/+294 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [service-monitor] Make it easier to add synthesized apps | Håkon Hallingstad | 2018-05-24 | 18 | -216/+294 | |
* | | | | | | | Merge pull request #5930 from vespa-engine/ovirtanen/convert-scala-to-java-in... | Bjørn Christian Seime | 2018-05-24 | 7 | -74/+48 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Scala code converted to Java | Olli Virtanen | 2018-05-24 | 7 | -74/+48 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5899 from vespa-engine/ovirtanen/remove-scala-dependency-... | Bjørn Christian Seime | 2018-05-24 | 17 | -605/+589 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Corrected author information | Olli Virtanen | 2018-05-24 | 8 | -11/+20 | |
| * | | | | | | Sync style with intelliJ defaults | Olli Virtanen | 2018-05-16 | 9 | -466/+473 | |
| * | | | | | | Convert Scala test code to Java | Olli Virtanen | 2018-05-15 | 16 | -594/+562 | |
* | | | | | | | Merge pull request #5929 from vespa-engine/gjoranv/aries-asm | gjoranv | 2018-05-24 | 5 | -19/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove aries.spifly and asm-debug-all. | gjoranv | 2018-05-24 | 5 | -19/+6 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5925 from vespa-engine/hmusum/cleanup-temp-dir-2 | Harald Musum | 2018-05-24 | 1 | -8/+20 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use try-finally in caller to make sure temp dir is always deleted | Harald Musum | 2018-05-24 | 1 | -6/+12 |