From f22f7beeada0c90e59cccd77695ff43a5c6e4fa1 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@chrisrebert.com>
Date: Wed, 23 Sep 2015 18:19:48 -0700
Subject: [PATCH 1/2] Move {test-infra=>grunt}/npm-shrinkwrap.json

---
 Gruntfile.js                              | 2 +-
 {test-infra => grunt}/npm-shrinkwrap.json | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {test-infra => grunt}/npm-shrinkwrap.json (100%)

diff --git a/Gruntfile.js b/Gruntfile.js
index e4d0e43e7c..dbcf935a82 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -509,7 +509,7 @@ module.exports = function (grunt) {
       if (err) {
         grunt.fail.warn(err);
       }
-      var dest = 'test-infra/npm-shrinkwrap.json';
+      var dest = 'grunt/npm-shrinkwrap.json';
       fs.renameSync('npm-shrinkwrap.json', dest);
       grunt.log.writeln('File ' + dest.cyan + ' updated.');
       done();
diff --git a/test-infra/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
similarity index 100%
rename from test-infra/npm-shrinkwrap.json
rename to grunt/npm-shrinkwrap.json

From 7d712bb4a564879cb4f7111459c493396e746b9a Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@chrisrebert.com>
Date: Wed, 23 Sep 2015 18:21:58 -0700
Subject: [PATCH 2/2] Travis: install npm dependencies using shrinkwrap; fixes
 #17552

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a5a1bac2bc..387796c5f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ before_install:
   - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi
 install:
   - bundle install --deployment --jobs=3
+  - cp grunt/npm-shrinkwrap.json ./
   - npm install -g grunt-cli
   - npm install
 cache: