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/39cf55a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39cf55a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39cf55a5 Branch: refs/heads/trunk Commit: 39cf55a543efc0ef9d3cc83ea225a8d068d3d537 Parents: 4902bdc c5820ed Author: Dave Brosius <[email protected]> Authored: Mon Apr 8 23:31:30 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Mon Apr 8 23:31:30 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + debian/changelog | 6 ++++++ .../apache/cassandra/tools/AbstractJmxClient.java | 11 ++++++----- src/java/org/apache/cassandra/tools/Shuffle.java | 11 +++++++---- 4 files changed, 20 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39cf55a5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39cf55a5/src/java/org/apache/cassandra/tools/Shuffle.java ----------------------------------------------------------------------
