Merge branch '1.4.5-SNAPSHOT' into ACCUMULO-1854-1.5-merge
Conflicts:
core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java
src/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3a703d75
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3a703d75
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3a703d75
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3a703d75d0bc37ad7aceb7357f1a69b67b7216d4
Parents: 6718920 e1dd6f9
Author: Josh Elser <els...@apache.org>
Authored: Fri Nov 22 20:29:48 2013 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Fri Nov 22 20:29:48 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
