From 0f504da291f0ea81d39b1287cac4cdbe95ac1bd0 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Fri, 7 Mar 2014 11:02:44 -0700 Subject: [PATCH 1/3] updated deps, and added badge to ensure they stay that way. --- README.md | 2 +- package.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7c57f4b9c..5b7ee5486 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ The official low-level Elasticsearch client for Node.js and the browser. -[![Build Status](https://travis-ci.org/elasticsearch/elasticsearch-js.png?branch=1.5)](https://travis-ci.org/elasticsearch/elasticsearch-js) [![Coverage Status](https://coveralls.io/repos/elasticsearch/elasticsearch-js/badge.png)](https://coveralls.io/r/elasticsearch/elasticsearch-js) +[![Build Status](https://travis-ci.org/elasticsearch/elasticsearch-js.png?branch=1.5)](https://travis-ci.org/elasticsearch/elasticsearch-js) [![Coverage Status](https://coveralls.io/repos/elasticsearch/elasticsearch-js/badge.png)](https://coveralls.io/r/elasticsearch/elasticsearch-js) [![Dependencies up to date](https://david-dm.org/elasticsearch/elasticsearch-js.png)](https://david-dm.org/elasticsearch/elasticsearch-js) ## Features diff --git a/package.json b/package.json index bcce4302d..5f7f4492e 100644 --- a/package.json +++ b/package.json @@ -66,10 +66,10 @@ }, "license": "Apache 2.0", "dependencies": { - "chalk": "~0.3.0", - "forever-agent": "~0.5.2", - "lodash-node": "~2.3.0", - "when": "~2.6.0" + "chalk": "~0.4", + "forever-agent": "~0.5", + "lodash-node": "~2.4", + "when": "~2.8" }, "repository": { "type": "git", From 104709ee5209251c74d86b1003e22e8a95fd1207 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Fri, 7 Mar 2014 11:06:55 -0700 Subject: [PATCH 2/3] fixed jshint error in generate script --- scripts/generate/logs/index.js | 1 - 1 file changed, 1 deletion(-) 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 936c3e2a38cfcda801ffe953e8e69d7789e72e32 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Mon, 10 Mar 2014 14:17:47 -0700 Subject: [PATCH 3/3] Updated the API to include new `version_type` options --- docs/api_methods_1_x.asciidoc | 16 ++++++++++++++++ docs/api_methods_master.asciidoc | 16 ++++++++++++++++ src/lib/apis/1_x.js | 28 +++++++++++++++++++++------- src/lib/apis/master.js | 28 +++++++++++++++++++++------- 4 files changed, 74 insertions(+), 14 deletions(-) diff --git a/docs/api_methods_1_x.asciidoc b/docs/api_methods_1_x.asciidoc index 1763fc6bf..871f894af 100644 --- a/docs/api_methods_1_x.asciidoc +++ b/docs/api_methods_1_x.asciidoc @@ -305,6 +305,8 @@ Options::: Options::: * `"internal"` * `"external"` + * `"external_gte"` + * `"force"` `index`:: `String` -- The index of the document being count percolated. @@ -382,6 +384,8 @@ Options::: Options::: * `"internal"` * `"external"` + * `"external_gte"` + * `"force"` `id`:: `String` -- Document ID @@ -448,6 +452,8 @@ Options::: Options::: * `"internal"` * `"external"` + * `"external_gte"` + * `"force"` `id`:: `String` -- The document ID @@ -744,6 +750,8 @@ client.get({ Options::: * `"internal"` * `"external"` + * `"external_gte"` + * `"force"` `id`:: `String` -- The document ID @@ -795,6 +803,8 @@ The default method is `GET` and the usual <