Updated Branches: refs/heads/cassandra-1.1 d90f0f3e7 -> 2c01cba39 refs/heads/trunk 213974d84 -> 78caed6b7
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/78caed6b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78caed6b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78caed6b Branch: refs/heads/trunk Commit: 78caed6b726d2f2589ed353da68cd3cb8e60caa7 Parents: 213974d 2c01cba Author: Jonathan Ellis <[email protected]> Authored: Fri May 18 11:52:53 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri May 18 11:52:53 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78caed6b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
