Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c20996d8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c20996d8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c20996d8 Branch: refs/heads/master Commit: c20996d83ee0fd64c864d3af1c1ac9deee5ac8d5 Parents: 3aa9d30 4d952ac Author: Josh Elser <els...@apache.org> Authored: Thu Dec 3 16:48:59 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Dec 3 16:48:59 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------