cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Thu, 08 Jan 2015 19:03:10 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/commitlog/CommitLog.java
	test/unit/org/apache/cassandra/db/CommitLogTest.java


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

Branch: refs/heads/cassandra-2.1
Commit: fb953094899b31e4a1d2efbf8d5ad9a3a26496e7
Parents: 5ac5ee6 5e797eb
Author: Joshua McKenzie <jmckenzie@apache.org>
Authored: Thu Jan 8 12:59:45 2015 -0600
Committer: Joshua McKenzie <jmckenzie@apache.org>
Committed: Thu Jan 8 12:59:45 2015 -0600

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/CommitLogTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb953094/test/unit/org/apache/cassandra/db/CommitLogTest.java
----------------------------------------------------------------------


Mime
View raw message