Merge branch '1.6' Merging with -sours for ACCUMULO-3405
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5bc1d080 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5bc1d080 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5bc1d080 Branch: refs/heads/master Commit: 5bc1d080f234c33d81a7a84ee97e14eaf695fe5b Parents: 26db8ee cb97321 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Dec 18 18:18:08 2014 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Dec 18 18:18:08 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
