From b01ce9d4cccbcb26ee634636127c6a0a920f1bd5 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 14 Jan 2014 18:09:36 +0100
Subject: [PATCH] Regenerate shrinkwrap for 1.6.1

---
 npm-shrinkwrap.json | 172 ++++++++++++++++++++++++++++++++------------
 1 file changed, 127 insertions(+), 45 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4c6c37e2..c086f7e6 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "dependencies": {
     "node-varnish": {
       "version": "0.1.1"
@@ -9,14 +9,14 @@
       "version": "1.3.3"
     },
     "windshaft": {
-      "version": "0.14.5",
+      "version": "0.15.0",
       "dependencies": {
         "grainstore": {
-          "version": "0.15.2",
+          "version": "0.16.0",
           "dependencies": {
             "carto": {
               "version": "0.9.5-cdb2",
-              "from": "git://github.com/CartoDB/carto.git#0.9.5-cdb2",
+              "from": "http://github.com/CartoDB/carto/tarball/0.9.5-cdb2",
               "dependencies": {
                 "underscore": {
                   "version": "1.4.4"
@@ -25,7 +25,7 @@
                   "version": "0.2.8",
                   "dependencies": {
                     "sax": {
-                      "version": "0.5.5"
+                      "version": "0.5.8"
                     }
                   }
                 },
@@ -131,46 +131,136 @@
                   "version": "0.3.8"
                 },
                 "zipfile": {
-                  "version": "0.4.2"
+                  "version": "0.4.3"
                 },
                 "sqlite3": {
-                  "version": "2.1.19",
+                  "version": "2.2.0",
                   "dependencies": {
-                    "tar.gz": {
-                      "version": "0.1.1",
+                    "node-pre-gyp": {
+                      "version": "0.2.5",
                       "dependencies": {
-                        "fstream": {
-                          "version": "0.1.25",
+                        "nopt": {
+                          "version": "2.1.2",
                           "dependencies": {
-                            "rimraf": {
-                              "version": "2.2.4"
-                            },
-                            "graceful-fs": {
-                              "version": "2.0.1"
-                            },
-                            "inherits": {
-                              "version": "2.0.1"
+                            "abbrev": {
+                              "version": "1.0.4"
                             }
                           }
                         },
+                        "npmlog": {
+                          "version": "0.0.6",
+                          "dependencies": {
+                            "ansi": {
+                              "version": "0.2.1"
+                            }
+                          }
+                        },
+                        "semver": {
+                          "version": "2.1.0"
+                        },
                         "tar": {
-                          "version": "0.1.18",
+                          "version": "0.1.19",
                           "dependencies": {
                             "inherits": {
                               "version": "2.0.1"
                             },
                             "block-stream": {
                               "version": "0.0.7"
+                            },
+                            "fstream": {
+                              "version": "0.1.25",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "2.0.1"
+                                }
+                              }
                             }
                           }
                         },
-                        "commander": {
-                          "version": "1.1.1",
+                        "tar-pack": {
+                          "version": "2.0.0",
                           "dependencies": {
-                            "keypress": {
-                              "version": "0.1.0"
+                            "uid-number": {
+                              "version": "0.0.3"
+                            },
+                            "once": {
+                              "version": "1.1.1"
+                            },
+                            "debug": {
+                              "version": "0.7.4"
+                            },
+                            "fstream": {
+                              "version": "0.1.25",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "2.0.1"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1"
+                                }
+                              }
+                            },
+                            "fstream-ignore": {
+                              "version": "0.0.7",
+                              "dependencies": {
+                                "minimatch": {
+                                  "version": "0.2.14",
+                                  "dependencies": {
+                                    "sigmund": {
+                                      "version": "1.0.0"
+                                    }
+                                  }
+                                },
+                                "inherits": {
+                                  "version": "2.0.1"
+                                }
+                              }
+                            },
+                            "readable-stream": {
+                              "version": "1.0.24"
+                            },
+                            "graceful-fs": {
+                              "version": "1.2.3"
                             }
                           }
+                        },
+                        "aws-sdk": {
+                          "version": "2.0.0-rc8",
+                          "dependencies": {
+                            "xml2js": {
+                              "version": "0.2.4",
+                              "dependencies": {
+                                "sax": {
+                                  "version": "0.6.0"
+                                }
+                              }
+                            },
+                            "xmlbuilder": {
+                              "version": "0.4.2"
+                            }
+                          }
+                        },
+                        "rc": {
+                          "version": "0.3.2",
+                          "dependencies": {
+                            "optimist": {
+                              "version": "0.3.7",
+                              "dependencies": {
+                                "wordwrap": {
+                                  "version": "0.0.2"
+                                }
+                              }
+                            },
+                            "deep-extend": {
+                              "version": "0.2.6"
+                            },
+                            "ini": {
+                              "version": "1.1.0"
+                            }
+                          }
+                        },
+                        "rimraf": {
+                          "version": "2.2.5"
                         }
                       }
                     }
@@ -239,7 +329,7 @@
           }
         },
         "tilelive-mapnik": {
-          "version": "0.6.4",
+          "version": "0.6.5",
           "dependencies": {
             "eio": {
               "version": "0.2.2"
@@ -267,10 +357,18 @@
       "version": "0.3.0"
     },
     "redis-mpool": {
-      "version": "0.0.2",
+      "version": "0.0.3",
       "dependencies": {
         "generic-pool": {
           "version": "2.0.4"
+        },
+        "hiredis": {
+          "version": "0.1.16",
+          "dependencies": {
+            "bindings": {
+              "version": "1.1.1"
+            }
+          }
         }
       }
     },
@@ -283,27 +381,11 @@
     "strftime": {
       "version": "0.6.2"
     },
-    "semver": {
-      "version": "1.1.4"
-    },
     "redis": {
       "version": "0.8.6"
     },
-    "redis-mpool": {
-      "version": "0.0.2",
-      "dependencies": {
-        "generic-pool": {
-          "version": "2.0.4"
-        }
-      }
-    },
-    "hiredis": {
-      "version": "0.1.15",
-      "dependencies": {
-        "bindings": {
-          "version": "1.1.0"
-        }
-      }
+    "semver": {
+      "version": "1.1.4"
     },
     "mocha": {
       "version": "1.14.0",
@@ -338,7 +420,7 @@
           "version": "3.2.3",
           "dependencies": {
             "minimatch": {
-              "version": "0.2.12",
+              "version": "0.2.14",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0"