Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c63731d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c63731d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c63731d Branch: refs/heads/master Commit: 0c63731dafcf07cd496272c1dcfec2488360f8db Parents: 8260914 76e7fff Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Dec 17 21:10:32 2014 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Dec 17 21:10:32 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
