91a63dea46
Merge remote-tracking branch 'upstream/master'
2014-05-20 01:36:39 -04:00
Rafael Mendonça França
e148157d7e
Upgrade puppet-git to 2.3.1
...
Closes #598
2014-05-19 10:54:32 -03:00
Rafael Mendonça França
ddada19796
Merge pull request #587 from nbmorgan/master
...
Added boxen upgrade instructions
2014-05-19 10:15:07 -03:00
Blaine Morgan
cb8fb9c55c
Update README.md
...
Other boxem fixed.
2014-05-18 17:51:12 -07:00
Blaine Morgan
cfe24f76bb
fixed spelling error
2014-05-16 17:04:45 -07:00
Blaine Morgan
ff9161ec73
Moved Upgrading instructions to FAQ
2014-05-16 16:03:17 -07:00
Blaine Morgan
bace1f5def
Added more detailed update process
2014-05-16 16:01:44 -07:00
49b33e3611
Update all modules
...
puppet-vagrant updated one version behind (3.0.6) because newest released caused
a script error. Investigate later.
2014-05-14 01:51:28 -04:00
7d261c83a7
Remove unused modules
2014-05-14 01:10:24 -04:00
7028352103
Fix issues preventing installs
2014-05-12 20:02:05 -04:00
ba3fdd142f
Clean up last install
2014-05-12 19:48:30 -04:00
Sam Kottler
5aadcf5d9d
Merge pull request #590 from jakecraige/master
...
update Puppetfile homebrew version
2014-05-07 20:08:19 +06:00
Jake Craige
51497a0510
update Puppetfile homebrew version
2014-05-07 09:03:10 -05:00
5a986daf83
Regen lock file
2014-05-01 00:40:01 -04:00
36c2746008
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
Puppetfile.lock
2014-04-30 23:46:14 -04:00
Sam Kottler
d254b360c9
Merge pull request #577 from seanknox/fix-xcode51-ruby
...
Fix to support LLVM/ruby that ships with Xcode 5.1
2014-04-28 12:45:41 +06:00
Blaine Morgan
bdbcefbd7a
Added boxen upgrade instructions
2014-04-25 12:01:15 -07:00
Sean Knox
be298839fa
Fix to support LLVM/ruby that ships with Xcode 5.1
2014-04-18 10:13:50 -07:00
David Goodlad
565e3e96a6
Merge pull request #572 from mroth/heartbleed
...
bump version on modules (includes ruby heartbleed fix)
2014-04-13 22:58:35 +02:00
ecc6dc9854
Flux readded
2014-04-11 23:03:45 -04:00
Matthew Rothenberg
4879624227
bump version on modules (includes ruby heartbleed fix)
2014-04-11 17:32:19 -04:00
Rafael Mendonça França
75c4ef6bdf
Merge pull request #569 from tarebyte/master
...
Update Puppetfile boxen-git to 2.3.0
2014-04-08 12:32:04 -05:00
Mark Tareshawty
4c7e1e33ac
updated boxen-git to 2.3.0
2014-04-08 13:27:23 -04:00
Rafael Mendonça França
a4819d6bc4
Upgrade boxen version to 2.5.0
...
Closes #554
2014-04-01 17:57:30 -03:00
Rafael Mendonça França
9e09639bec
Merge pull request #561 from skottler/bugs/560
...
Add deep_merge to the Gemfile(.lock) and vendor it
2014-04-01 13:45:48 -05:00
Sam Kottler
0e6d68887b
Add deep_merge to the Gemfile(.lock) and vendor it
2014-04-01 22:37:51 +06:00
Rafael Mendonça França
6a5f01dfe6
Merge pull request #559 from skottler/nodejs_370
...
Update to puppet-nodejs 3.7.0
2014-04-01 08:14:29 -05:00
Sam Kottler
cc437f06e9
Update to puppet-nodejs 3.7.0
2014-04-01 19:09:03 +06:00
Rafael Mendonça França
5c4772a75a
Merge pull request #558 from stepanstipl/fix-gnu_sed
...
Fix for when is GNU sed installed in homebrew with --default-names
2014-03-31 21:09:58 -05:00
Rafael Mendonça França
a9029337f5
Merge pull request #557 from stepanstipl/fix-puppet_module_data
...
Fix "Unable to find module 'ripienaa/puppet-module-data' on https://github.com "
2014-03-31 20:39:15 -05:00
Stepan Stipl
91eaef3628
Fix for when is GNU sed installed in homebrew with --default-names
2014-04-01 00:54:41 +01:00
Stepan Stipl
055aad6c41
Fix typo for ripienaar/puppet-module-data module
2014-04-01 00:37:48 +01:00
David Goodlad
5c0a6c485a
Merge pull request #552 from boxen/hiera-and-module-data
...
Hiera and module data
2014-04-01 10:08:27 +11:00
David Goodlad
327b94b592
Be explicit that puppet-module-data is important
2014-04-01 10:03:22 +11:00
David Goodlad
2397e7a3cb
Suggest some example hierarchies
2014-04-01 10:01:13 +11:00
David Goodlad
234cd8f661
Mention the default hiera configuration in README
2014-04-01 10:01:13 +11:00
Rafael Mendonça França
0bada7bc1d
Merge pull request #555 from idris/patch-1
...
Don't let .DS_Store files break script/bootstrap
2014-03-30 18:32:04 -05:00
Idris Mokhtarzada
fec988ebda
Don't let .DS_Store files break script/bootstrap
...
Fixes boxen/our-boxen#512
In particular, I have seen problems with the following hidden files that Mac creates:
- `.DS_Store`
- `.!59508!.DS_Store`
- `.!59554!.DS_Store`
2014-03-30 18:21:38 -04:00
Rafael Mendonça França
163e412305
Add note about the module cache
2014-03-30 17:59:10 -03:00
David Goodlad
c7aa51b0eb
Add sample hiera configuration
2014-03-30 21:58:17 +11:00
Rafael Mendonça França
0d66ea7b72
Revert "Merge pull request #531 from stepanstipl/fix-gnu_sed"
...
This reverts commit 4de4bf9a0a9adae9897d
2014-03-26 18:06:47 -03:00
Rafael Mendonça França
4de4bf9a0a
Merge pull request #531 from stepanstipl/fix-gnu_sed
...
Fix to work with GNU sed
Conflicts:
script/bootstrap
2014-03-26 14:13:27 -03:00
Adam Ochonicki
9adae9897d
Merge pull request #545 from mroth/fix-module-update
...
Fix broken module update, fixes #543
2014-03-25 11:33:24 -04:00
Matthew Rothenberg
457273c20b
bump git package
...
bugfix release
2014-03-25 11:24:53 -04:00
Matthew Rothenberg
e26894540a
re revert puppet-go to 1.1.0
...
This was fixed in #523 but undone again in #542 , but should not be
moved into our-boxen until the ZSH bug is fixed.
2014-03-25 11:20:08 -04:00
Matthew Rothenberg
8567ac1fb3
Fix Puppetfile to match #542
...
It looks like #542 updated `Puppetfile.lock` but left `Puppetfile` on
the old versions. This is resulting in issues such as #543 for people
using the clean repo. This updates Puppetfile to match
2014-03-25 11:13:33 -04:00
Adam Ochonicki
61cefb77b6
Merge pull request #542 from tarebyte/master
...
Updating base configuration
2014-03-23 14:18:59 -04:00
Mark Tareshawty
552a1d139b
fixed the rubies list
2014-03-23 14:03:48 -04:00
Mark Tareshawty
1856fd7918
updated puppet deps
2014-03-23 14:03:35 -04:00
Mark Tareshawty
ca14bfc169
added ruby 2.1.1
2014-03-23 13:18:44 -04:00
