Skip to content

Commit b0a6048

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 2601 b: refs/heads/update-datastore c: b5d4bca h: refs/heads/master i: 2599: 582a22d
1 parent 1691a82 commit b0a6048

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
66
refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
8-
refs/heads/update-datastore: bac6a070d46b89213516a1cabe6f796fac41be73
8+
refs/heads/update-datastore: b5d4bcaac68a609056edbcd986f0155ecdea0377
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
1010
refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
1111
refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2

branches/update-datastore/gcloud-java-examples/src/main/java/com/google/gcloud/examples/ResourceManagerExample.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@ private static void addUsage(
179179
usage.append(actionName);
180180
Joiner joiner = Joiner.on(" ");
181181
String[] requiredParams = action.getRequiredParams();
182-
String[] optionalParams = action.getOptionalParams();
183182
if (requiredParams.length > 0) {
184183
usage.append(' ');
185184
joiner.appendTo(usage, requiredParams);
186185
}
186+
String[] optionalParams = action.getOptionalParams();
187187
if (optionalParams.length > 0) {
188188
usage.append(" [");
189189
joiner.appendTo(usage, optionalParams);
@@ -213,8 +213,9 @@ public static void main(String... args) {
213213
args = args.length > 1 ? Arrays.copyOfRange(args, 1, args.length) : new String[] {};
214214
if (args.length < action.getRequiredParams().length) {
215215
StringBuilder usage = new StringBuilder();
216+
usage.append("Usage: ");
216217
addUsage(actionName, action, usage);
217-
System.out.println("Usage: " + usage);
218+
System.out.println(usage);
218219
} else {
219220
action.run(resourceManager, args);
220221
}

branches/update-datastore/gcloud-java-resourcemanager/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.google.gcloud</groupId>
1313
<artifactId>gcloud-java-pom</artifactId>
14-
<version>0.0.13-SNAPSHOT</version>
14+
<version>0.1.1-SNAPSHOT</version>
1515
</parent>
1616
<properties>
1717
<site.installationModule>gcloud-java-resourcemanager</site.installationModule>

branches/update-datastore/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static org.junit.Assert.assertNotSame;
2121

2222
import com.google.common.collect.ImmutableMap;
23-
import com.google.gcloud.AuthCredentials;
2423
import com.google.gcloud.PageImpl;
2524
import com.google.gcloud.RetryParams;
2625

@@ -59,7 +58,6 @@ public void testServiceOptions() throws Exception {
5958
options = options.toBuilder()
6059
.projectId("some-unnecessary-project-ID")
6160
.retryParams(RetryParams.defaultInstance())
62-
.authCredentials(AuthCredentials.noCredentials())
6361
.build();
6462
serializedCopy = serializeAndDeserialize(options);
6563
assertEquals(options, serializedCopy);

0 commit comments

Comments
 (0)