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/471f5cc3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/471f5cc3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/471f5cc3 Branch: refs/heads/trunk Commit: 471f5cc34c99f1f6dc42848446c2739390d7cc7a Parents: 3339864 66a6990 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Apr 10 15:53:39 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Apr 10 15:53:39 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/repair/Differencer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------