diff options
author | Michael DeHaan <michael@ansibleworks.com> | 2014-01-03 17:06:32 +0100 |
---|---|---|
committer | Michael DeHaan <michael@ansibleworks.com> | 2014-01-03 17:06:32 +0100 |
commit | 0882eefdff933391be40644890d453927685849f (patch) | |
tree | e240baa4d1a53e40c59c766c60323c1718cc67b2 /Makefile | |
parent | Fixes #5146 Handle missing stdin when running under celery with rabbitmq or r... (diff) | |
download | ansible-0882eefdff933391be40644890d453927685849f.tar.xz ansible-0882eefdff933391be40644890d453927685849f.zip |
Merge conflict
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions