Fix the __jid_event__ removed during the rebase

This commit is contained in:
Pedro Algarvio 2015-01-12 19:54:59 +00:00
parent 2344ead46f
commit a912d0b268
2 changed files with 28 additions and 2 deletions

View file

@ -133,7 +133,20 @@ dummy-variables-rgx=_|dummy
# List of additional names supposed to be defined in builtins. Remember that
# you should avoid to define new builtins when possible.
additional-builtins=__opts__,__salt__,__pillar__,__grains__,__context__,__ret__,__env__,__low__,__states__,__lowstate__,__running__,__active_provider_name__,__master_opts__,__progress__
additional-builtins=__opts__,
__salt__,
__pillar__,
__grains__,
__context__,
__ret__,
__env__,
__low__,
__states__,
__lowstate__,
__running__,
__active_provider_name__,
__master_opts__,
__jid_event__
# List of strings which can identify a callback function by name. A callback
# name must start or end with one of those strings.

View file

@ -192,7 +192,20 @@ dummy-variables-rgx=_|dummy
# List of additional names supposed to be defined in builtins. Remember that
# you should avoid to define new builtins when possible.
additional-builtins=__opts__,__salt__,__pillar__,__grains__,__context__,__ret__,__env__,__low__,__states__,__lowstate__,__running__,__active_provider_name__,__master_opts__,__progress__
additional-builtins=__opts__,
__salt__,
__pillar__,
__grains__,
__context__,
__ret__,
__env__,
__low__,
__states__,
__lowstate__,
__running__,
__active_provider_name__,
__master_opts__,
__jid_event__
# List of strings which can identify a callback function by name. A callback
# name must start or end with one of those strings.