summaryrefslogtreecommitdiffstats
path: root/parent
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Revert "Revert "Jonmv/reapply upgrade athenz""""Jon Marius Venstad2021-04-131-19/+22
* Revert "Revert "Revert "Jonmv/reapply upgrade athenz"""Jon Marius Venstad2021-04-131-22/+19
* Revert "Revert "Jonmv/reapply upgrade athenz""Jon Marius Venstad2021-04-131-19/+22
* Revert "Jonmv/reapply upgrade athenz"Harald Musum2021-04-131-22/+19
* Set jjwt version in parentJon Marius Venstad2021-04-131-0/+16
* Revert "Revert "No more bintray.""Jon Marius Venstad2021-04-131-18/+0
* Revert "Revert "Upgrade athenz to 1.10.11""Jon Marius Venstad2021-04-131-1/+6
* Merge pull request #17393 from vespa-engine/revert-17389-jonmv/upgrade-athenzJon Marius Venstad2021-04-131-6/+1
|\
| * Revert "Upgrade athenz to 1.10.11"Jon Marius Venstad2021-04-131-6/+1
* | Merge pull request #17388 from vespa-engine/revert-17382-aressem/no-more-bintrayJon Marius Venstad2021-04-131-0/+18
|\ \ | |/ |/|
| * Revert "No more bintray."Arnstein Ressem2021-04-121-0/+18
* | Upgrade athenz to 1.10.11Jon Marius Venstad2021-04-121-1/+6
|/
* No more bintray.Arnstein Ressem2021-04-121-18/+0
* Revert "Revert "Bjorncs/jdisc http2 preps [run-systemtest]""Bjørn Christian Seime2021-04-121-5/+0
* Revert "Bjorncs/jdisc http2 preps [run-systemtest]"Harald Musum2021-04-091-0/+5
* JettyMockRequestBuilder instead of Mockito in unit testsBjørn Christian Seime2021-04-091-5/+0
* Bump AWS SDK version to 1.11.974Valerij Fredriksen2021-03-151-1/+1
* Upgrade zookeeper client version to 3.6.2Bjørn Christian Seime2021-03-091-1/+1
* Upgrade Curator framework to 5.1.0Bjørn Christian Seime2021-03-081-1/+1
* Initial aws secret storeMorten Tokle2021-01-291-0/+10
* Add aircompressor library to vespajlib (for zstd)Bjørn Christian Seime2021-01-071-0/+5
* Revert "Revert "Reapply "Upgrade to Curator 4"""Harald Musum2021-01-051-2/+2
* Revert "Reapply "Upgrade to Curator 4""Harald Musum2021-01-051-2/+2
* Merge branch 'master' into revert-14062-revert-14057-hmusum/upgrade-to-curator-4Harald Musum2021-01-011-1/+10
|\
| * Remove unnecessary zookeeper.server.version propertyMartin Polden2020-12-111-1/+0
| * Add helper for combining multiple completable futuresBjørn Christian Seime2020-12-021-0/+5
| * Revert "Bjorncs/cluster controller reindexing status"Jon Marius Venstad2020-12-021-5/+0
| * Add helper for combining multiple completable futuresBjørn Christian Seime2020-12-011-0/+5
| * Merge pull request #15463 from vespa-engine/ogronnesby/csv-invoice-exportØyvind Grønnesby2020-11-301-0/+5
| |\
| | * Export all bills/invoices as CSVØyvind Grønnesby2020-11-251-0/+5
* | | Merge branch 'master' into revert-14062-revert-14057-hmusum/upgrade-to-curator-4Harald Musum2020-11-261-0/+6
|\| |
| * | Revert "Revert "Bjorncs/config convergence checker preps""Bjørn Christian Seime2020-11-251-0/+6
| * | Revert "Bjorncs/config convergence checker preps"Arnstein Ressem2020-11-251-6/+0
| * | Implement Vespa http client builder for Apache http async client 5Bjørn Christian Seime2020-11-241-0/+6
| |/
* / Revert "Revert "Upgrade to Curator 4""Harald Musum2020-11-201-2/+2
|/
* Revert "Revert "Junit 4.13 and juptier 5.7.0" (#15054)"Harald Musum2020-11-091-1/+1
* Merge pull request #15129 from vespa-engine/hakonhall/use-javadoc-no-forkHåkon Hallingstad2020-11-021-1/+1
|\
| * Use javadoc-no-fork and various fixesHåkon Hallingstad2020-10-311-1/+1
* | Revert "Junit 4.13 and juptier 5.7.0" (#15054)Jon Marius Venstad2020-10-271-1/+1
* | Don't bump junit 4.12 to 4.13.1 for Vespa parentJon Marius Venstad2020-10-271-1/+1
* | Junit 4.13 and juptier 4.7.0Jon Marius Venstad2020-10-271-2/+2
* | Bump aws sdk version to 1.11.879Morten Tokle2020-10-191-1/+1
|/
* Revert "Reapply "Upgrade to Curator 4""Harald Musum2020-09-281-2/+2
* Revert "Revert "Upgrade to Curator 4""Harald Musum2020-09-251-2/+2
* Merge pull request #14061 from vespa-engine/gjoranv/upgrade-maven-bundle-plugingjoranv2020-08-171-7/+2
|\
| * Upgrade maven-bundle-plugin to 4.1.0, and remove 'noee' instructiongjoranv2020-08-171-7/+2
* | Revert "Upgrade to Curator 4"Harald Musum2020-08-171-2/+2
|/
* Upgrade maven-compiler-plugin to 3.8.1Harald Musum2020-08-171-1/+1
* Upgrade to 4.3.0Harald Musum2020-08-161-2/+2
* Cleanup exclusions and remove stray fileHarald Musum2020-08-161-12/+0