]> source.dussan.org Git - sonarqube.git/commit
Merge branch 'master' into issues-in-es
authorStephane Gamard <stephane.gamard@sonarsource.com>
Tue, 9 Sep 2014 13:05:27 +0000 (15:05 +0200)
committerStephane Gamard <stephane.gamard@sonarsource.com>
Tue, 9 Sep 2014 13:05:27 +0000 (15:05 +0200)
commitd7a4731e80067b0ba11ca1d60c0b0eb3eca7277a
treec0759b80fc005a3f6b31e302b56c029af5178d23
parentcc5f905e907f8260b8e57379b0a5f434fa7d6238
parent31df88a00c7333926d6fce69215cc1df52789a7f
Merge branch 'master' into issues-in-es

Conflicts:
server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java
server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java
server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java
server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java
server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueDao.java