Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4dabc2bd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4dabc2bd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4dabc2bd Branch: refs/heads/1.8 Commit: 4dabc2bdaf0f47ed9903b70ce0ddff5f20575d5f Parents: 7f12433 60ac92d Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Jun 8 23:58:58 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Jun 8 23:58:58 2016 -0400 ---------------------------------------------------------------------- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------------