]> source.dussan.org Git - sonarqube.git/commitdiff
Automatic merge from branch-5.6
authorJenkins CI <ci@sonarsource.com>
Fri, 27 May 2016 08:10:42 +0000 (10:10 +0200)
committerJenkins CI <ci@sonarsource.com>
Fri, 27 May 2016 08:10:42 +0000 (10:10 +0200)
* origin/branch-5.6:
  SONAR-7652 fix connection to SQL Azure
  Upgrade version of java 8 on Travis
  SONAR-7653 remove useless code
  SONAR-7653 remove Java option XX:MaxPermSize
  SONAR-7587 end of support of Java 7

1  2 
it/it-tests/pom.xml
pom.xml
sonar-db/pom.xml
tests/upgrade/pom.xml

Simple merge
diff --cc pom.xml
Simple merge
Simple merge
Simple merge