Merge branch 'cassandra-2.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/4d39d4d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d39d4d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d39d4d5 Branch: refs/heads/trunk Commit: 4d39d4d54eaa96c19bbd3e09f9ddf68e35c8579e Parents: 6aa7d6c 830137f Author: Jason Brown <[email protected]> Authored: Mon Aug 3 05:06:18 2015 -0700 Committer: Jason Brown <[email protected]> Committed: Mon Aug 3 05:06:18 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d39d4d5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d39d4d5/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
