search

chr4-cookbooks / duplicity_ng

Chef cookbook to install duplicity and manage duplicity backup cronjobs
Other
3 stars 5 forks source link

Boto config provider #20

Closed merqlove closed 10 years ago

merqlove commented 10 years ago

Rebased from upstream master. Removed duplicate commit's. I don't understand why github adding your commits' into pool.

chr4 commented 10 years ago

I think you didn't rebase correctly. Maybe you did not git pull my changes first?

merqlove commented 10 years ago

Yes, i just made git fetch upstream && git pull --rebase upstream master And after git rebase -i HEAD~13 (till Ignore .ruby-version and .ruby-gemset)

merqlove commented 10 years ago

I found solution. Wait a minute :)