---

garrettjonesgoogle · garrettjonesgoogle · commit 2b87d2a03715 · 2017-02-14T09:24:29.000-08:00
yaml --- r: 7829 b: refs/heads/tswast-patch-1 c: 60daff1 h: refs/heads/master i: 7827: 8eed797
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 55a63f37a6ec095aa832ec643d4face97c5190d6
+refs/heads/tswast-patch-1: 60daff1ec08aa745745a5de0f21512a19f361034
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java b/branches/tswast-patch-1/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java
@@ -111,6 +111,7 @@ Operation<Instance, CreateInstanceMetadata> createInstance(InstanceInfo instance
    *       the requested levels).
    *   <li> All newly-reserved resources are available for serving the instance's tables.
    *   <li> The instance's new resource levels are readable via the API.
+   * </ul>
    */
   Operation<Instance, UpdateInstanceMetadata> updateInstance(
       InstanceInfo instance, InstanceInfo.InstanceField... fieldsToUpdate);
diff --git a/branches/tswast-patch-1/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Operation.java b/branches/tswast-patch-1/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Operation.java
@@ -117,7 +117,7 @@ public Operation<R, M> reload() throws SpannerException {
   /**
    * Blocks till the operation is complete or maximum time, if specified, has elapsed.
    *
-   * @returns null if operation is not found otherwise the current operation.
+   * @return null if operation is not found otherwise the current operation.
    */
   public Operation<R, M> waitFor(WaitForOption... options) throws SpannerException {
     if (isDone) {

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public Operation<R, M> reload() throws SpannerException {`
`117`	`117`	`/**`
`118`	`118`	`* Blocks till the operation is complete or maximum time, if specified, has elapsed.`
`119`	`119`	`*`
`120`		`- * @returns null if operation is not found otherwise the current operation.`
	`120`	`+ * @return null if operation is not found otherwise the current operation.`
`121`	`121`	`*/`
`122`	`122`	`public Operation<R, M> waitFor(WaitForOption... options) throws SpannerException {`
`123`	`123`	`if (isDone) {`