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/8c94eb2f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c94eb2f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c94eb2f Branch: refs/heads/trunk Commit: 8c94eb2fe3f931fd7be42dd5b0dc9717476f54b4 Parents: bb3f09c 2bcfab0 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Aug 9 17:52:42 2013 +0200 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Aug 9 17:52:42 2013 +0200 ---------------------------------------------------------------------- pylib/cqlshlib/cql3handling.py | 17 +------------- .../org/apache/cassandra/cql3/CFPropDefs.java | 24 +++++--------------- .../org/apache/cassandra/cql3/KSPropDefs.java | 8 +++---- 3 files changed, 10 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
