Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b892c09a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b892c09a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b892c09a Branch: refs/heads/cassandra-2.0 Commit: b892c09aca6a5a97553d3a02a008da7250498565 Parents: 447c64c 32dbe58 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Dec 4 17:56:00 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Dec 4 17:56:00 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/marshal/CollectionType.java | 17 +++++++++++++++++ .../org/apache/cassandra/db/marshal/ListType.java | 2 ++ .../org/apache/cassandra/db/marshal/MapType.java | 2 ++ .../org/apache/cassandra/db/marshal/SetType.java | 2 ++ .../org/apache/cassandra/service/MoveTest.java | 2 ++ 6 files changed, 26 insertions(+) ----------------------------------------------------------------------
