Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1465fe1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1465fe1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1465fe1e Branch: refs/heads/trunk Commit: 1465fe1e4bacc0055aad29b8b00acabd7847b8dc Parents: e28618f 743becb Author: Aleksey Yeschenko <[email protected]> Authored: Thu May 29 19:57:46 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu May 29 19:57:46 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- NEWS.txt | 12 ++++++++++++ src/java/org/apache/cassandra/config/CFMetaData.java | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1465fe1e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1465fe1e/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1465fe1e/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
