]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-5.0' into fix/merge-5.0
authorTeryk Bellahsene <teryk.bellahsene@sonarsource.com>
Thu, 12 Feb 2015 08:28:32 +0000 (09:28 +0100)
committerTeryk Bellahsene <teryk.bellahsene@sonarsource.com>
Thu, 12 Feb 2015 08:28:32 +0000 (09:28 +0100)
commit372cab29ac3ee6afb5615141e11c96ad1cb6540e
tree9f8edd6403e08fcd8a0d3a7f7d1431d2098adce1
parentd41d216c069d4144def36514be7c290f4706c116
parent9b6a8ecd0475b2f4035ce29c04387b7fff9970b6
Merge remote-tracking branch 'origin/branch-5.0' into fix/merge-5.0

* origin/branch-5.0:
  SONAR-6130 fix deadlock during purge

Conflicts:
sonar-core/src/main/java/org/sonar/core/purge/PurgeDao.java
sonar-core/src/test/java/org/sonar/core/purge/PurgeDaoTest.java
sonar-core/src/main/java/org/sonar/core/purge/PurgeDao.java