From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Mon, 27 Mar 2017 14:25:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/branch-6.3'
X-Git-Tag: 6.4-RC1~536
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bad8ec4d1d7b6e7b335b4fa18d3c66e6b746ac12;p=sonarqube.git

Merge remote-tracking branch 'origin/branch-6.3'
---

bad8ec4d1d7b6e7b335b4fa18d3c66e6b746ac12
diff --cc server/sonar-server/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java
index ddb1c63444b,b2333685896..0b1204ce2cb
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java
@@@ -22,8 -22,7 +22,7 @@@ package org.sonar.server.ws
  import org.sonar.api.resources.Language;
  import org.sonar.api.resources.Languages;
  import org.sonar.api.utils.Paging;
 -import org.sonar.db.rule.RuleDto;
 +import org.sonar.db.rule.RuleDefinitionDto;
- import org.sonar.db.user.UserDto;
  import org.sonarqube.ws.Common;
  
  import static com.google.common.base.Strings.nullToEmpty;