Merge branch 'master' into update-endpoints-sample

Author: lesv

endpoints/getting-started/openapi.yaml

@@ -20,6 +20,9 @@ info:
   version: "1.0.0"
 host: "echo-api.endpoints.YOUR-PROJECT-ID.cloud.goog"
 # [END swagger]
+# For App Engine deployments, delete the above "host:" line and remove the "# "
+# from the following line. Then change YOUR-PROJECT-ID to your project id.
+# host: "YOUR-PROJECT-ID.appspot.com"
 basePath: "/"
 consumes:
   - "application/json"

flexible/pubsub/src/main/java/com/example/flexible/pubsub/PubSubPublish.java

@@ -51,7 +51,6 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
       publisher.publish(pubsubMessage);
       // redirect to home page
       resp.sendRedirect("/");
-      // [END publish]
     } catch (Exception e) {
       resp.sendError(HttpStatus.SC_INTERNAL_SERVER_ERROR, e.getMessage());
     }