Merge pull request #663 from MarkVillacampa/master

bump boxen-xquartz to 1.2.1
MAECProject · Sep 25, 2014 · 4748541 · 4748541
2 parents 77b048a + e80065a
commit 4748541
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -55,7 +55,7 @@ github "repository",  "2.3.0"
 github "ruby",        "8.1.2"
 github "stdlib",      "4.2.1", :repo => "puppetlabs/puppetlabs-stdlib"
 github "sudo",        "1.0.0"
-github "xquartz",     "1.1.1"
+github "xquartz",     "1.2.1"
 
 # Optional/custom modules. There are tons available at
 # https://github.com/boxen.
diff --git a/Puppetfile.lock b/Puppetfile.lock
@@ -81,7 +81,7 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-xquartz
   specs:
-    xquartz (1.1.1)
+    xquartz (1.2.1)
 
 GITHUBTARBALL
   remote: puppetlabs/puppetlabs-inifile
@@ -118,5 +118,5 @@ DEPENDENCIES
   ruby (= 8.1.2)
   stdlib (= 4.2.1)
   sudo (= 1.0.0)
-  xquartz (= 1.1.1)
+  xquartz (= 1.2.1)
 
diff --git a/vendor/puppet/cache/boxen-puppet-xquartz-1.1.1.tar.gz b/vendor/puppet/cache/boxen-puppet-xquartz-1.1.1.tar.gz
diff --git a/vendor/puppet/cache/boxen-puppet-xquartz-1.2.1.tar.gz b/vendor/puppet/cache/boxen-puppet-xquartz-1.2.1.tar.gz