Merge branch cassandra-3.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/74f4bc33 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74f4bc33 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74f4bc33 Branch: refs/heads/trunk Commit: 74f4bc331fa8e4f9b417fb961dc5bd208b9088a1 Parents: 0f980e5 c1740a2 Author: blerer <benjamin.le...@datastax.com> Authored: Wed Aug 26 15:26:17 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Wed Aug 26 15:31:22 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 4 ++-- src/java/org/apache/cassandra/config/Config.java | 2 +- .../org/apache/cassandra/serializers/MapSerializer.java | 11 ----------- .../org/apache/cassandra/serializers/SetSerializer.java | 3 +-- 5 files changed, 5 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74f4bc33/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74f4bc33/src/java/org/apache/cassandra/config/Config.java ----------------------------------------------------------------------
