Merge commit '81fce53aca1954e42f2b263b3cb7153d2e8ce778' Merged with -sours, since it only applies only to the 1.6 branch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4165a56 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4165a56 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a4165a56 Branch: refs/heads/master Commit: a4165a56a9d820b61a9034de9ceef656051ffcbb Parents: 392d9d6 81fce53 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Jan 9 13:39:20 2015 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Jan 9 13:39:20 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------