From 33db72727e6ddbb1dd2da255e484e832cbede439 Mon Sep 17 00:00:00 2001
From: Michael Darakananda <pongad@google.com>
Date: Fri, 20 Jul 2018 13:52:30 -0700
Subject: [PATCH 1/2] pubsub: document auto message extension

Also tweak CircleCI doc test. It is sufficient to just generate the
docs; compressing is slow.
---
 .circleci/config.yml                                          | 2 +-
 .../src/main/java/com/google/cloud/pubsub/v1/Subscriber.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 403835e47841..3338941cd87d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -230,7 +230,7 @@ jobs:
           <<: *anchor_build
       - run:
           name: Run mvn javadoc goal
-          command: mvn javadoc:jar javadoc:test-jar
+          command: mvn javadoc:javadoc javadoc:test-javadoc
 
 workflows:
   version: 2
diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
index 8669682e727c..5debfdf3218f 100644
--- a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
+++ b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
@@ -70,7 +70,7 @@
  *
  * <p>The subscriber handles the ack management, by automatically extending the ack deadline while
  * the message is being processed, to then issue the ack or nack of such message when the processing
- * is done. <strong>Note:</strong> message redelivery is still possible.
+ * is done (see {@link Builder#setMaxAckExtensionPeriod(Duration)}). <strong>Note:</strong> message redelivery is still possible.
  *
  * <p>It also provides customizable options that control:
  *
@@ -547,7 +547,7 @@ Builder setAckExpirationPadding(Duration ackExpirationPadding) {
     }
 
     /**
-     * Set the maximum period a message ack deadline will be extended.
+     * Set the maximum period a message ack deadline will be extended. Defaults to one hour.
      *
      * <p>It is recommended to set this value to a reasonable upper bound of the subscriber time to
      * process any message. This maximum period avoids messages to be <i>locked</i> by a subscriber

From fd2c3d856b6b2a5e404df2ca3db017a1cf1ed7df Mon Sep 17 00:00:00 2001
From: Michael Darakananda <pongad@google.com>
Date: Mon, 23 Jul 2018 10:36:26 -0700
Subject: [PATCH 2/2] revert CI change

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3338941cd87d..403835e47841 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -230,7 +230,7 @@ jobs:
           <<: *anchor_build
       - run:
           name: Run mvn javadoc goal
-          command: mvn javadoc:javadoc javadoc:test-javadoc
+          command: mvn javadoc:jar javadoc:test-jar
 
 workflows:
   version: 2