Merge 64465ea into 174f461

agco · Nov 23, 2016 · 9ae7e75 · 9ae7e75
2 parents 174f461 + 64465ea
commit 9ae7e75
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/adapters/mongodb/converters.js b/lib/adapters/mongodb/converters.js
@@ -3,7 +3,7 @@
 const Hapi = require('hapi')
 const _ = require('lodash')
 const Hoek = require('hoek')
-const uuid = require('node-uuid')
+const uuid = require('uuid')
 const mongoose = require('mongoose')
 
 module.exports = function() {

diff --git a/package.json b/package.json
@@ -35,11 +35,11 @@
     "lodash": "^3.10.1",
     "mongodb": "2.1.16",
     "mongoose": "^4.2.8",
-    "node-uuid": "^1.4.3",
     "qs": "^6.0.0",
     "rx": "^4.0.7",
     "rx-node": "^1.0.1",
-    "susie": "^1.0.1"
+    "susie": "^1.0.1",
+    "uuid": "^3.0.0"
   },
   "devDependencies": {
     "agco-event-source-stream": "^1.1.1",

diff --git a/test/rest.spec.js b/test/rest.spec.js
@@ -4,7 +4,7 @@ const _ = require('lodash')
 const Promise = require('bluebird')
 const Joi = require('joi')
 const utils = require('./utils');
-const uuid = require('node-uuid')
+const uuid = require('uuid')
 const seeder = require('./seeder');
 
 const schema = {