---

mziccard · mziccard · commit 1ba52a6c9a86 · 2016-03-30T19:15:22.000+02:00
yaml --- r: 4687 b: refs/heads/logging-alpha c: acacd1d h: refs/heads/master i: 4685: 03c63a1 4683: 43973c1 4679: 651b210 4671: f5afbde
diff --git a/[refs] b/[refs]
@@ -12,7 +12,7 @@ refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
 refs/heads/gcs-nio: 283aeaf15efdcf3621eb6859f05e55ad7764375d
-refs/heads/logging-alpha: 45c466588e63c0159ed6432a1aed60b0ee068a31
+refs/heads/logging-alpha: acacd1db03ae25c638b68629098cd678d516d65e
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
 refs/tags/v0.1.2: 3eb3fe866ba22487686048f45d927b8c8638ea3f
diff --git a/branches/logging-alpha/RELEASING.md b/branches/logging-alpha/RELEASING.md
@@ -7,8 +7,8 @@ Most of the release process is handled by the `after_success.sh` script, trigger
 1. Run `utilities/update_pom_version.sh` from the repository's base directory.
 This script takes an optional argument denoting the new version.  By default, if the current version is X.Y.Z-SNAPSHOT, the script will update the version in all the pom.xml files to X.Y.Z.  If desired, another version can be supplied via command line argument instead.
 
-2. Create a PR to update the pom.xml version.  If releasing a new client library, this PR should also update javadoc grouping in the base directory's [pom.xml](./pom.xml).
-PRs that don't release new modules should look something like [#225](https://github.com/GoogleCloudPlatform/gcloud-java/pull/225).  PRs that do release a new module should also add the appropriate packages to the javadoc groups "SPI" and "Test helpers", as shown in [#802](https://github.com/GoogleCloudPlatform/gcloud-java/pull/802) for `gcloud-java-dns`. After this PR is merged into GoogleCloudPlatform/gcloud-java, Travis CI will push a new website to GoogleCloudPlatform/gh-pages, push a new artifact to the Maven Central Repository, and update versions in the README files.
+2. Create a PR to update the pom.xml version.
+The PR should look something like [#225](https://github.com/GoogleCloudPlatform/gcloud-java/pull/225).  After this PR is merged into GoogleCloudPlatform/gcloud-java, Travis CI will push a new website to GoogleCloudPlatform/gh-pages, push a new artifact to the Maven Central Repository, and update versions in the README files.
 
 3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository.  Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR.  Be sure that you are not opening the "Pull Request" build logs.  When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed.  You can also search for `gcloud-java` on the [Sonatype website](https://oss.sonatype.org/#nexus-search;quick~gcloud-java) and check the latest version number.  If the deployment didn't succeed because of a flaky test, rerun the build.
 
diff --git a/branches/logging-alpha/codacy-conf.json b/branches/logging-alpha/codacy-conf.json
diff --git a/branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/testing/package-info.java b/branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/testing/package-info.java
diff --git a/branches/logging-alpha/gcloud-java-dns/src/test/java/com/google/gcloud/dns/it/ITDnsTest.java b/branches/logging-alpha/gcloud-java-dns/src/test/java/com/google/gcloud/dns/it/ITDnsTest.java
@@ -593,11 +593,9 @@ public void testInvalidChangeRequest() {
         RecordSet.builder("subdomain." + zone.dnsName(), RecordSet.Type.A)
             .records(ImmutableList.of("0.255.1.5"))
             .build();
-    boolean recordAdded = false;
     try {
       ChangeRequestInfo validChange = ChangeRequest.builder().add(validA).build();
       zone.applyChangeRequest(validChange);
-      recordAdded = true;
       try {
         zone.applyChangeRequest(validChange);
         fail("Created a record set which already exists.");
@@ -650,11 +648,9 @@ public void testInvalidChangeRequest() {
         assertEquals(400, ex.code());
       }
     } finally {
-      if (recordAdded) {
-        ChangeRequestInfo deletion = ChangeRequest.builder().delete(validA).build();
-        ChangeRequest request = zone.applyChangeRequest(deletion);
-        waitForChangeToComplete(zone.name(), request.id());
-      }
+      ChangeRequestInfo deletion = ChangeRequest.builder().delete(validA).build();
+      ChangeRequest request = zone.applyChangeRequest(deletion);
+      waitForChangeToComplete(zone.name(), request.id());
       zone.delete();
     }
   }
diff --git a/branches/logging-alpha/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/package-info.java b/branches/logging-alpha/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/package-info.java
@@ -22,12 +22,11 @@
  * <pre> {@code
  * LocalResourceManagerHelper resourceManagerHelper = LocalResourceManagerHelper.create();
  * ResourceManager resourceManager = resourceManagerHelper.options().service();
- * resourceManagerHelper.start();
- * }</pre>
+ * } </pre>
  *
  * <p>After the test:
  * <pre> {@code
  * resourceManagerHelper.stop();
- * }</pre>
+ * } </pre>
  */
 package com.google.gcloud.resourcemanager.testing;
