Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03e2e0a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03e2e0a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03e2e0a1 Branch: refs/heads/trunk Commit: 03e2e0a178034f509acf52ecaeaf796e589dca58 Parents: 29c5fe6 37551e9 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Mon Oct 10 09:53:56 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Mon Oct 10 09:53:56 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 14 ++++++++++++-- .../org/apache/cassandra/db/SerializationHeader.java | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03e2e0a1/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03e2e0a1/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
