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/e269cf11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e269cf11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e269cf11 Branch: refs/heads/trunk Commit: e269cf116b19ea2cb26dc8fdf8b062ad0c680a43 Parents: ab94f28 a25ac14 Author: Dave Brosius <dbros...@apache.org> Authored: Sat Apr 13 17:28:31 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Sat Apr 13 17:28:31 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/Shuffle.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e269cf11/src/java/org/apache/cassandra/tools/Shuffle.java ----------------------------------------------------------------------
