diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-08-22 12:46:05 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-08-22 12:46:05 +0200 |
commit | ec95c8b33950ae5c2100a8b025752771affb7f1f (patch) | |
tree | 519188d5b02c181cdf9424b602de6908744ebbba /parent | |
parent | 0bec972def1e9729c5db5f6ea4babf024d359663 (diff) | |
parent | c0444cf8384a34981530d06743af26f163248744 (diff) |
Merge branch 'master' into revert-10346-revert-10336-hmusum/upgrade-to-zookeeper-3.4.14
Diffstat (limited to 'parent')
-rw-r--r-- | parent/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 976550f3d4c..c89d53e5160 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -760,7 +760,7 @@ <jna.version>4.5.2</jna.version> <tensorflow.version>1.12.0</tensorflow.version> <!-- Athenz dependencies. Make sure these dependencies matches those in Vespa's internal repositories --> - <athenz.version>1.8.12</athenz.version> + <athenz.version>1.8.29</athenz.version> <commons-lang.version>2.6</commons-lang.version> <!-- WARNING: If you change curator version, you also need to update zkfacade/src/main/java/org/apache/curator/**/package-info.java |