Merge remote-tracking branch 'upstream/develop' into unify-api

This commit is contained in:
Samuel M Smith 2013-08-12 11:23:26 -06:00
commit 85f2c6623f

View File

@ -265,6 +265,8 @@ class CkMinions(object):
return True
if ind == '@wheel':
return True
if ind == '@wheels':
return True
elif isinstance(ind, dict):
if len(ind) != 1:
continue
@ -294,6 +296,8 @@ class CkMinions(object):
return True
if ind == '@runners':
return True
if ind == '@runner':
return True
elif isinstance(ind, dict):
if len(ind) != 1:
continue