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/1b750ad4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b750ad4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b750ad4 Branch: refs/heads/trunk Commit: 1b750ad4ccc2a59d9ada0d0ea5df3ac7c586a133 Parents: 70c0d30 8c94eb2 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Aug 9 17:53:06 2013 +0200 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Aug 9 17:53:06 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(-) ----------------------------------------------------------------------
