Updated Branches: refs/heads/trunk b2cb52d8a -> 372708461
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/37270846 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37270846 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37270846 Branch: refs/heads/trunk Commit: 37270846182873f6433887418e2f08bd3bb1d533 Parents: b2cb52d 4884c1f Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Apr 9 19:09:57 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Apr 9 19:09:57 2012 +0200 ---------------------------------------------------------------------- .../apache/cassandra/config/ColumnDefinition.java | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/37270846/src/java/org/apache/cassandra/config/ColumnDefinition.java ----------------------------------------------------------------------