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

Already on GitHub? Sign in to your account

Add Windows support for File operations #737

Merged
merged 11 commits into from Feb 22, 2012

Conversation

Projects
None yet
3 participants
Owner

UtahDave commented Feb 22, 2012

No description provided.

@thatch45 thatch45 added a commit that referenced this pull request Feb 22, 2012

@thatch45 thatch45 Merge pull request #737 from UtahDave/develop
Add Windows support for File operations
d6cc156

@thatch45 thatch45 merged commit d6cc156 into saltstack:develop Feb 22, 2012

Member

SEJeff commented Feb 22, 2012

Hey Dave, the next time you do a pull request, do you mind rebasing your local branch before pushing? That way you don't have the 7 unnecessary merge commits.

Before you start hacking on a feature and with a clean git branch you can do:

git pull upstream develop && git rebase FETCH_HEAD

Then do write your feature and do your local commits. Afterwards run this again:

git pull upstream develop && git rebase FETCH_HEAD

With regard to merging and whatnot, git will do the right thing. If there is a commit upstream, you won't need to run git pull unless it updates files that you are working on. If you want, hit me up on IRC and I would be more than happy to show you how to do this. Other than that very small nit, awesome work. Please do keep the windows support coming.

@arthurlogilab arthurlogilab pushed a commit to arthurlogilab/salt that referenced this pull request Sep 17, 2013

@techhat techhat Merge pull request #737 from techhat/softlayer
Adding new SoftLayer driver
38dd053
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment