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

Add overwrite_arrays option #137

Merged
merged 1 commit into from
Sep 13, 2016
Merged

Conversation

Fryguy
Copy link
Member

@Fryguy Fryguy commented Apr 1, 2016

This is an extraction from
#103 where @dtaniwaki had
added this option, but had done it prior to the deep_merge extraction.

This depends on danielsdeleo/deep_merge#21

Paired with @carbonin https://github.com/carbonin on this.

@Fryguy
Copy link
Member Author

Fryguy commented Apr 4, 2016

This will fail Travis until danielsdeleo/deep_merge#21 is merged and the gemspec is updated here.

chessbyte pushed a commit to ManageIQ/manageiq that referenced this pull request Apr 5, 2016
The ability to override Arrays has been made into a PR upstream at
rubyconfig/config#137 and
danielsdeleo/deep_merge#21 . However, they
are not yet merged.  When they are merged and released, we can
switch back to a released version.

Supercedes #7656
Paired on this with @carbonin
@Fryguy
Copy link
Member Author

Fryguy commented Apr 7, 2016

@pkuczynski @fredwu Not sure who to ping on this, so hoping I pick the right people 🙏 Do you also do reviews / merge on https://github.com/danielsdeleo/deep_merge ?

@fredwu
Copy link
Member

fredwu commented Apr 7, 2016

@Fryguy No I don't believe any of us do - in fact by the looks of it deep_merge hasn't seen any commits since January 2014 so it's not actively maintained any more...

alongoldboim pushed a commit to alongoldboim/manageiq that referenced this pull request Apr 10, 2016
The ability to override Arrays has been made into a PR upstream at
rubyconfig/config#137 and
danielsdeleo/deep_merge#21 . However, they
are not yet merged.  When they are merged and released, we can
switch back to a released version.

Supercedes ManageIQ#7656
Paired on this with @carbonin
@pkuczynski pkuczynski added this to the 1.x overwrite arrays milestone May 12, 2016
@Fryguy
Copy link
Member Author

Fryguy commented May 20, 2016

I've updated my PR on deep_merge...hopefully it will pass now...then I'll see if I can get a new deep_merge version released

@pkuczynski
Copy link
Member

@Fryguy it seems that you have some conflicts. Could you please rebase on top of current master and squash your commits into one?

I got a message from @danielsdeleo and he will look at the deep_merge PR in June...

@Fryguy
Copy link
Member Author

Fryguy commented Jun 28, 2016

My deep_merge PR was merged...just need a release of deep_merge itself.

@pkuczynski
Copy link
Member

When do you think it will be released?

@kapso
Copy link

kapso commented Jul 3, 2016

+1

@vinceve vinceve mentioned this pull request Jul 27, 2016
@vinceve
Copy link

vinceve commented Jul 27, 2016

@ALL I submitted a new pull request where I pushed the same gem under a new name (deep_merge2). The latest release of the deep_merge gem was in 2011, so I guess it wasn't going to be released soon.

link to pull request: #147

Note: I rebased the branch onto the master of railsconfig/config. It should be mergeable. :)

@Fryguy
Copy link
Member Author

Fryguy commented Aug 1, 2016

@pkuczynski I'll rebase this today...I'll also see if I can @danielsdeleo to release a new deep_merge

@Fryguy
Copy link
Member Author

Fryguy commented Aug 1, 2016

@pkuczynski I just got release rights on the deep_merge gem. Expect a new version soon and then I will update this PR with the new gem.

This is an extraction from
rubyconfig#103 where @dtaniwaki had
added this option, but had done it prior to the deep_merge extraction.

This depends on danielsdeleo/deep_merge#21

Paired with @carbonin <https://github.com/carbonin> on this.
@Fryguy
Copy link
Member Author

Fryguy commented Aug 1, 2016

@pkuczynski I released a new version of the deep_merge gem and updated this PR accordingly.

@kbrock
Copy link

kbrock commented Aug 25, 2016

Cool stuff. Any objections before merging?

@Fryguy
Copy link
Member Author

Fryguy commented Aug 30, 2016

@pkuczynski @fredwu Bump?

Incidentally, we've been using this branch in ManageIQ / CloudForms for quite a while now, and all seems well!

@pkuczynski
Copy link
Member

I am on holiday at the moment. Can have a look when I am back

@Fryguy
Copy link
Member Author

Fryguy commented Sep 6, 2016

@pkuczynski Sounds great! Enjoy your holiday! 😎

@pkuczynski
Copy link
Member

The only thing I will change is to make it default to 'true', as this should be the correct behaviour from the start I believe. I will also add a note in the documentation, to highlight this change.

@Fryguy
Copy link
Member Author

Fryguy commented Sep 15, 2016

🎉 Thanks @pkuczynski

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants