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/0cb15fa3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0cb15fa3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0cb15fa3 Branch: refs/heads/1.7 Commit: 0cb15fa3086e3a3c0539d44577fa4aca80631466 Parents: eb6a038 cf47ce2 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Apr 7 14:30:44 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Apr 7 14:30:44 2016 -0400 ---------------------------------------------------------------------- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0cb15fa3/.travis.yml ---------------------------------------------------------------------- diff --cc .travis.yml index 645ff52,e4626ce..b249511 --- a/.travis.yml +++ b/.travis.yml @@@ -14,5 -14,8 +14,7 @@@ # limitations under the License. language: java jdk: - - openjdk6 + - openjdk7 - oraclejdk7 - script: mvn package + - oraclejdk8 + script: mvn clean verify -DskipITs