cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 02 Apr 2014 20:22:34 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/marshal/CompositeType.java
	test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java


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

Branch: refs/heads/cassandra-2.1
Commit: e66e523e6ee788fd6ed26a0605ee63cdf51d383b
Parents: c6dbba1 0e98f5b
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Wed Apr 2 15:22:09 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Wed Apr 2 15:22:09 2014 -0500

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

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



Mime
View raw message