Updated Branches: refs/heads/cassandra-1.2 dda7aee34 -> 5c81f4b92 refs/heads/cassandra-1.2.0 dda7aee34 -> 5c81f4b92 refs/heads/trunk fa8550f35 -> d82c4408c
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d82c4408 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d82c4408 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d82c4408 Branch: refs/heads/trunk Commit: d82c4408ce62cd815a065fffdd1b30564815c991 Parents: fa8550f 5c81f4b Author: Jonathan Ellis <[email protected]> Authored: Fri Nov 9 17:35:57 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Nov 9 17:35:57 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cli/CliClient.java | 118 +++++++++++---- src/java/org/apache/cassandra/cli/CliCompiler.java | 4 +- src/java/org/apache/cassandra/cli/Cql3CfDef.java | 5 - .../statements/CreateColumnFamilyStatement.java | 11 +- 5 files changed, 95 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
