Merge branch 'ACCUMULO-1854-merge' into ACCUMULO-1854-1.5-merge
Conflicts:
src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4dfe3e01
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4dfe3e01
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4dfe3e01
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4dfe3e01719696c483d65d62a42be11cb067746a
Parents: 16a2e0f 3beb9f7
Author: Josh Elser <els...@apache.org>
Authored: Thu Nov 21 20:20:02 2013 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Thu Nov 21 20:20:02 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
