Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a712387 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a712387 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a712387 Branch: refs/heads/trunk Commit: 9a712387062164405fc5a96facd239a0bb537b7d Parents: e7852a3 26bd512 Author: T Jake Luciani <[email protected]> Authored: Thu Jun 25 14:35:10 2015 -0400 Committer: T Jake Luciani <[email protected]> Committed: Thu Jun 25 14:35:10 2015 -0400 ---------------------------------------------------------------------- build.xml | 7 ------- tools/lib/netty-3.9.0.Final.jar | Bin 1231993 -> 0 bytes .../cassandra/stress/util/JavaDriverClient.java | 4 ++++ 3 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a712387/build.xml ----------------------------------------------------------------------
