You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/03/01 17:35:37 UTC
[1/11] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/cassandra-1.1 2fc2bd393 -> 2b0c84d5d
refs/heads/cassandra-1.1.0 6ed098d31 -> 2a5b3ef04
refs/heads/trunk 4bae17438 -> d6ad445e4
Merge branch 'cassandra-1.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6ad445e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6ad445e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6ad445e
Branch: refs/heads/trunk
Commit: d6ad445e4ed48aa0c45b64b0178a82387a972c89
Parents: 4bae174 2b0c84d
Author: Brandon Williams <br...@apache.org>
Authored: Thu Mar 1 10:35:29 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Mar 1 10:35:29 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/d6ad445e/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6ad445e/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
----------------------------------------------------------------------