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/093e188a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/093e188a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/093e188a Branch: refs/heads/trunk Commit: 093e188a42523f623639d0705608b67dc2578cc4 Parents: 2b86c9a f30015c Author: Dave Brosius <dbros...@apache.org> Authored: Tue Jun 18 08:46:06 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Tue Jun 18 08:46:06 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/093e188a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/093e188a/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
