Merge branch 'master' of github.com:hapijs/hapi

hueniverse · hueniverse · commit 7a8a05c08e95 · 2016-08-26T14:53:21.000-07:00
diff --git a/lib/request.js b/lib/request.js
@@ -353,7 +353,7 @@ internals.Request.prototype._lifecycle = function (err) {
         const timeoutReply = () => {
 
             this._log(['request', 'server', 'timeout', 'error'], { timeout: serverTimeout, elapsed: this._bench.elapsed() });
-            this._reply(Boom.serverTimeout());
+            this._reply(Boom.serverUnavailable());
         };
 
         if (serverTimeout <= 0) {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "accept": "2.x.x",
     "ammo":  "2.x.x",
-    "boom": "3.x.x",
+    "boom": "4.x.x",
     "call": "3.x.x",
     "catbox": "7.x.x",
     "catbox-memory": "2.x.x",
