[3/3] accumulo git commit: Merge branch '1.6'

[elserj]

Merge branch '1.6'

Conflicts:
        test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/58af0ce9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58af0ce9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/58af0ce9

Branch: refs/heads/master
Commit: 58af0ce9f04cb1efa59f69c8abdeb87e3c73504c
Parents: 60969b3 27269c4
Author: Josh Elser <els...@apache.org>
Authored: Thu Nov 13 10:53:08 2014 -0800
Committer: Josh Elser <els...@apache.org>
Committed: Thu Nov 13 10:53:08 2014 -0800

----------------------------------------------------------------------
 .../org/apache/accumulo/test/functional/BulkFileIT.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/58af0ce9/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
----------------------------------------------------------------------