Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cli/CliClient.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/447443f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/447443f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/447443f4
Branch: refs/heads/trunk
Commit: 447443f4f428ff721486cdb8e0a4681001709455
Parents: b1a0e4e 459c48b
Author: Tyler Hobbs <[email protected]>
Authored: Wed Apr 8 13:12:43 2015 -0500
Committer: Tyler Hobbs <[email protected]>
Committed: Wed Apr 8 13:12:43 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/447443f4/CHANGES.txt
----------------------------------------------------------------------
