You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by el...@apache.org on 2015/09/02 05:28:56 UTC

[18/19] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7

Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java


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

Branch: refs/heads/master
Commit: 20330055886fd3f093b06b8c5218220b575aaecf
Parents: 9b3d7c1 07ac4c8
Author: Josh Elser <el...@apache.org>
Authored: Tue Sep 1 23:28:35 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Sep 1 23:28:35 2015 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------