Updated Branches: refs/heads/cassandra-1.2 63c5a9e2b -> a6d4f7a4e refs/heads/cassandra-1.2.0 bc598b5a0 -> d67816bee refs/heads/trunk 02c8e233b -> 77fb2080f
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/77fb2080 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77fb2080 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77fb2080 Branch: refs/heads/trunk Commit: 77fb2080f3fb3a9c17e020656e186dbc23c03578 Parents: 02c8e23 a6d4f7a Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 18 14:32:32 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 18 14:32:32 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageService.java | 18 ++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/77fb2080/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/77fb2080/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
