Updated Branches: refs/heads/trunk a05a5641f -> a6c5d3c43
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/a6c5d3c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6c5d3c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6c5d3c4 Branch: refs/heads/trunk Commit: a6c5d3c4302661516e539f2c98bca908e51bb072 Parents: a05a564 698a2bb Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Apr 26 16:36:10 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Apr 26 16:36:10 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/ColumnFamily.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6c5d3c4/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6c5d3c4/src/java/org/apache/cassandra/db/ColumnFamily.java ----------------------------------------------------------------------
