From ecab839705074d40c7ec25ce0f7ce6b0bda848da Mon Sep 17 00:00:00 2001
From: Court Ewing <court@epixa.com>
Date: Wed, 9 Mar 2016 13:30:35 -0500
Subject: [PATCH] Update bunyan to 1.7.1

Unfortunately, the old version of bunyan we were depending on has a
compilation failure during npm install, so we need to upgrade it in
order to get more builds out of 4.1.
---
 npm-shrinkwrap.json | 192 ++++++++++++++++++++++++++++++--------------
 package.json        |   2 +-
 2 files changed, 133 insertions(+), 61 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 1d4a56a3f6d54..8a326b1a9e850 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "kibana",
-  "version": "4.1.3",
+  "version": "4.1.6-snapshot",
   "dependencies": {
     "ansicolors": {
       "version": "0.3.2",
@@ -93,43 +93,115 @@
       }
     },
     "bunyan": {
-      "version": "1.4.0",
-      "from": "http://registry.npmjs.org/bunyan/-/bunyan-1.4.0.tgz",
-      "resolved": "http://registry.npmjs.org/bunyan/-/bunyan-1.4.0.tgz",
+      "version": "1.7.1",
+      "from": "bunyan@1.7.1",
+      "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.7.1.tgz",
       "dependencies": {
         "dtrace-provider": {
-          "version": "0.5.0",
-          "from": "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.5.0.tgz",
-          "resolved": "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.5.0.tgz",
+          "version": "0.6.0",
+          "from": "dtrace-provider@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz",
           "dependencies": {
             "nan": {
-              "version": "1.8.4",
-              "from": "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz",
-              "resolved": "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz"
+              "version": "2.2.0",
+              "from": "nan@>=2.0.8 <3.0.0",
+              "resolved": "https://registry.npmjs.org/nan/-/nan-2.2.0.tgz"
             }
           }
         },
         "mv": {
-          "version": "2.0.3",
-          "from": "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz",
-          "resolved": "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz",
+          "version": "2.1.1",
+          "from": "mv@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
           "dependencies": {
             "ncp": {
-              "version": "0.6.0",
-              "from": "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz",
-              "resolved": "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"
+              "version": "2.0.0",
+              "from": "ncp@>=2.0.0 <2.1.0",
+              "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"
             },
             "rimraf": {
-              "version": "2.2.8",
-              "from": "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-              "resolved": "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+              "version": "2.4.5",
+              "from": "rimraf@>=2.4.0 <2.5.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "6.0.4",
+                  "from": "glob@>=6.0.1 <7.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.3",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
             }
           }
         },
         "safe-json-stringify": {
           "version": "1.0.3",
-          "from": "http://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz",
+          "from": "safe-json-stringify@>=1.0.0 <2.0.0",
           "resolved": "http://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"
+        },
+        "moment": {
+          "version": "2.12.0",
+          "from": "moment@>=2.10.6 <3.0.0",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.12.0.tgz"
         }
       }
     },
@@ -707,39 +779,39 @@
     },
     "jade": {
       "version": "1.11.0",
-      "from": "jade@>=1.8.2 <2.0.0",
+      "from": "http://registry.npmjs.org/jade/-/jade-1.11.0.tgz",
       "resolved": "http://registry.npmjs.org/jade/-/jade-1.11.0.tgz",
       "dependencies": {
         "character-parser": {
           "version": "1.2.1",
-          "from": "character-parser@1.2.1",
+          "from": "http://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz",
           "resolved": "http://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"
         },
         "clean-css": {
           "version": "3.3.4",
-          "from": "clean-css@>=3.1.9 <4.0.0",
+          "from": "http://registry.npmjs.org/clean-css/-/clean-css-3.3.4.tgz",
           "resolved": "http://registry.npmjs.org/clean-css/-/clean-css-3.3.4.tgz",
           "dependencies": {
             "commander": {
               "version": "2.8.1",
-              "from": "commander@>=2.8.0 <2.9.0",
+              "from": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
               "resolved": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
               "dependencies": {
                 "graceful-readlink": {
                   "version": "1.0.1",
-                  "from": "graceful-readlink@>=1.0.0",
+                  "from": "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
                   "resolved": "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
                 }
               }
             },
             "source-map": {
               "version": "0.4.2",
-              "from": "source-map@>=0.4.0 <0.5.0",
+              "from": "http://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz",
               "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz",
               "dependencies": {
                 "amdefine": {
                   "version": "0.1.1",
-                  "from": "amdefine@>=0.0.4",
+                  "from": "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz",
                   "resolved": "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
                 }
               }
@@ -748,22 +820,22 @@
         },
         "commander": {
           "version": "2.6.0",
-          "from": "commander@>=2.6.0 <2.7.0",
+          "from": "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
           "resolved": "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz"
         },
         "constantinople": {
           "version": "3.0.1",
-          "from": "constantinople@>=3.0.1 <3.1.0",
+          "from": "http://registry.npmjs.org/constantinople/-/constantinople-3.0.1.tgz",
           "resolved": "http://registry.npmjs.org/constantinople/-/constantinople-3.0.1.tgz",
           "dependencies": {
             "acorn-globals": {
               "version": "1.0.4",
-              "from": "acorn-globals@>=1.0.3 <2.0.0",
+              "from": "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.4.tgz",
               "resolved": "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.4.tgz",
               "dependencies": {
                 "acorn": {
                   "version": "1.2.2",
-                  "from": "acorn@>=1.0.1 <2.0.0",
+                  "from": "http://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz",
                   "resolved": "http://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
                 }
               }
@@ -772,22 +844,22 @@
         },
         "jstransformer": {
           "version": "0.0.2",
-          "from": "jstransformer@0.0.2",
+          "from": "http://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz",
           "resolved": "http://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz",
           "dependencies": {
             "is-promise": {
               "version": "2.0.0",
-              "from": "is-promise@>=2.0.0 <3.0.0",
+              "from": "http://registry.npmjs.org/is-promise/-/is-promise-2.0.0.tgz",
               "resolved": "http://registry.npmjs.org/is-promise/-/is-promise-2.0.0.tgz"
             },
             "promise": {
               "version": "6.1.0",
-              "from": "promise@>=6.0.1 <7.0.0",
+              "from": "http://registry.npmjs.org/promise/-/promise-6.1.0.tgz",
               "resolved": "http://registry.npmjs.org/promise/-/promise-6.1.0.tgz",
               "dependencies": {
                 "asap": {
                   "version": "1.0.0",
-                  "from": "asap@>=1.0.0 <1.1.0",
+                  "from": "http://registry.npmjs.org/asap/-/asap-1.0.0.tgz",
                   "resolved": "http://registry.npmjs.org/asap/-/asap-1.0.0.tgz"
                 }
               }
@@ -796,63 +868,63 @@
         },
         "transformers": {
           "version": "2.1.0",
-          "from": "transformers@2.1.0",
+          "from": "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz",
           "resolved": "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz",
           "dependencies": {
             "promise": {
               "version": "2.0.0",
-              "from": "promise@>=2.0.0 <2.1.0",
+              "from": "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz",
               "resolved": "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz",
               "dependencies": {
                 "is-promise": {
                   "version": "1.0.1",
-                  "from": "is-promise@>=1.0.0 <2.0.0",
+                  "from": "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz",
                   "resolved": "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"
                 }
               }
             },
             "css": {
               "version": "1.0.8",
-              "from": "css@>=1.0.8 <1.1.0",
+              "from": "http://registry.npmjs.org/css/-/css-1.0.8.tgz",
               "resolved": "http://registry.npmjs.org/css/-/css-1.0.8.tgz",
               "dependencies": {
                 "css-parse": {
                   "version": "1.0.4",
-                  "from": "css-parse@1.0.4",
+                  "from": "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz",
                   "resolved": "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"
                 },
                 "css-stringify": {
                   "version": "1.0.5",
-                  "from": "css-stringify@1.0.5",
+                  "from": "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz",
                   "resolved": "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"
                 }
               }
             },
             "uglify-js": {
               "version": "2.2.5",
-              "from": "uglify-js@>=2.2.5 <2.3.0",
+              "from": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
               "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
               "dependencies": {
                 "source-map": {
                   "version": "0.1.43",
-                  "from": "source-map@>=0.1.7 <0.2.0",
+                  "from": "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                   "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                   "dependencies": {
                     "amdefine": {
                       "version": "0.1.1",
-                      "from": "amdefine@>=0.0.4",
+                      "from": "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz",
                       "resolved": "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
                     }
                   }
                 },
                 "optimist": {
                   "version": "0.3.7",
-                  "from": "optimist@>=0.3.5 <0.4.0",
+                  "from": "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
                   "resolved": "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
                   "dependencies": {
                     "wordwrap": {
                       "version": "0.0.3",
-                      "from": "wordwrap@>=0.0.2 <0.1.0",
+                      "from": "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
                       "resolved": "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
                     }
                   }
@@ -863,54 +935,54 @@
         },
         "uglify-js": {
           "version": "2.4.23",
-          "from": "uglify-js@>=2.4.19 <3.0.0",
+          "from": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.23.tgz",
           "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.23.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@>=0.2.6 <0.3.0",
+              "from": "http://registry.npmjs.org/async/-/async-0.2.10.tgz",
               "resolved": "http://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "source-map": {
               "version": "0.1.34",
-              "from": "source-map@0.1.34",
+              "from": "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
               "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
               "dependencies": {
                 "amdefine": {
                   "version": "0.1.1",
-                  "from": "amdefine@>=0.0.4",
+                  "from": "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz",
                   "resolved": "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
                 }
               }
             },
             "uglify-to-browserify": {
               "version": "1.0.2",
-              "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
+              "from": "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
               "resolved": "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
             },
             "yargs": {
               "version": "3.5.4",
-              "from": "yargs@>=3.5.4 <3.6.0",
+              "from": "http://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
               "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
               "dependencies": {
                 "camelcase": {
                   "version": "1.1.0",
-                  "from": "camelcase@>=1.0.2 <2.0.0",
+                  "from": "http://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz",
                   "resolved": "http://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz"
                 },
                 "decamelize": {
                   "version": "1.0.0",
-                  "from": "decamelize@>=1.0.0 <2.0.0",
+                  "from": "http://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz",
                   "resolved": "http://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"
                 },
                 "window-size": {
                   "version": "0.1.0",
-                  "from": "window-size@0.1.0",
+                  "from": "http://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
                   "resolved": "http://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
                 },
                 "wordwrap": {
                   "version": "0.0.2",
-                  "from": "wordwrap@0.0.2",
+                  "from": "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
                   "resolved": "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
                 }
               }
@@ -919,22 +991,22 @@
         },
         "void-elements": {
           "version": "2.0.1",
-          "from": "void-elements@>=2.0.1 <2.1.0",
+          "from": "http://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
           "resolved": "http://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"
         },
         "with": {
           "version": "4.0.3",
-          "from": "with@>=4.0.0 <4.1.0",
+          "from": "http://registry.npmjs.org/with/-/with-4.0.3.tgz",
           "resolved": "http://registry.npmjs.org/with/-/with-4.0.3.tgz",
           "dependencies": {
             "acorn": {
               "version": "1.2.2",
-              "from": "acorn@>=1.0.1 <2.0.0",
+              "from": "http://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz",
               "resolved": "http://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
             },
             "acorn-globals": {
               "version": "1.0.4",
-              "from": "acorn-globals@>=1.0.3 <2.0.0",
+              "from": "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.4.tgz",
               "resolved": "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.4.tgz"
             }
           }
diff --git a/package.json b/package.json
index a6d401a64a50b..8323ec232add3 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "ansicolors": "^0.3.2",
     "bluebird": "^2.0.7",
     "body-parser": "^1.10.1",
-    "bunyan": "^1.2.3",
+    "bunyan": "^1.7.1",
     "commander": "^2.6.0",
     "compression": "^1.3.0",
     "cookie-parser": "^1.3.3",