cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [4/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Sat, 22 Mar 2014 20:56:13 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: e955016eeb942700b908f64d56bffea654bf045b
Parents: 2574f05 1fbdb48
Author: Vijay <vijay2win@gmail.com>
Authored: Sat Mar 22 13:55:00 2014 -0700
Committer: Vijay <vijay2win@gmail.com>
Committed: Sat Mar 22 13:55:00 2014 -0700

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/NodeTool.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------



Mime
View raw message