cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Tue, 08 Sep 2015 16:22:46 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
	src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java


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

Branch: refs/heads/trunk
Commit: 62b6d8ce08969a5d4a7e1ff73c661a5b7d1cfbff
Parents: 34bbb44 7b083a4
Author: Joshua McKenzie <jmckenzie@apache.org>
Authored: Tue Sep 8 12:21:30 2015 -0400
Committer: Joshua McKenzie <jmckenzie@apache.org>
Committed: Tue Sep 8 12:21:30 2015 -0400

----------------------------------------------------------------------
 .../cassandra/io/sstable/SnapshotDeletingTask.java      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------



Mime
View raw message