Merge branch 'master' into semantic-release

germanattanasio · web-flow · commit d2695181ee39 · 2018-06-29T09:39:32.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "watson-developer-cloud",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "description": "Client library to use the IBM Watson Services and AlchemyAPI",
   "main": "./index",
   "repository": {
diff --git a/test/integration/test.visual_recognition.custom_classifiers.js b/test/integration/test.visual_recognition.custom_classifiers.js
@@ -17,7 +17,7 @@ const logit = function(string) {
   return string;
 };
 
-describe('visual_recognition_integration_custom_classifiers', function() {
+describe.skip('visual_recognition_integration_custom_classifiers @slow', function() {
   // ugh.
   this.timeout(THIRTY_SECONDS * 8);
   this.slow(TWO_SECONDS);

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