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