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/ad342470 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad342470 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad342470 Branch: refs/heads/trunk Commit: ad3424707fec9cecad3e5c9a18582cd9933d07ac Parents: dbf3e1c ece3864 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 30 12:50:20 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 30 12:50:20 2014 -0500 ---------------------------------------------------------------------- README.asc | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.txt | 102 -------------------------------------------------------- 2 files changed, 99 insertions(+), 102 deletions(-) ----------------------------------------------------------------------