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