Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17055bfd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17055bfd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17055bfd Branch: refs/heads/cassandra-2.1 Commit: 17055bfdb0eb4f0a3d43b7c920aff3d1fa2a6ce6 Parents: 59123b6 78b734e Author: Sylvain Lebresne <[email protected]> Authored: Thu Aug 7 16:07:46 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Aug 7 16:07:46 2014 +0200 ---------------------------------------------------------------------- .../apache/cassandra/config/DatabaseDescriptor.java | 5 +++++ .../org/apache/cassandra/service/StorageService.java | 6 ++++++ .../apache/cassandra/service/StorageServiceMBean.java | 3 +++ src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++++ src/java/org/apache/cassandra/tools/NodeTool.java | 14 ++++++++++++++ 5 files changed, 32 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17055bfd/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17055bfd/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17055bfd/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17055bfd/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
