Updated Branches: refs/heads/cassandra-1.2 aa7c7d9cd -> 85cfd383b refs/heads/trunk c1e5b0ffa -> 7d81f8cb5
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/7d81f8cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d81f8cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d81f8cb Branch: refs/heads/trunk Commit: 7d81f8cb565f5d1aab278062e44e95729e12f6da Parents: c1e5b0f 85cfd38 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Feb 12 16:55:39 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Feb 12 16:55:39 2013 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/SystemTable.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d81f8cb/src/java/org/apache/cassandra/db/SystemTable.java ----------------------------------------------------------------------