Merge pull request #16 from awslabs/master

Merging AWSLabs changes back to Jenkins copy.

Author: Jmcfar

src/main/java/com/amazonaws/codedeploy/AWSClients.java

@@ -90,6 +90,8 @@ public static AWSClients fromBasicCredentials(String region, String awsAccessKey
     /**
      * Via the default provider chain (i.e., global keys for this Jenkins instance),  return the account ID for the
      * currently authenticated user.
+     * @param proxyHost hostname of the proxy to use (if any)
+     * @param proxyPort port of the proxy to use (if any)
      * @return 12-digit account id
      */
     public static String getAccountId(String proxyHost, int proxyPort) {

src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java

@@ -70,7 +70,7 @@
 /**
  * The AWS CodeDeploy Publisher is a post-build plugin that adds the ability to start a new CodeDeploy deployment
  * with the project's workspace as the application revision.
- * <p/>
+ *
  * To configure, users must create an IAM role that allows "S3" and "CodeDeploy" actions and must be assumable by
  * the globally configured keys. This allows the plugin to get temporary credentials instead of requiring permanent
  * credentials to be configured for each project.
@@ -488,15 +488,13 @@ public DescriptorImpl getDescriptor() {
     }
 
     public BuildStepMonitor getRequiredMonitorService() {
-
-        return BuildStepMonitor.STEP;
+        return BuildStepMonitor.NONE;
     }
 
     /**
      * Descriptor for {@link AWSCodeDeployPublisher}. Used as a singleton.
      * The class is marked as public so that it can be accessed from views.
-     * <p/>
-     * <p/>
+     *
      * See <tt>src/main/resources/com/amazonaws/codedeploy/AWSCodeDeployPublisher/*.jelly</tt>
      * for the actual HTML fragment for the configuration screen.
      */