Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2b0c84d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b0c84d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b0c84d5 Branch: refs/heads/cassandra-1.1 Commit: 2b0c84d5d04efff4baf0a490865642447e673645 Parents: 2fc2bd3 2a5b3ef Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Mar 1 10:34:57 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Mar 1 10:34:57 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliClient.java | 2 +- .../statements/CreateColumnFamilyStatement.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b0c84d5/src/java/org/apache/cassandra/cli/CliClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b0c84d5/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java ----------------------------------------------------------------------
