Updating with upstream.

gcloud_bigtable/_helpers.py

@@ -87,7 +87,7 @@ class AuthInfo(object):
 def _pb_timestamp_to_datetime(timestamp):
     """Convert a Timestamp protobuf to a datetime object.
 
-    :type timestamp: :class:`._generated.timestamp_pb.Timestamp`
+    :type timestamp: :class:`._generated.timestamp_pb2.Timestamp`
     :param timestamp: A Google returned timestamp protobuf.
 
     :rtype: :class:`datetime.datetime`

gcloud_bigtable/cluster.py

@@ -396,6 +396,28 @@ def update(self, timeout_seconds=None):
     def delete(self, timeout_seconds=None):
         """Delete this cluster.
 
+        Marks a cluster and all of its tables for permanent deletion in 7 days.
+
+        Immediately upon completion of the request:
+
+        * Billing will cease for all of the cluster's reserved resources.
+        * The cluster's ``delete_time`` field will be set 7 days in the future.
+
+        Soon afterward:
+
+        * All tables within the cluster will become unavailable.
+
+        Prior to the cluster's ``delete_time``:
+
+        * The cluster can be recovered with a call to ``UndeleteCluster``.
+        * All other attempts to modify or delete the cluster will be rejected.
+
+        At the cluster's ``delete_time``:
+
+        * The cluster and **all of its tables** will immediately and
+          irrevocably disappear from the API, and their data will be
+          permanently deleted.
+
         :type timeout_seconds: int
         :param timeout_seconds: Number of seconds for request time-out.
                                 If not passed, defaults to value set on