Merge pull request #23378 from rallytime/versionadded_boto

Add versionadded tags to new functions in boto_iam module
This commit is contained in:
Justin Findlay 2015-05-05 10:34:44 -06:00
commit f01d288be9

View file

@ -31,13 +31,13 @@ Connection module for Amazon IAM
# keep lint from choking on _get_conn and _cache_id # keep lint from choking on _get_conn and _cache_id
#pylint: disable=E0602 #pylint: disable=E0602
from __future__ import absolute_import
# Import Python libs # Import Python libs
from __future__ import absolute_import
import logging import logging
import json import json
log = logging.getLogger(__name__) # Import salt libs
import salt.utils.odict as odict
# Import third party libs # Import third party libs
# pylint: disable=unused-import # pylint: disable=unused-import
@ -52,8 +52,7 @@ except ImportError:
HAS_BOTO = False HAS_BOTO = False
# pylint: enable=unused-import # pylint: enable=unused-import
# Import salt libs log = logging.getLogger(__name__)
import salt.utils.odict as odict
def __virtual__(): def __virtual__():
@ -904,6 +903,8 @@ def update_assume_role_policy(role_name, policy_document, region=None,
''' '''
Update an assume role policy for a role. Update an assume role policy for a role.
.. versionadded:: Beryllium
CLI example:: CLI example::
salt myminion boto_iam.update_assume_role_policy myrole '{"Statement":"..."}' salt myminion boto_iam.update_assume_role_policy myrole '{"Statement":"..."}'
@ -930,6 +931,8 @@ def build_policy(region=None, key=None, keyid=None, profile=None):
''' '''
Build a default assume role policy. Build a default assume role policy.
.. versionadded:: Beryllium
CLI example:: CLI example::
salt myminion boto_iam.build_policy salt myminion boto_iam.build_policy