Updated Branches: refs/heads/cassandra-1.2 e90dcd51d -> 79764f743 refs/heads/trunk 7c77c8415 -> 4bab13ec4
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bab13ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bab13ec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bab13ec Branch: refs/heads/trunk Commit: 4bab13ec4a036ce92c30778043f3a2391148150c Parents: 7c77c84 79764f7 Author: Brandon Williams <[email protected]> Authored: Tue Jan 15 09:10:37 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Jan 15 09:10:37 2013 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bab13ec/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
