From d580a36cdad2a5110c8f15c08010ad3cab8c4f39 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Wed, 26 Feb 2014 12:59:46 -0700
Subject: [PATCH 01/14] version 1.5.9

---
 README.md           | 2 +-
 docs/about.asciidoc | 2 +-
 package.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7c57f4b9c..732a9469a 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ bower install elasticsearch
 ```
 
 ### Download
- - v1.5.8: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.8.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.8.tar.gz)
+ - v1.5.9: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.9.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.9.tar.gz)
 
 ## Docs
  - [Quick Start](http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/quick-start.html)
diff --git a/docs/about.asciidoc b/docs/about.asciidoc
index ba0220e5b..39de088b1 100644
--- a/docs/about.asciidoc
+++ b/docs/about.asciidoc
@@ -29,7 +29,7 @@ bower install elasticsearch
 ---------
 
 ==== Download
- * v1.5.8: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.8.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.8.tar.gz[tar.gz]
+ * v1.5.9: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.9.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.9.tar.gz[tar.gz]
 
 
 ==== Angular Build (elasticsearch.angular.js)
diff --git a/package.json b/package.json
index 5f222e575..a36349fe1 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "description": "The official low-level Elasticsearch client for Node.js and the browser.",
   "main": "src/elasticsearch.js",
   "homepage": "http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/index.html",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "browser": {
     "./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js",
     "./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js",

From 1401269c323de3465a5d5e1ef9c4918e28210fbc Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Mon, 3 Mar 2014 11:12:38 -0700
Subject: [PATCH 02/14] version 1.5.10

---
 README.md           | 2 +-
 docs/about.asciidoc | 2 +-
 package.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 732a9469a..1048e5957 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ bower install elasticsearch
 ```
 
 ### Download
- - v1.5.9: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.9.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.9.tar.gz)
+ - v1.5.10: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.10.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.10.tar.gz)
 
 ## Docs
  - [Quick Start](http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/quick-start.html)
diff --git a/docs/about.asciidoc b/docs/about.asciidoc
index 39de088b1..7d0d1dab6 100644
--- a/docs/about.asciidoc
+++ b/docs/about.asciidoc
@@ -29,7 +29,7 @@ bower install elasticsearch
 ---------
 
 ==== Download
- * v1.5.9: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.9.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.9.tar.gz[tar.gz]
+ * v1.5.10: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.10.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.10.tar.gz[tar.gz]
 
 
 ==== Angular Build (elasticsearch.angular.js)
diff --git a/package.json b/package.json
index 9d6e12420..f0f25135f 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "description": "The official low-level Elasticsearch client for Node.js and the browser.",
   "main": "src/elasticsearch.js",
   "homepage": "http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/index.html",
-  "version": "1.5.9",
+  "version": "1.5.10",
   "browser": {
     "./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js",
     "./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js",

From 983bcb0fd344333a0b61dae3d94bf5614457dff9 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Mon, 3 Mar 2014 11:17:34 -0700
Subject: [PATCH 03/14] Updated the changelog, and fixed a jshint error.

---
 CHANGELOG.md                   | 1 +
 scripts/generate/logs/index.js | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ce96bc3c..79076f2d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Fixed a bug that caused invalid param/type errors to not be reported properly, in the browser builds that use promises.
 - added the cat.threadPool to the master/1.0/1.x apis
 - Enabled Basic auth in the Angular connector -- Thanks @jeff-french!
+- Fixed a bug that was preventing index requests (and any other POST/PUT request) from using connections in the connection pool.
 
 ## 1.4 (Jan 30 2014)
 - The trace log messages will now diaplay the actual host connected to (without auth info) unless they are being written to a bash script
diff --git a/scripts/generate/logs/index.js b/scripts/generate/logs/index.js
index 0a061aa0f..fdff91111 100644
--- a/scripts/generate/logs/index.js
+++ b/scripts/generate/logs/index.js
@@ -21,7 +21,6 @@ var argv = require('optimist')
 
 var es = require('../../../src/elasticsearch');
 var async = require('async');
-var path = require('path');
 var moment = require('moment');
 var makeSamples = require('./samples').make;
 

From d3945736bc8ae3adffa5d2617b18fc59c6e9a697 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Mon, 10 Mar 2014 14:29:42 -0700
Subject: [PATCH 04/14] version 1.5.11

---
 README.md           | 2 +-
 docs/about.asciidoc | 2 +-
 package.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 59180c04f..1a079c869 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ bower install elasticsearch
 ```
 
 ### Download
- - v1.5.10: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.10.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.10.tar.gz)
+ - v1.5.11: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.11.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.11.tar.gz)
 
 ## Docs
  - [Quick Start](http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/quick-start.html)
diff --git a/docs/about.asciidoc b/docs/about.asciidoc
index 7d0d1dab6..eb252bd55 100644
--- a/docs/about.asciidoc
+++ b/docs/about.asciidoc
@@ -29,7 +29,7 @@ bower install elasticsearch
 ---------
 
 ==== Download
- * v1.5.10: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.10.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.10.tar.gz[tar.gz]
+ * v1.5.11: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.11.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.11.tar.gz[tar.gz]
 
 
 ==== Angular Build (elasticsearch.angular.js)
diff --git a/package.json b/package.json
index 3e454b819..cf29f2691 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "description": "The official low-level Elasticsearch client for Node.js and the browser.",
   "main": "src/elasticsearch.js",
   "homepage": "http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/index.html",
-  "version": "1.5.10",
+  "version": "1.5.11",
   "browser": {
     "./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js",
     "./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js",

From 3e5a342e63e19c24a3685f8665b48fdcd066e0cb Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Mon, 10 Mar 2014 14:34:04 -0700
Subject: [PATCH 05/14] ci bump

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a295f9b43..c949d255e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,5 @@ email:
   recipients:
     - spencer.alger@elasticsearch.com
   on_success: change
-  on_failure: always
\ No newline at end of file
+  on_failure: always
+

From fcb3177abd4d0a91afb5cad9a04a465fc9dcab07 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Mon, 10 Mar 2014 15:50:14 -0700
Subject: [PATCH 06/14] version 1.5.11

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c949d255e..a295f9b43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,5 +10,4 @@ email:
   recipients:
     - spencer.alger@elasticsearch.com
   on_success: change
-  on_failure: always
-
+  on_failure: always
\ No newline at end of file

From 170389573f57682a5e1ddb37c6cd919a88fe783a Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 14 Mar 2014 09:16:09 -0700
Subject: [PATCH 07/14] version 1.5.12

---
 README.md           | 2 +-
 docs/about.asciidoc | 2 +-
 package.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a58aa783c..232949ad6 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ bower install elasticsearch
 ```
 
 ### Download
- - v1.5.11: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.11.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.11.tar.gz)
+ - v1.5.12: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.12.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.12.tar.gz)
 
 ## Docs
  - [Quick Start](http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/quick-start.html)
diff --git a/docs/about.asciidoc b/docs/about.asciidoc
index eb252bd55..e71f76e79 100644
--- a/docs/about.asciidoc
+++ b/docs/about.asciidoc
@@ -29,7 +29,7 @@ bower install elasticsearch
 ---------
 
 ==== Download
- * v1.5.11: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.11.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.11.tar.gz[tar.gz]
+ * v1.5.12: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.12.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.12.tar.gz[tar.gz]
 
 
 ==== Angular Build (elasticsearch.angular.js)
diff --git a/package.json b/package.json
index 9ceb1865f..aa889d3b3 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "description": "The official low-level Elasticsearch client for Node.js and the browser.",
   "main": "src/elasticsearch.js",
   "homepage": "http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/index.html",
-  "version": "1.5.11",
+  "version": "1.5.12",
   "browser": {
     "./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js",
     "./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js",

From 6690081091e5af6b0e68318949185ba1ceaf24e0 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 14 Mar 2014 11:42:38 -0700
Subject: [PATCH 08/14] version 1.5.13

---
 README.md           | 2 +-
 docs/about.asciidoc | 2 +-
 package.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 232949ad6..06eafe4d8 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ bower install elasticsearch
 ```
 
 ### Download
- - v1.5.12: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.12.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.12.tar.gz)
+ - v1.5.13: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.13.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.13.tar.gz)
 
 ## Docs
  - [Quick Start](http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/quick-start.html)
diff --git a/docs/about.asciidoc b/docs/about.asciidoc
index e71f76e79..370b958c0 100644
--- a/docs/about.asciidoc
+++ b/docs/about.asciidoc
@@ -29,7 +29,7 @@ bower install elasticsearch
 ---------
 
 ==== Download
- * v1.5.12: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.12.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.12.tar.gz[tar.gz]
+ * v1.5.13: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.13.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.13.tar.gz[tar.gz]
 
 
 ==== Angular Build (elasticsearch.angular.js)
diff --git a/package.json b/package.json
index aa889d3b3..248c3095c 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "description": "The official low-level Elasticsearch client for Node.js and the browser.",
   "main": "src/elasticsearch.js",
   "homepage": "http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/index.html",
-  "version": "1.5.12",
+  "version": "1.5.13",
   "browser": {
     "./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js",
     "./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js",

From d02ef9e1f0ab4a3be85417afad905eb30fa4c11f Mon Sep 17 00:00:00 2001
From: juancancela <cancela.juancarlos@gmail.com>
Date: Sat, 15 Mar 2014 05:04:56 -0200
Subject: [PATCH 09/14] Minor typo in README file

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 06eafe4d8..27d0137a9 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ bower install elasticsearch
 
 [Jenkins](https://build.elasticsearch.org/job/es-js_nightly/)
 
-Elasticsearch.js provides support for, and is regularly tested against, Elasticsearch releases **0.90.5 and greater**. We also test against the latest changes in the 0.90 and master branches of the Elasticsearch repository. To tell the client which version of Elastisearch you are using, and therefore the API it should provide, set the `apiVerson` config param. [More info](http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/configuration.html#_config_options)
+Elasticsearch.js provides support for, and is regularly tested against, Elasticsearch releases **0.90.5 and greater**. We also test against the latest changes in the 0.90 and master branches of the Elasticsearch repository. To tell the client which version of Elastisearch you are using, and therefore the API it should provide, set the `apiVersion` config param. [More info](http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/configuration.html#_config_options)
 
 ## Examples
 

From de903991d7a6c5e4b84be64aba7f39f33f4d4127 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Tue, 18 Mar 2014 12:53:54 -0700
Subject: [PATCH 10/14] version 1.5.14

---
 README.md           | 2 +-
 docs/about.asciidoc | 2 +-
 package.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 27d0137a9..2b0e01061 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ bower install elasticsearch
 ```
 
 ### Download
- - v1.5.13: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.13.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.13.tar.gz)
+ - v1.5.14: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.14.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.14.tar.gz)
 
 ## Docs
  - [Quick Start](http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/quick-start.html)
diff --git a/docs/about.asciidoc b/docs/about.asciidoc
index 370b958c0..398230929 100644
--- a/docs/about.asciidoc
+++ b/docs/about.asciidoc
@@ -29,7 +29,7 @@ bower install elasticsearch
 ---------
 
 ==== Download
- * v1.5.13: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.13.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.13.tar.gz[tar.gz]
+ * v1.5.14: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.14.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.14.tar.gz[tar.gz]
 
 
 ==== Angular Build (elasticsearch.angular.js)
diff --git a/package.json b/package.json
index 248c3095c..75758063a 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "description": "The official low-level Elasticsearch client for Node.js and the browser.",
   "main": "src/elasticsearch.js",
   "homepage": "http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/index.html",
-  "version": "1.5.13",
+  "version": "1.5.14",
   "browser": {
     "./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js",
     "./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js",

From 9fde1576bc17a5ad2d1a8ceb437598e98cbe0adf Mon Sep 17 00:00:00 2001
From: Clinton Gormley <clint@traveljury.com>
Date: Thu, 27 Mar 2014 01:05:01 +0100
Subject: [PATCH 11/14] Fixed bad links to deprecated snapshot gateway docs

---
 docs/api_methods_1_0.asciidoc    | 2 +-
 docs/api_methods_1_x.asciidoc    | 2 +-
 docs/api_methods_master.asciidoc | 2 +-
 src/lib/apis/1_0.js              | 4 ++--
 src/lib/apis/1_x.js              | 4 ++--
 src/lib/apis/master.js           | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/api_methods_1_0.asciidoc b/docs/api_methods_1_0.asciidoc
index 09f85abe6..4a86b3e6c 100644
--- a/docs/api_methods_1_0.asciidoc
+++ b/docs/api_methods_1_0.asciidoc
@@ -3439,7 +3439,7 @@ client.indices.snapshotIndex([params, [callback]])
 
 Initiate a snapshot through the gateway of one or more indices.
 
-The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
+The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
 
 // no examples
 
diff --git a/docs/api_methods_1_x.asciidoc b/docs/api_methods_1_x.asciidoc
index b79de2d09..90d48029c 100644
--- a/docs/api_methods_1_x.asciidoc
+++ b/docs/api_methods_1_x.asciidoc
@@ -3492,7 +3492,7 @@ client.indices.snapshotIndex([params, [callback]])
 
 Initiate a snapshot through the gateway of one or more indices.
 
-The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
+The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
 
 // no examples
 
diff --git a/docs/api_methods_master.asciidoc b/docs/api_methods_master.asciidoc
index f87b8673b..0cf6114ad 100644
--- a/docs/api_methods_master.asciidoc
+++ b/docs/api_methods_master.asciidoc
@@ -3492,7 +3492,7 @@ client.indices.snapshotIndex([params, [callback]])
 
 Initiate a snapshot through the gateway of one or more indices.
 
-The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
+The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
 
 // no examples
 
diff --git a/src/lib/apis/1_0.js b/src/lib/apis/1_0.js
index b3d53eb67..1b3fc28cb 100644
--- a/src/lib/apis/1_0.js
+++ b/src/lib/apis/1_0.js
@@ -3258,7 +3258,7 @@ api.indices.prototype.segments = ca({
 });
 
 /**
- * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-gateway-snapshot.html) request
+ * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html) request
  *
  * @param {Object} params - An object with parameters used to carry out this action
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
@@ -5155,4 +5155,4 @@ api.create = ca.proxy(api.index, {
   transform: function (params) {
     params.op_type = 'create';
   }
-});
\ No newline at end of file
+});
diff --git a/src/lib/apis/1_x.js b/src/lib/apis/1_x.js
index efe274c67..0c2f49c81 100644
--- a/src/lib/apis/1_x.js
+++ b/src/lib/apis/1_x.js
@@ -3312,7 +3312,7 @@ api.indices.prototype.segments = ca({
 });
 
 /**
- * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-gateway-snapshot.html) request
+ * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html) request
  *
  * @param {Object} params - An object with parameters used to carry out this action
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
@@ -5254,4 +5254,4 @@ api.create = ca.proxy(api.index, {
   transform: function (params) {
     params.op_type = 'create';
   }
-});
\ No newline at end of file
+});
diff --git a/src/lib/apis/master.js b/src/lib/apis/master.js
index c8f4fa60f..39b947f0d 100644
--- a/src/lib/apis/master.js
+++ b/src/lib/apis/master.js
@@ -3312,7 +3312,7 @@ api.indices.prototype.segments = ca({
 });
 
 /**
- * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/indices-gateway-snapshot.html) request
+ * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html) request
  *
  * @param {Object} params - An object with parameters used to carry out this action
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
@@ -5254,4 +5254,4 @@ api.create = ca.proxy(api.index, {
   transform: function (params) {
     params.op_type = 'create';
   }
-});
\ No newline at end of file
+});

From e1113575d0dfe8eff612da74a3abfb18616a1bd6 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 27 Mar 2014 11:49:04 -0700
Subject: [PATCH 12/14] Revert "Fixed bad links to deprecated snapshot gateway
 docs"

This reverts commit 9fde1576bc17a5ad2d1a8ceb437598e98cbe0adf.
---
 docs/api_methods_1_0.asciidoc    | 2 +-
 docs/api_methods_1_x.asciidoc    | 2 +-
 docs/api_methods_master.asciidoc | 2 +-
 src/lib/apis/1_0.js              | 4 ++--
 src/lib/apis/1_x.js              | 4 ++--
 src/lib/apis/master.js           | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/api_methods_1_0.asciidoc b/docs/api_methods_1_0.asciidoc
index 4a86b3e6c..09f85abe6 100644
--- a/docs/api_methods_1_0.asciidoc
+++ b/docs/api_methods_1_0.asciidoc
@@ -3439,7 +3439,7 @@ client.indices.snapshotIndex([params, [callback]])
 
 Initiate a snapshot through the gateway of one or more indices.
 
-The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
+The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
 
 // no examples
 
diff --git a/docs/api_methods_1_x.asciidoc b/docs/api_methods_1_x.asciidoc
index 90d48029c..b79de2d09 100644
--- a/docs/api_methods_1_x.asciidoc
+++ b/docs/api_methods_1_x.asciidoc
@@ -3492,7 +3492,7 @@ client.indices.snapshotIndex([params, [callback]])
 
 Initiate a snapshot through the gateway of one or more indices.
 
-The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
+The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
 
 // no examples
 
diff --git a/docs/api_methods_master.asciidoc b/docs/api_methods_master.asciidoc
index 0cf6114ad..f87b8673b 100644
--- a/docs/api_methods_master.asciidoc
+++ b/docs/api_methods_master.asciidoc
@@ -3492,7 +3492,7 @@ client.indices.snapshotIndex([params, [callback]])
 
 Initiate a snapshot through the gateway of one or more indices.
 
-The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
+The default method is `POST` and the usual <<api-conventions,params and return values>> apply. See http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/indices-gateway-snapshot.html[the elasticsearch docs] for more about this method.
 
 // no examples
 
diff --git a/src/lib/apis/1_0.js b/src/lib/apis/1_0.js
index 1b3fc28cb..b3d53eb67 100644
--- a/src/lib/apis/1_0.js
+++ b/src/lib/apis/1_0.js
@@ -3258,7 +3258,7 @@ api.indices.prototype.segments = ca({
 });
 
 /**
- * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html) request
+ * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-gateway-snapshot.html) request
  *
  * @param {Object} params - An object with parameters used to carry out this action
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
@@ -5155,4 +5155,4 @@ api.create = ca.proxy(api.index, {
   transform: function (params) {
     params.op_type = 'create';
   }
-});
+});
\ No newline at end of file
diff --git a/src/lib/apis/1_x.js b/src/lib/apis/1_x.js
index 0c2f49c81..efe274c67 100644
--- a/src/lib/apis/1_x.js
+++ b/src/lib/apis/1_x.js
@@ -3312,7 +3312,7 @@ api.indices.prototype.segments = ca({
 });
 
 /**
- * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html) request
+ * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-gateway-snapshot.html) request
  *
  * @param {Object} params - An object with parameters used to carry out this action
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
@@ -5254,4 +5254,4 @@ api.create = ca.proxy(api.index, {
   transform: function (params) {
     params.op_type = 'create';
   }
-});
+});
\ No newline at end of file
diff --git a/src/lib/apis/master.js b/src/lib/apis/master.js
index 39b947f0d..c8f4fa60f 100644
--- a/src/lib/apis/master.js
+++ b/src/lib/apis/master.js
@@ -3312,7 +3312,7 @@ api.indices.prototype.segments = ca({
 });
 
 /**
- * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/indices-gateway-snapshot.html) request
+ * Perform a [indices.snapshotIndex](http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/indices-gateway-snapshot.html) request
  *
  * @param {Object} params - An object with parameters used to carry out this action
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
@@ -5254,4 +5254,4 @@ api.create = ca.proxy(api.index, {
   transform: function (params) {
     params.op_type = 'create';
   }
-});
+});
\ No newline at end of file

From db51f0ebafa5ec124df8de60879bf3ff70984e6e Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 27 Mar 2014 12:54:11 -0700
Subject: [PATCH 13/14] added a warning about reusing config objects to the
 config docs and to the Client constructor

---
 docs/configuration.asciidoc | 7 +++++--
 src/lib/client.js           | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/configuration.asciidoc b/docs/configuration.asciidoc
index 462986535..f561b9b68 100644
--- a/docs/configuration.asciidoc
+++ b/docs/configuration.asciidoc
@@ -1,16 +1,19 @@
 [[configuration]]
 == Configuration
 
-The `Client` constructor accepts a single object as it's argument, and the following keys can be used to configure that client instance.
+The `Client` constructor accepts a single object as it's argument. In the <<config-options>> section all of the available options/keys are listed.
 
 [source,js]
 ------
 var elasticsearch = require('elasticsearch');
 var client = new elasticsearch.Client({
-  ...
+  ... config options ...
 });
 ------
 
+WARNING: Due to the complex nature of the configuration, the config object you pass in will be modified and can only be used to create one `Client` instance. Sorry for the inconvenience. Related Github issue: https://github.com/elasticsearch/elasticsearch-js/issues/33
+
+[[config-options]]
 === Config options
 [horizontal]
 `host or hosts`[[config-hosts]]::
diff --git a/src/lib/client.js b/src/lib/client.js
index fb677e19a..ff7d612ea 100755
--- a/src/lib/client.js
+++ b/src/lib/client.js
@@ -32,6 +32,13 @@ var _ = require('./utils');
 function Client(config) {
   config = config || {};
 
+  if (config.__reused) {
+    throw new Error('Do not reuse objects to configure the elasticsearch Client class: ' +
+      'https://github.com/elasticsearch/elasticsearch-js/issues/33');
+  } else {
+    config.__reused = true;
+  }
+
   function EsApiClient() {
     // our client will log minimally by default
     if (!config.hasOwnProperty('log')) {

From 980bfa179205e536043fd85cd839e379e4ca3021 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 27 Mar 2014 12:56:06 -0700
Subject: [PATCH 14/14] version 0.2.0

---
 CHANGELOG.md        | 1 +
 README.md           | 2 +-
 docs/about.asciidoc | 2 +-
 package.json        | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6261281e9..ebc57d4aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 2.0 (Mar 27 2014)
 - The default API version is now `'1.0'`
 - Promises are now supported using the Bluebird module.
+- If you try to reuse a configuration object, an error will be thrown. https://github.com/elasticsearch/elasticsearch-js/issues/33
 
 ## 1.5 (Feb 6 2014)
 - Switched out `keepaliveagent` dependency with `forever-agent`, which is used in the ever popular `request` module, and is much simpler.
diff --git a/README.md b/README.md
index ad08ca9cd..f158dba66 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ bower install elasticsearch
 ```
 
 ### Download
- - v1.5.14: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.14.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.14.tar.gz)
+ - v2.0.0: [zip](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-2.0.0.zip), [tar.gz](https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-2.0.0.tar.gz)
 
 ## Docs
  - [Quick Start](http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/quick-start.html)
diff --git a/docs/about.asciidoc b/docs/about.asciidoc
index 398230929..ce1020887 100644
--- a/docs/about.asciidoc
+++ b/docs/about.asciidoc
@@ -29,7 +29,7 @@ bower install elasticsearch
 ---------
 
 ==== Download
- * v1.5.14: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.14.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-1.5.14.tar.gz[tar.gz]
+ * v2.0.0: https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-2.0.0.zip[zip], https://download.elasticsearch.org/elasticsearch/elasticsearch-js/elasticsearch-js-2.0.0.tar.gz[tar.gz]
 
 
 ==== Angular Build (elasticsearch.angular.js)
diff --git a/package.json b/package.json
index eafb654d1..84e849267 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "description": "The official low-level Elasticsearch client for Node.js and the browser.",
   "main": "src/elasticsearch.js",
   "homepage": "http://www.elasticsearch.org/guide/en/elasticsearch/client/javascript-api/current/index.html",
-  "version": "1.5.14",
+  "version": "2.0.0",
   "browser": {
     "./src/lib/connectors/index.js": "./src/lib/connectors/browser_index.js",
     "./src/lib/loggers/index.js": "./src/lib/loggers/browser_index.js",