Merging working into master in preparation for minor version bump

.travis.yml

@@ -32,4 +32,4 @@ notifications:
     - shaunak.kashyap@rackspace.com
 
 env:
-  - secure: "bdrUeYb3nSGgBB+QtDZxUHVPw6B/wjb3KXLm8TgonWrQm4GPeWKK29qhmDnFZmQjwQPfuebe7wAk1ZxGoZKbEiELVpJJ+8XYVOt6W/6V53H31JL6FqiIE5+7qBwDe+9ziveM6GcTXHT1GI5mUeACIbeBDPZaNubIJH3U6MPim64="
+  - secure: "bdrUeYb3nSGgBB+QtDZxUHVPw6B/wjb3KXLm8TgonWrQm4GPeWKK29qhmDnFZmQjwQPfuebe7wAk1ZxGoZKbEiELVpJJ+8XYVOt6W/6V53H31JL6FqiIE5+7qBwDe+9ziveM6GcTXHT1GI5mUeACIbeBDPZaNubIJH3U6MPim64="

README.md

@@ -19,7 +19,7 @@ Requirements
 * PHP >=5.4
 * cURL extension for PHP
 
-**Note**: Since PHP 5.3 has reached [end of life](http://php.net/eol.php) and is no longer officially supported, we are moving to 5.4 as a minimum requirement. If upgrading is not an option and you still need a stable version of the SDK for 5.3, please follow [this guide](http://docs.php-opencloud.com/en/latest/using-php-5.3).
+**Note**: Since PHP 5.3 has reached [end of life](http://php.net/eol.php) and is no longer officially supported, we are moving to 5.4 as a minimum requirement. If upgrading is not an option and you still need a stable version of the SDK for 5.3, please follow [this guide](http://docs.php-opencloud.com/en/latest/using-php-5.3.html).
 
 Installation
 ------------

composer.json

@@ -27,8 +27,9 @@
     },
     "require": {
         "php" : ">=5.4",
-        "guzzle/guzzle" : "~3.8",
-        "psr/log": "~1.0"
+        "guzzle/http" : "~3.8",
+        "psr/log": "~1.0",
+        "mikemccabe/json-patch-php": "~0.1"
     },
     "require-dev" : {
         "phpunit/phpunit": "4.3.*",

doc/services/object-store/migrating-containers.rst

@@ -37,13 +37,13 @@ Requirements
 
     use Guzzle\Plugin\Backoff\BackoffPlugin;
 
-    // set timeout in secs
-    $timeout = 10;
+    // maximum number of retries
+    $maxRetries = 10;
 
     // set HTTP error codes
     $httpErrors = array(500, 503, 408);
 
-    $backoffPlugin = BackoffPlugin::getExponentialBackoff($timeout, $httpErrors);
+    $backoffPlugin = BackoffPlugin::getExponentialBackoff($maxRetries, $httpErrors);
     $client->addSubscriber($backoffPlugin);
 
 

doc/services/object-store/objects.rst

@@ -259,7 +259,7 @@ Get content of file
 .. code-block:: php
 
   /** @param $content Guzzle\Http\EntityBody */
-  $content = $object->getContainer();
+  $content = $object->getContent();
 
 
 Get type of file

docs/userguide/CDN/README.md

@@ -0,0 +1,96 @@
+# CDN
+
+**CDN** is a service that you can use to manage your CDN-enabled domains and the origins and assets associated with those domains.
+
+## Concepts
+
+To use the CDN service effectively, you should understand the following key concepts:
+
+* **Content delivery network**: A content delivery network (CDN) is a system of multiple computers that contains copies of data stored at various network nodes. A CDN is designed to improve performance of publicly distributed assets. Assets can be anything from website content, to web application components, to media such as videos, ads, and interactive experiences.  CDNs decrease the load time of these assets by caching them on edge servers, also called points of presence (PoPs).  Edge servers are distributed around the globe, meaning requests only travel to a local location to grab assets, rather than to and from a data center based far from the end user.
+
+* **Edge node**: CDN providers have many points of presence (PoP) servers around the world. These servers are known as edge nodes. These edge nodes cache the content and serve it directly to customers, thus reducing transit time to a customers location.
+
+* **Edge server**: An edge server is the same as an edge node.
+
+* **Origin**: An origin is an address (IP or domain) from which the CDN provider pulls content. A service can have multiple origins.
+
+* **Flavor**: A flavor is a configuration option. A flavor enables you to choose from a generic setting that is powered by one or more CDN providers.
+
+* **Service**: A service represents your web application that has its content cached to the edge nodes.
+
+* **Status**: The status indicates the current state of the service. The time it takes for a service configuration to be distributed amongst a CDN provider cache can vary.
+
+* **Purge**: Purging removes content from the edge servers - thus invalidating the content - so that it can be refreshed from your origin servers.
+
+* **Caching rule**: A caching rule provides you with fine-grained control over the time-to-live (TTL) of an object. When the TTL expires for an object, the edge node pulls the object from the origin again.
+
+* **Restriction**: A restriction enables you to define rules about who can or cannot access content from the cache. Examples of a restriction are allowing requests only from certain domains, geographies, or IP addresses.
+
+## Getting started
+
+### 1. Instantiate an OpenStack or Rackspace client.
+
+To use the CDN service, you must first instantiate a `OpenStack` or `Rackspace` client object.
+
+* If you are working with an OpenStack cloud, instantiate an `OpenCloud\OpenStack` client as follows:
+
+    ```php
+    use OpenCloud\OpenStack;
+
+    $client = new OpenStack('<OPENSTACK CLOUD IDENTITY ENDPOINT URL>', array(
+        'username' => '<YOUR OPENSTACK CLOUD ACCOUNT USERNAME>',
+        'password' => '<YOUR OPENSTACK CLOUD ACCOUNT PASSWORD>'
+    ));
+    ```
+
+* If you are working with the Rackspace cloud, instantiate a `OpenCloud\Rackspace` client as follows:
+
+    ```php
+    use OpenCloud\Rackspace;
+
+    $client = new Rackspace(Rackspace::US_IDENTITY_ENDPOINT, array(
+        'username' => '<YOUR RACKSPACE CLOUD ACCOUNT USERNAME>',
+        'apiKey'   => '<YOUR RACKSPACE CLOUD ACCOUNT API KEY>'
+     ));
+    ```
+
+### 2. Obtain a CDN service object from the client.
+All CDN operations are done via an _CDN service object_. To
+instantiate this object, call the `cdnService` method on the `$client`
+object. This method takes one argument:
+
+| Position | Description | Data type | Required? | Default value | Example value |
+| -------- | ----------- | ----------| --------- | ------------- | ------------- |
+|  1       | Name of the service, as it appears in the service catalog | String | No | `null`; automatically determined when possible | `rackCDN` |
+
+
+```php
+$cdnService = $client->cdnService();
+```
+
+### 3. Create a service (to represent your web application).
+```php
+$service = $cdnService->createService(array(
+    'name'     => 'acme_site',
+    'domains'  => array(
+        array(
+            'domain' => 'www.acme.com'
+        ),
+        array(
+            'domain' => 'acme.com'
+        )
+    ),
+    'origins'  => array(
+        array(
+            'origin' => 'origin.acme.com'
+        )
+    ),
+    'flavorId' => 'cdn'
+));
+```
+
+[ [Get the executable PHP script for this example](/samples/CDN/create-service.php) ]
+
+## Next steps
+
+Once you have created a service, there is more you can do with it. See [complete user guide for CDN](USERGUIDE.md).