Merge branch 'cassandra-2.0' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ecfb403d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecfb403d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecfb403d

Branch: refs/heads/trunk
Commit: ecfb403da94efe161348ad85de45166b766673fb
Parents: db82949 55a5500
Author: Jonathan Ellis <jbel...@apache.org>
Authored: Thu Oct 3 09:53:14 2013 -0500
Committer: Jonathan Ellis <jbel...@apache.org>
Committed: Thu Oct 3 09:53:14 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/NodeCmd.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


Reply via email to