cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 05 Nov 2014 13:32:08 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java


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

Branch: refs/heads/cassandra-2.1
Commit: 98acdb8dd12d295ad8c61a460947f581174550de
Parents: e16f584 32da3c8
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Nov 5 16:31:55 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Nov 5 16:31:55 2014 +0300

----------------------------------------------------------------------

----------------------------------------------------------------------



Mime
View raw message