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/35047a8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35047a8f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35047a8f Branch: refs/heads/trunk Commit: 35047a8f67c0b2c323cec695788a3dc0322eef98 Parents: 049adcd d33e29a Author: Jonathan Ellis <[email protected]> Authored: Fri Aug 1 21:03:23 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Aug 1 21:03:23 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.sh | 7 +- .../cassandra/service/CassandraDaemon.java | 2 +- .../apache/cassandra/service/GCInspector.java | 145 ++++++------------- 4 files changed, 53 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/35047a8f/CHANGES.txt ----------------------------------------------------------------------
