habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0

Browse Source
This commit is contained in:
Spencer Alger
2014-03-27 12:21:21 -07:00
parent 8edf4e84e5 f87ec547dc
commit 0f158381b3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -2,7 +2,7 @@
The official low-level Elasticsearch client for Node.js and the browser. 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?branch=1.5) [![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) [![Build Status](https://travis-ci.org/elasticsearch/elasticsearch-js.png?branch=2.0)](https://travis-ci.org/elasticsearch/elasticsearch-js?branch=2.0) [![Coverage Status](https://coveralls.io/repos/elasticsearch/elasticsearch-js/badge.png?branch=2.0?branch=2.0)](https://coveralls.io/r/elasticsearch/elasticsearch-js?branch=2.0) [![Dependencies up to date](https://david-dm.org/elasticsearch/elasticsearch-js.png)](https://david-dm.org/elasticsearch/elasticsearch-js)
## Features ## Features

2
grunt/config/saucelabs-mocha.js
View File

@ -7,7 +7,7 @@ module.exports = {
'http://127.0.0.1:8000/builds.html' 'http://127.0.0.1:8000/builds.html'
], ],
testname: 'es.js client tests', testname: 'es.js client tests',
build: process.env.CI_BUILD_NUMBER, build: process.env.TRAVIS_BUILD_ID,
concurrency: 10, concurrency: 10,
username: slk.user, username: slk.user,
key: slk.key, key: slk.key,

4
package.json
View File

@ -60,9 +60,9 @@
"expect.js": "~0.2.0", "expect.js": "~0.2.0",
"aliasify": "~1.2.4", "aliasify": "~1.2.4",
"express": "~3.4.7", "express": "~3.4.7",
"grunt-saucelabs": "git://github.com/spenceralger/grunt-saucelabs.git",
"find-root": "~0.1.1", "find-root": "~0.1.1",
"event-stream": "~3.1.0" "event-stream": "~3.1.0",
"grunt-saucelabs": "^5.1.0"
}, },
"license": "Apache 2.0", "license": "Apache 2.0",
"dependencies": { "dependencies": {