From 8a9da3e6bae8f8ac9eed0e185ea0d494cbef9dc7 Mon Sep 17 00:00:00 2001
From: Jeremy Lindblom <jeremeamia@gmail.com>
Date: Tue, 26 May 2015 16:30:45 -0700
Subject: [PATCH] Updated composer.json to use a stable version of Guzzle 6.
 Minor fixes to integ tests.

---
 composer.json                   | 2 +-
 tests/Integ/ClientSmokeTest.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 32522846f6..1d062176a9 100755
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     },
     "require": {
         "php": ">=5.5",
-        "guzzlehttp/guzzle": "^5.2 || ^6.0@dev",
+        "guzzlehttp/guzzle": "^5.2 || ^6.0",
         "guzzlehttp/psr7": "^1.0.0",
         "guzzlehttp/promises": "^1.0.0",
         "mtdowling/jmespath.php": "^2.1"
diff --git a/tests/Integ/ClientSmokeTest.php b/tests/Integ/ClientSmokeTest.php
index 7aa70a8436..0b26e176e1 100644
--- a/tests/Integ/ClientSmokeTest.php
+++ b/tests/Integ/ClientSmokeTest.php
@@ -271,7 +271,7 @@ class (expected class name of instantiated client)
                 'DeleteCluster',
                 ['cluster' => 'foo'],
                 false,
-                'ClientException'
+                'ClusterNotFoundException'
             ],
             [
                 'elasticache',
@@ -581,7 +581,7 @@ class (expected class name of instantiated client)
                 'TerminateWorkspaces',
                 ['TerminateWorkspaceRequests' => [['WorkspaceId'=> 'foo']]],
                 false,
-                'ValidationException'
+                'ThrottlingException'
             ],
         ];
     }