Merge branch 'master' of https://github.com/watson-developer-cloud/nodejs-wrapper

herchu · herchu · commit 10fab889384f · 2015-09-14T16:15:59.000-03:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,10 @@
 language: node_js
+sudo: false # causes tests to be run in Travis CI's newer, faster build infrastructure
 node_js:
   - "0.10"
+  - "0.12"
+  - "stable"
 script:
   - npm test
 after_success:
-  - npm run coveralls
+  - npm run coveralls
diff --git a/README.md b/README.md
@@ -252,7 +252,7 @@ language_translation.translate({
       console.log(JSON.stringify(translation, null, 2));
 });
 
-language_identification.identify({
+language_translation.identify({
   text: 'The language translation service takes text input and identifies the language used.' },
   function (err, language) {
     if (err)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "watson-developer-cloud",
-  "version": "0.9.30",
+  "version": "0.10.0",
   "description": "Nodejs Client Wrapper to use the IBM Watson and Services",
   "main": "./lib/index",
   "repository": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "watson-developer-cloud",`
`3`		`- "version": "0.9.30",`
	`3`	`+ "version": "0.10.0",`
`4`	`4`	`"description": "Nodejs Client Wrapper to use the IBM Watson and Services",`
`5`	`5`	`"main": "./lib/index",`
`6`	`6`	`"repository": {`