Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed anonymous merge to reassign #9

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Changed anonymous merge to reassign #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
84e87c0
Changed anonymous merge to reassign
rubeon Apr 1, 2016
0400b57
Version bump
rubeon Apr 4, 2016
050eb28
Ignore use_inline_resources in foodcritic FC059
rubeon Apr 4, 2016
b87914c
Revert "Ignore use_inline_resources in foodcritic FC059"
rubeon Apr 10, 2016
eaa7b8e
Revert "Version bump"
rubeon Apr 10, 2016
1d5bade
Added contributing file
Jul 5, 2018
aebbc1e
Added contributing file
ukcloud-rubeon Jul 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Contributors

Anyone is free to contribute to this cookbook.

Please make sure to do the following:

- Clone it
- Branch it
- Test it
- Push it
- PR it

- Eric
2 changes: 1 addition & 1 deletion providers/install.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
end

tmp_dir_props['wrapper.app.parameter.2'] = "#{server_url}/agentServer/"
tmp_dir_props.merge(new_resource.wrapper_conf_properties)
tmp_dir_props.merge!(new_resource.wrapper_conf_properties)
wrapper_path = "#{home_directory}/conf/wrapper.conf"
tmp_dir_props.each do |key, value|
augeas_props << "set /files#{wrapper_path}/#{key} #{value}"
Expand Down