Merge lp:~hatch/juju-gui/1129464-grunt-version into lp:juju-gui/experimental

[Jeff Pihach]

Restricted grunt version

https://codereview.appspot.com/7357044/

[Jeff Pihach (hatch)]

Reviewers: mp+149310_code.launchpad.net,

Message:
Please take a look.

Description:
Restricted grunt version

https://code.launchpad.net/~hatch/juju-gui/1129464-grunt-version/+merge/149310

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/7357044/

Affected files:
   M HACKING
   A [revision details]
   M package.json

Index: HACKING
=== modified file 'HACKING'
--- HACKING 2013-02-13 18:35:39 +0000
+++ HACKING 2013-02-19 15:26:08 +0000
@@ -85,6 +85,24 @@

  You can then access the GUI at <http://localhost:8888/>.

+If you receive an error like:
+
+ fs.js:837
+ throw errnoException(errno, 'watch');
+ ^
+ Error: watch ENOSPC
+
+You can increase your watch limit:
+
+Create or edit:
+ /etc/sysctl.d/10-inotify.conf
+
+Add in the following:
+ # expand inotify limit
+ fs.inotify.max_user_watches=16384
+
+Then restart
+
  Note that the Makefile supports ``make help`` to try to introduce some of
the
  more important targets. Also note that if you use the "make prod" target
  while using the PyJuju rapi-rollup improv script, the password you should
use

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision: <email address hidden>

Index: package.json
=== modified file 'package.json'
--- package.json 2013-02-06 15:29:02 +0000
+++ package.json 2013-02-19 15:26:08 +0000
@@ -31,7 +31,7 @@
      "graceful-fs": "1.1.x",
      "rimraf": "2.0.x",
      "uglify-js": "2.2.x",
- "grunt": ">=0.2.0",
+ "grunt": "0.3.17",
      "node-spritesheet": ">=0.2.3",
      "node-minify": "0.7.x"
    },

[Madison Scott-Clary (makyo)]

Land with changes, looks good to me. Thanks for the fix.

https://codereview.appspot.com/7357044/diff/1/HACKING
File HACKING (right):

https://codereview.appspot.com/7357044/diff/1/HACKING#newcode88
HACKING:88: If you receive an error like:
I believe these should be double-colons before indented code.

https://codereview.appspot.com/7357044/

[Gary Poster (gary)]

Land with changes. Looks good. Thank you.

Gary

https://codereview.appspot.com/7357044/diff/1/HACKING
File HACKING (right):

https://codereview.appspot.com/7357044/diff/1/HACKING#newcode88
HACKING:88: If you receive an error like:
On 2013/02/19 15:48:21, matthew.scott wrote:
> I believe these should be double-colons before indented code.

Yes. I suggest running make view-docs to verify that things look as you
hope

https://codereview.appspot.com/7357044/diff/1/HACKING#newcode104
HACKING:104: Then restart
or sudo sysctl -p

https://codereview.appspot.com/7357044/

[Jeff Pihach (hatch)]

*** Submitted:

Restricted grunt version

R=matthew.scott, gary.poster
CC=
https://codereview.appspot.com/7357044

https://codereview.appspot.com/7357044/

=== modified file 'HACKING'
--- HACKING	2013-02-13 18:35:39 +0000
+++ HACKING	2013-02-19 15:30:55 +0000
@@ -85,6 +85,24 @@
 
 You can then access the GUI at <http://localhost:8888/>.
 
+If you receive an error like:
+
+  fs.js:837
+     throw errnoException(errno, 'watch');
+           ^
+  Error: watch ENOSPC
+
+You can increase your watch limit:
+
+Create or edit:
+  /etc/sysctl.d/10-inotify.conf
+
+Add in the following:
+  # expand inotify limit
+  fs.inotify.max_user_watches=16384
+
+Then restart
+
 Note that the Makefile supports ``make help`` to try to introduce some of the
 more important targets.  Also note that if you use the "make prod" target
 while using the PyJuju rapi-rollup improv script, the password you should use
 
=== modified file 'package.json'
--- package.json	2013-02-06 15:29:02 +0000
+++ package.json	2013-02-19 15:30:55 +0000
@@ -31,7 +31,7 @@
     "graceful-fs": "1.1.x",
     "rimraf": "2.0.x",
     "uglify-js": "2.2.x",
-    "grunt": ">=0.2.0",
+    "grunt": "0.3.17",
     "node-spritesheet": ">=0.2.3",
     "node-minify": "0.7.x"
   },