cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 15 Jul 2014 23:23:53 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 82cfcab4c8ab3a14cc38d86898721901ef5a02f9
Parents: 6319dc8 c70216a
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Tue Jul 15 18:23:39 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Tue Jul 15 18:23:39 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                       | 1 +
 src/java/org/apache/cassandra/tools/NodeTool.java | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/82cfcab4/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/82cfcab4/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------


Mime
View raw message