Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d57ce284 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d57ce284 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d57ce284 Branch: refs/heads/trunk Commit: d57ce284505d33f6cb568fd577532f2aa4f4ddfa Parents: c1c29d8 53f19c8 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Sep 12 18:45:34 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Sep 12 18:45:34 2013 +0300 ---------------------------------------------------------------------- build.xml | 2 +- lib/guava-13.0.1.jar | Bin 1891110 -> 0 bytes lib/guava-15.0.jar | Bin 0 -> 2172168 bytes lib/licenses/guava-13.0.1.txt | 202 ------------------------------------- lib/licenses/guava-15.0.txt | 202 +++++++++++++++++++++++++++++++++++++ 5 files changed, 203 insertions(+), 203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d57ce284/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 79a64eb,6aab42a..50a1b36 --- a/build.xml +++ b/build.xml @@@ -336,9 -336,9 +336,9 @@@ <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/> <dependencyManagement> <dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.0.5"/> - <dependency groupId="net.jpountz.lz4" artifactId="lz4" version="1.1.0"/> + <dependency groupId="net.jpountz.lz4" artifactId="lz4" version="1.1.2"/> <dependency groupId="com.ning" artifactId="compress-lzf" version="0.8.4"/> - <dependency groupId="com.google.guava" artifactId="guava" version="13.0.1"/> + <dependency groupId="com.google.guava" artifactId="guava" version="15.0"/> <dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/> <dependency groupId="commons-codec" artifactId="commons-codec" version="1.2"/> <dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.1"/>
