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:17 UTC
[6/8] cassandra git commit: Merge branch cassandra-2.1 into
cassandra-2.2
Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fb4e58b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fb4e58b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fb4e58b
Branch: refs/heads/trunk
Commit: 5fb4e58bc9d85f8248852982d4ef7a216967ade7
Parents: 01a11fd 264cf36
Author: blerer <be...@datastax.com>
Authored: Fri Aug 28 16:03:16 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Fri Aug 28 16:07:49 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(-)
----------------------------------------------------------------------