summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael DeHaan <michael@ansibleworks.com>2014-01-03 17:06:32 +0100
committerMichael DeHaan <michael@ansibleworks.com>2014-01-03 17:06:32 +0100
commit0882eefdff933391be40644890d453927685849f (patch)
treee240baa4d1a53e40c59c766c60323c1718cc67b2 /Makefile
parentFixes #5146 Handle missing stdin when running under celery with rabbitmq or r... (diff)
downloadansible-0882eefdff933391be40644890d453927685849f.tar.xz
ansible-0882eefdff933391be40644890d453927685849f.zip
Merge conflict
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions