Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/125f19a8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/125f19a8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/125f19a8
Branch: refs/heads/trunk
Commit: 125f19a8887ef308a6285c754824f1226885eef4
Parents: 536a08c 191cedf
Author: Sylvain Lebresne <[email protected]>
Authored: Mon Aug 25 16:01:19 2014 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Mon Aug 25 16:01:19 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
