Merge branch '1.5' into 1.6 with -sours
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dff686b4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dff686b4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dff686b4 Branch: refs/heads/master Commit: dff686b454e67e74150d967bdc3eb94dcb5e39a6 Parents: 100ffd1 c2155f4 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jan 8 20:21:16 2015 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jan 8 20:21:16 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
