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.

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

Repo refactor #103

Merged
merged 2 commits into from
Feb 12, 2017
Merged

Repo refactor #103

merged 2 commits into from
Feb 12, 2017

Conversation

martialblog
Copy link
Contributor

Addresses Issue #102

@martialblog
Copy link
Contributor Author

Ok the RuboCop Check failed... I'll have a look at that

@martialblog
Copy link
Contributor Author

Just now rebased the branch

@@ -24,8 +24,8 @@
puppetversion: Puppet.version,
facterversion: Facter.version
}
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
default_facts.merge!(YAML.safe_load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please check this again. I think the rebase didn't work as expected. We should stay with YAML.load.

@bastelfreak
Copy link
Member

Hi @martialblog, thanks for the PR! Can you please check the spec/spec_helper.rb again? After thats gone from the PR I'm happy to merge + release.

@bastelfreak bastelfreak added the enhancement New feature or request label Feb 12, 2017
- Added release parameter
- Key ID and download url are no longer parameters
- Key ID and download get set depending on release parameter
@martialblog
Copy link
Contributor Author

Hey @bastelfreak, all done. Should look good now.

@bastelfreak
Copy link
Member

thanks!

@bastelfreak bastelfreak merged commit 87e60f1 into voxpupuli:master Feb 12, 2017
@bastelfreak
Copy link
Member

Hi @martialblog, I just released a new version: https://forge.puppet.com/puppet/gluster

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants