You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/08/28 16:16:19 UTC

[8/8] cassandra git commit: Merge branch cassandra-3.0 into trunk

Merge branch cassandra-3.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/edade5ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edade5ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edade5ac

Branch: refs/heads/trunk
Commit: edade5ac33f29a88fd24df0bd96b3984c302be10
Parents: bf85616 efe9a7d
Author: blerer <be...@datastax.com>
Authored: Fri Aug 28 16:14:54 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Fri Aug 28 16:15:00 2015 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/NodeTool.java        | 8 ++++----
 src/java/org/apache/cassandra/tools/nodetool/Status.java | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------