---

shinfan · web-flow · commit 4c99c501335a · 2016-12-05T12:57:48.000-08:00
yaml --- r: 7705 b: refs/heads/tswast-patch-1 c: 0d9d1b3 h: refs/heads/master i: 7703: 3b1df8e
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: 243d0d115aaa2ea8de0019bb6fb9859ee598fcbf
+refs/heads/tswast-patch-1: 0d9d1b3ce548aa5335e23b8c2ec0464df8002d9f
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -73,7 +73,7 @@ public abstract class ServiceOptions<ServiceT extends Service<OptionsT>, Service
   private static final String MANIFEST_ARTIFACT_ID_KEY = "artifactId";
   private static final String MANIFEST_VERSION_KEY = "Implementation-Version";
   private static final String ARTIFACT_ID = "google-cloud-core";
-  private static final String LIBRARY_NAME = "google-cloud-java";
+  private static final String LIBRARY_NAME = "gcloud-java";
   private static final String LIBRARY_VERSION = defaultLibraryVersion();
   private static final String APPLICATION_NAME =
       LIBRARY_VERSION == null ? LIBRARY_NAME : LIBRARY_NAME + "/" + LIBRARY_VERSION;
@@ -570,30 +570,30 @@ public Clock getClock() {
   }
 
   /**
-   * Returns the application's name as a string in the format {@code google-cloud-java/[version]}.
+   * Returns the application's name as a string in the format {@code gcloud-java/[version]}.
    */
   @Deprecated
   public String applicationName() {
     return getApplicationName();
   }
 
   /**
-   * Returns the application's name as a string in the format {@code google-cloud-java/[version]}.
+   * Returns the application's name as a string in the format {@code gcloud-java/[version]}.
    */
   public String getApplicationName() {
     return APPLICATION_NAME;
   }
 
   /**
-   * Returns the library's name, {@code google-cloud-java}, as a string.
+   * Returns the library's name, {@code gcloud-java}, as a string.
    */
   @Deprecated
   public String libraryName() {
     return getLibraryName();
   }
 
   /**
-   * Returns the library's name, {@code google-cloud-java}, as a string.
+   * Returns the library's name, {@code gcloud-java}, as a string.
    */
   public String getLibraryName() {
     return LIBRARY_NAME;
diff --git a/branches/tswast-patch-1/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java b/branches/tswast-patch-1/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java
@@ -102,7 +102,7 @@ public class ServiceOptionsTest {
   private static final TestServiceOptions DEPRECATED_DEFAULT_OPTIONS =
       TestServiceOptions.newBuilder().projectId("project-id").build();
   private static final TestServiceOptions OPTIONS_COPY = OPTIONS.toBuilder().build();
-  private static final String LIBRARY_NAME = "google-cloud-java";
+  private static final String LIBRARY_NAME = "gcloud-java";
   private static final Pattern APPLICATION_NAME_PATTERN =
       Pattern.compile(LIBRARY_NAME + "(/[0-9]+.[0-9]+.[0-9]+)?");
 
