Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e447805 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e447805 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e447805 Branch: refs/heads/ACCUMULO-378 Commit: 5e4478057533d349be9c53312fd2a1d9787b9834 Parents: 7d639d8 ab4ecfc Author: Josh Elser <els...@apache.org> Authored: Thu Jun 12 22:35:17 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jun 12 22:35:17 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/iterators/Combiner.java | 10 +++++----- .../accumulo/core/util/format/DefaultFormatter.java | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
