Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e1000f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e1000f6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e1000f6 Branch: refs/heads/trunk Commit: 8e1000f602e855faeb62b73eadc2dd597360ae8e Parents: 6aaa023 e9a57fb Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Sun Jan 19 19:38:24 2014 -0800 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Sun Jan 19 19:38:24 2014 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/marshal/CompositeType.java | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e1000f6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e1000f6/src/java/org/apache/cassandra/db/marshal/CompositeType.java ----------------------------------------------------------------------
