summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Avoid creating unnecessary jar for test-bundles root.gjoranv2019-10-231-28/+32
* Move tests to package c.y.container.plugingjoranv2019-10-232-3/+3
* Use surefire instead of failsafe plugin.gjoranv2019-10-235-19/+18
* Add test with a bundle using artifact version as ExportPackagesgjoranv2019-10-2311-26/+205
* Add option to use artifact version as ExportPackage versiongjoranv2019-10-234-29/+62
* Restructure bundle-plugin-test to allow multiple test bundles.gjoranv2019-10-2310-88/+255
* Merge pull request #11064 from vespa-engine/revert-11063-revert-11002-olaa/te...Ola Aunrønning2019-10-2310-18/+258
|\
| * Revert "Revert "Added TenantCost""Ola Aunrønning2019-10-2310-18/+258
* | Merge pull request #11055 from vespa-engine/revert-11054-revert-11037-hakonha...Håkon Hallingstad2019-10-2315-57/+352
|\ \
| * | Use withX instead of setXHåkon Hallingstad2019-10-233-10/+10
| * | Make fluent-style paramsHåkon Hallingstad2019-10-233-19/+25
| * | Revert "Revert "Support flag conditions based on Vespa release ""Håkon Hallingstad2019-10-2315-55/+344
* | | Merge pull request #11065 from vespa-engine/revert-11058-gjoranv/artifact-ver...gjoranv2019-10-2321-511/+127
|\ \ \
| * | | Revert "Gjoranv/artifact version for exports4"Harald Musum2019-10-2321-511/+127
| | |/ | |/|
* | | Merge pull request #11052 from vespa-engine/jvenstad/support-multiple-instanc...Martin Polden2019-10-232-59/+159
|\ \ \ | |/ / |/| |
| * | Support various instances in IDTester, with convenience overloadsJon Marius Venstad2019-10-232-59/+159
* | | Merge pull request #11063 from vespa-engine/revert-11002-olaa/tenant-costOla Aunrønning2019-10-2310-258/+18
|\ \ \
| * | | Revert "Added TenantCost"Ola Aunrønning2019-10-2310-258/+18
|/ / /
* | | Merge pull request #11059 from vespa-engine/toregge/use-std-unique-ptr-to-sto...Geir Storli2019-10-2327-111/+91
|\ \ \
| * | | Use std::unique_ptr<vsm::FieldSearcher> to store field searhers.Tor Egge2019-10-2327-111/+91
* | | | Merge pull request #11060 from vespa-engine/mortent/cred-maintainer-certifica...Morten Tokle2019-10-233-1/+40
|\ \ \ \
| * | | | Add method for collecting certificate expiryMorten Tokle2019-10-233-1/+40
* | | | | Merge pull request #11058 from vespa-engine/gjoranv/artifact-version-for-expo...gjoranv2019-10-2321-127/+511
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use project.version also for the dependency test bundle.gjoranv2019-10-233-13/+15
| * | | | Avoid creating unnecessary jar for test-bundles root.gjoranv2019-10-231-28/+32
| * | | | Move tests to package c.y.container.plugingjoranv2019-10-232-3/+3
| * | | | Use surefire instead of failsafe plugin.gjoranv2019-10-235-19/+18
| * | | | Add test with a bundle using artifact version as ExportPackagesgjoranv2019-10-2311-26/+205
| * | | | Add option to use artifact version as ExportPackage versiongjoranv2019-10-234-29/+62
| * | | | Restructure bundle-plugin-test to allow multiple test bundles.gjoranv2019-10-2310-88/+255
|/ / / /
* | | | Merge pull request #11057 from vespa-engine/revert-11049-gjoranv/artifact-ver...gjoranv2019-10-2321-511/+127
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert "Gjoranv/artifact version for exports3"gjoranv2019-10-2321-511/+127
|/ / /
* | | Merge pull request #11053 from vespa-engine/hmusum/remove-unused-methodBjørn Christian Seime2019-10-231-1/+0
|\ \ \
| * | | Remove unused methodHarald Musum2019-10-231-1/+0
| | |/ | |/|
* | | Merge pull request #11054 from vespa-engine/revert-11037-hakonhall/support-fl...Valerij Fredriksen2019-10-2315-344/+55
|\ \ \
| * | | Revert "Support flag conditions based on Vespa release "Harald Musum2019-10-2315-344/+55
|/ / /
* | | Merge pull request #11049 from vespa-engine/gjoranv/artifact-version-for-expo...Henning Baldersheim2019-10-2321-127/+511
|\ \ \ | |_|/ |/| |
| * | Use project.version also for the dependency test bundle.gjoranv2019-10-223-13/+15
| * | Avoid creating unnecessary jar for test-bundles root.gjoranv2019-10-221-28/+32
| * | Move tests to package c.y.container.plugingjoranv2019-10-222-3/+3
| * | Use surefire instead of failsafe plugin.gjoranv2019-10-225-19/+18
| * | Add test with a bundle using artifact version as ExportPackagesgjoranv2019-10-2211-26/+205
| * | Add option to use artifact version as ExportPackage versiongjoranv2019-10-224-29/+62
| * | Restructure bundle-plugin-test to allow multiple test bundles.gjoranv2019-10-2210-88/+255
* | | Merge pull request #11044 from vespa-engine/toregge/extend-attribute-aspect-d...Geir Storli2019-10-232-6/+68
|\ \ \
| * | | Extend AttributeAspectDelayer to handle matchedattributeelementsfilterTor Egge2019-10-222-6/+68
* | | | Merge pull request #11002 from vespa-engine/olaa/tenant-costOla Aunrønning2019-10-2310-18/+258
|\ \ \ \
| * | | | Use BigDecimalOla Aunrønning2019-10-183-12/+24
| * | | | Added empty TenantCostOla Aunrønning2019-10-181-0/+15
| * | | | Added TenantCostOla Aunrønning2019-10-1710-18/+231