---

Ajay Kannan · Ajay Kannan · commit b3927737ffa9 · 2016-04-01T15:37:22.000-07:00
yaml --- r: 4751 b: refs/heads/logging-alpha c: df86a44 h: refs/heads/master i: 4749: c276566 4747: 4390015 4743: 3d22c8a 4735: fc183ee
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: e1a17f0e069b5b3d48e36890fcb18a02d675f898
+refs/heads/logging-alpha: df86a444de86aefbd5b9cbb198976badc8438052
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
 refs/tags/v0.1.2: 3eb3fe866ba22487686048f45d927b8c8638ea3f
diff --git a/branches/logging-alpha/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/it/ITBigQueryTest.java b/branches/logging-alpha/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/it/ITBigQueryTest.java
@@ -71,7 +71,6 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -624,7 +623,6 @@ public void testInsertAllWithErrors() {
     assertTrue(bigquery.delete(TableId.of(DATASET, tableName)));
   }
 
-  @Ignore("Flaky test; see issue #836")
   @Test
   public void testListAllTableData() {
     Page<List<FieldValue>> rows = bigquery.listTableData(TABLE_ID);
@@ -908,7 +906,6 @@ public void testCancelNonExistingJob() {
     assertFalse(bigquery.cancel("test_cancel_non_existing_job"));
   }
 
-  @Ignore("Flaky test; see #836")
   @Test
   public void testInsertFromFile() throws InterruptedException {
     String destinationTableName = "test_insert_from_file_table";
diff --git a/branches/logging-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/branches/logging-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -130,7 +130,7 @@ protected String defaultHost() {
     String host = System.getProperty(
         com.google.datastore.v1beta3.client.DatastoreHelper.LOCAL_HOST_ENV_VAR,
         System.getenv(com.google.datastore.v1beta3.client.DatastoreHelper.LOCAL_HOST_ENV_VAR));
-    return host != null ? host : super.defaultHost();
+    return host != null ? host : com.google.datastore.v1beta3.client.DatastoreFactory.DEFAULT_HOST;
   }
 
   @Override
diff --git a/branches/logging-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/spi/DefaultDatastoreRpc.java b/branches/logging-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/spi/DefaultDatastoreRpc.java
@@ -54,8 +54,9 @@ public DefaultDatastoreRpc(DatastoreOptions options) {
       if (fullURL.charAt(fullURL.length() - 1) != '/') {
         fullURL = fullURL + '/';
       }
-      fullURL = fullURL + "datastore/"
-          + com.google.datastore.v1beta3.client.DatastoreFactory.VERSION + "/projects/"
+      fullURL = fullURL
+          + com.google.datastore.v1beta3.client.DatastoreFactory.VERSION
+          + "/projects/"
           + options.projectId();
       clientBuilder = clientBuilder.projectId(null).projectEndpoint(fullURL);
     }

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ protected String defaultHost() {`
`130`	`130`	`String host = System.getProperty(`
`131`	`131`	`com.google.datastore.v1beta3.client.DatastoreHelper.LOCAL_HOST_ENV_VAR,`
`132`	`132`	`System.getenv(com.google.datastore.v1beta3.client.DatastoreHelper.LOCAL_HOST_ENV_VAR));`
`133`		`- return host != null ? host : super.defaultHost();`
	`133`	`+ return host != null ? host : com.google.datastore.v1beta3.client.DatastoreFactory.DEFAULT_HOST;`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,9 @@ public DefaultDatastoreRpc(DatastoreOptions options) {`
`54`	`54`	`if (fullURL.charAt(fullURL.length() - 1) != '/') {`
`55`	`55`	`fullURL = fullURL + '/';`
`56`	`56`	`}`
`57`		`- fullURL = fullURL + "datastore/"`
`58`		`- + com.google.datastore.v1beta3.client.DatastoreFactory.VERSION + "/projects/"`
	`57`	`+ fullURL = fullURL`
	`58`	`+ + com.google.datastore.v1beta3.client.DatastoreFactory.VERSION`
	`59`	`+ + "/projects/"`
`59`	`60`	`+ options.projectId();`
`60`	`61`	`clientBuilder = clientBuilder.projectId(null).projectEndpoint(fullURL);`
`61`	`62`	`}`