Merge branch 'cassandra-2.0.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/e472ba4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e472ba4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e472ba4a Branch: refs/heads/cassandra-2.0 Commit: e472ba4aa36d4cd78440896891846800c7e986c5 Parents: 1485758 1c606bb Author: Aleksey Yeschenko <[email protected]> Authored: Mon Aug 12 12:40:15 2013 +0200 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Aug 12 12:40:15 2013 +0200 ---------------------------------------------------------------------- pylib/cqlshlib/cql3handling.py | 4 ---- src/java/org/apache/cassandra/config/CFMetaData.java | 2 -- 2 files changed, 6 deletions(-) ----------------------------------------------------------------------
