Updated Branches: refs/heads/cassandra-1.2 056f38cc1 -> e6b6eaa58 refs/heads/trunk 66b9d114e -> 8b39a1615
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/8b39a161 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b39a161 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b39a161 Branch: refs/heads/trunk Commit: 8b39a1615804e853541d46b9f79c8aeef55c8969 Parents: 66b9d11 e6b6eaa Author: Brandon Williams <[email protected]> Authored: Fri Jan 18 10:19:52 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Jan 18 10:19:52 2013 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/SystemTable.java | 18 +++--------- .../apache/cassandra/service/StorageService.java | 22 +++++++++------ .../org/apache/cassandra/db/SystemTableTest.java | 2 +- 3 files changed, 19 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b39a161/src/java/org/apache/cassandra/db/SystemTable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b39a161/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
