Merge branch 'master' into storage-fix

README.md

@@ -31,6 +31,7 @@ on Google Cloud Platform.
     * [Google Container Engine](#google-container-engine)
     * [Google Cloud Functions (Beta)](#google-cloud-functions-beta)
   * [**Storage and Databases**](#storage-and-databases)
+    * [Cloud Spanner](#cloud-spanner)
     * [Google Cloud Datastore](#google-cloud-datastore)
     * [Google Cloud Storage](#google-cloud-storage)
   * [**Big Data**](#big-data)
@@ -222,6 +223,16 @@ View the [Cloud Functions Node.js samples][functions_samples].
 
 ### Storage and Databases
 
+#### Cloud Spanner
+
+[Cloud Spanner][spanner_docs] is a managed, mission-critical, globally
+consistent and scalable relational database service.
+
+View the [Cloud Spanner Node.js samples][spanner_samples].
+
+[spanner_docs]: https://cloud.google.com/spanner/docs/
+[spanner_samples]: spanner
+
 #### Google Cloud Datastore
 
 [Cloud Datastore][datastore_docs] is a NoSQL document database built for

functions/README.md

@@ -22,9 +22,10 @@ environment.
 * [Hello World](helloworld/)
 * [Background](background/)
 * [Callbacks](messages/)
-* [Cloud Storage](gcs/)
 * [Cloud Datastore](datastore/)
 * [Cloud Pub/Sub](pubsub/)
+* [Cloud Spanner](spanner/)
+* [Cloud Storage](gcs/)
 * [Dependencies](uuid/)
 * [Error Reporting](errorreporting/)
 * [HTTP](http/)

functions/spanner/index.js

@@ -23,10 +23,10 @@ const Spanner = require('@google-cloud/spanner');
 const spanner = Spanner();
 
 // Your Cloud Spanner instance ID
-const instanceId = 'my-instance';
+const instanceId = 'test-instance';
 
 // Your Cloud Spanner database ID
-const databaseId = 'my-database';
+const databaseId = 'example-db';
 
 /**
  * HTTP Cloud Function.