Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc630832 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc630832 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc630832 Branch: refs/heads/trunk Commit: bc6308321729ac613b3db912782ff257b43c568e Parents: aad152d 94f1107 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Aug 22 16:17:01 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Aug 22 16:17:01 2014 +0200 ---------------------------------------------------------------------- build.xml | 2 +- tools/lib/cassandra-driver-core-2.0.4.jar | Bin 544025 -> 0 bytes tools/lib/cassandra-driver-core-2.0.5.jar | Bin 0 -> 544552 bytes 3 files changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc630832/build.xml ----------------------------------------------------------------------
