Merge branch '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/b693b6da Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b693b6da Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b693b6da Branch: refs/heads/master Commit: b693b6da8be9608372684cfa64fe34fc45ea4f6a Parents: 6bc6760 dff686b Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jan 8 20:22:11 2015 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jan 8 20:22:11 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------