Merge branch '1.6.1-SNAPSHOT' Merging ACCUMULO-2934 to master, with -sours, since that change only applies to 1.6.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5026b131 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5026b131 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5026b131 Branch: refs/heads/master Commit: 5026b1314a6595c15b652ffdd6653894e529f0dd Parents: 2120178 3583409 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jun 23 19:24:19 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jun 23 19:24:19 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
