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/3ad82c73 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ad82c73 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ad82c73 Branch: refs/heads/trunk Commit: 3ad82c730e468e32a2de9fe1eeec80fbf54326c4 Parents: cbbc119 1b21aef Author: Aleksey Yeschenko <[email protected]> Authored: Sat Nov 15 00:07:16 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Sat Nov 15 00:07:16 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/CFMetaData.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ad82c73/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
