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

Added functionality to load properties from mix of files and urls #12

Merged
merged 4 commits into from Jul 5, 2016

Conversation

rkhokhla
Copy link
Contributor

@rkhokhla rkhokhla commented Jul 1, 2016

Please review the change and incorporate into project if you find it appropriate.

@@ -652,6 +652,16 @@ func (p *Properties) expand(input string) (string, error) {
return expand(input, make(map[string]bool), p.Prefix, p.Postfix, p.m)
}

func (p *Properties) merge(other *Properties) {
Copy link
Owner

Choose a reason for hiding this comment

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

That should be public IMO and could you add a test please?

@magiconair
Copy link
Owner

The second approach with the merge function looks better.

@magiconair magiconair merged commit e2f061e into magiconair:master Jul 5, 2016
@magiconair magiconair added this to the 1.7.1 milestone Oct 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants