diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2013-09-26 22:07:34 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2013-09-26 22:07:44 +0900 |
| commit | 8c5809d59cdd2adbe53e0290c7f5dc4f32cf8891 (patch) | |
| tree | f3be894f17d67c7eb1824191c8c618714b1ff20d /gerrit-httpd | |
| parent | 01cea13727927133ad9a820287a19f989a5c0d5c (diff) | |
| parent | 48933d3c3e4a756c70f293e10baa7477bf139388 (diff) | |
Merge branch 'stable-2.6' into stable-2.7
* stable-2.6:
Fix documentation of query label operator
Fix: change list shows '1' instead of '-1' for label score.
Remove unused imports
Change-Id: I81307db450717eb11ca1ae1b5226fa98d518e60a
Diffstat (limited to 'gerrit-httpd')
| -rw-r--r-- | gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java | 1 | ||||
| -rw-r--r-- | gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java index fe7aa23dd5..d2a25a811c 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java @@ -36,7 +36,6 @@ import org.w3c.dom.NodeList; import java.io.IOException; -import javax.annotation.Nullable; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java index 9a2a7dad8f..037c7bbc95 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java @@ -27,7 +27,6 @@ import com.google.gerrit.server.account.AccountUserNameException; import com.google.gerrit.server.account.AuthRequest; import com.google.gerrit.server.account.AuthResult; import com.google.gerrit.server.auth.AuthenticationUnavailableException; -import com.google.gerrit.server.config.SitePaths; import com.google.gwtexpui.server.CacheHeaders; import com.google.inject.Inject; import com.google.inject.Provider; |