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/18caa5b1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18caa5b1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18caa5b1 Branch: refs/heads/master Commit: 18caa5b17415e0e570267fa8f25b5f3d9b8b6870 Parents: d42b770 2056cff Author: Christopher Tubbs <ctubb...@apache.org> Authored: Sun Apr 17 13:06:45 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Sun Apr 17 13:06:45 2016 -0400 ---------------------------------------------------------------------- .travis.yml | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/18caa5b1/.travis.yml ---------------------------------------------------------------------- diff --cc .travis.yml index cf23377,1937917..c6a948f --- a/.travis.yml +++ b/.travis.yml @@@ -31,8 -31,10 +31,9 @@@ jdk - oraclejdk8 - oraclejdk7 - openjdk7 - - openjdk6 # clear any cache of accumulo artifacts, just in case; use https for central before_script: + - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname)/" /etc/hosts | sudo tee /etc/hosts - rm -rf $HOME/.m2/repository/org/apache/accumulo - echo "<settings xmlns='http://maven.apache.org/SETTINGS/1.0.0'><mirrors><mirror><id>secure-central</id><url>https://repo.maven.apache.org/maven2</url><mirrorOf>central</mirrorOf></mirror></mirrors></settings>" > $HOME/settings-custom.xml script: mvn --settings $HOME/settings-custom.xml clean verify -DskipITs
