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/trunk
Commit: e66e523e6ee788fd6ed26a0605ee63cdf51d383b
Parents: c6dbba1 0e98f5b
Author: Tyler Hobbs <[email protected]>
Authored: Wed Apr 2 15:22:09 2014 -0500
Committer: Tyler Hobbs <[email protected]>
Committed: Wed Apr 2 15:22:09 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
