Updated Branches: refs/heads/trunk 2ed977a3c -> 09ff86140
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/09ff8614 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09ff8614 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09ff8614 Branch: refs/heads/trunk Commit: 09ff861408759f86c0ae007e30fe956691c1875a Parents: 2ed977a a7ed01c Author: Sylvain Lebresne <[email protected]> Authored: Tue May 22 17:15:09 2012 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue May 22 17:15:09 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/CFDefinition.java | 10 +++++----- .../apache/cassandra/cql3/ColumnIdentifier.java | 14 ++++---------- 3 files changed, 10 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09ff8614/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09ff8614/src/java/org/apache/cassandra/cql3/CFDefinition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09ff8614/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java ----------------------------------------------------------------------
