Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0827fb2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0827fb2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0827fb2 Branch: refs/heads/trunk Commit: a0827fb2e7e3ac643573eab987ebb0b92f8b73e2 Parents: 48bfc8e 515e4a2 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Feb 14 23:26:55 2017 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Feb 14 23:26:55 2017 +0000 ---------------------------------------------------------------------- build.xml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0827fb2/build.xml ---------------------------------------------------------------------- diff --cc build.xml index d5962fe,0eef700..8fde61b --- a/build.xml +++ b/build.xml @@@ -436,9 -450,10 +436,10 @@@ <dependency groupId="de.jflex" artifactId="jflex" version="1.6.0" /> <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" /> <dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" version="2.4.0" /> - <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.2.6" /> + <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.3.5" /> <dependency groupId="org.jctools" artifactId="jctools-core" version="1.2.1"/> </dependencyManagement> + <developer id="adelapena" name="Andres de la Peña"/> <developer id="alakshman" name="Avinash Lakshman"/> <developer id="aleksey" name="Aleksey Yeschenko"/> <developer id="amorton" name="Aaron Morton"/>
