merge from immerda #6
Open
+666
−65
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* split things up between technologies and then between operating- systems * include legacy stuff from the virtual module * refactor things * add various scripts and facts
Conflicts: examples/virt-example.pp lib/puppet/provider/virt/libvirt.rb lib/puppet/type/virt.rb manifests/init.pp
|
@carlasouza Are you planning to merge this? I want to do some refactoring and I don't want to be rebasing against this. :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi,
I was looking around for the best puppet virtual module, and I found yours, but I also found that the immerda group had made a number of recent improvements that were not contained within your repository (git://git.puppet.immerda.ch/module-virt.git).
Their changes were on top of your unstable branch, which has not seen commits from you since 2010. You have been making other commits in the master branch that were useful. So what this meant was that you had new things in master, and immerda had new things in unstable. Time for a merge!
I've done that merge, and resolved the conflicts and I present to you this pull request to consider. The biggest difference here is the class refactoring that immerda did which brings your module in-line with best practices for module auto-loading. It places different classes into files, rather them being all in init.pp and params.pp. This is a really good improvement, but hard to wrap your head around when it comes to merging.
Anyways, have a look, it would be good to get these sync'd up as I think both of you have been doing good work. Let me know if you have any questions.