Updated Branches: refs/heads/trunk 4bab13ec4 -> bffb4bdfe
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/bffb4bdf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bffb4bdf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bffb4bdf Branch: refs/heads/trunk Commit: bffb4bdfe60b143d2f5e52426792a1e9f9b67a3e Parents: 4bab13e ec35427 Author: Sylvain Lebresne <[email protected]> Authored: Tue Jan 15 16:26:27 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Jan 15 16:26:27 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/SystemTable.java | 1 + .../apache/cassandra/service/StorageService.java | 3 ++- 3 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffb4bdf/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffb4bdf/src/java/org/apache/cassandra/db/SystemTable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffb4bdf/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
