From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Tue, 17 Mar 2015 08:32:20 +0000 (+0100)
Subject: Manual merge from branch-5.1
X-Git-Tag: 5.2-RC1~2565
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7f32a128f3997c0fe8fa32b3462129faace2c154;p=sonarqube.git

Manual merge from branch-5.1
---

7f32a128f3997c0fe8fa32b3462129faace2c154
diff --cc server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
index a3e02ea1211,ea847c6e095..87a8e607fae
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
@@@ -61,9 -64,7 +61,8 @@@ import org.sonar.server.view.index.View
  import javax.annotation.CheckForNull;
  import javax.annotation.Nullable;
  
- import java.text.SimpleDateFormat;
  import java.util.*;
 +import java.util.regex.Pattern;
  
  import static com.google.common.collect.Lists.newArrayList;