Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/tools/NodeCmd.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5968f7b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5968f7b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5968f7b2
Branch: refs/heads/trunk
Commit: 5968f7b2e87929bb5884b1711a8f4712f12d030d
Parents: 67ba050 8d2c3fe
Author: Vijay <vijay2...@gmail.com>
Authored: Sun Mar 9 14:52:17 2014 -0700
Committer: Vijay <vijay2...@gmail.com>
Committed: Sun Mar 9 14:52:17 2014 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
