Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bfcb0edb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bfcb0edb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bfcb0edb Branch: refs/heads/master Commit: bfcb0edb6e209b56aa3a061594fc9a246c6e0639 Parents: ccc9a67 4ac9085 Author: Josh Elser <els...@apache.org> Authored: Mon Nov 24 11:39:34 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Nov 24 11:39:34 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/examples/simple/combiner/StatsCombiner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
