Merge commit '7e8730c457fce66f1299e3e298b4090ccf7a064d'

Author: Jenkins User

Jenkinsfile

@@ -5,7 +5,7 @@
 		CollectionItem = require(__dirname + '/CollectionItem'),
 		RestHandlers = require(__dirname + '/restHandlers'),
 		blueprint = require(__dirname + '/blueprint'),
-		inflection = require(__dirname + '/inflection');
+		inflection = require('inflection');
 
 	module.exports = Collection;
 

lib/Collection.js

@@ -4,7 +4,7 @@
 	var _ = require('lodash'),
 		RestHandlers = require(__dirname + '/restHandlers'),
 		blueprint = require(__dirname + '/blueprint'),
-		inflection = require(__dirname + '/inflection');
+		inflection = require('inflection');
 
 	function CollectionItem(kind, data, itemId, options, undefinedProperty) {
 

lib/CollectionItem.js

@@ -11,12 +11,7 @@
 
 	var _ = require('lodash'),
 		blueprint = require(__dirname + '/blueprint'),
-		inflection = require(__dirname + '/inflection'),
-		log = require(__dirname + '/log'),
-		RestHandlers = require(__dirname + '/restHandlers'),
-		Collection = require(__dirname + '/Collection'),
-		CollectionItem = require(__dirname + '/CollectionItem'),
-		wrapCollectionItems = require(__dirname + '/wrapCollectionItems');
+		Collection = require(__dirname + '/Collection');
 
 	exports.Client = Client;