From 59fb1dea540fd76c27da3676605ffeff7efd0200 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Tue, 6 Oct 2015 18:49:11 +0200
Subject: [PATCH] Start using mapconfig-extension branch from windshaft

---
 npm-shrinkwrap.json | 41 ++++++++++++++++++++++++++---------------
 package.json        |  2 +-
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 6370ac3a..727251f8 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -68,14 +68,14 @@
           "dependencies": {
             "unpipe": {
               "version": "1.0.0",
-              "from": "unpipe@1.0.0",
+              "from": "unpipe@~1.0.0",
               "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
             }
           }
         },
         "type-is": {
           "version": "1.6.9",
-          "from": "type-is@~1.6.9",
+          "from": "type-is@~1.6.6",
           "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.9.tgz",
           "dependencies": {
             "media-typer": {
@@ -85,7 +85,7 @@
             },
             "mime-types": {
               "version": "2.1.7",
-              "from": "mime-types@~2.1.7",
+              "from": "mime-types@~2.1.6",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
               "dependencies": {
                 "mime-db": {
@@ -192,7 +192,7 @@
           "dependencies": {
             "mime-types": {
               "version": "2.1.7",
-              "from": "mime-types@~2.1.7",
+              "from": "mime-types@~2.1.6",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
               "dependencies": {
                 "mime-db": {
@@ -381,7 +381,7 @@
             },
             "mime-types": {
               "version": "2.1.7",
-              "from": "mime-types@~2.1.7",
+              "from": "mime-types@~2.1.6",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
               "dependencies": {
                 "mime-db": {
@@ -441,7 +441,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2",
+              "from": "inherits@~2.0.1",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
@@ -533,7 +533,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2",
+                  "from": "inherits@~2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "isarray": {
@@ -620,9 +620,9 @@
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
         },
         "tough-cookie": {
-          "version": "2.0.0",
+          "version": "2.1.0",
           "from": "tough-cookie@>=0.12.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.1.0.tgz"
         },
         "http-signature": {
           "version": "0.11.0",
@@ -711,9 +711,9 @@
           "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
           "dependencies": {
             "bluebird": {
-              "version": "2.10.1",
+              "version": "2.10.2",
               "from": "bluebird@^2.9.30",
-              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
+              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
             },
             "chalk": {
               "version": "1.1.1",
@@ -827,8 +827,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "1.0.1",
-      "from": "windshaft@~1.0.1",
+      "version": "1.0.2",
+      "from": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
+      "resolved": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
       "dependencies": {
         "mapnik": {
           "version": "1.4.15-cdb2",
@@ -1301,9 +1302,9 @@
                       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                     },
                     "tough-cookie": {
-                      "version": "2.0.0",
+                      "version": "2.1.0",
                       "from": "tough-cookie@>=0.12.0",
-                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.1.0.tgz"
                     },
                     "form-data": {
                       "version": "0.1.4",
@@ -2966,6 +2967,11 @@
                   }
                 }
               }
+            },
+            "semver": {
+              "version": "1.1.4",
+              "from": "semver@~1.1.4",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz"
             }
           }
         },
@@ -3046,6 +3052,11 @@
             }
           }
         },
+        "semver": {
+          "version": "5.0.3",
+          "from": "semver@~5.0.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
+        },
         "carto": {
           "version": "0.15.1-cdb1",
           "from": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb1",
diff --git a/package.json b/package.json
index 473fbbdf..12f9194e 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
         "node-statsd": "~0.0.7",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "~1.0.1",
+        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
         "step": "~0.0.6",
         "queue-async": "~1.0.7",
         "request": "~2.62.0",