Merge branch 'master' into multiple-connections

bugthesystem · Jan 7, 2017 · 44638f8 · 44638f8
2 parents 2ca0fbf + 79de648
commit 44638f8
Show file tree

Hide file tree

Showing 6 changed files with 527 additions and 554 deletions.
diff --git a/examples/package.json b/examples/package.json
@@ -10,8 +10,8 @@
   "author": "@ziyasal sarikayaziya@gmail.com",
   "license": "MIT",
   "dependencies": {
-    "hapi": "^15.2.0",
+    "hapi": "^16.1.0",
     "hapijs-status-monitor": "file:../",
-    "request": "^2.78.0"
+    "request": "^2.79.0"
   }
 }