commit f439ffcf059d4d631520a5464c097ec04cc09f82
author David Pursehouse <dpursehouse@collab.net> Wed Jun 21 01:57:13 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 21 01:57:13 2017 +0000
tree af92e41addd68f518e64deef2a5f670ec907bbc5
parent d4f2b219e366eb8b06422edb50ddc90422fd3adc
parent bb3adc0d7b76dbbfdb77d343638d3fd17dd1fac4

Merge changes I3b55501b,Iea7d1265

* changes:
  AtomicityHelper: Remove usage of deprecated SubmitInput.waitForMerge
  Adapt to upstream changes in Submit.apply(...)

src/main/java/com/criteo/gerrit/plugins/automerge/AutomergeConfig.java

diff --git a/src/main/java/com/criteo/gerrit/plugins/automerge/AutomergeConfig.java b/src/main/java/com/criteo/gerrit/plugins/automerge/AutomergeConfig.java
index 40d0811..bd1bbca 100644
--- a/src/main/java/com/criteo/gerrit/plugins/automerge/AutomergeConfig.java
+++ b/src/main/java/com/criteo/gerrit/plugins/automerge/AutomergeConfig.java
@@ -7,8 +7,6 @@
 import org.eclipse.jgit.lib.Config;
 
 import java.io.File;
-import java.io.IOException;
-
 
 public class AutomergeConfig {
 
@@ -55,9 +53,7 @@
   /**
    * Return a comment from a file located in the gerrit etc_dir
    *
-   * @param filename
    * @return a string containing a comment.
-   * @throws IOException
    */
   public final String getTemplatesPath() {
     return templatesPath.getPath();