Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/35252694 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/35252694 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/35252694 Branch: refs/heads/master Commit: 35252694b9f17fd5aec119b9799b641d665d92d9 Parents: 16c36b8 0cb15fa Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Apr 7 14:31:15 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Apr 7 14:31:15 2016 -0400 ---------------------------------------------------------------------- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
