aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge pull request #11051 from vespa-engine/revert-11045-revert-11041-revert-...Harald Musum2019-10-2312-2/+36
|\ \ \ \ \
| * | | | | Revert "Revert "Reapply "Move ZooKeeperServer to another module"""Harald Musum2019-10-2312-2/+36
| | |_|_|/ | |/| | |
* | | | | Merge pull request #11037 from vespa-engine/hakonhall/support-flag-conditions...Håkon Hallingstad2019-10-2315-55/+344
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Document HOSTNAME and make factoriesHåkon Hallingstad2019-10-229-26/+38
| * | | | Update flags/src/main/java/com/yahoo/vespa/flags/json/Condition.java Håkon Hallingstad2019-10-221-1/+1
| * | | | Support flag conditions based on Vespa releaseHåkon Hallingstad2019-10-2215-51/+328
* | | | | Merge pull request #11050 from vespa-engine/aressem/compile-for-java-8Jon Bratseth2019-10-222-22/+6
|\ \ \ \ \
| * | | | | Use the new release option in JDK 9+ to ensure JDK 8 compability for client l...Arnstein Ressem2019-10-222-22/+6
|/ / / / /
* | | | | Merge pull request #11045 from vespa-engine/revert-11041-revert-11040-revert-...Håkon Hallingstad2019-10-2212-36/+2
|\ \ \ \ \
| * | | | | Revert "Reapply "Move ZooKeeperServer to another module""Harald Musum2019-10-2212-36/+2
* | | | | | Merge pull request #11043 from vespa-engine/geirst/matched-elements-only-for-...Geir Storli2019-10-227-9/+61
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Handle matched element filter transforms for imported complex fields.Geir Storli2019-10-225-8/+49
| * | | | | Mark matched elements filter transforms as dynamic that require the query.Geir Storli2019-10-222-1/+12
| | |_|_|/ | |/| | |
* | | | | Merge pull request #11048 from vespa-engine/bratseth/say-it-may-take-a-long-timeJon Marius Venstad2019-10-223-3/+4
|\ \ \ \ \
| * | | | | Say it may take a long timeJon Bratseth2019-10-223-3/+4
|/ / / / /
* | | | | Merge pull request #11046 from vespa-engine/revert-11035-gjoranv/artifact-ver...gjoranv2019-10-2221-505/+127
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "Gjoranv/artifact version for exports2"gjoranv2019-10-2221-505/+127
|/ / / /
* | | | Merge pull request #11041 from vespa-engine/revert-11040-revert-11032-revert-...Harald Musum2019-10-2212-2/+36
|\ \ \ \
| * | | | Copy from correct place, we are not using submodules yetHarald Musum2019-10-221-4/+1
| * | | | Revert "Revert "Reapply "move ZooKeeperServer to another module"""Harald Musum2019-10-2212-2/+39
| |/ / /
* | | | Merge pull request #11035 from vespa-engine/gjoranv/artifact-version-for-expo...gjoranv2019-10-2221-127/+505
|\ \ \ \
| * | | | Move tests to package c.y.container.plugingjoranv2019-10-212-3/+3
| * | | | Use surefire instead of failsafe plugin.gjoranv2019-10-215-19/+18
| * | | | Add test with a bundle using artifact version as ExportPackagesgjoranv2019-10-2111-26/+205
| * | | | Add option to use artifact version as ExportPackage versiongjoranv2019-10-194-29/+62
| * | | | Restructure bundle-plugin-test to allow multiple test bundles.gjoranv2019-10-1910-88/+255
* | | | | Merge pull request #11042 from vespa-engine/bratseth/skew-metricKristian Aune2019-10-224-2/+31
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add metric hostedVespa.docker.skew to measure average host skewJon Bratseth2019-10-224-2/+31
|/ / / /
* | | | Merge pull request #11040 from vespa-engine/revert-11032-revert-11027-revert-...Harald Musum2019-10-2212-39/+2
|\ \ \ \
| * | | | Revert "Reapply "move ZooKeeperServer to another module""Håkon Hallingstad2019-10-2212-39/+2
|/ / / /
* | | | Merge pull request #11039 from vespa-engine/revert-11038-revert-11036-hakonha...Håkon Hallingstad2019-10-228-15/+122
|\ \ \ \