Updated Branches: refs/heads/cassandra-1.1 eacdca02d -> ae76bda56 refs/heads/trunk 27a816e5f -> 4dc18a215
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/4dc18a21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dc18a21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dc18a21 Branch: refs/heads/trunk Commit: 4dc18a2158012f7811391da9c9c141fc8f1fb150 Parents: 27a816e ae76bda Author: Brandon Williams <[email protected]> Authored: Mon Jun 25 12:52:16 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Jun 25 12:52:16 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/4dc18a21/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
