updated @damonp 's work on Vagrant to merge cleanly with Master.
added cookbook version numbers to the Berksfile so they don't automatically increment.
Some of the cookbook versions are newer than what was previously used, but since everything worked for me, I hardcoded things to the version number that was pulled in what I ran vagrant up.
There were a few conflicts that needed to be manually resolved:
CONFLICT (content): Merge conflict in site-cookbooks/bb_monitor/recipes/nginx.rb
CONFLICT (content): Merge conflict in site-cookbooks/bb_external/recipes/sensu_plugins.rb
CONFLICT (content): Merge conflict in readme.md
CONFLICT (add/add): Merge conflict in create_stack
CONFLICT (content): Merge conflict in Berksfile.lock
I'm not as familiar with this project as everyone else yet, so I would appreciate if someone could check out those files to make sure the manual merge looks good.
Some of the cookbook versions are newer than what was previously used, but since everything worked for me, I hardcoded things to the version number that was pulled in what I ran vagrant up.
There were a few conflicts that needed to be manually resolved:
I'm not as familiar with this project as everyone else yet, so I would appreciate if someone could check out those files to make sure the manual merge looks good.