search

mesosphere-backup / deimos

Mesos containerizer hooks for Docker
Apache License 2.0
249 stars 26 forks source link

Support for local inages #54

Closed asterkin closed 10 years ago

asterkin commented 10 years ago

This small change will recognise an image in local cache without trying to pull it. Useful for development/debugging.

solidsnack commented 10 years ago

Thanks for catching this and providing a fix.

Could you use is None instead of == None, as recommended by PEP-8?

Comparisons to singletons like None should always be done with is or is not, never the equality operators.

Could you fix the spelling in the commit message ("inages" -> "images")?

I look forward to merging your patch.

asterkin commented 10 years ago

I changed the if statement to us is None. Now it seems to be late to fix the spelling in commit message (git --amend works only for the recent commit). Sorry about this. I could create a new clean branch and start over if it helps. Please, advise.

solidsnack commented 10 years ago

Please create a new clean branch and start over. Use git push -f to overwrite the old one. It should show up in this pull request.

On 12 August 2014 07:08, asterkin notifications@github.com wrote:

I changed the if statement to us is None. Now it seems to be late to fix the spelling in commit message (git --amend works only for the recent commit). Sorry about this. I could create a new clean branch and start over if it helps. Please, advise.

— Reply to this email directly or view it on GitHub https://github.com/mesosphere/deimos/pull/54#issuecomment-51880596.

ConnorDoyle commented 10 years ago

@asterkin you can also git rebase -i master followed by git push --force. See http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

asterkin commented 10 years ago

Is it ok now?