cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [6/7] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Mon, 18 Nov 2013 16:34:27 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/thrift/CassandraServer.java


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

Branch: refs/heads/trunk
Commit: 4444fd6ff7464bede6dbcc634ffd3ff8cf1650e7
Parents: 25471ba 1ac6019
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Nov 18 17:31:49 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Nov 18 17:31:49 2013 +0100

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

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



Mime
View raw message