From b83bd50ad3dbaa2d8d35ab09faf8d76661f551bc Mon Sep 17 00:00:00 2001
From: Trevor Rowe <trevorrowe@gmail.com>
Date: Thu, 27 Aug 2015 21:39:41 -0700
Subject: [PATCH] Added ELB instance deregistered waiter.

Fixes #793
---
 CHANGELOG.md                                   |  5 +++++
 .../2012-06-01/waiters-2.json                  | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 325374f3632..db28d64b8cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+* Feature - Aws::ElasticLoadBalancing - Added a waiter that will poll
+  until an instance has been deregistered.
+
+  See [related GitHub issue #793](https://github.com/aws/aws-sdk-ruby/issues/793).
+
 * Issue - Aws::EC2 - Added a missing `#load` method for
   `Aws::EC2::NetworkInterfaceAssociation`.
 
diff --git a/aws-sdk-core/apis/elasticloadbalancing/2012-06-01/waiters-2.json b/aws-sdk-core/apis/elasticloadbalancing/2012-06-01/waiters-2.json
index 7b2196f51ac..b03901a4cb1 100644
--- a/aws-sdk-core/apis/elasticloadbalancing/2012-06-01/waiters-2.json
+++ b/aws-sdk-core/apis/elasticloadbalancing/2012-06-01/waiters-2.json
@@ -14,6 +14,24 @@
         }
       ]
     },
+    "InstanceDeregistered": {
+      "delay": 15,
+      "operation": "DescribeInstanceHealth",
+      "maxAttempts": 40,
+      "acceptors": [
+        {
+          "expected": "OutOfService",
+          "matcher": "pathAll",
+          "state": "success",
+          "argument": "InstanceStates[].State"
+        },
+        {
+          "matcher": "error",
+          "expected": "InvalidInstance",
+          "state": "success"
+        }
+      ]
+    },
     "AnyInstanceInService": {
       "delay": 15,
       "operation": "DescribeInstanceHealth",