Merge branch '1.6' into 1.7 * This preserves the existing configuration and formatting in the 1.7 branch (equivalent to merging with -sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5efa0bd9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5efa0bd9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5efa0bd9 Branch: refs/heads/master Commit: 5efa0bd9ba93edef9b78f01d82229fcfff9b49fc Parents: af21ac5 da7aaea Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Dec 22 18:35:11 2015 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Dec 22 18:35:11 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
