Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/boxen/our-boxen into work…

…ing-branch
  • Loading branch information...
kieran-bamforth committed Apr 25, 2016
2 parents 253dcbc + 9e8348c commit 7fe877f45882cda540b3ad99448fd2bba25a6e04
@@ -44,7 +44,7 @@ github "foreman", "1.2.0"
github "gcc", "3.0.2"
github "git", "2.7.92"
github "go", "2.1.0"
github "homebrew", "1.13.0"
github "homebrew", "2.0.2"
github "hub", "1.4.1"
github "inifile", "1.4.1", :repo => "puppetlabs/puppetlabs-inifile"
github "nginx", "1.6.0"
@@ -81,7 +81,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-homebrew
specs:
homebrew (1.13.0)
homebrew (2.0.2)

GITHUBTARBALL
remote: boxen/puppet-hub
@@ -286,7 +286,7 @@ DEPENDENCIES
git (= 2.7.92)
gitx (= 1.2.0)
go (= 2.1.0)
homebrew (= 1.13.0)
homebrew (= 2.0.2)
hub (= 1.4.1)
inifile (= 1.4.1)
iterm2 (= 1.2.5)
@@ -31,7 +31,7 @@ and detect most of these and tell you anyway):

### Dependencies

**Install the Xcode Command Lines Tools and/or full Xcode.**
**Install the Xcode Command Line Tools and/or full Xcode.**
This will grant you the most predictable behavior in building apps like
MacVim.

@@ -137,8 +137,8 @@ This template project provides the following by default:
* Node.js 0.12
* Ruby 1.9.3
* Ruby 2.0.0
* Ruby 2.1.7
* Ruby 2.2.3
* Ruby 2.1.8
* Ruby 2.2.4
* ack
* Findutils
* GNU tar
@@ -54,7 +54,7 @@ The next step is to update your Puppet modules and RubyGems. First delete Puppet
```bash
rm Puppetfile.lock Gemfile.lock
bundle install --no-deployment --without development --path .bundle
bundle exec librarian-puppet install --clean
bundle exec librarian-puppet install --path=shared --clean
```

### Q: What's a good approach to merging our-boxen back into my private fork?
@@ -65,7 +65,7 @@ One approach is to delete the Gemfile.lock and Puppetfile.lock and run:
bundle install --without development --path .bundle

# Regenerates Puppetfile.lock and caches tarballs
bundle exec librarian-puppet install --clean
bundle exec librarian-puppet install --path=shared --clean

These will generate the respective lock files suitable for committing. Hope that helps.

Binary file not shown.
Binary file not shown.

0 comments on commit 7fe877f

Please sign in to comment.
You can’t perform that action at this time.