diff --git a/.ci/docs b/.ci/docs new file mode 100644 index 0000000000..4363b2d61a --- /dev/null +++ b/.ci/docs @@ -0,0 +1,46 @@ +pipeline { + agent { label 'docs' } + environment { + PYENV_ROOT = "/usr/local/pyenv" + PATH = "$PYENV_ROOT/bin:$PATH" + } + stages { + stage('github-pending') { + steps { + githubNotify credentialsId: 'test-jenkins-credentials', + description: 'Testing docs...', + status: 'PENDING', + context: "jenkins/pr/docs" + } + } + stage('setup') { + steps { + sh 'eval "$(pyenv init -)"; pyenv install 2.7.14 || echo "We already have this python."; pyenv local 2.7.14; pyenv shell 2.7.14' + sh 'eval "$(pyenv init -)"; pip install sphinx -e .' + } + } + stage('build') { + steps { + sh 'eval "$(pyenv init -)"; make -C doc clean html' + archiveArtifacts artifacts: 'doc/_build/html/' + } + } + } + post { + always { + cleanWs() + } + success { + githubNotify credentialsId: 'test-jenkins-credentials', + description: 'The docs job has passed', + status: 'SUCCESS', + context: "jenkins/pr/docs" + } + failure { + githubNotify credentialsId: 'test-jenkins-credentials', + description: 'The docs job has failed', + status: 'FAILURE', + context: "jenkins/pr/docs" + } + } +} diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2 new file mode 100644 index 0000000000..ee47ea6c61 --- /dev/null +++ b/.ci/kitchen-centos7-py2 @@ -0,0 +1,65 @@ +pipeline { + agent { label 'kitchen-slave' } + environment { + SALT_KITCHEN_PLATFORMS = "/var/jenkins/workspace/platforms.yml" + SALT_KITCHEN_DRIVER = "/var/jenkins/workspace/driver.yml" + PATH = "/usr/local/rbenv/shims/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin:/root/bin" + RBENV_VERSION = "2.4.2" + TEST_SUITE = "py2" + TEST_PLATFORM = "centos-7" + } + stages { + stage('github-pending') { + steps { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "running ${TEST_SUITE}-${TEST_PLATFORM}...", + status: 'PENDING', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + } + stage('setup') { + steps { + sh 'bundle install --with ec2 windows --without opennebula docker' + } + } + stage('run kitchen') { + steps { + script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + sshagent(credentials: ['jenkins-testing-ssh-key']) { + sh 'ssh-add ~/.ssh/jenkins-testing.pem' + sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM || bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' + sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' + } + }} + archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml' + } + post { + always { + script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + sshagent(credentials: ['jenkins-testing-ssh-key']) { + sh 'ssh-add ~/.ssh/jenkins-testing.pem' + sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM' + } + }} + } + } + } + } + post { + always { + cleanWs() + } + success { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed", + status: 'SUCCESS', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + failure { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed", + status: 'FAILURE', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + } +} diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3 new file mode 100644 index 0000000000..999aebeeb3 --- /dev/null +++ b/.ci/kitchen-centos7-py3 @@ -0,0 +1,65 @@ +pipeline { + agent { label 'kitchen-slave' } + environment { + SALT_KITCHEN_PLATFORMS = "/var/jenkins/workspace/platforms.yml" + SALT_KITCHEN_DRIVER = "/var/jenkins/workspace/driver.yml" + PATH = "/usr/local/rbenv/shims/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin:/root/bin" + RBENV_VERSION = "2.4.2" + TEST_SUITE = "py3" + TEST_PLATFORM = "centos-7" + } + stages { + stage('github-pending') { + steps { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "running ${TEST_SUITE}-${TEST_PLATFORM}...", + status: 'PENDING', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + } + stage('setup') { + steps { + sh 'bundle install --with ec2 windows --without opennebula docker' + } + } + stage('run kitchen') { + steps { + script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + sshagent(credentials: ['jenkins-testing-ssh-key']) { + sh 'ssh-add ~/.ssh/jenkins-testing.pem' + sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM || bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' + sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' + } + }} + archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml' + } + post { + always { + script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + sshagent(credentials: ['jenkins-testing-ssh-key']) { + sh 'ssh-add ~/.ssh/jenkins-testing.pem' + sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM' + } + }} + } + } + } + } + post { + always { + cleanWs() + } + success { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed", + status: 'SUCCESS', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + failure { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed", + status: 'FAILURE', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + } +} diff --git a/.ci/kitchen-ubuntu1604-py2 b/.ci/kitchen-ubuntu1604-py2 new file mode 100644 index 0000000000..20ff7d9463 --- /dev/null +++ b/.ci/kitchen-ubuntu1604-py2 @@ -0,0 +1,65 @@ +pipeline { + agent { label 'kitchen-slave' } + environment { + SALT_KITCHEN_PLATFORMS = "/var/jenkins/workspace/platforms.yml" + SALT_KITCHEN_DRIVER = "/var/jenkins/workspace/driver.yml" + PATH = "/usr/local/rbenv/shims/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin:/root/bin" + RBENV_VERSION = "2.4.2" + TEST_SUITE = "py2" + TEST_PLATFORM = "ubuntu-1604" + } + stages { + stage('github-pending') { + steps { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "running ${TEST_SUITE}-${TEST_PLATFORM}...", + status: 'PENDING', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + } + stage('setup') { + steps { + sh 'bundle install --with ec2 windows --without opennebula docker' + } + } + stage('run kitchen') { + steps { + script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + sshagent(credentials: ['jenkins-testing-ssh-key']) { + sh 'ssh-add ~/.ssh/jenkins-testing.pem' + sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM || bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' + sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' + } + }} + archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml' + } + post { + always { + script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + sshagent(credentials: ['jenkins-testing-ssh-key']) { + sh 'ssh-add ~/.ssh/jenkins-testing.pem' + sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM' + } + }} + } + } + } + } + post { + always { + cleanWs() + } + success { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed", + status: 'SUCCESS', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + failure { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed", + status: 'FAILURE', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + } +} diff --git a/.ci/kitchen-ubuntu1604-py3 b/.ci/kitchen-ubuntu1604-py3 new file mode 100644 index 0000000000..91712b717d --- /dev/null +++ b/.ci/kitchen-ubuntu1604-py3 @@ -0,0 +1,65 @@ +pipeline { + agent { label 'kitchen-slave' } + environment { + SALT_KITCHEN_PLATFORMS = "/var/jenkins/workspace/platforms.yml" + SALT_KITCHEN_DRIVER = "/var/jenkins/workspace/driver.yml" + PATH = "/usr/local/rbenv/shims/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin:/root/bin" + RBENV_VERSION = "2.4.2" + TEST_SUITE = "py3" + TEST_PLATFORM = "ubuntu-1604" + } + stages { + stage('github-pending') { + steps { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "running ${TEST_SUITE}-${TEST_PLATFORM}...", + status: 'PENDING', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + } + stage('setup') { + steps { + sh 'bundle install --with ec2 windows --without opennebula docker' + } + } + stage('run kitchen') { + steps { + script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + sshagent(credentials: ['jenkins-testing-ssh-key']) { + sh 'ssh-add ~/.ssh/jenkins-testing.pem' + sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM || bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM' + sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM' + } + }} + archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml' + } + post { + always { + script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + sshagent(credentials: ['jenkins-testing-ssh-key']) { + sh 'ssh-add ~/.ssh/jenkins-testing.pem' + sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM' + } + }} + } + } + } + } + post { + always { + cleanWs() + } + success { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed", + status: 'SUCCESS', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + failure { + githubNotify credentialsId: 'test-jenkins-credentials', + description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed", + status: 'FAILURE', + context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}" + } + } +} diff --git a/.ci/lint b/.ci/lint new file mode 100644 index 0000000000..f848a9d11f --- /dev/null +++ b/.ci/lint @@ -0,0 +1,66 @@ +pipeline { + agent { label 'pr-lint-slave' } + environment { + PYENV_ROOT = "/usr/local/pyenv" + PATH = "$PYENV_ROOT/bin:$PATH" + } + stages { + stage('github-pending') { + steps { + githubNotify credentialsId: 'test-jenkins-credentials', + description: 'Testing lint...', + status: 'PENDING', + context: "jenkins/pr/lint" + } + } + stage('setup') { + steps { + sh 'eval "$(pyenv init -)"; pyenv install 2.7.14 || echo "We already have this python."; pyenv local 2.7.14; pyenv shell 2.7.14' + sh 'eval "$(pyenv init -)"; pip install pylint SaltPyLint' + sh 'eval "$(pyenv init -)"; which pylint; pylint --version' + } + } + stage('linting') { + failFast false + parallel { + stage('salt linting') { + steps { + sh 'eval "$(pyenv init -)"; pylint --rcfile=.testing.pylintrc --disable=W1307,str-format-in-logging setup.py salt/ | tee pylint-report.xml' + archiveArtifacts artifacts: 'pylint-report.xml' + } + } + stage('test linting') { + steps { + sh 'eval "$(pyenv init -)"; pylint --rcfile=.testing.pylintrc --disable=W0232,E1002,W1307,str-format-in-logging tests/ | tee pylint-report-tests.xml' + archiveArtifacts artifacts: 'pylint-report-tests.xml' + } + } + } + } + } + post { + always { + step([$class: 'WarningsPublisher', + parserConfigurations: [[ + parserName: 'PyLint', + pattern: 'pylint-report*.xml' + ]], + unstableTotalAll: '999', + usePreviousBuildAsReference: true + ]) + cleanWs() + } + success { + githubNotify credentialsId: 'test-jenkins-credentials', + description: 'The lint job has passed', + status: 'SUCCESS', + context: "jenkins/pr/lint" + } + failure { + githubNotify credentialsId: 'test-jenkins-credentials', + description: 'The lint job has failed', + status: 'FAILURE', + context: "jenkins/pr/lint" + } + } +} diff --git a/.github/stale.yml b/.github/stale.yml index 603aab719c..9e60a57424 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,8 +1,8 @@ # Probot Stale configuration file # Number of days of inactivity before an issue becomes stale -# 700 is approximately 1 year and 11 months -daysUntilStale: 700 +# 650 is approximately 1 year and 9 months +daysUntilStale: 650 # Number of days of inactivity before a stale issue is closed daysUntilClose: 7 diff --git a/.kitchen.yml b/.kitchen.yml index dd1a795bfe..e704f0a113 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -1,6 +1,6 @@ --- <% vagrant = system('gem list -i kitchen-vagrant 2>/dev/null >/dev/null') %> -<% version = '2017.7.4' %> +<% version = '2017.7.6' %> <% platformsfile = ENV['SALT_KITCHEN_PLATFORMS'] || '.kitchen/platforms.yml' %> <% driverfile = ENV['SALT_KITCHEN_DRIVER'] || '.kitchen/driver.yml' %> <% verifierfile = ENV['SALT_KITCHEN_VERIFIER'] || '.kitchen/verifier.yml' %> @@ -31,7 +31,7 @@ provisioner: salt_version: latest salt_bootstrap_url: https://bootstrap.saltstack.com salt_bootstrap_options: -X -p rsync stable <%= version %> - log_level: debug + log_level: info sudo: true require_chef: false retry_on_exit_code: @@ -43,23 +43,20 @@ provisioner: repo: git testingdir: /testing salt_copy_filter: - - .bundle - - .kitchen - - .kitchen.yml - - artifacts - - Gemfile - - Gemfile.lock - - README.rst - - .travis.yml - - '*.pyc' - __pycache__ + - '*.pyc' + - .bundle + - .tox + - .kitchen + - artifacts + - Gemfile.lock state_top: base: "os:Windows": - match: grain - prep_windows "*": - - git.salt + - <%= ENV['KITCHEN_STATE'] || 'git.salt' %> pillars: top.sls: base: diff --git a/.pylintrc b/.pylintrc index 390a82c998..ea2705cb99 100644 --- a/.pylintrc +++ b/.pylintrc @@ -170,6 +170,7 @@ additional-builtins=__opts__, __proxy__, __serializers__, __reg__, + __executors__, __events__ # List of strings which can identify a callback function by name. A callback diff --git a/.testing.pylintrc b/.testing.pylintrc index ccb20da64d..30f93d53bb 100644 --- a/.testing.pylintrc +++ b/.testing.pylintrc @@ -267,6 +267,7 @@ additional-builtins=__opts__, __proxy__, __serializers__, __reg__, + __executors__, __events__ diff --git a/conf/minion b/conf/minion index 2f94e6f415..03e6a9f978 100644 --- a/conf/minion +++ b/conf/minion @@ -21,6 +21,10 @@ #proxy_username: #proxy_password: +# List of hosts to bypass HTTP proxy. This key does nothing unless proxy_host etc is +# configured, it does not support any kind of wildcards. +#no_proxy: [] + # If multiple masters are specified in the 'master' setting, the default behavior # is to always try to connect to them in the order they are listed. If random_master is # set to True, the order will be randomized instead. This can be helpful in distributing diff --git a/doc/.scripts/compile-translation-catalogs b/doc/.scripts/compile-translation-catalogs index 6ed8573049..181462e9a8 100755 --- a/doc/.scripts/compile-translation-catalogs +++ b/doc/.scripts/compile-translation-catalogs @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) compile-translation-catalogs diff --git a/doc/.scripts/download-translation-catalog b/doc/.scripts/download-translation-catalog index 6f23343224..81bdf1822a 100755 --- a/doc/.scripts/download-translation-catalog +++ b/doc/.scripts/download-translation-catalog @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) download-translation-catalog diff --git a/doc/.scripts/setup-transifex-config b/doc/.scripts/setup-transifex-config index fc5e56d066..398a3f875f 100755 --- a/doc/.scripts/setup-transifex-config +++ b/doc/.scripts/setup-transifex-config @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) setup-transifex-config diff --git a/doc/.scripts/update-transifex-source-translations b/doc/.scripts/update-transifex-source-translations index be2e29c917..b82363397e 100755 --- a/doc/.scripts/update-transifex-source-translations +++ b/doc/.scripts/update-transifex-source-translations @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) update-transifex-source-translations diff --git a/doc/_ext/saltautodoc.py b/doc/_ext/saltautodoc.py index 9826dac8c4..439bfe0c25 100644 --- a/doc/_ext/saltautodoc.py +++ b/doc/_ext/saltautodoc.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) saltautodoc.py diff --git a/doc/conf.py b/doc/conf.py index 441f2121cf..7309353f91 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -6,6 +6,7 @@ Sphinx documentation for Salt import functools import sys import os +import re import types import time @@ -106,6 +107,7 @@ MOCK_MODULES = [ 'tornado', 'tornado.concurrent', + 'tornado.escape', 'tornado.gen', 'tornado.httpclient', 'tornado.httpserver', @@ -127,53 +129,56 @@ MOCK_MODULES = [ # modules, renderers, states, returners, et al 'ClusterShell', 'ClusterShell.NodeSet', - 'django', - 'libvirt', 'MySQLdb', 'MySQLdb.cursors', - 'nagios_json', - 'psutil', - 'pycassa', - 'pymongo', - 'rabbitmq_server', - 'redis', - 'requests', - 'requests.exceptions', - 'rpm', - 'rpmUtils', - 'rpmUtils.arch', - 'yum', 'OpenSSL', - 'zfs', - 'salt.ext.six.moves.winreg', - 'win32security', - 'ntsecuritycon', - 'napalm', + 'avahi', + 'boto.regioninfo', + 'concurrent', + 'dbus', + 'django', + 'dns', + 'dns.resolver', 'dson', + 'hjson', 'jnpr', - 'json', - 'lxml', - 'lxml.etree', 'jnpr.junos', 'jnpr.junos.utils', 'jnpr.junos.utils.config', 'jnpr.junos.utils.sw', - 'dns', - 'dns.resolver', + 'json', 'keyring', + 'libvirt', + 'lxml', + 'lxml.etree', + 'msgpack', + 'nagios_json', + 'napalm', 'netaddr', 'netaddr.IPAddress', 'netaddr.core', 'netaddr.core.AddrFormatError', + 'ntsecuritycon', + 'psutil', + 'pycassa', + 'pyconnman', + 'pyiface', + 'pymongo', 'pyroute2', 'pyroute2.ipdb', - 'avahi', - 'dbus', + 'rabbitmq_server', + 'redis', + 'rpm', + 'rpmUtils', + 'rpmUtils.arch', + 'salt.ext.six.moves.winreg', 'twisted', 'twisted.internet', 'twisted.internet.protocol', 'twisted.internet.protocol.DatagramProtocol', - 'msgpack', + 'win32security', + 'yum', + 'zfs', ] for mod_name in MOCK_MODULES: @@ -210,6 +215,8 @@ sys.modules['ntsecuritycon'].SYNCHRONIZE = 0 # Define a fake version attribute for the following libs. sys.modules['cherrypy'].config = mock_decorator_with_params +sys.modules['tornado'].version_info = (0, 0, 0) +sys.modules['boto.regioninfo']._load_json_file = {'endpoints': None} # -- Add paths to PYTHONPATH --------------------------------------------------- @@ -237,8 +244,7 @@ formulas_dir = os.path.join(os.pardir, docs_basepath, 'formulas') # ----- Intersphinx Settings ------------------------------------------------> intersphinx_mapping = { - 'python2': ('http://docs.python.org/2', None), - 'python3': ('http://docs.python.org/3', None) + 'python': ('https://docs.python.org/3', None) } # <---- Intersphinx Settings ------------------------------------------------- @@ -250,8 +256,8 @@ on_saltstack = 'SALT_ON_SALTSTACK' in os.environ project = 'Salt' version = salt.version.__version__ -latest_release = '2018.3.0' # latest release -previous_release = '2017.7.5' # latest release from previous branch +latest_release = '2018.3.2' # latest release +previous_release = '2017.7.7' # latest release from previous branch previous_release_dir = '2017.7' # path on web server for previous branch next_release = '' # next release next_release_dir = '' # path on web server for next release branch @@ -316,6 +322,9 @@ modindex_common_prefix = ['salt.'] autosummary_generate = True +# strip git rev as there won't necessarily be a release based on it +stripped_release = re.sub(r'-\d+-g[0-9a-f]+$', '', release) + # Define a substitution for linking to the latest release tarball rst_prolog = """\ .. |current_release_doc| replace:: :doc:`/topics/releases/{release}` @@ -352,14 +361,13 @@ rst_prolog = """\

x86_64: salt-{release}-py3-x86_64.pkg | md5

-""".format(release=release) +""".format(release=stripped_release) # A shortcut for linking to tickets on the GitHub issue tracker extlinks = { 'blob': ('https://github.com/saltstack/salt/blob/%s/%%s' % 'develop', None), - 'download': ('https://cloud.github.com/downloads/saltstack/salt/%s', None), - 'issue': ('https://github.com/saltstack/salt/issues/%s', 'issue '), - 'pull': ('https://github.com/saltstack/salt/pull/%s', 'PR '), + 'issue': ('https://github.com/saltstack/salt/issues/%s', 'issue #'), + 'pull': ('https://github.com/saltstack/salt/pull/%s', 'PR #'), 'formula_url': ('https://github.com/saltstack-formulas/%s', ''), } diff --git a/doc/contents.rst b/doc/contents.rst index b9cdbb29bd..3b06f98656 100644 --- a/doc/contents.rst +++ b/doc/contents.rst @@ -7,6 +7,7 @@ Salt Table of Contents .. toctree:: :maxdepth: 2 + topics/index topics/installation/index topics/configuration/index topics/using_salt @@ -15,12 +16,16 @@ Salt Table of Contents topics/utils/index topics/event/index topics/orchestrate/index + topics/solaris/index topics/ssh/index + topics/thorium/index topics/cloud/index topics/proxyminion/index topics/network_automation/index topics/virt/index ref/cli/index + ref/pillar/index + ref/tops/index ref/index topics/api topics/topology/index @@ -30,3 +35,4 @@ Salt Table of Contents topics/development/index topics/releases/index topics/venafi/index + glossary diff --git a/doc/faq.rst b/doc/faq.rst index 28c298cda3..2894de2e41 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -148,22 +148,23 @@ Why aren't my custom modules/states/etc. available on my Minions? ----------------------------------------------------------------- Custom modules are synced to Minions when -:mod:`saltutil.sync_modules `, -or :mod:`saltutil.sync_all ` is run. -Custom modules are also synced by :mod:`state.apply` when run without -any arguments. +:py:func:`saltutil.sync_modules `, +or :py:func:`saltutil.sync_all ` is run. +Similarly, custom states are synced to Minions when :py:func:`saltutil.sync_states +`, or :py:func:`saltutil.sync_all +` is run. -Similarly, custom states are synced to Minions -when :mod:`state.apply `, -:mod:`saltutil.sync_states `, or -:mod:`saltutil.sync_all ` is run. +They are both also synced when a :ref:`highstate ` is +triggered. -Custom states are also synced by :mod:`state.apply` -when run without any arguments. +As of the Fluorine release, as well as 2017.7.7 and 2018.3.2 in their +respective release cycles, the ``sync`` argument to :py:func:`state.apply +`/:py:func:`state.sls ` can +be used to sync custom types when running individual SLS files. Other custom types (renderers, outputters, etc.) have similar behavior, see the -documentation for the :mod:`saltutil ` module for more +documentation for the :py:func:`saltutil ` module for more information. :ref:`This reactor example ` can be used to automatically diff --git a/doc/favicon.ico b/doc/favicon.ico new file mode 100644 index 0000000000..e81db9c1d6 Binary files /dev/null and b/doc/favicon.ico differ diff --git a/doc/man/salt-api.1 b/doc/man/salt-api.1 index 44536a69f8..6bd7330ddb 100644 --- a/doc/man/salt-api.1 +++ b/doc/man/salt-api.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-API" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-API" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-api \- salt-api Command . diff --git a/doc/man/salt-call.1 b/doc/man/salt-call.1 index 6c641f98ff..c9efcf23e4 100644 --- a/doc/man/salt-call.1 +++ b/doc/man/salt-call.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-CALL" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-CALL" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-call \- salt-call Documentation . diff --git a/doc/man/salt-cloud.1 b/doc/man/salt-cloud.1 index 8771856bb0..64100580da 100644 --- a/doc/man/salt-cloud.1 +++ b/doc/man/salt-cloud.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-CLOUD" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-CLOUD" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-cloud \- Salt Cloud Command . diff --git a/doc/man/salt-cp.1 b/doc/man/salt-cp.1 index 37841c18b3..b2c151747f 100644 --- a/doc/man/salt-cp.1 +++ b/doc/man/salt-cp.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-CP" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-CP" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-cp \- salt-cp Documentation . diff --git a/doc/man/salt-key.1 b/doc/man/salt-key.1 index 23acbf9cb7..2bf4d46a88 100644 --- a/doc/man/salt-key.1 +++ b/doc/man/salt-key.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-KEY" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-KEY" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-key \- salt-key Documentation . diff --git a/doc/man/salt-master.1 b/doc/man/salt-master.1 index bd9f911a46..11aced7b02 100644 --- a/doc/man/salt-master.1 +++ b/doc/man/salt-master.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-MASTER" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-MASTER" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-master \- salt-master Documentation . diff --git a/doc/man/salt-minion.1 b/doc/man/salt-minion.1 index 158225030a..318055476d 100644 --- a/doc/man/salt-minion.1 +++ b/doc/man/salt-minion.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-MINION" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-MINION" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-minion \- salt-minion Documentation . diff --git a/doc/man/salt-proxy.1 b/doc/man/salt-proxy.1 index 0f9d394242..b0d2b72094 100644 --- a/doc/man/salt-proxy.1 +++ b/doc/man/salt-proxy.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-PROXY" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-PROXY" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-proxy \- salt-proxy Documentation . diff --git a/doc/man/salt-run.1 b/doc/man/salt-run.1 index 20f33b9812..3a4c10360d 100644 --- a/doc/man/salt-run.1 +++ b/doc/man/salt-run.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-RUN" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-RUN" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-run \- salt-run Documentation . diff --git a/doc/man/salt-ssh.1 b/doc/man/salt-ssh.1 index 3a9cd23f23..0389ff3fc8 100644 --- a/doc/man/salt-ssh.1 +++ b/doc/man/salt-ssh.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-SSH" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-SSH" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-ssh \- salt-ssh Documentation . diff --git a/doc/man/salt-syndic.1 b/doc/man/salt-syndic.1 index 9a4f625c52..48f0d1cd0d 100644 --- a/doc/man/salt-syndic.1 +++ b/doc/man/salt-syndic.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-SYNDIC" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-SYNDIC" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-syndic \- salt-syndic Documentation . diff --git a/doc/man/salt-unity.1 b/doc/man/salt-unity.1 index f7eca4073e..1025ef129c 100644 --- a/doc/man/salt-unity.1 +++ b/doc/man/salt-unity.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT-UNITY" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT-UNITY" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt-unity \- salt-unity Command . diff --git a/doc/man/salt.1 b/doc/man/salt.1 index 0b4948637d..876f450e59 100644 --- a/doc/man/salt.1 +++ b/doc/man/salt.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt \- salt . diff --git a/doc/man/salt.7 b/doc/man/salt.7 index a90592b673..b8e0d12991 100644 --- a/doc/man/salt.7 +++ b/doc/man/salt.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SALT" "7" "May 09, 2018" "2018.3.1" "Salt" +.TH "SALT" "7" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME salt \- Salt Documentation . @@ -12729,6 +12729,21 @@ syndic_finger: \(aqab:30:65:2a:d6:9e:20:4f:d8:b2:f3:a7:d4:65:50:10\(aq .fi .UNINDENT .UNINDENT +.SS \fBno_proxy\fP +.sp +Default: \fB\(aq\(aq\fP +.sp +List of hostnames to bypass proxy. +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +no_proxy: [ '127.0.0.1', 'foo.tld' ] +.ft P +.fi +.UNINDENT +.UNINDENT .SS \fBproxy_host\fP .sp Default: \fB\(aq\(aq\fP @@ -15642,6 +15657,10 @@ and \fBmine_functions\fP\&. # targeted with the normal \-N argument to salt\-ssh. #ssh_list_nodegroups: {} +# salt\-ssh has the ability to update the flat roster file if a minion is not +# found in the roster. Set this to True to enable it. +#ssh_update_roster: False + ##### Master Module Management ##### ########################################## # Manage how master side modules are loaded. @@ -173031,7 +173050,7 @@ salt \(aq*\(aq kubernetes.nodes api_url=http://k8s\-api\-server:port api_user=my \fBWARNING:\fP .INDENT 0.0 .INDENT 3.5 -Configuration options will change in Flourine. All options above will be replaced by: +Configuration options will change in Fluorine. All options above will be replaced by: .INDENT 0.0 .IP \(bu 2 kubernetes.kubeconfig or kubernetes.kubeconfig\-data @@ -260179,7 +260198,7 @@ uuid .IP \(bu 2 struct .IP \(bu 2 -salt.modules.reg +salt.utils.win_reg .UNINDENT .UNINDENT .INDENT 0.0 @@ -299920,16 +299939,47 @@ salt\-run state.orchestrate_single fun=salt.wheel name=key.list_all .UNINDENT .INDENT 0.0 .TP -.B salt.runners.state.rm_pause(jid, state_id, duration=None) +.B salt.runners.state.pause(jid, state_id=None, duration=None) +Set up a state id pause, this instructs a running state to pause at a given +state id. This needs to pass in the jid of the running state and can +optionally pass in a duration in seconds. +.UNINDENT +.INDENT 0.0 +.TP +.B salt.runners.state.resume(jid, state_id=None) Remove a pause from a jid, allowing it to continue .UNINDENT .INDENT 0.0 .TP -.B salt.runners.state.set_pause(jid, state_id, duration=None) +.B salt.runners.state.rm_pause(jid, state_id=None) +This function is an alias of \fBresume\fP\&. +.INDENT 7.0 +.INDENT 3.5 +Remove a pause from a jid, allowing it to continue +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B salt.runners.state.set_pause(jid, state_id=None, duration=None) +This function is an alias of \fBpause\fP\&. +.INDENT 7.0 +.INDENT 3.5 Set up a state id pause, this instructs a running state to pause at a given state id. This needs to pass in the jid of the running state and can optionally pass in a duration in seconds. .UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B salt.runners.state.soft_kill(jid, state_id=None) +Set up a state run to die before executing the given state id, +this instructs a running state to safely exit at a given +state id. This needs to pass in the jid of the running state. +If a state_id is not passed then the jid referenced will be safely exited +at the beginning of the next state run. +.UNINDENT .SS salt.runners.survey .sp A general map/reduce style salt runner for aggregating results @@ -337110,7 +337160,7 @@ salt.modules.kubernetes for more information. \fBWARNING:\fP .INDENT 0.0 .INDENT 3.5 -Configuration options will change in Flourine. +Configuration options will change in Fluorine. .UNINDENT .UNINDENT .sp @@ -380650,10 +380700,28 @@ We haven\(aqt been doing development on RAET for quite some time and decided tha 2018.3.0 is the time to announce the deprecation. RAET support will be removed in Neon. Please consider to move to \fBzeromq\fP or \fBtcp\fP transport instead of \fBraet\fP\&. -.SS In Progress: Salt 2018.3.1 Release Notes +.SS Salt 2018.3.1 Release Notes .sp -Version 2018.3.1 is an \fBunreleased\fP bugfix release for 2018.3.0\&. -This release is still in progress and has not been released yet. +Version 2018.3.1 is a bugfix release for 2018.3.0\&. +.SS Statistics +.INDENT 0.0 +.IP \(bu 2 +Total Merges: \fB525\fP +.IP \(bu 2 +Total Issue References: \fB74\fP +.IP \(bu 2 +Total PR References: \fB255\fP +.IP \(bu 2 +Contributors: \fB55\fP (\fI\%Ch3LL\fP, \fI\%DmitryKuzmenko\fP, \fI\%Giandom\fP, \fI\%Kimol\fP, \fI\%L4rS6\fP, \fI\%LukeCarrier\fP, \fI\%OrlandoArcapix\fP, \fI\%TamCore\fP, \fI\%The\-Loeki\fP, \fI\%UtahDave\fP, \fI\%aesposito91\fP, \fI\%bbinet\fP, \fI\%bdrung\fP, \fI\%boltronics\fP, \fI\%bosatsu\fP, \fI\%clan\fP, \fI\%corywright\fP, \fI\%damon\-atkins\fP, \fI\%dincamihai\fP, \fI\%dmurphy18\fP, \fI\%dnABic\fP, \fI\%douglasjreynolds\fP, \fI\%dwoz\fP, \fI\%edgan\fP, \fI\%ejparker12\fP, \fI\%esell\fP, \fI\%ezh\fP, \fI\%femnad\fP, \fI\%folti\fP, \fI\%garethgreenaway\fP, \fI\%gtmanfred\fP, \fI\%isbm\fP, \fI\%jasperla\fP, \fI\%johnj\fP, \fI\%mateiw\fP, \fI\%mcalmer\fP, \fI\%mirceaulinic\fP, \fI\%morganwillcock\fP, \fI\%opdude\fP, \fI\%pcn\fP, \fI\%pruiz\fP, \fI\%psagers\fP, \fI\%psyer\fP, \fI\%rallytime\fP, \fI\%robinro\fP, \fI\%s0undt3ch\fP, \fI\%samodid\fP, \fI\%shengis\fP, \fI\%skjaro\fP, \fI\%tankywoo\fP, \fI\%terminalmage\fP, \fI\%twangboy\fP, \fI\%vutny\fP, \fI\%yannj\-fr\fP, \fI\%zmedico\fP) +.UNINDENT +.SS Tornado 5.0 Support for Python 2 Only +.sp +Tornado 5.0 moves to using asyncio for all python3 versions. Because of this +and changes in asyncio between python 3.4 and 3.5 to only be able to use one +ioloop, which requires some rearchitecting, support for tornado 5.0 and python3 +versions of salt has been delayed to a later release. +.sp +For now, to use tornado 5.0, the python 2 version of salt must be used. .SS Changes to Slack Engine pillars .sp When using \fBgroups_pillar_name\fP for the slack engine, the engine should be @@ -380661,6 +380729,5275 @@ used as part of a salt\-minion process running on the master. This will allow the minion to have pillars assigned to it, and will still allow the engine to create a LocalClient connection to the master ipc sockets to control environments. +.SS Changes to Automatically Updating the Roster File +.sp +In \fB2018.3.0\fP salt\-ssh was configured to automatically update the flat roster +file if a minion was not found for salt\-ssh. This was decided to be +undesireable as a default. The \fB\-\-skip\-roster\fP flag has been removed and +replaced with \fB\-\-update\-roster\fP, which will enable salt\-ssh to add minions +to the flat roster file. This behavior can also be enabled by setting +\fBssh_update_roster: True\fP in the master config file. +.SS Changelog for v2018.3.0..v2018.3.1 +.sp +\fIGenerated at: 2018\-06\-06 17:43:01 UTC\fP +.INDENT 0.0 +.IP \(bu 2 +\fBISSUE\fP \fI\%#47955\fP: (\fI\%frogunder\fP) 2018.3.1 Creating Windows machine in Amazon using salt\-cloud fails. (refs: \fI\%#47989\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47998\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47989\fP to 2018.3.1 +@ \fI2018\-06\-06 17:08:04 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47989\fP: (\fI\%dwoz\fP) Properly decode password from aws using m2crypto (refs: \fI\%#47998\fP) +.IP \(bu 2 +605463ca0d Merge pull request \fI\%#47998\fP from rallytime/bp\-47989 +.IP \(bu 2 +1b7e9ac2d3 Lint fixes +.IP \(bu 2 +0545152ddd Properly decode password from aws using m2crypto +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47965\fP: (\fI\%Ch3LL\fP) Add PR 47924 from 2018.3 branch +@ \fI2018\-06\-06 13:54:09 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +dbc798ac68 Merge pull request \fI\%#47965\fP from Ch3LL/gitpy_mac_3.1 +.IP \(bu 2 +bf608abd44 Catch all exceptions in git import for salt.utils.gitfs +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47973\fP: (\fI\%terminalmage\fP) salt.modules.testinframod: fix TypeError invoking types.FunctionType +@ \fI2018\-06\-06 13:53:46 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +864d640633 Merge pull request \fI\%#47973\fP from terminalmage/fix\-testinfra +.IP \(bu 2 +4518c89484 Lint: Remove unused six import +.IP \(bu 2 +c6816b2149 salt.modules.testinframod: fix TypeError invoking types.FunctionType +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47236\fP: (\fI\%MorphBonehunter\fP) x509.private_key_managed broken after upgrade to 2018.3.0 (refs: \fI\%#47957\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47967\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47957\fP to 2018.3.1 +@ \fI2018\-06\-06 13:53:28 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47957\fP: (\fI\%garethgreenaway\fP) [2018.8] Ensure x509 passphrase is a string (refs: \fI\%#47967\fP) +.IP \(bu 2 +5ddcfff420 Merge pull request \fI\%#47967\fP from rallytime/bp\-47957 +.IP \(bu 2 +9a55579af1 removing unnecessary change +.IP \(bu 2 +329b2e5956 Ensuring that when a passphrase is passed in, it is returned as a string from the passphrase callback. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47902\fP: (\fI\%Ch3LL\fP) Remove In Progress for 2018.3.1 Release Notes +@ \fI2018\-05\-30 18:26:49 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +9c964fdbce Merge pull request \fI\%#47902\fP from Ch3LL/rn_in_progress +.IP \(bu 2 +f560a151cd Remove In Progress for 2018.3.1 Release Notes +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47897\fP: (\fI\%Ch3LL\fP) Add changelog to 2018.3.1 release notes +@ \fI2018\-05\-30 15:04:42 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +ea7b4fdc08 Merge pull request \fI\%#47897\fP from Ch3LL/rn_2018 +.IP \(bu 2 +e27ee273a7 Add == line to changelog line for release notes +.IP \(bu 2 +61e56d275d Add changelog to 2018.3.1 release notes +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47784\fP: (\fI\%jpsv\fP) win_lgpo.py line 5368; AttributeError: \(aqOrderedDict\(aq object has no attribute \(aqlower\(aq (refs: \fI\%#47848\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47848\fP: (\fI\%twangboy\fP) Fix some major issues with the LGPO module +@ \fI2018\-05\-30 13:37:32 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +f15e636d5e Merge pull request \fI\%#47848\fP from twangboy/fix_47784 +.IP \(bu 2 +98facf8dc8 Remove log.debug statement in __virtual__ +.IP \(bu 2 +f037fa4064 Fix some major issues with the LGPO module +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47881\fP: (\fI\%gtmanfred\fP) quote python_version in requirements.txt +@ \fI2018\-05\-29 21:12:05 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +92b8c4c08e Merge pull request \fI\%#47881\fP from gtmanfred/2018.3.1 +.IP \(bu 2 +3d874b5529 quote python_version in requirements.txt +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47874\fP: (\fI\%gtmanfred\fP) Tornado 5.0 is only supported on python 2 for now +@ \fI2018\-05\-29 19:45:44 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +705bf8172d Merge pull request \fI\%#47874\fP from gtmanfred/2018.3.1 +.IP \(bu 2 +13f920415a add tornado5 note to 2018.3.1 +.IP \(bu 2 +aeacd2b749 allow tornado 5.0 to be installed only for python2 +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47820\fP: (\fI\%Ch3LL\fP) Remove output_loglevel in mac_system module +@ \fI2018\-05\-25 13:10:36 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +09e8c5f0cd Merge pull request \fI\%#47820\fP from Ch3LL/mac_system +.IP \(bu 2 +362414e53b Remove output_loglevel in mac_system module +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47798\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47776\fP to 2018.3.1 +@ \fI2018\-05\-23 15:10:43 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47776\fP: (\fI\%garethgreenaway\fP) [2018.3] Fixes to failing _before_connect tests (refs: \fI\%#47798\fP) +.IP \(bu 2 +7e314c26c8 Merge pull request \fI\%#47798\fP from rallytime/bp\-47776 +.IP \(bu 2 +ae881547d2 Fixing unit.test_minion.MinionTestCase.test_beacons_before_connect and unit.test_minion.MinionTestCase.test_scheduler_before_connect. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47782\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47775\fP to 2018.3.1 +@ \fI2018\-05\-22 20:56:37 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47775\fP: (\fI\%gtmanfred\fP) catch UnsupportedOperation with AssertionError (refs: \fI\%#47782\fP) +.IP \(bu 2 +9c610da0bc Merge pull request \fI\%#47782\fP from rallytime/bp\-47775 +.IP \(bu 2 +bab9c966c5 catch UnsupportedOperation with AssertionError +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47770\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47769\fP to 2018.3.1 +@ \fI2018\-05\-22 17:27:20 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47769\fP: (\fI\%gtmanfred\fP) skip test that breaks test suite (refs: \fI\%#47770\fP) +.IP \(bu 2 +4adf10b20b Merge pull request \fI\%#47770\fP from rallytime/bp\-47769 +.IP \(bu 2 +3cfb95c7bc skip test that breaks test suite +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47724\fP: (\fI\%terminalmage\fP) 2 master_tops/ext_nodes fixes +@ \fI2018\-05\-21 15:59:04 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +bbe8e62a98 Merge pull request \fI\%#47724\fP from terminalmage/master_tops_fixes +.IP \(bu 2 +48b8c5acd1 Merge branch \(aq2018.3.1\(aq into master_tops_fixes +.IP \(bu 2 +89b3070d4c Change deprecation warning to debug logging +.IP \(bu 2 +ceb6e10f87 Fix spurious "Malformed request" error +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47484\fP: (\fI\%whytewolf\fP) Windows: pkg.latest state not updating packages. (refs: \fI\%#47702\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47739\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47702\fP to 2018.3.1 +@ \fI2018\-05\-21 15:37:03 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47702\fP: (\fI\%damon\-atkins\fP) State pkg.latest called win pkg.install with list of pkgs and the required versions (refs: \fI\%#47739\fP) +.IP \(bu 2 +97d6fe7434 Merge pull request \fI\%#47739\fP from rallytime/bp\-47702 +.IP \(bu 2 +f79da64bb0 Update is_windows path to use \fIplatform\fP +.IP \(bu 2 +f04b19b5b6 Ensure targeted_pkgs always contains value for non\-windows. +.IP \(bu 2 +14659f9cad Adjusted based on feed back. +.IP \(bu 2 +9f18f7cdf5 Whitespace lint issues +.IP \(bu 2 +2a29b28ee6 pkg.install execution module on windows ensures the software package is installed when no version is specified, it does not upgrade the software to the latest. This is per the design. pkg.latest must provide the versions to install to pkg.install +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47730\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47700\fP to 2018.3.1 +@ \fI2018\-05\-21 15:36:16 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47700\fP: (\fI\%yannj\-fr\fP) fix roots modification time check (refs: \fI\%#47730\fP) +.IP \(bu 2 +cfbe0ba73e Merge pull request \fI\%#47730\fP from rallytime/bp\-47700 +.IP \(bu 2 +9bc35b88ea fix roots modification time check +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47727\fP: (\fI\%Ch3LL\fP) Fix salt.utils.versions.warn_until spelling +@ \fI2018\-05\-21 13:41:00 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +3614d3d83a Merge pull request \fI\%#47727\fP from Ch3LL/spelling +.IP \(bu 2 +47a8de5b73 Fix salt.utils.versions.warn_until spelling +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47736\fP: (\fI\%Ch3LL\fP) mac_utils test: patch __salt__[\(aqcmd.run*\(aq] +@ \fI2018\-05\-21 13:38:59 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +bb45cdaefe Merge pull request \fI\%#47736\fP from Ch3LL/fix_util_mac_test +.IP \(bu 2 +ee90c779a8 mac_utils test: patch __salt__[\(aqcmd.run*\(aq] +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47641\fP: (\fI\%gtmanfred\fP) fix _create_stream and tornado 5.0 +@ \fI2018\-05\-18 14:25:36 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +43930f8bac Merge pull request \fI\%#47641\fP from gtmanfred/2018.3.1 +.IP \(bu 2 +037fd92f59 fix pylint +.IP \(bu 2 +75d42d8963 Fix last test for tornado +.IP \(bu 2 +a046512287 allow using tornado 5.0 +.IP \(bu 2 +05e651f038 fix _create_stream and tornado 5.0 +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47532\fP: (\fI\%edgan\fP) roster auto\-add feature in salt\-ssh\-2018.3.0 (refs: \fI\%#47541\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47541\fP: (\fI\%gtmanfred\fP) switch skip\-roster to update\-roster +@ \fI2018\-05\-18 13:29:50 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +9f926bcd1a Merge pull request \fI\%#47541\fP from gtmanfred/2018.3 +.IP \(bu 2 +8c5c780292 switch skip\-roster to update\-roster +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47719\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47692\fP to 2018.3.1 +@ \fI2018\-05\-18 13:22:02 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47692\fP: (\fI\%dwoz\fP) Default windows to m1.small for ec2\-classic (refs: \fI\%#47719\fP) +.IP \(bu 2 +a963f1b558 Merge pull request \fI\%#47719\fP from rallytime/bp\-47692 +.IP \(bu 2 +1d9f247fb7 Default windows to m1.small for ec2\-classic +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47706\fP: (\fI\%Ch3LL\fP) Add cmd._run_all_quiet to mac_utils and __utils__ in mac_service +@ \fI2018\-05\-18 01:11:46 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +c9108893ab Merge pull request \fI\%#47706\fP from Ch3LL/mac_service_util +.IP \(bu 2 +3611af699f remove added space +.IP \(bu 2 +9921caa143 fix pylint +.IP \(bu 2 +317e41d3c0 use cmd._run_quiet and cmd._run_all_quiet instead of importing minion_mods in __salt__ +.IP \(bu 2 +a78652515a Add __salt__ to mac_utils and __utils__ in mac_service +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47664\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47645\fP to 2018.3.1 +@ \fI2018\-05\-15 18:25:27 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47645\fP: (\fI\%Ch3LL\fP) query the pip path for test test_issue_2087_missing_pip (refs: \fI\%#47664\fP) +.IP \(bu 2 +fb3bf1ff3e Merge pull request \fI\%#47664\fP from rallytime/bp\-47645 +.IP \(bu 2 +0a732d8e66 query the pip path for test test_issue_2087_missing_pip +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47647\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47601\fP and \fI\%#47643\fP to 2018.3.1 +@ \fI2018\-05\-15 14:07:54 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47643\fP: (\fI\%dwoz\fP) Remove unwanted file (refs: \fI\%#47647\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47601\fP: (\fI\%dwoz\fP) Skip tests when we can not use runas (refs: \fI\%#47647\fP) +.IP \(bu 2 +9039fee104 Merge pull request \fI\%#47647\fP from rallytime/bp\-47601\-and\-47643\-2018.3.1 +.IP \(bu 2 +7214fe17c8 Fix typo +.IP \(bu 2 +506dceed17 Remove unwanted file +.IP \(bu 2 +b6a21dfda3 use ignore\-undefined\-variable +.IP \(bu 2 +2429f9fe8a Ignore pylint WindowsError +.IP \(bu 2 +2d63682fea Better doc string +.IP \(bu 2 +ec2adff699 Skip tests when we can not use runas +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47596\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47568\fP to 2018.3.1 +@ \fI2018\-05\-10 22:09:09 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47568\fP: (\fI\%terminalmage\fP) salt.serializers.yaml/yamlex: remove invalid multi_constructor (refs: \fI\%#47596\fP) +.IP \(bu 2 +17b5265d95 Merge pull request \fI\%#47596\fP from rallytime/bp\-47568 +.IP \(bu 2 +ecf5dc8b9f Add exception logging on serialize/deserialize exceptions +.IP \(bu 2 +9659b19819 salt.serializers.yaml/yamlex: remove invalid multi_constructor +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47595\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47569\fP to 2018.3.1 +@ \fI2018\-05\-10 22:08:53 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47569\fP: (\fI\%Ch3LL\fP) Update salt.utils.path mock in virtual core test (refs: \fI\%#47595\fP) +.IP \(bu 2 +c4c400f3e9 Merge pull request \fI\%#47595\fP from rallytime/bp\-47569 +.IP \(bu 2 +0763f96458 update salt.utils.platform path for virt core test +.IP \(bu 2 +718252c1ef Update salt.utils.path mock in virtual core test +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47599\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47570\fP to 2018.3.1 +@ \fI2018\-05\-10 22:06:44 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47570\fP: (\fI\%gtmanfred\fP) Update dependency to msgpack (refs: \fI\%#47599\fP) +.IP \(bu 2 +ec7de14be0 Merge pull request \fI\%#47599\fP from rallytime/bp\-47570 +.IP \(bu 2 +9334c03da9 Update dependency to msgpack +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47571\fP: (\fI\%rallytime\fP) [2018.3.1] Update man pages +@ \fI2018\-05\-10 16:21:57 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +2a10d92669 Merge pull request \fI\%#47571\fP from rallytime/man\-pages +.IP \(bu 2 +ade5e9f664 [2018.3.1] Update man pages +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47550\fP: (\fI\%pcn\fP) Fixes a bad deletion I did that only surfaced in 2018.3 +@ \fI2018\-05\-09 13:36:33 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +85284caaf9 Merge pull request \fI\%#47550\fP from pcn/fix\-disable\-term\-protect\-in\-2018.3 +.IP \(bu 2 +d58a56877c Fixes a bad deletion I did that only surfaced in 2018.3 +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47553\fP: (\fI\%douglasjreynolds\fP) Unicode version error in lxc (refs: \fI\%#47554\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47554\fP: (\fI\%douglasjreynolds\fP) Converted unicode str version to a LooseVersion; matching line 2080. +@ \fI2018\-05\-09 13:34:13 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +f9083ff77e Merge pull request \fI\%#47554\fP from douglasjreynolds/lxc_unicode_fix +.IP \(bu 2 +e6bce581c6 Converted unicode str version to _LooseVersion to match line 2080. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47518\fP: (\fI\%Ch3LL\fP) Fix 47364: ensure we are not caching zfs.is_supported +@ \fI2018\-05\-09 13:29:07 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +fe4e79f1de Merge pull request \fI\%#47518\fP from Ch3LL/zfs_support +.IP \(bu 2 +d19fef963e remove unnecessary patch in zfs.is_supported test +.IP \(bu 2 +58c4f29f96 Fix 47364: ensure we are not caching zfs.is_supported +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47159\fP: (\fI\%terminalmage\fP) Fix for whitelist/blacklist checking for non\-list iterables +@ \fI2018\-05\-08 20:43:51 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +332e9f13a6 Merge pull request \fI\%#47159\fP from terminalmage/whitelist_blacklist\-iter\-fix +.IP \(bu 2 +ca936de372 Treat empty whitelist/blacklist as no whitelist/blacklist +.IP \(bu 2 +bcccaf2621 Raise a TypeError when invalid input passed to check_whitelist_blacklist +.IP \(bu 2 +2ae510ff2b Fix comment in test +.IP \(bu 2 +17398efcf7 Fix for whitelist/blacklist checking for non\-list iterables +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47514\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-05\-08 18:36:54 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +21809ddc02 Merge pull request \fI\%#47514\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +e2616b605f Update the pip tests to use the parsing syntax generated in PR \fI\%#47196\fP +.IP \(bu 2 +b13b59791f Remove double instance of adding \fI\-\-format=json\fP in pip module +.IP \(bu 2 +2ad60c7e81 Lint: remove duplicate function in helpers.py +.IP \(bu 2 +75480158b3 Lint: cur_version should just be pip_version +.IP \(bu 2 +5565d5e9b1 Update old utils paths with new utils paths +.IP \(bu 2 +786076ac03 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +611ca1fc03 Merge pull request \fI\%#47476\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +1f91a85587 specify cache dir for pip install +.IP \(bu 2 +99e150e09c check for kitchen\-vagrant gem before loading windows tests +.UNINDENT +.IP \(bu 2 +7c3f2c56da Merge pull request \fI\%#47412\fP from twangboy/fix_47125 +.INDENT 2.0 +.IP \(bu 2 +c9bab0b8e3 Merge branch \(aq2017.7\(aq into fix_47125 +.IP \(bu 2 +2600e404d5 Fix overly long line +.IP \(bu 2 +5c8db05769 Fix issue where the cwd was being removed +.UNINDENT +.IP \(bu 2 +4846e957c4 Merge pull request \fI\%#47467\fP from twangboy/cleanup_settings +.INDENT 2.0 +.IP \(bu 2 +9d498293b1 Remove unused settings, update NSIS +.UNINDENT +.IP \(bu 2 +da9871d36b Merge pull request \fI\%#47196\fP from twangboy/fix_47024 +.INDENT 2.0 +.IP \(bu 2 +14ee5537b9 Add @with_tempdir helper +.IP \(bu 2 +6c3b5fa6fa Fix typo +.IP \(bu 2 +f031710af2 Merge branch \(aq2017.7\(aq into fix_47024 +.IP \(bu 2 +7c46d9d0d4 Fix integration.modules.test_pip +.IP \(bu 2 +22ac81df63 Fix integration.modules.test_pip +.IP \(bu 2 +57d98224d4 Merge pull request #9 from terminalmage/twangboy/fix_47024 +.INDENT 2.0 +.IP \(bu 2 +37a13d8004 Update pip unit tests to reflect changes +.IP \(bu 2 +7f86779be0 Lint fix +.UNINDENT +.IP \(bu 2 +c48d8f4f61 DRY and other fixes in pip module +.IP \(bu 2 +b1117896a0 Change from global variable to __context__\(ga\(ga +.IP \(bu 2 +3e6e524eca Fix some tests\(ga\(ga +.IP \(bu 2 +c94f0f20e4 Fix lint error +.IP \(bu 2 +fd47b21530 Fix merge conflict +.UNINDENT +.IP \(bu 2 +e8c4524bae Merge pull request \fI\%#47455\fP from Ch3LL/unreleased_rn +.INDENT 2.0 +.IP \(bu 2 +b6d0cc2ab7 Add In Progress Warning for 2017.7.6 Release Notes +.UNINDENT +.IP \(bu 2 +2c7a4b6179 Merge pull request \fI\%#47459\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +d228e72477 update ubuntu\-rolling to 18.04 +.UNINDENT +.IP \(bu 2 +64a64c0ed7 Merge pull request \fI\%#47462\fP from terminalmage/docs +.INDENT 2.0 +.IP \(bu 2 +6d7803ece0 Fix docs build on Sphinx 1.7+ +.UNINDENT +.IP \(bu 2 +6cd0d31c03 Merge pull request \fI\%#47438\fP from lomeroe/double_admx_test +.INDENT 2.0 +.IP \(bu 2 +4902f1e2ba check if a policy has either an enabled value or enabled list entry or a disabled value or disabled list entry when determining the state of the policy +.UNINDENT +.IP \(bu 2 +ed69821d19 Merge pull request \fI\%#47433\fP from s0undt3ch/2017.7 +.INDENT 2.0 +.IP \(bu 2 +5abadf25d6 Add missing requirements files not commited in \fI\%#47106\fP +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47443\fP: (\fI\%skylerberg\fP) Input validation does not raise SaltInvocationError in win_dsc.py (refs: \fI\%#47505\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47516\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47505\fP to 2018.3 +@ \fI2018\-05\-08 13:32:33 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47505\fP: (\fI\%dwoz\fP) Raise proper invocation errors (refs: \fI\%#47516\fP) +.IP \(bu 2 +9559ac7679 Merge pull request \fI\%#47516\fP from rallytime/bp\-47505 +.IP \(bu 2 +7c60e4071e Raise proper invocation errors +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47502\fP: (\fI\%psagers\fP) service.enable (and .disable) destroys /etc/rc.conf on FreeBSD (refs: \fI\%#47503\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47515\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47503\fP to 2018.3 +@ \fI2018\-05\-08 13:32:03 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47503\fP: (\fI\%psagers\fP) Fix \fI\%#47502\fP: Remove an extraneous (accidentally introduced?) call to rstrip() (refs: \fI\%#47515\fP) +.IP \(bu 2 +bf79acfbc8 Merge pull request \fI\%#47515\fP from rallytime/bp\-47503 +.IP \(bu 2 +821dbb88a0 Fix \fI\%#47502\fP: Remove an extraneous (accidentally introduced?) call to rstrip. +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47511\fP: (\fI\%joesusecom\fP) sshconfig salt\-ssh roster is missing in the documentation (refs: \fI\%#47531\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47531\fP: (\fI\%gtmanfred\fP) add ssh config doc for rosters +@ \fI2018\-05\-07 22:26:30 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +779b3ed056 Merge pull request \fI\%#47531\fP from gtmanfred/2018.3 +.IP \(bu 2 +92ded7162c add ssh config doc for rosters +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47520\fP: (\fI\%rallytime\fP) Cleanup weird spaces +@ \fI2018\-05\-07 19:50:58 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +95b2f9db30 Merge pull request \fI\%#47520\fP from rallytime/cleanup\-spaces +.IP \(bu 2 +e9cb080a00 Cleanup weird spaces +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47495\fP: (\fI\%dwoz\fP) Fix crufty nssm.exe reference +@ \fI2018\-05\-07 19:12:49 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +05fc52f124 Merge pull request \fI\%#47495\fP from dwoz/uninstall_wart +.IP \(bu 2 +caa36c9064 Merge branch \(aq2018.3\(aq into uninstall_wart +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47322\fP: (\fI\%masau\fP) lxc clone not working (refs: \fI\%#47494\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47494\fP: (\fI\%ejparker12\fP) Fixed lxc.clone unhandled exception in salt/modules/lxc.py +@ \fI2018\-05\-07 19:03:58 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +3cc7d3ae7c Merge pull request \fI\%#47494\fP from ejparker12/fix\-lxc\-clone +.IP \(bu 2 +e0e2c9782d Fixed lxc.clone unhandled exception in salt/modules/lxc.py +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47496\fP: (\fI\%mateiw\fP) salt\-ssh \-\-extra\-filerefs doesn\(aqt include any files if no refs in state files (refs: \fI\%#47497\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47497\fP: (\fI\%mateiw\fP) Fix salt\-ssh \-\-extra\-filerefs to include files even if no refs in states to apply +@ \fI2018\-05\-07 19:02:50 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +adde83f639 Merge pull request \fI\%#47497\fP from mateiw/2018.3\-fix\-ssh\-extra\-files\-refs\-issue\-47496 +.IP \(bu 2 +d67239aae7 \-\-extra\-filerefs include files even if no refs in states to apply +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47404\fP: (\fI\%shengis\fP) Localized version of yum breaks pkg.install (refs: \fI\%#47441\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47441\fP: (\fI\%shengis\fP) Fix _run to reset LANGUAGE env variable +@ \fI2018\-05\-07 18:29:25 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +34b1b1ee53 Merge pull request \fI\%#47441\fP from shengis/fix\-run\-env\-reset +.IP \(bu 2 +62fc16b721 Merge branch \(aq2018.3\(aq into fix\-run\-env\-reset +.IP \(bu 2 +3b02b0bdc1 Merge branch \(aq2018.3\(aq into fix\-run\-env\-reset +.IP \(bu 2 +ee2ab38c8c Fix _run to reset LANGUAGE env variable +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47479\fP: (\fI\%whytewolf\fP) win_task.info on py3 throwing error, but works in py2 (refs: \fI\%#47507\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47507\fP: (\fI\%gtmanfred\fP) fix win_task for py3 +@ \fI2018\-05\-07 17:41:21 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +17cfd4f7cf Merge pull request \fI\%#47507\fP from gtmanfred/2018.3 +.IP \(bu 2 +19db39f402 fix win_task for py3 +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47472\fP: (\fI\%terminalmage\fP) salt.utils.hashutils: Fix UnicodeEncodeError in several funcs +@ \fI2018\-05\-07 13:31:07 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +a4c2df8fb2 Merge pull request \fI\%#47472\fP from terminalmage/hashutils +.IP \(bu 2 +7266c9984d salt.utils.hashutils: Fix UnicodeEncodeError in several funcs +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47485\fP: (\fI\%gtmanfred\fP) add openstack modules to doc index.rst +@ \fI2018\-05\-07 13:11:42 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +8b0a370189 Merge pull request \fI\%#47485\fP from gtmanfred/2018.3 +.IP \(bu 2 +c86163d79f add openstack modules to doc index.rst +.INDENT 2.0 +.INDENT 3.5 +.INDENT 0.0 +.IP \(bu 2 +3557fc5fa6 Fix crufty nssm.exe reference +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47482\fP: (\fI\%gtmanfred\fP) add all autodoc for new salt openstack modules +@ \fI2018\-05\-04 21:03:38 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +8df37f734a Merge pull request \fI\%#47482\fP from gtmanfred/2018.3 +.IP \(bu 2 +1f65d5cb73 add all autodoc for new salt openstack modules +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47447\fP: (\fI\%dwoz\fP) Fix failing test due to windows console encoding +@ \fI2018\-05\-04 16:41:29 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +d20ca15c5d Merge pull request \fI\%#47447\fP from dwoz/strv +.IP \(bu 2 +8c01773833 Use the same non decodable bytes for all tests +.IP \(bu 2 +983881a2a1 Add bytes that will not decode using cp1252 +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47466\fP: (\fI\%dwoz\fP) bytes file that decodes the same utf\-8 and cp1252 +@ \fI2018\-05\-04 15:54:24 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +8c5b30b541 Merge pull request \fI\%#47466\fP from dwoz/randbytes +.IP \(bu 2 +fd9bc06aab bytes file that decodes the same utf\-8 and cp1252 +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46660\fP: (\fI\%mruepp\fP) top file merging same does produce conflicting ids with gitfs (refs: \fI\%#47354\fP, \fI\%#46751\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47465\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47354\fP to 2018.3 +@ \fI2018\-05\-04 13:06:04 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47354\fP: (\fI\%folti\fP) fix forward port of \fI\%#46751\fP (refs: \fI\%#47465\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46751\fP: (\fI\%folti\fP) top file merging strategy \(aqsame\(aq works again (refs: \fI\%#47354\fP) +.IP \(bu 2 +3658604c43 Merge pull request \fI\%#47465\fP from rallytime/bp\-47354 +.IP \(bu 2 +3df6fa7990 fix forward port of \fI\%#46751\fP +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47435\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-05\-04 13:05:32 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +fa293f8fac Merge pull request \fI\%#47435\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +be0731da5f Add skipIfs back in for rest_tornado tests +.IP \(bu 2 +fd98ee3dc1 Lint: Add missing blank line +.IP \(bu 2 +561718b20b Update old is_windows utils path to new utils path +.IP \(bu 2 +a94cdf8a0d Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +7ae3497b0c Merge pull request \fI\%#47429\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +8ae32033cc server_list_min should use state, not status +.UNINDENT +.IP \(bu 2 +2f5fc4ecc5 Merge pull request \fI\%#47399\fP from isbm/isbm\-zeromq17\-deprecationwarning\-2017.7.2\-v2 +.INDENT 2.0 +.IP \(bu 2 +a36e49fd27 fix pylint +.IP \(bu 2 +98b5629b36 Fix imports +.IP \(bu 2 +d94c0f0152 Remove unnecessary variable +.IP \(bu 2 +8e377b5653 Lintfix: E0203 and attribute access +.IP \(bu 2 +2aab70b1b8 Install ZMQ handler if <15 version +.IP \(bu 2 +296c589f4b Use ZMQ switch utility in the integration tests +.IP \(bu 2 +ab5fa34d7c Use ZMQ_VERSION_INFO constant everywhere +.IP \(bu 2 +43b5558b82 Add trace logging on ZMQ sockets communication +.IP \(bu 2 +164204a9fe Remove duplicate code for ZMQ monitor handling +.IP \(bu 2 +834b1e4ff0 Remove obsolete ZMQIOLoop direct instance +.IP \(bu 2 +1c90cbdb3c Remove an empty line +.IP \(bu 2 +ef2e0acd66 Add logging on ZMQ socket exception +.IP \(bu 2 +38ceed371d Lintfix: ident +.IP \(bu 2 +1ece6a5f52 Lintfix: line too long +.IP \(bu 2 +4e650c0b44 Remove code duplicate by reusing utilities functions +.IP \(bu 2 +57da54b676 Fix imports +.IP \(bu 2 +948368e9a1 Add libzmq version info builder +.IP \(bu 2 +0b4a17b859 Update log exception message +.IP \(bu 2 +116e1809fc Put a message alongside the exception to the logs +.IP \(bu 2 +4bc43124b7 Remove unnecessary ZMQ import and check for its presence +.IP \(bu 2 +05f4d40269 Use utility for ZMQ import handling in SSH client +.IP \(bu 2 +457ef7d9a5 Use utility for ZMQ import handling in flo/zero +.IP \(bu 2 +08dee6f5bd Use utility for ZMQ import handling +.IP \(bu 2 +e2a353cfb0 Remove unnecessary ZMQ extra\-check for cache utils +.IP \(bu 2 +c8f2cc271d Remove unnecessary ZMQ extra\-check for master utils +.IP \(bu 2 +3940667bb9 Remove old ZMQ import handling +.IP \(bu 2 +f34a53e029 Use ZMQ utility for version check +.IP \(bu 2 +cbb26dcb28 Use ZMQ installer for master +.IP \(bu 2 +453e83210a Add ZMQ version build +.IP \(bu 2 +af9601e21d Use ZMQ importer utility in async +.IP \(bu 2 +d50b2b2023 Incorporate tornado\-5 fixes +.IP \(bu 2 +1fd9af0655 Add ZMQ backward\-compatibility tornado installer for older versions +.IP \(bu 2 +ad4b40415c Add one place for handling various ZMQ versions and IOLoop classes +.UNINDENT +.IP \(bu 2 +b14e974b5f Merge pull request \fI\%#47343\fP from Ch3LL/win_srv_test +.INDENT 2.0 +.IP \(bu 2 +2173b6f549 ensure we are enabling/disabling before test +.IP \(bu 2 +d58be06751 Add additionatl service module integration tests and enable for windows +.UNINDENT +.IP \(bu 2 +b0f3fb577f Merge pull request \fI\%#47375\fP from terminalmage/issue47310 +.INDENT 2.0 +.IP \(bu 2 +fa2bea52bb Remove extra blank line to appease linter +.IP \(bu 2 +f8ab2be81c Add debug logging if we fail to detect virtual packages +.IP \(bu 2 +67c4fc56ac Warn on use of virtual packages in pkg.installed state +.UNINDENT +.IP \(bu 2 +56235032f4 Merge pull request \fI\%#47415\fP from kstreee/fix\-local\-client\-tgt\-bug +.INDENT 2.0 +.IP \(bu 2 +b8d37e0a1e To add a test case for the syndic environment, copies the test case which was written by @mattp\- that was already merged into develop branch, related pr is \fI\%#46692\fP\&. +.IP \(bu 2 +4627bad1fd Realizes \(aqtgt\(aq field into actual minions using ckminions to subscribe results of the minions before publishing a payload. +.UNINDENT +.IP \(bu 2 +d65ceaee03 Merge pull request \fI\%#47286\fP from baniobloom/vpc_peering_connection_name_fix +.INDENT 2.0 +.IP \(bu 2 +a968965087 Merge branch \(aq2017.7\(aq into vpc_peering_connection_name_fix +.UNINDENT +.IP \(bu 2 +8a5d4437bb Merge pull request \fI\%#47270\fP from meaksh/2017.7\-fix\-retcode\-on\-schedule\-utils +.INDENT 2.0 +.IP \(bu 2 +d299cf3385 Merge branch \(aq2017.7\(aq into 2017.7\-fix\-retcode\-on\-schedule\-utils +.IP \(bu 2 +b6da600fff Initialize __context__ retcode for functions handled via schedule util module +.UNINDENT +.IP \(bu 2 +5b51075384 Merge pull request \fI\%#47371\fP from rallytime/fix\-47264 +.INDENT 2.0 +.IP \(bu 2 +a43485b49c Fix "of pass" typo in grains.delval docs: change to "or pass" +.UNINDENT +.IP \(bu 2 +a86e53be66 Merge pull request \fI\%#47389\fP from dwoz/moregittestfix +.INDENT 2.0 +.IP \(bu 2 +67745c1362 Older GitPython versions will not have close +.UNINDENT +.IP \(bu 2 +a5367eaf63 Merge pull request \fI\%#47388\fP from dwoz/test_pip_fix +.INDENT 2.0 +.IP \(bu 2 +eb26321e8b Fix missing import +.UNINDENT +.IP \(bu 2 +9b59b991c2 Merge pull request \fI\%#47380\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +93d1445ec1 add io_loop handling to runtests engine +.UNINDENT +.IP \(bu 2 +37822c0cbb Merge pull request \fI\%#47384\fP from dwoz/test_pip_fix +.INDENT 2.0 +.IP \(bu 2 +a37a9da1fb Fix py2 version of pip test +.UNINDENT +.IP \(bu 2 +eefd96732e Merge pull request \fI\%#47382\fP from dwoz/gitfs_tests +.INDENT 2.0 +.IP \(bu 2 +1570708fac Close the repo and fix multiple tests +.UNINDENT +.IP \(bu 2 +57c75ff660 Merge pull request \fI\%#47369\fP from terminalmage/ldap_pillar +.INDENT 2.0 +.IP \(bu 2 +085883ae2d Return an empty dict if no search_order in ldap ext_pillar config file +.UNINDENT +.IP \(bu 2 +bcc66dd9bf Merge pull request \fI\%#47363\fP from DSRCorporation/bugs/replace_exc_info_with_exception +.INDENT 2.0 +.IP \(bu 2 +3f7b93a23c Tornado5.0: Future.exc_info is dropped +.UNINDENT +.IP \(bu 2 +bcef34f7e1 Merge pull request \fI\%#47334\fP from terminalmage/ldap_pillar +.INDENT 2.0 +.IP \(bu 2 +0175a8687c pillar_ldap: Fix cryptic errors when config file fails to load +.IP \(bu 2 +65c3ba7ff1 Remove useless documentation +.IP \(bu 2 +5d67cb27de Remove unncessary commented line +.INDENT 2.0 +.INDENT 3.5 +.INDENT 0.0 +.IP \(bu 2 +8de3d41adb fixed vpc_peering_connection_name option +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47464\fP: (\fI\%dwoz\fP) Skip tests not applicable to windows +@ \fI2018\-05\-04 13:04:38 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +51d21afd4f Merge pull request \fI\%#47464\fP from dwoz/skiP_syslog_tests +.IP \(bu 2 +ca9393b7fb Skip tests not applicable to windows +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47456\fP: (\fI\%dwoz\fP) Sysname returns text type +@ \fI2018\-05\-04 02:57:50 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +3219430dcc Merge pull request \fI\%#47456\fP from dwoz/sysname +.IP \(bu 2 +559ee1961f Sysname returns text type +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47458\fP: (\fI\%Ch3LL\fP) Add In Progress Warning for 2018.3.1 Release Notes +@ \fI2018\-05\-03 20:40:46 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +f3918514a7 Merge pull request \fI\%#47458\fP from Ch3LL/unreleased_rn_2018 +.IP \(bu 2 +6a261e5e3a Add In Progress Warning for 2018.3.1 Release Notes +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47448\fP: (\fI\%dwoz\fP) Fix missing import in test suite +@ \fI2018\-05\-03 14:30:23 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +9fbdcbe994 Merge pull request \fI\%#47448\fP from dwoz/transport_import +.IP \(bu 2 +7e04eb82e1 Fix missing import in test suite +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47260\fP: (\fI\%mew1033\fP) disable_saltenv_mapping not working as expected (refs: \fI\%#47410\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47410\fP: (\fI\%terminalmage\fP) gitfs: Fix identification of base env when saltenv mapping is disabled +@ \fI2018\-05\-03 14:12:27 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +157a32af7f Merge pull request \fI\%#47410\fP from terminalmage/issue47260 +.IP \(bu 2 +3ab332ad0e Update tests to reflect bugfix +.IP \(bu 2 +7b8127f336 gitfs: Fix identification of base env when saltenv mapping is disabled +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47413\fP: (\fI\%dmurphy18\fP) Repobuild improvements for Ubuntu 18.04 lack of gpg2 and better error checking +@ \fI2018\-05\-02 16:21:31 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +091e4cf9a6 Merge pull request \fI\%#47413\fP from saltstack/repobuild_improv +.IP \(bu 2 +c064032110 Removed extra spaces for pylint +.IP \(bu 2 +20c50b3331 Minor cleanup due to review comments +.IP \(bu 2 +c143b359e9 Update for Ubuntu 18.04 lack of gpg2 and enhanced error checking +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47216\fP: (\fI\%twangboy\fP) Reg docs +@ \fI2018\-05\-02 13:33:27 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +5e5774fd37 Merge pull request \fI\%#47216\fP from twangboy/reg_docs +.IP \(bu 2 +0beeb58b16 Fix lint, add bytes +.IP \(bu 2 +bad441f8dc Fix some lint\(ga +.IP \(bu 2 +af5139c2ff Add additional examples +.IP \(bu 2 +24df6ec1b7 Additional docs formatting +.IP \(bu 2 +ff46b27a60 Update reg docs, fix formatting issues +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47417\fP: (\fI\%gtmanfred\fP) revert instantiating a Caller Client in the engine +@ \fI2018\-05\-01 18:58:06 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +63baf4c4f8 Merge pull request \fI\%#47417\fP from gtmanfred/slack +.IP \(bu 2 +5c8ea7f506 Update slack.py +.IP \(bu 2 +ee8a5eeb10 revert instantiating a Caller Client in the engine +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#45790\fP: (\fI\%bdarnell\fP) Test with Tornado 5.0b1 (refs: \fI\%#46066\fP, \fI\%#47106\fP, \fI\%#47433\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47368\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-05\-01 18:56:20 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47106\fP: (\fI\%DmitryKuzmenko\fP) Tornado50 compatibility fixes (refs: \fI\%#47374\fP, \fI\%#47368\fP, \fI\%#47433\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46002\fP: (\fI\%isbm\fP) Pyzmq 17.0.0 proper handling (refs: \fI\%#47374\fP, \fI\%#47368\fP) +.IP \(bu 2 +0bdfaa5ffe Merge pull request \fI\%#47368\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +46806e595b Update test assertion comment for pip pkgs +.IP \(bu 2 +d9d24de49e Lint: Add missing import +.IP \(bu 2 +c7b73d132e Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +31db8ca7ad Merge pull request \fI\%#47347\fP from dwoz/test_mysql_fix_again +.INDENT 2.0 +.IP \(bu 2 +add78fb618 Fix linter warnings +.IP \(bu 2 +2644cc7553 Fix linter nits +.IP \(bu 2 +799c601184 Proper fix for mysql tests +.UNINDENT +.UNINDENT +.IP \(bu 2 +fefc0cc3ca Update old utils paths to use new utils paths +.IP \(bu 2 +13e8124031 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +e573236848 Merge pull request \fI\%#47359\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +6214ed8133 add mention of the formulas channel to the formulas docs +.UNINDENT +.IP \(bu 2 +629503b2a8 Merge pull request \fI\%#47317\fP from dwoz/threadshutdown +.INDENT 2.0 +.IP \(bu 2 +6db2a0e4d3 Log exceptions at exception level +.IP \(bu 2 +d4ae787595 Do not join a thread that is stopped +.UNINDENT +.IP \(bu 2 +aacd5cefe3 Merge pull request \fI\%#47304\fP from cachedout/test_cli_timeout_arg +.INDENT 2.0 +.IP \(bu 2 +85025af83c Pass timeout to salt CLI for tests +.UNINDENT +.IP \(bu 2 +55534fb659 Merge pull request \fI\%#47311\fP from Ch3LL/firewall_windows +.INDENT 2.0 +.IP \(bu 2 +4e16c18c16 Add firewall module windows tests to whitelist +.IP \(bu 2 +4b2fc4ec66 Add windows firewall execution modules integration tests +.UNINDENT +.IP \(bu 2 +1667375a80 Merge pull request \fI\%#47348\fP from dwoz/no_symlinks +.INDENT 2.0 +.IP \(bu 2 +94a70e847a Ignore gitfs tests when symlinks not enabled +.UNINDENT +.IP \(bu 2 +dac04261b5 Merge pull request \fI\%#47342\fP from dwoz/test_mysql_fix +.INDENT 2.0 +.IP \(bu 2 +7496f4c5a8 Fix mysql test cases +.UNINDENT +.IP \(bu 2 +34e78ef564 Merge pull request \fI\%#47341\fP from dwoz/inet_pton_fix +.INDENT 2.0 +.IP \(bu 2 +85451f48d4 Fix python 3 support for inet_pton function +.UNINDENT +.IP \(bu 2 +e4779f3246 Merge pull request \fI\%#47339\fP from dwoz/ssh_key_test_fix +.INDENT 2.0 +.IP \(bu 2 +e37a93a1ca Remove redundent close call +.IP \(bu 2 +b2ae5889b7 Close the temporary file handle +.IP \(bu 2 +9f7f83a975 Use salt.utils.fopen for line ending consistancy +.UNINDENT +.IP \(bu 2 +b221860151 Merge pull request \fI\%#47335\fP from dwoz/pip_test_fix +.INDENT 2.0 +.IP \(bu 2 +dcb6a22c00 Remove un\-needed string\-escape +.UNINDENT +.IP \(bu 2 +1c527bfd3a Merge pull request \fI\%#47331\fP from dwoz/py3_wingroup_fix +.INDENT 2.0 +.IP \(bu 2 +cc154ef857 Do not encode usernames +.UNINDENT +.IP \(bu 2 +708078b152 Merge pull request \fI\%#47329\fP from cachedout/frank_credit +.INDENT 2.0 +.IP \(bu 2 +33c0644ac4 Credit Frank Spierings +.UNINDENT +.IP \(bu 2 +a545e55543 Merge pull request \fI\%#47281\fP from Ch3LL/system_test +.INDENT 2.0 +.IP \(bu 2 +c9181a75a6 Add destructivetest decorator on tests +.IP \(bu 2 +0d0c8987fc Add win_system integration module tests +.UNINDENT +.IP \(bu 2 +b64d930df0 Merge pull request \fI\%#47283\fP from Ch3LL/ntp_test +.INDENT 2.0 +.IP \(bu 2 +ced7f86546 Add windows ntp integration module tests +.UNINDENT +.IP \(bu 2 +910aff910f Merge pull request \fI\%#47314\fP from Ch3LL/net_mac_test +.INDENT 2.0 +.IP \(bu 2 +67beb1451c Skip netstat test on macosx as its not supported +.UNINDENT +.IP \(bu 2 +0549ef7c16 Merge pull request \fI\%#47307\fP from rallytime/bp\-47257 +.INDENT 2.0 +.IP \(bu 2 +6c5b2f92bc Role is not a list but a dictionary +.UNINDENT +.IP \(bu 2 +d6ff4689f6 Merge pull request \fI\%#47312\fP from rallytime/update\-bootstrap\-release +.INDENT 2.0 +.IP \(bu 2 +765cce06a2 Update bootstrap script to latest release: 2018.04.25 +.UNINDENT +.IP \(bu 2 +e0765f5719 Merge pull request \fI\%#47279\fP from dwoz/py3_build_fix +.INDENT 2.0 +.IP \(bu 2 +21dc1bab91 Pep\-8 line endings +.IP \(bu 2 +717abedaf7 Fix comman wart +.IP \(bu 2 +4100dcd64c Close might get called more than once +.IP \(bu 2 +dbe671f943 Stop socket before queue on delete +.IP \(bu 2 +9587f5c69e Silence pylint import\-error for six.moves +.IP \(bu 2 +4b0c7d3b34 Fix typo +.IP \(bu 2 +05adf7c2b1 Use six.moves for queue import +.IP \(bu 2 +fe340778fa Gracefully shutdown worker threads +.UNINDENT +.IP \(bu 2 +44f19b2f94 Merge pull request \fI\%#47113\fP from jfindlay/iptables_state +.INDENT 2.0 +.IP \(bu 2 +8bd08012ee modules,states.iptables support proto for policy ext +.UNINDENT +.IP \(bu 2 +b7a6206330 Merge pull request \fI\%#47302\fP from Ch3LL/dead_code +.INDENT 2.0 +.IP \(bu 2 +daa68b4877 Add virtual grains test for core grains +.IP \(bu 2 +a59dd2785d Remove dead code in core grains file for virt\-what +.UNINDENT +.IP \(bu 2 +e29362acfc Merge pull request \fI\%#47303\fP from baniobloom/bug_fix_doc +.INDENT 2.0 +.IP \(bu 2 +b97c9df5f3 added clarity on how to figure out what is the oldest supported main release branch +.UNINDENT +.IP \(bu 2 +0d9d55e013 Merge pull request \fI\%#47106\fP from DSRCorporation/bugs/tornado50 +.INDENT 2.0 +.IP \(bu 2 +39e403b18d Merge branch \(aq2017.7\(aq into bugs/tornado50 +.IP \(bu 2 +6706b3a2d1 Run off of a temporary config +.IP \(bu 2 +d6873800d5 Allow running pytest>=3.5.0 +.IP \(bu 2 +2da3983740 Tornado 5.0 compatibility fixes +.UNINDENT +.IP \(bu 2 +2e014f4746 Merge pull request \fI\%#47271\fP from gtmanfred/amazon +.INDENT 2.0 +.IP \(bu 2 +8a53908908 Do not load rh_service module when booted with systemd +.IP \(bu 2 +e4d1d5bf11 Revert "support amazon linux 2 for service module" +.UNINDENT +.IP \(bu 2 +599b0ed1e9 Merge pull request \fI\%#47246\fP from cloudflare/fix\-44847\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +ad80028104 This way, we can pass flags such as \fBdebug\fP into the state, but also \fBtest\fP\&. +.UNINDENT +.IP \(bu 2 +4e2e1f0719 Merge pull request \fI\%#47220\fP from benediktwerner/fix\-pip\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +0197c3e973 Fix pip test +.IP \(bu 2 +34bf66c09f Fix pip.installed with pip>=10.0.0 +.UNINDENT +.IP \(bu 2 +92e606251f Merge pull request \fI\%#47272\fP from rallytime/reg\-windows\-codeowners +.INDENT 2.0 +.IP \(bu 2 +9445af0185 Add windows tests and reg module/state to CODEOWNERS file for team\-windows +.UNINDENT +.IP \(bu 2 +9dca5c0221 Merge pull request \fI\%#47252\fP from rallytime/codeowners\-fixes +.INDENT 2.0 +.IP \(bu 2 +204b6af92b Fix the matching patterns in the CODEOWNERS file to use fnmatch patterns +.UNINDENT +.IP \(bu 2 +3de1bb49c8 Merge pull request \fI\%#47177\fP from fpicot/fix_47173_pkg_normalize +.INDENT 2.0 +.IP \(bu 2 +149f846f34 fix normalize parameter in pkg.installed +.UNINDENT +.IP \(bu 2 +10e30515dc Merge pull request \fI\%#47251\fP from Ch3LL/pub_fix_rn +.INDENT 2.0 +.IP \(bu 2 +fa4c2e6575 Update Docs to remove unnecessary + sign +.UNINDENT +.IP \(bu 2 +bb7850a431 Merge pull request \fI\%#47249\fP from Ch3LL/pub_fix_rn +.INDENT 2.0 +.IP \(bu 2 +24dea24b7e Add CVE number to 2016.3.6 Release +.UNINDENT +.IP \(bu 2 +56933eb0b2 Merge pull request \fI\%#47227\fP from pruiz/pruiz/zfs\-dataset\-present\-slow\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +fded61f19b Fix issue \fI\%#47225\fP: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots +.UNINDENT +.IP \(bu 2 +9825065048 Merge pull request \fI\%#47167\fP from smitty42/vbox\-skd\-fix +.INDENT 2.0 +.IP \(bu 2 +5de53139cd Merge branch \(aq2017.7\(aq into vbox\-skd\-fix +.UNINDENT +.IP \(bu 2 +976f031170 Merge pull request \fI\%#47213\fP from dwoz/py3win +.INDENT 2.0 +.IP \(bu 2 +ad9c7f63f0 Fix coverate on py3 windows builds +.IP \(bu 2 +91252bac95 Adding updates for python3 compatibility and new virtualbox SDK version support. +.UNINDENT +.IP \(bu 2 +cebcd6d069 Merge pull request \fI\%#47197\fP from dwoz/testfix +.INDENT 2.0 +.IP \(bu 2 +25803c9176 Move process target to top level module namespace +.UNINDENT +.IP \(bu 2 +d4269c2b70 Merge pull request \fI\%#47193\fP from Ch3LL/network_test +.INDENT 2.0 +.IP \(bu 2 +bbf9987c19 Add network module integration tests +.UNINDENT +.IP \(bu 2 +c777248a78 Merge pull request \fI\%#47189\fP from Ch3LL/autoruns +.INDENT 2.0 +.IP \(bu 2 +6a88bedb7a Add autoruns to windows whitelist +.IP \(bu 2 +e9e4d4af70 Add autoruns.list integration test for Windows +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47403\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47356\fP to 2018.3 +@ \fI2018\-05\-01 15:19:06 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47356\fP: (\fI\%robinro\fP) Fix sysctl translate (refs: \fI\%#47403\fP) +.IP \(bu 2 +4e6870305c Merge pull request \fI\%#47403\fP from rallytime/bp\-47356 +.IP \(bu 2 +9b682bc48e Fix sysctl translate +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47407\fP: (\fI\%terminalmage\fP) Reduce severity of missing X_update_interval key +@ \fI2018\-05\-01 15:18:46 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +7e0cdd6145 Merge pull request \fI\%#47407\fP from terminalmage/update\-interval\-log +.IP \(bu 2 +abc592bfff Reduce severity of missing X_update_interval key +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47042\fP: (\fI\%valentin2105\fP) [ERROR] Unable to manage file: \(aqutf8\(aq codec can\(aqt decode byte (refs: \fI\%#47061\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47405\fP: (\fI\%terminalmage\fP) Fix file.get_diff regression in 2018.3 branch +@ \fI2018\-05\-01 15:16:46 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47061\fP: (\fI\%terminalmage\fP) Fix diffing binary files in file.get_diff (refs: \fI\%#47405\fP) +.IP \(bu 2 +1377942bcc Merge pull request \fI\%#47405\fP from terminalmage/binary\-diff +.IP \(bu 2 +89ddb08026 Use a lambda instead of defining a one\-line function +.IP \(bu 2 +b79ff04fda Remove no\-longer\-used enumerate +.IP \(bu 2 +e03b865359 Add unit test for file.get_diff +.IP \(bu 2 +5bdc9e9bd5 Fix UnboundLocalError in file.get_diff +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47325\fP: (\fI\%robertodocampo\fP) docker_container.running creates containers using the image ID as the image name (refs: \fI\%#47367\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47367\fP: (\fI\%terminalmage\fP) Start docker containers with image name instead of ID +@ \fI2018\-04\-30 18:46:13 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +c267e6083e Merge pull request \fI\%#47367\fP from terminalmage/issue47325 +.IP \(bu 2 +798134caa3 Add regression test for creating images with image name insead of ID +.IP \(bu 2 +4ed47e839c Start docker containers with image name instead of ID +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47006\fP: (\fI\%cedwards\fP) marathon & fx2 grain modules cause master and minion failure (refs: \fI\%#47401\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47401\fP: (\fI\%gtmanfred\fP) fix proxy virtual checks for marathon and fx2 +@ \fI2018\-04\-30 18:44:46 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +3bb00cbb55 Merge pull request \fI\%#47401\fP from gtmanfred/proxy +.IP \(bu 2 +99f9231759 fix proxy virtual checks for marathon and fx2 +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47397\fP: (\fI\%rallytime\fP) Add 2018.3.1 Release Notes +@ \fI2018\-04\-30 14:44:38 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +c160fe36ce Merge pull request \fI\%#47397\fP from rallytime/2018.3.1\-release\-notes +.IP \(bu 2 +3b40cdad2a Add 2018.3.1 Release Notes +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#45790\fP: (\fI\%bdarnell\fP) Test with Tornado 5.0b1 (refs: \fI\%#46066\fP, \fI\%#47106\fP, \fI\%#47433\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47374\fP: (\fI\%DmitryKuzmenko\fP) tornado50 merge forward for 2018.3 +@ \fI2018\-04\-29 16:29:12 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47106\fP: (\fI\%DmitryKuzmenko\fP) Tornado50 compatibility fixes (refs: \fI\%#47374\fP, \fI\%#47368\fP, \fI\%#47433\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46002\fP: (\fI\%isbm\fP) Pyzmq 17.0.0 proper handling (refs: \fI\%#47374\fP, \fI\%#47368\fP) +.IP \(bu 2 +3400f829c4 Merge pull request \fI\%#47374\fP from DSRCorporation/bugs/tornado50\-2018.3 +.IP \(bu 2 +400999c54f fix pylint +.IP \(bu 2 +47b6d409d1 add io_loop handling to runtests engine +.IP \(bu 2 +fd074fdb7d use salt.utils.zeromq +.IP \(bu 2 +4ae33c5d9a Run off of a temporary config +.IP \(bu 2 +7938b4906e Allow running pytest>=3.5.0 +.IP \(bu 2 +34058c181e Tornado 5.0 compatibility fixes +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47124\fP: (\fI\%mchugh19\fP) Vault module problem in 2018.3.0 (refs: \fI\%#47379\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47379\fP: (\fI\%dwoz\fP) Properly encode messages when creating/validating signatures with m2crypto +@ \fI2018\-04\-28 08:38:23 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +2afe4bee95 Merge pull request \fI\%#47379\fP from dwoz/m2crypto_regression +.IP \(bu 2 +068f2d430d Always sign and verify bytes +.IP \(bu 2 +7810ebaba9 Add sign regression tests +.IP \(bu 2 +f4441c3a1c Adding regression test for 47124 +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47277\fP: (\fI\%morganwillcock\fP) Fix minion crash on NetBSD +@ \fI2018\-04\-27 15:02:21 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +7390b72808 Merge pull request \fI\%#47277\fP from morganwillcock/netbsdswap +.IP \(bu 2 +0bcb1a079a Merge branch \(aq2018.3\(aq into netbsdswap +.IP \(bu 2 +30478e8c9c Use swapctl for NetBSD +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47320\fP: (\fI\%twangboy\fP) Change from NSSM to SSM +@ \fI2018\-04\-27 14:37:50 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +2b7c7ef704 Merge pull request \fI\%#47320\fP from twangboy/win_ssm +.IP \(bu 2 +5549d83aae Use ssm instead of nssm +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47308\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47287\fP to 2018.3 +@ \fI2018\-04\-27 13:50:49 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47287\fP: (\fI\%esell\fP) convert unicode ssh pass to str for azure (refs: \fI\%#47308\fP) +.IP \(bu 2 +b6df5facce Merge pull request \fI\%#47308\fP from rallytime/bp\-47287 +.IP \(bu 2 +5f392a23fe convert unicode ssh pass to str for azure +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47324\fP: (\fI\%rlschilperoort\fP) archive.extracted keep and/or keep_source not working (refs: \fI\%#47332\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47332\fP: (\fI\%garethgreenaway\fP) [2018.3] Removing duplicate code from state/archive.py +@ \fI2018\-04\-27 13:12:51 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +efa3aab800 Merge pull request \fI\%#47332\fP from garethgreenaway/47324_archive_extracted_keep_keep_source +.IP \(bu 2 +cc10bfec6b Removing redundant code which is prevening keep & keep_source from being set. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47326\fP: (\fI\%The\-Loeki\fP) Some Redis fixes +@ \fI2018\-04\-26 17:12:47 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +245d62ca16 Merge pull request \fI\%#47326\fP from The\-Loeki/redis\-cache\-sockets +.IP \(bu 2 +d86fbe5bdd redis_return: add unix_socket_path to docs +.IP \(bu 2 +ee9f533765 redis_cache: document UNIX socket access +.IP \(bu 2 +5337558a5a redis_return: Let redis handle pool creation, add UNIX socket support +.IP \(bu 2 +c90f83b0f9 redis_return: cluster_mode default to False in __virtual__ to prevent KeyError stacktraces +.IP \(bu 2 +71e3286829 redis_return: Fix code blocks in docs +.IP \(bu 2 +e6605f1c78 redis_cache fix code blox in docs +.IP \(bu 2 +40e67747ee redis_cache: add socket to options +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47319\fP: (\fI\%dwoz\fP) Skip unix group tests on windows. +@ \fI2018\-04\-26 15:59:35 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +27a438f0ff Merge pull request \fI\%#47319\fP from dwoz/skip_tests +.IP \(bu 2 +d9442d043e Skip tests not applicable to windows +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47293\fP: (\fI\%dwoz\fP) The grp module is not available on windows +@ \fI2018\-04\-25 20:22:34 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +057f668788 Merge pull request \fI\%#47293\fP from dwoz/win_build_fix +.IP \(bu 2 +0386216005 Fix sneaky indention +.IP \(bu 2 +082b8d0b3d Use salt.utils.platform +.IP \(bu 2 +cc2538e08f The grp modules is not available on windows +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46862\fP: (\fI\%kivoli\fP) Setting locale.system fails in 2018.3 (refs: \fI\%#47280\fP, \fI\%#46869\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47280\fP: (\fI\%gtmanfred\fP) make sure not to send invalid information +@ \fI2018\-04\-25 17:46:45 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +fff4f8c1a5 Merge pull request \fI\%#47280\fP from gtmanfred/localectl +.IP \(bu 2 +7c212cbb2d fix pylint +.IP \(bu 2 +6754787e8e update localemod tests +.IP \(bu 2 +9075070573 make sure not to send invalid information +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46977\fP: (\fI\%gtmanfred\fP) [2018.3.0] Backwards compatibilty breaking change in 2018.3.0 (refs: \fI\%#47038\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47038\fP: (\fI\%garethgreenaway\fP) [2018.3] fix to fileclient.py +@ \fI2018\-04\-25 14:57:04 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +205701dcbe Merge pull request \fI\%#47038\fP from garethgreenaway/46977_fixing_fileclient_forward_compatibilty +.IP \(bu 2 +ba01d2133a Updating version.py to include Magnesium. +.IP \(bu 2 +10c823dd79 The _ext_nodes master function has been renamed to _master_tops. To ensure compatibility when using older Salt masters we continue to pass the function as _ext_nodes until the Magnesium release. +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47059\fP: (\fI\%OrlandoArcapix\fP) Some states incorrectly return None instead of an empty dict when there are no changes (refs: \fI\%#47060\fP) +.IP \(bu 2 +\fBISSUE\fP \fI\%#46985\fP: (\fI\%OrlandoArcapix\fP) grafana4_user.present and grafana4_org.present states not working in 2018.3.0 (refs: \fI\%#47048\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47060\fP: (\fI\%OrlandoArcapix\fP) Return an empty dict for \(aqchanges\(aq instead of \(aqNone\(aq +@ \fI2018\-04\-25 14:55:24 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47048\fP: (\fI\%OrlandoArcapix\fP) Issue46985 fix grafana4 state (refs: \fI\%#47060\fP) +.IP \(bu 2 +89daf4fdc7 Merge pull request \fI\%#47060\fP from OrlandoArcapix/Issue47059\-return_dict_from_state +.IP \(bu 2 +5378e4fd07 Update grafana_datasource test to check for empty dict being returned on no changes, rather than None +.IP \(bu 2 +f115452653 Return an empty dict for \(aqchanges\(aq instead of \(aqNone\(aq +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47089\fP: (\fI\%syphernl\fP) UnicodeDecodeError: \(aqascii\(aq codec can\(aqt decode byte 0xc3 in position 404: ordinal not in range(128) (refs: \fI\%#47153\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47153\fP: (\fI\%terminalmage\fP) salt.modules.ssh: properly encode/decode I/O +@ \fI2018\-04\-25 14:53:51 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +10cc0d312b Merge pull request \fI\%#47153\fP from terminalmage/issue47089 +.IP \(bu 2 +bdb52797f8 salt.modules.ssh: properly encode/decode I/O +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47199\fP: (\fI\%tkaehn\fP) Targeting by list (\-L) broken for minions behind syndic? (refs: \fI\%#47275\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47275\fP: (\fI\%terminalmage\fP) Fix false failure events sent when using syndic +@ \fI2018\-04\-25 13:56:47 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +b5d64f1a70 Merge pull request \fI\%#47275\fP from terminalmage/issue47199 +.IP \(bu 2 +8012ad12f8 Fix false failure events sent when using syndic +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47267\fP: (\fI\%skjaro\fP) Problem with beacon diskusage on windows platform in 2018.3 (refs: \fI\%#47284\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47284\fP: (\fI\%skjaro\fP) Fix beacon diskusage documentation for the new beahavior mentioned in issue \fI\%#47267\fP +@ \fI2018\-04\-25 13:52:30 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +6215a995d8 Merge pull request \fI\%#47284\fP from skjaro/beacon_diskusage_doc_fix +.IP \(bu 2 +fcc042aa5f Fix beacon documentation for the new beahavior mentioned in issue \fI\%#47267\fP +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47291\fP: (\fI\%bosatsu\fP) Fix proxy minion beacon doc +@ \fI2018\-04\-25 13:42:36 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +3ef4fe6ed2 Merge pull request \fI\%#47291\fP from bosatsu/fix\-proxy\-minion\-beacon\-doc +.IP \(bu 2 +01980b4c43 Fix topics/releases/2018.3.0.rst to include correct example of proxy_example beacon yaml configuration. +.IP \(bu 2 +9682e26eec Fix topics/proxyminion/beacon.rst to include correct example of salt_proxy beacon yaml configuration. +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47239\fP: (\fI\%bosatsu\fP) Unable to load salt_proxy beacon on minion in 2018.3.0 (refs: \fI\%#47255\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47255\fP: (\fI\%garethgreenaway\fP) [2018.3] Fixes to salt_proxy beacon and beacon tests +@ \fI2018\-04\-25 13:41:51 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +ea2d68b865 Merge pull request \fI\%#47255\fP from garethgreenaway/47239_fixes_to_salt_proxy_beacon +.IP \(bu 2 +a2a8d78cb0 Fixing status beacon tests. +.IP \(bu 2 +c87d6cae23 Ensure the salt_proxy is returning the correct tuple when the configuration is valid. Update various beacon unit tests to ensure they are testing the results of the validate function for a True result. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47292\fP: (\fI\%dwoz\fP) Fix decorator wart +@ \fI2018\-04\-25 04:25:23 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47290\fP: (\fI\%dwoz\fP) Run cache_master test in tmp dir (refs: \fI\%#47292\fP) +.IP \(bu 2 +19f9e8258f Merge pull request \fI\%#47292\fP from dwoz/cp_fix_again +.IP \(bu 2 +7d045eb235 Fix decorator wart +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47285\fP: (\fI\%dwoz\fP) Fix reg grains test +@ \fI2018\-04\-25 00:16:56 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +da532aa1ac Merge pull request \fI\%#47285\fP from dwoz/core_test_fix +.IP \(bu 2 +884f4c1829 Fix extra space +.IP \(bu 2 +8a9027c0c9 Fix reg grains test +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47290\fP: (\fI\%dwoz\fP) Run cache_master test in tmp dir (refs: \fI\%#47292\fP) +@ \fI2018\-04\-24 23:37:21 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +f591cff643 Merge pull request \fI\%#47290\fP from dwoz/test_cp_fix +.IP \(bu 2 +5ff51affbd Run cache_master test in tmp dir +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47092\fP: (\fI\%syphernl\fP) [2018.3.0] pkg.installed breaks with virtual packages (refs: \fI\%#47250\fP) +.IP \(bu 2 +\fBISSUE\fP \fI\%#38838\fP: (\fI\%Zorlin\fP) Failing to remove nginx (refs: \fI\%#44455\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47250\fP: (\fI\%terminalmage\fP) Fix virtual package detection +@ \fI2018\-04\-24 19:22:24 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#44455\fP: (\fI\%samodid\fP) Fix for \fI\%#38838\fP (refs: \fI\%#47250\fP) +.IP \(bu 2 +6d323aa8f0 Merge pull request \fI\%#47250\fP from terminalmage/issue47092 +.IP \(bu 2 +b8630a70be Fix virtual package detection +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47225\fP: (\fI\%pruiz\fP) zfs.filesystem_present takes forever on a dataset with lots (10k+) of snapshots (refs: \fI\%#47228\fP, \fI\%#47227\fP, \fI\%#47226\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47228\fP: (\fI\%pruiz\fP) Fix issue \fI\%#47225\fP: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots (2018.3 branch) +@ \fI2018\-04\-24 13:35:21 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47226\fP: (\fI\%pruiz\fP) Fix issue \fI\%#47225\fP: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots (refs: \fI\%#47228\fP, \fI\%#47227\fP) +.IP \(bu 2 +428e915d6a Merge pull request \fI\%#47228\fP from pruiz/pruiz/zfs\-dataset\-present\-slow\-2018.3 +.IP \(bu 2 +cfbf136ab2 Fix issue \fI\%#47225\fP: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46943\fP: (\fI\%Auha\fP) Slack.Engine could not start (refs: \fI\%#47262\fP, \fI\%#47109\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47262\fP: (\fI\%garethgreenaway\fP) [2018.3] Fixes to targeting in Slack engine +@ \fI2018\-04\-24 13:18:36 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +0b836106b9 Merge pull request \fI\%#47262\fP from garethgreenaway/slack_engine_target_fix +.IP \(bu 2 +bcdef641e8 Removing target and tgt_type from the cmdline that is passed along to Salt, the target is used else where and including it in the cmdline causes problem when it is passed along. Adding an additional test to ensure we are getting the right targt. +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47047\fP: (\fI\%Giandom\fP) Pillars aren\(aqt evaluated when alias is passed in Slack Engine (refs: \fI\%#47142\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47142\fP: (\fI\%garethgreenaway\fP) [2018.3] pillar and output formatting fixes to Slack engine +@ \fI2018\-04\-23 19:55:07 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +2ed4b38b02 Merge pull request \fI\%#47142\fP from garethgreenaway/47047_passing_pillar_to_slack_aliases +.IP \(bu 2 +6f183e1d80 Initial commmit for unit/engines/test_slack_engine +.IP \(bu 2 +a2840fc230 Only include the rest of the cmdline if the cmd is an alias. +.IP \(bu 2 +e846df7409 Fixing a bug when passing pillar values to aliases for the Slack engine. Cleaned up the formatting of the results, color codes don\(aqt translate well into Slack output. For any state runs, eg. highstate. apply, sls, we run the output through the highstate formater. For anything else run it though the yaml outputer. Running it though highstate causes errors when the output does match what the highstate output is expecting. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47245\fP: (\fI\%terminalmage\fP) Ensure we pass hexid as bytes when zmq_filtering enabled +@ \fI2018\-04\-23 16:54:57 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +42a0e655dc Merge pull request \fI\%#47245\fP from terminalmage/zeromq\-bytes +.IP \(bu 2 +a7accc0548 Ensure we pass hexid as bytes when zmq_filtering enabled +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47242\fP: (\fI\%aesposito91\fP) PY3 fix for zeromq setsockopt +@ \fI2018\-04\-23 16:38:09 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +73525d1460 Merge pull request \fI\%#47242\fP from aesposito91/2018.3 +.IP \(bu 2 +b225351e6d Update napalm_syslog.py +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47117\fP: (\fI\%prashanthtuttu\fP) Napalm / Capirca Issue (refs: \fI\%#47241\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47241\fP: (\fI\%mirceaulinic\fP) Fix the imports into the netacl execution and state modules +@ \fI2018\-04\-23 14:56:32 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +b78295aee9 Merge pull request \fI\%#47241\fP from cloudflare/fix\-47117 +.IP \(bu 2 +26c5583264 \fI\%#47117\fP: fix the napalm imports in the netacl state module +.IP \(bu 2 +48396467c1 \fI\%#47117\fP: fix the napalm imports in the netacl execution module +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47219\fP: (\fI\%garethgreenaway\fP) [2018.3] Fixing a backward compatibility issue with vault module & runner +@ \fI2018\-04\-23 14:10:19 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +88557ea991 Merge pull request \fI\%#47219\fP from garethgreenaway/vault_backward_compatibility +.IP \(bu 2 +1758081ffe When using the vault module on a 2018.3 minion against a 2017.7 master, the 2018.3 minion is expecting a verify element in the results from the Salt runner on the master. The runner in 2017.7 did not include a verify element, which results in an error. This change accounts for this by using the default in 2018.3 which is not to verify if not configured. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47186\fP: (\fI\%dmurphy18\fP) backport of issue 46933, updated ZFS handling to Salt 2018.3.x +@ \fI2018\-04\-23 14:07:06 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +370feadbd2 Merge pull request \fI\%#47186\fP from dmurphy18/zfs_backport_46933 +.IP \(bu 2 +283359d315 Corrected typo in comma\-seprated and 2018.3.0 \-> 2018.3.1 +.IP \(bu 2 +b7f8d5a22f Replace use of Fluorine with 2018.3.0 for comma\-separated warnings +.IP \(bu 2 +3f30ab2ed6 ZFS backport of 46933 to 2018.3.1 +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47217\fP: (\fI\%twangboy\fP) Remove installation of pywin32 from setup.py +@ \fI2018\-04\-23 13:32:54 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +bf3a67d11b Merge pull request \fI\%#47217\fP from twangboy/fix_setup +.IP \(bu 2 +eb3d45bb08 Remove installation of pywin32 from setup.py +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47195\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-04\-20 19:25:30 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +8e21703f13 Merge pull request \fI\%#47195\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +f90fd8c663 Test fix: file strings must be unicode in master config +.IP \(bu 2 +bee4948df1 Lint: use full path for event utils function +.IP \(bu 2 +120c5446b7 Update old utils paths to new utils paths +.IP \(bu 2 +4718d31e53 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +65f344e371 Merge pull request \fI\%#47184\fP from Ch3LL/status_test +.INDENT 2.0 +.IP \(bu 2 +25a84428b8 Add status module integration modules tests for Windows +.UNINDENT +.IP \(bu 2 +965600ad6c Merge pull request \fI\%#47163\fP from rallytime/jenkins\-autodoc +.INDENT 2.0 +.IP \(bu 2 +0039395017 Updage jenkins module autodocs to use jenkinsmod name instead +.UNINDENT +.IP \(bu 2 +0a43dde5fc Merge pull request \fI\%#47185\fP from twangboy/add_tests +.INDENT 2.0 +.IP \(bu 2 +345daa0423 Add additional integration tests to whitelist +.UNINDENT +.IP \(bu 2 +1a600bb9a4 Merge pull request \fI\%#47172\fP from dwoz/cover_without_admin +.INDENT 2.0 +.IP \(bu 2 +cadd759727 Use warnings to warn user +.IP \(bu 2 +144c68e214 Allow non admin name based runs on windows +.UNINDENT +.IP \(bu 2 +d5997d2301 Merge pull request \fI\%#47110\fP from kstreee/fix\-misusing\-of\-timeout +.INDENT 2.0 +.IP \(bu 2 +0624aee0ed Fixes misusing of the timeout option. +.UNINDENT +.IP \(bu 2 +87ca2b4003 Merge pull request \fI\%#40961\fP from terminalmage/issue40948 +.INDENT 2.0 +.IP \(bu 2 +6ba66cca41 Fix incorrect logic in exception check +.IP \(bu 2 +fed5041c5f Make error more specific to aid in troubleshooting +.IP \(bu 2 +8c67ab53b4 Fix path in log message +.IP \(bu 2 +3198ca8b19 Make error more explicit when PKI dir not present for salt\-call +.UNINDENT +.IP \(bu 2 +f5e63584d4 Merge pull request \fI\%#47134\fP from Ch3LL/user_win_test +.INDENT 2.0 +.IP \(bu 2 +e7c9bc4038 Add user integration tests for windows OS +.UNINDENT +.IP \(bu 2 +da2f6a3fac Merge pull request \fI\%#47131\fP from gtmanfred/cli +.INDENT 2.0 +.IP \(bu 2 +1b1c29bf62 add __cli for master processes +.UNINDENT +.IP \(bu 2 +9b8e6ffb8c Merge pull request \fI\%#47129\fP from rallytime/bp\-47121 +.INDENT 2.0 +.IP \(bu 2 +11da526b21 add ImportError +.IP \(bu 2 +bd0c23396c fix pip.req import error in pip 10.0.0 +.UNINDENT +.IP \(bu 2 +eb5ac51a48 Merge pull request \fI\%#47102\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +3dc93b310b fix tests +.IP \(bu 2 +8497e08f8e fix pip module for 10.0.0 +.IP \(bu 2 +4c07a3d1e9 fix other tests +.IP \(bu 2 +b71e3d8a04 dont allow using no_use_wheel for pip 10.0.0 or newer +.UNINDENT +.IP \(bu 2 +c1dc42e67e Merge pull request \fI\%#47037\fP from twangboy/fix_dev_scripts +.INDENT 2.0 +.IP \(bu 2 +990a24d7ed Fix build_env scripts +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46906\fP: (\fI\%whytewolf\fP) Windows failure with PR 46541 (refs: \fI\%#47168\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47168\fP: (\fI\%gtmanfred\fP) fix metadata grain for py3 and windows +@ \fI2018\-04\-20 19:07:50 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +a56eb7e05d Merge pull request \fI\%#47168\fP from gtmanfred/metadata +.IP \(bu 2 +396f7906e3 fix metadata grain for py3 and windows +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46918\fP: (\fI\%AmbicaY\fP) napalm/capirca issue (refs: \fI\%#47202\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47202\fP: (\fI\%mirceaulinic\fP) Fix \fI\%#46918\fP: add the TTL field +@ \fI2018\-04\-20 14:34:09 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +6135b76e2c Merge pull request \fI\%#47202\fP from cloudflare/fix\-46918 +.IP \(bu 2 +1e74141cc0 Fix \fI\%#46918\fP +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47150\fP: (\fI\%srkunze\fP) [Regression] ip_to_host and SSH._expand_target require missing reverse\-lookup (refs: \fI\%#47191\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47191\fP: (\fI\%terminalmage\fP) salt\-ssh: Do not attempt to match host/ip to minion ID if reverse lookup fails +@ \fI2018\-04\-20 14:20:05 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +7f1115e611 Merge pull request \fI\%#47191\fP from terminalmage/issue47150 +.IP \(bu 2 +95a6f075cb Add debug logging when ip_to_host fails +.IP \(bu 2 +45696e622b salt\-ssh: Do not attempt to match host/ip to minion ID if reverse lookup fails +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47122\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-04\-19 20:44:18 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +1947ffdf56 Merge pull request \fI\%#47122\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +878fa06134 Test fix: remove tornado testing lib from class +.IP \(bu 2 +a40f007962 lint: get_context is in stringutils.py now +.IP \(bu 2 +3416e398c6 Update old utils paths references to use new paths +.IP \(bu 2 +94c2a12be6 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +6a4c0b8a1a Merge pull request \fI\%#47108\fP from dwoz/async_test_fix +.INDENT 2.0 +.IP \(bu 2 +3d85e30ce5 AsyncTestCase is required for AsyncEventPublisher +.UNINDENT +.IP \(bu 2 +03892eaf0b Merge pull request \fI\%#47068\fP from cachedout/catch_value_error_socket_test +.INDENT 2.0 +.IP \(bu 2 +7db5625632 Catch an operation on a closed socket in a test +.UNINDENT +.IP \(bu 2 +1ea2885ec2 Merge pull request \fI\%#47065\fP from dwoz/jinja_test_fix +.INDENT 2.0 +.IP \(bu 2 +673cd31c65 Merge branch \(aq2017.7\(aq into jinja_test_fix +.UNINDENT +.IP \(bu 2 +5293b5b5ca Merge pull request \fI\%#47077\fP from dwoz/test_state_fix +.INDENT 2.0 +.IP \(bu 2 +444da3f893 Fix py3 wart (chr vs bytesstring) +.IP \(bu 2 +e8acca01c2 Fix failing state test by normalizing line endings +.UNINDENT +.IP \(bu 2 +ca967de5da Merge pull request \fI\%#47067\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +f913a7859c use the recommended opennebula lookup method +.UNINDENT +.IP \(bu 2 +7fddad6cd9 Merge pull request \fI\%#47064\fP from dwoz/roots_tests_fix +.INDENT 2.0 +.IP \(bu 2 +25fd7c0694 fix py3 wart, encode os.linesep +.IP \(bu 2 +d79f1a1961 Fix fileserver roots tests +.UNINDENT +.IP \(bu 2 +977c6939c4 Merge pull request \fI\%#47069\fP from cachedout/match_timeout_arg +.INDENT 2.0 +.IP \(bu 2 +b8990f5258 Pass the timeout variable to the CLI when calling salt in tests +.UNINDENT +.IP \(bu 2 +2c4c19c622 Merge pull request \fI\%#47074\fP from dwoz/ignore_artifacts +.INDENT 2.0 +.IP \(bu 2 +c3941efad0 Kitchn should ignore artifacts directory +.UNINDENT +.IP \(bu 2 +c484c0bd71 Merge pull request \fI\%#47055\fP from bloomberg/GH\-47000 +.INDENT 2.0 +.IP \(bu 2 +8af3f5b874 GH\-47000: add proper handling of full_return in cmd_subset +.UNINDENT +.IP \(bu 2 +f3496030cc Merge pull request \fI\%#47039\fP from twangboy/win_fix_winrm_script +.INDENT 2.0 +.IP \(bu 2 +6635b9003f Fix winrm powershell script +.INDENT 2.0 +.INDENT 3.5 +.INDENT 0.0 +.IP \(bu 2 +46fa2c04de Fix py3 os.linesep wart +.IP \(bu 2 +3c565d7e54 Use salt.utils.fopen +.IP \(bu 2 +aa965310f1 Clean up cruft +.IP \(bu 2 +efc9866580 Jinja test fixes +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47162\fP: (\fI\%terminalmage\fP) Partial backport of \fI\%#47161\fP to 2018.3 branch +@ \fI2018\-04\-19 19:28:47 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47161\fP: (\fI\%terminalmage\fP) Fix failing pillar unit test (refs: \fI\%#47162\fP) +.IP \(bu 2 +291cca7ed8 Merge pull request \fI\%#47162\fP from terminalmage/bp\-47161 +.IP \(bu 2 +d185f97a47 mocked file_roots and pillar_roots should be dicts +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47081\fP: (\fI\%sjorge\fP) file.directory with recursion fails if there are non\-ascii characters in the path (refs: \fI\%#47165\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47165\fP: (\fI\%terminalmage\fP) Make sure a str type is passed to os.walk +@ \fI2018\-04\-19 14:59:16 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +2ee8006da3 Merge pull request \fI\%#47165\fP from terminalmage/issue47081 +.IP \(bu 2 +9e29acb477 Make sure a str type is passed to os.walk +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47070\fP: (\fI\%terminalmage\fP) Use decorators for temp files/dirs in test suite +@ \fI2018\-04\-19 14:01:48 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +6257862bbb Merge pull request \fI\%#47070\fP from terminalmage/with_tempdir +.IP \(bu 2 +048728d2b7 Remove unused imports +.IP \(bu 2 +879c557264 Use decorators for temp files/dirs in test suite +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47155\fP: (\fI\%mcalmer\fP) Fix patchinstall for yumpkg +@ \fI2018\-04\-18 19:24:17 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +b46365614b Merge pull request \fI\%#47155\fP from mcalmer/fix\-patchinstall +.IP \(bu 2 +382afba457 fix invalid string compare +.IP \(bu 2 +8c19368938 provide kwargs to pkg_resource.parse_targets required to detect advisory type +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#47042\fP: (\fI\%valentin2105\fP) [ERROR] Unable to manage file: \(aqutf8\(aq codec can\(aqt decode byte (refs: \fI\%#47061\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47061\fP: (\fI\%terminalmage\fP) Fix diffing binary files in file.get_diff (refs: \fI\%#47405\fP) +@ \fI2018\-04\-18 18:52:10 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +13ae1a2413 Merge pull request \fI\%#47061\fP from terminalmage/issue47042 +.IP \(bu 2 +87f6cefea3 Rewrite flaky utf8 state to make it easier to troubleshoot +.IP \(bu 2 +df6e535f05 Fix diffing binary files in file.get_diff +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47058\fP: (\fI\%terminalmage\fP) Fix calls to file.lsattr when lsattr is not installed +@ \fI2018\-04\-18 16:30:12 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +cba0f13cd9 Merge pull request \fI\%#47058\fP from terminalmage/lsattr +.IP \(bu 2 +eeb067e910 Fix calls to file.lsattr when lsattr is not installed +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46929\fP: (\fI\%noelmcloughlin\fP) 2018.3 regression file.managed.context parsing (refs: \fI\%#47104\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47104\fP: (\fI\%terminalmage\fP) yamlloader: Properly handle colons in inline dicts +@ \fI2018\-04\-18 16:22:47 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +b96ce23b3f Merge pull request \fI\%#47104\fP from terminalmage/issue46929 +.IP \(bu 2 +33bf6643cd Add additional test for plain scalars +.IP \(bu 2 +508659b682 yamlloader: Properly handle colons in inline dicts +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46887\fP: (\fI\%julientravelaer\fP) ldap.managed broken with 2018.3.0 (refs: \fI\%#47029\fP) +.IP \(bu 2 +\fBISSUE\fP \fI\%#46859\fP: (\fI\%cheribral\fP) pillar_ldap causing TypeError exceptions in python\-ldap with unicode objects (refs: \fI\%#47029\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47076\fP: (\fI\%terminalmage\fP) pillar_ldap: Load config options as str types +@ \fI2018\-04\-18 16:16:22 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47029\fP: (\fI\%terminalmage\fP) ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types (refs: \fI\%#47076\fP) +.IP \(bu 2 +c12697b173 Merge pull request \fI\%#47076\fP from terminalmage/issue46859 +.IP \(bu 2 +c06c859caf pillar_ldap: Load config options as str types +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47107\fP: (\fI\%twangboy\fP) Fix issues with reg state, add tests +@ \fI2018\-04\-18 15:53:02 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +50bd885ec7 Merge pull request \fI\%#47107\fP from twangboy/fix_46932 +.IP \(bu 2 +ae8ab2ab1a Fix tests for py3, enable tearDown +.IP \(bu 2 +3cf4ac1475 Add integration tests for reg state +.IP \(bu 2 +cc259b146f Cast vdata to appropriate type in reg state +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46909\fP: (\fI\%epelc\fP) Binary \fIcontents_pillar\fP with file.managed raises UnicodeDecodeError (refs: \fI\%#47041\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47041\fP: (\fI\%terminalmage\fP) Force null bytes to be str types +@ \fI2018\-04\-18 14:08:25 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +d6c59696be Merge pull request \fI\%#47041\fP from terminalmage/issue46909 +.IP \(bu 2 +e4182715be Special check specifically for bytes types +.IP \(bu 2 +ee90dd5d95 Merge branch \(aq2018.3\(aq into issue46909 +.IP \(bu 2 +0e99343a7f Use the same way of defining contents in both file.managed states +.IP \(bu 2 +5741d287b5 Move back to using null byte check for contents +.IP \(bu 2 +8e214c9fa9 file.managed: Add test to ensure binary contents work +.IP \(bu 2 +7b7dc94610 Use salt.utils.stringutils.is_binary to check if contents are binary +.IP \(bu 2 +e3c969da81 PY3: Ensure binary contents work with file.managed +.IP \(bu 2 +5d98a8bedd Make salt.utils.stringutils.to_binary work for bytestrings +.IP \(bu 2 +1024000369 Force null bytes to be str types +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47007\fP: (\fI\%twangboy\fP) Fix some issues with the win_servermanager module +@ \fI2018\-04\-17 20:57:04 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +9a9f6524f8 Merge pull request \fI\%#47007\fP from twangboy/fix_46968 +.IP \(bu 2 +432db7c6ec Lint: Remove unused import +.IP \(bu 2 +10341e8f8b Remove erroneous pop statement +.IP \(bu 2 +56582f293a Remove redundant try/except block from state\(ga +.IP \(bu 2 +6ad2427279 Remove unnecessary try/except blocks +.IP \(bu 2 +92eeaa51bd Put some error checking in the shell command +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46943\fP: (\fI\%Auha\fP) Slack.Engine could not start (refs: \fI\%#47262\fP, \fI\%#47109\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47109\fP: (\fI\%garethgreenaway\fP) [2018.3] fixes to Slack engine +@ \fI2018\-04\-17 13:56:27 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +a52137ee36 Merge pull request \fI\%#47109\fP from garethgreenaway/46943_slack_engine_fixes +.IP \(bu 2 +02baa76595 Fixing a bug that occured when a comment was added to a message sent to Slack by Salt. Also making \fIslack_engine:groups_pillar\fP optional. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47045\fP: (\fI\%tankywoo\fP) Fix ba7d00f5 for gentoo pkg.installed method +@ \fI2018\-04\-17 13:55:45 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +6c16a34c44 Merge pull request \fI\%#47045\fP from tankywoo/fix\-gentoo\-pkg\-installed +.IP \(bu 2 +551f4e10cf Fix ba7d00f5 for gentoo pkg.installed +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47053\fP: (\fI\%clan\fP) handle jinja error in level +@ \fI2018\-04\-16 22:47:54 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +86c7cfef56 Merge pull request \fI\%#47053\fP from clan/jinja\-error +.IP \(bu 2 +a847466946 handle jinja error in level +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47062\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-04\-16 19:58:32 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +7bfa608e9f Merge pull request \fI\%#47062\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +59f5880e72 lint fix +.IP \(bu 2 +1ddf8c584b Update old utils files to new new utils files path +.IP \(bu 2 +28a79ebba4 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +1700a10ebe Merge pull request \fI\%#46326\fP from kstreee/fix\-client\-local +.INDENT 2.0 +.IP \(bu 2 +0f358a9c9e Fixes a timing bug of saltnado\(aqs client local. +.UNINDENT +.IP \(bu 2 +c3c00316c5 Merge pull request \fI\%#46913\fP from lomeroe/2017_7\-fix46877 +.INDENT 2.0 +.IP \(bu 2 +369a0645ed move exception for clarity +.IP \(bu 2 +32ce5bfda5 Use configparser serializer object to read psscript.ini and script.ini startup/shutdown script files. +.UNINDENT +.IP \(bu 2 +9e37cfc9d6 Merge pull request \fI\%#47025\fP from terminalmage/fix\-server_id\-windows +.INDENT 2.0 +.IP \(bu 2 +cb0cf89ed3 Fix server_id grain in PY3 on Windows +.UNINDENT +.IP \(bu 2 +2e193cfb45 Merge pull request \fI\%#47027\fP from rallytime/bp\-44508 +.INDENT 2.0 +.IP \(bu 2 +8e72f362f4 Add priority field to support the latest capirca. +.IP \(bu 2 +112f92baab Add priority field to support the latest capirca. +.UNINDENT +.IP \(bu 2 +385fe2bc1e Merge pull request \fI\%#47020\fP from rallytime/bp\-46970 +.INDENT 2.0 +.IP \(bu 2 +9373dff52b Update test_pkgrepo.py +.IP \(bu 2 +13cf9eb5b1 Removing debugging. +.IP \(bu 2 +a61a8593e5 Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments. +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47066\fP: (\fI\%terminalmage\fP) Fix regression in handling of environment/saltenv +@ \fI2018\-04\-16 19:57:12 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +fa27e64a33 Merge pull request \fI\%#47066\fP from terminalmage/issue46979 +.IP \(bu 2 +5c4c0468ad Fix regression in handling of environment/saltenv +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47051\fP: (\fI\%rallytime\fP) Simplify LooseVersion check in \fI__virtual__\fP check in mac_assistive module +@ \fI2018\-04\-13 19:43:33 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +8761b81a69 Merge pull request \fI\%#47051\fP from rallytime/fix\-lint +.IP \(bu 2 +d52b3689d9 Simplify LooseVersion check in \fI__virtual__\fP check in mac_assistive module +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47057\fP: (\fI\%corywright\fP) Fix copy/paste typo in minionfs tutorial +@ \fI2018\-04\-13 19:43:01 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +bbb8018b55 Merge pull request \fI\%#47057\fP from corywright/fix\-minionfs\-whitelist\-docs +.IP \(bu 2 +9b7ee97d12 Fix copy/paste typo in minionfs tutorial +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46931\fP: (\fI\%anlutro\fP) file.managed diff is switched when using template in salt\-ssh 2018.3 (refs: \fI\%#47046\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47046\fP: (\fI\%clan\fP) switch order of file to be diffed +@ \fI2018\-04\-13 13:40:13 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +d5afa4a2c5 Merge pull request \fI\%#47046\fP from clan/file_diff +.IP \(bu 2 +bb58605c54 switch order of file to be diffed +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46985\fP: (\fI\%OrlandoArcapix\fP) grafana4_user.present and grafana4_org.present states not working in 2018.3.0 (refs: \fI\%#47048\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47048\fP: (\fI\%OrlandoArcapix\fP) Issue46985 fix grafana4 state (refs: \fI\%#47060\fP) +@ \fI2018\-04\-13 13:34:29 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +ec9251ecd3 Merge pull request \fI\%#47048\fP from OrlandoArcapix/Issue46985\-fix\-grafana4\-state +.IP \(bu 2 +259d747414 Remove accidentally added copy of a file +.IP \(bu 2 +6c8c3da74d Return an empty dict instead of \(aqNone\(aq from grafana4 states +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47017\fP: (\fI\%opdude\fP) Don’t encode a unicode string +@ \fI2018\-04\-13 13:31:33 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +d8c4c221cf Merge pull request \fI\%#47017\fP from Unity\-Technologies/hotfix/pip_windows +.IP \(bu 2 +838670f626 Don’t encode a unicode string +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46917\fP: (\fI\%boltronics\fP) mysql_grants.present broken with \fIdatabase: somedatabase.*\fP (refs: \fI\%#46919\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47019\fP: (\fI\%rallytime\fP) Back\-port \fI\%#46919\fP to 2018.3 +@ \fI2018\-04\-12 19:43:01 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46919\fP: (\fI\%boltronics\fP) Replace failing is and is not tests with == and != (refs: \fI\%#47019\fP) +.IP \(bu 2 +5b7544eaa0 Merge pull request \fI\%#47019\fP from rallytime/bp\-46919 +.IP \(bu 2 +6837d6c138 Replace failing is and is not tests with == and != +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46887\fP: (\fI\%julientravelaer\fP) ldap.managed broken with 2018.3.0 (refs: \fI\%#47029\fP) +.IP \(bu 2 +\fBISSUE\fP \fI\%#46859\fP: (\fI\%cheribral\fP) pillar_ldap causing TypeError exceptions in python\-ldap with unicode objects (refs: \fI\%#47029\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47029\fP: (\fI\%terminalmage\fP) ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types (refs: \fI\%#47076\fP) +@ \fI2018\-04\-12 19:41:29 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +ac2d54d78a Merge pull request \fI\%#47029\fP from terminalmage/issue46859 +.IP \(bu 2 +ab6314247b ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types +.IP \(bu 2 +7691dee4ed Add to_str option to decode funcs +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46868\fP: (\fI\%tjyang\fP) 2017.7.4 to 2018.3.0 upgrade issue: Salt request timed out. The master is not responding (refs: \fI\%#46930\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46930\fP: (\fI\%dwoz\fP) Clean up bad public key headers +@ \fI2018\-04\-12 18:57:37 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +e6e07720fa Merge pull request \fI\%#46930\fP from dwoz/crptodomekeyfix +.IP \(bu 2 +f2e484ed54 Merge branch \(aq2018.3\(aq into crptodomekeyfix +.IP \(bu 2 +e1995a92ee Fix verify signature test +.IP \(bu 2 +0ba32118d9 Add test for bad public key without m2crypto +.IP \(bu 2 +a44c356233 Clean up bad public key headers +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46951\fP: (\fI\%Giandom\fP) Slack engine error using aliases: TypeError unhashable type (refs: \fI\%#47008\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47008\fP: (\fI\%garethgreenaway\fP) [2018.3] Fixing aliases in slack engine +@ \fI2018\-04\-12 15:24:40 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +0e43becc12 Merge pull request \fI\%#47008\fP from garethgreenaway/46951_fixing_slack_engine_aliases +.IP \(bu 2 +dc2a72d44f Fixing aliases in slack engine +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46947\fP: (\fI\%Giandom\fP) Slack engine groups error (refs: \fI\%#47009\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47009\fP: (\fI\%garethgreenaway\fP) [2018.3] fixes to slack engine documentation +@ \fI2018\-04\-12 15:20:54 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +c33de7c82d Merge pull request \fI\%#47009\fP from garethgreenaway/46947_slack_documentation_update_catch_non_dicts +.IP \(bu 2 +f0fadbb4ce Fixing indention for slack documention. Updating try..except to ensure we catch when groups aren\(aqt dicts. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47023\fP: (\fI\%rallytime\fP) Back\-port \fI\%#46997\fP to 2018.3 +@ \fI2018\-04\-12 15:05:24 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46997\fP: (\fI\%LukeCarrier\fP) Fix respository (=> repository) typo in sls_build (refs: \fI\%#47023\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#44638\fP: (\fI\%terminalmage\fP) Many improvements to docker network and container states (refs: \fI\%#46997\fP) +.IP \(bu 2 +68d17c71f1 Merge pull request \fI\%#47023\fP from rallytime/bp\-46997 +.IP \(bu 2 +c2c60f4ffc Fix respository (=> repository) typo in sls_build +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47026\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-04\-12 14:39:41 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +9cf3c6406a Merge pull request \fI\%#47026\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +ba70df9d62 Use msgpack utils for loads call, import msgpack for UnpackValueError +.IP \(bu 2 +34a478dfe5 Update old fopen path with new utils files path +.IP \(bu 2 +590c7fc13f Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +8f994e7cf9 Merge pull request \fI\%#46539\fP from jfoboss/patch\-1 +.INDENT 2.0 +.IP \(bu 2 +6890122e41 Merge pull request \fI\%#1\fP from twangboy/pull_46539 +.INDENT 2.0 +.IP \(bu 2 +19c3fadbe5 Fix unit test for win_ntp +.UNINDENT +.IP \(bu 2 +826a8d3099 Fixing \fI\%#46504\fP +.UNINDENT +.IP \(bu 2 +74d70e95a5 Merge pull request \fI\%#46999\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +791af8f6ce switch pip test package +.UNINDENT +.IP \(bu 2 +8adaf7f526 Merge pull request \fI\%#46023\fP from bloomberg/parallel\-orch +.INDENT 2.0 +.IP \(bu 2 +0ac0b3ca29 Merge branch \(aq2017.7\(aq into parallel\-orch +.UNINDENT +.IP \(bu 2 +39d65a39cf Merge pull request \fI\%#46613\fP from myinitialsarepm/fix_puppet.fact_and_puppet.facts +.INDENT 2.0 +.IP \(bu 2 +44ecd13abc Update tests to use cmd.run_all +.IP \(bu 2 +7d7d40f541 Merge branch \(aq2017.7\(aq into fix_puppet.fact_and_puppet.facts +.IP \(bu 2 +0ce1520bd0 Merge branch \(aq2017.7\(aq into fix_puppet.fact_and_puppet.facts +.IP \(bu 2 +69e1f6f681 Fix puppet.fact and puppet.facts to use stdout. +.INDENT 2.0 +.INDENT 3.5 +.INDENT 0.0 +.IP \(bu 2 +3d5e69600b address lint issues raised by @isbm +.IP \(bu 2 +a9866c7a03 fix parallel mode py3 compatibility +.IP \(bu 2 +6d7730864a removing prereq from test orch +.IP \(bu 2 +6c8a25778f add integration test to runners/test_state to exercise parallel +.IP \(bu 2 +2c86f16b39 cherry\-pick cdata KeyError prevention from \fI\%#39832\fP +.IP \(bu 2 +26a96e8933 record start/stop duration for parallel processes separately +.IP \(bu 2 +e4844bdf2b revisit previous join() behavior in check_requisites +.IP \(bu 2 +f00a359cdf join() parallel process instead of a recursive sleep +.IP \(bu 2 +6e7007a4dc add parallel support for orchestrations +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47021\fP: (\fI\%garethgreenaway\fP) [2018.3] Fixing integration.modules.test_state_jinja_filters.StateModuleJinjaFiltersTest.test_path_which +@ \fI2018\-04\-12 13:12:39 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +d3be828696 Merge pull request \fI\%#47021\fP from garethgreenaway/920_state_module_jinja_filters_test_test_path_which +.IP \(bu 2 +2ccf2c5fe0 Fixing test_path_which to check that the filter is available rather than results. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#47022\fP: (\fI\%corywright\fP) Add auth.file module to auth documentation page +@ \fI2018\-04\-11 21:11:10 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +66e8445b82 Merge pull request \fI\%#47022\fP from corywright/add\-auth\-file\-module\-to\-docs +.IP \(bu 2 +bd0918fc40 Add auth.file module to auth documentation page +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#45774\fP: (\fI\%twangboy\fP) Fix __virtual__ issue in mac_system.py +@ \fI2018\-04\-11 14:26:13 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +12ecfdee93 Merge pull request \fI\%#45774\fP from twangboy/mac_add_service_util +.IP \(bu 2 +5796696617 Fix tests for Py3 +.IP \(bu 2 +7b40218790 Fix lint, remove sentence from docstring +.IP \(bu 2 +781880f0fc Add _available_services function for testing +.IP \(bu 2 +6080633613 Add assert_called_with +.IP \(bu 2 +1bf70b2033 Add more tests for available_services +.IP \(bu 2 +b429fc3e74 Add tests for mac_utils +.IP \(bu 2 +b5f67130cc Used +.nf +* +.fi +args and +.nf +** +.fi +kwargs +.IP \(bu 2 +ed061617a2 Fix unicode_literal issue in mac_assistive +.IP \(bu 2 +82e17e5fc8 Fix args/kwargs +.IP \(bu 2 +455146500a Move some functions into mac_utils +.IP \(bu 2 +125586264b Add utilsmac_service.py +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46953\fP: (\fI\%cskowronnek\fP) salt\-cloud azurearm [ERROR ] There was a profile error: Parameter \(aqsubscription_id\(aq must be str. (refs: \fI\%#47012\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#47012\fP: (\fI\%terminalmage\fP) Azure: ensure subscription_id is a str type +@ \fI2018\-04\-11 13:57:08 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +79347f108a Merge pull request \fI\%#47012\fP from terminalmage/issue46953 +.IP \(bu 2 +5192622a32 Azure: ensure subscription_id is a str type +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46526\fP: (\fI\%Ch3LL\fP) Add tests for new source_* minion options +@ \fI2018\-04\-10 19:56:45 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +6503bf8dfa Merge pull request \fI\%#46526\fP from Ch3LL/ip_conf +.IP \(bu 2 +c01180ff47 Patch ZMQ versions for master_uri test +.IP \(bu 2 +da38f332a5 Change comment and salt.utils.network import +.IP \(bu 2 +e972ebdf1a Add for new source_* minion options +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46993\fP: (\fI\%L4rS6\fP) Fix: tuple instead of string +@ \fI2018\-04\-10 17:07:59 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +03907d3fce Merge pull request \fI\%#46993\fP from L4rS6/fix\-broken\-keystone\-auth/2018.3 +.IP \(bu 2 +e33ba1b3d5 Fix: tuple instead of string +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46990\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-04\-10 17:07:33 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +ffaee26540 Merge pull request \fI\%#46990\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +ccc5bad2df Merge branch \(aq2017.7\(aq into merge\-2018.3 +.INDENT 2.0 +.IP \(bu 2 +ba5421d988 Merge pull request \fI\%#46991\fP from gtmanfred/windows +.INDENT 2.0 +.IP \(bu 2 +98588c1dc5 use saltstack salt\-jenkins +.UNINDENT +.UNINDENT +.IP \(bu 2 +2f1cf3e511 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +00c4067585 Merge pull request \fI\%#46975\fP from gtmanfred/windows +.INDENT 2.0 +.IP \(bu 2 +1f69c0d7f8 make sure windows outputs xml junit files +.IP \(bu 2 +4a2ec1bbb3 support new versions of winrm\-fs +.IP \(bu 2 +b9efec8526 remove libnacl on windows +.IP \(bu 2 +2edd5eaf9e fix path +.IP \(bu 2 +b03e272e44 windows work +.UNINDENT +.IP \(bu 2 +3cf2353e41 Merge pull request \fI\%#46945\fP from vutny/doc\-faq\-fix\-jinja +.INDENT 2.0 +.IP \(bu 2 +bfdf54e61d [DOC] Fix Jinja block in FAQ page +.UNINDENT +.IP \(bu 2 +fc2f728665 Merge pull request \fI\%#46925\fP from terminalmage/fix\-file.patch\-docstring +.INDENT 2.0 +.IP \(bu 2 +97695657f0 Remove reference to directory support in file.patch state +.UNINDENT +.IP \(bu 2 +eef6c518e1 Merge pull request \fI\%#46900\fP from rallytime/bp\-46801 +.INDENT 2.0 +.IP \(bu 2 +6a41e8b457 rename jenkins to jenkinsmod +.UNINDENT +.IP \(bu 2 +71839b0303 Merge pull request \fI\%#46899\fP from rallytime/bp\-45116 +.INDENT 2.0 +.IP \(bu 2 +b92f908da4 fix adding parameters to http.query from sdb yaml +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46339\fP: (\fI\%DmitryKuzmenko\fP) SSH State test failures +@ \fI2018\-04\-10 17:06:51 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +a34b92ae82 Merge pull request \fI\%#46339\fP from DSRCorporation/bugs/ssh_state_test_failures +.IP \(bu 2 +bd98c49dc7 Merge branch \(aq2018.3\(aq into bugs/ssh_state_test_failures +.IP \(bu 2 +6fdc458a7f Increase timeout for run_run in ShellCase +.IP \(bu 2 +8e60cccdfb Give background task more chance to start. +.IP \(bu 2 +e0b6878fac One more useful assert for better test results. +.IP \(bu 2 +92a6c43c73 More logging and assertion fixes. Extended ssh ops timeout. +.IP \(bu 2 +6ebdd17ac4 Advanced logging in the failing SSH State tests. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46989\fP: (\fI\%Ch3LL\fP) Fix redis cache log debug line +@ \fI2018\-04\-10 16:35:12 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +9924100c44 Merge pull request \fI\%#46989\fP from Ch3LL/redis_log +.IP \(bu 2 +6160bc06c6 Fix redis cache log debug line +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46834\fP: (\fI\%oeuftete\fP) strftime filter not found in 2018.3.0 (refs: \fI\%#46848\fP) +.IP \(bu 2 +\fBISSUE\fP \fI\%#46668\fP: (\fI\%anlutro\fP) Jinja2 filter strftime stopped working in salt\-ssh 2018.3 (refs: \fI\%#46848\fP, \fI\%#46744\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46848\fP: (\fI\%garethgreenaway\fP) [2018.8] salt\-ssh jinja filters tests +@ \fI2018\-04\-10 16:19:51 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +c6431936cb Merge pull request \fI\%#46848\fP from garethgreenaway/testing_jinja_filters_avaiable_via_salt_ssh +.IP \(bu 2 +5fcda3eff8 Merge branch \(aq2018.3\(aq into testing_jinja_filters_avaiable_via_salt_ssh +.IP \(bu 2 +0adfee9b11 Updating a couple tests. Fixing check_whitelist_blacklist to work with PY3 when non\-iterables are passed. Adding warning about lst_avg results being wrong and future updates in Neon. +.IP \(bu 2 +f3f42146ca Removing expected from strftime and hashsum tests since the results are always different and we are only concerned about the filter being available. +.IP \(bu 2 +860234c045 Fixing lint. +.IP \(bu 2 +0891c6b580 fixing docstring +.IP \(bu 2 +c8945e4b2e cleaning up some imports. +.IP \(bu 2 +0599759e5b cleaning up some test doc strings. +.IP \(bu 2 +dceda5eb88 Moving all jinja filter tests into support/jinja_filters.py. Updaitng integration/ssh/test_jinja_filters.py to use those tests. Adding integration/modules/test_state_jinja_filters.py to also use the common jinja filter tests. +.IP \(bu 2 +07d7e3ca01 Adding a new integration test and corresponding state files to test availabilty of jinja filters when using salt\-ssh. +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46880\fP: (\fI\%liquidgecka\fP) rabbitmq_policy broken in 2018.3.0 (refs: \fI\%#46973\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46973\fP: (\fI\%rallytime\fP) New "apply_to" kwarg in rabbitmq module should be added at the end +@ \fI2018\-04\-10 14:42:32 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#41233\fP: (\fI\%dnABic\fP) added parameter apply_to for rabbitmq policy (refs: \fI\%#46973\fP) +.IP \(bu 2 +fbbcb7584c Merge pull request \fI\%#46973\fP from rallytime/fix\-46880 +.IP \(bu 2 +8ce21f982c New "apply_to" kwarg in rabbitmq module should be added at the end +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46934\fP: (\fI\%d601\fP) GPG encrypted binary data in pillars breaks in 2018.3.0 (refs: \fI\%#46966\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46966\fP: (\fI\%terminalmage\fP) Fix traceback when attempting to decode binary data to unicode +@ \fI2018\-04\-10 14:08:35 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +58f59cfbff Merge pull request \fI\%#46966\fP from terminalmage/issue46934 +.IP \(bu 2 +df43ffdb8f salt.payload.Serial: fix traceback when unpacking binary blob +.IP \(bu 2 +40a49358c9 gpg renderer: fix tranceback when decrypted ciphertext contains binary data +.IP \(bu 2 +17a88f6a71 Include exc_info in pillar render errors to aid in troubleshooting +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46881\fP: (\fI\%SynPrime\fP) Cron.file \- source file not found (refs: \fI\%#46944\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46944\fP: (\fI\%garethgreenaway\fP) [2018.3] cron.file with salt source URL +@ \fI2018\-04\-10 13:34:03 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +e33e792e2a Merge pull request \fI\%#46944\fP from garethgreenaway/46881_Cron_file_source_file_not_found +.IP \(bu 2 +438aafeb03 Adding kwargs to calls into file module functions +.IP \(bu 2 +14d12b1d6b Remove unused imports. Gating tests so they do not run on Windows +.IP \(bu 2 +623d96f21a Adding dummy cron file for integration/states/test_cron +.IP \(bu 2 +c8e01871d6 Adding an integration test to test cron.file. +.IP \(bu 2 +ddc55d8f9b Fixing bug that made cron.file unable to use a file via a Salt URL. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46937\fP: (\fI\%gtmanfred\fP) enable_ssh_minions does not work with subset yet +@ \fI2018\-04\-07 02:54:56 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +08e8782f76 Merge pull request \fI\%#46937\fP from gtmanfred/2018.3 +.IP \(bu 2 +3fb75e903c enable_ssh_minions does not work with subset yet +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46936\fP: (\fI\%gtmanfred\fP) don\(aqt copy __pycache__ or .pyc files for kitchen +@ \fI2018\-04\-06 19:15:46 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +ac4e7cd73f Merge pull request \fI\%#46936\fP from gtmanfred/2018.3 +.IP \(bu 2 +91474878fa don\(aqt copy __pycache__ or .pyc files for kitchen +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46659\fP: (\fI\%stamak\fP) [salt\-cloud] [new oxygen openstack driver ] no public_ips and floating_ips in salt\-cloud output (refs: \fI\%#46912\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46912\fP: (\fI\%gtmanfred\fP) pull latest vm data after building for openstack shade driver +@ \fI2018\-04\-06 13:46:42 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +8105fd9715 Merge pull request \fI\%#46912\fP from gtmanfred/openstack +.IP \(bu 2 +5ef538f8ad pull latest vm data after building for openstack shade driver +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46908\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-04\-05 21:27:03 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +735ea12960 Merge pull request \fI\%#46908\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +102e966512 Remove redundant section in log setup +.IP \(bu 2 +177c686b52 Update old utils paths to new utils paths +.IP \(bu 2 +0a297e7319 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +d0f5b43753 Merge pull request \fI\%#44926\fP from frogunder/whitelisted_acl +.INDENT 2.0 +.IP \(bu 2 +18e460fc30 Merge branch \(aq2017.7\(aq into whitelisted_acl +.IP \(bu 2 +1ad4d7d988 fix assert errors +.IP \(bu 2 +e6a56016df update test +.IP \(bu 2 +19a2244cb7 whitelist_acl_test +.UNINDENT +.IP \(bu 2 +7d822f9cec Merge pull request \fI\%#46464\fP from gtmanfred/orchestration +.INDENT 2.0 +.IP \(bu 2 +637cdc6b7b fix pylint +.IP \(bu 2 +0151013ddb document \fIcli\fP option for cmd_subset +.IP \(bu 2 +4a3ed6607d add test for subset in orchestration +.IP \(bu 2 +3112359dd6 fix salt subset in orchestrator +.UNINDENT +.IP \(bu 2 +805ed1c964 Merge pull request \fI\%#46879\fP from dwoz/cloudtestfix +.INDENT 2.0 +.IP \(bu 2 +dc54fc53c3 Fix multiple typos causing tests to fail +.UNINDENT +.IP \(bu 2 +f70f6de282 Merge pull request \fI\%#46647\fP from twangboy/win_fix_test_grains +.INDENT 2.0 +.IP \(bu 2 +c179388b0e Fix the tear down function in integration.modules.test_grains.GrainsAppendTestCase +.UNINDENT +.IP \(bu 2 +91c078ce12 Merge pull request \fI\%#46756\fP from nages13/bugfix\-grain\-virtual_subtype +.INDENT 2.0 +.IP \(bu 2 +781f5030a4 Merge branch \(aqbugfix\-grain\-virtual_subtype\(aq of \fI\%https://github.com/nages13/salt\fP into bugfix\-grain\-virtual_subtype +.INDENT 2.0 +.IP \(bu 2 +cd1ac4b7f9 Merge branch \(aq2017.7\(aq into bugfix\-grain\-virtual_subtype +.IP \(bu 2 +0ace76c0e7 Merge branch \(aq2017.7\(aq into bugfix\-grain\-virtual_subtype +.IP \(bu 2 +9eb6f5c0d0 Merge branch \(aq2017.7\(aq into bugfix\-grain\-virtual_subtype +.IP \(bu 2 +73d6d9d365 Merge branch \(aq2017.7\(aq into bugfix\-grain\-virtual_subtype +.IP \(bu 2 +a4a17eba6a Merge branch \(aq2017.7\(aq into bugfix\-grain\-virtual_subtype +.IP \(bu 2 +bf5034dbdb Merge branch \(aq2017.7\(aq into bugfix\-grain\-virtual_subtype +.IP \(bu 2 +8d12770951 Merge branch \(aq2017.7\(aq into bugfix\-grain\-virtual_subtype +.UNINDENT +.IP \(bu 2 +7e704c0e81 Moved down container check code below hypervisors to validate containers type running in virtual environment. Fixes \fI\%#46754\fP & \fI\%#43405\fP +.IP \(bu 2 +710f74c4a6 fix grains[\(aqvirtual_subtype\(aq] to show Docker on xen kernels +.UNINDENT +.IP \(bu 2 +058bbed221 Merge pull request \fI\%#46799\fP from garethgreenaway/46762_prereq_shenanigans_tests +.INDENT 2.0 +.IP \(bu 2 +13875e78cf Fixing documention string for test. +.IP \(bu 2 +3d288c44d4 Fixing test documentation +.IP \(bu 2 +6cff02ef6a Adding tests for \fI\%#46788\fP +.UNINDENT +.IP \(bu 2 +d9770bf3f8 Merge pull request \fI\%#46867\fP from terminalmage/unicode\-logging\-normalization +.INDENT 2.0 +.IP \(bu 2 +7652688e83 Backport string arg normalization to 2017.7 branch +.UNINDENT +.IP \(bu 2 +9eb98b1f6e Merge pull request \fI\%#46770\fP from twangboy/fix_46433 +.INDENT 2.0 +.IP \(bu 2 +89af0a6222 Merge branch \(aq2017.7\(aq into fix_46433 +.IP \(bu 2 +67b4697578 Remove unused import (ling) +.IP \(bu 2 +9302fa5ab0 Clean up code comments +.IP \(bu 2 +b383b9b330 Change the order of SID Lookup +.UNINDENT +.IP \(bu 2 +9c776cffb7 Merge pull request \fI\%#46839\fP from gtmanfred/tupletarget +.INDENT 2.0 +.IP \(bu 2 +3b7208ce27 match tuple for targets as well +.UNINDENT +.IP \(bu 2 +7db251dc11 Merge pull request \fI\%#46845\fP from rallytime/bp\-46817 +.INDENT 2.0 +.IP \(bu 2 +36a0f6d8ca address filehandle/event leak in async run_job invocations +.UNINDENT +.IP \(bu 2 +e3d17ab7bc Merge pull request \fI\%#46847\fP from dwoz/missing\-strdup +.INDENT 2.0 +.IP \(bu 2 +55845f4846 strdup from libc is not available on windows +.UNINDENT +.IP \(bu 2 +f2dd79f9c4 Merge pull request \fI\%#46776\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +edc1059ee0 fix shrinking list in for loop bug +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46853\fP: (\fI\%terminalmage\fP) Add back date_format filter +@ \fI2018\-04\-05 20:33:50 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +9a47afc33b Merge pull request \fI\%#46853\fP from terminalmage/date_format_filter +.IP \(bu 2 +266d13a665 Add back date_format filter +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46882\fP: (\fI\%jasperla\fP) Backport \fI\%#46280\fP \fI\%#46849\fP \fI\%#46852\fP to 2018.3 +@ \fI2018\-04\-05 14:29:12 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46852\fP: (\fI\%jasperla\fP) fix creating a nic tag on a link with double 0 in the MAC (refs: \fI\%#46882\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46849\fP: (\fI\%jasperla\fP) Unbreak creating etherstubs on SmartOS (refs: \fI\%#46882\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46280\fP: (\fI\%jasperla\fP) Remove unneeded checks for binaries in SmartOS modules (refs: \fI\%#46882\fP) +.IP \(bu 2 +a064a3e695 Merge pull request \fI\%#46882\fP from jasperla/smartos/backports +.IP \(bu 2 +47a66975ff fix creating a nic tag on a link with double 0 in the MAC +.IP \(bu 2 +a3cb0e576e Unbreak creating etherstubs on SmartOS +.IP \(bu 2 +e703254990 Remove unneeded checks for binaries in SmartOS modules +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46873\fP: (\fI\%terminalmage\fP) Attempt UTF\-8 first when decoding/encoding +@ \fI2018\-04\-05 14:16:28 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +4e5e291c99 Merge pull request \fI\%#46873\fP from terminalmage/utf8\-first +.IP \(bu 2 +cf28eb74aa Don\(aqt log command when output_loglevel == \(aqquiet\(aq +.IP \(bu 2 +f59cee28db Remove hacky workarounds to get encode/decode tests to pass on Windows +.IP \(bu 2 +76e5d81bb4 Remove hacky workaround to get Windows to decode deserialized data properly +.IP \(bu 2 +0b5729e58a Remove hacky workaround to get git state/exec module to work properly on Windows +.IP \(bu 2 +22ff48518f Attempt UTF\-8 first when decoding/encoding +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#43499\fP: (\fI\%tyeapple\fP) zmq setsockopt need to adapt python3 (refs: \fI\%#46874\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46878\fP: (\fI\%terminalmage\fP) Backport \fI\%#46874\fP to 2018.3 +@ \fI2018\-04\-05 13:26:04 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46874\fP: (\fI\%johnj\fP) Use bytestrings for PY3 compatibility when running setsockopt for zmq.SUBSCRIBE (refs: \fI\%#46878\fP) +.IP \(bu 2 +1518762465 Merge pull request \fI\%#46878\fP from terminalmage/bp\-46874 +.IP \(bu 2 +d9511d04d4 \fI\%#43499\fP, zmq setsockopt need to adapt python3 +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46862\fP: (\fI\%kivoli\fP) Setting locale.system fails in 2018.3 (refs: \fI\%#47280\fP, \fI\%#46869\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46869\fP: (\fI\%gtmanfred\fP) Always return dictionary for _localectl_status +@ \fI2018\-04\-05 13:25:14 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +67894e3ee9 Merge pull request \fI\%#46869\fP from gtmanfred/2018.3 +.IP \(bu 2 +1496e985f7 fix pylint +.IP \(bu 2 +75425dfd20 fix tests for localemod +.IP \(bu 2 +2d7c7b5e33 Always return dictionary for _localectl_status +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46870\fP: (\fI\%mirceaulinic\fP) Correct the documentation for two new proxy modules +@ \fI2018\-04\-04 21:48:41 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +58c8ff18e2 Merge pull request \fI\%#46870\fP from cloudflare/proxy\-doc +.IP \(bu 2 +f4b6184476 Corect and add the cimc proxy module to autodoc +.IP \(bu 2 +a99bc202b9 Correct & add Panos to autodoc +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46729\fP: (\fI\%terminalmage\fP) Performance improvement/error catching in expr_match +@ \fI2018\-04\-04 20:25:57 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +d7e4b9d755 Merge pull request \fI\%#46729\fP from terminalmage/expr_match +.IP \(bu 2 +70cfafe299 Add test case +.IP \(bu 2 +250039b11f Restore original variable name +.IP \(bu 2 +ae0f112a49 Log an exception when non\-string val/expr passed to expr_match +.IP \(bu 2 +dac42a672b Performance improvement/error catching in expr_match +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46872\fP: (\fI\%terminalmage\fP) Backport \fI\%#46863\fP to 2018.3 +@ \fI2018\-04\-04 19:04:40 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46863\fP: (\fI\%TamCore\fP) fixed top function which was broken since commit 002aa88a97e (refs: \fI\%#46872\fP) +.IP \(bu 2 +e0b383afb5 Merge pull request \fI\%#46872\fP from terminalmage/bp\-46863 +.IP \(bu 2 +be284e5b99 Add skipIf when older mock present +.IP \(bu 2 +db8faaee56 Add unit tests for ext_nodes master_tops module +.IP \(bu 2 +ee437f7cbf fixed top function which was broken since commit 002aa88a97e +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46850\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-04\-04 18:07:44 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +5c76d98d1a Merge pull request \fI\%#46850\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +a0fcd5c053 Fix test_cp failure: forgot to add tgt to test when @with_tempfile is present +.IP \(bu 2 +d0202cab72 Resolve bad merge: there should only be one test_get_file_from_env_in_url test +.IP \(bu 2 +e28f71b418 Lint: use full salt utils path +.IP \(bu 2 +4ad50bbdee Update old utils paths to new paths +.IP \(bu 2 +893196d3e6 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +1941426218 Merge pull request \fI\%#46838\fP from gtmanfred/npm +.INDENT 2.0 +.IP \(bu 2 +bff61dd291 use http registry for npm +.UNINDENT +.IP \(bu 2 +e544254e7b Merge pull request \fI\%#46823\fP from rallytime/fix\-42312 +.INDENT 2.0 +.IP \(bu 2 +dafa820f93 Improve __virtual__ checks in sensehat module +.UNINDENT +.IP \(bu 2 +37f6d2de35 Merge pull request \fI\%#46641\fP from skizunov/develop3 +.INDENT 2.0 +.IP \(bu 2 +c624aa4827 Make LazyLoader thread safe +.UNINDENT +.IP \(bu 2 +989508b100 Merge pull request \fI\%#46837\fP from rallytime/merge\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +8522c1d634 Merge branch \(aq2016.11\(aq into \(aq2017.7\(aq +.IP \(bu 2 +3e844ed1df Merge pull request \fI\%#46739\fP from rallytime/2016.11_update_version_doc +.INDENT 2.0 +.IP \(bu 2 +4d9fc5cc0f Update release versions for the 2016.11 branch +.UNINDENT +.UNINDENT +.IP \(bu 2 +307e7f35f9 Merge pull request \fI\%#46740\fP from rallytime/2017.7_update_version_doc +.INDENT 2.0 +.IP \(bu 2 +7edf98d224 Update 2018.3.0 information and move branch from "latest" to "previous" +.IP \(bu 2 +5336e866ac Update release versions for the 2017.7 branch +.UNINDENT +.IP \(bu 2 +ebf5dd276f Merge pull request \fI\%#46783\fP from twangboy/fix_46680 +.INDENT 2.0 +.IP \(bu 2 +da5ce25ef3 Fix unit tests on Linux +.IP \(bu 2 +b7f4f377cd Add space I removed +.IP \(bu 2 +f1c68a09b5 Fix network.managed test=True on Windows +.UNINDENT +.IP \(bu 2 +f652f25cc1 Merge pull request \fI\%#46821\fP from rallytime/fix\-mantest\-failures +.INDENT 2.0 +.IP \(bu 2 +209a8029c3 Fix the new test failures from the mantest changes +.UNINDENT +.IP \(bu 2 +c460f62081 Merge pull request \fI\%#46800\fP from lomeroe/2017_7\-46627 +.INDENT 2.0 +.IP \(bu 2 +2bee383e9d correct create list item value names if the valuePrefix attribute does not exist on the list item, the value is the value name, other wise, the valuename a number with the valuePrefix prepended to it +.UNINDENT +.IP \(bu 2 +df26f2641e Merge pull request \fI\%#46675\fP from dwoz/inspectlib\-tests +.INDENT 2.0 +.IP \(bu 2 +d39f4852d8 Handle non\-zero status exception +.IP \(bu 2 +83c005802b Handle cases where git can not be found +.IP \(bu 2 +628b87d5c4 Skip test when git symlinks are not configured +.UNINDENT +.IP \(bu 2 +4083e7c460 Merge pull request \fI\%#46815\fP from terminalmage/bp\-46809 +.INDENT 2.0 +.IP \(bu 2 +71d5601507 Fix sharedsecret authentication +.UNINDENT +.IP \(bu 2 +3bac9717f4 Merge pull request \fI\%#46769\fP from dwoz/wincloudtest +.INDENT 2.0 +.IP \(bu 2 +eabc234e5d Fix config override name +.IP \(bu 2 +5c22a0f88d Use aboslute imports +.IP \(bu 2 +810042710d Set default cloud test timeout back to 500 seconds +.IP \(bu 2 +5ac89ad307 Use winrm_verify_ssl option causing tests to pass +.IP \(bu 2 +71858a709c allow not verifying ssl winrm saltcloud +.IP \(bu 2 +ba5f11476c Adding windows minion tests for salt cloud +.UNINDENT +.IP \(bu 2 +f1be939763 Merge pull request \fI\%#46786\fP from twangboy/fix_46757 +.INDENT 2.0 +.IP \(bu 2 +b0053250ff Remove int(), just return \-1 +.IP \(bu 2 +7d56126d74 Fixes some lint +.IP \(bu 2 +49b3e937da Return int(\-1) when pidfile contains invalid data +.UNINDENT +.IP \(bu 2 +89bf24b15c Merge pull request \fI\%#46814\fP from terminalmage/bp\-46772 +.INDENT 2.0 +.IP \(bu 2 +a9f26f2ab8 avoid breaking if AutoRemove is not found +.IP \(bu 2 +97779c965d fix container removal if auto_remove was enabled +.UNINDENT +.IP \(bu 2 +5ea4ffbdb6 Merge pull request \fI\%#46813\fP from terminalmage/event\-debug\-log +.INDENT 2.0 +.IP \(bu 2 +5d6de3a2eb Get rid of confusing debug logging +.UNINDENT +.IP \(bu 2 +e533b7182d Merge pull request \fI\%#46766\fP from twangboy/win_fix_test_git +.INDENT 2.0 +.IP \(bu 2 +5afc66452c Remove unused/redundant imports +.IP \(bu 2 +88fd72c52c Use with_tempfile decorator where possible +.UNINDENT +.IP \(bu 2 +69d450db84 Merge pull request \fI\%#46778\fP from terminalmage/salt\-jenkins\-906 +.INDENT 2.0 +.IP \(bu 2 +bbfd35d3ea Replace flaky SPM man test +.UNINDENT +.IP \(bu 2 +c935ffb740 Merge pull request \fI\%#46788\fP from garethgreenaway/46762_prereq_shenanigans +.INDENT 2.0 +.IP \(bu 2 +fa7aed6424 Ensure failed tags are added to self.pre. +.UNINDENT +.IP \(bu 2 +395b7f8fdc Merge pull request \fI\%#46655\fP from dwoz/pyobjects\-46350 +.INDENT 2.0 +.IP \(bu 2 +5aabd442f2 Fix up import and docstring syntax +.IP \(bu 2 +62d64c9230 Fix missing import +.IP \(bu 2 +18b1730320 Skip test that requires pywin32 on +.nf +* +.fi +nix platforms +.IP \(bu 2 +45dce1a485 Add reg module to globals +.IP \(bu 2 +09f9322981 Fix pep8 wart +.IP \(bu 2 +73d06f664b Fix linter error +.IP \(bu 2 +009a8f56ea Fix up environ state tests for Windows +.IP \(bu 2 +b4be10b8fc Fixing cleanUp method to restore environment +.UNINDENT +.IP \(bu 2 +af45c49c42 Merge pull request \fI\%#46632\fP from dwoz/file\-recurse\-36802 +.INDENT 2.0 +.IP \(bu 2 +44db77ae79 Fix lint errors and typo +.IP \(bu 2 +cb5619537f Only change what is essential for test fix +.IP \(bu 2 +eb822f5a12 Fix file.recurse w/ clean=True \fI\%#36802\fP +.UNINDENT +.IP \(bu 2 +6e9f504ed1 Merge pull request \fI\%#46751\fP from folti/2017.7 +.INDENT 2.0 +.IP \(bu 2 +7058f10381 same top merging strategy works again +.UNINDENT +.IP \(bu 2 +d3623e0815 Merge pull request \fI\%#46691\fP from Ch3LL/win_group_test +.INDENT 2.0 +.IP \(bu 2 +7cda825e90 Add groupadd module integration tests for Windows +.UNINDENT +.IP \(bu 2 +14ab50d3f4 Merge pull request \fI\%#46696\fP from dwoz/win_test_client +.INDENT 2.0 +.IP \(bu 2 +ec4634fc06 Better explanation in doc strings +.IP \(bu 2 +d9ae2abb34 Fix splling in docstring +.IP \(bu 2 +b40efc5db8 Windows test client fixes +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46851\fP: (\fI\%rallytime\fP) Back\-port \fI\%#46844\fP to 2018.3 +@ \fI2018\-04\-04 18:04:59 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46844\fP: (\fI\%UtahDave\fP) Fix warning format in 2018.3.0 release notes (refs: \fI\%#46851\fP) +.IP \(bu 2 +b808ba7049 Merge pull request \fI\%#46851\fP from rallytime/bp\-46844 +.IP \(bu 2 +ab2ccea1af Quick grammar fix in 2018.3.0 release notes +.IP \(bu 2 +af7bad3c7f Fix warning format in 2018.3.0 release notes +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46864\fP: (\fI\%femnad\fP) Attribute Error When Invoking Vault Module Method (refs: \fI\%#46865\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46865\fP: (\fI\%femnad\fP) Fix Log Line for Vault Token Generation Debug Line +@ \fI2018\-04\-04 14:52:00 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +ea56778e03 Merge pull request \fI\%#46865\fP from femnad/fix\-log\-in\-vault\-runner +.IP \(bu 2 +01a5b88e7b Fix Log Line for Vault Token Generation Debug Line +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46836\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2018.3.0rc1 to 2018.3 +@ \fI2018\-04\-03 16:54:53 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +a0e168ccee Merge pull request \fI\%#46836\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +e75ba1f502 Merge branch \(aq2018.3.0rc1\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +39235715e6 Merge pull request \fI\%#46792\fP from damon\-atkins/patch\-1 +.IP \(bu 2 +db5b9464e6 provided an example +.IP \(bu 2 +41e3e1e253 Update windows information in release notes +.IP \(bu 2 +99447fbf49 Added more windows information +.IP \(bu 2 +d4241006f2 Update 2018.3.0.rst Windows Items, Group topics +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46808\fP: (\fI\%ezh\fP) Sharedsecret authentication is broken (refs: \fI\%#46809\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46809\fP: (\fI\%ezh\fP) Fix sharedsecret authentication (refs: \fI\%#46815\fP) +@ \fI2018\-04\-03 16:53:24 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +4a358217a0 Merge pull request \fI\%#46809\fP from ezh/2018.3\-sharedsecret +.IP \(bu 2 +20db8f03f7 Merge branch \(aq2018.3\(aq into 2018.3\-sharedsecret +.IP \(bu 2 +9df6d18ec7 Fix sharedsecret authentication +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46820\fP: (\fI\%rallytime\fP) [2018.3] Update the latest release information for docs +@ \fI2018\-04\-03 14:36:31 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +1519d7d895 Merge pull request \fI\%#46820\fP from rallytime/2018.3_update_version_doc +.IP \(bu 2 +274f8ee0dd [2018.3] Update the latest release information for docs +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46731\fP: (\fI\%rallytime\fP) Back\-port \fI\%#46024\fP to 2018.3 +@ \fI2018\-04\-02 19:00:42 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46024\fP: (\fI\%zmedico\fP) Trivial bug fixes for tagify and fire_args functions (refs: \fI\%#46731\fP) +.IP \(bu 2 +07f1141722 Merge pull request \fI\%#46731\fP from rallytime/bp\-46024 +.IP \(bu 2 +ee4ee5b619 fire_args: fix UnboundLocalError: local variable \(aqtag\(aq +.IP \(bu 2 +4ce2c21824 tagify: handle integer suffix list +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46779\fP: (\fI\%anlutro\fP) salt\-ssh 2018.3 states with "runas" fail with "Environment could not be retrieved for User" (refs: \fI\%#46796\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46796\fP: (\fI\%terminalmage\fP) Fix regression introduced in merge\-forward +@ \fI2018\-04\-02 18:10:22 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46503\fP: (\fI\%psyer\fP) Fixes stdout user environment corruption (refs: \fI\%#46796\fP) +.IP \(bu 2 +4f31c1062d Merge pull request \fI\%#46796\fP from terminalmage/issue46779 +.IP \(bu 2 +f8f9d045ac Add regression test +.IP \(bu 2 +e0e4e19ba3 Include extra troubleshooting information +.IP \(bu 2 +dcb0c67309 Fix regression introduced in merge\-forward +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46690\fP: (\fI\%dincamihai\fP) Fix unicode handling in pkg.info_installed +@ \fI2018\-03\-29 14:10:48 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +4609a7dd85 Merge pull request \fI\%#46690\fP from dincamihai/2018.3 +.IP \(bu 2 +980adf8253 Fix unicode handling in pkg.info_installed +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46746\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-03\-28 21:13:07 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +e5b3c8fa91 Merge pull request \fI\%#46746\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +e8864b7b0b Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +1222bdbc00 Merge pull request \fI\%#46732\fP from rallytime/bp\-46032 +.INDENT 2.0 +.IP \(bu 2 +bf0b962dc0 Workaroung python bug in traceback.format_exc() +.UNINDENT +.IP \(bu 2 +50fe1e9480 Merge pull request \fI\%#46749\fP from vutny/doc\-deprecate\-copr +.INDENT 2.0 +.IP \(bu 2 +a1cc55da3d [DOC] Remove mentions of COPR repo from RHEL installation page +.UNINDENT +.IP \(bu 2 +bd1e8bcc7d Merge pull request \fI\%#46734\fP from terminalmage/busybox +.INDENT 2.0 +.IP \(bu 2 +6502b6b4ff Make busybox image builder work with newer busybox releases +.UNINDENT +.IP \(bu 2 +c09c6f819c Merge pull request \fI\%#46742\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +fd0e649d1e only use npm test work around on newer versions +.UNINDENT +.IP \(bu 2 +3b6d5eca88 Merge pull request \fI\%#46743\fP from Ch3LL/mac_auth +.INDENT 2.0 +.IP \(bu 2 +4f1c42c0e3 Workaround getpwnam in auth test for MacOSX +.UNINDENT +.UNINDENT +.IP \(bu 2 +d0278345fc Update old utils paths to new utils paths +.IP \(bu 2 +e312efb5e7 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +b548a3e742 Merge pull request \fI\%#46171\fP from amaclean199/fix_mysql_grants_comparison +.INDENT 2.0 +.IP \(bu 2 +97db3d9766 Merge branch \(aq2017.7\(aq into fix_mysql_grants_comparison +.IP \(bu 2 +0565b3980e Merge branch \(aq2017.7\(aq into fix_mysql_grants_comparison +.IP \(bu 2 +8af407173d Merge branch \(aq2017.7\(aq into fix_mysql_grants_comparison +.IP \(bu 2 +00d13f05c4 Fix mysql grant comparisons by stripping both of escape characters and quotes. Fixes \fI\%#26920\fP +.UNINDENT +.IP \(bu 2 +554400e067 Merge pull request \fI\%#46709\fP from vutny/doc\-faq\-minion\-master\-restart +.INDENT 2.0 +.IP \(bu 2 +d0929280fc [DOC] Update FAQ about Salt self\-restarting +.UNINDENT +.IP \(bu 2 +3f21e9cc65 Merge pull request \fI\%#46503\fP from psyer/fix\-cmd\-run\-env\-corrupt +.INDENT 2.0 +.IP \(bu 2 +e8582e80f2 Python 3\-compatibility fix to unit test +.IP \(bu 2 +27f651906d Merge pull request \fI\%#1\fP from terminalmage/fix\-cmd\-run\-env\-corrupt +.INDENT 2.0 +.IP \(bu 2 +172d3b2e04 Allow cases where no marker was found to proceed without raising exception +.IP \(bu 2 +35ad828ab8 Simplify the marker parsing logic +.UNINDENT +.IP \(bu 2 +a09f20ab45 fix repr for the linter +.IP \(bu 2 +4ee723ac0f Rework how errors are output +.IP \(bu 2 +dc283940e0 Merge branch \(aq2017.7\(aq into fix\-cmd\-run\-env\-corrupt +.IP \(bu 2 +a91926561f Fix linting problems +.IP \(bu 2 +e8d3d017f9 fix bytes or str in find command +.IP \(bu 2 +0877cfc38f Merge branch \(aq2017.7\(aq into fix\-cmd\-run\-env\-corrupt +.IP \(bu 2 +86176d1252 Merge branch \(aq2017.7\(aq into fix\-cmd\-run\-env\-corrupt +.IP \(bu 2 +3a7cc44ade Add python3 support for byte encoded markers +.IP \(bu 2 +09048139c7 Do not show whole env in error +.IP \(bu 2 +ed94700255 fix missing raise statement +.IP \(bu 2 +15868bc88c Fixes stdout user environment corruption +.UNINDENT +.IP \(bu 2 +ac2a6616a7 Merge pull request \fI\%#46432\fP from twangboy/win_locales_utf8 +.INDENT 2.0 +.IP \(bu 2 +affa35c30d Revert passing encoding +.IP \(bu 2 +a0ab27ef15 Merge remote\-tracking branch \(aqdw/win_locales_utf8\(aq into win_locales_utf8 +.INDENT 2.0 +.IP \(bu 2 +9f95c50061 Use default SLS encoding, fall back to system encoding +.IP \(bu 2 +6548d550d0 Use salt.utils.to_unicode +.IP \(bu 2 +8c0164fb63 Add ability to specify encoding in sdecode +.IP \(bu 2 +2e7985a81c Default to utf\-8 on Windows +.UNINDENT +.IP \(bu 2 +8017860dcc Use salt.utils.to_unicode +.IP \(bu 2 +c10ed26eab Add ability to specify encoding in sdecode +.IP \(bu 2 +8d7e2d0058 Default to utf\-8 on Windows +.UNINDENT +.IP \(bu 2 +fadc5e4ba4 Merge pull request \fI\%#46669\fP from terminalmage/pillar\-merge\-order +.INDENT 2.0 +.IP \(bu 2 +b4a1d34b47 Add option to return to pre\-2017.7.3 pillar include merge order +.UNINDENT +.IP \(bu 2 +b90f0d1364 Merge pull request \fI\%#46711\fP from terminalmage/wildcard\-versions\-info +.INDENT 2.0 +.IP \(bu 2 +fc7d16f1af Add performance reminder for wildcard versions +.UNINDENT +.IP \(bu 2 +6c80d90bb6 Merge pull request \fI\%#46693\fP from dwoz/test_smtp_return +.INDENT 2.0 +.IP \(bu 2 +5bf850c67f File and Pillar roots are dictionaries +.UNINDENT +.IP \(bu 2 +9a6bc1418c Merge pull request \fI\%#46543\fP from dafenko/fix\-add\-saltenv\-pillarenv\-to\-pillar\-item +.INDENT 2.0 +.IP \(bu 2 +6d5b2068aa Merge branch \(aq2017.7\(aq into fix\-add\-saltenv\-pillarenv\-to\-pillar\-item +.IP \(bu 2 +5219377313 Merge branch \(aq2017.7\(aq into fix\-add\-saltenv\-pillarenv\-to\-pillar\-item +.IP \(bu 2 +b7d39caa86 Merge branch \(aq2017.7\(aq into fix\-add\-saltenv\-pillarenv\-to\-pillar\-item +.IP \(bu 2 +25f1074a85 Add docstring for added parameters +.IP \(bu 2 +973bc13955 Merge branch \(aq2017.7\(aq into fix\-add\-saltenv\-pillarenv\-to\-pillar\-item +.IP \(bu 2 +164314a859 Merge branch \(aq2017.7\(aq into fix\-add\-saltenv\-pillarenv\-to\-pillar\-item +.IP \(bu 2 +267ae9f633 Fix missing saltenv and pillarenv in pillar.item +.UNINDENT +.IP \(bu 2 +f776040e25 Merge pull request \fI\%#46679\fP from vutny/doc\-state\-pkg +.INDENT 2.0 +.IP \(bu 2 +4a730383bf [DOC] Correct examples in \fIpkg\fP state module +.UNINDENT +.IP \(bu 2 +47409eaa6e Merge pull request \fI\%#46646\fP from twangboy/win_fix_test_local_cache +.INDENT 2.0 +.IP \(bu 2 +8d93156604 Fix \fIunit.returners.test_local_cache\fP for Windows +.UNINDENT +.IP \(bu 2 +0c2dce0416 Merge pull request \fI\%#46649\fP from terminalmage/issue46595 +.INDENT 2.0 +.IP \(bu 2 +e82a1aa1ec Make server_id consistent on Python 3 +.UNINDENT +.IP \(bu 2 +4e7466a21c Merge pull request \fI\%#46588\fP from UtahDave/no_crash_winshell +.INDENT 2.0 +.IP \(bu 2 +b7842a1777 Update error message. +.IP \(bu 2 +95dfdb91ca Don\(aqt stacktrace when salt\-ssh w/o saltwinshell +.UNINDENT +.IP \(bu 2 +33af3cfc7c Merge pull request \fI\%#46631\fP from rallytime/update\-pillar\-unit\-tests +.INDENT 2.0 +.IP \(bu 2 +0f728186aa Fix pillar unit test failures: file_roots and pillar_roots environments should be lists +.UNINDENT +.IP \(bu 2 +d329e7af78 Merge pull request \fI\%#46640\fP from terminalmage/file.copy\-docs +.INDENT 2.0 +.IP \(bu 2 +480c5f8faa Clarify the docs for the file.copy state +.UNINDENT +.IP \(bu 2 +ff40590c06 Merge pull request \fI\%#46642\fP from vutny/doc\-cloud\-index +.INDENT 2.0 +.IP \(bu 2 +51e6aa54a1 [DOC] Unify cloud modules index header +.UNINDENT +.IP \(bu 2 +83ed40c06a Merge pull request \fI\%#46619\fP from rallytime/merge\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +bcbddf5d07 Merge branch \(aq2017.7.5\(aq into \(aq2017.7\(aq +.INDENT 2.0 +.IP \(bu 2 +19bb725698 Merge pull request \fI\%#46612\fP from Ch3LL/7.5_rn +.INDENT 2.0 +.IP \(bu 2 +6076bfa2ee Add changelog to 2017.7.5 release +.UNINDENT +.IP \(bu 2 +31c78aef11 Merge pull request \fI\%#46572\fP from dmurphy18/update_xxxbuild +.INDENT 2.0 +.IP \(bu 2 +c87511570d Merge branch \(aq2017.7.5\(aq into update_xxxbuild +.UNINDENT +.IP \(bu 2 +cdd768fa4d Merge pull request \fI\%#46577\fP from gtmanfred/2017.7.5 +.INDENT 2.0 +.IP \(bu 2 +78cbf7b5cd Fix npm issue +.IP \(bu 2 +c76f7eb028 enable debug logging on the minionlog +.UNINDENT +.IP \(bu 2 +e6682c660c Merge pull request \fI\%#46551\fP from terminalmage/salt\-jenkins\-885 +.INDENT 2.0 +.IP \(bu 2 +703b5e7e65 Change versionadded to show that 2018.3.0 will not have this function +.IP \(bu 2 +010d260d06 Rewrite failing Suse pkg integration test +.IP \(bu 2 +f3f5dec239 zypper.py: fix version argument being ignored +.IP \(bu 2 +214f2d6ad3 Add pkg.list_repo_pkgs to zypper.py +.INDENT 2.0 +.INDENT 3.5 +.INDENT 0.0 +.IP \(bu 2 +0a541613f2 Additon of \-sa flag to allow for revision numbers other than \-0 or \-1 +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +bd62699ccb Merge pull request \fI\%#46563\fP from gtmanfred/2017.7.5 +.INDENT 2.0 +.IP \(bu 2 +8d5ab72983 virtualenv version too old for python3.6 +.UNINDENT +.IP \(bu 2 +2916708124 Merge pull request \fI\%#46561\fP from gtmanfred/2017.7.5 +.INDENT 2.0 +.IP \(bu 2 +2c39ac6dfb disable verbose +.UNINDENT +.IP \(bu 2 +ee3bff6e32 Merge pull request \fI\%#46537\fP from rallytime/bp\-46529 +.INDENT 2.0 +.IP \(bu 2 +289c7a228f retry if there is a segfault +.UNINDENT +.IP \(bu 2 +1271536a89 Merge pull request \fI\%#46519\fP from rallytime/man\-pages\-2017.7.5 +.INDENT 2.0 +.IP \(bu 2 +782a5584f5 Update man pages for 2017.7.5 +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +df12135439 Merge pull request \fI\%#46584\fP from twangboy/lgpo\-46568 +.INDENT 2.0 +.IP \(bu 2 +661017104b Detect disabled reg_multi_sz elements properly +.UNINDENT +.IP \(bu 2 +2fd3aa487c Merge pull request \fI\%#46624\fP from twangboy/win_fix_installer +.INDENT 2.0 +.IP \(bu 2 +fa0b0efe46 Fix some installer script inconsistencies +.UNINDENT +.IP \(bu 2 +f038e3c452 Merge pull request \fI\%#46571\fP from garethgreenaway/46552_onfail_and_require +.INDENT 2.0 +.IP \(bu 2 +152c43c843 Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using \(aqonfail\(aq and two of those states using a \(aqrequire\(aq against the first one state, the last two will run even if the \(aqonfail\(aq isn\(aqt met because the \(aqrequire\(aq is met because the first state returns true even though it didn\(aqt excute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran. +.UNINDENT +.IP \(bu 2 +2677330e19 Merge pull request \fI\%#46520\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +caefedc095 make sure utils is empty for pickling for windows +.IP \(bu 2 +2883548e6b pass utils to the scheduler for reloading in modules +.UNINDENT +.IP \(bu 2 +7bc3c2e588 Merge pull request \fI\%#46531\fP from terminalmage/issue44299 +.INDENT 2.0 +.IP \(bu 2 +b70c3389da Fix case where no comments specified +.IP \(bu 2 +ce391c53f4 Add regression test for \fI\%#44299\fP +.IP \(bu 2 +c3e36a6c94 Fix regression in yumpkg._parse_repo_file() +.IP \(bu 2 +f0c79e3da3 Slight modification to salt.utils.pkg.rpm.combine_comments() +.UNINDENT +.IP \(bu 2 +b80edb5d26 Merge pull request \fI\%#46567\fP from dwoz/runtest\-n\-wart +.INDENT 2.0 +.IP \(bu 2 +3b6901e19d Honor named tests when running integration suites +.UNINDENT +.IP \(bu 2 +1dcd22e767 Merge pull request \fI\%#46580\fP from twangboy/win_update_docs_dism +.INDENT 2.0 +.IP \(bu 2 +d52b99d7a3 Clarify some issues with msu files in win_dism.py +.UNINDENT +.IP \(bu 2 +0a68c22332 Merge pull request \fI\%#46541\fP from gtmanfred/metadata +.INDENT 2.0 +.IP \(bu 2 +19bd1d9db5 handle user\-data for metadata grains +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46668\fP: (\fI\%anlutro\fP) Jinja2 filter strftime stopped working in salt\-ssh 2018.3 (refs: \fI\%#46848\fP, \fI\%#46744\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46744\fP: (\fI\%garethgreenaway\fP) [2018.3] Ensure salt.utils.dateutils is available for templates via salt\-ssh +@ \fI2018\-03\-28 21:09:46 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +ef68df7f3a Merge pull request \fI\%#46744\fP from garethgreenaway/46668_jinja2_filter_strftime_unavailable +.IP \(bu 2 +0b30955c00 Including salt.utils.dateutils so various jinja_filters are available when using salt\-ssh. +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46334\fP: (\fI\%sjorge\fP) [2018.3.0rc1] Stacktrace on call to nacl.dec (refs: \fI\%#46426\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46720\fP: (\fI\%rallytime\fP) Bump deprecation notices in nacl module & runner to Neon +@ \fI2018\-03\-27 21:15:46 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46426\fP: (\fI\%garethgreenaway\fP) [2018.3.0rc1] fixes to nacl module & runner (refs: \fI\%#46639\fP, \fI\%#46720\fP) +.IP \(bu 2 +65bb37effd Merge pull request \fI\%#46720\fP from rallytime/bump\-nacl\-deprecation +.IP \(bu 2 +5102c0310c Bump deprecation notices in nacl module & runner to Neon +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46733\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2018.3.0rc1 to 2018.3 +@ \fI2018\-03\-27 18:46:43 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +c83d9e66fe Merge pull request \fI\%#46733\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +00d4eb26f3 Merge branch \(aq2018.3.0rc1\(aq into \(aq2018.3\(aq +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46565\fP: (\fI\%twangboy\fP) Create reg salt util (2018.3) +@ \fI2018\-03\-26 22:03:33 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +0faced1d54 Merge pull request \fI\%#46565\fP from twangboy/win_fix_cmd_powershell_2018.3 +.IP \(bu 2 +5ee64e9b0e Fix lint (spelling error) +.IP \(bu 2 +0de54ed953 Additional tests +.IP \(bu 2 +fc9ecd75e2 Skip unit.state.test_reg unless on Windows +.IP \(bu 2 +aa98bdf250 Fix some lint +.IP \(bu 2 +e0d201a96f Make sure the docs are correct for the tests +.IP \(bu 2 +f15f92318d Add tests for salt.utils.win_reg +.IP \(bu 2 +f7112b19a2 Submit \fI\%#46527\fP agains 2018.3 +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46334\fP: (\fI\%sjorge\fP) [2018.3.0rc1] Stacktrace on call to nacl.dec (refs: \fI\%#46426\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46639\fP: (\fI\%terminalmage\fP) Use the correct path for nacl certificates in Windows +@ \fI2018\-03\-26 19:20:10 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46426\fP: (\fI\%garethgreenaway\fP) [2018.3.0rc1] fixes to nacl module & runner (refs: \fI\%#46639\fP, \fI\%#46720\fP) +.IP \(bu 2 +dd52368f90 Merge pull request \fI\%#46639\fP from terminalmage/nacl\-default\-path +.IP \(bu 2 +2f7660fe35 Use the correct path for nacl certificates in Windows +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46416\fP: (\fI\%dincamihai\fP) Fix cp.push empty file +@ \fI2018\-03\-26 17:52:47 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +2efef52a3e Merge pull request \fI\%#46416\fP from dincamihai/fix\-cp.push\-empty\-file +.IP \(bu 2 +536ba0fa1e Fix cp.push empty file +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46643\fP: (\fI\%mcalmer\fP) fix docker return +@ \fI2018\-03\-26 15:52:31 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +84579e7652 Merge pull request \fI\%#46643\fP from mcalmer/fix\-docker\-return +.IP \(bu 2 +3ceb63f607 fix checking test results +.IP \(bu 2 +af64632bf3 add unit test for failed login +.IP \(bu 2 +0fc7989236 make it possible to use login, pull and push from module.run and detect errors +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46650\fP: (\fI\%Ch3LL\fP) Mirror libnacl imports in test from the nacl module +@ \fI2018\-03\-26 14:48:40 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +c67afbeb36 Merge pull request \fI\%#46650\fP from Ch3LL/nacl_test +.IP \(bu 2 +9fef8bc431 Mirror libnacl imports in test from the nacl runner +.IP \(bu 2 +f11d58a8e9 Mirror libnacl imports in test from the nacl module +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46645\fP: (\fI\%terminalmage\fP) Add Unicode / Python 3 update to 2018.3.0 release notes +@ \fI2018\-03\-26 14:43:53 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +03b58a01cf Merge pull request \fI\%#46645\fP from terminalmage/release\-notes +.IP \(bu 2 +986c7bcdae Rewrite unicode/py3 section +.IP \(bu 2 +064bc83276 Add Unicode / Python 3 update to 2018.3.0 release notes +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#46150\fP: (\fI\%whytewolf\fP) With chocolately.version some packages don\(aqt work with check_remote=True (refs: \fI\%#46661\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46661\fP: (\fI\%Kimol\fP) Chocolatey \- Lowered name of local and remote packages before comparing versions. +@ \fI2018\-03\-26 14:35:39 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +308c9ddfc3 Merge pull request \fI\%#46661\fP from Kimol/2018.3\-fix_chocolatey_check_remote_packages +.IP \(bu 2 +52581e7918 Removed trailing whitespace +.IP \(bu 2 +123a86947c Chocolatey \- Added lowering local packages for unifing both local and remote names to lowercase for comparison. +.IP \(bu 2 +4be1a991c2 Lowered name of available packages before comparing with local packages +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46569\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 (refs: \fI\%#46631\fP) +@ \fI2018\-03\-21 20:57:04 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +2e1f7c37f7 Merge pull request \fI\%#46569\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +46ba72fb1c Fix pillar unit test failures: file_roots and pillar_roots environments should be lists +.IP \(bu 2 +fe2d46dd0c Better merge conflict resolution for setup.py windows changes +.IP \(bu 2 +8886b61576 Update old utils paths to new paths +.IP \(bu 2 +8d1e1e7f94 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +048b2ba3f6 Merge pull request \fI\%#46547\fP from garethgreenaway/46427_service_module_cumulus +.INDENT 2.0 +.IP \(bu 2 +edd0b11447 Merge branch \(aq2017.7\(aq into 46427_service_module_cumulus +.IP \(bu 2 +ea3c16080e Disable the \fIservice\fP module on Cumulus since it is using systemd. +.UNINDENT +.IP \(bu 2 +98e3260b9a Merge pull request \fI\%#46548\fP from Ch3LL/profit_test +.INDENT 2.0 +.IP \(bu 2 +db96c4e72e check for foo,bar username,password set in profitbrick config +.UNINDENT +.IP \(bu 2 +79f2a76609 Merge pull request \fI\%#46549\fP from Ch3LL/dimension_test +.INDENT 2.0 +.IP \(bu 2 +bb338c464c Fix dimensionsdata test random_name call +.UNINDENT +.IP \(bu 2 +083846fe0e Merge pull request \fI\%#46529\fP from gtmanfred/kitchen +.INDENT 2.0 +.IP \(bu 2 +50d6e2c7be retry if there is a segfault +.UNINDENT +.IP \(bu 2 +5cc11129f1 Merge pull request \fI\%#46511\fP from rallytime/bp\-45769 +.INDENT 2.0 +.IP \(bu 2 +a8ffceda53 Surpress boto WARNING during decode, reference: \fI\%https://github.com/boto/boto/issues/2965\fP +.UNINDENT +.IP \(bu 2 +0e90c8ca6f Merge pull request \fI\%#46493\fP from terminalmage/issue46207 +.INDENT 2.0 +.IP \(bu 2 +f06ff68f10 salt\-call: don\(aqt re\-use initial pillar if CLI overrides passed +.UNINDENT +.IP \(bu 2 +b11a8fc8e0 Merge pull request \fI\%#46450\fP from gtmanfred/salt_runner +.INDENT 2.0 +.IP \(bu 2 +7974ff7264 load grains for salt.cmd runner +.UNINDENT +.IP \(bu 2 +22d753364b Merge pull request \fI\%#46337\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +d6d9e36359 add tests for names and listen/listen_in +.IP \(bu 2 +3f8e0db572 let listen_in work with names +.IP \(bu 2 +7161f4d4df fix listen to be able to handle names +.UNINDENT +.IP \(bu 2 +b7191b8782 Merge pull request \fI\%#46413\fP from meaksh/2017.7\-explore\-result\-in\-depth +.INDENT 2.0 +.IP \(bu 2 +885751634e Add new unit test to check state.apply within module.run +.IP \(bu 2 +9f19ad5264 Rename and fix recursive method +.IP \(bu 2 +1476ace558 Fix Python3 and pylint issue +.IP \(bu 2 +726ca3044d Explore \(aqmodule.run\(aq response to catch the \(aqresult\(aq in depth +.UNINDENT +.IP \(bu 2 +02a79a2014 Merge pull request \fI\%#46496\fP from gtmanfred/kitchen +.INDENT 2.0 +.IP \(bu 2 +da002f78d0 include virtualenv path for py3 windows +.IP \(bu 2 +fe2efe03ea remove duplicate setup +.UNINDENT +.IP \(bu 2 +5c4c182d75 Merge pull request \fI\%#46330\fP from bdrung/fix_kubernetes_test_create_deployments +.INDENT 2.0 +.IP \(bu 2 +5008c53c44 Fix ValueError for template in AppsV1beta1DeploymentSpec +.UNINDENT +.IP \(bu 2 +c7e05d3ff4 Merge pull request \fI\%#46482\fP from rongshengfang/fix\-keyerror\-in\-instance_present +.INDENT 2.0 +.IP \(bu 2 +ed8c83e89a Fix KeyError in salt/states/boto_ec2.py when an EIP is being associated to an existing instance with the instance_present state. +.UNINDENT +.IP \(bu 2 +573d51afec Merge pull request \fI\%#46463\fP from terminalmage/mock\-2.0 +.INDENT 2.0 +.IP \(bu 2 +b958b4699c Update requirements files to depend on mock>=2.0.0 +.UNINDENT +.IP \(bu 2 +a154d35fc7 Merge pull request \fI\%#46422\fP from rallytime/bp\-46300 +.INDENT 2.0 +.IP \(bu 2 +829dfde8e8 Change stringutils path to old utils path for 2017.7 +.IP \(bu 2 +91db2e0782 Python 3 support +.UNINDENT +.IP \(bu 2 +2afaca17a1 Merge pull request \fI\%#46320\fP from mcalmer/warn\-kubernetes +.INDENT 2.0 +.IP \(bu 2 +c493ced415 add warning about future config option change +.UNINDENT +.IP \(bu 2 +c7f95581e3 Merge pull request \fI\%#46449\fP from bdrung/make\-doc\-theme\-configurable +.INDENT 2.0 +.IP \(bu 2 +4a5da2d144 Make documentation theme configurable +.UNINDENT +.IP \(bu 2 +10ce0e9e20 Merge pull request \fI\%#46162\fP from rallytime/team\-suse\-zypper\-owner +.INDENT 2.0 +.IP \(bu 2 +13a295a3b7 Add \fIpkg\fP and \fIsnapper\fP to team\-suse +.IP \(bu 2 +35c7b7b0d3 Add btrfs, xfs, yumpkg, and kubernetes file to team\-suse +.IP \(bu 2 +485d777ac0 Add team\-suse to CODEOWNERS file for zypper files +.UNINDENT +.IP \(bu 2 +cac096b311 Merge pull request \fI\%#46434\fP from gtmanfred/highstate_return +.INDENT 2.0 +.IP \(bu 2 +d18f1a55a7 fix pylint +.IP \(bu 2 +9e2c3f7991 split return key value correctly +.UNINDENT +.IP \(bu 2 +7dd71101ce Merge pull request \fI\%#46455\fP from whytewolf/Issue_44452_unicode_cloud +.INDENT 2.0 +.IP \(bu 2 +5fe474b1a8 .format remove fix for \fI\%#44452\fP +.UNINDENT +.IP \(bu 2 +4c8d9026d3 Merge pull request \fI\%#46428\fP from twangboy/win_fix_reqs +.INDENT 2.0 +.IP \(bu 2 +e7ab97cc17 Remove six as a hard dep for Salt +.IP \(bu 2 +cc67e5c2ef Set six to 1.11.0 +.UNINDENT +.IP \(bu 2 +e834d9a63b Merge pull request \fI\%#46454\fP from gtmanfred/kitchen +.INDENT 2.0 +.IP \(bu 2 +b8ab8434a5 fix windows for kitchen +.UNINDENT +.IP \(bu 2 +2886dca88f Merge pull request \fI\%#46452\fP from gtmanfred/spm_cache_dir +.INDENT 2.0 +.IP \(bu 2 +169cf7a4e2 make spm cache_dir instead of all cachedirs +.UNINDENT +.IP \(bu 2 +a188984cd9 Merge pull request \fI\%#46446\fP from bdrung/fix\-typos +.INDENT 2.0 +.IP \(bu 2 +7e6e80be87 heat: Fix spelling mistake of environment +.IP \(bu 2 +a3c54b50f6 Fix various spelling mistakes +.UNINDENT +.IP \(bu 2 +e35fc5263c Merge pull request \fI\%#46309\fP from bdrung/dynamic\-pillarenv +.INDENT 2.0 +.IP \(bu 2 +584b451fd1 Support dynamic pillar_root environment +.UNINDENT +.IP \(bu 2 +35fe9827fe Merge pull request \fI\%#46430\fP from terminalmage/issue44032 +.INDENT 2.0 +.IP \(bu 2 +f9f187e915 Improve reliability/idempotence of file.blockreplace state +.UNINDENT +.IP \(bu 2 +2bad0a21c0 Merge pull request \fI\%#46429\fP from twangboy/win_fix_snmp +.INDENT 2.0 +.IP \(bu 2 +8995a9b8de Fix problem with __virtual__ in win_snmp +.UNINDENT +.IP \(bu 2 +93a572f229 Merge pull request \fI\%#46100\fP from jfindlay/resolv_scope +.INDENT 2.0 +.IP \(bu 2 +d5561bedaf tests.unit.grains.core add scoped IPv6 nameserver +.IP \(bu 2 +4e2e62d508 salt.utils.dns parse scope param for ipv6 servers +.UNINDENT +.IP \(bu 2 +5acc1d5c54 Merge pull request \fI\%#46420\fP from bdrung/2017.7 +.INDENT 2.0 +.IP \(bu 2 +e48c13d9e0 Fix SSH client exception if SSH is not found +.UNINDENT +.IP \(bu 2 +ca6a76e317 Merge pull request \fI\%#46379\fP from angeloudy/2017.7 +.INDENT 2.0 +.IP \(bu 2 +3acb59c74c Merge branch \(aq2017.7\(aq into 2017.7 +.IP \(bu 2 +d971e0c08b Fix indent +.IP \(bu 2 +269514683f Update http.py +.IP \(bu 2 +908c040ac3 Update http.py +.IP \(bu 2 +51ba3c135b Update http.py +.IP \(bu 2 +14aba24111 fix bytes\-object required error in python 3 +.UNINDENT +.IP \(bu 2 +73f9233557 Merge pull request \fI\%#46404\fP from gtmanfred/kitchen +.INDENT 2.0 +.IP \(bu 2 +c56baa95a8 clone .git for the version tests +.IP \(bu 2 +3620611b5b fix unhold package for debian +.IP \(bu 2 +5219f7d2ba fix minion log path +.UNINDENT +.IP \(bu 2 +ca28cfd4e4 Merge pull request \fI\%#46310\fP from twangboy/win_update_installer_build +.INDENT 2.0 +.IP \(bu 2 +bcf8b19566 Update the installer build +.UNINDENT +.IP \(bu 2 +decccbeca3 Merge pull request \fI\%#46316\fP from twangboy/win_fix_dsc +.INDENT 2.0 +.IP \(bu 2 +2042d33d59 Fix issues with the DSC module +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46620\fP: (\fI\%rallytime\fP) [2018.3] Merge 2018.3.0rc1 into 2018.3 +@ \fI2018\-03\-20 22:45:00 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +8cdd56b9dc Merge pull request \fI\%#46620\fP from rallytime/merge\-2018.3.0rc1\-into\-2018.3 +.IP \(bu 2 +b03cda3cea Merge branch \(aq2018.3.0rc1\(aq into \(aq2018.3\(aq +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46606\fP: (\fI\%Ch3LL\fP) add autodoc topics for infoblox state modules +@ \fI2018\-03\-19 21:35:46 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +2d2fe22ae2 Merge pull request \fI\%#46606\fP from Ch3LL/infoblox_docs +.IP \(bu 2 +6eab6a7dc4 add autodoc topics for infoblox state modules +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46540\fP: (\fI\%s0undt3ch\fP) Some missing \fIisinstance\fP checks. +@ \fI2018\-03\-15 16:17:19 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +1191d5b379 Merge pull request \fI\%#46540\fP from s0undt3ch/2018.3 +.IP \(bu 2 +fa1d668774 Some missing \fIisinstance\fP checks. Committed again through a PR. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46513\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2018.3.0rc1 to 2018.3 +@ \fI2018\-03\-15 15:58:59 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +5429438e4b Merge pull request \fI\%#46513\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +aa760334a1 Merge branch \(aq2018.3.0rc1\(aq into \(aq2018.3\(aq +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#43208\fP: (\fI\%mitar\fP) Prevent user.present to change uid and gid of existing user (refs: \fI\%#46502\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46502\fP: (\fI\%terminalmage\fP) user.present: don\(aqt change uid/gid unless explicitly told to +@ \fI2018\-03\-13 14:25:20 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +3e073c7e8a Merge pull request \fI\%#46502\fP from terminalmage/issue43208 +.IP \(bu 2 +4106840deb user.present: don\(aqt change uid/gid unless explicitly told to +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46398\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-03\-12 20:25:19 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +7cdb00ca9c Merge pull request \fI\%#46398\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +d22e5ba442 Merge fix: return back \fIwb+\fP mode in \fIcrypt.gen_keys\fP\&. +.IP \(bu 2 +c7dddaf8ce Lint: Use log variable, not logger. +.IP \(bu 2 +ca1860cd91 Use new get_umask function in mask calls in virt.py +.IP \(bu 2 +19ec7b6de1 Update old utils paths with new utils paths +.IP \(bu 2 +d83727fdf9 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +95586678c3 Merge pull request \fI\%#46394\fP from Ch3LL/mac_doc +.INDENT 2.0 +.IP \(bu 2 +158add6661 change oxdownload to oxdownload\-{python_version} +.IP \(bu 2 +21aa848c89 Add mac py2 and py3 packages to mac installation docs +.UNINDENT +.IP \(bu 2 +07b5d09ac1 Merge pull request \fI\%#46338\fP from rallytime/fix\-44831 +.INDENT 2.0 +.IP \(bu 2 +90771da999 Remove cmd.wait deprecation reference in docs +.UNINDENT +.IP \(bu 2 +3849e7a085 Merge pull request \fI\%#46333\fP from danlsgiga/issue\-42438 +.INDENT 2.0 +.IP \(bu 2 +3b13f37b44 Revert changes in the code and change docs instead +.IP \(bu 2 +38114a65d8 Fixes color parameter mismatch and handles 204 responses correctly +.UNINDENT +.IP \(bu 2 +a8f2f1b063 Merge pull request \fI\%#46322\fP from terminalmage/issue44935 +.INDENT 2.0 +.IP \(bu 2 +85ac6a9893 yamlify_arg: don\(aqt treat leading dashes as lists +.UNINDENT +.IP \(bu 2 +da5c282cb2 Merge pull request \fI\%#46327\fP from samilaine/fix\-vmware\-cloud\-fqdn +.INDENT 2.0 +.IP \(bu 2 +4b8dfb326f Modify the way a FQDN is handled in the vmware cloud provider. +.UNINDENT +.IP \(bu 2 +78c45d3786 Merge pull request \fI\%#46318\fP from terminalmage/squelch\-warnings +.INDENT 2.0 +.IP \(bu 2 +5889b36646 Skip type\-checking for several gitfs/git_pillar/winrepo params +.UNINDENT +.IP \(bu 2 +bb0d6fc263 Merge pull request \fI\%#46312\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +749ae580ed add module_dirs to salt ssh thin tarball +.UNINDENT +.IP \(bu 2 +88b5f7383d Merge pull request \fI\%#46242\fP from redbaron4/fix\-46127 +.INDENT 2.0 +.IP \(bu 2 +06dba51617 Make changes from review +.IP \(bu 2 +727ebe1056 Merge branch \(aq2017.7\(aq into fix\-46127 +.IP \(bu 2 +08d1ee8baf Fix Python3 test errors +.IP \(bu 2 +aa9d709015 Pass env_vars to pip.freeze +.UNINDENT +.IP \(bu 2 +a0716643e4 Merge pull request \fI\%#46265\fP from Ch3LL/profit_cloud +.INDENT 2.0 +.IP \(bu 2 +d4893eab4c Add username/password to profitbricks conf for cloud tests +.UNINDENT +.IP \(bu 2 +ed7bffa7e0 Merge pull request \fI\%#46306\fP from rallytime/bp\-46256 +.INDENT 2.0 +.IP \(bu 2 +6439bce4a8 Don\(aqt install msgpack 0.5.5 +.UNINDENT +.IP \(bu 2 +8c2c4e3316 Merge pull request \fI\%#46208\fP from terminalmage/audit\-umask\-usage +.INDENT 2.0 +.IP \(bu 2 +9c92aadce8 Disable blacklisted\-function check for legitimate uses +.IP \(bu 2 +58a11aaa26 Disable pylint check in salt\-ssh shim +.IP \(bu 2 +ecadf67659 Blacklist os.umask +.IP \(bu 2 +31b1d98fcb Replace direct use of os.umask with use of existing context manager +.IP \(bu 2 +82ce546e18 Prevent failed os.makedirs from leaving modified umask in place +.UNINDENT +.IP \(bu 2 +978e869490 Merge pull request \fI\%#46293\fP from eliasp/2017.7\-44624\-py3\-compat +.INDENT 2.0 +.IP \(bu 2 +2e08b0d9c8 Fix Python3 comparison \fITypeError\fP in \fIsalt.modules.upstart\fP +.UNINDENT +.IP \(bu 2 +bee4a66d0c Merge pull request \fI\%#46264\fP from terminalmage/issue46128 +.INDENT 2.0 +.IP \(bu 2 +68000b7211 Fix incorrect merge conflict resolution +.UNINDENT +.IP \(bu 2 +1e0b3aa348 Merge pull request \fI\%#46296\fP from vutny/doc\-pillar\-get +.INDENT 2.0 +.IP \(bu 2 +1faa8331e1 [DOC] Add missing params to \fIpillar.get\fP docstring +.UNINDENT +.IP \(bu 2 +c490a50452 Merge pull request \fI\%#45874\fP from GwiYeong/2017.7\-local\-client\-hotfix +.INDENT 2.0 +.IP \(bu 2 +949aefc82b Merge branch \(aq2017.7\(aq into 2017.7\-local\-client\-hotfix +.IP \(bu 2 +45d663f435 fix for local client timeout bug +.UNINDENT +.IP \(bu 2 +8e8a3a2897 Merge pull request \fI\%#46261\fP from rallytime/merge\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +8256ae5ee5 Merge branch \(aq2016.11\(aq into \(aq2017.7\(aq +.INDENT 2.0 +.IP \(bu 2 +140ef4d6b9 Merge pull request \fI\%#46253\fP from rallytime/doc\-banners +.INDENT 2.0 +.IP \(bu 2 +07ed8c7db3 Update docbanner for SaltConf18 +.UNINDENT +.IP \(bu 2 +9fe86ee520 Merge pull request \fI\%#46179\fP from wedge\-jarrad/cifs\-remount\-fix +.INDENT 2.0 +.IP \(bu 2 +9ca25c4313 Add credentials and secretfile to mount.mounted mount_invisible_keys +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46421\fP: (\fI\%bdrung\fP) Skip SSHPasswordTests if ssh binary is not found +@ \fI2018\-03\-09 16:21:02 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +9c089aa4de Merge pull request \fI\%#46421\fP from bdrung/skip\-ssh\-tests\-if\-ssh\-is\-missing +.IP \(bu 2 +3d6f658309 Skip SSHPasswordTests if ssh binary is not found +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46453\fP: (\fI\%bdrung\fP) Fix various spelling mistakes in 2018.3 +@ \fI2018\-03\-09 14:48:33 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46446\fP: (\fI\%bdrung\fP) Fix various typos (refs: \fI\%#46453\fP) +.IP \(bu 2 +4cbfde5839 Merge pull request \fI\%#46453\fP from bdrung/fix\-typos\-2018.3 +.IP \(bu 2 +3d37eca847 Fix various spelling mistakes +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#44032\fP: (\fI\%PhilippeAB\fP) blockreplace marker_end isn\(aqt applied with newline (refs: \fI\%#46430\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46437\fP: (\fI\%terminalmage\fP) Improve reliability/idempotence of file.blockreplace state (2018.3 branch) +@ \fI2018\-03\-08 15:38:53 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46430\fP: (\fI\%terminalmage\fP) Improve reliability/idempotence of file.blockreplace state (refs: \fI\%#46437\fP) +.IP \(bu 2 +a43d999fb8 Merge pull request \fI\%#46437\fP from terminalmage/issue44032\-2018.3 +.IP \(bu 2 +4798187035 Improve reliability/idempotence of file.blockreplace state (2018.3 branch) +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46328\fP: (\fI\%dincamihai\fP) Fix openscap push +@ \fI2018\-03\-07 17:51:41 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +0c66507aff Merge pull request \fI\%#46328\fP from dincamihai/2018.3.0rc1 +.IP \(bu 2 +b5e508f339 Fix openscap push +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46174\fP: (\fI\%twangboy\fP) Fix a unicode issue with the git module on Windows +@ \fI2018\-03\-06 18:53:53 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +82cb2ea5a0 Merge pull request \fI\%#46174\fP from twangboy/win_fix_test_git_2 +.IP \(bu 2 +80e3a47dd4 Add output_encoding argument to git state, and add docs +.IP \(bu 2 +661a0687ec Fix git utf\-8 issues for Windows +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46235\fP: (\fI\%twangboy\fP) Fix \fIunit.modules.test_ssh\fP for Windows +@ \fI2018\-03\-05 20:39:44 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +7690cf8564 Merge pull request \fI\%#46235\fP from twangboy/win_fix_test_ssh +.IP \(bu 2 +9ea02d7045 Use write instead of writelines for Windows +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46332\fP: (\fI\%terminalmage\fP) Update the merge\-forward docs to reference the 2018.3 branch +@ \fI2018\-03\-05 19:39:56 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +c4f366cdd9 Merge pull request \fI\%#46332\fP from terminalmage/merge\-forward\-docs +.IP \(bu 2 +0411845cec Update the merge\-forward docs to reference the 2018.3 branch +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46307\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2018.3.0rc1 to 2018.3 +@ \fI2018\-03\-03 12:56:07 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +241611aca5 Merge pull request \fI\%#46307\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +c9fa21f62c Merge branch \(aq2018.3.0rc1\(aq into \(aq2018.3\(aq +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46314\fP: (\fI\%terminalmage\fP) Merge 2017.7 branch into 2018.3 +@ \fI2018\-03\-03 12:54:27 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +30c34f0c62 Merge pull request \fI\%#46314\fP from terminalmage/merge\-2017.7\-2018.3 +.IP \(bu 2 +61ab47ee70 Merge branch \(aq2017.7\(aq into merge\-2017.7\-2018.3 +.INDENT 2.0 +.IP \(bu 2 +88a3166589 Merge pull request \fI\%#46276\fP from terminalmage/issue44046 +.INDENT 2.0 +.IP \(bu 2 +a14d4daf8c salt.utils.docker.translate_input: operate on deepcopy of kwargs +.UNINDENT +.IP \(bu 2 +da60399b8f Merge pull request \fI\%#46183\fP from oeuftete/fix\-docker\-container\-running\-host\-config\-ulimits +.INDENT 2.0 +.IP \(bu 2 +5b09644429 Sort lists from Ulimits before comparing +.IP \(bu 2 +0b80f02226 Update old dockerng doc ref +.UNINDENT +.IP \(bu 2 +509429f08c Merge pull request \fI\%#46260\fP from terminalmage/git_pillar +.INDENT 2.0 +.IP \(bu 2 +b1ce2501fd Normalize global git_pillar/winrepo config items +.UNINDENT +.IP \(bu 2 +a97a3e6fb0 Merge pull request \fI\%#46101\fP from jfindlay/openrc_ret +.INDENT 2.0 +.IP \(bu 2 +2eef3c65a6 tests.unit.modules.gentoo_service add retcode arg +.IP \(bu 2 +81ec66fd8b modules.gentoo_service handle stopped retcode +.UNINDENT +.IP \(bu 2 +1a17593c05 Merge pull request \fI\%#46254\fP from rallytime/enterprise\-banner +.INDENT 2.0 +.IP \(bu 2 +f5fae3dedf Update enterprise banner +.UNINDENT +.IP \(bu 2 +8c50ff32bd Merge pull request \fI\%#46250\fP from terminalmage/runner\-docs +.INDENT 2.0 +.IP \(bu 2 +91b4895087 Add documentation to the fileserver runner +.UNINDENT +.IP \(bu 2 +53067cca43 Merge pull request \fI\%#46243\fP from racker\-markh/fix\-openstack\-private\-network\-issue +.INDENT 2.0 +.IP \(bu 2 +50c1e140f0 Don\(aqt check deny private_ips already in the original list of private_ips +.UNINDENT +.IP \(bu 2 +15405c8760 Merge pull request \fI\%#46239\fP from terminalmage/issue46109 +.INDENT 2.0 +.IP \(bu 2 +586d8b0dcf archive.extracted: don\(aqt check source file when if_missing path exists +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#33177\fP: (\fI\%robnagler\fP) pillar.stack should not continue after errors (refs: \fI\%#46287\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46287\fP: (\fI\%bbinet\fP) Update PillarStack stack.py to latest upstream version +@ \fI2018\-03\-02 21:39:52 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +194b0317ac Merge pull request \fI\%#46287\fP from bbinet/upstream\-pillarstack +.IP \(bu 2 +b14b6f2c95 Update PillarStack stack.py to latest upstream version +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46227\fP: (\fI\%Ch3LL\fP) Mock file_client call in smtp return test +@ \fI2018\-02\-28 22:12:22 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +7382654c70 Merge pull request \fI\%#46227\fP from Ch3LL/smtp_file_client +.IP \(bu 2 +280dc9a2b6 Mock file_client call in smtp return test +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46232\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-02\-28 19:16:37 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +123625213e Merge pull request \fI\%#46232\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +04f24c1794 Lint: fix from a bad merge +.IP \(bu 2 +aad61c77bd Update old utils paths to new paths +.IP \(bu 2 +7243baf2c0 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +633e1208e4 Merge pull request \fI\%#46221\fP from terminalmage/salt\-jenkins\-854 +.INDENT 2.0 +.IP \(bu 2 +0eb012659c Fix hanging tests in integration suite +.UNINDENT +.IP \(bu 2 +7917277345 Merge pull request \fI\%#46214\fP from vutny/formulas\-readme\-formatting +.INDENT 2.0 +.IP \(bu 2 +d702846961 [DOC] Replace \fInote\fP rST block for GitHub +.UNINDENT +.IP \(bu 2 +a2e099b744 Merge pull request \fI\%#46203\fP from Ch3LL/7.5_release +.INDENT 2.0 +.IP \(bu 2 +6ddf3246ce Add 2017.7.5 Release Notes File +.UNINDENT +.IP \(bu 2 +973b227818 Merge pull request \fI\%#46201\fP from rallytime/merge\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +9ac2101baa Merge branch \(aq2016.11\(aq into \(aq2017.7\(aq +.IP \(bu 2 +a4c5417d23 Merge pull request \fI\%#46132\fP from rallytime/2016.11_update_version_doc +.INDENT 2.0 +.IP \(bu 2 +d2196b6df3 Update release versions for the 2016.11 branch +.UNINDENT +.UNINDENT +.IP \(bu 2 +89cf2e5061 Merge pull request \fI\%#46139\fP from bdrung/os\-grains +.INDENT 2.0 +.IP \(bu 2 +0b445f2a37 tests: Add unit tests for _parse_os_release() +.IP \(bu 2 +f6069b77ed Fix osfinger grain on Debian +.IP \(bu 2 +8dde55a761 tests: Add os_grains test cases for Debian +.IP \(bu 2 +ff02ab9937 tests: Add Ubuntu 17.10 (artful) os_grains test case +.IP \(bu 2 +77d5356aba Fix incorrect oscodename grain on Ubuntu +.IP \(bu 2 +7e62dc9fd2 tests: Support reading os\-release files from disk +.IP \(bu 2 +a92ec0db1b Make _parse_os_release() always callable +.IP \(bu 2 +eee1fe5b38 tests: Dissolve _run_ubuntu_os_grains_tests +.IP \(bu 2 +1d6ef731fe tests: Deduplicate _run_os_grains_tests() +.UNINDENT +.IP \(bu 2 +c8c71e75ca Merge pull request \fI\%#46133\fP from rallytime/2017.7_update_version_doc +.INDENT 2.0 +.IP \(bu 2 +0ed338e643 Update release versions for the 2017.7 branch +.UNINDENT +.IP \(bu 2 +390d592aa6 Merge pull request \fI\%#46185\fP from terminalmage/issue46124 +.INDENT 2.0 +.IP \(bu 2 +3b58dd0da0 gitfs: Fix detection of base env when its ref is also mapped to a different env +.UNINDENT +.IP \(bu 2 +705caa8cca Merge pull request \fI\%#46148\fP from rallytime/merge\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +25deebf7a6 Merge branch \(aq2017.7.3\(aq into \(aq2017.7\(aq +.INDENT 2.0 +.IP \(bu 2 +b5b083fd26 Merge pull request \fI\%#46074\fP from Ch3LL/update\-7.4 +.INDENT 2.0 +.IP \(bu 2 +8d0eeeb059 Update 2017.7.4 Release Notes with new fixes +.UNINDENT +.IP \(bu 2 +32f3d00e44 Merge pull request \fI\%#46066\fP from rallytime/pin\-tornado +.INDENT 2.0 +.IP \(bu 2 +6dc1a3b9dc Pin tornado version in requirements file +.UNINDENT +.IP \(bu 2 +85761ee650 Merge pull request \fI\%#46036\fP from terminalmage/issue43769 +.INDENT 2.0 +.IP \(bu 2 +e2140d9a84 Mock the ssh.key_is_encrypted utils func +.IP \(bu 2 +169924b3fe Move ssh.key_is_encrypted to a utils module temporarily +.IP \(bu 2 +54f4d78f7a Only keep ssh.py in the Windows installer +.IP \(bu 2 +5f04531e1b Keep ssh state and execution modules in the installer +.IP \(bu 2 +f2b69f703d git.latest: Fix regression with identity file usage +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +10a47dcbc4 Merge pull request \fI\%#46137\fP from damon\-atkins/2017.7_fix_ec2_pillar2 +.INDENT 2.0 +.IP \(bu 2 +99e7f6a7d3 update ec2 pillar arguments with better names +.UNINDENT +.IP \(bu 2 +d74cb14557 Merge pull request \fI\%#46145\fP from terminalmage/issue46004 +.INDENT 2.0 +.IP \(bu 2 +467ff841cd pillarenv argument should default to None and not the value from opts +.IP \(bu 2 +2a185855ea Better solution for fixing the opts munging in pillar.show_pillar runner +.IP \(bu 2 +e2c4702e0c Update tests to reflect changes to the SaltCacheLoader +.IP \(bu 2 +f9301fcc34 Document behavior when orchestration runnner invoked with non\-orch states +.IP \(bu 2 +9644579cd0 Instantiate the SaltCacheLoader\(aqs fileclient in the __init__ +.IP \(bu 2 +f9a6c86e21 salt.runners.pillar.show_pillar: don\(aqt modify master opts +.IP \(bu 2 +e0940a9fc4 Properly detect use of the state.orch alias and add orch jid to kwargs +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#42932\fP: (\fI\%bobrik\fP) cmd.run with bg: true doesn\(aqt fail properly (refs: \fI\%#46172\fP, \fI\%#45932\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46172\fP: (\fI\%The\-Loeki\fP) cmdmod: reimplementation of \fI\%#45932\fP for Oxygen +@ \fI2018\-02\-28 19:14:26 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#45932\fP: (\fI\%The\-Loeki\fP) Fix cmd run_all bg error (refs: \fI\%#46172\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#39980\fP: (\fI\%vutny\fP) [2016.3] Allow to use \fIbg\fP kwarg for \fIcmd.run\fP state function (refs: \fI\%#46172\fP, \fI\%#45932\fP) +.IP \(bu 2 +20d869c228 Merge pull request \fI\%#46172\fP from The\-Loeki/fix_cmd_run_all_bg_oxygen +.IP \(bu 2 +3ecf5018d0 Merge branch \(aq2018.3\(aq into fix_cmd_run_all_bg_oxygen +.IP \(bu 2 +b5315e817b Merge branch \(aq2018.3\(aq into fix_cmd_run_all_bg_oxygen +.IP \(bu 2 +beabf4f06b cmdmod: reimplementation of \fI\%#45932\fP for Oxygen +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46238\fP: (\fI\%terminalmage\fP) Don\(aqt allow salt.utils.files.fopen() to open stdin/stdout/stderr +@ \fI2018\-02\-28 19:08:23 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +687575b582 Merge pull request \fI\%#46238\fP from terminalmage/fds\-in\-fopen +.IP \(bu 2 +fe1527a3c4 Don\(aqt allow salt.utils.files.fopen() to open stdin/stdout/stderr +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46219\fP: (\fI\%twangboy\fP) Fix \fIunit.modules.test_network\fP for Windows +@ \fI2018\-02\-28 15:45:02 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +3da5dcb313 Merge pull request \fI\%#46219\fP from twangboy/win_fix_inet_pton +.IP \(bu 2 +46f1d2cc09 Use six.text_type instead of six.u +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46228\fP: (\fI\%twangboy\fP) Fix \fIunit.modules.test_pip\fP for Windows +@ \fI2018\-02\-28 15:37:49 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +44343f8063 Merge pull request \fI\%#46228\fP from twangboy/win_fix_test_pip +.IP \(bu 2 +415821eee9 Fix encoding issue +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46198\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2018.3.0rc1 to 2018.3 +@ \fI2018\-02\-27 15:17:51 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +adc8950bbe Merge pull request \fI\%#46198\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +1b4dc71930 Lint fix +.IP \(bu 2 +776f2ea5d7 Merge branch \(aq2018.3.0rc1\(aq into \(aq2018.3\(aq +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#45849\fP: (\fI\%Epiclemonaid\fP) XenServer Provisioning errors out on this line. removing it succeeds. (refs: \fI\%#46168\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46168\fP: (\fI\%gtmanfred\fP) driver and provider should be specified +@ \fI2018\-02\-26 16:17:13 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +06d2dff3ac Merge pull request \fI\%#46168\fP from gtmanfred/2018.3 +.IP \(bu 2 +ac99bd26db driver and provider should be specified +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46161\fP: (\fI\%rallytime\fP) [2018.3] Merge forward from 2017.7 to 2018.3 +@ \fI2018\-02\-26 15:29:39 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +605e5eff73 Merge pull request \fI\%#46161\fP from rallytime/merge\-2018.3 +.IP \(bu 2 +69ac94baca Update utils paths +.IP \(bu 2 +cffbf52c10 Lint fix: remove extra line +.IP \(bu 2 +79bed6cff1 Merge branch \(aq2017.7\(aq into \(aq2018.3\(aq +.INDENT 2.0 +.IP \(bu 2 +0398ce0482 Merge pull request \fI\%#46135\fP from rallytime/bp\-46088 +.INDENT 2.0 +.IP \(bu 2 +57a60f62a3 fix kernel subpackages install bug +.UNINDENT +.IP \(bu 2 +1fcbbd1e02 Merge pull request \fI\%#46136\fP from rallytime/bp\-46115 +.INDENT 2.0 +.IP \(bu 2 +0a481d707f update digitalocean salt\-cloud driver +.UNINDENT +.IP \(bu 2 +11e5e8eb86 Merge pull request \fI\%#45911\fP from twangboy/win_fix_lgpo_unicode +.INDENT 2.0 +.IP \(bu 2 +bcde5cc625 Update log statement +.IP \(bu 2 +e9fa53d3b7 Change the Invalid Data Message +.IP \(bu 2 +c818d4b791 Convert reg values to unicode for debug +.UNINDENT +.IP \(bu 2 +524a6a72a0 Merge pull request \fI\%#46123\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +8d36730ef7 If no pubkey is passed in openmode fail +.UNINDENT +.IP \(bu 2 +e48fa58012 Merge pull request \fI\%#46131\fP from vutny/doc\-formula\-formatting +.INDENT 2.0 +.IP \(bu 2 +d8fb051e44 [DOC] Fix code\-blocks for reStructuredText +.UNINDENT +.IP \(bu 2 +6cea44ee95 Merge pull request \fI\%#46118\fP from rallytime/bp\-44603 +.INDENT 2.0 +.IP \(bu 2 +2a2c23c66b Fix acme state to correctly return on test +.UNINDENT +.IP \(bu 2 +16c382b55b Merge pull request \fI\%#46121\fP from rallytime/merge\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +4c2f504a85 Merge branch \(aq2016.11\(aq into \(aq2017.7\(aq +.INDENT 2.0 +.IP \(bu 2 +e197a0fbc5 Merge pull request \fI\%#46076\fP from rallytime/bp\-46066 +.INDENT 2.0 +.IP \(bu 2 +b94d73c53e Pin tornado version in requirements file +.UNINDENT +.IP \(bu 2 +c72c1bde5f Merge pull request \fI\%#46093\fP from wedge\-jarrad/contributing\-doc\-typo +.INDENT 2.0 +.IP \(bu 2 +5a0fe104f7 Fix contributing doc typo +.UNINDENT +.IP \(bu 2 +3cb83ea87e Merge pull request \fI\%#45992\fP from bgridley/fix\-routes\-present\-state +.INDENT 2.0 +.IP \(bu 2 +679787699c Add vpc_peering_connection_id to describe_route_tables route_keys +.UNINDENT +.IP \(bu 2 +8a60635da0 Merge pull request \fI\%#46000\fP from terminalmage/issue45910 +.INDENT 2.0 +.IP \(bu 2 +8cf13325ee salt.states.reg.present: Prevent traceback when reg data is binary +.UNINDENT +.IP \(bu 2 +1f44e285dc Merge pull request \fI\%#46011\fP from terminalmage/fix\-solaris\-runas +.INDENT 2.0 +.IP \(bu 2 +8ee0a3a28b Move Solaris USER workaround up a bit +.IP \(bu 2 +13cdb52690 cmdmod.py: runas workaround for platforms that don\(aqt set a USER env var +.UNINDENT +.IP \(bu 2 +30fb8f7be0 Merge pull request \fI\%#45467\fP from twangboy/win_exclude_hidden +.INDENT 2.0 +.IP \(bu 2 +ea41215646 Make the regex pattern less greedy +.IP \(bu 2 +6d223cffa7 Add tip about passing bogus saltenv +.IP \(bu 2 +1282ae3a93 Skip hidden first +.IP \(bu 2 +437a457911 Skip hidden dirs in genrepo +.IP \(bu 2 +87dc554dc3 Add final updates to docs +.IP \(bu 2 +3646d5c897 Fix some docs formatting, add some warnings +.IP \(bu 2 +35c81faf5a Log the source_dir when caching the files +.IP \(bu 2 +91c3da8dfd Improve docs for pkg.refresh_db +.IP \(bu 2 +4803d92707 Add some documentation +.IP \(bu 2 +08b82e0875 Fix lint error, use raw +.IP \(bu 2 +2f712691cf Exclude hidden directories in pkg.refresh_db +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +b92346645b Merge pull request \fI\%#46107\fP from amendlik/yumpkg\-assumeyes +.INDENT 2.0 +.IP \(bu 2 +8d9a432fb2 Add \-\-assumeyes to yum/dnf commands in yumpkg.refresh_db +.UNINDENT +.IP \(bu 2 +14fe423e0c Merge pull request \fI\%#46094\fP from kstreee/fix\-memory\-leak +.INDENT 2.0 +.IP \(bu 2 +48080a1bae Fixes memory leak, saltclients should be cleaned after used. +.IP \(bu 2 +aba00805f4 Adds set_close_callback function to removes stream instance after closed from a set streams. +.UNINDENT +.IP \(bu 2 +320c2037e1 Merge pull request \fI\%#46097\fP from vutny/fix\-https\-link +.INDENT 2.0 +.IP \(bu 2 +2062fd0e5c [DOC] Put https link to the formulas doc page +.UNINDENT +.IP \(bu 2 +0eb137fb4e Merge pull request \fI\%#46103\fP from bdrung/2017.7 +.INDENT 2.0 +.IP \(bu 2 +dd3f936557 Fix skipping Kubernetes tests if client is not installed +.UNINDENT +.IP \(bu 2 +c3a938e994 Merge pull request \fI\%#46070\fP from Ch3LL/fix\-doc\-dns +.INDENT 2.0 +.IP \(bu 2 +2a5d855d97 add required arg to dns_check jinja doc example +.UNINDENT +.IP \(bu 2 +01042e9d77 Merge pull request \fI\%#46067\fP from rallytime/bp\-45994 +.INDENT 2.0 +.IP \(bu 2 +a07bb48726 Correct formatting for lint +.IP \(bu 2 +e8678f633d Fix Comment being None not \(aq\(aq and inject quotes into the TXT ChangeRecords +.UNINDENT +.IP \(bu 2 +5e0e2a30e2 Merge pull request \fI\%#45932\fP from The\-Loeki/fix_cmd_run_all_bg +.INDENT 2.0 +.IP \(bu 2 +f83da27ca5 Merge branch \(aq2017.7\(aq into fix_cmd_run_all_bg +.IP \(bu 2 +771758fbca Merge branch \(aq2017.7\(aq into fix_cmd_run_all_bg +.IP \(bu 2 +c54fcf7a2d cmd: move separate DRY logging blocks into _run, prevent logging on bg=True, don\(aqt use_vt on bg +.IP \(bu 2 +ebb1f81a9b cmd run: when running in bg, force ignore_retcode=True +.UNINDENT +.IP \(bu 2 +45ace39961 Merge pull request \fI\%#46062\fP from vutny/pg\-user\-state\-fix\-typo +.INDENT 2.0 +.IP \(bu 2 +a5fbe4e95e Fix typo in postgres_user.present state function +.UNINDENT +.IP \(bu 2 +edcb64de76 Merge pull request \fI\%#45763\fP from twangboy/win_fix_path_rehash +.INDENT 2.0 +.IP \(bu 2 +b9a2bc7b29 Fix hyperlinks +.IP \(bu 2 +29912adc15 Move the test_rehash test to test_win_functions +.IP \(bu 2 +adc594c183 Remove duplicate link +.IP \(bu 2 +e84628c1eb Add some comments to the code +.IP \(bu 2 +d50d5f582f Add additional info to docs for \fIbroadcast_setting_change\fP +.IP \(bu 2 +3a54e09cd9 Rename setting to message +.IP \(bu 2 +a3f9e99bc0 Change to a generic function to broadcast change +.IP \(bu 2 +79299361c3 Create refresh_environment salt util +.IP \(bu 2 +967b83940c Fix rehash function +.UNINDENT +.IP \(bu 2 +a46fbc546c Merge pull request \fI\%#46042\fP from jfindlay/file_tree_doc +.INDENT 2.0 +.IP \(bu 2 +0ba4954a4b salt.pillar.file_tree revise module documentation +.IP \(bu 2 +3c6a5bf967 salt.pillar.file_tree provide better debug info +.IP \(bu 2 +bb1cdc451e salt.pillar.file_tree no stack trace when nodegroups undefined +.UNINDENT +.IP \(bu 2 +de86126dd8 Merge pull request \fI\%#46013\fP from rallytime/bp\-45598 +.INDENT 2.0 +.IP \(bu 2 +2ea3fef543 No lazy logging +.IP \(bu 2 +f427b0febc Change formatting style of logging lines per review +.IP \(bu 2 +ebb244396b Patch around ResourceRecords needing to be present for AliasTarget entries to work +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46160\fP: (\fI\%rallytime\fP) Mark 2 tests as flaky +@ \fI2018\-02\-23 19:10:06 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +05b771bfd7 Merge pull request \fI\%#46160\fP from rallytime/flaky\-tests +.IP \(bu 2 +49e49ae51b Mark 2 tests as flaky +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46006\fP: (\fI\%dincamihai\fP) Remove obsolete unicode handling in pkg.info_installed +@ \fI2018\-02\-22 19:22:36 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +9b2bc1982c Merge pull request \fI\%#46006\fP from dincamihai/oxygen.rc1 +.IP \(bu 2 +99079fc442 Remove obsolete unicode handling in pkg.info_installed +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46078\fP: (\fI\%rallytime\fP) [oxygen] Merge forward from oxygen.rc1 to oxygen +@ \fI2018\-02\-20 21:49:04 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +93dab45307 Merge pull request \fI\%#46078\fP from rallytime/merge\-oxygen +.IP \(bu 2 +2d0f81fd1b Merge branch \(aqoxygen.rc1\(aq into \(aqoxygen\(aq +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#45938\fP: (\fI\%edgan\fP) zookeeper.present state doesn\(aqt deal with an existing zode with no ACL specified (refs: \fI\%#46043\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#46071\fP: (\fI\%rallytime\fP) Back\-port \fI\%#46043\fP to oxygen +@ \fI2018\-02\-16 19:56:36 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#46043\fP: (\fI\%edgan\fP) Allow zookeeper znode creation to not require an ACL (refs: \fI\%#46071\fP) +.IP \(bu 2 +8d99c3b8fe Merge pull request \fI\%#46071\fP from rallytime/bp\-46043 +.IP \(bu 2 +b82c8bd630 Allow zookeeper znode creation to not require an ACL +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46056\fP: (\fI\%Ch3LL\fP) Fix mac_assistive module not loading +@ \fI2018\-02\-16 14:57:46 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +5a31422432 Merge pull request \fI\%#46056\fP from Ch3LL/ver_mac +.IP \(bu 2 +e44f5133c5 Fix mac_assistive module not loading +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46041\fP: (\fI\%rallytime\fP) [oxygen] Merge forward from 2017.7 to oxygen +@ \fI2018\-02\-16 14:55:51 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +cdca28f5da Merge pull request \fI\%#46041\fP from rallytime/merge\-oxygen +.IP \(bu 2 +e060a74fd8 Merge branch \(aq2017.7\(aq into \(aqoxygen\(aq +.INDENT 2.0 +.IP \(bu 2 +07e5735471 Merge pull request \fI\%#46016\fP from rallytime/bp\-45826 +.INDENT 2.0 +.IP \(bu 2 +1916e5c4a4 Fix selinux.fcontext_policy_present for Centos 6 +.UNINDENT +.IP \(bu 2 +a1f4092811 Merge pull request \fI\%#46015\fP from rallytime/bp\-45785 +.INDENT 2.0 +.IP \(bu 2 +ef6ffb1492 Resolve linting errors +.IP \(bu 2 +8047066c46 Remove unused import +.IP \(bu 2 +8f7c45935a Add tests for salt.modules.selinux.fcontext_get_policy +.IP \(bu 2 +bafb7b4e6e Ensure parsed fields are stripped +.IP \(bu 2 +a830a6e819 m/selinux.fcontext_get_policy allow long filespecs +.UNINDENT +.IP \(bu 2 +96097c037e Merge pull request \fI\%#46012\fP from rallytime/bp\-45462 +.INDENT 2.0 +.IP \(bu 2 +9f76836a6c emit port cli version, variants as separate args +.UNINDENT +.IP \(bu 2 +1279924f5f Merge pull request \fI\%#45991\fP from terminalmage/fix\-duplicate\-extra\-opts +.INDENT 2.0 +.IP \(bu 2 +916766f651 yumpkg: Fix a couple issues with _get_extra_opts +.UNINDENT +.IP \(bu 2 +8b9adc258e Merge pull request \fI\%#46017\fP from rallytime/merge\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +a06645ce71 Merge branch \(aq2017.7.3\(aq into \(aq2017.7\(aq +.IP \(bu 2 +6d534c6e7e Merge pull request \fI\%#46009\fP from Ch3LL/rn_7.4 +.INDENT 2.0 +.IP \(bu 2 +ac0baf4b34 Add 2017.7.4 Release Notes with PRs +.UNINDENT +.IP \(bu 2 +ca76a0b328 Merge pull request \fI\%#45981\fP from gtmanfred/2017.7.3 +.INDENT 2.0 +.IP \(bu 2 +0d448457dc apparently local is not set by default +.IP \(bu 2 +2a92f4bc16 use local config for vault when masterless +.UNINDENT +.IP \(bu 2 +6530649dbc Merge pull request \fI\%#45953\fP from rallytime/bp\-45928\-2017.7.3 +.INDENT 2.0 +.IP \(bu 2 +85363189d1 Fixing vault when used with pillar over salt\-ssh +.UNINDENT +.IP \(bu 2 +fb378cebb0 Merge pull request \fI\%#45934\fP from rallytime/bp\-45902 +.INDENT 2.0 +.IP \(bu 2 +bb83e8b345 Add regression test for issue 45893 +.IP \(bu 2 +cdda66d759 Remove duplicated section in docstring and fix example +.IP \(bu 2 +4b6351cda6 Check the effective saltenv for cached archive +.UNINDENT +.IP \(bu 2 +0d74151c71 Merge pull request \fI\%#45935\fP from rallytime/bp\-45742 +.INDENT 2.0 +.IP \(bu 2 +6a0b5f7af3 Removed the chained copy +.IP \(bu 2 +ad1150fad4 list.copy() is not compatible with python 2.7 +.UNINDENT +.UNINDENT +.IP \(bu 2 +d20ff89414 Merge pull request \fI\%#45988\fP from rallytime/bp\-45797 +.INDENT 2.0 +.IP \(bu 2 +953a400d79 follow symlinks +.UNINDENT +.IP \(bu 2 +b18087cee0 Merge pull request \fI\%#45711\fP from bdrung/fix\-unicode\-tests +.INDENT 2.0 +.IP \(bu 2 +b6181b5ed6 Fix Unicode tests when run with LC_ALL=POSIX +.UNINDENT +.IP \(bu 2 +5271fb1d40 Merge pull request \fI\%#45878\fP from damon\-atkins/2017.7_fix_ec2_pillar +.INDENT 2.0 +.IP \(bu 2 +0e74025714 Merge branch \(aq2017.7\(aq into 2017.7_fix_ec2_pillar +.IP \(bu 2 +b4d0b23891 py3 fix +.IP \(bu 2 +75d9e20d8a Add ignoring \(aqterminated\(aq, \(aqstopped\(aq instances, to improve changes of a single match +.IP \(bu 2 +0093472a37 added tag_key_list and tag_key_sep to create ec2_tags_list +.IP \(bu 2 +afb3968aa7 ec2_pillar could not find instance\-id, resolved. add support to use any tag to compare minion id against. +.UNINDENT +.IP \(bu 2 +cf367dbd04 Merge pull request \fI\%#45942\fP from terminalmage/issue45679\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +89cbd72a0d Don\(aqt try to sort ports when translating docker input +.IP \(bu 2 +9cd47b39dd Fix incorrect translation of docker port_bindings \-> ports +.UNINDENT +.IP \(bu 2 +dae41de7a8 Merge pull request \fI\%#45959\fP from rallytime/state\-doc\-update +.INDENT 2.0 +.IP \(bu 2 +6f781cb95d A couple of grammar updates for the state compiler docs +.UNINDENT +.IP \(bu 2 +007214f7bf Merge pull request \fI\%#45908\fP from DimensionDataResearch/fix/issue/45884 +.INDENT 2.0 +.IP \(bu 2 +1a75786b5a Fix linter warnings. +.IP \(bu 2 +82ec0b589c Revert to using salt.utils.cloud.is_public_ip. +.IP \(bu 2 +9b6b01873b Fix violations reported by flake8. +.IP \(bu 2 +a2bc155c73 Use __utils__[\(aqcloud.\(aq] instead of salt.cloud.utils. +.IP \(bu 2 +98907a32cb Ensure \(aqauth\(aq parameter is correctly passed to dimensiondata driver. +.IP \(bu 2 +de26b03e2c Fix copy/paste bug in dimensiondata provider integration test. +.IP \(bu 2 +6b1b6be427 Add integration tests for dimensiondata cloud provider. +.IP \(bu 2 +f6ea9fed7d Ensure that event data provided by the dimensiondata driver is serialisable. +.UNINDENT +.IP \(bu 2 +efcbfa868c Merge pull request \fI\%#45985\fP from garethgreenaway/2017_7_fixing_mac_tests_again +.INDENT 2.0 +.IP \(bu 2 +7b8dc14433 Missing \fIformat\fP in the call to write. +.UNINDENT +.IP \(bu 2 +bf03abd07c Merge pull request \fI\%#45958\fP from garethgreenaway/backport\-fixing_mactests_queue_full +.INDENT 2.0 +.IP \(bu 2 +25dffaae91 Backporting \fI\%#45935\fP +.UNINDENT +.IP \(bu 2 +bab365d6c6 Merge pull request \fI\%#45949\fP from rallytime/merge\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +f51687e903 Merge branch \(aq2016.11\(aq into \(aq2017.7\(aq +.IP \(bu 2 +7779fea7ba Merge pull request \fI\%#45940\fP from dmurphy18/fix_aix_cmdmod +.INDENT 2.0 +.IP \(bu 2 +dd2788419b Fix use of \(aqsu\(aq for AIX to use \(aq\-\(aq +.UNINDENT +.UNINDENT +.IP \(bu 2 +7fd00ec752 Merge pull request \fI\%#45928\fP from garethgreenaway/45915_fixing_vault_pillar_for_salt_ssh +.INDENT 2.0 +.IP \(bu 2 +259e60e5d4 Fixing vault when used with pillar over salt\-ssh +.UNINDENT +.IP \(bu 2 +9d14ad9ccf Merge pull request \fI\%#45925\fP from terminalmage/fix\-spelling +.INDENT 2.0 +.IP \(bu 2 +7a143fe454 Fix spelling error in docstring +.UNINDENT +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#45972\fP: (\fI\%mcalmer\fP) move log_file option to changeable defaults +@ \fI2018\-02\-15 18:57:24 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +057e895faf Merge pull request \fI\%#45972\fP from mcalmer/allow\-salt\-ssh\-define\-log_file +.IP \(bu 2 +f89a20bf3e move log_file option to changeable defaults +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#46007\fP: (\fI\%rallytime\fP) [oxygen] Merge forward from oxygen.rc1 to oxygen +@ \fI2018\-02\-13 18:50:09 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +d4377d4678 Merge pull request \fI\%#46007\fP from rallytime/merge\-oxygen +.IP \(bu 2 +d6c2d0693a Merge branch \(aqoxygen.rc1\(aq into \(aqoxygen\(aq +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#45944\fP: (\fI\%mirceaulinic\fP) Add NetBox module autodoc +@ \fI2018\-02\-13 00:01:48 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +069f790b3c Merge pull request \fI\%#45944\fP from cloudflare/netbox\-autodoc +.IP \(bu 2 +ed69b987cf Add NetBox module autodoc +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#45984\fP: (\fI\%garethgreenaway\fP) [oxygen] Missing \fIformat\fP in the call to write. +@ \fI2018\-02\-12 19:06:04 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +2a6285d313 Merge pull request \fI\%#45984\fP from garethgreenaway/fixing_mac_tests_again +.IP \(bu 2 +ae7791d30b Missing \fIformat\fP in the call to write. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#45922\fP: (\fI\%rallytime\fP) [oxygen] Merge forward from 2017.7 to oxygen +@ \fI2018\-02\-09 20:24:26 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +88f481a3df Merge pull request \fI\%#45922\fP from rallytime/merge\-oxygen +.IP \(bu 2 +9c49c8d47c Remove extra patch +.IP \(bu 2 +b96f4cf8ad Remove duplicate import in cmdmod.py +.IP \(bu 2 +34ecdffa71 Replace old utils paths with new paths +.IP \(bu 2 +d80547e0b8 Merge branch \(aq2017.7\(aq into \(aqoxygen\(aq +.IP \(bu 2 +0cbe93cd69 Merge pull request \fI\%#45920\fP from rallytime/merge\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +e4e4744218 Merge branch \(aq2016.11\(aq into \(aq2017.7\(aq +.IP \(bu 2 +27ff82f996 Merge pull request \fI\%#45864\fP from rallytime/release\-note\-fix +.INDENT 2.0 +.IP \(bu 2 +104a24f244 Remove extraneous ] in release notes for 2016.11.9 +.UNINDENT +.IP \(bu 2 +5fa010de2b Merge pull request \fI\%#45787\fP from rallytime/2016.11.9_docs +.INDENT 2.0 +.IP \(bu 2 +a38d4d44fa [2016.11] Bump latest and previous versions +.UNINDENT +.UNINDENT +.IP \(bu 2 +643a8a5278 Merge pull request \fI\%#45814\fP from gtmanfred/2017.7 +.INDENT 2.0 +.IP \(bu 2 +d8eec9aa97 fix cookies dict size changing in http.query +.UNINDENT +.IP \(bu 2 +3a3f87c16d Merge pull request \fI\%#45877\fP from rallytime/new\-release\-notes +.INDENT 2.0 +.IP \(bu 2 +f937e8ba81 Add release notes file for 2017.7.4 release +.UNINDENT +.IP \(bu 2 +1c3cc00670 Merge pull request \fI\%#45904\fP from rallytime/bp\-41017 +.INDENT 2.0 +.IP \(bu 2 +80c56cdcea Fixed typo in pkg state documentation +.UNINDENT +.IP \(bu 2 +317d35bd15 Merge pull request \fI\%#45907\fP from terminalmage/fix\-grains\-backport +.INDENT 2.0 +.IP \(bu 2 +6cf7e50cc4 Fix backport of grains fix +.UNINDENT +.IP \(bu 2 +dade5f0cab Merge pull request \fI\%#45906\fP from rallytime/bp\-45548 +.INDENT 2.0 +.IP \(bu 2 +1befa7386c Update x509.py +.UNINDENT +.IP \(bu 2 +82c473a1fe Merge pull request \fI\%#45902\fP from terminalmage/issue45893 +.INDENT 2.0 +.IP \(bu 2 +9d200efc26 Add regression test for issue 45893 +.IP \(bu 2 +1468f1d0ff Remove duplicated section in docstring and fix example +.IP \(bu 2 +6cc5cd9b8a Check the effective saltenv for cached archive +.UNINDENT +.IP \(bu 2 +fdedde3cfb Merge pull request \fI\%#45862\fP from rallytime/bp\-45830 +.INDENT 2.0 +.IP \(bu 2 +1024856f9a Wrapping the put_nowait in a try...except and catching the exception when the multiprocessing queue is full. This situation is happening when running the full testing suite on MacOS where the queue limit is 32767 vs on Linux where the queue limit is unlimited. +.UNINDENT +.IP \(bu 2 +43a45b42c3 Merge pull request \fI\%#45779\fP from The\-Loeki/patch\-3 +.INDENT 2.0 +.IP \(bu 2 +8575ae3d52 Merge branch \(aq2017.7\(aq into patch\-3 +.IP \(bu 2 +47cf00d88e SSH shell shim: Don\(aqt use $() for optimal support +.UNINDENT +.IP \(bu 2 +cca997d0da Merge pull request \fI\%#45788\fP from rallytime/2017.7.3_docs +.INDENT 2.0 +.IP \(bu 2 +d5faf6126b [2017.7] Bump latest and previous versions +.UNINDENT +.IP \(bu 2 +746206cebe Merge pull request \fI\%#45842\fP from rallytime/bp\-45827 +.INDENT 2.0 +.IP \(bu 2 +c631598a87 Fix traceback in disks grains when /sys/block not available +.UNINDENT +.IP \(bu 2 +900aadcd67 Merge pull request \fI\%#45721\fP from garethgreenaway/44978_show_duration_when_no_state_run +.INDENT 2.0 +.IP \(bu 2 +359265869f Adding a couple tests to ensure that duration is included in state run results even when states do not run. +.IP \(bu 2 +912347abc3 Include the duration when a state does not run, for example when the \fIonchanges\fP requisite is not met. +.UNINDENT +.IP \(bu 2 +80a2d009b4 Merge pull request \fI\%#45517\fP from kstreee/fix\-mkdir +.INDENT 2.0 +.IP \(bu 2 +24d41f2451 Fixes base dir making logic to ensure not raising the exception when base directory already exists. +.UNINDENT +.IP \(bu 2 +7a4b1b2e77 Merge pull request \fI\%#45835\fP from kstreee/fix\-missing\-return\-statement +.INDENT 2.0 +.IP \(bu 2 +68c7f3dcba Adds a missing return statement. +.UNINDENT +.IP \(bu 2 +0a04f118c2 Merge pull request \fI\%#45840\fP from rallytime/bp\-45603 +.INDENT 2.0 +.IP \(bu 2 +9653363131 Fix for duplicate entries with pkrepo.managed +.UNINDENT +.IP \(bu 2 +bd2178cd5f Merge pull request \fI\%#45716\fP from ciiqr/fix_cmd_script_quoting +.INDENT 2.0 +.IP \(bu 2 +217791079b some code cleanup (lint errors and escape_argument as _cmd_quote) +.IP \(bu 2 +1c29bc5a3d fixed quoting of script path in cmd.script +.UNINDENT +.IP \(bu 2 +272f912c7c Merge pull request \fI\%#45719\fP from bdrung/fix\-python3\-sphinx\-build +.INDENT 2.0 +.IP \(bu 2 +179e8fbe73 doc: Do not mock non\-existing __qualname__ attribute +.IP \(bu 2 +971e59ebe2 Drop enforcing new\-style object for SaltYamlSafeLoader +.UNINDENT +.IP \(bu 2 +fc04336c3b Merge pull request \fI\%#45764\fP from mchugh19/2017.7 +.INDENT 2.0 +.IP \(bu 2 +0a7f1a4d75 English better +.IP \(bu 2 +37e067c7b5 support amazon linux 2 for service module +.UNINDENT +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#45861\fP: (\fI\%rallytime\fP) [oxygen] Merge forward from oxygen.rc1 to oxygen +@ \fI2018\-02\-08 13:39:59 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +048c18ea42 Merge pull request \fI\%#45861\fP from rallytime/merge\-oxygen +.IP \(bu 2 +6d812ac192 Merge branch \(aqoxygen.rc1\(aq into \(aqoxygen\(aq +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#45852\fP: (\fI\%Giandom\fP) fix\-missing\-highstate\-module\-import +@ \fI2018\-02\-05 15:02:39 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +1bd38fb3b7 Merge pull request \fI\%#45852\fP from Giandom/fix\-missing\-highstate\-module\-import +.IP \(bu 2 +dc5a8f9233 fix\-missing\-highstate\-module\-import +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#45829\fP: (\fI\%rallytime\fP) [oxygen] Merge forward from 2017.7 to oxygen +@ \fI2018\-02\-02 20:20:32 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +5f54ce7b5f Merge pull request \fI\%#45829\fP from rallytime/merge\-oxygen +.IP \(bu 2 +34a17819ca Add opts to salt.utils.jid.gen_jid call in minion.py +.IP \(bu 2 +79d071df9c Merge branch \(aq2017.7\(aq into \(aqoxygen\(aq +.IP \(bu 2 +f234bf52f4 Merge pull request \fI\%#45756\fP from roaldnefs/fix\-grafana4\-documentation +.INDENT 2.0 +.IP \(bu 2 +92979c0b57 Fix grafana4 states documentation +.UNINDENT +.IP \(bu 2 +685b683db5 Merge pull request \fI\%#45801\fP from rallytime/merge\-2017.7 +.INDENT 2.0 +.IP \(bu 2 +26e992e011 Merge branch \(aq2016.11\(aq into \(aq2017.7\(aq +.IP \(bu 2 +746386d04c Merge pull request \fI\%#45794\fP from vutny/doc\-file\-state\-examples +.INDENT 2.0 +.IP \(bu 2 +ddfeae6a29 [DOC] Fix code\-block rST directive in file state module +.UNINDENT +.IP \(bu 2 +abc9ece214 Merge pull request \fI\%#45780\fP from vutny/doc\-pkgrepo\-zypper +.IP \(bu 2 +f80c7d8d69 [DOC] Add missing gpgautoimport for pkgrepo.managed +.UNINDENT +.IP \(bu 2 +c7d319f3bc Merge pull request \fI\%#45802\fP from rallytime/merge\-2017.7\-from\-2017.7.3 +.INDENT 2.0 +.IP \(bu 2 +eb48513ba0 Merge branch \(aq2017.7.3\(aq into \(aq2017.7\(aq +.IP \(bu 2 +1439da8d76 Merge pull request \fI\%#45755\fP from terminalmage/issue45743 +.IP \(bu 2 +8af1251c59 salt.crypt: Ensure message is encoded before signing +.UNINDENT +.IP \(bu 2 +96e9232cc2 Merge pull request \fI\%#45761\fP from gtmanfred/2017.7 +.IP \(bu 2 +280767ed57 generate a jid for cache_jobs on the minion +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#45819\fP: (\fI\%Giandom\fP) oxygen\-added\-highstate\-output\-to\-slack\-engine +@ \fI2018\-02\-01 18:38:42 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +3471796c51 Merge pull request \fI\%#45819\fP from Giandom/oxygen\-added\-highstate\-output\-to\-slack\-engine +.IP \(bu 2 +1af8899a9d oxygen\-added\-highstate\-output\-to\-slack\-engine +.UNINDENT +.UNINDENT +.SS Salt 2018.3.2 Release Notes +.sp +Version 2018.3.2 is a bugfix release for 2018.3.0\&. +.sp +The \fB2018.3.2\fP release contains only a small number of fixes, detailed below. +.sp +Mainly, this release fixes Issue \fI\%#48038\fP, which is a critical bug that occurs +in a multi\-syndic setup where the same job is run multiple times on a minion. +.SS Statistics +.INDENT 0.0 +.IP \(bu 2 +Total Merges: \fB3\fP +.IP \(bu 2 +Total Issue References: \fB1\fP +.IP \(bu 2 +Total PR References: \fB6\fP +.IP \(bu 2 +Contributors: \fB3\fP (\fI\%cro\fP, \fI\%garethgreenaway\fP, \fI\%rallytime\fP) +.UNINDENT +.SS Changelog for v2018.3.1..v2018.3.2 +.sp +\fIGenerated at: 2018\-06\-14 13:24:42 UTC\fP +.INDENT 0.0 +.IP \(bu 2 +\fBPR\fP \fI\%#48100\fP: (\fI\%rallytime\fP) Back\-port \fI\%#48014\fP to 2018.3.2 +@ \fI2018\-06\-14 12:54:52 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#48014\fP: (\fI\%cro\fP) Find job pause (refs: \fI\%#48100\fP) +.IP \(bu 2 +36b99ae80a Merge pull request \fI\%#48100\fP from rallytime/bp\-48014 +.IP \(bu 2 +77feccc5c4 Lint: Add blank line +.IP \(bu 2 +159b052962 One more case where returner doesn\(aqt respond +.IP \(bu 2 +91b45b4cc4 Catch two cases when a returner is not able to be contacted\-\-these would throw a stacktrace. +.UNINDENT +.IP \(bu 2 +\fBPR\fP \fI\%#48099\fP: (\fI\%rallytime\fP) Back\-port \fI\%#47915\fP to 2018.3.2 +@ \fI2018\-06\-14 12:54:23 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#47915\fP: (\fI\%garethgreenaway\fP) [2018.3] state runner pause resume kill (refs: \fI\%#48099\fP) +.IP \(bu 2 +40c1bfdec9 Merge pull request \fI\%#48099\fP from rallytime/bp\-47915 +.IP \(bu 2 +3556850058 fixing typo in alias_function call. +.IP \(bu 2 +4b0ff496fa Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back\-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality. +.UNINDENT +.IP \(bu 2 +\fBISSUE\fP \fI\%#48038\fP: (\fI\%austinpapp\fP) jobs are not dedup\(aqing minion side (refs: \fI\%#48075\fP) +.IP \(bu 2 +\fBPR\fP \fI\%#48097\fP: (\fI\%rallytime\fP) Back\-port \fI\%#48075\fP to 2018.3.2 +@ \fI2018\-06\-14 12:52:44 UTC\fP +.INDENT 2.0 +.IP \(bu 2 +\fBPR\fP \fI\%#48075\fP: (\fI\%garethgreenaway\fP) [2017.7] Ensure that the shared list of jids is passed (refs: \fI\%#48097\fP) +.IP \(bu 2 +074a97dcfa Merge pull request \fI\%#48097\fP from rallytime/bp\-48075 +.IP \(bu 2 +e4c719b55f Ensure that the shared list of jids is passed when creating the Minion. Fixes an issue when minions are pointed at multiple syndics. +.UNINDENT +.UNINDENT .SS Salt 2017.7.0 Release Notes \- Codename Nitrogen .SS Python 3 .sp @@ -383177,7 +388514,7 @@ fc306fc8c3 Add missing colon in \fIif\fP statement .IP \(bu 2 822eabcc81 Catch exceptions raised when making changes to jenkins .IP \(bu 2 -91b583b493 Improve and correct execption raising +91b583b493 Improve and correct exception raising .IP \(bu 2 f096917a0e Raise an exception if we fail to cache the config xml .UNINDENT @@ -395584,6 +400921,14 @@ b9761971c2 fix moto version .sp Version 2017.7.6 is an \fBunreleased\fP bugfix release for 2017.7.0\&. This release is still in progress and has not been released yet. +.SS Tornado 5.0 Support for Python 2 Only +.sp +Tornado 5.0 moves to using asyncio for all python3 versions. Because of this +and changes in asyncio between python 3.4 and 3.5 to only be able to use one +ioloop, which requires some rearchitecting, support for tornado 5.0 and python3 +versions of salt has been delayed to a later release. +.sp +For now, to use tornado 5.0, the python 2 version of salt must be used. .SS Option to Return to Previous Pillar Include Behavior .sp Prior to version 2017.7.3, keys from pillar includes @@ -409315,7 +414660,7 @@ fc306fc Add missing colon in \fIif\fP statement .IP \(bu 2 822eabc Catch exceptions raised when making changes to jenkins .IP \(bu 2 -91b583b Improve and correct execption raising +91b583b Improve and correct exception raising .IP \(bu 2 f096917 Raise an exception if we fail to cache the config xml .UNINDENT diff --git a/doc/man/spm.1 b/doc/man/spm.1 index e14cf9ba91..a689a5b0c5 100644 --- a/doc/man/spm.1 +++ b/doc/man/spm.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SPM" "1" "May 09, 2018" "2018.3.1" "Salt" +.TH "SPM" "1" "Jun 14, 2018" "2018.3.2" "Salt" .SH NAME spm \- Salt Package Manager Command . diff --git a/doc/ref/beacons/all/salt.beacons.sensehat.rst b/doc/ref/beacons/all/salt.beacons.sensehat.rst index cc8fcc4fdc..1e9e685db3 100644 --- a/doc/ref/beacons/all/salt.beacons.sensehat.rst +++ b/doc/ref/beacons/all/salt.beacons.sensehat.rst @@ -1,5 +1,5 @@ salt.beacons.sensehat module -======================= +============================ .. automodule:: salt.beacons.sensehat :members: diff --git a/doc/ref/cache/all/index.rst b/doc/ref/cache/all/index.rst index ed30872ebe..8a9689909d 100644 --- a/doc/ref/cache/all/index.rst +++ b/doc/ref/cache/all/index.rst @@ -1,7 +1,7 @@ .. _all-salt.cache: ============= -cache modules +Cache Modules ============= .. currentmodule:: salt.cache @@ -10,6 +10,8 @@ cache modules :toctree: :template: autosummary.rst.tmpl - localfs consul + etcd_cache + localfs + mysql_cache redis_cache diff --git a/doc/ref/cache/all/salt.cache.consul.rst b/doc/ref/cache/all/salt.cache.consul.rst index 516a3b8f62..d28bcc019a 100644 --- a/doc/ref/cache/all/salt.cache.consul.rst +++ b/doc/ref/cache/all/salt.cache.consul.rst @@ -1,5 +1,5 @@ -salt.cache.consul module -======================== +salt.cache.consul +================= .. automodule:: salt.cache.consul :members: diff --git a/doc/ref/cache/all/salt.cache.etcd_cache.rst b/doc/ref/cache/all/salt.cache.etcd_cache.rst index c42dba1ea7..cadbdbe12e 100644 --- a/doc/ref/cache/all/salt.cache.etcd_cache.rst +++ b/doc/ref/cache/all/salt.cache.etcd_cache.rst @@ -1,5 +1,5 @@ -salt.cache.etcd_cache module -============================= +salt.cache.etcd_cache +===================== .. automodule:: salt.cache.etcd_cache :members: diff --git a/doc/ref/cache/all/salt.cache.localfs.rst b/doc/ref/cache/all/salt.cache.localfs.rst index b8867cbe16..bc5ced05a0 100644 --- a/doc/ref/cache/all/salt.cache.localfs.rst +++ b/doc/ref/cache/all/salt.cache.localfs.rst @@ -1,5 +1,5 @@ -salt.cache.localfs module -========================= +salt.cache.localfs +================== .. automodule:: salt.cache.localfs :members: diff --git a/doc/ref/cache/all/salt.cache.mysql_cache.rst b/doc/ref/cache/all/salt.cache.mysql_cache.rst index 83fafbee9f..7ec11a98c0 100644 --- a/doc/ref/cache/all/salt.cache.mysql_cache.rst +++ b/doc/ref/cache/all/salt.cache.mysql_cache.rst @@ -1,5 +1,5 @@ -salt.cache.mysql_cache module -============================= +salt.cache.mysql_cache +====================== .. automodule:: salt.cache.mysql_cache :members: diff --git a/doc/ref/cache/all/salt.cache.redis_cache.rst b/doc/ref/cache/all/salt.cache.redis_cache.rst index 8079332340..a40e8bee05 100644 --- a/doc/ref/cache/all/salt.cache.redis_cache.rst +++ b/doc/ref/cache/all/salt.cache.redis_cache.rst @@ -1,5 +1,5 @@ -salt.cache.redis_cache module -============================= +salt.cache.redis_cache +====================== .. automodule:: salt.cache.redis_cache :members: diff --git a/doc/ref/cli/index.rst b/doc/ref/cli/index.rst index 5074483353..fccf51d1db 100644 --- a/doc/ref/cli/index.rst +++ b/doc/ref/cli/index.rst @@ -74,6 +74,12 @@ salt-syndic salt-syndic +salt-unity +========== +.. toctree:: + + salt-unity + salt-api ======== .. toctree:: diff --git a/doc/ref/cli/salt-ssh.rst b/doc/ref/cli/salt-ssh.rst index 1ecbaaad76..37f28ff037 100644 --- a/doc/ref/cli/salt-ssh.rst +++ b/doc/ref/cli/salt-ssh.rst @@ -112,6 +112,10 @@ Authentication Options Specify the SSH private key file to be used for authentication. +.. option:: --priv-passwd=SSH_PRIV_PASSWD + + Specify the SSH private key file's passphrase if need be. + .. option:: -i, --ignore-host-keys By default ssh host keys are honored and connections will ask for diff --git a/doc/ref/cli/salt.rst b/doc/ref/cli/salt.rst index 6eaa9e56ff..1cbad32ba6 100644 --- a/doc/ref/cli/salt.rst +++ b/doc/ref/cli/salt.rst @@ -46,14 +46,6 @@ Options Instead of waiting for the job to run on minions only print the job id of the started execution and complete. -.. option:: --state-output=STATE_OUTPUT - - .. versionadded:: 0.17 - - Override the configured ``state_output`` value for minion output. One of - ``full``, ``terse``, ``mixed``, ``changes`` or ``filter``. Default: - ``full``. - .. option:: --subset=SUBSET Execute the routine on a random subset of the targeted minions. The diff --git a/doc/ref/clients/index.rst b/doc/ref/clients/index.rst index f5eb1f342f..3029ffc71d 100644 --- a/doc/ref/clients/index.rst +++ b/doc/ref/clients/index.rst @@ -72,6 +72,7 @@ Each module type has a corresponding loader function. Salt's Client Interfaces ======================== +.. _client-interfaces: .. _local-client: LocalClient diff --git a/doc/ref/clouds/all/index.rst b/doc/ref/clouds/all/index.rst index cdd3985537..3e401eee23 100644 --- a/doc/ref/clouds/all/index.rst +++ b/doc/ref/clouds/all/index.rst @@ -23,6 +23,7 @@ cloud modules lxc msazure nova + oneandone opennebula openstack parallels diff --git a/doc/ref/clouds/all/salt.cloud.clouds.aliyun.rst b/doc/ref/clouds/all/salt.cloud.clouds.aliyun.rst index 6de478fb54..d91c8b1fd8 100644 --- a/doc/ref/clouds/all/salt.cloud.clouds.aliyun.rst +++ b/doc/ref/clouds/all/salt.cloud.clouds.aliyun.rst @@ -1,6 +1,6 @@ -=============================== +======================== salt.cloud.clouds.aliyun -=============================== +======================== .. automodule:: salt.cloud.clouds.aliyun - :members: \ No newline at end of file + :members: diff --git a/doc/ref/clouds/all/salt.cloud.clouds.vultrpy.rst b/doc/ref/clouds/all/salt.cloud.clouds.vultrpy.rst index dba16328dc..69f120e253 100644 --- a/doc/ref/clouds/all/salt.cloud.clouds.vultrpy.rst +++ b/doc/ref/clouds/all/salt.cloud.clouds.vultrpy.rst @@ -1,5 +1,6 @@ -salt.cloud.clouds.vultrpy module -================================ +========================= +salt.cloud.clouds.vultrpy +========================= .. automodule:: salt.cloud.clouds.vultrpy :members: diff --git a/doc/ref/configuration/logging/index.rst b/doc/ref/configuration/logging/index.rst index a266480be4..894fbc7353 100644 --- a/doc/ref/configuration/logging/index.rst +++ b/doc/ref/configuration/logging/index.rst @@ -9,7 +9,7 @@ issues you might find along the way. If you want to get some more information on the nitty-gritty of salt's logging system, please head over to the :ref:`logging development -document`, if all you're after is salt's logging +document `, if all you're after is salt's logging configurations, please continue reading. @@ -25,10 +25,9 @@ example, setting ``log_level: error`` will log statements at ``error``, ``quiet`` level. Most of the logging levels are defined by default in Python's logging library -and can be found in the official `Python documentation -`_. Salt uses some more -levels in addition to the standard levels. All levels available in salt are -shown in the table below. +and can be found in the official :ref:`Python documentation `. +Salt uses some more levels in addition to the standard levels. All levels +available in salt are shown in the table below. .. note:: @@ -74,11 +73,14 @@ The log records can be sent to a regular file, local path name, or network location. Remote logging works best when configured to use rsyslogd(8) (e.g.: ``file:///dev/log``), with rsyslogd(8) configured for network logging. The format for remote addresses is: -``://:/``. Where -``log-facility`` is the symbolic name of a syslog facility as defined in the -:ref:`SysLogHandler documentation -` . It defaults to -``LOG_USER``. + +.. code-block:: text + + ://:/ + +Where ``log-facility`` is the symbolic name of a syslog facility as defined in +the :py:meth:`SysLogHandler documentation +`. It defaults to ``LOG_USER``. Default: Dependent of the binary being executed, for example, for ``salt-master``, ``/var/log/salt/master``. @@ -148,7 +150,7 @@ The level of messages to send to the log file. One of ``all``, ``garbage``, Default: ``%H:%M:%S`` The date and time format used in console log messages. Allowed date/time -formatting can be seen on :func:`time.strftime `. +formatting matches those used in :py:func:`time.strftime`. .. code-block:: yaml @@ -162,7 +164,7 @@ formatting can be seen on :func:`time.strftime `. Default: ``%Y-%m-%d %H:%M:%S`` The date and time format used in log file messages. Allowed date/time -formatting can be seen on :func:`time.strftime `. +formatting matches those used in :py:func:`time.strftime`. .. code-block:: yaml @@ -176,8 +178,8 @@ formatting can be seen on :func:`time.strftime `. Default: ``[%(levelname)-8s] %(message)s`` The format of the console logging messages. All standard python logging -:ref:`LogRecord attributes ` can be used. Salt -also provides these custom LogRecord attributes to colorize console log output: +:py:class:`~logging.LogRecord` attributes can be used. Salt also provides these +custom LogRecord attributes to colorize console log output: .. code-block:: python @@ -204,9 +206,9 @@ also provides these custom LogRecord attributes to colorize console log output: Default: ``%(asctime)s,%(msecs)03d [%(name)-17s][%(levelname)-8s] %(message)s`` The format of the log file logging messages. All standard python logging -:ref:`LogRecord attributes ` can be used. Salt -also provides these custom LogRecord attributes that include padding and -enclosing brackets ``[`` and ``]``: +:py:class:`~logging.LogRecord` attributes can be used. Salt also provides +these custom LogRecord attributes that include padding and enclosing brackets +``[`` and ``]``: .. code-block:: python diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst index 801053e446..ee8b390b1a 100644 --- a/doc/ref/configuration/master.rst +++ b/doc/ref/configuration/master.rst @@ -428,7 +428,7 @@ to False. .. conf_master:: color_theme ``color_theme`` ---------- +--------------- Default: ``""`` @@ -728,31 +728,6 @@ master event bus. The value is expressed in bytes. max_event_size: 1048576 -.. conf_master:: ping_on_rotate - -``ping_on_rotate`` ------------------- - -.. versionadded:: 2014.7.0 - -Default: ``False`` - -By default, the master AES key rotates every 24 hours. The next command -following a key rotation will trigger a key refresh from the minion which may -result in minions which do not respond to the first command after a key refresh. - -To tell the master to ping all minions immediately after an AES key refresh, set -ping_on_rotate to ``True``. This should mitigate the issue where a minion does not -appear to initially respond after a key is rotated. - -Note that ping_on_rotate may cause high load on the master immediately after -the key rotation event as minions reconnect. Consider this carefully if this -salt master is managing a large number of minions. - -.. code-block:: yaml - - ping_on_rotate: False - .. conf_master:: master_job_cache ``master_job_cache`` @@ -828,8 +803,7 @@ Causes the master to periodically look for actively connected minions. :ref:`Presence events ` are fired on the event bus on a regular interval with a list of connected minions, as well as events with lists of newly connected or disconnected minions. This is a master-only operation -that does not send executions to minions. Note, this does not detect minions -that connect to a master via localhost. +that does not send executions to minions. .. code-block:: yaml @@ -840,6 +814,8 @@ that connect to a master via localhost. ``ping_on_rotate`` ------------------ +.. versionadded:: 2014.7.0 + Default: ``False`` By default, the master AES key rotates every 24 hours. The next command @@ -850,9 +826,9 @@ To tell the master to ping all minions immediately after an AES key refresh, set ``ping_on_rotate`` to ``True``. This should mitigate the issue where a minion does not appear to initially respond after a key is rotated. -Note that ping_on_rotate may cause high load on the master immediately after -the key rotation event as minions reconnect. Consider this carefully if this -salt master is managing a large number of minions. +Note that enabling this may cause high load on the master immediately after the +key rotation event as minions reconnect. Consider this carefully if this salt +master is managing a large number of minions. If disabled, it is recommended to handle this event by listening for the ``aes_key_rotate`` event with the ``key`` tag and acting appropriately. @@ -872,8 +848,7 @@ Changes the underlying transport layer. ZeroMQ is the recommended transport while additional transport layers are under development. Supported values are ``zeromq``, ``raet`` (experimental), and ``tcp`` (experimental). This setting has a significant impact on performance and should not be changed unless you know -what you are doing! Transports are explained in :ref:`Salt Transports -`. +what you are doing! .. code-block:: yaml @@ -886,10 +861,10 @@ what you are doing! Transports are explained in :ref:`Salt Transports Default: ``{}`` -(experimental) Starts multiple transports and overrides options for each transport with the provided dictionary -This setting has a significant impact on performance and should not be changed unless you know -what you are doing! Transports are explained in :ref:`Salt Transports -`. The following example shows how to start a TCP transport alongside a ZMQ transport. +(experimental) Starts multiple transports and overrides options for each +transport with the provided dictionary This setting has a significant impact on +performance and should not be changed unless you know what you are doing! The +following example shows how to start a TCP transport alongside a ZMQ transport. .. code-block:: yaml @@ -1031,7 +1006,7 @@ a minion performs an authentication check with the master. .. conf_master:: minion_data_cache_events ``minion_data_cache_events`` --------------------- +---------------------------- .. versionadded:: 2017.7.3 @@ -1096,6 +1071,23 @@ Define the default salt-ssh roster module to use roster: cache +.. conf_master:: roster_defaults + +``roster_defaults`` +------------------- + +.. versionadded:: 2017.7.0 + +Default settings which will be inherited by all rosters. + +.. code-block:: yaml + + roster_defaults: + user: daniel + sudo: True + priv: /root/.ssh/id_rsa + tty: True + .. conf_master:: roster_file ``roster_file`` @@ -1103,24 +1095,27 @@ Define the default salt-ssh roster module to use Default: ``/etc/salt/roster`` -Pass in an alternative location for the salt-ssh `flat` roster file. +Pass in an alternative location for the salt-ssh :py:mod:`flat +` roster file. .. code-block:: yaml roster_file: /root/roster -.. conf_master:: roster_file +.. conf_master:: rosters ``rosters`` ---------------- +----------- -Default: None +Default: ``None`` -Define locations for `flat` roster files so they can be chosen when using Salt API. -An administrator can place roster files into these locations. -Then when calling Salt API, parameter 'roster_file' should contain a relative path to these locations. -That is, "roster_file=/foo/roster" will be resolved as "/etc/salt/roster.d/foo/roster" etc. -This feature prevents passing insecure custom rosters through the Salt API. +Define locations for :py:mod:`flat ` roster files so they can +be chosen when using Salt API. An administrator can place roster files into +these locations. Then, when calling Salt API, the :conf_master:`roster_file` +parameter should contain a relative path to these locations. That is, +``roster_file=/foo/roster`` will be resolved as +``/etc/salt/roster.d/foo/roster`` etc. This feature prevents passing insecure +custom rosters through the Salt API. .. code-block:: yaml @@ -1141,6 +1136,19 @@ The ssh password to log in with. ssh_passwd: '' +.. conf_master:: ssh_priv_passwd + +``ssh_priv_passwd`` +------------------- + +Default: ``''`` + +Passphrase for ssh private key file. + +.. code-block:: yaml + + ssh_priv_passwd: '' + .. conf_master:: ssh_port ``ssh_port`` @@ -1740,10 +1748,10 @@ constant names without ssl module prefix: ``CERT_REQUIRED`` or ``PROTOCOL_SSLv23 certfile: ssl_version: PROTOCOL_TLSv1_2 -.. conf_master:: allow_minion_key_revoke +.. conf_master:: preserve_minion_cache -``allow_minion_key_revoke`` ---------------------------- +``preserve_minion_cache`` +------------------------- Default: ``False`` @@ -1772,7 +1780,7 @@ the master will drop the request and the minion's key will remain accepted. .. code-block:: yaml - rotate_aes_key: True + allow_minion_key_revoke: False Master Large Scale Tuning Settings @@ -2197,6 +2205,7 @@ Example using line statements and line comments to increase ease of use: If your configuration options are .. code-block:: yaml + jinja_sls_env: line_statement_prefix: '%' line_comment_prefix: '##' @@ -2206,7 +2215,7 @@ as a jinja statement and will interpret anything after a ``##`` as a comment. This allows the following more convenient syntax to be used: -.. code-block:: yaml +.. code-block:: jinja ## (this comment will not stay once rendered) # (this comment remains in the rendered template) @@ -2220,7 +2229,7 @@ This allows the following more convenient syntax to be used: The following less convenient but equivalent syntax would have to be used if you had not set the line_statement and line_comment options: -.. code-block:: yaml +.. code-block:: jinja {# (this comment will not stay once rendered) #} # (this comment remains in the rendered template) @@ -4354,7 +4363,7 @@ Default: ``['+refs/heads/*:refs/remotes/origin/*', '+refs/tags/*:refs/tags/*']`` When fetching from remote repositories, by default Salt will fetch branches and tags. This parameter can be used to override the default and specify alternate refspecs to be fetched. This parameter works similarly to its -:ref:`GitFS counterpart `, in that it can be +:ref:`GitFS counterpart `, in that it can be configured both globally and for individual remotes. .. code-block:: yaml @@ -4402,12 +4411,14 @@ The pillar_source_merging_strategy option allows you to configure merging strategy between different sources. It accepts 5 values: * ``none``: -.. versionadded:: 2016.3.4 + It will not do any merging at all and only parse the pillar data from the passed environment and 'base' if no environment was specified. + .. versionadded:: 2016.3.4 + * ``recurse``: - it will merge recursively mapping of data. For example, theses 2 sources: + It will recursively merge data. For example, theses 2 sources: .. code-block:: yaml @@ -5509,7 +5520,7 @@ Default: ``['+refs/heads/*:refs/remotes/origin/*', '+refs/tags/*:refs/tags/*']`` When fetching from remote repositories, by default Salt will fetch branches and tags. This parameter can be used to override the default and specify alternate refspecs to be fetched. This parameter works similarly to its -:ref:`GitFS counterpart `, in that it can be +:ref:`GitFS counterpart `, in that it can be configured both globally and for individual remotes. .. code-block:: yaml diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst index 4aa9ef7cbf..7384633d00 100644 --- a/doc/ref/configuration/minion.rst +++ b/doc/ref/configuration/minion.rst @@ -346,7 +346,7 @@ option on the Salt master. .. conf_minion:: publish_port ``publish_port`` ---------------- +---------------- Default: ``4505`` @@ -583,7 +583,7 @@ ids. Default: ``True`` -Caches the minion id to a file when the minion's :minion_conf:`id` is not +Caches the minion id to a file when the minion's :conf_minion:`id` is not statically defined in the minion config. This setting prevents potential problems when automatic minion id resolution changes, which can cause the minion to lose connection with the master. To turn off minion id caching, @@ -645,7 +645,7 @@ This directory may contain sensitive data and should be protected accordingly. .. conf_master:: color_theme ``color_theme`` ---------- +--------------- Default: ``""`` @@ -1029,7 +1029,7 @@ is appropriate if you expect occasional downtime from the master(s). master_tries: 1 -.. conf_minion:: acceptance_wait_time_max +.. conf_minion:: auth_tries ``auth_tries`` -------------- @@ -1297,8 +1297,7 @@ Changes the underlying transport layer. ZeroMQ is the recommended transport while additional transport layers are under development. Supported values are ``zeromq``, ``raet`` (experimental), and ``tcp`` (experimental). This setting has a significant impact on performance and should not be changed unless you know -what you are doing! Transports are explained in :ref:`Salt Transports -`. +what you are doing! .. code-block:: yaml @@ -1404,6 +1403,58 @@ The password used for HTTP proxy access. proxy_password: obolus +.. conf_minion:: no_proxy + +``no_proxy`` +------------ + +.. versionadded:: Fluorine + +Default: ``[]`` + +List of hosts to bypass HTTP proxy + +.. note:: + This key does nothing unless proxy_host etc is configured, it does not + support any kind of wildcards. + +.. code-block:: yaml + + no_proxy: [ '127.0.0.1', 'foo.tld' ] + +Docker Configuration +==================== + +.. conf_minion:: docker.update_mine + +``docker.update_mine`` +---------------------- + +.. versionadded:: 2017.7.8,2018.3.3 +.. versionchanged:: Fluorine + The default value is now ``False`` + +Default: ``True`` + +If enabled, when containers are added, removed, stopped, started, etc., the +:ref:`mine ` will be updated with the results of :py:func:`docker.ps +verbose=True all=True host=True `. This mine data is +used by :py:func:`mine.get_docker `. Set this +option to ``False`` to keep Salt from updating the mine with this information. + +.. note:: + This option can also be set in Grains or Pillar data, with Grains + overriding Pillar and the minion config file overriding Grains. + +.. note:: + Disabling this will of course keep :py:func:`mine.get_docker + ` from returning any information for a given + minion. + +.. code-block:: yaml + + docker.update_mine: False + .. conf_minion:: docker.compare_container_networks ``docker.compare_container_networks`` @@ -1438,6 +1489,7 @@ Specifies which keys are examined by - GlobalIPv6Address - IPv6Gateway + Minion Execution Module Management ================================== @@ -1647,7 +1699,7 @@ below. Default: ``-1`` Specify a max size (in bytes) for modules on import. This feature is currently -only supported on *nix operating systems and requires psutil. +only supported on \*NIX operating systems and requires psutil. .. code-block:: yaml @@ -2714,7 +2766,7 @@ Thread Settings .. conf_minion:: multiprocessing ``multiprocessing`` -------- +------------------- Default: ``True`` @@ -2731,7 +2783,7 @@ executed in a thread. .. conf_minion:: process_count_max ``process_count_max`` -------- +--------------------- .. versionadded:: 2018.3.0 diff --git a/doc/ref/engines/all/salt.engines.napalm_syslog.rst b/doc/ref/engines/all/salt.engines.napalm_syslog.rst index db09f3ab71..5ba2f6e2d5 100644 --- a/doc/ref/engines/all/salt.engines.napalm_syslog.rst +++ b/doc/ref/engines/all/salt.engines.napalm_syslog.rst @@ -1,6 +1,6 @@ -=========================== +========================== salt.engines.napalm_syslog -=========================== +========================== .. automodule:: salt.engines.napalm_syslog :members: diff --git a/doc/ref/executors/all/index.rst b/doc/ref/executors/all/index.rst index fd846f3714..1f26a86fc3 100644 --- a/doc/ref/executors/all/index.rst +++ b/doc/ref/executors/all/index.rst @@ -11,5 +11,6 @@ executors modules :template: autosummary.rst.tmpl direct_call + docker splay sudo diff --git a/doc/ref/executors/all/salt.executors.docker.rst b/doc/ref/executors/all/salt.executors.docker.rst new file mode 100644 index 0000000000..9f2b3cb246 --- /dev/null +++ b/doc/ref/executors/all/salt.executors.docker.rst @@ -0,0 +1,6 @@ +salt.executors.docker module +============================ + +.. automodule:: salt.executors.docker + :members: + diff --git a/doc/ref/executors/index.rst b/doc/ref/executors/index.rst index f7a0e33a84..5a529c3977 100644 --- a/doc/ref/executors/index.rst +++ b/doc/ref/executors/index.rst @@ -83,3 +83,7 @@ option set by commandline or API ``data.get('executor_opts', {}).get('splaytime')`` should be used. So if an option is safe and must be accessible by user executor should check it in both places, but if an option is unsafe it should be read from the only config ignoring the passed request data. + +There is also a function named ``all_missing_func`` which the name of the +``func`` is passed, which can be used to verify if the command should still be +run, even if it is not loaded in minion_mods. diff --git a/doc/ref/grains/all/salt.grains.metadata.rst b/doc/ref/grains/all/salt.grains.metadata.rst index cb20af0429..91ac8bf64a 100644 --- a/doc/ref/grains/all/salt.grains.metadata.rst +++ b/doc/ref/grains/all/salt.grains.metadata.rst @@ -1,6 +1,6 @@ -================= +==================== salt.grains.metadata -================= +==================== .. automodule:: salt.grains.metadata :members: diff --git a/doc/ref/internals/unicode.rst b/doc/ref/internals/unicode.rst index 0782db7c78..2f5b31a3ed 100644 --- a/doc/ref/internals/unicode.rst +++ b/doc/ref/internals/unicode.rst @@ -1,4 +1,4 @@ -.. __unicode: +.. _unicode: =============== Unicode in Salt @@ -12,19 +12,29 @@ several basic rules to help developers handle Unicode correctly. Salt's basic workflow for Unicode handling is as follows: -1) Salt should convert whatever data is passed on CLI/API to Unicode. Internally, -everything that Salt does should be Unicode unless it is printing to the screen -or writing to storage. +1) Salt should convert whatever data is passed on CLI/API to Unicode. + Internally, everything that Salt does should be Unicode unless it is + printing to the screen or writing to storage. 2) Modules and various Salt pluggable systems use incoming data assuming Unicode. - 2.1) For Salt modules that query an API; the module should convert the data received from the API into Unicode. + 2.1) For Salt modules that query an API; the module should convert the data + received from the API into Unicode. - 2.2) For Salt modules that shell out to get output; the module should convert data received into Unicode. (This does not apply if using the `cmd` execution module, which should handle this for you. + 2.2) For Salt modules that shell out to get output; the module should + convert data received into Unicode. (This does not apply if using the + :mod:`cmd ` execution module, which should handle + this for you. - 2.3) For Salt modules which print directly to the console (not via an outputter) or which write directly to disk, a string should be encoded when appropriate. To handle this conversion, the global variable `__salt_system_encoding__` is available, which declares the locale of the system that Salt is running on. + 2.3) For Salt modules which print directly to the console (not via an + outputter) or which write directly to disk, a string should be encoded + when appropriate. To handle this conversion, the global variable + ``__salt_system_encoding__`` is available, which declares the locale of + the system that Salt is running on. -3) When a function in a Salt module returns, it should return Unicode. +3) When a function in a Salt module returns a string, it should return a + ``unicode`` type in Python 2. -4) When Salt delivers the data to an outputter or a returner, it is the job of the outputter -or returner to encode the Unicode before displaying it on the console or writing it to storage. +4) When Salt delivers the data to an outputter or a returner, it is the job of + the outputter or returner to encode the Unicode before displaying it on the + console or writing it to storage. diff --git a/doc/ref/modules/all/index.rst b/doc/ref/modules/all/index.rst index 8daa249dfa..d4616acf4c 100644 --- a/doc/ref/modules/all/index.rst +++ b/doc/ref/modules/all/index.rst @@ -11,6 +11,8 @@ execution modules salt.modules.group salt.modules.kernelpkg salt.modules.pkg + salt.modules.service + salt.modules.shadow salt.modules.user .. currentmodule:: salt.modules @@ -96,7 +98,6 @@ execution modules cron csf cyg - cytest daemontools data datadog_api @@ -282,6 +283,7 @@ execution modules netbox netbsd_sysctl netbsdservice + netmiko_mod netscaler network neutron @@ -371,6 +373,7 @@ execution modules s3 s6 salt_proxy + saltcheck saltcloudmod saltutil schedule @@ -425,6 +428,7 @@ execution modules system system_profiler systemd + template telegram telemetry temp @@ -485,7 +489,6 @@ execution modules win_system win_task win_timezone - win_update win_useradd win_wua x509 @@ -502,5 +505,6 @@ execution modules znc zoneadm zonecfg + zookeeper zpool zypper diff --git a/doc/ref/modules/all/salt.modules.cytest.rst b/doc/ref/modules/all/salt.modules.cytest.rst deleted file mode 100644 index cf808dafb6..0000000000 --- a/doc/ref/modules/all/salt.modules.cytest.rst +++ /dev/null @@ -1,5 +0,0 @@ -salt.modules.cytest module -========================== - -.. automodule:: salt.modules.cytest - :members: diff --git a/doc/ref/modules/all/salt.modules.libcloud_storage.rst b/doc/ref/modules/all/salt.modules.libcloud_storage.rst index 26aad95d9a..19569af41e 100644 --- a/doc/ref/modules/all/salt.modules.libcloud_storage.rst +++ b/doc/ref/modules/all/salt.modules.libcloud_storage.rst @@ -1,5 +1,5 @@ -salt.modules.libcloud_storage module -================================ +salt.modules.libcloud_storage +============================= .. automodule:: salt.modules.libcloud_storage :members: diff --git a/doc/ref/modules/all/salt.modules.napalm_network.rst b/doc/ref/modules/all/salt.modules.napalm_network.rst index 3a8535a621..388544d340 100644 --- a/doc/ref/modules/all/salt.modules.napalm_network.rst +++ b/doc/ref/modules/all/salt.modules.napalm_network.rst @@ -1,5 +1,5 @@ salt.modules.napalm_network module -=============================== +================================== .. automodule:: salt.modules.napalm_network :members: diff --git a/doc/ref/modules/all/salt.modules.netmiko_mod.rst b/doc/ref/modules/all/salt.modules.netmiko_mod.rst new file mode 100644 index 0000000000..dd308b1b26 --- /dev/null +++ b/doc/ref/modules/all/salt.modules.netmiko_mod.rst @@ -0,0 +1,7 @@ +======================== +salt.modules.netmiko_mod +======================== + +.. automodule:: salt.modules.netmiko_mod + :members: + diff --git a/doc/ref/modules/all/salt.modules.opsgenie.rst b/doc/ref/modules/all/salt.modules.opsgenie.rst index e16999297e..ba68e4c046 100644 --- a/doc/ref/modules/all/salt.modules.opsgenie.rst +++ b/doc/ref/modules/all/salt.modules.opsgenie.rst @@ -1,6 +1,6 @@ -=================== +===================== salt.modules.opsgenie -=================== +===================== .. automodule:: salt.modules.opsgenie :members: diff --git a/doc/ref/modules/all/salt.modules.panos.rst b/doc/ref/modules/all/salt.modules.panos.rst index b21cf84768..8716d60d4a 100644 --- a/doc/ref/modules/all/salt.modules.panos.rst +++ b/doc/ref/modules/all/salt.modules.panos.rst @@ -1,6 +1,6 @@ -=================== +================== salt.modules.panos -=================== +================== .. automodule:: salt.modules.panos - :members: \ No newline at end of file + :members: diff --git a/doc/ref/modules/all/salt.modules.pkg.rst b/doc/ref/modules/all/salt.modules.pkg.rst index 9488336e60..04012b6d02 100644 --- a/doc/ref/modules/all/salt.modules.pkg.rst +++ b/doc/ref/modules/all/salt.modules.pkg.rst @@ -30,7 +30,7 @@ Execution Module Used for :py:mod:`~salt.modules.solarispkg` Solaris-based OSes using ``pkgadd(1M)`` :py:mod:`~salt.modules.solarisips` Solaris-based OSes using IPS ``pkg(1)`` :py:mod:`~salt.modules.win_pkg` Salt's :ref:`Windows Package Manager - ` :py:mod:`~salt.modules.yumpkg` RedHat-based distros and derivatives using ``yum(8)`` or ``dnf(8)`` :py:mod:`~salt.modules.zypper` SUSE-based distros using ``zypper(8)`` diff --git a/doc/ref/modules/all/salt.modules.saltcheck.rst b/doc/ref/modules/all/salt.modules.saltcheck.rst new file mode 100644 index 0000000000..cf4e68afe6 --- /dev/null +++ b/doc/ref/modules/all/salt.modules.saltcheck.rst @@ -0,0 +1,6 @@ +====================== +salt.modules.saltcheck +====================== + +.. automodule:: salt.modules.saltcheck + :members: diff --git a/doc/ref/modules/all/salt.modules.service.rst b/doc/ref/modules/all/salt.modules.service.rst index ce251c6858..6ff3e46c2a 100644 --- a/doc/ref/modules/all/salt.modules.service.rst +++ b/doc/ref/modules/all/salt.modules.service.rst @@ -33,7 +33,3 @@ Execution Module Used for :py:mod:`~salt.modules.win_service` Windows ====================================== ======================================== -| - -.. automodule:: salt.modules.service - :members: diff --git a/doc/ref/modules/all/salt.modules.shadow.rst b/doc/ref/modules/all/salt.modules.shadow.rst index 6036f6fc21..3b03032d28 100644 --- a/doc/ref/modules/all/salt.modules.shadow.rst +++ b/doc/ref/modules/all/salt.modules.shadow.rst @@ -18,9 +18,3 @@ Execution Module Used for :py:mod:`~salt.modules.solaris_shadow` Solaris-based OSes :py:mod:`~salt.modules.win_shadow` Windows ====================================== ======================================== - -| - -.. automodule:: salt.modules.shadow - :members: - diff --git a/doc/ref/modules/all/salt.modules.template.rst b/doc/ref/modules/all/salt.modules.template.rst new file mode 100644 index 0000000000..de69426902 --- /dev/null +++ b/doc/ref/modules/all/salt.modules.template.rst @@ -0,0 +1,6 @@ +===================== +salt.modules.template +===================== + +.. automodule:: salt.modules.template + :members: diff --git a/doc/ref/modules/all/salt.modules.win_update.rst b/doc/ref/modules/all/salt.modules.win_update.rst deleted file mode 100644 index ae9efbdcdd..0000000000 --- a/doc/ref/modules/all/salt.modules.win_update.rst +++ /dev/null @@ -1,6 +0,0 @@ -======================= -salt.modules.win_update -======================= - -.. automodule:: salt.modules.win_update - :members: \ No newline at end of file diff --git a/doc/ref/modules/index.rst b/doc/ref/modules/index.rst index 2b292a5f2f..ba945c23a3 100644 --- a/doc/ref/modules/index.rst +++ b/doc/ref/modules/index.rst @@ -137,7 +137,7 @@ call functions available in other execution modules. The variable ``__salt__`` is packed into the modules after they are loaded into the Salt minion. -The ``__salt__`` variable is a :ref:`Python dictionary ` +The ``__salt__`` variable is a :ref:`Python dictionary ` containing all of the Salt functions. Dictionary keys are strings representing the names of the modules and the values are the functions themselves. @@ -157,6 +157,7 @@ Calling Execution Modules on the Salt Master ============================================ .. versionadded:: 2016.11.0 + Execution modules can now also be called via the :command:`salt-run` command using the :ref:`salt runner `. @@ -175,8 +176,8 @@ Grains Data ----------- The values detected by the Salt Grains on the minion are available in a -:ref:`dict ` named ``__grains__`` and can be accessed -from within callable objects in the Python modules. +:ref:`Python dictionary ` named ``__grains__`` and can be +accessed from within callable objects in the Python modules. To see the contents of the grains dictionary for a given system in your deployment run the :func:`grains.items` function: @@ -287,7 +288,7 @@ Virtual module names are set using the ``__virtual__`` function and the ``__virtual__`` Function ======================== -The ``__virtual__`` function returns either a :ref:`string `, +The ``__virtual__`` function returns either a :ref:`string `, :py:data:`True`, :py:data:`False`, or :py:data:`False` with an :ref:`error string `. If a string is returned then the module is loaded using the name of the string as the virtual name. If ``True`` is returned the @@ -509,7 +510,7 @@ To add documentation add a `Python docstring`_ to the function. Now when the sys.doc call is executed the docstring will be cleanly returned to the calling terminal. -.. _`Python docstring`: http://docs.python.org/2/glossary.html#term-docstring +.. _`Python docstring`: https://docs.python.org/3/glossary.html#term-docstring Documentation added to execution modules in docstrings will automatically be added to the online web-based documentation. diff --git a/doc/ref/proxy/all/index.rst b/doc/ref/proxy/all/index.rst index d986cd5b67..651ac05154 100644 --- a/doc/ref/proxy/all/index.rst +++ b/doc/ref/proxy/all/index.rst @@ -20,6 +20,7 @@ proxy modules junos marathon napalm + netmiko_px nxos panos philips_hue diff --git a/doc/ref/proxy/all/salt.proxy.napalm.rst b/doc/ref/proxy/all/salt.proxy.napalm.rst index 33e5a8b7d0..729ebfcf61 100644 --- a/doc/ref/proxy/all/salt.proxy.napalm.rst +++ b/doc/ref/proxy/all/salt.proxy.napalm.rst @@ -1,6 +1,6 @@ -================ +================= salt.proxy.napalm -================ +================= .. automodule:: salt.proxy.napalm :members: diff --git a/doc/ref/proxy/all/salt.proxy.netmiko_px.rst b/doc/ref/proxy/all/salt.proxy.netmiko_px.rst new file mode 100644 index 0000000000..b28d18cd54 --- /dev/null +++ b/doc/ref/proxy/all/salt.proxy.netmiko_px.rst @@ -0,0 +1,6 @@ +===================== +salt.proxy.netmiko_px +===================== + +.. automodule:: salt.proxy.netmiko_px + :members: diff --git a/doc/ref/renderers/index.rst b/doc/ref/renderers/index.rst index e075d1d449..0817454346 100644 --- a/doc/ref/renderers/index.rst +++ b/doc/ref/renderers/index.rst @@ -127,7 +127,7 @@ Other render pipeline combinations include: The following is a contrived example SLS file using the ``jinja|mako|yaml`` render pipeline: -.. code-block:: python +.. code-block:: text #!jinja|mako|yaml diff --git a/doc/ref/returners/index.rst b/doc/ref/returners/index.rst index e5f713edc1..f2790bfe88 100644 --- a/doc/ref/returners/index.rst +++ b/doc/ref/returners/index.rst @@ -80,9 +80,9 @@ Other optional functions can be included to add support for ''' # Get a redis connection serv = redis.Redis( - host='redis-serv.example.com', - port=6379, - db='0') + host='redis-serv.example.com', + port=6379, + db='0') serv.sadd("%(id)s:jobs" % ret, ret['jid']) serv.set("%(jid)s:%(id)s" % ret, salt.utils.json.dumps(ret['return'])) serv.sadd('jobs', ret['jid']) diff --git a/doc/ref/sdb/all/index.rst b/doc/ref/sdb/all/index.rst index 1995bab77e..3e34d4e4c6 100644 --- a/doc/ref/sdb/all/index.rst +++ b/doc/ref/sdb/all/index.rst @@ -18,6 +18,7 @@ sdb modules etcd_db keyring_db memcached + redis_sdb rest sqlite3 tism diff --git a/doc/ref/sdb/all/salt.sdb.redis_sdb.rst b/doc/ref/sdb/all/salt.sdb.redis_sdb.rst new file mode 100644 index 0000000000..c537339d46 --- /dev/null +++ b/doc/ref/sdb/all/salt.sdb.redis_sdb.rst @@ -0,0 +1,5 @@ +salt.sdb.redis_sdb module +========================= + +.. automodule:: salt.sdb.redis_sdb + :members: diff --git a/doc/ref/states/all/index.rst b/doc/ref/states/all/index.rst index aa88fbba1c..d26b051d54 100644 --- a/doc/ref/states/all/index.rst +++ b/doc/ref/states/all/index.rst @@ -75,7 +75,6 @@ state modules debconfmod dellchassis disk - docker docker_container docker_image docker_network @@ -136,7 +135,6 @@ state modules jboss7 jenkins junos - k8s kapacitor kernelpkg keyboard @@ -308,7 +306,6 @@ state modules win_smtp_server win_snmp win_system - win_update win_wua winrepo x509 @@ -326,4 +323,5 @@ state modules zk_concurrency zfs zone + zookeeper zpool diff --git a/doc/ref/states/all/salt.states.docker.rst b/doc/ref/states/all/salt.states.docker.rst deleted file mode 100644 index fdcf03d73f..0000000000 --- a/doc/ref/states/all/salt.states.docker.rst +++ /dev/null @@ -1,6 +0,0 @@ -================== -salt.states.docker -================== - -.. automodule:: salt.states.docker - :members: diff --git a/doc/ref/states/all/salt.states.infoblox_a.rst b/doc/ref/states/all/salt.states.infoblox_a.rst index b3f53941ae..c16bc26bd2 100644 --- a/doc/ref/states/all/salt.states.infoblox_a.rst +++ b/doc/ref/states/all/salt.states.infoblox_a.rst @@ -1,5 +1,5 @@ -salt.states.infoblox_a module -=========================== +salt.states.infoblox_a +====================== .. automodule:: salt.states.infoblox_a :members: diff --git a/doc/ref/states/all/salt.states.infoblox_cname.rst b/doc/ref/states/all/salt.states.infoblox_cname.rst index c2fbbed0c4..f6757f4cd1 100644 --- a/doc/ref/states/all/salt.states.infoblox_cname.rst +++ b/doc/ref/states/all/salt.states.infoblox_cname.rst @@ -1,5 +1,5 @@ -salt.states.infoblox_cname module -=========================== +salt.states.infoblox_cname +========================== .. automodule:: salt.states.infoblox_cname :members: diff --git a/doc/ref/states/all/salt.states.infoblox_host_record.rst b/doc/ref/states/all/salt.states.infoblox_host_record.rst index b8a550b261..92e00d19af 100644 --- a/doc/ref/states/all/salt.states.infoblox_host_record.rst +++ b/doc/ref/states/all/salt.states.infoblox_host_record.rst @@ -1,5 +1,5 @@ -salt.states.infoblox_host_record module -=========================== +salt.states.infoblox_host_record +================================ .. automodule:: salt.states.infoblox_host_record :members: diff --git a/doc/ref/states/all/salt.states.infoblox_range.rst b/doc/ref/states/all/salt.states.infoblox_range.rst index 9cdccdee9d..02392579d8 100644 --- a/doc/ref/states/all/salt.states.infoblox_range.rst +++ b/doc/ref/states/all/salt.states.infoblox_range.rst @@ -1,5 +1,5 @@ -salt.states.infoblox_range module -=========================== +salt.states.infoblox_range +========================== .. automodule:: salt.states.infoblox_range :members: diff --git a/doc/ref/states/all/salt.states.k8s.rst b/doc/ref/states/all/salt.states.k8s.rst deleted file mode 100644 index 7ac47446be..0000000000 --- a/doc/ref/states/all/salt.states.k8s.rst +++ /dev/null @@ -1,6 +0,0 @@ -=============== -salt.states.k8s -=============== - -.. automodule:: salt.states.k8s - :members: diff --git a/doc/ref/states/all/salt.states.panos.rst b/doc/ref/states/all/salt.states.panos.rst index bf5ca9eb9b..85649a7a36 100644 --- a/doc/ref/states/all/salt.states.panos.rst +++ b/doc/ref/states/all/salt.states.panos.rst @@ -1,6 +1,6 @@ -================ +================= salt.states.panos -================ +================= .. automodule:: salt.states.panos - :members: \ No newline at end of file + :members: diff --git a/doc/ref/states/all/salt.states.rbac_solaris.rst b/doc/ref/states/all/salt.states.rbac_solaris.rst index ca2a82a1c3..732a33ada3 100644 --- a/doc/ref/states/all/salt.states.rbac_solaris.rst +++ b/doc/ref/states/all/salt.states.rbac_solaris.rst @@ -1,4 +1,4 @@ -======------============ +======================== salt.states.rbac_solaris ======================== diff --git a/doc/ref/states/all/salt.states.win_update.rst b/doc/ref/states/all/salt.states.win_update.rst deleted file mode 100644 index 90751a9574..0000000000 --- a/doc/ref/states/all/salt.states.win_update.rst +++ /dev/null @@ -1,6 +0,0 @@ -====================== -salt.states.win_update -====================== - -.. automodule:: salt.states.win_update - :members: \ No newline at end of file diff --git a/doc/ref/states/compiler_ordering.rst b/doc/ref/states/compiler_ordering.rst index 6b333ef815..422beb3930 100644 --- a/doc/ref/states/compiler_ordering.rst +++ b/doc/ref/states/compiler_ordering.rst @@ -1,3 +1,5 @@ +.. _compiler-ordering: + ===================================== Understanding State Compiler Ordering ===================================== diff --git a/doc/ref/states/failhard.rst b/doc/ref/states/failhard.rst index a37c465a71..b19d59d90a 100644 --- a/doc/ref/states/failhard.rst +++ b/doc/ref/states/failhard.rst @@ -10,6 +10,8 @@ But the situation may exist, where you would want all state execution to stop if a single state execution fails. The capability to do this is called ``failing hard``. +.. _state-level-failhard: + State Level Failhard ==================== @@ -36,6 +38,8 @@ executed. It is possible to override a Global Failhard (see below) by explicitly setting it to ``False`` in the state. +.. _global-failhard: + Global Failhard =============== @@ -52,5 +56,5 @@ in states not being executed or even checked. It can also be confusing to see states failhard if an admin is not actively aware that the failhard has been set. -To use the global failhard set failhard: True in the master configuration -file. +To use the global failhard set :conf_master:`failhard` to ``True`` in the +master configuration file. diff --git a/doc/ref/states/requisites.rst b/doc/ref/states/requisites.rst index 9afa810eea..1a47ca60c9 100644 --- a/doc/ref/states/requisites.rst +++ b/doc/ref/states/requisites.rst @@ -24,7 +24,7 @@ the targeting state. The following example demonstrates a direct requisite: .. code-block:: yaml vim: - pkg.installed: [] + pkg.installed /etc/vimrc: file.managed: @@ -86,7 +86,7 @@ State target matching ~~~~~~~~~~~~~~~~~~~~~ In order to understand how state targets are matched, it is helpful to know -:ref:`how the state compiler is working `. Consider the following +:ref:`how the state compiler is working `. Consider the following example: .. code-block:: yaml @@ -673,7 +673,7 @@ id declaration. This is useful when many files need to have the same defaults. - group: apache - mode: 755 - /etc/bar.conf + /etc/bar.conf: file.managed: - source: salt://bar.conf - use: @@ -869,7 +869,7 @@ See :ref:`Reloading Modules `. - reload_grains: true grains_read: - module.run: + module.run: - name: grains.items .. _unless-requisite: @@ -1024,10 +1024,10 @@ same privileges as the salt-minion. comment-repo: file.replace: - name: /etc/yum.repos.d/fedora.repo - - pattern: ^enabled=0 + - pattern: '^enabled=0' - repl: enabled=1 - check_cmd: - - ! grep 'enabled=0' /etc/yum.repos.d/fedora.repo + - "! grep 'enabled=0' /etc/yum.repos.d/fedora.repo" This will attempt to do a replace on all ``enabled=0`` in the .repo file, and replace them with ``enabled=1``. The ``check_cmd`` is just a bash command. It diff --git a/doc/ref/states/top.rst b/doc/ref/states/top.rst index 967c275617..053b561060 100644 --- a/doc/ref/states/top.rst +++ b/doc/ref/states/top.rst @@ -249,8 +249,8 @@ Match Type Description ============ ================================================================================================================ glob Full minion ID or glob expression to match multiple minions (e.g. ``minion123`` or ``minion*``) pcre Perl-compatible regular expression (PCRE) matching a minion ID (e.g. ``web[0-3].domain.com``) -grain Match a :ref:`grain `, optionally using globbing (e.g. ``kernel:Linux`` or ``kernel:*BSD``) -grain_pcre Match a :ref:`grain ` using PCRE (e.g. ``kernel:(Free|Open)BSD``) +grain Match a :ref:`grain `, optionally using globbing (e.g. ``kernel:Linux`` or ``kernel:*BSD``) +grain_pcre Match a :ref:`grain ` using PCRE (e.g. ``kernel:(Free|Open)BSD``) list Comma-separated list of minions (e.g. ``minion1,minion2,minion3``) pillar :ref:`Pillar ` match, optionally using globbing (e.g. ``role:webserver`` or ``role:web*``) pillar_pcre :ref:`Pillar ` match using PCRE (e.g. ``role:web(server|proxy)`` diff --git a/doc/ref/states/writing.rst b/doc/ref/states/writing.rst index 05b4934add..ecfb1655d8 100644 --- a/doc/ref/states/writing.rst +++ b/doc/ref/states/writing.rst @@ -20,7 +20,7 @@ illustrate: .. code-block:: yaml - /etc/salt/master: # maps to "name" + /etc/salt/master: # maps to "name", unless a "name" argument is specified below file.managed: # maps to . - e.g. "managed" in https://github.com/saltstack/salt/tree/develop/salt/states/file.py - user: root # one of many options passed to the manage function - group: root @@ -50,22 +50,115 @@ directly define the user interface. .. _here: https://github.com/saltstack/salt/blob/v0.16.2/salt/states/pkgrepo.py#L163-183 +Best Practices +============== + +A well-written state function will follow these steps: + +.. note:: + This is an extremely simplified example. Feel free to browse the `source + code`_ for Salt's state modules to see other examples. + + .. _`source code`: https://github.com/saltstack/salt/tree/develop/salt/states + +1. Set up the return dictionary and perform any necessary input validation + (type checking, looking for use of mutually-exclusive arguments, etc.). + + .. code-block:: python + + ret = {'name': name, + 'result': False, + 'changes': {}, + 'comment': ''} + + if foo and bar: + ret['comment'] = 'Only one of foo and bar is permitted' + return ret + +2. Check if changes need to be made. This is best done with an + information-gathering function in an accompanying :ref:`execution module + `. The state should be able to use the return + from this function to tell whether or not the minion is already in the + desired state. + + .. code-block:: python + + result = __salt__['modname.check'](name) + +3. If step 2 found that the minion is already in the desired state, then exit + immediately with a ``True`` result and without making any changes. + + .. code-block:: python + + if result: + ret['result'] = True + ret['comment'] = '{0} is already installed'.format(name) + return ret + +4. If step 2 found that changes *do* need to be made, then check to see if the + state was being run in test mode (i.e. with ``test=True``). If so, then exit + with a ``None`` result, a relevant comment, and (if possible) a ``changes`` + entry describing what changes would be made. + + .. code-block:: python + + if __opts__['test']: + ret['result'] = None + ret['comment'] = '{0} would be installed'.format(name) + ret['changes'] = result + return ret + +5. Make the desired changes. This should again be done using a function from an + accompanying execution module. If the result of that function is enough to + tell you whether or not an error occurred, then you can exit with a + ``False`` result and a relevant comment to explain what happened. + + .. code-block:: python + + result = __salt__['modname.install'](name) + +6. Perform the same check from step 2 again to confirm whether or not the + minion is in the desired state. Just as in step 2, this function should be + able to tell you by its return data whether or not changes need to be made. + + .. code-block:: python + + ret['changes'] = __salt__['modname.check'](name) + + As you can see here, we are setting the ``changes`` key in the return + dictionary to the result of the ``modname.check`` function (just as we did + in step 4). The assumption here is that the information-gathering function + will return a dictionary explaining what changes need to be made. This may + or may not fit your use case. + +7. Set the return data and return! + + .. code-block:: python + + if ret['changes']: + ret['comment'] = '{0} failed to install'.format(name) + else: + ret['result'] = True + ret['comment'] = '{0} was installed'.format(name) + + return ret + Using Custom State Modules ========================== -Place your custom state modules inside a ``_states`` directory within the -:conf_master:`file_roots` specified by the master config file. These custom -state modules can then be distributed in a number of ways. Custom state modules -are distributed when :py:func:`state.apply ` is run, -or by executing the :mod:`saltutil.sync_states +Before the state module can be used, it must be distributed to minions. This +can be done by placing them into ``salt://_states/``. They can then be +distributed manually to minions by running :mod:`saltutil.sync_states ` or :mod:`saltutil.sync_all -` functions. +`. Alternatively, when running a +:ref:`highstate ` custom types will automatically be synced. -Any custom states which have been synced to a minion, that are named the -same as one of Salt's default set of states, will take the place of the default -state with the same name. Note that a state's default name is its filename -(i.e. ``foo.py`` becomes state ``foo``), but that its name can be overridden -by using a :ref:`__virtual__ function `. +Any custom states which have been synced to a minion, that are named the same +as one of Salt's default set of states, will take the place of the default +state with the same name. Note that a state module's name defaults to one based +on its filename (i.e. ``foo.py`` becomes state module ``foo``), but that its +name can be overridden by using a :ref:`__virtual__ function +`. Cross Calling Execution Modules from States =========================================== @@ -97,11 +190,12 @@ functions available in other state modules. The variable ``__states__`` is packed into the modules after they are loaded into the Salt minion. -The ``__states__`` variable is a :ref:`Python dictionary ` -containing all of the state modules. Dictionary keys are strings representing the -names of the modules and the values are the functions themselves. +The ``__states__`` variable is a :ref:`Python dictionary ` +containing all of the state modules. Dictionary keys are strings representing +the names of the modules and the values are the functions themselves. -Salt state modules can be cross-called by accessing the value in the ``__states__`` dict: +Salt state modules can be cross-called by accessing the value in the +``__states__`` dict: .. code-block:: python diff --git a/doc/topics/beacons/index.rst b/doc/topics/beacons/index.rst index ce7e42e562..f2090388db 100644 --- a/doc/topics/beacons/index.rst +++ b/doc/topics/beacons/index.rst @@ -176,7 +176,7 @@ following on the event bus: .. code-block:: json - salt/beacon/larry/inotify//etc/important_file { + { "_stamp": "2015-09-09T15:59:37.972753", "data": { "change": "IN_IGNORED", diff --git a/doc/topics/best_practices.rst b/doc/topics/best_practices.rst index 6cd4a4d76a..22c37203db 100644 --- a/doc/topics/best_practices.rst +++ b/doc/topics/best_practices.rst @@ -200,7 +200,7 @@ preferred: ``/srv/salt/apache/conf.sls``: -.. code-block:: yaml +.. code-block:: jinja {% set name = 'httpd' %} {% set tmpl = 'salt://apache/files/httpd.conf' %} @@ -234,7 +234,7 @@ locations within a single state: ``/srv/salt/apache/conf.sls``: -.. code-block:: yaml +.. code-block:: jinja {% from "apache/map.jinja" import apache with context %} @@ -267,7 +267,8 @@ is not very modular to one that is: .. code-block:: yaml httpd: - pkg.installed: [] + pkg: + - installed service.running: - enable: True @@ -331,7 +332,7 @@ modification of static values: ``/srv/salt/apache/map.jinja``: -.. code-block:: yaml +.. code-block:: jinja {% set apache = salt['grains.filter_by']({ 'Debian': { @@ -357,7 +358,7 @@ modification of static values: ``/srv/salt/apache/init.sls``: -.. code-block:: yaml +.. code-block:: jinja {% from "apache/map.jinja" import apache with context %} @@ -387,7 +388,7 @@ to be broken into two states. ``/srv/salt/apache/map.jinja``: -.. code-block:: yaml +.. code-block:: jinja {% set apache = salt['grains.filter_by']({ 'Debian': { @@ -414,7 +415,7 @@ to be broken into two states. ``/srv/salt/apache/init.sls``: -.. code-block:: yaml +.. code-block:: jinja {% from "apache/map.jinja" import apache with context %} @@ -427,7 +428,7 @@ to be broken into two states. ``/srv/salt/apache/conf.sls``: -.. code-block:: yaml +.. code-block:: jinja {% from "apache/map.jinja" import apache with context %} @@ -521,7 +522,7 @@ the associated pillar: ``/srv/salt/mysql/testerdb.sls``: -.. code-block:: yaml +.. code-block:: jinja testdb: mysql_database.present: @@ -529,7 +530,7 @@ the associated pillar: ``/srv/salt/mysql/user.sls``: -.. code-block:: yaml +.. code-block:: jinja include: - mysql.testerdb diff --git a/doc/topics/cloud/aws.rst b/doc/topics/cloud/aws.rst index da6c6fc16d..d920928da8 100644 --- a/doc/topics/cloud/aws.rst +++ b/doc/topics/cloud/aws.rst @@ -57,6 +57,10 @@ parameters are discussed in more detail below. id: 'use-instance-role-credentials' key: 'use-instance-role-credentials' + # If 'role_arn' is specified the above credentials are used to + # to assume to the role. By default, role_arn is set to None. + role_arn: arn:aws:iam::012345678910:role/SomeRoleName + # Make sure this key is owned by corresponding user (default 'salt') with permissions 0400. # private_key: /etc/salt/my_test_key.pem @@ -468,6 +472,19 @@ EC2 API or AWS Console. spot_config: spot_price: 0.10 +You can optionally specify tags to apply to the EC2 spot instance request. +A spot instance request itself is an object in AWS. The following example +will set two tags on the spot instance request. + +.. code-block:: yaml + + my-ec2-config: + spot_config: + spot_price: 0.10 + tag: + tag0: value + tag1: value + By default, the spot instance type is set to 'one-time', meaning it will be launched and, if it's ever terminated for whatever reason, it will not be recreated. If you would like your spot instances to be relaunched after @@ -723,7 +740,7 @@ them have never been used, much less tested, by the Salt Stack team. NOTE: If ``image`` of a profile does not start with ``ami-``, latest image with that name will be used. For example, to create a CentOS 7 -profile, instead of using the AMI like ``image: ami-1caef165``, we +profile, instead of using the AMI like ``image: ami-1caef165``, we can use its name like ``image: 'CentOS Linux 7 x86_64 HVM EBS ENA 1803_01'``. We can also use a pattern like below to get the latest CentOS 7: diff --git a/doc/topics/cloud/azure.rst b/doc/topics/cloud/azure.rst index 7599605aa4..f0b297a3c7 100644 --- a/doc/topics/cloud/azure.rst +++ b/doc/topics/cloud/azure.rst @@ -21,18 +21,6 @@ Dependencies * `Salt `_ -.. note:: - - The Azure driver is currently being updated to work with the new version of - the Python Azure SDK, 1.0.0. However until that process is complete, this - driver will not work with Azure 1.0.0. Please be sure you're running on a - minimum version of 0.10.2 and less than version 1.0.0. - - See `Issue #27980`_ for more information. - -.. _Issue #27980: https://github.com/saltstack/salt/issues/27980 - - Configuration ============= diff --git a/doc/topics/cloud/azurearm.rst b/doc/topics/cloud/azurearm.rst index 5534d4cfdf..6b9d74c16a 100644 --- a/doc/topics/cloud/azurearm.rst +++ b/doc/topics/cloud/azurearm.rst @@ -169,13 +169,19 @@ fields, separated by the pipe (``|``) character: sku: Such as 14.04.5-LTS or 2012-R2-Datacenter version: Such as 14.04.201612050 or latest -It is possible to specify the URL of a custom image that you have access to, -such as: +It is possible to specify the URL or resource ID path of a custom image that you +have access to, such as: .. code-block:: yaml https://.blob.core.windows.net/system/Microsoft.Compute/Images//template-osDisk.01234567-890a-bcdef0123-4567890abcde.vhd +or: + +.. code-block:: yaml + + /subscriptions/XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX/resourceGroups/myRG/providers/Microsoft.Compute/images/myImage + size ---- Required. The name of the size to use to create a VM. Available sizes can be @@ -287,6 +293,26 @@ availability_set ---------------- Optional. If set, the VM will be added to the specified availability set. +volumes +------- + +Optional. A list of dictionaries describing data disks to attach to the +instance can be specified using this setting. The data disk dictionaries are +passed entirely to the `Azure DataDisk object +`_, +so ad-hoc options can be handled as long as they are valid properties of the +object. + +.. code-block:: yaml + + volumes: + - disk_size_gb: 50 + caching: ReadWrite + - disk_size_gb: 100 + caching: ReadWrite + managed_disk: + storage_account_type: Standard_LRS + cleanup_disks ------------- Optional. Default is ``False``. If set to ``True``, disks will be cleaned up @@ -310,7 +336,7 @@ Optional. Default is ``False``. Normally when a VM is deleted, its associated interfaces and IPs are retained. This is useful if you expect the deleted VM to be recreated with the same name and network settings. If you would like interfaces and IPs to be deleted when their associated VM is deleted, set this -to ``True``. +to ``True``. userdata -------- @@ -329,14 +355,14 @@ How this is used depends on the operating system that is being deployed. If used, any ``userdata`` setting will be ignored. userdata_sendkeys -------------- +----------------- Optional. Set to ``True`` in order to generate salt minion keys and provide them as variables to the userdata script when running it through the template renderer. The keys can be referenced as ``{{opts['priv_key']}}`` and ``{{opts['pub_key']}}``. userdata_template -------------- +----------------- Optional. Enter the renderer, such as ``jinja``, to be used for the userdata script template. diff --git a/doc/topics/cloud/deploy.rst b/doc/topics/cloud/deploy.rst index 00a8ff2979..4a75d36c72 100644 --- a/doc/topics/cloud/deploy.rst +++ b/doc/topics/cloud/deploy.rst @@ -257,4 +257,4 @@ This has also been tested to work with pipes, if needed: .. code-block:: yaml - script_args: | head + script_args: '| head' diff --git a/doc/topics/cloud/dimensiondata.rst b/doc/topics/cloud/dimensiondata.rst index 74be6ded6d..4a0b3180a2 100644 --- a/doc/topics/cloud/dimensiondata.rst +++ b/doc/topics/cloud/dimensiondata.rst @@ -2,7 +2,6 @@ Getting Started With Dimension Data Cloud ========================================= - Dimension Data are a global IT Services company and form part of the NTT Group. Dimension Data provide IT-as-a-Service to customers around the globe on their cloud platform (Compute as a Service). The CaaS service is available either on @@ -10,14 +9,15 @@ one of the public cloud instances or as a private instance on premises. http://cloud.dimensiondata.com/ -CaaS has its own non-standard `API`_ , SaltStack provides a -wrapper on top of this `API`_ with common methods with other IaaS solutions and -Public cloud providers. Therefore, you can use the Dimension Data -module to communicate with both the public and private clouds. +CaaS has its own non-standard API , SaltStack provides a wrapper on top of this +API with common methods with other IaaS solutions and Public cloud providers. +Therefore, you can use the Dimension Data module to communicate with both the +public and private clouds. Dependencies ============ + This driver requires the Python ``apache-libcloud`` and ``netaddr`` library to be installed. @@ -53,13 +53,14 @@ Possible regions: driver: dimensiondata .. note:: - .. versionchanged:: 2015.8.0 - The ``provider`` parameter in cloud provider definitions was renamed to ``driver``. This - change was made to avoid confusion with the ``provider`` parameter that is used in cloud profile - definitions. Cloud provider definitions now use ``driver`` to refer to the Salt cloud module that - provides the underlying functionality to connect to a cloud host, while cloud profiles continue - to use ``provider`` to refer to provider configurations that you define. + In version 2015.8.0, the ``provider`` parameter in cloud provider + definitions was renamed to ``driver``. This change was made to avoid + confusion with the ``provider`` parameter that is used in cloud profile + definitions. Cloud provider definitions now use ``driver`` to refer to the + Salt cloud module that provides the underlying functionality to connect to + a cloud host, while cloud profiles continue to use ``provider`` to refer to + provider configurations that you define. Profiles ======== diff --git a/doc/topics/cloud/index.rst b/doc/topics/cloud/index.rst index d95ca09269..3a6ba09900 100644 --- a/doc/topics/cloud/index.rst +++ b/doc/topics/cloud/index.rst @@ -125,7 +125,6 @@ Cloud Provider Specifics Getting Started With Parallels Getting Started With ProfitBricks Getting Started With Proxmox - Getting Started With Rackspace Getting Started With Scaleway Getting Started With Saltify Getting Started With SoftLayer diff --git a/doc/topics/cloud/libvirt.rst b/doc/topics/cloud/libvirt.rst index 7fb0ff25ef..79e88831c2 100644 --- a/doc/topics/cloud/libvirt.rst +++ b/doc/topics/cloud/libvirt.rst @@ -9,11 +9,11 @@ libvirt with qemu-kvm. http://www.libvirt.org/ Host Dependencies -============ +================= * libvirt >= 1.2.18 (older might work) Salt-Cloud Dependencies -============ +======================= * libvirt-python Provider Configuration diff --git a/doc/topics/cloud/misc.rst b/doc/topics/cloud/misc.rst index 9b07bd7c17..7f716f0226 100644 --- a/doc/topics/cloud/misc.rst +++ b/doc/topics/cloud/misc.rst @@ -27,7 +27,7 @@ This has also been tested to work with pipes, if needed: .. code-block:: yaml - script_args: | head + script_args: '| head' Selecting the File Transport diff --git a/doc/topics/cloud/profitbricks.rst b/doc/topics/cloud/profitbricks.rst index bae3f74781..a7514bd92e 100644 --- a/doc/topics/cloud/profitbricks.rst +++ b/doc/topics/cloud/profitbricks.rst @@ -156,136 +156,127 @@ command: # salt-cloud --list-sizes my-profitbricks-config -.. versionadded:: Fluorine -One or more public IP address can be reserved with the following command: +.. versionchanged:: Fluorine -.. code-block:: bash + One or more public IP address can be reserved with the following command: - # salt-cloud -f reserve_ipblock my-profitbricks-config location='us/ewr' size=1 + .. code-block:: bash + + # salt-cloud -f reserve_ipblock my-profitbricks-config location='us/ewr' size=1 Profile Specifics: ------------------ The following list explains some of the important properties. -size - Can be one of the options listed in the output of the following command: +- ``size`` - Can be one of the options listed in the output of the following + command: -.. code-block:: bash + .. code-block:: bash - salt-cloud --list-sizes my-profitbricks-config + salt-cloud --list-sizes my-profitbricks-config -image - Can be one of the options listed in the output of the following command: +- ``image`` - Can be one of the options listed in the output of the following + command: -.. code-block:: bash + .. code-block:: bash - salt-cloud --list-images my-profitbricks-config + salt-cloud --list-images my-profitbricks-config -image_alias - Can be one of the options listed in the output of the following command: +- ``image_alias`` - Can be one of the options listed in the output of the + following command: -.. code-block:: bash + .. code-block:: bash - salt-cloud -f list_images my-profitbricks-config + salt-cloud -f list_images my-profitbricks-config -disk_size - This option allows you to override the size of the disk as defined by the - size. The disk size is set in gigabytes (GB). +- ``disk_size`` - This option allows you to override the size of the disk as + defined by the size. The disk size is set in gigabytes (GB). -disk_type - This option allow the disk type to be set to HDD or SSD. The default is - HDD. +- ``disk_type`` - This option allow the disk type to be set to HDD or SSD. The + default is HDD. -.. versionadded:: Fluorine -image_password - A password is set on the image for the "root" or "Administrator" account. - This field may only be set during volume creation. Only valid with - ProfitBricks supplied HDD (not ISO) images. The password must contain at - least 8 and no more than 50 characters. Only these characters are - allowed: [a-z][A-Z][0-9] + .. versionadded:: Fluorine -cores - This option allows you to override the number of CPU cores as defined by - the size. +- ``image_password`` - A password is set on the image for the "root" or + "Administrator" account. This field may only be set during volume creation. + Only valid with ProfitBricks supplied HDD (not ISO) images. The password must + contain at least 8 and no more than 50 characters. Only these characters are + allowed: [a-z][A-Z][0-9] -ram - This option allows you to override the amount of RAM defined by the size. - The value must be a multiple of 256, e.g. 256, 512, 768, 1024, and so - forth. +- ``cores`` - This option allows you to override the number of CPU cores as + defined by the size. -public_lan - This option will connect the server to the specified public LAN. If no - LAN exists, then a new public LAN will be created. The value accepts a LAN - ID (integer). +- ``ram`` - This option allows you to override the amount of RAM defined by the + size. The value must be a multiple of 256, e.g. 256, 512, 768, 1024, and so + forth. -.. versionadded:: Fluorine -public_ips - Public IPs assigned to the NIC in the public LAN. +- ``public_lan`` - This option will connect the server to the specified public + LAN. If no LAN exists, then a new public LAN will be created. The value + accepts a LAN ID (integer). -public_firewall_rules - This option allows for a list of firewall rules assigned to the public - network interface. + .. versionadded:: Fluorine - Firewall Rule Name: - protocol: (TCP, UDP, ICMP) - source_mac: - source_ip: - target_ip: - port_range_start: - port_range_end: - icmp_type: - icmp_code: +- ``public_ips`` - Public IPs assigned to the NIC in the public LAN. -private_lan - This option will connect the server to the specified private LAN. If no - LAN exists, then a new private LAN will be created. The value accepts a LAN - ID (integer). +- ``public_firewall_rules`` - This option allows for a list of firewall rules + assigned to the public network interface. -.. versionadded:: Fluorine -private_ips - Private IPs assigned in the private LAN. NAT setting is ignored when this setting is active. + .. code-block:: yaml -private_firewall_rules - This option allows for a list of firewall rules assigned to the private - network interface. + Firewall Rule Name: + protocol: (TCP, UDP, ICMP) + source_mac: + source_ip: + target_ip: + port_range_start: + port_range_end: + icmp_type: + icmp_code: - Firewall Rule Name: - protocol: (TCP, UDP, ICMP) - source_mac: - source_ip: - target_ip: - port_range_start: - port_range_end: - icmp_type: - icmp_code: +- ``private_lan`` - This option will connect the server to the specified + private LAN. If no LAN exists, then a new private LAN will be created. The + value accepts a LAN ID (integer). -ssh_private_key - Full path to the SSH private key file. + .. versionadded:: Fluorine -ssh_public_key - Full path to the SSH public key file. +- ``private_ips`` - Private IPs assigned in the private LAN. NAT setting is + ignored when this setting is active. -ssh_interface - This option will use the private LAN IP for node connections (such as - as bootstrapping the node) instead of the public LAN IP. The value accepts - 'private_lan'. +- ``private_firewall_rules`` - This option allows for a list of firewall rules + assigned to the private network interface. -cpu_family - This option allow the CPU family to be set to AMD_OPTERON or INTEL_XEON. - The default is AMD_OPTERON. + .. code-block:: yaml -volumes: - This option allows a list of additional volumes by name that will be - created and attached to the server. Each volume requires 'disk_size' - and, optionally, 'disk_type'. The default is HDD. + Firewall Rule Name: + protocol: (TCP, UDP, ICMP) + source_mac: + source_ip: + target_ip: + port_range_start: + port_range_end: + icmp_type: + icmp_code: -deploy - Set to False if Salt should not be installed on the node. +- ``ssh_private_key`` - Full path to the SSH private key file -wait_for_timeout - The timeout to wait in seconds for provisioning resources such as servers. - The default wait_for_timeout is 15 minutes. +- ``ssh_public_key`` - Full path to the SSH public key file + +- ``ssh_interface`` - This option will use the private LAN IP for node + connections (such as as bootstrapping the node) instead of the public LAN IP. + The value accepts 'private_lan'. + +- ``cpu_family`` - This option allow the CPU family to be set to AMD_OPTERON or + INTEL_XEON. The default is AMD_OPTERON. + +- ``volumes`` - This option allows a list of additional volumes by name that + will be created and attached to the server. Each volume requires 'disk_size' + and, optionally, 'disk_type'. The default is HDD. + +- ``deploy`` - Set to ``False`` if Salt should not be installed on the node. + +- ``wait_for_timeout`` - The timeout to wait in seconds for provisioning + resources such as servers. The default wait_for_timeout is 15 minutes. For more information concerning cloud profiles, see :ref:`here -`. +`. diff --git a/doc/topics/cloud/proxmox.rst b/doc/topics/cloud/proxmox.rst index 7dd19760c6..add7f0783b 100644 --- a/doc/topics/cloud/proxmox.rst +++ b/doc/topics/cloud/proxmox.rst @@ -149,10 +149,10 @@ with their default settings listed. # The name of the image, from ``salt-cloud --list-images proxmox`` image: local:vztmpl/ubuntu-12.04-standard_12.04-1_amd64.tar.gz - + # Whether or not to verify the SSL cert on the Proxmox host verify_ssl: False - + # Network interfaces, netX net0: name=eth0,bridge=vmbr0,ip=dhcp @@ -172,7 +172,7 @@ QEMU profile file (for a new VM): # Technology used to create the VM ('qemu', 'openvz'(on Proxmox <4.x) or 'lxc'(on Proxmox 4.x+)) technology: qemu - + # Proxmox node name host: node_name @@ -187,7 +187,7 @@ QEMU profile file (for a new VM): # OS Type enum (other / wxp / w2k / w2k3 / w2k8 / wvista / win7 / win8 / l24 / l26 / solaris) ostype: win7 - + # Hard disk location sata0: :, format=, size=GB #Example: local:120,format=qcow2,size=120GB @@ -231,7 +231,7 @@ QEMU profile file (for a clone): # Technology used to create the VM ('qemu' or 'lxc') technology: qemu - + # Proxmox node name host: node_name @@ -244,5 +244,11 @@ QEMU profile file (for a clone): More information can be found on Proxmox API under the 'POST' method of /nodes/{node}/qemu/{vmid}/clone .. note:: - The Proxmox API offers a lot more options and parameters, which are not yet supported by this salt-cloud 'overlay'. Feel free to add your contribution by forking the github repository and modifying the following file: salt/salt/cloud/clouds/proxmox.py - An easy way to support more parameters for VM creation would be to add the names of the optional parameters in the 'create_nodes(vm_)' function, under the 'qemu' technology. But it requires you to dig into the code ... + The Proxmox API offers a lot more options and parameters, which are not yet + supported by this salt-cloud 'overlay'. Feel free to add your contribution + by forking the github repository and modifying the following file: + ``salt/cloud/clouds/proxmox.py`` + + An easy way to support more parameters for VM creation would be to add the + names of the optional parameters in the 'create_nodes(vm\_)' function, under + the 'qemu' technology. But it requires you to dig into the code ... diff --git a/doc/topics/cloud/releases/0.8.5.rst b/doc/topics/cloud/releases/0.8.5.rst index c05d07ca3d..25c3a0f272 100644 --- a/doc/topics/cloud/releases/0.8.5.rst +++ b/doc/topics/cloud/releases/0.8.5.rst @@ -149,7 +149,7 @@ This has also been tested to work with pipes, if needed: .. code-block:: yaml - script_args: | head + script_args: '| head' Remove Old SSH Keys =================== diff --git a/doc/topics/cloud/virtualbox.rst b/doc/topics/cloud/virtualbox.rst index 5d0bdc9bee..a0847f918c 100644 --- a/doc/topics/cloud/virtualbox.rst +++ b/doc/topics/cloud/virtualbox.rst @@ -28,8 +28,6 @@ The Virtualbox cloud module just needs to use the virtualbox driver for now. Vir driver: virtualbox -.. _vmware-cloud-profile: - Profiles ======== diff --git a/doc/topics/cloud/vmware.rst b/doc/topics/cloud/vmware.rst index cb58073195..7b5a4abe90 100644 --- a/doc/topics/cloud/vmware.rst +++ b/doc/topics/cloud/vmware.rst @@ -211,7 +211,7 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or hardware_version: 10 image: centos64Guest - + #For Windows VM win_username: Administrator win_password: administrator @@ -232,13 +232,14 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or the current VM/template\'s vCPU count is used. ``cores_per_socket`` - .. versionadded:: 2016.11.0 Enter the number of cores per vCPU that you want the VM/template to have. If not specified, - this will default to 1. - - .. note:: + this will default to 1. - Cores per socket should be less than or equal to the total number of vCPUs assigned to the VM/template. + .. note:: + Cores per socket should be less than or equal to the total number of + vCPUs assigned to the VM/template. + + .. versionadded:: 2016.11.0 ``memory`` Enter the memory size (in MB or GB) that you want the VM/template to have. If @@ -515,31 +516,31 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or ``win_username`` Specify windows vm administrator account. - + .. note:: - + Windows template should have "administrator" account. ``win_password`` Specify windows vm administrator account password. - + .. note:: - During network configuration (if network specified), it is used to specify new administrator password for the machine. + During network configuration (if network specified), it is used to specify new administrator password for the machine. ``win_organization_name`` Specify windows vm user's organization. Default organization name is Organization VMware vSphere documentation: - + https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.UserData.html ``win_user_fullname`` Specify windows vm user's fullname. Default fullname is "Windows User" VMware vSphere documentation: - + https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.UserData.html -``plain_text`` +``plain_text`` Flag to specify whether or not the password is in plain text, rather than encrypted. VMware vSphere documentation: @@ -599,7 +600,7 @@ Example to reconfigure the memory and number of vCPUs: clonefrom: 'test-vm' memory: 16GB - num_cpus: 8 + num_cpus: 8 Cloning a Template diff --git a/doc/topics/cloud/windows.rst b/doc/topics/cloud/windows.rst index 4f1a740fca..68ca5359cb 100644 --- a/doc/topics/cloud/windows.rst +++ b/doc/topics/cloud/windows.rst @@ -85,7 +85,7 @@ If supported by the cloud provider, a PowerShell script may be used to open up this port automatically, using the cloud provider's `userdata`. The following script would open up port 445, and apply the changes: -.. code-block:: powershell +.. code-block:: text New-NetFirewallRule -Name "SMB445" -DisplayName "SMB445" -Protocol TCP -LocalPort 445 @@ -138,7 +138,7 @@ enabled in your userdata. By default EC2 Windows images only have insecure HTTP enabled. To enable HTTPS and basic authentication required by pywinrm consider the following userdata example: -.. code-block:: powershell +.. code-block:: text New-NetFirewallRule -Name "SMB445" -DisplayName "SMB445" -Protocol TCP -LocalPort 445 diff --git a/doc/topics/configuration/index.rst b/doc/topics/configuration/index.rst index 00aa8e5824..254a0f65ce 100644 --- a/doc/topics/configuration/index.rst +++ b/doc/topics/configuration/index.rst @@ -7,6 +7,7 @@ secure and troubleshoot, and how to perform many other administrative tasks. .. toctree:: :maxdepth: 1 + :glob: ../../ref/configuration/master ../../ref/configuration/minion @@ -18,6 +19,7 @@ secure and troubleshoot, and how to perform many other administrative tasks. ../jobs/job_cache ../jobs/external_cache ../../ref/configuration/logging/index + ../../ref/configuration/logging/handlers/* ../../ref/file_server/index ../tutorials/gitfs ../tutorials/minionfs diff --git a/doc/topics/development/architecture.rst b/doc/topics/development/architecture.rst index 6155f8a98b..85f7695e22 100644 --- a/doc/topics/development/architecture.rst +++ b/doc/topics/development/architecture.rst @@ -110,40 +110,51 @@ The typical lifecycle of a salt job from the perspective of the master might be as follows: 1) A command is issued on the CLI. For example, 'salt my_minion test.ping'. -2) The 'salt' command uses LocalClient to generate a request to the salt master -by connecting to the ReqServer on TCP:4506 and issuing the job. -3) The salt-master ReqServer sees the request and passes it to an available -MWorker over workers.ipc. -4) A worker picks up the request and handles it. First, it checks to ensure -that the requested user has permissions to issue the command. Then, it sends -the publish command to all connected minions. For the curious, this happens -in ClearFuncs.publish(). -5) The worker announces on the master event bus that it is about to publish -a job to connected minions. This happens by placing the event on the master -event bus (master_event_pull.ipc) where the EventPublisher picks it up and -distributes it to all connected event listeners on master_event_pub.ipc. -6) The message to the minions is encrypted and sent to the Publisher via IPC -on publish_pull.ipc. -7) Connected minions have a TCP session established with the Publisher on TCP -port 4505 where they await commands. When the Publisher receives the job over -publish_pull, it sends the jobs across the wire to the minions for processing. -8) After the minions receive the request, they decrypt it and perform any -requested work, if they determine that they are targeted to do so. -9) When the minion is ready to respond, it publishes the result of its job back -to the master by sending the encrypted result back to the master on TCP 4506 -where it is again picked up by the ReqServer and forwarded to an available -MWorker for processing. (Again, this happens by passing this message across -workers.ipc to an available worker.) -10) When the MWorker receives the job it decrypts it and fires an event onto -the master event bus (master_event_pull.ipc). (Again for the curious, this -happens in AESFuncs._return(). -11) The EventPublisher sees this event and re-publishes it on the bus to all -connected listeners of the master event bus (on master_event_pub.ipc). This -is where the LocalClient has been waiting, listening to the event bus for -minion replies. It gathers the job and stores the result. -12) When all targeted minions have replied or the timeout has been exceeded, -the salt client displays the results of the job to the user on the CLI. +2) The 'salt' command uses LocalClient to generate a request to the salt master + by connecting to the ReqServer on TCP:4506 and issuing the job. + +3) The salt-master ReqServer sees the request and passes it to an available + MWorker over workers.ipc. + +4) A worker picks up the request and handles it. First, it checks to ensure + that the requested user has permissions to issue the command. Then, it sends + the publish command to all connected minions. For the curious, this happens + in ClearFuncs.publish(). + +5) The worker announces on the master event bus that it is about to publish a + job to connected minions. This happens by placing the event on the master + event bus (master_event_pull.ipc) where the EventPublisher picks it up and + distributes it to all connected event listeners on master_event_pub.ipc. + +6) The message to the minions is encrypted and sent to the Publisher via IPC on + publish_pull.ipc. + +7) Connected minions have a TCP session established with the Publisher on TCP + port 4505 where they await commands. When the Publisher receives the job + over publish_pull, it sends the jobs across the wire to the minions for + processing. + +8) After the minions receive the request, they decrypt it and perform any + requested work, if they determine that they are targeted to do so. + +9) When the minion is ready to respond, it publishes the result of its job back + to the master by sending the encrypted result back to the master on TCP 4506 + where it is again picked up by the ReqServer and forwarded to an available + MWorker for processing. (Again, this happens by passing this message across + workers.ipc to an available worker.) + +10) When the MWorker receives the job it decrypts it and fires an event onto + the master event bus (master_event_pull.ipc). (Again for the curious, this + happens in AESFuncs._return(). + +11) The EventPublisher sees this event and re-publishes it on the bus to all + connected listeners of the master event bus (on master_event_pub.ipc). This + is where the LocalClient has been waiting, listening to the event bus for + minion replies. It gathers the job and stores the result. + +12) When all targeted minions have replied or the timeout has been exceeded, + the salt client displays the results of the job to the user on the CLI. Salt Minion =========== diff --git a/doc/topics/development/contributing.rst b/doc/topics/development/contributing.rst index 18db60f2e7..37c3294bb8 100644 --- a/doc/topics/development/contributing.rst +++ b/doc/topics/development/contributing.rst @@ -154,7 +154,7 @@ Fork a Repo Guide_>`_ and is well worth reading. nothing to commit, working tree clean Do **NOT** perform a ``git pull`` or ``git merge`` here. Instead, add - ``--force`` to the end of the ``git push`` command to get the changes + ``--force-with-lease`` to the end of the ``git push`` command to get the changes pushed to your fork. Pulling or merging, while they will resolve the non-fast-forward issue, will likely add extra commits to the pull request which were not part of your changes. diff --git a/doc/topics/development/conventions/formulas.rst b/doc/topics/development/conventions/formulas.rst index 4340df3eb6..699bd08702 100644 --- a/doc/topics/development/conventions/formulas.rst +++ b/doc/topics/development/conventions/formulas.rst @@ -236,13 +236,13 @@ repository be sure to communicate with any other contributors there on pull requests that are large or have breaking changes. In general it is best to have another Contributor review and merge any pull -requests that you open. Feel free to `at-mention`__ other regular contributors +requests that you open. Feel free to `at-mention`_ other regular contributors to a repository and request a review. However, there are a lot of formula repositories so if a repository does not yet have regular contributors or if your pull request has stayed open for more than a couple days feel free to "selfie-merge" your own pull request. -__: https://help.github.com/articles/basic-writing-and-formatting-syntax/#mentioning-users-and-teams +.. _`at-mention`: https://help.github.com/articles/basic-writing-and-formatting-syntax/#mentioning-users-and-teams Style ----- @@ -250,7 +250,7 @@ Style Maintainability, readability, and reusability are all marks of a good Salt sls file. This section contains several suggestions and examples. -.. code-block:: yaml +.. code-block:: jinja # Deploy the stable master branch unless version overridden by passing # Pillar at the CLI or via the Reactor. @@ -472,7 +472,7 @@ lookups. Below is a simple example of a readable loop: -.. code-block:: yaml +.. code-block:: jinja {% for user in salt.pillar.get('list_of_users', []) %} @@ -489,7 +489,7 @@ Readability suffers and the correct YAML indentation is difficult to see in the surrounding visual noise. Parametrization (discussed below) and variables are both useful techniques to avoid this. For example: -.. code-block:: yaml +.. code-block:: jinja {# ---- Bad example ---- #} @@ -530,7 +530,7 @@ easily combined and merged. And they can be directly serialized into YAML which is often easier than trying to create valid YAML through templating. For example: -.. code-block:: yaml +.. code-block:: jinja {# ---- Bad example ---- #} @@ -624,7 +624,10 @@ example is a state tree of two sls files, one simple and one complicated. common_users: user.present: - - names: [larry, curly, moe] + - names: + - larry + - curly + - moe ``/srv/salt/roles_configuration``: @@ -676,7 +679,7 @@ above). Macros are useful for creating reusable, parameterized states. For example: -.. code-block:: yaml +.. code-block:: jinja {% macro user_state(state_id, user_name, shell='/bin/bash', groups=[]) %} {{ state_id }}: @@ -696,7 +699,7 @@ example, the following macro could be used to write a php.ini config file: ``/srv/salt/php.sls``: -.. code-block:: yaml +.. code-block:: jinja php_ini: file.managed: @@ -793,7 +796,7 @@ syntax for referencing a value is a normal dictionary lookup in Jinja, such as Values defined in the map file can be fetched for the current platform in any state file using the following syntax: -.. code-block:: yaml +.. code-block:: jinja {% from "mysql/map.jinja" import mysql with context %} @@ -987,7 +990,7 @@ XML.) ``/srv/salt/tomcat/server_xml.sls``: -.. code-block:: yaml +.. code-block:: jinja {% import_yaml 'tomcat/defaults.yaml' as server_xml_defaults %} {% set server_xml_final_values = salt.pillar.get( @@ -1022,18 +1025,18 @@ example: ``/srv/salt/app/deploy.sls``: -.. code-block:: yaml +.. code-block:: jinja {# Load the map file. #} {% import_yaml 'app/defaults.yaml' as app_defaults %} {# Extract the relevant subset for the app configured on the current machine (configured via a grain in this example). #} - {% app = app_defaults.get(salt.grains.get('role') %} + {% app = app_defaults.get(salt.grains.get('role')) %} {# Allow values from Pillar to (optionally) update values from the lookup table. #} - {% do app_defaults.update(salt.pillar.get('myapp', {}) %} + {% do app_defaults.update(salt.pillar.get('myapp', {})) %} deploy_application: git.latest: @@ -1081,7 +1084,7 @@ The following is a best-practice example for a reusable Apache formula. (This skips platform-specific options for brevity. See the full :formula_url:`apache-formula` for more.) -.. code-block:: yaml +.. code-block:: text # apache/init.sls apache: diff --git a/doc/topics/development/extend/index.rst b/doc/topics/development/extend/index.rst index b76fd16ccb..349e833ba4 100644 --- a/doc/topics/development/extend/index.rst +++ b/doc/topics/development/extend/index.rst @@ -12,38 +12,38 @@ You can use Salt Extend to quickly create templated modules for adding new behav Salt Extend takes a template directory and merges it into a SaltStack source code directory. Command line usage -~~~~~~~~~~~~~~~~~~ +------------------ *See* :ref:`salt-extend ` Choosing a template -~~~~~~~~~~~~~~~~~~~ +------------------- The following templates are available: module -^^^^^^ +****** Creates a new execution module within salt/modules/{{module_name}}.py module_unit -^^^^^^^^^^^ +*********** Creates a new execution module unit test suite within tests/unit/modules/test_{{module_name}}.py state -^^^^^ +***** Creates a new state module within salt/states/{{module_name}}.py state_unit -^^^^^^^^^^ +********** Creates a new state module unit test suite within tests/unit/states/test_{{module_name}}.py Adding templates -~~~~~~~~~~~~~~~~ +---------------- 1. Create a directory under /templates 2. Create a file ``template.yml`` containing properties for @@ -51,12 +51,12 @@ Adding templates * ``description`` - a description of the template * ``questions`` - a collection of additional questions to ask the user, the name of the item will be used as the key in the context dictionary within the jinja template. - + * ``question`` - The question to ask the user, as a string * ``default`` - (optional) the default value, can contain Jinja2 template syntax and has access to the default context properties Example template.yml -^^^^^^^^^^^^^^^^^^^^ +******************** .. code-block:: yaml @@ -71,19 +71,19 @@ Example template.yml 3. Create the files within /templates/ to match the target .. note:: - + File names can contain Jinja 2 template syntax, e.g. *'{{module_name}}.py}}'* Example file in the template directory -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +************************************** .. code-block:: python print('Hello {{module_name}}') __virtual__ = '{{__virtual_name__}}' - + Default context properties -^^^^^^^^^^^^^^^^^^^^^^^^^^ +************************** The default context provides the following properties @@ -97,10 +97,10 @@ The default context provides the following properties As well as any additional properties entered from the questions section of ``template.yml`` API -~~~ +--- salt.utils.extend module -======================== +************************ .. automodule:: salt.utils.extend :members: diff --git a/doc/topics/development/index.rst b/doc/topics/development/index.rst index 6170b295e3..c4a341c040 100644 --- a/doc/topics/development/index.rst +++ b/doc/topics/development/index.rst @@ -8,7 +8,7 @@ Developing Salt * extend/index - tests/index + tests/* raet/index git/index conventions/index diff --git a/doc/topics/development/labels.rst b/doc/topics/development/labels.rst index 8f64ead5bc..666b9f7ed2 100644 --- a/doc/topics/development/labels.rst +++ b/doc/topics/development/labels.rst @@ -4,98 +4,105 @@ GitHub Labels and Milestones ============================ -SaltStack uses several label categories, as well as milestones, to triage incoming issues and pull requests in the -GitHub issue tracker. Labels are used to sort issues by type, priority, severity, status, functional area, functional -group, and targeted release and pull requests by status, functional area, functional group, type of change, and test -status. Milestones are used to indicate whether an issue is fully triaged or is scheduled to be fixed by SaltStack in -an upcoming sprint. +SaltStack uses several label categories, as well as milestones, to triage +incoming issues and pull requests in the GitHub issue tracker. Labels are used +to sort issues by type, priority, severity, status, functional area, functional +group, and targeted release and pull requests by status, functional area, +functional group, type of change, and test status. Milestones are used to +indicate whether an issue is fully triaged or is scheduled to be fixed by +SaltStack in an upcoming sprint. Milestones ========== -All issues are assigned to a milestone, whereas pull requests are almost never assigned to a milestone as the mean -lifetime of pull requests is short enough that there is no need to track them temporally. +All issues are assigned to a milestone, whereas pull requests are almost never +assigned to a milestone as the mean lifetime of pull requests is short enough +that there is no need to track them temporally. -SaltStack uses milestones to indicate which issues are blocked on submitter or upstream actions, are approved, or are -scheduled to be fixed or implemented in an upcoming sprint. If an issue is not attached to a sprint milestone, you are -welcome to work on it at your own desire and convenience. If it is attached to a sprint milestone and you have already -begun working on it or have a solution in mind or have other ideas related to the issue, you are encouraged to -coordinate with the assignee via the GitHub issue tracker to create the best possible solution or implementation. +SaltStack uses milestones to indicate which issues are blocked on submitter or +upstream actions, are approved, or are scheduled to be fixed or implemented in +an upcoming sprint. If an issue is not attached to a sprint milestone, you are +welcome to work on it at your own desire and convenience. If it is attached to +a sprint milestone and you have already begun working on it or have a solution +in mind or have other ideas related to the issue, you are encouraged to +coordinate with the assignee via the GitHub issue tracker to create the best +possible solution or implementation. -``Approved`` - The issue has been validated and has all necessary information. +- ``Approved`` - The issue has been validated and has all necessary information. -``Blocked`` - The issue is waiting on actions by parties outside of SaltStack, such as receiving more information from the - submitter or resolution of an upstream issue. This milestone is usually applied in conjunction with the labels - ``Info Needed``, ``Question``, ``Expected Behavior``, ``Won't Fix For Now``, or ``Upstream Bug``. +- ``Blocked`` - The issue is waiting on actions by parties outside of + SaltStack, such as receiving more information from the submitter or + resolution of an upstream issue. This milestone is usually applied in + conjunction with the labels ``Info Needed``, ``Question``, ``Expected + Behavior``, ``Won't Fix For Now``, or ``Upstream Bug``. -``Under Review`` - The issue is having further validation done by a SaltStack engineer. +- ``Under Review`` - The issue is having further validation done by a SaltStack + engineer. -```` - The issue is being actively worked on by a SaltStack engineer. Sprint milestones names are constructed from the - chemical symbol of the next release's codename and the number of sprints until that release is made. For example, - if the next release codename is ``Neon`` and there are five sprints until that release, the corresponding sprint - milestone will be called ``Ne 5``. See :ref:`` for a discussion of Salt's release - codenames. +- ```` - The issue is being actively worked on by a SaltStack engineer. + Sprint milestones names are constructed from the chemical symbol of the next + release's codename and the number of sprints until that release is made. For + example, if the next release codename is ``Neon`` and there are five sprints + until that release, the corresponding sprint milestone will be called ``Ne + 5``. See :ref:`here ` for a discussion of Salt's release + codenames. Labels ====== -Labels are used to sort and describe issues and pull requests. Some labels are usually reserved for one or the other, -though most labels may be applied to both. +Labels are used to sort and describe issues and pull requests. Some labels are +usually reserved for one or the other, though most labels may be applied to +both. -New issues will receive at least one label and a milestone, and new pull requests will receive at least one label. -Except for the :ref:`functional area ` and :ref:`functional group ` -label categories, issues will generally receive only up to one label per category. +New issues will receive at least one label and a milestone, and new pull +requests will receive at least one label. Except for the :ref:`functional area +` and :ref:`functional group ` +label categories, issues will generally receive only up to one label per +category. Type ---- -Issues are categorized into one of several types. Type labels are almost never used for pull requests. GitHub treats -pull requests like issues in many ways, so a pull request could be considered an issue with an implicit ``Pull Request`` -type label applied. +Issues are categorized into one of several types. Type labels are almost never +used for pull requests. GitHub treats pull requests like issues in many ways, +so a pull request could be considered an issue with an implicit ``Pull +Request`` type label applied. -``Feature`` - The issue is a request for new functionality including changes, enhancements, refactors, etc. +- ``Feature`` - The issue is a request for new functionality including changes, + enhancements, refactors, etc. -``Bug`` - The issue documents broken, incorrect, or confusing behavior. This label is always accompanied by a :ref:`severity - label `. +- ``Bug`` - The issue documents broken, incorrect, or confusing behavior. This + label is always accompanied by a :ref:`severity label `. -``Duplicate`` - The issue is a duplicate of another feature request or bug report. +- ``Duplicate`` - The issue is a duplicate of another feature request or bug + report. -``Upstream Bug`` - The issue is a result of an upstream issue. +- ``Upstream Bug`` - The issue is a result of an upstream issue. -``Question`` - The issue is more of a question than a request for new features or a report of broken features, but can sometimes - lead to further discussion or changes of confusing or incongruous behavior or documentation. +- ``Question`` - The issue is more of a question than a request for new + features or a report of broken features, but can sometimes lead to further + discussion or changes of confusing or incongruous behavior or documentation. -``Expected Behavior`` - The issue is a bug report of intended functionality. +- ``Expected Behavior`` - The issue is a bug report of intended functionality. Priority -------- -An issue's priority is relative to its :ref:`functional area `. If a bug report, for example, -about ``gitfs`` indicates that all users of ``gitfs`` will encounter this bug, then a ``P1`` label will be applied, even -though users who are not using ``gitfs`` will not encounter the bug. If a feature is requested by many users, it may be -given a high priority. +An issue's priority is relative to its :ref:`functional area +`. If a bug report, for example, about ``gitfs`` +indicates that all users of ``gitfs`` will encounter this bug, then a ``P1`` +label will be applied, even though users who are not using ``gitfs`` will not +encounter the bug. If a feature is requested by many users, it may be given a +high priority. -``P1`` - The issue will be seen by all users. +- ``P1`` - The issue will be seen by all users. -``P2`` - The issue will be seen by most users. +- ``P2`` - The issue will be seen by most users. -``P3`` - The issue will be seen by about half of users. +- ``P3`` - The issue will be seen by about half of users. -``P4`` - The issue will not be seen by most users. Usually the issue is a very specific use case or corner case. +- ``P4`` - The issue will not be seen by most users. Usually the issue is a + very specific use case or corner case. .. _bug-severity-labels: @@ -104,196 +111,219 @@ Severity Severity labels are almost always only applied to issues labeled ``Bug``. -``Blocker`` - The issue is blocking an impending release. +- ``Blocker`` - The issue is blocking an impending release. -``Critical`` - The issue causes data loss, crashes or hangs salt processes, makes the system unresponsive, etc. +- ``Critical`` - The issue causes data loss, crashes or hangs salt processes, + makes the system unresponsive, etc. -``High Severity`` - The issue reports incorrect functionality, bad functionality, a confusing user experience, etc. +- ``High Severity`` - The issue reports incorrect functionality, bad + functionality, a confusing user experience, etc. -``Medium Severity`` - The issue reports cosmetic items, formatting, spelling, colors, etc. +- ``Medium Severity`` - The issue reports cosmetic items, formatting, spelling, + colors, etc. .. _functional-area-labels: Functional Area --------------- -Many major components of Salt have corresponding GitHub labels. These labels are applied to all issues and pull -requests as is reasonably appropriate. They are useful in organizing issues and pull requests according to the source -code relevant to issues or the source code changed by pull requests. +Many major components of Salt have corresponding GitHub labels. These labels +are applied to all issues and pull requests as is reasonably appropriate. They +are useful in organizing issues and pull requests according to the source code +relevant to issues or the source code changed by pull requests. -* ``Execution Module`` -* ``File Servers`` -* ``Grains`` -* ``Multi-Master`` -* ``Packaging`` Related to packaging of Salt, not Salt's support for package management. -* ``Pillar`` -* ``RAET`` -* ``Returners`` -* ``Runners`` -* ``SPM`` -* ``Salt-API`` -* ``Salt-Cloud`` -* ``Salt-SSH`` -* ``Salt-Syndic`` -* ``State Module`` -* ``Tests`` -* ``Transport`` -* ``Windows`` -* ``ZMQ`` +- ``Execution Module`` +- ``File Servers`` +- ``Grains`` +- ``Multi-Master`` +- ``Packaging`` Related to packaging of Salt, not Salt's support for package management. +- ``Pillar`` +- ``RAET`` +- ``Returners`` +- ``Runners`` +- ``SPM`` +- ``Salt-API`` +- ``Salt-Cloud`` +- ``Salt-SSH`` +- ``Salt-Syndic`` +- ``State Module`` +- ``Tests`` +- ``Transport`` +- ``Windows`` +- ``ZMQ`` .. _functional-group-labels: Functional Group ---------------- -These labels sort issues and pull requests according to the internal SaltStack engineering teams. +These labels sort issues and pull requests according to the internal SaltStack +engineering teams. -``Core`` - The issue or pull request relates to code that is central or existential to Salt itself. +- ``Core`` - The issue or pull request relates to code that is central or + existential to Salt itself. -``Platform`` - The issue or pull request relates to support and integration with various platforms like traditional operating - systems as well as containers, platform-based utilities like filesystems, command schedulers, etc., and - system-based applications like webservers, databases, etc. +- ``Platform`` - The issue or pull request relates to support and integration + with various platforms like traditional operating systems as well as + containers, platform-based utilities like filesystems, command schedulers, + etc., and system-based applications like webservers, databases, etc. -``RIoT`` - The issue or pull request relates to support and integration with various abstract systems like cloud providers, - hypervisors, API-based services, etc. +- ``RIoT`` - The issue or pull request relates to support and integration with + various abstract systems like cloud providers, hypervisors, API-based + services, etc. -``Console`` - The issue or pull request relates to the SaltStack enterprise console. +- ``Console`` - The issue or pull request relates to the SaltStack enterprise + console. -``Documentation`` - The issue or pull request relates to documentation. +- ``Documentation`` - The issue or pull request relates to documentation. Status ------ -Status labels are used to define and track the state of issues and pull requests. Not all potential statuses correspond -to a label, but some statuses are common enough that labels have been created for them. If an issue has not been moved -beyond the ``Blocked`` milestone, it is very likely that it will only have a status label. +Status labels are used to define and track the state of issues and pull +requests. Not all potential statuses correspond to a label, but some statuses +are common enough that labels have been created for them. If an issue has not +been moved beyond the ``Blocked`` milestone, it is very likely that it will +only have a status label. -``Bugfix - back-port`` - The pull request needs to be back-ported to an older release branch. This is done by :ref:`recreating the pull - request ` against that branch. Once the back-port is completed, this label is replaced - with a ``Bugfix - [Done] back-ported`` label. Normally, new features should go into the develop and bug fixes into - the oldest supported release branch, see :ref:``. +- ``Bugfix - back-port`` The pull request needs to be back-ported to an older + release branch. This is done by :ref:`recreating the pull request + ` against that branch. Once the back-port is + completed, this label is replaced with a ``Bugfix - [Done] back-ported`` + label. Normally, new features should go into the develop and bug fixes into + the oldest supported release branch, see :ref:`here `. -``Bugfix - [Done] back-ported`` - The pull request has been back-ported to an older branch. +- ``Bugfix - [Done] back-ported`` - The pull request has been back-ported to an + older branch. -``Cannot Reproduce`` - The issue is a bug and has been reviewed by a SaltStack engineer, but it cannot be replicated with the provided - information and context. Those involved with the bug will need to work through additional ideas until the bug can - be isolated and verified. +- ``Cannot Reproduce`` - The issue is a bug and has been reviewed by a + SaltStack engineer, but it cannot be replicated with the provided information + and context. Those involved with the bug will need to work through + additional ideas until the bug can be isolated and verified. -``Confirmed`` - The issue is a bug and has been confirmed by a SaltStack engineer, who often documents a minimal working example - that reproduces the bug. +- ``Confirmed`` - The issue is a bug and has been confirmed by a SaltStack + engineer, who often documents a minimal working example that reproduces the + bug. -``Fixed Pending Verification`` - The issue is a bug and has been fixed by one or more pull requests, which should link to the issue. Closure of the - issue is contingent upon confirmation of resolution from the submitter. If the submitter reports a negative - confirmation, this label is removed. If no response is given after a few weeks, then the issue will be assumed - fixed and closed. +- ``Fixed Pending Verification`` - The issue is a bug and has been fixed by one + or more pull requests, which should link to the issue. Closure of the issue + is contingent upon confirmation of resolution from the submitter. If the + submitter reports a negative confirmation, this label is removed. If no + response is given after a few weeks, then the issue will be assumed fixed and + closed. -``Info Needed`` - The issue needs more information before it can be verified and resolved. For a feature request this may include a - description of the use cases. Almost all bug reports need to include at least the versions of salt and its - dependencies, the system type and version, commands used, debug logs, error messages, and relevant configs. +- ``Info Needed`` - The issue needs more information before it can be verified + and resolved. For a feature request this may include a description of the + use cases. Almost all bug reports need to include at least the versions of + salt and its dependencies, the system type and version, commands used, debug + logs, error messages, and relevant configs. -``Pending Changes`` - The pull request needs additional changes before it can be merged. +- ``Pending Changes`` - The pull request needs additional changes before it can + be merged. -``Pending Discussion`` - The issue or pull request needs more discussion before it can be closed or merged. The status of the issue or pull - request is not clear or apparent enough for definite action to be taken, or additional input from SaltStack, the - submitter, or another party has been requested. +- ``Pending Discussion`` - The issue or pull request needs more discussion + before it can be closed or merged. The status of the issue or pull request + is not clear or apparent enough for definite action to be taken, or + additional input from SaltStack, the submitter, or another party has been + requested. - If the issue is not a pull request, once the discussion has arrived at a cogent conclusion, this label will be - removed and the issue will be accepted. If it is a pull request, the results of the discussion may require - additional changes and thus, a ``Pending Changes`` label. + If the issue is not a pull request, once the discussion has arrived at a + cogent conclusion, this label will be removed and the issue will be accepted. + If it is a pull request, the results of the discussion may require additional + changes and thus, a ``Pending Changes`` label. -``Won't Fix for Now`` - The issue is legitimate, but it is not something the SaltStack team is currently able or willing to fix or - implement. Issues having this label may be revisited in the future. +- ``Won't Fix for Now`` - The issue is legitimate, but it is not something the + SaltStack team is currently able or willing to fix or implement. Issues + having this label may be revisited in the future. Type of Change ~~~~~~~~~~~~~~ -Every pull request should receive a change label. These labels measure the quantity of change as well as the -significance of the change. The amount of change and the importance of the code area changed are considered, but often -the depth of secondary code review required and the potential repercussions of the change may also advise the label -choice. +Every pull request should receive a change label. These labels measure the +quantity of change as well as the significance of the change. The amount of +change and the importance of the code area changed are considered, but often +the depth of secondary code review required and the potential repercussions of +the change may also advise the label choice. -Core code areas include: state compiler, crypto engine, master and minion and syndic daemons, transport, pillar -rendering, loader, transport layer, event system, salt.utils, client, cli, logging, netapi, runner engine, templating -engine, top file compilation, file client, file server, mine, salt-ssh, test runner, etc. +Core code areas include: state compiler, crypto engine, master and minion and +syndic daemons, transport, pillar rendering, loader, transport layer, event +system, salt.utils, client, cli, logging, netapi, runner engine, templating +engine, top file compilation, file client, file server, mine, salt-ssh, test +runner, etc. -Non-core code usually constitutes the specific set of plugins for each of the several plugin layers of Salt: execution -modules, states, runners, returners, clouds, etc. +Non-core code usually constitutes the specific set of plugins for each of the +several plugin layers of Salt: execution modules, states, runners, returners, +clouds, etc. -``Minor Change`` - * Less than 64 lines changed, or - * Less than 8 core lines changed -``Medium Change`` - * Less than 256 lines changed, or - * Less than 64 core lines changed -``Master Change`` - * More than 256 lines changed, or - * More than 64 core lines changed -``Expert Change`` - * Needs specialized, in-depth review +- ``Minor Change`` + + * Less than 64 lines changed, or + + * Less than 8 core lines changed + +- ``Medium Change`` + + * Less than 256 lines changed, or + + * Less than 64 core lines changed + +- ``Master Change`` + + * More than 256 lines changed, or + + * More than 64 core lines changed + +- ``Expert Change`` + + * Needs specialized, in-depth review Test Status ----------- -These labels relate to the status of the automated tests that run on pull requests. If the tests on a pull request fail -and are not overridden by one of these labels, the pull request submitter needs to update the code and/or tests so that -the tests pass and the pull request can be merged. +These labels relate to the status of the automated tests that run on pull +requests. If the tests on a pull request fail and are not overridden by one of +these labels, the pull request submitter needs to update the code and/or tests +so that the tests pass and the pull request can be merged. -``Lint`` - The pull request has passed all tests except for the code lint checker. +- ``Lint`` - The pull request has passed all tests except for the code lint + checker. -``Tests Passed`` - The pull request has passed all tests even though some test results are negative. Sometimes the automated testing - infrastructure will encounter internal errors unrelated to the code change in the pull request that cause test runs - to fail. These errors can be caused by cloud host and network issues and also Jenkins issues like erroneously - accumulating workspace artifacts, resource exhaustion, and bugs that arise from long running Jenkins processes. +- ``Tests Passed`` - The pull request has passed all tests even though some + test results are negative. Sometimes the automated testing infrastructure + will encounter internal errors unrelated to the code change in the pull + request that cause test runs to fail. These errors can be caused by cloud + host and network issues and also Jenkins issues like erroneously accumulating + workspace artifacts, resource exhaustion, and bugs that arise from long + running Jenkins processes. Other ----- -These labels indicate miscellaneous issue types or statuses that are common or important enough to be tracked and sorted -with labels. +These labels indicate miscellaneous issue types or statuses that are common or +important enough to be tracked and sorted with labels. -``Awesome`` - The pull request implements an especially well crafted solution, or a very difficult but necessary change. +- ``Awesome`` - The pull request implements an especially well crafted + solution, or a very difficult but necessary change. -``Help Wanted`` - The issue appears to have a simple solution. Issues having this label - should be a good starting place for new contributors to Salt. +- ``Help Wanted`` - The issue appears to have a simple solution. Issues having + this label should be a good starting place for new contributors to Salt. -``Needs Testcase`` - The issue or pull request relates to a feature that needs test coverage. The pull request containing the tests - should reference the issue or pull request having this label, whereupon the label should be removed. +- ``Needs Testcase`` - The issue or pull request relates to a feature that + needs test coverage. The pull request containing the tests should reference + the issue or pull request having this label, whereupon the label should be + removed. -``Regression`` - The issue is a bug that breaks functionality known to work in previous releases. +- ``Regression`` - The issue is a bug that breaks functionality known to work + in previous releases. -``Story`` - The issue is used by a SaltStack engineer to track progress on multiple related issues in a single place. +- ``Story`` - The issue is used by a SaltStack engineer to track progress on + multiple related issues in a single place. -``Stretch`` - The issue is an optional goal for the current sprint but may not be delivered. +- ``Stretch`` - The issue is an optional goal for the current sprint but may + not be delivered. -``ZD`` - The issue is related to a Zendesk customer support ticket. +- ``ZD`` - The issue is related to a Zendesk customer support ticket. -```` - The issue is scheduled to be implemented by ````. See :ref:`` for a - discussion of Salt's release codenames. +- ```` - The issue is scheduled to be implemented by ````. + See :ref:`here ` for a discussion of Salt's release + codenames. diff --git a/doc/topics/development/tests/unit.rst b/doc/topics/development/tests/unit.rst index 4f56f5348d..d129ad478e 100644 --- a/doc/topics/development/tests/unit.rst +++ b/doc/topics/development/tests/unit.rst @@ -180,6 +180,404 @@ available, since that's not actually part of what's being tested, we mocked that import by patching ``sys.modules`` when tests are running. +Mocking Filehandles +------------------- + +.. note:: + This documentation applies to the 2018.3 release cycle and newer. The + extended functionality for ``mock_open`` described below does not exist in + the 2017.7 and older release branches. + +Opening files in Salt is done using ``salt.utils.files.fopen()``. When testing +code that reads from files, the ``mock_open`` helper can be used to mock +filehandles. Note that is not the same ``mock_open`` as +:py:func:`unittest.mock.mock_open` from the Python standard library, but rather +a separate implementation which has additional functionality. + +.. code-block:: python + + from tests.support.unit import TestCase, skipIf + from tests.support.mock import ( + patch + mock_open, + NO_MOCK, + NO_MOCK_REASON, + ) + + import salt.modules.mymod as mymod + + @skipIf(NO_MOCK, NO_MOCK_REASON) + class MyAwesomeTestCase(TestCase): + + def test_something(self): + fopen_mock = mock_open(read_data='foo\nbar\nbaz\n') + with patch('salt.utils.files.fopen', fopen_mock): + result = mymod.myfunc() + assert result is True + +This will force any filehandle opened to mimic a filehandle which, when read, +produces the specified contents. + +.. important:: + **String Types** + + When running tests on Python 2, ``mock_open`` will convert any ``unicode`` + types to ``str`` types to more closely reproduce Python 2 behavior (file + reads are always ``str`` types in Python 2, irrespective of mode). + + However, when configuring your read_data, make sure that you are using + bytestrings (e.g. ``b'foo\nbar\nbaz\n'``) when the code you are testing is + opening a file for binary reading, otherwise the tests will fail on Python + 3. The mocked filehandles produced by ``mock_open`` will raise a + :py:obj:`TypeError` if you attempt to read a bytestring when opening for + non-binary reading, and similarly will not let you read a string when + opening a file for binary reading. They will also not permit bytestrings to + be "written" if the mocked filehandle was opened for non-binary writing, + and vice-versa when opened for non-binary writing. These enhancements force + test writers to write more accurate tests. + +More Complex Scenarios +********************** + +.. _unit-tests-multiple-file-paths: + +Multiple File Paths ++++++++++++++++++++ + +What happens when the code being tested reads from more than one file? For +those cases, you can pass ``read_data`` as a dictionary: + +.. code-block:: python + + import textwrap + + from tests.support.unit import TestCase, skipIf + from tests.support.mock import ( + patch + mock_open, + NO_MOCK, + NO_MOCK_REASON, + ) + + import salt.modules.mymod as mymod + + @skipIf(NO_MOCK, NO_MOCK_REASON) + class MyAwesomeTestCase(TestCase): + + def test_something(self): + contents = { + '/etc/foo.conf': textwrap.dedent('''\ + foo + bar + baz + '''), + '/etc/b*.conf': textwrap.dedent('''\ + one + two + three + '''), + } + fopen_mock = mock_open(read_data=contents) + with patch('salt.utils.files.fopen', fopen_mock): + result = mymod.myfunc() + assert result is True + +This would make ``salt.utils.files.fopen()`` produce filehandles with different +contents depending on which file was being opened by the code being tested. +``/etc/foo.conf`` and any file matching the pattern ``/etc/b*.conf`` would +work, while opening any other path would result in a +:py:obj:`FileNotFoundError` being raised (in Python 2, an ``IOError``). + +Since file patterns are supported, it is possible to use a pattern of ``'*'`` +to define a fallback if no other patterns match the filename being opened. The +below two ``mock_open`` calls would produce identical results: + +.. code-block:: python + + mock_open(read_data='foo\n') + mock_open(read_data={'*': 'foo\n'}) + +.. note:: + Take care when specifying the ``read_data`` as a dictionary, in cases where + the patterns overlap (e.g. when both ``/etc/b*.conf`` and ``/etc/bar.conf`` + are in the ``read_data``). Dictionary iteration order will determine which + pattern is attempted first, second, etc., with the exception of ``*`` which + is used when no other pattern matches. If your test case calls for + specifying overlapping patterns, and you are not running Python 3.6 or + newer, then an ``OrderedDict`` can be used to ensure matching is handled in + the desired way: + + .. code-block:: python + + contents = OrderedDict() + contents['/etc/bar.conf'] = 'foo\nbar\nbaz\n' + contents['/etc/b*.conf'] = IOError(errno.EACCES, 'Permission denied') + contents['*'] = 'This is a fallback for files not beginning with "/etc/b"\n' + fopen_mock = mock_open(read_data=contents) + +Raising Exceptions +++++++++++++++++++ + +Instead of a string, an exception can also be used as the ``read_data``: + +.. code-block:: python + + import errno + + from tests.support.unit import TestCase, skipIf + from tests.support.mock import ( + patch + mock_open, + NO_MOCK, + NO_MOCK_REASON, + ) + + import salt.modules.mymod as mymod + + @skipIf(NO_MOCK, NO_MOCK_REASON) + class MyAwesomeTestCase(TestCase): + + def test_something(self): + exc = IOError(errno.EACCES, 'Permission denied') + fopen_mock = mock_open(read_data=exc) + with patch('salt.utils.files.fopen', fopen_mock): + mymod.myfunc() + +The above example would raise the specified exception when any file is opened. +The expectation would be that ``mymod.myfunc()`` would gracefully handle the +IOError, so a failure to do that would result in it being raised and causing +the test to fail. + +Multiple File Contents +++++++++++++++++++++++ + +For cases in which a file is being read more than once, and it is necessary to +test a function's behavior based on what the file looks like the second (or +third, etc.) time it is read, just specify the the contents for that file as a +list. Each time the file is opened, ``mock_open`` will cycle through the list +and produce a mocked filehandle with the specified contents. For example: + +.. code-block:: python + + import errno + import textwrap + + from tests.support.unit import TestCase, skipIf + from tests.support.mock import ( + patch + mock_open, + NO_MOCK, + NO_MOCK_REASON, + ) + + import salt.modules.mymod as mymod + + @skipIf(NO_MOCK, NO_MOCK_REASON) + class MyAwesomeTestCase(TestCase): + + def test_something(self): + contents = { + '/etc/foo.conf': [ + textwrap.dedent('''\ + foo + bar + '''), + textwrap.dedent('''\ + foo + bar + baz + '''), + ], + '/etc/b*.conf': [ + IOError(errno.ENOENT, 'No such file or directory'), + textwrap.dedent('''\ + one + two + three + '''), + ], + } + fopen_mock = mock_open(read_data=contents) + with patch('salt.utils.files.fopen', fopen_mock): + result = mymod.myfunc() + assert result is True + +Using this example, the first time ``/etc/foo.conf`` is opened, it will +simulate a file with the first string in the list as its contents, while the +second time it is opened, the simulated file's contents will be the second +string in the list. + +If no more items remain in the list, then attempting to open the file will +raise a :py:obj:`RuntimeError`. In the example above, if ``/etc/foo.conf`` were +to be opened a third time, a :py:obj:`RuntimeError` would be raised. + +Note that exceptions can also be mixed in with strings when using this +technique. In the above example, if ``/etc/bar.conf`` were to be opened twice, +the first time would simulate the file not existing, while the second time +would simulate a file with string defined in the second element of the list. + +.. note:: + Notice that the second path in the ``contents`` dictionary above + (``/etc/b*.conf``) contains an asterisk. The items in the list are cycled + through for each match of a given pattern (*not* separately for each + individual file path), so this means that only two files matching that + pattern could be opened before the next one would raise a + :py:obj:`RuntimeError`. + +Accessing the Mocked Filehandles in a Test +****************************************** + +.. note:: + The code for the ``MockOpen``, ``MockCall``, and ``MockFH`` classes + (referenced below) can be found in ``tests/support/mock.py``. There are + extensive unit tests for them located in ``tests/unit/test_mock.py``. + +The above examples simply show how to mock ``salt.utils.files.fopen()`` to +simulate files with the contents you desire, but you can also access the mocked +filehandles (and more), and use them to craft assertions in your tests. To do +so, just add an ``as`` clause to the end of the ``patch`` statement: + +.. code-block:: python + + fopen_mock = mock_open(read_data='foo\nbar\nbaz\n') + with patch('salt.utils.files.fopen', fopen_mock) as m_open: + # do testing here + ... + ... + +When doing this, ``m_open`` will be a ``MockOpen`` instance. It will contain +several useful attributes: + +- **read_data** - A dictionary containing the ``read_data`` passed when + ``mock_open`` was invoked. In the event that :ref:`multiple file paths + ` are not used, then this will be a + dictionary mapping ``*`` to the ``read_data`` passed to ``mock_open``. + +- **call_count** - An integer representing how many times + ``salt.utils.files.fopen()`` was called to open a file. + +- **calls** - A list of ``MockCall`` objects. A ``MockCall`` object is a simple + class which stores the arguments passed to it, making the positional + arguments available via its ``args`` attribute, and the keyword arguments + available via its ``kwargs`` attribute. + + .. code-block:: python + + from tests.support.unit import TestCase, skipIf + from tests.support.mock import ( + patch + mock_open, + MockCall, + NO_MOCK, + NO_MOCK_REASON, + ) + + import salt.modules.mymod as mymod + + @skipIf(NO_MOCK, NO_MOCK_REASON) + class MyAwesomeTestCase(TestCase): + + def test_something(self): + + with patch('salt.utils.files.fopen', mock_open(read_data=b'foo\n')) as m_open: + mymod.myfunc() + # Assert that only two opens attempted + assert m_open.call_count == 2 + # Assert that only /etc/foo.conf was opened + assert all(call.args[0] == '/etc/foo.conf' for call in m_open.calls) + # Asser that the first open was for binary read, and the + # second was for binary write. + assert m_open.calls == [ + MockCall('/etc/foo.conf', 'rb'), + MockCall('/etc/foo.conf', 'wb'), + ] + + Note that ``MockCall`` is imported from ``tests.support.mock`` in the above + example. Also, the second assert above is redundant since it is covered in + the final assert, but both are included simply as an example. + +- **filehandles** - A dictionary mapping the unique file paths opened, to lists + of ``MockFH`` objects. Each open creates a unique ``MockFH`` object. Each + ``MockFH`` object itself has a number of useful attributes: + + - **filename** - The path to the file which was opened using + ``salt.utils.files.fopen()`` + + - **call** - A ``MockCall`` object representing the arguments passed to + ``salt.utils.files.fopen()``. Note that this ``MockCall`` is also available + in the parent ``MockOpen`` instance's **calls** list. + + - The following methods are mocked using :py:class:`unittest.mock.Mock` + objects, and Mock's built-in asserts (as well as the call data) can be used + as you would with any other Mock object: + + - **.read()** + + - **.readlines()** + + - **.readline()** + + - **.close()** + + - **.write()** + + - **.writelines()** + + - **.seek()** + + - The read functions (**.read()**, **.readlines()**, **.readline()**) all + work as expected, as does iterating through the file line by line (i.e. + ``for line in fh:``). + + - The **.tell()** method is also implemented in such a way that it updates + after each time the mocked filehandle is read, and will report the correct + position. The one caveat here is that **.seek()** doesn't actually work + (it's simply mocked), and will not change the position. Additionally, + neither **.write()** or **.writelines()** will modify the mocked + filehandle's contents. + + - The attributes **.write_calls** and **.writelines_calls** (no parenthesis) + are available as shorthands and correspond to lists containing the contents + passed for all calls to **.write()** and **.writelines()**, respectively. + +Examples +++++++++ + +.. code-block:: python + + with patch('salt.utils.files.fopen', mock_open(read_data=contents)) as m_open: + # Run the code you are unit testing + mymod.myfunc() + # Check that only the expected file was opened, and that it was opened + # only once. + assert m_open.call_count == 1 + assert list(m_open.filehandles) == ['/etc/foo.conf'] + # "opens" will be a list of all the mocked filehandles opened + opens = m_open.filehandles['/etc/foo.conf'] + # Check that we wrote the expected lines ("expected" here is assumed to + # be a list of strings) + assert opens[0].write_calls == expected + +.. code-block:: python + + with patch('salt.utils.files.fopen', mock_open(read_data=contents)) as m_open: + # Run the code you are unit testing + mymod.myfunc() + # Check that .readlines() was called (remember, it's a Mock) + m_open.filehandles['/etc/foo.conf'][0].readlines.assert_called() + +.. code-block:: python + + with patch('salt.utils.files.fopen', mock_open(read_data=contents)) as m_open: + # Run the code you are unit testing + mymod.myfunc() + # Check that we read the file and also wrote to it + m_open.filehandles['/etc/foo.conf'][0].read.assert_called_once() + m_open.filehandles['/etc/foo.conf'][1].writelines.assert_called_once() + +.. _`Mock()`: https://github.com/testing-cabal/mock + + Naming Conventions ------------------ @@ -198,7 +596,7 @@ prepended with the ``test_`` naming syntax, as described above. If a function does not start with ``test_``, then the function acts as a "normal" function and is not considered a testing function. It will not be included in the test run or testing output. The same principle applies to unit test files that -do not have the ``test_*.py`` naming syntax. This test file naming convention +do not have the ``test_*.py`` naming syntax. This test file naming convention is how the test runner recognizes that a test file contains unit tests. @@ -209,8 +607,7 @@ Most commonly, the following imports are necessary to create a unit test: .. code-block:: python - # Import Salt Testing libs - from tests.support.unit import skipIf, TestCase + from tests.support.unit import TestCase, skipIf If you need mock support to your tests, please also import: @@ -513,7 +910,7 @@ This function contains two raise statements and one return statement, so we know that we will need (at least) three tests. It has two function arguments and many references to non-builtin functions. In the tests below you will see that MagicMock's ``patch()`` method may be used as a context manager or as a -decorator. When patching the salt dunders however, please use the context +decorator. When patching the salt dunders however, please use the context manager approach. There are three test functions, one for each raise and return statement in the diff --git a/doc/topics/development/tutorial.rst b/doc/topics/development/tutorial.rst index f6890b8119..77990b1e46 100644 --- a/doc/topics/development/tutorial.rst +++ b/doc/topics/development/tutorial.rst @@ -34,7 +34,7 @@ Clone In your CLI, navigate to the directory into which you want clone the Salt codebase and submit the following command: -.. code-block:: shell +.. code-block:: bash $ git clone https://github.com//salt.git @@ -42,7 +42,7 @@ where ```` is the name of your GitHub account. After the clone has completed, add SaltStack as a second remote and fetch any changes from ``upstream``. -.. code-block:: shell +.. code-block:: bash $ cd salt $ git remote add upstream https://github.com/saltstack/salt.git @@ -53,7 +53,7 @@ the default branch for the SaltStack GitHub project. This branch needs to track ``upstream/develop`` so that we will get all upstream changes when they happen. -.. code-block:: shell +.. code-block:: bash $ git checkout develop $ git branch --set-upstream-to upstream/develop @@ -65,7 +65,7 @@ Fetch Fetch any ``upstream`` changes on the ``develop`` branch and sync them to your local copy of the branch with a single command: -.. code-block:: shell +.. code-block:: bash $ git pull --rebase @@ -87,7 +87,7 @@ updated. I'll select the ``alternatives`` module. Create a new branch off from ``develop``. Be sure to name it something short and descriptive. -.. code-block:: shell +.. code-block:: bash $ git checkout -b virt_ret @@ -97,10 +97,13 @@ Edit Edit the file you have selected, and verify that the changes are correct. -.. code-block:: shell +.. code-block:: bash $ vim salt/modules/alternatives.py $ git diff + +.. code-block:: diff + diff --git a/salt/modules/alternatives.py b/salt/modules/alternatives.py index 1653e5f..30c0a59 100644 --- a/salt/modules/alternatives.py @@ -122,7 +125,7 @@ Commit Stage and commit the changes. Write a descriptive commit summary, but try to keep it less than 50 characters. Review your commit. -.. code-block:: shell +.. code-block:: bash $ git add salt/modules/alternatives.py $ git commit -m 'modules.alternatives: __virtual__ return err msg' @@ -143,7 +146,7 @@ Push Push your branch to your GitHub account. You will likely need to enter your GitHub username and password. -.. code-block:: shell +.. code-block:: bash $ git push origin virt_ret Username for 'https://github.com': @@ -156,7 +159,7 @@ GitHub username and password. you have done this, you may need add the keys to your git repository configuration - .. code-block:: shell + .. code-block:: bash $ git config ssh.key ~/.ssh/ diff --git a/doc/topics/grains/index.rst b/doc/topics/grains/index.rst index eb6b4a6dd4..82d8b5548f 100644 --- a/doc/topics/grains/index.rst +++ b/doc/topics/grains/index.rst @@ -41,6 +41,11 @@ Grains data can be listed by using the 'grains.items' module: .. _static-custom-grains: +Using grains in a state +======================= + +To use a grain in a state you can access it via `{{ grains['key'] }}`. + Grains in the Minion Config =========================== @@ -124,9 +129,9 @@ Writing Grains The grains are derived by executing all of the "public" functions (i.e. those which do not begin with an underscore) found in the modules located in the Salt's core grains code, followed by those in any custom grains modules. The -functions in a grains module must return a Python :ref:`dict -`, where the dictionary keys are the names of grains, and -each key's value is that value for that grain. +functions in a grains module must return a :ref:`Python dictionary +`, where the dictionary keys are the names of grains, and each +key's value is that value for that grain. Custom grains modules should be placed in a subdirectory named ``_grains`` located under the :conf_master:`file_roots` specified by the master config diff --git a/doc/topics/index.rst b/doc/topics/index.rst index a4d9f68052..f641334537 100644 --- a/doc/topics/index.rst +++ b/doc/topics/index.rst @@ -119,9 +119,9 @@ can use the `Freenode webchat client`_ right from your browser. `Logs of the IRC channel activity`_ are being collected courtesy of Moritz Lenz. -.. _Freenode:: http://freenode.net/irc_servers.shtml -.. _Freenode webchat client:: http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83 -.. _Logs of the IRC channel activity:: http://irclog.perlgeek.de/salt/ +.. _Freenode: http://freenode.net/irc_servers.shtml +.. _`Freenode webchat client`: http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83 +.. _`Logs of the IRC channel activity`: http://irclog.perlgeek.de/salt/ If you wish to discuss the development of Salt itself join us in ``#salt-devel``. diff --git a/doc/topics/installation/freebsd.rst b/doc/topics/installation/freebsd.rst index 646d49170a..e54e7fc678 100644 --- a/doc/topics/installation/freebsd.rst +++ b/doc/topics/installation/freebsd.rst @@ -5,13 +5,14 @@ FreeBSD Installation ============ -Salt is available in the FreeBSD ports at `sysutils/py-salt. `__ +Salt is available in the FreeBSD ports tree at `sysutils/py-salt +`_. FreeBSD binary repo =================== -.. code-block:: shell +.. code-block:: bash pkg install py27-salt @@ -20,13 +21,13 @@ FreeBSD ports By default salt is packaged using python 2.7, but if you build your own packages from FreeBSD ports either by hand or with poudriere you can instead package it with your choice of python. Add a line to /etc/make.conf to choose your python flavour: -.. code-block:: shell +.. code-block:: text echo "DEFAULT_VERSIONS+= python=3.6" >> /etc/make.conf Then build the port and install: -.. code-block:: shell +.. code-block:: bash cd /usr/ports/sysutils/py-salt make install @@ -38,7 +39,7 @@ Post-installation tasks Copy the sample configuration file: -.. code-block:: shell +.. code-block:: bash cp /usr/local/etc/salt/master.sample /usr/local/etc/salt/master @@ -46,7 +47,7 @@ Copy the sample configuration file: Activate the Salt Master in ``/etc/rc.conf``: -.. code-block:: shell +.. code-block:: bash sysrc salt_master_enable="YES" @@ -54,7 +55,7 @@ Activate the Salt Master in ``/etc/rc.conf``: Start the Salt Master as follows: -.. code-block:: shell +.. code-block:: bash service salt_master start @@ -62,7 +63,7 @@ Start the Salt Master as follows: Copy the sample configuration file: -.. code-block:: shell +.. code-block:: bash cp /usr/local/etc/salt/minion.sample /usr/local/etc/salt/minion @@ -70,7 +71,7 @@ Copy the sample configuration file: Activate the Salt Minion in ``/etc/rc.conf``: -.. code-block:: shell +.. code-block:: bash sysrc salt_minion_enable="YES" @@ -78,7 +79,7 @@ Activate the Salt Minion in ``/etc/rc.conf``: Start the Salt Minion as follows: -.. code-block:: shell +.. code-block:: bash service salt_minion start diff --git a/doc/topics/installation/index.rst b/doc/topics/installation/index.rst index f430defc52..97158ab06c 100644 --- a/doc/topics/installation/index.rst +++ b/doc/topics/installation/index.rst @@ -142,7 +142,7 @@ Optional Dependencies settings) * gcc - dynamic `Cython`_ module compiling -.. _`Python 2.6`: http://python.org/download/ +.. _`Python 2.7`: http://python.org/download/ .. _`ZeroMQ`: http://zeromq.org/ .. _`pyzmq`: https://github.com/zeromq/pyzmq .. _`msgpack-python`: https://pypi.python.org/pypi/msgpack-python/ diff --git a/doc/topics/installation/windows.rst b/doc/topics/installation/windows.rst index 2c04b568f6..c838cf4a69 100644 --- a/doc/topics/installation/windows.rst +++ b/doc/topics/installation/windows.rst @@ -64,7 +64,7 @@ populated with values from the existing config, but they will be grayed out. There will also be a checkbox to use the existing config. If you continue, the existing config will be used. If the checkbox is unchecked, default values are displayed and can be changed. If you continue, the existing config file in -``c:\salt\conf`` will be removed along with the ``c:\salt\conf\minion.d` +``c:\salt\conf`` will be removed along with the ``c:\salt\conf\minion.d`` directory. The values entered will be used with the default config. The final page allows you to start the minion service and optionally change its diff --git a/doc/topics/jinja/index.rst b/doc/topics/jinja/index.rst index 12fd30484a..2be8d02798 100644 --- a/doc/topics/jinja/index.rst +++ b/doc/topics/jinja/index.rst @@ -4,14 +4,13 @@ Understanding Jinja =================== -`Jinja `_ is the default templating language -in SLS files. +`Jinja`_ is the default templating language in SLS files. + +.. _Jinja: http://jinja.pocoo.org/docs/templates/ Jinja in States =============== -.. _Jinja: http://jinja.pocoo.org/docs/templates/ - Jinja is evaluated before YAML, which means it is evaluated before the States are run. @@ -176,10 +175,9 @@ Saltstack extends `builtin filters`_ with these custom filters: ``strftime`` ------------ -Converts any time related object into a time based string. It requires a -valid :ref:`strftime directives `. An -:ref:`exhaustive list ` can be found in -the official Python documentation. +Converts any time related object into a time based string. It requires valid +strftime directives. An exhaustive list can be found :ref:`here +` in the Python documentation. .. code-block:: jinja @@ -224,8 +222,8 @@ maps. {%- load_yaml as foo %} bar: {{ bar|yaml_encode }} baz: {{ baz|yaml_encode }} - baz: {{ zip|yaml_encode }} - baz: {{ zap|yaml_encode }} + zip: {{ zip|yaml_encode }} + zap: {{ zap|yaml_encode }} {%- endload %} In the above case ``{{ bar }}`` and ``{{ foo.bar }}`` should be @@ -888,6 +886,10 @@ Example: encoding (usually a ``unicode`` type). This filter was incorrectly-named when it was added. ``json_decode_list`` will be supported until the Neon release. +.. deprecated:: 2018.3.3,Fluorine + The :jinja_ref:`tojson` filter accomplishes what this filter was designed + to do, making this filter redundant. + Recursively encodes all string elements of the list to bytes. @@ -917,6 +919,9 @@ Returns: encoding (usually a ``unicode`` type). This filter was incorrectly-named when it was added. ``json_decode_dict`` will be supported until the Neon release. +.. deprecated:: 2018.3.3,Fluorine + The :jinja_ref:`tojson` filter accomplishes what this filter was designed + to do, making this filter redundant. Recursively encodes all string items in the dictionary to bytes. @@ -936,6 +941,22 @@ Returns: {'a': '\xd0\x94'} +.. jinja_ref:: tojson + +``tojson`` +---------- + +.. versionadded:: 2018.3.3,Fluorine + +Dumps a data structure to JSON. + +This filter was added to provide this functionality to hosts which have a +Jinja release older than version 2.9 installed. If Jinja 2.9 or newer is +installed, then the upstream version of the filter will be used. See the +`upstream docs`__ for more information. + +.. __: http://jinja.pocoo.org/docs/2.10/templates/#tojson + .. jinja_ref:: random_hash ``random_hash`` @@ -1805,7 +1826,7 @@ Logs Yes, in Salt, one is able to debug a complex Jinja template using the logs. For example, making the call: -.. code-block:: yaml +.. code-block:: jinja {%- do salt.log.error('testing jinja logging') -%} diff --git a/doc/topics/netapi/index.rst b/doc/topics/netapi/index.rst index 43a01ca6ad..9b75cad88b 100644 --- a/doc/topics/netapi/index.rst +++ b/doc/topics/netapi/index.rst @@ -38,8 +38,8 @@ simply by creating a data structure. (And this is exactly how much of Salt's own internals work!) .. autoclass:: salt.netapi.NetapiClient - :members: local, local_async, local_subset, ssh, ssh_async, - runner, runner_async, wheel, wheel_async + :members: local, local_async, local_subset, ssh, runner, runner_async, + wheel, wheel_async .. toctree:: diff --git a/doc/topics/network_automation/index.rst b/doc/topics/network_automation/index.rst index 0ba8bea94f..723f866e80 100644 --- a/doc/topics/network_automation/index.rst +++ b/doc/topics/network_automation/index.rst @@ -21,8 +21,8 @@ New in Carbon (2016.11) ----------------------- The methodologies for network automation have been introduced in -:ref:`Carbon ` based on proxy -minions: +:ref:`2016.11.0 `. Network +automation support is based on proxy minions. - :mod:`NAPALM proxy ` - :mod:`Junos proxy` diff --git a/doc/topics/orchestrate/orchestrate_runner.rst b/doc/topics/orchestrate/orchestrate_runner.rst index 1a735f5e9e..78cd4b1ce1 100644 --- a/doc/topics/orchestrate/orchestrate_runner.rst +++ b/doc/topics/orchestrate/orchestrate_runner.rst @@ -235,7 +235,7 @@ To get a more dynamic state, use jinja variables together with Using the same example but passing on pillar data, the state would be like this. -.. code-block:: yaml +.. code-block:: jinja # /srv/salt/orch/deploy.sls {% set servers = salt['pillar.get']('servers', 'test') %} diff --git a/doc/topics/pillar/index.rst b/doc/topics/pillar/index.rst index f2936256da..a071b15ddc 100644 --- a/doc/topics/pillar/index.rst +++ b/doc/topics/pillar/index.rst @@ -141,7 +141,7 @@ targeting to them via a top file will have the key of ``company`` with a value of ``Foo Industries``. Consequently this data can be used from within modules, renderers, State SLS -files, and more via the shared pillar :ref:`dict `: +files, and more via the shared pillar dictionary: .. code-block:: jinja diff --git a/doc/topics/proxyminion/index.rst b/doc/topics/proxyminion/index.rst index d4b1934f96..1753f2f099 100644 --- a/doc/topics/proxyminion/index.rst +++ b/doc/topics/proxyminion/index.rst @@ -54,7 +54,7 @@ connection with the remote device only when required. New in 2016.11.0 ---------------- -Proxy minions now support configuration files with names ending in '*.conf' +Proxy minions now support configuration files with names ending in '\*.conf' and placed in /etc/salt/proxy.d. Proxy minions can now be configured in /etc/salt/proxy or /etc/salt/proxy.d @@ -387,8 +387,9 @@ Pre 2015.8 the proxymodule also must have an ``id()`` function. 2015.8 and foll this function because the proxy's id is required on the command line. Here is an example proxymodule used to interface to a *very* simple REST -server. Code for the server is in the `salt-contrib GitHub repository -`_ +server. Code for the server is in the `salt-contrib GitHub repository`_. + +.. _`salt-contrib GitHub repository`: https://github.com/saltstack/salt-contrib/tree/master/proxyminion_rest_example This proxymodule enables "service" enumeration, starting, stopping, restarting, and status; "package" installation, and a ping. @@ -738,7 +739,7 @@ This sections specifically talks about the SSH proxy module and explains the working of the example proxy module ``ssh_sample``. Here is a simple example proxymodule used to interface to a device over SSH. -Code for the SSH shell is in the `salt-contrib GitHub repository `_ +Code for the SSH shell is in the `salt-contrib GitHub repository`_. This proxymodule enables "package" installation. diff --git a/doc/topics/releases/0.6.0.rst b/doc/topics/releases/0.6.0.rst index 5cfb5a7fd1..2aee534753 100644 --- a/doc/topics/releases/0.6.0.rst +++ b/doc/topics/releases/0.6.0.rst @@ -47,8 +47,6 @@ You can find the source code for Salt on my GitHub page, I have also set up a few wiki pages explaining how to use and set up Salt. If you are using Arch Linux there is a package available in the Arch Linux AUR. -Salt 0.6.0 Source: :download:`salt-0.6.0.tar.gz` - GitHub page: |saltrepo| Wiki: https://github.com/saltstack/salt/wiki diff --git a/doc/topics/releases/0.7.0.rst b/doc/topics/releases/0.7.0.rst index 69c859762f..53b8d1ecbe 100644 --- a/doc/topics/releases/0.7.0.rst +++ b/doc/topics/releases/0.7.0.rst @@ -50,12 +50,8 @@ to Matthias Teege for tracking down some configuration bugs! Salt can be downloaded from the following locations; -Source Tarball: - -:download:`salt-0.7.0.tar.gz` - Arch Linux Package: https://aur.archlinux.org/packages/salt-git/ -Please enjoy the latest Salt release! \ No newline at end of file +Please enjoy the latest Salt release! diff --git a/doc/topics/releases/0.8.0.rst b/doc/topics/releases/0.8.0.rst index 1337af2365..656443f46c 100644 --- a/doc/topics/releases/0.8.0.rst +++ b/doc/topics/releases/0.8.0.rst @@ -5,8 +5,6 @@ Salt 0.8.0 release notes Salt 0.8.0 is ready for general consumption! The source tarball is available on GitHub for download: -:download:`salt-0.8.0.tar.gz` - A lot of work has gone into salt since the last release just 2 weeks ago, and salt has improved a great deal. A swath of new features are here along with performance and threading improvements! diff --git a/doc/topics/releases/0.8.7.rst b/doc/topics/releases/0.8.7.rst index 6b2a97336c..8df8feab37 100644 --- a/doc/topics/releases/0.8.7.rst +++ b/doc/topics/releases/0.8.7.rst @@ -13,7 +13,6 @@ but the back end to support expansion is in place. I also recently gave a presentation to the Utah Python users group in Salt Lake City, the slides from this presentation are available here: -:download:`Salt.pdf` The video from this presentation will be available shortly. @@ -74,7 +73,5 @@ making debugging of minion modules MUCH easier. Salt is nearing the goal of 1.0, where the core feature set and capability is complete! -Salt 0.8.7 can be downloaded from GitHub here: -:download:`salt-0.8.7.tar.gz` --Thomas S Hatch \ No newline at end of file +-Thomas S Hatch diff --git a/doc/topics/releases/0.8.8.rst b/doc/topics/releases/0.8.8.rst index 48c19e0e15..1923e6df8e 100644 --- a/doc/topics/releases/0.8.8.rst +++ b/doc/topics/releases/0.8.8.rst @@ -3,8 +3,7 @@ Salt 0.8.8 release notes ======================== Salt 0.8.8 is here! This release adds a great deal of code and some serious new -features. The latest release can be downloaded here: -:download:`salt-0.8.8.tar.gz` +features. Improved Documentation has been set up for salt using sphinx thanks to the efforts of Seth House. This new documentation system will act as the back end @@ -73,6 +72,5 @@ maintaining supreme usability and simplicity. If you would like a more complete overview of Salt please watch the Salt presentation: Slides: -:download:`Salt.pdf` --Thomas S Hatch \ No newline at end of file +-Thomas S Hatch diff --git a/doc/topics/releases/0.8.9.rst b/doc/topics/releases/0.8.9.rst index 88f946275a..767e7b3ee8 100644 --- a/doc/topics/releases/0.8.9.rst +++ b/doc/topics/releases/0.8.9.rst @@ -17,11 +17,7 @@ date has been filled in. Download! --------- -The Salt source can be downloaded from the salt GitHub site: - -:download:`salt-0.8.9.tar.gz` - -Or from PyPI: +The Salt source can be downloaded from PyPI: https://pypi.python.org/packages/source/s/salt/salt-0.8.9.tar.gz diff --git a/doc/topics/releases/0.9.0.rst b/doc/topics/releases/0.9.0.rst index 36a5c3dc34..5ab29304d5 100644 --- a/doc/topics/releases/0.9.0.rst +++ b/doc/topics/releases/0.9.0.rst @@ -14,11 +14,7 @@ improvements to the ZeroMQ systems. Download! --------- -The Salt source can be downloaded from the salt GitHub site: - -:download:`salt-0.9.0.tar.gz` - -Or from PyPI: +The Salt source can be downloaded from PyPI: https://pypi.python.org/packages/source/s/salt/salt-0.9.0.tar.gz @@ -124,4 +120,4 @@ Extensive utilities for managing processes publish ~~~~~~~ -Used by the peer interface to allow minions to make publications \ No newline at end of file +Used by the peer interface to allow minions to make publications diff --git a/doc/topics/releases/0.9.2.rst b/doc/topics/releases/0.9.2.rst index 53ee1df2bd..ea0f84624c 100644 --- a/doc/topics/releases/0.9.2.rst +++ b/doc/topics/releases/0.9.2.rst @@ -17,11 +17,7 @@ helping us clean up the states interface and make it ready for the world! Download! --------- -The Salt source can be downloaded from the salt GitHub site: - -:download:`salt-0.9.2.tar.gz` - -Or from PyPI: +The Salt source can be downloaded from PyPI: https://pypi.python.org/packages/source/s/salt/salt-0.9.2.tar.gz @@ -77,4 +73,4 @@ Cython Loading Disabled by Default Cython loading requires a development tool chain to be installed on the minion, requiring this by default can cause problems for most Salt deployments. If Cython auto loading is desired it will need to be turned on in the minion -config. \ No newline at end of file +config. diff --git a/doc/topics/releases/0.9.3.rst b/doc/topics/releases/0.9.3.rst index 1a308f77ff..9b95f10e45 100644 --- a/doc/topics/releases/0.9.3.rst +++ b/doc/topics/releases/0.9.3.rst @@ -16,11 +16,7 @@ system has been greatly refined and many new features are available. Download! --------- -The Salt source can be downloaded from the salt GitHub site: - -:download:`salt-0.9.3.tar.gz` - -Or from PyPI: +The Salt source can be downloaded from PyPI: https://pypi.python.org/packages/source/s/salt/salt-0.9.3.tar.gz diff --git a/doc/topics/releases/0.9.4.rst b/doc/topics/releases/0.9.4.rst index a3e18962cf..94f506d62c 100644 --- a/doc/topics/releases/0.9.4.rst +++ b/doc/topics/releases/0.9.4.rst @@ -18,11 +18,7 @@ our new and existing contributors. Download! ========= -The Salt source can be downloaded from the salt GitHub site: - -:download:`salt-0.9.4.tar.gz` - -Or from PyPI: +The Salt source can be downloaded from PyPI: https://pypi.python.org/packages/source/s/salt/salt-0.9.4.tar.gz @@ -145,4 +141,4 @@ Gentoo Support -------------- Additional experimental support has been added for Gentoo. This is found in -the contribution from Doug Renn, aka nestegg. \ No newline at end of file +the contribution from Doug Renn, aka nestegg. diff --git a/doc/topics/releases/2014.7.1.rst b/doc/topics/releases/2014.7.1.rst index 4b50ba23be..a2bfd9a6f9 100644 --- a/doc/topics/releases/2014.7.1.rst +++ b/doc/topics/releases/2014.7.1.rst @@ -4,7 +4,7 @@ Salt 2014.7.1 Release Notes :release: 2015-01-12 -Version 2014.7.1 is a bugfix release for :ref:`2014.7.0`. +Version 2014.7.1 is a bugfix release for :ref:`2014.7.0 `. The changes include: diff --git a/doc/topics/releases/2014.7.3.rst b/doc/topics/releases/2014.7.3.rst index 087c03283d..ccc9fc7308 100644 --- a/doc/topics/releases/2014.7.3.rst +++ b/doc/topics/releases/2014.7.3.rst @@ -2,9 +2,9 @@ Salt 2014.7.3 Release Notes =========================== -:release: TBA +:release: 2015-03-25 -Version 2014.7.3 is a bugfix release for :ref:`2014.7.0`. +Version 2014.7.3 is a bugfix release for :ref:`2014.7.0 `. Changes: diff --git a/doc/topics/releases/2014.7.4.rst b/doc/topics/releases/2014.7.4.rst index 614e29f498..d669d2c0e6 100644 --- a/doc/topics/releases/2014.7.4.rst +++ b/doc/topics/releases/2014.7.4.rst @@ -4,7 +4,7 @@ Salt 2014.7.4 Release Notes :release: 2015-03-30 -Version 2014.7.4 is a bugfix release for :ref:`2014.7.0`. +Version 2014.7.4 is a bugfix release for :ref:`2014.7.0 `. This is a security release. The security issues fixed have only been present since 2014.7.0, and only users of the two listed modules are vulnerable. The diff --git a/doc/topics/releases/2014.7.5.rst b/doc/topics/releases/2014.7.5.rst index 2bd8ab2d3c..9a329fdaf6 100644 --- a/doc/topics/releases/2014.7.5.rst +++ b/doc/topics/releases/2014.7.5.rst @@ -4,7 +4,7 @@ Salt 2014.7.5 Release Notes :release: 2015-04-16 -Version 2014.7.5 is a bugfix release for :ref:`2014.7.0`. +Version 2014.7.5 is a bugfix release for :ref:`2014.7.0 `. Changes: diff --git a/doc/topics/releases/2014.7.6.rst b/doc/topics/releases/2014.7.6.rst index 0b0c091a25..f522ff486a 100644 --- a/doc/topics/releases/2014.7.6.rst +++ b/doc/topics/releases/2014.7.6.rst @@ -4,1128 +4,1274 @@ Salt 2014.7.6 Release Notes :release: 2015-05-18 -Version 2014.7.6 is a bugfix release for :ref:`2014.7.0`. +Version 2014.7.6 is a bugfix release for :ref:`2014.7.0 `. -This release is a security release. A minor issue was found, as cited below: +Statistics +========== -- CVE-2015-4017 -- Certificates are not verified when connecting to server in - the Aliyun and Proxmox modules +- Total Merges: **122** +- Total Issue References: **66** +- Total PR References: **166** + +- Contributors: **49** (`0xf10e`_, `Azidburn`_, `F30`_, `JaseFace`_, `JohannesEbke`_, `aletourneau`_, `aneeshusa`_, `basepi`_, `bastichelaar`_, `bersace`_, `cachedout`_, `cedwards`_, `cellscape`_, `chris-prince`_, `clan`_, `clinta`_, `cr1st1p`_, `cro`_, `dr4Ke`_, `ericfode`_, `ether42`_, `garethgreenaway`_, `gtmanfred`_, `hvnsweeting`_, `jfindlay`_, `jleroy`_, `joejulian`_, `justinta`_, `kaithar`_, `lorengordon`_, `martinhoefling`_, `mguegan`_, `multani`_, `notpeter`_, `panticz`_, `rallytime`_, `rominf`_, `rubic`_, `s0undt3ch`_, `skizunov`_, `slinu3d`_, `t0rrant`_, `techhat`_, `teizz`_, `terminalmage`_, `thatch45`_, `twangboy`_, `vdesjardins`_, `vr-jack`_) + + +Security Fix +============ + +**CVE-2015-4017** Certificates are not verified when connecting to server in +the Aliyun and Proxmox modules Only users of the Aliyun or Proxmox cloud modules are at risk. The vulnerability does not exist in the latest 2015.5.0 release of Salt. -Changes: -- salt.runners.cloud.action() has changed the `fun` keyword argument to `func`. - Please update any calls to this function in the cloud runner. +Changelog for v2014.7.5..v2014.7.6 +================================== -Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +*Generated at: 2018-05-27 20:42:49 UTC* -- **PR** `#23810`_: (*rallytime*) Backport `#23757`_ to 2014.7 - @ *2015-05-18T15:30:21Z* +* **PR** `#23810`_: (`rallytime`_) Backport `#23757`_ to 2014.7 + @ *2015-05-18 15:30:21 UTC* - - **PR** `#23757`_: (*clan*) use abspath, do not eliminating symlinks - | refs: `#23810`_ - * aee00c8 Merge pull request `#23810`_ from rallytime/`bp-23757`_ - * fb32c32 use abspath, do not eliminating symlinks + * **PR** `#23757`_: (`clan`_) use abspath, do not eliminating symlinks (refs: `#23810`_) -- **PR** `#23809`_: (*rallytime*) Fix virtualport section of virt.get_nics loop - @ *2015-05-18T15:30:09Z* + * aee00c83df Merge pull request `#23810`_ from rallytime/bp-23757 - - **ISSUE** `#20198`_: (*jcftang*) virt.get_graphics, virt.get_nics are broken, in turn breaking other things - | refs: `#23809`_ - - **PR** `#21487`_: (*rallytime*) Backport `#21469`_ to 2014.7 - | refs: `#23809`_ - - **PR** `#21469`_: (*vdesjardins*) fixes `#20198`_: virt.get_graphics and virt.get_nics calls in module virt - | refs: `#21487`_ - * 6b3352b Merge pull request `#23809`_ from rallytime/virt_get_nics_fix - * 0616fb7 Fix virtualport section of virt.get_nics loop + * fb32c32065 use abspath, do not eliminating symlinks -- **PR** `#23823`_: (*gtmanfred*) add link local for ipv6 - @ *2015-05-17T12:48:25Z* +* **ISSUE** `#20198`_: (`jcftang`_) virt.get_graphics, virt.get_nics are broken, in turn breaking other things (refs: `#23809`_, `#21469`_) - * 188f03f Merge pull request `#23823`_ from gtmanfred/2014.7 - * 5ef006d add link local for ipv6 +* **PR** `#23809`_: (`rallytime`_) Fix virtualport section of virt.get_nics loop + @ *2015-05-18 15:30:09 UTC* -- **PR** `#23802`_: (*gtmanfred*) if it is ipv6 ip_to_int will fail - @ *2015-05-16T04:06:59Z* + * **PR** `#21487`_: (`rallytime`_) Backport `#21469`_ to 2014.7 (refs: `#23809`_) - - **PR** `#23573`_: (*techhat*) Scan all available networks for public and private IPs - | refs: `#23802`_ - * f3ca682 Merge pull request `#23802`_ from gtmanfred/2014.7 - * 2da98b5 if it is ipv6 ip_to_int will fail + * **PR** `#21469`_: (`vdesjardins`_) fixes `#20198`_: virt.get_graphics and virt.get_nics calls in module virt (refs: `#21487`_) -- **PR** `#23488`_: (*cellscape*) LXC cloud fixes - @ *2015-05-15T18:09:35Z* + * 6b3352bb1a Merge pull request `#23809`_ from rallytime/virt_get_nics_fix - - **ISSUE** `#16424`_: (*stanvit*) salt-run cloud.create fails with saltify - * d9af0c3 Merge pull request `#23488`_ from cellscape/lxc-cloud-fixes - * 64250a6 Remove profile from opts after creating LXC container + * 0616fb7884 Fix virtualport section of virt.get_nics loop - * c4047d2 Set destroy=True in opts when destroying cloud instance +* **PR** `#23823`_: (`gtmanfred`_) add link local for ipv6 + @ *2015-05-17 12:48:25 UTC* - * 9e1311a Store instance names in opts when performing cloud action + * 188f03f567 Merge pull request `#23823`_ from gtmanfred/2014.7 - * 934bc57 Correctly pass custom env to lxc-attach + * 5ef006d59d add link local for ipv6 - * 7fb85f7 Preserve test=True option in cloud states +* **PR** `#23802`_: (`gtmanfred`_) if it is ipv6 ip_to_int will fail + @ *2015-05-16 04:06:59 UTC* - * 9771b5a Fix detection of absent LXC container in cloud state + * **PR** `#23573`_: (`techhat`_) Scan all available networks for public and private IPs (refs: `#23802`_) - * fb24f0c Report failure when failed to create/clone LXC container + * f3ca682f92 Merge pull request `#23802`_ from gtmanfred/2014.7 - * 2d9aa2b Avoid shadowing variables in lxc module + * 2da98b58c8 if it is ipv6 ip_to_int will fail - * 792e102 Allow overriding profile options in lxc.cloud_init_interface +* **PR** `#23488`_: (`cellscape`_) LXC cloud fixes + @ *2015-05-15 18:09:35 UTC* - * 42bd64b Return changes on successful lxc.create from salt-cloud + * d9af0c3e82 Merge pull request `#23488`_ from cellscape/lxc-cloud-fixes - * 4409eab Return correct result when creating cloud LXC container + * 64250a67e5 Remove profile from opts after creating LXC container - * 377015c Issue `#16424`_: List all providers when creating salt-cloud instance without profile + * c4047d2a71 Set destroy=True in opts when destroying cloud instance -- **PR** `#23748`_: (*basepi*) [2014.7] Log salt-ssh roster render errors more assertively and verbosely - @ *2015-05-14T22:38:10Z* + * 9e1311a7cd Store instance names in opts when performing cloud action - - **ISSUE** `#22332`_: (*rallytime*) [salt-ssh] Add a check for host in /etc/salt/roster - | refs: `#23748`_ - * 808bbe1 Merge pull request `#23748`_ from basepi/salt-ssh.roster.host.check - * bc53e04 Log entire exception for render errors in roster + * 934bc57c73 Correctly pass custom env to lxc-attach - * 753de6a Log render errors in roster to error level + * 7fb85f7be1 Preserve test=True option in cloud states - * e01a7a9 Always let the real YAML error through + * 9771b5a313 Fix detection of absent LXC container in cloud state -- **PR** `#23731`_: (*twangboy*) Fixes `#22959`_: Trying to add a directory to an unmapped drive in windows - @ *2015-05-14T21:59:14Z* + * fb24f0cf02 Report failure when failed to create/clone LXC container - - **ISSUE** `#22959`_: (*highlyunavailable*) Windows Salt hangs if file.directory is trying to write to a drive that doesn't exist - * 72cf360 Merge pull request `#23731`_ from twangboy/fix_22959 - * 88e5495 Fixes `#22959`_: Trying to add a directory to an unmapped drive in windows + * 2d9aa2bb97 Avoid shadowing variables in lxc module -- **PR** `#23730`_: (*rallytime*) Backport `#23729`_ to 2014.7 - @ *2015-05-14T21:58:34Z* + * 792e1021f2 Allow to override profile options in lxc.cloud_init_interface - - **PR** `#23729`_: (*rallytime*) Partially merge `#23437`_ (grains fix) - | refs: `#23730`_ - - **PR** `#23437`_: (*cedwards*) Grains item patch - | refs: `#23729`_ - * 2610195 Merge pull request `#23730`_ from rallytime/`bp-23729`_ - * 1877cae adding support for nested grains to grains.item + * 42bd64b9b3 Return changes on successful lxc.create from salt-cloud -- **PR** `#23688`_: (*twangboy*) Added inet_pton to utils/validate/net.py for ip.set_static_ip in windows - @ *2015-05-14T16:15:56Z* + * 4409eabb83 Return correct result when creating cloud LXC container - * 3e9df88 Merge pull request `#23688`_ from twangboy/fix_23415 - * 6a91169 Fixed unused-import pylint error + * 377015c881 Issue `#16424`_: List all providers when creating salt-cloud instance without profile - * 5e25b3f fixed pylint errors +* **ISSUE** `#22332`_: (`rallytime`_) [salt-ssh] Add a check for host in /etc/salt/roster (refs: `#23748`_) - * 1a96766 Added inet_pton to utils/validate/net.py for ip.set_static_ip in windows +* **PR** `#23748`_: (`basepi`_) [2014.7] Log salt-ssh roster render errors more assertively and verbosely + @ *2015-05-14 22:38:10 UTC* -- **PR** `#23680`_: (*cachedout*) Rename kwarg in cloud runner - @ *2015-05-13T19:44:02Z* + * 808bbe1cb2 Merge pull request `#23748`_ from basepi/salt-ssh.roster.host.check - - **ISSUE** `#23403`_: (*iamfil*) salt.runners.cloud.action fun parameter is replaced - | refs: `#23680`_ - * 1b86460 Merge pull request `#23680`_ from cachedout/issue_23403 - * d5986c2 Rename kwarg in cloud runner + * bc53e049e0 Log entire exception for render errors in roster -- **PR** `#23674`_: (*cachedout*) Handle lists correctly in grains.list_prsesent - @ *2015-05-13T18:34:58Z* + * 753de6a621 Log render errors in roster to error level - - **ISSUE** `#23548`_: (*kkaig*) grains.list_present produces incorrect (?) output - | refs: `#23674`_ - * cd64af0 Merge pull request `#23674`_ from cachedout/issue_23548 - * da8a2f5 Handle lists correctly in grains.list_prsesent + * e01a7a90b3 Always let the real YAML error through -- **PR** `#23672`_: (*twangboy*) Fix user present - @ *2015-05-13T18:30:09Z* +* **ISSUE** `#22959`_: (`highlyunavailable`_) Windows Salt hangs if file.directory is trying to write to a drive that doesn't exist (refs: `#23731`_) - * d322a19 Merge pull request `#23672`_ from twangboy/fix_user_present - * 731e7af Merge branch '2014.7' of https://github.com/saltstack/salt into fix_user_present +* **PR** `#23731`_: (`twangboy`_) Fixes `#22959`_: Trying to add a directory to an unmapped drive in windows + @ *2015-05-14 21:59:14 UTC* - * d6f70a4 Fixed user.present to create password in windows + * 72cf360255 Merge pull request `#23731`_ from twangboy/fix_22959 -- **PR** `#23670`_: (*rallytime*) Backport `#23607`_ to 2014.7 - @ *2015-05-13T18:27:17Z* + * 88e5495b2d Fixes `#22959`_: Trying to add a directory to an unmapped drive in windows - - **ISSUE** `#23604`_: (*Azidburn*) service.dead on systemd Minion create an Error Message - | refs: `#23607`_ - - **PR** `#23607`_: (*Azidburn*) Fix for `#23604`_. No error reporting. Exitcode !=0 are ok - | refs: `#23670`_ - * 43f7025 Merge pull request `#23670`_ from rallytime/`bp-23607`_ - * ed30dc4 Fix for `#23604`_. No error reporting. Exitcode !=0 are ok +* **PR** `#23730`_: (`rallytime`_) Backport `#23729`_ to 2014.7 + @ *2015-05-14 21:58:34 UTC* -- **PR** `#23661`_: (*rallytime*) Merge `#23640`_ with whitespace fix - @ *2015-05-13T15:47:30Z* + * **PR** `#23729`_: (`rallytime`_) Partially merge `#23437`_ (grains fix) (refs: `#23730`_) - - **ISSUE** `#22141`_: (*Deshke*) grains.get_or_set_hash render error if hash begins with "%" - | refs: `#23640`_ - - **PR** `#23640`_: (*cachedout*) Add warning to get_or_set_hash about reserved chars - | refs: `#23661`_ - * 0f006ac Merge pull request `#23661`_ from rallytime/merge-23640 - * 4427f42 Whitespace fix + * **PR** `#23437`_: (`cedwards`_) Grains item patch (refs: `#23729`_) - * dd91154 Add warning to get_or_set_hash about reserved chars + * 2610195262 Merge pull request `#23730`_ from rallytime/bp-23729 -- **PR** `#23639`_: (*cachedout*) Handle exceptions raised by __virtual__ - @ *2015-05-13T15:11:12Z* + * 1877caecba adding support for nested grains to grains.item - - **ISSUE** `#23452`_: (*michaelforge*) minion crashed with empty grain - | refs: `#23639`_ - * 84e2ef8 Merge pull request `#23639`_ from cachedout/issue_23452 - * d418b49 Syntax error! +* **PR** `#23688`_: (`twangboy`_) Added inet_pton to utils/validate/net.py for ip.set_static_ip in windows + @ *2015-05-14 16:15:56 UTC* - * 45b4015 Handle exceptions raised by __virtual__ + * 3e9df883d6 Merge pull request `#23688`_ from twangboy/fix_23415 -- **PR** `#23637`_: (*cachedout*) Convert str master to list - @ *2015-05-13T15:08:19Z* + * 6a91169bae Fixed unused-import pylint error - - **ISSUE** `#23611`_: (*hubez*) master_type set to 'failover' but 'master' is not of type list but of type - | refs: `#23637`_ - * bd9b94b Merge pull request `#23637`_ from cachedout/issue_23611 - * 56cb1f5 Fix typo + * 5e25b3f355 fixed pylint errors - * f6fcf19 Convert str master to list + * 1a9676626f Added inet_pton to utils/validate/net.py for ip.set_static_ip in windows -- **PR** `#23595`_: (*rallytime*) Backport `#23549`_ to 2014.7 - @ *2015-05-12T21:19:40Z* +* **ISSUE** `#23403`_: (`iamfil`_) salt.runners.cloud.action fun parameter is replaced (refs: `#23680`_) - - **PR** `#23549`_: (*vr-jack*) Update __init__.py - | refs: `#23595`_ - * f20c0e4 Merge pull request `#23595`_ from rallytime/`bp-23549`_ - * 6efcac0 Update __init__.py +* **PR** `#23680`_: (`cachedout`_) Rename kwarg in cloud runner + @ *2015-05-13 19:44:02 UTC* -- **PR** `#23594`_: (*rallytime*) Backport `#23496`_ to 2014.7 - @ *2015-05-12T21:19:34Z* + * 1b86460d73 Merge pull request `#23680`_ from cachedout/issue_23403 - - **ISSUE** `#23110`_: (*martinhoefling*) Copying files from gitfs in file.recurse state fails - - **PR** `#23496`_: (*martinhoefling*) Fix for issue `#23110`_ - | refs: `#23594`_ - * 1acaf86 Merge pull request `#23594`_ from rallytime/`bp-23496`_ - * d5ae1d2 Fix for issue `#23110`_ This resolves issues when the freshly created directory is removed by fileserver.update. + * d5986c21b4 Rename kwarg in cloud runner -- **PR** `#23593`_: (*rallytime*) Backport `#23442`_ to 2014.7 - @ *2015-05-12T21:19:26Z* +* **ISSUE** `#23548`_: (`kkaig`_) grains.list_present produces incorrect (?) output (refs: `#23674`_) - - **PR** `#23442`_: (*clan*) add directory itself to keep list - | refs: `#23593`_ - * 2c221c7 Merge pull request `#23593`_ from rallytime/`bp-23442`_ - * 39869a1 check w/ low['name'] only +* **PR** `#23674`_: (`cachedout`_) Handle lists correctly in grains.list_prsesent + @ *2015-05-13 18:34:58 UTC* - * 304cc49 another fix for file defined w/ id, but require name + * cd64af0ce4 Merge pull request `#23674`_ from cachedout/issue_23548 - * 8814d41 add directory itself to keep list + * da8a2f5cb3 Handle lists correctly in grains.list_prsesent -- **PR** `#23606`_: (*twangboy*) Fixed checkbox for starting service and actually starting it - @ *2015-05-12T21:18:50Z* +* **PR** `#23672`_: (`twangboy`_) Fix user present + @ *2015-05-13 18:30:09 UTC* - * fadd1ef Merge pull request `#23606`_ from twangboy/fix_installer - * 038331e Fixed checkbox for starting service and actually starting it + * d322a19213 Merge pull request `#23672`_ from twangboy/fix_user_present -- **PR** `#23592`_: (*rallytime*) Backport `#23389`_ to 2014.7 - @ *2015-05-12T16:44:42Z* + * 731e7af3dd Merge branch '2014.7' of https://github.com/saltstack/salt into fix_user_present - - **ISSUE** `#22908`_: (*karanjad*) Add failhard option to salt orchestration - | refs: `#23389`_ - - **PR** `#23389`_: (*cachedout*) Correct fail_hard typo - | refs: `#23592`_ - * 10b3f0f Merge pull request `#23592`_ from rallytime/`bp-23389`_ - * 734cc43 Correct fail_hard typo + * d6f70a4545 Fixed user.present to create password in windows -- **PR** `#23573`_: (*techhat*) Scan all available networks for public and private IPs - | refs: `#23802`_ - @ *2015-05-12T15:22:22Z* +* **ISSUE** `#23604`_: (`Azidburn`_) service.dead on systemd Minion create an Error Message (refs: `#23607`_) - * cd34b9b Merge pull request `#23573`_ from techhat/novaquery - * f92db5e Linting +* **PR** `#23670`_: (`rallytime`_) Backport `#23607`_ to 2014.7 + @ *2015-05-13 18:27:17 UTC* - * 26e00d3 Scan all available networks for public and private IPs + * **PR** `#23607`_: (`Azidburn`_) Fix for `#23604`_. No error reporting. Exitcode !=0 are ok (refs: `#23670`_) -- **PR** `#23558`_: (*jfindlay*) reorder emerge command line - @ *2015-05-12T15:17:46Z* + * 43f7025000 Merge pull request `#23670`_ from rallytime/bp-23607 - - **ISSUE** `#23479`_: (*danielmorlock*) Typo in pkg.removed for Gentoo? - | refs: `#23558`_ - * 2a72cd7 Merge pull request `#23558`_ from jfindlay/fix_ebuild - * 45404fb reorder emerge command line + * ed30dc4642 Fix for `#23604`_. No error reporting. Exitcode !=0 are ok -- **PR** `#23530`_: (*dr4Ke*) salt-ssh state: fix including all salt:// references - @ *2015-05-12T15:13:43Z* +* **ISSUE** `#22141`_: (`Deshke`_) grains.get_or_set_hash render error if hash begins with "%" (refs: `#23640`_) - - **ISSUE** `#23355`_: (*dr4Ke*) salt-ssh: 'sources: salt://' files from 'pkg' state are not included in salt_state.tgz - | refs: `#23530`_ - * a664a3c Merge pull request `#23530`_ from dr4Ke/fix_salt-ssh_to_include_pkg_sources - * 5df6a80 fix pylint warning +* **PR** `#23661`_: (`rallytime`_) Merge `#23640`_ with whitespace fix + @ *2015-05-13 15:47:30 UTC* - * d0549e5 salt-ssh state: fix including all salt:// references + * **PR** `#23640`_: (`cachedout`_) Add warning to get_or_set_hash about reserved chars (refs: `#23661`_) -- **PR** `#23433`_: (*twangboy*) Obtain all software from the registry - @ *2015-05-11T22:47:52Z* + * 0f006ac1d8 Merge pull request `#23661`_ from rallytime/merge-23640 - - **ISSUE** `#23004`_: (*b18*) 2014.7.5 - Windows - pkg.list_pkgs - "nxlog" never shows up in output. - | refs: `#23433`_ - * 55c3869 Merge pull request `#23433`_ from twangboy/list_pkgs_fix - * 8ab5b1b Fix pylint error + * 4427f42bb6 Whitespace fix - * 2d11d65 Obtain all software from the registry + * dd9115466e Add warning to get_or_set_hash about reserved chars -- **PR** `#23554`_: (*jleroy*) Debian: Hostname always updated - @ *2015-05-11T21:57:00Z* +* **ISSUE** `#23452`_: (`landergate`_) minion crashed with empty grain (refs: `#23639`_) - * 755bed0 Merge pull request `#23554`_ from jleroy/debian-hostname-fix - * 5ff749e Debian: Hostname always updated +* **PR** `#23639`_: (`cachedout`_) Handle exceptions raised by __virtual__ + @ *2015-05-13 15:11:12 UTC* -- **PR** `#23551`_: (*dr4Ke*) grains.append unit tests, related to `#23474`_ - @ *2015-05-11T21:54:25Z* + * 84e2ef88fc Merge pull request `#23639`_ from cachedout/issue_23452 - * 6ec87ce Merge pull request `#23551`_ from dr4Ke/grains.append_unit_tests - * ebff9df fix pylint errors + * d418b49a77 Syntax error! - * c495404 unit tests for grains.append module function + * 45b4015d7d Handle exceptions raised by __virtual__ - * 0c9a323 use MagickMock +* **ISSUE** `#23611`_: (`hubez`_) master_type set to 'failover' but 'master' is not of type list but of type (refs: `#23637`_) - * c838a22 unit tests for grains.append module function +* **PR** `#23637`_: (`cachedout`_) Convert str master to list + @ *2015-05-13 15:08:19 UTC* -- **PR** `#23474`_: (*dr4Ke*) Fix grains.append in nested dictionary grains `#23411`_ - @ *2015-05-11T18:00:21Z* + * bd9b94ba8c Merge pull request `#23637`_ from cachedout/issue_23611 - - **ISSUE** `#23411`_: (*dr4Ke*) grains.append should work at any level of a grain - | refs: `#23440`_ - - **PR** `#23440`_: (*dr4Ke*) fix grains.append in nested dictionary grains `#23411`_ - | refs: `#23474`_ - * e96c5c5 Merge pull request `#23474`_ from dr4Ke/fix_grains.append_nested - * a01a5bb grains.get, parameter delimititer, versionadded: 2014.7.6 + * 56cb1f52e3 Fix typo - * b39f504 remove debugging output + * f6fcf19a7f Convert str master to list - * b6e15e2 fix grains.append in nested dictionary grains `#23411`_ +* **PR** `#23595`_: (`rallytime`_) Backport `#23549`_ to 2014.7 + @ *2015-05-12 21:19:40 UTC* -- **PR** `#23537`_: (*t0rrant*) Update changelog - @ *2015-05-11T17:02:16Z* + * **PR** `#23549`_: (`vr-jack`_) Update __init__.py (refs: `#23595`_) - * ab7e1ae Merge pull request `#23537`_ from t0rrant/patch-1 - * 8e03cc9 Update changelog + * f20c0e42ce Merge pull request `#23595`_ from rallytime/bp-23549 -- **PR** `#23538`_: (*cro*) Update date in LICENSE file - @ *2015-05-11T15:19:25Z* + * 6efcac09ad Update __init__.py - * b79fed3 Merge pull request `#23538`_ from cro/licupdate - * 345efe2 Update date in LICENSE file +* **ISSUE** `#23110`_: (`martinhoefling`_) Copying files from gitfs in file.recurse state fails (refs: `#23496`_) -- **PR** `#23505`_: (*aneeshusa*) Remove unused ssh config validator. Fixes `#23159`_. - @ *2015-05-09T13:24:15Z* +* **PR** `#23594`_: (`rallytime`_) Backport `#23496`_ to 2014.7 + @ *2015-05-12 21:19:34 UTC* - - **ISSUE** `#23159`_: (*aneeshusa*) Unused validator - * a123a36 Merge pull request `#23505`_ from aneeshusa/remove-unused-ssh-config-validator - * 90af167 Remove unused ssh config validator. Fixes `#23159`_. + * **PR** `#23496`_: (`martinhoefling`_) Fix for issue `#23110`_ (refs: `#23594`_) -- **PR** `#23467`_: (*slinu3d*) Added AWS v4 signature support - @ *2015-05-08T14:36:19Z* + * 1acaf86da7 Merge pull request `#23594`_ from rallytime/bp-23496 - - **ISSUE** `#20518`_: (*ekle*) module s3.get does not support eu-central-1 - | refs: `#23467`_ - * ca2c21a Merge pull request `#23467`_ from slinu3d/2014.7 - * 0b4081d Fixed pylint error at line 363 + * d5ae1d268a Fix for issue `#23110`_ This resolves issues when the freshly created directory is removed by fileserver.update. - * 5be5eb5 Fixed pylink errors +* **PR** `#23593`_: (`rallytime`_) Backport `#23442`_ to 2014.7 + @ *2015-05-12 21:19:26 UTC* - * e64f374 Fixed lint errors + * **PR** `#23442`_: (`clan`_) add directory itself to keep list (refs: `#23593`_) - * b9d1ac4 Added AWS v4 signature support + * 2c221c7332 Merge pull request `#23593`_ from rallytime/bp-23442 -- **PR** `#23444`_: (*techhat*) Add create_attach_volume to nova driver - @ *2015-05-07T19:51:32Z* + * 39869a15bd check w/ low['name'] only - * e6f9eec Merge pull request `#23444`_ from techhat/novacreateattach - * ebdb7ea Add create_attach_volume to nova driver + * 304cc499e9 another fix for file defined w/ id, but require name -- **PR** `#23460`_: (*s0undt3ch*) [2014.7] Update to latest stable bootstrap script v2015.05.07 - @ *2015-05-07T19:10:54Z* + * 8814d4180e add directory itself to keep list - - **ISSUE** `#563`_: (*chutz*) pidfile support for minion and master daemons - | refs: `#23460`_ - * e331463 Merge pull request `#23460`_ from s0undt3ch/hotfix/bootstrap-script-2014.7 - * edcd0c4 Update to latest stable bootstrap script v2015.05.07 +* **PR** `#23606`_: (`twangboy`_) Fixed checkbox for starting service and actually starting it + @ *2015-05-12 21:18:50 UTC* -- **PR** `#23439`_: (*techhat*) Add wait_for_passwd_maxtries variable - @ *2015-05-07T07:28:56Z* + * fadd1ef63c Merge pull request `#23606`_ from twangboy/fix_installer - * 7a8ce1a Merge pull request `#23439`_ from techhat/maxtries - * 0ad3ff2 Add wait_for_passwd_maxtries variable + * 038331edab Fixed checkbox for starting service and actually starting it -- **PR** `#23422`_: (*cro*) $HOME should not be used, some shells don't set it. - @ *2015-05-06T21:02:36Z* +* **ISSUE** `#22908`_: (`karanjad`_) Add failhard option to salt orchestration (refs: `#23389`_) - * 644eb75 Merge pull request `#23422`_ from cro/gce_sh_home - * 4ef9e6b Don't use $HOME to find user's directory, some shells don't set it +* **PR** `#23592`_: (`rallytime`_) Backport `#23389`_ to 2014.7 + @ *2015-05-12 16:44:42 UTC* -- **PR** `#23425`_: (*basepi*) [2014.7] Fix typo in FunctionWrapper - @ *2015-05-06T20:38:03Z* + * **PR** `#23389`_: (`cachedout`_) Correct fail_hard typo (refs: `#23592`_) - * ef17ab4 Merge pull request `#23425`_ from basepi/functionwrapper_typo - * c390737 Fix typo in FunctionWrapper + * 10b3f0f643 Merge pull request `#23592`_ from rallytime/bp-23389 -- **PR** `#23385`_: (*rallytime*) Backport `#23346`_ to 2014.7 - @ *2015-05-06T20:12:29Z* + * 734cc43801 Correct fail_hard typo - - **PR** `#23346`_: (*ericfode*) Allow file_map in salt-cloud to handle folders. - | refs: `#23385`_ - * 1b13ec0 Merge pull request `#23385`_ from rallytime/`bp-23346`_ - * 9efc13c more linting fixes +* **PR** `#23573`_: (`techhat`_) Scan all available networks for public and private IPs (refs: `#23802`_) + @ *2015-05-12 15:22:22 UTC* - * cf131c9 cleaned up some pylint errors + * cd34b9b6c4 Merge pull request `#23573`_ from techhat/novaquery - * f981699 added logic to sftp_file and file_map to allow folder uploads using file_map + * f92db5e92f Linting -- **PR** `#23414`_: (*jfindlay*) 2015.2 -> 2015.5 - @ *2015-05-06T20:04:02Z* + * 26e00d3ccc Scan all available networks for public and private IPs - * f8c7a62 Merge pull request `#23414`_ from jfindlay/update_branch - * 8074d16 2015.2 -> 2015.5 +* **ISSUE** `#23479`_: (`danielmorlock`_) Typo in pkg.removed for Gentoo? (refs: `#23558`_) -- **PR** `#23404`_: (*hvnsweeting*) saltapi cherrypy: initialize var when POST body is empty - @ *2015-05-06T17:35:56Z* +* **PR** `#23558`_: (`jfindlay`_) reorder emerge command line + @ *2015-05-12 15:17:46 UTC* - * 54b3bd4 Merge pull request `#23404`_ from hvnsweeting/cherrypy-post-emptybody-fix - * f85f8f9 initialize var when POST body is empty + * 2a72cd71c2 Merge pull request `#23558`_ from jfindlay/fix_ebuild -- **PR** `#23409`_: (*terminalmage*) Update Lithium docstrings in 2014.7 branch - @ *2015-05-06T16:20:46Z* + * 45404fb2a6 reorder emerge command line - * 160f703 Merge pull request `#23409`_ from terminalmage/update-lithium-docstrings-2014.7 - * bc97d01 Fix sphinx typo +* **ISSUE** `#23355`_: (`dr4Ke`_) salt-ssh: 'sources: salt://' files from 'pkg' state are not included in salt_state.tgz (refs: `#23530`_) - * 20006b0 Update Lithium docstrings in 2014.7 branch +* **PR** `#23530`_: (`dr4Ke`_) salt-ssh state: fix including all salt:// references + @ *2015-05-12 15:13:43 UTC* -- **PR** `#23397`_: (*jfindlay*) add more flexible whitespace to locale_gen search - @ *2015-05-06T03:44:11Z* + * a664a3c6fd Merge pull request `#23530`_ from dr4Ke/fix_salt-ssh_to_include_pkg_sources - - **ISSUE** `#17245`_: (*tomashavlas*) localemod does not generate locale for Arch - | refs: `#23307`_ `#23397`_ - * aa5fb0a Merge pull request `#23397`_ from jfindlay/fix_locale_gen - * 0941fef add more flexible whitespace to locale_gen search + * 5df6a8008c fix pylint warning -- **PR** `#23368`_: (*kaithar*) Backport `#23367`_ to 2014.7 - @ *2015-05-05T21:42:26Z* + * d0549e56ba salt-ssh state: fix including all salt:// references - - **PR** `#23367`_: (*kaithar*) Put the sed insert statement back in to the output. - | refs: `#23368`_ - - **PR** `#18368`_: (*basepi*) Merge forward from 2014.7 to develop - | refs: `#23367`_ `#23368`_ - * 0c76dd4 Merge pull request `#23368`_ from kaithar/`bp-23367`_ - * 577f419 Pylint fix +* **ISSUE** `#23004`_: (`b18`_) 2014.7.5 - Windows - pkg.list_pkgs - "nxlog" never shows up in output. (refs: `#23433`_) - * 8d9acd1 Put the sed insert statement back in to the output. +* **PR** `#23433`_: (`twangboy`_) Obtain all software from the registry + @ *2015-05-11 22:47:52 UTC* -- **PR** `#23350`_: (*lorengordon*) Append/prepend: search for full line - @ *2015-05-05T21:42:11Z* + * 55c3869861 Merge pull request `#23433`_ from twangboy/list_pkgs_fix - - **ISSUE** `#23294`_: (*variia*) file.replace fails to append if repl string partially available - | refs: `#23350`_ - * 3493cc1 Merge pull request `#23350`_ from lorengordon/file.replace_assume_line - * b60e224 Append/prepend: search for full line + * 8ab5b1b86f Fix pylint error -- **PR** `#23341`_: (*cachedout*) Fix syndic pid and logfile path - @ *2015-05-05T21:29:10Z* + * 2d11d6545e Obtain all software from the registry - - **ISSUE** `#23026`_: (*adelcast*) Incorrect salt-syndic logfile and pidfile locations - | refs: `#23341`_ - * 7be5c48 Merge pull request `#23341`_ from cachedout/issue_23026 - * e98e65e Fix tests +* **PR** `#23554`_: (`jleroy`_) Debian: Hostname always updated + @ *2015-05-11 21:57:00 UTC* - * 6011b43 Fix syndic pid and logfile path + * 755bed0abd Merge pull request `#23554`_ from jleroy/debian-hostname-fix -- **PR** `#23272`_: (*basepi*) [2014.7] Allow salt-ssh minion config overrides via master config and roster - | refs: `#23347`_ - @ ** + * 5ff749e487 Debian: Hostname always updated - - **ISSUE** `#19114`_: (*pykler*) salt-ssh and gpg pillar renderer - | refs: `#23188`_ `#23272`_ `#23347`_ - - **PR** `#23188`_: (*basepi*) [2014.7] Work around bug in salt-ssh in config.get for gpg renderer - | refs: `#23272`_ - * ea61abf Merge pull request `#23272`_ from basepi/salt-ssh.minion.config.19114 - * c223309 Add versionadded +* **ISSUE** `#23411`_: (`dr4Ke`_) grains.append should work at any level of a grain (refs: `#23440`_, `#23474`_) - * be7407f Lint +* **PR** `#23551`_: (`dr4Ke`_) grains.append unit tests, related to `#23474`_ + @ *2015-05-11 21:54:25 UTC* - * c2c3375 Missing comma + * **PR** `#23474`_: (`dr4Ke`_) Fix grains.append in nested dictionnary grains `#23411`_ (refs: `#23551`_) - * 8e3e8e0 Pass the minion_opts through the FunctionWrapper + * **PR** `#23440`_: (`dr4Ke`_) fix grains.append in nested dictionnary grains `#23411`_ (refs: `#23474`_) - * cb69cd0 Match the master config template in the master config reference + * 6ec87ce9f5 Merge pull request `#23551`_ from dr4Ke/grains.append_unit_tests - * 87fc316 Add Salt-SSH section to master config template + * ebff9df5b2 fix pylint errors - * 91dd9dc Add ssh_minion_opts to master config ref + * c4954046ad unit tests for grains.append module function - * c273ea1 Add minion config to salt-ssh doc + * 0c9a32326c use MagickMock - * a0b6b76 Add minion_opts to roster docs + * c838a22377 unit tests for grains.append module function - * 5212c35 Accept minion_opts from the target information +* **ISSUE** `#23411`_: (`dr4Ke`_) grains.append should work at any level of a grain (refs: `#23440`_, `#23474`_) - * e2099b6 Process `ssh_minion_opts` from master config +* **PR** `#23474`_: (`dr4Ke`_) Fix grains.append in nested dictionnary grains `#23411`_ (refs: `#23551`_) + @ *2015-05-11 18:00:21 UTC* - * 3b64214 Revert "Work around bug in salt-ssh in config.get for gpg renderer" + * **PR** `#23440`_: (`dr4Ke`_) fix grains.append in nested dictionnary grains `#23411`_ (refs: `#23474`_) - * 494953a Remove the strip (embracing multi-line YAML dump) + * e96c5c5bf3 Merge pull request `#23474`_ from dr4Ke/fix_grains.append_nested - * fe87f0f Dump multi-line yaml into the SHIM + * a01a5bb51e grains.get, parameter delimititer, versionadded: 2014.7.6 - * b751a72 Inject local minion config into shim if available + * b39f50475d remove debugging output -- **PR** `#23347`_: (*basepi*) [2014.7] Salt-SSH Backport FunctionWrapper.__contains__ - @ *2015-05-05T14:13:21Z* + * b6e15e295c fix grains.append in nested dictionnary grains `#23411`_ - - **ISSUE** `#19114`_: (*pykler*) salt-ssh and gpg pillar renderer - | refs: `#23188`_ `#23272`_ `#23347`_ - - **PR** `#23272`_: (*basepi*) [2014.7] Allow salt-ssh minion config overrides via master config and roster - | refs: `#23347`_ - - **PR** `#23188`_: (*basepi*) [2014.7] Work around bug in salt-ssh in config.get for gpg renderer - | refs: `#23272`_ - * 4f760dd Merge pull request `#23347`_ from basepi/salt-ssh.functionwrapper.contains.19114 - * 30595e3 Backport FunctionWrapper.__contains__ +* **PR** `#23537`_: (`t0rrant`_) Update changelog + @ *2015-05-11 17:02:16 UTC* -- **PR** `#23344`_: (*cachedout*) Explicitly set file_client on master - @ *2015-05-04T23:21:48Z* + * ab7e1aed8e Merge pull request `#23537`_ from t0rrant/patch-1 - - **ISSUE** `#22742`_: (*hvnsweeting*) salt-master says: "This master address: 'salt' was previously resolvable but now fails to resolve!" - | refs: `#23344`_ - * 02658b1 Merge pull request `#23344`_ from cachedout/issue_22742 - * 5adc96c Explicitly set file_client on master + * 8e03cc99d3 Update changelog -- **PR** `#23318`_: (*cellscape*) Honor seed argument in LXC container initializaton - @ *2015-05-04T20:58:12Z* +* **PR** `#23538`_: (`cro`_) Update date in LICENSE file + @ *2015-05-11 15:19:25 UTC* - - **PR** `#23311`_: (*cellscape*) Fix new container initialization in LXC runner - | refs: `#23318`_ - * ba7605d Merge pull request `#23318`_ from cellscape/honor-seed-argument - * 228b1be Honor seed argument in LXC container initializaton + * b79fed3a92 Merge pull request `#23538`_ from cro/licupdate -- **PR** `#23307`_: (*jfindlay*) check for /etc/locale.gen - @ *2015-05-04T20:56:32Z* + * 345efe25c9 Update date in LICENSE file - - **ISSUE** `#17245`_: (*tomashavlas*) localemod does not generate locale for Arch - | refs: `#23307`_ `#23397`_ - * 4ac4509 Merge pull request `#23307`_ from jfindlay/fix_locale_gen - * 101199a check for /etc/locale.gen +* **ISSUE** `#23159`_: (`aneeshusa`_) Unused validator (refs: `#23505`_) -- **PR** `#23324`_: (*s0undt3ch*) [2014.7] Update to the latest stable release of the bootstrap script v2015.05.04 - @ *2015-05-04T16:28:30Z* +* **PR** `#23505`_: (`aneeshusa`_) Remove unused ssh config validator. Fixes `#23159`_. + @ *2015-05-09 13:24:15 UTC* - - **ISSUE** `#580`_: (*thatch45*) recursive watch not being caught - | refs: `#23324`_ - - **ISSUE** `#552`_: (*jhutchins*) Support require and watch under the same state dec - | refs: `#23324`_ - - **PR** `#589`_: (*epoelke*) add --quiet and --outfile options to saltkey - | refs: `#23324`_ - - **PR** `#567`_: (*bastichelaar*) Added upstart module - | refs: `#23324`_ - - **PR** `#560`_: (*UtahDave*) The runas feature that was added in 93423aa2e5e4b7de6452090b0039560d2b13... - | refs: `#23324`_ - - **PR** `#504`_: (*SEJeff*) File state goodies - | refs: `#23324`_ - * f790f42 Merge pull request `#23324`_ from s0undt3ch/hotfix/bootstrap-script-2014.7 - * 6643e47 Update to the latest stable release of the bootstrap script v2015.05.04 + * a123a36f05 Merge pull request `#23505`_ from aneeshusa/remove-unused-ssh-config-validator -- **PR** `#23329`_: (*cro*) Require requests to verify cert when talking to aliyun and proxmox cloud providers - @ *2015-05-04T16:18:17Z* + * 90af1672ca Remove unused ssh config validator. Fixes `#23159`_. - * 5487367 Merge pull request `#23329`_ from cro/cloud_verify_cert - * 860d4b7 Turn on ssl verify for requests. +* **ISSUE** `#20518`_: (`ekle`_) module s3.get does not support eu-central-1 (refs: `#23467`_) -- **PR** `#23311`_: (*cellscape*) Fix new container initialization in LXC runner - | refs: `#23318`_ - @ *2015-05-04T09:55:29Z* +* **PR** `#23467`_: (`slinu3d`_) Added AWS v4 signature support + @ *2015-05-08 14:36:19 UTC* - * ea20176 Merge pull request `#23311`_ from cellscape/fix-salt-cloud-lxc-init - * 76fbb34 Fix new container initialization in LXC runner + * ca2c21a63c Merge pull request `#23467`_ from slinu3d/2014.7 -- **PR** `#23298`_: (*chris-prince*) Fixed issue `#18880`_ in 2014.7 branch - @ *2015-05-03T15:49:41Z* + * 0b4081d8f4 Fixed pylint error at line 363 - - **ISSUE** `#18880`_: (*johtso*) npm installed breaks when a module is missing - * c399b8f Merge pull request `#23298`_ from chris-prince/2014.7 - * 0fa25db Fixed issue `#18880`_ in 2014.7 branch + * 5be5eb5b14 Fixed pylink errors -- **PR** `#23292`_: (*rallytime*) Merge `#23151`_ with pylint fixes - @ *2015-05-02T03:54:12Z* + * e64f374ffa Fixed lint errors - - **ISSUE** `#23148`_: (*cr1st1p*) virt - error handling bogus if machine image location is wrong - - **PR** `#23151`_: (*cr1st1p*) Fixes `#23148`_ - | refs: `#23292`_ - * 16ecefd Merge pull request `#23292`_ from rallytime/merge-23151 - * 8ff852a Merge `#23151`_ with pylint fixes + * b9d1ac4f1f Added AWS v4 signature support - * 8ffa12e Fixes `#23148`_ +* **PR** `#23444`_: (`techhat`_) Add create_attach_volume to nova driver + @ *2015-05-07 19:51:32 UTC* -- **PR** `#23274`_: (*basepi*) [2014.7] Reduce salt-ssh debug log verbosity - @ *2015-05-01T20:19:23Z* + * e6f9eec02e Merge pull request `#23444`_ from techhat/novacreateattach - * ce24315 Merge pull request `#23274`_ from basepi/salt-ssh.debug.verbosity - * ecee6c6 Log stdout and stderr to trace + * ebdb7eae2d Add create_attach_volume to nova driver - * 08f54d7 Log stdout and stderr to trace as well +* **ISSUE** `#529`_: (`rubic`_) run salt in user space (refs: `#543`_) - * 9b9c30f Reduce salt-ssh debug log verbosity + * **PR** `saltstack/salt-bootstrap#563`_: (`notpeter`_) Ubuntu alternate ppas (refs: `#23460`_) -- **PR** `#23261`_: (*rallytime*) Fix tornado websocket event handler registration - @ *2015-05-01T18:20:31Z* + * **PR** `#543`_: (`rubic`_) updated documentation for user, fixed configuration template links (refs: #`saltstack/salt-bootstrap#563`_) - - **ISSUE** `#22605`_: (*mavenAtHouzz*) Tornado websockets event Handlers registration are incorrect - | refs: `#23261`_ - * 7b55e43 Merge pull request `#23261`_ from rallytime/`fix-22605`_ - * 4950fbf Fix tornado websocket event handler registration +* **PR** `#23460`_: (`s0undt3ch`_) [2014.7] Update to latest stable bootstrap script v2015.05.07 + @ *2015-05-07 19:10:54 UTC* -- **PR** `#23258`_: (*teizz*) TCP keepalives on the ret side, Revisited. - @ *2015-05-01T16:13:49Z* + * e331463319 Merge pull request `#23460`_ from s0undt3ch/hotfix/bootstrap-script-2014.7 - * 83ef7cb Merge pull request `#23258`_ from teizz/ret_keepalive_2014_7_5 - * 0b9fb6f The fixes by cachedout which were backported into 2015_2 were missing a single parameter thus not setting up the TCP keepalive for the ZeroMQ Channel by default. + * edcd0c41f2 Update to latest stable bootstrap script v2015.05.07 -- **PR** `#23241`_: (*techhat*) Move iptables log options after the jump - @ *2015-05-01T01:31:59Z* +* **PR** `#23439`_: (`techhat`_) Add wait_for_passwd_maxtries variable + @ *2015-05-07 07:28:56 UTC* - - **ISSUE** `#23224`_: (*twellspring*) iptables.append --log parameters must be after --jump LOG - | refs: `#23241`_ - * 8de3c83 Merge pull request `#23241`_ from techhat/issue23224 - * 87f7948 Move iptables log options after the jump + * 7a8ce1a954 Merge pull request `#23439`_ from techhat/maxtries -- **PR** `#23228`_: (*rallytime*) Backport `#23171`_ to 2014.7 - @ *2015-04-30T21:09:45Z* + * 0ad3ff2c88 Add wait_for_passwd_maxtries variable - - **PR** `#23171`_: (*skizunov*) Bugfix: 'clean_proc_dir' is broken - | refs: `#23228`_ - * f20210e Merge pull request `#23228`_ from rallytime/`bp-23171`_ - * e670e99 Bugfix: 'clean_proc_dir' is broken +* **PR** `#23422`_: (`cro`_) $HOME should not be used, some shells don't set it. + @ *2015-05-06 21:02:36 UTC* -- **PR** `#23227`_: (*rallytime*) Backport `#22808`_ to 2014.7 - @ *2015-04-30T21:09:14Z* + * 644eb75fec Merge pull request `#23422`_ from cro/gce_sh_home - - **ISSUE** `#22703`_: (*Xiol*) salt-ssh does not work with list matcher - | refs: `#22808`_ - - **PR** `#22808`_: (*basepi*) [2015.2] Add list targeting to salt-ssh flat roster - | refs: `#23227`_ - * 721cc28 Merge pull request `#23227`_ from rallytime/`bp-22808`_ - * d208a00 Dict, not list + * 4ef9e6ba06 Don't use $HOME to find user's directory, some shells don't set it - * a3f529e It's already been converted to a list +* **PR** `#23425`_: (`basepi`_) [2014.7] Fix typo in FunctionWrapper + @ *2015-05-06 20:38:03 UTC* - * dd57f2d Add list targeting to salt-ssh flat roster + * ef17ab4b2a Merge pull request `#23425`_ from basepi/functionwrapper_typo -- **PR** `#22823`_: (*hvnsweeting*) 22822 file directory clean - @ *2015-04-30T15:25:51Z* + * c390737f3e Fix typo in FunctionWrapper - * 82c22af Merge pull request `#22823`_ from hvnsweeting/22822-file-directory-clean - * c749c27 fix lint - remove unnecessary parenthesis +* **PR** `#23385`_: (`rallytime`_) Backport `#23346`_ to 2014.7 + @ *2015-05-06 20:12:29 UTC* - * cb3dfee refactor + * **PR** `#23346`_: (`ericfode`_) Allow file_map in salt-cloud to handle folders. (refs: `#23385`_) - * 8924b5a refactor: use relpath instead of do it manually + * 1b13ec04c2 Merge pull request `#23385`_ from rallytime/bp-23346 - * d3060a5 refactor + * 9efc13c810 more linting fixes - * 5759a0e bugfix: fix file.directory clean=True when it require parent dir + * cf131c9a5a cleaned up some pylint errors -- **PR** `#22977`_: (*bersace*) Fix fileserver backends __opts__ overwritten by _pillar - @ *2015-04-30T15:24:56Z* + * f981699c75 added logic to sftp_file and file_map to allow folder uploads using file_map - - **ISSUE** `#22941`_: (*bersace*) `_pillar` func breaks fileserver globals - | refs: `#22977`_ `#22942`_ - - **PR** `#22942`_: (*bersace*) Fix fileserver backends global overwritten by _pillar - | refs: `#22977`_ - * f6c0728 Merge pull request `#22977`_ from bersace/fix-fileserver-backends-pillar-side-effect - * 5f451f6 Fix fileserver backends __opts__ overwritten by _pillar +* **PR** `#23414`_: (`jfindlay`_) 2015.2 -> 2015.5 + @ *2015-05-06 20:04:02 UTC* -- **PR** `#23180`_: (*jfindlay*) fix typos from 36841bdd in masterapi.py - @ *2015-04-30T15:22:41Z* + * f8c7a62089 Merge pull request `#23414`_ from jfindlay/update_branch - - **ISSUE** `#23166`_: (*claudiupopescu*) "Error in function _minion_event" resulting in modules not loaded - | refs: `#23180`_ - * 34206f7 Merge pull request `#23180`_ from jfindlay/remote_event - * 72066e1 fix typos from 36841bdd in masterapi.py + * 8074d16d52 2015.2 -> 2015.5 -- **PR** `#23176`_: (*jfindlay*) copy standard cmd.run* kwargs into cmd.run_chroot - @ *2015-04-30T15:22:12Z* +* **PR** `#23404`_: (`hvnsweeting`_) saltapi cherrypy: initialize var when POST body is empty + @ *2015-05-06 17:35:56 UTC* - - **ISSUE** `#23153`_: (*cr1st1p*) cmdmod : run_chroot - broken in 2014.7.5 - missing kwargs - | refs: `#23176`_ - * b6b8216 Merge pull request `#23176`_ from jfindlay/run_chroot - * 7dc3417 copy standard cmd.run* kwargs into cmd.run_chroot + * 54b3bd43e4 Merge pull request `#23404`_ from hvnsweeting/cherrypy-post-emptybody-fix -- **PR** `#23193`_: (*joejulian*) supervisord.mod_watch should accept sfun - @ *2015-04-30T04:34:21Z* + * f85f8f954c initialize var when POST body is empty - - **ISSUE** `#23192`_: (*joejulian*) supervisord mod_watch does not accept sfun - | refs: `#23193`_ - * effacbe Merge pull request `#23193`_ from joejulian/2014.7_supervisord_accept_sfun - * efb59f9 supervisord.mod_watch should accept sfun +* **PR** `#23409`_: (`terminalmage`_) Update Lithium docstrings in 2014.7 branch + @ *2015-05-06 16:20:46 UTC* -- **PR** `#23188`_: (*basepi*) [2014.7] Work around bug in salt-ssh in config.get for gpg renderer - | refs: `#23272`_ - @ *2015-04-30T04:34:10Z* + * 160f703296 Merge pull request `#23409`_ from terminalmage/update-lithium-docstrings-2014.7 - - **ISSUE** `#19114`_: (*pykler*) salt-ssh and gpg pillar renderer - | refs: `#23188`_ `#23272`_ `#23347`_ - * 72fe88e Merge pull request `#23188`_ from basepi/salt-ssh.function.wrapper.gpg.19114 - * d73979e Work around bug in salt-ssh in config.get for gpg renderer + * bc97d011ba Fix sphinx typo -- **PR** `#23154`_: (*cachedout*) Re-establish channel on interruption in fileclient - @ *2015-04-29T16:18:59Z* + * 20006b06f6 Update Lithium docstrings in 2014.7 branch - - **ISSUE** `#21480`_: (*msciciel*) TypeError: string indices must be integers, not str - | refs: `#23154`_ - * 168508e Merge pull request `#23154`_ from cachedout/refresh_channel - * 9f8dd80 Re-establish channel on interruption in fileclient +* **ISSUE** `#17245`_: (`tomashavlas`_) localemod does not generate locale for Arch (refs: `#23397`_, `#23307`_) -- **PR** `#23146`_: (*rallytime*) Backport `#20779`_ to 2014.7 - @ *2015-04-28T20:45:06Z* +* **PR** `#23397`_: (`jfindlay`_) add more flexible whitespace to locale_gen search + @ *2015-05-06 03:44:11 UTC* - - **ISSUE** `#20647`_: (*ryan-lane*) file.serialize fails to serialize due to ordered dicts - | refs: `#20779`_ - - **PR** `#20779`_: (*cachedout*) Use declared yaml options - | refs: `#23146`_ - * 3b53e04 Merge pull request `#23146`_ from rallytime/`bp-20779`_ - * ffd1849 compare OrderedDicts in serializer unit test + * aa5fb0aa46 Merge pull request `#23397`_ from jfindlay/fix_locale_gen - * a221706 Just change serialize + * 0941fefd2b add more flexible whitespace to locale_gen search - * a111798 Use declared yaml options +* **PR** `#23368`_: (`kaithar`_) Backport `#23367`_ to 2014.7 + @ *2015-05-05 21:42:26 UTC* -- **PR** `#23145`_: (*rallytime*) Backport `#23089`_ to 2014.7 - @ *2015-04-28T20:44:56Z* + * **PR** `#23367`_: (`kaithar`_) Put the sed insert statement back in to the output. (refs: `#23368`_) - - **PR** `#23089`_: (*cachedout*) Stringify version number before lstrip - | refs: `#23145`_ - * 8bb4664 Merge pull request `#23145`_ from rallytime/`bp-23089`_ - * 93c41af Stringify version number before lstrip + * **PR** `#18368`_: (`basepi`_) Merge forward from 2014.7 to develop (refs: `#23368`_, `#23367`_) -- **PR** `#23144`_: (*rallytime*) Backport `#23124`_ to 2014.7 - @ *2015-04-28T20:44:46Z* + * 0c76dd4d8a Merge pull request `#23368`_ from kaithar/bp-23367 - - **ISSUE** `#16188`_: (*drawks*) salt.modules.parted has various functions with bogus input validation. - | refs: `#23124`_ - - **PR** `#23124`_: (*ether42*) fix parsing the output of parted in parted.list_() - | refs: `#23144`_ - * c85d36f Merge pull request `#23144`_ from rallytime/`bp-23124`_-2014-7 - * 6b64da7 fix parsing the output of parted + * 577f41972e Pylint fix -- **PR** `#23120`_: (*terminalmage*) Don't run os.path.relpath() if repo doesn't have a "root" param set - @ *2015-04-28T15:46:54Z* + * 8d9acd1f89 Put the sed insert statement back in to the output. - * a27b158 Merge pull request `#23120`_ from terminalmage/fix-gitfs-relpath - * 1860fff Don't run os.path.relpath() if repo doesn't have a "root" param set +* **ISSUE** `#23294`_: (`variia`_) file.replace fails to append if repl string partially available (refs: `#23350`_) -- **PR** `#23132`_: (*clinta*) Backport b27c176 - @ *2015-04-28T15:00:30Z* +* **PR** `#23350`_: (`lorengordon`_) Append/prepend: search for full line + @ *2015-05-05 21:42:11 UTC* - * fcba607 Merge pull request `#23132`_ from clinta/patch-2 - * a824d72 Backport b27c176 + * 3493cc1fca Merge pull request `#23350`_ from lorengordon/file.replace_assume_line -- **PR** `#23114`_: (*rallytime*) Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages - @ *2015-04-28T03:59:24Z* + * b60e224beb Append/prepend: search for full line - - **ISSUE** `#18476`_: (*Auha*) Upgrading salt on my master caused dependency issues - | refs: `#23114`_ `#18610`_ - - **PR** `#18610`_: (*rallytime*) Make ZMQ 4 installation docs for ubuntu more clear - | refs: `#23114`_ - * b0f4b28 Merge pull request `#23114`_ from rallytime/remove_ubuntu_zmq4_docs - * f6cc7c8 Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages +* **ISSUE** `#23026`_: (`adelcast`_) Incorrect salt-syndic logfile and pidfile locations (refs: `#23341`_) -- **PR** `#23108`_: (*rallytime*) Backport `#23097`_ to 2014.7 - @ *2015-04-28T03:58:05Z* +* **PR** `#23341`_: (`cachedout`_) Fix syndic pid and logfile path + @ *2015-05-05 21:29:10 UTC* - - **ISSUE** `#23085`_: (*xenophonf*) Use "s3fs" (not "s3") in fileserver_roots - | refs: `#23097`_ - - **PR** `#23097`_: (*rallytime*) Change s3 to s3fs in fileserver_roots docs example - | refs: `#23108`_ - * 399857f Merge pull request `#23108`_ from rallytime/`bp-23097`_ - * fa88984 Change s3 to s3fs in fileserver_roots docs example + * 7be5c48ad5 Merge pull request `#23341`_ from cachedout/issue_23026 -- **PR** `#23112`_: (*basepi*) [2014.7] Backport `#22199`_ to fix mysql returner save_load errors - @ *2015-04-28T03:55:44Z* + * e98e65e787 Fix tests - - **ISSUE** `#22171`_: (*basepi*) We should only call returner.save_load once per jid - | refs: `#22199`_ - - **PR** `#22199`_: (*basepi*) [2015.2] Put a bandaid on the save_load duplicate issue (mysql returner) - | refs: `#23112`_ - * 5541537 Merge pull request `#23112`_ from basepi/mysql_returner_save_load - * 0127012 Put a bandaid on the save_load duplicate issue + * 6011b437ca Fix syndic pid and logfile path -- **PR** `#23113`_: (*rallytime*) Revert "Backport `#22895`_ to 2014.7" - @ *2015-04-28T03:27:29Z* +* **ISSUE** `#19114`_: (`pykler`_) salt-ssh and gpg pillar renderer (refs: `#23347`_, `#23272`_, `#23188`_) - - **PR** `#22925`_: (*rallytime*) Backport `#22895`_ to 2014.7 - | refs: `#23113`_ - - **PR** `#22895`_: (*aletourneau*) pam_tally counter was not reset to 0 after a successful login - | refs: `#22925`_ - * dfe2066 Merge pull request `#23113`_ from saltstack/revert-22925-`bp-22895`_ - * b957ea8 Revert "Backport `#22895`_ to 2014.7" +* **PR** `#23272`_: (`basepi`_) [2014.7] Allow salt-ssh minion config overrides via master config and roster (refs: `#23347`_) + @ *2015-05-05 21:28:47 UTC* -- **PR** `#23094`_: (*terminalmage*) pygit2: disable cleaning of stale refs for authenticated remotes - @ *2015-04-27T20:51:28Z* + * **PR** `#23188`_: (`basepi`_) [2014.7] Work around bug in salt-ssh in config.get for gpg renderer (refs: `#23272`_) - - **ISSUE** `#23013`_: (*markusr815*) gitfs regression with authenticated repos - | refs: `#23094`_ - * 21515f3 Merge pull request `#23094`_ from terminalmage/issue23013 - * aaf7b04 pygit2: disable cleaning of stale refs for authenticated remotes + * ea61abfa68 Merge pull request `#23272`_ from basepi/salt-ssh.minion.config.19114 -- **PR** `#23048`_: (*jfindlay*) py-2.6 compat for utils/boto.py ElementTree exception - @ *2015-04-25T16:56:45Z* + * c223309bb7 Add versionadded - * d45aa21 Merge pull request `#23048`_ from jfindlay/ET_error - * 64c42cc py-2.6 compat for utils/boto.py ElementTree exception + * be7407feae Lint -- **PR** `#23025`_: (*jfindlay*) catch exceptions on bad system locales/encodings - @ *2015-04-25T16:56:30Z* + * c2c337567e Missing comma - - **ISSUE** `#22981`_: (*syphernl*) Locale state throwing traceback when generating not (yet) existing locale - | refs: `#23025`_ - * d25a5c1 Merge pull request `#23025`_ from jfindlay/fix_sys_locale - * 9c4d62b catch exceptions on bad system locales/encodings + * 8e3e8e073a Pass the minion_opts through the FunctionWrapper -- **PR** `#22932`_: (*hvnsweeting*) bugfix: also manipulate dir_mode when source not defined - @ *2015-04-25T16:54:58Z* + * cb69cd07de Match the master config template in the master config reference - * 5e44b59 Merge pull request `#22932`_ from hvnsweeting/file-append-bugfix - * 3f368de do not use assert in execution module + * 87fc3161f9 Add Salt-SSH section to master config template - * 9d4fd4a bugfix: also manipulate dir_mode when source not defined + * 91dd9dcbdc Add ssh_minion_opts to master config ref -- **PR** `#23055`_: (*jfindlay*) prevent ps module errors on accessing dead procs - @ *2015-04-24T22:39:49Z* + * c273ea14c6 Add minion config to salt-ssh doc - - **ISSUE** `#23021`_: (*ether42*) ps.pgrep raises NoSuchProcess - | refs: `#23055`_ - * c2416a4 Merge pull request `#23055`_ from jfindlay/fix_ps - * c2dc7ad prevent ps module errors on accessing dead procs + * a0b6b760c3 Add minion_opts to roster docs -- **PR** `#23031`_: (*jfindlay*) convert exception e.message to just e - @ *2015-04-24T18:38:13Z* + * 5212c35260 Accept minion_opts from the target information - * bfd9158 Merge pull request `#23031`_ from jfindlay/exception - * 856bad1 convert exception e.message to just e + * e2099b6e1b Process `ssh_minion_opts` from master config -- **PR** `#23015`_: (*hvnsweeting*) if status of service is stop, there is not an error with it - @ *2015-04-24T14:35:10Z* + * 3b64214377 Revert "Work around bug in salt-ssh in config.get for gpg renderer" - * 7747f33 Merge pull request `#23015`_ from hvnsweeting/set-non-error-lvl-for-service-status-log - * 92ea163 if status of service is stop, there is not an error with it + * 494953a208 Remove the strip (embracing multi-line YAML dump) -- **PR** `#23000`_: (*jfindlay*) set systemd service killMode to process for minion - @ *2015-04-24T03:42:39Z* + * fe87f0fe39 Dump multi-line yaml into the SHIM - - **ISSUE** `#22993`_: (*jetpak*) salt-minion restart causes all spawned daemons to die on centos7 (systemd) - | refs: `#23000`_ - * 2e09789 Merge pull request `#23000`_ from jfindlay/systemd_kill - * 3d575e2 set systemd service killMode to process for minion + * b751a7281c Inject local minion config into shim if available -- **PR** `#22999`_: (*jtand*) Added retry_dns to minion doc. - @ *2015-04-24T03:30:24Z* +* **ISSUE** `#19114`_: (`pykler`_) salt-ssh and gpg pillar renderer (refs: `#23347`_, `#23272`_, `#23188`_) - - **ISSUE** `#22707`_: (*arthurlogilab*) retry_dns of master configuration is missing from the documentation - | refs: `#22999`_ - * b5c059a Merge pull request `#22999`_ from jtand/fix_22707 - * 8486e17 Added retry_dns to minion doc. +* **PR** `#23347`_: (`basepi`_) [2014.7] Salt-SSH Backport FunctionWrapper.__contains__ + @ *2015-05-05 14:13:21 UTC* -- **PR** `#22990`_: (*techhat*) Use the proper cloud conf variable - @ *2015-04-23T17:48:07Z* + * **PR** `#23272`_: (`basepi`_) [2014.7] Allow salt-ssh minion config overrides via master config and roster (refs: `#23347`_) - * 27dc877 Merge pull request `#22990`_ from techhat/2014.7 - * d33bcbc Use the proper cloud conf variable + * **PR** `#23188`_: (`basepi`_) [2014.7] Work around bug in salt-ssh in config.get for gpg renderer (refs: `#23272`_) -- **PR** `#22976`_: (*multani*) Improve state_output documentation - @ *2015-04-23T12:24:22Z* + * 4f760dd9cb Merge pull request `#23347`_ from basepi/salt-ssh.functionwrapper.contains.19114 - * 13dff65 Merge pull request `#22976`_ from multani/fix/state-output-doc - * 19efd41 Improve state_output documentation + * 30595e3ff7 Backport FunctionWrapper.__contains__ -- **PR** `#22955`_: (*terminalmage*) Fix regression introduced yesterday in dockerio module - @ *2015-04-22T18:56:39Z* +* **ISSUE** `#22742`_: (`hvnsweeting`_) salt-master says: "This master address: 'salt' was previously resolvable but now fails to resolve!" (refs: `#23344`_) - * 89fa185 Merge pull request `#22955`_ from terminalmage/dockerio-run-fix - * b4472ad Fix regression introduced yesterday in dockerio module +* **PR** `#23344`_: (`cachedout`_) Explicitely set file_client on master + @ *2015-05-04 23:21:48 UTC* -- **PR** `#22954`_: (*rallytime*) Backport `#22909`_ to 2014.7 - @ *2015-04-22T18:56:20Z* + * 02658b1e60 Merge pull request `#23344`_ from cachedout/issue_22742 - - **PR** `#22909`_: (*mguegan*) Fix compatibility with pkgin > 0.7 - | refs: `#22954`_ - * 46ef227 Merge pull request `#22954`_ from rallytime/`bp-22909`_ - * 70c1cd3 Fix compatibility with pkgin > 0.7 + * 5adc96ce7f Explicitely set file_client on master -- **PR** `#22856`_: (*jfindlay*) increase timeout and decrease tries for route53 records - @ *2015-04-22T16:47:01Z* +* **PR** `#23318`_: (`cellscape`_) Honor seed argument in LXC container initializaton + @ *2015-05-04 20:58:12 UTC* - - **ISSUE** `#18720`_: (*Reiner030*) timeouts when setting Route53 records - | refs: `#22856`_ - * c9ae593 Merge pull request `#22856`_ from jfindlay/route53_timeout - * ba4a786 add route53 record sync wait, default=False + * **PR** `#23311`_: (`cellscape`_) Fix new container initialization in LXC runner (refs: `#23318`_) - * ea2fd50 increase timeout and tries for route53 records + * ba7605d1cb Merge pull request `#23318`_ from cellscape/honor-seed-argument -- **PR** `#22946`_: (*s0undt3ch*) Test with a more recent pip version to avoid a traceback - @ *2015-04-22T16:25:17Z* + * 228b1be299 Honor seed argument in LXC container initializaton - * a178d44 Merge pull request `#22946`_ from s0undt3ch/2014.7 - * bc87749 Test with a more recent pip version to avoid a traceback +* **ISSUE** `#17245`_: (`tomashavlas`_) localemod does not generate locale for Arch (refs: `#23397`_, `#23307`_) -- **PR** `#22945`_: (*garethgreenaway*) Fixes to scheduler - @ *2015-04-22T16:25:00Z* +* **PR** `#23307`_: (`jfindlay`_) check for /etc/locale.gen + @ *2015-05-04 20:56:32 UTC* - - **ISSUE** `#22571`_: (*BoomerB*) same error message as on issue `#18504`_ - | refs: `#22945`_ - * de339be Merge pull request `#22945`_ from garethgreenaway/22571_2014_7_schedule_pillar_refresh_seconds_exceptions - * bfa6d25 Fixing a reported issue when using a scheduled job from pillar with splay. _seconds element that acted as a backup of the actual seconds was being removed when pillar was refreshed and causing exceptions. This fix moves some splay related code out of the if else condition so it's checked whether the job is in the job queue or not. + * 4ac4509c57 Merge pull request `#23307`_ from jfindlay/fix_locale_gen -- **PR** `#22887`_: (*hvnsweeting*) fix `#18843`_ - @ *2015-04-22T15:47:05Z* + * 101199ac14 check for /etc/locale.gen - - **ISSUE** `#18843`_: (*calvinhp*) State user.present will fail to create home if user exists and homedir doesn't - * 12d2b91 Merge pull request `#22887`_ from hvnsweeting/18843-fix-user-present-home - * 7fe7b08 run user.chhome once to avoid any side-effect when run it twice +* **ISSUE** `saltstack/salt-bootstrap#580`_: (`bradthurber`_) git develop broken in centos6/rhel6/others? due to missing python tornado dep (refs: `#23324`_) - * 19de995 clarify the usage of home arg +* **ISSUE** `saltstack/salt-bootstrap#560`_: (`bradthurber`_) param to avoid git install on CentOS/RHEL? (refs: `#23324`_) - * d6dc09a enhance doc, as usermod on ubuntu 12.04 will not CREATE home +* **ISSUE** `#552`_: (`jhutchins`_) Support require and watch under the same state dec (refs: `#23324`_) - * 0ce4d7f refactor: force to use boolean + * **PR** `saltstack/salt-bootstrap#589`_: (`panticz`_) Fix Debian Squeeze backports mirror (refs: `#23324`_) - * 849d19e log debug the creating dir process + * **PR** `saltstack/salt-bootstrap#504`_: (`rominf`_) opensuse 13.2: fix installation (refs: `#23324`_) - * c4e95b9 fix `#18843`_: usermod won't create a dir if old home does not exist + * **PR** `#567`_: (`bastichelaar`_) Added upstart module (refs: `#23324`_) -- **PR** `#22930`_: (*jfindlay*) localemod.gen_locale now always returns a boolean - @ *2015-04-22T15:37:39Z* +* **PR** `#23324`_: (`s0undt3ch`_) [2014.7] Update to the latest stable release of the bootstrap script v2015.05.04 + @ *2015-05-04 16:28:30 UTC* - - **ISSUE** `#21140`_: (*holms*) locale.present state executed successfully, although originally fails - | refs: `#22930`_ `#22829`_ - - **ISSUE** `#2417`_: (*ffa*) Module standards - | refs: `#22829`_ - - **PR** `#22829`_: (*F30*) Always return a boolean in gen_locale() - | refs: `#22930`_ - * b7de7bd Merge pull request `#22930`_ from jfindlay/localegen_bool - * 399399f localemod.gen_locale now always returns a boolean + * f790f42ed6 Merge pull request `#23324`_ from s0undt3ch/hotfix/bootstrap-script-2014.7 -- **PR** `#22933`_: (*hvnsweeting*) add test for `#18843`_ - @ *2015-04-22T15:27:18Z* + * 6643e47ce5 Update to the latest stable release of the bootstrap script v2015.05.04 - - **ISSUE** `#18843`_: (*calvinhp*) State user.present will fail to create home if user exists and homedir doesn't - * 11bcf14 Merge pull request `#22933`_ from hvnsweeting/18843-test - * b13db32 add test for `#18843`_ +* **PR** `#23329`_: (`cro`_) Require requests to verify cert when talking to aliyun and proxmox cloud providers + @ *2015-05-04 16:18:17 UTC* -- **PR** `#22925`_: (*rallytime*) Backport `#22895`_ to 2014.7 - | refs: `#23113`_ - @ *2015-04-22T02:30:26Z* + * 5487367baa Merge pull request `#23329`_ from cro/cloud_verify_cert - - **PR** `#22895`_: (*aletourneau*) pam_tally counter was not reset to 0 after a successful login - | refs: `#22925`_ - * 6890752 Merge pull request `#22925`_ from rallytime/`bp-22895`_ - * 3852d96 Pylint fix + * 860d4b7338 Turn on ssl verify for requests. - * 90f7829 Fixed pylint issues +* **PR** `#23311`_: (`cellscape`_) Fix new container initialization in LXC runner (refs: `#23318`_) + @ *2015-05-04 09:55:29 UTC* - * 5ebf159 Cleaned up pull request + * ea2017672d Merge pull request `#23311`_ from cellscape/fix-salt-cloud-lxc-init - * a08ac47 pam_tally counter was not reset to 0 after a successful login + * 76fbb34e7d Fix new container initialization in LXC runner -- **PR** `#22914`_: (*cachedout*) Call proper returner function in jobs.list_jobs - @ *2015-04-22T00:49:01Z* +* **ISSUE** `#18880`_: (`johtso`_) npm installed breaks when a module is missing (refs: `#23298`_) - - **ISSUE** `#22790`_: (*whiteinge*) jobs.list_jobs runner tracebacks on 'missing' argument - | refs: `#22914`_ - * eca37eb Merge pull request `#22914`_ from cachedout/issue_22790 - * d828d6f Call proper returner function in jobs.list_jobs +* **PR** `#23298`_: (`chris-prince`_) Fixed issue `#18880`_ in 2014.7 branch + @ *2015-05-03 15:49:41 UTC* -- **PR** `#22918`_: (*JaseFace*) Add a note to the git_pillar docs stating that GitPython is the only currently supported provider - @ *2015-04-22T00:48:26Z* + * c399b8f568 Merge pull request `#23298`_ from chris-prince/2014.7 - * 44f3409 Merge pull request `#22918`_ from JaseFace/git-pillar-provider-doc-note - * 0aee5c2 Add a note to the git_pillar docs stating that GitPython is the only currently supported provider + * 0fa25dbb58 Fixed issue `#18880`_ in 2014.7 branch -- **PR** `#22907`_: (*techhat*) Properly merge cloud configs to create profiles - @ *2015-04-21T22:02:44Z* +* **ISSUE** `#23148`_: (`cr1st1p`_) virt - error handling bogus if machine image location is wrong (refs: `#23151`_) - * 31c461f Merge pull request `#22907`_ from techhat/cloudconfig - * 3bf4e66 Properly merge cloud configs to create profiles +* **PR** `#23292`_: (`rallytime`_) Merge `#23151`_ with pylint fixes + @ *2015-05-02 03:54:12 UTC* -- **PR** `#22894`_: (*0xf10e*) Fix issue `#22782`_ - @ *2015-04-21T18:55:18Z* + * **PR** `#23151`_: (`cr1st1p`_) Fixes `#23148`_ (refs: `#23292`_) - * f093975 Merge pull request `#22894`_ from 0xf10e/2014.7 - * 58fa24c Clarify doc on kwarg 'roles' for user_present(). + * 16ecefd466 Merge pull request `#23292`_ from rallytime/merge-23151 - * f0ae2eb Improve readability by renaming tenant_role + * 8ff852a23a Merge `#23151`_ with pylint fixes -- **PR** `#22902`_: (*rallytime*) Change state example to use proper kwarg - @ *2015-04-21T18:50:47Z* + * 8ffa12e82d Fixes `#23148`_ - - **ISSUE** `#12003`_: (*MarkusMuellerAU*) [state.dockerio] docker.run TypeError: run() argument after ** must be a mapping, not str - | refs: `#22902`_ - * c802ba7 Merge pull request `#22902`_ from rallytime/docker_doc_fix - * 8f70346 Change state example to use proper kwarg +* **PR** `#23274`_: (`basepi`_) [2014.7] Reduce salt-ssh debug log verbosity + @ *2015-05-01 20:19:23 UTC* -- **PR** `#22898`_: (*terminalmage*) dockerio: better error message for native exec driver - @ *2015-04-21T18:02:58Z* + * ce24315a4b Merge pull request `#23274`_ from basepi/salt-ssh.debug.verbosity - * 81771a7 Merge pull request `#22898`_ from terminalmage/issue12003 - * c375309 dockerio: better error message for native exec driver + * ecee6c68f4 Log stdout and stderr to trace -- **PR** `#22897`_: (*rallytime*) Add param documentation for file.replace state - @ *2015-04-21T17:31:04Z* + * 08f54d79c6 Log stdout and stderr to trace as well - - **ISSUE** `#22825`_: (*paolodina*) Issue using file.replace in state file - | refs: `#22897`_ - * e2ec4ec Merge pull request `#22897`_ from rallytime/`fix-22825`_ - * 9c51630 Add param documentation for file.replace state + * 9b9c30f5ad Reduce salt-ssh debug log verbosity -- **PR** `#22850`_: (*bersace*) Fix pillar and salt fileserver mixed - @ *2015-04-21T17:04:33Z* +* **ISSUE** `#22605`_: (`mavenAtHouzz`_) Tornado websockets event Handlers registration are incorrect (refs: `#23261`_) - - **ISSUE** `#22844`_: (*bersace*) LocalClient file cache confuse pillar and state files - | refs: `#22850`_ - * fd53889 Merge pull request `#22850`_ from bersace/fix-pillar-salt-mixed - * 31b98e7 Initialize state file client after pillar loading +* **PR** `#23261`_: (`rallytime`_) Fix tornado websocket event handler registration + @ *2015-05-01 18:20:31 UTC* - * f6bebb7 Use saltenv + * 7b55e4310f Merge pull request `#23261`_ from rallytime/fix-22605 -- **PR** `#22818`_: (*twangboy*) Added documentation regarding pip in windows - @ *2015-04-21T03:58:59Z* + * 4950fbf2b3 Fix tornado websocket event handler registration - * 1380fec Merge pull request `#22818`_ from twangboy/upd_pip_docs - * cb999c7 Update pip.py +* **PR** `#23258`_: (`teizz`_) TCP keepalives on the ret side, Revisited. + @ *2015-05-01 16:13:49 UTC* - * 3cc5c97 Added documentation regarding pip in windows + * 83ef7cb114 Merge pull request `#23258`_ from teizz/ret_keepalive_2014_7_5 -- **PR** `#22872`_: (*rallytime*) Prevent stacktrace on os.path.exists in hosts module - @ *2015-04-21T02:54:40Z* + * 0b9fb6f9be The fixes by cachedout which were backported into 2015_2 were missing a single parameter thus not setting up the TCP keepalive for the ZeroMQ Channel by default. - * b2bf17f Merge pull request `#22872`_ from rallytime/fix_hosts_stacktrace - * c88a1ea Prevent stacktrace on os.path.exists in hosts module +* **ISSUE** `#23224`_: (`twellspring`_) iptables.append --log parameters must be after --jump LOG (refs: `#23241`_) -- **PR** `#22853`_: (*s0undt3ch*) Don't assume package installation order. - @ *2015-04-21T02:42:41Z* +* **PR** `#23241`_: (`techhat`_) Move iptables log options after the jump + @ *2015-05-01 01:31:59 UTC* - * 03af523 Merge pull request `#22853`_ from s0undt3ch/2014.7 - * b62df62 Don't assume package installation order. + * 8de3c83956 Merge pull request `#23241`_ from techhat/issue23224 -- **PR** `#22877`_: (*s0undt3ch*) Don't fail on `make clean` just because the directory does not exist - @ *2015-04-21T02:40:47Z* + * 87f7948c99 Move iptables log options after the jump - * 9211e36 Merge pull request `#22877`_ from s0undt3ch/hotfix/clean-docs-fix - * 95d6887 Don't fail on `make clean` just because the directory does not exist +* **PR** `#23228`_: (`rallytime`_) Backport `#23171`_ to 2014.7 + @ *2015-04-30 21:09:45 UTC* -- **PR** `#22873`_: (*thatch45*) Type check the version since it will often be numeric - @ *2015-04-21T02:38:11Z* + * **PR** `#23171`_: (`skizunov`_) Bugfix: 'clean_proc_dir' is broken (refs: `#23228`_) - * 5bdbd08 Merge pull request `#22873`_ from thatch45/type_check - * 53b8376 Type check the version since it will often be numeric + * f20210e499 Merge pull request `#23228`_ from rallytime/bp-23171 -- **PR** `#22870`_: (*twangboy*) Added ability to send a version with a space in it - @ *2015-04-20T23:18:28Z* + * e670e99506 Bugfix: 'clean_proc_dir' is broken - * c965b0a Merge pull request `#22870`_ from twangboy/fix_installer_again - * 3f180cf Added ability to send a version with a space in it +* **ISSUE** `#22703`_: (`Xiol`_) salt-ssh does not work with list matcher (refs: `#22808`_) -- **PR** `#22863`_: (*rallytime*) Backport `#20974`_ to 2014.7 - @ *2015-04-20T19:29:37Z* +* **PR** `#23227`_: (`rallytime`_) Backport `#22808`_ to 2014.7 + @ *2015-04-30 21:09:14 UTC* - - **PR** `#20974`_: (*JohannesEbke*) Fix expr_match usage in salt.utils.check_whitelist_blacklist - | refs: `#22863`_ - * 2973eb1 Merge pull request `#22863`_ from rallytime/`bp-20974`_ - * 14913a4 Fix expr_match usage in salt.utils.check_whitelist_blacklist + * **PR** `#22808`_: (`basepi`_) [2015.2] Add list targeting to salt-ssh flat roster (refs: `#23227`_) -- **PR** `#22578`_: (*hvnsweeting*) gracefully handle when salt-minion cannot decrypt key - @ *2015-04-20T15:24:45Z* + * 721cc285ee Merge pull request `#23227`_ from rallytime/bp-22808 - * c45b92b Merge pull request `#22578`_ from hvnsweeting/2014-7-fix-compile-pillar - * f75b24a gracefully handle when salt-minion cannot decrypt key + * d208a00b2a Dict, not list -- **PR** `#22800`_: (*terminalmage*) Improve error logging for pygit2 SSH-based remotes - @ *2015-04-18T17:18:55Z* + * a3f529e003 It's already been converted to a list - - **ISSUE** `#21979`_: (*yrdevops*) gitfs: error message not descriptive enough when libgit2 was compiled without libssh2 - | refs: `#22800`_ - * 900c7a5 Merge pull request `#22800`_ from terminalmage/issue21979 - * 8f1c008 Clarify that for pygit2, receiving 0 objects means repo is up-to-date + * dd57f2d1c1 Add list targeting to salt-ssh flat roster - * 98885f7 Add information about libssh2 requirement for pygit2 ssh auth +* **PR** `#22823`_: (`hvnsweeting`_) 22822 file directory clean + @ *2015-04-30 15:25:51 UTC* - * 09468d2 Fix incorrect log message + * 82c22afacc Merge pull request `#22823`_ from hvnsweeting/22822-file-directory-clean - * 2093bf8 Adjust loglevels for gitfs errors + * c749c276b4 fix lint - remove unnecessary parenthesis - * 9d394df Improve error logging for pygit2 SSH-based remotes + * cb3dfee969 refactor -- **PR** `#22813`_: (*twangboy*) Updated instructions for building salt - @ *2015-04-18T04:10:07Z* + * 8924b5a911 refactor: use relpath instead of do it manually - * e99f2fd Merge pull request `#22813`_ from twangboy/win_doc_fix - * adc421a Fixed some formatting issues + * d3060a51a3 refactor - * 8901b3b Updated instructions for building salt + * 5759a0e8f0 bugfix: fix file.directory clean=True when it require parent dir -- **PR** `#22810`_: (*basepi*) [2014.7] More msgpack gating for salt-ssh - @ *2015-04-17T22:28:24Z* +* **ISSUE** `saltstack/salt#22941`_: (`bersace`_) `_pillar` func breaks fileserver globals (refs: `#22942`_) - - **ISSUE** `#22708`_: (*Bilge*) salt-ssh file.accumulated error: NameError: global name 'msgpack' is not defined - | refs: `#22810`_ - * fe1de89 Merge pull request `#22810`_ from basepi/salt-ssh.more.msgpack.gating - * d4da8e6 Gate msgpack in salt/modules/saltutil.py +* **ISSUE** `#22941`_: (`bersace`_) `_pillar` func breaks fileserver globals (refs: `#22977`_) - * 02303b2 Gate msgpack in salt/modules/data.py +* **PR** `#22977`_: (`bersace`_) Fix fileserver backends __opts__ overwritten by _pillar + @ *2015-04-30 15:24:56 UTC* - * d7e8741 Gate salt.states.file.py msgpack + * **PR** `#22942`_: (`bersace`_) Fix fileserver backends global overwritten by _pillar (refs: `#22977`_) -- **PR** `#22803`_: (*rallytime*) Allow map file to work with softlayer - @ *2015-04-17T20:34:42Z* + * f6c0728bfb Merge pull request `#22977`_ from bersace/fix-fileserver-backends-pillar-side-effect - - **ISSUE** `#17144`_: (*xpender*) salt-cloud -m fails with softlayer - | refs: `#22803`_ - * 11df71e Merge pull request `#22803`_ from rallytime/`fix-17144`_ - * ce88b6a Allow map file to work with softlayer + * 5f451f63cf Fix fileserver backends __opts__ overwritten by _pillar -- **PR** `#22807`_: (*rallytime*) Add 2014.7.5 links to windows installation docs - @ *2015-04-17T20:32:13Z* +* **ISSUE** `#23166`_: (`claudiupopescu`_) "Error in function _minion_event" resulting in modules not loaded (refs: `#23180`_) - * cd43a95 Merge pull request `#22807`_ from rallytime/windows_docs_update - * 5931a58 Replace all 4s with 5s +* **PR** `#23180`_: (`jfindlay`_) fix typos from 36841bdd in masterapi.py + @ *2015-04-30 15:22:41 UTC* - * eadaead Add 2014.7.5 links to windows installation docs + * 34206f7ae3 Merge pull request `#23180`_ from jfindlay/remote_event -- **PR** `#22795`_: (*rallytime*) Added release note for 2014.7.5 release - @ *2015-04-17T18:05:36Z* + * 72066e1073 fix typos from 36841bdd in masterapi.py - * 0b295e2 Merge pull request `#22795`_ from rallytime/release_notes - * fde1fee Remove extra line +* **ISSUE** `#23153`_: (`cr1st1p`_) cmdmod : run_chroot - broken in 2014.7.5 - missing kwargs (refs: `#23176`_) - * b19b95d Added release note for 2014.7.5 release +* **PR** `#23176`_: (`jfindlay`_) copy standard cmd.run* kwargs into cmd.run_chroot + @ *2015-04-30 15:22:12 UTC* -- **PR** `#22759`_: (*twangboy*) Final edits to the batch files for running salt - @ *2015-04-17T04:31:15Z* + * b6b82165c8 Merge pull request `#23176`_ from jfindlay/run_chroot - - **ISSUE** `#22740`_: (*lorengordon*) New Windows installer assumes salt is installed to the current directory - | refs: `#22759`_ - - **PR** `#22754`_: (*twangboy*) Removed redundant \\ and " - | refs: `#22759`_ - * 3c91459 Merge pull request `#22759`_ from twangboy/fix_bat_one_last_time - * 075f82e Final edits to the batch files for running salt + * 7dc3417b44 copy standard cmd.run* kwargs into cmd.run_chroot -- **PR** `#22760`_: (*thatch45*) Fix issues with the syndic - @ *2015-04-17T04:30:48Z* +* **ISSUE** `#23192`_: (`joejulian`_) supervisord mod_watch does not accept sfun (refs: `#23193`_) - * 20d3f2b Merge pull request `#22760`_ from thatch45/syndic_fix - * e2db624 Fix issues with the syndic not resolving the master when the interface is set +* **PR** `#23193`_: (`joejulian`_) supervisord.mod_watch should accept sfun + @ *2015-04-30 04:34:21 UTC* -- **PR** `#22762`_: (*twangboy*) Fixed version not showing in Add/Remove Programs - @ *2015-04-17T04:29:46Z* + * effacbe294 Merge pull request `#23193`_ from joejulian/2014.7_supervisord_accept_sfun - * 54c4584 Merge pull request `#22762`_ from twangboy/fix_installer - * 4d25af8 Fixed version not showing in Add/Remove Programs + * efb59f9d9d supervisord.mod_watch should accept sfun +* **ISSUE** `#19114`_: (`pykler`_) salt-ssh and gpg pillar renderer (refs: `#23347`_, `#23272`_, `#23188`_) + +* **PR** `#23188`_: (`basepi`_) [2014.7] Work around bug in salt-ssh in config.get for gpg renderer (refs: `#23272`_) + @ *2015-04-30 04:34:10 UTC* + + * 72fe88e5c6 Merge pull request `#23188`_ from basepi/salt-ssh.function.wrapper.gpg.19114 + + * d73979ee12 Work around bug in salt-ssh in config.get for gpg renderer + +* **ISSUE** `#21480`_: (`msciciel`_) TypeError: string indices must be integers, not str (refs: `#23154`_) + +* **PR** `#23154`_: (`cachedout`_) Re-establish channel on interruption in fileclient + @ *2015-04-29 16:18:59 UTC* + + * 168508ec2a Merge pull request `#23154`_ from cachedout/refresh_channel + + * 9f8dd80c38 Re-establish channel on interruption in fileclient + +* **ISSUE** `#20647`_: (`ryan-lane`_) file.serialize fails to serialize due to ordered dicts (refs: `#20779`_) + +* **PR** `#23146`_: (`rallytime`_) Backport `#20779`_ to 2014.7 + @ *2015-04-28 20:45:06 UTC* + + * **PR** `#20779`_: (`cachedout`_) Use declared yaml options (refs: `#23146`_) + + * 3b53e04534 Merge pull request `#23146`_ from rallytime/bp-20779 + + * ffd18493e8 compare OrderedDicts in serializer unit test + + * a22170627c Just change serialize + + * a111798e8e Use declared yaml options + +* **PR** `#23145`_: (`rallytime`_) Backport `#23089`_ to 2014.7 + @ *2015-04-28 20:44:56 UTC* + + * **PR** `#23089`_: (`cachedout`_) Stringify version number before lstrip (refs: `#23145`_) + + * 8bb4664bf9 Merge pull request `#23145`_ from rallytime/bp-23089 + + * 93c41afd23 Stringify version number before lstrip + +* **ISSUE** `#16188`_: (`drawks`_) salt.modules.parted has various functions with bogus input validation. (refs: `#23124`_) + +* **PR** `#23144`_: (`rallytime`_) Backport `#23124`_ to 2014.7 + @ *2015-04-28 20:44:46 UTC* + + * **PR** `#23124`_: (`ether42`_) fix parsing the output of parted in parted.list_() (refs: `#23144`_) + + * c85d36fd29 Merge pull request `#23144`_ from rallytime/bp-23124-2014-7 + + * 6b64da706c fix parsing the output of parted + +* **PR** `#23120`_: (`terminalmage`_) Don't run os.path.relpath() if repo doesn't have a "root" param set + @ *2015-04-28 15:46:54 UTC* + + * a27b158153 Merge pull request `#23120`_ from terminalmage/fix-gitfs-relpath + + * 1860fffd68 Don't run os.path.relpath() if repo doesn't have a "root" param set + +* **PR** `#23132`_: (`clinta`_) Backport b27c176 + @ *2015-04-28 15:00:30 UTC* + + * fcba607978 Merge pull request `#23132`_ from clinta/patch-2 + + * a824d727d1 Backport b27c176 + +* **ISSUE** `#18476`_: (`Auha`_) Upgrading salt on my master caused dependency issues (refs: `#18610`_, `#23114`_) + +* **PR** `#23114`_: (`rallytime`_) Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages + @ *2015-04-28 03:59:24 UTC* + + * **PR** `#18610`_: (`rallytime`_) Make ZMQ 4 installation docs for ubuntu more clear (refs: `#23114`_) + + * b0f4b28487 Merge pull request `#23114`_ from rallytime/remove_ubuntu_zmq4_docs + + * f6cc7c8f8a Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages + +* **ISSUE** `#23085`_: (`xenophonf`_) Use "s3fs" (not "s3") in fileserver_roots (refs: `#23097`_) + +* **PR** `#23108`_: (`rallytime`_) Backport `#23097`_ to 2014.7 + @ *2015-04-28 03:58:05 UTC* + + * **PR** `#23097`_: (`rallytime`_) Change s3 to s3fs in fileserver_roots docs example (refs: `#23108`_) + + * 399857f20b Merge pull request `#23108`_ from rallytime/bp-23097 + + * fa889845df Change s3 to s3fs in fileserver_roots docs example + +* **ISSUE** `#22171`_: (`basepi`_) We should only call returner.save_load once per jid (refs: `#22199`_) + +* **PR** `#23112`_: (`basepi`_) [2014.7] Backport `#22199`_ to fix mysql returner save_load errors + @ *2015-04-28 03:55:44 UTC* + + * **PR** `#22199`_: (`basepi`_) [2015.2] Put a bandaid on the save_load duplicate issue (mysql returner) (refs: `#23112`_) + + * 5541537c32 Merge pull request `#23112`_ from basepi/mysql_returner_save_load + + * 0127012ed3 Put a bandaid on the save_load duplicate issue + + * **PR** `saltstack/salt#22925`_: (`rallytime`_) Backport `#22895`_ to 2014.7 (refs: `#23113`_) + +* **PR** `#23113`_: (`rallytime`_) Revert "Backport `#22895`_ to 2014.7" + @ *2015-04-28 03:27:29 UTC* + + * **PR** `#22895`_: (`aletourneau`_) pam_tally counter was not reset to 0 after a succesfull login (refs: `#23113`_, `#22925`_, #saltstack/salt`#22925`_) + + * dfe2066b25 Merge pull request `#23113`_ from saltstack/revert-22925-bp-22895 + + * b957ea8977 Revert "Backport `#22895`_ to 2014.7" + +* **ISSUE** `#23013`_: (`ghost`_) gitfs regression with authenticated repos (refs: `#23094`_) + +* **PR** `#23094`_: (`terminalmage`_) pygit2: disable cleaning of stale refs for authenticated remotes + @ *2015-04-27 20:51:28 UTC* + + * 21515f3c23 Merge pull request `#23094`_ from terminalmage/issue23013 + + * aaf7b04f79 pygit2: disable cleaning of stale refs for authenticated remotes + +* **PR** `#23048`_: (`jfindlay`_) py-2.6 compat for utils/boto.py ElementTree exception + @ *2015-04-25 16:56:45 UTC* + + * d45aa21dca Merge pull request `#23048`_ from jfindlay/ET_error + + * 64c42ccb5f py-2.6 compat for utils/boto.py ElementTree exception + +* **ISSUE** `#22981`_: (`syphernl`_) Locale state throwing traceback when generating not (yet) existing locale (refs: `#23025`_) + +* **PR** `#23025`_: (`jfindlay`_) catch exceptions on bad system locales/encodings + @ *2015-04-25 16:56:30 UTC* + + * d25a5c102f Merge pull request `#23025`_ from jfindlay/fix_sys_locale + + * 9c4d62bb00 catch exceptions on bad system locales/encodings + +* **PR** `#22932`_: (`hvnsweeting`_) bugfix: also manipulate dir_mode when source not defined + @ *2015-04-25 16:54:58 UTC* + + * 5e44b59a14 Merge pull request `#22932`_ from hvnsweeting/file-append-bugfix + + * 3f368de14a do not use assert in execution module + + * 9d4fd4a8c8 bugfix: also manipulate dir_mode when source not defined + +* **ISSUE** `#23021`_: (`ether42`_) ps.pgrep raises NoSuchProcess (refs: `#23055`_) + +* **PR** `#23055`_: (`jfindlay`_) prevent ps module errors on accessing dead procs + @ *2015-04-24 22:39:49 UTC* + + * c2416a425f Merge pull request `#23055`_ from jfindlay/fix_ps + + * c2dc7adeb1 prevent ps module errors on accessing dead procs + +* **PR** `#23031`_: (`jfindlay`_) convert exception e.message to just e + @ *2015-04-24 18:38:13 UTC* + + * bfd9158a83 Merge pull request `#23031`_ from jfindlay/exception + + * 856bad1c31 convert exception e.message to just e + +* **PR** `#23015`_: (`hvnsweeting`_) if status of service is stop, there is not an error with it + @ *2015-04-24 14:35:10 UTC* + + * 7747f3342e Merge pull request `#23015`_ from hvnsweeting/set-non-error-lvl-for-service-status-log + + * 92ea163513 if status of service is stop, there is not an error with it + +* **ISSUE** `#22993`_: (`jetpak`_) salt-minion restart causes all spawned daemons to die on centos7 (systemd) (refs: `#23000`_) + +* **PR** `#23000`_: (`jfindlay`_) set systemd service killMode to process for minion + @ *2015-04-24 03:42:39 UTC* + + * 2e09789156 Merge pull request `#23000`_ from jfindlay/systemd_kill + + * 3d575e29c4 set systemd service killMode to process for minion + +* **ISSUE** `#22707`_: (`arthurlogilab`_) retry_dns of master configuration is missing from the documentation (refs: `#22999`_) + +* **PR** `#22999`_: (`justinta`_) Added retry_dns to minion doc. + @ *2015-04-24 03:30:24 UTC* + + * b5c059ab26 Merge pull request `#22999`_ from jtand/fix_22707 + + * 8486e17ab3 Added retry_dns to minion doc. + +* **PR** `#22990`_: (`techhat`_) Use the proper cloud conf variable + @ *2015-04-23 17:48:07 UTC* + + * 27dc877bfd Merge pull request `#22990`_ from techhat/2014.7 + + * d33bcbc2c1 Use the proper cloud conf variable + +* **PR** `#22976`_: (`multani`_) Improve state_output documentation + @ *2015-04-23 12:24:22 UTC* + + * 13dff652c6 Merge pull request `#22976`_ from multani/fix/state-output-doc + + * 19efd419b5 Improve state_output documentation + +* **PR** `#22955`_: (`terminalmage`_) Fix regression introduced yesterday in dockerio module + @ *2015-04-22 18:56:39 UTC* + + * 89fa18500c Merge pull request `#22955`_ from terminalmage/dockerio-run-fix + + * b4472ad1b2 Fix regression introduced yesterday in dockerio module + +* **PR** `#22954`_: (`rallytime`_) Backport `#22909`_ to 2014.7 + @ *2015-04-22 18:56:20 UTC* + + * **PR** `#22909`_: (`mguegan`_) Fix compatibility with pkgin > 0.7 (refs: `#22954`_) + + * 46ef227911 Merge pull request `#22954`_ from rallytime/bp-22909 + + * 70c1cd3969 Fix compatibility with pkgin > 0.7 + +* **ISSUE** `#18720`_: (`Reiner030`_) timeouts when setting Route53 records (refs: `#22856`_) + +* **PR** `#22856`_: (`jfindlay`_) increase timeout and decrease tries for route53 records + @ *2015-04-22 16:47:01 UTC* + + * c9ae593461 Merge pull request `#22856`_ from jfindlay/route53_timeout + + * ba4a786984 add route53 record sync wait, default=False + + * ea2fd50660 increase timeout and tries for route53 records + +* **PR** `#22946`_: (`s0undt3ch`_) Test with a more recent pip version to avoid a traceback + @ *2015-04-22 16:25:17 UTC* + + * a178d444b8 Merge pull request `#22946`_ from s0undt3ch/2014.7 + + * bc87749e2c Test with a more recent pip version to avoid a traceback + +* **ISSUE** `#22571`_: (`BoomerB`_) same error message as on issue #18504 (refs: `#22945`_) + +* **PR** `#22945`_: (`garethgreenaway`_) Fixes to scheduler + @ *2015-04-22 16:25:00 UTC* + + * de339bef0a Merge pull request `#22945`_ from garethgreenaway/22571_2014_7_schedule_pillar_refresh_seconds_exceptions + + * bfa6d25ed8 Fixing a reported issue when using a scheduled job from pillar with splay. _seconds element that acted as a backup of the actual seconds was being removed when pillar was refreshed and causing exceptions. This fix moves some splay related code out of the if else condition so it's checked whether the job is in the job queue or not. + +* **ISSUE** `#18843`_: (`calvinhp`_) State user.present will fail to create home if user exists and homedir doesn't (refs: `#22933`_, `#22887`_) + +* **PR** `#22887`_: (`hvnsweeting`_) fix `#18843`_ + @ *2015-04-22 15:47:05 UTC* + + * 12d2b91d85 Merge pull request `#22887`_ from hvnsweeting/18843-fix-user-present-home + + * 7fe7b089fd run user.chhome once to avoid any side-effect when run it twice + + * 19de9954ee clarify the usage of home arg + + * d6dc09af64 enhance doc, as usermod on ubuntu 12.04 will not CREATE home + + * 0ce4d7feb6 refactor: force to use boolean + + * 849d19edd7 log debug the creating dir process + + * c4e95b9f48 fix `#18843`_: usermod won't create a dir if old home does not exist + +* **ISSUE** `#2417`_: (`ffa`_) Module standards (refs: `#22829`_) + +* **ISSUE** `#21140`_: (`holms`_) locale.present state executed successfully, although originally fails (refs: `#22930`_, `#22829`_) + +* **PR** `#22930`_: (`jfindlay`_) localemod.gen_locale now always returns a boolean + @ *2015-04-22 15:37:39 UTC* + + * **PR** `#22829`_: (`F30`_) Always return a boolean in gen_locale() (refs: `#22930`_) + + * b7de7bdf47 Merge pull request `#22930`_ from jfindlay/localegen_bool + + * 399399f89e localemod.gen_locale now always returns a boolean + +* **ISSUE** `#18843`_: (`calvinhp`_) State user.present will fail to create home if user exists and homedir doesn't (refs: `#22933`_, `#22887`_) + +* **PR** `#22933`_: (`hvnsweeting`_) add test for `#18843`_ + @ *2015-04-22 15:27:18 UTC* + + * 11bcf14979 Merge pull request `#22933`_ from hvnsweeting/18843-test + + * b13db32fde add test for `#18843`_ + +* **PR** `#22925`_: (`rallytime`_) Backport `#22895`_ to 2014.7 + @ *2015-04-22 02:30:26 UTC* + + * **PR** `#22895`_: (`aletourneau`_) pam_tally counter was not reset to 0 after a succesfull login (refs: `#23113`_, `#22925`_, #saltstack/salt`#22925`_) + + * 6890752dd3 Merge pull request `#22925`_ from rallytime/bp-22895 + + * 3852d96213 Pylint fix + + * 90f7829ad3 Fixed pylint issues + + * 5ebf159554 Cleaned up pull request + + * a08ac478f6 pam_tally counter was not reset to 0 after a succesfull login + +* **ISSUE** `#22790`_: (`whiteinge`_) jobs.list_jobs runner tracebacks on 'missing' argument (refs: `#22914`_) + +* **PR** `#22914`_: (`cachedout`_) Call proper returner function in jobs.list_jobs + @ *2015-04-22 00:49:01 UTC* + + * eca37ebc11 Merge pull request `#22914`_ from cachedout/issue_22790 + + * d828d6fd58 Call proper returner function in jobs.list_jobs + +* **PR** `#22918`_: (`JaseFace`_) Add a note to the git_pillar docs stating that GitPython is the only currently supported provider + @ *2015-04-22 00:48:26 UTC* + + * 44f3409b01 Merge pull request `#22918`_ from JaseFace/git-pillar-provider-doc-note + + * 0aee5c23d4 Add a note to the git_pillar docs stating that GitPython is the only currently supported provider + +* **PR** `#22907`_: (`techhat`_) Properly merge cloud configs to create profiles + @ *2015-04-21 22:02:44 UTC* + + * 31c461f573 Merge pull request `#22907`_ from techhat/cloudconfig + + * 3bf4e66112 Properly merge cloud configs to create profiles + +* **ISSUE** `#22782`_: (`0xf10e`_) Turning everything into OrderedDicts broke states.keystone.user_present() (refs: `#22894`_) + +* **PR** `#22894`_: (`0xf10e`_) Fix issue `#22782`_ + @ *2015-04-21 18:55:18 UTC* + + * f0939754a0 Merge pull request `#22894`_ from 0xf10e/2014.7 + + * 58fa24c7fa Clarify doc on kwarg 'roles' for user_present(). + + * f0ae2eb84f Improve readability by renaming tenant_role + +* **ISSUE** `#12003`_: (`MarkusMuellerAU`_) [state.dockerio] docker.run TypeError: run() argument after ** must be a mapping, not str (refs: `#22902`_) + +* **PR** `#22902`_: (`rallytime`_) Change state example to use proper kwarg + @ *2015-04-21 18:50:47 UTC* + + * c802ba7514 Merge pull request `#22902`_ from rallytime/docker_doc_fix + + * 8f703461b0 Change state example to use proper kwarg + +* **PR** `#22898`_: (`terminalmage`_) dockerio: better error message for native exec driver + @ *2015-04-21 18:02:58 UTC* + + * 81771a7769 Merge pull request `#22898`_ from terminalmage/issue12003 + + * c375309434 dockerio: better error message for native exec driver + +* **ISSUE** `#22825`_: (`paolodina`_) Issue using file.replace in state file (refs: `#22897`_) + +* **PR** `#22897`_: (`rallytime`_) Add param documentation for file.replace state + @ *2015-04-21 17:31:04 UTC* + + * e2ec4ecc55 Merge pull request `#22897`_ from rallytime/fix-22825 + + * 9c51630002 Add param documentation for file.replace state + +* **ISSUE** `saltstack/salt#22844`_: (`bersace`_) LocalClient file cache confuse pillar and state files (refs: `#22850`_) + +* **PR** `#22850`_: (`bersace`_) Fix pillar and salt fileserver mixed + @ *2015-04-21 17:04:33 UTC* + + * fd53889f0e Merge pull request `#22850`_ from bersace/fix-pillar-salt-mixed + + * 31b98e72eb Initialize state file client after pillar loading + + * f6bebb7a31 Use saltenv + +* **PR** `#22818`_: (`twangboy`_) Added documentation regarding pip in windows + @ *2015-04-21 03:58:59 UTC* + + * 1380fec1b9 Merge pull request `#22818`_ from twangboy/upd_pip_docs + + * cb999c7d70 Update pip.py + + * 3cc5c970ad Added documentation regarding pip in windows + +* **PR** `#22872`_: (`rallytime`_) Prevent stacktrace on os.path.exists in hosts module + @ *2015-04-21 02:54:40 UTC* + + * b2bf17f5d5 Merge pull request `#22872`_ from rallytime/fix_hosts_stacktrace + + * c88a1ea243 Prevent stacktrace on os.path.exists in hosts module + +* **PR** `#22853`_: (`s0undt3ch`_) Don't assume package installation order. + @ *2015-04-21 02:42:41 UTC* + + * 03af523de9 Merge pull request `#22853`_ from s0undt3ch/2014.7 + + * b62df62151 Don't assume package installation order. + +* **PR** `#22877`_: (`s0undt3ch`_) Don't fail on `make clean` just because the directory does not exist + @ *2015-04-21 02:40:47 UTC* + + * 9211e36564 Merge pull request `#22877`_ from s0undt3ch/hotfix/clean-docs-fix + + * 95d6887949 Don't fail on `make clean` just because the directory does not exist + +* **PR** `#22873`_: (`thatch45`_) Type check the version since it will often be numeric + @ *2015-04-21 02:38:11 UTC* + + * 5bdbd08bbd Merge pull request `#22873`_ from thatch45/type_check + + * 53b8376626 Type check the version since it will often be numeric + +* **PR** `#22870`_: (`twangboy`_) Added ability to send a version with a space in it + @ *2015-04-20 23:18:28 UTC* + + * c965b0a035 Merge pull request `#22870`_ from twangboy/fix_installer_again + + * 3f180cfaae Added ability to send a version with a space in it + +* **PR** `#22863`_: (`rallytime`_) Backport `#20974`_ to 2014.7 + @ *2015-04-20 19:29:37 UTC* + + * **PR** `#20974`_: (`JohannesEbke`_) Fix expr_match usage in salt.utils.check_whitelist_blacklist (refs: `#22863`_) + + * 2973eb18bc Merge pull request `#22863`_ from rallytime/bp-20974 + + * 14913a4cb4 Fix expr_match usage in salt.utils.check_whitelist_blacklist + +* **PR** `#22578`_: (`hvnsweeting`_) gracefully handle when salt-minion cannot decrypt key + @ *2015-04-20 15:24:45 UTC* + + * c45b92bb4b Merge pull request `#22578`_ from hvnsweeting/2014-7-fix-compile-pillar + + * f75b24ad68 gracefully handle when salt-minion cannot decrypt key + +* **ISSUE** `#21979`_: (`yrdevops`_) gitfs: error message not descriptive enough when libgit2 was compiled without libssh2 (refs: `#22800`_) + +* **PR** `#22800`_: (`terminalmage`_) Improve error logging for pygit2 SSH-based remotes + @ *2015-04-18 17:18:55 UTC* + + * 900c7a510f Merge pull request `#22800`_ from terminalmage/issue21979 + + * 8f1c0084cd Clarify that for pygit2, receiving 0 objects means repo is up-to-date + + * 98885f71d6 Add information about libssh2 requirement for pygit2 ssh auth + + * 09468d2607 Fix incorrect log message + + * 2093bf8d96 Adjust loglevels for gitfs errors + + * 9d394dfe46 Improve error logging for pygit2 SSH-based remotes + +* **PR** `#22813`_: (`twangboy`_) Updated instructions for building salt + @ *2015-04-18 04:10:07 UTC* + + * e99f2fdb28 Merge pull request `#22813`_ from twangboy/win_doc_fix + + * adc421acdd Fixed some formatting issues + + * 8901b3b5a6 Updated instructions for building salt + +* **ISSUE** `#22708`_: (`Bilge`_) salt-ssh file.accumulated error: NameError: global name 'msgpack' is not defined (refs: `#22810`_) + +* **PR** `#22810`_: (`basepi`_) [2014.7] More msgpack gating for salt-ssh + @ *2015-04-17 22:28:24 UTC* + + * fe1de89ad7 Merge pull request `#22810`_ from basepi/salt-ssh.more.msgpack.gating + + * d4da8e66a4 Gate msgpack in salt/modules/saltutil.py + + * 02303b22ce Gate msgpack in salt/modules/data.py + + * d7e8741f02 Gate salt.states.file.py msgpack + +* **ISSUE** `#17144`_: (`xpender`_) salt-cloud -m fails with softlayer (refs: `#22803`_) + +* **PR** `#22803`_: (`rallytime`_) Allow map file to work with softlayer + @ *2015-04-17 20:34:42 UTC* + + * 11df71e16d Merge pull request `#22803`_ from rallytime/fix-17144 + + * ce88b6ad41 Allow map file to work with softlayer + +* **PR** `#22807`_: (`rallytime`_) Add 2014.7.5 links to windows installation docs + @ *2015-04-17 20:32:13 UTC* + + * cd43a95212 Merge pull request `#22807`_ from rallytime/windows_docs_update + + * 5931a582d1 Replace all 4s with 5s + + * eadaead755 Add 2014.7.5 links to windows installation docs + +* **PR** `#22795`_: (`rallytime`_) Added release note for 2014.7.5 release + @ *2015-04-17 18:05:36 UTC* + + * 0b295e2c87 Merge pull request `#22795`_ from rallytime/release_notes + + * fde1feed46 Remove extra line + + * b19b95d992 Added release note for 2014.7.5 release + +* **ISSUE** `#22740`_: (`lorengordon`_) New Windows installer assumes salt is installed to the current directory (refs: `#22759`_) + +* **PR** `#22759`_: (`twangboy`_) Final edits to the batch files for running salt + @ *2015-04-17 04:31:15 UTC* + + * **PR** `#22754`_: (`twangboy`_) Removed redundant \\\\ and " (refs: `#22759`_) + + * 3c91459de2 Merge pull request `#22759`_ from twangboy/fix_bat_one_last_time + + * 075f82e046 Final edits to the batch files for running salt + +* **PR** `#22760`_: (`thatch45`_) Fix issues with the syndic + @ *2015-04-17 04:30:48 UTC* + + * 20d3f2bb83 Merge pull request `#22760`_ from thatch45/syndic_fix + + * e2db624b37 Fix issues with the syndic not resolving the master when the interface is set + +* **PR** `#22762`_: (`twangboy`_) Fixed version not showing in Add/Remove Programs + @ *2015-04-17 04:29:46 UTC* + + * 54c45845ab Merge pull request `#22762`_ from twangboy/fix_installer + + * 4d25af8acf Fixed version not showing in Add/Remove Programs .. _`#12003`: https://github.com/saltstack/salt/issues/12003 .. _`#16188`: https://github.com/saltstack/salt/issues/16188 @@ -1134,7 +1280,6 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#17245`: https://github.com/saltstack/salt/issues/17245 .. _`#18368`: https://github.com/saltstack/salt/pull/18368 .. _`#18476`: https://github.com/saltstack/salt/issues/18476 -.. _`#18504`: https://github.com/saltstack/salt/issues/18504 .. _`#18610`: https://github.com/saltstack/salt/pull/18610 .. _`#18720`: https://github.com/saltstack/salt/issues/18720 .. _`#18843`: https://github.com/saltstack/salt/issues/18843 @@ -1179,7 +1324,6 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#22823`: https://github.com/saltstack/salt/pull/22823 .. _`#22825`: https://github.com/saltstack/salt/issues/22825 .. _`#22829`: https://github.com/saltstack/salt/pull/22829 -.. _`#22844`: https://github.com/saltstack/salt/issues/22844 .. _`#22850`: https://github.com/saltstack/salt/pull/22850 .. _`#22853`: https://github.com/saltstack/salt/pull/22853 .. _`#22856`: https://github.com/saltstack/salt/pull/22856 @@ -1337,31 +1481,106 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23810`: https://github.com/saltstack/salt/pull/23810 .. _`#23823`: https://github.com/saltstack/salt/pull/23823 .. _`#2417`: https://github.com/saltstack/salt/issues/2417 -.. _`#504`: https://github.com/saltstack/salt/pull/504 +.. _`#529`: https://github.com/saltstack/salt/issues/529 +.. _`#543`: https://github.com/saltstack/salt/pull/543 .. _`#552`: https://github.com/saltstack/salt/issues/552 -.. _`#560`: https://github.com/saltstack/salt/pull/560 -.. _`#563`: https://github.com/saltstack/salt/issues/563 .. _`#567`: https://github.com/saltstack/salt/pull/567 -.. _`#580`: https://github.com/saltstack/salt/issues/580 -.. _`#589`: https://github.com/saltstack/salt/pull/589 -.. _`bp-20779`: https://github.com/saltstack/salt/pull/20779 -.. _`bp-20974`: https://github.com/saltstack/salt/pull/20974 -.. _`bp-22808`: https://github.com/saltstack/salt/pull/22808 -.. _`bp-22895`: https://github.com/saltstack/salt/pull/22895 -.. _`bp-22909`: https://github.com/saltstack/salt/pull/22909 -.. _`bp-23089`: https://github.com/saltstack/salt/pull/23089 -.. _`bp-23097`: https://github.com/saltstack/salt/pull/23097 -.. _`bp-23124`: https://github.com/saltstack/salt/pull/23124 -.. _`bp-23171`: https://github.com/saltstack/salt/pull/23171 -.. _`bp-23346`: https://github.com/saltstack/salt/pull/23346 -.. _`bp-23367`: https://github.com/saltstack/salt/pull/23367 -.. _`bp-23389`: https://github.com/saltstack/salt/pull/23389 -.. _`bp-23442`: https://github.com/saltstack/salt/pull/23442 -.. _`bp-23496`: https://github.com/saltstack/salt/pull/23496 -.. _`bp-23549`: https://github.com/saltstack/salt/pull/23549 -.. _`bp-23607`: https://github.com/saltstack/salt/pull/23607 -.. _`bp-23729`: https://github.com/saltstack/salt/pull/23729 -.. _`bp-23757`: https://github.com/saltstack/salt/pull/23757 -.. _`fix-17144`: https://github.com/saltstack/salt/issues/17144 -.. _`fix-22605`: https://github.com/saltstack/salt/issues/22605 -.. _`fix-22825`: https://github.com/saltstack/salt/issues/22825 +.. _`0xf10e`: https://github.com/0xf10e +.. _`Auha`: https://github.com/Auha +.. _`Azidburn`: https://github.com/Azidburn +.. _`Bilge`: https://github.com/Bilge +.. _`BoomerB`: https://github.com/BoomerB +.. _`Deshke`: https://github.com/Deshke +.. _`F30`: https://github.com/F30 +.. _`JaseFace`: https://github.com/JaseFace +.. _`JohannesEbke`: https://github.com/JohannesEbke +.. _`MarkusMuellerAU`: https://github.com/MarkusMuellerAU +.. _`Reiner030`: https://github.com/Reiner030 +.. _`Xiol`: https://github.com/Xiol +.. _`adelcast`: https://github.com/adelcast +.. _`aletourneau`: https://github.com/aletourneau +.. _`aneeshusa`: https://github.com/aneeshusa +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`b18`: https://github.com/b18 +.. _`basepi`: https://github.com/basepi +.. _`bastichelaar`: https://github.com/bastichelaar +.. _`bersace`: https://github.com/bersace +.. _`bradthurber`: https://github.com/bradthurber +.. _`cachedout`: https://github.com/cachedout +.. _`calvinhp`: https://github.com/calvinhp +.. _`cedwards`: https://github.com/cedwards +.. _`cellscape`: https://github.com/cellscape +.. _`chris-prince`: https://github.com/chris-prince +.. _`clan`: https://github.com/clan +.. _`claudiupopescu`: https://github.com/claudiupopescu +.. _`clinta`: https://github.com/clinta +.. _`cr1st1p`: https://github.com/cr1st1p +.. _`cro`: https://github.com/cro +.. _`danielmorlock`: https://github.com/danielmorlock +.. _`dr4Ke`: https://github.com/dr4Ke +.. _`drawks`: https://github.com/drawks +.. _`ekle`: https://github.com/ekle +.. _`ericfode`: https://github.com/ericfode +.. _`ether42`: https://github.com/ether42 +.. _`ffa`: https://github.com/ffa +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`ghost`: https://github.com/ghost +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`highlyunavailable`: https://github.com/highlyunavailable +.. _`holms`: https://github.com/holms +.. _`hubez`: https://github.com/hubez +.. _`hvnsweeting`: https://github.com/hvnsweeting +.. _`iamfil`: https://github.com/iamfil +.. _`jcftang`: https://github.com/jcftang +.. _`jetpak`: https://github.com/jetpak +.. _`jfindlay`: https://github.com/jfindlay +.. _`jhutchins`: https://github.com/jhutchins +.. _`jleroy`: https://github.com/jleroy +.. _`joejulian`: https://github.com/joejulian +.. _`johtso`: https://github.com/johtso +.. _`justinta`: https://github.com/justinta +.. _`kaithar`: https://github.com/kaithar +.. _`karanjad`: https://github.com/karanjad +.. _`kkaig`: https://github.com/kkaig +.. _`landergate`: https://github.com/landergate +.. _`lorengordon`: https://github.com/lorengordon +.. _`martinhoefling`: https://github.com/martinhoefling +.. _`mavenAtHouzz`: https://github.com/mavenAtHouzz +.. _`mguegan`: https://github.com/mguegan +.. _`msciciel`: https://github.com/msciciel +.. _`multani`: https://github.com/multani +.. _`notpeter`: https://github.com/notpeter +.. _`panticz`: https://github.com/panticz +.. _`paolodina`: https://github.com/paolodina +.. _`pykler`: https://github.com/pykler +.. _`rallytime`: https://github.com/rallytime +.. _`rominf`: https://github.com/rominf +.. _`rubic`: https://github.com/rubic +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack/salt#22844`: https://github.com/saltstack/salt/issues/22844 +.. _`saltstack/salt#22925`: https://github.com/saltstack/salt/pull/22925 +.. _`saltstack/salt#22941`: https://github.com/saltstack/salt/issues/22941 +.. _`saltstack/salt-bootstrap#504`: https://github.com/saltstack/salt-bootstrap/pull/504 +.. _`saltstack/salt-bootstrap#560`: https://github.com/saltstack/salt-bootstrap/issues/560 +.. _`saltstack/salt-bootstrap#563`: https://github.com/saltstack/salt-bootstrap/pull/563 +.. _`saltstack/salt-bootstrap#580`: https://github.com/saltstack/salt-bootstrap/issues/580 +.. _`saltstack/salt-bootstrap#589`: https://github.com/saltstack/salt-bootstrap/pull/589 +.. _`skizunov`: https://github.com/skizunov +.. _`slinu3d`: https://github.com/slinu3d +.. _`syphernl`: https://github.com/syphernl +.. _`t0rrant`: https://github.com/t0rrant +.. _`techhat`: https://github.com/techhat +.. _`teizz`: https://github.com/teizz +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`tomashavlas`: https://github.com/tomashavlas +.. _`twangboy`: https://github.com/twangboy +.. _`twellspring`: https://github.com/twellspring +.. _`variia`: https://github.com/variia +.. _`vdesjardins`: https://github.com/vdesjardins +.. _`vr-jack`: https://github.com/vr-jack +.. _`whiteinge`: https://github.com/whiteinge +.. _`xenophonf`: https://github.com/xenophonf +.. _`xpender`: https://github.com/xpender +.. _`yrdevops`: https://github.com/yrdevops diff --git a/doc/topics/releases/2014.7.7.rst b/doc/topics/releases/2014.7.7.rst new file mode 100644 index 0000000000..481852dd18 --- /dev/null +++ b/doc/topics/releases/2014.7.7.rst @@ -0,0 +1,624 @@ +=========================== +Salt 2014.7.7 Release Notes +=========================== + +:release: 2015-10-13 + +Version 2014.7.7 is a bugfix release for :ref:`2014.7.0 `. + +Statistics +========== + +- Total Merges: **54** +- Total Issue References: **20** +- Total PR References: **60** + +- Contributors: **28** (`AkhterAli`_, `BretFisher`_, `MrCitron`_, `alekti`_, `basepi`_, `bersace`_, `cachedout`_, `corux`_, `cro`_, `davidjb`_, `dumol`_, `efficks`_, `garethgreenaway`_, `hvnsweeting`_, `jacksontj`_, `jacobhammons`_, `jaybocc2`_, `jfindlay`_, `jquast`_, `justinta`_, `msteed`_, `nmadhok`_, `notpeter`_, `puneetk`_, `rallytime`_, `techhat`_, `trevor-h`_, `twangboy`_) + + +Changelog for v2014.7.6..v2014.7.7 +================================== + +*Generated at: 2018-05-27 20:45:04 UTC* + +* **PR** `#27335`_: (`rallytime`_) [2014.7] Fixup salt-cloud logging + @ *2015-09-24 20:33:53 UTC* + + * 5262f01325 Merge pull request `#27335`_ from rallytime/cloud-logging-7 + + * adeb1dcad4 Pylint Fix + + * 588c13783c Salt-cloud logging clean up for windows functions + + * 9b6000135c [2014.7] Fixup salt-cloud logging + +* **PR** `#27252`_: (`jfindlay`_) 2014.7 -> 2014.7.0 + @ *2015-09-18 23:44:39 UTC* + + * e90412d3b8 Merge pull request `#27252`_ from jfindlay/version.2014.7 + + * 3d28307a00 2014.7 -> 2014.7.0 + +* **PR** `#27117`_: (`jacobhammons`_) made 2014.7 an archived release + @ *2015-09-15 07:35:12 UTC* + + * c186e51764 Merge pull request `#27117`_ from jacobhammons/release-docs-2014.7 + + * b69e11e0a4 made 2014.7 an archived release minor doc site updates + +* **PR** `#27114`_: (`cachedout`_) Issue warning that some log levels may contain sensitive data + @ *2015-09-15 07:30:43 UTC* + + * 69d758ee2b Merge pull request `#27114`_ from cachedout/warn_on_insecure_log + + * 507fb04683 Issue warning that some log levels may contain sensitive data + +* **PR** `#27075`_: (`twangboy`_) Replaced password with redacted when displayed + @ *2015-09-14 18:36:10 UTC* + + * aa71bae8aa Merge pull request `#27075`_ from twangboy/fix_password_2014.7 + + * c0689e3215 Replaced password with redacted when displayed + +* **ISSUE** `#26656`_: (`ari`_) [documentation] error in example for salt.runner.pillar (refs: `#26667`_) + +* **PR** `#26667`_: (`nmadhok`_) [doc-fix] Removing special character from salt.runners.pillar and other changes + @ *2015-08-26 18:24:37 UTC* + + * c2c7fe06c8 Merge pull request `#26667`_ from nmadhok/doc-fix-2014.7 + + * 26be189689 Doc fix. Fixes `#26656`_ + +* **PR** `#26663`_: (`jacobhammons`_) version change for latest branch + @ *2015-08-26 14:03:35 UTC* + + * 6bd3dccae8 Merge pull request `#26663`_ from jacobhammons/2014.7-version + + * b6af538070 version change for latest branch + +* **PR** `#26636`_: (`rallytime`_) Refactor cloud provider tests to be more accurate + @ *2015-08-25 21:28:34 UTC* + + * 071a6112e5 Merge pull request `#26636`_ from rallytime/cloud-test-fixes + + * c0d83d558d Don't use id as variable + + * 2b4bc1679d Keep ec2 instance creation test the same - it works better for the ec2 output + + * b5b58eb31f Skip digital ocean tests since we can't use API v1 with v2 tests + + * 9ae1539c62 Update cloud tests to be more efficient and accurate + +* **ISSUE** `#26630`_: (`efficks`_) win_service: Function has_powershell does not works on Windows XP (refs: `#26640`_) + +* **PR** `#26640`_: (`efficks`_) Fix function spacing + @ *2015-08-25 20:01:39 UTC* + + * 304542b4c6 Merge pull request `#26640`_ from efficks/fixws2014 + + * ebe5d9d85c Fix function spacing + +* **PR** `#26515`_: (`bersace`_) Defaults to current saltenv in state.sls + @ *2015-08-25 16:35:50 UTC* + + * 4532f98a76 Merge pull request `#26515`_ from bersace/salt-env-local-sls + + * 0727af9e3d Defaults to current saltenv in state.sls + +* **PR** `#26242`_: (`cro`_) Remove dead code + @ *2015-08-12 15:14:20 UTC* + + * da8bca09aa Merge pull request `#26242`_ from cro/anonldap4 + + * a0d2ab1eed Remove dead code + +* **PR** `#26216`_: (`cro`_) Fix LDAP configuration issue. + @ *2015-08-11 18:33:43 UTC* + + * 1ecf23773e Merge pull request `#26216`_ from cro/anonldap3 + + * af132d7b89 Documentation update for anonymous bind issue. + + * 2ef54b6b13 Documentation update for anonymous bind issue. + + * 5b1836bb00 Fix issue with LDAP anonymous binds. + +* **PR** `#26116`_: (`corux`_) file.replace fails if repl string is an invalid regex and append/prepend is used + @ *2015-08-10 16:44:12 UTC* + + * abdf2935c4 Merge pull request `#26116`_ from corux/fix-escape-content + + * fd913ddc36 Append/prepend: search for full line with escaped content + +* **ISSUE** `#25751`_: (`basepi`_) Document `master_finger` more prominently (refs: `#26088`_) + +* **PR** `#26088`_: (`jacobhammons`_) Master finger + @ *2015-08-07 14:31:33 UTC* + + * 106356d98d Merge pull request `#26088`_ from jacobhammons/master-finger + + * 133d5f7885 some small changes + + * d220c83f77 master_finger configuration docs switch a script to use https:// instead of http:// Refs `#25751`_ + +* **ISSUE** `#25961`_: (`getabc`_) [2015.5.3-2] salt-winrepo.git/salt-minion.sls fails certificate '\*.wpengine.com' or 'wpengine.com' (refs: `#26047`_) + +* **PR** `#26047`_: (`jacobhammons`_) Updated windows download links in the docs to https://repo.saltstack.com + @ *2015-08-05 22:59:44 UTC* + + * 4bd4bc41f2 Merge pull request `#26047`_ from jacobhammons/win-downloads + + * 7c162d181c Updated windows download links in the docs to https://repo.saltstack.com Refs `#25961`_ + +* **ISSUE** `#25701`_: (`alekti`_) Issue `#23764`_ regression (refs: `#25750`_) + +* **ISSUE** `#23764`_: (`es1o`_) source_hash from local file is not supported. (refs: `#25750`_) + +* **PR** `#25750`_: (`alekti`_) Add file as supported protocol for file source_hash. Fixes `#25701`_. + @ *2015-07-29 02:31:27 UTC* + + * d93eb87c16 Merge pull request `#25750`_ from alekti/2014.7 + + * 9ec3ae96d4 Add file as supported protocol for file source_hash. Fixes `#23764`_. + +* **PR** `#25704`_: (`cachedout`_) Ensure prior alignment with master_type in 2014.7 + @ *2015-07-27 16:06:35 UTC* + + * 3a15df22ac Merge pull request `#25704`_ from cachedout/master_type_2014_7 + + * c95886c9a7 Ensure prior alignment with master_type in 2014.7 + +* **PR** `#25657`_: (`MrCitron`_) Add the ability to specify a base pattern for carbon returner + @ *2015-07-24 16:32:58 UTC* + + * d1b9362a73 Merge pull request `#25657`_ from MrCitron/pattern-carbon-returner-2014.7 + + * f8b2f8079f Add the ability to specify a base pattern for metrics path used by the carbon returner + +* **PR** `#25633`_: (`AkhterAli`_) Update loader.py + @ *2015-07-22 20:02:41 UTC* + + * 9634351fc2 Merge pull request `#25633`_ from AkhterAli/2014.7 + + * 29be4bbe11 Update loader.py + +* **PR** `#25416`_: (`cachedout`_) Fix broken keyword + @ *2015-07-14 19:47:10 UTC* + + * 09ebaceca8 Merge pull request `#25416`_ from cachedout/str_2014_7 + + * cc514938a8 Fix broken keyword + +* **PR** `#25375`_: (`cachedout`_) Fix error in config.py for master_type + @ *2015-07-13 16:49:27 UTC* + + * 2a1dd1113f Merge pull request `#25375`_ from cachedout/config_fix_2014_7 + + * c041f2905f Fix error in config.py for master_type + +* **PR** `#25324`_: (`jacobhammons`_) Latest help theme updates + @ *2015-07-10 16:11:31 UTC* + + * 2590e23d48 Merge pull request `#25324`_ from jacobhammons/doc-theme-updates + + * 88f5fcf58d Latest help theme updates + +* **ISSUE** `#18447`_: (`ryan-lane`_) Can't install salt with raet using pip -e git (refs: `#25093`_) + +* **PR** `#25093`_: (`jaybocc2`_) quick fix for issue `#18447`_ + @ *2015-07-01 15:56:53 UTC* + + * 36d53ef59e Merge pull request `#25093`_ from jaybocc2/2014.7 + + * c6a501ebda quick fix for issue `#18447`_ + +* **PR** `#25069`_: (`puneetk`_) Add a helper module function called list_enabled + @ *2015-06-30 20:53:51 UTC* + + * 38903a94a1 Merge pull request `#25069`_ from puneetk/patch-1 + + * f0b4e600e6 Update Documentation to clarify version added + + * f8dc6030e7 Pylint updates , removing whitespace + + * 532d315dd1 [Code Review update] renamed function to is_enaled from list_enabled + + * 20b0462289 Update schedule.py + + * 4f1471d7fb Add a helper module function called list_enabled + +* **ISSUE** `#15209`_: (`hubez`_) file.manage: source_hash not working with s3:// (2014.7.0rc1) (refs: `#25011`_) + +* **PR** `#25011`_: (`notpeter`_) Add s3 to protocols for remote source_hash (2014.7 backport) + @ *2015-06-27 22:35:44 UTC* + + * a7154e7471 Merge pull request `#25011`_ from notpeter/s3_2014.7_backport + + * 8b8af640f6 Add s3 to protocols for remote source_hash + +* **ISSUE** `#24915`_: (`justinta`_) Salt-cloud not working in 2014.7.6 (refs: `#24944`_) + +* **PR** `#24944`_: (`techhat`_) Double-check main_cloud_config + @ *2015-06-25 12:29:55 UTC* + + * a11e4c6eea Merge pull request `#24944`_ from techhat/issue24915 + + * 59c3081e49 Double-check main_cloud_config + +* **PR** `#24936`_: (`justinta`_) Fixed ps module to not use depreciated psutil commands + @ *2015-06-24 22:38:19 UTC* + + * d26a5447ba Merge pull request `#24936`_ from jtand/psutil + + * bdb7a19c36 Fixed ps module to not use depreciated psutil commands + +* **ISSUE** `saltstack/salt-bootstrap#473`_: (`s1kbr0`_) salt-bootstrap.sh [...] git v2014.1.11 on SmartOS base64 is broken (refs: `#24918`_) + +* **PR** `#24918`_: (`BretFisher`_) SmartOS SMF minion startup fix + @ *2015-06-24 15:44:26 UTC* + + * eeb05a1b10 Merge pull request `#24918`_ from BretFisher/minion-start-smartos-smf-fix + + * d7bfb0c7fd Smartos smf minion fix + +* **ISSUE** `#24776`_: (`nmadhok`_) --static option in salt raises ValueError and has been broken for a very long time (refs: `#24777`_) + +* **PR** `#24780`_: (`nmadhok`_) Backporting PR `#24777`_ to 2014.7 branch + @ *2015-06-18 14:52:56 UTC* + + * **PR** `#24779`_: (`nmadhok`_) Backporting Changes to 2014.7 branch (refs: `#24777`_) + + * **PR** `#24778`_: (`nmadhok`_) Backporting PR `#24777`_ to 2015.2 branch (refs: `#24777`_) + + * **PR** `#24777`_: (`nmadhok`_) Fixing issue where --static option fails with ValueError Fixes `#24776`_ (refs: `#24778`_, `#24780`_) + + * 4281dfff0b Merge pull request `#24780`_ from nmadhok/backport-2014.7-24777 + + * c53b0d9a22 Backporting PR `#24777`_ to 2014.7 branch + +* **ISSUE** `#21318`_: (`thanatos`_) get_full_returns raises KeyError (refs: `#24769`_) + +* **ISSUE** `#18994`_: (`njhartwell`_) salt.client.get_cli_returns errors when called immediately after run_job (refs: `#24769`_) + +* **PR** `#24769`_: (`msteed`_) Fix stacktrace in get_cli_returns() + @ *2015-06-18 14:31:46 UTC* + + * f3c5cb2d41 Merge pull request `#24769`_ from msteed/issue-21318 + + * f40a9d5cc0 Fix stacktrace in get_cli_returns() + +* **ISSUE** `#17041`_: (`xenophonf`_) Confusing Salt error messages due to limited/incomplete PowerShell command error handling (refs: `#24690`_) + +* **PR** `#24690`_: (`twangboy`_) Report powershell output instead of error + @ *2015-06-17 16:33:49 UTC* + + * 59db24602f Merge pull request `#24690`_ from twangboy/fix_17041 + + * 7a015389af Added additional reporting + + * d84ad5d519 Fixed capitalization... Failed and Already + + * e9552455c4 Merge branch '2014.7' of https://github.com/saltstack/salt into fix_17041 + +* **ISSUE** `#24196`_: (`johnccfm`_) Exception when using user.present with Windows (refs: `#24646`_) + +* **PR** `#24646`_: (`twangboy`_) Fixed user.present on existing user + @ *2015-06-15 15:04:43 UTC* + + * a18dadad71 Merge pull request `#24646`_ from twangboy/fix_24196 + + * a208e1d60f Fixed user.present on existing user + + * 144bff2f67 Report powershell output instead of error + +* **PR** `#24643`_: (`cro`_) Add reference to salt-announce mailing list + @ *2015-06-12 20:21:15 UTC* + + * b99484fde2 Merge pull request `#24643`_ from cro/saltannounce + + * ecb0623d7f Add salt-announce mailing list. + +* **PR** `#24620`_: (`twangboy`_) Fixed comment and uncomment functions in file.py + @ *2015-06-12 19:36:26 UTC* + + * 635121e85d Merge pull request `#24620`_ from twangboy/fix_24215 + + * d7a9999be1 Fixed comment and uncomment functions in file.py + +* **PR** `#24589`_: (`BretFisher`_) Fixed Mine example for jinja code block + @ *2015-06-11 15:48:02 UTC* + + * d83928a7f9 Merge pull request `#24589`_ from BretFisher/patch-1 + + * 65a11336dc Fixed Mine example for jinja code block + +* **ISSUE** `#24427`_: (`fayetted`_) 2015.5.1-3 Windows 64Bit Minion fails to start after install (refs: `#24530`_) + +* **PR** `#24530`_: (`twangboy`_) Start Minion Service on Silent Install + @ *2015-06-09 21:30:08 UTC* + + * d376390f76 Merge pull request `#24530`_ from twangboy/fix_24427 + + * 673e1d809e Added missing panel.bmp for installer + + * cc50218b01 Start Minion Service on Silent Install + +* **PR** `#24513`_: (`jquast`_) bugfix use of 'iteritem' in 2014.7 branch + @ *2015-06-09 04:06:36 UTC* + + * **PR** `#24511`_: (`jquast`_) bugfix: trailing "...done" in rabbitmq output (refs: `#24513`_) + + * 6ebc476bb3 Merge pull request `#24513`_ from jquast/2014.7-bugfix-iteritem + + * 2be0180e5e bugfix use of 'iteritem' in 2014.7 branch + +* **ISSUE** `#24276`_: (`markuskramerIgitt`_) Live salt-master Profiling with SIGUSR2 fails (refs: `#24405`_) + +* **PR** `#24405`_: (`jacksontj`_) Fix for `#24276`_ + @ *2015-06-04 20:50:42 UTC* + + * 83f853b6ea Merge pull request `#24405`_ from jacksontj/2014.7 + + * 2c7afaeebf Fix for `#24276`_ + +* **PR** `#24395`_: (`hvnsweeting`_) handle exceptions when received data is not in good shape + @ *2015-06-04 20:08:22 UTC* + + * cef919c602 Merge pull request `#24395`_ from hvnsweeting/handle-exception-get-file + + * bb798a0224 handle exceptions when received data is not in good shape + +* **PR** `#24305`_: (`twangboy`_) Added documentation, fixed formatting + @ *2015-06-04 19:40:54 UTC* + + * efba1a94b4 Merge pull request `#24305`_ from twangboy/win_path_docs + + * 36804253e6 Fixed pylint error caused by \P... added r + + * bc42a4bb11 triple double quotes to triple single quotes + + * 77cd930bba Added documentation, fixed formatting + +* **PR** `#24178`_: (`rallytime`_) Backport `#24118`_ to 2014.7, too. + @ *2015-05-27 17:49:45 UTC* + + * **PR** `#24118`_: (`trevor-h`_) removed deprecated pymongo usage (refs: `#24178`_) + + * 9d7331c87d Merge pull request `#24178`_ from rallytime/bp-24118 + + * e2217a09e8 removed deprecated pymongo usage as no longer functional with pymongo > 3.x + +* **PR** `#24159`_: (`rallytime`_) Fill out modules/keystone.py CLI Examples + @ *2015-05-27 15:07:11 UTC* + + * 4e8c5031b0 Merge pull request `#24159`_ from rallytime/keystone_doc_examples + + * dadac8d076 Fill out modules/keystone.py CLI Examples + +* **PR** `#24158`_: (`rallytime`_) Fix test_valid_docs test for tls module + @ *2015-05-27 15:06:05 UTC* + + * fc10ee8ed5 Merge pull request `#24158`_ from rallytime/fix_doc_error + + * 49a517e2ca Fix test_valid_docs test for tls module + +* **PR** `#24125`_: (`hvnsweeting`_) Fix rabbitmq test mode + @ *2015-05-26 15:40:18 UTC* + + * c0d32e0b5e Merge pull request `#24125`_ from hvnsweeting/fix-rabbitmq-test-mode + + * 71862c69b9 enhance log + + * 28e2594162 change according to new output of rabbitmq module functions + + * cd0212e8ed processes and returns better output for rabbitmq module + +* **ISSUE** `#23464`_: (`tibold`_) cmd_iter_no_block() blocks (refs: `#24093`_) + +* **PR** `#24093`_: (`msteed`_) Make LocalClient.cmd_iter_no_block() not block + @ *2015-05-25 15:56:42 UTC* + + * 39a8f30f06 Merge pull request `#24093`_ from msteed/issue-23464 + + * fd35903d75 Fix failing test + + * 41b344c7d3 Make LocalClient.cmd_iter_no_block() not block + +* **PR** `#24008`_: (`davidjb`_) Correct reST formatting for states.cmd documentation + @ *2015-05-21 04:19:01 UTC* + + * 5bffd3045e Merge pull request `#24008`_ from davidjb/2014.7 + + * 8b8d0293d4 Correct reST formatting for documentation + +* **PR** `#23933`_: (`jacobhammons`_) sphinx saltstack2 doc theme + @ *2015-05-20 18:19:19 UTC* + + * 1aa0420040 Merge pull request `#23933`_ from jacobhammons/2014.7 + + * a3613e68e4 removed numbering from doc TOC + + * 78b737c5e6 removed 2015.* release from release notes, updated index page to remove PDF/epub links + + * e867f7df77 Changed build settings to use saltstack2 theme and update release versions. + + * 81ed9c9f59 sphinx saltstack2 doc theme + +* **PR** `#23965`_: (`hvnsweeting`_) handle all exceptions gitpython can raise + @ *2015-05-20 15:08:03 UTC* + + * 314e4db512 Merge pull request `#23965`_ from hvnsweeting/20147-fix-gitfs-gitpython-exception + + * 2576301631 handle all exception gitpython can raise + +* **PR** `#23939`_: (`basepi`_) Add extended changelog to 2014.7.6 release notes + @ *2015-05-19 21:21:00 UTC* + + * 913391207a Merge pull request `#23939`_ from basepi/v2014.7.6release + + * 32b65dc2a9 Add extended changelog to 2014.7.6 release notes + +* **ISSUE** `#23820`_: (`UtahDave`_) 2014.7.5 schedule error (refs: `#23881`_) + +* **PR** `#23881`_: (`garethgreenaway`_) Fixes to schedule module in 2014.7 + @ *2015-05-19 15:46:30 UTC* + + * 0031ca2631 Merge pull request `#23881`_ from garethgreenaway/23820_2014_7_schedule_list_issue + + * b207f2a433 Missing continue in the list function when deleting unused attributes. + +* **ISSUE** `#22131`_: (`quixoten`_) "unexpected keyword argument 'merge'" on 2014.7.2 (salt-ssh) (refs: `#23887`_) + +* **PR** `#23887`_: (`basepi`_) [2014.7] Bring salt-ssh pillar.get in line with mainline pillar.get + @ *2015-05-18 23:11:34 UTC* + + * 63bd21ecd2 Merge pull request `#23887`_ from basepi/salt-ssh.pillar.get.22131 + + * bc84502f46 Bring salt-ssh pillar.get in line with mainline pillar.get + +* **PR** `#23891`_: (`basepi`_) Update the release notes index page + @ *2015-05-18 23:06:52 UTC* + + * 17c5810c04 Merge pull request `#23891`_ from basepi/releasenotes + + * dec153bcea Update the release notes index page + +* **PR** `#23888`_: (`basepi`_) Update the 2014.7.6 release notes with CVE details + @ *2015-05-18 22:35:51 UTC* + + * a93e58f80f Merge pull request `#23888`_ from basepi/v2014.7.6release + + * 49921b6cb2 Update the 2014.7.6 release notes with CVE details + +* **PR** `#23871`_: (`rallytime`_) Backport `#23848`_ to 2014.7 + @ *2015-05-18 20:34:04 UTC* + + * **PR** `#23848`_: (`dumol`_) Updated installation docs for SLES 12. (refs: `#23871`_) + + * 50730287bb Merge pull request `#23871`_ from rallytime/bp-23848 + + * 379c09c3a5 Updated for SLES 12. + +.. _`#15209`: https://github.com/saltstack/salt/issues/15209 +.. _`#17041`: https://github.com/saltstack/salt/issues/17041 +.. _`#18447`: https://github.com/saltstack/salt/issues/18447 +.. _`#18994`: https://github.com/saltstack/salt/issues/18994 +.. _`#21318`: https://github.com/saltstack/salt/issues/21318 +.. _`#22131`: https://github.com/saltstack/salt/issues/22131 +.. _`#23464`: https://github.com/saltstack/salt/issues/23464 +.. _`#23764`: https://github.com/saltstack/salt/issues/23764 +.. _`#23820`: https://github.com/saltstack/salt/issues/23820 +.. _`#23848`: https://github.com/saltstack/salt/pull/23848 +.. _`#23871`: https://github.com/saltstack/salt/pull/23871 +.. _`#23881`: https://github.com/saltstack/salt/pull/23881 +.. _`#23887`: https://github.com/saltstack/salt/pull/23887 +.. _`#23888`: https://github.com/saltstack/salt/pull/23888 +.. _`#23891`: https://github.com/saltstack/salt/pull/23891 +.. _`#23933`: https://github.com/saltstack/salt/pull/23933 +.. _`#23939`: https://github.com/saltstack/salt/pull/23939 +.. _`#23965`: https://github.com/saltstack/salt/pull/23965 +.. _`#24008`: https://github.com/saltstack/salt/pull/24008 +.. _`#24093`: https://github.com/saltstack/salt/pull/24093 +.. _`#24118`: https://github.com/saltstack/salt/pull/24118 +.. _`#24125`: https://github.com/saltstack/salt/pull/24125 +.. _`#24158`: https://github.com/saltstack/salt/pull/24158 +.. _`#24159`: https://github.com/saltstack/salt/pull/24159 +.. _`#24178`: https://github.com/saltstack/salt/pull/24178 +.. _`#24196`: https://github.com/saltstack/salt/issues/24196 +.. _`#24276`: https://github.com/saltstack/salt/issues/24276 +.. _`#24305`: https://github.com/saltstack/salt/pull/24305 +.. _`#24395`: https://github.com/saltstack/salt/pull/24395 +.. _`#24405`: https://github.com/saltstack/salt/pull/24405 +.. _`#24427`: https://github.com/saltstack/salt/issues/24427 +.. _`#24511`: https://github.com/saltstack/salt/pull/24511 +.. _`#24513`: https://github.com/saltstack/salt/pull/24513 +.. _`#24530`: https://github.com/saltstack/salt/pull/24530 +.. _`#24589`: https://github.com/saltstack/salt/pull/24589 +.. _`#24620`: https://github.com/saltstack/salt/pull/24620 +.. _`#24643`: https://github.com/saltstack/salt/pull/24643 +.. _`#24646`: https://github.com/saltstack/salt/pull/24646 +.. _`#24690`: https://github.com/saltstack/salt/pull/24690 +.. _`#24769`: https://github.com/saltstack/salt/pull/24769 +.. _`#24776`: https://github.com/saltstack/salt/issues/24776 +.. _`#24777`: https://github.com/saltstack/salt/pull/24777 +.. _`#24778`: https://github.com/saltstack/salt/pull/24778 +.. _`#24779`: https://github.com/saltstack/salt/pull/24779 +.. _`#24780`: https://github.com/saltstack/salt/pull/24780 +.. _`#24915`: https://github.com/saltstack/salt/issues/24915 +.. _`#24918`: https://github.com/saltstack/salt/pull/24918 +.. _`#24936`: https://github.com/saltstack/salt/pull/24936 +.. _`#24944`: https://github.com/saltstack/salt/pull/24944 +.. _`#25011`: https://github.com/saltstack/salt/pull/25011 +.. _`#25069`: https://github.com/saltstack/salt/pull/25069 +.. _`#25093`: https://github.com/saltstack/salt/pull/25093 +.. _`#25324`: https://github.com/saltstack/salt/pull/25324 +.. _`#25375`: https://github.com/saltstack/salt/pull/25375 +.. _`#25416`: https://github.com/saltstack/salt/pull/25416 +.. _`#25633`: https://github.com/saltstack/salt/pull/25633 +.. _`#25657`: https://github.com/saltstack/salt/pull/25657 +.. _`#25701`: https://github.com/saltstack/salt/issues/25701 +.. _`#25704`: https://github.com/saltstack/salt/pull/25704 +.. _`#25750`: https://github.com/saltstack/salt/pull/25750 +.. _`#25751`: https://github.com/saltstack/salt/issues/25751 +.. _`#25961`: https://github.com/saltstack/salt/issues/25961 +.. _`#26047`: https://github.com/saltstack/salt/pull/26047 +.. _`#26088`: https://github.com/saltstack/salt/pull/26088 +.. _`#26116`: https://github.com/saltstack/salt/pull/26116 +.. _`#26216`: https://github.com/saltstack/salt/pull/26216 +.. _`#26242`: https://github.com/saltstack/salt/pull/26242 +.. _`#26515`: https://github.com/saltstack/salt/pull/26515 +.. _`#26630`: https://github.com/saltstack/salt/issues/26630 +.. _`#26636`: https://github.com/saltstack/salt/pull/26636 +.. _`#26640`: https://github.com/saltstack/salt/pull/26640 +.. _`#26656`: https://github.com/saltstack/salt/issues/26656 +.. _`#26663`: https://github.com/saltstack/salt/pull/26663 +.. _`#26667`: https://github.com/saltstack/salt/pull/26667 +.. _`#27075`: https://github.com/saltstack/salt/pull/27075 +.. _`#27114`: https://github.com/saltstack/salt/pull/27114 +.. _`#27117`: https://github.com/saltstack/salt/pull/27117 +.. _`#27252`: https://github.com/saltstack/salt/pull/27252 +.. _`#27335`: https://github.com/saltstack/salt/pull/27335 +.. _`AkhterAli`: https://github.com/AkhterAli +.. _`BretFisher`: https://github.com/BretFisher +.. _`MrCitron`: https://github.com/MrCitron +.. _`UtahDave`: https://github.com/UtahDave +.. _`alekti`: https://github.com/alekti +.. _`ari`: https://github.com/ari +.. _`basepi`: https://github.com/basepi +.. _`bersace`: https://github.com/bersace +.. _`cachedout`: https://github.com/cachedout +.. _`corux`: https://github.com/corux +.. _`cro`: https://github.com/cro +.. _`davidjb`: https://github.com/davidjb +.. _`dumol`: https://github.com/dumol +.. _`efficks`: https://github.com/efficks +.. _`es1o`: https://github.com/es1o +.. _`fayetted`: https://github.com/fayetted +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`getabc`: https://github.com/getabc +.. _`hubez`: https://github.com/hubez +.. _`hvnsweeting`: https://github.com/hvnsweeting +.. _`jacksontj`: https://github.com/jacksontj +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jaybocc2`: https://github.com/jaybocc2 +.. _`jfindlay`: https://github.com/jfindlay +.. _`johnccfm`: https://github.com/johnccfm +.. _`jquast`: https://github.com/jquast +.. _`justinta`: https://github.com/justinta +.. _`markuskramerIgitt`: https://github.com/markuskramerIgitt +.. _`msteed`: https://github.com/msteed +.. _`njhartwell`: https://github.com/njhartwell +.. _`nmadhok`: https://github.com/nmadhok +.. _`notpeter`: https://github.com/notpeter +.. _`puneetk`: https://github.com/puneetk +.. _`quixoten`: https://github.com/quixoten +.. _`rallytime`: https://github.com/rallytime +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`s1kbr0`: https://github.com/s1kbr0 +.. _`saltstack/salt-bootstrap#473`: https://github.com/saltstack/salt-bootstrap/issues/473 +.. _`techhat`: https://github.com/techhat +.. _`thanatos`: https://github.com/thanatos +.. _`tibold`: https://github.com/tibold +.. _`trevor-h`: https://github.com/trevor-h +.. _`twangboy`: https://github.com/twangboy +.. _`xenophonf`: https://github.com/xenophonf diff --git a/doc/topics/releases/2014.7.8.rst b/doc/topics/releases/2014.7.8.rst index 3ebcdc39ca..2760e2e430 100644 --- a/doc/topics/releases/2014.7.8.rst +++ b/doc/topics/releases/2014.7.8.rst @@ -2,76 +2,86 @@ Salt 2014.7.8 Release Notes =========================== -Changes for v2014.7.7..v2014.7.8 --------------------------------- +:release: 2015-11-13 -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Version 2014.7.8 is a bugfix release for :ref:`2014.7.0 `. -*Generated at: 2016-03-11T21:18:48Z* -Statistics: +Statistics +========== - Total Merges: **7** -- Total Issue references: **3** -- Total PR references: **10** +- Total Issue References: **3** +- Total PR References: **10** -Changes: +- Contributors: **5** (`DmitryKuzmenko`_, `JaseFace`_, `MasterNayru`_, `cachedout`_, `rallytime`_) -- **PR** `#28839`_: (*cachedout*) Revert `#28740`_ - @ *2015-11-12T22:54:28Z* +Changelog for v2014.7.7..v2014.7.8 +================================== - - **PR** `#28740`_: (*MasterNayru*) Add missing S3 module import - | refs: `#28777`_ - * 4b8bdd0 Merge pull request `#28839`_ from cachedout/revert_28740 - * 215b26c Revert `#28740`_ +*Generated at: 2018-05-27 20:47:34 UTC* -- **PR** `#28777`_: (*rallytime*) Back-port `#28740`_ to 2014.7 - @ *2015-11-11T18:00:00Z* +* **PR** `#28839`_: (`cachedout`_) Revert `#28740`_ + @ *2015-11-12 22:54:28 UTC* - - **PR** `#28740`_: (*MasterNayru*) Add missing S3 module import - | refs: `#28777`_ - * 76e69b4 Merge pull request `#28777`_ from rallytime/`bp-28740`_-2014.7 - * da5fac2 Back-port `#28740`_ to 2014.7 + * **PR** `#28740`_: (`MasterNayru`_) Add missing S3 module import (refs: `#28777`_, `#28839`_) -- **PR** `#28716`_: (*rallytime*) Back-port `#28705`_ to 2014.7 - @ *2015-11-10T16:15:03Z* + * 4b8bdd0afb Merge pull request `#28839`_ from cachedout/revert_28740 - - **PR** `#28705`_: (*cachedout*) Account for new headers class in tornado 4.3 - | refs: `#28716`_ - * 45c73eb Merge pull request `#28716`_ from rallytime/`bp-28705`_ - * 32e7bd3 Account for new headers class in tornado 4.3 + * 215b26c06f Revert `#28740`_ -- **PR** `#28717`_: (*cachedout*) Add note about recommended umask - @ *2015-11-09T23:26:20Z* +* **PR** `#28777`_: (`rallytime`_) Back-port `#28740`_ to 2014.7 + @ *2015-11-11 18:00:00 UTC* - - **ISSUE** `#28199`_: (*felskrone*) Non-standard umasks might break the master - | refs: `#28717`_ - * f4fe921 Merge pull request `#28717`_ from cachedout/umask_note - * 1874300 Add note about recommended umask + * **PR** `#28740`_: (`MasterNayru`_) Add missing S3 module import (refs: `#28777`_, `#28839`_) -- **PR** `#28461`_: (*cachedout*) Wrap all cache calls in state.sls in correct umask - @ *2015-11-02T17:11:02Z* + * 76e69b4bff Merge pull request `#28777`_ from rallytime/bp-28740-2014.7 - - **ISSUE** `#28455`_: (*zmalone*) highstate.cache is world readable, and contains secrets - | refs: `#28461`_ - * 4bf56ca Merge pull request `#28461`_ from cachedout/issue_28455 - * 097838e Wrap all cache calls in state.sls in correct umask + * da5fac2b36 Back-port `#28740`_ to 2014.7 -- **PR** `#28407`_: (*DmitryKuzmenko*) Don't request creds if auth with key. - @ *2015-10-29T16:12:30Z* +* **PR** `#28716`_: (`rallytime`_) Back-port `#28705`_ to 2014.7 + @ *2015-11-10 16:15:03 UTC* - - **ISSUE** `#24910`_: (*bocig*) -T, --make-token flag does NOT work- LDAP Groups - | refs: `#28407`_ - * f3e61db Merge pull request `#28407`_ from DSRCompany/issues/24910_token_auth_fix_2014 - * b7b5bec Don't request creds if auth with key. + * **PR** `#28705`_: (`cachedout`_) Account for new headers class in tornado 4.3 (refs: `#28716`_) -- **PR** `#27390`_: (*JaseFace*) Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() - @ *2015-10-05T18:09:33Z* + * 45c73ebf2f Merge pull request `#28716`_ from rallytime/bp-28705 - * d284eb1 Merge pull request `#27390`_ from JaseFace/schedule-missing-enabled - * 563db71 Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run. schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition. + * 32e7bd3ea0 Account for new headers class in tornado 4.3 +* **ISSUE** `#28199`_: (`felskrone`_) Non-standard umasks might break the master (refs: `#28717`_) + +* **PR** `#28717`_: (`cachedout`_) Add note about recommended umask + @ *2015-11-09 23:26:20 UTC* + + * f4fe921965 Merge pull request `#28717`_ from cachedout/umask_note + + * 1874300e08 Add note about recommended umask + +* **ISSUE** `#28455`_: (`zmalone`_) highstate.cache is world readable, and contains secrets (refs: `#28461`_) + +* **PR** `#28461`_: (`cachedout`_) Wrap all cache calls in state.sls in correct umask + @ *2015-11-02 17:11:02 UTC* + + * 4bf56cad3f Merge pull request `#28461`_ from cachedout/issue_28455 + + * 097838ec0c Wrap all cache calls in state.sls in correct umask + +* **ISSUE** `#24910`_: (`bocig`_) -T, --make-token flag does NOT work- LDAP Groups (refs: `#28407`_) + +* **PR** `#28407`_: (`DmitryKuzmenko`_) Don't request creds if auth with key. + @ *2015-10-29 16:12:30 UTC* + + * f3e61db045 Merge pull request `#28407`_ from DSRCompany/issues/24910_token_auth_fix_2014 + + * b7b5bec309 Don't request creds if auth with key. + +* **PR** `#27390`_: (`JaseFace`_) Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() + @ *2015-10-05 18:09:33 UTC* + + * d284eb165b Merge pull request `#27390`_ from JaseFace/schedule-missing-enabled + + * 563db71bfd Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run. schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition. .. _`#24910`: https://github.com/saltstack/salt/issues/24910 .. _`#27390`: https://github.com/saltstack/salt/pull/27390 @@ -85,6 +95,11 @@ Changes: .. _`#28740`: https://github.com/saltstack/salt/pull/28740 .. _`#28777`: https://github.com/saltstack/salt/pull/28777 .. _`#28839`: https://github.com/saltstack/salt/pull/28839 -.. _`bp-28705`: https://github.com/saltstack/salt/pull/28705 -.. _`bp-28740`: https://github.com/saltstack/salt/pull/28740 - +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`JaseFace`: https://github.com/JaseFace +.. _`MasterNayru`: https://github.com/MasterNayru +.. _`bocig`: https://github.com/bocig +.. _`cachedout`: https://github.com/cachedout +.. _`felskrone`: https://github.com/felskrone +.. _`rallytime`: https://github.com/rallytime +.. _`zmalone`: https://github.com/zmalone diff --git a/doc/topics/releases/2014.7.9.rst b/doc/topics/releases/2014.7.9.rst index 30d704c296..b9d7862b06 100644 --- a/doc/topics/releases/2014.7.9.rst +++ b/doc/topics/releases/2014.7.9.rst @@ -2,44 +2,70 @@ Salt 2014.7.9 Release Notes =========================== -Changes for v2014.7.8..v2014.7.9 --------------------------------- +:release: 2016-03-11 -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): - -*Generated at: 2016-03-11T20:58:58Z* - -Statistics: - -- Total Merges: **3** -- Total Issue references: **1** -- Total PR references: **3** - -Changes: +Version 2014.7.9 is a bugfix release for :ref:`2014.7.0 `. -- **PR** `#31826`_: (*gtmanfred*) Remove ability of authenticating user to specify pam service - @ *2016-03-11T20:41:01Z* +Statistics +========== - * c5e7c03 Merge pull request `#31826`_ from gtmanfred/2014.7 - * d73f70e Remove ability of authenticating user to specify pam service +- Total Merges: **5** +- Total Issue References: **1** +- Total PR References: **5** -- **PR** `#29392`_: (*jacobhammons*) updated version number to not reference a specific build from the lat… - @ *2015-12-03T15:54:31Z* +- Contributors: **4** (`douardda`_, `gtmanfred`_, `jacobhammons`_, `jfindlay`_) - * 85aa70a Merge pull request `#29392`_ from jacobhammons/2014.7 - * d7f0db1 updated version number to not reference a specific build from the latest branch -- **PR** `#29296`_: (*douardda*) Use process KillMode on Debian systems also - @ *2015-12-01T16:00:16Z* +Changelog for v2014.7.8..v2014.7.9 +================================== - - **ISSUE** `#29295`_: (*douardda*) systemd's service file should use the 'process' KillMode option on Debian also - | refs: `#29296`_ - * d2fb210 Merge pull request `#29296`_ from douardda/patch-3 - * d288539 Use process KillMode on Debian systems also +*Generated at: 2018-05-27 20:55:35 UTC* +* **PR** `#31834`_: (`jfindlay`_) add 2014.7.8 release notes + @ *2016-03-11 21:35:42 UTC* + + * 218c902091 Merge pull request `#31834`_ from jfindlay/2014.7 + + * 358fdad0c8 add 2014.7.8 release notes + +* **PR** `#31833`_: (`jfindlay`_) add 2014.7.9 release notes + @ *2016-03-11 21:19:55 UTC* + + * a423c6cd04 Merge pull request `#31833`_ from jfindlay/2014.7 + + * 6910fcc584 add 2014.7.9 release notes + +* **PR** `#31826`_: (`gtmanfred`_) Remove ability of authenticating user to specify pam service + @ *2016-03-11 20:41:01 UTC* + + * c5e7c03953 Merge pull request `#31826`_ from gtmanfred/2014.7 + + * d73f70ebb2 Remove ability of authenticating user to specify pam service + +* **PR** `#29392`_: (`jacobhammons`_) updated version number to not reference a specific build from the lat… + @ *2015-12-03 15:54:31 UTC* + + * 85aa70a6cb Merge pull request `#29392`_ from jacobhammons/2014.7 + + * d7f0db1dd8 updated version number to not reference a specific build from the latest branch + +* **ISSUE** `#29295`_: (`douardda`_) systemd's service file should use the 'process' KillMode option on Debian also (refs: `#29296`_) + +* **PR** `#29296`_: (`douardda`_) Use process KillMode on Debian systems also + @ *2015-12-01 16:00:16 UTC* + + * d2fb2109a3 Merge pull request `#29296`_ from douardda/patch-3 + + * d2885390f4 Use process KillMode on Debian systems also .. _`#29295`: https://github.com/saltstack/salt/issues/29295 .. _`#29296`: https://github.com/saltstack/salt/pull/29296 .. _`#29392`: https://github.com/saltstack/salt/pull/29392 .. _`#31826`: https://github.com/saltstack/salt/pull/31826 +.. _`#31833`: https://github.com/saltstack/salt/pull/31833 +.. _`#31834`: https://github.com/saltstack/salt/pull/31834 +.. _`douardda`: https://github.com/douardda +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jfindlay`: https://github.com/jfindlay diff --git a/doc/topics/releases/2015.5.1.rst b/doc/topics/releases/2015.5.1.rst index 1bcfb36b12..8ae0122f30 100644 --- a/doc/topics/releases/2015.5.1.rst +++ b/doc/topics/releases/2015.5.1.rst @@ -4,1725 +4,1707 @@ Salt 2015.5.1 Release Notes :release: 2015-05-20 -Version 2015.5.1 is a bugfix release for :ref:`2015.5.0`. +Version 2015.5.1 is a bugfix release for :ref:`2015.5.0 `. -Changes: -- salt.runners.cloud.action() has changed the `fun` keyword argument to `func`. - Please update any calls to this function in the cloud runner. +Statistics +========== -Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +- Total Merges: **203** +- Total Issue References: **30** +- Total PR References: **177** -**PR** `#23989`_: (*rallytime*) Backport `#23980`_ to 2015.5 - @ *2015-05-20T19:33:41Z* +- Contributors: **49** (`Arabus`_, `Lothiraldan`_, `Snergster`_, `TaiSHiNet`_, `The-Loeki`_, `UtahDave`_, `aboe76`_, `ahus1`_, `basepi`_, `bastiaanb`_, `bradthurber`_, `cachedout`_, `cellscape`_, `corywright`_, `cro`_, `dennisjac`_, `dmyerscough`_, `galet`_, `garethgreenaway`_, `gladiatr72`_, `gtmanfred`_, `iggy`_, `ionutbalutoiu`_, `jacobhammons`_, `jayeshka`_, `jfindlay`_, `joejulian`_, `jpic`_, `justinta`_, `kaidokert`_, `kaithar`_, `kiorky`_, `lisa2lisa`_, `msciciel`_, `nleib`_, `notpeter`_, `optix2000`_, `rahulhan`_, `rallytime`_, `rubic`_, `ryan-lane`_, `s0undt3ch`_, `slinu3d`_, `steverweber`_, `techhat`_, `terminalmage`_, `ticosax`_, `twangboy`_, `whiteinge`_) - * **PR** `#23980`_: (*iggy*) template: jinja2 -> jinja | refs: `#23989`_ - * 117ecb1 Merge pull request `#23989`_ from rallytime/`bp-23980`_ - * 8f8557c template: jinja2 -> jinja -**PR** `#23988`_: (*rallytime*) Backport `#23977`_ to 2015.5 - @ *2015-05-20T19:13:36Z* +Cloud Runner Changes +==================== - * **PR** `#23977`_: (*ionutbalutoiu*) Fixed glance image_create | refs: `#23988`_ - * d4f1ba0 Merge pull request `#23988`_ from rallytime/`bp-23977`_ - * 46fc7c6 Fixed glance image_create +The ``fun`` argument to the :py:func:`cloud.action ` +runner has changed to ``func``. Please update any calls to this runner. -**PR** `#23986`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-05-20T18:41:33Z* - * **PR** `#23965`_: (*hvnsweeting*) handle all exceptions gitpython can raise - * 9566e7d Merge pull request `#23986`_ from basepi/merge-forward-2015.5 - * 0b78156 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - * 314e4db Merge pull request `#23965`_ from hvnsweeting/20147-fix-gitfs-gitpython-exception - * 2576301 handle all exception gitpython can raise +Changelog for v2015.5.0..v2015.5.1 +================================== -**PR** `#23985`_: (*UtahDave*) Add 2014.7.5-2 and 2015.5.0-2 Windows installer download links - @ *2015-05-20T18:32:44Z* +*Generated at: 2018-05-27 20:58:00 UTC* - * 9d1130e Merge pull request `#23985`_ from UtahDave/2015.5local - * 10338d0 Add links to Windows 2015.5.0-2 install downloads - * b84f975 updated Windows 2014.7.5-2 installer download link +* **PR** `#23998`_: (`rallytime`_) Update release note for 2015.5.1 + @ *2015-05-20 20:58:55 UTC* -**PR** `#23983`_: (*rallytime*) Versionadded tags for https_user and https_pass args new in 2015.5.0 - @ *2015-05-20T18:05:27Z* + * 2422760ebd Merge pull request `#23998`_ from rallytime/release_notes - * ca7729d Merge pull request `#23983`_ from rallytime/versionadded_git_options - * 14eae22 Versionadded tags for https_user and https_pass args new in 2015.5.0 + * 113c6049f5 Update release note for 2015.5.1 -**PR** `#23970`_: (*jayeshka*) adding system unit test case - @ *2015-05-20T17:12:57Z* +* **PR** `#23989`_: (`rallytime`_) Backport `#23980`_ to 2015.5 + @ *2015-05-20 19:33:41 UTC* - * b06df57 Merge pull request `#23970`_ from jayeshka/system-unit-test - * 89eb008 adding system unit test case + * **PR** `#23980`_: (`iggy`_) template: jinja2 -> jinja (refs: `#23989`_) -**PR** `#23967`_: (*jayeshka*) adding states/memcached unit test case - @ *2015-05-20T17:12:26Z* + * 117ecb1fe0 Merge pull request `#23989`_ from rallytime/bp-23980 - * 38d5f75 Merge pull request `#23967`_ from jayeshka/memcached-states-unit-test - * 8ef9240 adding states/memcached unit test case + * 8f8557c47d template: jinja2 -> jinja -**PR** `#23966`_: (*jayeshka*) adding states/modjk unit test case - @ *2015-05-20T17:11:48Z* +* **PR** `#23988`_: (`rallytime`_) Backport `#23977`_ to 2015.5 + @ *2015-05-20 19:13:36 UTC* - * 868e807 Merge pull request `#23966`_ from jayeshka/modjk-states-unit-test - * 422a964 adding states/modjk unit test case + * **PR** `#23977`_: (`ionutbalutoiu`_) Fixed glance image_create (refs: `#23988`_) -**PR** `#23942`_: (*jacobhammons*) Updates to sphinx saltstack2 doc theme - @ *2015-05-20T15:43:54Z* + * d4f1ba02d7 Merge pull request `#23988`_ from rallytime/bp-23977 - * 6316490 Merge pull request `#23942`_ from jacobhammons/2015.5 - * 31023c8 Updates to sphinx saltstack2 doc theme + * 46fc7c6b69 Fixed glance image_create -**PR** `#23874`_: (*joejulian*) Validate keyword arguments to be valid - @ *2015-05-20T04:53:40Z* +* **PR** `#23986`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-05-20 18:41:33 UTC* - * **ISSUE** `#23872`_: (*joejulian*) create_ca_signed_cert can error if dereferenced dict is used for args | refs: `#23874`_ - * 587957b Merge pull request `#23874`_ from joejulian/2015.5_tls_validate_kwargs - * 30102ac Fix py3 and ordering inconsistency problems. - * 493f7ad Validate keyword arguments to be valid + * 9566e7d412 Merge pull request `#23986`_ from basepi/merge-forward-2015.5 -**PR** `#23960`_: (*rallytime*) Backport `#22114`_ to 2015.5 - @ *2015-05-20T04:37:09Z* + * 0b78156592 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - * **PR** `#22114`_: (*dmyerscough*) Fixing KeyError when there are no additional pages | refs: `#23960`_ - * 00c5c22 Merge pull request `#23960`_ from rallytime/`bp-22114`_ - * f3e1d63 Catch KeyError - * 306b1ea Fixing KeyError - * 6b2cda2 Fix PEP8 complaint - * 239e50f Fixing KeyError when there are no additional pages + * 314e4db512 Merge pull request `#23965`_ from hvnsweeting/20147-fix-gitfs-gitpython-exception -**PR** `#23961`_: (*rallytime*) Backport `#23944`_ to 2015.5 - @ *2015-05-20T04:35:41Z* + * 2576301631 handle all exception gitpython can raise - * **PR** `#23944`_: (*ryan-lane*) Add missing loginclass argument to _changes call | refs: `#23961`_ - * 4648b46 Merge pull request `#23961`_ from rallytime/`bp-23944`_ - * 970d19a Add missing loginclass argument to _changes call +* **PR** `#23985`_: (`UtahDave`_) Add 2014.7.5-2 and 2015.5.0-2 Windows installer download links + @ *2015-05-20 18:32:44 UTC* -**PR** `#23948`_: (*jfindlay*) augeas.change state now returns changes as a dict - @ *2015-05-20T04:00:10Z* + * 9d1130ef8e Merge pull request `#23985`_ from UtahDave/2015.5local - * 0cb5cd3 Merge pull request `#23948`_ from jfindlay/augeas_changes - * f09b80a augeas.change state now returns changes as a dict + * 10338d0c54 Add links to Windows 2015.5.0-2 install downloads -**PR** `#23957`_: (*rallytime*) Backport `#23951`_ to 2015.5 - @ *2015-05-20T03:04:24Z* + * b84f9756c5 updated Windows 2014.7.5-2 installer download link - * **PR** `#23951`_: (*ryan-lane*) Do not check perms in file.copy if preserve | refs: `#23957`_ - * 2d185f7 Merge pull request `#23957`_ from rallytime/`bp-23951`_ - * 996b431 Update file.py - * 85d461f Do not check perms in file.copy if preserve +* **PR** `#23983`_: (`rallytime`_) Versionadded tags for https_user and https_pass args new in 2015.5.0 + @ *2015-05-20 18:05:27 UTC* -- **PR** `#23956`_: (*rallytime*) Backport `#23906`_ to 2015.5 - @ *2015-05-20T03:04:14Z* + * ca7729d023 Merge pull request `#23983`_ from rallytime/versionadded_git_options - - **ISSUE** `#23839`_: (*gladiatr72*) wonky loader syndrome - | refs: `#23906`_ - - **ISSUE** `#23373`_: (*tnypex*) reactor/orchestrate race condition on salt['pillar.get'] - | refs: `#23906`_ - - **PR** `#23906`_: (*gladiatr72*) Added exception handler to trap the RuntimeError raised when - | refs: `#23956`_ - * ebff1ff Merge pull request `#23956`_ from rallytime/`bp-23906`_ - * 9d87fd3 add proper marker for format argument + * 14eae22c91 Versionadded tags for https_user and https_pass args new in 2015.5.0 - * 197688e Added exception handler to trap the RuntimeError raised when Depends.enforce_dependency() class method fires unsuccessfully. There appears to be no synchronization within the Depends decorator class wrt the class global dependency_dict which results in incomplete population of any loader instantiation occurring at the time of one of these exceptions. +* **PR** `#23970`_: (`jayeshka`_) adding system unit test case + @ *2015-05-20 17:12:57 UTC* -- **PR** `#23955`_: (*rallytime*) Backport `#19305`_ to 2015.5 - @ *2015-05-20T03:03:55Z* + * b06df57e03 Merge pull request `#23970`_ from jayeshka/system-unit-test - - **ISSUE** `#19852`_: (*TaiSHiNet*) DigitalOcean APIv2 can't delete machines when there is only 1 page - | refs: `#23955`_ - - **ISSUE** `#19304`_: (*TaiSHiNet*) DigitalOcean API v2 cannot delete VMs on 2nd page - | refs: `#19305`_ - - **PR** `#19305`_: (*TaiSHiNet*) Fixes droplet listing past page 1 - | refs: `#23955`_ - * da3f919 Merge pull request `#23955`_ from rallytime/`bp-19305`_ - * bbf2429 Fixes droplet listing past page 1 + * 89eb00815e adding system unit test case -- **PR** `#23940`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-05-19T22:37:58Z* +* **PR** `#23967`_: (`jayeshka`_) adding states/memcached unit test case + @ *2015-05-20 17:12:26 UTC* - - **ISSUE** `#23820`_: (*UtahDave*) 2014.7.5 schedule error - | refs: `#23881`_ - - **ISSUE** `#22131`_: (*quixoten*) "unexpected keyword argument 'merge'" on 2014.7.2 (salt-ssh) - | refs: `#23887`_ - - **PR** `#23939`_: (*basepi*) Add extended changelog to 2014.7.6 release notes - - **PR** `#23887`_: (*basepi*) [2014.7] Bring salt-ssh pillar.get in line with mainline pillar.get - - **PR** `#23881`_: (*garethgreenaway*) Fixes to schedule module in 2014.7 - * 02a78fc Merge pull request `#23940`_ from basepi/merge-forward-2015.5 - * 36f0065 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * 38d5f75756 Merge pull request `#23967`_ from jayeshka/memcached-states-unit-test - * 9133912 Merge pull request `#23939`_ from basepi/v2014.7.6release + * 8ef9240e25 adding states/memcached unit test case - * 32b65dc Add extended changelog to 2014.7.6 release notes +* **PR** `#23966`_: (`jayeshka`_) adding states/modjk unit test case + @ *2015-05-20 17:11:48 UTC* - * 0031ca2 Merge pull request `#23881`_ from garethgreenaway/23820_2014_7_schedule_list_issue + * 868e807d8a Merge pull request `#23966`_ from jayeshka/modjk-states-unit-test - * b207f2a Missing continue in the list function when deleting unused attributes. + * 422a96497d adding states/modjk unit test case - * 63bd21e Merge pull request `#23887`_ from basepi/salt-ssh.pillar.get.22131 +* **PR** `#23942`_: (`jacobhammons`_) Updates to sphinx saltstack2 doc theme + @ *2015-05-20 15:43:54 UTC* - * bc84502 Bring salt-ssh pillar.get in line with mainline pillar.get + * 63164900bd Merge pull request `#23942`_ from jacobhammons/2015.5 -- **PR** `#23932`_: (*rallytime*) Backport `#23908`_ to 2015.5 - @ *2015-05-19T21:41:28Z* + * 31023c8915 Updates to sphinx saltstack2 doc theme - - **PR** `#23908`_: (*nleib*) fix connection function to mongo - | refs: `#23932`_ - * ee4c01b Merge pull request `#23932`_ from rallytime/`bp-23908`_ - * 5d520c9 fix connection function to mongo +* **ISSUE** `#23872`_: (`joejulian`_) create_ca_signed_cert can error if dereferenced dict is used for args (refs: `#23874`_) -- **PR** `#23931`_: (*rallytime*) Backport `#23880`_ to 2015.5 - @ *2015-05-19T21:41:18Z* +* **PR** `#23874`_: (`joejulian`_) Validate keyword arguments to be valid + @ *2015-05-20 04:53:40 UTC* - - **PR** `#23880`_: (*bastiaanb*) if setting client_config_dir to '~', expand path - | refs: `#23931`_ - * 70bd407 Merge pull request `#23931`_ from rallytime/`bp-23880`_ - * 8ce59a2 if setting client_config_dir to '~', expand path + * 587957badc Merge pull request `#23874`_ from joejulian/2015.5_tls_validate_kwargs -- **PR** `#23898`_: (*kiorky*) Lxc profiles - | refs: `#23897`_ - @ *2015-05-19T21:08:28Z* + * 30102acd04 Fix py3 and ordering inconsistency problems. - - **ISSUE** `#23847`_: (*kiorky*) lxc: systemd containers cant be seeded - | refs: `#23806`_ `#23898`_ `#23897`_ `#23808`_ - - **ISSUE** `#23833`_: (*kiorky*) lxc.set_dns fails intermittently - | refs: `#23898`_ `#23807`_ `#23897`_ `#23808`_ - - **ISSUE** `#23772`_: (*cheuschober*) lxc.init fails to bootstrap container - | refs: `#23806`_ `#23898`_ `#23807`_ `#23897`_ `#23808`_ - - **ISSUE** `#23658`_: (*arthurlogilab*) [salt-cloud lxc] too verbose, shows host: True multiple times when starting - | refs: `#23898`_ `#23897`_ - - **ISSUE** `#23657`_: (*arthurlogilab*) [salt-cloud lxc] NameError: global name '__salt__' is not defined - | refs: `#23727`_ `#23898`_ `#23897`_ - - **PR** `#23897`_: (*kiorky*) Lxc seed and prof ports - | refs: `#23898`_ - - **PR** `#23808`_: (*kiorky*) Lxc seed and prof ports - | refs: `#23807`_ `#23897`_ - - **PR** `#23807`_: (*kiorky*) Lxc profiles - | refs: `#23898`_ - - **PR** `#23806`_: (*kiorky*) Lxc seeding - | refs: `#23807`_ - * 5bdbf0a Merge pull request `#23898`_ from makinacorpus/lxc_profiles - * d9051a0 lxc: systemd support + * 493f7ad5f0 Validate keyword arguments to be valid - * e8d674f lxc: chroot fallback toggle +* **PR** `#23960`_: (`rallytime`_) Backport `#22114`_ to 2015.5 + @ *2015-05-20 04:37:09 UTC* - * e2887a0 lxc: sync func name with develop + * **PR** `#22114`_: (`dmyerscough`_) Fixing KeyError when there are no additional pages (refs: `#23960`_) - * e96e345 lxc more fixes (lxc.set_dns) + * 00c5c22867 Merge pull request `#23960`_ from rallytime/bp-22114 - * fdb6424 lxc: Fix salt config (no more a kwarg) + * f3e1d63fce Catch KeyError - * 63e63fa repair salt cloud lxc api on develop + * 306b1ea6b8 Fixing KeyError - * 80eabe2 lxc salt cloud doc + * 6b2cda2861 Fix PEP8 complaint - * 73f229d lxc: unificate saltconfig/master/master_port + * 239e50f30d Fixing KeyError when there are no additional pages - * 0bc1f08 lxc: refactor a bit saltcloud/lxc interface +* **PR** `#23961`_: (`rallytime`_) Backport `#23944`_ to 2015.5 + @ *2015-05-20 04:35:41 UTC* - * 7a80370 lxc: get networkprofile from saltcloud + * **PR** `#23944`_: (`ryan-lane`_) Add missing loginclass argument to _changes call (refs: `#23961`_) - * 47acb2e lxc: default net profile has now correct options + * 4648b46e05 Merge pull request `#23961`_ from rallytime/bp-23944 - * 7eadf48 lxc: select the appropriate default bridge + * 970d19a31e Add missing loginclass argument to _changes call -- **PR** `#23922`_: (*garethgreenaway*) Fixes to debian_ip.py - @ *2015-05-19T18:50:53Z* +* **PR** `#23948`_: (`jfindlay`_) augeas.change state now returns changes as a dict + @ *2015-05-20 04:00:10 UTC* - - **ISSUE** `#23900`_: (*hashi825*) salt ubuntu network building issue 2015.5.0 - | refs: `#23922`_ - * b818f72 Merge pull request `#23922`_ from garethgreenaway/23900_2015_5_bonding_interface_fixes - * 0bba536 Fixing issue reported when using bonded interfaces on Ubuntu. Attributes should be bond-, but the code was attempting to split just on ``bond_``. Fix accounts for both, but the debian_ip.py module will write out bond attributes with bond- + * 0cb5cd3938 Merge pull request `#23948`_ from jfindlay/augeas_changes -- **PR** `#23925`_: (*jpic*) Fixed wrong path in LXC cloud documentation - @ *2015-05-19T18:23:56Z* + * f09b80a8b5 augeas.change state now returns changes as a dict - - **PR** `#23924`_: (*jpic*) Fixed wrong path in LXC cloud documentation - | refs: `#23925`_ - * b1c98a3 Merge pull request `#23925`_ from jpic/fix/wrong_lxc_path - * a4bcd75 Fixed wrong path in LXC cloud documentation +* **PR** `#23957`_: (`rallytime`_) Backport `#23951`_ to 2015.5 + @ *2015-05-20 03:04:24 UTC* -- **PR** `#23894`_: (*whiteinge*) Add __all__ attribute to Mock class for docs - @ *2015-05-19T17:17:35Z* + * **PR** `#23951`_: (`ryan-lane`_) Do not check perms in file.copy if preserve (refs: `#23957`_) - * 7f6a716 Merge pull request `#23894`_ from whiteinge/doc-mock__all__ - * 6eeca46 Add __all__ attribute to Mock class for docs + * 2d185f78f7 Merge pull request `#23957`_ from rallytime/bp-23951 -- **PR** `#23884`_: (*jfindlay*) Fix locale.set_locale on debian - @ *2015-05-19T15:51:22Z* + * 996b431252 Update file.py - - **ISSUE** `#23767`_: (*chrimi*) Salt system.locale fails on non existent default locale - | refs: `#23884`_ - * 8108a9b Merge pull request `#23884`_ from jfindlay/fix_locale - * 91c2d51 use append_if_not_found in locale.set_locale + * 85d461f748 Do not check perms in file.copy if preserve - * e632603 (re)generate /etc/default/locale +* **ISSUE** `#23839`_: (`gladiatr72`_) wonky loader syndrome (refs: `#23906`_) -- **PR** `#23866`_: (*jfindlay*) backport `#23834`_, change portage.dep.strip_empty to list comprehension - @ *2015-05-19T15:50:43Z* +* **ISSUE** `#23373`_: (`tnypex`_) reactor/orchestrate race condition on salt['pillar.get'] (refs: `#23906`_) - - **PR** `#23834`_: (*Arabus*) Avoid deprecation warning from portage.dep.strip_empty() - | refs: `#23866`_ - * 6bae12f Merge pull request `#23866`_ from jfindlay/flag_strip - * aa032cc replace portage.dep.strip_empty() with list comprehension +* **PR** `#23956`_: (`rallytime`_) Backport `#23906`_ to 2015.5 + @ *2015-05-20 03:04:14 UTC* - * 7576872 Proper replacement for portage.dep.strip_empty() with list comprehension, pep8fix + * **PR** `#23906`_: (`gladiatr72`_) Added exception handler to trap the RuntimeError raised when (refs: `#23956`_) - * 2851a5c Switch portage.dep.strip_empty(...) to filter(None,...) to avoid deprecation warning and do essentially the same + * ebff1ff967 Merge pull request `#23956`_ from rallytime/bp-23906 -- **PR** `#23917`_: (*corywright*) Split debian bonding options on dash instead of underscore - @ *2015-05-19T15:44:35Z* + * 9d87fd335c add proper marker for format argument - - **ISSUE** `#23904`_: (*mbrgm*) Network config bonding section cannot be parsed when attribute names use dashes - | refs: `#23917`_ - * a67a008 Merge pull request `#23917`_ from corywright/issue23904 - * c06f8cf Split debian bonding options on dash instead of underscore + * 197688ef0c Added exception handler to trap the RuntimeError raised when Depends.enforce_dependency() class method fires unsuccessfully. There appears to be no synchronization within the Depends decorator class wrt the class global dependency_dict which results in incomplete population of any loader instantiation occuring at the time of one of these exceptions. -- **PR** `#23909`_: (*jayeshka*) 'str' object has no attribute 'capitalized' - @ *2015-05-19T15:41:53Z* +* **ISSUE** `#19852`_: (`TaiSHiNet`_) DigitalOcean APIv2 can't delete machines when there is only 1 page (refs: `#23955`_) - * e8fcd09 Merge pull request `#23909`_ from jayeshka/file-exe-module - * e422d9d 'str' object has no attribute 'capitalized' +* **ISSUE** `#19304`_: (`TaiSHiNet`_) DigitalOcean API v2 cannot delete VMs on 2nd page (refs: `#19305`_) -- **PR** `#23903`_: (*garethgreenaway*) Adding docs for missing schedule state module parameters. - @ *2015-05-19T06:29:34Z* +* **PR** `#23955`_: (`rallytime`_) Backport `#19305`_ to 2015.5 + @ *2015-05-20 03:03:55 UTC* - * c73bf38 Merge pull request `#23903`_ from garethgreenaway/missing_docs_schedule_state - * acd8ab9 Adding docs for missing schedule state module parameters. + * **PR** `#19305`_: (`TaiSHiNet`_) Fixes droplet listing past page 1 (refs: `#23955`_) -* f7eb70c changed previous release to 2014.7.6 + * da3f9197d3 Merge pull request `#23955`_ from rallytime/bp-19305 + * bbf2429bce Fixes droplet listing past page 1 -* 608059f Merge branch '2015.5' of https://github.com/jacobhammons/salt into 2015.5 +* **PR** `#23940`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-05-19 22:37:58 UTC* + * 02a78fce3d Merge pull request `#23940`_ from basepi/merge-forward-2015.5 - * a56697b Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 + * 36f0065faf Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - * 1c2af5c Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 + * 913391207a Merge pull request `#23939`_ from basepi/v2014.7.6release - * ef58128 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 + * 32b65dc2a9 Add extended changelog to 2014.7.6 release notes - * 8664e8b Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5-2 + * 0031ca2631 Merge pull request `#23881`_ from garethgreenaway/23820_2014_7_schedule_list_issue - * 46eb265 saltstack2 sphinx theme updates + * b207f2a433 Missing continue in the list function when deleting unused attributes. - * e7442d3 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 + * 63bd21ecd2 Merge pull request `#23887`_ from basepi/salt-ssh.pillar.get.22131 - * ee3c1bd missed one + * bc84502f46 Bring salt-ssh pillar.get in line with mainline pillar.get - * 3872921 More updates to sphinx2 theme +* **PR** `#23932`_: (`rallytime`_) Backport `#23908`_ to 2015.5 + @ *2015-05-19 21:41:28 UTC* - * fcd4865 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 + * **PR** `#23908`_: (`nleib`_) fix connection function to mongo (refs: `#23932`_) - * 8c32152 removed TOC numbering, additional tweaks to layout.html + * ee4c01bf30 Merge pull request `#23932`_ from rallytime/bp-23908 - * 73dfaef Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 + * 5d520c9377 fix connection function to mongo - * 16d8a75 saltstack2 sphinx theme and build settings +* **PR** `#23931`_: (`rallytime`_) Backport `#23880`_ to 2015.5 + @ *2015-05-19 21:41:18 UTC* -- **PR** `#23806`_: (*kiorky*) Lxc seeding - | refs: `#23807`_ - @ *2015-05-18T23:18:33Z* + * **PR** `#23880`_: (`bastiaanb`_) if setting client_config_dir to '~', expand path (refs: `#23931`_) - - **ISSUE** `#23847`_: (*kiorky*) lxc: systemd containers cant be seeded - | refs: `#23806`_ `#23898`_ `#23897`_ `#23808`_ - - **ISSUE** `#23772`_: (*cheuschober*) lxc.init fails to bootstrap container - | refs: `#23806`_ `#23898`_ `#23807`_ `#23897`_ `#23808`_ - * ff3cc7d Merge pull request `#23806`_ from makinacorpus/lxc_seeding - * 61b7aad runners/lxc: optim + * 70bd407920 Merge pull request `#23931`_ from rallytime/bp-23880 -- **PR** `#23892`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-05-18T23:07:57Z* + * 8ce59a2e16 if setting client_config_dir to '~', expand path - - **PR** `#23891`_: (*basepi*) Update the release notes index page - - **PR** `#23888`_: (*basepi*) Update the 2014.7.6 release notes with CVE details - - **PR** `#23871`_: (*rallytime*) Backport `#23848`_ to 2014.7 - - **PR** `#23848`_: (*dumol*) Updated installation docs for SLES 12. - | refs: `#23871`_ - * 5f1a93d Merge pull request `#23892`_ from basepi/merge-forward-2015.5 - * c2eed77 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 +* **ISSUE** `#23847`_: (`kiorky`_) lxc: systemd containers cant be seeded (refs: `#23806`_, `#23898`_, `#23897`_, `#23808`_) - * 17c5810 Merge pull request `#23891`_ from basepi/releasenotes +* **ISSUE** `#23833`_: (`kiorky`_) lxc.set_dns fails intermittently (refs: `#23807`_, `#23898`_, `#23897`_, `#23808`_) - * dec153b Update the release notes index page +* **ISSUE** `#23772`_: (`cheuschober`_) lxc.init fails to bootstrap container (refs: `#23806`_, `#23808`_, `#23807`_, `#23898`_, `#23897`_) - * a93e58f Merge pull request `#23888`_ from basepi/v2014.7.6release +* **ISSUE** `#23658`_: (`arthurlogilab`_) [salt-cloud lxc] too verbose, shows host: True multiple times when starting (refs: `#23898`_, `#23897`_) - * 49921b6 Update the 2014.7.6 release notes with CVE details +* **ISSUE** `#23657`_: (`arthurlogilab`_) [salt-cloud lxc] NameError: global name '__salt__' is not defined (refs: `#23898`_, `#23727`_, `#23897`_) - * 5073028 Merge pull request `#23871`_ from rallytime/`bp-23848`_ +* **PR** `#23898`_: (`kiorky`_) Lxc profiles (refs: `#23897`_) + @ *2015-05-19 21:08:28 UTC* - * 379c09c Updated for SLES 12. + * **PR** `#23897`_: (`kiorky`_) Lxc seed and prof ports (refs: `#23898`_) -- **PR** `#23875`_: (*rallytime*) Backport `#23838`_ to 2015.5 - @ *2015-05-18T22:28:55Z* + * **PR** `#23808`_: (`kiorky`_) Lxc seed and prof ports (refs: `#23807`_, `#23897`_) - - **PR** `#23838`_: (*gtmanfred*) add refresh_beacons and sync_beacons - | refs: `#23875`_ - * 66d1335 Merge pull request `#23875`_ from rallytime/`bp-23838`_ - * 3174227 Add versionadded directives to new beacon saltutil functions + * **PR** `#23807`_: (`kiorky`_) Lxc profiles (refs: `#23898`_) - * 4a94b2c add refresh_beacons and sync_beacons + * **PR** `#23806`_: (`kiorky`_) Lxc seeding (refs: `#23807`_) -- **PR** `#23876`_: (*rallytime*) Switch digital ocean tests to v2 driver - @ *2015-05-18T22:17:13Z* + * 5bdbf0af9b Merge pull request `#23898`_ from makinacorpus/lxc_profiles - * d294cf2 Merge pull request `#23876`_ from rallytime/switch_digital_ocean_tests_v2 - * dce9b54 Remove extra line + * d9051a047a lxc: systemd support - * 4acf58e Switch digital ocean tests to v2 driver + * e8d674fed4 lxc: chroot fallback toggle -- **PR** `#23882`_: (*garethgreenaway*) Fixes to scheduler in 2015.5 - @ *2015-05-18T22:09:24Z* + * e2887a0d44 lxc: sync func name with develop - - **ISSUE** `#23792`_: (*neogenix*) Salt Scheduler Incorrect Response (True, should be False) - | refs: `#23882`_ - * b97a48c Merge pull request `#23882`_ from garethgreenaway/23792_2015_5_wrong_return_code - * 37dbde6 Job already exists in schedule, should return False. + * e96e345799 lxc more fixes (lxc.set_dns) -- **PR** `#23868`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-05-18T18:35:54Z* + * fdb64245d4 lxc: Fix salt config (no more a kwarg) - - **ISSUE** `#20198`_: (*jcftang*) virt.get_graphics, virt.get_nics are broken, in turn breaking other things - | refs: `#23809`_ - - **PR** `#23823`_: (*gtmanfred*) add link local for ipv6 - - **PR** `#23810`_: (*rallytime*) Backport `#23757`_ to 2014.7 - - **PR** `#23809`_: (*rallytime*) Fix virtualport section of virt.get_nics loop - - **PR** `#23802`_: (*gtmanfred*) if it is ipv6 ip_to_int will fail - - **PR** `#23757`_: (*clan*) use abspath, do not eliminating symlinks - | refs: `#23810`_ - - **PR** `#23573`_: (*techhat*) Scan all available networks for public and private IPs - | refs: `#23802`_ - - **PR** `#21487`_: (*rallytime*) Backport `#21469`_ to 2014.7 - | refs: `#23809`_ - - **PR** `#21469`_: (*vdesjardins*) fixes `#20198`_: virt.get_graphics and virt.get_nics calls in module virt - | refs: `#21487`_ - * 61c922e Merge pull request `#23868`_ from basepi/merge-forward-2015.5 - * c9ed233 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * 63e63fa527 repair salt cloud lxc api on develop - * aee00c8 Merge pull request `#23810`_ from rallytime/`bp-23757`_ + * 80eabe2703 lxc salt cloud doc - * fb32c32 use abspath, do not eliminating symlinks + * 73f229d966 lxc: unificate saltconfig/master/master_port - * 6b3352b Merge pull request `#23809`_ from rallytime/virt_get_nics_fix + * 0bc1f08a6b lxc: refactor a bit saltcloud/lxc interface - * 0616fb7 Fix virtualport section of virt.get_nics loop + * 7a80370da9 lxc: get networkprofile from saltcloud - * 188f03f Merge pull request `#23823`_ from gtmanfred/2014.7 + * 47acb2e159 lxc: default net profile has now correct options - * 5ef006d add link local for ipv6 + * 7eadf4863c lxc: select the appropriate default bridge - * f3ca682 Merge pull request `#23802`_ from gtmanfred/2014.7 +* **ISSUE** `#23900`_: (`hashi825`_) salt ubuntu network building issue 2015.5.0 (refs: `#23922`_) - * 2da98b5 if it is ipv6 ip_to_int will fail +* **PR** `#23922`_: (`garethgreenaway`_) Fixes to debian_ip.py + @ *2015-05-19 18:50:53 UTC* -- **PR** `#23863`_: (*rahulhan*) Adding states/timezone.py unit test - @ *2015-05-18T17:02:19Z* + * b818f72dce Merge pull request `#23922`_ from garethgreenaway/23900_2015_5_bonding_interface_fixes - * 433f873 Merge pull request `#23863`_ from rahulhan/states_timezone_unit_test - * 72fcabc Adding states/timezone.py unit test + * 0bba536d6d Fixing issue reported when using bonded interfaces on Ubuntu. Attributes should be bond-, but the code was attempting to split just on bond\_. Fix accounts for both, but the debian_ip.py module will write out bond attributes with bond- -- **PR** `#23862`_: (*rahulhan*) Adding states/tomcat.py unit tests - @ *2015-05-18T17:02:10Z* +* **PR** `#23925`_: (`jpic`_) Fixed wrong path in LXC cloud documentation + @ *2015-05-19 18:23:56 UTC* - * 37b3ee5 Merge pull request `#23862`_ from rahulhan/states_tomcat_unit_test - * 65d7752 Adding states/tomcat.py unit tests + * **PR** `#23924`_: (`jpic`_) Fixed wrong path in LXC cloud documentation (refs: `#23925`_) -- **PR** `#23860`_: (*rahulhan*) Adding states/test.py unit tests - @ *2015-05-18T17:01:49Z* + * b1c98a38ed Merge pull request `#23925`_ from jpic/fix/wrong_lxc_path - * dde7207 Merge pull request `#23860`_ from rahulhan/states_test_unit_test - * 1f4cf86 Adding states/test.py unit tests + * a4bcd75171 Fixed wrong path in LXC cloud documentation -- **PR** `#23859`_: (*rahulhan*) Adding states/sysrc.py unit tests - @ *2015-05-18T17:01:46Z* +* **PR** `#23894`_: (`whiteinge`_) Add __all__ attribute to Mock class for docs + @ *2015-05-19 17:17:35 UTC* - * 3c9b813 Merge pull request `#23859`_ from rahulhan/states_sysrc_unit_test - * 6a903b0 Adding states/sysrc.py unit tests + * 7f6a716a8a Merge pull request `#23894`_ from whiteinge/doc-mock__all__ -- **PR** `#23812`_: (*rallytime*) Backport `#23790`_ to 2015.5 - @ *2015-05-18T15:30:34Z* + * 6eeca46158 Add __all__ attribute to Mock class for docs - - **PR** `#23790`_: (*aboe76*) updated suse spec file to version 2015.5.0 - | refs: `#23812`_ - * 4cf30a7 Merge pull request `#23812`_ from rallytime/`bp-23790`_ - * 3f65631 updated suse spec file to version 2015.5.0 +* **ISSUE** `#23767`_: (`chrimi`_) Salt system.locale fails on non existent default locale (refs: `#23884`_) -- **PR** `#23811`_: (*rallytime*) Backport `#23786`_ to 2015.5 - @ *2015-05-18T15:30:27Z* +* **PR** `#23884`_: (`jfindlay`_) Fix locale.set_locale on debian + @ *2015-05-19 15:51:22 UTC* - - **PR** `#23786`_: (*kaithar*) Log the error generated that causes returns.mysql.returner to except. - | refs: `#23811`_ - * c6f939a Merge pull request `#23811`_ from rallytime/`bp-23786`_ - * 346f30b Log the error generated that causes returns.mysql.returner to except. + * 8108a9bd19 Merge pull request `#23884`_ from jfindlay/fix_locale -- **PR** `#23850`_: (*jayeshka*) adding sysbench unit test case - @ *2015-05-18T15:28:04Z* + * 91c2d51400 use append_if_not_found in locale.set_locale - * ce60582 Merge pull request `#23850`_ from jayeshka/sysbench-unit-test - * 280abde adding sysbench unit test case + * e63260391c (re)generate /etc/default/locale -- **PR** `#23843`_: (*The-Loeki*) Fix erroneous virtual:physical core grain detection - @ *2015-05-18T15:24:22Z* +* **PR** `#23866`_: (`jfindlay`_) backport `#23834`_, change portage.dep.strip_empty to list comprehension + @ *2015-05-19 15:50:43 UTC* - * 060902f Merge pull request `#23843`_ from The-Loeki/patch-1 - * 9e2cf60 Fix erroneous virtual:physical core grain detection + * **PR** `#23834`_: (`Arabus`_) Avoid deprecation warning from portage.dep.strip_empty() (refs: `#23866`_) -- **PR** `#23816`_: (*Snergster*) Doc for `#23685`_ Added prereq, caution, and additional mask information - @ *2015-05-18T15:18:03Z* + * 6bae12fa8b Merge pull request `#23866`_ from jfindlay/flag_strip - - **ISSUE** `#23815`_: (*Snergster*) [beacons] inotify errors on subdir creation - | refs: `#23816`_ - * 3257a9b Merge pull request `#23816`_ from Snergster/23685-doc-fix - * 0fca49d Added prereq, caution, and additional mask information + * aa032ccfaf replace portage.dep.strip_empty() with list comprehension -- **PR** `#23832`_: (*ahus1*) make saltify provider use standard boostrap procedure - @ *2015-05-18T02:18:29Z* + * 7576872280 Proper replacement for portage.dep.strip_empty() with list comprehension, pep8fix - - **PR** `#23829`_: (*ahus1*) make saltify provider use standard boostrap procedure - | refs: `#23832`_ - * 3df3b85 Merge pull request `#23832`_ from ahus1/ahus1_saltify_bootstrap_2015.5 - * f5b1734 fixing problem in unit test + * 2851a5cf13 Switch portage.dep.strip_empty(...) to filter(None,...) to avoid deprecation warning and do essentially the same - * cba47f6 make saltify to use standard boostrap procedure, therefore providing all options like master_sign_pub_file +* **ISSUE** `#23904`_: (`mbrgm`_) Network config bonding section cannot be parsed when attribute names use dashes (refs: `#23917`_) -- **PR** `#23791`_: (*optix2000*) Psutil compat - @ *2015-05-16T04:05:54Z* +* **PR** `#23917`_: (`corywright`_) Split debian bonding options on dash instead of underscore + @ *2015-05-19 15:44:35 UTC* - * 8ec4fb2 Merge pull request `#23791`_ from optix2000/psutil_compat - * 5470cf5 Fix pylint errors and sloppy inline comments + * a67a008913 Merge pull request `#23917`_ from corywright/issue23904 - * 64634b6 Update psutil.pid_list to use psutil.pids + * c06f8cf831 Split debian bonding options on dash instead of underscore - * 5dd6d69 Fix imports that aren't in __all__ +* **PR** `#23909`_: (`jayeshka`_) 'str' object has no attribute 'capitalized' + @ *2015-05-19 15:41:53 UTC* - * 8a1da33 Fix test cases by mocking psutil_compat + * e8fcd0994d Merge pull request `#23909`_ from jayeshka/file-exe-module - * 558798d Fix net_io_counters deprecation issue + * e422d9d200 'str' object has no attribute 'capitalized' - * 8140f92 Override unnecessary pylint errors +* **PR** `#23903`_: (`garethgreenaway`_) Adding docs for missing schedule state module parameters. + @ *2015-05-19 06:29:34 UTC* - * 7d02ad4 Fix some of the mock names for the new API + * c73bf38927 Merge pull request `#23903`_ from garethgreenaway/missing_docs_schedule_state - * 9b3023e Fix overloaded getters/setters. Fix line lengths + * acd8ab9e1d Adding docs for missing schedule state module parameters. - * 180eb87 Fix whitespace + * a56697bd6e Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 - * f8edf72 Use new psutil API in ps module + * 1c2af5c685 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 - * e48982f Fix version checking in psutil_compat + * ef581283fa Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 - * 93ee411 Create compatibility psutil. psutil 3.0 drops 1.0 API, but we still support old psutil versions. + * 8664e8bc8d Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5-2 -- **PR** `#23782`_: (*terminalmage*) Replace "command -v" with "which" and get rid of spurious log messages - @ *2015-05-16T04:03:10Z* + * 46eb2655ee saltstack2 sphinx theme updates - * 405517b Merge pull request `#23782`_ from terminalmage/issue23772 - * 0f6f239 More ignore_retcode to suppress spurious log msgs + * e7442d3b1e Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 - * b4c48e6 Ignore return code in lxc.attachable + * ee3c1bd4a7 missed one - * 08658c0 Replace "command -v" with "which" + * 3872921dd0 More updates to sphinx2 theme -- **PR** `#23783`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-05-15T21:38:51Z* + * fcd48657ef Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 - - **ISSUE** `#22959`_: (*highlyunavailable*) Windows Salt hangs if file.directory is trying to write to a drive that doesn't exist - - **ISSUE** `#22332`_: (*rallytime*) [salt-ssh] Add a check for host in /etc/salt/roster - | refs: `#23748`_ - - **ISSUE** `#16424`_: (*stanvit*) salt-run cloud.create fails with saltify - - **PR** `#23748`_: (*basepi*) [2014.7] Log salt-ssh roster render errors more assertively and verbosely - - **PR** `#23731`_: (*twangboy*) Fixes `#22959`_: Trying to add a directory to an unmapped drive in windows - - **PR** `#23730`_: (*rallytime*) Backport `#23729`_ to 2014.7 - - **PR** `#23729`_: (*rallytime*) Partially merge `#23437`_ (grains fix) - | refs: `#23730`_ - - **PR** `#23688`_: (*twangboy*) Added inet_pton to utils/validate/net.py for ip.set_static_ip in windows - - **PR** `#23488`_: (*cellscape*) LXC cloud fixes - - **PR** `#23437`_: (*cedwards*) Grains item patch - | refs: `#23729`_ - * cb2eb40 Merge pull request `#23783`_ from basepi/merge-forward-2015.5 - * 9df51ca __opts__.get + * 8c32152be0 removed TOC numbering, additional tweaks to layout.html - * 51d23ed Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * 73dfaeff28 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 - * d9af0c3 Merge pull request `#23488`_ from cellscape/lxc-cloud-fixes + * 16d8a753ad saltstack2 sphinx theme and build settings - * 64250a6 Remove profile from opts after creating LXC container +* **ISSUE** `#23847`_: (`kiorky`_) lxc: systemd containers cant be seeded (refs: `#23806`_, `#23898`_, `#23897`_, `#23808`_) - * c4047d2 Set destroy=True in opts when destroying cloud instance +* **ISSUE** `#23772`_: (`cheuschober`_) lxc.init fails to bootstrap container (refs: `#23806`_, `#23808`_, `#23807`_, `#23898`_, `#23897`_) - * 9e1311a Store instance names in opts when performing cloud action +* **PR** `#23806`_: (`kiorky`_) Lxc seeding (refs: `#23807`_) + @ *2015-05-18 23:18:33 UTC* - * 934bc57 Correctly pass custom env to lxc-attach + * ff3cc7d331 Merge pull request `#23806`_ from makinacorpus/lxc_seeding - * 7fb85f7 Preserve test=True option in cloud states + * 61b7aad308 runners/lxc: optim - * 9771b5a Fix detection of absent LXC container in cloud state +* **PR** `#23892`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-05-18 23:07:57 UTC* - * fb24f0c Report failure when failed to create/clone LXC container + * 5f1a93d966 Merge pull request `#23892`_ from basepi/merge-forward-2015.5 - * 2d9aa2b Avoid shadowing variables in lxc module + * c2eed77691 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - * 792e102 Allow overriding profile options in lxc.cloud_init_interface + * 17c5810c04 Merge pull request `#23891`_ from basepi/releasenotes - * 42bd64b Return changes on successful lxc.create from salt-cloud + * dec153bcea Update the release notes index page - * 4409eab Return correct result when creating cloud LXC container + * a93e58f80f Merge pull request `#23888`_ from basepi/v2014.7.6release - * 377015c Issue `#16424`_: List all providers when creating salt-cloud instance without profile + * 49921b6cb2 Update the 2014.7.6 release notes with CVE details - * 808bbe1 Merge pull request `#23748`_ from basepi/salt-ssh.roster.host.check + * 50730287bb Merge pull request `#23871`_ from rallytime/bp-23848 - * bc53e04 Log entire exception for render errors in roster + * 379c09c3a5 Updated for SLES 12. - * 753de6a Log render errors in roster to error level +* **PR** `#23875`_: (`rallytime`_) Backport `#23838`_ to 2015.5 + @ *2015-05-18 22:28:55 UTC* - * e01a7a9 Always let the real YAML error through + * **PR** `#23838`_: (`gtmanfred`_) add refresh_beacons and sync_beacons (refs: `#23875`_) - * 72cf360 Merge pull request `#23731`_ from twangboy/fix_22959 + * 66d13356b3 Merge pull request `#23875`_ from rallytime/bp-23838 - * 88e5495 Fixes `#22959`_: Trying to add a directory to an unmapped drive in windows + * 3174227e8e Add versionadded directives to new beacon saltutil functions - * 2610195 Merge pull request `#23730`_ from rallytime/`bp-23729`_ + * 4a94b2c17b add refresh_beacons and sync_beacons - * 1877cae adding support for nested grains to grains.item +* **PR** `#23876`_: (`rallytime`_) Switch digital ocean tests to v2 driver + @ *2015-05-18 22:17:13 UTC* - * 3e9df88 Merge pull request `#23688`_ from twangboy/fix_23415 + * d294cf260b Merge pull request `#23876`_ from rallytime/switch_digital_ocean_tests_v2 - * 6a91169 Fixed unused-import pylint error + * dce9b540a6 Remove extra line - * 5e25b3f fixed pylint errors + * 4acf58e758 Switch digital ocean tests to v2 driver - * 1a96766 Added inet_pton to utils/validate/net.py for ip.set_static_ip in windows +* **ISSUE** `#23792`_: (`neogenix`_) Salt Scheduler Incorrect Response (True, should be False) (refs: `#23882`_) -- **PR** `#23781`_: (*jfindlay*) fix unit test mock errors on arch - @ *2015-05-15T19:40:07Z* +* **PR** `#23882`_: (`garethgreenaway`_) Fixes to scheduler in 2015.5 + @ *2015-05-18 22:09:24 UTC* - * 982f873 Merge pull request `#23781`_ from jfindlay/fix_locale_tests - * 14c711e fix unit test mock errors on arch + * b97a48c7f5 Merge pull request `#23882`_ from garethgreenaway/23792_2015_5_wrong_return_code -- **PR** `#23740`_: (*jfindlay*) Binary write - @ *2015-05-15T18:10:44Z* + * 37dbde6d57 Job already exists in schedule, should return False. - - **ISSUE** `#23566`_: (*rks2286*) Salt-cp corrupting the file after transfer to minion - | refs: `#23740`_ - * 916b1c4 Merge pull request `#23740`_ from jfindlay/binary_write - * 626930a update incorrect comment wording +* **PR** `#23868`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-05-18 18:35:54 UTC* - * a978f5c always use binary file write mode on windows + * 61c922ea1a Merge pull request `#23868`_ from basepi/merge-forward-2015.5 -- **PR** `#23736`_: (*jfindlay*) always load pip execution module - @ *2015-05-15T18:10:16Z* + * c9ed23394c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - - **ISSUE** `#23682`_: (*chrish42*) Pip module requires system pip, even when not used (with env_bin) - | refs: `#23736`_ - * 348645e Merge pull request `#23736`_ from jfindlay/fix_pip - * b8867a8 update pip tests + * aee00c83df Merge pull request `#23810`_ from rallytime/bp-23757 - * 040bbc4 only check pip version in one place + * fb32c32065 use abspath, do not eliminating symlinks - * 6c453a5 check for executable status of bin_env + * 6b3352bb1a Merge pull request `#23809`_ from rallytime/virt_get_nics_fix - * 3337257 always load the pip module as pip could be anywhere + * 0616fb7884 Fix virtualport section of virt.get_nics loop -- **PR** `#23770`_: (*cellscape*) Fix cloud LXC container destruction - @ *2015-05-15T17:38:59Z* + * 188f03f567 Merge pull request `#23823`_ from gtmanfred/2014.7 - * 10cedfb Merge pull request `#23770`_ from cellscape/fix-cloud-lxc-destruction - * 4f6021c Fix cloud LXC container destruction + * 5ef006d59d add link local for ipv6 -- **PR** `#23759`_: (*lisa2lisa*) fixed the problem for not beable to revoke *.*, for more detail https… - @ *2015-05-15T17:38:38Z* + * f3ca682f92 Merge pull request `#23802`_ from gtmanfred/2014.7 - * ddea822 Merge pull request `#23759`_ from lisa2lisa/iss23664 - * a29f161 fixed the problem for not beable to revoke *.*, for more detail https://github.com/saltstack/salt/issues/23201, fixed mysql cannot create user with pure digit password, for more info https://github.com/saltstack/salt/issues/23664 + * 2da98b58c8 if it is ipv6 ip_to_int will fail -- **PR** `#23769`_: (*cellscape*) Fix file_roots CA lookup in salt.utils.http.get_ca_bundle - @ *2015-05-15T16:21:49Z* +* **PR** `#23863`_: (`rahulhan`_) Adding states/timezone.py unit test + @ *2015-05-18 17:02:19 UTC* - * 10615ff Merge pull request `#23769`_ from cellscape/utils-http-ca-file-roots - * 8e90f32 Fix file_roots CA lookup in salt.utils.http.get_ca_bundle + * 433f87372c Merge pull request `#23863`_ from rahulhan/states_timezone_unit_test -- **PR** `#23765`_: (*jayeshka*) adding states/makeconf unit test case - @ *2015-05-15T14:29:43Z* + * 72fcabc690 Adding states/timezone.py unit test - * fd8a1b7 Merge pull request `#23765`_ from jayeshka/makeconf_states-unit-test - * 26e31af adding states/makeconf unit test case +* **PR** `#23862`_: (`rahulhan`_) Adding states/tomcat.py unit tests + @ *2015-05-18 17:02:10 UTC* -- **PR** `#23760`_: (*ticosax*) [doc] document refresh argument - @ *2015-05-15T14:23:47Z* + * 37b3ee5421 Merge pull request `#23862`_ from rahulhan/states_tomcat_unit_test - * ee13b08 Merge pull request `#23760`_ from ticosax/2015.5 - * e3ca859 document refresh argument + * 65d7752d2a Adding states/tomcat.py unit tests -- **PR** `#23766`_: (*jayeshka*) adding svn unit test case - @ *2015-05-15T14:23:18Z* +* **PR** `#23860`_: (`rahulhan`_) Adding states/test.py unit tests + @ *2015-05-18 17:01:49 UTC* - * a017f72 Merge pull request `#23766`_ from jayeshka/svn-unit-test - * 19939cf adding svn unit test case + * dde7207acb Merge pull request `#23860`_ from rahulhan/states_test_unit_test -- **PR** `#23751`_: (*rallytime*) Backport `#23737`_ to 2015.5 - @ *2015-05-15T03:58:37Z* + * 1f4cf86500 Adding states/test.py unit tests - - **ISSUE** `#23734`_: (*bradthurber*) 2015.5.0 modules/archive.py ZipFile instance has no attribute '__exit__' - only python 2.6? - | refs: `#23737`_ - - **PR** `#23737`_: (*bradthurber*) fix for 2015.5.0 modules/archive.py ZipFile instance has no attribute… - | refs: `#23751`_ - * 0ed9d45 Merge pull request `#23751`_ from rallytime/`bp-23737`_ - * 8d1eb32 fix for 2015.5.0 modules/archive.py ZipFile instance has no attribute '__exit__' - only python 2.6? `#23734`_ +* **PR** `#23859`_: (`rahulhan`_) Adding states/sysrc.py unit tests + @ *2015-05-18 17:01:46 UTC* -- **PR** `#23710`_: (*kiorky*) Get more useful output from stateful commands - @ *2015-05-14T21:58:10Z* + * 3c9b8139e8 Merge pull request `#23859`_ from rahulhan/states_sysrc_unit_test - - **ISSUE** `#23709`_: (*kiorky*) cmdmod: enhancement is really needed for stateful commands - | refs: `#23710`_ - * d73984e Merge pull request `#23710`_ from makinacorpus/i23709 - * c706909 Get more useful output from stateful commands + * 6a903b054d Adding states/sysrc.py unit tests -- **PR** `#23724`_: (*rallytime*) Backport `#23609`_ to 2015.5 - @ *2015-05-14T19:34:22Z* +* **PR** `#23812`_: (`rallytime`_) Backport `#23790`_ to 2015.5 + @ *2015-05-18 15:30:34 UTC* - - **PR** `#23609`_: (*kaidokert*) file_map: chown created directories if not root `#23608`_ - | refs: `#23724`_ - * cdf421b Merge pull request `#23724`_ from rallytime/`bp-23609`_ - * fe3a762 file_map: chmod created directories if not root + * **PR** `#23790`_: (`aboe76`_) updated suse spec file to version 2015.5.0 (refs: `#23812`_) -- **PR** `#23723`_: (*rallytime*) Backport `#23568`_ to 2015.5 - @ *2015-05-14T19:34:11Z* + * 4cf30a7ffa Merge pull request `#23812`_ from rallytime/bp-23790 - - **PR** `#23568`_: (*techhat*) Allow Salt Cloud to use either SCP or SFTP, as configured - | refs: `#23723`_ - * 94f9099 Merge pull request `#23723`_ from rallytime/`bp-23568`_ - * bbec34a Allow Salt Cloud to use either SCP or SFTP, as configured + * 3f65631cb6 updated suse spec file to version 2015.5.0 -- **PR** `#23725`_: (*rallytime*) Backport `#23691`_ to 2015.5 - @ *2015-05-14T19:32:30Z* +* **PR** `#23811`_: (`rallytime`_) Backport `#23786`_ to 2015.5 + @ *2015-05-18 15:30:27 UTC* - - **PR** `#23691`_: (*dennisjac*) add initial configuration documentation for varstack pillar - | refs: `#23725`_ - * 137e5ee Merge pull request `#23725`_ from rallytime/`bp-23691`_ - * 28a846e add initial configuration documentation for varstack pillar + * **PR** `#23786`_: (`kaithar`_) Log the error generated that causes returns.mysql.returner to except. (refs: `#23811`_) -- **PR** `#23722`_: (*rallytime*) Backport `#23472`_ to 2015.5 - @ *2015-05-14T19:31:52Z* + * c6f939adfb Merge pull request `#23811`_ from rallytime/bp-23786 - - **PR** `#23472`_: (*techhat*) Allow neutron network list to be used as pillar data - | refs: `#23722`_ - * 0c00995 Merge pull request `#23722`_ from rallytime/`bp-23472`_ - * c3d0f39 Change versionadded tag for backport + * 346f30bdda Log the error generated that causes returns.mysql.returner to except. - * 023e88f Allow neutron network list to be used as pillar data +* **PR** `#23850`_: (`jayeshka`_) adding sysbench unit test case + @ *2015-05-18 15:28:04 UTC* -- **PR** `#23727`_: (*jfindlay*) fix npm execution module stacktrace - @ *2015-05-14T18:14:12Z* + * ce60582de4 Merge pull request `#23850`_ from jayeshka/sysbench-unit-test - - **ISSUE** `#23657`_: (*arthurlogilab*) [salt-cloud lxc] NameError: global name '__salt__' is not defined - | refs: `#23727`_ `#23898`_ `#23897`_ - * cbf4ca8 Merge pull request `#23727`_ from jfindlay/npm_salt - * 05392f2 fix npm execution module stacktrace + * 280abdec7c adding sysbench unit test case -- **PR** `#23718`_: (*rahulhan*) Adding states/user.py unit tests - @ *2015-05-14T17:15:38Z* +* **PR** `#23843`_: (`The-Loeki`_) Fix erroneous virtual:physical core grain detection + @ *2015-05-18 15:24:22 UTC* - * ef536d5 Merge pull request `#23718`_ from rahulhan/states_user_unit_tests - * aad27db Adding states/user.py unit tests + * 060902fefa Merge pull request `#23843`_ from The-Loeki/patch-1 -- **PR** `#23720`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-05-14T17:13:02Z* + * 9e2cf606eb Fix erroneous virtual:physical core grain detection - - **ISSUE** `#23604`_: (*Azidburn*) service.dead on systemd Minion create an Error Message - | refs: `#23607`_ - - **ISSUE** `#23548`_: (*kkaig*) grains.list_present produces incorrect (?) output - | refs: `#23674`_ - - **ISSUE** `#23403`_: (*iamfil*) salt.runners.cloud.action fun parameter is replaced - | refs: `#23680`_ - - **PR** `#23680`_: (*cachedout*) Rename kwarg in cloud runner - - **PR** `#23674`_: (*cachedout*) Handle lists correctly in grains.list_prsesent - - **PR** `#23672`_: (*twangboy*) Fix user present - - **PR** `#23670`_: (*rallytime*) Backport `#23607`_ to 2014.7 - - **PR** `#23607`_: (*Azidburn*) Fix for `#23604`_. No error reporting. Exitcode !=0 are ok - | refs: `#23670`_ - * a529d74 Merge pull request `#23720`_ from basepi/merge-forward-2015.5 - * 06a3ebd Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 +* **ISSUE** `#23815`_: (`Snergster`_) [beacons] inotify errors on subdir creation (refs: `#23816`_) - * 1b86460 Merge pull request `#23680`_ from cachedout/issue_23403 - - * d5986c2 Rename kwarg in cloud runner - - * cd64af0 Merge pull request `#23674`_ from cachedout/issue_23548 - - * da8a2f5 Handle lists correctly in grains.list_prsesent - - * d322a19 Merge pull request `#23672`_ from twangboy/fix_user_present - - * 731e7af Merge branch '2014.7' of https://github.com/saltstack/salt into fix_user_present - - * d6f70a4 Fixed user.present to create password in windows - - * 43f7025 Merge pull request `#23670`_ from rallytime/`bp-23607`_ - - * ed30dc4 Fix for `#23604`_. No error reporting. Exitcode !=0 are ok - -- **PR** `#23704`_: (*jayeshka*) adding states/lvs_server unit test case - @ *2015-05-14T14:22:10Z* - - * 13facbf Merge pull request `#23704`_ from jayeshka/lvs_server_states-unit-test - * da323da adding states/lvs_server unit test case - -- **PR** `#23703`_: (*jayeshka*) adding states/lvs_service unit test case - @ *2015-05-14T14:21:23Z* - - * f95ca31 Merge pull request `#23703`_ from jayeshka/lvs_service_states-unit-test - * 66717c8 adding states/lvs_service unit test case - -- **PR** `#23702`_: (*jayeshka*) Remove superfluous return statement. - @ *2015-05-14T14:20:42Z* - - * 07e987e Merge pull request `#23702`_ from jayeshka/fix_lvs_service - * ecff218 fix lvs_service +* **ISSUE** `#23685`_: (`Snergster`_) inotify beacon on file. 'change' event to reactor to reset file to known state will cause loop (refs: `#23816`_) -- **PR** `#23686`_: (*jfindlay*) remove superfluous return statement - @ *2015-05-14T14:20:18Z* +* **PR** `#23816`_: (`Snergster`_) Doc for `#23685`_ Added prereq, caution, and additional mask information + @ *2015-05-18 15:18:03 UTC* - * 39973d4 Merge pull request `#23686`_ from jfindlay/fix_lvs_server - * 5aaeb73 remove superfluous return statement + * 3257a9bead Merge pull request `#23816`_ from Snergster/23685-doc-fix -- **PR** `#23690`_: (*rallytime*) Backport `#23424`_ to 2015.5 - @ *2015-05-13T23:04:36Z* + * 0fca49d52a Added prereq, caution, and additional mask information - - **PR** `#23424`_: (*jtand*) Added python_shell=True for refresh_db in pacman.py - | refs: `#23690`_ - * be7c7ef Merge pull request `#23690`_ from rallytime/`bp-23424`_ - * 94574b7 Added python_shell=True for refresh_db in pacman.py +* **PR** `#23832`_: (`ahus1`_) make saltify provider use standard boostrap procedure + @ *2015-05-18 02:18:29 UTC* -- **PR** `#23681`_: (*cachedout*) Start on 2015.5.1 release notes - @ *2015-05-13T19:44:22Z* + * **PR** `#23829`_: (`ahus1`_) make saltify provider use standard boostrap procedure (refs: `#23832`_) - * 1a0db43 Merge pull request `#23681`_ from cachedout/2015_5_1_release_notes - * bdbbfa6 Start on 2015.5.1 release notes + * 3df3b85090 Merge pull request `#23832`_ from ahus1/ahus1_saltify_bootstrap_2015.5 -- **PR** `#23679`_: (*jfindlay*) Merge `#23616`_ - @ *2015-05-13T19:03:53Z* + * f5b1734782 fixing problem in unit test - - **PR** `#23616`_: (*Snergster*) virtual returning none warning fixed in dev but missed in 2015.5 - | refs: `#23679`_ - * b54075a Merge pull request `#23679`_ from jfindlay/merge_23616 - * 6e15e19 appease pylint's blank line strictures + * cba47f6856 make saltify to use standard boostrap procedure, therefore providing all options like master_sign_pub_file - * 8750680 virtual returning none warning fixed in dev but missed in 2015.5 +* **PR** `#23791`_: (`optix2000`_) Psutil compat + @ *2015-05-16 04:05:54 UTC* -- **PR** `#23675`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-05-13T18:35:54Z* + * 8ec4fb2a73 Merge pull request `#23791`_ from optix2000/psutil_compat - - **ISSUE** `#23611`_: (*hubez*) master_type set to 'failover' but 'master' is not of type list but of type - | refs: `#23637`_ - - **ISSUE** `#23479`_: (*danielmorlock*) Typo in pkg.removed for Gentoo? - | refs: `#23558`_ - - **ISSUE** `#23452`_: (*michaelforge*) minion crashed with empty grain - | refs: `#23639`_ - - **ISSUE** `#23411`_: (*dr4Ke*) grains.append should work at any level of a grain - | refs: `#23440`_ - - **ISSUE** `#23355`_: (*dr4Ke*) salt-ssh: 'sources: salt://' files from 'pkg' state are not included in salt_state.tgz - | refs: `#23530`_ - - **ISSUE** `#23110`_: (*martinhoefling*) Copying files from gitfs in file.recurse state fails - - **ISSUE** `#23004`_: (*b18*) 2014.7.5 - Windows - pkg.list_pkgs - "nxlog" never shows up in output. - | refs: `#23433`_ - - **ISSUE** `#22908`_: (*karanjad*) Add failhard option to salt orchestration - | refs: `#23389`_ - - **ISSUE** `#22141`_: (*Deshke*) grains.get_or_set_hash render error if hash begins with "%" - | refs: `#23640`_ - - **PR** `#23661`_: (*rallytime*) Merge `#23640`_ with whitespace fix - - **PR** `#23640`_: (*cachedout*) Add warning to get_or_set_hash about reserved chars - | refs: `#23661`_ - - **PR** `#23639`_: (*cachedout*) Handle exceptions raised by __virtual__ - - **PR** `#23637`_: (*cachedout*) Convert str master to list - - **PR** `#23606`_: (*twangboy*) Fixed checkbox for starting service and actually starting it - - **PR** `#23595`_: (*rallytime*) Backport `#23549`_ to 2014.7 - - **PR** `#23594`_: (*rallytime*) Backport `#23496`_ to 2014.7 - - **PR** `#23593`_: (*rallytime*) Backport `#23442`_ to 2014.7 - - **PR** `#23592`_: (*rallytime*) Backport `#23389`_ to 2014.7 - - **PR** `#23573`_: (*techhat*) Scan all available networks for public and private IPs - | refs: `#23802`_ - - **PR** `#23558`_: (*jfindlay*) reorder emerge command line - - **PR** `#23554`_: (*jleroy*) Debian: Hostname always updated - - **PR** `#23551`_: (*dr4Ke*) grains.append unit tests, related to `#23474`_ - - **PR** `#23549`_: (*vr-jack*) Update __init__.py - | refs: `#23595`_ - - **PR** `#23537`_: (*t0rrant*) Update changelog - - **PR** `#23530`_: (*dr4Ke*) salt-ssh state: fix including all salt:// references - - **PR** `#23496`_: (*martinhoefling*) Fix for issue `#23110`_ - | refs: `#23594`_ - - **PR** `#23474`_: (*dr4Ke*) Fix grains.append in nested dictionary grains `#23411`_ - - **PR** `#23442`_: (*clan*) add directory itself to keep list - | refs: `#23593`_ - - **PR** `#23440`_: (*dr4Ke*) fix grains.append in nested dictionary grains `#23411`_ - | refs: `#23474`_ - - **PR** `#23433`_: (*twangboy*) Obtain all software from the registry - - **PR** `#23389`_: (*cachedout*) Correct fail_hard typo - | refs: `#23592`_ - * e480f13 Merge pull request `#23675`_ from basepi/merge-forward-2015.5 - * bd63548 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * 5470cf58db Fix pylint errors and sloppy inline comments - * 0f006ac Merge pull request `#23661`_ from rallytime/merge-23640 + * 64634b6349 Update psutil.pid_list to use psutil.pids - * 4427f42 Whitespace fix + * 5dd6d69192 Fix imports that aren't in __all__ - * dd91154 Add warning to get_or_set_hash about reserved chars + * 8a1da33ada Fix test cases by mocking psutil_compat - * 84e2ef8 Merge pull request `#23639`_ from cachedout/issue_23452 + * 558798df1f Fix net_io_counters deprecation issue - * d418b49 Syntax error! + * 8140f92ba8 Override unecessary pylint errors - * 45b4015 Handle exceptions raised by __virtual__ + * 7d02ad4f06 Fix some of the mock names for the new API - * bd9b94b Merge pull request `#23637`_ from cachedout/issue_23611 + * 9b3023e851 Fix overloaded getters/setters. Fix line lengths - * 56cb1f5 Fix typo + * 180eb87a46 Fix whitespace - * f6fcf19 Convert str master to list + * f8edf72f98 Use new psutil API in ps module - * f20c0e4 Merge pull request `#23595`_ from rallytime/`bp-23549`_ + * e48982ff9c Fix version checking in psutil_compat - * 6efcac0 Update __init__.py + * 93ee411fd5 Create compatability psutil. psutil 3.0 drops 1.0 API, but we still support old psutil versions. - * 1acaf86 Merge pull request `#23594`_ from rallytime/`bp-23496`_ +* **PR** `#23782`_: (`terminalmage`_) Replace "command -v" with "which" and get rid of spurious log messages + @ *2015-05-16 04:03:10 UTC* - * d5ae1d2 Fix for issue `#23110`_ This resolves issues when the freshly created directory is removed by fileserver.update. + * 405517be8b Merge pull request `#23782`_ from terminalmage/issue23772 - * 2c221c7 Merge pull request `#23593`_ from rallytime/`bp-23442`_ + * 0f6f239052 More ignore_retcode to suppress spurious log msgs - * 39869a1 check w/ low['name'] only + * b4c48e62ea Ignore return code in lxc.attachable - * 304cc49 another fix for file defined w/ id, but require name + * 08658c0177 Replace "command -v" with "which" - * 8814d41 add directory itself to keep list +* **PR** `#23783`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-05-15 21:38:51 UTC* - * fadd1ef Merge pull request `#23606`_ from twangboy/fix_installer + * cb2eb401f3 Merge pull request `#23783`_ from basepi/merge-forward-2015.5 - * 038331e Fixed checkbox for starting service and actually starting it + * 9df51caf28 __opts__.get - * acdd3fc Fix lint + * 51d23ed9d0 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - * 680e88f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * d9af0c3e82 Merge pull request `#23488`_ from cellscape/lxc-cloud-fixes - * 10b3f0f Merge pull request `#23592`_ from rallytime/`bp-23389`_ + * 64250a67e5 Remove profile from opts after creating LXC container - * 734cc43 Correct fail_hard typo + * c4047d2a71 Set destroy=True in opts when destroying cloud instance - * cd34b9b Merge pull request `#23573`_ from techhat/novaquery + * 9e1311a7cd Store instance names in opts when performing cloud action - * f92db5e Linting + * 934bc57c73 Correctly pass custom env to lxc-attach - * 26e00d3 Scan all available networks for public and private IPs + * 7fb85f7be1 Preserve test=True option in cloud states - * 2a72cd7 Merge pull request `#23558`_ from jfindlay/fix_ebuild + * 9771b5a313 Fix detection of absent LXC container in cloud state - * 45404fb reorder emerge command line + * fb24f0cf02 Report failure when failed to create/clone LXC container - * a664a3c Merge pull request `#23530`_ from dr4Ke/fix_salt-ssh_to_include_pkg_sources + * 2d9aa2bb97 Avoid shadowing variables in lxc module - * 5df6a80 fix pylint warning + * 792e1021f2 Allow to override profile options in lxc.cloud_init_interface - * d0549e5 salt-ssh state: fix including all salt:// references + * 42bd64b9b3 Return changes on successful lxc.create from salt-cloud - * 55c3869 Merge pull request `#23433`_ from twangboy/list_pkgs_fix + * 4409eabb83 Return correct result when creating cloud LXC container - * 8ab5b1b Fix pylint error + * 377015c881 Issue `#16424`_: List all providers when creating salt-cloud instance without profile - * 2d11d65 Obtain all software from the registry + * 808bbe1cb2 Merge pull request `#23748`_ from basepi/salt-ssh.roster.host.check - * 755bed0 Merge pull request `#23554`_ from jleroy/debian-hostname-fix + * bc53e049e0 Log entire exception for render errors in roster - * 5ff749e Debian: Hostname always updated + * 753de6a621 Log render errors in roster to error level - * 6ec87ce Merge pull request `#23551`_ from dr4Ke/grains.append_unit_tests + * e01a7a90b3 Always let the real YAML error through - * ebff9df fix pylint errors + * 72cf360255 Merge pull request `#23731`_ from twangboy/fix_22959 - * c495404 unit tests for grains.append module function + * 88e5495b2d Fixes `#22959`_: Trying to add a directory to an unmapped drive in windows - * 0c9a323 use MagickMock + * 2610195262 Merge pull request `#23730`_ from rallytime/bp-23729 - * c838a22 unit tests for grains.append module function + * 1877caecba adding support for nested grains to grains.item - * e96c5c5 Merge pull request `#23474`_ from dr4Ke/fix_grains.append_nested + * 3e9df883d6 Merge pull request `#23688`_ from twangboy/fix_23415 - * a01a5bb grains.get, parameter delimititer, versionadded: 2014.7.6 + * 6a91169bae Fixed unused-import pylint error - * b39f504 remove debugging output + * 5e25b3f355 fixed pylint errors - * b6e15e2 fix grains.append in nested dictionary grains `#23411`_ + * 1a9676626f Added inet_pton to utils/validate/net.py for ip.set_static_ip in windows - * ab7e1ae Merge pull request `#23537`_ from t0rrant/patch-1 +* **PR** `#23781`_: (`jfindlay`_) fix unit test mock errors on arch + @ *2015-05-15 19:40:07 UTC* - * 8e03cc9 Update changelog + * 982f87316d Merge pull request `#23781`_ from jfindlay/fix_locale_tests -- **PR** `#23669`_: (*rallytime*) Backport `#23586`_ to 2015.5 - @ *2015-05-13T18:27:11Z* + * 14c711eeb3 fix unit test mock errors on arch - - **PR** `#23586`_: (*Lothiraldan*) Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes - | refs: `#23669`_ - * 0dad6be Merge pull request `#23669`_ from rallytime/`bp-23586`_ - * ef4c6ad Remove another unused import +* **ISSUE** `#23566`_: (`rks2286`_) Salt-cp corrupting the file after transfer to minion (refs: `#23740`_) - * 73cfda7 Remove unused import +* **PR** `#23740`_: (`jfindlay`_) Binary write + @ *2015-05-15 18:10:44 UTC* - * 52b68d6 Use the zip_longest from six module for python 3 compatibility + * 916b1c4f7c Merge pull request `#23740`_ from jfindlay/binary_write - * 18d5ff9 Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes + * 626930a4e5 update incorrect comment wording -- **PR** `#23662`_: (*rallytime*) Merge `#23642`_ with pylint fix - @ *2015-05-13T15:46:51Z* + * a978f5c091 always use binary file write mode on windows - - **PR** `#23642`_: (*cachedout*) Let saltmod handle lower-level exceptions gracefully - | refs: `#23662`_ - * fabef75 Merge pull request `#23662`_ from rallytime/merge-23642 - * aa7bbd8 Remove unused import +* **ISSUE** `#23682`_: (`chrish42`_) Pip module requires system pip, even when not used (with env_bin) (refs: `#23736`_) - * 9e66d4c Let saltmod handle lower-level exceptions gracefully +* **PR** `#23736`_: (`jfindlay`_) always load pip execution module + @ *2015-05-15 18:10:16 UTC* -- **PR** `#23622`_: (*jfindlay*) merge `#23508`_ - @ *2015-05-13T15:36:49Z* + * 348645ecd5 Merge pull request `#23736`_ from jfindlay/fix_pip - - **PR** `#23508`_: (*cro*) Port mysql returner to postgres using jsonb datatype - | refs: `#23622`_ - * 072b927 Merge pull request `#23622`_ from jfindlay/pgjsonb - * 454322c appease pylint's proscription on blank line excess + * b8867a8c23 update pip tests - * 57c6171 Get time with timezone correct also in job return. + * 040bbc42d2 only check pip version in one place - * e109d0f Get time with timezone correct. + * 6c453a5a2a check for executable status of bin_env - * 21e06b9 Fix SQL, remove unneeded imports. + * 3337257833 always load the pip module as pip could be anywhere - * 653f360 Stop making changes in 2 places. +* **PR** `#23770`_: (`cellscape`_) Fix cloud LXC container destruction + @ *2015-05-15 17:38:59 UTC* - * d6daaa0 Typo. + * 10cedfb174 Merge pull request `#23770`_ from cellscape/fix-cloud-lxc-destruction - * 7d748bf SSL is handled differently by Pg, so don't set it here. + * 4f6021c884 Fix cloud LXC container destruction - * cc7c377 Fill alter_time field in salt_events with current time with timezone. +* **PR** `#23759`_: (`lisa2lisa`_) fixed the problem for not beable to revoke *.*, for more detail https… + @ *2015-05-15 17:38:38 UTC* - * 43defe9 Port mysql module to Postgres using jsonb datatypes + * ddea822b02 Merge pull request `#23759`_ from lisa2lisa/iss23664 -- **PR** `#23651`_: (*jayeshka*) adding solr unit test case - @ *2015-05-13T15:26:15Z* + * a29f161a58 fixed the problem for not beable to revoke *.*, for more detail https://github.com/saltstack/salt/issues/23201, fixed mysql cannot create user with pure digit password, for more info https://github.com/saltstack/salt/issues/23664 - * c1bdd4d Merge pull request `#23651`_ from jayeshka/solr-unit-test - * 6e05148 adding solr unit test case +* **PR** `#23769`_: (`cellscape`_) Fix file_roots CA lookup in salt.utils.http.get_ca_bundle + @ *2015-05-15 16:21:49 UTC* -- **PR** `#23649`_: (*jayeshka*) adding states/libvirt unit test case - @ *2015-05-13T15:24:48Z* + * 10615ff5a7 Merge pull request `#23769`_ from cellscape/utils-http-ca-file-roots - * ee43411 Merge pull request `#23649`_ from jayeshka/libvirt_states-unit-test - * 0fb923a adding states/libvirt unit test case + * 8e90f3291b Fix file_roots CA lookup in salt.utils.http.get_ca_bundle -- **PR** `#23648`_: (*jayeshka*) adding states/linux_acl unit test case - @ *2015-05-13T15:24:11Z* +* **PR** `#23765`_: (`jayeshka`_) adding states/makeconf unit test case + @ *2015-05-15 14:29:43 UTC* - * c7fc466 Merge pull request `#23648`_ from jayeshka/linux_acl_states-unit-test - * 3f0ab29 removed error. + * fd8a1b797f Merge pull request `#23765`_ from jayeshka/makeconf_states-unit-test - * 11081c1 adding states/linux_acl unit test case + * 26e31afa31 adding states/makeconf unit test case -- **PR** `#23650`_: (*jayeshka*) adding states/kmod unit test case - @ *2015-05-13T15:09:18Z* +* **PR** `#23760`_: (`ticosax`_) [doc] document refresh argument + @ *2015-05-15 14:23:47 UTC* - * 4cba7ba Merge pull request `#23650`_ from jayeshka/kmod_states-unit-test - * 1987015 adding states/kmod unit test case + * ee13b08027 Merge pull request `#23760`_ from ticosax/2015.5 -- **PR** `#23633`_: (*jayeshka*) made changes to test_interfaces function. - @ *2015-05-13T06:51:07Z* + * e3ca859ba6 document refresh argument - * bc8faf1 Merge pull request `#23633`_ from jayeshka/win_network-2015.5-unit-test - * 0936e1d made changes to test_interfaces function. +* **PR** `#23766`_: (`jayeshka`_) adding svn unit test case + @ *2015-05-15 14:23:18 UTC* -- **PR** `#23619`_: (*jfindlay*) fix kmod.present processing of module loading - @ *2015-05-13T01:16:56Z* + * a017f725a4 Merge pull request `#23766`_ from jayeshka/svn-unit-test - * 7df3579 Merge pull request `#23619`_ from jfindlay/fix_kmod_state - * 73facbf fix kmod.present processing of module loading + * 19939cfa98 adding svn unit test case -- **PR** `#23598`_: (*rahulhan*) Adding states/win_dns_client.py unit tests - @ *2015-05-12T21:47:36Z* +* **ISSUE** `#23734`_: (`bradthurber`_) 2015.5.0 modules/archive.py ZipFile instance has no attribute '__exit__' - only python 2.6? (refs: `#23737`_) - * d4f3095 Merge pull request `#23598`_ from rahulhan/states_win_dns_client_unit_test - * d08d885 Adding states/win_dns_client.py unit tests +* **PR** `#23751`_: (`rallytime`_) Backport `#23737`_ to 2015.5 + @ *2015-05-15 03:58:37 UTC* -- **PR** `#23597`_: (*rahulhan*) Adding states/vbox_guest.py unit tests - @ *2015-05-12T21:46:30Z* + * **PR** `#23737`_: (`bradthurber`_) fix for 2015.5.0 modules/archive.py ZipFile instance has no attribute… (refs: `#23751`_) - * 811c6a1 Merge pull request `#23597`_ from rahulhan/states_vbox_guest_unit_test - * 6a2909e Removed errors + * 0ed9d45114 Merge pull request `#23751`_ from rallytime/bp-23737 - * 4cde78a Adding states/vbox_guest.py unit tests + * 8d1eb326d0 fix for 2015.5.0 modules/archive.py ZipFile instance has no attribute '__exit__' - only python 2.6? `#23734`_ -- **PR** `#23615`_: (*rallytime*) Backport `#23577`_ to 2015.5 - @ *2015-05-12T21:19:11Z* +* **ISSUE** `#23709`_: (`kiorky`_) cmdmod: enhancement is really needed for stateful commands (refs: `#23710`_) - - **PR** `#23577`_: (*msciciel*) Fix find and remove functions to pass database param - | refs: `#23615`_ - * 029ff11 Merge pull request `#23615`_ from rallytime/`bp-23577`_ - * 6f74477 Fix find and remove functions to pass database param +* **PR** `#23710`_: (`kiorky`_) Get more useful output from stateful commands + @ *2015-05-14 21:58:10 UTC* -- **PR** `#23603`_: (*rahulhan*) Adding states/winrepo.py unit tests - @ *2015-05-12T18:40:12Z* + * d73984ec9c Merge pull request `#23710`_ from makinacorpus/i23709 - * b858953 Merge pull request `#23603`_ from rahulhan/states_winrepo_unit_test - * a66e7e7 Adding states/winrepo.py unit tests + * c70690969e Get more useful output from stateful commands -- **PR** `#23602`_: (*rahulhan*) Adding states/win_path.py unit tests - @ *2015-05-12T18:39:37Z* +* **ISSUE** `#23608`_: (`kaidokert`_) salt-cloud file_map with non-root user (refs: `#23609`_) - * 3cbbd6d Merge pull request `#23602`_ from rahulhan/states_win_path_unit_test - * 122c29f Adding states/win_path.py unit tests +* **PR** `#23724`_: (`rallytime`_) Backport `#23609`_ to 2015.5 + @ *2015-05-14 19:34:22 UTC* -- **PR** `#23600`_: (*rahulhan*) Adding states/win_network.py unit tests - @ *2015-05-12T18:39:01Z* + * **PR** `#23609`_: (`kaidokert`_) file_map: chown created directories if not root `#23608`_ (refs: `#23724`_) - * 3c904e8 Merge pull request `#23600`_ from rahulhan/states_win_network_unit_test - * b418404 removed lint error + * cdf421b9ed Merge pull request `#23724`_ from rallytime/bp-23609 - * 1be8023 Adding states/win_network.py unit tests + * fe3a762673 file_map: chmod created directories if not root -- **PR** `#23599`_: (*rahulhan*) Adding win_firewall.py unit tests - @ *2015-05-12T18:37:49Z* +* **PR** `#23723`_: (`rallytime`_) Backport `#23568`_ to 2015.5 + @ *2015-05-14 19:34:11 UTC* - * 10243a7 Merge pull request `#23599`_ from rahulhan/states_win_firewall_unit_test - * 6cda890 Adding win_firewall.py unit tests + * **PR** `#23568`_: (`techhat`_) Allow Salt Cloud to use either SCP or SFTP, as configured (refs: `#23723`_) -- **PR** `#23601`_: (*basepi*) Add versionadded for jboss module/state - @ *2015-05-12T17:22:59Z* + * 94f9099307 Merge pull request `#23723`_ from rallytime/bp-23568 - * e73071d Merge pull request `#23601`_ from basepi/jboss.version.added - * 0174c8f Add versionadded for jboss module/state + * bbec34abd3 Allow Salt Cloud to use either SCP or SFTP, as configured -- **PR** `#23469`_: (*s0undt3ch*) Call the windows specific function not the general one - @ *2015-05-12T16:47:22Z* +* **PR** `#23725`_: (`rallytime`_) Backport `#23691`_ to 2015.5 + @ *2015-05-14 19:32:30 UTC* - * 9beb7bc Merge pull request `#23469`_ from s0undt3ch/hotfix/call-the-win-func - * 83e88a3 Call the windows specific function not the general one + * **PR** `#23691`_: (`dennisjac`_) add initial configuration documentation for varstack pillar (refs: `#23725`_) -- **PR** `#23583`_: (*jayeshka*) adding states/ipset unit test case - @ *2015-05-12T16:31:55Z* + * 137e5eefd0 Merge pull request `#23725`_ from rallytime/bp-23691 - * d2f0975 Merge pull request `#23583`_ from jayeshka/ipset_states-unit-test - * 4330cf4 adding states/ipset unit test case + * 28a846ebe8 add initial configuration documentation for varstack pillar -- **PR** `#23582`_: (*jayeshka*) adding states/keyboard unit test case - @ *2015-05-12T16:31:17Z* +* **PR** `#23722`_: (`rallytime`_) Backport `#23472`_ to 2015.5 + @ *2015-05-14 19:31:52 UTC* - * 82a47e8 Merge pull request `#23582`_ from jayeshka/keyboard_states-unit-test - * fa94d7a adding states/keyboard unit test case + * **PR** `#23472`_: (`techhat`_) Allow neutron network list to be used as pillar data (refs: `#23722`_) -- **PR** `#23581`_: (*jayeshka*) adding states/layman unit test case - @ *2015-05-12T16:30:36Z* + * 0c00995dfb Merge pull request `#23722`_ from rallytime/bp-23472 - * 77e5b28 Merge pull request `#23581`_ from jayeshka/layman_states-unit-test - * 297b055 adding states/layman unit test case + * c3d0f39515 Change versionadded tag for backport -- **PR** `#23580`_: (*jayeshka*) adding smf unit test case - @ *2015-05-12T16:29:58Z* + * 023e88f264 Allow neutron network list to be used as pillar data - * cbe3282 Merge pull request `#23580`_ from jayeshka/smf-unit-test - * 4f97191 adding smf unit test case +* **ISSUE** `#23657`_: (`arthurlogilab`_) [salt-cloud lxc] NameError: global name '__salt__' is not defined (refs: `#23898`_, `#23727`_, `#23897`_) -- **PR** `#23572`_: (*The-Loeki*) Fix regression of `#21355`_ introduced by `#21603`_ - @ *2015-05-12T16:28:05Z* +* **PR** `#23727`_: (`jfindlay`_) fix npm execution module stacktrace + @ *2015-05-14 18:14:12 UTC* - - **ISSUE** `#21603`_: (*ipmb*) ssh_auth.present fails on key without comment - | refs: `#23572`_ `#23572`_ - - **PR** `#21355`_: (*The-Loeki*) Fix for comments containing whitespaces - * 16a3338 Merge pull request `#23572`_ from The-Loeki/ssh_auth_fix - * d8248dd Fix regression of `#21355`_ introduced by `#21603`_ + * cbf4ca8d91 Merge pull request `#23727`_ from jfindlay/npm_salt -- **PR** `#23565`_: (*garethgreenaway*) fix to aptpkg module - @ *2015-05-12T16:25:46Z* + * 05392f282e fix npm execution module stacktrace - - **ISSUE** `#23490`_: (*lichtamberg*) salt.modules.aptpkg.upgrade should have default "dist_upgrade=False" - | refs: `#23565`_ - * f843f89 Merge pull request `#23565`_ from garethgreenaway/2015_2_aptpkg_upgrade_default_to_upgrade - * 97ae514 aptpkg.upgrade should default to upgrade instead of dist_upgrade. +* **PR** `#23718`_: (`rahulhan`_) Adding states/user.py unit tests + @ *2015-05-14 17:15:38 UTC* -- **PR** `#23550`_: (*jfindlay*) additional mock for rh_ip_test test_build_bond - @ *2015-05-12T15:17:16Z* + * ef536d58de Merge pull request `#23718`_ from rahulhan/states_user_unit_tests - - **ISSUE** `#23473`_: (*terminalmage*) unit.modules.rh_ip_test.RhipTestCase.test_build_bond is not properly mocked - | refs: `#23550`_ - * c1157cd Merge pull request `#23550`_ from jfindlay/fix_rh_ip_test - * e9b94d3 additional mock for rh_ip_test test_build_bond + * aad27db513 Adding states/user.py unit tests -- **PR** `#23552`_: (*garethgreenaway*) Fix for an issue caused by a previous pull request - @ *2015-05-11T21:54:59Z* +* **PR** `#23720`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-05-14 17:13:02 UTC* - * b593328 Merge pull request `#23552`_ from garethgreenaway/2015_5_returner_fix_broken_previous_pr - * 7d70e2b Passed argumentes in the call _fetch_profile_opts to were in the wrong order + * a529d74079 Merge pull request `#23720`_ from basepi/merge-forward-2015.5 -- **PR** `#23547`_: (*slinu3d*) Added AWS v4 signature support for 2015.5 - @ *2015-05-11T21:52:24Z* + * 06a3ebd9d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - * d0f9682 Merge pull request `#23547`_ from slinu3d/2015.5 - * f3bfdb5 Fixed urlparse and urlencode calls + * 1b86460d73 Merge pull request `#23680`_ from cachedout/issue_23403 - * 802dbdb Added AWS v4 signature support for 2015.5 + * d5986c21b4 Rename kwarg in cloud runner -- **PR** `#23544`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-05-11T18:02:06Z* + * cd64af0ce4 Merge pull request `#23674`_ from cachedout/issue_23548 - - **ISSUE** `#23159`_: (*aneeshusa*) Unused validator - - **ISSUE** `#20518`_: (*ekle*) module s3.get does not support eu-central-1 - | refs: `#23467`_ - - **ISSUE** `#563`_: (*chutz*) pidfile support for minion and master daemons - | refs: `#23460`_ `#23461`_ - - **PR** `#23538`_: (*cro*) Update date in LICENSE file - - **PR** `#23505`_: (*aneeshusa*) Remove unused ssh config validator. Fixes `#23159`_. - - **PR** `#23467`_: (*slinu3d*) Added AWS v4 signature support - - **PR** `#23460`_: (*s0undt3ch*) [2014.7] Update to latest stable bootstrap script v2015.05.07 - - **PR** `#23444`_: (*techhat*) Add create_attach_volume to nova driver - - **PR** `#23439`_: (*techhat*) Add wait_for_passwd_maxtries variable - * 06c6a1f Merge pull request `#23544`_ from basepi/merge-forward-2015.5 - * f8a36bc Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * da8a2f5cb3 Handle lists correctly in grains.list_prsesent - * b79fed3 Merge pull request `#23538`_ from cro/licupdate + * d322a19213 Merge pull request `#23672`_ from twangboy/fix_user_present - * 345efe2 Update date in LICENSE file + * 731e7af3dd Merge branch '2014.7' of https://github.com/saltstack/salt into fix_user_present - * a123a36 Merge pull request `#23505`_ from aneeshusa/remove-unused-ssh-config-validator + * d6f70a4545 Fixed user.present to create password in windows - * 90af167 Remove unused ssh config validator. Fixes `#23159`_. + * 43f7025000 Merge pull request `#23670`_ from rallytime/bp-23607 - * ca2c21a Merge pull request `#23467`_ from slinu3d/2014.7 + * ed30dc4642 Fix for `#23604`_. No error reporting. Exitcode !=0 are ok - * 0b4081d Fixed pylint error at line 363 +* **PR** `#23704`_: (`jayeshka`_) adding states/lvs_server unit test case + @ *2015-05-14 14:22:10 UTC* - * 5be5eb5 Fixed pylink errors + * 13facbf077 Merge pull request `#23704`_ from jayeshka/lvs_server_states-unit-test - * e64f374 Fixed lint errors + * da323dab0b adding states/lvs_server unit test case - * b9d1ac4 Added AWS v4 signature support +* **PR** `#23703`_: (`jayeshka`_) adding states/lvs_service unit test case + @ *2015-05-14 14:21:23 UTC* - * e6f9eec Merge pull request `#23444`_ from techhat/novacreateattach + * f95ca3188f Merge pull request `#23703`_ from jayeshka/lvs_service_states-unit-test - * ebdb7ea Add create_attach_volume to nova driver + * 66717c8133 adding states/lvs_service unit test case - * e331463 Merge pull request `#23460`_ from s0undt3ch/hotfix/bootstrap-script-2014.7 +* **PR** `#23702`_: (`jayeshka`_) Remove superfluous return statement. + @ *2015-05-14 14:20:42 UTC* - * edcd0c4 Update to latest stable bootstrap script v2015.05.07 + * 07e987e327 Merge pull request `#23702`_ from jayeshka/fix_lvs_service - * 7a8ce1a Merge pull request `#23439`_ from techhat/maxtries + * ecff2181e4 fix lvs_service - * 0ad3ff2 Add wait_for_passwd_maxtries variable +* **PR** `#23686`_: (`jfindlay`_) remove superflous return statement + @ *2015-05-14 14:20:18 UTC* -- **PR** `#23470`_: (*twangboy*) Fixed service.restart for salt-minion - @ *2015-05-11T17:54:47Z* + * 39973d4095 Merge pull request `#23686`_ from jfindlay/fix_lvs_server - - **ISSUE** `#23426`_: (*twangboy*) Can't restart salt-minion on 64 bit windows (2015.5.0) - | refs: `#23470`_ - * aa5b896 Merge pull request `#23470`_ from twangboy/fix_svc_restart - * b3f284c Fixed tests + * 5aaeb73532 remove superflous return statement - * ad44d79 Fixed service.restart for salt-minion +* **PR** `#23690`_: (`rallytime`_) Backport `#23424`_ to 2015.5 + @ *2015-05-13 23:04:36 UTC* -- **PR** `#23539`_: (*rahulhan*) Adding states/virtualenv_mod.py unit tests - @ *2015-05-11T17:02:31Z* + * **PR** `#23424`_: (`justinta`_) Added python_shell=True for refresh_db in pacman.py (refs: `#23690`_) - * 67988b2 Merge pull request `#23539`_ from rahulhan/states_virtualenv_mod_unit_test - * 750bb07 Adding states/virtualenv_mod.py unit tests + * be7c7ef3fd Merge pull request `#23690`_ from rallytime/bp-23424 -* 6f0cf2e Merge remote-tracking branch 'upstream/2015.2' into 2015.5 + * 94574b7367 Added python_shell=True for refresh_db in pacman.py - - **ISSUE** `#23244`_: (*freimer*) Caller not available in reactors - | refs: `#23245`_ - - **PR** `#23509`_: (*keesbos*) Catch the unset (empty/None) environment case - - **PR** `#23423`_: (*cachedout*) Remove jid_event from state.orch - - **PR** `#23245`_: (*freimer*) Add Caller functionality to reactors. +* **PR** `#23681`_: (`cachedout`_) Start on 2015.5.1 release notes + @ *2015-05-13 19:44:22 UTC* - * c966196 Merge pull request `#23423`_ from cachedout/remove_jid_event_from_orch + * 1a0db43097 Merge pull request `#23681`_ from cachedout/2015_5_1_release_notes - * f81aab7 Remove jid_event from state.orch + * bdbbfa6ee7 Start on 2015.5.1 release notes - * 2bb09b7 Merge pull request `#23509`_ from keesbos/Catch_empty_environment +* **PR** `#23679`_: (`jfindlay`_) Merge `#23616`_ + @ *2015-05-13 19:03:53 UTC* - * 6dedeac Catch the unset (empty/None) environment case + * **PR** `#23616`_: (`Snergster`_) virtual returning none warning fixed in dev but missed in 2015.5 (refs: `#23679`_) - * 6d42f30 Merge pull request `#23245`_ from freimer/issue_23244 + * b54075a2ac Merge pull request `#23679`_ from jfindlay/merge_23616 - * 24cf6eb Add Caller functionality to reactors. + * 6e15e19907 appease pylint's blank line strictures -- **PR** `#23513`_: (*gladiatr72*) short-circuit auto-failure of iptables.delete state - @ *2015-05-11T15:18:33Z* + * 8750680d9e virtual returning none warning fixed in dev but missed in 2015.5 - * c3f03d8 Merge pull request `#23513`_ from gladiatr72/RFC_stop_iptables.check_from_short-circuiting_position-only_delete_rule - * c71714c short-circuit auto-failure of iptables.delete state if position argument is set without the other accoutrements that check_rule requires. +* **PR** `#23675`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-05-13 18:35:54 UTC* -- **PR** `#23534`_: (*jayeshka*) adding states/ini_manage unit test case - @ *2015-05-11T14:32:06Z* + * e480f13688 Merge pull request `#23675`_ from basepi/merge-forward-2015.5 - * 4e77f6f Merge pull request `#23534`_ from jayeshka/ini_manage_states-unit-test - * 831223c adding states/ini_manage unit test case + * bd635488ef Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#23533`_: (*jayeshka*) adding states/hipchat unit test case - @ *2015-05-11T14:30:22Z* + * 0f006ac1d8 Merge pull request `#23661`_ from rallytime/merge-23640 - * 11ba9ed Merge pull request `#23533`_ from jayeshka/hipchat-states-unit-test - * 41d14b3 adding states/hipchat unit test case + * 4427f42bb6 Whitespace fix -- **PR** `#23532`_: (*jayeshka*) adding states/ipmi unit test case - @ *2015-05-11T14:28:15Z* + * dd9115466e Add warning to get_or_set_hash about reserved chars - * e542113 Merge pull request `#23532`_ from jayeshka/ipmi-states-unit-test - * fc3e64a adding states/ipmi unit test case + * 84e2ef88fc Merge pull request `#23639`_ from cachedout/issue_23452 -- **PR** `#23531`_: (*jayeshka*) adding service unit test case - @ *2015-05-11T14:27:12Z* + * d418b49a77 Syntax error! - * 9ba85fd Merge pull request `#23531`_ from jayeshka/service-unit-test - * 3ad5314 adding service unit test case + * 45b4015d7d Handle exceptions raised by __virtual__ -- **PR** `#23517`_: (*garethgreenaway*) fix to returners - @ *2015-05-11T14:20:51Z* + * bd9b94ba8c Merge pull request `#23637`_ from cachedout/issue_23611 - - **ISSUE** `#23512`_: (*Code-Vortex*) hipchat_returner / slack_returner not work correctly - | refs: `#23517`_ - * 32838cd Merge pull request `#23517`_ from garethgreenaway/23512_2015_5_returners_with_profiles - * 81e31e2 fix for returners that utilize profile attributes. code in the if else statement was backwards. `#23512`_ + * 56cb1f52e3 Fix typo -- **PR** `#23502`_: (*rahulhan*) Adding states/win_servermanager.py unit tests - @ *2015-05-08T19:47:18Z* + * f6fcf19a7f Convert str master to list - * 6be7d8d Merge pull request `#23502`_ from rahulhan/states_win_servermanager_unit_test - * 2490074 Adding states/win_servermanager.py unit tests + * f20c0e42ce Merge pull request `#23595`_ from rallytime/bp-23549 -- **PR** `#23495`_: (*jayeshka*) adding seed unit test case - @ *2015-05-08T17:30:38Z* + * 6efcac09ad Update __init__.py - * 6048578 Merge pull request `#23495`_ from jayeshka/seed-unit-test - * 3f134bc adding seed unit test case + * 1acaf86da7 Merge pull request `#23594`_ from rallytime/bp-23496 -- **PR** `#23494`_: (*jayeshka*) adding sensors unit test case - @ *2015-05-08T17:30:18Z* + * d5ae1d268a Fix for issue `#23110`_ This resolves issues when the freshly created directory is removed by fileserver.update. - * 70bc3c1 Merge pull request `#23494`_ from jayeshka/sensors-unit-test - * 1fb48a3 adding sensors unit test case + * 2c221c7332 Merge pull request `#23593`_ from rallytime/bp-23442 -- **PR** `#23493`_: (*jayeshka*) adding states/incron unit test case - @ *2015-05-08T17:29:59Z* + * 39869a15bd check w/ low['name'] only - * b981b20 Merge pull request `#23493`_ from jayeshka/incron-states-unit-test - * cc7bc17 adding states/incron unit test case + * 304cc499e9 another fix for file defined w/ id, but require name -- **PR** `#23492`_: (*jayeshka*) adding states/influxdb_database unit test case - @ *2015-05-08T17:29:51Z* + * 8814d4180e add directory itself to keep list - * 4019c49 Merge pull request `#23492`_ from jayeshka/influxdb_database-states-unit-test - * e1fcac8 adding states/influxdb_database unit test case + * fadd1ef63c Merge pull request `#23606`_ from twangboy/fix_installer -- **PR** `#23491`_: (*jayeshka*) adding states/influxdb_user unit test case - @ *2015-05-08T16:24:07Z* + * 038331edab Fixed checkbox for starting service and actually starting it - * d317a77 Merge pull request `#23491`_ from jayeshka/influxdb_user-states-unit-test - * 9d4043f adding states/influxdb_user unit test case + * acdd3fc6bd Fix lint -- **PR** `#23477`_: (*galet*) LDAP auth: Escape filter value for group membership search - @ *2015-05-07T22:04:48Z* + * 680e88f058 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - * e0b2a73 Merge pull request `#23477`_ from galet/ldap-filter-escaping - * 33038b9 LDAP auth: Escape filter value for group membership search + * 10b3f0f643 Merge pull request `#23592`_ from rallytime/bp-23389 -- **PR** `#23476`_: (*cachedout*) Lint becaon - @ *2015-05-07T19:55:36Z* + * 734cc43801 Correct fail_hard typo - - **PR** `#23431`_: (*UtahDave*) Beacon fixes - | refs: `#23476`_ - * e1719fe Merge pull request `#23476`_ from cachedout/lint_23431 - * 8d1ff20 Lint becaon + * cd34b9b6c4 Merge pull request `#23573`_ from techhat/novaquery -- **PR** `#23431`_: (*UtahDave*) Beacon fixes - | refs: `#23476`_ - @ *2015-05-07T19:53:47Z* + * f92db5e92f Linting - * 1e299ed Merge pull request `#23431`_ from UtahDave/beacon_fixes - * 152f223 remove unused import + * 26e00d3ccc Scan all available networks for public and private IPs - * 81198f9 fix interval logic and example + * 2a72cd71c2 Merge pull request `#23558`_ from jfindlay/fix_ebuild - * 5504778 update to proper examples + * 45404fb2a6 reorder emerge command line - * 6890439 fix list for mask + * a664a3c6fd Merge pull request `#23530`_ from dr4Ke/fix_salt-ssh_to_include_pkg_sources - * ee7b579 remove custom interval code. + * 5df6a8008c fix pylint warning -- **PR** `#23468`_: (*rahulhan*) Adding states/win_system.py unit tests - @ *2015-05-07T19:20:50Z* + * d0549e56ba salt-ssh state: fix including all salt:// references - * ea55c44 Merge pull request `#23468`_ from rahulhan/states_win_system_unit_test - * 33f8c12 Adding states/win_system.py unit tests + * 55c3869861 Merge pull request `#23433`_ from twangboy/list_pkgs_fix -- **PR** `#23466`_: (*UtahDave*) minor spelling fix - @ *2015-05-07T19:19:06Z* + * 8ab5b1b86f Fix pylint error - * e6e1114 Merge pull request `#23466`_ from UtahDave/2015.5local - * b2c399a minor spelling fix + * 2d11d6545e Obtain all software from the registry -- **PR** `#23461`_: (*s0undt3ch*) [2015.5] Update to latest stable bootstrap script v2015.05.07 - @ *2015-05-07T19:16:18Z* + * 755bed0abd Merge pull request `#23554`_ from jleroy/debian-hostname-fix - - **ISSUE** `#563`_: (*chutz*) pidfile support for minion and master daemons - | refs: `#23460`_ `#23461`_ - * 4eeb1e6 Merge pull request `#23461`_ from s0undt3ch/hotfix/bootstrap-script - * 638c63d Update to latest stable bootstrap script v2015.05.07 + * 5ff749e487 Debian: Hostname always updated -- **PR** `#23450`_: (*jayeshka*) adding scsi unit test case - @ *2015-05-07T19:00:28Z* + * 6ec87ce9f5 Merge pull request `#23551`_ from dr4Ke/grains.append_unit_tests - * 8651278 Merge pull request `#23450`_ from jayeshka/scsi-unit-test - * e7269ff adding scsi unit test case + * ebff9df5b2 fix pylint errors -- **PR** `#23449`_: (*jayeshka*) adding s3 unit test case - @ *2015-05-07T18:59:45Z* + * c4954046ad unit tests for grains.append module function - * 8b374ae Merge pull request `#23449`_ from jayeshka/s3-unit-test - * 85786bf adding s3 unit test case + * 0c9a32326c use MagickMock -- **PR** `#23448`_: (*jayeshka*) adding states/keystone unit test case - @ *2015-05-07T18:58:59Z* + * c838a22377 unit tests for grains.append module function - * 49b431c Merge pull request `#23448`_ from jayeshka/keystone-states-unit-test - * a3050eb adding states/keystone unit test case + * e96c5c5bf3 Merge pull request `#23474`_ from dr4Ke/fix_grains.append_nested -- **PR** `#23447`_: (*jayeshka*) adding states/grafana unit test case - @ *2015-05-07T18:58:20Z* + * a01a5bb51e grains.get, parameter delimititer, versionadded: 2014.7.6 - * 23d7e7e Merge pull request `#23447`_ from jayeshka/grafana-states-unit-test - * 7e90a4a adding states/grafana unit test case + * b39f50475d remove debugging output -- **PR** `#23438`_: (*techhat*) Gate requests import - @ *2015-05-07T07:22:58Z* + * b6e15e295c fix grains.append in nested dictionnary grains `#23411`_ - * 1fd0bc2 Merge pull request `#23438`_ from techhat/gaterequests - * d5b15fc Gate requests import + * ab7e1aed8e Merge pull request `#23537`_ from t0rrant/patch-1 -- **PR** `#23429`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-05-07T05:35:13Z* + * 8e03cc99d3 Update changelog - - **ISSUE** `#17245`_: (*tomashavlas*) localemod does not generate locale for Arch - | refs: `#23307`_ `#23397`_ - - **PR** `#23425`_: (*basepi*) [2014.7] Fix typo in FunctionWrapper - - **PR** `#23422`_: (*cro*) $HOME should not be used, some shells don't set it. - - **PR** `#23414`_: (*jfindlay*) 2015.2 -> 2015.5 - - **PR** `#23409`_: (*terminalmage*) Update Lithium docstrings in 2014.7 branch - | refs: `#23410`_ - - **PR** `#23404`_: (*hvnsweeting*) saltapi cherrypy: initialize var when POST body is empty - - **PR** `#23397`_: (*jfindlay*) add more flexible whitespace to locale_gen search - - **PR** `#23385`_: (*rallytime*) Backport `#23346`_ to 2014.7 - - **PR** `#23346`_: (*ericfode*) Allow file_map in salt-cloud to handle folders. - | refs: `#23385`_ - * 3c4f734 Merge pull request `#23429`_ from basepi/merge-forward-2015.5 - * 7729834 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 +* **PR** `#23669`_: (`rallytime`_) Backport `#23586`_ to 2015.5 + @ *2015-05-13 18:27:11 UTC* - * 644eb75 Merge pull request `#23422`_ from cro/gce_sh_home + * **PR** `#23586`_: (`Lothiraldan`_) Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes (refs: `#23669`_) - * 4ef9e6b Don't use $HOME to find user's directory, some shells don't set it + * 0dad6be0fc Merge pull request `#23669`_ from rallytime/bp-23586 - * ef17ab4 Merge pull request `#23425`_ from basepi/functionwrapper_typo + * ef4c6adae3 Remove another unused import - * c390737 Fix typo in FunctionWrapper + * 73cfda751a Remove unused import - * 1b13ec0 Merge pull request `#23385`_ from rallytime/`bp-23346`_ + * 52b68d695a Use the zip_longest from six module for python 3 compatiblity - * 9efc13c more linting fixes + * 18d5ff9a8e Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes - * cf131c9 cleaned up some pylint errors +* **PR** `#23662`_: (`rallytime`_) Merge `#23642`_ with pylint fix + @ *2015-05-13 15:46:51 UTC* - * f981699 added logic to sftp_file and file_map to allow folder uploads using file_map + * **PR** `#23642`_: (`cachedout`_) Let saltmod handle lower-level exceptions gracefully (refs: `#23662`_) - * f8c7a62 Merge pull request `#23414`_ from jfindlay/update_branch + * fabef759e0 Merge pull request `#23662`_ from rallytime/merge-23642 - * 8074d16 2015.2 -> 2015.5 + * aa7bbd84fa Remove unused import - * 54b3bd4 Merge pull request `#23404`_ from hvnsweeting/cherrypy-post-emptybody-fix + * 9e66d4c88e Let saltmod handle lower-level exceptions gracefully - * f85f8f9 initialize var when POST body is empty +* **PR** `#23622`_: (`jfindlay`_) merge `#23508`_ + @ *2015-05-13 15:36:49 UTC* - * 160f703 Merge pull request `#23409`_ from terminalmage/update-lithium-docstrings-2014.7 + * **PR** `#23508`_: (`cro`_) Port mysql returner to postgres using jsonb datatype (refs: `#23622`_) - * bc97d01 Fix sphinx typo + * 072b92733d Merge pull request `#23622`_ from jfindlay/pgjsonb - * 20006b0 Update Lithium docstrings in 2014.7 branch + * 454322c7e4 appease pylint's proscription on blank line excess - * aa5fb0a Merge pull request `#23397`_ from jfindlay/fix_locale_gen + * 57c617136d Get time with timezone correct also in job return. - * 0941fef add more flexible whitespace to locale_gen search + * e109d0f643 Get time with timezone correct. -- **PR** `#23396`_: (*basepi*) [2015.2] Merge forward from 2014.7 to 2015.2 - @ *2015-05-06T21:42:35Z* + * 21e06b9112 Fix SQL, remove unneeded imports. - - **ISSUE** `#23294`_: (*variia*) file.replace fails to append if repl string partially available - | refs: `#23350`_ - - **ISSUE** `#23026`_: (*adelcast*) Incorrect salt-syndic logfile and pidfile locations - | refs: `#23341`_ - - **ISSUE** `#22742`_: (*hvnsweeting*) salt-master says: "This master address: 'salt' was previously resolvable but now fails to resolve!" - | refs: `#23344`_ - - **ISSUE** `#19114`_: (*pykler*) salt-ssh and gpg pillar renderer - | refs: `#23272`_ `#23347`_ `#23188`_ - - **ISSUE** `#17245`_: (*tomashavlas*) localemod does not generate locale for Arch - | refs: `#23307`_ `#23397`_ - - **ISSUE** `#580`_: (*thatch45*) recursive watch not being caught - | refs: `#23324`_ - - **ISSUE** `#552`_: (*jhutchins*) Support require and watch under the same state dec - | refs: `#23324`_ - - **PR** `#23368`_: (*kaithar*) Backport `#23367`_ to 2014.7 - - **PR** `#23367`_: (*kaithar*) Put the sed insert statement back in to the output. - | refs: `#23368`_ - - **PR** `#23350`_: (*lorengordon*) Append/prepend: search for full line - - **PR** `#23347`_: (*basepi*) [2014.7] Salt-SSH Backport FunctionWrapper.__contains__ - - **PR** `#23344`_: (*cachedout*) Explicitly set file_client on master - - **PR** `#23341`_: (*cachedout*) Fix syndic pid and logfile path - - **PR** `#23324`_: (*s0undt3ch*) [2014.7] Update to the latest stable release of the bootstrap script v2015.05.04 - - **PR** `#23318`_: (*cellscape*) Honor seed argument in LXC container initializaton - - **PR** `#23311`_: (*cellscape*) Fix new container initialization in LXC runner - | refs: `#23318`_ - - **PR** `#23307`_: (*jfindlay*) check for /etc/locale.gen - - **PR** `#23272`_: (*basepi*) [2014.7] Allow salt-ssh minion config overrides via master config and roster - | refs: `#23347`_ - - **PR** `#23188`_: (*basepi*) [2014.7] Work around bug in salt-ssh in config.get for gpg renderer - | refs: `#23272`_ - - **PR** `#18368`_: (*basepi*) Merge forward from 2014.7 to develop - | refs: `#23367`_ `#23368`_ - - **PR** `#589`_: (*epoelke*) add --quiet and --outfile options to saltkey - | refs: `#23324`_ - - **PR** `#567`_: (*bastichelaar*) Added upstart module - | refs: `#23324`_ - - **PR** `#560`_: (*UtahDave*) The runas feature that was added in 93423aa2e5e4b7de6452090b0039560d2b13... - | refs: `#23324`_ - - **PR** `#504`_: (*SEJeff*) File state goodies - | refs: `#23324`_ - * 1fb8445 Merge pull request `#23396`_ from basepi/merge-forward-2015.2 - * 2766c8c Fix typo in FunctionWrapper + * 653f360723 Stop making changes in 2 places. - * fd09cda Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 + * d6daaa0292 Typo. - * 0c76dd4 Merge pull request `#23368`_ from kaithar/`bp-23367`_ + * 7d748bff75 SSL is handled differently by Pg, so don't set it here. - * 577f419 Pylint fix + * cc7c377bcd Fill alter_time field in salt_events with current time with timezone. - * 8d9acd1 Put the sed insert statement back in to the output. + * 43defe9b20 Port mysql module to Postgres using jsonb datatypes - * 3493cc1 Merge pull request `#23350`_ from lorengordon/file.replace_assume_line +* **PR** `#23651`_: (`jayeshka`_) adding solr unit test case + @ *2015-05-13 15:26:15 UTC* - * b60e224 Append/prepend: search for full line + * c1bdd4d377 Merge pull request `#23651`_ from jayeshka/solr-unit-test - * 7be5c48 Merge pull request `#23341`_ from cachedout/issue_23026 + * 6e05148962 adding solr unit test case - * e98e65e Fix tests +* **PR** `#23649`_: (`jayeshka`_) adding states/libvirt unit test case + @ *2015-05-13 15:24:48 UTC* - * 6011b43 Fix syndic pid and logfile path + * ee43411677 Merge pull request `#23649`_ from jayeshka/libvirt_states-unit-test - * ea61abf Merge pull request `#23272`_ from basepi/salt-ssh.minion.config.19114 + * 0fb923a283 adding states/libvirt unit test case - * c223309 Add versionadded +* **PR** `#23648`_: (`jayeshka`_) adding states/linux_acl unit test case + @ *2015-05-13 15:24:11 UTC* - * be7407f Lint + * c7fc466f1e Merge pull request `#23648`_ from jayeshka/linux_acl_states-unit-test - * c2c3375 Missing comma + * 3f0ab29eb0 removed error. - * 8e3e8e0 Pass the minion_opts through the FunctionWrapper + * 11081c121c adding states/linux_acl unit test case - * cb69cd0 Match the master config template in the master config reference +* **PR** `#23650`_: (`jayeshka`_) adding states/kmod unit test case + @ *2015-05-13 15:09:18 UTC* - * 87fc316 Add Salt-SSH section to master config template + * 4cba7ba35c Merge pull request `#23650`_ from jayeshka/kmod_states-unit-test - * 91dd9dc Add ssh_minion_opts to master config ref + * 1987015033 adding states/kmod unit test case - * c273ea1 Add minion config to salt-ssh doc +* **PR** `#23633`_: (`jayeshka`_) made changes to test_interfaces function. + @ *2015-05-13 06:51:07 UTC* - * a0b6b76 Add minion_opts to roster docs + * bc8faf1543 Merge pull request `#23633`_ from jayeshka/win_network-2015.5-unit-test - * 5212c35 Accept minion_opts from the target information + * 0936e1d386 made changes to test_interfaces function. - * e2099b6 Process `ssh_minion_opts` from master config +* **PR** `#23619`_: (`jfindlay`_) fix kmod.present processing of module loading + @ *2015-05-13 01:16:56 UTC* - * 3b64214 Revert "Work around bug in salt-ssh in config.get for gpg renderer" + * 7df3579bbc Merge pull request `#23619`_ from jfindlay/fix_kmod_state - * 494953a Remove the strip (embracing multi-line YAML dump) + * 73facbfc1f fix kmod.present processing of module loading - * fe87f0f Dump multi-line yaml into the SHIM +* **PR** `#23598`_: (`rahulhan`_) Adding states/win_dns_client.py unit tests + @ *2015-05-12 21:47:36 UTC* - * b751a72 Inject local minion config into shim if available + * d4f30955fa Merge pull request `#23598`_ from rahulhan/states_win_dns_client_unit_test - * 4f760dd Merge pull request `#23347`_ from basepi/salt-ssh.functionwrapper.contains.19114 + * d08d885828 Adding states/win_dns_client.py unit tests - * 30595e3 Backport FunctionWrapper.__contains__ +* **PR** `#23597`_: (`rahulhan`_) Adding states/vbox_guest.py unit tests + @ *2015-05-12 21:46:30 UTC* - * 02658b1 Merge pull request `#23344`_ from cachedout/issue_22742 + * 811c6a1d89 Merge pull request `#23597`_ from rahulhan/states_vbox_guest_unit_test - * 5adc96c Explicitly set file_client on master + * 6a2909eeea Removed errors - * ba7605d Merge pull request `#23318`_ from cellscape/honor-seed-argument + * 4cde78a58a Adding states/vbox_guest.py unit tests - * 228b1be Honor seed argument in LXC container initializaton +* **PR** `#23615`_: (`rallytime`_) Backport `#23577`_ to 2015.5 + @ *2015-05-12 21:19:11 UTC* - * 4ac4509 Merge pull request `#23307`_ from jfindlay/fix_locale_gen + * **PR** `#23577`_: (`msciciel`_) Fix find and remove functions to pass database param (refs: `#23615`_) - * 101199a check for /etc/locale.gen + * 029ff1103d Merge pull request `#23615`_ from rallytime/bp-23577 - * f790f42 Merge pull request `#23324`_ from s0undt3ch/hotfix/bootstrap-script-2014.7 + * 6f74477129 Fix find and remove functions to pass database param - * 6643e47 Update to the latest stable release of the bootstrap script v2015.05.04 +* **PR** `#23603`_: (`rahulhan`_) Adding states/winrepo.py unit tests + @ *2015-05-12 18:40:12 UTC* -* 23d4feb Merge remote-tracking branch 'upstream/2015.2' into 2015.5 + * b8589532d1 Merge pull request `#23603`_ from rahulhan/states_winrepo_unit_test + * a66e7e7f1f Adding states/winrepo.py unit tests -- **PR** `#23412`_: (*rahulhan*) Adding states/win_update.py unit tests - @ *2015-05-06T18:31:09Z* +* **PR** `#23602`_: (`rahulhan`_) Adding states/win_path.py unit tests + @ *2015-05-12 18:39:37 UTC* - * b3c1672 Merge pull request `#23412`_ from rahulhan/states_win_update_unit_test - * 9bc1519 Removed unwanted imports + * 3cbbd6d277 Merge pull request `#23602`_ from rahulhan/states_win_path_unit_test - * f12bfcf Adding states/win_update.py unit tests + * 122c29f71a Adding states/win_path.py unit tests -- **PR** `#23413`_: (*terminalmage*) Update manpages for 2015.2 -> 2015.5 - @ *2015-05-06T17:12:57Z* +* **PR** `#23600`_: (`rahulhan`_) Adding states/win_network.py unit tests + @ *2015-05-12 18:39:01 UTC* - * f2d7646 Merge pull request `#23413`_ from terminalmage/update-manpages - * 23fa440 Update manpages to reflect 2015.2 rename to 2015.5 + * 3c904e8739 Merge pull request `#23600`_ from rahulhan/states_win_network_unit_test - * 0fdaa73 Fix missed docstring updates from 2015.2 -> 2015.5 + * b418404eb7 removed lint error - * 4fea5ba Add missing RST file + * 1be802300b Adding states/win_network.py unit tests -- **PR** `#23410`_: (*terminalmage*) Update Lithium docstrings in 2015.2 branch - @ *2015-05-06T15:53:52Z* +* **PR** `#23599`_: (`rahulhan`_) Adding win_firewall.py unit tests + @ *2015-05-12 18:37:49 UTC* - - **PR** `#23409`_: (*terminalmage*) Update Lithium docstrings in 2014.7 branch - | refs: `#23410`_ - * bafbea7 Merge pull request `#23410`_ from terminalmage/update-lithium-docstrings-2015.2 - * d395565 Update Lithium docstrings in 2015.2 branch + * 10243a7742 Merge pull request `#23599`_ from rahulhan/states_win_firewall_unit_test -- **PR** `#23407`_: (*jayeshka*) adding rsync unit test case - @ *2015-05-06T15:52:23Z* + * 6cda890517 Adding win_firewall.py unit tests - * 02ef41a Merge pull request `#23407`_ from jayeshka/rsync-unit-test - * a4dd836 adding rsync unit test case +* **PR** `#23601`_: (`basepi`_) Add versionadded for jboss module/state + @ *2015-05-12 17:22:59 UTC* -- **PR** `#23406`_: (*jayeshka*) adding states/lxc unit test case - @ *2015-05-06T15:51:50Z* + * e73071dbdf Merge pull request `#23601`_ from basepi/jboss.version.added - * 58ec2a2 Merge pull request `#23406`_ from jayeshka/lxc-states-unit-test - * 32a0d03 adding states/lxc unit test case + * 0174c8fe58 Add versionadded for jboss module/state -- **PR** `#23395`_: (*basepi*) [2015.2] Add note to 2015.2.0 release notes about master opts in pillar - @ *2015-05-05T22:15:20Z* +* **PR** `#23469`_: (`s0undt3ch`_) Call the windows specific function not the general one + @ *2015-05-12 16:47:22 UTC* - * 8837d00 Merge pull request `#23395`_ from basepi/2015.2.0masteropts - * b261c95 Add note to 2015.2.0 release notes about master opts in pillar + * 9beb7bc529 Merge pull request `#23469`_ from s0undt3ch/hotfix/call-the-win-func -- **PR** `#23393`_: (*basepi*) [2015.2] Add warning about python_shell changes to 2015.2.0 release notes - @ *2015-05-05T22:12:46Z* + * 83e88a3eb1 Call the windows specific function not the general one - * f79aed5 Merge pull request `#23393`_ from basepi/2015.2.0python_shell - * b2f033f Add CLI note +* **PR** `#23583`_: (`jayeshka`_) adding states/ipset unit test case + @ *2015-05-12 16:31:55 UTC* - * 48e7b3e Add warning about python_shell changes to 2015.2.0 release notes + * d2f097584c Merge pull request `#23583`_ from jayeshka/ipset_states-unit-test -- **PR** `#23380`_: (*gladiatr72*) Fix for double output with static salt cli/v2015.2 - @ *2015-05-05T21:44:28Z* + * 4330cf4a6e adding states/ipset unit test case - * a977776 Merge pull request `#23380`_ from gladiatr72/fix_for_double_output_with_static__salt_CLI/v2015.2 - * c47fdd7 Actually removed the ``static`` bits from below the else: fold this time. +* **PR** `#23582`_: (`jayeshka`_) adding states/keyboard unit test case + @ *2015-05-12 16:31:17 UTC* - * 4ee3679 Fix for incorrect output with salt CLI --static option + * 82a47e8cbf Merge pull request `#23582`_ from jayeshka/keyboard_states-unit-test -- **PR** `#23379`_: (*rahulhan*) Adding states/rabbitmq_cluster.py - @ *2015-05-05T21:44:06Z* + * fa94d7ab5c adding states/keyboard unit test case - * 5c9543c Merge pull request `#23379`_ from rahulhan/states_rabbitmq_cluster_test - * 04c22d1 Adding states/rabbitmq_cluster.py +* **PR** `#23581`_: (`jayeshka`_) adding states/layman unit test case + @ *2015-05-12 16:30:36 UTC* -- **PR** `#23377`_: (*rahulhan*) Adding states/xmpp.py unit tests - @ *2015-05-05T21:43:35Z* + * 77e5b28566 Merge pull request `#23581`_ from jayeshka/layman_states-unit-test - * 430f080 Merge pull request `#23377`_ from rahulhan/states_xmpp_test - * 32923b5 Adding states/xmpp.py unit tests + * 297b055b1c adding states/layman unit test case -- **PR** `#23335`_: (*steverweber*) 2015.2: include doc in master config for module_dirs - @ *2015-05-05T21:28:58Z* +* **PR** `#23580`_: (`jayeshka`_) adding smf unit test case + @ *2015-05-12 16:29:58 UTC* - * 8c057e6 Merge pull request `#23335`_ from steverweber/2015.2 - * 5e3bae9 help installing python pysphere lib + * cbe32828ef Merge pull request `#23580`_ from jayeshka/smf-unit-test - * 97513b0 include module_dirs + * 4f9719157b adding smf unit test case - * 36b1c87 include module_dirs +* **ISSUE** `#21603`_: (`ipmb`_) ssh_auth.present fails on key without comment (refs: `#23572`_) -- **PR** `#23362`_: (*jayeshka*) adding states/zk_concurrency unit test case - @ *2015-05-05T15:50:06Z* +* **PR** `#23572`_: (`The-Loeki`_) Fix regression of `#21355`_ introduced by `#21603`_ + @ *2015-05-12 16:28:05 UTC* - * 1648253 Merge pull request `#23362`_ from jayeshka/zk_concurrency-states-unit-test - * f60dda4 adding states/zk_concurrency unit test case + * **PR** `#21355`_: (`The-Loeki`_) Fix for comments containing whitespaces (refs: `#23572`_) -- **PR** `#23363`_: (*jayeshka*) adding riak unit test case - @ *2015-05-05T14:23:05Z* + * 16a333832a Merge pull request `#23572`_ from The-Loeki/ssh_auth_fix - * 1cdaeed Merge pull request `#23363`_ from jayeshka/riak-unit-test - * f9da6db adding riak unit test case + * d8248dd368 Fix regression of `#21355`_ introduced by `#21603`_ +* **ISSUE** `#23490`_: (`lichtamberg`_) salt.modules.aptpkg.upgrade should have default "dist_upgrade=False" (refs: `#23565`_) + +* **PR** `#23565`_: (`garethgreenaway`_) fix to aptpkg module + @ *2015-05-12 16:25:46 UTC* + + * f843f89cd7 Merge pull request `#23565`_ from garethgreenaway/2015_2_aptpkg_upgrade_default_to_upgrade + + * 97ae514641 aptpkg.upgrade should default to upgrade instead of dist_upgrade. + +* **ISSUE** `#23473`_: (`terminalmage`_) unit.modules.rh_ip_test.RhipTestCase.test_build_bond is not properly mocked (refs: `#23550`_) + +* **PR** `#23550`_: (`jfindlay`_) additional mock for rh_ip_test test_build_bond + @ *2015-05-12 15:17:16 UTC* + + * c1157cdaee Merge pull request `#23550`_ from jfindlay/fix_rh_ip_test + + * e9b94d36d3 additional mock for rh_ip_test test_build_bond + +* **PR** `#23552`_: (`garethgreenaway`_) Fix for an issue caused by a previous pull request + @ *2015-05-11 21:54:59 UTC* + + * b593328176 Merge pull request `#23552`_ from garethgreenaway/2015_5_returner_fix_broken_previous_pr + + * 7d70e2b334 Passed argumentes in the call _fetch_profile_opts to were in the wrong order + +* **PR** `#23547`_: (`slinu3d`_) Added AWS v4 signature support for 2015.5 + @ *2015-05-11 21:52:24 UTC* + + * d0f96825dd Merge pull request `#23547`_ from slinu3d/2015.5 + + * f3bfdb561b Fixed urlparse and urlencode calls + + * 802dbdb965 Added AWS v4 signature support for 2015.5 + +* **PR** `#23544`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-05-11 18:02:06 UTC* + + * 06c6a1f44a Merge pull request `#23544`_ from basepi/merge-forward-2015.5 + + * f8a36bc155 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * b79fed3a92 Merge pull request `#23538`_ from cro/licupdate + + * 345efe25c9 Update date in LICENSE file + + * a123a36f05 Merge pull request `#23505`_ from aneeshusa/remove-unused-ssh-config-validator + + * 90af1672ca Remove unused ssh config validator. Fixes `#23159`_. + + * ca2c21a63c Merge pull request `#23467`_ from slinu3d/2014.7 + + * 0b4081d8f4 Fixed pylint error at line 363 + + * 5be5eb5b14 Fixed pylink errors + + * e64f374ffa Fixed lint errors + + * b9d1ac4f1f Added AWS v4 signature support + + * e6f9eec02e Merge pull request `#23444`_ from techhat/novacreateattach + + * ebdb7eae2d Add create_attach_volume to nova driver + + * e331463319 Merge pull request `#23460`_ from s0undt3ch/hotfix/bootstrap-script-2014.7 + + * edcd0c41f2 Update to latest stable bootstrap script v2015.05.07 + + * 7a8ce1a954 Merge pull request `#23439`_ from techhat/maxtries + + * 0ad3ff2c88 Add wait_for_passwd_maxtries variable + +* **ISSUE** `#23426`_: (`twangboy`_) Can't restart salt-minion on 64 bit windows (2015.5.0) (refs: `#23470`_) + +* **PR** `#23470`_: (`twangboy`_) Fixed service.restart for salt-minion + @ *2015-05-11 17:54:47 UTC* + + * aa5b896d3e Merge pull request `#23470`_ from twangboy/fix_svc_restart + + * b3f284c517 Fixed tests + + * ad44d79f26 Fixed service.restart for salt-minion + +* **PR** `#23539`_: (`rahulhan`_) Adding states/virtualenv_mod.py unit tests + @ *2015-05-11 17:02:31 UTC* + + * 67988b21ee Merge pull request `#23539`_ from rahulhan/states_virtualenv_mod_unit_test + + * 750bb07d1c Adding states/virtualenv_mod.py unit tests + + * c96619653e Merge pull request `#23423`_ from cachedout/remove_jid_event_from_orch + + * f81aab7627 Remove jid_event from state.orch + + * 2bb09b7ee7 Merge pull request `#23509`_ from keesbos/Catch_empty_environment + + * 6dedeaccd2 Catch the unset (empty/None) environment case + + * 6d42f30271 Merge pull request `#23245`_ from freimer/issue_23244 + + * 24cf6ebad5 Add Caller functionality to reactors. + +* **PR** `#23513`_: (`gladiatr72`_) short-circuit auto-failure of iptables.delete state + @ *2015-05-11 15:18:33 UTC* + + * c3f03d827d Merge pull request `#23513`_ from gladiatr72/RFC_stop_iptables.check_from_short-circuiting_position-only_delete_rule + + * c71714c364 short-circuit auto-failure of iptables.delete state if position argument is set without the other accoutrements that check_rule requires. + +* **PR** `#23534`_: (`jayeshka`_) adding states/ini_manage unit test case + @ *2015-05-11 14:32:06 UTC* + + * 4e77f6f8c4 Merge pull request `#23534`_ from jayeshka/ini_manage_states-unit-test + + * 831223c31c adding states/ini_manage unit test case + +* **PR** `#23533`_: (`jayeshka`_) adding states/hipchat unit test case + @ *2015-05-11 14:30:22 UTC* + + * 11ba9ed99b Merge pull request `#23533`_ from jayeshka/hipchat-states-unit-test + + * 41d14b322d adding states/hipchat unit test case + +* **PR** `#23532`_: (`jayeshka`_) adding states/ipmi unit test case + @ *2015-05-11 14:28:15 UTC* + + * e5421139d3 Merge pull request `#23532`_ from jayeshka/ipmi-states-unit-test + + * fc3e64a8a4 adding states/ipmi unit test case + +* **PR** `#23531`_: (`jayeshka`_) adding service unit test case + @ *2015-05-11 14:27:12 UTC* + + * 9ba85fd31a Merge pull request `#23531`_ from jayeshka/service-unit-test + + * 3ad5314ee0 adding service unit test case + +* **ISSUE** `#23512`_: (`mostafahussein`_) hipchat_returner / slack_returner not work correctly (refs: `#23517`_) + +* **PR** `#23517`_: (`garethgreenaway`_) fix to returners + @ *2015-05-11 14:20:51 UTC* + + * 32838cd888 Merge pull request `#23517`_ from garethgreenaway/23512_2015_5_returners_with_profiles + + * 81e31e27cf fix for returners that utilize profile attributes. code in the if else statement was backwards. `#23512`_ + +* **PR** `#23502`_: (`rahulhan`_) Adding states/win_servermanager.py unit tests + @ *2015-05-08 19:47:18 UTC* + + * 6be7d8d13b Merge pull request `#23502`_ from rahulhan/states_win_servermanager_unit_test + + * 2490074aa2 Adding states/win_servermanager.py unit tests + +* **PR** `#23495`_: (`jayeshka`_) adding seed unit test case + @ *2015-05-08 17:30:38 UTC* + + * 604857811e Merge pull request `#23495`_ from jayeshka/seed-unit-test + + * 3f134bc573 adding seed unit test case + +* **PR** `#23494`_: (`jayeshka`_) adding sensors unit test case + @ *2015-05-08 17:30:18 UTC* + + * 70bc3c1415 Merge pull request `#23494`_ from jayeshka/sensors-unit-test + + * 1fb48a31a8 adding sensors unit test case + +* **PR** `#23493`_: (`jayeshka`_) adding states/incron unit test case + @ *2015-05-08 17:29:59 UTC* + + * b981b20d44 Merge pull request `#23493`_ from jayeshka/incron-states-unit-test + + * cc7bc170f3 adding states/incron unit test case + +* **PR** `#23492`_: (`jayeshka`_) adding states/influxdb_database unit test case + @ *2015-05-08 17:29:51 UTC* + + * 4019c493a1 Merge pull request `#23492`_ from jayeshka/influxdb_database-states-unit-test + + * e1fcac815d adding states/influxdb_database unit test case + +* **PR** `#23491`_: (`jayeshka`_) adding states/influxdb_user unit test case + @ *2015-05-08 16:24:07 UTC* + + * d317a77afb Merge pull request `#23491`_ from jayeshka/influxdb_user-states-unit-test + + * 9d4043f9ff adding states/influxdb_user unit test case + +* **PR** `#23477`_: (`galet`_) LDAP auth: Escape filter value for group membership search + @ *2015-05-07 22:04:48 UTC* + + * e0b2a73eb4 Merge pull request `#23477`_ from galet/ldap-filter-escaping + + * 33038b9f86 LDAP auth: Escape filter value for group membership search + +* **PR** `#23476`_: (`cachedout`_) Lint becaon + @ *2015-05-07 19:55:36 UTC* + + * **PR** `#23431`_: (`UtahDave`_) Beacon fixes (refs: `#23476`_) + + * e1719fe26b Merge pull request `#23476`_ from cachedout/lint_23431 + + * 8d1ff209eb Lint becaon + +* **PR** `#23431`_: (`UtahDave`_) Beacon fixes (refs: `#23476`_) + @ *2015-05-07 19:53:47 UTC* + + * 1e299ede4f Merge pull request `#23431`_ from UtahDave/beacon_fixes + + * 152f2235c2 remove unused import + + * 81198f9399 fix interval logic and example + + * 5504778adf update to proper examples + + * 6890439d58 fix list for mask + + * ee7b579e90 remove custom interval code. + +* **PR** `#23468`_: (`rahulhan`_) Adding states/win_system.py unit tests + @ *2015-05-07 19:20:50 UTC* + + * ea55c44bbb Merge pull request `#23468`_ from rahulhan/states_win_system_unit_test + + * 33f8c12e9f Adding states/win_system.py unit tests + +* **PR** `#23466`_: (`UtahDave`_) minor spelling fix + @ *2015-05-07 19:19:06 UTC* + + * e6e11147af Merge pull request `#23466`_ from UtahDave/2015.5local + + * b2c399a137 minor spelling fix + +* **ISSUE** `#529`_: (`rubic`_) run salt in user space (refs: `#543`_) + + * **PR** `saltstack/salt-bootstrap#563`_: (`notpeter`_) Ubuntu alternate ppas (refs: `#23461`_, `#23460`_) + + * **PR** `#543`_: (`rubic`_) updated documentation for user, fixed configuration template links (refs: #`saltstack/salt-bootstrap#563`_) + +* **PR** `#23461`_: (`s0undt3ch`_) [2015.5] Update to latest stable bootstrap script v2015.05.07 + @ *2015-05-07 19:16:18 UTC* + + * 4eeb1e627a Merge pull request `#23461`_ from s0undt3ch/hotfix/bootstrap-script + + * 638c63d635 Update to latest stable bootstrap script v2015.05.07 + +* **PR** `#23450`_: (`jayeshka`_) adding scsi unit test case + @ *2015-05-07 19:00:28 UTC* + + * 865127844a Merge pull request `#23450`_ from jayeshka/scsi-unit-test + + * e7269ff29b adding scsi unit test case + +* **PR** `#23449`_: (`jayeshka`_) adding s3 unit test case + @ *2015-05-07 18:59:45 UTC* + + * 8b374ae64d Merge pull request `#23449`_ from jayeshka/s3-unit-test + + * 85786bfe7f adding s3 unit test case + +* **PR** `#23448`_: (`jayeshka`_) adding states/keystone unit test case + @ *2015-05-07 18:58:59 UTC* + + * 49b431c8e4 Merge pull request `#23448`_ from jayeshka/keystone-states-unit-test + + * a3050eb3e2 adding states/keystone unit test case + +* **PR** `#23447`_: (`jayeshka`_) adding states/grafana unit test case + @ *2015-05-07 18:58:20 UTC* + + * 23d7e7ef92 Merge pull request `#23447`_ from jayeshka/grafana-states-unit-test + + * 7e90a4aaca adding states/grafana unit test case + +* **PR** `#23438`_: (`techhat`_) Gate requests import + @ *2015-05-07 07:22:58 UTC* + + * 1fd0bc2011 Merge pull request `#23438`_ from techhat/gaterequests + + * d5b15fc6ce Gate requests import + +* **PR** `#23429`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-05-07 05:35:13 UTC* + + * 3c4f734332 Merge pull request `#23429`_ from basepi/merge-forward-2015.5 + + * 7729834d92 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * 644eb75fec Merge pull request `#23422`_ from cro/gce_sh_home + + * 4ef9e6ba06 Don't use $HOME to find user's directory, some shells don't set it + + * ef17ab4b2a Merge pull request `#23425`_ from basepi/functionwrapper_typo + + * c390737f3e Fix typo in FunctionWrapper + + * 1b13ec04c2 Merge pull request `#23385`_ from rallytime/bp-23346 + + * 9efc13c810 more linting fixes + + * cf131c9a5a cleaned up some pylint errors + + * f981699c75 added logic to sftp_file and file_map to allow folder uploads using file_map + + * f8c7a62089 Merge pull request `#23414`_ from jfindlay/update_branch + + * 8074d16d52 2015.2 -> 2015.5 + + * 54b3bd43e4 Merge pull request `#23404`_ from hvnsweeting/cherrypy-post-emptybody-fix + + * f85f8f954c initialize var when POST body is empty + + * 160f703296 Merge pull request `#23409`_ from terminalmage/update-lithium-docstrings-2014.7 + + * bc97d011ba Fix sphinx typo + + * 20006b06f6 Update Lithium docstrings in 2014.7 branch + + * aa5fb0aa46 Merge pull request `#23397`_ from jfindlay/fix_locale_gen + + * 0941fefd2b add more flexible whitespace to locale_gen search + +* **PR** `#23396`_: (`basepi`_) [2015.2] Merge forward from 2014.7 to 2015.2 + @ *2015-05-06 21:42:35 UTC* + + * 1fb84450f4 Merge pull request `#23396`_ from basepi/merge-forward-2015.2 + + * 2766c8cb4b Fix typo in FunctionWrapper + + * fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 + + * 0c76dd4d8a Merge pull request `#23368`_ from kaithar/bp-23367 + + * 577f41972e Pylint fix + + * 8d9acd1f89 Put the sed insert statement back in to the output. + + * 3493cc1fca Merge pull request `#23350`_ from lorengordon/file.replace_assume_line + + * b60e224beb Append/prepend: search for full line + + * 7be5c48ad5 Merge pull request `#23341`_ from cachedout/issue_23026 + + * e98e65e787 Fix tests + + * 6011b437ca Fix syndic pid and logfile path + + * ea61abfa68 Merge pull request `#23272`_ from basepi/salt-ssh.minion.config.19114 + + * c223309bb7 Add versionadded + + * be7407feae Lint + + * c2c337567e Missing comma + + * 8e3e8e073a Pass the minion_opts through the FunctionWrapper + + * cb69cd07de Match the master config template in the master config reference + + * 87fc3161f9 Add Salt-SSH section to master config template + + * 91dd9dcbdc Add ssh_minion_opts to master config ref + + * c273ea14c6 Add minion config to salt-ssh doc + + * a0b6b760c3 Add minion_opts to roster docs + + * 5212c35260 Accept minion_opts from the target information + + * e2099b6e1b Process `ssh_minion_opts` from master config + + * 3b64214377 Revert "Work around bug in salt-ssh in config.get for gpg renderer" + + * 494953a208 Remove the strip (embracing multi-line YAML dump) + + * fe87f0fe39 Dump multi-line yaml into the SHIM + + * b751a7281c Inject local minion config into shim if available + + * 4f760dd9cb Merge pull request `#23347`_ from basepi/salt-ssh.functionwrapper.contains.19114 + + * 30595e3ff7 Backport FunctionWrapper.__contains__ + + * 02658b1e60 Merge pull request `#23344`_ from cachedout/issue_22742 + + * 5adc96ce7f Explicitely set file_client on master + + * ba7605d1cb Merge pull request `#23318`_ from cellscape/honor-seed-argument + + * 228b1be299 Honor seed argument in LXC container initializaton + + * 4ac4509c57 Merge pull request `#23307`_ from jfindlay/fix_locale_gen + + * 101199ac14 check for /etc/locale.gen + + * f790f42ed6 Merge pull request `#23324`_ from s0undt3ch/hotfix/bootstrap-script-2014.7 + + * 6643e47ce5 Update to the latest stable release of the bootstrap script v2015.05.04 + +* **PR** `#23412`_: (`rahulhan`_) Adding states/win_update.py unit tests + @ *2015-05-06 18:31:09 UTC* + + * b3c16720f6 Merge pull request `#23412`_ from rahulhan/states_win_update_unit_test + + * 9bc1519ee7 Removed unwanted imports + + * f12bfcf248 Adding states/win_update.py unit tests + +* **PR** `#23413`_: (`terminalmage`_) Update manpages for 2015.2 -> 2015.5 + @ *2015-05-06 17:12:57 UTC* + + * f2d7646a58 Merge pull request `#23413`_ from terminalmage/update-manpages + + * 23fa4402dc Update manpages to reflect 2015.2 rename to 2015.5 + + * 0fdaa73c84 Fix missed docstring updates from 2015.2 -> 2015.5 + + * 4fea5ba477 Add missing RST file + +* **PR** `#23410`_: (`terminalmage`_) Update Lithium docstrings in 2015.2 branch + @ *2015-05-06 15:53:52 UTC* + + * **PR** `#23409`_: (`terminalmage`_) Update Lithium docstrings in 2014.7 branch (refs: `#23410`_) + + * bafbea7bc7 Merge pull request `#23410`_ from terminalmage/update-lithium-docstrings-2015.2 + + * d395565bf7 Update Lithium docstrings in 2015.2 branch + +* **PR** `#23407`_: (`jayeshka`_) adding rsync unit test case + @ *2015-05-06 15:52:23 UTC* + + * 02ef41a549 Merge pull request `#23407`_ from jayeshka/rsync-unit-test + + * a4dd836125 adding rsync unit test case + +* **PR** `#23406`_: (`jayeshka`_) adding states/lxc unit test case + @ *2015-05-06 15:51:50 UTC* + + * 58ec2a24c1 Merge pull request `#23406`_ from jayeshka/lxc-states-unit-test + + * 32a0d03093 adding states/lxc unit test case + +* **PR** `#23395`_: (`basepi`_) [2015.2] Add note to 2015.2.0 release notes about master opts in pillar + @ *2015-05-05 22:15:20 UTC* + + * 8837d0038e Merge pull request `#23395`_ from basepi/2015.2.0masteropts + + * b261c95cd6 Add note to 2015.2.0 release notes about master opts in pillar + +* **PR** `#23393`_: (`basepi`_) [2015.2] Add warning about python_shell changes to 2015.2.0 release notes + @ *2015-05-05 22:12:46 UTC* + + * f79aed5fe1 Merge pull request `#23393`_ from basepi/2015.2.0python_shell + + * b2f033f485 Add CLI note + + * 48e7b3ee4f Add warning about python_shell changes to 2015.2.0 release notes + +* **PR** `#23380`_: (`gladiatr72`_) Fix for double output with static salt cli/v2015.2 + @ *2015-05-05 21:44:28 UTC* + + * a9777761d8 Merge pull request `#23380`_ from gladiatr72/fix_for_double_output_with_static__salt_CLI/v2015.2 + + * c47fdd79c7 Actually removed the ``static`` bits from below the else: fold this time. + + * 4ee367956c Fix for incorrect output with salt CLI --static option + +* **PR** `#23379`_: (`rahulhan`_) Adding states/rabbitmq_cluster.py + @ *2015-05-05 21:44:06 UTC* + + * 5c9543c1d2 Merge pull request `#23379`_ from rahulhan/states_rabbitmq_cluster_test + + * 04c22d1acf Adding states/rabbitmq_cluster.py + +* **PR** `#23377`_: (`rahulhan`_) Adding states/xmpp.py unit tests + @ *2015-05-05 21:43:35 UTC* + + * 430f080a3a Merge pull request `#23377`_ from rahulhan/states_xmpp_test + + * 32923b53c3 Adding states/xmpp.py unit tests + +* **PR** `#23335`_: (`steverweber`_) 2015.2: include doc in master config for module_dirs + @ *2015-05-05 21:28:58 UTC* + + * 8c057e6794 Merge pull request `#23335`_ from steverweber/2015.2 + + * 5e3bae95d8 help installing python pysphere lib + + * 97513b060a include module_dirs + + * 36b1c87dd2 include module_dirs + +* **PR** `#23362`_: (`jayeshka`_) adding states/zk_concurrency unit test case + @ *2015-05-05 15:50:06 UTC* + + * 1648253675 Merge pull request `#23362`_ from jayeshka/zk_concurrency-states-unit-test + + * f60dda4b1d adding states/zk_concurrency unit test case + +* **PR** `#23363`_: (`jayeshka`_) adding riak unit test case + @ *2015-05-05 14:23:05 UTC* + + * 1cdaeed868 Merge pull request `#23363`_ from jayeshka/riak-unit-test + + * f9da6db459 adding riak unit test case .. _`#16424`: https://github.com/saltstack/salt/issues/16424 -.. _`#17245`: https://github.com/saltstack/salt/issues/17245 -.. _`#18368`: https://github.com/saltstack/salt/pull/18368 -.. _`#19114`: https://github.com/saltstack/salt/issues/19114 .. _`#19304`: https://github.com/saltstack/salt/issues/19304 .. _`#19305`: https://github.com/saltstack/salt/pull/19305 .. _`#19852`: https://github.com/saltstack/salt/issues/19852 -.. _`#20198`: https://github.com/saltstack/salt/issues/20198 -.. _`#20518`: https://github.com/saltstack/salt/issues/20518 .. _`#21355`: https://github.com/saltstack/salt/pull/21355 -.. _`#21469`: https://github.com/saltstack/salt/pull/21469 -.. _`#21487`: https://github.com/saltstack/salt/pull/21487 .. _`#21603`: https://github.com/saltstack/salt/issues/21603 .. _`#22114`: https://github.com/saltstack/salt/pull/22114 -.. _`#22131`: https://github.com/saltstack/salt/issues/22131 -.. _`#22141`: https://github.com/saltstack/salt/issues/22141 -.. _`#22332`: https://github.com/saltstack/salt/issues/22332 -.. _`#22742`: https://github.com/saltstack/salt/issues/22742 -.. _`#22908`: https://github.com/saltstack/salt/issues/22908 .. _`#22959`: https://github.com/saltstack/salt/issues/22959 -.. _`#23004`: https://github.com/saltstack/salt/issues/23004 -.. _`#23026`: https://github.com/saltstack/salt/issues/23026 .. _`#23110`: https://github.com/saltstack/salt/issues/23110 .. _`#23159`: https://github.com/saltstack/salt/issues/23159 -.. _`#23188`: https://github.com/saltstack/salt/pull/23188 -.. _`#23244`: https://github.com/saltstack/salt/issues/23244 .. _`#23245`: https://github.com/saltstack/salt/pull/23245 .. _`#23272`: https://github.com/saltstack/salt/pull/23272 -.. _`#23294`: https://github.com/saltstack/salt/issues/23294 .. _`#23307`: https://github.com/saltstack/salt/pull/23307 -.. _`#23311`: https://github.com/saltstack/salt/pull/23311 .. _`#23318`: https://github.com/saltstack/salt/pull/23318 .. _`#23324`: https://github.com/saltstack/salt/pull/23324 .. _`#23335`: https://github.com/saltstack/salt/pull/23335 .. _`#23341`: https://github.com/saltstack/salt/pull/23341 .. _`#23344`: https://github.com/saltstack/salt/pull/23344 -.. _`#23346`: https://github.com/saltstack/salt/pull/23346 .. _`#23347`: https://github.com/saltstack/salt/pull/23347 .. _`#23350`: https://github.com/saltstack/salt/pull/23350 -.. _`#23355`: https://github.com/saltstack/salt/issues/23355 .. _`#23362`: https://github.com/saltstack/salt/pull/23362 .. _`#23363`: https://github.com/saltstack/salt/pull/23363 -.. _`#23367`: https://github.com/saltstack/salt/pull/23367 .. _`#23368`: https://github.com/saltstack/salt/pull/23368 .. _`#23373`: https://github.com/saltstack/salt/issues/23373 .. _`#23377`: https://github.com/saltstack/salt/pull/23377 .. _`#23379`: https://github.com/saltstack/salt/pull/23379 .. _`#23380`: https://github.com/saltstack/salt/pull/23380 .. _`#23385`: https://github.com/saltstack/salt/pull/23385 -.. _`#23389`: https://github.com/saltstack/salt/pull/23389 .. _`#23393`: https://github.com/saltstack/salt/pull/23393 .. _`#23395`: https://github.com/saltstack/salt/pull/23395 .. _`#23396`: https://github.com/saltstack/salt/pull/23396 .. _`#23397`: https://github.com/saltstack/salt/pull/23397 -.. _`#23403`: https://github.com/saltstack/salt/issues/23403 .. _`#23404`: https://github.com/saltstack/salt/pull/23404 .. _`#23406`: https://github.com/saltstack/salt/pull/23406 .. _`#23407`: https://github.com/saltstack/salt/pull/23407 @@ -1740,17 +1722,13 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23429`: https://github.com/saltstack/salt/pull/23429 .. _`#23431`: https://github.com/saltstack/salt/pull/23431 .. _`#23433`: https://github.com/saltstack/salt/pull/23433 -.. _`#23437`: https://github.com/saltstack/salt/pull/23437 .. _`#23438`: https://github.com/saltstack/salt/pull/23438 .. _`#23439`: https://github.com/saltstack/salt/pull/23439 -.. _`#23440`: https://github.com/saltstack/salt/pull/23440 -.. _`#23442`: https://github.com/saltstack/salt/pull/23442 .. _`#23444`: https://github.com/saltstack/salt/pull/23444 .. _`#23447`: https://github.com/saltstack/salt/pull/23447 .. _`#23448`: https://github.com/saltstack/salt/pull/23448 .. _`#23449`: https://github.com/saltstack/salt/pull/23449 .. _`#23450`: https://github.com/saltstack/salt/pull/23450 -.. _`#23452`: https://github.com/saltstack/salt/issues/23452 .. _`#23460`: https://github.com/saltstack/salt/pull/23460 .. _`#23461`: https://github.com/saltstack/salt/pull/23461 .. _`#23466`: https://github.com/saltstack/salt/pull/23466 @@ -1763,7 +1741,6 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23474`: https://github.com/saltstack/salt/pull/23474 .. _`#23476`: https://github.com/saltstack/salt/pull/23476 .. _`#23477`: https://github.com/saltstack/salt/pull/23477 -.. _`#23479`: https://github.com/saltstack/salt/issues/23479 .. _`#23488`: https://github.com/saltstack/salt/pull/23488 .. _`#23490`: https://github.com/saltstack/salt/issues/23490 .. _`#23491`: https://github.com/saltstack/salt/pull/23491 @@ -1771,7 +1748,6 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23493`: https://github.com/saltstack/salt/pull/23493 .. _`#23494`: https://github.com/saltstack/salt/pull/23494 .. _`#23495`: https://github.com/saltstack/salt/pull/23495 -.. _`#23496`: https://github.com/saltstack/salt/pull/23496 .. _`#23502`: https://github.com/saltstack/salt/pull/23502 .. _`#23505`: https://github.com/saltstack/salt/pull/23505 .. _`#23508`: https://github.com/saltstack/salt/pull/23508 @@ -1789,8 +1765,6 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23539`: https://github.com/saltstack/salt/pull/23539 .. _`#23544`: https://github.com/saltstack/salt/pull/23544 .. _`#23547`: https://github.com/saltstack/salt/pull/23547 -.. _`#23548`: https://github.com/saltstack/salt/issues/23548 -.. _`#23549`: https://github.com/saltstack/salt/pull/23549 .. _`#23550`: https://github.com/saltstack/salt/pull/23550 .. _`#23551`: https://github.com/saltstack/salt/pull/23551 .. _`#23552`: https://github.com/saltstack/salt/pull/23552 @@ -1820,10 +1794,8 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23603`: https://github.com/saltstack/salt/pull/23603 .. _`#23604`: https://github.com/saltstack/salt/issues/23604 .. _`#23606`: https://github.com/saltstack/salt/pull/23606 -.. _`#23607`: https://github.com/saltstack/salt/pull/23607 .. _`#23608`: https://github.com/saltstack/salt/issues/23608 .. _`#23609`: https://github.com/saltstack/salt/pull/23609 -.. _`#23611`: https://github.com/saltstack/salt/issues/23611 .. _`#23615`: https://github.com/saltstack/salt/pull/23615 .. _`#23616`: https://github.com/saltstack/salt/pull/23616 .. _`#23619`: https://github.com/saltstack/salt/pull/23619 @@ -1831,7 +1803,6 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23633`: https://github.com/saltstack/salt/pull/23633 .. _`#23637`: https://github.com/saltstack/salt/pull/23637 .. _`#23639`: https://github.com/saltstack/salt/pull/23639 -.. _`#23640`: https://github.com/saltstack/salt/pull/23640 .. _`#23642`: https://github.com/saltstack/salt/pull/23642 .. _`#23648`: https://github.com/saltstack/salt/pull/23648 .. _`#23649`: https://github.com/saltstack/salt/pull/23649 @@ -1867,7 +1838,6 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23724`: https://github.com/saltstack/salt/pull/23724 .. _`#23725`: https://github.com/saltstack/salt/pull/23725 .. _`#23727`: https://github.com/saltstack/salt/pull/23727 -.. _`#23729`: https://github.com/saltstack/salt/pull/23729 .. _`#23730`: https://github.com/saltstack/salt/pull/23730 .. _`#23731`: https://github.com/saltstack/salt/pull/23731 .. _`#23734`: https://github.com/saltstack/salt/issues/23734 @@ -1876,7 +1846,6 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23740`: https://github.com/saltstack/salt/pull/23740 .. _`#23748`: https://github.com/saltstack/salt/pull/23748 .. _`#23751`: https://github.com/saltstack/salt/pull/23751 -.. _`#23757`: https://github.com/saltstack/salt/pull/23757 .. _`#23759`: https://github.com/saltstack/salt/pull/23759 .. _`#23760`: https://github.com/saltstack/salt/pull/23760 .. _`#23765`: https://github.com/saltstack/salt/pull/23765 @@ -1902,7 +1871,6 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23812`: https://github.com/saltstack/salt/pull/23812 .. _`#23815`: https://github.com/saltstack/salt/issues/23815 .. _`#23816`: https://github.com/saltstack/salt/pull/23816 -.. _`#23820`: https://github.com/saltstack/salt/issues/23820 .. _`#23823`: https://github.com/saltstack/salt/pull/23823 .. _`#23829`: https://github.com/saltstack/salt/pull/23829 .. _`#23832`: https://github.com/saltstack/salt/pull/23832 @@ -1912,7 +1880,6 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23839`: https://github.com/saltstack/salt/issues/23839 .. _`#23843`: https://github.com/saltstack/salt/pull/23843 .. _`#23847`: https://github.com/saltstack/salt/issues/23847 -.. _`#23848`: https://github.com/saltstack/salt/pull/23848 .. _`#23850`: https://github.com/saltstack/salt/pull/23850 .. _`#23859`: https://github.com/saltstack/salt/pull/23859 .. _`#23860`: https://github.com/saltstack/salt/pull/23860 @@ -1970,40 +1937,68 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23986`: https://github.com/saltstack/salt/pull/23986 .. _`#23988`: https://github.com/saltstack/salt/pull/23988 .. _`#23989`: https://github.com/saltstack/salt/pull/23989 -.. _`#504`: https://github.com/saltstack/salt/pull/504 -.. _`#552`: https://github.com/saltstack/salt/issues/552 -.. _`#560`: https://github.com/saltstack/salt/pull/560 -.. _`#563`: https://github.com/saltstack/salt/issues/563 -.. _`#567`: https://github.com/saltstack/salt/pull/567 -.. _`#580`: https://github.com/saltstack/salt/issues/580 -.. _`#589`: https://github.com/saltstack/salt/pull/589 -.. _`bp-19305`: https://github.com/saltstack/salt/pull/19305 -.. _`bp-22114`: https://github.com/saltstack/salt/pull/22114 -.. _`bp-23346`: https://github.com/saltstack/salt/pull/23346 -.. _`bp-23367`: https://github.com/saltstack/salt/pull/23367 -.. _`bp-23389`: https://github.com/saltstack/salt/pull/23389 -.. _`bp-23424`: https://github.com/saltstack/salt/pull/23424 -.. _`bp-23442`: https://github.com/saltstack/salt/pull/23442 -.. _`bp-23472`: https://github.com/saltstack/salt/pull/23472 -.. _`bp-23496`: https://github.com/saltstack/salt/pull/23496 -.. _`bp-23549`: https://github.com/saltstack/salt/pull/23549 -.. _`bp-23568`: https://github.com/saltstack/salt/pull/23568 -.. _`bp-23577`: https://github.com/saltstack/salt/pull/23577 -.. _`bp-23586`: https://github.com/saltstack/salt/pull/23586 -.. _`bp-23607`: https://github.com/saltstack/salt/pull/23607 -.. _`bp-23609`: https://github.com/saltstack/salt/pull/23609 -.. _`bp-23691`: https://github.com/saltstack/salt/pull/23691 -.. _`bp-23729`: https://github.com/saltstack/salt/pull/23729 -.. _`bp-23737`: https://github.com/saltstack/salt/pull/23737 -.. _`bp-23757`: https://github.com/saltstack/salt/pull/23757 -.. _`bp-23786`: https://github.com/saltstack/salt/pull/23786 -.. _`bp-23790`: https://github.com/saltstack/salt/pull/23790 -.. _`bp-23838`: https://github.com/saltstack/salt/pull/23838 -.. _`bp-23848`: https://github.com/saltstack/salt/pull/23848 -.. _`bp-23880`: https://github.com/saltstack/salt/pull/23880 -.. _`bp-23906`: https://github.com/saltstack/salt/pull/23906 -.. _`bp-23908`: https://github.com/saltstack/salt/pull/23908 -.. _`bp-23944`: https://github.com/saltstack/salt/pull/23944 -.. _`bp-23951`: https://github.com/saltstack/salt/pull/23951 -.. _`bp-23977`: https://github.com/saltstack/salt/pull/23977 -.. _`bp-23980`: https://github.com/saltstack/salt/pull/23980 +.. _`#23998`: https://github.com/saltstack/salt/pull/23998 +.. _`#529`: https://github.com/saltstack/salt/issues/529 +.. _`#543`: https://github.com/saltstack/salt/pull/543 +.. _`Arabus`: https://github.com/Arabus +.. _`Lothiraldan`: https://github.com/Lothiraldan +.. _`Snergster`: https://github.com/Snergster +.. _`TaiSHiNet`: https://github.com/TaiSHiNet +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`UtahDave`: https://github.com/UtahDave +.. _`aboe76`: https://github.com/aboe76 +.. _`ahus1`: https://github.com/ahus1 +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`basepi`: https://github.com/basepi +.. _`bastiaanb`: https://github.com/bastiaanb +.. _`bradthurber`: https://github.com/bradthurber +.. _`cachedout`: https://github.com/cachedout +.. _`cellscape`: https://github.com/cellscape +.. _`cheuschober`: https://github.com/cheuschober +.. _`chrimi`: https://github.com/chrimi +.. _`chrish42`: https://github.com/chrish42 +.. _`corywright`: https://github.com/corywright +.. _`cro`: https://github.com/cro +.. _`dennisjac`: https://github.com/dennisjac +.. _`dmyerscough`: https://github.com/dmyerscough +.. _`galet`: https://github.com/galet +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gladiatr72`: https://github.com/gladiatr72 +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`hashi825`: https://github.com/hashi825 +.. _`iggy`: https://github.com/iggy +.. _`ionutbalutoiu`: https://github.com/ionutbalutoiu +.. _`ipmb`: https://github.com/ipmb +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jayeshka`: https://github.com/jayeshka +.. _`jfindlay`: https://github.com/jfindlay +.. _`joejulian`: https://github.com/joejulian +.. _`jpic`: https://github.com/jpic +.. _`justinta`: https://github.com/justinta +.. _`kaidokert`: https://github.com/kaidokert +.. _`kaithar`: https://github.com/kaithar +.. _`kiorky`: https://github.com/kiorky +.. _`lichtamberg`: https://github.com/lichtamberg +.. _`lisa2lisa`: https://github.com/lisa2lisa +.. _`mbrgm`: https://github.com/mbrgm +.. _`mostafahussein`: https://github.com/mostafahussein +.. _`msciciel`: https://github.com/msciciel +.. _`neogenix`: https://github.com/neogenix +.. _`nleib`: https://github.com/nleib +.. _`notpeter`: https://github.com/notpeter +.. _`optix2000`: https://github.com/optix2000 +.. _`rahulhan`: https://github.com/rahulhan +.. _`rallytime`: https://github.com/rallytime +.. _`rks2286`: https://github.com/rks2286 +.. _`rubic`: https://github.com/rubic +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack/salt-bootstrap#563`: https://github.com/saltstack/salt-bootstrap/pull/563 +.. _`slinu3d`: https://github.com/slinu3d +.. _`steverweber`: https://github.com/steverweber +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`ticosax`: https://github.com/ticosax +.. _`tnypex`: https://github.com/tnypex +.. _`twangboy`: https://github.com/twangboy +.. _`whiteinge`: https://github.com/whiteinge diff --git a/doc/topics/releases/2015.5.10.rst b/doc/topics/releases/2015.5.10.rst index a6f158d9c9..c50873d322 100644 --- a/doc/topics/releases/2015.5.10.rst +++ b/doc/topics/releases/2015.5.10.rst @@ -2,10 +2,15 @@ Salt 2015.5.10 Release Notes ============================ +:release: 2015-03-22 + +Version 2015.5.10 is a bugfix release for :ref:`2015.5.0 `. + + Security Fix ============ -CVE-2016-3176: Insecure configuration of PAM external authentication service +**CVE-2016-3176** Insecure configuration of PAM external authentication service This issue affects all Salt versions prior to 2015.8.8/2015.5.10 when PAM :ref:`external authentication ` is enabled. This issue involves @@ -17,7 +22,7 @@ for bringing this issue to our attention. This update defines the PAM eAuth ``service`` that users authenticate against in the Salt Master configuration. -(No additional fixes are contained in this release). +No additional fixes are included in this release. Read Before Upgrading Debian 8 (Jessie) from Salt Versions Earlier than 2015.5.9 ================================================================================ @@ -32,3 +37,10 @@ Salt ``systemd`` service files are missing the following statement in these vers This statement must be added to successfully upgrade on these earlier versions of Salt. + +Changelog for v2015.5.9..v2015.5.10 +=================================== + +*Generated at: 2018-05-27 22:39:26 UTC* + +* 69ba1de71d Remove ability of authenticating user to specify pam service diff --git a/doc/topics/releases/2015.5.11.rst b/doc/topics/releases/2015.5.11.rst index fb639f3813..899a2909c5 100644 --- a/doc/topics/releases/2015.5.11.rst +++ b/doc/topics/releases/2015.5.11.rst @@ -2,310 +2,1208 @@ Salt 2015.5.11 Release Notes ============================ -Version 2015.5.11 is a bugfix release for :ref:`2015.5.0`. +:release: 2015-07-22 -Changes for v2015.5.10..v2015.5.11 ----------------------------------- +Version 2015.5.11 is a bugfix release for :ref:`2015.5.0 `. -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): -*Generated at: 2016-05-20T21:02:38Z* +Statistics +========== -Total Merges: **101** +- Total Merges: **101** +- Total Issue References: **73** +- Total PR References: **162** -Changes: +- Contributors: **46** (`AndrewPashkin`_, `Ch3LL`_, `DmitryKuzmenko`_, `TheNullByte`_, `UtahDave`_, `abednarik`_, `amontalban`_, `anlutro`_, `attiasr`_, `basepi`_, `borgstrom`_, `brejoc`_, `bstevenson`_, `cachedout`_, `carlwgeorge`_, `efficks`_, `gerhardqux`_, `gtmanfred`_, `heyfife`_, `jacobhammons`_, `jfindlay`_, `justinta`_, `lomeroe`_, `lorengordon`_, `mtorromeo`_, `nmadhok`_, `notpeter`_, `paclat`_, `pcn`_, `phistrom`_, `rallytime`_, `robgott`_, `sacren`_, `sastorsl`_, `serge-p`_, `sjmh`_, `sjorge`_, `techhat`_, `terminalmage`_, `thatch45`_, `thegoodduke`_, `toanju`_, `tomwalsh`_, `twangboy`_, `whiteinge`_, `yannis666`_) -* dc8ce2d Fix traceback in logging for config validation (`#33386`_) (`#33405`_) -- **PR** `#33383`_: (*thatch45*) maintain the fallabck because I am totally sick of this crap +Changelog for v2015.5.10..v2015.5.11 +==================================== -* 755acfb Improve doc clarity for disable_modules documentation (`#33379`_) +*Generated at: 2018-05-27 22:41:56 UTC* -* 2b5ad12 Better YAML syntax error handling (`#33375`_) +* **PR** `#33412`_: (`jfindlay`_) update 2015.5.11 release notes -- **PR** `#33372`_: (*jacobhammons*) revved 2015.8 branch to .9 in version selector +* **PR** `#33405`_: (`rallytime`_) Back-port `#33386`_ to 2015.5 -* 55be0ab Expanded documentation for boto_elb state and module (`#33341`_) +* **PR** `#33386`_: (`terminalmage`_) Fix traceback in logging for config validation (refs: `#33405`_) -* 9b42a05 Added some more docs for master and minion config settings (`#33292`_) +* **ISSUE** `#33376`_: (`tmehlinger`_) pip state broken in 2015.8.9 with pip <6.0 (refs: `#33383`_) -* 8acee5e Fix iptables --match-set (`#23643`_) (`#33301`_) +* **PR** `#33383`_: (`thatch45`_) maintain the fallabck because I am totally sick of this crap + @ *2016-05-20 00:03:59 UTC* -* 757ef20 fix "loose" typo (`#33290`_) + * d15f5e2cef Merge pull request `#33383`_ from thatch45/2015.5 -* b7d98da Add auth_tries config option to minion.rst docs (`#33287`_) + * f5ebcba21c restore whitespace -* 061851b Document minion_id_caching config value (`#33282`_) + * 1d8b289db1 blast, put the try/except int he right place -* 8fa72f6 Clarify file.replace MULTILINE flag interaction with regex anchors (`#33137`_) + * 081e6c5b83 maintain the fallabck because I am totally sick of this crap -* 4b1f460 update 2015.5.11 release notes (`#33236`_) + * **PR** `#33379`_: (`cachedout`_) Improve doc clarity for disable_modules documentation -- **PR** `#33211`_: (*cachedout*) Don't try to kill a parent proc if we can't +* **ISSUE** `#26574`_: (`jfindlay`_) minion stacktrace on top file yaml syntax error (refs: `#33375`_) -* f868329 Resolve issue with pkg module on Mint Linux (`#33205`_) + * **PR** `#33375`_: (`cachedout`_) Better YAML syntax error handling -* a09e1b6 Add pip installed and removed test (`#33178`_) +* **PR** `#33372`_: (`jacobhammons`_) revved 2015.8 branch to .9 in version selector + @ *2016-05-19 20:05:35 UTC* -* 96e3586 update 2015.5.11 release notes (`#33197`_) + * bb3e98cad2 Merge pull request `#33372`_ from jacobhammons/release-update -* 09b072a Fix file.managed for Windows (`#33181`_) + * 5ce502160b revved 2015.8 branch to .9 in version selector -* 30868ab [2015.5] Update to latest bootstrap script v2016.05.11 (`#33185`_) + * **PR** `#33341`_: (`phistrom`_) Expanded documentation for boto_elb state and module -* 264ad34 Pip fix (`#33180`_) +* **ISSUE** `#32400`_: (`rallytime`_) Document Default Config Values (refs: `#33286`_, `#33292`_, `#32538`_, `#33287`_, `#32454`_, `#33282`_) -* 43288b2 add 2015.5.11 release notes (`#33160`_) + * **PR** `#33292`_: (`rallytime`_) Added some more docs for master and minion config settings -* e0da8fd [2015.5] Update to latest bootstrap script v2016.05.10 (`#33155`_) +* **ISSUE** `#23643`_: (`falzm`_) Error in iptables module: argument --match-set: expected 2 argument(s) (refs: `#33301`_) -- **PR** `#33141`_: (*jtand*) Skipping salt-call --local test + * **PR** `#33301`_: (`gerhardqux`_) Fix iptables --match-set (`#23643`_) -* 878d34a Doc mock decorators (`#33132`_) + * **PR** `#33290`_: (`UtahDave`_) fix "loose" typo -* 30edead Lower display of msgpack failure msg to debug (`#33078`_) +* **ISSUE** `#32400`_: (`rallytime`_) Document Default Config Values (refs: `#33286`_, `#33292`_, `#32538`_, `#33287`_, `#32454`_, `#33282`_) -* d4928c5 Use saltstack repo in buildpackage.py on CentOS 5 (`#33080`_) + * **PR** `#33287`_: (`rallytime`_) Add auth_tries config option to minion.rst docs -* 61d126c add test for installing package while using salt-call --local (`#33025`_) + * **PR** `#33286`_: (`rallytime`_) Document new master and minion config opts for 2016.3.0 (refs: `#33287`_) -* 6d3e4e8 File and User test fixes for 2015.5 on Fedora23 (`#33055`_) +* **ISSUE** `#33276`_: (`sjmh`_) minion_id_caching has no documentation (refs: `#33282`_) -* d48b2b8 test pillar.items output (`#33060`_) +* **ISSUE** `#32400`_: (`rallytime`_) Document Default Config Values (refs: `#33286`_, `#33292`_, `#32538`_, `#33287`_, `#32454`_, `#33282`_) -* 398793b Fix minor document error of test.assertion (`#33067`_) + * **PR** `#33282`_: (`rallytime`_) Document minion_id_caching config value -* f875763 Saltfile with pillar tests (`#33045`_) +* **ISSUE** `#33118`_: (`saltuser`_) file.replace not working correctly on newer minions (refs: `#33137`_) -* 1d78924 Backport `#33021`_ manually to 2015.5 (`#33044`_) + * **PR** `#33137`_: (`lorengordon`_) Clarify file.replace MULTILINE flag interaction with regex anchors -* f00b5f9 Add run_on_start docs to schedule.rst (`#32958`_) + * **PR** `#33236`_: (`jfindlay`_) update 2015.5.11 release notes -* edce22a backport PR `#32732`_ to 2015.5 fixes `#23714`_ (`#32848`_) +* **ISSUE** `#32250`_: (`ikryten`_) Cannot run salt-minion as unprivileged user using 'user' directive (refs: `#33211`_) -* 9b5c14c `salt-cloud -u` downloads stable version from bootstrap.saltstack.com by default (`#32837`_) +* **PR** `#33211`_: (`cachedout`_) Don't try to kill a parent proc if we can't + @ *2016-05-12 21:29:50 UTC* -* 9725804 update bootstrap to 2016.04.18 release (`#32667`_) + * 698f1eb657 Merge pull request `#33211`_ from cachedout/user_kill -- **PR** `#32776`_: (*rallytime*) [2015.5] Merge forward from 2014.7 to 2015.5 + * d4f2e5baa7 Don't try to kill a parent proc if we can't -* 67d0c81 Support remote sources in a source list (`#32691`_) +* **ISSUE** `#32198`_: (`goatjam`_) State 'pkg.installed' was not found in SLS (refs: `#33205`_) -- **PR** `#32686`_: (*cachedout*) Fix stacktrace in batch with dup minion ids + * **PR** `#33205`_: (`cachedout`_) Resolve issue with pkg module on Mint Linux -* 3ec9502 Update "Low Hanging Fruit" to "Help Wanted" (`#32675`_) + * **PR** `#33178`_: (`justinta`_) Add pip installed and removed test -* 77bea56 Additional documentation on calling exec modules from templates (`#32657`_) + * **PR** `#33197`_: (`jfindlay`_) update 2015.5.11 release notes -* c910b8d Fixing critical bug to remove only the specified Host instead of the entire Host cluster (`#32639`_) + * **PR** `#33181`_: (`twangboy`_) Fix file.managed for Windows -* 4568565 Add _syspaths.py to .gitignore (`#32638`_) + * **PR** `#33185`_: (`rallytime`_) [2015.5] Update to latest bootstrap script v2016.05.11 -- **PR** `#32561`_: (*gtmanfred*) redact passwords and hashes from user.present updates +* **ISSUE** `#33163`_: (`jaybocc2`_) Salt 2015.8.5 incompatible with Pip v8.1.2 (refs: `#33180`_) -- **PR** `#32538`_: (*rallytime*) Back-port `#32528`_ to 2015.5 + * **PR** `#33180`_: (`thatch45`_) Pip fix -* 29333e5 Add documentation for some master/minion configs (`#32454`_) + * **PR** `#33160`_: (`jfindlay`_) add 2015.5.11 release notes -- **PR** `#32458`_: (*terminalmage*) Improve and clarify docs on provider overrides. + * **PR** `#33155`_: (`rallytime`_) [2015.5] Update to latest bootstrap script v2016.05.10 -* 0809126 Merge `#32293`_ with test fixes (`#32418`_) +* **PR** `#33141`_: (`justinta`_) Skipping salt-call --local test + @ *2016-05-10 17:05:17 UTC* -* bbd8260 Ignore Raspbian in service.py __virtual__ (`#32421`_) + * 6cd1641840 Merge pull request `#33141`_ from jtand/disable_local_pkg_install_test -* 690addf FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check ``freebsd/pkg#1409`` for more info. + * 8b1e34fb17 Skipping salt-call --local test -- **PR** `#32399`_: (*amontalban*) Backport to fix `#28262`_ for 2015.5 as requested in PR `#32376`_ +* **ISSUE** `#33085`_: (`fmnisme`_) salt doc err (refs: `#33132`_) -- **PR** `#32374`_: (*cachedout*) Update proxmox documentation + * **PR** `#33132`_: (`whiteinge`_) Doc mock decorators -- **PR** `#32339`_: (*Ch3LL*) remove reference to master_alive_check in 2015.5 +* **ISSUE** `#33074`_: (`robnagler`_) Critical error in msgpack exposes pillar data (refs: `#33078`_) -- **PR** `#32284`_: (*rallytime*) Audit config.py default types and values + * **PR** `#33078`_: (`cachedout`_) Lower display of msgpack failure msg to debug -- **PR** `#32302`_: (*terminalmage*) Properly support packages with blank "Release" param in pkg.latest_version + * **PR** `#33080`_: (`justinta`_) Use saltstack repo in buildpackage.py on CentOS 5 -- **PR** `#32162`_: (*terminalmage*) Properly handle yum/zypper repositories in pkgrepo.managed + * **PR** `#33025`_: (`Ch3LL`_) add test for installing package while using salt-call --local -- **PR** `#32223`_: (*twangboy*) Create minion.d directory on install for Windows + * **PR** `#33055`_: (`justinta`_) File and User test fixes for 2015.5 on Fedora23 -- **PR** `#32218`_: (*cachedout*) Only display error when tty is True in salt-ssh + * **PR** `#33060`_: (`Ch3LL`_) Test pillar.items output -- **PR** `#32196`_: (*jtand*) Fixed pylint error in app_pam_test.py + * **PR** `#33067`_: (`sacren`_) Fix minor document error of test.assertion -- **PR** `#32154`_: (*Ch3LL*) Add integration tests for salt-api using pam eauth + * **PR** `#33045`_: (`Ch3LL`_) Saltfile with pillar tests -- **PR** `#32170`_: (*gtmanfred*) add name for lxc for use with cloud cache + * **PR** `#33044`_: (`thatch45`_) Backport `#33021`_ manually to 2015.5 -- **PR** `#32164`_: (*terminalmage*) Make __virtual__ for rhservice.py more robust (2015.5 branch) + * **PR** `#33021`_: (`UtahDave`_) Fix syndic regression (refs: `#33044`_) -- **PR** `#32141`_: (*paclat*) fixes 32108 +* **ISSUE** `#22580`_: (`ryanwalder`_) minion runs highstate on start if schedule set in pillar (refs: `#32958`_) -- **PR** `#32129`_: (*terminalmage*) Support multiple valid option types when performing type checks + * **PR** `#32958`_: (`rallytime`_) Add run_on_start docs to schedule.rst -- **PR** `#32056`_: (*bstevenson*) Fix list absent +* **ISSUE** `#23714`_: (`naemono`_) file.copy force ignored during highstate, but not with 'salt-call state.sls_id' (refs: `#32732`_, `#32848`_) -- **PR** `#32096`_: (*rallytime*) Back-port `#32065`_ to 2015.5 + * **PR** `#32848`_: (`lomeroe`_) backport PR `#32732`_ to 2015.5 fixes `#23714`_ -- **PR** `#32104`_: (*jacobhammons*) One additional known issue for 2015.5.10 release notes + * **PR** `#32732`_: (`lomeroe`_) correct use of force flag in file.copy `#23714`_ (refs: `#32848`_) -- **PR** `#32100`_: (*jacobhammons*) 2015.5.10 release docs + * **PR** `#32837`_: (`jfindlay`_) `salt-cloud -u` downloads stable version from bootstrap.saltstack.com by default -- **PR** `#32038`_: (*terminalmage*) Improve state module docs, replace references to state.highstate/state.sls with state.apply + * **PR** `#32667`_: (`jfindlay`_) [2015.5] update bootstrap to 2016.04.18 release -- **PR** `#32051`_: (*terminalmage*) Fix outputter for state.apply +* **PR** `#32776`_: (`rallytime`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2016-04-25 15:18:12 UTC* -- **PR** `#32002`_: (*abednarik*) Added Manajro Linux to virtual. + * c842e1e437 Merge pull request `#32776`_ from rallytime/merge-2015.5 -- **PR** `#31957`_: (*rallytime*) [2015.5] Merge forward from 2014.7 to 2015.5 + * 7ecbf9f885 Merge pull request `#14`_ from whiteinge/runner-async-low -- **PR** `#31972`_: (*terminalmage*) Make lack of python-ldap module more explicit when LDAP eauth is enabled + * 211f7b4af1 Format low data correct for runner_async -- **PR** `#31935`_: (*twangboy*) Back port nullsoft build script from 2015.8 + * ce72851861 Merge branch '2014.7' into '2015.5' -- **PR** `#31912`_: (*jfindlay*) log.mixins: remove extermporaneous .record + * 2775edc176 Saltnado /run fix (`#32590`_) -- **PR** `#31825`_: (*jtand*) Updated .testing.pylintrc to match newer versions of pylint + * b19c5a5ce7 Verify auth in saltnado run (`#32552`_) -- **PR** `#31900`_: (*rallytime*) Add "python module" clarification to ps __virtual__ warning. + * **PR** `#32691`_: (`terminalmage`_) Support remote sources in a source list -- **PR** `#31878`_: (*rallytime*) Make sure __virtual__ error message is helpful when psutil is missing +* **ISSUE** `#32661`_: (`dergrunepunkt`_) Batch exception w/dulpicated minion IDs (refs: `#32686`_) -- **PR** `#31852`_: (*rallytime*) [2015.5] Merge forward from 2014.7 to 2015.5 +* **PR** `#32686`_: (`cachedout`_) Fix stacktrace in batch with dup minion ids + @ *2016-04-19 19:18:50 UTC* -- **PR** `#31827`_: (*gtmanfred*) Remove ability of authenticating user to specify pam service + * bd5442d768 Merge pull request `#32686`_ from cachedout/issue_32661 -- **PR** `#31810`_: (*whiteinge*) Fix outdated Jinja 'env' variable reference + * f704df90bc Fix stacktrace in batch with dup minion ids -- **PR** `#31744`_: (*brejoc*) Fix for AttributeError with libcloud <0.15 + * **PR** `#32675`_: (`basepi`_) [2015.5] Update "Low Hanging Fruit" to "Help Wanted" -- **PR** `#31740`_: (*terminalmage*) Assume pillar_opts is False when not specified in masterless mode +* **ISSUE** `#32612`_: (`oliver-dungey`_) Calling Salt Modules from Templates - more complex examples would be great (refs: `#32657`_) -- **PR** `#31750`_: (*rallytime*) Back-port `#26170`_ to 2015.5 + * **PR** `#32657`_: (`cachedout`_) Additional documentation on calling exec modules from templates -- **PR** `#31689`_: (*rallytime*) Back-port `#29467`_ to 2015.5 + * **PR** `#32639`_: (`nmadhok`_) [2015.5] - Fixing critical bug to remove only the specified Host instead of the entire Host cluster -- **PR** `#31687`_: (*cachedout*) Removed useless GPG tests + * **PR** `#32638`_: (`nmadhok`_) [2015.5] Adding _syspaths.py to .gitignore -- **PR** `#31660`_: (*terminalmage*) Remove epoch from version string if present when installing with yum +* **ISSUE** `#32381`_: (`tbaker57`_) user.present state includes shadow hash in return when user updated (refs: `#32561`_) -- **PR** `#31683`_: (*rallytime*) Back-port `#31578`_ to 2015.5 +* **PR** `#32561`_: (`gtmanfred`_) redact passwords and hashes from user.present updates + @ *2016-04-14 15:48:59 UTC* -- **PR** `#31682`_: (*cachedout*) Add definition of job cache to glossary + * 027b502335 Merge pull request `#32561`_ from gtmanfred/user_passwords -- **PR** `#31658`_: (*rallytime*) Add mentioned of Salt's Coding Style docs to the Contributing docs + * 3db5e78d5d redact passwords and hashes from user.present updates -- **PR** `#31655`_: (*rallytime*) Make note of pylint dependencies in docs +* **ISSUE** `#32400`_: (`rallytime`_) Document Default Config Values (refs: `#33286`_, `#33292`_, `#32538`_, `#33287`_, `#32454`_, `#33282`_) -- **PR** `#31440`_: (*cachedout*) Set correct type for master_tops config value +* **PR** `#32538`_: (`rallytime`_) Back-port `#32528`_ to 2015.5 + @ *2016-04-13 15:06:14 UTC* -- **PR** `#31622`_: (*jfindlay*) doc/topics/tutorials/http: update query decoding docs + * **PR** `#32528`_: (`AndrewPashkin`_) Document "grains" setting in the minion configuration reference (refs: `#32538`_) -- **PR** `#31558`_: (*cachedout*) Don't stacktrace if ssh binary is not installed with salt-ssh + * 7307bcb88e Merge pull request `#32538`_ from rallytime/bp-32528 -- **PR** `#31521`_: (*terminalmage*) salt-ssh: Fix race condition when caching files to build the thin tarball + * 46a4e8a310 Remove merge conflict line -- **PR** `#31497`_: (*rallytime*) Remove duplicate "timeout" definition in Roster docs + * e0d947c707 Document "grains" setting in the minion configuration reference -- **PR** `#31472`_: (*rallytime*) Update contributing docs +* **ISSUE** `#32400`_: (`rallytime`_) Document Default Config Values (refs: `#33286`_, `#33292`_, `#32538`_, `#33287`_, `#32454`_, `#33282`_) -- **PR** `#31461`_: (*DmitryKuzmenko*) Set auth retry count to 0 if multimaster mode is failover. + * **PR** `#32454`_: (`rallytime`_) Add documentation for some master/minion configs -- **PR** `#31442`_: (*sastorsl*) Add os.path.exists(src) to file.py, def copy +* **ISSUE** `#32413`_: (`commutecat`_) Raspbian detected by both systemd.py and service.py __virtual__ functions (refs: `#32421`_, `#32458`_) -- **PR** `#31441`_: (*cachedout*) Include localhost minions in presence detection for runner +* **PR** `#32458`_: (`terminalmage`_) Improve and clarify docs on provider overrides. + @ *2016-04-09 14:25:42 UTC* -- **PR** `#31416`_: (*carlwgeorge*) selinux module documentation fix + * 100c6e1b25 Merge pull request `#32458`_ from terminalmage/clarify-providers-docs -- **PR** `#31336`_: (*terminalmage*) Improve config validation logging + * 500d3ebbaa Add link to provider override docs to all group providers -- **PR** `#31374`_: (*sjorge*) fix for `#31369`_ + * 83ca01f620 dd link to provider override docs to all shadow providers -- **PR** `#31339`_: (*jacobhammons*) changed latest release to 2015.8.7 + * c5fe38789d Add link to provider override docs to all user providers -- **PR** `#31288`_: (*notpeter*) Improve salt.states.ssh_known_hosts documentation. + * 5c1c1dda59 Add link to provider override docs to all service providers -- **PR** `#31183`_: (*heyfife*) Fixed named external_ip reservation/re-use code in gce driver. + * 736f2befc9 Add link to provider override docs to all package providers -- **PR** `#31032`_: (*terminalmage*) (2015.5 branch) yumpkg: ensure that dnf-plugins-core >= 0.1.15 is installed + * f9306347cc Clarify the scope of the provider param in states. -- **PR** `#31264`_: (*sjorge*) fix if_missing gets appended to dirs list, take III + * af24c82ab0 Add documentation on virtual module provider overrides to the module docs -- **PR** `#31110`_: (*cachedout*) Fixup 30730 + * 0bc6c97a63 Improve docstrings -- **PR** `#30974`_: (*rallytime*) Back-port `#30949`_ to 2015.5 + * 1948920674 Add external ref to windows package manager docs -- **PR** `#30942`_: (*rallytime*) Back-port `#30897`_ to 2015.5 + * e7fa21438c Add new doc pages to toctree -- **PR** `#30922`_: (*jacobhammons*) Rev latest version to 2015.8.5 + * f0de1236ec Move the tables of virtual modules to individual documentation pages -- **PR** `#30865`_: (*abednarik*) Better boto elb error message. +* **ISSUE** `#11497`_: (`eeaston`_) cmd.run cwd should not be checked before preconditions (refs: `#32293`_) -- **PR** `#30831`_: (*jacobhammons*) Updated readme + * **PR** `#32418`_: (`rallytime`_) Merge `#32293`_ with test fixes -- **PR** `#30829`_: (*jacobhammons*) Updated latest version to 2015.8.4 + * **PR** `#32293`_: (`efficks`_) Fix issue `#11497`_ (refs: `#32418`_) -- **PR** `#30784`_: (*rallytime*) Back-port `#24952`_ to 2015.5 +* **ISSUE** `#32413`_: (`commutecat`_) Raspbian detected by both systemd.py and service.py __virtual__ functions (refs: `#32421`_, `#32458`_) -- **PR** `#30764`_: (*terminalmage*) Work around yum versionlock's inability to remove holds by package name alone + * **PR** `#32421`_: (`terminalmage`_) Ignore Raspbian in service.py __virtual__ -- **PR** `#30760`_: (*toanju*) Changed output format of arp_ip_target from list to comma delimited... +* **ISSUE** `#1409`_: (`twinshadow`_) module/network.py: Interfaces do not list multiple addesses -- **PR** `#30757`_: (*yannis666*) Fix to mine update to merge configuration +* **ISSUE** `saltstack/salt#28262`_: (`palica`_) FreeBSD pkgng provider raising error for minion (refs: `#32376`_) -- **PR** `#30749`_: (*abednarik*) Fix Netwotk hostname Module in Debian systems. +* **ISSUE** `#28262`_: (`palica`_) FreeBSD pkgng provider raising error for minion (refs: `#32399`_, `#32376`_) -- **PR** `#30699`_: (*abednarik*) Add Retry to save_load. +* **PR** `#32399`_: (`amontalban`_) Backport to fix `#28262`_ for 2015.5 as requested in PR `#32376`_ + @ *2016-04-06 22:48:23 UTC* -- **PR** `#30659`_: (*sjmh*) Fix lsscsi issues for certain platforms + * **PR** `#32376`_: (`amontalban`_) Fixes `saltstack/salt#28262`_ (refs: `#32399`_) -- **PR** `#30671`_: (*techhat*) Add file locking to cloud index + * a36866d7db Merge pull request `#32399`_ from amontalban/2015.5 -- **PR** `#30586`_: (*abednarik*) Fix comment_line permissions. + * e1ffbd615a Fixes `saltstack/salt#28262`_ for 2015.5 branch -- **PR** `#30582`_: (*terminalmage*) yumpkg.check_db: run separate repoquery commands when multiple names passed +* **ISSUE** `#32066`_: (`guettli`_) Proxmox docs outdated (refs: `#32374`_) -- **PR** `#30548`_: (*jacobhammons*) Added placeholder release notes for 2015.5.10 +* **PR** `#32374`_: (`cachedout`_) Update proxmox documentation + @ *2016-04-05 22:25:16 UTC* -- **PR** `#30530`_: (*terminalmage*) 2015.5 tweaks from `#30529`_ + * 3f03c5fcf9 Merge pull request `#32374`_ from cachedout/issue_32066 -- **PR** `#30484`_: (*terminalmage*) Backport DNF support to 2015.5 branch + * 62389d1d1a Update proxmox documentation -- **PR** `#30512`_: (*jfindlay*) disable pkgrepo test for ubuntu 15.10+ +* **PR** `#32339`_: (`Ch3LL`_) remove reference to master_alive_check in 2015.5 + @ *2016-04-04 20:39:24 UTC* -- **PR** `#30478`_: (*jtand*) Updated pip_state to work with pip 8.0 + * 8578089beb Merge pull request `#32339`_ from Ch3LL/fix_doc_multi-master -- **PR** `#30482`_: (*borgstrom*) Pyobjects recursive import support (for 2015.5) + * 2774da288d remove reference to master_alive_check -- **PR** `#30459`_: (*jfindlay*) modules.pkg: disable repo int test for ubuntu 15.10 +* **ISSUE** `#32044`_: (`ScoreUnder`_) Multiple masters throwing warnings? "Key master with value [...] has an invalid type of list, a str is required for this value" (refs: `#32129`_) -- **PR** `#30443`_: (*jtand*) Boto uses False for is_default instead of None +* **PR** `#32284`_: (`rallytime`_) Audit config.py default types and values + @ *2016-04-02 02:00:38 UTC* -- **PR** `#30420`_: (*attiasr*) Backport `#26853`_ + * **PR** `#32129`_: (`terminalmage`_) Support multiple valid option types when performing type checks (refs: `#32284`_) -- **PR** `#30364`_: (*rallytime*) Add TLS version imports and add linode driver documentation notices + * fbdc47cc55 Merge pull request `#32284`_ from rallytime/config-audit -- **PR** `#30184`_: (*rallytime*) Back-port `#30166`_ to 2015.5 + * 0491513204 Don't be so explicit. Just use string_types. -- **PR** `#30291`_: (*thegoodduke*) ipset: fix test=true & add comment for every entry + * 083c477fd3 Use six.string_types in config default tuples + * 7e642b8381 Audit config.py default types and values - first sweep + +* **ISSUE** `#32301`_: (`terminalmage`_) pkg.latest_version returns inaccurate version when blank "Release" param set in package metadata (refs: `#32302`_) + +* **PR** `#32302`_: (`terminalmage`_) Properly support packages with blank "Release" param in pkg.latest_version + @ *2016-04-01 22:13:27 UTC* + + * 0a6d44e57b Merge pull request `#32302`_ from terminalmage/fix-missing-release + + * 413c371ccd Properly support packages with blank "Release" param in pkg.latest_version + +* **ISSUE** `#31963`_: (`UtahDave`_) pkgrepo.managed state test=True doesn't actually test if changes need to be made. (refs: `#32162`_) + +* **PR** `#32162`_: (`terminalmage`_) Properly handle yum/zypper repositories in pkgrepo.managed + @ *2016-03-30 17:51:05 UTC* + + * 5d08db7c92 Merge pull request `#32162`_ from terminalmage/issue31963 + + * 5c1bdb812c Fix pkgrepo integration test + + * e7fb3095ce Properly handle yum/zypper repositories in pkgrepo.managed + + * add2111fec Use six.iteritems instead of dict.items + + * 6c21881c38 Docstring tweaks + + * ecbb78b649 Remove useless function + + * 06f3309552 Normalize variable naming to match other functions + + * 690537ca8b Look for apt-add-repository in PATH instead of assuming it's there + + * 709d80bb1b aptpkg: Accept \*\*kwargs instead of a dict for pkg.expand_repo_def + +* **ISSUE** `#31976`_: (`moltob`_) Schedules not persisted on Windows minion (Installer issue) (refs: `#32223`_) + +* **PR** `#32223`_: (`twangboy`_) Create minion.d directory on install for Windows + @ *2016-03-30 14:43:27 UTC* + + * 4fcdaab428 Merge pull request `#32223`_ from twangboy/fix_31976 + + * b7fcae97ce Create minion.d directory, fixes `#31976`_ + +* **ISSUE** `#31501`_: (`grep4linux`_) Salt states fail with error 'Failed to return clean data' when using salt-ssh in Amazon EC2 (refs: `#32218`_) + +* **PR** `#32218`_: (`cachedout`_) Only display error when tty is True in salt-ssh + @ *2016-03-29 19:13:44 UTC* + + * 3309ff6a29 Merge pull request `#32218`_ from cachedout/issue_31501 + + * 6795d6aef0 Only display error when tty is True in salt-ssh + +* **PR** `#32196`_: (`justinta`_) Fixed pylint error in app_pam_test.py + @ *2016-03-28 23:59:42 UTC* + + * 6e0cb22c96 Merge pull request `#32196`_ from jtand/cherrypy_pam_test_lint_fix + + * bd3942e0fd Fixed pylint error in app_pam_test.py + +* **PR** `#32154`_: (`Ch3LL`_) Add integration tests for salt-api using pam eauth + @ *2016-03-28 16:06:36 UTC* + + * **PR** `#31826`_: (`gtmanfred`_) Remove ability of authenticating user to specify pam service (refs: `#32154`_) + + * 6b8b8b51c0 Merge pull request `#32154`_ from Ch3LL/ch3ll_pam_2015.5 + + * ba605b0128 fix more pylint and add ability to close cherrypy engine + + * 2d4dc4da05 add teardown call + + * d115878714 fix pylint error + + * 4c1ab082b6 add pam salt-api tests + +* **PR** `#32170`_: (`gtmanfred`_) add name for lxc for use with cloud cache + @ *2016-03-28 14:34:16 UTC* + + * 230443be6c Merge pull request `#32170`_ from gtmanfred/lxc_cloud_name + + * eb7d82e7be add name for lxc for use with cloud cache + +* **ISSUE** `#31731`_: (`sjorge`_) rh_service references osrelease before it is available, also does not return bool (refs: `#32165`_) + + * **PR** `#32165`_: (`terminalmage`_) Make __virtual__ for rhservice.py more robust (refs: `#32164`_) + +* **PR** `#32164`_: (`terminalmage`_) Make __virtual__ for rhservice.py more robust (2015.5 branch) (refs: `#32165`_) + @ *2016-03-27 18:21:52 UTC* + + * 32b0421a34 Merge pull request `#32164`_ from terminalmage/issue31731-2015.5 + + * 18439c4f89 Make __virtual__ for rhservice.py more robust (2015.5 branch) + +* **PR** `#32141`_: (`paclat`_) fixes 32108 + @ *2016-03-25 16:50:59 UTC* + + * 6212e9aa56 Merge pull request `#32141`_ from paclat/issue_32108 + + * 72c5d12d43 fixes 32108 + +* **ISSUE** `#32044`_: (`ScoreUnder`_) Multiple masters throwing warnings? "Key master with value [...] has an invalid type of list, a str is required for this value" (refs: `#32129`_) + +* **PR** `#32129`_: (`terminalmage`_) Support multiple valid option types when performing type checks (refs: `#32284`_) + @ *2016-03-24 21:16:29 UTC* + + * bdd7ea89d5 Merge pull request `#32129`_ from terminalmage/issue32044 + + * 34ca1ea12e Change type check errors to debug loglevel + + * 5462081488 Support multiple valid option types when performing type checks + +* **ISSUE** `#32052`_: (`bstevenson`_) list_absent function doesn't loop through list of values (refs: `#32056`_) + +* **PR** `#32056`_: (`bstevenson`_) Fix list absent + @ *2016-03-24 17:35:00 UTC* + + * c42014eb54 Merge pull request `#32056`_ from bstevenson/fix-list_absent + + * 1500aae027 set deleted value to list + + * 1dc8f5f289 unit test update + + * 39adf86fec Fixed negation logic + + * be9388173b Removed has_key in lieu of in + + * e48593ed81 Comments and Changes output fixes + + * b98f5517de Updated to conform to proper ret values + + * d18b4be80b remove whitespace end of line 186:q + + * d2b89c85ad fix formating + + * 103cee9e29 cleaned up formating + + * 7a4d7f0bff added whitespace + + * 8ea5b545b0 Loop through list values in list_absent + +* **PR** `#32096`_: (`rallytime`_) Back-port `#32065`_ to 2015.5 + @ *2016-03-23 22:01:36 UTC* + + * **PR** `#32065`_: (`TheNullByte`_) Fix an issue with the minion targeting example in docs (refs: `#32096`_) + + * 848ce5647f Merge pull request `#32096`_ from rallytime/bp-32065 + + * 36a9d6a374 Fix an issue with the minion targeting example + +* **PR** `#32104`_: (`jacobhammons`_) One additional known issue for 2015.5.10 release notes + @ *2016-03-23 21:20:50 UTC* + + * 9b332d48b9 Merge pull request `#32104`_ from jacobhammons/dot10 + + * b9fc882a1e One additional known issue for 2015.5.10 release notes + +* **PR** `#32100`_: (`jacobhammons`_) 2015.5.10 release docs + @ *2016-03-23 20:05:21 UTC* + + * ff51d548e1 Merge pull request `#32100`_ from jacobhammons/dot10 + + * 544a1661ce 2015.5.10 release docs + +* **ISSUE** `#32037`_: (`terminalmage`_) Increase the visibility of state.apply in Salt's documentation (refs: `#32038`_) + +* **PR** `#32038`_: (`terminalmage`_) Improve state module docs, replace references to state.highstate/state.sls with state.apply + @ *2016-03-23 17:08:02 UTC* + + * 72a20f9799 Merge pull request `#32038`_ from terminalmage/issue32037 + + * 8b2d983324 Add reference to state tutorial to state.apply docstring + + * 9b4fe8443e Move highstate usage details to top of state.apply docstring + + * 74ee8c54bc Clarify prior role of state.highstate in states tutorial + + * 1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply + +* **PR** `#32051`_: (`terminalmage`_) Fix outputter for state.apply + @ *2016-03-23 16:42:43 UTC* + + * 908a7bf5cd Merge pull request `#32051`_ from terminalmage/fix-state-apply-output + + * 7d7cb45565 Fix outputter for state.apply + +* **ISSUE** `#31788`_: (`crocket`_) pkg.installed doesn't work on Manjaro. (refs: `#32002`_) + +* **PR** `#32002`_: (`abednarik`_) Added Manajro Linux to virtual. + @ *2016-03-21 17:55:16 UTC* + + * 0e66f678d4 Merge pull request `#32002`_ from abednarik/pkg_manjaron_issue31788 + + * 1b052d0a66 Added Manajro Linux to virtual. List extended with ManajaroLinux in order su load pacman module. + +* **PR** `#31957`_: (`rallytime`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2016-03-18 15:12:22 UTC* + + * ba5bf62c1a Merge pull request `#31957`_ from rallytime/merge-2015.5 + + * 1b6ec5d445 Merge branch '2014.7' into '2015.5' + + * ba73deee46 Merge pull request `#31929`_ from twangboy/fix_build_script + + * 2c5599d2bc Backport build script from 2015.8 + + * ce74991dd0 Fix nsi script to work with new build process + +* **PR** `#31972`_: (`terminalmage`_) Make lack of python-ldap module more explicit when LDAP eauth is enabled + @ *2016-03-18 15:11:59 UTC* + + * a52e3ad7a1 Merge pull request `#31972`_ from terminalmage/zh-584 + + * 1e5639e495 Make lack of python-ldap module more explicit when LDAP eauth is enabled + +* **PR** `#31935`_: (`twangboy`_) Back port nullsoft build script from 2015.8 + @ *2016-03-17 14:54:50 UTC* + + * 2d1f2a0c2e Merge pull request `#31935`_ from twangboy/fix_build_script2 + + * 4af8c9dbfc Back port nullsoft build script from 2015.8 + +* **PR** `#31912`_: (`jfindlay`_) log.mixins: remove extermporaneous .record + @ *2016-03-16 01:56:46 UTC* + + * 43240dc566 Merge pull request `#31912`_ from jfindlay/log_mixin + + * 9f9c694654 log.mixins: remove extermporaneous .record + +* **PR** `#31825`_: (`justinta`_) Updated .testing.pylintrc to match newer versions of pylint + @ *2016-03-15 18:12:44 UTC* + + * 440e0dcbe0 Merge pull request `#31825`_ from jtand/udpate_pylintrc + + * 9a14e02766 Updated beacons/sh.py to work with enumerate() + + * 0ecec691a0 Adjusted beacons to work with enumerate better + + * f509b4113e Fixed final lint error + + * 5945b3f11f Fix and disable pylint errors + + * 06ae6eaf55 Fixed pylint errors on jboss state and module + + * de96db97c8 Fixed more pylint errors, and disabled some more + + * c07b0a20b5 Merge branch 'lint_fixes' into udpate_pylintrc + + * 2e6a152308 Fixed lint error in lxc.py + + * 908ca1a439 Fixed lint error in ssh_py_shim + + * 404c1b50f7 Changed range(len()) to enumerate() + + * 1e13586546 Changed range(len()) to enumerate() + + * 9ccce7a9a5 Added more disables + + * 9c1aab3b4e Updated .testing.pylintrc to match newer versions of pylint + +* **ISSUE** `#31867`_: (`damon-atkins`_) " __virtual__ returned False" is not a clear error message (refs: `#31878`_, `#31900`_) + +* **PR** `#31900`_: (`rallytime`_) Add "python module" clarification to ps __virtual__ warning. + @ *2016-03-15 17:59:35 UTC* + + * 471c9444a3 Merge pull request `#31900`_ from rallytime/fix-psutil-warning + + * 22403d69ae Add "python module" clarification to ps __virtual__ warning. + +* **ISSUE** `#31867`_: (`damon-atkins`_) " __virtual__ returned False" is not a clear error message (refs: `#31878`_, `#31900`_) + +* **ISSUE** `#19659`_: (`wonderslug`_) state process.absent is failing on Ubuntu 14.04 because psutil is not installed (refs: `#31878`_) + +* **PR** `#31878`_: (`rallytime`_) Make sure __virtual__ error message is helpful when psutil is missing + @ *2016-03-14 21:31:42 UTC* + + * c44c1b5e59 Merge pull request `#31878`_ from rallytime/fix-psutil-warning + + * 44b29f72a1 Make sure __virtual__ error message is helpful when psutil is missing + +* **PR** `#31852`_: (`rallytime`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2016-03-13 02:47:02 UTC* + + * 5c592b6768 Merge pull request `#31852`_ from rallytime/merge-2015.5 + + * 1470de17fa Merge branch '2014.7' into '2015.5' + + * 218c902091 Merge pull request `#31834`_ from jfindlay/2014.7 + + * 358fdad0c8 add 2014.7.8 release notes + + * a423c6cd04 Merge pull request `#31833`_ from jfindlay/2014.7 + + * 6910fcc584 add 2014.7.9 release notes + + * c5e7c03953 Merge pull request `#31826`_ from gtmanfred/2014.7 + + * d73f70ebb2 Remove ability of authenticating user to specify pam service + +* **PR** `#31827`_: (`gtmanfred`_) Remove ability of authenticating user to specify pam service + @ *2016-03-11 20:40:19 UTC* + + * 0cc1d5db03 Merge pull request `#31827`_ from gtmanfred/2015.5 + + * 979173b78a Remove ability of authenticating user to specify pam service + +* **PR** `#31810`_: (`whiteinge`_) Fix outdated Jinja 'env' variable reference + @ *2016-03-11 03:52:21 UTC* + + * 8cf0b9eb3d Merge pull request `#31810`_ from whiteinge/saltenv-jinja-var + + * cb72b19240 Fix outdated Jinja 'env' variable reference + +* **ISSUE** `#31729`_: (`brejoc`_) Creating VM with salt-cloud fails for provider Exoscale (Cloudstack) (refs: `#31744`_) + +* **PR** `#31744`_: (`brejoc`_) Fix for AttributeError with libcloud <0.15 + @ *2016-03-10 00:15:26 UTC* + + * 970ef0e445 Merge pull request `#31744`_ from brejoc/fix-attribute-error-with-older-libcloud/2015.5 + + * bb29dc2283 Added version to libcloud depends statement + + * 87f9534fce Added log message with update suggestion for libcloud + + * 72eab406cd Fix for AttributeError with libcloud <0.15 + +* **ISSUE** `#31666`_: (`sjorge`_) salt-call --local pillar.items is overly eager to give data (refs: `#31740`_) + +* **PR** `#31740`_: (`terminalmage`_) Assume pillar_opts is False when not specified in masterless mode + @ *2016-03-09 22:57:57 UTC* + + * df2d23ba5d Merge pull request `#31740`_ from terminalmage/issue31666 + + * aeaf5864cd Fall back to False when pillar_opts not set + + * fe19d77eb4 Add default value for pillar_opts on minion + +* **ISSUE** `#31749`_: (`milan-milo`_) salt-cloud spitting out error 'AttributeError: 'NoneType' object has no attribute 'pop'' (refs: `#31750`_) + +* **ISSUE** `#26162`_: (`nmadhok`_) VMware cloud driver create function failing with traceback on latest develop (refs: `#26170`_) + +* **PR** `#31750`_: (`rallytime`_) Back-port `#26170`_ to 2015.5 + @ *2016-03-09 17:44:14 UTC* + + * **PR** `#26170`_: (`nmadhok`_) [Backport] Make sure variable is a dictionary before popping something from it. (refs: `#31750`_) + + * e22f5c0a26 Merge pull request `#31750`_ from rallytime/bp-26170 + + * 3c11234a05 Make sure variable is a dictionary before popping something from it. + +* **ISSUE** `#30559`_: (`kaidokert`_) module.wait does not fail when called state fails (refs: `#31689`_) + +* **PR** `#31689`_: (`rallytime`_) Back-port `#29467`_ to 2015.5 + @ *2016-03-06 19:26:11 UTC* + + * **PR** `#29467`_: (`serge-p`_) Update module.py (refs: `#31689`_) + + * 9162925dd0 Merge pull request `#31689`_ from rallytime/bp-29467 + + * 1f8f4cb99b Update module.py + +* **PR** `#31687`_: (`cachedout`_) Removed useless GPG tests + @ *2016-03-05 00:08:27 UTC* + + * d7914cdb14 Merge pull request `#31687`_ from cachedout/rm_gpg_test + + * 8b00513ebb Removed useless tests + +* **ISSUE** `#31619`_: (`alexxannar`_) 2015.8.7 pkg.installed problem with version parameter (refs: `#31660`_) + +* **PR** `#31660`_: (`terminalmage`_) Remove epoch from version string if present when installing with yum + @ *2016-03-04 20:49:23 UTC* + + * bd4d12a155 Merge pull request `#31660`_ from terminalmage/issue31619 + + * da954d7b92 Add integration test for packages with epoch in version + + * 4fa7e4defe Move epoch removal + + * 290192af56 Remove epoch from version string if present when installing with yum + +* **PR** `#31683`_: (`rallytime`_) Back-port `#31578`_ to 2015.5 + @ *2016-03-04 20:47:41 UTC* + + * **PR** `#31578`_: (`anlutro`_) Allow queueing of state runs through saltmod (refs: `#31683`_) + + * e33c1f456a Merge pull request `#31683`_ from rallytime/bp-31578 + + * 8fe46789b7 allow queueing of state runs through saltmod + +* **ISSUE** `#31671`_: (`guettli`_) Word "Job Cache" does not match (refs: `#31682`_) + +* **PR** `#31682`_: (`cachedout`_) Add definition of job cache to glossary + @ *2016-03-04 20:07:19 UTC* + + * 27f443895d Merge pull request `#31682`_ from cachedout/cache_meaning + + * a75e146125 Add definition of job cache to glossary + +* **PR** `#31658`_: (`rallytime`_) Add mentioned of Salt's Coding Style docs to the Contributing docs + @ *2016-03-03 22:14:57 UTC* + + * bd04c964d1 Merge pull request `#31658`_ from rallytime/add-style-to-contrib + + * 6b526b5878 Add mentioned of Salt's Coding Style docs to the Contributing docs + +* **ISSUE** `#21932`_: (`clinta`_) Salt Coding Style docs should list requirements for salt pylintrc (refs: `#31655`_) + +* **PR** `#31655`_: (`rallytime`_) Make note of pylint dependencies in docs + @ *2016-03-03 18:37:06 UTC* + + * 10658dffe6 Merge pull request `#31655`_ from rallytime/pylint-docs + + * 6e0377d376 Make note of pylint dependencies in docs + +* **PR** `#31440`_: (`cachedout`_) Set correct type for master_tops config value + @ *2016-03-02 21:17:14 UTC* + + * 6075774a01 Merge pull request `#31440`_ from cachedout/master_tops_type + + * f49cc75049 Set correct type for master_tops config value + +* **ISSUE** `#31614`_: (`frizzby`_) salt.utils.http.query() implementation contradicts it's documentation. decode arg (refs: `#31622`_) + +* **PR** `#31622`_: (`jfindlay`_) doc/topics/tutorials/http: update query decoding docs + @ *2016-03-02 18:23:44 UTC* + + * 6d31b8918f Merge pull request `#31622`_ from jfindlay/query_doc + + * 4e48fec806 doc/topics/tutorials/http: update query decoding docs + +* **PR** `#31558`_: (`cachedout`_) Don't stacktrace if ssh binary is not installed with salt-ssh + @ *2016-02-29 22:15:44 UTC* + + * dbf6e0786c Merge pull request `#31558`_ from cachedout/ensure_ssh_installed + + * cecc6e0a5f Don't stacktrace if ssh binary is not installed with salt-ssh + +* **PR** `#31521`_: (`terminalmage`_) salt-ssh: Fix race condition when caching files to build the thin tarball + @ *2016-02-29 15:32:22 UTC* + + * 060a60fd90 Merge pull request `#31521`_ from terminalmage/issue24753 + + * 0d352bbc16 Add fileclient tests + + * d9370a8041 Update cp module salt-ssh wrapper to use new cachedir param + + * 0320494b1d Update the SSH state module wrappers to pass an alternate cachedir + + * 65bdcb3afa Accept and pass through the alternate cachedir when prepping the thin tar + + * c3f7a2f2e5 Add ability to specify an alternate base dir for file caching + +* **PR** `#31497`_: (`rallytime`_) Remove duplicate "timeout" definition in Roster docs + @ *2016-02-26 15:01:30 UTC* + + * 92f8f89218 Merge pull request `#31497`_ from rallytime/remove-timeout-dup + + * 83e6480d20 Remove duplicate "timeout" definition in Roster docs + +* **PR** `#31472`_: (`rallytime`_) Update contributing docs + @ *2016-02-25 16:05:59 UTC* + + * da001bcb49 Merge pull request `#31472`_ from rallytime/update-contributing-docs + + * 5871e4d1e0 Update contributing docs + +* **ISSUE** `#30183`_: (`jakehilton`_) Minion startup extremely delayed when first master in failover multi master setup is down (refs: `#31382`_) + +* **PR** `#31461`_: (`DmitryKuzmenko`_) Set auth retry count to 0 if multimaster mode is failover. + @ *2016-02-24 17:15:30 UTC* + + * **PR** `#31382`_: (`DmitryKuzmenko`_) Set auth retry count to 0 if multimaster mode is failover (refs: `#31461`_) + + * f35e2dd1d3 Merge pull request `#31461`_ from DSRCompany/issues/30183_fix_multimaster_failover_2015.5 + + * 3d09c3b7a3 Set auth retry count to 0 if multimaster mode is failover. + +* **ISSUE** `#31356`_: (`sastorsl`_) file.copy module with recurse=true and non-existing src dir does not fail and resets dst dir permissions (refs: `#31442`_) + +* **PR** `#31442`_: (`sastorsl`_) Add os.path.exists(src) to file.py, def copy + @ *2016-02-23 23:40:03 UTC* + + * 26733ce988 Merge pull request `#31442`_ from sastorsl/salt-modules-file.py-copy-check-src + + * 0a4132866d removed lint in the exception string + + * f8b5d498c3 Add os.path.exists(src) to file.py, def copy + +* **ISSUE** `#30739`_: (`paclat`_) manage.present does not work when minion is using localhost (refs: `#31441`_) + +* **PR** `#31441`_: (`cachedout`_) Include localhost minions in presence detection for runner + @ *2016-02-23 23:36:59 UTC* + + * e480727d27 Merge pull request `#31441`_ from cachedout/issue_30739 + + * ffcfad1570 Include localhost minions in presence detection for runner + +* **PR** `#31416`_: (`carlwgeorge`_) selinux module documentation fix + @ *2016-02-22 21:49:28 UTC* + + * 91ff95f093 Merge pull request `#31416`_ from carlwgeorge/selinux_doc_fix + + * 0e6846d72e selinux module documentation fix + +* **PR** `#31336`_: (`terminalmage`_) Improve config validation logging + @ *2016-02-22 19:34:24 UTC* + + * 7d01979898 Merge pull request `#31336`_ from terminalmage/config-validation-logging + + * 795008bad1 Improve config validation logging + +* **ISSUE** `#31369`_: (`sjorge`_) illumos/solaris/smartos display compacted hwaddrs (refs: `#31374`_) + +* **PR** `#31374`_: (`sjorge`_) fix for `#31369`_ + @ *2016-02-22 16:22:21 UTC* + + * fed096a29d Merge pull request `#31374`_ from sjorge/solarish_hwaddr + + * bdf2576dfb missed a .format and messed up the join + + * bbd2fdc96d fix for illumos/solaris hwaddr + +* **PR** `#31339`_: (`jacobhammons`_) changed latest release to 2015.8.7 + @ *2016-02-19 00:30:24 UTC* + + * 6ee17f905b Merge pull request `#31339`_ from jacobhammons/dot7prev + + * 07120a8d48 changed latest release to 2015.8.7 + +* **PR** `#31288`_: (`notpeter`_) Improve salt.states.ssh_known_hosts documentation. + @ *2016-02-17 22:09:18 UTC* + + * cd3400e67e Merge pull request `#31288`_ from notpeter/ssh_known_hosts_docs + + * 3f573d89a2 Improve salt.states.ssh_known_hosts documentation. + +* **PR** `#31183`_: (`heyfife`_) Fixed named external_ip reservation/re-use code in gce driver. + @ *2016-02-17 19:02:27 UTC* + + * 875d9925fa Merge pull request `#31183`_ from heyfife/fix-gce-named-static-ip-reservation + + * 26774e2323 Fixed named external_ip reservation/re-use code. + +* **ISSUE** `#31001`_: (`toanju`_) Fedora 23 check installed packages fails (refs: `#31032`_) + +* **PR** `#31032`_: (`terminalmage`_) (2015.5 branch) yumpkg: ensure that dnf-plugins-core >= 0.1.15 is installed + @ *2016-02-17 19:02:03 UTC* + + * e56c402c0c Merge pull request `#31032`_ from terminalmage/issue31001 + + * 42daea4509 yumpkg.py: Remove repoquery usage everywhere but check_db + + * 50befbc149 backport salt.utils.pkg.rpm to 2015.5 + + * a1ad14994a Move salt.utils.itersplit() to salt.utils.itertools.split() + + * 5b8646ce64 Ignore failure to install new enough dnf-plugins-core + + * defe0859fd Ensure that dnf-plugins-core 0.1.15 is installed + +* **ISSUE** `#31174`_: (`sjorge`_) salt.states.archive.extacted displays incorrect message: (refs: `#31176`_) + +* **PR** `#31264`_: (`sjorge`_) fix if_missing gets appended to dirs list, take III + @ *2016-02-17 17:12:25 UTC* + + * **PR** `#31250`_: (`sjorge`_) if_missing append to array as far back as 2014.1 (refs: `#31264`_) + + * **PR** `#31176`_: (`sjorge`_) if_missing incorrected appended to directories_created (refs: `#31250`_, `#31264`_) + + * cec69b74f0 Merge pull request `#31264`_ from sjorge/if_missing-155-fix + + * 545edbf5e1 fix if_missing gets appended to dirs list, take III + +* **PR** `#31110`_: (`cachedout`_) Fixup 30730 + @ *2016-02-10 21:37:55 UTC* + + * fa3f474de9 Merge pull request `#31110`_ from cachedout/fixup_30730 + + * 5bf5848e04 Fixup unit test + + * f558f68e0a Fixes pylint warnings + + * 56a975ec43 Attempt to fix pylint warnings + + * 55d71be057 Make documentation and code examples consistent with code + + * 1f04fed6f8 Change parameter name from includes to skips + + * ccf5e13e7d Adding support for skipHidden in SetInclude + + * 4f2d4af2e7 Variable names standardization + + * f5917ac1e8 Fixes typo + + * 26e5236073 Invert RebootRequired logic + + * 8065a7abf6 Add basic documentation and define how the skips parameter works. + + * 389fea7508 Change parameter name from includes to skips + + * 30e1fef906 Adding support for skipHidden in SetInclude + + * 1244eea5be Variable names standardization, consistent if/else logic with states.win_update + +* **ISSUE** `#30900`_: (`mchugh19`_) modules/qemu_nbd.py assumes versions of utilities that don't exist on ubuntu (refs: `#30949`_) + +* **PR** `#30974`_: (`rallytime`_) Back-port `#30949`_ to 2015.5 + @ *2016-02-08 16:38:46 UTC* + + * **PR** `#30949`_: (`techhat`_) Replace cfdisk with sfdisk (refs: `#30974`_) + + * 1c699a1664 Merge pull request `#30974`_ from rallytime/bp-30949 + + * ff6542f593 Replace cfdisk with sfdisk + +* **ISSUE** `#28951`_: (`ClaudiuPID`_) CloudLinux 7 changes (refs: `#30897`_) + +* **PR** `#30942`_: (`rallytime`_) Back-port `#30897`_ to 2015.5 + @ *2016-02-05 19:00:55 UTC* + + * **PR** `#30897`_: (`mtorromeo`_) Only remove the word linux from distroname when its not part of the name (refs: `#30942`_) + + * c7f87cc371 Merge pull request `#30942`_ from rallytime/bp-30897 + + * 885e00ba54 Only remove the word linux from distroname when its not part of the name + +* **PR** `#30922`_: (`jacobhammons`_) Rev latest version to 2015.8.5 + @ *2016-02-05 01:20:27 UTC* + + * 35b7f62669 Merge pull request `#30922`_ from jacobhammons/prev-rel-notes + + * 57c1ec637a Rev latest version to 2015.8.5 + +* **ISSUE** `#30840`_: (`HeathNaylor`_) Generic Error for SALT.STATES.BOTO_ELB (refs: `#30865`_) + +* **PR** `#30865`_: (`abednarik`_) Better boto elb error message. + @ *2016-02-04 21:02:05 UTC* + + * 2488bb902e Merge pull request `#30865`_ from abednarik/better_boto_elb_error + + * 3561e8c19b Better boto elb error message. + +* **PR** `#30831`_: (`jacobhammons`_) Updated readme + @ *2016-02-02 21:06:02 UTC* + + * 4da04f82c8 Merge pull request `#30831`_ from jacobhammons/readme-update + + * 01a92f5d98 Updated readme + +* **PR** `#30829`_: (`jacobhammons`_) Updated latest version to 2015.8.4 + @ *2016-02-02 20:06:13 UTC* + + * 90c1ea9f6c Merge pull request `#30829`_ from jacobhammons/release-2015.5 + + * c95bb60148 Version to 2015.8.4 + +* **ISSUE** `#24575`_: (`BrandKNY`_) raid.present inside mdadm.py triggers IndexError: list index out of range (refs: `#30784`_) + +* **ISSUE** `#23694`_: (`gmolight`_) mdadm.py module (refs: `#30784`_) + +* **PR** `#30784`_: (`rallytime`_) Back-port `#24952`_ to 2015.5 + @ *2016-02-01 21:43:01 UTC* + + * **PR** `#24952`_: (`pcn`_) Don't split the string on a single line (refs: `#30784`_) + + * 80a36793cb Merge pull request `#30784`_ from rallytime/bp-24952 + + * a07908bdea Don't split the string on a single line + +* **ISSUE** `#30560`_: (`terminalmage`_) yumpkg.py: pkg.unhold fails in yum (refs: `#30764`_) + +* **PR** `#30764`_: (`terminalmage`_) Work around yum versionlock's inability to remove holds by package name alone + @ *2016-02-01 18:14:27 UTC* + + * e978f5392f Merge pull request `#30764`_ from terminalmage/issue30560 + + * 39736afcd7 Work around yum versionlock's inability to remove holds by package name alone + +* **PR** `#30760`_: (`toanju`_) Changed output format of arp_ip_target from list to comma delimited... + @ *2016-01-31 19:05:02 UTC* + + * **PR** `#27952`_: (`tomwalsh`_) Corrected format of arp_ip_target in network config files and modprobe files (refs: `#30760`_) + + * 6f565c0d76 Merge pull request `#30760`_ from toanju/2015.5 + + * dc4256f7df Changed output format of arp_ip_target from list to comma delimited string + +* **ISSUE** `#30722`_: (`yannis666`_) mine config is not merged from minion config and pillar (refs: `#30757`_) + +* **PR** `#30757`_: (`yannis666`_) Fix to mine update to merge configuration + @ *2016-01-31 19:02:44 UTC* + + * 1c205b4898 Merge pull request `#30757`_ from yannis666/fix-for-mine-update-merge + + * 61bb23e256 Fix to mine update to merge configuration + +* **ISSUE** `#28751`_: (`olfway`_) network.system state ignores test=True on debian/ubuntu (refs: `#30749`_) + +* **PR** `#30749`_: (`abednarik`_) Fix Netwotk hostname Module in Debian systems. + @ *2016-01-29 23:01:09 UTC* + + * f9fde8f6a7 Merge pull request `#30749`_ from abednarik/fix_network_system_test + + * 1e9e97df59 Fix Netwotk hostname Module in Debian systems. + +* **ISSUE** `#28438`_: (`vakulich`_) Master failed to save job cache file: "Could not write job invocation cache file: [Errno 2] No such file or directory" (refs: `#30699`_) + +* **PR** `#30699`_: (`abednarik`_) Add Retry to save_load. + @ *2016-01-29 16:08:30 UTC* + + * 076268089a Merge pull request `#30699`_ from abednarik/save_load_retry_time + + * 186872cf49 Add Retry to save_load. + +* **ISSUE** `#30565`_: (`heaje`_) scsi.ls fails to run both on CentOS 6 and CentOS 7 (refs: `#30659`_) + +* **PR** `#30659`_: (`sjmh`_) Fix lsscsi issues for certain platforms + @ *2016-01-28 15:53:38 UTC* + + * 8d79d1b9c7 Merge pull request `#30659`_ from sjmh/fix-scsi + + * 3544dd995e Fix lsscsi issues for certain platforms + +* **ISSUE** `#18980`_: (`lrhazi`_) salt-cloud: ExtraData: unpack(b) received extra data. (refs: `#30671`_) + +* **PR** `#30671`_: (`techhat`_) Add file locking to cloud index + @ *2016-01-27 17:14:55 UTC* + + * 516919525a Merge pull request `#30671`_ from techhat/lockcloud + + * 4719f8d4ea Whitespace + + * 8e7eca23e4 Add file locking to cloud index + +* **ISSUE** `#28320`_: (`Grokzen`_) file.comment & file.uncomment changes file permissions on edit (refs: `#30586`_) + +* **PR** `#30586`_: (`abednarik`_) Fix comment_line permissions. + @ *2016-01-25 23:24:02 UTC* + + * 643c9c9616 Merge pull request `#30586`_ from abednarik/fix_comment_line_perms + + * 8b395a42cb Fix comment_line permissions. + +* **PR** `#30582`_: (`terminalmage`_) yumpkg.check_db: run separate repoquery commands when multiple names passed + @ *2016-01-24 17:15:04 UTC* + + * a823e21428 Merge pull request `#30582`_ from terminalmage/dnf-repoquery-multiple-targets + + * 410da789f9 yumpkg.check_db: run separate repoquery commands when multiple names passed + +* **PR** `#30548`_: (`jacobhammons`_) Added placeholder release notes for 2015.5.10 + @ *2016-01-22 18:36:01 UTC* + + * 8e56be7f4c Merge pull request `#30548`_ from jacobhammons/doc-fixes + + * 03c51bb54d Added placeholder release notes for 2015.5.10 Changed old doc links from docs.saltstack.org to docs.saltstack.com + +* **PR** `#30530`_: (`terminalmage`_) 2015.5 tweaks from `#30529`_ + @ *2016-01-22 16:26:21 UTC* + + * **PR** `#30529`_: (`terminalmage`_) Merge 2015.5 into 2015.8 (refs: `#30530`_) + + * 1aafd4c5b5 Merge pull request `#30530`_ from terminalmage/yumpkg-dnf-cleanup + + * 2586f71bcf 2015.5 tweaks from `#30529`_ + +* **ISSUE** `#23553`_: (`aboe76`_) dnf a new package provider for fedora 22 (refs: `#30484`_) + +* **PR** `#30484`_: (`terminalmage`_) Backport DNF support to 2015.5 branch + @ *2016-01-21 22:14:46 UTC* + + * 7798d42272 Merge pull request `#30484`_ from terminalmage/dnf-yumpkg-2015.5 + + * 330e26d1da Hide get_locked_packages + + * 5a637420e8 Backport DNF support to 2015.5 branch + +* **PR** `#30512`_: (`jfindlay`_) disable pkgrepo test for ubuntu 15.10+ + @ *2016-01-21 21:32:58 UTC* + + * b348f804b1 Merge pull request `#30512`_ from jfindlay/repo_test + + * 66f06f2bd3 disable pkgrepo test for ubuntu 15.10+ + +* **PR** `#30478`_: (`justinta`_) Updated pip_state to work with pip 8.0 + @ *2016-01-21 16:02:41 UTC* + + * a9348dfef8 Merge pull request `#30478`_ from jtand/pip_8_update + + * 6227368830 Convert version to int, instead of comparing strings to ints + + * 20384a4810 Added InstallationError to except block + + * baa274bca9 Updated pip_state to work with pip 8.0 + +* **ISSUE** `#30465`_: (`alandrees`_) Nested imports with pyobjects (refs: `#30482`_) + +* **PR** `#30482`_: (`borgstrom`_) Pyobjects recursive import support (for 2015.5) + @ *2016-01-21 15:54:32 UTC* + + * a30147c64f Merge pull request `#30482`_ from borgstrom/pyobjects_recursive + + * 2c55a7580b Fixup lint errors + + * b46df0e4b5 Allow recursive salt:// imports + + * 51bfa16173 Add test to prove that recursive imports are currently broken + +* **PR** `#30459`_: (`jfindlay`_) modules.pkg: disable repo int test for ubuntu 15.10 + @ *2016-01-20 16:41:12 UTC* + + * 5c7cc51937 Merge pull request `#30459`_ from jfindlay/pkg_tests + + * fb9972f590 modules.pkg: disable repo int test for ubuntu 15.10 + +* **PR** `#30443`_: (`justinta`_) Boto uses False for is_default instead of None + @ *2016-01-19 18:28:08 UTC* + + * dd2ceb4c07 Merge pull request `#30443`_ from jtand/boto_vpc_5 + + * 2f77152479 Boto uses False for is_default instead of None + +* **ISSUE** `#26833`_: (`twangboy`_) salt-cloud fails to spin up windows minion on 2015.8 Head (refs: `#26853`_) + +* **ISSUE** `#21256`_: (`dhs-rec`_) win.exe package for RH 6 (refs: `#26853`_) + +* **PR** `#30420`_: (`attiasr`_) Backport `#26853`_ + @ *2016-01-19 17:33:58 UTC* + + * **PR** `#26853`_: (`UtahDave`_) Fix salt-cloud on windows (refs: `#30420`_) + + * 62d9dddced Merge pull request `#30420`_ from attiasr/patch-1 + + * 4de343c5a1 Backport `#26853`_ + +* **ISSUE** `#30341`_: (`dnd`_) salt-cloud linode connection reset by peer (refs: `#30364`_) + +* **PR** `#30364`_: (`rallytime`_) Add TLS version imports and add linode driver documentation notices + @ *2016-01-14 19:04:47 UTC* + + * 5a923b3aa9 Merge pull request `#30364`_ from rallytime/fix-30341 + + * 79bcf151cb Add TLS version imports and add linode driver documentation notices + +* **ISSUE** `#28822`_: (`HerrBerg`_) saltenv url-parameter not working in file.managed for salt:// sources since 2015.8 (refs: `#30166`_) + +* **PR** `#30184`_: (`rallytime`_) Back-port `#30166`_ to 2015.5 + @ *2016-01-13 18:27:36 UTC* + + * **PR** `#30166`_: (`robgott`_) adding split_env call to cp.hash_file to pick up saltenv in file quer… (refs: `#30184`_) + + * f037fd9c27 Merge pull request `#30184`_ from rallytime/bp-30166 + + * fa6b1b3022 adding split_env call to cp.hash_file to pick up saltenv in file query parameter + +* **PR** `#30291`_: (`thegoodduke`_) ipset: fix test=true & add comment for every entry + @ *2016-01-12 19:40:23 UTC* + + * **PR** `#30170`_: (`thegoodduke`_) ipset: fix comment and test (refs: `#30291`_) + + * 1d8413fd2f Merge pull request `#30291`_ from thegoodduke/for_fix_ipset + + * 62d6ccf561 ipset: fix test=true & add comment for every entry + +.. _`#11497`: https://github.com/saltstack/salt/issues/11497 +.. _`#1409`: https://github.com/saltstack/salt/issues/1409 +.. _`#14`: https://github.com/saltstack/salt/issues/14 +.. _`#18980`: https://github.com/saltstack/salt/issues/18980 +.. _`#19659`: https://github.com/saltstack/salt/issues/19659 +.. _`#21256`: https://github.com/saltstack/salt/issues/21256 +.. _`#21932`: https://github.com/saltstack/salt/issues/21932 +.. _`#22580`: https://github.com/saltstack/salt/issues/22580 +.. _`#23553`: https://github.com/saltstack/salt/issues/23553 .. _`#23643`: https://github.com/saltstack/salt/issues/23643 +.. _`#23694`: https://github.com/saltstack/salt/issues/23694 .. _`#23714`: https://github.com/saltstack/salt/issues/23714 -.. _`#28262`: https://github.com/saltstack/salt/issues/28262 -.. _`#31369`: https://github.com/saltstack/salt/issues/31369 +.. _`#24575`: https://github.com/saltstack/salt/issues/24575 .. _`#24952`: https://github.com/saltstack/salt/pull/24952 +.. _`#26162`: https://github.com/saltstack/salt/issues/26162 .. _`#26170`: https://github.com/saltstack/salt/pull/26170 +.. _`#26574`: https://github.com/saltstack/salt/issues/26574 +.. _`#26833`: https://github.com/saltstack/salt/issues/26833 .. _`#26853`: https://github.com/saltstack/salt/pull/26853 .. _`#27952`: https://github.com/saltstack/salt/pull/27952 +.. _`#28262`: https://github.com/saltstack/salt/issues/28262 +.. _`#28320`: https://github.com/saltstack/salt/issues/28320 +.. _`#28438`: https://github.com/saltstack/salt/issues/28438 +.. _`#28751`: https://github.com/saltstack/salt/issues/28751 +.. _`#28822`: https://github.com/saltstack/salt/issues/28822 +.. _`#28951`: https://github.com/saltstack/salt/issues/28951 .. _`#29467`: https://github.com/saltstack/salt/pull/29467 .. _`#30166`: https://github.com/saltstack/salt/pull/30166 .. _`#30170`: https://github.com/saltstack/salt/pull/30170 +.. _`#30183`: https://github.com/saltstack/salt/issues/30183 .. _`#30184`: https://github.com/saltstack/salt/pull/30184 .. _`#30291`: https://github.com/saltstack/salt/pull/30291 +.. _`#30341`: https://github.com/saltstack/salt/issues/30341 .. _`#30364`: https://github.com/saltstack/salt/pull/30364 .. _`#30420`: https://github.com/saltstack/salt/pull/30420 .. _`#30443`: https://github.com/saltstack/salt/pull/30443 .. _`#30459`: https://github.com/saltstack/salt/pull/30459 +.. _`#30465`: https://github.com/saltstack/salt/issues/30465 .. _`#30478`: https://github.com/saltstack/salt/pull/30478 .. _`#30482`: https://github.com/saltstack/salt/pull/30482 .. _`#30484`: https://github.com/saltstack/salt/pull/30484 @@ -313,11 +1211,16 @@ Changes: .. _`#30529`: https://github.com/saltstack/salt/pull/30529 .. _`#30530`: https://github.com/saltstack/salt/pull/30530 .. _`#30548`: https://github.com/saltstack/salt/pull/30548 +.. _`#30559`: https://github.com/saltstack/salt/issues/30559 +.. _`#30560`: https://github.com/saltstack/salt/issues/30560 +.. _`#30565`: https://github.com/saltstack/salt/issues/30565 .. _`#30582`: https://github.com/saltstack/salt/pull/30582 .. _`#30586`: https://github.com/saltstack/salt/pull/30586 .. _`#30659`: https://github.com/saltstack/salt/pull/30659 .. _`#30671`: https://github.com/saltstack/salt/pull/30671 .. _`#30699`: https://github.com/saltstack/salt/pull/30699 +.. _`#30722`: https://github.com/saltstack/salt/issues/30722 +.. _`#30739`: https://github.com/saltstack/salt/issues/30739 .. _`#30749`: https://github.com/saltstack/salt/pull/30749 .. _`#30757`: https://github.com/saltstack/salt/pull/30757 .. _`#30760`: https://github.com/saltstack/salt/pull/30760 @@ -325,14 +1228,18 @@ Changes: .. _`#30784`: https://github.com/saltstack/salt/pull/30784 .. _`#30829`: https://github.com/saltstack/salt/pull/30829 .. _`#30831`: https://github.com/saltstack/salt/pull/30831 +.. _`#30840`: https://github.com/saltstack/salt/issues/30840 .. _`#30865`: https://github.com/saltstack/salt/pull/30865 .. _`#30897`: https://github.com/saltstack/salt/pull/30897 +.. _`#30900`: https://github.com/saltstack/salt/issues/30900 .. _`#30922`: https://github.com/saltstack/salt/pull/30922 .. _`#30942`: https://github.com/saltstack/salt/pull/30942 .. _`#30949`: https://github.com/saltstack/salt/pull/30949 .. _`#30974`: https://github.com/saltstack/salt/pull/30974 +.. _`#31001`: https://github.com/saltstack/salt/issues/31001 .. _`#31032`: https://github.com/saltstack/salt/pull/31032 .. _`#31110`: https://github.com/saltstack/salt/pull/31110 +.. _`#31174`: https://github.com/saltstack/salt/issues/31174 .. _`#31176`: https://github.com/saltstack/salt/pull/31176 .. _`#31183`: https://github.com/saltstack/salt/pull/31183 .. _`#31250`: https://github.com/saltstack/salt/pull/31250 @@ -340,6 +1247,8 @@ Changes: .. _`#31288`: https://github.com/saltstack/salt/pull/31288 .. _`#31336`: https://github.com/saltstack/salt/pull/31336 .. _`#31339`: https://github.com/saltstack/salt/pull/31339 +.. _`#31356`: https://github.com/saltstack/salt/issues/31356 +.. _`#31369`: https://github.com/saltstack/salt/issues/31369 .. _`#31374`: https://github.com/saltstack/salt/pull/31374 .. _`#31382`: https://github.com/saltstack/salt/pull/31382 .. _`#31416`: https://github.com/saltstack/salt/pull/31416 @@ -349,20 +1258,29 @@ Changes: .. _`#31461`: https://github.com/saltstack/salt/pull/31461 .. _`#31472`: https://github.com/saltstack/salt/pull/31472 .. _`#31497`: https://github.com/saltstack/salt/pull/31497 +.. _`#31501`: https://github.com/saltstack/salt/issues/31501 .. _`#31521`: https://github.com/saltstack/salt/pull/31521 .. _`#31558`: https://github.com/saltstack/salt/pull/31558 .. _`#31578`: https://github.com/saltstack/salt/pull/31578 +.. _`#31614`: https://github.com/saltstack/salt/issues/31614 +.. _`#31619`: https://github.com/saltstack/salt/issues/31619 .. _`#31622`: https://github.com/saltstack/salt/pull/31622 .. _`#31655`: https://github.com/saltstack/salt/pull/31655 .. _`#31658`: https://github.com/saltstack/salt/pull/31658 .. _`#31660`: https://github.com/saltstack/salt/pull/31660 +.. _`#31666`: https://github.com/saltstack/salt/issues/31666 +.. _`#31671`: https://github.com/saltstack/salt/issues/31671 .. _`#31682`: https://github.com/saltstack/salt/pull/31682 .. _`#31683`: https://github.com/saltstack/salt/pull/31683 .. _`#31687`: https://github.com/saltstack/salt/pull/31687 .. _`#31689`: https://github.com/saltstack/salt/pull/31689 +.. _`#31729`: https://github.com/saltstack/salt/issues/31729 +.. _`#31731`: https://github.com/saltstack/salt/issues/31731 .. _`#31740`: https://github.com/saltstack/salt/pull/31740 .. _`#31744`: https://github.com/saltstack/salt/pull/31744 +.. _`#31749`: https://github.com/saltstack/salt/issues/31749 .. _`#31750`: https://github.com/saltstack/salt/pull/31750 +.. _`#31788`: https://github.com/saltstack/salt/issues/31788 .. _`#31810`: https://github.com/saltstack/salt/pull/31810 .. _`#31825`: https://github.com/saltstack/salt/pull/31825 .. _`#31826`: https://github.com/saltstack/salt/pull/31826 @@ -370,18 +1288,25 @@ Changes: .. _`#31833`: https://github.com/saltstack/salt/pull/31833 .. _`#31834`: https://github.com/saltstack/salt/pull/31834 .. _`#31852`: https://github.com/saltstack/salt/pull/31852 +.. _`#31867`: https://github.com/saltstack/salt/issues/31867 .. _`#31878`: https://github.com/saltstack/salt/pull/31878 .. _`#31900`: https://github.com/saltstack/salt/pull/31900 .. _`#31912`: https://github.com/saltstack/salt/pull/31912 .. _`#31929`: https://github.com/saltstack/salt/pull/31929 .. _`#31935`: https://github.com/saltstack/salt/pull/31935 .. _`#31957`: https://github.com/saltstack/salt/pull/31957 +.. _`#31963`: https://github.com/saltstack/salt/issues/31963 .. _`#31972`: https://github.com/saltstack/salt/pull/31972 +.. _`#31976`: https://github.com/saltstack/salt/issues/31976 .. _`#32002`: https://github.com/saltstack/salt/pull/32002 +.. _`#32037`: https://github.com/saltstack/salt/issues/32037 .. _`#32038`: https://github.com/saltstack/salt/pull/32038 +.. _`#32044`: https://github.com/saltstack/salt/issues/32044 .. _`#32051`: https://github.com/saltstack/salt/pull/32051 +.. _`#32052`: https://github.com/saltstack/salt/issues/32052 .. _`#32056`: https://github.com/saltstack/salt/pull/32056 .. _`#32065`: https://github.com/saltstack/salt/pull/32065 +.. _`#32066`: https://github.com/saltstack/salt/issues/32066 .. _`#32096`: https://github.com/saltstack/salt/pull/32096 .. _`#32100`: https://github.com/saltstack/salt/pull/32100 .. _`#32104`: https://github.com/saltstack/salt/pull/32104 @@ -393,15 +1318,21 @@ Changes: .. _`#32165`: https://github.com/saltstack/salt/pull/32165 .. _`#32170`: https://github.com/saltstack/salt/pull/32170 .. _`#32196`: https://github.com/saltstack/salt/pull/32196 +.. _`#32198`: https://github.com/saltstack/salt/issues/32198 .. _`#32218`: https://github.com/saltstack/salt/pull/32218 .. _`#32223`: https://github.com/saltstack/salt/pull/32223 +.. _`#32250`: https://github.com/saltstack/salt/issues/32250 .. _`#32284`: https://github.com/saltstack/salt/pull/32284 .. _`#32293`: https://github.com/saltstack/salt/pull/32293 +.. _`#32301`: https://github.com/saltstack/salt/issues/32301 .. _`#32302`: https://github.com/saltstack/salt/pull/32302 .. _`#32339`: https://github.com/saltstack/salt/pull/32339 .. _`#32374`: https://github.com/saltstack/salt/pull/32374 .. _`#32376`: https://github.com/saltstack/salt/pull/32376 +.. _`#32381`: https://github.com/saltstack/salt/issues/32381 .. _`#32399`: https://github.com/saltstack/salt/pull/32399 +.. _`#32400`: https://github.com/saltstack/salt/issues/32400 +.. _`#32413`: https://github.com/saltstack/salt/issues/32413 .. _`#32418`: https://github.com/saltstack/salt/pull/32418 .. _`#32421`: https://github.com/saltstack/salt/pull/32421 .. _`#32454`: https://github.com/saltstack/salt/pull/32454 @@ -411,9 +1342,11 @@ Changes: .. _`#32552`: https://github.com/saltstack/salt/pull/32552 .. _`#32561`: https://github.com/saltstack/salt/pull/32561 .. _`#32590`: https://github.com/saltstack/salt/pull/32590 +.. _`#32612`: https://github.com/saltstack/salt/issues/32612 .. _`#32638`: https://github.com/saltstack/salt/pull/32638 .. _`#32639`: https://github.com/saltstack/salt/pull/32639 .. _`#32657`: https://github.com/saltstack/salt/pull/32657 +.. _`#32661`: https://github.com/saltstack/salt/issues/32661 .. _`#32667`: https://github.com/saltstack/salt/pull/32667 .. _`#32675`: https://github.com/saltstack/salt/pull/32675 .. _`#32686`: https://github.com/saltstack/salt/pull/32686 @@ -430,13 +1363,17 @@ Changes: .. _`#33055`: https://github.com/saltstack/salt/pull/33055 .. _`#33060`: https://github.com/saltstack/salt/pull/33060 .. _`#33067`: https://github.com/saltstack/salt/pull/33067 +.. _`#33074`: https://github.com/saltstack/salt/issues/33074 .. _`#33078`: https://github.com/saltstack/salt/pull/33078 .. _`#33080`: https://github.com/saltstack/salt/pull/33080 +.. _`#33085`: https://github.com/saltstack/salt/issues/33085 +.. _`#33118`: https://github.com/saltstack/salt/issues/33118 .. _`#33132`: https://github.com/saltstack/salt/pull/33132 .. _`#33137`: https://github.com/saltstack/salt/pull/33137 .. _`#33141`: https://github.com/saltstack/salt/pull/33141 .. _`#33155`: https://github.com/saltstack/salt/pull/33155 .. _`#33160`: https://github.com/saltstack/salt/pull/33160 +.. _`#33163`: https://github.com/saltstack/salt/issues/33163 .. _`#33178`: https://github.com/saltstack/salt/pull/33178 .. _`#33180`: https://github.com/saltstack/salt/pull/33180 .. _`#33181`: https://github.com/saltstack/salt/pull/33181 @@ -445,6 +1382,7 @@ Changes: .. _`#33205`: https://github.com/saltstack/salt/pull/33205 .. _`#33211`: https://github.com/saltstack/salt/pull/33211 .. _`#33236`: https://github.com/saltstack/salt/pull/33236 +.. _`#33276`: https://github.com/saltstack/salt/issues/33276 .. _`#33282`: https://github.com/saltstack/salt/pull/33282 .. _`#33286`: https://github.com/saltstack/salt/pull/33286 .. _`#33287`: https://github.com/saltstack/salt/pull/33287 @@ -454,7 +1392,101 @@ Changes: .. _`#33341`: https://github.com/saltstack/salt/pull/33341 .. _`#33372`: https://github.com/saltstack/salt/pull/33372 .. _`#33375`: https://github.com/saltstack/salt/pull/33375 +.. _`#33376`: https://github.com/saltstack/salt/issues/33376 .. _`#33379`: https://github.com/saltstack/salt/pull/33379 .. _`#33383`: https://github.com/saltstack/salt/pull/33383 .. _`#33386`: https://github.com/saltstack/salt/pull/33386 .. _`#33405`: https://github.com/saltstack/salt/pull/33405 +.. _`#33412`: https://github.com/saltstack/salt/pull/33412 +.. _`AndrewPashkin`: https://github.com/AndrewPashkin +.. _`BrandKNY`: https://github.com/BrandKNY +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`ClaudiuPID`: https://github.com/ClaudiuPID +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`Grokzen`: https://github.com/Grokzen +.. _`HeathNaylor`: https://github.com/HeathNaylor +.. _`HerrBerg`: https://github.com/HerrBerg +.. _`ScoreUnder`: https://github.com/ScoreUnder +.. _`TheNullByte`: https://github.com/TheNullByte +.. _`UtahDave`: https://github.com/UtahDave +.. _`abednarik`: https://github.com/abednarik +.. _`aboe76`: https://github.com/aboe76 +.. _`alandrees`: https://github.com/alandrees +.. _`alexxannar`: https://github.com/alexxannar +.. _`amontalban`: https://github.com/amontalban +.. _`anlutro`: https://github.com/anlutro +.. _`attiasr`: https://github.com/attiasr +.. _`basepi`: https://github.com/basepi +.. _`borgstrom`: https://github.com/borgstrom +.. _`brejoc`: https://github.com/brejoc +.. _`bstevenson`: https://github.com/bstevenson +.. _`cachedout`: https://github.com/cachedout +.. _`carlwgeorge`: https://github.com/carlwgeorge +.. _`clinta`: https://github.com/clinta +.. _`commutecat`: https://github.com/commutecat +.. _`crocket`: https://github.com/crocket +.. _`damon-atkins`: https://github.com/damon-atkins +.. _`dergrunepunkt`: https://github.com/dergrunepunkt +.. _`dhs-rec`: https://github.com/dhs-rec +.. _`dnd`: https://github.com/dnd +.. _`eeaston`: https://github.com/eeaston +.. _`efficks`: https://github.com/efficks +.. _`falzm`: https://github.com/falzm +.. _`fmnisme`: https://github.com/fmnisme +.. _`frizzby`: https://github.com/frizzby +.. _`gerhardqux`: https://github.com/gerhardqux +.. _`gmolight`: https://github.com/gmolight +.. _`goatjam`: https://github.com/goatjam +.. _`grep4linux`: https://github.com/grep4linux +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`guettli`: https://github.com/guettli +.. _`heaje`: https://github.com/heaje +.. _`heyfife`: https://github.com/heyfife +.. _`ikryten`: https://github.com/ikryten +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jakehilton`: https://github.com/jakehilton +.. _`jaybocc2`: https://github.com/jaybocc2 +.. _`jfindlay`: https://github.com/jfindlay +.. _`justinta`: https://github.com/justinta +.. _`kaidokert`: https://github.com/kaidokert +.. _`lomeroe`: https://github.com/lomeroe +.. _`lorengordon`: https://github.com/lorengordon +.. _`lrhazi`: https://github.com/lrhazi +.. _`mchugh19`: https://github.com/mchugh19 +.. _`milan-milo`: https://github.com/milan-milo +.. _`moltob`: https://github.com/moltob +.. _`mtorromeo`: https://github.com/mtorromeo +.. _`naemono`: https://github.com/naemono +.. _`nmadhok`: https://github.com/nmadhok +.. _`notpeter`: https://github.com/notpeter +.. _`olfway`: https://github.com/olfway +.. _`oliver-dungey`: https://github.com/oliver-dungey +.. _`paclat`: https://github.com/paclat +.. _`palica`: https://github.com/palica +.. _`pcn`: https://github.com/pcn +.. _`phistrom`: https://github.com/phistrom +.. _`rallytime`: https://github.com/rallytime +.. _`robgott`: https://github.com/robgott +.. _`robnagler`: https://github.com/robnagler +.. _`ryanwalder`: https://github.com/ryanwalder +.. _`sacren`: https://github.com/sacren +.. _`saltstack/salt#28262`: https://github.com/saltstack/salt/issues/28262 +.. _`saltuser`: https://github.com/saltuser +.. _`sastorsl`: https://github.com/sastorsl +.. _`serge-p`: https://github.com/serge-p +.. _`sjmh`: https://github.com/sjmh +.. _`sjorge`: https://github.com/sjorge +.. _`tbaker57`: https://github.com/tbaker57 +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`thegoodduke`: https://github.com/thegoodduke +.. _`tmehlinger`: https://github.com/tmehlinger +.. _`toanju`: https://github.com/toanju +.. _`tomwalsh`: https://github.com/tomwalsh +.. _`twangboy`: https://github.com/twangboy +.. _`twinshadow`: https://github.com/twinshadow +.. _`vakulich`: https://github.com/vakulich +.. _`whiteinge`: https://github.com/whiteinge +.. _`wonderslug`: https://github.com/wonderslug +.. _`yannis666`: https://github.com/yannis666 diff --git a/doc/topics/releases/2015.5.2.rst b/doc/topics/releases/2015.5.2.rst index 5c3d5f8cb9..0c5a91cbc6 100644 --- a/doc/topics/releases/2015.5.2.rst +++ b/doc/topics/releases/2015.5.2.rst @@ -6,969 +6,1084 @@ Salt 2015.5.2 Release Notes Version 2015.5.2 is a bugfix release for :ref:`2015.5.0`. -Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): -**PR** `#24346`_: (*rallytime*) Backport `#24271`_ to 2015.5 - @ *2015-06-03T18:44:31Z* +Statistics +========== - **PR** `#24271`_: (*randybias*) Fixed the setup instructions - | refs: `#24346`_ - * 76927c9 Merge pull request `#24346`_ from rallytime/`bp-24271`_ - * 04067b6 Fixed the setup instructions +- Total Merges: **112** +- Total Issue References: **36** +- Total PR References: **145** -**PR** `#24345`_: (*rallytime*) Backport `#24013`_ to 2015.5 - @ *2015-06-03T18:39:41Z* +- Contributors: **49** (`Sacro`_, `The-Loeki`_, `YanChii`_, `aboe76`_, `anlutro`_, `awdrius`_, `basepi`_, `cdarwin`_, `cedwards`_, `clan`_, `corywright`_, `cro`_, `djcrabhat`_, `dmyerscough`_, `dr4Ke`_, `fayetted`_, `galet`_, `garethgreenaway`_, `ghost`_, `hazelesque`_, `hvnsweeting`_, `jacksontj`_, `jacobhammons`_, `jayeshka`_, `jbq`_, `jfindlay`_, `joejulian`_, `justinta`_, `kartiksubbarao`_, `kiorky`_, `merll`_, `msteed`_, `neogenix`_, `nicholascapo`_, `nleib`_, `pengyao`_, `pruiz`_, `rallytime`_, `randybias`_, `ryan-lane`_, `steverweber`_, `swdream`_, `techhat`_, `terminalmage`_, `thcipriani`_, `thusoy`_, `trevor-h`_, `twangboy`_, `whiteinge`_) - **ISSUE** `#24012`_: (*jbq*) Enabling a service does not create the appropriate rc.d symlinks on Ubuntu - | refs: `#24013`_ - **PR** `#24013`_: (*jbq*) Fix enabling a service on Ubuntu `#24012`_ - | refs: `#24345`_ - * 4afa03d Merge pull request `#24345`_ from rallytime/`bp-24013`_ - * 16e0732 Fix enabling a service on Ubuntu `#24012`_ -**PR** `#24365`_: (*jacobhammons*) Fixes for PDF build errors - @ *2015-06-03T17:50:02Z* +Changelog for v2015.5.1..v2015.5.2 +================================== - * c3392c2 Merge pull request `#24365`_ from jacobhammons/DocFixes - * 0fc1902 Fixes for PDF build errors +*Generated at: 2018-05-27 21:13:02 UTC* -**PR** `#24313`_: (*nicholascapo*) Fix `#22991`_ Correctly set result when test=True - @ *2015-06-03T14:49:18Z* +* **PR** `#24372`_: (`rallytime`_) Add 2015.5.2 release notes + @ *2015-06-03 19:30:46 UTC* - **ISSUE** `#22991`_: (*nicholascapo*) npm.installed ignores test=True - * ae681a4 Merge pull request `#24313`_ from nicholascapo/`fix-22991`_-npm.installed-test-true - * ac9644c Fix `#22991`_ npm.installed correctly set result on test=True + * d71d75e2ec Merge pull request `#24372`_ from rallytime/release_notes -**PR** `#24312`_: (*nicholascapo*) Fix `#18966`_: file.serialize supports test=True - @ *2015-06-03T14:49:06Z* + * f5ec1a1693 Add 2015.5.2 release notes - **ISSUE** `#18966`_: (*bechtoldt*) file.serialize ignores test=True - * d57a9a2 Merge pull request `#24312`_ from nicholascapo/`fix-18966`_-file.serialize-test-true - * e7328e7 Fix `#18966`_ file.serialize correctly set result on test=True +* **PR** `#24346`_: (`rallytime`_) Backport `#24271`_ to 2015.5 + @ *2015-06-03 18:44:31 UTC* -**PR** `#24302`_: (*jfindlay*) fix pkg hold/unhold integration test - @ *2015-06-03T03:27:43Z* + * **PR** `#24271`_: (`randybias`_) Fixed the setup instructions (refs: `#24346`_) - * 6b694e3 Merge pull request `#24302`_ from jfindlay/pkg_tests - * c2db0b1 fix pkg hold/unhold integration test + * 76927c9ea1 Merge pull request `#24346`_ from rallytime/bp-24271 -**PR** `#24349`_: (*rallytime*) Remove references to mount_points in ec2 docs - @ *2015-06-03T01:54:09Z* + * 04067b6833 Fixed the setup instructions - **ISSUE** `#14021`_: (*mathrawka*) EC2 doc mentions mount_point, but unable to use properly - | refs: `#24349`_ - * aca8447 Merge pull request `#24349`_ from rallytime/`fix-14021`_ - * a235b11 Remove references to mount_points in ec2 docs +* **ISSUE** `#24012`_: (`jbq`_) Enabling a service does not create the appropriate rc.d symlinks on Ubuntu (refs: `#24013`_) -**PR** `#24328`_: (*dr4Ke*) Fix state grains silently fails 2015.5 - @ *2015-06-02T15:18:46Z* +* **PR** `#24345`_: (`rallytime`_) Backport `#24013`_ to 2015.5 + @ *2015-06-03 18:39:41 UTC* - **ISSUE** `#24319`_: (*dr4Ke*) grains state shouldn't fail silently - * 88a997e Merge pull request `#24328`_ from dr4Ke/fix_state_grains_silently_fails_2015.5 - * 8a63d1e fix state grains silently fails `#24319`_ + * **PR** `#24013`_: (`jbq`_) Fix enabling a service on Ubuntu `#24012`_ (refs: `#24345`_) - * ca1af20 grains state: add some tests + * 4afa03d8e3 Merge pull request `#24345`_ from rallytime/bp-24013 -**PR** `#24310`_: (*techhat*) Add warning about destroying maps - @ *2015-06-02T03:01:28Z* + * 16e0732b50 Fix enabling a service on Ubuntu `#24012`_ - **ISSUE** `#24036`_: (*arthurlogilab*) [salt-cloud] Protect against passing command line arguments as names for the --destroy command in map files - | refs: `#24310`_ - **ISSUE** `#9772`_: (*s0undt3ch*) Delete VM's in a map does not delete them all - | refs: `#24310`_ - * 7dcd9bb Merge pull request `#24310`_ from techhat/mapwarning - * ca535a6 Add warning about destroying maps +* **PR** `#24365`_: (`jacobhammons`_) Fixes for PDF build errors + @ *2015-06-03 17:50:02 UTC* -**PR** `#24281`_: (*steverweber*) Ipmi docfix - @ *2015-06-01T17:45:36Z* + * c3392c246a Merge pull request `#24365`_ from jacobhammons/DocFixes - * 02bfb25 Merge pull request `#24281`_ from steverweber/ipmi_docfix - * dd36f2c yaml formatting + * 0fc190267f Fixes for PDF build errors - * f6deef3 include api_kg kwarg in ipmi state +* **ISSUE** `#22991`_: (`nicholascapo`_) npm.installed ignores test=True (refs: `#24313`_) - * a7d4e97 doc cleanup +* **PR** `#24313`_: (`nicholascapo`_) Fix `#22991`_ Correctly set result when test=True + @ *2015-06-03 14:49:18 UTC* - * 0ded2fd save more cleanup to doc + * ae681a4db1 Merge pull request `#24313`_ from nicholascapo/fix-22991-npm.installed-test-true - * 08872f2 fix name api_key to api_kg + * ac9644cb19 Fix `#22991`_ npm.installed correctly set result on test=True - * 165a387 doc fix add api_kg kwargs +* **ISSUE** `#18966`_: (`bechtoldt`_) file.serialize ignores test=True (refs: `#24312`_) - * 1ec7888 cleanup docs +* **PR** `#24312`_: (`nicholascapo`_) Fix `#18966`_: file.serialize supports test=True + @ *2015-06-03 14:49:06 UTC* -**PR** `#24287`_: (*jfindlay*) fix pkg test on ubuntu 12.04 for realz - @ *2015-06-01T14:16:37Z* + * d57a9a267c Merge pull request `#24312`_ from nicholascapo/fix-18966-file.serialize-test-true - * 73cd2cb Merge pull request `#24287`_ from jfindlay/pkg_test - * 98944d8 fix pkg test on ubuntu 12.04 for realz + * e7328e7043 Fix `#18966`_ file.serialize correctly set result on test=True -**PR** `#24279`_: (*rallytime*) Backport `#24263`_ to 2015.5 - @ *2015-06-01T04:29:34Z* +* **PR** `#24302`_: (`jfindlay`_) fix pkg hold/unhold integration test + @ *2015-06-03 03:27:43 UTC* - **PR** `#24263`_: (*cdarwin*) Correct usage of import_yaml in formula documentation - | refs: `#24279`_ - * 02017a0 Merge pull request `#24279`_ from rallytime/`bp-24263`_ - * beff7c7 Correct usage of import_yaml in formula documentation + * 6b694e3495 Merge pull request `#24302`_ from jfindlay/pkg_tests -**PR** `#24277`_: (*rallytime*) Put a space between after_jump commands - @ *2015-06-01T04:28:26Z* + * c2db0b1758 fix pkg hold/unhold integration test - **ISSUE** `#24226`_: (*c4urself*) iptables state needs to keep ordering of flags - | refs: `#24277`_ - * 2ba696d Merge pull request `#24277`_ from rallytime/fix_iptables_jump - * e2d1606 Move after_jump split out of loop +* **ISSUE** `#14021`_: (`emostar`_) EC2 doc mentions mount_point, but unable to use properly (refs: `#24349`_) - * d14f130 Remove extra loop +* **PR** `#24349`_: (`rallytime`_) Remove references to mount_points in ec2 docs + @ *2015-06-03 01:54:09 UTC* - * 42ed532 Put a space between after_jump commands + * aca8447ced Merge pull request `#24349`_ from rallytime/fix-14021 -**PR** `#24262`_: (*basepi*) More dictupdate after `#24142`_ - @ *2015-05-31T04:09:37Z* + * a235b114d7 Remove references to mount_points in ec2 docs - **PR** `#24142`_: (*basepi*) Optimize dictupdate.update and add `#24097`_ functionality - | refs: `#24262`_ - **PR** `#24097`_: (*kiorky*) Optimize dictupdate - | refs: `#24142`_ `#24142`_ - * 113eba3 Merge pull request `#24262`_ from basepi/dictupdatefix - * 0c4832c Raise a typeerror if non-dict types +* **PR** `#24328`_: (`dr4Ke`_) Fix state grains silently fails 2015.5 + @ *2015-06-02 15:18:46 UTC* - * be21aaa Pylint + * 88a997e6ee Merge pull request `#24328`_ from dr4Ke/fix_state_grains_silently_fails_2015.5 - * bb8a6c6 More optimization + * 8a63d1ebbe fix state grains silently fails `#24319`_ - * c933249 py3 compat + * ca1af20203 grains state: add some tests - * ff6b2a7 Further optimize dictupdate.update() +* **ISSUE** `#9772`_: (`s0undt3ch`_) Delete VM's in a map does not delete them all (refs: `#24310`_) - * c73f5ba Remove unused valtype +* **ISSUE** `#24036`_: (`arthurlogilab`_) [salt-cloud] Protect against passing command line arguments as names for the --destroy command in map files (refs: `#24310`_) -**PR** `#24269`_: (*kiorky*) zfs: Fix spurious retcode hijacking in virtual - @ *2015-05-30T17:47:49Z* +* **PR** `#24310`_: (`techhat`_) Add warning about destroying maps + @ *2015-06-02 03:01:28 UTC* - * 785d5a1 Merge pull request `#24269`_ from makinacorpus/zfs - * 0bf23ce zfs: Fix spurious retcode hijacking in virtual + * 7dcd9bb5de Merge pull request `#24310`_ from techhat/mapwarning -**PR** `#24257`_: (*jfindlay*) fix pkg mod integration test on ubuntu 12.04 - @ *2015-05-29T23:09:00Z* + * ca535a6ff4 Add warning about destroying maps - * 3d885c0 Merge pull request `#24257`_ from jfindlay/pkg_tests - * 9508924 fix pkg mod integration test on ubuntu 12.04 +* **PR** `#24281`_: (`steverweber`_) Ipmi docfix + @ *2015-06-01 17:45:36 UTC* -**PR** `#24260`_: (*basepi*) Fix some typos from `#24080`_ - @ *2015-05-29T22:54:58Z* + * 02bfb254d6 Merge pull request `#24281`_ from steverweber/ipmi_docfix - **ISSUE** `#23657`_: (*arthurlogilab*) [salt-cloud lxc] NameError: global name '__salt__' is not defined - | refs: `#24080`_ `#23982`_ - **PR** `#24080`_: (*kiorky*) Lxc consistency2 - | refs: `#24260`_ `#23982`_ `#24066`_ - **PR** `#24066`_: (*kiorky*) Merge forward 2015.5 -> develop - | refs: `#23982`_ - **PR** `#24065`_: (*kiorky*) continue to fix `#23883`_ - | refs: `#24080`_ `#24066`_ - **PR** `#23982`_: (*kiorky*) lxc: path support - | refs: `#24080`_ - * 08a1075 Merge pull request `#24260`_ from basepi/lxctypos24080 - * 0fa1ad3 Fix another lxc typo + * dd36f2c555 yaml formating - * 669938f s/you ll/you'll/ + * f6deef3047 include api_kg kwarg in ipmi state -**PR** `#24080`_: (*kiorky*) Lxc consistency2 - | refs: `#24260`_ `#23982`_ `#24066`_ - @ *2015-05-29T22:51:54Z* + * a7d4e97bb9 doc cleanup - **ISSUE** `#23657`_: (*arthurlogilab*) [salt-cloud lxc] NameError: global name '__salt__' is not defined - | refs: `#24080`_ `#23982`_ - **PR** `#24066`_: (*kiorky*) Merge forward 2015.5 -> develop - | refs: `#23982`_ - **PR** `#24065`_: (*kiorky*) continue to fix `#23883`_ - | refs: `#24080`_ `#24066`_ - **PR** `#23982`_: (*kiorky*) lxc: path support - | refs: `#24080`_ - * 75590cf Merge pull request `#24080`_ from makinacorpus/lxc_consistency2 - * 81f8067 lxc: fix old lxc test + * 0ded2fdbef save more cleanup to doc - * 458f506 seed: lint + * 08872f2da3 fix name api_key to api_kg - * 96b8d55 Fix seed.mkconfig yamldump + * 165a387681 doc fix add api_kg kwargs - * 76ddb68 lxc/applynet: conservative + * 1ec78887e4 cleanup docs - * ce7096f variable collision +* **PR** `#24287`_: (`jfindlay`_) fix pkg test on ubuntu 12.04 for realz + @ *2015-06-01 14:16:37 UTC* - * 8a8b28d lxc: lint + * 73cd2cbe1f Merge pull request `#24287`_ from jfindlay/pkg_test - * 458b18b more lxc docs + * 98944d8c7f fix pkg test on ubuntu 12.04 for realz - * ef1f952 lxc docs: typos +* **PR** `#24279`_: (`rallytime`_) Backport `#24263`_ to 2015.5 + @ *2015-06-01 04:29:34 UTC* - * d67a43d more lxc docs + * **PR** `#24263`_: (`cdarwin`_) Correct usage of import_yaml in formula documentation (refs: `#24279`_) - * 608da5e modules/lxc: merge resolution + * 02017a074c Merge pull request `#24279`_ from rallytime/bp-24263 - * 27c4689 modules/lxc: more consistent comparison + * beff7c7785 Correct usage of import_yaml in formula documentation - * 07c365a lxc: merge conflict spotted +* **ISSUE** `#24226`_: (`c4urself`_) iptables state needs to keep ordering of flags (refs: `#24277`_) - * 9993915 modules/lxc: rework settings for consistency +* **PR** `#24277`_: (`rallytime`_) Put a space between after_jump commands + @ *2015-06-01 04:28:26 UTC* - * ce11d83 lxc: Global doc refresh + * 2ba696d54a Merge pull request `#24277`_ from rallytime/fix_iptables_jump - * 61ed2f5 clouds/lxc: profile key is conflicting + * e2d1606b19 Move after_jump split out of loop -**PR** `#24247`_: (*rallytime*) Backport `#24220`_ to 2015.5 - @ *2015-05-29T21:40:01Z* + * d14f1307b6 Remove extra loop - **ISSUE** `#24210`_: (*damonnk*) salt-cloud vsphere.py should allow key_filename param - | refs: `#24220`_ - **PR** `#24220`_: (*djcrabhat*) adding key_filename param to vsphere provider - | refs: `#24247`_ - * da14f3b Merge pull request `#24247`_ from rallytime/`bp-24220`_ - * 0b1041d adding key_filename param to vsphere provider + * 42ed5320b6 Put a space between after_jump commands -**PR** `#24254`_: (*rallytime*) Add deprecation warning to Digital Ocean v1 Driver - @ *2015-05-29T21:39:25Z* +* **PR** `#24262`_: (`basepi`_) More dictupdate after `#24142`_ + @ *2015-05-31 04:09:37 UTC* - **PR** `#22731`_: (*dmyerscough*) Decommission DigitalOcean APIv1 and have users use the new DigitalOcean APIv2 - | refs: `#24254`_ - * 21d6126 Merge pull request `#24254`_ from rallytime/add_deprecation_warning_digitalocean - * cafe37b Add note to docs about deprecation + * **PR** `#24142`_: (`basepi`_) Optimize dictupdate.update and add `#24097`_ functionality (refs: `#24262`_) - * ea0f1e0 Add deprecation warning to digital ocean driver to move to digital_ocean_v2 + * **PR** `#24097`_: (`kiorky`_) Optimize dictupdate (refs: `#24142`_) -**PR** `#24252`_: (*aboe76*) Updated suse spec to 2015.5.1 - @ *2015-05-29T21:38:45Z* + * 113eba34ec Merge pull request `#24262`_ from basepi/dictupdatefix - * dac055d Merge pull request `#24252`_ from aboe76/opensuse_package - * 0ad617d Updated suse spec to 2015.5.1 + * 0c4832c0d4 Raise a typeerror if non-dict types -**PR** `#24251`_: (*garethgreenaway*) Returners broken in 2015.5 - @ *2015-05-29T21:37:52Z* + * be21aaa122 Pylint - * 49e7fe8 Merge pull request `#24251`_ from garethgreenaway/2015_5_returner_brokenness - * 5df6b52 The code calling cfg as a function vs treating it as a dictionary and using get is currently backwards causing returners to fail when used from the CLI and in scheduled jobs. + * bb8a6c6cc9 More optimization -**PR** `#24255`_: (*rallytime*) Clarify digital ocean documentation and mention v1 driver deprecation - @ *2015-05-29T21:37:07Z* + * c933249d1a py3 compat - **ISSUE** `#21498`_: (*rallytime*) Clarify Digital Ocean Documentation - | refs: `#24255`_ - * bfb9461 Merge pull request `#24255`_ from rallytime/clarify_digital_ocean_driver_docs - * 8d51f75 Clarify digital ocean documentation and mention v1 driver deprecation + * ff6b2a781f Further optimize dictupdate.update() -**PR** `#24232`_: (*rallytime*) Backport `#23308`_ to 2015.5 - @ *2015-05-29T21:36:46Z* + * c73f5ba37c Remove unused valtype - **PR** `#23308`_: (*thusoy*) Don't merge: Add missing jump arguments to iptables module - | refs: `#24232`_ - * 41f5756 Merge pull request `#24232`_ from rallytime/`bp-23308`_ - * 2733f66 Import string +* **PR** `#24269`_: (`kiorky`_) zfs: Fix spurious retcode hijacking in virtual + @ *2015-05-30 17:47:49 UTC* - * 9097cca Add missing jump arguments to iptables module + * 785d5a1bfc Merge pull request `#24269`_ from makinacorpus/zfs -**PR** `#24245`_: (*Sacro*) Unset PYTHONHOME when starting the service - @ *2015-05-29T20:00:31Z* + * 0bf23ce701 zfs: Fix spurious retcode hijacking in virtual - * a95982c Merge pull request `#24245`_ from Sacro/patch-2 - * 6632d06 Unset PYTHONHOME when starting the service +* **PR** `#24257`_: (`jfindlay`_) fix pkg mod integration test on ubuntu 12.04 + @ *2015-05-29 23:09:00 UTC* -**PR** `#24121`_: (*hvnsweeting*) deprecate setting user permission in rabbitmq_vhost.present - @ *2015-05-29T15:55:40Z* + * 3d885c04f0 Merge pull request `#24257`_ from jfindlay/pkg_tests - * 1504c76 Merge pull request `#24121`_ from hvnsweeting/rabbitmq-host-deprecate-set-permission - * 2223158 deprecate setting user permission in rabbitmq_host.present + * 9508924c02 fix pkg mod integration test on ubuntu 12.04 -**PR** `#24179`_: (*merll*) Changing user and group only possible for existing ids. - @ *2015-05-29T15:52:43Z* +* **ISSUE** `#23883`_: (`kaithar`_) max_event_size seems broken (refs: `#24001`_, `#24065`_) - **PR** `#24169`_: (*merll*) Changing user and group only possible for existing ids. - | refs: `#24179`_ - * ba02f65 Merge pull request `#24179`_ from Precis/fix-file-uid-gid-2015.0 - * ee4c9d5 Use ids if user or group is not present. +* **ISSUE** `#23657`_: (`arthurlogilab`_) [salt-cloud lxc] NameError: global name '__salt__' is not defined (refs: `#23982`_, `#24080`_) -**PR** `#24229`_: (*msteed*) Fix auth failure on syndic with external_auth - @ *2015-05-29T15:04:06Z* +* **PR** `#24260`_: (`basepi`_) Fix some typos from `#24080`_ + @ *2015-05-29 22:54:58 UTC* - **ISSUE** `#24147`_: (*paclat*) Syndication issues when using authentication on master of masters. - | refs: `#24229`_ - * 9bfb066 Merge pull request `#24229`_ from msteed/issue-24147 - * 482d1cf Fix auth failure on syndic with external_auth + * **PR** `#24080`_: (`kiorky`_) Lxc consistency2 (refs: `#24066`_, `#24260`_, `#23982`_) -**PR** `#24234`_: (*jayeshka*) adding states/quota unit test case. - @ *2015-05-29T14:14:27Z* + * **PR** `#24066`_: (`kiorky`_) Merge forward 2015.5 -> develop (refs: `#23982`_) - * 19fa43c Merge pull request `#24234`_ from jayeshka/quota-states-unit-test - * c233565 adding states/quota unit test case. + * **PR** `#24065`_: (`kiorky`_) continue to fix `#23883`_ (refs: `#24066`_, `#24080`_) -**PR** `#24217`_: (*jfindlay*) disable intermittently failing tests - @ *2015-05-29T03:08:39Z* + * **PR** `#23982`_: (`kiorky`_) lxc: path support (refs: `#24080`_) - **ISSUE** `#40`_: (*thatch45*) Clean up timeouts - | refs: `#22857`_ - **PR** `#23623`_: (*jfindlay*) Fix /jobs endpoint's return - | refs: `#24217`_ - **PR** `#22857`_: (*jacksontj*) Fix /jobs endpoint's return - | refs: `#23623`_ - * e15142c Merge pull request `#24217`_ from jfindlay/disable_bad_tests - * 6b62804 disable intermittently failing tests + * 08a10755b3 Merge pull request `#24260`_ from basepi/lxctypos24080 -**PR** `#24199`_: (*ryan-lane*) Various fixes for boto_route53 and boto_elb - @ *2015-05-29T03:02:41Z* + * 0fa1ad3977 Fix another lxc typo - * ce8e43b Merge pull request `#24199`_ from lyft/route53-fix-elb - * d8dc9a7 Better unit tests for boto_elb state + * 669938f28d s/you ll/you'll/ - * 62f214b Remove cnames_present test +* **ISSUE** `#23883`_: (`kaithar`_) max_event_size seems broken (refs: `#24001`_, `#24065`_) - * 7b9ae82 Lint fix +* **ISSUE** `#23657`_: (`arthurlogilab`_) [salt-cloud lxc] NameError: global name '__salt__' is not defined (refs: `#23982`_, `#24080`_) - * b74b0d1 Various fixes for boto_route53 and boto_elb +* **PR** `#24080`_: (`kiorky`_) Lxc consistency2 (refs: `#24066`_, `#24260`_, `#23982`_) + @ *2015-05-29 22:51:54 UTC* -**PR** `#24142`_: (*basepi*) Optimize dictupdate.update and add `#24097`_ functionality - | refs: `#24262`_ - @ *2015-05-29T03:00:56Z* + * **PR** `#24066`_: (`kiorky`_) Merge forward 2015.5 -> develop (refs: `#23982`_) - **PR** `#24097`_: (*kiorky*) Optimize dictupdate - | refs: `#24142`_ `#24142`_ - **PR** `#21968`_: (*ryanwohara*) Verifying the key has a value before using it. - * a43465d Merge pull request `#24142`_ from basepi/dictupdate24097 - * 5c6e210 Deepcopy on merge_recurse + * **PR** `#24065`_: (`kiorky`_) continue to fix `#23883`_ (refs: `#24066`_, `#24080`_) - * a13c84a Fix None check from `#21968`_ + * **PR** `#23982`_: (`kiorky`_) lxc: path support (refs: `#24080`_) - * 9ef2c64 Add docstring + * 75590cf490 Merge pull request `#24080`_ from makinacorpus/lxc_consistency2 - * 8579429 Add in recursive_update from `#24097`_ + * 81f80674a2 lxc: fix old lxc test - * 8599143 if key not in dest, don't recurse + * 458f50617b seed: lint - * d8a84b3 Rename klass to valtype + * 96b8d55f14 Fix seed.mkconfig yamldump -**PR** `#24208`_: (*jayeshka*) adding states/ports unit test case. - @ *2015-05-28T23:06:33Z* + * 76ddb683f4 lxc/applynet: conservative - * 526698b Merge pull request `#24208`_ from jayeshka/ports-states-unit-test - * 657b709 adding states/ports unit test case. + * ce7096fdb7 variable collision -**PR** `#24219`_: (*jfindlay*) find zfs without modinfo - @ *2015-05-28T21:07:26Z* + * 8a8b28d652 lxc: lint - **ISSUE** `#20635`_: (*dennisjac*) 2015.2.0rc1: zfs errors in log after update - | refs: `#24219`_ - * d00945f Merge pull request `#24219`_ from jfindlay/zfs_check - * 15d4019 use the salt loader in the zfs mod + * 458b18b7e6 more lxc docs - * 5599b67 try to search for zfs if modinfo is unavailable + * ef1f95231a lxc docs: typos -**PR** `#24190`_: (*msteed*) Fix issue 23815 - @ *2015-05-28T20:10:34Z* + * d67a43dc1f more lxc docs - **ISSUE** `#23815`_: (*Snergster*) [beacons] inotify errors on subdir creation - * 3dc4b85 Merge pull request `#24190`_ from msteed/issue-23815 - * 086a1a9 lint + * 608da5ef5d modules/lxc: merge resolution - * 65de62f fix `#23815`_ + * 27c4689a24 modules/lxc: more consistent comparsion - * d04e916 spelling + * 07c365a23b lxc: merge conflict spotted - * db9f682 add inotify beacon unit tests + * 999391551c modules/lxc: rework settings for consistency -**PR** `#24211`_: (*rallytime*) Backport `#24205`_ to 2015.5 - @ *2015-05-28T18:28:15Z* + * ce11d8352e lxc: Global doc refresh - **PR** `#24205`_: (*hazelesque*) Docstring fix in salt.modules.yumpkg.hold - | refs: `#24211`_ - * 436634b Merge pull request `#24211`_ from rallytime/`bp-24205`_ - * 23284b5 Docstring fix in salt.modules.yumpkg.hold + * 61ed2f5e76 clouds/lxc: profile key is conflicting -**PR** `#24212`_: (*terminalmage*) Clarify error in rendering template for top file - @ *2015-05-28T18:26:20Z* +* **ISSUE** `#24210`_: (`damonnk`_) salt-cloud vsphere.py should allow key_filename param (refs: `#24220`_) - * cc58624 Merge pull request `#24212`_ from terminalmage/clarify-error-msg - * ca807fb Clarify error in rendering template for top file +* **PR** `#24247`_: (`rallytime`_) Backport `#24220`_ to 2015.5 + @ *2015-05-29 21:40:01 UTC* -**PR** `#24213`_: (*The-Loeki*) ShouldFix _- troubles in debian_ip - @ *2015-05-28T18:24:39Z* + * **PR** `#24220`_: (`djcrabhat`_) adding key_filename param to vsphere provider (refs: `#24247`_) - **ISSUE** `#23904`_: (*mbrgm*) Network config bonding section cannot be parsed when attribute names use dashes - | refs: `#23917`_ - **ISSUE** `#23900`_: (*hashi825*) salt ubuntu network building issue 2015.5.0 - | refs: `#23922`_ - **PR** `#23922`_: (*garethgreenaway*) Fixes to debian_ip.py - | refs: `#24213`_ - **PR** `#23917`_: (*corywright*) Split debian bonding options on dash instead of underscore - | refs: `#24213`_ - * 9825160 Merge pull request `#24213`_ from The-Loeki/patch-3 - * a68d515 ShouldFix _- troubles in debian_ip + * da14f3b976 Merge pull request `#24247`_ from rallytime/bp-24220 -**PR** `#24214`_: (*basepi*) 2015.5.1release - @ *2015-05-28T16:23:57Z* + * 0b1041dd72 adding key_filename param to vsphere provider - * 071751d Merge pull request `#24214`_ from basepi/2015.5.1release - * e5ba31b 2015.5.1 release date +* **PR** `#24254`_: (`rallytime`_) Add deprecation warning to Digital Ocean v1 Driver + @ *2015-05-29 21:39:25 UTC* - * 768494c Update latest release in docs + * **PR** `#22731`_: (`dmyerscough`_) Decommission DigitalOcean APIv1 and have users use the new DigitalOcean APIv2 (refs: `#24254`_) -**PR** `#24202`_: (*rallytime*) Backport `#24186`_ to 2015.5 - @ *2015-05-28T05:16:48Z* + * 21d6126c34 Merge pull request `#24254`_ from rallytime/add_deprecation_warning_digitalocean - **PR** `#24186`_: (*thcipriani*) Update salt vagrant provisioner info - | refs: `#24202`_ - * c2f1fdb Merge pull request `#24202`_ from rallytime/`bp-24186`_ - * db793dd Update salt vagrant provisioner info + * cafe37bdf8 Add note to docs about deprecation -**PR** `#24192`_: (*rallytime*) Backport `#20474`_ to 2015.5 - @ *2015-05-28T05:16:18Z* + * ea0f1e0921 Add deprecation warning to digital ocean driver to move to digital_ocean_v2 - **PR** `#20474`_: (*djcrabhat*) add sudo, sudo_password params to vsphere deploy to allow for non-root deploys - | refs: `#24192`_ - * 8a085a2 Merge pull request `#24192`_ from rallytime/`bp-20474`_ - * fd3c783 add sudo, sudo_password params to deploy to allow for non-root deploys +* **PR** `#24252`_: (`aboe76`_) Updated suse spec to 2015.5.1 + @ *2015-05-29 21:38:45 UTC* -**PR** `#24184`_: (*rallytime*) Backport `#24129`_ to 2015.5 - @ *2015-05-28T05:15:08Z* + * dac055dd8b Merge pull request `#24252`_ from aboe76/opensuse_package - **PR** `#24129`_: (*pengyao*) Wheel client doc - | refs: `#24184`_ - * 7cc535b Merge pull request `#24184`_ from rallytime/`bp-24129`_ - * 722a662 fixed a typo + * 0ad617df21 Updated suse spec to 2015.5.1 - * 565eb46 Add cmd doc for WheelClient +* **PR** `#24251`_: (`garethgreenaway`_) Returners broken in 2015.5 + @ *2015-05-29 21:37:52 UTC* -**PR** `#24183`_: (*rallytime*) Backport `#19320`_ to 2015.5 - @ *2015-05-28T05:14:36Z* + * 49e7fe8a5e Merge pull request `#24251`_ from garethgreenaway/2015_5_returner_brokenness - **PR** `#19320`_: (*clan*) add 'state_output_profile' option for profile output - | refs: `#24183`_ - * eb0af70 Merge pull request `#24183`_ from rallytime/`bp-19320`_ - * 55db1bf sate_output_profile default to True + * 5df6b52568 The code calling cfg as a function vs treating it as a dictionary and using get is currently backwards causing returners to fail when used from the CLI and in scheduled jobs. - * 9919227 fix type: statei -> state +* **ISSUE** `#21498`_: (`rallytime`_) Clarify Digital Ocean Documentation (refs: `#24255`_) - * 0549ca6 add 'state_output_profile' option for profile output +* **PR** `#24255`_: (`rallytime`_) Clarify digital ocean documentation and mention v1 driver deprecation + @ *2015-05-29 21:37:07 UTC* -**PR** `#24201`_: (*whiteinge*) Add list of client libraries for the rest_cherrypy module to the top-level documentation - @ *2015-05-28T02:12:09Z* + * bfb946123e Merge pull request `#24255`_ from rallytime/clarify_digital_ocean_driver_docs - * 1b5bf23 Merge pull request `#24201`_ from whiteinge/rest_cherrypy-client-libs - * 5f71802 Add list of client libraries for the rest_cherrypy module + * 8d51f75aa5 Clarify digital ocean documentation and mention v1 driver deprecation - * 28fc77f Fix rest_cherrypy config example indentation +* **PR** `#24232`_: (`rallytime`_) Backport `#23308`_ to 2015.5 + @ *2015-05-29 21:36:46 UTC* -**PR** `#24195`_: (*rallytime*) Merge `#24185`_ with a couple of fixes - @ *2015-05-27T22:18:37Z* + * **PR** `#23308`_: (`thusoy`_) Don't merge: Add missing jump arguments to iptables module (refs: `#24232`_) - **PR** `#24185`_: (*jacobhammons*) Fixes for doc build errors - | refs: `#24195`_ - * 3307ec2 Merge pull request `#24195`_ from rallytime/merge-24185 - * d8daa9d Merge `#24185`_ with a couple of fixes + * 41f5756f36 Merge pull request `#24232`_ from rallytime/bp-23308 - * 634d56b Fixed pylon error + * 2733f66449 Import string - * 0689815 Fixes for doc build errors + * 9097cca099 Add missing jump arguments to iptables module -**PR** `#24166`_: (*jayeshka*) adding states/pkgng unit test case. - @ *2015-05-27T20:27:49Z* +* **PR** `#24245`_: (`Sacro`_) Unset PYTHONHOME when starting the service + @ *2015-05-29 20:00:31 UTC* - * 7e400bc Merge pull request `#24166`_ from jayeshka/pkgng-states-unit-test - * 2234bb0 adding states/pkgng unit test case. + * a95982c722 Merge pull request `#24245`_ from Sacro/patch-2 -**PR** `#24189`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-05-27T20:26:31Z* + * 6632d06e94 Unset PYTHONHOME when starting the service - **PR** `#24178`_: (*rallytime*) Backport `#24118`_ to 2014.7, too. - **PR** `#24159`_: (*rallytime*) Fill out modules/keystone.py CLI Examples - **PR** `#24158`_: (*rallytime*) Fix test_valid_docs test for tls module - **PR** `#24118`_: (*trevor-h*) removed deprecated pymongo usage - | refs: `#24139`_ `#24178`_ - * 9fcda79 Merge pull request `#24189`_ from basepi/merge-forward-2015.5 - * 8839e9c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 +* **PR** `#24121`_: (`hvnsweeting`_) deprecate setting user permission in rabbitmq_vhost.present + @ *2015-05-29 15:55:40 UTC* - * 9d7331c Merge pull request `#24178`_ from rallytime/`bp-24118`_ + * 1504c76d3a Merge pull request `#24121`_ from hvnsweeting/rabbitmq-host-deprecate-set-permission - * e2217a0 removed deprecated pymongo usage as no longer functional with pymongo > 3.x + * 2223158e76 deprecate setting user permission in rabbitmq_host.present - * 4e8c503 Merge pull request `#24159`_ from rallytime/keystone_doc_examples +* **PR** `#24179`_: (`merll`_) Changing user and group only possible for existing ids. + @ *2015-05-29 15:52:43 UTC* - * dadac8d Fill out modules/keystone.py CLI Examples + * **PR** `#24169`_: (`merll`_) Changing user and group only possible for existing ids. (refs: `#24179`_) - * fc10ee8 Merge pull request `#24158`_ from rallytime/fix_doc_error + * ba02f6509e Merge pull request `#24179`_ from Precis/fix-file-uid-gid-2015.0 - * 49a517e Fix test_valid_docs test for tls module + * ee4c9d59ab Use ids if user or group is not present. -**PR** `#24181`_: (*jtand*) Fixed error where file was evaluated as a symlink in test_absent - @ *2015-05-27T18:26:28Z* +* **ISSUE** `#24147`_: (`paclat`_) Syndication issues when using authentication on master of masters. (refs: `#24229`_) - * 2303dec Merge pull request `#24181`_ from jtand/file_test - * 5f0e601 Fixed error where file was evaluated as a symlink in test_absent +* **PR** `#24229`_: (`msteed`_) Fix auth failure on syndic with external_auth + @ *2015-05-29 15:04:06 UTC* -**PR** `#24180`_: (*terminalmage*) Skip libvirt tests if not running as root - @ *2015-05-27T18:18:47Z* + * 9bfb066c2c Merge pull request `#24229`_ from msteed/issue-24147 - * a162768 Merge pull request `#24180`_ from terminalmage/fix-libvirt-test - * 72e7416 Skip libvirt tests if not running as root + * 482d1cfc64 Fix auth failure on syndic with external_auth -**PR** `#24165`_: (*jayeshka*) adding states/portage_config unit test case. - @ *2015-05-27T17:15:08Z* +* **PR** `#24234`_: (`jayeshka`_) adding states/quota unit test case. + @ *2015-05-29 14:14:27 UTC* - * 1fbc5b2 Merge pull request `#24165`_ from jayeshka/portage_config-states-unit-test - * 8cf1505 adding states/portage_config unit test case. + * 19fa43c290 Merge pull request `#24234`_ from jayeshka/quota-states-unit-test -**PR** `#24164`_: (*jayeshka*) adding states/pecl unit test case. - @ *2015-05-27T17:14:26Z* + * c23356500b adding states/quota unit test case. - * 4747856 Merge pull request `#24164`_ from jayeshka/pecl-states-unit-test - * 563a5b3 adding states/pecl unit test case. +* **PR** `#24217`_: (`jfindlay`_) disable intermittently failing tests + @ *2015-05-29 03:08:39 UTC* -**PR** `#24160`_: (*The-Loeki*) small enhancement to data module; pop() - @ *2015-05-27T17:03:10Z* + * **PR** `#23623`_: (`jfindlay`_) Fix /jobs endpoint's return (refs: `#24217`_) - * cdaaa19 Merge pull request `#24160`_ from The-Loeki/patch-1 - * 2175ff3 doc & merge fix + * **PR** `#22857`_: (`jacksontj`_) Fix /jobs endpoint's return (refs: `#23623`_) - * eba382c small enhancement to data module; pop() + * e15142c629 Merge pull request `#24217`_ from jfindlay/disable_bad_tests -**PR** `#24153`_: (*techhat*) Batch mode sometimes improperly builds lists of minions to process - @ *2015-05-27T16:21:53Z* + * 6b6280442c disable intermittently failing tests - * 4a8dbc7 Merge pull request `#24153`_ from techhat/batchlist - * 467ba64 Make sure that minion IDs are strings +* **PR** `#24199`_: (`ryan-lane`_) Various fixes for boto_route53 and boto_elb + @ *2015-05-29 03:02:41 UTC* -**PR** `#24167`_: (*jayeshka*) adding states/pagerduty unit test case. - @ *2015-05-27T16:14:01Z* + * ce8e43b774 Merge pull request `#24199`_ from lyft/route53-fix-elb - * ed8ccf5 Merge pull request `#24167`_ from jayeshka/pagerduty-states-unit-test - * 1af8c83 adding states/pagerduty unit test case. + * d8dc9a7b5b Better unit tests for boto_elb state -**PR** `#24156`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-05-27T15:05:01Z* + * 62f214b535 Remove cnames_present test - **ISSUE** `#23464`_: (*tibold*) cmd_iter_no_block() blocks - | refs: `#24093`_ - **PR** `#24125`_: (*hvnsweeting*) Fix rabbitmq test mode - **PR** `#24093`_: (*msteed*) Make LocalClient.cmd_iter_no_block() not block - **PR** `#24008`_: (*davidjb*) Correct reST formatting for states.cmd documentation - **PR** `#23933`_: (*jacobhammons*) sphinx saltstack2 doc theme - * b9507d1 Merge pull request `#24156`_ from basepi/merge-forward-2015.5 - * e52b5ab Remove stray >>>>> + * 7b9ae82951 Lint fix - * 7dfbd92 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * b74b0d1413 Various fixes for boto_route53 and boto_elb - * c0d32e0 Merge pull request `#24125`_ from hvnsweeting/fix-rabbitmq-test-mode +* **PR** `#24142`_: (`basepi`_) Optimize dictupdate.update and add `#24097`_ functionality (refs: `#24262`_) + @ *2015-05-29 03:00:56 UTC* - * 71862c6 enhance log + * **PR** `#24097`_: (`kiorky`_) Optimize dictupdate (refs: `#24142`_) - * 28e2594 change according to new output of rabbitmq module functions + * a43465d235 Merge pull request `#24142`_ from basepi/dictupdate24097 - * cd0212e processes and returns better output for rabbitmq module + * 5c6e210c8b Deepcopy on merge_recurse - * 39a8f30 Merge pull request `#24093`_ from msteed/issue-23464 + * a13c84ade8 Fix None check from `#21968`_ - * fd35903 Fix failing test + * 9ef2c64098 Add docstring - * 41b344c Make LocalClient.cmd_iter_no_block() not block + * 8579429314 Add in recursive_update from `#24097`_ - * 5bffd30 Merge pull request `#24008`_ from davidjb/2014.7 + * 8599143200 if key not in dest, don't recurse - * 8b8d029 Correct reST formatting for documentation + * d8a84b3017 Rename klass to valtype - * 1aa0420 Merge pull request `#23933`_ from jacobhammons/2014.7 +* **PR** `#24208`_: (`jayeshka`_) adding states/ports unit test case. + @ *2015-05-28 23:06:33 UTC* - * a3613e6 removed numbering from doc TOC + * 526698ba8d Merge pull request `#24208`_ from jayeshka/ports-states-unit-test - * 78b737c removed 2015.* release from release notes, updated index page to remove PDF/epub links + * 657b709932 adding states/ports unit test case. - * e867f7d Changed build settings to use saltstack2 theme and update release versions. +* **ISSUE** `#20635`_: (`dennisjac`_) 2015.2.0rc1: zfs errors in log after update (refs: `#24219`_) - * 81ed9c9 sphinx saltstack2 doc theme +* **PR** `#24219`_: (`jfindlay`_) find zfs without modinfo + @ *2015-05-28 21:07:26 UTC* -**PR** `#24145`_: (*jfindlay*) attempt to decode win update package - @ *2015-05-26T23:20:20Z* + * d00945fd40 Merge pull request `#24219`_ from jfindlay/zfs_check - **ISSUE** `#24102`_: (*bormotov*) win_update encondig problems - | refs: `#24145`_ - * 05745fa Merge pull request `#24145`_ from jfindlay/win_update_encoding - * cc5e17e attempt to decode win update package + * 15d401907c use the salt loader in the zfs mod -**PR** `#24123`_: (*kiorky*) fix service enable/disable change - @ *2015-05-26T21:24:19Z* + * 5599b67a46 try to search for zfs if modinfo is unavailable - **ISSUE** `#24122`_: (*kiorky*) service.dead is no more stateful: services does not handle correctly enable/disable change state - | refs: `#24123`_ - * 7024789 Merge pull request `#24123`_ from makinacorpus/ss - * 2e2e1d2 fix service enable/disable change +* **PR** `#24190`_: (`msteed`_) Fix issue 23815 + @ *2015-05-28 20:10:34 UTC* -**PR** `#24146`_: (*rallytime*) Fixes the boto_vpc_test failure on CentOS 5 tests - @ *2015-05-26T20:15:19Z* + * 3dc4b85295 Merge pull request `#24190`_ from msteed/issue-23815 - * 51c3cec Merge pull request `#24146`_ from rallytime/fix_centos_boto_failure - * ac0f97d Fixes the boto_vpc_test failure on CentOS 5 tests + * 086a1a94e8 lint -**PR** `#24144`_: (*twangboy*) Compare Keys ignores all newlines and carriage returns - @ *2015-05-26T19:25:48Z* + * 65de62f852 fix `#23815`_ - **ISSUE** `#24052`_: (*twangboy*) v2015.5.1 Changes the way it interprets the minion_master.pub file - | refs: `#24089`_ `#24144`_ - **ISSUE** `#23566`_: (*rks2286*) Salt-cp corrupting the file after transfer to minion - | refs: `#24144`_ `#23740`_ - **PR** `#23740`_: (*jfindlay*) Binary write - | refs: `#24144`_ - * 1c91a21 Merge pull request `#24144`_ from twangboy/fix_24052 - * c197b41 Compare Keys removing all newlines and carriage returns + * d04e9162de spelling -**PR** `#24139`_: (*rallytime*) Backport `#24118`_ to 2015.5 - @ *2015-05-26T18:24:27Z* + * db9f6820b8 add inotify beacon unit tests - **PR** `#24118`_: (*trevor-h*) removed deprecated pymongo usage - | refs: `#24139`_ `#24178`_ - * 0841667 Merge pull request `#24139`_ from rallytime/`bp-24118`_ - * 4bb519b removed deprecated pymongo usage as no longer functional with pymongo > 3.x +* **PR** `#24211`_: (`rallytime`_) Backport `#24205`_ to 2015.5 + @ *2015-05-28 18:28:15 UTC* -**PR** `#24138`_: (*rallytime*) Backport `#24116`_ to 2015.5 - @ *2015-05-26T18:23:51Z* + * **PR** `#24205`_: (`hazelesque`_) Docstring fix in salt.modules.yumpkg.hold (refs: `#24211`_) - **PR** `#24116`_: (*awdrius*) Fixed typo in chown username (ending dot) that fails the command. - | refs: `#24138`_ - * 742eca2 Merge pull request `#24138`_ from rallytime/`bp-24116`_ - * 7f08641 Fixed typo in chown username (ending dot) that fails the command. + * 436634b508 Merge pull request `#24211`_ from rallytime/bp-24205 -**PR** `#24137`_: (*rallytime*) Backport `#24105`_ to 2015.5 - @ *2015-05-26T18:23:40Z* + * 23284b5d47 Docstring fix in salt.modules.yumpkg.hold - **PR** `#24105`_: (*cedwards*) Updated some beacon-specific documentation formatting - | refs: `#24137`_ - * e01536d Merge pull request `#24137`_ from rallytime/`bp-24105`_ - * f0778a0 Updated some beacon-specific documentation formatting +* **PR** `#24212`_: (`terminalmage`_) Clarify error in rendering template for top file + @ *2015-05-28 18:26:20 UTC* -**PR** `#24136`_: (*rallytime*) Backport `#24104`_ to 2015.5 - @ *2015-05-26T15:58:47Z* + * cc58624c7e Merge pull request `#24212`_ from terminalmage/clarify-error-msg - **ISSUE** `#23364`_: (*pruiz*) Unable to destroy host using proxmox cloud: There was an error destroying machines: 501 Server Error: Method 'DELETE /nodes/pmx1/openvz/openvz/100' not implemented - **PR** `#24104`_: (*pruiz*) Only try to stop a VM if it's not already stopped. (fixes `#23364`_) - | refs: `#24136`_ - * 89cdf97 Merge pull request `#24136`_ from rallytime/`bp-24104`_ - * c538884 Only try to stop a VM if it's not already stopped. (fixes `#23364`_) + * ca807fb032 Clarify error in rendering template for top file -**PR** `#24135`_: (*rallytime*) Backport `#24083`_ to 2015.5 - @ *2015-05-26T15:58:27Z* +* **ISSUE** `#23904`_: (`mbrgm`_) Network config bonding section cannot be parsed when attribute names use dashes (refs: `#23917`_) - **PR** `#24083`_: (*swdream*) fix code block syntax - | refs: `#24135`_ - * 67c4373 Merge pull request `#24135`_ from rallytime/`bp-24083`_ - * e1d06f9 fix code block syntax +* **ISSUE** `#23900`_: (`hashi825`_) salt ubuntu network building issue 2015.5.0 (refs: `#23922`_) -**PR** `#24131`_: (*jayeshka*) adding states/mysql_user unit test case - @ *2015-05-26T15:58:10Z* +* **PR** `#24213`_: (`The-Loeki`_) ShouldFix _- troubles in debian_ip + @ *2015-05-28 18:24:39 UTC* - * a83371e Merge pull request `#24131`_ from jayeshka/mysql_user-states-unit-test - * ed1ef69 adding states/mysql_user unit test case + * **PR** `#23922`_: (`garethgreenaway`_) Fixes to debian_ip.py (refs: `#24213`_) -**PR** `#24130`_: (*jayeshka*) adding states/ntp unit test case - @ *2015-05-26T15:57:29Z* + * **PR** `#23917`_: (`corywright`_) Split debian bonding options on dash instead of underscore (refs: `#24213`_) - * 1dc1d2a Merge pull request `#24130`_ from jayeshka/ntp-states-unit-test - * ede4a9f adding states/ntp unit test case + * 9825160b1a Merge pull request `#24213`_ from The-Loeki/patch-3 -**PR** `#24128`_: (*jayeshka*) adding states/openstack_config unit test case - @ *2015-05-26T15:56:08Z* + * a68d515973 ShouldFix _- troubles in debian_ip - * 3943417 Merge pull request `#24128`_ from jayeshka/openstack_config-states-unit-test - * ca09e0f adding states/openstack_config unit test case +* **PR** `#24214`_: (`basepi`_) 2015.5.1release + @ *2015-05-28 16:23:57 UTC* -**PR** `#24127`_: (*jayeshka*) adding states/npm unit test case - @ *2015-05-26T15:55:18Z* + * 071751d13f Merge pull request `#24214`_ from basepi/2015.5.1release - * 23f25c4 Merge pull request `#24127`_ from jayeshka/npm-states-unit-test - * c3ecabb adding states/npm unit test case + * e5ba31b5b5 2015.5.1 release date -**PR** `#24077`_: (*anlutro*) Change how state_verbose output is filtered - @ *2015-05-26T15:41:11Z* + * 768494c819 Update latest release in docs - **ISSUE** `#24009`_: (*hvnsweeting*) state_verbose False summary is wrong - | refs: `#24077`_ - * 07488a4 Merge pull request `#24077`_ from alprs/fix-outputter_highstate_nonverbose_count - * 7790408 Change how state_verbose output is filtered +* **PR** `#24202`_: (`rallytime`_) Backport `#24186`_ to 2015.5 + @ *2015-05-28 05:16:48 UTC* -**PR** `#24119`_: (*jfindlay*) Update contrib docs - @ *2015-05-26T15:37:01Z* + * **PR** `#24186`_: (`thcipriani`_) Update salt vagrant provisioner info (refs: `#24202`_) - * 224820f Merge pull request `#24119`_ from jfindlay/update_contrib_docs - * fa2d411 update example release branch in contrib docs + * c2f1fdb244 Merge pull request `#24202`_ from rallytime/bp-24186 - * a0b76b5 clarify git rebase instructions + * db793dd0de Update salt vagrant provisioner info - * 3517e00 fix contribution docs link typos +* **PR** `#24192`_: (`rallytime`_) Backport `#20474`_ to 2015.5 + @ *2015-05-28 05:16:18 UTC* - * 651629c backport dev contrib doc updates to 2015.5 + * **PR** `#20474`_: (`djcrabhat`_) add sudo, sudo_password params to vsphere deploy to allow for non-root deploys (refs: `#24192`_) -**PR** `#23928`_: (*joejulian*) Add the ability to replace existing certificates - @ *2015-05-25T19:47:26Z* + * 8a085a2592 Merge pull request `#24192`_ from rallytime/bp-20474 - * 5488c4a Merge pull request `#23928`_ from joejulian/2015.5_tls_module_replace_existing - * 4a4cbdd Add the ability to replace existing certificates + * fd3c783f3e add sudo, sudo_password params to deploy to allow for non-root deploys -**PR** `#24078`_: (*jfindlay*) if a charmap is not supplied, set it to the codeset - @ *2015-05-25T19:39:19Z* +* **PR** `#24184`_: (`rallytime`_) Backport `#24129`_ to 2015.5 + @ *2015-05-28 05:15:08 UTC* - **ISSUE** `#23221`_: (*Reiner030*) Debian Jessie: locale.present not working again - | refs: `#24078`_ - * dd90ef0 Merge pull request `#24078`_ from jfindlay/locale_charmap - * 5eb97f0 if a charmap is not supplied, set it to the codeset + * **PR** `#24129`_: (`pengyao`_) Wheel client doc (refs: `#24184`_) -**PR** `#24088`_: (*jfindlay*) pkg module integration tests - @ *2015-05-25T19:39:02Z* + * 7cc535bf4a Merge pull request `#24184`_ from rallytime/bp-24129 - * 9cec5d3 Merge pull request `#24088`_ from jfindlay/pkg_tests - * f1bd5ec adding pkg module integration tests + * 722a662479 fixed a typo - * 739b2ef rework yumpkg refresh_db so args are not mandatory + * 565eb46ff5 Add cmd doc for WheelClient -**PR** `#24089`_: (*jfindlay*) allow override of binary file mode on windows - @ *2015-05-25T19:38:44Z* +* **PR** `#24183`_: (`rallytime`_) Backport `#19320`_ to 2015.5 + @ *2015-05-28 05:14:36 UTC* - **ISSUE** `#24052`_: (*twangboy*) v2015.5.1 Changes the way it interprets the minion_master.pub file - | refs: `#24089`_ `#24144`_ - * 517552c Merge pull request `#24089`_ from jfindlay/binary_write - * b2259a6 allow override of binary file mode on windows + * **PR** `#19320`_: (`clan`_) add 'state_output_profile' option for profile output (refs: `#24183`_) -**PR** `#24092`_: (*jfindlay*) collect scattered contents edits, ensure it's a str - @ *2015-05-25T19:38:10Z* + * eb0af70e5b Merge pull request `#24183`_ from rallytime/bp-19320 - **ISSUE** `#23973`_: (*mschiff*) state file.managed: setting contents_pillar to a pillar which is a list throws exception instead giving descriptive error message - | refs: `#24092`_ - * 121ab9f Merge pull request `#24092`_ from jfindlay/file_state - * cfa0f13 collect scattered contents edits, ensure it's a str + * 55db1bf8b5 sate_output_profile default to True -**PR** `#24112`_: (*The-Loeki*) thin_gen breaks when thinver doesn't exist - @ *2015-05-25T19:37:47Z* + * 991922703b fix type: statei -> state - * 84e65de Merge pull request `#24112`_ from The-Loeki/patch-1 - * 34646ea thin_gen breaks when thinver doesn't exist + * 0549ca6266 add 'state_output_profile' option for profile output -**PR** `#24108`_: (*jayeshka*) adding states/mysql_query unit test case - @ *2015-05-25T12:30:48Z* +* **PR** `#24201`_: (`whiteinge`_) Add list of client libraries for the rest_cherrypy module to the top-level documentation + @ *2015-05-28 02:12:09 UTC* - * ec509ed Merge pull request `#24108`_ from jayeshka/mysql_query-states-unit-test - * ec50450 adding states/mysql_query unit test case + * 1b5bf23187 Merge pull request `#24201`_ from whiteinge/rest_cherrypy-client-libs -**PR** `#24110`_: (*jayeshka*) adding varnish unit test case - @ *2015-05-25T12:30:21Z* + * 5f718027ca Add list of client libraries for the rest_cherrypy module - * f2e5d6c Merge pull request `#24110`_ from jayeshka/varnish-unit-test - * e119889 adding varnish unit test case + * 28fc77f6f6 Fix rest_cherrypy config example indentation -**PR** `#24109`_: (*jayeshka*) adding states/mysql_grants unit test case - @ *2015-05-25T12:29:53Z* +* **PR** `#24195`_: (`rallytime`_) Merge `#24185`_ with a couple of fixes + @ *2015-05-27 22:18:37 UTC* - * 4fca2b4 Merge pull request `#24109`_ from jayeshka/mysql_grants-states-unit-test - * 11a93cb adding states/mysql_grants unit test case + * **PR** `#24185`_: (`jacobhammons`_) Fixes for doc build errors (refs: `#24195`_) -**PR** `#24028`_: (*nleib*) send a disable message to disable puppet - @ *2015-05-25T04:02:11Z* + * 3307ec20d9 Merge pull request `#24195`_ from rallytime/merge-24185 - * 6b43c9a Merge pull request `#24028`_ from nleib/2015.5 - * 15f24b4 update format of string in disabled msg + * d8daa9dcd7 Merge `#24185`_ with a couple of fixes - * 7690e5b remove trailing whitespaces + * 634d56bca0 Fixed pylon error - * 56a9720 Update puppet.py + * 0689815d0e Fixes for doc build errors - * 9686391 Update puppet.py +* **PR** `#24166`_: (`jayeshka`_) adding states/pkgng unit test case. + @ *2015-05-27 20:27:49 UTC* - * 33f3d68 send a disable message to disable puppet + * 7e400bc3d7 Merge pull request `#24166`_ from jayeshka/pkgng-states-unit-test -**PR** `#24100`_: (*jfindlay*) adding states/file unit test case - @ *2015-05-24T05:17:54Z* + * 2234bb0b70 adding states/pkgng unit test case. - **PR** `#23963`_: (*jayeshka*) adding states/file unit test case - | refs: `#24100`_ - * 52c9aca Merge pull request `#24100`_ from jfindlay/merge_23963 - * 7d59deb adding states/file unit test case +* **PR** `#24189`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-05-27 20:26:31 UTC* -**PR** `#24098`_: (*galet*) Systemd not recognized properly on Oracle Linux 7 - @ *2015-05-24T04:07:31Z* + * 9fcda79cd4 Merge pull request `#24189`_ from basepi/merge-forward-2015.5 - **ISSUE** `#21446`_: (*dpheasant*) check for systemd on Oracle Linux - | refs: `#24098`_ - * 0eb9f15 Merge pull request `#24098`_ from galet/2015.5 - * 4d6ab21 Systemd not recognized properly on Oracle Linux 7 + * 8839e9c22e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -**PR** `#24090`_: (*jfindlay*) adding states/mount unit test case - @ *2015-05-22T23:02:57Z* + * 9d7331c87d Merge pull request `#24178`_ from rallytime/bp-24118 - **PR** `#24062`_: (*jayeshka*) adding states/mount unit test case - | refs: `#24090`_ - * 8e04db7 Merge pull request `#24090`_ from jfindlay/merge_24062 - * a81a922 adding states/mount unit test case + * e2217a09e8 removed deprecated pymongo usage as no longer functional with pymongo > 3.x -**PR** `#24086`_: (*rallytime*) Backport `#22806`_ to 2015.5 - @ *2015-05-22T21:18:20Z* + * 4e8c5031b0 Merge pull request `#24159`_ from rallytime/keystone_doc_examples - **ISSUE** `#22574`_: (*unicolet*) error when which is not available - | refs: `#22806`_ - **PR** `#22806`_: (*jfindlay*) use cmd.run_all instead of cmd.run_stdout - | refs: `#24086`_ - * c0079f5 Merge pull request `#24086`_ from rallytime/`bp-22806`_ - * f728f55 use cmd.run_all instead of cmd.run_stdout + * dadac8d076 Fill out modules/keystone.py CLI Examples -**PR** `#24024`_: (*jayeshka*) adding states/mongodb_user unit test case - @ *2015-05-22T20:53:19Z* + * fc10ee8ed5 Merge pull request `#24158`_ from rallytime/fix_doc_error - * 09de253 Merge pull request `#24024`_ from jayeshka/mongodb_user-states-unit-test - * f31dc92 resolved errors + * 49a517e2ca Fix test_valid_docs test for tls module - * d038b1f adding states/mongodb_user unit test case +* **PR** `#24181`_: (`justinta`_) Fixed error where file was evaluated as a symlink in test_absent + @ *2015-05-27 18:26:28 UTC* -**PR** `#24065`_: (*kiorky*) continue to fix `#23883`_ - | refs: `#24080`_ `#24066`_ - @ *2015-05-22T18:59:21Z* + * 2303dec0e9 Merge pull request `#24181`_ from jtand/file_test - **ISSUE** `#23883`_: (*kaithar*) max_event_size seems broken - * bfd812c Merge pull request `#24065`_ from makinacorpus/real23883 - * 028282e continue to fix `#23883`_ + * 5f0e601589 Fixed error where file was evaluated as a symlink in test_absent -**PR** `#24029`_: (*kiorky*) Fix providers handling - @ *2015-05-22T16:56:06Z* +* **PR** `#24180`_: (`terminalmage`_) Skip libvirt tests if not running as root + @ *2015-05-27 18:18:47 UTC* - **ISSUE** `#24017`_: (*arthurlogilab*) [salt-cloud openstack] TypeError: unhashable type: 'dict' on map creation - | refs: `#24029`_ - * 429adfe Merge pull request `#24029`_ from makinacorpus/fixproviders - * 412b39b Fix providers handling + * a16276852b Merge pull request `#24180`_ from terminalmage/fix-libvirt-test -**PR** `#23936`_: (*jfindlay*) remove unreachable returns in file state - @ *2015-05-22T16:26:49Z* + * 72e7416ad2 Skip libvirt tests if not running as root - * a42cccc Merge pull request `#23936`_ from jfindlay/file_state - * ac29c0c also validate file.recurse source parameter +* **PR** `#24165`_: (`jayeshka`_) adding states/portage_config unit test case. + @ *2015-05-27 17:15:08 UTC* - * 57f7388 remove unreachable returns in file state + * 1fbc5b25e6 Merge pull request `#24165`_ from jayeshka/portage_config-states-unit-test -**PR** `#24063`_: (*jayeshka*) removed tuple index error - @ *2015-05-22T14:58:20Z* + * 8cf1505392 adding states/portage_config unit test case. - * 8b69b41 Merge pull request `#24063`_ from jayeshka/mount-states-module - * b9745d5 removed tuple index error +* **PR** `#24164`_: (`jayeshka`_) adding states/pecl unit test case. + @ *2015-05-27 17:14:26 UTC* -**PR** `#24057`_: (*rallytime*) Backport `#22572`_ to 2015.5 - @ *2015-05-22T05:36:25Z* + * 4747856411 Merge pull request `#24164`_ from jayeshka/pecl-states-unit-test - **PR** `#22572`_: (*The-Loeki*) Small docfix for GitPillar - | refs: `#24057`_ - * 02ac4aa Merge pull request `#24057`_ from rallytime/`bp-22572`_ - * 49aad84 Small docfix for GitPillar + * 563a5b3c30 adding states/pecl unit test case. -**PR** `#24040`_: (*rallytime*) Backport `#24027`_ to 2015.5 - @ *2015-05-21T23:43:54Z* +* **PR** `#24160`_: (`The-Loeki`_) small enhancement to data module; pop() + @ *2015-05-27 17:03:10 UTC* - **ISSUE** `#23088`_: (*wfhg*) Segfault when adding a Zypper repo on SLES 11.3 - | refs: `#24027`_ - **PR** `#24027`_: (*wfhg*) Add baseurl to salt.modules.zypper.mod_repo - | refs: `#24040`_ - * 82de059 Merge pull request `#24040`_ from rallytime/`bp-24027`_ - * 37d25d8 Added baseurl as alias for url and mirrorlist in salt.modules.zypper.mod_repo. + * cdaaa19324 Merge pull request `#24160`_ from The-Loeki/patch-1 -**PR** `#24039`_: (*rallytime*) Backport `#24015`_ to 2015.5 - @ *2015-05-21T23:43:25Z* + * 2175ff3c75 doc & merge fix - **PR** `#24015`_: (*YanChii*) minor improvement of solarisips docs & fix typos - | refs: `#24039`_ - * d909781 Merge pull request `#24039`_ from rallytime/`bp-24015`_ - * 6bfaa94 minor improvement of solarisips docs & fix typos + * eba382cdda small enhancement to data module; pop() -**PR** `#24038`_: (*rallytime*) Backport `#19599`_ to 2015.5 - @ *2015-05-21T23:43:10Z* +* **PR** `#24153`_: (`techhat`_) Batch mode sometimes improperly builds lists of minions to process + @ *2015-05-27 16:21:53 UTC* - **ISSUE** `#19598`_: (*fayetted*) ssh_auth.present test=true incorectly reports changes will be made - | refs: `#19599`_ - **PR** `#19599`_: (*fayetted*) Fix ssh_auth test mode, compare lines not just key - | refs: `#24038`_ - * 4a0f254 Merge pull request `#24038`_ from rallytime/`bp-19599`_ - * ea00d3e Fix ssh_auth test mode, compare lines not just key + * 4a8dbc7f13 Merge pull request `#24153`_ from techhat/batchlist -**PR** `#24046`_: (*rallytime*) Remove key management test from digital ocean cloud tests - @ *2015-05-21T22:32:04Z* + * 467ba64612 Make sure that minion IDs are strings - * 42b87f1 Merge pull request `#24046`_ from rallytime/remove_key_test - * 1d031ca Remove key management test from digital ocean cloud tests +* **PR** `#24167`_: (`jayeshka`_) adding states/pagerduty unit test case. + @ *2015-05-27 16:14:01 UTC* -**PR** `#24044`_: (*cro*) Remove spurious log message, fix typo in doc - @ *2015-05-21T22:31:49Z* + * ed8ccf57a2 Merge pull request `#24167`_ from jayeshka/pagerduty-states-unit-test - * eff54b1 Merge pull request `#24044`_ from cro/pgjsonb - * de06633 Remove spurious log message, fix typo in doc + * 1af8c8334d adding states/pagerduty unit test case. -**PR** `#24001`_: (*msteed*) issue `#23883`_ - @ *2015-05-21T20:32:30Z* +* **PR** `#24156`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-05-27 15:05:01 UTC* - **ISSUE** `#23883`_: (*kaithar*) max_event_size seems broken - * ac32000 Merge pull request `#24001`_ from msteed/issue-23883 - * bea97a8 issue `#23883`_ + * b9507d1567 Merge pull request `#24156`_ from basepi/merge-forward-2015.5 -**PR** `#23995`_: (*kiorky*) Lxc path pre - @ *2015-05-21T17:26:03Z* + * e52b5ab2e2 Remove stray >>>>> - * f7fae26 Merge pull request `#23995`_ from makinacorpus/lxc_path_pre - * 319282a lint + * 7dfbd929ff Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - * 1dc67e5 lxc: versionadded + * c0d32e0b5e Merge pull request `#24125`_ from hvnsweeting/fix-rabbitmq-test-mode - * fcad7cb lxc: states improvements + * 71862c69b9 enhance log - * 644bd72 lxc: more consistence for profiles + * 28e2594162 change according to new output of rabbitmq module functions - * 139372c lxc: remove merge cruft + * cd0212e8ed processes and returns better output for rabbitmq module - * 725b046 lxc: Repair merge + * 39a8f30f06 Merge pull request `#24093`_ from msteed/issue-23464 -**PR** `#24032`_: (*kartiksubbarao*) Update augeas_cfg.py - @ *2015-05-21T17:03:42Z* + * fd35903d75 Fix failing test - **ISSUE** `#16383`_: (*interjection*) salt.states.augeas.change example from docs fails with exception - | refs: `#24032`_ - * 26d6851 Merge pull request `#24032`_ from kartiksubbarao/augeas_insert_16383 - * 3686dcd Update augeas_cfg.py + * 41b344c7d3 Make LocalClient.cmd_iter_no_block() not block -**PR** `#24025`_: (*jayeshka*) adding timezone unit test case - @ *2015-05-21T16:50:53Z* + * 5bffd3045e Merge pull request `#24008`_ from davidjb/2014.7 - * 55c9245 Merge pull request `#24025`_ from jayeshka/timezone-unit-test - * 1ec33e2 removed assertion error + * 8b8d0293d4 Correct reST formatting for documentation - * 16ecb28 adding timezone unit test case + * 1aa0420040 Merge pull request `#23933`_ from jacobhammons/2014.7 -**PR** `#24023`_: (*jayeshka*) adding states/mongodb_database unit test case - @ *2015-05-21T16:49:17Z* + * a3613e68e4 removed numbering from doc TOC - * e243617 Merge pull request `#24023`_ from jayeshka/mongodb_database-states-unit-test - * 5a9ac7e adding states/mongodb_database unit test case + * 78b737c5e6 removed 2015.* release from release notes, updated index page to remove PDF/epub links -**PR** `#24022`_: (*jayeshka*) adding states/modjk_worker unit test case - @ *2015-05-21T16:48:29Z* + * e867f7df77 Changed build settings to use saltstack2 theme and update release versions. - * b377bd9 Merge pull request `#24022`_ from jayeshka/modjk_worker-states-unit-test - * 05c0a98 adding states/modjk_worker unit test case + * 81ed9c9f59 sphinx saltstack2 doc theme -**PR** `#24005`_: (*msteed*) issue `#23776`_ - @ *2015-05-21T01:55:34Z* +* **ISSUE** `#24102`_: (`bormotov`_) win_update encondig problems (refs: `#24145`_) - **ISSUE** `#23776`_: (*enblde*) Presence change events constantly reporting all minions as new in 2015.5 - * 701c51b Merge pull request `#24005`_ from msteed/issue-23776 - * 62e67d8 issue `#23776`_ +* **PR** `#24145`_: (`jfindlay`_) attempt to decode win update package + @ *2015-05-26 23:20:20 UTC* -**PR** `#23996`_: (*neogenix*) iptables state generates a 0 position which is invalid in iptables cli `#23950`_ - @ *2015-05-20T22:44:27Z* + * 05745fa931 Merge pull request `#24145`_ from jfindlay/win_update_encoding - **ISSUE** `#23950`_: (*neogenix*) iptables state generates a 0 position which is invalid in iptables cli - | refs: `#23996`_ - * 17b7c0b Merge pull request `#23996`_ from neogenix/2015.5-23950 - * ad417a5 fix for `#23950`_ + * cc5e17e61f attempt to decode win update package -**PR** `#23994`_: (*rallytime*) Skip the gpodder pkgrepo test for Ubuntu 15 - they don't have vivid ppa up yet - @ *2015-05-20T21:18:21Z* +* **ISSUE** `#24122`_: (`kiorky`_) service.dead is no more stateful: services does not handle correctly enable/disable change state (refs: `#24123`_) - * 4cb8773 Merge pull request `#23994`_ from rallytime/skip_test_ubuntu_15 - * 9e0ec07 Skip the gpodder pkgrepo test - they don't have vivid ppa up yet +* **PR** `#24123`_: (`kiorky`_) fix service enable/disable change + @ *2015-05-26 21:24:19 UTC* + * 70247890de Merge pull request `#24123`_ from makinacorpus/ss + + * 2e2e1d262d fix service enable/disable change + +* **PR** `#24146`_: (`rallytime`_) Fixes the boto_vpc_test failure on CentOS 5 tests + @ *2015-05-26 20:15:19 UTC* + + * 51c3cec5d7 Merge pull request `#24146`_ from rallytime/fix_centos_boto_failure + + * ac0f97de51 Fixes the boto_vpc_test failure on CentOS 5 tests + +* **ISSUE** `#24052`_: (`twangboy`_) v2015.5.1 Changes the way it interprets the minion_master.pub file (refs: `#24144`_, `#24089`_) + +* **ISSUE** `#23566`_: (`rks2286`_) Salt-cp corrupting the file after transfer to minion (refs: `#24144`_, `#23740`_) + +* **PR** `#24144`_: (`twangboy`_) Compare Keys ignores all newlines and carriage returns + @ *2015-05-26 19:25:48 UTC* + + * **PR** `#23740`_: (`jfindlay`_) Binary write (refs: `#24144`_) + + * 1c91a2176f Merge pull request `#24144`_ from twangboy/fix_24052 + + * c197b41494 Compare Keys removing all newlines and carriage returns + +* **PR** `#24139`_: (`rallytime`_) Backport `#24118`_ to 2015.5 + @ *2015-05-26 18:24:27 UTC* + + * **PR** `#24118`_: (`trevor-h`_) removed deprecated pymongo usage (refs: `#24178`_, `#24139`_) + + * 084166747c Merge pull request `#24139`_ from rallytime/bp-24118 + + * 4bb519b8da removed deprecated pymongo usage as no longer functional with pymongo > 3.x + +* **PR** `#24138`_: (`rallytime`_) Backport `#24116`_ to 2015.5 + @ *2015-05-26 18:23:51 UTC* + + * **PR** `#24116`_: (`awdrius`_) Fixed typo in chown username (ending dot) that fails the command. (refs: `#24138`_) + + * 742eca29f7 Merge pull request `#24138`_ from rallytime/bp-24116 + + * 7f08641800 Fixed typo in chown username (ending dot) that fails the command. + +* **PR** `#24137`_: (`rallytime`_) Backport `#24105`_ to 2015.5 + @ *2015-05-26 18:23:40 UTC* + + * **PR** `#24105`_: (`cedwards`_) Updated some beacon-specific documentation formatting (refs: `#24137`_) + + * e01536d098 Merge pull request `#24137`_ from rallytime/bp-24105 + + * f0778a0a60 Updated some beacon-specific documentation formatting + +* **ISSUE** `#23364`_: (`pruiz`_) Unable to destroy host using proxmox cloud: There was an error destroying machines: 501 Server Error: Method 'DELETE /nodes/pmx1/openvz/openvz/100' not implemented (refs: `#24104`_) + +* **PR** `#24136`_: (`rallytime`_) Backport `#24104`_ to 2015.5 + @ *2015-05-26 15:58:47 UTC* + + * **PR** `#24104`_: (`pruiz`_) Only try to stop a VM if it's not already stopped. (fixes `#23364`_) (refs: `#24136`_) + + * 89cdf976e1 Merge pull request `#24136`_ from rallytime/bp-24104 + + * c53888415f Only try to stop a VM if it's not already stopped. (fixes `#23364`_) + +* **PR** `#24135`_: (`rallytime`_) Backport `#24083`_ to 2015.5 + @ *2015-05-26 15:58:27 UTC* + + * **PR** `#24083`_: (`swdream`_) fix code block syntax (refs: `#24135`_) + + * 67c4373577 Merge pull request `#24135`_ from rallytime/bp-24083 + + * e1d06f9764 fix code block syntax + +* **PR** `#24131`_: (`jayeshka`_) adding states/mysql_user unit test case + @ *2015-05-26 15:58:10 UTC* + + * a83371e0ed Merge pull request `#24131`_ from jayeshka/mysql_user-states-unit-test + + * ed1ef69856 adding states/mysql_user unit test case + +* **PR** `#24130`_: (`jayeshka`_) adding states/ntp unit test case + @ *2015-05-26 15:57:29 UTC* + + * 1dc1d2a6e5 Merge pull request `#24130`_ from jayeshka/ntp-states-unit-test + + * ede4a9f2f1 adding states/ntp unit test case + +* **PR** `#24128`_: (`jayeshka`_) adding states/openstack_config unit test case + @ *2015-05-26 15:56:08 UTC* + + * 39434179a8 Merge pull request `#24128`_ from jayeshka/openstack_config-states-unit-test + + * ca09e0f7c1 adding states/openstack_config unit test case + +* **PR** `#24127`_: (`jayeshka`_) adding states/npm unit test case + @ *2015-05-26 15:55:18 UTC* + + * 23f25c4298 Merge pull request `#24127`_ from jayeshka/npm-states-unit-test + + * c3ecabbae0 adding states/npm unit test case + +* **ISSUE** `#24009`_: (`hvnsweeting`_) state_verbose False summary is wrong (refs: `#24077`_) + +* **PR** `#24077`_: (`anlutro`_) Change how state_verbose output is filtered + @ *2015-05-26 15:41:11 UTC* + + * 07488a4415 Merge pull request `#24077`_ from alprs/fix-outputter_highstate_nonverbose_count + + * 7790408c3c Change how state_verbose output is filtered + +* **PR** `#24119`_: (`jfindlay`_) Update contrib docs + @ *2015-05-26 15:37:01 UTC* + + * 224820febf Merge pull request `#24119`_ from jfindlay/update_contrib_docs + + * fa2d411f53 update example release branch in contrib docs + + * a0b76b57b3 clarify git rebase instructions + + * 3517e0095f fix contribution docs link typos + + * 651629c6a4 backport dev contrib doc updates to 2015.5 + +* **PR** `#23928`_: (`joejulian`_) Add the ability to replace existing certificates + @ *2015-05-25 19:47:26 UTC* + + * 5488c4aaa2 Merge pull request `#23928`_ from joejulian/2015.5_tls_module_replace_existing + + * 4a4cbdd266 Add the ability to replace existing certificates + +* **ISSUE** `#23221`_: (`Reiner030`_) Debian Jessie: locale.present not working again (refs: `#24078`_) + +* **PR** `#24078`_: (`jfindlay`_) if a charmap is not supplied, set it to the codeset + @ *2015-05-25 19:39:19 UTC* + + * dd90ef09b9 Merge pull request `#24078`_ from jfindlay/locale_charmap + + * 5eb97f0973 if a charmap is not supplied, set it to the codeset + +* **PR** `#24088`_: (`jfindlay`_) pkg module integration tests + @ *2015-05-25 19:39:02 UTC* + + * 9cec5d3dc9 Merge pull request `#24088`_ from jfindlay/pkg_tests + + * f1bd5ec404 adding pkg module integration tests + + * 739b2ef3bd rework yumpkg refresh_db so args are not mandatory + +* **ISSUE** `#24052`_: (`twangboy`_) v2015.5.1 Changes the way it interprets the minion_master.pub file (refs: `#24144`_, `#24089`_) + +* **PR** `#24089`_: (`jfindlay`_) allow override of binary file mode on windows + @ *2015-05-25 19:38:44 UTC* + + * 517552caa6 Merge pull request `#24089`_ from jfindlay/binary_write + + * b2259a6370 allow override of binary file mode on windows + +* **ISSUE** `#23973`_: (`mschiff`_) state file.managed: setting contents_pillar to a pillar which is a list throws exception instead giving descriptive error message (refs: `#24092`_) + +* **PR** `#24092`_: (`jfindlay`_) collect scattered contents edits, ensure it's a str + @ *2015-05-25 19:38:10 UTC* + + * 121ab9f857 Merge pull request `#24092`_ from jfindlay/file_state + + * cfa0f1358e collect scattered contents edits, ensure it's a str + +* **PR** `#24112`_: (`The-Loeki`_) thin_gen breaks when thinver doesn't exist + @ *2015-05-25 19:37:47 UTC* + + * 84e65dece7 Merge pull request `#24112`_ from The-Loeki/patch-1 + + * 34646eae16 thin_gen breaks when thinver doesn't exist + +* **PR** `#24108`_: (`jayeshka`_) adding states/mysql_query unit test case + @ *2015-05-25 12:30:48 UTC* + + * ec509ed272 Merge pull request `#24108`_ from jayeshka/mysql_query-states-unit-test + + * ec50450460 adding states/mysql_query unit test case + +* **PR** `#24110`_: (`jayeshka`_) adding varnish unit test case + @ *2015-05-25 12:30:21 UTC* + + * f2e5d6c2fd Merge pull request `#24110`_ from jayeshka/varnish-unit-test + + * e11988969f adding varnish unit test case + +* **PR** `#24109`_: (`jayeshka`_) adding states/mysql_grants unit test case + @ *2015-05-25 12:29:53 UTC* + + * 4fca2b49e3 Merge pull request `#24109`_ from jayeshka/mysql_grants-states-unit-test + + * 11a93cb80c adding states/mysql_grants unit test case + +* **PR** `#24028`_: (`nleib`_) send a disable message to disable puppet + @ *2015-05-25 04:02:11 UTC* + + * 6b43c9a8cb Merge pull request `#24028`_ from nleib/2015.5 + + * 15f24b42b2 update format of string in disabled msg + + * 7690e5b008 remove trailing whitespaces + + * 56a972034f Update puppet.py + + * 9686391d81 Update puppet.py + + * 33f3d68489 send a disable message to disable puppet + +* **PR** `#24100`_: (`jfindlay`_) adding states/file unit test case + @ *2015-05-24 05:17:54 UTC* + + * **PR** `#23963`_: (`jayeshka`_) adding states/file unit test case (refs: `#24100`_) + + * 52c9acafc2 Merge pull request `#24100`_ from jfindlay/merge_23963 + + * 7d59deb3d6 adding states/file unit test case + +* **ISSUE** `#21446`_: (`dpheasant`_) check for systemd on Oracle Linux (refs: `#24098`_) + +* **PR** `#24098`_: (`galet`_) Systemd not recognized properly on Oracle Linux 7 + @ *2015-05-24 04:07:31 UTC* + + * 0eb9f15d20 Merge pull request `#24098`_ from galet/2015.5 + + * 4d6ab21c74 Systemd not recognized properly on Oracle Linux 7 + +* **PR** `#24090`_: (`jfindlay`_) adding states/mount unit test case + @ *2015-05-22 23:02:57 UTC* + + * **PR** `#24062`_: (`jayeshka`_) adding states/mount unit test case (refs: `#24090`_) + + * 8e04db76de Merge pull request `#24090`_ from jfindlay/merge_24062 + + * a81a9225b8 adding states/mount unit test case + +* **ISSUE** `#22574`_: (`unicolet`_) error when which is not available (refs: `#22806`_) + +* **PR** `#24086`_: (`rallytime`_) Backport `#22806`_ to 2015.5 + @ *2015-05-22 21:18:20 UTC* + + * **PR** `#22806`_: (`jfindlay`_) use cmd.run_all instead of cmd.run_stdout (refs: `#24086`_) + + * c0079f5dc7 Merge pull request `#24086`_ from rallytime/bp-22806 + + * f728f55160 use cmd.run_all instead of cmd.run_stdout + +* **PR** `#24024`_: (`jayeshka`_) adding states/mongodb_user unit test case + @ *2015-05-22 20:53:19 UTC* + + * 09de253373 Merge pull request `#24024`_ from jayeshka/mongodb_user-states-unit-test + + * f31dc921f5 resolved errors + + * d038b1fdbb adding states/mongodb_user unit test case + +* **ISSUE** `#23883`_: (`kaithar`_) max_event_size seems broken (refs: `#24001`_, `#24065`_) + +* **PR** `#24065`_: (`kiorky`_) continue to fix `#23883`_ (refs: `#24066`_, `#24080`_) + @ *2015-05-22 18:59:21 UTC* + + * bfd812c56b Merge pull request `#24065`_ from makinacorpus/real23883 + + * 028282e01d continue to fix `#23883`_ + +* **ISSUE** `#24017`_: (`arthurlogilab`_) [salt-cloud openstack] TypeError: unhashable type: 'dict' on map creation (refs: `#24029`_) + +* **PR** `#24029`_: (`kiorky`_) Fix providers handling + @ *2015-05-22 16:56:06 UTC* + + * 429adfe00a Merge pull request `#24029`_ from makinacorpus/fixproviders + + * 412b39b802 Fix providers handling + +* **PR** `#23936`_: (`jfindlay`_) remove unreachable returns in file state + @ *2015-05-22 16:26:49 UTC* + + * a42ccccd98 Merge pull request `#23936`_ from jfindlay/file_state + + * ac29c0cdd0 also validate file.recurse source parameter + + * 57f73887fe remove unreachable returns in file state + +* **PR** `#24063`_: (`jayeshka`_) removed tuple index error + @ *2015-05-22 14:58:20 UTC* + + * 8b69b41a42 Merge pull request `#24063`_ from jayeshka/mount-states-module + + * b9745d5c4f removed tuple index error + +* **PR** `#24057`_: (`rallytime`_) Backport `#22572`_ to 2015.5 + @ *2015-05-22 05:36:25 UTC* + + * **PR** `#22572`_: (`The-Loeki`_) Small docfix for GitPillar (refs: `#24057`_) + + * 02ac4aa288 Merge pull request `#24057`_ from rallytime/bp-22572 + + * 49aad84b17 Small docfix for GitPillar + +* **ISSUE** `#23088`_: (`ghost`_) Segfault when adding a Zypper repo on SLES 11.3 (refs: `#24027`_) + +* **PR** `#24040`_: (`rallytime`_) Backport `#24027`_ to 2015.5 + @ *2015-05-21 23:43:54 UTC* + + * **PR** `#24027`_: (`ghost`_) Add baseurl to salt.modules.zypper.mod_repo (refs: `#24040`_) + + * 82de059891 Merge pull request `#24040`_ from rallytime/bp-24027 + + * 37d25d8bc6 Added baseurl as alias for url and mirrorlist in salt.modules.zypper.mod_repo. + +* **PR** `#24039`_: (`rallytime`_) Backport `#24015`_ to 2015.5 + @ *2015-05-21 23:43:25 UTC* + + * **PR** `#24015`_: (`YanChii`_) minor improvement of solarisips docs & fix typos (refs: `#24039`_) + + * d909781d97 Merge pull request `#24039`_ from rallytime/bp-24015 + + * 6bfaa94a8c minor improovement of solarisips docs & fix typos + +* **ISSUE** `#19598`_: (`fayetted`_) ssh_auth.present test=true incorectly reports changes will be made (refs: `#19599`_) + +* **PR** `#24038`_: (`rallytime`_) Backport `#19599`_ to 2015.5 + @ *2015-05-21 23:43:10 UTC* + + * **PR** `#19599`_: (`fayetted`_) Fix ssh_auth test mode, compare lines not just key (refs: `#24038`_) + + * 4a0f254d22 Merge pull request `#24038`_ from rallytime/bp-19599 + + * ea00d3e786 Fix ssh_auth test mode, compare lines not just key + +* **PR** `#24046`_: (`rallytime`_) Remove key management test from digital ocean cloud tests + @ *2015-05-21 22:32:04 UTC* + + * 42b87f1049 Merge pull request `#24046`_ from rallytime/remove_key_test + + * 1d031caa78 Remove key management test from digital ocean cloud tests + +* **PR** `#24044`_: (`cro`_) Remove spurious log message, fix typo in doc + @ *2015-05-21 22:31:49 UTC* + + * eff54b1c5a Merge pull request `#24044`_ from cro/pgjsonb + + * de0663314a Remove spurious log message, fix typo in doc + +* **ISSUE** `#23883`_: (`kaithar`_) max_event_size seems broken (refs: `#24001`_, `#24065`_) + +* **PR** `#24001`_: (`msteed`_) issue `#23883`_ + @ *2015-05-21 20:32:30 UTC* + + * ac32000b5d Merge pull request `#24001`_ from msteed/issue-23883 + + * bea97a8b98 issue `#23883`_ + +* **PR** `#23995`_: (`kiorky`_) Lxc path pre + @ *2015-05-21 17:26:03 UTC* + + * f7fae26059 Merge pull request `#23995`_ from makinacorpus/lxc_path_pre + + * 319282af5f lint + + * 1dc67e5678 lxc: versionadded + + * fcad7cb804 lxc: states improvments + + * 644bd729f7 lxc: more consistence for profiles + + * 139372c055 lxc: remove merge cruft + + * 725b0462ca lxc: Repair merge + +* **ISSUE** `#16383`_: (`interjection`_) salt.states.augeas.change example from docs fails with exception (refs: `#24032`_) + +* **PR** `#24032`_: (`kartiksubbarao`_) Update augeas_cfg.py + @ *2015-05-21 17:03:42 UTC* + + * 26d6851666 Merge pull request `#24032`_ from kartiksubbarao/augeas_insert_16383 + + * 3686dcd4c7 Update augeas_cfg.py + +* **PR** `#24025`_: (`jayeshka`_) adding timezone unit test case + @ *2015-05-21 16:50:53 UTC* + + * 55c9245075 Merge pull request `#24025`_ from jayeshka/timezone-unit-test + + * 1ec33e22a7 removed assertion error + + * 16ecb28950 adding timezone unit test case + +* **PR** `#24023`_: (`jayeshka`_) adding states/mongodb_database unit test case + @ *2015-05-21 16:49:17 UTC* + + * e243617659 Merge pull request `#24023`_ from jayeshka/mongodb_database-states-unit-test + + * 5a9ac7effb adding states/mongodb_database unit test case + +* **PR** `#24022`_: (`jayeshka`_) adding states/modjk_worker unit test case + @ *2015-05-21 16:48:29 UTC* + + * b377bd93e6 Merge pull request `#24022`_ from jayeshka/modjk_worker-states-unit-test + + * 05c0a985db adding states/modjk_worker unit test case + +* **ISSUE** `#23776`_: (`enblde`_) Presence change events constantly reporting all minions as new in 2015.5 (refs: `#24005`_) + +* **PR** `#24005`_: (`msteed`_) issue `#23776`_ + @ *2015-05-21 01:55:34 UTC* + + * 701c51ba7a Merge pull request `#24005`_ from msteed/issue-23776 + + * 62e67d8ca0 issue `#23776`_ + +* **ISSUE** `#23950`_: (`neogenix`_) iptables state generates a 0 position which is invalid in iptables cli (refs: `#23996`_) + +* **PR** `#23996`_: (`neogenix`_) iptables state generates a 0 position which is invalid in iptables cli `#23950`_ + @ *2015-05-20 22:44:27 UTC* + + * 17b7c0b741 Merge pull request `#23996`_ from neogenix/2015.5-23950 + + * ad417a57c2 fix for `#23950`_ + +* **PR** `#23994`_: (`rallytime`_) Skip the gpodder pkgrepo test for Ubuntu 15 - they don't have vivid ppa up yet + @ *2015-05-20 21:18:21 UTC* + + * 4cb877307c Merge pull request `#23994`_ from rallytime/skip_test_ubuntu_15 + + * 9e0ec07d85 Skip the gpodder pkgrepo test - they don't have vivid ppa up yet .. _`#14021`: https://github.com/saltstack/salt/issues/14021 .. _`#16383`: https://github.com/saltstack/salt/issues/16383 @@ -991,7 +1106,6 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#23221`: https://github.com/saltstack/salt/issues/23221 .. _`#23308`: https://github.com/saltstack/salt/pull/23308 .. _`#23364`: https://github.com/saltstack/salt/issues/23364 -.. _`#23464`: https://github.com/saltstack/salt/issues/23464 .. _`#23566`: https://github.com/saltstack/salt/issues/23566 .. _`#23623`: https://github.com/saltstack/salt/pull/23623 .. _`#23657`: https://github.com/saltstack/salt/issues/23657 @@ -1148,28 +1262,75 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt .. _`#24346`: https://github.com/saltstack/salt/pull/24346 .. _`#24349`: https://github.com/saltstack/salt/pull/24349 .. _`#24365`: https://github.com/saltstack/salt/pull/24365 +.. _`#24372`: https://github.com/saltstack/salt/pull/24372 .. _`#40`: https://github.com/saltstack/salt/issues/40 .. _`#9772`: https://github.com/saltstack/salt/issues/9772 -.. _`bp-19320`: https://github.com/saltstack/salt/pull/19320 -.. _`bp-19599`: https://github.com/saltstack/salt/pull/19599 -.. _`bp-20474`: https://github.com/saltstack/salt/pull/20474 -.. _`bp-22572`: https://github.com/saltstack/salt/pull/22572 -.. _`bp-22806`: https://github.com/saltstack/salt/pull/22806 -.. _`bp-23308`: https://github.com/saltstack/salt/pull/23308 -.. _`bp-24013`: https://github.com/saltstack/salt/pull/24013 -.. _`bp-24015`: https://github.com/saltstack/salt/pull/24015 -.. _`bp-24027`: https://github.com/saltstack/salt/pull/24027 -.. _`bp-24083`: https://github.com/saltstack/salt/pull/24083 -.. _`bp-24104`: https://github.com/saltstack/salt/pull/24104 -.. _`bp-24105`: https://github.com/saltstack/salt/pull/24105 -.. _`bp-24116`: https://github.com/saltstack/salt/pull/24116 -.. _`bp-24118`: https://github.com/saltstack/salt/pull/24118 -.. _`bp-24129`: https://github.com/saltstack/salt/pull/24129 -.. _`bp-24186`: https://github.com/saltstack/salt/pull/24186 -.. _`bp-24205`: https://github.com/saltstack/salt/pull/24205 -.. _`bp-24220`: https://github.com/saltstack/salt/pull/24220 -.. _`bp-24263`: https://github.com/saltstack/salt/pull/24263 -.. _`bp-24271`: https://github.com/saltstack/salt/pull/24271 -.. _`fix-14021`: https://github.com/saltstack/salt/issues/14021 -.. _`fix-18966`: https://github.com/saltstack/salt/issues/18966 -.. _`fix-22991`: https://github.com/saltstack/salt/issues/22991 +.. _`Reiner030`: https://github.com/Reiner030 +.. _`Sacro`: https://github.com/Sacro +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`YanChii`: https://github.com/YanChii +.. _`aboe76`: https://github.com/aboe76 +.. _`anlutro`: https://github.com/anlutro +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`awdrius`: https://github.com/awdrius +.. _`basepi`: https://github.com/basepi +.. _`bechtoldt`: https://github.com/bechtoldt +.. _`bormotov`: https://github.com/bormotov +.. _`c4urself`: https://github.com/c4urself +.. _`cdarwin`: https://github.com/cdarwin +.. _`cedwards`: https://github.com/cedwards +.. _`clan`: https://github.com/clan +.. _`corywright`: https://github.com/corywright +.. _`cro`: https://github.com/cro +.. _`damonnk`: https://github.com/damonnk +.. _`dennisjac`: https://github.com/dennisjac +.. _`djcrabhat`: https://github.com/djcrabhat +.. _`dmyerscough`: https://github.com/dmyerscough +.. _`dpheasant`: https://github.com/dpheasant +.. _`dr4Ke`: https://github.com/dr4Ke +.. _`emostar`: https://github.com/emostar +.. _`enblde`: https://github.com/enblde +.. _`fayetted`: https://github.com/fayetted +.. _`galet`: https://github.com/galet +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`ghost`: https://github.com/ghost +.. _`hashi825`: https://github.com/hashi825 +.. _`hazelesque`: https://github.com/hazelesque +.. _`hvnsweeting`: https://github.com/hvnsweeting +.. _`interjection`: https://github.com/interjection +.. _`jacksontj`: https://github.com/jacksontj +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jayeshka`: https://github.com/jayeshka +.. _`jbq`: https://github.com/jbq +.. _`jfindlay`: https://github.com/jfindlay +.. _`joejulian`: https://github.com/joejulian +.. _`justinta`: https://github.com/justinta +.. _`kaithar`: https://github.com/kaithar +.. _`kartiksubbarao`: https://github.com/kartiksubbarao +.. _`kiorky`: https://github.com/kiorky +.. _`mbrgm`: https://github.com/mbrgm +.. _`merll`: https://github.com/merll +.. _`mschiff`: https://github.com/mschiff +.. _`msteed`: https://github.com/msteed +.. _`neogenix`: https://github.com/neogenix +.. _`nicholascapo`: https://github.com/nicholascapo +.. _`nleib`: https://github.com/nleib +.. _`paclat`: https://github.com/paclat +.. _`pengyao`: https://github.com/pengyao +.. _`pruiz`: https://github.com/pruiz +.. _`rallytime`: https://github.com/rallytime +.. _`randybias`: https://github.com/randybias +.. _`rks2286`: https://github.com/rks2286 +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`steverweber`: https://github.com/steverweber +.. _`swdream`: https://github.com/swdream +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`thcipriani`: https://github.com/thcipriani +.. _`thusoy`: https://github.com/thusoy +.. _`trevor-h`: https://github.com/trevor-h +.. _`twangboy`: https://github.com/twangboy +.. _`unicolet`: https://github.com/unicolet +.. _`whiteinge`: https://github.com/whiteinge diff --git a/doc/topics/releases/2015.5.3.rst b/doc/topics/releases/2015.5.3.rst index 8bce6e38c1..f9a0f89981 100644 --- a/doc/topics/releases/2015.5.3.rst +++ b/doc/topics/releases/2015.5.3.rst @@ -2,1513 +2,1632 @@ Salt 2015.5.3 Release Notes =========================== -Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +:release: 2015-07-07 -*Generated at: 2015-07-01T19:40:52Z* +Version 2015.5.3 is a bugfix release for :ref:`2015.5.0 `. -Statistics: -- Total Merges: **177** -- Total Issue references: **81** -- Total PR references: **231** +Statistics +========== -Changes: +- Total Merges: **178** +- Total Issue References: **69** +- Total PR References: **207** +- Contributors: **62** (`CameronNemo`_, `Lanzaa`_, `Starblade42`_, `The-Loeki`_, `TheScriptSage`_, `aboe76`_, `ahus1`_, `aneeshusa`_, `anlutro`_, `arthurlogilab`_, `basepi`_, `borutmrak`_, `cachedout`_, `cgtx`_, `codertux`_, `cro`_, `dkiser`_, `driskell`_, `eliasp`_, `garethgreenaway`_, `grischa`_, `gthb`_, `heewa`_, `infestdead`_, `jacksontj`_, `jacobhammons`_, `jayeshka`_, `jeanpralo`_, `jfindlay`_, `jodv`_, `joejulian`_, `justinta`_, `kartiksubbarao`_, `kev009`_, `kiorky`_, `lorengordon`_, `msciciel`_, `msteed`_, `nmadhok`_, `notpeter`_, `obestwalter`_, `pengyao`_, `pille`_, `porterjamesj`_, `pruiz`_, `quixoten`_, `rallytime`_, `rhertzog`_, `ruzarowski`_, `ryan-lane`_, `steverweber`_, `tankywoo`_, `tbaker57`_, `techhat`_, `terminalmage`_, `thatch45`_, `thenewwazoo`_, `trevor-h`_, `twangboy`_, `variia`_, `zefrog`_, `zhujinhe`_) -- **PR** `#25096`_: (*jfindlay*) Postgres group test - @ *2015-07-01T18:48:26Z* - - **PR** `#24330`_: (*jayeshka*) adding states/postgres_group unit test case. - | refs: `#25096`_ - * 21709aa Merge pull request `#25096`_ from jfindlay/postgres_group_test - * 3c379dc declobber postgres state unit test mocking +Changelog for v2015.5.2..v2015.5.3 +================================== - * a162ffa adding states/postgres_group unit test case. +*Generated at: 2018-05-27 21:20:01 UTC* -- **PR** `#25085`_: (*jfindlay*) accept all sources in the file state - @ *2015-07-01T18:23:45Z* +* **PR** `#25109`_: (`jfindlay`_) add 2015.5.3 release notes + @ *2015-07-01 19:45:56 UTC* - - **ISSUE** `#25041`_: (*wt*) REGRESSION: pillar.get of integer fails to render in sls - | refs: `#25085`_ - * 0a84640 Merge pull request `#25085`_ from jfindlay/fix_file - * 937a252 remove unnecessary file state tests + * f0f512a4da Merge pull request `#25109`_ from jfindlay/2015.5 - * 6f238e9 integration test file.managed sources + * 3187d5d5aa add 2015.5.3 release notes - * a5978d3 iterate an iterable source othwerise list+str it +* **PR** `#25096`_: (`jfindlay`_) Postgres group test + @ *2015-07-01 18:48:26 UTC* -- **PR** `#25095`_: (*jfindlay*) Win groupadd unit tests - @ *2015-07-01T18:18:53Z* + * **PR** `#24330`_: (`jayeshka`_) adding states/postgres_group unit test case. (refs: `#25096`_) - - **PR** `#24207`_: (*jayeshka*) adding win_groupadd unit test case. - | refs: `#25095`_ - * a983942 Merge pull request `#25095`_ from jfindlay/win_groupadd_test - * 564dffd depend on win libs rather than mocking them + * 21709aa483 Merge pull request `#25096`_ from jfindlay/postgres_group_test - * 9b9aeb8 resolved all errors. + * 3c379dc115 declobber postgres state unit test mocking - * aaf8935 adding win_groupadd unit test case. + * a162ffa3d8 adding states/postgres_group unit test case. -- **PR** `#25089`_: (*jfindlay*) fix minion sudo - @ *2015-07-01T15:53:16Z* +* **ISSUE** `#25041`_: (`wt`_) REGRESSION: pillar.get of integer fails to render in sls (refs: `#25085`_) - - **ISSUE** `#21520`_: (*jfindlay*) sudo.salt_call is broken - | refs: `#25089`_ - - **PR** `#20226`_: (*thatch45*) Allow sudo priv escalation - | refs: `#25089`_ - * 7c8d2a8 Merge pull request `#25089`_ from jfindlay/fix_sudo - * d8f91d4 add some apprehension to the sudo exec module +* **PR** `#25085`_: (`jfindlay`_) accept all sources in the file state + @ *2015-07-01 18:23:45 UTC* - * a9269c0 adding sudo exec module docs + * 0a846400c6 Merge pull request `#25085`_ from jfindlay/fix_file - * e4a40b7 comment whitespace in minion config + * 937a252e16 remove unnecessary file state tests - * 44cb167 adding sudo_user minion config docs + * 6f238e924c integration test file.managed sources - * d461060 adding sudo_user minion config to default + * a5978d30c2 iterate an iterable source othwerise list+str it -- **PR** `#25099`_: (*driskell*) Fix broken batch results - @ *2015-07-01T15:51:29Z* +* **PR** `#25095`_: (`jfindlay`_) Win groupadd unit tests + @ *2015-07-01 18:18:53 UTC* - - **ISSUE** `#24875`_: (*ahammond*) ValueError: list.remove(x): x not in list in File "/usr/lib/python2.6/site-packages/salt/cli/batch.py", line 179, in run active.remove(minion) - | refs: `#25099`_ - * 4d6078e Merge pull request `#25099`_ from driskell/patch-1 - * 59b23e5 Fix broken batch results + * **PR** `#24207`_: (`jayeshka`_) adding win_groupadd unit test case. (refs: `#25095`_) -- **PR** `#25083`_: (*steverweber*) ipmi: get_sensor_data would always fail - @ *2015-06-30T20:57:21Z* + * a98394210e Merge pull request `#25095`_ from jfindlay/win_groupadd_test - * 4635079 Merge pull request `#25083`_ from steverweber/fix_ipmi_stat - * 836f48c include _ in IpmiCommand + * 564dffd14a depend on win libs rather than mocking them - * 817e434 get_sensor_data would always fail + * 9b9aeb8628 resolved all erors. -- **PR** `#25067`_: (*The-Loeki*) Fix for maxdepth=0 in find - @ *2015-06-30T20:54:06Z* + * aaf89354c0 adding win_groupadd unit test case. - * 15f2a40 Merge pull request `#25067`_ from The-Loeki/patch-1 - * 61edad3 Fix for maxdepth=0 in find +* **ISSUE** `#21520`_: (`jfindlay`_) sudo.salt_call is broken (refs: `#25089`_) -- **PR** `#25078`_: (*terminalmage*) Use smaller number for upper limit of mac_user's _first_avail_uid helper function - @ *2015-06-30T20:53:24Z* +* **PR** `#25089`_: (`jfindlay`_) fix minion sudo + @ *2015-07-01 15:53:16 UTC* - * 58d933c Merge pull request `#25078`_ from terminalmage/fix-mac-uid - * df2ab7e Use smaller number for upper limit of mac_user's _first_avail_uid helper function + * **PR** `#20226`_: (`thatch45`_) Allow sudo priv escalation (refs: `#25089`_) -- **PR** `#25045`_: (*garethgreenaway*) Fixes to debian_ip.py in 2015.5 - @ *2015-06-30T17:36:43Z* + * 7c8d2a8656 Merge pull request `#25089`_ from jfindlay/fix_sudo - - **ISSUE** `#24521`_: (*multani*) State network.managed fails on Debian (Jessie) - | refs: `#25045`_ - * ebd6cdc Merge pull request `#25045`_ from garethgreenaway/24521_debian_networking - * 6f2a6c9 having proto default to static since it's needed to build the template. + * d8f91d4a19 add some apprehension to the sudo exec module -- **PR** `#25065`_: (*lorengordon*) Add download links for 2015.5.1-3 and 2015.5.2 Windows installers - @ *2015-06-30T15:29:31Z* + * a9269c072a adding sudo exec module docs - - **ISSUE** `#25057`_: (*TheBigBear*) why is there still no newer salt-minion for windows than ver. 2015.5.0-2? no 2015.5.1 or 2015.5.2? - * ae31b27 Merge pull request `#25065`_ from lorengordon/update-windows-installer-links - * 40a0c13 Add download links for 2015.5.1-3 and 2015.5.2, Fixes `#25057`_ + * e4a40b7bd8 comment whitespace in minion config -- **PR** `#25052`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-06-30T01:05:00Z* + * 44cb167744 adding sudo_user minion config docs - - **ISSUE** `#15209`_: (*hubez*) file.manage: source_hash not working with s3:// (2014.7.0rc1) - | refs: `#25011`_ - - **PR** `#25011`_: (*notpeter*) Add s3 to protocols for remote source_hash (2014.7 backport) - * ddaeb0f Merge pull request `#25052`_ from basepi/merge-forward-2015.5 - * 2c5e664 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * d461060efe adding sudo_user minion config to default - * a7154e7 Merge pull request `#25011`_ from notpeter/s3_2014.7_backport +* **ISSUE** `#24875`_: (`ahammond`_) ValueError: list.remove(x): x not in list in File "/usr/lib/python2.6/site-packages/salt/cli/batch.py", line 179, in run active.remove(minion) (refs: `#25099`_) - * 8b8af64 Add s3 to protocols for remote source_hash +* **PR** `#25099`_: (`driskell`_) Fix broken batch results + @ *2015-07-01 15:51:29 UTC* -- **PR** `#25038`_: (*jfindlay*) versionadded - @ *2015-06-29T19:49:27Z* + * 4d6078e5dd Merge pull request `#25099`_ from driskell/patch-1 - - **PR** `#24747`_: (*msciciel*) add get_route function to network module - | refs: `#25038`_ - * c7003d4 Merge pull request `#25038`_ from jfindlay/versionadded - * d6dc6f9 versionadded + * 59b23e5f6e Fix broken batch results -- **PR** `#24747`_: (*msciciel*) add get_route function to network module - | refs: `#25038`_ - @ *2015-06-29T16:51:43Z* +* **PR** `#25083`_: (`steverweber`_) ipmi: get_sensor_data would always fail + @ *2015-06-30 20:57:21 UTC* - * 28c87ca Merge pull request `#24747`_ from msciciel/2015.5 - * 79b4ec2 network module lint fix + * 46350796b6 Merge pull request `#25083`_ from steverweber/fix_ipmi_stat - * 0b6ef78 network module: fix for ipv6 + * 836f48c378 include _ in IpmiCommand - * f3d184c add get_route function to network module + * 817e434591 get_sensor_data would always fail -- **PR** `#24975`_: (*ryan-lane*) Fix update of undefined env var in npm module - @ *2015-06-29T16:45:05Z* +* **PR** `#25067`_: (`The-Loeki`_) Fix for maxdepth=0 in find + @ *2015-06-30 20:54:06 UTC* - * 46a9677 Merge pull request `#24975`_ from lyft/npm-module-fix - * 6fde581 Try byte literals rather than unicode strings in the env + * 15f2a4077c Merge pull request `#25067`_ from The-Loeki/patch-1 - * c8514de Fix update of undefined env var in npm module + * 61edad3a80 Fix for maxdepth=0 in find -- **PR** `#24986`_: (*heewa*) Don't modify empty change - @ *2015-06-29T16:44:17Z* +* **PR** `#25078`_: (`terminalmage`_) Use smaller number for upper limit of mac_user's _first_avail_uid helper function + @ *2015-06-30 20:53:24 UTC* - * 9cf8550 Merge pull request `#24986`_ from heewa/fix-pkg-hold-when-errored - * d47a448 Don't modify empty change + * 58d933cfa8 Merge pull request `#25078`_ from terminalmage/fix-mac-uid -- **PR** `#24999`_: (*rallytime*) Provide a less confusing error when cloud provider is misconfigured - @ *2015-06-29T16:43:31Z* + * df2ab7ee2b Use smaller number for upper limit of mac_user's _first_avail_uid helper function - - **ISSUE** `#24969`_: (*bradthurber*) salt-cloud 2015.5.0: missing azure dependency results in misleading error - | refs: `#24999`_ - * ece897d Merge pull request `#24999`_ from rallytime/cloud_error_help - * 1e81a88 Clean up +* **ISSUE** `#24521`_: (`multani`_) State network.managed fails on Debian (Jessie) (refs: `#25045`_) - * be19a67 Provide a less confusing error when cloud provider is misconfigured +* **PR** `#25045`_: (`garethgreenaway`_) Fixes to debian_ip.py in 2015.5 + @ *2015-06-30 17:36:43 UTC* -- **PR** `#24987`_: (*heewa*) Don't try to cache a template when it's not a file - @ *2015-06-29T14:02:59Z* + * ebd6cdc412 Merge pull request `#25045`_ from garethgreenaway/24521_debian_networking - * 4af15cf Merge pull request `#24987`_ from heewa/fix-trying-to-cache-no-file - * 9ae0c78 Don't try to cache a template when it's not a file + * 6f2a6c940b having proto default to static since it's needed to build the template. -- **PR** `#25022`_: (*jfindlay*) revise label and milestone documentation - @ *2015-06-29T13:51:24Z* +* **PR** `#25065`_: (`lorengordon`_) Add download links for 2015.5.1-3 and 2015.5.2 Windows installers + @ *2015-06-30 15:29:31 UTC* - * 8eeaddb Merge pull request `#25022`_ from jfindlay/label_docs - * 8575192 revise label and milestone documentation + * ae31b279cc Merge pull request `#25065`_ from lorengordon/update-windows-installer-links -- **PR** `#25029`_: (*jayeshka*) adding redismod unit test case. - @ *2015-06-29T13:50:33Z* + * 40a0c132d4 Add download links for 2015.5.1-3 and 2015.5.2, Fixes `#25057`_ - * 89c2e01 Merge pull request `#25029`_ from jayeshka/redismod-unit-test - * e3045be adding redismod unit test case. +* **PR** `#25052`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-06-30 01:05:00 UTC* -- **PR** `#24995`_: (*rallytime*) Fix deprecated pymongo usage causing errors in latest pymongo - @ *2015-06-27T22:28:56Z* + * ddaeb0fb8e Merge pull request `#25052`_ from basepi/merge-forward-2015.5 - - **PR** `#24175`_: (*trevor-h*) fix deprecated pymongo usage causing errors in latest pymongo - | refs: `#24995`_ - * 6425252 Merge pull request `#24995`_ from rallytime/tops_mongo - * a3c1063 fix deprecated pymongo usage causing errors in latest pymongo + * 2c5e664a58 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#24994`_: (*garethgreenaway*) Another Fix to gpg.py in 2015.5 - @ *2015-06-27T22:28:15Z* + * a7154e7471 Merge pull request `#25011`_ from notpeter/s3_2014.7_backport - - **ISSUE** `#24862`_: (*dkatsanikakis*) gpg.import_key returns error after successfully completed - | refs: `#24966`_ `#24994`_ - * e9aaa11 Merge pull request `#24994`_ from garethgreenaway/2015_5_24862_gpg_import_key - * d2f0d8f variable was referenced before assignment. Just removing the variable and checking the return from distutils.version.LooseVersion directly. + * 8b8af640f6 Add s3 to protocols for remote source_hash -- **PR** `#24988`_: (*jayeshka*) adding states/supervisord unit test case. - @ *2015-06-27T22:24:42Z* +* **PR** `#25038`_: (`jfindlay`_) versionadded + @ *2015-06-29 19:49:27 UTC* - * ebd666e Merge pull request `#24988`_ from jayeshka/supervisord-states-unit-test - * bb0a6d5 adding states/supervisord unit test case. + * **PR** `#24747`_: (`msciciel`_) add get_route function to network module (refs: `#25038`_) -- **PR** `#25007`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-06-26T21:28:57Z* + * c7003d4951 Merge pull request `#25038`_ from jfindlay/versionadded - - **ISSUE** `#24915`_: (*jtand*) Salt-cloud not working in 2014.7.6 - | refs: `#24944`_ - - **PR** `#24944`_: (*techhat*) Double-check main_cloud_config - - **PR** `#24936`_: (*jtand*) Fixed ps module to not use depreciated psutil commands - * 0487c3c Merge pull request `#25007`_ from basepi/merge-forward-2015.5 - * 4980fd5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * d6dc6f97b5 versionadded - * a11e4c6 Merge pull request `#24944`_ from techhat/issue24915 +* **PR** `#24747`_: (`msciciel`_) add get_route function to network module (refs: `#25038`_) + @ *2015-06-29 16:51:43 UTC* - * 59c3081 Double-check main_cloud_config + * 28c87cab17 Merge pull request `#24747`_ from msciciel/2015.5 - * d26a544 Merge pull request `#24936`_ from jtand/psutil + * 79b4ec2da8 network module lint fix - * bdb7a19 Fixed ps module to not use depreciated psutil commands + * 0b6ef784b2 network module: fix for ipv6 -- **PR** `#25003`_: (*jacobhammons*) Updated man pages - @ *2015-06-26T19:13:41Z* + * f3d184c478 add get_route function to network module - * 91a60e1 Merge pull request `#25003`_ from jacobhammons/man-pages - * cf97a4a Updated man pages +* **PR** `#24975`_: (`ryan-lane`_) Fix update of undefined env var in npm module + @ *2015-06-29 16:45:05 UTC* -- **PR** `#25002`_: (*jacobhammons*) sphinx html theme updates - @ *2015-06-26T18:39:14Z* + * 46a96773aa Merge pull request `#24975`_ from lyft/npm-module-fix - * a60a2c4 Merge pull request `#25002`_ from jacobhammons/doc-announcements - * f88f344 sphinx html theme updates + * 6fde58182f Try byte literals rather than unicode strings in the env -- **PR** `#24977`_: (*rallytime*) Only warn about digital ocean deprecation if digital ocean is configured - @ *2015-06-25T23:54:46Z* + * c8514de334 Fix update of undefined env var in npm module - * a791b23 Merge pull request `#24977`_ from rallytime/do_move_warning - * 6b54422 Only warn about digital ocean deprecation if digital ocean is configured +* **PR** `#24986`_: (`heewa`_) Don't modify empty change + @ *2015-06-29 16:44:17 UTC* -- **PR** `#24966`_: (*garethgreenaway*) Fixes to gpg.py in 2015.5 - @ *2015-06-25T19:58:49Z* + * 9cf8550cd8 Merge pull request `#24986`_ from heewa/fix-pkg-hold-when-errored - - **ISSUE** `#24862`_: (*dkatsanikakis*) gpg.import_key returns error after successfully completed - | refs: `#24966`_ `#24994`_ - * a71c1b7 Merge pull request `#24966`_ from garethgreenaway/2015_5_24862_gpg_import_key - * 55eb73b fixing unit tests. + * d47a448a80 Don't modify empty change - * 80c24be Fixing an issue with the import_key method. Different results depending on which gnupg python module is installed. +* **ISSUE** `#24969`_: (`bradthurber`_) salt-cloud 2015.5.0: missing azure dependency results in misleading error (refs: `#24999`_) -- **PR** `#24965`_: (*jacksontj*) Fix memory leak in saltnado - @ *2015-06-25T18:48:03Z* +* **PR** `#24999`_: (`rallytime`_) Provide a less confusing error when cloud provider is misconfigured + @ *2015-06-29 16:43:31 UTC* - - **ISSUE** `#24846`_: (*mavenAtHouzz*) Memory leak issue in rest_tornado EventListener - | refs: `#24965`_ - * 8622184 Merge pull request `#24965`_ from jacksontj/2015.5 - * 48b5e16 pylint + * ece897d8d6 Merge pull request `#24999`_ from rallytime/cloud_error_help - * 87adca4 Fix memory leak in saltnado + * 1e81a88625 Clean up -- **PR** `#24948`_: (*jfindlay*) fix some malformed doc links and anchors - @ *2015-06-25T15:51:38Z* + * be19a6730e Provide a less confusing error when cloud provider is misconfigured - * 773c4cf Merge pull request `#24948`_ from jfindlay/doc_links - * 152a9b2 fix some malformed doc links and anchors +* **PR** `#24987`_: (`heewa`_) Don't try to cache a template when it's not a file + @ *2015-06-29 14:02:59 UTC* -- **PR** `#24886`_: (*anlutro*) Be more careful about stripping away root_dir from directory options - @ *2015-06-25T15:50:11Z* + * 4af15cfb90 Merge pull request `#24987`_ from heewa/fix-trying-to-cache-no-file - - **ISSUE** `#24885`_: (*anlutro*) Master config - Directories starting with a dot have the dot stripped when root_dir is . - | refs: `#24886`_ - * 4ebc01e Merge pull request `#24886`_ from alprs/fix-root_dir_bug - * 52ccafd os.sep is the correct directory separator constant + * 9ae0c78ffc Don't try to cache a template when it's not a file - * 0ecbf26 Be more careful about stripping away root_dir from directory options +* **PR** `#25022`_: (`jfindlay`_) revise label and milestone documentation + @ *2015-06-29 13:51:24 UTC* -- **PR** `#24930`_: (*jacksontj*) Don't refetch file templates 100% of the time-- Performance optimization for templated files - @ *2015-06-24T21:22:47Z* + * 8eeaddbff4 Merge pull request `#25022`_ from jfindlay/label_docs - * f52f7e1 Merge pull request `#24930`_ from jacksontj/2015.5 - * 5fb7534 Only parse the source if we have one + * 8575192cc4 revise label and milestone documentation - * c03a6fa Add support for sources of managed files to be local +* **PR** `#25029`_: (`jayeshka`_) adding redismod unit test case. + @ *2015-06-29 13:50:33 UTC* - * 4cf78a0 pylint + * 89c2e01ac1 Merge pull request `#25029`_ from jayeshka/redismod-unit-test - * d70914e Don't refetch the template 100% of the time-- Performance optimization for templated files + * e3045be5a9 adding redismod unit test case. -- **PR** `#24935`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-06-24T18:17:54Z* +* **PR** `#24995`_: (`rallytime`_) Fix deprecated pymongo usage causing errors in latest pymongo + @ *2015-06-27 22:28:56 UTC* - - **PR** `#24918`_: (*BretFisher*) SmartOS SMF minion startup fix - - **PR** `#473`_: (*whiteinge*) Added a couple functions to work with the minion file cache - | refs: `#24918`_ - * 925a4d9 Merge pull request `#24935`_ from basepi/merge-forward-2015.5 - * 8d8bf34 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * **PR** `#24175`_: (`trevor-h`_) fix deprecated pymongo usage causing errors in latest pymongo (refs: `#24995`_) - * eeb05a1 Merge pull request `#24918`_ from BretFisher/minion-start-smartos-smf-fix + * 642525298c Merge pull request `#24995`_ from rallytime/tops_mongo - * d7bfb0c Smartos smf minion fix + * a3c1063a37 fix deprecated pymongo usage causing errors in latest pymongo -- **PR** `#24873`_: (*jfindlay*) convert osrelease grain to str before str op - @ *2015-06-24T16:43:08Z* +* **ISSUE** `#24862`_: (`dkatsanikakis`_) gpg.import_key returns error after succesfully completed (refs: `#24994`_, `#24966`_) - - **ISSUE** `#24826`_: (*rakai93*) rh_service.py: 'int' object has no attribute 'startswith' - | refs: `#24873`_ - * 4e8ed0d Merge pull request `#24873`_ from jfindlay/rh_service - * febe6ef convert osrelease grain to str before str op +* **PR** `#24994`_: (`garethgreenaway`_) Another Fix to gpg.py in 2015.5 + @ *2015-06-27 22:28:15 UTC* -- **PR** `#24923`_: (*jayeshka*) adding states/status unit test case. - @ *2015-06-24T15:50:07Z* + * e9aaa11b68 Merge pull request `#24994`_ from garethgreenaway/2015_5_24862_gpg_import_key - * 90819f9 Merge pull request `#24923`_ from jayeshka/status-states-unit-test - * baec650 adding states/status unit test case. + * d2f0d8fa96 variable was referenced before assignment. Just removing the variable and checking the return from distutils.version.LooseVersion directly. -- **PR** `#24902`_: (*cro*) Fix minion failover, document same - @ *2015-06-24T15:20:43Z* +* **PR** `#24988`_: (`jayeshka`_) adding states/supervisord unit test case. + @ *2015-06-27 22:24:42 UTC* - * 2dd24ec Merge pull request `#24902`_ from cro/fixfo2 - * 90c73ff References to documentation. + * ebd666e5ee Merge pull request `#24988`_ from jayeshka/supervisord-states-unit-test - * f0c9204 Add references to failover parameters in conf + * bb0a6d5625 adding states/supervisord unit test case. - * 9da96a8 Docs +* **PR** `#25007`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-06-26 21:28:57 UTC* - * e2314f0 Move comment. + * 0487c3c59b Merge pull request `#25007`_ from basepi/merge-forward-2015.5 - * b9a756f Fix master failover and add documentation for same. Factor in syndics. Syndics will not failover (yet). + * 4980fd547b Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#24926`_: (*rallytime*) Back-port `#22263`_ to 2015.5 - @ *2015-06-24T15:09:40Z* + * a11e4c6eea Merge pull request `#24944`_ from techhat/issue24915 - - **PR** `#22263`_: (*cachedout*) Prevent a load from being written if one already exists - | refs: `#24926`_ - * 087ee09 Merge pull request `#24926`_ from rallytime/`bp-22263`_ - * 8c92d9c Prevent a load from being written if one already exists + * 59c3081e49 Double-check main_cloud_config -- **PR** `#24900`_: (*rallytime*) Back-port `#24848`_ to 2015.5 - @ *2015-06-24T15:09:18Z* + * d26a5447ba Merge pull request `#24936`_ from jtand/psutil - - **PR** `#24848`_: (*nmadhok*) Correcting bash code blocks - | refs: `#24900`_ - * b34a74f Merge pull request `#24900`_ from rallytime/`bp-24848`_ - * d2b5456 Correcting bash code blocks + * bdb7a19c36 Fixed ps module to not use depreciated psutil commands -- **PR** `#24899`_: (*rallytime*) Back-port `#24847`_ to 2015.5 - @ *2015-06-24T15:09:01Z* +* **PR** `#25003`_: (`jacobhammons`_) Updated man pages + @ *2015-06-26 19:13:41 UTC* - - **PR** `#24847`_: (*borutmrak*) unset size parameter for lxc.create when backing=zfs - | refs: `#24899`_ - * a546e8e Merge pull request `#24899`_ from rallytime/`bp-24847`_ - * 1e4ec7a unset size parameter for lxc.create when backing=zfs + * 91a60e198e Merge pull request `#25003`_ from jacobhammons/man-pages -- **PR** `#24898`_: (*rallytime*) Back-port `#24845`_ to 2015.5 - @ *2015-06-24T15:06:09Z* + * cf97a4ab17 Updated man pages - - **PR** `#24845`_: (*porterjamesj*) fix bug in docker.loaded - | refs: `#24898`_ - * d4dd8d2 Merge pull request `#24898`_ from rallytime/`bp-24845`_ - * 071049a fix bug in docker.loaded +* **PR** `#25002`_: (`jacobhammons`_) sphinx html theme updates + @ *2015-06-26 18:39:14 UTC* -- **PR** `#24897`_: (*rallytime*) Back-port `#24839`_ to 2015.5 - @ *2015-06-24T15:05:35Z* + * a60a2c4222 Merge pull request `#25002`_ from jacobhammons/doc-announcements - - **ISSUE** `#24799`_: (*infestdead*) Forced remount because options changed when no options changed (glusterfs) - - **PR** `#24839`_: (*infestdead*) fix for issue `#24799`_ - | refs: `#24897`_ - * 6930855 Merge pull request `#24897`_ from rallytime/`bp-24839`_ - * f3b20d5 fix for issue `#24799`_ + * f88f344a28 sphinx html theme updates -- **PR** `#24891`_: (*jayeshka*) adding states/ssh_known_hosts unit test case. - @ *2015-06-23T16:46:58Z* +* **PR** `#24977`_: (`rallytime`_) Only warn about digital ocean deprecation if digital ocean is configured + @ *2015-06-25 23:54:46 UTC* - * 1650233 Merge pull request `#24891`_ from jayeshka/ssh_known_hosts-states-unit-test - * ef1347f adding states/ssh_known_hosts unit test case. + * a791b23ff9 Merge pull request `#24977`_ from rallytime/do_move_warning -- **PR** `#24874`_: (*dkiser*) Fix for salt-cloud when ssh key used to auth and using sudo. - @ *2015-06-22T23:46:08Z* + * 6b544227ab Only warn about digital ocean deprecation if digital ocean is configured - - **ISSUE** `#24870`_: (*dkiser*) salt-cloud fails on sudo password prompt when using ssh key to auth - | refs: `#24874`_ - * c32aae9 Merge pull request `#24874`_ from dkiser/salt-cloud-24870 - * 6c31143 Fix key error for the PR to fix `#24870`_. +* **ISSUE** `#24862`_: (`dkatsanikakis`_) gpg.import_key returns error after succesfully completed (refs: `#24994`_, `#24966`_) - * bdcf7d8 Fix pylint for `#24874`_. +* **PR** `#24966`_: (`garethgreenaway`_) Fixes to gpg.py in 2015.5 + @ *2015-06-25 19:58:49 UTC* - * 8f66d19 Fix for salt-cloud when ssh key used to auth and using sudo. + * a71c1b7c8b Merge pull request `#24966`_ from garethgreenaway/2015_5_24862_gpg_import_key -- **PR** `#24880`_: (*dkiser*) Fix to allow password for salt-cloud to be set outside of a vm specif… - @ *2015-06-22T23:44:59Z* + * 55eb73b0c9 fixing unit tests. - - **ISSUE** `#24871`_: (*dkiser*) salt-cloud fails to honor 'password' in cloud options before raising an exception - | refs: `#24880`_ - * ddaa21c Merge pull request `#24880`_ from dkiser/salt-cloud-24871 - * 4f6c035 Fix to allow password for salt-cloud to be set outside of a vm specific context. + * 80c24be4fe Fixing an issue with the import_key method. Different results depending on which gnupg python module is installed. -- **PR** `#24852`_: (*pruiz*) Fix issue 24851: regular expression so it now matches packages with '.' or '-' at pkg name - @ *2015-06-22T20:37:13Z* +* **ISSUE** `#24846`_: (`mavenAtHouzz`_) Memory leak issue in rest_tornado EventListener (refs: `#24965`_) - * 3902b16 Merge pull request `#24852`_ from pruiz/issue-24851 - * 73adb1d Fix regular expression so it now matches packages with '.' or '-' at pkg name. +* **PR** `#24965`_: (`jacksontj`_) Fix memory leak in saltnado + @ *2015-06-25 18:48:03 UTC* -- **PR** `#24861`_: (*jayeshka*) adding states/ssh_auth unit test case. - @ *2015-06-22T16:20:01Z* + * 86221846ac Merge pull request `#24965`_ from jacksontj/2015.5 - * 6c5b788 Merge pull request `#24861`_ from jayeshka/ssh_auth-states-unit-test - * e5d7b0d adding states/ssh_auth unit test case. + * 48b5e1653e pylint -- **PR** `#24824`_: (*kev009*) Detect bhyve virtual type for FreeBSD guests - @ *2015-06-22T15:24:35Z* + * 87adca46e0 Fix memory leak in saltnado - - **ISSUE** `#23478`_: (*calvinhp*) grains.get virtual reports "physical" on bhyve FreeBSD VM - | refs: `#24824`_ - * 9e3321c Merge pull request `#24824`_ from kev009/grains-bhyve-bsd - * a226209 Detect bhyve virtual type for freebsd guests +* **PR** `#24948`_: (`jfindlay`_) fix some malformed doc links and anchors + @ *2015-06-25 15:51:38 UTC* -- **PR** `#24795`_: (*anlutro*) Fix state.apply for salt-ssh - @ *2015-06-22T15:23:57Z* + * 773c4cf8e4 Merge pull request `#24948`_ from jfindlay/doc_links - - **ISSUE** `#24746`_: (*anlutro*) state.apply doesn't seem to work - | refs: `#24795`_ - * 7b07ef9 Merge pull request `#24795`_ from alprs/fix-salt_ssh_state_apply - * 905840b Fix state.apply for salt-ssh + * 152a9b2a12 fix some malformed doc links and anchors -- **PR** `#24832`_: (*jacksontj*) Don't incur a "_load_all" of the lazy_loader while looking for mod_init. - @ *2015-06-22T15:17:10Z* +* **ISSUE** `#24885`_: (`anlutro`_) Master config - Directories starting with a dot have the dot stripped when root_dir is . (refs: `#24886`_) - - **PR** `#20540`_: (*jacksontj*) Loader nomerge: Don't allow modules to "merge" - | refs: `#24832`_ - - **PR** `#20481`_: (*jacksontj*) Add submodule support to LazyLoader - | refs: `#20540`_ - - **PR** `#20473`_: (*jacksontj*) Add "disabled" support - | refs: `#20481`_ - - **PR** `#20274`_: (*jacksontj*) Loader overhaul to LazyLoader - | refs: `#20473`_ - - **PR** `#12327`_: (*jacksontj*) Add a LazyLoader class which will lazily load modules (with the given lo... - | refs: `#20274`_ - * 31d4c13 Merge pull request `#24832`_ from jacksontj/2015.5 - * cfa7c0a pylint +* **PR** `#24886`_: (`anlutro`_) Be more careful about stripping away root_dir from directory options + @ *2015-06-25 15:50:11 UTC* - * be18439 Don't incur a "_load_all" of the lazy_loader while looking for mod_init. + * 4ebc01e662 Merge pull request `#24886`_ from alprs/fix-root_dir_bug -- **PR** `#24834`_: (*rallytime*) Back-port `#24811`_ to 2015.5 - @ *2015-06-19T18:43:49Z* + * 52ccafded3 os.sep is the correct directory separator constant - - **ISSUE** `#14666`_: (*luciddr34m3r*) salt-cloud GoGrid exception when using map file - | refs: `#24811`_ - - **PR** `#24811`_: (*rallytime*) Add notes to map and gogrid docs -- don't use -P with map files - | refs: `#24834`_ - * 2d8148f Merge pull request `#24834`_ from rallytime/`bp-24811`_ - * e2684ec Add notes to map and gogrid docs -- don't use -P with map files + * 0ecbf261ad Be more careful about stripping away root_dir from directory options -- **PR** `#24790`_: (*rallytime*) Back-port `#24741`_ to 2015.5 - @ *2015-06-19T17:25:58Z* +* **PR** `#24930`_: (`jacksontj`_) Don't refetch file templates 100% of the time-- Performance optimization for templated files + @ *2015-06-24 21:22:47 UTC* - - **PR** `#24741`_: (*CameronNemo*) Improve Upstart enable/disable handling - | refs: `#24790`_ - * d2edb63 Merge pull request `#24790`_ from rallytime/`bp-24741`_ - * a54245f Add missing import + * f52f7e1d20 Merge pull request `#24930`_ from jacksontj/2015.5 - * 4ce6370 salt.modules.upstart: fix lint errors + * 5fb75346ef Only parse the source if we have one - * aec53ec Improve Upstart enable/disable handling + * c03a6fa9d1 Add support for sources of managed files to be local -- **PR** `#24789`_: (*rallytime*) Back-port `#24717`_ to 2015.5 - @ *2015-06-19T17:17:00Z* + * 4cf78a0a95 pylint - - **PR** `#24717`_: (*gthb*) virtualenv.managed: document user and no_chown - | refs: `#24789`_ - * 645e62a Merge pull request `#24789`_ from rallytime/`bp-24717`_ - * 95ac4eb virtualenv.managed: document user and no_chown + * d70914e473 Don't refetch the template 100% of the time-- Performance optimization for templated files -- **PR** `#24823`_: (*jayeshka*) adding states/splunk_search unit test case. - @ *2015-06-19T17:14:12Z* +* **PR** `#24935`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-06-24 18:17:54 UTC* - * 0a6c70f Merge pull request `#24823`_ from jayeshka/splunk_search-states-unit-test - * 98831a8 adding states/splunk_search unit test case. + * 925a4d91ba Merge pull request `#24935`_ from basepi/merge-forward-2015.5 -- **PR** `#24809`_: (*jodv*) Correctly create single item list for failover master type with string value for master opt - @ *2015-06-19T15:22:20Z* + * 8d8bf3476f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - * 4c5a708 Merge pull request `#24809`_ from jodv/single_item_master_list - * 18ceebc single item list vs. list of characters + * eeb05a1b10 Merge pull request `#24918`_ from BretFisher/minion-start-smartos-smf-fix -- **PR** `#24802`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-06-18T20:11:58Z* + * d7bfb0c7fd Smartos smf minion fix - - **ISSUE** `#24776`_: (*nmadhok*) --static option in salt raises ValueError and has been broken for a very long time - | refs: `#24777`_ - - **ISSUE** `#21318`_: (*thanatos*) get_full_returns raises KeyError - | refs: `#24769`_ - - **ISSUE** `#18994`_: (*njhartwell*) salt.client.get_cli_returns errors when called immediately after run_job - | refs: `#24769`_ - - **ISSUE** `#17041`_: (*xenophonf*) Confusing Salt error messages due to limited/incomplete PowerShell command error handling - | refs: `#24690`_ - - **ISSUE** `#19`_: (*thatch45*) Sending a faulty command kills all the minions! - - **PR** `#24780`_: (*nmadhok*) Backporting PR `#24777`_ to 2014.7 branch - - **PR** `#24779`_: (*nmadhok*) Backporting Changes to 2014.7 branch - | refs: `#24777`_ - - **PR** `#24778`_: (*nmadhok*) Backporting PR `#24777`_ to 2015.2 branch - | refs: `#24777`_ - - **PR** `#24777`_: (*nmadhok*) Fixing issue where --static option fails with ValueError Fixes `#24776`_ - | refs: `#24778`_ `#24780`_ - - **PR** `#24769`_: (*msteed*) Fix stacktrace in get_cli_returns() - - **PR** `#24690`_: (*twangboy*) Report powershell output instead of error - * ae05e70 Merge pull request `#24802`_ from basepi/merge-forward-2015.5 - * 5b7a65d Merge pull request `#19`_ from twangboy/merge-forward-fixes +* **ISSUE** `#24826`_: (`rakai93`_) rh_service.py: 'int' object has no attribute 'startswith' (refs: `#24873`_) - * 98e7e90 Fixed test failures for Colton +* **PR** `#24873`_: (`jfindlay`_) convert osrelease grain to str before str op + @ *2015-06-24 16:43:08 UTC* - * b949856 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * 4e8ed0d8ed Merge pull request `#24873`_ from jfindlay/rh_service - * 4281dff Merge pull request `#24780`_ from nmadhok/backport-2014.7-24777 + * febe6efab7 convert osrelease grain to str before str op - * c53b0d9 Backporting PR `#24777`_ to 2014.7 branch +* **PR** `#24923`_: (`jayeshka`_) adding states/status unit test case. + @ *2015-06-24 15:50:07 UTC* - * f3c5cb2 Merge pull request `#24769`_ from msteed/issue-21318 + * 90819f9c37 Merge pull request `#24923`_ from jayeshka/status-states-unit-test - * f40a9d5 Fix stacktrace in get_cli_returns() + * baec650674 adding states/status unit test case. - * 59db246 Merge pull request `#24690`_ from twangboy/fix_17041 +* **PR** `#24902`_: (`cro`_) Fix minion failover, document same + @ *2015-06-24 15:20:43 UTC* - * 7a01538 Added additional reporting + * 2dd24ece71 Merge pull request `#24902`_ from cro/fixfo2 - * d84ad5d Fixed capitalization... Failed and Already + * 90c73ff446 References to documentation. - * e955245 Merge branch '2014.7' of https://github.com/saltstack/salt into fix_17041 + * f0c9204d8b Add references to failover parameters in conf - * 144bff2 Report powershell output instead of error + * 9da96a8b95 Docs -- **PR** `#24798`_: (*jtand*) Revert "adding states/postgres_database unit test case." - @ *2015-06-18T17:56:17Z* + * e2314f0e49 Move comment. - - **PR** `#24329`_: (*jayeshka*) adding states/postgres_database unit test case. - | refs: `#24798`_ - * daa76c3 Merge pull request `#24798`_ from saltstack/revert-24329-postgres_database-states-unit-test - * 179ce03 Revert "adding states/postgres_database unit test case." + * b9a756ff5f Fix master failover and add documentation for same. Factor in syndics. Syndics will not failover (yet). -- **PR** `#24791`_: (*rallytime*) Back-port `#24749`_ to 2015.5 - @ *2015-06-18T17:43:15Z* +* **PR** `#24926`_: (`rallytime`_) Back-port `#22263`_ to 2015.5 + @ *2015-06-24 15:09:40 UTC* - - **PR** `#24749`_: (*obestwalter*) add windows specific default for multiprocessing - | refs: `#24791`_ - * 7073a9f Merge pull request `#24791`_ from rallytime/`bp-24749`_ - * be43b2b add windows specific default for multiprocessing + * **PR** `#22263`_: (`cachedout`_) Prevent a load from being written if one already exists (refs: `#24926`_) -- **PR** `#24792`_: (*rallytime*) Back-port `#24757`_ to 2015.5 - @ *2015-06-18T15:58:35Z* + * 087ee09f46 Merge pull request `#24926`_ from rallytime/bp-22263 - - **PR** `#24757`_: (*cachedout*) Fix loader call in pyobjects - | refs: `#24792`_ - - **PR** `#24668`_: (*grischa*) enable virtual package names in pyobjects renderer - | refs: `#24721`_ `#24757`_ - * 1a158e8 Merge pull request `#24792`_ from rallytime/`bp-24757`_ - * 6c804f0 Fix loader call in pyobjects + * 8c92d9c677 Prevent a load from being written if one already exists -- **PR** `#24768`_: (*jfindlay*) fix yum versionlock on RHEL/CentOS 5, disable corresponding test - @ *2015-06-18T15:13:12Z* +* **PR** `#24900`_: (`rallytime`_) Back-port `#24848`_ to 2015.5 + @ *2015-06-24 15:09:18 UTC* - * 0f92982 Merge pull request `#24768`_ from jfindlay/pkg_mod - * 7a26c2b disable pkg.hold test for RHEL/CentOS 5 + * **PR** `#24848`_: (`nmadhok`_) Correcting bash code blocks (refs: `#24900`_) - * 4cacd93 use correct yum versionlock pkg name on centos 5 + * b34a74fe89 Merge pull request `#24900`_ from rallytime/bp-24848 -- **PR** `#24778`_: (*nmadhok*) Backporting PR `#24777`_ to 2015.2 branch - | refs: `#24777`_ - @ *2015-06-18T14:53:04Z* + * d2b5456f5d Correcting bash code blocks - - **ISSUE** `#24776`_: (*nmadhok*) --static option in salt raises ValueError and has been broken for a very long time - | refs: `#24777`_ - - **PR** `#24779`_: (*nmadhok*) Backporting Changes to 2014.7 branch - | refs: `#24777`_ - - **PR** `#24777`_: (*nmadhok*) Fixing issue where --static option fails with ValueError Fixes `#24776`_ - | refs: `#24778`_ `#24780`_ - * 39f088a Merge pull request `#24778`_ from nmadhok/backport-2015.2-24777 - * ae3701f Backporting PR `#24777`_ to 2015.2 branch +* **PR** `#24899`_: (`rallytime`_) Back-port `#24847`_ to 2015.5 + @ *2015-06-24 15:09:01 UTC* -- **PR** `#24774`_: (*zefrog*) Fix lxc lvname parameter command - @ *2015-06-18T14:49:06Z* + * **PR** `#24847`_: (`borutmrak`_) unset size parameter for lxc.create when backing=zfs (refs: `#24899`_) - * 2a4f65f Merge pull request `#24774`_ from zefrog/fix-lxc-lvname-param - * 21e0cd4 Fixed typo in lxc module: lvname parameter typo + * a546e8e326 Merge pull request `#24899`_ from rallytime/bp-24847 - * 283d86e Fixed bug in lxc module: lvname using wrong parameter in cmd + * 1e4ec7a56b unset size parameter for lxc.create when backing=zfs -- **PR** `#24782`_: (*jayeshka*) adding states/slack unit test case. - @ *2015-06-18T14:33:55Z* +* **PR** `#24898`_: (`rallytime`_) Back-port `#24845`_ to 2015.5 + @ *2015-06-24 15:06:09 UTC* - * fd73390 Merge pull request `#24782`_ from jayeshka/slack-states-unit-test - * e2b6214 adding states/slack unit test case. + * **PR** `#24845`_: (`porterjamesj`_) fix bug in docker.loaded (refs: `#24898`_) -- **PR** `#24771`_: (*jacksontj*) Always extend requisites, instead of replacing them - @ *2015-06-18T14:29:09Z* + * d4dd8d288d Merge pull request `#24898`_ from rallytime/bp-24845 - - **ISSUE** `#24770`_: (*jacksontj*) `Requisite` and `Requisite_in` don't play nice together - | refs: `#24771`_ - * c9c90af Merge pull request `#24771`_ from jacksontj/2015.5 - * b1211c5 Re-enable tests for complex prereq and prereq_in + * 071049ae7a fix bug in docker.loaded - * 378f6bf Only merge when the merge is of requisites +* **ISSUE** `#24799`_: (`infestdead`_) Forced remount because options changed when no options changed (glusterfs) (refs: `#24839`_) -- **PR** `#24766`_: (*msteed*) Remove doc references to obsolete minion opt - @ *2015-06-17T21:36:55Z* +* **PR** `#24897`_: (`rallytime`_) Back-port `#24839`_ to 2015.5 + @ *2015-06-24 15:05:35 UTC* - * 5fe4de8 Merge pull request `#24766`_ from msteed/undoc-dns_check - * f92a769 Remove doc references to obsolete minion opt + * **PR** `#24839`_: (`infestdead`_) fix for issue `#24799`_ (refs: `#24897`_) -- **PR** `#24329`_: (*jayeshka*) adding states/postgres_database unit test case. - | refs: `#24798`_ - @ *2015-06-17T19:11:02Z* + * 693085520f Merge pull request `#24897`_ from rallytime/bp-24839 - * a407ab7 Merge pull request `#24329`_ from jayeshka/postgres_database-states-unit-test - * ee06f1a adding states/postgres_database unit test case. + * f3b20d5445 fix for issue `#24799`_ -- **PR** `#24632`_: (*jacobhammons*) Doc bug fixes - @ *2015-06-17T18:40:02Z* +* **PR** `#24891`_: (`jayeshka`_) adding states/ssh_known_hosts unit test case. + @ *2015-06-23 16:46:58 UTC* - - **ISSUE** `#24560`_: (*hydrosine*) Documentation missing on parameter - | refs: `#24632`_ - - **ISSUE** `#24547`_: (*dragonpaw*) Artifactory docs say module is 'jboss7'. - | refs: `#24632`_ - - **ISSUE** `#24375`_: (*companykitchen-dev*) Custom grain won't sync under any circumstances - | refs: `#24632`_ - - **ISSUE** `#24275`_: (*kartiksubbarao*) augeas issue with apache and recognizing changes that have been already made - | refs: `#24632`_ - - **ISSUE** `#24163`_: (*tbaker57*) enable_gpu_grains default value confusion - | refs: `#24632`_ - * 3ff6eff Merge pull request `#24632`_ from jacobhammons/bug-fixes - * 7c52012 Fixed typos + * 1650233be9 Merge pull request `#24891`_ from jayeshka/ssh_known_hosts-states-unit-test - * c7cdd41 Doc bug fixes Refs `#24547`_ Refs `#24275`_ Refs `#24375`_ Refs `#24560`_ Refs `#24163`_ + * ef1347f2b3 adding states/ssh_known_hosts unit test case. -- **PR** `#24607`_: (*garethgreenaway*) fixes to minion.py - @ *2015-06-17T18:16:42Z* +* **ISSUE** `#24870`_: (`dkiser`_) salt-cloud fails on sudo password prompt when using ssh key to auth (refs: `#24874`_) - - **ISSUE** `#24198`_: (*ahammond*) salt-call event.send doesn't send events from minion - | refs: `#24607`_ - * 9995f64 Merge pull request `#24607`_ from garethgreenaway/2015_5_sending_events_multi_master - * 8abd3f0 A fix if you have multiple masters configured and try to fire events to the minion. Currently they fail silently. Might be the cause of `#24198`_. +* **PR** `#24874`_: (`dkiser`_) Fix for salt-cloud when ssh key used to auth and using sudo. + @ *2015-06-22 23:46:08 UTC* -- **PR** `#24755`_: (*rallytime*) Remove SALT_CLOUD_REQS from setup.py - @ *2015-06-17T17:42:25Z* + * c32aae96aa Merge pull request `#24874`_ from dkiser/salt-cloud-24870 - * bf2dd94 Merge pull request `#24755`_ from rallytime/fix_setup_15 - * 48769a5 Remove SALT_CLOUD_REQS from setup.py + * 6c31143b22 Fix key error for the PR to fix `#24870`_. -- **PR** `#24740`_: (*rallytime*) Backport `#24720`_ to 2015.5 - @ *2015-06-17T16:43:37Z* + * bdcf7d88c1 Fix pylint for `#24874`_. - - **PR** `#24720`_: (*TheScriptSage*) Issue 24621 - AD/LDAP Group Auth Issue - | refs: `#24740`_ - * 3d53d79 Merge pull request `#24740`_ from rallytime/`bp-24720`_ - * a9bcdb5 Updating master.py to properly check against groups when user is only authed against group. Tested against unit.auth_test. + * 8f66d193e0 Fix for salt-cloud when ssh key used to auth and using sudo. -- **PR** `#24723`_: (*rallytime*) Back-port `#20124`_ to 2015.5 - @ *2015-06-17T16:43:20Z* +* **ISSUE** `#24871`_: (`dkiser`_) salt-cloud fails to honor 'password' in cloud options before raising an exception (refs: `#24880`_) - - **PR** `#20124`_: (*cgtx*) add init system to default grains - | refs: `#24723`_ - * ac2851b Merge pull request `#24723`_ from rallytime/`bp-20124`_ - * 4d0061b fix infinite loop introduced by `#20124`_ when the init system is not in the supported_inits list +* **PR** `#24880`_: (`dkiser`_) Fix to allow password for salt-cloud to be set outside of a vm specif… + @ *2015-06-22 23:44:59 UTC* - * 0c7fa0f Optimizations for `#20124`_ + * ddaa21c0ae Merge pull request `#24880`_ from dkiser/salt-cloud-24871 - * f353454 add init system to default grains (resolve `#20124`_) + * 4f6c035673 Fix to allow password for salt-cloud to be set outside of a vm specific context. -- **PR** `#24754`_: (*anlutro*) salt-cloud documentation - Add information about linode location - @ *2015-06-17T16:04:48Z* +* **PR** `#24852`_: (`pruiz`_) Fix issue 24851: regular expression so it now matches packages with '.' or '-' at pkg name + @ *2015-06-22 20:37:13 UTC* - * 78cd09b Merge pull request `#24754`_ from alprs/docs-add_linode_location_option - * d88e071 add information about linode location + * 3902b162a9 Merge pull request `#24852`_ from pruiz/issue-24851 -- **PR** `#24748`_: (*jayeshka*) adding states/serverdensity_device unit test case. - @ *2015-06-17T15:39:07Z* + * 73adb1df50 Fix regular expression so it now matches packages with '.' or '-' at pkg name. - * d5554f7 Merge pull request `#24748`_ from jayeshka/serverdensity_device-states-unit-test - * 1a4c241 adding states/serverdensity_device unit test case. +* **PR** `#24861`_: (`jayeshka`_) adding states/ssh_auth unit test case. + @ *2015-06-22 16:20:01 UTC* -- **PR** `#24739`_: (*rallytime*) Back-port `#24735`_ to 2015.5 - @ *2015-06-17T15:16:47Z* + * 6c5b788afd Merge pull request `#24861`_ from jayeshka/ssh_auth-states-unit-test - - **PR** `#24735`_: (*notpeter*) Add 2015.5 codename to version numbers docs - | refs: `#24739`_ - * 0b7e7ef Merge pull request `#24739`_ from rallytime/`bp-24735`_ - * 64c565d Add .0 to version number + * e5d7b0de80 adding states/ssh_auth unit test case. - * 5ed801b Add codenames for 2015.5 and future versions. Trailing newline. +* **ISSUE** `#23478`_: (`calvinhp`_) grains.get virtual reports "physical" on bhyve FreeBSD VM (refs: `#24824`_) -- **PR** `#24732`_: (*msteed*) Fix stacktrace when `--summary` is used - @ *2015-06-17T03:27:57Z* +* **PR** `#24824`_: (`kev009`_) Detect bhyve virtual type for FreeBSD guests + @ *2015-06-22 15:24:35 UTC* - - **ISSUE** `#24111`_: (*yermulnik*) cli option '--summary' got broken after upgrade to 2015.5.1 - | refs: `#24732`_ - * c8713f2 Merge pull request `#24732`_ from msteed/issue-24111 - * 54b33dd Fix stacktrace when --summary is used + * 9e3321c18e Merge pull request `#24824`_ from kev009/grains-bhyve-bsd -- **PR** `#24721`_: (*rallytime*) Back-port `#24668`_ to 2015.5 - @ *2015-06-17T03:23:47Z* + * a2262097a1 Detect bhyve virtual type for freebsd guests - - **PR** `#24668`_: (*grischa*) enable virtual package names in pyobjects renderer - | refs: `#24721`_ `#24757`_ - * 70d3781 Merge pull request `#24721`_ from rallytime/`bp-24668`_ - * 68fb5af fixing other test +* **ISSUE** `#24746`_: (`anlutro`_) state.apply doesn't seem to work (refs: `#24795`_) - * ba4f262 fixing text for virtual support in pyobjects +* **PR** `#24795`_: (`anlutro`_) Fix state.apply for salt-ssh + @ *2015-06-22 15:23:57 UTC* - * b349d91 enable virtual package names in pyobjects renderer + * 7b07ef9f44 Merge pull request `#24795`_ from alprs/fix-salt_ssh_state_apply -- **PR** `#24718`_: (*rallytime*) Added some missing config documentation to the vsphere driver - @ *2015-06-17T03:19:35Z* + * 905840b1fa Fix state.apply for salt-ssh - - **ISSUE** `#21923`_: (*Fluro*) Salt cloud not running provisioning script as root - | refs: `#24718`_ - - **ISSUE** `#17241`_: (*hasues*) Salt-Cloud for vSphere needs additional documentation - | refs: `#24718`_ - * 1b9d689 Merge pull request `#24718`_ from rallytime/update_vsphere_docs - * bfdebb6 Added some missing config documentation to the vsphere driver +* **PR** `#24832`_: (`jacksontj`_) Don't incur a "_load_all" of the lazy_loader while looking for mod_init. + @ *2015-06-22 15:17:10 UTC* -- **PR** `#24714`_: (*rallytime*) Remove cloud-requirements.txt - @ *2015-06-17T03:17:04Z* + * **PR** `#20540`_: (`jacksontj`_) Loader nomerge: Don't allow modules to "merge" (refs: `#24832`_) - * 64857c7 Merge pull request `#24714`_ from rallytime/remove_cloud_reqs_15 - * 67b796d Remove cloud-requirements.txt + * **PR** `#20481`_: (`jacksontj`_) Add submodule support to LazyLoader (refs: `#20540`_) -- **PR** `#24733`_: (*msteed*) Include Tornado in versions report - @ *2015-06-17T03:13:53Z* + * **PR** `#20473`_: (`jacksontj`_) Add "disabled" support (refs: `#20481`_) - - **ISSUE** `#24439`_: (*bechtoldt*) Add tornado version to versions report - | refs: `#24733`_ - * f96b1d6 Merge pull request `#24733`_ from msteed/issue-24439 - * 76cfef0 Include Tornado in versions report + * **PR** `#20274`_: (`jacksontj`_) Loader overhaul to LazyLoader (refs: `#20473`_) -- **PR** `#24737`_: (*jacksontj*) Move AES command logging to trace - @ *2015-06-17T01:48:11Z* + * **PR** `#12327`_: (`jacksontj`_) Add a LazyLoader class which will lazily load modules (with the given lo... (refs: `#20274`_) - * a861fe0 Merge pull request `#24737`_ from jacksontj/2015.5 - * a4ed41a Move AES command logging to trace + * 31d4c131e9 Merge pull request `#24832`_ from jacksontj/2015.5 -- **PR** `#24724`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-06-16T22:46:27Z* + * cfa7c0a699 pylint - - **ISSUE** `#24196`_: (*johnccfm*) Exception when using user.present with Windows - | refs: `#24646`_ - - **PR** `#24646`_: (*twangboy*) Fixed user.present on existing user - * 0d2dc46 Merge pull request `#24724`_ from basepi/merge-forward-2015.5 - * 4641028 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * be18439736 Don't incur a "_load_all" of the lazy_loader while looking for mod_init. - * a18dada Merge pull request `#24646`_ from twangboy/fix_24196 +* **ISSUE** `#14666`_: (`luciddr34m3r`_) salt-cloud GoGrid exception when using map file (refs: `#24811`_) - * a208e1d Fixed user.present on existing user +* **PR** `#24834`_: (`rallytime`_) Back-port `#24811`_ to 2015.5 + @ *2015-06-19 18:43:49 UTC* -- **PR** `#24701`_: (*jayeshka*) adding states/selinux unit test case. - @ *2015-06-16T15:27:29Z* + * **PR** `#24811`_: (`rallytime`_) Add notes to map and gogrid docs -- don't use -P with map files (refs: `#24834`_) - * 3d33fe7 Merge pull request `#24701`_ from jayeshka/selinux-states-unit-test - * 0c136fd adding states/selinux unit test case. + * 2d8148fb4d Merge pull request `#24834`_ from rallytime/bp-24811 -- **PR** `#24687`_: (*cachedout*) Note about minimum worker_threads - @ *2015-06-15T20:46:23Z* + * e2684ecf0b Add notes to map and gogrid docs -- don't use -P with map files - * 2e287a9 Merge pull request `#24687`_ from cachedout/min_worker_threads - * b7bb7ea Note about minimum worker_threads +* **PR** `#24790`_: (`rallytime`_) Back-port `#24741`_ to 2015.5 + @ *2015-06-19 17:25:58 UTC* -- **PR** `#24688`_: (*cachedout*) Update AUTHORS - @ *2015-06-15T20:46:03Z* + * **PR** `#24741`_: (`CameronNemo`_) Improve Upstart enable/disable handling (refs: `#24790`_) - * 432478c Merge pull request `#24688`_ from cachedout/update_authors - * 3f6880e Better email + * d2edb63cff Merge pull request `#24790`_ from rallytime/bp-24741 - * 6c7b773 Update AUTHORS + * a54245f080 Add missing import -- **PR** `#24649`_: (*cachedout*) Improved error reporting for failed states - @ *2015-06-15T16:04:20Z* + * 4ce6370d6e salt.modules.upstart: fix lint errors - - **ISSUE** `#22385`_: (*cachedout*) States which require unavailable modules should display the reason - | refs: `#24649`_ - * 9a2b50d Merge pull request `#24649`_ from cachedout/issue_22385 - * b9fe792 States will now return the reason behind failure if a module could not be loaded + * aec53ec32a Improve Upstart enable/disable handling -- **PR** `#24673`_: (*jayeshka*) adding states/schedule unit test case. - @ *2015-06-15T15:24:52Z* +* **PR** `#24789`_: (`rallytime`_) Back-port `#24717`_ to 2015.5 + @ *2015-06-19 17:17:00 UTC* - * 66e9e16 Merge pull request `#24673`_ from jayeshka/schedule-states-unit-test - * 54aaaa5 adding states/schedule unit test case. + * **PR** `#24717`_: (`gthb`_) virtualenv.managed: document user and no_chown (refs: `#24789`_) -- **PR** `#24663`_: (*kartiksubbarao*) Update augeas_cfg.py - @ *2015-06-15T15:18:48Z* + * 645e62a43c Merge pull request `#24789`_ from rallytime/bp-24717 - - **ISSUE** `#24661`_: (*kartiksubbarao*) augeas.change doesn't support setting empty values - | refs: `#24663`_ - * 5eb19c4 Merge pull request `#24663`_ from kartiksubbarao/patch-2 - * e18db50 Update augeas_cfg.py + * 95ac4eba13 virtualenv.managed: document user and no_chown -- **PR** `#24667`_: (*dkiser*) fix for `#24583`_ clouds/openstack.py kerying first time succeeds - @ *2015-06-14T21:58:58Z* +* **PR** `#24823`_: (`jayeshka`_) adding states/splunk_search unit test case. + @ *2015-06-19 17:14:12 UTC* - - **ISSUE** `#24583`_: (*dkiser*) salt-cloud keyring password referenced before assignment - | refs: `#24667`_ - * 4450432 Merge pull request `#24667`_ from dkiser/fix-cloud-keyring - * c92c05f fix for `#24583`_ clouds/openstack.py kerying first time succeeds + * 0a6c70f062 Merge pull request `#24823`_ from jayeshka/splunk_search-states-unit-test -- **PR** `#24659`_: (*kartiksubbarao*) Update aliases.py - @ *2015-06-13T17:31:42Z* + * 98831a8cb0 adding states/splunk_search unit test case. - - **ISSUE** `#24537`_: (*kartiksubbarao*) alias.present doesn't update alias values that are substrings of the existing value - | refs: `#24659`_ - * 4c64ee9 Merge pull request `#24659`_ from kartiksubbarao/patch-1 - * d683474 Update aliases.py +* **PR** `#24809`_: (`jodv`_) Correctly create single item list for failover master type with string value for master opt + @ *2015-06-19 15:22:20 UTC* -- **PR** `#24644`_: (*cro*) Merge forward 2014.7->2015.5 - @ *2015-06-12T21:31:41Z* + * 4c5a708599 Merge pull request `#24809`_ from jodv/single_item_master_list - - **PR** `#24643`_: (*cro*) Add reference to salt-announce mailing list - - **PR** `#24620`_: (*twangboy*) Fixed comment and uncomment functions in file.py - * 89eb616 Merge pull request `#24644`_ from cro/2014.7-2015.5-20150612 - * 4136dc3 Merge forward from 2014.7 to 2015.5 + * 18ceebc77f single item list vs. list of characters - * b99484f Merge pull request `#24643`_ from cro/saltannounce +* **PR** `#24802`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-06-18 20:11:58 UTC* - * ecb0623 Add salt-announce mailing list. + * ae05e70e94 Merge pull request `#24802`_ from basepi/merge-forward-2015.5 - * 635121e Merge pull request `#24620`_ from twangboy/fix_24215 + * 5b7a65d6d9 Merge pull request `#19`_ from twangboy/merge-forward-fixes - * d7a9999 Fixed comment and uncomment functions in file.py + * 98e7e90299 Fixed test failures for Colton -- **PR** `#24642`_: (*basepi*) Revert "fix target rule, remove unneeded quotation mark" - @ *2015-06-12T20:14:26Z* + * b949856ae6 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - - **PR** `#24595`_: (*tankywoo*) fix target rule, remove unneeded quotation mark - | refs: `#24642`_ - * b896a0d Merge pull request `#24642`_ from saltstack/revert-24595-fix-iptables-target - * 5ff3224 Revert "fix target rule, remove unneeded quotation mark" + * 4281dfff0b Merge pull request `#24780`_ from nmadhok/backport-2014.7-24777 -- **PR** `#24628`_: (*jayeshka*) adding states/reg unit test case. - @ *2015-06-12T17:29:11Z* + * c53b0d9a22 Backporting PR `#24777`_ to 2014.7 branch - * 01092c2 Merge pull request `#24628`_ from jayeshka/reg_states-unit-test - * af1bd8f adding states/reg unit test case. + * f3c5cb2d41 Merge pull request `#24769`_ from msteed/issue-21318 -- **PR** `#24631`_: (*rallytime*) Back-port `#24591`_ to 2015.5 - @ *2015-06-12T16:54:32Z* + * f40a9d5cc0 Fix stacktrace in get_cli_returns() - - **ISSUE** `#24494`_: (*arnoutpierre*) Computed comments in jinja states - | refs: `#24591`_ - - **ISSUE** `#24073`_: (*primechuck*) State.highstate uses stale grain data. - | refs: `#24492`_ - - **ISSUE** `#23359`_: (*BalintSzigeti*) init.sls parsing issue - | refs: `#24591`_ - - **ISSUE** `#21217`_: (*Colstuwjx*) Maybe a bug for jinja render? - | refs: `#24591`_ - - **PR** `#24591`_: (*tbaker57*) Add some documentation surrounding Jinja vs yaml comments - - | refs: `#24631`_ - - **PR** `#24492`_: (*DmitryKuzmenko*) Don't remove grains from opts - * 5f491f9 Merge pull request `#24631`_ from rallytime/`bp-24591`_ - * f13cd41 Add extra clarification why jinja comments are needed. + * 59db24602f Merge pull request `#24690`_ from twangboy/fix_17041 - * 2374971 Fix typo + * 7a015389af Added additional reporting - * 6a91747 Add some documentation surrounding Jinja comments - refs `#24492`_, `#21217`_, `#23359`_ + * d84ad5d519 Fixed capitalization... Failed and Already -- **PR** `#24616`_: (*garethgreenaway*) additional logging in state.py module - @ *2015-06-12T16:25:39Z* + * e9552455c4 Merge branch '2014.7' of https://github.com/saltstack/salt into fix_17041 - * f23f99e Merge pull request `#24616`_ from garethgreenaway/2015_5_logging_disabled_states - * 4dbf0ef Adding some logging statement to give feedback when states, including highstate, are disabled. Useful when running from scheduler. + * 144bff2f67 Report powershell output instead of error -- **PR** `#24595`_: (*tankywoo*) fix target rule, remove unneeded quotation mark - | refs: `#24642`_ - @ *2015-06-12T16:23:22Z* + * **PR** `saltstack/salt#24329`_: (`jayeshka`_) adding states/postgres_database unit test case. (refs: `#24798`_) - * 6dccbb0 Merge pull request `#24595`_ from tankywoo/fix-iptables-target - * 10a5160 fix target rule, remove unneeded quotation mark +* **PR** `#24798`_: (`justinta`_) Revert "adding states/postgres_database unit test case." + @ *2015-06-18 17:56:17 UTC* -- **PR** `#24604`_: (*jfindlay*) fix pkg module integration tests - @ *2015-06-12T16:04:26Z* + * daa76c34e4 Merge pull request `#24798`_ from saltstack/revert-24329-postgres_database-states-unit-test - * 8ac3d94 Merge pull request `#24604`_ from jfindlay/pkg_tests - * d88fb22 fix pkg module integration tests on CentOS 5 + * 179ce03d93 Revert "adding states/postgres_database unit test case." - * fb91b40 fix pkg module integration tests on ubuntu 12 +* **PR** `#24791`_: (`rallytime`_) Back-port `#24749`_ to 2015.5 + @ *2015-06-18 17:43:15 UTC* -- **PR** `#24600`_: (*basepi*) [2015.5] Remove __kwarg__ from salt-ssh keyword args - @ *2015-06-12T04:21:29Z* + * **PR** `#24749`_: (`obestwalter`_) add windows specfic default for multiprocessing (refs: `#24791`_) - * 0ff545c Merge pull request `#24600`_ from basepi/salt-ssh.orchestrate.20615 - * 9b55683 Remove __kwarg__ from salt-ssh keyword args + * 7073a9f850 Merge pull request `#24791`_ from rallytime/bp-24749 -- **PR** `#24608`_: (*basepi*) [2015.5] Normalize salt-ssh flat roster minion IDs to strings - @ *2015-06-11T21:35:07Z* + * be43b2b394 add windows specfic default for multiprocessing - - **ISSUE** `#22843`_: (*Xiol*) salt-ssh roster doesn't support integers as host keys - | refs: `#24608`_ - * 832916f Merge pull request `#24608`_ from basepi/salt-ssh.flat.roster.integers.22843 - * 381820f Normalize salt-ssh flat roster minion IDs to strings +* **PR** `#24792`_: (`rallytime`_) Back-port `#24757`_ to 2015.5 + @ *2015-06-18 15:58:35 UTC* -- **PR** `#24605`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-06-11T19:15:21Z* + * **PR** `#24757`_: (`cachedout`_) Fix loader call in pyobjects (refs: `#24792`_) - - **PR** `#24589`_: (*BretFisher*) Fixed Mine example for jinja code block - * 4eb5bb2 Merge pull request `#24605`_ from basepi/merge-forward-2015.5 - * f96c502 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * **PR** `#24668`_: (`grischa`_) enable virtual package names in pyobjects renderer (refs: `#24721`_, `#24757`_) - * d83928a Merge pull request `#24589`_ from BretFisher/patch-1 + * 1a158e8a3b Merge pull request `#24792`_ from rallytime/bp-24757 - * 65a1133 Fixed Mine example for jinja code block + * 6c804f0789 Fix loader call in pyobjects -- **PR** `#24598`_: (*jacobhammons*) 2015.5.2 release changes - @ *2015-06-11T17:24:11Z* +* **PR** `#24768`_: (`jfindlay`_) fix yum versionlock on RHEL/CentOS 5, disable corresponding test + @ *2015-06-18 15:13:12 UTC* - - **ISSUE** `#24457`_: (*ryan-lane*) When selecting the version of docs on the docs site, it brings you to the homepage - | refs: `#24598`_ - - **ISSUE** `#24250`_: (*jfindlay*) have version links on docs page link to that version of the current page - | refs: `#24598`_ - * e0bb177 Merge pull request `#24598`_ from jacobhammons/doc-fixes - * f3f34dd 2015.5.2 release changes Refs `#24250`_ Refs `#24457`_ + * 0f9298263b Merge pull request `#24768`_ from jfindlay/pkg_mod -- **PR** `#24588`_: (*basepi*) Fixes for saltmod.function for salt-ssh - @ *2015-06-11T16:15:21Z* + * 7a26c2b5b9 disable pkg.hold test for RHEL/CentOS 5 - - **ISSUE** `#20615`_: (*aurynn*) 2014.7.1: salt/states/saltmod using incorrect return dict for orchestrate - | refs: `#24588`_ - * 26930b4 Merge pull request `#24588`_ from basepi/salt-ssh.orchestrate.20615 - * 826936c Move documentation into docstring instead of comments + * 4cacd93c22 use correct yum versionlock pkg name on centos 5 - * de052e7 Assign 'return' to 'ret' if necessary in saltmod.function +* **ISSUE** `#24776`_: (`nmadhok`_) --static option in salt raises ValueError and has been broken for a very long time (refs: `#24777`_) - * 34ff989 Convert keyword args to key=value strings in salt-ssh + * **PR** `#24779`_: (`nmadhok`_) Backporting Changes to 2014.7 branch (refs: `#24777`_) -- **PR** `#24593`_: (*jayeshka*) adding states/redismod unit test case. - @ *2015-06-11T15:55:27Z* +* **PR** `#24778`_: (`nmadhok`_) Backporting PR `#24777`_ to 2015.2 branch (refs: `#24777`_) + @ *2015-06-18 14:53:04 UTC* - * 5a21ad1 Merge pull request `#24593`_ from jayeshka/redismod_states-unit-test - * 3b95744 adding states/redismod unit test case. + * **PR** `#24777`_: (`nmadhok`_) Fixing issue where --static option fails with ValueError Fixes `#24776`_ (refs: `#24778`_, `#24780`_) -- **PR** `#24581`_: (*rallytime*) Disabled some flaky tests until we can figure out how to make them more reliable - @ *2015-06-11T15:51:41Z* + * 39f088a74c Merge pull request `#24778`_ from nmadhok/backport-2015.2-24777 - - **ISSUE** `#40`_: (*thatch45*) Clean up timeouts - | refs: `#22857`_ - - **PR** `#24217`_: (*jfindlay*) disable intermittently failing tests - | refs: `#24581`_ - - **PR** `#23623`_: (*jfindlay*) Fix /jobs endpoint's return - | refs: `#24217`_ - - **PR** `#22857`_: (*jacksontj*) Fix /jobs endpoint's return - | refs: `#23623`_ - * 8ffb86e Merge pull request `#24581`_ from rallytime/disable_some_flaky_tests - * c82f135 Disabled some flaky tests until we can figure out how to make them more reliable + * ae3701f639 Backporting PR `#24777`_ to 2015.2 branch -- **PR** `#24566`_: (*jayeshka*) adding states/rdp unit test case. - @ *2015-06-11T02:14:39Z* +* **PR** `#24774`_: (`zefrog`_) Fix lxc lvname parameter command + @ *2015-06-18 14:49:06 UTC* - * a570d7f Merge pull request `#24566`_ from jayeshka/rdp_states-unit-test - * 273b994 adding states/rdp unit test case. + * 2a4f65f3f7 Merge pull request `#24774`_ from zefrog/fix-lxc-lvname-param -- **PR** `#24551`_: (*joejulian*) 2015.5 don't pollute environment - @ *2015-06-11T02:13:06Z* + * 21e0cd4a5e Fixed typo in lxc module: lvname parameter typo - - **ISSUE** `#24480`_: (*kiorky*) [CRITICAL] [2015.5] tls breaks tzinfo - | refs: `#24551`_ - * 20ada1f Merge pull request `#24551`_ from joejulian/2015.5_dont_pollute_environment - * cfc3b43 Don't pollute the TZ environment variable + * 283d86ec12 Fixed bug in lxc module: lvname using wrong parameter in cmd - * cba8d3f pep8 +* **PR** `#24782`_: (`jayeshka`_) adding states/slack unit test case. + @ *2015-06-18 14:33:55 UTC* - * 9cb7015 Mark keyword version adds + * fd7339014b Merge pull request `#24782`_ from jayeshka/slack-states-unit-test - * 76e2583 Merge tls changes from develop + * e2b6214764 adding states/slack unit test case. -- **PR** `#24574`_: (*jacobhammons*) Refs `#19901`_ - @ *2015-06-10T20:09:23Z* +* **ISSUE** `#24770`_: (`jacksontj`_) `Requisite` and `Requisite_in` don't play nice together (refs: `#24771`_) - - **ISSUE** `#19901`_: (*clinta*) State cache is not documented - | refs: `#24468`_ - * bb2fd6a Merge pull request `#24574`_ from jacobhammons/19901 - * e2a2946 Refs `#19901`_ +* **PR** `#24771`_: (`jacksontj`_) Always extend requisites, instead of replacing them + @ *2015-06-18 14:29:09 UTC* -- **PR** `#24577`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-06-10T19:46:22Z* + * c9c90af512 Merge pull request `#24771`_ from jacksontj/2015.5 - - **ISSUE** `#24427`_: (*fayetted*) 2015.5.1-3 Windows 64Bit Minion fails to start after install - | refs: `#24530`_ - - **PR** `#24530`_: (*twangboy*) Start Minion Service on Silent Install - * b03166c Merge pull request `#24577`_ from basepi/merge-forward-2015.5 - * e1d45cc Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * b1211c5422 Re-enable tests for complex prereq and prereq_in - * d376390 Merge pull request `#24530`_ from twangboy/fix_24427 + * 378f6bfc36 Only merge when the merge is of requisites - * 673e1d8 Added missing panel.bmp for installer +* **PR** `#24766`_: (`msteed`_) Remove doc references to obsolete minion opt + @ *2015-06-17 21:36:55 UTC* - * cc50218 Start Minion Service on Silent Install + * 5fe4de8f62 Merge pull request `#24766`_ from msteed/undoc-dns_check -- **PR** `#24571`_: (*jacobhammons*) Refs `#24235`_ - @ *2015-06-10T17:02:18Z* + * f92a769d35 Remove doc references to obsolete minion opt - - **ISSUE** `#24235`_: (*tomasfejfar*) Difference between running from minion and from master - | refs: `#24468`_ - * 3ec457b Merge pull request `#24571`_ from jacobhammons/24235 - * 8df5d53 Refs `#24235`_ +* **PR** `#24329`_: (`jayeshka`_) adding states/postgres_database unit test case. + @ *2015-06-17 19:11:02 UTC* -- **PR** `#24565`_: (*pille*) fix backtrace, when listing plugins - @ *2015-06-10T16:33:11Z* + * a407ab7c51 Merge pull request `#24329`_ from jayeshka/postgres_database-states-unit-test - * fe07eb5 Merge pull request `#24565`_ from pille/munin-ignore-broken-symlinks - * 8511a6c fix backtrace, when listing plugins + * ee06f1ad57 adding states/postgres_database unit test case. -- **PR** `#24554`_: (*ryan-lane*) Fix yes usage for pecl defaults - @ *2015-06-09T23:59:49Z* +* **ISSUE** `#24560`_: (`hydrosine`_) Documentation missing on parameter (refs: `#24632`_) - * 251c8f9 Merge pull request `#24554`_ from lyft/pecl-module-fix - * 56a9cfc Fix yes usage for pecl defaults +* **ISSUE** `#24547`_: (`dragonpaw`_) Artifactory docs say module is 'jboss7'. (refs: `#24632`_) -- **PR** `#24535`_: (*rallytime*) Back-port `#24518`_ to 2015.5 - @ *2015-06-09T20:06:18Z* +* **ISSUE** `#24375`_: (`companykitchen-dev`_) Custom grain won't sync under any circumstances (refs: `#24632`_) - - **PR** `#24518`_: (*rallytime*) Merge `#24448`_ with Pylint Fixes - | refs: `#24535`_ - - **PR** `#24448`_: (*codertux*) Update modules path for operating systems using systemd - | refs: `#24518`_ - * dbd49b4 Merge pull request `#24535`_ from rallytime/`bp-24518`_ - * fc75197 Pylint fix +* **ISSUE** `#24275`_: (`kartiksubbarao`_) augeas issue with apache and recognizing changes that have been already made (refs: `#24632`_) - * 3e08840 Update modules path for operating systems using systemd +* **ISSUE** `#24163`_: (`tbaker57`_) enable_gpu_grains default value confusion (refs: `#24632`_) -- **PR** `#24538`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-06-09T17:27:20Z* +* **PR** `#24632`_: (`jacobhammons`_) Doc bug fixes + @ *2015-06-17 18:40:02 UTC* - - **PR** `#24513`_: (*jquast*) bugfix use of 'iteritem' in 2014.7 branch - - **PR** `#24511`_: (*jquast*) bugfix: trailing "...done" in rabbitmq output - | refs: `#24513`_ - * 485ed3c Merge pull request `#24538`_ from basepi/merge-forward-2015.5 - * 6a8039d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * 3ff6eff546 Merge pull request `#24632`_ from jacobhammons/bug-fixes - * 6ebc476 Merge pull request `#24513`_ from jquast/2014.7-bugfix-iteritem + * 7c52012e31 Fixed typos - * 2be0180 bugfix use of 'iteritem' in 2014.7 branch + * c7cdd416a2 Doc bug fixes Refs `#24547`_ Refs `#24275`_ Refs `#24375`_ Refs `#24560`_ Refs `#24163`_ -- **PR** `#24495`_: (*jayeshka*) adding states/rabbitmq_vhost unit test case. - @ *2015-06-09T15:33:23Z* +* **ISSUE** `#24198`_: (`ahammond`_) salt-call event.send doesn't send events from minion (refs: `#24607`_) - * 73e6388 Merge pull request `#24495`_ from jayeshka/rabbitmq_vhost_states-unit-test - * 31889e3 cosmetic change. +* **PR** `#24607`_: (`garethgreenaway`_) fixes to minion.py + @ *2015-06-17 18:16:42 UTC* - * cf501cf resolved error. + * 9995f64428 Merge pull request `#24607`_ from garethgreenaway/2015_5_sending_events_multi_master - * 4bb6087 Merge branch '2015.5' of https://github.com/saltstack/salt into rabbitmq_vhost_states-unit-test + * 8abd3f0ee1 A fix if you have multiple masters configured and try to fire events to the minion. Currently they fail silently. Might be the cause of `#24198`_. - * 3ad7714 adding states/rabbitmq_vhost unit test case. +* **PR** `#24755`_: (`rallytime`_) Remove SALT_CLOUD_REQS from setup.py + @ *2015-06-17 17:42:25 UTC* -- **PR** `#24445`_: (*jayeshka*) adding states/pyrax_queues unit test case. - @ *2015-06-09T15:28:45Z* + * bf2dd94389 Merge pull request `#24755`_ from rallytime/fix_setup_15 - * bf1abcc Merge pull request `#24445`_ from jayeshka/pyrax_queues_states-unit-test - * ea27cef adding states/pyrax_queues unit test case. + * 48769a544d Remove SALT_CLOUD_REQS from setup.py -- **PR** `#24490`_: (*aneeshusa*) Fix pacman.list_upgrades for new python_shell default. - @ *2015-06-09T15:13:16Z* +* **PR** `#24740`_: (`rallytime`_) Backport `#24720`_ to 2015.5 + @ *2015-06-17 16:43:37 UTC* - * 0247e8d Merge pull request `#24490`_ from aneeshusa/fix-pacman-list-upgrades - * 980e1cb Lint fix. + * **PR** `#24720`_: (`TheScriptSage`_) Issue 24621 - AD/LDAP Group Auth Issue (refs: `#24740`_) - * dca33f1 Fix pacman.list_upgrades for new python_shell default. + * 3d53d79476 Merge pull request `#24740`_ from rallytime/bp-24720 -- **PR** `#24517`_: (*steverweber*) small fixes to the ipmi docs - @ *2015-06-09T15:10:14Z* + * a9bcdb5b77 Updating master.py to properly check against groups when user is only authed against group. Tested against unit.auth_test. - * 6268ddb Merge pull request `#24517`_ from steverweber/ipmi_doc - * 6413712 lint +* **PR** `#24723`_: (`rallytime`_) Back-port `#20124`_ to 2015.5 + @ *2015-06-17 16:43:20 UTC* - * e78aea9 more small fixes to the ipmi docs + * **PR** `#20124`_: (`cgtx`_) add init system to default grains (refs: `#24723`_) -- **PR** `#24524`_: (*jayeshka*) any() takes list oy tuple. - @ *2015-06-09T13:49:42Z* + * ac2851be55 Merge pull request `#24723`_ from rallytime/bp-20124 - * 3728b3f Merge pull request `#24524`_ from jayeshka/rabbitmq_vhost_states-module - * 01c99ad any() takes list oy tuple. + * 4d0061b832 fix infinite loop introduced by `#20124`_ when the init system is not in the supported_inits list -- **PR** `#24482`_: (*eliasp*) 'docker.running' needs now the 'image' param. - @ *2015-06-09T04:43:04Z* + * 0c7fa0fca2 Optimizations for `#20124`_ - * dd23de8 Merge pull request `#24482`_ from eliasp/2015.5-states.dockerio-docker.running-doc - * 5de741d 'docker.running' needs now the 'image' param. + * f353454327 add init system to default grains (resolve `#20124`_) -- **PR** `#24515`_: (*basepi*) [2015.5] Add xml library to the salt-thin - @ *2015-06-09T04:10:06Z* +* **PR** `#24754`_: (`anlutro`_) salt-cloud documentation - Add information about linode location + @ *2015-06-17 16:04:48 UTC* - - **ISSUE** `#23503`_: (*jfindlay*) salt-ssh fails on CentOS 7 when python-zmq is not installed - | refs: `#24515`_ - * 2a727c3 Merge pull request `#24515`_ from basepi/susexml23503 - * 078b33e Add xml library to the thin + * 78cd09b6e9 Merge pull request `#24754`_ from alprs/docs-add_linode_location_option -- **PR** `#24497`_: (*jayeshka*) adding states/rbenv unit test case. - @ *2015-06-09T03:56:10Z* + * d88e071e98 add information about linode location - * fce998a Merge pull request `#24497`_ from jayeshka/rbenv_states-unit-test - * 79d343a adding states/rbenv unit test case. +* **PR** `#24748`_: (`jayeshka`_) adding states/serverdensity_device unit test case. + @ *2015-06-17 15:39:07 UTC* -- **PR** `#24496`_: (*jayeshka*) adding states/rabbitmq_user unit test case. - @ *2015-06-09T03:55:23Z* + * d5554f76ec Merge pull request `#24748`_ from jayeshka/serverdensity_device-states-unit-test - * 2bcb4b1 Merge pull request `#24496`_ from jayeshka/rabbitmq_user_states-unit-test - * 7d96f27 adding states/rabbitmq_user unit test case. + * 1a4c241050 adding states/serverdensity_device unit test case. -- **PR** `#24481`_: (*eliasp*) Fix typo (licnese → license). - @ *2015-06-09T03:30:25Z* +* **PR** `#24739`_: (`rallytime`_) Back-port `#24735`_ to 2015.5 + @ *2015-06-17 15:16:47 UTC* - * 02a597b Merge pull request `#24481`_ from eliasp/2015.5-salt.states.powerpath-license_typo - * 1280054 Fix typo (licnese → license). + * **PR** `#24735`_: (`notpeter`_) Add 2015.5 codename to version numbers docs (refs: `#24739`_) -- **PR** `#24467`_: (*thenewwazoo*) Fix dockerio bound volumes - @ *2015-06-09T01:40:23Z* + * 0b7e7ef879 Merge pull request `#24739`_ from rallytime/bp-24735 - * 5ad3db5 Merge pull request `#24467`_ from thenewwazoo/fix-dockerio-bound-volumes - * db4e3dc Let's raise an exception if create fails + * 64c565d9be Add .0 to version number - * d1d85dd Add logging + * 5ed801b98f Add codenames for 2015.5 and future versions. Trailing newline. - * ddc63f0 Fix volume handling when creating containers +* **ISSUE** `#24111`_: (`yermulnik`_) cli option '--summary' got broken after upgrade to 2015.5.1 (refs: `#24732`_) -- **PR** `#24504`_: (*rallytime*) Move vsphere deprecation to 2015.5 - @ *2015-06-08T22:43:05Z* +* **PR** `#24732`_: (`msteed`_) Fix stacktrace when `--summary` is used + @ *2015-06-17 03:27:57 UTC* - - **PR** `#24487`_: (*nmadhok*) Deprecating vsphere cloud driver in favor of vmware cloud driver - | refs: `#24504`_ - * d236fbd Merge pull request `#24504`_ from rallytime/move_vsphere_deprecation_2015.5 - * d876535 Add Getting Started with VSphere doc to 2015.5 + * c8713f2d00 Merge pull request `#24732`_ from msteed/issue-24111 - * b685ebc Add vSphere deprecation warnings to 2015.5 + * 54b33dd359 Fix stacktrace when --summary is used -- **PR** `#24506`_: (*rallytime*) Backport `#24450`_ to 2015.5 - @ *2015-06-08T22:42:14Z* +* **PR** `#24721`_: (`rallytime`_) Back-port `#24668`_ to 2015.5 + @ *2015-06-17 03:23:47 UTC* - - **PR** `#24450`_: (*ruzarowski*) Fix salt cli runs with batch-size set - | refs: `#24506`_ - * cb55460 Merge pull request `#24506`_ from rallytime/`bp-24450`_ - * 1c0fca2 Backport `#24450`_ to 2015.5 + * **PR** `#24668`_: (`grischa`_) enable virtual package names in pyobjects renderer (refs: `#24721`_, `#24757`_) -- **PR** `#24498`_: (*rallytime*) Added "CLI Example" to make failing test happy on 2015.5 - @ *2015-06-08T15:48:40Z* + * 70d37816bf Merge pull request `#24721`_ from rallytime/bp-24668 - * 3173fd1 Merge pull request `#24498`_ from rallytime/fix_doc_failure_fifteen - * d992ef4 Added "CLI Example" to make failing test happy on 2015.5 + * 68fb5af970 fixing other test -- **PR** `#24471`_: (*anlutro*) Set up salt-ssh file logging - @ *2015-06-08T15:26:49Z* + * ba4f262b9c fixing text for virtual support in pyobjects - * 3639e41 Merge pull request `#24471`_ from alprs/fix-salt_ssh_logging - * 6a11ec8 set up salt-ssh file logging + * b349d91a5f enable virtual package names in pyobjects renderer -- **PR** `#24469`_: (*jfindlay*) correctly handle user environment info for npm - @ *2015-06-08T15:26:02Z* +* **ISSUE** `#21923`_: (`Fluro`_) Salt cloud not running provisioning script as root (refs: `#24718`_) - - **ISSUE** `#24231`_: (*tarwich*) npm.bootstrap - | refs: `#24469`_ - * 551e70f Merge pull request `#24469`_ from jfindlay/npm_env - * 8140c96 update npm's user info envs +* **ISSUE** `#17241`_: (`hasues`_) Salt-Cloud for vSphere needs additional documentation (refs: `#24718`_) - * cb572f8 add `env` parameter to npm.uninstall +* **PR** `#24718`_: (`rallytime`_) Added some missing config documentation to the vsphere driver + @ *2015-06-17 03:19:35 UTC* -- **PR** `#24468`_: (*jacobhammons*) Bug fixes and build errors - @ *2015-06-08T15:25:40Z* + * 1b9d6895c7 Merge pull request `#24718`_ from rallytime/update_vsphere_docs - - **ISSUE** `#24268`_: (*tkent-xetus*) Ability to specify revision for win_gitrepos undocumented - | refs: `#24468`_ - - **ISSUE** `#24235`_: (*tomasfejfar*) Difference between running from minion and from master - | refs: `#24468`_ - - **ISSUE** `#24193`_: (*abng88*) Update ext_pillar docs to mention that this feature is supported masterless as well - | refs: `#24468`_ - - **ISSUE** `#24172`_: (*zhujinhe*) Can lists be passed in the pillar on the command line on version 2015.5.0? - | refs: `#24468`_ - - **ISSUE** `#23211`_: (*lloesche*) Document that salt://| escapes special characters in filenames - | refs: `#24468`_ - - **ISSUE** `#19901`_: (*clinta*) State cache is not documented - | refs: `#24468`_ - - **ISSUE** `#19801`_: (*ksalman*) How are grains static? - | refs: `#24468`_ - * 0d9e0c2 Merge pull request `#24468`_ from jacobhammons/doc-fixes - * 1035959 Appended .0 to version added + * bfdebb6e18 Added some missing config documentation to the vsphere driver - * d45c4ed Bug fixes and build errors Refs `#23211`_ Refs `#24268`_ Refs `#24235`_ Refs `#24193`_ Refs `#24172`_ Refs `#19901`_ Refs `#19801`_ +* **PR** `#24714`_: (`rallytime`_) Remove cloud-requirements.txt + @ *2015-06-17 03:17:04 UTC* -- **PR** `#24465`_: (*jfindlay*) catch exception from softwarerepositories - @ *2015-06-08T15:25:19Z* + * 64857c706d Merge pull request `#24714`_ from rallytime/remove_cloud_reqs_15 - - **ISSUE** `#24318`_: (*favadi*) uncaught exception for pkgrepo.absent for invalid PPA - | refs: `#24465`_ - * be6905a Merge pull request `#24465`_ from jfindlay/unknown_ppa - * 19c9128 catch exception from softwarerepositories + * 67b796d01e Remove cloud-requirements.txt -- **PR** `#24464`_: (*jfindlay*) fix typo in modules/mount.py - @ *2015-06-08T15:25:07Z* +* **ISSUE** `#24439`_: (`bechtoldt`_) Add tornado version to versions report (refs: `#24733`_) - - **ISSUE** `#24296`_: (*objectx*) mount.mount calls file.mkdir with incorrect named argument - | refs: `#24464`_ - * 58d1ea8 Merge pull request `#24464`_ from jfindlay/file_mkdir - * 6e8cd44 fix typo in modules/mount.py +* **PR** `#24733`_: (`msteed`_) Include Tornado in versions report + @ *2015-06-17 03:13:53 UTC* -- **PR** `#24461`_: (*dkiser*) fix for `#24434`_ - @ *2015-06-08T15:24:53Z* + * f96b1d68cd Merge pull request `#24733`_ from msteed/issue-24439 - - **ISSUE** `#24434`_: (*dkiser*) multimaster failover fails due to logic from issue `#23611`_ - * 4f332a7 Merge pull request `#24461`_ from dkiser/multimaster_minion_fix - * 1944a74 fix for `#24434`_ + * 76cfef05ec Include Tornado in versions report -- **PR** `#24479`_: (*ahus1*) change "path" to "name" for "file" operations - @ *2015-06-07T17:56:11Z* +* **PR** `#24737`_: (`jacksontj`_) Move AES command logging to trace + @ *2015-06-17 01:48:11 UTC* - * 8917416 Merge pull request `#24479`_ from ahus1/patch-1 - * 7d6b60c change "path" to "name" for "file" operations + * a861fe0f4f Merge pull request `#24737`_ from jacksontj/2015.5 -- **PR** `#24475`_: (*rallytime*) Back-port `#24454`_ to 2015.5 - @ *2015-06-07T01:29:32Z* + * a4ed41ae82 Move AES command logging to trace - - **PR** `#24454`_: (*rhertzog*) Strip extraneous newline character added in last environment variable - | refs: `#24475`_ - * 8618d5b Merge pull request `#24475`_ from rallytime/`bp-24454`_ - * a793c19 Avoid extraneous newline character added in last environment variable +* **PR** `#24724`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-06-16 22:46:27 UTC* -- **PR** `#24474`_: (*rallytime*) Back-port `#24420`_ to 2015.5 - @ *2015-06-07T01:29:11Z* + * 0d2dc46648 Merge pull request `#24724`_ from basepi/merge-forward-2015.5 - - **ISSUE** `#24407`_: (*aboe76*) Please expand salt module random - | refs: `#24420`_ - - **PR** `#24420`_: (*aboe76*) added random integer module to mod_random.py - | refs: `#24474`_ - * 61658ff Merge pull request `#24474`_ from rallytime/`bp-24420`_ - * 4219b40 Fix lint error and update versionadded to 2015.5.3 + * 4641028464 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - * 3613cc9 added random integer module to mod_random.py + * a18dadad71 Merge pull request `#24646`_ from twangboy/fix_24196 -- **PR** `#24472`_: (*variia*) ensure {} output is not treated as change in module.py state, fixes #… - @ *2015-06-06T14:45:44Z* + * a208e1d60f Fixed user.present on existing user - - **ISSUE** `#24233`_: (*variia*) yumpkg.group_install keeps returning state change - * 508d7dd Merge pull request `#24472`_ from variia/Fix-yumpkg_group_install-return-change-`#24233`_ - * 37e8827 ensure {} output is not treated as change in module.py state, fixes `#24233`_ +* **PR** `#24701`_: (`jayeshka`_) adding states/selinux unit test case. + @ *2015-06-16 15:27:29 UTC* -- **PR** `#24466`_: (*basepi*) [2015.5] Fix for # in inner strings in yaml arguments - @ *2015-06-06T14:35:56Z* + * 3d33fe7676 Merge pull request `#24701`_ from jayeshka/selinux-states-unit-test - - **ISSUE** `#18045`_: (*dstokes*) Pillar kwargs parse error with # - | refs: `#24466`_ - - **ISSUE** `#8585`_: (*UtahDave*) '#' in single quoted option on cli not making it into the execution module - | refs: `#24466`_ - * 0292e67 Merge pull request `#24466`_ from basepi/fixhashinargs18045 - * 2e0609f Fix for # in inner strings in yaml arguments + * 0c136fd9c2 adding states/selinux unit test case. -- **PR** `#24456`_: (*rallytime*) Back-port `#24441`_ to 2015.5 - @ *2015-06-05T22:32:25Z* +* **PR** `#24687`_: (`cachedout`_) Note about minimum worker_threads + @ *2015-06-15 20:46:23 UTC* - - **PR** `#24441`_: (*arthurlogilab*) [doc] Alignment fix on external_auth documentation - | refs: `#24456`_ - * ced558a Merge pull request `#24456`_ from rallytime/`bp-24441`_ - * 7002855 yaml indentations should be 2 spaces + * 2e287a9e33 Merge pull request `#24687`_ from cachedout/min_worker_threads - * 21b51ab [doc] Alignment fix on external_auth documentation + * b7bb7eaeb2 Note about minimum worker_threads -- **PR** `#24398`_: (*kiorky*) VirtualName for states.apt - | refs: `#24399`_ - @ *2015-06-05T17:40:04Z* +* **PR** `#24688`_: (`cachedout`_) Update AUTHORS + @ *2015-06-15 20:46:03 UTC* - - **ISSUE** `#24397`_: (*kiorky*) on debian: states.apt should use virtualname as it shadows system apt module - | refs: `#24398`_ `#24398`_ `#24399`_ `#24399`_ `#24400`_ - - **PR** `#24399`_: (*kiorky*) Versionvirtual - | refs: `#24398`_ - * c0ff411 Merge pull request `#24398`_ from makinacorpus/aptv - * 785d277 VirtualName for states.apt + * 432478ccb7 Merge pull request `#24688`_ from cachedout/update_authors -- **PR** `#24447`_: (*jayeshka*) adding states/rabbitmq_policy unit test case. - @ *2015-06-05T15:26:11Z* + * 3f6880e291 Better email - * 3626340 Merge pull request `#24447`_ from jayeshka/rabbitmq_policy_states-unit-test - * 9b038ab adding states/rabbitmq_policy unit test case. + * 6c7b773eae Update AUTHORS -- **PR** `#24446`_: (*jayeshka*) adding states/rabbitmq_plugin unit test case. - @ *2015-06-05T15:25:33Z* +* **ISSUE** `#22385`_: (`cachedout`_) States which require unavailable modules should display the reason (refs: `#24649`_) - * 8445a3f Merge pull request `#24446`_ from jayeshka/rabbitmq_plugin_states-unit-test - * cb0c99a adding states/rabbitmq_plugin unit test case. +* **PR** `#24649`_: (`cachedout`_) Improved error reporting for failed states + @ *2015-06-15 16:04:20 UTC* -- **PR** `#24426`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-06-05T03:59:11Z* + * 9a2b50d59f Merge pull request `#24649`_ from cachedout/issue_22385 - - **ISSUE** `#24276`_: (*markuskramerIgitt*) Live salt-master Profiling with SIGUSR2 fails - - **PR** `#24405`_: (*jacksontj*) Fix for `#24276`_ - - **PR** `#24395`_: (*hvnsweeting*) handle exceptions when received data is not in good shape - - **PR** `#24305`_: (*twangboy*) Added documentation, fixed formatting - * 9cc3808 Merge pull request `#24426`_ from basepi/merge-forward-2015.5 - * eafa20c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + * b9fe792534 States will now return the reason behind failure if a module could not be loaded - * 83f853b Merge pull request `#24405`_ from jacksontj/2014.7 +* **PR** `#24673`_: (`jayeshka`_) adding states/schedule unit test case. + @ *2015-06-15 15:24:52 UTC* - * 2c7afae Fix for `#24276`_ + * 66e9e16753 Merge pull request `#24673`_ from jayeshka/schedule-states-unit-test - * cef919c Merge pull request `#24395`_ from hvnsweeting/handle-exception-get-file + * 54aaaa5f12 adding states/schedule unit test case. - * bb798a0 handle exceptions when received data is not in good shape +* **ISSUE** `#24661`_: (`kartiksubbarao`_) augeas.change doesn't support setting empty values (refs: `#24663`_) - * efba1a9 Merge pull request `#24305`_ from twangboy/win_path_docs +* **PR** `#24663`_: (`kartiksubbarao`_) Update augeas_cfg.py + @ *2015-06-15 15:18:48 UTC* - * 36804253 Fixed pylint error caused by \\P... added r + * 5eb19c4e4d Merge pull request `#24663`_ from kartiksubbarao/patch-2 - * bc42a4b triple double quotes to triple single quotes + * e18db50e0c Update augeas_cfg.py - * 77cd930 Added documentation, fixed formatting +* **ISSUE** `#24583`_: (`dkiser`_) salt-cloud keyring password referenced before assignment (refs: `#24667`_) -- **PR** `#24429`_: (*jacobhammons*) Salt cloud doc updates, build errors and bug fixes - @ *2015-06-05T00:27:38Z* +* **PR** `#24667`_: (`dkiser`_) fix for `#24583`_ clouds/openstack.py kerying first time succeeds + @ *2015-06-14 21:58:58 UTC* - - **ISSUE** `#24309`_: (*steverweber*) missing docs - | refs: `#24429`_ - * 5d738b8 Merge pull request `#24429`_ from jacobhammons/cloud-doc-updates - * 1f7a13d Salt cloud doc updates, build errors and bug fixes Refs `#24309`_ + * 4450432161 Merge pull request `#24667`_ from dkiser/fix-cloud-keyring -- **PR** `#24408`_: (*rallytime*) Backport `#24392`_ to 2015.5 - @ *2015-06-04T20:22:09Z* + * c92c05fac0 fix for `#24583`_ clouds/openstack.py kerying first time succeeds - - **PR** `#24392`_: (*quixoten*) Fix "No such file or directory" in grains/core.py - | refs: `#24408`_ - * cdffc02 Merge pull request `#24408`_ from rallytime/`bp-24392`_ - * ff7461b Use path found by salt.utils.which +* **ISSUE** `#24537`_: (`kartiksubbarao`_) alias.present doesn't update alias values that are substrings of the existing value (refs: `#24659`_) -- **PR** `#24380`_: (*rallytime*) Backport `#24357`_ to 2015.5 - @ *2015-06-04T20:13:51Z* +* **PR** `#24659`_: (`kartiksubbarao`_) Update aliases.py + @ *2015-06-13 17:31:42 UTC* - - **PR** `#24357`_: (*zhujinhe*) fix invoke issues of Jinja Macros example - | refs: `#24380`_ - * a6a1f87 Merge pull request `#24380`_ from rallytime/`bp-24357`_ - * f08c875 fix invoke issues of Jinja Macros example + * 4c64ee9d94 Merge pull request `#24659`_ from kartiksubbarao/patch-1 -- **PR** `#24388`_: (*pengyao*) fixes `#24358`_ - @ *2015-06-04T20:07:40Z* + * d6834749e2 Update aliases.py - - **ISSUE** `#24358`_: (*pengyao*) Netapi SSH client don't support ssh_user and ssh_passwd arguments - | refs: `#24388`_ - * 86ce9db Merge pull request `#24388`_ from pengyao/sshclient-kwargs - * 5c08ca4 fixes `#24358`_ +* **PR** `#24644`_: (`cro`_) Merge forward 2014.7->2015.5 + @ *2015-06-12 21:31:41 UTC* -- **PR** `#24367`_: (*terminalmage*) Improve error message when module does not exist - @ *2015-06-04T20:07:12Z* + * 89eb616c29 Merge pull request `#24644`_ from cro/2014.7-2015.5-20150612 - - **ISSUE** `#22958`_: (*highlyunavailable*) Weird error when typoing a command - | refs: `#24367`_ - * 72d2eae Merge pull request `#24367`_ from terminalmage/issue22958 - * d0d7a54 Improve error message when module does not exist + * 4136dc3160 Merge forward from 2014.7 to 2015.5 -- **PR** `#24412`_: (*jfindlay*) backport `#23387`_ - @ *2015-06-04T20:06:03Z* + * b99484fde2 Merge pull request `#24643`_ from cro/saltannounce - - **ISSUE** `#23101`_: (*gravyboat*) Create a docs page for labels - | refs: `#23387`_ - - **PR** `#23387`_: (*rallytime*) Add some "What are all these labels for?" documentation - | refs: `#24412`_ - * a628778 Merge pull request `#24412`_ from jfindlay/`bp-23387`_ - * bf85772 Make sure the parameters are in the correct order + * ecb0623d7f Add salt-announce mailing list. - * 9f53809 Add "* Change" label parameters + * 635121e85d Merge pull request `#24620`_ from twangboy/fix_24215 - * b27a15e Remove "workaround" wording + * d7a9999be1 Fixed comment and uncomment functions in file.py - * 9fff35a Some small fixes + * **PR** `saltstack/salt#24595`_: (`tankywoo`_) fix target rule, remove unneeded quotation mark (refs: `#24642`_) - * 54a7089 Link the new labels doc in contributing and hacking docs +* **PR** `#24642`_: (`basepi`_) Revert "fix target rule, remove unneeded quotation mark" + @ *2015-06-12 20:14:26 UTC* - * 375695e Add pull request label definitions + * b896a0d0e9 Merge pull request `#24642`_ from saltstack/revert-24595-fix-iptables-target - * de94563 Add Feature Request label definition + * 5ff3224ae1 Revert "fix target rule, remove unneeded quotation mark" - * 684f291 Add issue definition and augment functional areas section +* **PR** `#24628`_: (`jayeshka`_) adding states/reg unit test case. + @ *2015-06-12 17:29:11 UTC* - * 2da13dd Start a "what are all of these labels for?" doc + * 01092c2337 Merge pull request `#24628`_ from jayeshka/reg_states-unit-test -- **PR** `#24336`_: (*twangboy*) Added line to give more descriptive error - @ *2015-06-04T19:56:00Z* + * af1bd8f9ff adding states/reg unit test case. - - **ISSUE** `#24154`_: (*ssgward*) Exception when running cp.get_url - | refs: `#24336`_ - * 485116c Merge pull request `#24336`_ from twangboy/fix_cp_get_url - * 37b11f9 Added line to give more descriptive error +* **ISSUE** `#24494`_: (`arount`_) Computed comments in jinja states (refs: `#24591`_) -- **PR** `#24413`_: (*techhat*) Add more namespaced functions to GoGrid driver - @ *2015-06-04T19:51:22Z* +* **ISSUE** `#23359`_: (`BalintSzigeti`_) init.sls parsing issue (refs: `#24591`_) - * b3d39cc Merge pull request `#24413`_ from techhat/gogridnamespace - * 1b397cb Adding blank line +* **ISSUE** `#21217`_: (`Colstuwjx`_) Maybe a bug for jinja render? (refs: `#24591`_) - * da08cc9 Add more namespaced functions to GoGrid driver +* **PR** `#24631`_: (`rallytime`_) Back-port `#24591`_ to 2015.5 + @ *2015-06-12 16:54:32 UTC* -- **PR** `#24399`_: (*kiorky*) Versionvirtual - | refs: `#24398`_ - @ *2015-06-04T18:02:22Z* + * **PR** `#24591`_: (`tbaker57`_) Add some documentation surrounding Jinja vs yaml comments - (refs: `#24631`_) - - **ISSUE** `#24397`_: (*kiorky*) on debian: states.apt should use virtualname as it shadows system apt module - | refs: `#24398`_ `#24398`_ `#24399`_ `#24399`_ `#24400`_ - - **PR** `#24398`_: (*kiorky*) VirtualName for states.apt - | refs: `#24399`_ - * 27f109b Merge pull request `#24399`_ from makinacorpus/versionvirtual - * 235c78d Use apt_pkg.version_compare if available + * 5f491f911d Merge pull request `#24631`_ from rallytime/bp-24591 - * 1c0cd45 reindent block to isolate conflict on merge forward + * f13cd418bc Add extra clarification why jinja comments are needed. - * 699ecea use var to isolate conflict on merge forward + * 23749718bb Fix typo -- **PR** `#24371`_: (*joejulian*) 2015.5 tls module tests - @ *2015-06-04T15:20:16Z* + * 6a917471d4 Add some documentation surrounding Jinja comments - refs `#24492`_, `#21217`_, `#23359`_ - * deaee68 Merge pull request `#24371`_ from joejulian/2015.5_tls_module_tests - * 4c5dee1 Add @destructiveTest decorator to destructive tests +* **PR** `#24616`_: (`garethgreenaway`_) additional logging in state.py module + @ *2015-06-12 16:25:39 UTC* - * 274bbd4 Accept results from older pyOpenSSL + * f23f99ec35 Merge pull request `#24616`_ from garethgreenaway/2015_5_logging_disabled_states - * 161f913 All cert info should be in UTC always + * 4dbf0ef160 Adding some logging statement to give feedback when states, including highstate, are disabled. Useful when running from scheduler. - * 9affcca See the whole diff if dict compare fails +* **PR** `#24595`_: (`tankywoo`_) fix target rule, remove unneeded quotation mark + @ *2015-06-12 16:23:22 UTC* - * 94f6208 Ignore extensions for now. Resolve this as part of fixing issue 24338. + * 6dccbb04a1 Merge pull request `#24595`_ from tankywoo/fix-iptables-target - * 84904d3 Mask lint warning for unused imported module + * 10a5160d7c fix target rule, remove unneeded quotation mark - * 5675b78 Do not test if PyOpenSSL is not installed +* **PR** `#24604`_: (`jfindlay`_) fix pkg module integration tests + @ *2015-06-12 16:04:26 UTC* - * 563cc66 Add tls tests + * 8ac3d94785 Merge pull request `#24604`_ from jfindlay/pkg_tests -- **PR** `#24403`_: (*jayeshka*) adding states/process unit test case. - @ *2015-06-04T15:19:01Z* + * d88fb22fdc fix pkg module integration tests on CentOS 5 - * 84686ee Merge pull request `#24403`_ from jayeshka/process_states-unit-test - * fcb71fb adding states/process unit test case. + * fb91b40ba0 fix pkg module integration tests on ubuntu 12 -- **PR** `#24402`_: (*jayeshka*) adding states/pyenv unit test case. - @ *2015-06-04T15:18:11Z* +* **PR** `#24600`_: (`basepi`_) [2015.5] Remove __kwarg__ from salt-ssh keyword args + @ *2015-06-12 04:21:29 UTC* - * 35de8d7 Merge pull request `#24402`_ from jayeshka/pyenv_states-unit-test - * 5f263ab adding states/pyenc unit test case. + * 0ff545c549 Merge pull request `#24600`_ from basepi/salt-ssh.orchestrate.20615 -- **PR** `#24401`_: (*jayeshka*) adding states/powerpath unit test case. - @ *2015-06-04T15:17:46Z* + * 9b55683f6a Remove __kwarg__ from salt-ssh keyword args - * 632f838 Merge pull request `#24401`_ from jayeshka/powerpath-states-unit-test - * 49ff927 adding states/powerpath unit test case. +* **ISSUE** `#22843`_: (`Xiol`_) salt-ssh roster doesn't support integers as host keys (refs: `#24608`_) -- **PR** `#24400`_: (*kiorky*) Aptversion - @ *2015-06-04T15:17:19Z* +* **PR** `#24608`_: (`basepi`_) [2015.5] Normalize salt-ssh flat roster minion IDs to strings + @ *2015-06-11 21:35:07 UTC* - - **ISSUE** `#24397`_: (*kiorky*) on debian: states.apt should use virtualname as it shadows system apt module - | refs: `#24398`_ `#24398`_ `#24399`_ `#24399`_ `#24400`_ - * 0a6e5e0 Merge pull request `#24400`_ from makinacorpus/aptversion - * e15cb93 Use apt_pkg.version_compare if available + * 832916f49f Merge pull request `#24608`_ from basepi/salt-ssh.flat.roster.integers.22843 - * 953725a Fix too much quoting in apt.version_cmp + * 381820f051 Normalize salt-ssh flat roster minion IDs to strings -- **PR** `#24385`_: (*jeanpralo*) Fix salt.modules.dockerio.start method - @ *2015-06-04T15:00:22Z* +* **PR** `#24605`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-06-11 19:15:21 UTC* - * a904055 Merge pull request `#24385`_ from jeanpralo/Fix-binds-dockerio.start - * a0fed31 binds dict if not specified should remain to none otherwise docker-py will try to create a new host config and all volume and ports binds are lost. config should be done at the creation of the container not when we start it + * 4eb5bb253b Merge pull request `#24605`_ from basepi/merge-forward-2015.5 -- **PR** `#24381`_: (*jtand*) Disabled flaky test to review later - @ *2015-06-04T14:57:43Z* + * f96c5029bb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 - * 9890bc4 Merge pull request `#24381`_ from jtand/seed_test - * 7570ae9 Disabled flaky test to review later + * d83928a7f9 Merge pull request `#24589`_ from BretFisher/patch-1 -- **PR** `#24382`_: (*basepi*) [2015.5] Handle CommandExecutionError in grains commands, Fixes `#23342`_ - @ *2015-06-04T12:44:04Z* + * 65a11336dc Fixed Mine example for jinja code block - - **ISSUE** `#23342`_: (*philipsd6*) salt-ssh 2015.2.0rc2 fails when target doesn't have lspci available - | refs: `#24382`_ - * b3fa8fe Merge pull request `#24382`_ from basepi/grainscommandnotfound23342 - * 85b91d6 Handle CommandExecutionError in grains commands +* **ISSUE** `#24457`_: (`ryan-lane`_) When selecting the version of docs on the docs site, it brings you to the homepage (refs: `#24598`_) -- **PR** `#24379`_: (*Starblade42*) Fixes an issue where Pagerduty states/modules couldn't find their profile in the Pillar - @ *2015-06-04T12:41:13Z* +* **ISSUE** `#24250`_: (`jfindlay`_) have version links on docs page link to that version of the current page (refs: `#24598`_) - * 52587a4 Merge pull request `#24379`_ from Starblade42/2015.5 - * b93dc5e Linting! +* **PR** `#24598`_: (`jacobhammons`_) 2015.5.2 release changes + @ *2015-06-11 17:24:11 UTC* - * 2dd5904 Fixes an issue where Pagerduty states/modules couldn't find it's profile in the Pillar + * e0bb177823 Merge pull request `#24598`_ from jacobhammons/doc-fixes -- **PR** `#24366`_: (*terminalmage*) Use yes $'\\n' instead of printf '\\n' for pecl commands - @ *2015-06-03T21:28:58Z* + * f3f34ddff6 2015.5.2 release changes Refs `#24250`_ Refs `#24457`_ - * 3ca35d1 Merge pull request `#24366`_ from terminalmage/pecl-yes - * dcd9ad8 Use yes $'\\n' instead of printf '\\n' for pecl commands +* **ISSUE** `#20615`_: (`aurynn`_) 2014.7.1: salt/states/saltmod using incorrect return dict for orchestrate (refs: `#24588`_) -- **PR** `#24348`_: (*kiorky*) Try to close input pipes before calling lxc-start - @ *2015-06-03T19:38:07Z* +* **PR** `#24588`_: (`basepi`_) Fixes for saltmod.function for salt-ssh + @ *2015-06-11 16:15:21 UTC* - - **ISSUE** `#24284`_: (*kiorky*) systemd lxc containers need use_vt=True at lxc-start stage - | refs: `#24348`_ - - **PR** `#548`_: (*Lanzaa*) Salt is now platform dependent. Use get_python_lib(1) - | refs: `#24348`_ - * 86a3b31 Merge pull request `#24348`_ from makinacorpus/lxcpre - * 0cb11a2 lxc: typo + * 26930b45bd Merge pull request `#24588`_ from basepi/salt-ssh.orchestrate.20615 - * d71efa6 Try to close input pipes before calling lxc-start + * 826936ce57 Move documentation into docstring instead of comments + * de052e7135 Assign 'return' to 'ret' if necessary in saltmod.function + + * 34ff989d66 Convert keyword args to key=value strings in salt-ssh + +* **PR** `#24593`_: (`jayeshka`_) adding states/redismod unit test case. + @ *2015-06-11 15:55:27 UTC* + + * 5a21ad152e Merge pull request `#24593`_ from jayeshka/redismod_states-unit-test + + * 3b95744840 adding states/redismod unit test case. + +* **ISSUE** `#40`_: (`thatch45`_) Clean up timeouts (refs: `#22857`_) + +* **PR** `#24581`_: (`rallytime`_) Disabled some flaky tests until we can figure out how to make them more reliable + @ *2015-06-11 15:51:41 UTC* + + * **PR** `#24217`_: (`jfindlay`_) disable intermittently failing tests (refs: `#24581`_) + + * **PR** `#23623`_: (`jfindlay`_) Fix /jobs endpoint's return (refs: `#24217`_) + + * **PR** `#22857`_: (`jacksontj`_) Fix /jobs endpoint's return (refs: `#23623`_) + + * 8ffb86edd0 Merge pull request `#24581`_ from rallytime/disable_some_flaky_tests + + * c82f135d2e Disabled some flaky tests until we can figure out how to make them more reliable + +* **PR** `#24566`_: (`jayeshka`_) adding states/rdp unit test case. + @ *2015-06-11 02:14:39 UTC* + + * a570d7f967 Merge pull request `#24566`_ from jayeshka/rdp_states-unit-test + + * 273b994e91 adding states/rdp unit test case. + +* **ISSUE** `#24480`_: (`kiorky`_) [CRITICAL] [2015.5] tls breaks tzinfo (refs: `#24551`_) + +* **PR** `#24551`_: (`joejulian`_) 2015.5 dont pollute environment + @ *2015-06-11 02:13:06 UTC* + + * 20ada1f8a1 Merge pull request `#24551`_ from joejulian/2015.5_dont_pollute_environment + + * cfc3b43ba2 Don't pollute the TZ environment variable + + * cba8d3f923 pep8 + + * 9cb7015568 Mark keyword version adds + + * 76e2583265 Merge tls changes from develop + +* **ISSUE** `#19901`_: (`clinta`_) State cache is not documented (refs: `#24574`_, `#24468`_) + +* **PR** `#24574`_: (`jacobhammons`_) Refs `#19901`_ + @ *2015-06-10 20:09:23 UTC* + + * bb2fd6a970 Merge pull request `#24574`_ from jacobhammons/19901 + + * e2a2946dc7 Refs `#19901`_ + +* **PR** `#24577`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-06-10 19:46:22 UTC* + + * b03166cde3 Merge pull request `#24577`_ from basepi/merge-forward-2015.5 + + * e1d45ccf3b Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * d376390f76 Merge pull request `#24530`_ from twangboy/fix_24427 + + * 673e1d809e Added missing panel.bmp for installer + + * cc50218b01 Start Minion Service on Silent Install + +* **ISSUE** `#24235`_: (`tomasfejfar`_) Difference between running from minion and from master (refs: `#24571`_, `#24468`_) + +* **PR** `#24571`_: (`jacobhammons`_) Refs `#24235`_ + @ *2015-06-10 17:02:18 UTC* + + * 3ec457beef Merge pull request `#24571`_ from jacobhammons/24235 + + * 8df5d53bb8 Refs `#24235`_ + +* **PR** `#24565`_: (`pille`_) fix backtrace, when listing plugins + @ *2015-06-10 16:33:11 UTC* + + * fe07eb5653 Merge pull request `#24565`_ from pille/munin-ignore-broken-symlinks + + * 8511a6c0a6 fix backtrace, when listing plugins + +* **PR** `#24554`_: (`ryan-lane`_) Fix yes usage for pecl defaults + @ *2015-06-09 23:59:49 UTC* + + * 251c8f9f5f Merge pull request `#24554`_ from lyft/pecl-module-fix + + * 56a9cfcf24 Fix yes usage for pecl defaults + +* **PR** `#24535`_: (`rallytime`_) Back-port `#24518`_ to 2015.5 + @ *2015-06-09 20:06:18 UTC* + + * **PR** `#24518`_: (`rallytime`_) Merge `#24448`_ with Pylint Fixes (refs: `#24535`_) + + * **PR** `#24448`_: (`codertux`_) Update modules path for operating systems using systemd (refs: `#24518`_) + + * dbd49b4acb Merge pull request `#24535`_ from rallytime/bp-24518 + + * fc75197616 Pylint fix + + * 3e08840988 Update modules path for operating systems using systemd + +* **PR** `#24538`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-06-09 17:27:20 UTC* + + * 485ed3cff9 Merge pull request `#24538`_ from basepi/merge-forward-2015.5 + + * 6a8039d468 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * 6ebc476bb3 Merge pull request `#24513`_ from jquast/2014.7-bugfix-iteritem + + * 2be0180e5e bugfix use of 'iteritem' in 2014.7 branch + +* **PR** `#24495`_: (`jayeshka`_) adding states/rabbitmq_vhost unit test case. + @ *2015-06-09 15:33:23 UTC* + + * 73e6388acd Merge pull request `#24495`_ from jayeshka/rabbitmq_vhost_states-unit-test + + * 31889e38eb cosmetic change. + + * cf501cf60d resolved error. + + * 4bb6087722 Merge branch '2015.5' of https://github.com/saltstack/salt into rabbitmq_vhost_states-unit-test + + * 3ad77143a8 adding states/rabbitmq_vhost unit test case. + +* **PR** `#24445`_: (`jayeshka`_) adding states/pyrax_queues unit test case. + @ *2015-06-09 15:28:45 UTC* + + * bf1abccebe Merge pull request `#24445`_ from jayeshka/pyrax_queues_states-unit-test + + * ea27cefb10 adding states/pyrax_queues unit test case. + +* **PR** `#24490`_: (`aneeshusa`_) Fix pacman.list_upgrades for new python_shell default. + @ *2015-06-09 15:13:16 UTC* + + * 0247e8d10d Merge pull request `#24490`_ from aneeshusa/fix-pacman-list-upgrades + + * 980e1cb4dc Lint fix. + + * dca33f1112 Fix pacman.list_upgrades for new python_shell default. + +* **PR** `#24517`_: (`steverweber`_) small fixes to the ipmi docs + @ *2015-06-09 15:10:14 UTC* + + * 6268ddb43a Merge pull request `#24517`_ from steverweber/ipmi_doc + + * 6413712844 lint + + * e78aea9b01 more small fixes to the ipmi docs + +* **PR** `#24524`_: (`jayeshka`_) any() takes list oy tuple. + @ *2015-06-09 13:49:42 UTC* + + * 3728b3f327 Merge pull request `#24524`_ from jayeshka/rabbitmq_vhost_states-module + + * 01c99ad767 any() takes list oy tuple. + +* **PR** `#24482`_: (`eliasp`_) 'docker.running' needs now the 'image' param. + @ *2015-06-09 04:43:04 UTC* + + * dd23de885b Merge pull request `#24482`_ from eliasp/2015.5-states.dockerio-docker.running-doc + + * 5de741d626 'docker.running' needs now the 'image' param. + +* **ISSUE** `#23503`_: (`jfindlay`_) salt-ssh fails on CentOS 7 when python-zmq is not installed (refs: `#24515`_) + +* **PR** `#24515`_: (`basepi`_) [2015.5] Add xml library to the salt-thin + @ *2015-06-09 04:10:06 UTC* + + * 2a727c3f55 Merge pull request `#24515`_ from basepi/susexml23503 + + * 078b33eaaf Add xml library to the thin + +* **PR** `#24497`_: (`jayeshka`_) adding states/rbenv unit test case. + @ *2015-06-09 03:56:10 UTC* + + * fce998a58b Merge pull request `#24497`_ from jayeshka/rbenv_states-unit-test + + * 79d343a62b adding states/rbenv unit test case. + +* **PR** `#24496`_: (`jayeshka`_) adding states/rabbitmq_user unit test case. + @ *2015-06-09 03:55:23 UTC* + + * 2bcb4b1eed Merge pull request `#24496`_ from jayeshka/rabbitmq_user_states-unit-test + + * 7d96f27f91 adding states/rabbitmq_user unit test case. + +* **PR** `#24481`_: (`eliasp`_) Fix typo (licnese → license). + @ *2015-06-09 03:30:25 UTC* + + * 02a597bf49 Merge pull request `#24481`_ from eliasp/2015.5-salt.states.powerpath-license_typo + + * 1280054bce Fix typo (licnese → license). + +* **PR** `#24467`_: (`thenewwazoo`_) Fix dockerio bound volumes + @ *2015-06-09 01:40:23 UTC* + + * 5ad3db5ffb Merge pull request `#24467`_ from thenewwazoo/fix-dockerio-bound-volumes + + * db4e3dc69b Let's raise an exception if create fails + + * d1d85dd685 Add logging + + * ddc63f0f30 Fix volume handling when creating containers + +* **PR** `#24504`_: (`rallytime`_) Move vsphere deprecation to 2015.5 + @ *2015-06-08 22:43:05 UTC* + + * **PR** `#24487`_: (`nmadhok`_) Deprecating vsphere cloud driver in favor of vmware cloud driver (refs: `#24504`_) + + * d236fbd38f Merge pull request `#24504`_ from rallytime/move_vsphere_deprecation_2015.5 + + * d876535d71 Add Getting Started with VSphere doc to 2015.5 + + * b685ebc104 Add vSphere deprecation warnings to 2015.5 + +* **PR** `#24506`_: (`rallytime`_) Backport `#24450`_ to 2015.5 + @ *2015-06-08 22:42:14 UTC* + + * **PR** `#24450`_: (`ruzarowski`_) Fix salt cli runs with batch-size set (refs: `#24506`_) + + * cb5546085c Merge pull request `#24506`_ from rallytime/bp-24450 + + * 1c0fca2b9d Backport `#24450`_ to 2015.5 + +* **PR** `#24498`_: (`rallytime`_) Added "CLI Example" to make failing test happy on 2015.5 + @ *2015-06-08 15:48:40 UTC* + + * 3173fd17ad Merge pull request `#24498`_ from rallytime/fix_doc_failure_fifteen + + * d992ef4777 Added "CLI Example" to make failing test happy on 2015.5 + +* **PR** `#24471`_: (`anlutro`_) Set up salt-ssh file logging + @ *2015-06-08 15:26:49 UTC* + + * 3639e411bd Merge pull request `#24471`_ from alprs/fix-salt_ssh_logging + + * 6a11ec87b8 set up salt-ssh file logging + +* **ISSUE** `#24231`_: (`tarwich`_) npm.bootstrap (refs: `#24469`_) + +* **PR** `#24469`_: (`jfindlay`_) correctly handle user environment info for npm + @ *2015-06-08 15:26:02 UTC* + + * 551e70f3fb Merge pull request `#24469`_ from jfindlay/npm_env + + * 8140c96949 update npm's user info envs + + * cb572f8c41 add `env` parameter to npm.uninstall + +* **ISSUE** `#24268`_: (`tkent-xetus`_) Ability to specify revision for win_gitrepos undocumented (refs: `#24468`_) + +* **ISSUE** `#24235`_: (`tomasfejfar`_) Difference between running from minion and from master (refs: `#24571`_, `#24468`_) + +* **ISSUE** `#24193`_: (`abng88`_) Update ext_pillar docs to mention that this feature is supported masterless as well (refs: `#24468`_) + +* **ISSUE** `#24172`_: (`zhujinhe`_) Can lists be passed in the pillar on the command line on version 2015.5.0? (refs: `#24468`_) + +* **ISSUE** `#23211`_: (`lloesche`_) Document that salt://| escapes special characters in filenames (refs: `#24468`_) + +* **ISSUE** `#19901`_: (`clinta`_) State cache is not documented (refs: `#24574`_, `#24468`_) + +* **ISSUE** `#19801`_: (`ksalman`_) How are grains static? (refs: `#24468`_) + +* **PR** `#24468`_: (`jacobhammons`_) Bug fixes and build errors + @ *2015-06-08 15:25:40 UTC* + + * 0d9e0c2b8c Merge pull request `#24468`_ from jacobhammons/doc-fixes + + * 1035959459 Appended .0 to version added + + * d45c4ed11f Bug fixes and build errors Refs `#23211`_ Refs `#24268`_ Refs `#24235`_ Refs `#24193`_ Refs `#24172`_ Refs `#19901`_ Refs `#19801`_ + +* **ISSUE** `#24318`_: (`favadi`_) uncaught exception for pkgrepo.absent for invalid PPA (refs: `#24465`_) + +* **PR** `#24465`_: (`jfindlay`_) catch exception from softwarerepositories + @ *2015-06-08 15:25:19 UTC* + + * be6905a545 Merge pull request `#24465`_ from jfindlay/unknown_ppa + + * 19c912866d catch exception from softwarerepositories + +* **ISSUE** `#24296`_: (`objectx`_) mount.mount calls file.mkdir with incorrect named argument (refs: `#24464`_) + +* **PR** `#24464`_: (`jfindlay`_) fix typo in modules/mount.py + @ *2015-06-08 15:25:07 UTC* + + * 58d1ea8fe8 Merge pull request `#24464`_ from jfindlay/file_mkdir + + * 6e8cd44500 fix typo in modules/mount.py + +* **ISSUE** `#24434`_: (`dkiser`_) multimaster failover fails due to logic from issue #23611 (refs: `#24461`_) + +* **PR** `#24461`_: (`dkiser`_) fix for `#24434`_ + @ *2015-06-08 15:24:53 UTC* + + * 4f332a71c6 Merge pull request `#24461`_ from dkiser/multimaster_minion_fix + + * 1944a743d7 fix for `#24434`_ + +* **PR** `#24479`_: (`ahus1`_) change "path" to "name" for "file" operations + @ *2015-06-07 17:56:11 UTC* + + * 8917416d39 Merge pull request `#24479`_ from ahus1/patch-1 + + * 7d6b60c79d change "path" to "name" for "file" operations + +* **PR** `#24475`_: (`rallytime`_) Back-port `#24454`_ to 2015.5 + @ *2015-06-07 01:29:32 UTC* + + * **PR** `#24454`_: (`rhertzog`_) Strip extraneous newline character added in last environment variable (refs: `#24475`_) + + * 8618d5b6ea Merge pull request `#24475`_ from rallytime/bp-24454 + + * a793c192a6 Avoid extraneous newline character added in last environment variable + +* **ISSUE** `#24407`_: (`aboe76`_) Please expand salt module random (refs: `#24420`_) + +* **PR** `#24474`_: (`rallytime`_) Back-port `#24420`_ to 2015.5 + @ *2015-06-07 01:29:11 UTC* + + * **PR** `#24420`_: (`aboe76`_) added random integer module to mod_random.py (refs: `#24474`_) + + * 61658ffef7 Merge pull request `#24474`_ from rallytime/bp-24420 + + * 4219b404ad Fix lint error and update versionadded to 2015.5.3 + + * 3613cc9659 added random integer module to mod_random.py + +* **ISSUE** `#24233`_: (`variia`_) yumpkg.group_install keeps returning state change + +* **PR** `#24472`_: (`variia`_) ensure {} output is not treated as change in module.py state, fixes #… + @ *2015-06-06 14:45:44 UTC* + + * 508d7ddb91 Merge pull request `#24472`_ from variia/Fix-yumpkg_group_install-return-change-`#24233`_ + + * 37e8827ce8 ensure {} output is not treated as change in module.py state, fixes `#24233`_ + +* **ISSUE** `#8585`_: (`UtahDave`_) '#' in single quoted option on cli not making it into the execution module (refs: `#24466`_) + +* **ISSUE** `#18045`_: (`dstokes`_) Pillar kwargs parse error with # (refs: `#24466`_) + +* **PR** `#24466`_: (`basepi`_) [2015.5] Fix for # in inner strings in yaml arguments + @ *2015-06-06 14:35:56 UTC* + + * 0292e67c8a Merge pull request `#24466`_ from basepi/fixhashinargs18045 + + * 2e0609f09e Fix for # in inner strings in yaml arguments + +* **PR** `#24456`_: (`rallytime`_) Back-port `#24441`_ to 2015.5 + @ *2015-06-05 22:32:25 UTC* + + * **PR** `#24441`_: (`arthurlogilab`_) [doc] Alignement fix on external_auth documentation (refs: `#24456`_) + + * ced558a6e6 Merge pull request `#24456`_ from rallytime/bp-24441 + + * 70028553c1 yaml indentations should be 2 spaces + + * 21b51abf25 [doc] Alignement fix on external_auth documentation + +* **ISSUE** `#24397`_: (`kiorky`_) on debian: states.apt should use virtualname as it shadows system apt module (refs: `#24398`_, `#24400`_, `#24399`_) + + * **PR** `#24399`_: (`kiorky`_) Versionvirtual (refs: `#24398`_) + +* **PR** `#24398`_: (`kiorky`_) VirtualName for states.apt (refs: `#24399`_) + @ *2015-06-05 17:40:04 UTC* + + * c0ff4110ab Merge pull request `#24398`_ from makinacorpus/aptv + + * 785d27707f VirtualName for states.apt + +* **PR** `#24447`_: (`jayeshka`_) adding states/rabbitmq_policy unit test case. + @ *2015-06-05 15:26:11 UTC* + + * 36263405be Merge pull request `#24447`_ from jayeshka/rabbitmq_policy_states-unit-test + + * 9b038abd63 adding states/rabbitmq_policy unit test case. + +* **PR** `#24446`_: (`jayeshka`_) adding states/rabbitmq_plugin unit test case. + @ *2015-06-05 15:25:33 UTC* + + * 8445a3f28d Merge pull request `#24446`_ from jayeshka/rabbitmq_plugin_states-unit-test + + * cb0c99a012 adding states/rabbitmq_plugin unit test case. + +* **PR** `#24426`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-06-05 03:59:11 UTC* + + * 9cc3808758 Merge pull request `#24426`_ from basepi/merge-forward-2015.5 + + * eafa20cdfb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * 83f853b6ea Merge pull request `#24405`_ from jacksontj/2014.7 + + * 2c7afaeebf Fix for `#24276`_ + + * cef919c602 Merge pull request `#24395`_ from hvnsweeting/handle-exception-get-file + + * bb798a0224 handle exceptions when received data is not in good shape + + * efba1a94b4 Merge pull request `#24305`_ from twangboy/win_path_docs + + * 36804253e6 Fixed pylint error caused by \P... added r + + * bc42a4bb11 triple double quotes to triple single quotes + + * 77cd930bba Added documentation, fixed formatting + +* **ISSUE** `#24309`_: (`steverweber`_) missing docs (refs: `#24429`_) + +* **PR** `#24429`_: (`jacobhammons`_) Salt cloud doc updates, build errors and bug fixes + @ *2015-06-05 00:27:38 UTC* + + * 5d738b8dab Merge pull request `#24429`_ from jacobhammons/cloud-doc-updates + + * 1f7a13d6f9 Salt cloud doc updates, build errors and bug fixes Refs `#24309`_ + +* **PR** `#24408`_: (`rallytime`_) Backport `#24392`_ to 2015.5 + @ *2015-06-04 20:22:09 UTC* + + * **PR** `#24392`_: (`quixoten`_) Fix "No such file or directory" in grains/core.py (refs: `#24408`_) + + * cdffc02cfe Merge pull request `#24408`_ from rallytime/bp-24392 + + * ff7461b3cd Use path found by salt.utils.which + +* **PR** `#24380`_: (`rallytime`_) Backport `#24357`_ to 2015.5 + @ *2015-06-04 20:13:51 UTC* + + * **PR** `#24357`_: (`zhujinhe`_) fix invoke issues of Jinja Macros example (refs: `#24380`_) + + * a6a1f87cd9 Merge pull request `#24380`_ from rallytime/bp-24357 + + * f08c875015 fix invoke issues of Jinja Macros example + +* **ISSUE** `#24358`_: (`pengyao`_) Netapi SSH client don't support ssh_user and ssh_passwd arguments (refs: `#24388`_) + +* **PR** `#24388`_: (`pengyao`_) fixes `#24358`_ + @ *2015-06-04 20:07:40 UTC* + + * 86ce9dbbdf Merge pull request `#24388`_ from pengyao/sshclient-kwargs + + * 5c08ca48b4 fixes `#24358`_ + +* **ISSUE** `#22958`_: (`highlyunavailable`_) Weird error when typoing a command (refs: `#24367`_) + +* **PR** `#24367`_: (`terminalmage`_) Improve error message when module does not exist + @ *2015-06-04 20:07:12 UTC* + + * 72d2eaeda9 Merge pull request `#24367`_ from terminalmage/issue22958 + + * d0d7a5481c Improve error message when module does not exist + +* **ISSUE** `#23101`_: (`gravyboat`_) Create a docs page for labels (refs: `#23387`_) + +* **PR** `#24412`_: (`jfindlay`_) backport `#23387`_ + @ *2015-06-04 20:06:03 UTC* + + * **PR** `#23387`_: (`rallytime`_) Add some "What are all these labels for?" documentation (refs: `#24412`_) + + * a628778e3c Merge pull request `#24412`_ from jfindlay/bp-23387 + + * bf85772042 Make sure the parameters are in the correct order + + * 9f53809cde Add "* Change" label parameters + + * b27a15e774 Remove "workaround" wording + + * 9fff35a959 Some small fixes + + * 54a7089fd6 Link the new labels doc in contributing and hacking docs + + * 375695e696 Add pull request label definitions + + * de945638d3 Add Feature Request label definition + + * 684f291bd4 Add issue definition and augment functional areas section + + * 2da13dd525 Start a "what are all of these labels for?" doc + +* **ISSUE** `#24154`_: (`ssgward`_) Exception when running cp.get_url (refs: `#24336`_) + +* **PR** `#24336`_: (`twangboy`_) Added line to give more descriptive error + @ *2015-06-04 19:56:00 UTC* + + * 485116c2cc Merge pull request `#24336`_ from twangboy/fix_cp_get_url + + * 37b11f931c Added line to give more descriptive error + +* **PR** `#24413`_: (`techhat`_) Add more namespaced functions to GoGrid driver + @ *2015-06-04 19:51:22 UTC* + + * b3d39cc0e8 Merge pull request `#24413`_ from techhat/gogridnamespace + + * 1b397cb6fe Adding blank line + + * da08cc9aac Add more namespaced functions to GoGrid driver + +* **ISSUE** `#24397`_: (`kiorky`_) on debian: states.apt should use virtualname as it shadows system apt module (refs: `#24398`_, `#24400`_, `#24399`_) + +* **PR** `#24399`_: (`kiorky`_) Versionvirtual (refs: `#24398`_) + @ *2015-06-04 18:02:22 UTC* + + * **PR** `#24398`_: (`kiorky`_) VirtualName for states.apt (refs: `#24399`_) + + * 27f109bd76 Merge pull request `#24399`_ from makinacorpus/versionvirtual + + * 235c78ddfe Use apt_pkg.version_compare if available + + * 1c0cd459f8 reindent block to isolate conflict on merge forward + + * 699eceab64 use var to isolate conflict on merge forward + +* **PR** `#24371`_: (`joejulian`_) 2015.5 tls module tests + @ *2015-06-04 15:20:16 UTC* + + * deaee68b89 Merge pull request `#24371`_ from joejulian/2015.5_tls_module_tests + + * 4c5dee1e25 Add @destructiveTest decorator to destructive tests + + * 274bbd4d43 Accept results from older pyOpenSSL + + * 161f913522 All cert info should be in UTC always + + * 9affcca766 See the whole diff if dict compare fails + + * 94f620857c Ignore extensions for now. Resolve this as part of fixing issue 24338. + + * 84904d31f1 Mask lint warning for unused imported module + + * 5675b78459 Do not test if PyOpenSSL is not installed + + * 563cc66311 Add tls tests + +* **PR** `#24403`_: (`jayeshka`_) adding states/process unit test case. + @ *2015-06-04 15:19:01 UTC* + + * 84686ee695 Merge pull request `#24403`_ from jayeshka/process_states-unit-test + + * fcb71fb35e adding states/process unit test case. + +* **PR** `#24402`_: (`jayeshka`_) adding states/pyenv unit test case. + @ *2015-06-04 15:18:11 UTC* + + * 35de8d72db Merge pull request `#24402`_ from jayeshka/pyenv_states-unit-test + + * 5f263ab48b adding states/pyenc unit test case. + +* **PR** `#24401`_: (`jayeshka`_) adding states/powerpath unit test case. + @ *2015-06-04 15:17:46 UTC* + + * 632f838838 Merge pull request `#24401`_ from jayeshka/powerpath-states-unit-test + + * 49ff9272ce adding states/powerpath unit test case. + +* **ISSUE** `#24397`_: (`kiorky`_) on debian: states.apt should use virtualname as it shadows system apt module (refs: `#24398`_, `#24400`_, `#24399`_) + +* **PR** `#24400`_: (`kiorky`_) Aptversion + @ *2015-06-04 15:17:19 UTC* + + * 0a6e5e0d96 Merge pull request `#24400`_ from makinacorpus/aptversion + + * e15cb936b5 Use apt_pkg.version_compare if available + + * 953725a563 Fix too much quoting in apt.version_cmp + +* **PR** `#24385`_: (`jeanpralo`_) Fix salt.modules.dockerio.start method + @ *2015-06-04 15:00:22 UTC* + + * a904055d28 Merge pull request `#24385`_ from jeanpralo/Fix-binds-dockerio.start + + * a0fed313fa binds dict if not specified should remain to none otherwise docker-py will try to create a new host config and all volume and ports binds are lost. config should be done at the creation of the container not when we start it + +* **PR** `#24381`_: (`justinta`_) Disabled flaky test to review later + @ *2015-06-04 14:57:43 UTC* + + * 9890bc4e43 Merge pull request `#24381`_ from jtand/seed_test + + * 7570ae9132 Disabled flaky test to review later + +* **ISSUE** `#23342`_: (`philipsd6`_) salt-ssh 2015.2.0rc2 fails when target doesn't have lspci available (refs: `#24382`_) + +* **PR** `#24382`_: (`basepi`_) [2015.5] Handle CommandExecutionError in grains commands, Fixes `#23342`_ + @ *2015-06-04 12:44:04 UTC* + + * b3fa8fefcb Merge pull request `#24382`_ from basepi/grainscommandnotfound23342 + + * 85b91d64cc Handle CommandExecutionError in grains commands + +* **PR** `#24379`_: (`Starblade42`_) Fixes an issue where Pagerduty states/modules couldn't find their profile in the Pillar + @ *2015-06-04 12:41:13 UTC* + + * 52587a4fc1 Merge pull request `#24379`_ from Starblade42/2015.5 + + * b93dc5ef6c Linting! + + * 2dd5904119 Fixes an issue where Pagerduty states/modules couldn't find it's profile in the Pillar + +* **PR** `#24366`_: (`terminalmage`_) Use yes $'\\n' instead of printf '\\n' for pecl commands + @ *2015-06-03 21:28:58 UTC* + + * 3ca35d1ec3 Merge pull request `#24366`_ from terminalmage/pecl-yes + + * dcd9ad8b6e Use yes $'\n' instead of printf '\n' for pecl commands + +* **ISSUE** `#24284`_: (`kiorky`_) systemd lxc containers need use_vt=True at lxc-start stage (refs: `#24348`_) + + * **PR** `#548`_: (`Lanzaa`_) Salt is now platform dependent. Use get_python_lib(1) (refs: `#24348`_) + +* **PR** `#24348`_: (`kiorky`_) Try to close input pipes before calling lxc-start + @ *2015-06-03 19:38:07 UTC* + + * 86a3b317c6 Merge pull request `#24348`_ from makinacorpus/lxcpre + + * 0cb11a2767 lxc: typo + + * d71efa6d66 Try to close input pipes before calling lxc-start .. _`#12327`: https://github.com/saltstack/salt/pull/12327 .. _`#14666`: https://github.com/saltstack/salt/issues/14666 -.. _`#15209`: https://github.com/saltstack/salt/issues/15209 -.. _`#17041`: https://github.com/saltstack/salt/issues/17041 .. _`#17241`: https://github.com/saltstack/salt/issues/17241 .. _`#18045`: https://github.com/saltstack/salt/issues/18045 -.. _`#18994`: https://github.com/saltstack/salt/issues/18994 -.. _`#19`: https://github.com/saltstack/salt/issues/19 .. _`#19801`: https://github.com/saltstack/salt/issues/19801 .. _`#19901`: https://github.com/saltstack/salt/issues/19901 +.. _`#19`: https://github.com/saltstack/salt/issues/19 .. _`#20124`: https://github.com/saltstack/salt/pull/20124 .. _`#20226`: https://github.com/saltstack/salt/pull/20226 .. _`#20274`: https://github.com/saltstack/salt/pull/20274 @@ -1517,7 +1636,6 @@ Changes: .. _`#20540`: https://github.com/saltstack/salt/pull/20540 .. _`#20615`: https://github.com/saltstack/salt/issues/20615 .. _`#21217`: https://github.com/saltstack/salt/issues/21217 -.. _`#21318`: https://github.com/saltstack/salt/issues/21318 .. _`#21520`: https://github.com/saltstack/salt/issues/21520 .. _`#21923`: https://github.com/saltstack/salt/issues/21923 .. _`#22263`: https://github.com/saltstack/salt/pull/22263 @@ -1532,16 +1650,13 @@ Changes: .. _`#23387`: https://github.com/saltstack/salt/pull/23387 .. _`#23478`: https://github.com/saltstack/salt/issues/23478 .. _`#23503`: https://github.com/saltstack/salt/issues/23503 -.. _`#23611`: https://github.com/saltstack/salt/issues/23611 .. _`#23623`: https://github.com/saltstack/salt/pull/23623 -.. _`#24073`: https://github.com/saltstack/salt/issues/24073 .. _`#24111`: https://github.com/saltstack/salt/issues/24111 .. _`#24154`: https://github.com/saltstack/salt/issues/24154 .. _`#24163`: https://github.com/saltstack/salt/issues/24163 .. _`#24172`: https://github.com/saltstack/salt/issues/24172 .. _`#24175`: https://github.com/saltstack/salt/pull/24175 .. _`#24193`: https://github.com/saltstack/salt/issues/24193 -.. _`#24196`: https://github.com/saltstack/salt/issues/24196 .. _`#24198`: https://github.com/saltstack/salt/issues/24198 .. _`#24207`: https://github.com/saltstack/salt/pull/24207 .. _`#24217`: https://github.com/saltstack/salt/pull/24217 @@ -1589,7 +1704,6 @@ Changes: .. _`#24413`: https://github.com/saltstack/salt/pull/24413 .. _`#24420`: https://github.com/saltstack/salt/pull/24420 .. _`#24426`: https://github.com/saltstack/salt/pull/24426 -.. _`#24427`: https://github.com/saltstack/salt/issues/24427 .. _`#24429`: https://github.com/saltstack/salt/pull/24429 .. _`#24434`: https://github.com/saltstack/salt/issues/24434 .. _`#24439`: https://github.com/saltstack/salt/issues/24439 @@ -1627,7 +1741,6 @@ Changes: .. _`#24498`: https://github.com/saltstack/salt/pull/24498 .. _`#24504`: https://github.com/saltstack/salt/pull/24504 .. _`#24506`: https://github.com/saltstack/salt/pull/24506 -.. _`#24511`: https://github.com/saltstack/salt/pull/24511 .. _`#24513`: https://github.com/saltstack/salt/pull/24513 .. _`#24515`: https://github.com/saltstack/salt/pull/24515 .. _`#24517`: https://github.com/saltstack/salt/pull/24517 @@ -1750,7 +1863,6 @@ Changes: .. _`#24899`: https://github.com/saltstack/salt/pull/24899 .. _`#24900`: https://github.com/saltstack/salt/pull/24900 .. _`#24902`: https://github.com/saltstack/salt/pull/24902 -.. _`#24915`: https://github.com/saltstack/salt/issues/24915 .. _`#24918`: https://github.com/saltstack/salt/pull/24918 .. _`#24923`: https://github.com/saltstack/salt/pull/24923 .. _`#24926`: https://github.com/saltstack/salt/pull/24926 @@ -1790,30 +1902,107 @@ Changes: .. _`#25095`: https://github.com/saltstack/salt/pull/25095 .. _`#25096`: https://github.com/saltstack/salt/pull/25096 .. _`#25099`: https://github.com/saltstack/salt/pull/25099 +.. _`#25109`: https://github.com/saltstack/salt/pull/25109 .. _`#40`: https://github.com/saltstack/salt/issues/40 -.. _`#473`: https://github.com/saltstack/salt/pull/473 .. _`#548`: https://github.com/saltstack/salt/pull/548 .. _`#8585`: https://github.com/saltstack/salt/issues/8585 -.. _`bp-20124`: https://github.com/saltstack/salt/pull/20124 -.. _`bp-22263`: https://github.com/saltstack/salt/pull/22263 -.. _`bp-23387`: https://github.com/saltstack/salt/pull/23387 -.. _`bp-24357`: https://github.com/saltstack/salt/pull/24357 -.. _`bp-24392`: https://github.com/saltstack/salt/pull/24392 -.. _`bp-24420`: https://github.com/saltstack/salt/pull/24420 -.. _`bp-24441`: https://github.com/saltstack/salt/pull/24441 -.. _`bp-24450`: https://github.com/saltstack/salt/pull/24450 -.. _`bp-24454`: https://github.com/saltstack/salt/pull/24454 -.. _`bp-24518`: https://github.com/saltstack/salt/pull/24518 -.. _`bp-24591`: https://github.com/saltstack/salt/pull/24591 -.. _`bp-24668`: https://github.com/saltstack/salt/pull/24668 -.. _`bp-24717`: https://github.com/saltstack/salt/pull/24717 -.. _`bp-24720`: https://github.com/saltstack/salt/pull/24720 -.. _`bp-24735`: https://github.com/saltstack/salt/pull/24735 -.. _`bp-24741`: https://github.com/saltstack/salt/pull/24741 -.. _`bp-24749`: https://github.com/saltstack/salt/pull/24749 -.. _`bp-24757`: https://github.com/saltstack/salt/pull/24757 -.. _`bp-24811`: https://github.com/saltstack/salt/pull/24811 -.. _`bp-24839`: https://github.com/saltstack/salt/pull/24839 -.. _`bp-24845`: https://github.com/saltstack/salt/pull/24845 -.. _`bp-24847`: https://github.com/saltstack/salt/pull/24847 -.. _`bp-24848`: https://github.com/saltstack/salt/pull/24848 +.. _`BalintSzigeti`: https://github.com/BalintSzigeti +.. _`CameronNemo`: https://github.com/CameronNemo +.. _`Colstuwjx`: https://github.com/Colstuwjx +.. _`Fluro`: https://github.com/Fluro +.. _`Lanzaa`: https://github.com/Lanzaa +.. _`Starblade42`: https://github.com/Starblade42 +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`TheScriptSage`: https://github.com/TheScriptSage +.. _`UtahDave`: https://github.com/UtahDave +.. _`Xiol`: https://github.com/Xiol +.. _`abng88`: https://github.com/abng88 +.. _`aboe76`: https://github.com/aboe76 +.. _`ahammond`: https://github.com/ahammond +.. _`ahus1`: https://github.com/ahus1 +.. _`aneeshusa`: https://github.com/aneeshusa +.. _`anlutro`: https://github.com/anlutro +.. _`arount`: https://github.com/arount +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`aurynn`: https://github.com/aurynn +.. _`basepi`: https://github.com/basepi +.. _`bechtoldt`: https://github.com/bechtoldt +.. _`borutmrak`: https://github.com/borutmrak +.. _`bradthurber`: https://github.com/bradthurber +.. _`cachedout`: https://github.com/cachedout +.. _`calvinhp`: https://github.com/calvinhp +.. _`cgtx`: https://github.com/cgtx +.. _`clinta`: https://github.com/clinta +.. _`codertux`: https://github.com/codertux +.. _`companykitchen-dev`: https://github.com/companykitchen-dev +.. _`cro`: https://github.com/cro +.. _`dkatsanikakis`: https://github.com/dkatsanikakis +.. _`dkiser`: https://github.com/dkiser +.. _`dragonpaw`: https://github.com/dragonpaw +.. _`driskell`: https://github.com/driskell +.. _`dstokes`: https://github.com/dstokes +.. _`eliasp`: https://github.com/eliasp +.. _`favadi`: https://github.com/favadi +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gravyboat`: https://github.com/gravyboat +.. _`grischa`: https://github.com/grischa +.. _`gthb`: https://github.com/gthb +.. _`hasues`: https://github.com/hasues +.. _`heewa`: https://github.com/heewa +.. _`highlyunavailable`: https://github.com/highlyunavailable +.. _`hydrosine`: https://github.com/hydrosine +.. _`infestdead`: https://github.com/infestdead +.. _`jacksontj`: https://github.com/jacksontj +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jayeshka`: https://github.com/jayeshka +.. _`jeanpralo`: https://github.com/jeanpralo +.. _`jfindlay`: https://github.com/jfindlay +.. _`jodv`: https://github.com/jodv +.. _`joejulian`: https://github.com/joejulian +.. _`justinta`: https://github.com/justinta +.. _`kartiksubbarao`: https://github.com/kartiksubbarao +.. _`kev009`: https://github.com/kev009 +.. _`kiorky`: https://github.com/kiorky +.. _`ksalman`: https://github.com/ksalman +.. _`lloesche`: https://github.com/lloesche +.. _`lorengordon`: https://github.com/lorengordon +.. _`luciddr34m3r`: https://github.com/luciddr34m3r +.. _`mavenAtHouzz`: https://github.com/mavenAtHouzz +.. _`msciciel`: https://github.com/msciciel +.. _`msteed`: https://github.com/msteed +.. _`multani`: https://github.com/multani +.. _`nmadhok`: https://github.com/nmadhok +.. _`notpeter`: https://github.com/notpeter +.. _`obestwalter`: https://github.com/obestwalter +.. _`objectx`: https://github.com/objectx +.. _`pengyao`: https://github.com/pengyao +.. _`philipsd6`: https://github.com/philipsd6 +.. _`pille`: https://github.com/pille +.. _`porterjamesj`: https://github.com/porterjamesj +.. _`pruiz`: https://github.com/pruiz +.. _`quixoten`: https://github.com/quixoten +.. _`rakai93`: https://github.com/rakai93 +.. _`rallytime`: https://github.com/rallytime +.. _`rhertzog`: https://github.com/rhertzog +.. _`ruzarowski`: https://github.com/ruzarowski +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`saltstack/salt#24329`: https://github.com/saltstack/salt/pull/24329 +.. _`saltstack/salt#24595`: https://github.com/saltstack/salt/pull/24595 +.. _`ssgward`: https://github.com/ssgward +.. _`steverweber`: https://github.com/steverweber +.. _`tankywoo`: https://github.com/tankywoo +.. _`tarwich`: https://github.com/tarwich +.. _`tbaker57`: https://github.com/tbaker57 +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`thenewwazoo`: https://github.com/thenewwazoo +.. _`tkent-xetus`: https://github.com/tkent-xetus +.. _`tomasfejfar`: https://github.com/tomasfejfar +.. _`trevor-h`: https://github.com/trevor-h +.. _`twangboy`: https://github.com/twangboy +.. _`variia`: https://github.com/variia +.. _`wt`: https://github.com/wt +.. _`yermulnik`: https://github.com/yermulnik +.. _`zefrog`: https://github.com/zefrog +.. _`zhujinhe`: https://github.com/zhujinhe diff --git a/doc/topics/releases/2015.5.4.rst b/doc/topics/releases/2015.5.4.rst index 4bc3d9ff4c..c4bab00fed 100644 --- a/doc/topics/releases/2015.5.4.rst +++ b/doc/topics/releases/2015.5.4.rst @@ -2,1342 +2,2459 @@ Salt 2015.5.4 Release Notes =========================== -Version 2015.5.4 is a bugfix release for :ref:`2015.5.0`. +:release: 2015-08-13 -Changes: +Version 2015.5.4 is a bugfix release for :ref:`2015.5.0 `. -- The ``cron.present`` state now correctly defaults to state ID as identifier. -- When querying for VMs in ``digital_ocean_v2.py``, the number of VMs to include in a page was changed from 20 - (default) to 200 to reduce the number of API calls to Digital Ocean. - -- The ``vmware`` Salt-Cloud driver was back-ported from the develop branch in order for installations of Salt - that are older than 2015.8.0 to be able to use the ``vmware`` driver without stack-tracing on various - deprecation paths that were implemented in the 2015.8.0 release. - -Changes for v2015.5.3..v2015.5.4 --------------------------------- - -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): - -*Generated at: 2015-08-13T20:23:30Z* - -Statistics: +Statistics +========== - Total Merges: **247** -- Total Issue references: **140** -- Total PR references: **330** +- Total Issue References: **138** +- Total PR References: **312** -Changes: +- Contributors: **92** (`0xf10e`_, `AkhterAli`_, `BretFisher`_, `DmitryKuzmenko`_, `EvaSDK`_, `GideonRed-zz`_, `JohannesEbke`_, `Oro`_, `TheBigBear`_, `TronPaul`_, `UtahDave`_, `ahus1`_, `alekti`_, `alexandrsushko`_, `amontalban`_, `andre-luiz-dos-santos`_, `aneeshusa`_, `anlutro`_, `asyncsrc`_, `attiasr`_, `babilen`_, `basepi`_, `bbinet`_, `bclermont`_, `bechtoldt`_, `blackduckx`_, `bobrik`_, `cachedout`_, `colekowalski`_, `cro`_, `d--j`_, `davidjb`_, `denmat`_, `derBroBro`_, `dkiser`_, `driskell`_, `egarbi`_, `fleaflicker`_, `garethgreenaway`_, `gmcwhistler`_, `gtmanfred`_, `hasues`_, `isbm`_, `jacksontj`_, `jacobhammons`_, `jahamn`_, `jarpy`_, `jasonkeene`_, `jayeshka`_, `jfindlay`_, `jleroy`_, `jmdcal`_, `jodv`_, `joejulian`_, `jquast`_, `justinta`_, `kev009`_, `klyr`_, `l2ol33rt`_, `loa`_, `lomeroe`_, `martinhoefling`_, `mgwilliams`_, `nicholascapo`_, `niq000`_, `nmadhok`_, `nyushi`_, `oeuftete`_, `opdude`_, `pcdummy`_, `pcn`_, `peterdemin`_, `puneetk`_, `rallytime`_, `rmatulat`_, `s0undt3ch`_, `silenius`_, `sjorge`_, `stanislavb`_, `steverweber`_, `supertom`_, `t0rrant`_, `tankywoo`_, `techhat`_, `terminalmage`_, `thatch45`_, `tony-cocco`_, `twangboy`_, `uvsmtid`_, `vr-jack`_, `yanatan16`_, `zyio`_) -- **PR** `#26292`_: (*jquast*) Rabbitmq 3.2.4 on Ubuntu has "...done.", not "...done" - @ *2015-08-13T19:53:29Z* -- **PR** `#26296`_: (*jquast*) bugfix missing `runas=None' for rabbitmqctl cmds (backport to 2015.5) - @ *2015-08-13T19:52:40Z* +Bug Fixes +========= -- **PR** `#26293`_: (*jfindlay*) Fix `#26268`_ - @ *2015-08-13T19:48:06Z* +- The :py:func:`cron.present ` state now correctly + defaults to state ID as identifier. - - **ISSUE** `#25618`_: (*twangboy*) Fix reg.py to work with the registry properly - | refs: `#26268`_ - - **PR** `#26268`_: (*twangboy*) Multiple improvements to reg executionmod and state mod - | refs: `#26293`_ -- **PR** `#26290`_: (*rallytime*) Only call convert_to_arn when action name is provided - @ *2015-08-13T18:48:58Z* +Salt-Cloud Changes +================== - - **ISSUE** `#25192`_: (*deuscapturus*) 2015.5.2 boto_cloudwatch_alarm.present not working. - | refs: `#26290`_ +- When querying for VMs in the ``digital_ocean_v2`` cloud driver, the number of + VMs to include in a page was changed from 20 (default) to 200 to reduce the + number of API calls to Digital Ocean. -- **PR** `#26288`_: (*bbinet*) allow deleting grains which value is False - @ *2015-08-13T18:24:36Z* +- The ``vmware`` salt-cloud driver was back-ported from the develop branch in + order for installations of Salt that are older than 2015.8.0 to be able to + use the ``vmware`` driver without stack-tracing on various deprecation paths + that were implemented in the 2015.8.0 release. -- **PR** `#26263`_: (*rallytime*) Don't make changes when test=True for openstack present/absent funcs - @ *2015-08-13T16:30:31Z* - - **ISSUE** `#24882`_: (*nmadhok*) salt.states.openstack_config.present and salt.states.openstack_config.absent make changes when test=True - | refs: `#26263`_ +Changelog for v2015.5.3..v2015.5.4 +================================== -- **PR** `#26265`_: (*rallytime*) Don't stacktrace on query return in ec2.create_snapshot - @ *2015-08-13T16:28:48Z* +*Generated at: 2018-05-27 21:59:14 UTC* - - **ISSUE** `#24484`_: (*codehotter*) clouds/ec2.py: create_snapshot throws exception - | refs: `#26265`_ +* **PR** `#26292`_: (`jquast`_) Rabbitmq 3.2.4 on Ubuntu has "...done.", not "...done" + @ *2015-08-13 19:53:29 UTC* -- **PR** `#26285`_: (*stanislavb*) Remove explicit version from instance identity URL - @ *2015-08-13T16:25:32Z* + * 0a5d1307c4 Merge pull request `#26292`_ from jquast/backport-ubuntu-rabbitmq-fix -- **PR** `#26275`_: (*cachedout*) Re-init modules on multi-master reconnect - @ *2015-08-13T15:52:50Z* + * 39ef653bc2 Rabbitmq 3.2.4 on Ubuntu has ...done. not ...done, change the if to be more portable -- **PR** `#26273`_: (*garethgreenaway*) Fixes to schedule module in 2015.5 - @ *2015-08-13T15:34:43Z* +* **PR** `#26296`_: (`jquast`_) bugfix missing 'runas=None' for rabbitmqctl cmds (backport to 2015.5) + @ *2015-08-13 19:52:40 UTC* -- **PR** `#26271`_: (*rallytime*) Fix del_root_vol_on_destroy and del_all_vols_on_destroy functionality on ec2 - @ *2015-08-12T23:22:47Z* + * 21cc3c3bf6 Merge pull request `#26296`_ from jquast/bugfix-runas-rabbitmqctl-2015.5 - - **ISSUE** `#24483`_: (*codehotter*) clouds/ec2.py: del_root_vol_on_destroy and del_all_vols_on_destroy not working - | refs: `#26271`_ + * eb77320786 bugfix missing 'runas=None' for rabbitmqctl cmds -- **PR** `#26219`_: (*anlutro*) cron: make identifier default to state ID - @ *2015-08-12T18:42:33Z* +* **ISSUE** `#25618`_: (`twangboy`_) Fix reg.py to work with the registry properly (refs: `#26268`_) - - **ISSUE** `#25958`_: (*anlutro*) Cron identifier does not default to state ID as documented - | refs: `#26219`_ +* **PR** `#26293`_: (`jfindlay`_) Fix `#26268`_ + @ *2015-08-13 19:48:06 UTC* -- **PR** `#26257`_: (*rallytime*) Back-port `#26237`_ to 2015.5 - @ *2015-08-12T18:40:35Z* + * **PR** `#26268`_: (`twangboy`_) Multiple improvements to reg executionmod and state mod (refs: `#26293`_) - - **ISSUE** `#26207`_: (*fullermd*) group members setting fails with obscure error message on FreeBSD - | refs: `#26237`_ - - **PR** `#26237`_: (*silenius*) fix issue `#26207`_ - | refs: `#26257`_ + * ee59d154d7 Merge pull request `#26293`_ from jfindlay/reggie -- **PR** `#26258`_: (*nmadhok*) Fix permission on tests/runtests.py on 2015.5 branch - @ *2015-08-12T18:40:04Z* + * 91ea964556 add versionadded to reg exec and state mods -- **PR** `#26261`_: (*nmadhok*) Correct spelling of integration in docs - @ *2015-08-12T18:14:48Z* + * 3348b726c9 fix state/reg unit tests - - **PR** `#2015`_: (*thekuffs*) Esky / bbfreeze support + * 3f74a389ce return test results when test=True -- **PR** `#26247`_: (*nmadhok*) Initial commit of unit tests for vmware cloud driver - @ *2015-08-12T16:58:24Z* + * a1274c438d I might have fixed some tests... I might have made them worse -- **PR** `#26246`_: (*nmadhok*) Backport additions to VMware cloud driver from develop to 2015.5 branch - @ *2015-08-12T15:11:26Z* + * 7393adf5a8 Fixed some lint -- **PR** `#26239`_: (*opdude*) Fixed documentation to match function name - @ *2015-08-12T14:48:52Z* + * 787c88a283 Multiple improvements to reg executionmod and state mod -- **PR** `#26232`_: (*garethgreenaway*) Fix to trust_key in gpg module for 2015.5. - @ *2015-08-12T04:48:27Z* +* **ISSUE** `#25192`_: (`deuscapturus`_) 2015.5.2 boto_cloudwatch_alarm.present not working. (refs: `#26290`_) -- **PR** `#26084`_: (*twangboy*) Added python_shell=True, quoted user input - @ *2015-08-10T21:29:35Z* +* **PR** `#26290`_: (`rallytime`_) Only call convert_to_arn when action name is provided + @ *2015-08-13 18:48:58 UTC* - - **ISSUE** `#25802`_: (*jefftucker*) Running module "npm.list" fails on Windows for masterless minion - | refs: `#26084`_ + * 5dd5ac1198 Merge pull request `#26290`_ from rallytime/fix-25192 -- **PR** `#26183`_: (*cro*) Fix LDAP configuration issue. - @ *2015-08-10T19:09:41Z* + * a1f90fa070 Only call convert_to_arn when action name is provided -- **PR** `#26186`_: (*jacobhammons*) regenerated man pages - @ *2015-08-10T19:07:44Z* +* **PR** `#26288`_: (`bbinet`_) allow to delete grains which value is False + @ *2015-08-13 18:24:36 UTC* -- **PR** `#26182`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-08-10T19:00:10Z* + * c81dc0b62f Merge pull request `#26288`_ from bbinet/grains-absent-fix - - **ISSUE** `#25961`_: (*getabc*) [2015.5.3-2] salt-winrepo.git/salt-minion.sls fails certificate '*.wpengine.com' or 'wpengine.com' - | refs: `#26047`_ - - **ISSUE** `#25751`_: (*basepi*) Document `master_finger` more prominently - | refs: `#26088`_ - - **PR** `#26116`_: (*corux*) file.replace fails if repl string is an invalid regex and append/prepend is used - - **PR** `#26088`_: (*jacobhammons*) Master finger - - **PR** `#26047`_: (*jacobhammons*) Updated windows download links in the docs to https://repo.saltstack.com + * f46722aaeb allow to delete grains which value is False -- **PR** `#26000`_: (*driskell*) Implement full event caching for subscribed tags - @ *2015-08-10T18:57:17Z* +* **ISSUE** `#24882`_: (`nmadhok`_) salt.states.openstack_config.present and salt.states.openstack_config.absent make changes when test=True (refs: `#26263`_) - - **ISSUE** `#25998`_: (*driskell*) Event subsystem discarding required events during --batch breaking it for slow running commands - | refs: `#26000`_ +* **PR** `#26263`_: (`rallytime`_) Don't make changes when test=True for openstack present/absent funcs + @ *2015-08-13 16:30:31 UTC* -- **PR** `#26175`_: (*rallytime*) Back-port `#26153`_ to 2015.5 - @ *2015-08-10T18:22:32Z* + * 65ab5aa495 Merge pull request `#26263`_ from rallytime/fix-24882 - - **PR** `#26153`_: (*loa*) Fix dockerio state documentation typo - | refs: `#26175`_ + * 86b8161d22 Mock test key in __opts__ dict -- **PR** `#26177`_: (*rallytime*) Back-port `#26147`_ to 2015.5 - @ *2015-08-10T18:22:01Z* + * 298685bbb2 Don't make changes when test=True for openstack present/absent funcs - - **ISSUE** `#26024`_: (*jpic*) lxc_conf_unset in cloud.profile is ignored - - **PR** `#26147`_: (*martinhoefling*) Fixes `#26024`_ - | refs: `#26177`_ +* **ISSUE** `#24484`_: (`bailsman`_) clouds/ec2.py: create_snapshot throws exception (refs: `#26265`_) -- **PR** `#26179`_: (*rallytime*) Back-port `#25404`_ to 2015.5 - @ *2015-08-10T18:21:50Z* +* **PR** `#26265`_: (`rallytime`_) Don't stacktrace on query return in ec2.create_snapshot + @ *2015-08-13 16:28:48 UTC* - - **ISSUE** `#21082`_: (*clinta*) master_type failover does not failover on DNS errors - | refs: `#25404`_ - - **PR** `#25404`_: (*DmitryKuzmenko*) Fixed minion failover to next master on DNS errors. - | refs: `#26179`_ + * 3d1a9cfedd Merge pull request `#26265`_ from rallytime/fix-24484 -- **PR** `#26180`_: (*jfindlay*) fix processing of state.template - @ *2015-08-10T18:21:38Z* + * 4975300591 Don't stacktrace on query return in ec2.create_snapshot - - **ISSUE** `#26112`_: (*wt*) state.template fails with unclear error with template with only an include - | refs: `#26180`_ +* **PR** `#26285`_: (`stanislavb`_) Remove explicit version from instance identity URL + @ *2015-08-13 16:25:32 UTC* -- **PR** `#26172`_: (*nmadhok*) [Backport] Make sure variable is a dictionary before popping something from it. - @ *2015-08-10T16:42:50Z* + * 5778cb3f01 Merge pull request `#26285`_ from stanislavb/2015.5 - - **ISSUE** `#26162`_: (*nmadhok*) VMware cloud driver create function failing with traceback on latest develop - | refs: `#26163`_ `#26172`_ - - **PR** `#26163`_: (*nmadhok*) Make sure variable is a dictionary before popping something from it. + * 1f18f4f91e Remove explicit version from instance identity URL -- **PR** `#26168`_: (*cachedout*) Fix slack docs - @ *2015-08-10T14:57:18Z* +* **PR** `#26275`_: (`cachedout`_) Re-init modules on multi-master reconnect + @ *2015-08-13 15:52:50 UTC* - - **ISSUE** `#26098`_: (*rdinoff*) SALT.STATES.SLACK Doc update - | refs: `#26168`_ + * 679dc089c0 Merge pull request `#26275`_ from cachedout/mm_reinit -- **PR** `#26127`_: (*garethgreenaway*) Fixes to salt.utils.http related to cp.get_file_str bug. - @ *2015-08-10T14:38:25Z* + * 1e0473c04a Re-init modules on multi-master reconnect - - **ISSUE** `#24106`_: (*nvx*) fileclient.py#get_url ignores HTTP Auth again (2015.5 regression) - | refs: `#26127`_ +* **PR** `#26273`_: (`garethgreenaway`_) Fixes to schedule module in 2015.5 + @ *2015-08-13 15:34:43 UTC* -- **PR** `#26140`_: (*nmadhok*) VMware cloud driver fixes - @ *2015-08-10T13:15:58Z* + * 75fff28779 Merge pull request `#26273`_ from garethgreenaway/2015_5_schedule_list_show_jobs_enabled - - **ISSUE** `#26141`_: (*nmadhok*) salt-cloud VMware driver fails with error in parsing configuration file - | refs: `#26140`_ - - **ISSUE** `#25809`_: (*o-sleep*) vmware cloud module error message - | refs: `#26140`_ - - **ISSUE** `#25625`_: (*steverweber*) cloud vmware driver does not provide mac_address unless vmware tools is running - | refs: `#26137`_ `#26140`_ + * 1aad4b1b4f Jobs are enabled by default but schedule.list does not show an enabled jobs as being enabled by default. This change fixes that. -- **PR** `#26137`_: (*steverweber*) use device mac address if vmtools not active - @ *2015-08-09T03:05:36Z* +* **ISSUE** `#24483`_: (`bailsman`_) clouds/ec2.py: del_root_vol_on_destroy and del_all_vols_on_destroy not working (refs: `#26271`_) - - **ISSUE** `#25625`_: (*steverweber*) cloud vmware driver does not provide mac_address unless vmware tools is running - | refs: `#26137`_ `#26140`_ +* **PR** `#26271`_: (`rallytime`_) Fix del_root_vol_on_destroy and del_all_vols_on_destroy functionality on ec2 + @ *2015-08-12 23:22:47 UTC* -- **PR** `#26119`_: (*jodv*) Backport eauth bugfix to 2015.5 - @ *2015-08-09T02:19:52Z* + * 10af22775a Merge pull request `#26271`_ from rallytime/fix-24483 -- **PR** `#26135`_: (*cro*) Fix proxy minions in 2015.5 and significantly update documentation. - @ *2015-08-09T02:19:21Z* + * 139fbb93bc Fix del_root_vol_on_destroy and del_all_vols_on_destroy functionality on ec2 -- **PR** `#26132`_: (*TheBigBear*) minor edit - @ *2015-08-08T21:05:34Z* +* **ISSUE** `#25958`_: (`anlutro`_) Cron identifier does not default to state ID as documented (refs: `#26219`_) -- **PR** `#26133`_: (*amontalban*) Fixed `#25915`_ in salt/modules/pkgng.py and salt/states/pkg.py - @ *2015-08-08T21:05:05Z* +* **PR** `#26219`_: (`anlutro`_) cron: make identifier default to state ID + @ *2015-08-12 18:42:33 UTC* - - **ISSUE** `#25915`_: (*ari*) FreeBSD pkg install fails + * 8e1b5da2e0 Merge pull request `#26219`_ from alprs/fix-cron_identifier_default -- **PR** `#26111`_: (*anlutro*) Better error messages when virtualenv creation fails - @ *2015-08-07T21:42:09Z* + * 1f02e1671b cron: fix a typo in the tests -- **PR** `#26110`_: (*jfindlay*) check for sources before adding them to cmd str - @ *2015-08-07T21:33:23Z* + * a86b1b7f94 add release note about cron state changes - - **ISSUE** `#26093`_: (*freedba*) archive.tar bug - | refs: `#26110`_ + * 9511e392ce cron: read full length of multi-line comments -- **PR** `#26106`_: (*vr-jack*) Update __init__.py - @ *2015-08-07T21:15:55Z* + * 9b18cd9050 cron: more descriptive tests, updated to reflect new behavior -- **PR** `#26101`_: (*rallytime*) Back-port `#25984`_ to 2015.5 - @ *2015-08-07T18:56:26Z* + * f22ad837c3 cron: change identifier default value to False - - **ISSUE** `#25983`_: (*jmdcal*) Trying to get md5 of local zip - | refs: `#25984`_ - - **PR** `#25984`_: (*jmdcal*) Support local files without md5sum - | refs: `#26101`_ + * ad444b6e7b cron identifier: default to state id -- **PR** `#26080`_: (*techhat*) Fix string checking in s3fs - @ *2015-08-06T23:36:09Z* +* **ISSUE** `#26207`_: (`fullermd`_) group members setting fails with obscure error message on FreeBSD (refs: `#26237`_) -- **PR** `#26079`_: (*cachedout*) Update docs to remove state.over - @ *2015-08-06T23:35:26Z* +* **PR** `#26257`_: (`rallytime`_) Back-port `#26237`_ to 2015.5 + @ *2015-08-12 18:40:35 UTC* - - **ISSUE** `#26039`_: (*basepi*) Update scheduler docs to use orchestrate instead of overstate - | refs: `#26079`_ + * **PR** `#26237`_: (`silenius`_) fix issue `#26207`_ (refs: `#26257`_) -- **PR** `#26058`_: (*opdude*) Fix choco version on chocolatey versions below 0.9.9 - @ *2015-08-06T18:50:10Z* + * eebcade533 Merge pull request `#26257`_ from rallytime/bp-26237 -- **PR** `#26068`_: (*jfindlay*) fix autoruns.list looking in wrong directory - @ *2015-08-06T18:49:48Z* + * d57fdbc6a0 Add versionadded to new members function -- **PR** `#26065`_: (*s0undt3ch*) [2015.5] Update to latest bootstrap stable release v2015.06.08 - @ *2015-08-06T17:09:35Z* + * dad1920626 fix issue `#26207`_ - - **ISSUE** `#634`_: (*loupgaroublond*) /srv/salt/_grains/ not documented - | refs: `#26065`_ - - **ISSUE** `#631`_: (*fatbox*) Can't extend the same item multiple times - | refs: `#26065`_ - - **ISSUE** `#625`_: (*whiteinge*) `cmd.run` state `user` flag is not working - | refs: `#25506`_ `#632`_ - - **PR** `#640`_: (*terminalmage*) fix syntax errors introduced in 0f776c13 - | refs: `#26065`_ - - **PR** `#638`_: (*blast-hardcheese*) Tightened up configuration documentation - | refs: `#26065`_ - - **PR** `#633`_: (*epoelke*) Bug fix to salt-key - | refs: `#26065`_ - - **PR** `#632`_: (*whiteinge*) Change the ``cmd.run`` state to use the new ``runas`` arg - | refs: `#26065`_ +* **PR** `#26258`_: (`nmadhok`_) Fix permission on tests/runtests.py on 2015.5 branch + @ *2015-08-12 18:40:04 UTC* -- **PR** `#26061`_: (*gmcwhistler*) Patch for issue `#25994`_ - @ *2015-08-06T17:07:34Z* + * d7c8169dfb Merge pull request `#26258`_ from nmadhok/fix-permission - - **ISSUE** `#25994`_: (*gmcwhistler*) module.ilo tempfile creation in __execute_cmd results in TypeError: cannot concatenate 'str' and 'int' objects + * d94485d336 Fix permission on tests/runtests.py on 2015.5 branch -- **PR** `#26064`_: (*s0undt3ch*) Don't stacktrace when trying to get the default locale. - @ *2015-08-06T16:11:05Z* +* **PR** `#26261`_: (`nmadhok`_) Correct spelling of integration in docs + @ *2015-08-12 18:14:48 UTC* - - **ISSUE** `#26063`_: (*saltstack-bot*) not working with salt-cloud shows unknown locale error - | refs: `#26064`_ + * 74b70c37b7 Merge pull request `#26261`_ from nmadhok/doc-fix-2015.5 -- **PR** `#26048`_: (*jacobhammons*) Updated windows download links in the docs to https://repo.saltstack.com - @ *2015-08-05T22:59:50Z* + * 714f9766e7 Correct spelling of integration in docs -- **PR** `#26044`_: (*rallytime*) Make sure the key we're comparing is also lowercase - @ *2015-08-05T19:23:54Z* +* **PR** `#26247`_: (`nmadhok`_) Initial commit of unit tests for vmware cloud driver + @ *2015-08-12 16:58:24 UTC* - - **ISSUE** `#25616`_: (*rallytime*) [2015.5] Provisioning Linodes Stacktraces - | refs: `#26044`_ + * de00c181f8 Merge pull request `#26247`_ from nmadhok/vmware-cloud-test-2015.5 -- **PR** `#26042`_: (*jfindlay*) fix test mode logic in state docs - @ *2015-08-05T19:23:07Z* + * 6cc5f97e92 Lint Fix -- **PR** `#26036`_: (*nicholascapo*) survey.hash: Remove manually printed text - @ *2015-08-05T19:21:59Z* + * a8bfe5ec1f Initial commit of unit tests for vmware cloud driver - - **ISSUE** `#24460`_: (*nicholascapo*) Survey runner does not follow `--out` flag - | refs: `#26036`_ +* **PR** `#26246`_: (`nmadhok`_) Backport additions to VMware cloud driver from develop to 2015.5 branch + @ *2015-08-12 15:11:26 UTC* -- **PR** `#26030`_: (*opdude*) Fix a bug in choco version that returned odd data - @ *2015-08-05T16:30:25Z* + * d14d7b2c0e Merge pull request `#26246`_ from nmadhok/vmware-cloud-driver-additions-2015.5 -- **PR** `#26032`_: (*jfindlay*) add test logic to state reult doc - @ *2015-08-05T16:28:32Z* + * 5227aa94bc Backport additions to VMware cloud driver from develop to 2015.5 branch -- **PR** `#26031`_: (*alekti*) Revert "Add file as supported protocol for file source_hash. Fixes `#23764`_" - @ *2015-08-05T15:32:01Z* +* **PR** `#26239`_: (`opdude`_) Fixed documentation to match function name + @ *2015-08-12 14:48:52 UTC* - - **ISSUE** `#23764`_: (*es1o*) source_hash from local file is not supported. - | refs: `#25750`_ + * 87b300d7b3 Merge pull request `#26239`_ from Unity-Technologies/2015.5 -- **PR** `#26021`_: (*anlutro*) Documentation: Specify versionadded for git.present shared argument - @ *2015-08-05T14:17:38Z* + * fc18751710 Fixed documentation to match function name -- **PR** `#26020`_: (*alekti*) Correctly resolve conflict merging pull 25750 to 2015.5 - @ *2015-08-05T14:16:58Z* +* **PR** `#26232`_: (`garethgreenaway`_) Fix to trust_key in gpg module for 2015.5. + @ *2015-08-12 04:48:27 UTC* - - **ISSUE** `#23764`_: (*es1o*) source_hash from local file is not supported. - | refs: `#25750`_ - - **PR** `#25750`_: (*alekti*) Add file as supported protocol for file source_hash. Fixes `#25701`_. - | refs: `#26020`_ + * a93b96c9ba Merge pull request `#26232`_ from garethgreenaway/2015_5_gpg_trust_key_fix -- **PR** `#26016`_: (*basepi*) Revert "Deep merge of pillar lists" - @ *2015-08-05T04:59:52Z* + * e174c41887 Fix to trust_key in gpg module for 2015.5. - - **ISSUE** `#22241`_: (*masterkorp*) Salt master not properly generating the map - | refs: `#25358`_ - - **PR** `#25358`_: (*dkiser*) Deep merge of pillar lists - | refs: `#26016`_ +* **ISSUE** `#25802`_: (`jefftucker`_) Running module "npm.list" fails on Windows for masterless minion (refs: `#26084`_) -- **PR** `#25992`_: (*twangboy*) Refactor win_system.py - @ *2015-08-05T04:54:18Z* +* **PR** `#26084`_: (`twangboy`_) Added python_shell=True, quoted user input + @ *2015-08-10 21:29:35 UTC* - - **ISSUE** `#12255`_: (*eliasp*) 'system.set_computer_desc' fails with non-ASCII chars - | refs: `#25992`_ - - **ISSUE** `#3`_: (*thatch45*) libvirt module + * b57da552ff Merge pull request `#26084`_ from twangboy/fix_25802 -- **PR** `#26002`_: (*twangboy*) Fixed regex to account for comment character followed by whitespace - @ *2015-08-04T22:28:11Z* + * 4503ed5b34 Fixed but with multiple packages, was causing tests to fail - - **ISSUE** `#25948`_: (*twangboy*) Fix uncomment function to handle spaces - | refs: `#26002`_ + * f05e3e72a3 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25802 -- **PR** `#25970`_: (*jfindlay*) accept addition of layman overlay - @ *2015-08-04T15:42:28Z* +* **PR** `#26183`_: (`cro`_) Fix LDAP configuration issue. + @ *2015-08-10 19:09:41 UTC* - - **ISSUE** `#25949`_: (*godlike64*) layman.add does not work with unofficial overlays - | refs: `#25970`_ + * c3814137a3 Merge pull request `#26183`_ from cro/anonldap2 -- **PR** `#25971`_: (*basepi*) [2015.5] salt.modules.reg Add spaces for strings split across multiple lines - @ *2015-08-04T15:39:48Z* + * aa5e9c80b5 Lint roller -- **PR** `#25990`_: (*rallytime*) Back-port `#25976`_ to 2015.5 - @ *2015-08-04T14:36:53Z* + * 79833e3f8a Cherry pick index.rst change. - - **PR** `#25976`_: (*fleaflicker*) Typo in help output - | refs: `#25990`_ + * 99f2c27399 Documentation update for anonymous bind issue. -- **PR** `#25996`_: (*attiasr*) fix msiexec package remove - @ *2015-08-04T14:36:31Z* + * 793eed7b96 Cherry pick master.py groups check -- **PR** `#25966`_: (*rallytime*) Back-port `#25864`_ to 2015.5 - @ *2015-08-03T18:48:26Z* +* **PR** `#26186`_: (`jacobhammons`_) regenerated man pages + @ *2015-08-10 19:07:44 UTC* - - **ISSUE** `#25863`_: (*peterdemin*) pkg.installed fails on already installed package if it is in versionlock.list - | refs: `#25864`_ - - **PR** `#25864`_: (*peterdemin*) `#25863`_ state.pkg.installed fix - | refs: `#25966`_ + * 3233ed4675 Merge pull request `#26186`_ from jacobhammons/man-page-updates -- **PR** `#25967`_: (*rallytime*) Back-port `#25917`_ to 2015.5 - @ *2015-08-03T18:48:02Z* + * bf2dad913f regenerated man pages - - **PR** `#25917`_: (*jmdcal*) adding missing format string - | refs: `#25967`_ +* **PR** `#26182`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-08-10 19:00:10 UTC* -- **PR** `#25895`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-08-03T17:12:37Z* + * d48bcf7598 Merge pull request `#26182`_ from basepi/merge-forward-2015.5 - - **ISSUE** `#23764`_: (*es1o*) source_hash from local file is not supported. - | refs: `#25750`_ - - **PR** `#25750`_: (*alekti*) Add file as supported protocol for file source_hash. Fixes `#25701`_. - | refs: `#26020`_ - - **PR** `#25704`_: (*cachedout*) Ensure prior alignment with master_type in 2014.7 - - **PR** `#25657`_: (*MrCitron*) Add the ability to specify a base pattern for carbon returner - - **PR** `#25633`_: (*AkhterAli*) Update loader.py + * 32f5345d7d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#25941`_: (*jfindlay*) add timelib to dependency versions - @ *2015-08-03T12:23:42Z* + * abdf2935c4 Merge pull request `#26116`_ from corux/fix-escape-content - - **ISSUE** `#25850`_: (*ssgward*) Need to add packages to --versions-report - | refs: `#25941`_ + * fd913ddc36 Append/prepend: search for full line with escaped content -- **PR** `#25951`_: (*garethgreenaway*) Log when event.fire and event.fire_master fail. - @ *2015-08-03T00:19:45Z* + * 106356d98d Merge pull request `#26088`_ from jacobhammons/master-finger -- **PR** `#25942`_: (*jfindlay*) typo in minion doc - @ *2015-07-31T23:34:55Z* + * 133d5f7885 some small changes - - **ISSUE** `#25838`_: (*grep4linux*) docs disable_modules documentation typo - | refs: `#25942`_ + * d220c83f77 master_finger configuration docs switch a script to use https:// instead of http:// Refs `#25751`_ -- **PR** `#25938`_: (*jacobhammons*) Doc on using syndic with multimaster - @ *2015-07-31T23:05:05Z* + * 4bd4bc41f2 Merge pull request `#26047`_ from jacobhammons/win-downloads - - **PR** `#14690`_: (*jacksontj*) Multi syndic - | refs: `#25938`_ + * 7c162d181c Updated windows download links in the docs to https://repo.saltstack.com Refs `#25961`_ -- **PR** `#25848`_: (*twangboy*) Added allusers="1" when installing msi - @ *2015-07-31T20:33:17Z* +* **ISSUE** `#25998`_: (`driskell`_) Event subsystem discarding required events during --batch breaking it for slow running commands (refs: `#26000`_) - - **ISSUE** `#25839`_: (*twangboy*) ALLUSERS="1" should be a default when installing MSI's - | refs: `#25848`_ +* **PR** `#26000`_: (`driskell`_) Implement full event caching for subscribed tags + @ *2015-08-10 18:57:17 UTC* -- **PR** `#25898`_: (*jfindlay*) clarify and expand syndic docs - @ *2015-07-31T20:01:23Z* + * f39780f8ce Merge pull request `#26000`_ from driskell/fix_discarded_events -- **PR** `#25927`_: (*jacksontj*) Pass actual renderers to the Reactor's Compiler - @ *2015-07-31T20:00:17Z* + * 65acf975dd Implement full event caching for subscribed tags Require all multitasking contexts to subscribe to their events so one call to get_event for one tag does not discard events that should be saved for a subsequent call to get_event with another tag. Use blocking get_event in batching with very small timeout. Fixes `#25998`_ - - **ISSUE** `#25852`_: (*UtahDave*) Salt loader is not loading Salt vars in reactor python renderer - | refs: `#25927`_ +* **PR** `#26175`_: (`rallytime`_) Back-port `#26153`_ to 2015.5 + @ *2015-08-10 18:22:32 UTC* -- **PR** `#25921`_: (*cachedout*) Handle non-ascii in state log - @ *2015-07-31T17:41:30Z* + * **PR** `#26153`_: (`loa`_) Fix dockerio state documentation typo (refs: `#26175`_) - - **ISSUE** `#25810`_: (*nvx*) winpkg highstate fails when a new package name contains a unicide character - | refs: `#25921`_ + * c01b4cf150 Merge pull request `#26175`_ from rallytime/bp-26153 -- **PR** `#25919`_: (*TheBigBear*) Minor update to msi un-installer info - @ *2015-07-31T17:39:48Z* + * 9a263067e9 Fix dockerio state documentation typo -- **PR** `#25905`_: (*rallytime*) Back-port `#25982`_ to 2015.5 - @ *2015-07-30T23:24:19Z* +* **ISSUE** `#26024`_: (`jpic`_) lxc_conf_unset in cloud.profile is ignored (refs: `#26147`_) - - **PR** `#25892`_: (*TheBigBear*) Update 7-zip msi un-installer instructions - | refs: `#25905`_ +* **PR** `#26177`_: (`rallytime`_) Back-port `#26147`_ to 2015.5 + @ *2015-08-10 18:22:01 UTC* -- **PR** `#25890`_: (*rallytime*) Back-port `#25698`_ to 2015.5 - @ *2015-07-30T23:12:09Z* + * **PR** `#26147`_: (`martinhoefling`_) Fixes `#26024`_ (refs: `#26177`_) - - **ISSUE** `#25577`_: (*yellow1912*) Wrong indentation in document - | refs: `#25696`_ - - **PR** `#25698`_: (*rallytime*) Back-port `#25659`_ to 2015.8 - | refs: `#25890`_ - - **PR** `#25696`_: (*AkhterAli*) Update schedule.py - - **PR** `#25659`_: (*isbm*) Bugfix: crash at getting non-existing repo - | refs: `#25698`_ + * ca80f33bfd Merge pull request `#26177`_ from rallytime/bp-26147 -- **PR** `#25894`_: (*jacobhammons*) Minor doc bug fixes - @ *2015-07-30T23:02:34Z* + * 323c3ab53c Fixes `#26024`_ - - **ISSUE** `#25650`_: (*jacksontj*) state.running documentation is incorrect - | refs: `#25894`_ - - **ISSUE** `#24042`_: (*whiteinge*) The state_events setting is not documented - | refs: `#25894`_ - - **ISSUE** `#23788`_: (*k5jj*) functions in drac.py module do not match documentation - | refs: `#25894`_ - - **ISSUE** `#21296`_: (*Lothiraldan*) Possible minion enumeration using saltutil.find_job and eauth - | refs: `#25894`_ +* **ISSUE** `#21082`_: (`clinta`_) master_type failover does not failover on DNS errors (refs: `#25404`_) -- **PR** `#25877`_: (*rallytime*) Protect against passing a map file in addition to VM names with --destroy - @ *2015-07-30T21:55:45Z* +* **PR** `#26179`_: (`rallytime`_) Back-port `#25404`_ to 2015.5 + @ *2015-08-10 18:21:50 UTC* - - **ISSUE** `#24036`_: (*arthurlogilab*) [salt-cloud] Protect against passing command line arguments as names for the --destroy command in map files - | refs: `#25877`_ + * **PR** `#25404`_: (`DmitryKuzmenko`_) Fixed minion failover to next master on DNS errors. (refs: `#26179`_) -- **PR** `#25870`_: (*rallytime*) Back-port `#25824`_ to 2015.5 - @ *2015-07-30T21:54:35Z* + * 1213b8d706 Merge pull request `#26179`_ from rallytime/bp-25404 - - **PR** `#25824`_: (*klyr*) Fix get_managed() in file.py module for local files - | refs: `#25870`_ + * 52ab9fc1fb Fixed minion failover to next master on DNS errors. -- **PR** `#25885`_: (*t0rrant*) Update Debian changelog - @ *2015-07-30T20:05:59Z* +* **ISSUE** `#26112`_: (`wt`_) state.template fails with unclear error with template with only an include (refs: `#26180`_) -- **PR** `#25875`_: (*rallytime*) Back-port `#25862`_ to 2015.5 - @ *2015-07-30T17:34:02Z* +* **PR** `#26180`_: (`jfindlay`_) fix processing of state.template + @ *2015-08-10 18:21:38 UTC* - - **ISSUE** `#25478`_: (*zyio*) salt-ssh - Unable to locate current thin version - | refs: `#25862`_ - - **ISSUE** `#25026`_: (*sylvia-wang*) salt-ssh "Failure deploying thin" when using salt module functions - | refs: `#25862`_ - - **PR** `#25862`_: (*zyio*) Adding SCP_NOT_FOUND exit code - | refs: `#25875`_ + * b319c5ec04 Merge pull request `#26180`_ from jfindlay/templ_env -- **PR** `#25873`_: (*rallytime*) Back-port `#25855`_ to 2015.5 - @ *2015-07-30T17:33:55Z* + * 5e46ea4441 check type of matches in render_state before iterating - - **PR** `#25855`_: (*puneetk*) Patch 3 - | refs: `#25873`_ + * c80299b918 insert saltenv to render_state args in state.template -- **PR** `#25871`_: (*rallytime*) Back-port `#25829`_ to 2015.5 - @ *2015-07-30T17:33:43Z* +* **ISSUE** `#26162`_: (`nmadhok`_) VMware cloud driver create function failing with traceback on latest develop (refs: `#26172`_) - - **PR** `#25829`_: (*peterdemin*) Fixed typo in salt.states.saltmod.function doc string - | refs: `#25871`_ +* **PR** `#26172`_: (`nmadhok`_) [Backport] Make sure variable is a dictionary before popping something from it. + @ *2015-08-10 16:42:50 UTC* -- **PR** `#25869`_: (*rallytime*) Back-port `#25788`_ to 2015.5 - @ *2015-07-30T17:33:33Z* + * ef5a4a47f6 Merge pull request `#26172`_ from nmadhok/backport-cloud-fix-26163-2015.5 - - **ISSUE** `#24002`_: (*csakoda*) File lock contention on windows minions causing highstate crash - | refs: `#25788`_ - - **PR** `#25788`_: (*opdude*) Catch a hard crash when running highstate on windows - | refs: `#25869`_ + * 0f2b5f8ac8 Make sure variable is a dictionary before popping something from it. -- **PR** `#25853`_: (*davidjb*) Make ssh-id-wrapper accessible to non-root users - @ *2015-07-30T16:49:47Z* +* **ISSUE** `#26098`_: (`rdinoff`_) SALT.STATES.SLACK Doc update (refs: `#26168`_) - - **ISSUE** `#19532`_: (*stolendog*) salt-ssh running git clone with not root user - | refs: `#25853`_ +* **PR** `#26168`_: (`cachedout`_) Fix slack docs + @ *2015-08-10 14:57:18 UTC* -- **PR** `#25856`_: (*jfindlay*) expand minion reauth scalability documentation - @ *2015-07-30T15:33:17Z* + * 2545df052a Merge pull request `#26168`_ from cachedout/fix_slack_docs - - **ISSUE** `#25447`_: (*spo0nman*) SaltMaster is crippled with Minion Re-Authentication - | refs: `#25856`_ + * f421a936dc Fix slack docs -- **PR** `#25840`_: (*jfindlay*) add note to winrepo state docs about required grain - @ *2015-07-30T14:38:27Z* +* **ISSUE** `#24106`_: (`nvx`_) fileclient.py#get_url ignores HTTP Auth again (2015.5 regression) (refs: `#26127`_) - - **ISSUE** `#25801`_: (*themalkolm*) Update docs that salt.states.winrepo requires `roles:salt-master` in grains. - | refs: `#25840`_ +* **PR** `#26127`_: (`garethgreenaway`_) Fixes to salt.utils.http related to cp.get_file_str bug. + @ *2015-08-10 14:38:25 UTC* -- **PR** `#25846`_: (*jfindlay*) rework deprecation documentation for release names - @ *2015-07-30T13:26:21Z* + * 9e6b0d6165 Merge pull request `#26127`_ from garethgreenaway/2015_5_24106 - - **ISSUE** `#25827`_: (*0xf10e*) "Deprecating Code" doesn't mention Usage of warn_until() w/ Release Names - | refs: `#25846`_ + * 66f640086a one more lint error -- **PR** `#25833`_: (*jahamn*) Allows cp.push to recreate empty files - @ *2015-07-29T16:14:48Z* + * 317a8ec75c Disabling pylint for W0633, auth should only ever be a sequence at this location. - - **ISSUE** `#23288`_: (*UtahDave*) cp.push fails to recreate empty files. - | refs: `#25833`_ + * 08eaca4fe4 lint fixes. -- **PR** `#25831`_: (*rallytime*) Add salt:// to key_url options to docs for pkgrepo.managed - @ *2015-07-29T15:38:43Z* + * 7046b84ac8 Fixing a bug where cp.get_file_str would not work if using http(s) URLs with authentication. The salt.utils.http library in 2015.5 defaults to using urllib instead of requests and there was no authenitication support added. This PR adds authentication support. `#24106`_ - - **ISSUE** `#11474`_: (*JensRantil*) pkgrepo.managed key_url: salt:// always use `base` env - | refs: `#25831`_ +* **ISSUE** `#26141`_: (`nmadhok`_) salt-cloud VMware driver fails with error in parsing configuration file (refs: `#26140`_) -- **PR** `#25807`_: (*rallytime*) Provide helpful error when using actions with a mapfile - @ *2015-07-29T15:30:15Z* +* **ISSUE** `#25809`_: (`o-sleep`_) vmware cloud module error message (refs: `#26140`_) - - **ISSUE** `#22699`_: (*arthurlogilab*) salt-cloud fails on KeyError when given a nonexistent action - | refs: `#25807`_ +* **ISSUE** `#25625`_: (`steverweber`_) cloud vmware driver does not provide mac_address unless vmware tools is running (refs: `#26137`_, `#26140`_) -- **PR** `#25818`_: (*jfindlay*) fix autoruns list - @ *2015-07-29T15:29:20Z* +* **PR** `#26140`_: (`nmadhok`_) VMware cloud driver fixes + @ *2015-08-10 13:15:58 UTC* -- **PR** `#25826`_: (*anlutro*) Check that "onchanges" is a list - @ *2015-07-29T15:00:28Z* + * 3b65e1dd91 Merge pull request `#26140`_ from nmadhok/vmware-cloud-fixes -- **PR** `#25798`_: (*twangboy*) Fixed stacktrace on package name not found - @ *2015-07-28T22:40:14Z* + * a1899b436c Correct provider name in profile example - - **ISSUE** `#25258`_: (*nickw8*) windows minion repo not updating - | refs: `#25798`_ + * 1f21876d21 Lint fixes -- **PR** `#25797`_: (*twangboy*) Changed repocache back to cached_repo - @ *2015-07-28T22:39:32Z* + * 0bd4fce9c1 Additional fixes to format_instance functions to display more information available - - **ISSUE** `#25437`_: (*lorengordon*) Stacktrace on Windows when running pkg.list_pkgs - | refs: `#25598`_ `#25763`_ - - **PR** `#25763`_: (*twangboy*) Fix 25437 - | refs: `#25797`_ + * 4ee1b777e9 Change double quotes to single quotes in add_host config example -- **PR** `#25793`_: (*rallytime*) Back-port `#25730`_ to 2015.5 - @ *2015-07-28T19:37:34Z* + * e132f06a5c Change double quotes to single quotes in provider configuration example - - **PR** `#25730`_: (*sjorge*) patchelf lives in pkgsrc - | refs: `#25793`_ + * ad9895de07 Display error in else condition if connection is unsuccessful and does not have msg attribute. Fixes `#25809`_ -- **PR** `#25792`_: (*rallytime*) Back-port `#25688`_ to 2015.5 - @ *2015-07-28T19:37:17Z* +* **ISSUE** `#25625`_: (`steverweber`_) cloud vmware driver does not provide mac_address unless vmware tools is running (refs: `#26137`_, `#26140`_) - - **PR** `#25688`_: (*bclermont*) Don't acquire lock if there is no formatter - | refs: `#25792`_ +* **PR** `#26137`_: (`steverweber`_) use device mac address if vmtools not active + @ *2015-08-09 03:05:36 UTC* -- **PR** `#25796`_: (*cachedout*) Remove debug from docs - @ *2015-07-28T17:35:59Z* + * 474a250414 Merge pull request `#26137`_ from steverweber/vmware_macaddress_fix -- **PR** `#25749`_: (*jahamn*) Allow zpool.create on character devices - @ *2015-07-28T16:01:40Z* + * 2589e389f0 use device mac address if vmtools not active - - **ISSUE** `#24920`_: (*voileux*) module.zpool.create on character device is not possible by salt - | refs: `#25749`_ +* **PR** `#26119`_: (`jodv`_) Backport eauth bugfix to 2015.5 + @ *2015-08-09 02:19:52 UTC* -- **PR** `#25685`_: (*twangboy*) Fixed regex issues with comment and uncomment - @ *2015-07-28T15:29:49Z* + * 8a33797737 Merge pull request `#26119`_ from jodv/backport_eauth_bugfix -- **PR** `#25763`_: (*twangboy*) Fix 25437 - | refs: `#25797`_ - @ *2015-07-28T15:29:27Z* + * e1a7bb5e7b fix pylint error (unnecessary 'finally' clause may swallow exceptions unintentionally) - - **ISSUE** `#25437`_: (*lorengordon*) Stacktrace on Windows when running pkg.list_pkgs - | refs: `#25598`_ `#25763`_ + * 5b5b4d8fe9 Fix issue with mixed user and group eauth perms -- **PR** `#25752`_: (*thatch45*) State top saltenv - @ *2015-07-28T01:02:10Z* + * 0d2c6a67a5 Return all relevant perms on login -- **PR** `#25755`_: (*twangboy*) Fixed problem with dunder functions not being passed - @ *2015-07-27T19:31:22Z* +* **PR** `#26135`_: (`cro`_) Fix proxy minions in 2015.5 and significantly update documentation. + @ *2015-08-09 02:19:21 UTC* - - **ISSUE** `#25717`_: (*twangboy*) Problem with chocolatey module not loading - | refs: `#25755`_ + * 2b8dcce0ca Merge pull request `#26135`_ from cro/pm20155_2 -- **PR** `#25648`_: (*twangboy*) Clarified functionality of reg module, fixed state to work with new module - @ *2015-07-27T19:30:33Z* + * 28329fff55 These tests make no sense now that the proxy interface is module based and not object based. - - **ISSUE** `#25352`_: (*m03*) reg.absent reporting incorrect results - | refs: `#25648`_ - - **ISSUE** `#1`_: (*thatch45*) Enable regex on the salt cli + * b17b65d4de Fix lint. -- **PR** `#25740`_: (*rallytime*) Back-port `#25722`_ to 2015.5 - @ *2015-07-27T16:08:40Z* + * f4263c8f17 Fix lint. - - **ISSUE** `#25154`_: (*uvsmtid*) All data mixed on STDOUT together should generate valid JSON output - | refs: `#25722`_ - - **ISSUE** `#25153`_: (*uvsmtid*) Multiple results should generate valid JSON output - | refs: `#25722`_ - - **PR** `#25722`_: (*uvsmtid*) Minor docs changes to emphasize JSON output problems without `--static` option - | refs: `#25740`_ + * 6927251c09 Fix lint. -- **PR** `#25739`_: (*rallytime*) Back-port `#25709`_ to 2015.5 - @ *2015-07-27T16:08:27Z* + * 08f1a43ff0 Fix lint. - - **PR** `#25709`_: (*colekowalski*) add direct-io-mode to mount_invisible_options - | refs: `#25739`_ - - **PR** `#25699`_: (*rallytime*) Back-port `#25660`_ to 2015.5 - | refs: `#25709`_ - - **PR** `#25660`_: (*colekowalski*) add glusterfs' direct-io-mode to mount_invisible_keys - | refs: `#25699`_ `#25709`_ + * 8261158b5a Fix lint. -- **PR** `#25738`_: (*rallytime*) Back-port `#25671`_ to 2015.5 - @ *2015-07-27T16:08:23Z* + * b5e643b9cd Whoops...Don't log the entire proxy dictionary--might have sensitive stuff in it. - - **PR** `#25671`_: (*niq000*) added a parameter so verifying SSL is now optional instead of hard-coded - | refs: `#25738`_ + * 2acf3c5aa3 Remove some debugging statements, change some others to 'info' level. -- **PR** `#25737`_: (*rallytime*) Back-port `#25608`_ to 2015.5 - @ *2015-07-27T16:08:18Z* + * 37de6af686 More proxy minion updates - - **ISSUE** `#25229`_: (*rall0r*) Module git.latest kills target directory when test=True - | refs: `#25608`_ - - **PR** `#25608`_: (*rall0r*) Fix: prevent git.latest from removing target - | refs: `#25737`_ + * e79a182108 More proxy minion updates -- **PR** `#25733`_: (*davidjb*) Avoid IndexError when listing mounts if mount output ends in newline - @ *2015-07-27T16:08:05Z* + * 3b746ac2f6 Update to reflect refactor to LazyLoader -- **PR** `#25705`_: (*blackduckx*) Support for setm augeas command. - @ *2015-07-27T16:07:10Z* + * 5d390d3a5f Updates post meeting with Rick - - **ISSUE** `#22460`_: (*onmeac*) Command setm is not supported (yet) - | refs: `#25705`_ + * d1213ce4a0 Updates post meeting with Rick -- **PR** `#25703`_: (*cachedout*) Return to `str` for master_type for 2015.5 - @ *2015-07-27T16:06:22Z* + * dd0b7c6937 Fix proxyobject confusion, now called proxymodule -- **PR** `#25702`_: (*twangboy*) Fixed win_user module for groups with spaces in the name - @ *2015-07-27T15:06:33Z* + * 9b1599d436 Update to reflect refactor to LazyLoader - - **ISSUE** `#25144`_: (*johnccfm*) user.present on Windows fails to add user to groups if group name contains a space - | refs: `#25702`_ +* **PR** `#26132`_: (`TheBigBear`_) minor edit + @ *2015-08-08 21:05:34 UTC* -- **PR** `#25711`_: (*twangboy*) Fixed problem with win_servermanager.list_installed - @ *2015-07-27T15:05:48Z* + * 2705b4a36a Merge pull request `#26132`_ from TheBigBear/patch-5 - - **ISSUE** `#25351`_: (*m03*) win_servermanager.list_installed failing with "IndexError: list index out of range" - | refs: `#25711`_ + * 1d624d77bc minor edit -- **PR** `#25714`_: (*cachedout*) Display warning when progressbar can't be loaded - @ *2015-07-25T00:10:13Z* +* **ISSUE** `#25915`_: (`ari`_) FreeBSD pkg install fails (refs: `#26133`_) - - **ISSUE** `#25435`_: (*yee379*) progressbar dependency missing - | refs: `#25714`_ +* **PR** `#26133`_: (`amontalban`_) Fixed `#25915`_ in salt/modules/pkgng.py and salt/states/pkg.py + @ *2015-08-08 21:05:05 UTC* -- **PR** `#25699`_: (*rallytime*) Back-port `#25660`_ to 2015.5 - | refs: `#25709`_ - @ *2015-07-24T22:11:40Z* + * 3eac28f0f9 Merge pull request `#26133`_ from amontalban/fix-bug-25915 - - **PR** `#25660`_: (*colekowalski*) add glusterfs' direct-io-mode to mount_invisible_keys - | refs: `#25699`_ `#25709`_ + * 6b0f4fca05 Fixed `#25915`_ in salt/modules/pkgng.py and salt/states/pkg.py -- **PR** `#25694`_: (*s0undt3ch*) Salt-SSH fix for `#25689`_ - @ *2015-07-24T21:41:57Z* +* **PR** `#26111`_: (`anlutro`_) Better error messages when virtualenv creation fails + @ *2015-08-07 21:42:09 UTC* - - **ISSUE** `#25689`_: (*anlutro*) Minion log in salt-ssh - | refs: `#25694`_ + * 19c42b8b3a Merge pull request `#26111`_ from alprs/fix-virtualenv_fail_message -- **PR** `#25710`_: (*jahamn*) Integration Testcase for Issue 25250 - @ *2015-07-24T20:57:33Z* + * b2913acc48 virtualenv: better error messages when creation fails - - **ISSUE** `#25250`_: (*wipfs*) 'force' option in copy state deletes target file - | refs: `#25461`_ `#25710`_ +* **ISSUE** `#26093`_: (`freedba`_) archive.tar bug (refs: `#26110`_) -- **PR** `#25680`_: (*basepi*) [2015.5] Move cmd.run jinja aliasing to a wrapper class to prevent side effects - @ *2015-07-24T19:52:10Z* +* **PR** `#26110`_: (`jfindlay`_) check for sources before adding them to cmd str + @ *2015-08-07 21:33:23 UTC* - - **PR** `#25049`_: (*terminalmage*) Fix cmd.run when cross-called in a state/execution module - | refs: `#25680`_ + * 6d2835b464 Merge pull request `#26110`_ from jfindlay/tar_sources -- **PR** `#25682`_: (*basepi*) [2015.5] Fix parsing args with just a hash (#) - @ *2015-07-24T19:52:01Z* + * 1b2f8905eb check for sources before adding them to cmd str -- **PR** `#25695`_: (*stanislavb*) Configurable AWS region & region from IAM metadata - @ *2015-07-24T19:36:40Z* +* **PR** `#26106`_: (`vr-jack`_) Update __init__.py + @ *2015-08-07 21:15:55 UTC* -- **PR** `#25645`_: (*kev009*) Fix pkgng provider to work with a sources list and the underlying pkg… - @ *2015-07-24T16:33:18Z* + * 2d271b3612 Merge pull request `#26106`_ from vr-jack/2015.5 -- **PR** `#25677`_: (*aneeshusa*) Fix pacman.list_upgrades when refresh=True. - @ *2015-07-24T16:30:06Z* + * 5664de6610 Update __init__.py -- **PR** `#25675`_: (*UtahDave*) Use OS line endings with contents on file.managed - @ *2015-07-24T16:29:50Z* +* **ISSUE** `#25983`_: (`jmdcal`_) Trying to get md5 of local zip (refs: `#25984`_) - - **ISSUE** `#25674`_: (*UtahDave*) file.managed with contents parameter uses wrong line endings on Windows - | refs: `#25675`_ +* **PR** `#26101`_: (`rallytime`_) Back-port `#25984`_ to 2015.5 + @ *2015-08-07 18:56:26 UTC* -- **PR** `#25676`_: (*basepi*) Update release candidate docs to 2015.8.0rc2 - @ *2015-07-23T20:29:37Z* + * **PR** `#25984`_: (`jmdcal`_) Support local files without md5sum (refs: `#26101`_) -- **PR** `#25666`_: (*nmadhok*) Check if the properties exist before looping over them causing KeyError - @ *2015-07-23T17:55:40Z* + * 40d41741c1 Merge pull request `#26101`_ from rallytime/bp-25984 - - **ISSUE** `#25665`_: (*nmadhok*) salt-cloud VMware driver fails with KeyErrors if there's any existing machine in the VMware infrastructure in (invalid state) - | refs: `#25666`_ + * 3d279c0713 Pylint Fix -- **PR** `#25656`_: (*anlutro*) Fix locale detection in debian/gentoo - @ *2015-07-23T16:46:40Z* + * cced16a9f4 Support local files without md5sum -- **PR** `#25661`_: (*rallytime*) Back-port `#25624`_ to 2015.5 - @ *2015-07-23T16:26:48Z* +* **PR** `#26080`_: (`techhat`_) Fix string checking in s3fs + @ *2015-08-06 23:36:09 UTC* - - **PR** `#25624`_: (*bobrik*) Fix typo in get_routes example for debian_ip - | refs: `#25661`_ + * 0d3c2d549e Merge pull request `#26080`_ from techhat/fixlower -- **PR** `#25662`_: (*rallytime*) Back-port `#25638`_ to 2015.5 - @ *2015-07-23T16:26:40Z* + * 8717a36963 Fix string checking in s3fs - - **ISSUE** `#15209`_: (*hubez*) file.manage: source_hash not working with s3:// (2014.7.0rc1) - | refs: `#25638`_ - - **PR** `#25638`_: (*TronPaul*) fix bad merge in 99fc7ec - | refs: `#25662`_ +* **ISSUE** `#26039`_: (`basepi`_) Update scheduler docs to use orchestrate instead of overstate (refs: `#26079`_) -- **PR** `#25644`_: (*cachedout*) pillar doc fix - @ *2015-07-22T22:57:23Z* +* **PR** `#26079`_: (`cachedout`_) Update docs to remove state.over + @ *2015-08-06 23:35:26 UTC* - - **ISSUE** `#25413`_: (*zizkebab*) pillar_opts default behavior is not reflected in the docs - | refs: `#25644`_ + * dc9c9b5a34 Merge pull request `#26079`_ from cachedout/issue_26039 -- **PR** `#25642`_: (*cachedout*) Warn on pillar schedule delete - @ *2015-07-22T22:04:12Z* + * f03f460af2 Update docs to remove state.over - - **ISSUE** `#25540`_: (*dennisjac*) salt highstate schedule cannot be removed - | refs: `#25642`_ + * 89d8faaeb1 Added python_shell=True, quoted user input -- **PR** `#25598`_: (*twangboy*) Fixed problem trying to load file with name of boolean type - @ *2015-07-22T17:07:49Z* +* **PR** `#26058`_: (`opdude`_) Fix choco version on chocolatey versions below 0.9.9 + @ *2015-08-06 18:50:10 UTC* - - **ISSUE** `#25437`_: (*lorengordon*) Stacktrace on Windows when running pkg.list_pkgs - | refs: `#25598`_ `#25763`_ - * 7b79e433 Merge pull request `#25598`_ from twangboy/fix_25437 + * aa023f25b8 Merge pull request `#26058`_ from Unity-Technologies/hotfix/fix-choco-pkg-version-2015-5 -- **PR** `#25604`_: (*terminalmage*) Move patching of mock_open to within test - @ *2015-07-22T16:53:55Z* + * beddb96b2b Fix choco version on chocolatey versions below 0.9.9 - - **ISSUE** `#25323`_: (*terminalmage*) unit.modules.tls_test fails with older mock - | refs: `#25604`_ +* **PR** `#26068`_: (`jfindlay`_) fix autoruns.list looking in wrong directory + @ *2015-08-06 18:49:48 UTC* -- **PR** `#25609`_: (*s0undt3ch*) [2015.5] Update the bootstrap script to latest release v2015.07.22 - @ *2015-07-22T16:28:52Z* + * fbe2584abe Merge pull request `#26068`_ from jfindlay/auto_fix - - **ISSUE** `#630`_: (*syphernl*) Allow for an include statement in config files - | refs: `#25609`_ - - **PR** `#627`_: (*chjohnst*) add saltversion grain - | refs: `#25609`_ + * 1e9a850e23 fix autoruns.list looking in wrong directory -- **PR** `#25603`_: (*terminalmage*) Add version_cmp function to yumpkg.py - @ *2015-07-22T15:42:29Z* +* **ISSUE** `saltstack/salt-bootstrap#640`_: (`Deshke`_) salt-minon install bug on ubuntu 14.04 tornado>=4.0 (refs: `#26065`_) - - **ISSUE** `#21912`_: (*rvora*) pkg.latest not updating the package on CentOS though yum reports an update available - | refs: `#25603`_ +* **ISSUE** `saltstack/salt-bootstrap#633`_: (`neilmb`_) Bootstrap install fails on python-requests dependency (refs: `#26065`_) -- **PR** `#25590`_: (*garethgreenaway*) 2015.5 scheduled jobs return data - @ *2015-07-21T21:57:42Z* +* **ISSUE** `saltstack/salt-bootstrap#632`_: (`JulianGindi`_) python-requests : Depends: python-urllib3 (>= 1.7.1) but it is not installable (refs: `#26065`_) - - **ISSUE** `#25560`_: (*dennisjac*) scheduled highstate runs don't return results to the job cache - | refs: `#25590`_ +* **ISSUE** `saltstack/salt-bootstrap#631`_: (`DavidJFelix`_) Stable broken in 15.04 even with -P (refs: `#26065`_) -- **PR** `#25584`_: (*rallytime*) Back-port `#24054`_ and `#25576`_ to 2015.5 - @ *2015-07-21T21:16:38Z* +* **ISSUE** `#636`_: (`pille`_) restict access to salt:// filesystem (refs: #`saltstack/salt-bootstrap#638`_) - - **PR** `#25576`_: (*pcn*) s3fs breaks when fetching files from s3 - | refs: `#25584`_ - - **PR** `#24054`_: (*mgwilliams*) s3.head: return useful data - | refs: `#25584`_ +* **ISSUE** `#613`_: (`thatch45`_) Add timeout option to publish.publish (refs: #`saltstack/salt-bootstrap#634`_) -- **PR** `#25589`_: (*jahamn*) Fixes ssh_known_host not taking port into account - @ *2015-07-21T21:15:06Z* + * **PR** `saltstack/salt-bootstrap#638`_: (`stanislavb`_) Use prefix /usr for centos git install (refs: `#26065`_) - - **ISSUE** `#23626`_: (*mirko*) salt state 'ssh_known_hosts' doesn't take 'port' into account - | refs: `#25589`_ + * **PR** `saltstack/salt-bootstrap#634`_: (`BretFisher`_) bugfix: exit git root before removing it (refs: `#26065`_) -- **PR** `#25573`_: (*EvaSDK*) Do not execute bootstrap script twice - @ *2015-07-21T18:20:04Z* +* **PR** `#26065`_: (`s0undt3ch`_) [2015.5] Update to latest bootstrap stable release v2015.06.08 + @ *2015-08-06 17:09:35 UTC* - - **PR** `#25465`_: (*EvaSDK*) 2015.5.3 LXC module fixes - | refs: `#25573`_ + * 5570408597 Merge pull request `#26065`_ from s0undt3ch/hotfix/bootstrap-script-2015.5 -- **PR** `#25580`_: (*attiasr*) use explicit utf-8 decoding (`#25532`_) - @ *2015-07-21T15:40:49Z* + * a430a62b01 Update to latest bootstrap stable release v2015.06.08 - - **ISSUE** `#25532`_: (*attiasr*) salt/modules/win_pkg.py list_pkgs is broken (encoding issues) - | refs: `#25556`_ `#25580`_ +* **ISSUE** `#25994`_: (`gmcwhistler`_) module.ilo tempfile creation in __execute_cmd results in TypeError: cannot concatenate 'str' and 'int' objects (refs: `#26061`_) -- **PR** `#25568`_: (*twangboy*) Fixed win_useradd module to add fullname - @ *2015-07-21T14:30:25Z* +* **PR** `#26061`_: (`gmcwhistler`_) Patch for issue `#25994`_ + @ *2015-08-06 17:07:34 UTC* - - **ISSUE** `#25206`_: (*jfindlay*) fullname issues with user.add state on windows - | refs: `#25568`_ + * 83a1922196 Merge pull request `#26061`_ from gmcwhistler/2015.5 -- **PR** `#25561`_: (*twangboy*) Fixed the gem module to work on windows... without injection - @ *2015-07-20T21:12:15Z* + * b9e89d0f2d Patch for issue `#25994`_ - - **ISSUE** `#21041`_: (*deuscapturus*) state module gem.installed not working on Windows. - | refs: `#25430`_ `#25561`_ `#25428`_ - - **PR** `#25428`_: (*twangboy*) Fixed the gem module to work on windows - | refs: `#25561`_ +* **ISSUE** `#26063`_: (`saltstack-bot`_) not working with salt-cloud shows unknown locale error (refs: `#26064`_) -- **PR** `#25521`_: (*cachedout*) Fix outputter for state.orch - @ *2015-07-20T19:30:14Z* +* **PR** `#26064`_: (`s0undt3ch`_) Don't stacktrace when trying to get the default locale. + @ *2015-08-06 16:11:05 UTC* -- **PR** `#25563`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-07-20T19:27:36Z* + * 073fb2bdea Merge pull request `#26064`_ from s0undt3ch/issues/26063-unknown-locale - - **PR** `#25416`_: (*cachedout*) Fix broken keyword + * 8c6ab78b1d Don't stacktrace when trying to get the default locale. -- **PR** `#25559`_: (*cachedout*) Lint win_pkg - @ *2015-07-20T17:46:29Z* +* **PR** `#26048`_: (`jacobhammons`_) Updated windows download links in the docs to https://repo.saltstack.com + @ *2015-08-05 22:59:50 UTC* -- **PR** `#25556`_: (*attiasr*) fix for `#25532`_ - @ *2015-07-20T17:45:11Z* + * 0f44761d6e Merge pull request `#26048`_ from jacobhammons/win-downloads2 - - **ISSUE** `#25532`_: (*attiasr*) salt/modules/win_pkg.py list_pkgs is broken (encoding issues) - | refs: `#25556`_ `#25580`_ + * 75243b61cf Updated windows download links in the docs to https://repo.saltstack.com -- **PR** `#25554`_: (*jfindlay*) verify_ssl=True for s3 ext pillar - @ *2015-07-20T17:43:38Z* +* **ISSUE** `#25616`_: (`rallytime`_) [2015.5] Provisioning Linodes Stacktraces (refs: `#26044`_) - - **ISSUE** `#25538`_: (*stanislavb*) S3 ext_pillar configuration requires verify_ssl - | refs: `#25554`_ +* **PR** `#26044`_: (`rallytime`_) Make sure the key we're comparing is also lowercase + @ *2015-08-05 19:23:54 UTC* -- **PR** `#25551`_: (*rallytime*) Backport `#25530`_ to 2015.5 - @ *2015-07-20T17:43:00Z* + * dedcadc37e Merge pull request `#26044`_ from rallytime/fix-25616 - - **PR** `#25530`_: (*andre-luiz-dos-santos*) The variable name must be last - | refs: `#25551`_ + * c2e3803810 Make sure the key we're comparing is also lowercase -- **PR** `#25533`_: (*attiasr*) port 445 for windows bootstraping - @ *2015-07-20T15:13:06Z* +* **PR** `#26042`_: (`jfindlay`_) fix test mode logic in state docs + @ *2015-08-05 19:23:07 UTC* -- **PR** `#25525`_: (*gtmanfred*) add make _prepare an alias for postinitio - @ *2015-07-20T15:12:38Z* + * f005bdfce6 Merge pull request `#26042`_ from jfindlay/result - - **ISSUE** `#25432`_: (*gtmanfred*) [2015.5.3][raet] raet error with SaltRaetRoadStackJoiner - | refs: `#25525`_ + * a83059ca01 fix test mode logic in state docs -- **PR** `#25519`_: (*rallytime*) Backport vmware driver to 2015.5 branch - @ *2015-07-20T15:11:26Z* +* **ISSUE** `#24460`_: (`nicholascapo`_) Survey runner does not follow `--out` flag (refs: `#26036`_) - - **ISSUE** `#25511`_: (*rallytime*) Make provider --> driver change backward compatible - | refs: `#25519`_ `#25519`_ - - **ISSUE** `#23574`_: (*CedNantes*) Failed to Deploy Salt-Minion on a Win 2012 R2 using wmware Cloud Driver from Develop branch - | refs: `#25519`_ +* **PR** `#26036`_: (`nicholascapo`_) survey.hash: Remove manually printed text + @ *2015-08-05 19:21:59 UTC* -- **PR** `#25542`_: (*Oro*) Fix hipchat.send_message when using API v2 - @ *2015-07-20T15:09:13Z* + * 51ab6864b7 Merge pull request `#26036`_ from nicholascapo/survey.hash_follow_out_flag -- **PR** `#25531`_: (*rallytime*) Back-port `#25529`_ to 2015.5 - @ *2015-07-18T19:16:10Z* + * 439ee9831c survey.hash: Remove manually printed text - - **PR** `#25529`_: (*davidjb*) Fix minor typo in best practice example - | refs: `#25531`_ +* **PR** `#26030`_: (`opdude`_) Fix a bug in choco version that returned odd data + @ *2015-08-05 16:30:25 UTC* -- **PR** `#25528`_: (*davidjb*) Fix typo in extend declaration doco - @ *2015-07-18T14:22:06Z* + * 6a4d18eba6 Merge pull request `#26030`_ from Unity-Technologies/hotfix/fix-choco-pkg-version-2015-5 -- **PR** `#25517`_: (*rallytime*) Back-port `#25486`_ to 2015.5 - @ *2015-07-17T21:49:26Z* + * 3dd96c0638 Fix a bug in choco version that returned odd data - - **ISSUE** `#25486`_: (*whiteinge*) Highstate outputter not used for state.apply - | refs: `#25517`_ - - **PR** `#25485`_: (*attiasr*) fix file downloads on windows +* **PR** `#26032`_: (`jfindlay`_) add test logic to state reult doc + @ *2015-08-05 16:28:32 UTC* -- **PR** `#25516`_: (*rallytime*) Back-port `#25483`_ to 2015.5 - @ *2015-07-17T21:49:05Z* + * c96d3bb55e Merge pull request `#26032`_ from jfindlay/result - - **ISSUE** `#25479`_: (*alexandrsushko*) multiple mount.mounted of one device - | refs: `#25483`_ - - **PR** `#25483`_: (*alexandrsushko*) Added 'none' to the set of specialFSes - | refs: `#25516`_ + * 0fd180e106 add test logic to state reult doc -- **PR** `#25513`_: (*garethgreenaway*) fixes to schedule.add documentation in 2015.5 - @ *2015-07-17T17:03:24Z* +* **ISSUE** `#23764`_: (`es1o`_) source_hash from local file is not supported. (refs: `#26031`_, `#25750`_) - - **ISSUE** `#25493`_: (*blackduckx*) Issue with job_args on schedule.add command - | refs: `#25513`_ +* **PR** `#26031`_: (`alekti`_) Revert "Add file as supported protocol for file source_hash. Fixes `#23764`_" + @ *2015-08-05 15:32:01 UTC* -- **PR** `#25465`_: (*EvaSDK*) 2015.5.3 LXC module fixes - | refs: `#25573`_ - @ *2015-07-17T15:57:54Z* + * bd14d85636 Merge pull request `#26031`_ from alekti/merge-pull-25750-to-2015.5 -- **PR** `#25506`_: (*s0undt3ch*) [2015.5] Update bootstrap script to latest stable release, v2015.07.17 - @ *2015-07-17T15:40:38Z* + * 5a7cab4dcc Revert "Add file as supported protocol for file source_hash. Fixes `#23764`_." - - **ISSUE** `#25456`_: (*julienlavergne*) [2015.8.0rc1] salt-bootstrap fails to install salt master - | refs: `#25506`_ - - **ISSUE** `#25270`_: (*iggy*) [2015.8.0rc1] salt-bootstrap fails to properly install a minion - | refs: `#25506`_ - - **ISSUE** `#625`_: (*whiteinge*) `cmd.run` state `user` flag is not working - | refs: `#25506`_ `#632`_ - - **ISSUE** `#611`_: (*fatbox*) Peer interface fails to return data occasionally - | refs: `#25506`_ - - **ISSUE** `#607`_: (*thatch45*) next level -X support - | refs: `#25506`_ - - **ISSUE** `#598`_: (*syphernl*) Explanation on how to execute interactive installs - | refs: `#25506`_ - - **ISSUE** `#455`_: (*whiteinge*) Document common troubleshooting tips - | refs: `#25506`_ - - **PR** `#624`_: (*chjohnst*) Docs are not correct with network.ping as args are not supported - | refs: `#25506`_ - - **PR** `#621`_: (*akoumjian*) Adding ec2 cloud-init bootstrap docs - | refs: `#25506`_ - - **PR** `#606`_: (*terminalmage*) need empty line before code blocks. added ones that were missing. - | refs: `#25506`_ - - **PR** `#602`_: (*terminalmage*) State-related documentation changes - | refs: `#25506`_ +* **PR** `#26021`_: (`anlutro`_) Documentation: Specify versionadded for git.present shared argument + @ *2015-08-05 14:17:38 UTC* -- **PR** `#25498`_: (*jfindlay*) only read /proc/1/cmdline if it exists - @ *2015-07-17T15:35:33Z* + * d55e6e5fe9 Merge pull request `#26021`_ from alprs/docs-git_present_shared_versionadded - - **ISSUE** `#25454`_: (*mschiff*) Regression: salt 2015.5 not working in secure chroot anymore. - | refs: `#25498`_ + * 8fa678aaa7 specify versionadded for git.present shared argument -- **PR** `#25487`_: (*rallytime*) Back-port `#25464`_ to 2015.5 - @ *2015-07-16T16:58:36Z* +* **ISSUE** `#25701`_: (`alekti`_) Issue `#23764`_ regression (refs: `#25750`_) - - **PR** `#25464`_: (*jquast*) docfix: "cache_jobs: False" => grains_cache: False" - | refs: `#25487`_ +* **ISSUE** `#23764`_: (`es1o`_) source_hash from local file is not supported. (refs: `#26031`_, `#25750`_) -- **PR** `#25482`_: (*oeuftete*) Fix docker.running detection of running container - @ *2015-07-16T16:58:29Z* +* **PR** `#26020`_: (`alekti`_) Correctly resolve conflict merging pull 25750 to 2015.5 + @ *2015-08-05 14:16:58 UTC* - - **PR** `#2015`_: (*thekuffs*) Esky / bbfreeze support + * **PR** `#25750`_: (`alekti`_) Add file as supported protocol for file source_hash. Fixes `#25701`_. (refs: `#26020`_) -- **PR** `#25468`_: (*joejulian*) Add support for pyOpenSSL > 0.10 - @ *2015-07-16T15:10:30Z* + * 5e17c5d230 Merge pull request `#26020`_ from alekti/merge-pull-25750-to-2015.5 - - **ISSUE** `#25384`_: (*rickh563*) pyopenssl 0.14 requirement in 2015.5.3 does not work in RHEL6 : ZD-364 - | refs: `#25468`_ + * 4b9d7426cc Add file as supported protocol for file source_hash. Fixes `#23764`_. -- **PR** `#25467`_: (*rallytime*) Add lxml dependency to opennebula docs - @ *2015-07-16T15:09:57Z* +* **ISSUE** `#22241`_: (`masterkorp`_) Salt master not properly generating the map (refs: `#25358`_) -- **PR** `#25461`_: (*jahamn*) Update file, if force option and content not same - @ *2015-07-15T20:15:07Z* +* **PR** `#26016`_: (`basepi`_) Revert "Deep merge of pillar lists" + @ *2015-08-05 04:59:52 UTC* - - **ISSUE** `#25250`_: (*wipfs*) 'force' option in copy state deletes target file - | refs: `#25461`_ `#25710`_ - - **ISSUE** `#24647`_: (*nmadhok*) salt.states.file.copy does not copy the file if it already exists with force=True - | refs: `#25461`_ + * **PR** `#25358`_: (`dkiser`_) Deep merge of pillar lists (refs: `#26016`_) -- **PR** `#25438`_: (*rallytime*) Reduce digital_ocean_v2 API call frequency - @ *2015-07-15T19:40:18Z* + * 53f7aadcd7 Merge pull request `#26016`_ from basepi/revert.25358 - - **ISSUE** `#25431`_: (*namcois*) Digital Ocean v2 reducing API calls by adding per_page - | refs: `#25438`_ + * 8a0e8e0460 Revert "Deep merge of pillar lists" -- **PR** `#25457`_: (*jacksontj*) Saltnado - @ *2015-07-15T17:50:12Z* +* **ISSUE** `#12255`_: (`eliasp`_) 'system.set_computer_desc' fails with non-ASCII chars (refs: `#25992`_) - - **PR** `#25427`_: (*tony-cocco*) Saltnado runner client results in blocking call despite being set-up as Runner.async - | refs: `#25457`_ +* **PR** `#25992`_: (`twangboy`_) Refactor win_system.py + @ *2015-08-05 04:54:18 UTC* -- **PR** `#25459`_: (*jahamn*) Fixed 'defulats' typo in verify.py - @ *2015-07-15T16:53:06Z* + * 200bff7538 Merge pull request `#25992`_ from twangboy/fix_12255 -- **PR** `#25426`_: (*jquast*) bugfix: trailing "...done" in rabbitmq output (backport from 'develop' to 2015.5) - @ *2015-07-15T14:48:05Z* + * 0502897635 Fixed the lint... again -- **PR** `#25433`_: (*jleroy*) Support for IPv6 addresses scopes in network.interfaces (ifconfig) - @ *2015-07-15T14:44:09Z* + * 6f85d6b9af Fixed some lint - - **PR** `#25151`_: (*jleroy*) Support for IPv6 addresses scopes in network.interfaces - | refs: `#25274`_ `#25433`_ + * 4195803e56 Merge pull request `#3`_ from jfindlay/win_sys -- **PR** `#25430`_: (*twangboy*) Disabled rbenv execution module for Windows - @ *2015-07-15T14:41:18Z* + * 9156bbd33e update win_system exec mod unit tests - - **ISSUE** `#21041`_: (*deuscapturus*) state module gem.installed not working on Windows. - | refs: `#25430`_ `#25561`_ `#25428`_ + * c92add95b5 Gated ctypes import, fixed some lint -* c4b1584 Additional test case for question raised in `#1846`_ + * d7670fda0a Refactor win_service.py - - **ISSUE** `#1846`_: (*seanchannel*) development dependencies +* **ISSUE** `#25948`_: (`twangboy`_) Fix uncomment function to handle spaces (refs: `#26002`_) -- **PR** `#25420`_: (*techhat*) Move S3 to use AWS Signature Version 4 - @ *2015-07-14T22:03:09Z* +* **PR** `#26002`_: (`twangboy`_) Fixed regex to account for comment character followed by whitespace + @ *2015-08-04 22:28:11 UTC* -- **PR** `#25418`_: (*twangboy*) Fixed problem with file.managed test=True - @ *2015-07-14T21:26:59Z* + * c168159750 Merge pull request `#26002`_ from twangboy/fix_25948 - - **ISSUE** `#20441`_: (*deuscapturus*) State module file.managed returns an error on Windows and test=Test - | refs: `#25418`_ + * ba1a57e582 Fixed regex to account for comment character followed by whitespace -- **PR** `#25417`_: (*ahus1*) extended documentation about dependencies for dig module - @ *2015-07-14T20:49:51Z* +* **ISSUE** `#25949`_: (`godlike64`_) layman.add does not work with unofficial overlays (refs: `#25970`_) -- **PR** `#25411`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-07-14T17:55:26Z* +* **PR** `#25970`_: (`jfindlay`_) accept addition of layman overlay + @ *2015-08-04 15:42:28 UTC* - - **PR** `#25375`_: (*cachedout*) Fix error in config.py for master_type - - **PR** `#25324`_: (*jacobhammons*) Latest help theme updates + * 4ad2422da1 Merge pull request `#25970`_ from jfindlay/layman -- **PR** `#25406`_: (*anlutro*) Force arguments to aptpkg.version_cmp into strings - @ *2015-07-14T16:15:41Z* + * 237a9e18b3 accept addition of layman overlay -- **PR** `#25408`_: (*rallytime*) Back-port `#25399`_ to 2015.5 - @ *2015-07-14T16:09:06Z* +* **PR** `#25971`_: (`basepi`_) [2015.5] salt.modules.reg Add spaces for strings split across multiple lines + @ *2015-08-04 15:39:48 UTC* - - **PR** `#25399`_: (*jarpy*) Demonstrate per-minion client_acl. - | refs: `#25408`_ + * f136c6c1c0 Merge pull request `#25971`_ from basepi/reg.typos -- **PR** `#25240`_: (*tankywoo*) file make os.walk only be called one - @ *2015-07-14T16:04:49Z* + * bb001a6c0e Add spaces for strings split across multiple lines -- **PR** `#25395`_: (*rallytime*) Back-port `#25389`_ to 2015.5 - @ *2015-07-14T03:26:34Z* +* **PR** `#25990`_: (`rallytime`_) Back-port `#25976`_ to 2015.5 + @ *2015-08-04 14:36:53 UTC* - - **PR** `#25389`_: (*l2ol33rt*) Adding entropy note for gpg renderer - | refs: `#25395`_ + * **PR** `#25976`_: (`fleaflicker`_) Typo in help output (refs: `#25990`_) -- **PR** `#25392`_: (*rallytime*) Back-port `#25256`_ to 2015.5 - @ *2015-07-14T03:25:13Z* + * 6383dd8a7d Merge pull request `#25990`_ from rallytime/bp-25976 - - **PR** `#25256`_: (*yanatan16*) Don't assume source_hash exists - | refs: `#25392`_ + * 5f6dc0cc85 Typo in help output -- **PR** `#25398`_: (*twangboy*) Fix date - @ *2015-07-14T03:21:17Z* +* **PR** `#25996`_: (`attiasr`_) fix msiexec package remove + @ *2015-08-04 14:36:31 UTC* -- **PR** `#25397`_: (*GideonRed*) Introduce standard error output when cli exits with non-zero status - @ *2015-07-14T03:20:24Z* + * 9f8bf75dc0 Merge pull request `#25996`_ from attiasr/patch-1 -- **PR** `#25386`_: (*cachedout*) Lint `#25383`_ - @ *2015-07-13T21:01:10Z* + * 5fbc5fcd94 fix msiexec package remove - - **ISSUE** `#24444`_: (*michaelkrupp*) file.managed does not handle dead symlinks - | refs: `#25383`_ - - **PR** `#25383`_: (*jahamn*) Fix manage_file function in salt/modules/file.py to handle broken sym… +* **ISSUE** `#25863`_: (`peterdemin`_) pkg.installed fails on already installed package if it is in versionlock.list (refs: `#25864`_) -- **PR** `#25383`_: (*jahamn*) Fix manage_file function in salt/modules/file.py to handle broken sym… - @ *2015-07-13T20:58:23Z* +* **PR** `#25966`_: (`rallytime`_) Back-port `#25864`_ to 2015.5 + @ *2015-08-03 18:48:26 UTC* - - **ISSUE** `#24444`_: (*michaelkrupp*) file.managed does not handle dead symlinks - | refs: `#25383`_ + * **PR** `#25864`_: (`peterdemin`_) `#25863`_ state.pkg.installed fix (refs: `#25966`_) -- **PR** `#25369`_: (*anlutro*) Fix aptpkg.version_cmp - @ *2015-07-13T20:18:45Z* + * 2dca8d959b Merge pull request `#25966`_ from rallytime/bp-25864 -- **PR** `#25379`_: (*jfindlay*) check for cwd before getting it - @ *2015-07-13T19:50:27Z* + * 0f7f9637b4 `#25863`_ fix - state.pkg: do preflight check only for non-installed packages - - **ISSUE** `#25337`_: (*eliasp*) `salt-call` from non-existend cwd backtraces - | refs: `#25379`_ +* **PR** `#25967`_: (`rallytime`_) Back-port `#25917`_ to 2015.5 + @ *2015-08-03 18:48:02 UTC* -- **PR** `#25334`_: (*jfindlay*) return all cmd info back to zypper fcn - @ *2015-07-13T17:03:29Z* + * **PR** `#25917`_: (`jmdcal`_) adding missing format string (refs: `#25967`_) - - **ISSUE** `#25320`_: (*podloucky-init*) zypper module list_upgrades broken (2015.5.2) - | refs: `#25334`_ + * a6d8e541ed Merge pull request `#25967`_ from rallytime/bp-25917 -- **PR** `#25339`_: (*jfindlay*) update orchestration docs - @ *2015-07-13T16:04:26Z* + * 82b7e14a1f adding missing format string -- **PR** `#25358`_: (*dkiser*) Deep merge of pillar lists - | refs: `#26016`_ - @ *2015-07-13T15:51:01Z* +* **PR** `#25895`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-08-03 17:12:37 UTC* - - **ISSUE** `#22241`_: (*masterkorp*) Salt master not properly generating the map - | refs: `#25358`_ + * 87d028b302 Merge pull request `#25895`_ from basepi/merge-forward-2015.5 -- **PR** `#25346`_: (*bechtoldt*) set correct indention in states/requisites.rst (docs), fixes `#25281`_ - @ *2015-07-13T15:34:45Z* + * 56e43c8f88 Fix lint - - **ISSUE** `#25281`_: (*shinshenjs*) Unless usage in Official Doc syntax error? + * 93a182d9ea Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#25336`_: (*terminalmage*) Don't try to read init binary if it wasn't found - @ *2015-07-13T09:45:30Z* + * d93eb87c16 Merge pull request `#25750`_ from alekti/2014.7 -- **PR** `#25350`_: (*davidjb*) Fix documentation for file.blockreplace - @ *2015-07-13T03:41:20Z* + * 9ec3ae96d4 Add file as supported protocol for file source_hash. Fixes `#23764`_. -- **PR** `#25326`_: (*rallytime*) Back-port `#20972`_ to 2015.5 - @ *2015-07-10T18:49:44Z* + * 3a15df22ac Merge pull request `#25704`_ from cachedout/master_type_2014_7 - - **ISSUE** `#19288`_: (*oba11*) AssociatePublicIpAddress doesn't work with salt-cloud 2014.7.0 - | refs: `#20972`_ `#25326`_ - - **PR** `#20972`_: (*JohannesEbke*) Fix interface cleanup when using AssociatePublicIpAddress in `#19288`_ - | refs: `#25326`_ + * c95886c9a7 Ensure prior alignment with master_type in 2014.7 -- **PR** `#25327`_: (*rallytime*) Back-port `#25290`_ to 2015.5 - @ *2015-07-10T18:49:37Z* + * d1b9362a73 Merge pull request `#25657`_ from MrCitron/pattern-carbon-returner-2014.7 - - **ISSUE** `#24433`_: (*chrimi*) Salt locale state fails, if locale has not been generated - | refs: `#25290`_ - - **PR** `#25290`_: (*pcdummy*) Simple fix for locale.present on Ubuntu. - | refs: `#25327`_ + * f8b2f8079f Add the ability to specify a base pattern for metrics path used by the carbon returner -- **PR** `#25328`_: (*rallytime*) Back-port `#25309`_ to 2015.5 - @ *2015-07-10T17:22:59Z* + * 9634351fc2 Merge pull request `#25633`_ from AkhterAli/2014.7 - - **ISSUE** `#24827`_: (*yermulnik*) locale.present doesn't generate locales - | refs: `#25309`_ - - **PR** `#25309`_: (*davidjb*) Format /etc/locale.gen correctly in salt.modules.localemod.gen_locale - | refs: `#25328`_ + * 29be4bbe11 Update loader.py -- **PR** `#25322`_: (*jacobhammons*) version change to 2015.5.3 - @ *2015-07-10T16:11:24Z* +* **ISSUE** `#25850`_: (`ssgward`_) Need to add packages to --versions-report (refs: `#25941`_) -- **PR** `#25308`_: (*jacksontj*) Make clear commands trace level logging - @ *2015-07-10T14:20:06Z* +* **PR** `#25941`_: (`jfindlay`_) add timelib to dependency versions + @ *2015-08-03 12:23:42 UTC* - - **PR** `#24737`_: (*jacksontj*) Move AES command logging to trace - | refs: `#25308`_ + * 98955057e0 Merge pull request `#25941`_ from jfindlay/time_lib -- **PR** `#25269`_: (*jfindlay*) Extract tomcat war version - @ *2015-07-10T01:28:21Z* + * 464f7a404c add timelib to dependency versions - - **ISSUE** `#24520`_: (*nvx*) Tomcat module fails to extract version number from snapshot builds (2015.5 regression) - | refs: `#24927`_ - - **PR** `#24927`_: (*egarbi*) Tomcat module fails to extract version number from snapshot builds `#2`_… - | refs: `#25269`_ +* **PR** `#25951`_: (`garethgreenaway`_) Log when event.fire and event.fire_master fail. + @ *2015-08-03 00:19:45 UTC* -- **PR** `#25238`_: (*DmitryKuzmenko*) Pillarenv backport 2015.5 - @ *2015-07-10T01:25:07Z* + * dcc6883b24 Merge pull request `#25951`_ from garethgreenaway/event_fire_failed_log_why - - **ISSUE** `#18808`_: (*amendlik*) Add command line argument to select pillar environment - | refs: `#25238`_ - - **PR** `#23719`_: (*DmitryKuzmenko*) Support pillarenv cmdline in state.sls + * 7f20454427 If we're unable to fire an event, log the cause so we know what happened -- **PR** `#25299`_: (*twangboy*) Added -NonInteractive so powershell doesn't hang waiting for input - @ *2015-07-09T21:00:16Z* +* **ISSUE** `#25838`_: (`grep4linux`_) docs disable_modules documentation typo (refs: `#25942`_) - - **ISSUE** `#13943`_: (*Supermathie*) Powershell commands that expect input hang forever - | refs: `#25299`_ +* **PR** `#25942`_: (`jfindlay`_) typo in minion doc + @ *2015-07-31 23:34:55 UTC* -- **PR** `#25301`_: (*jacobhammons*) bug fix for module function display in help - @ *2015-07-09T20:46:34Z* + * 4143cec3bf Merge pull request `#25942`_ from saltstack/lover -- **PR** `#25279`_: (*jacobhammons*) Additional docs on external and master job cache, assorted doc fixes - @ *2015-07-09T16:46:26Z* + * 7e121de907 Update minion.rst - - **ISSUE** `#25277`_: (*jacobhammons*) CherryPy recommended versions - | refs: `#25279`_ +* **PR** `#25938`_: (`jacobhammons`_) Doc on using syndic with multimaster + @ *2015-07-31 23:05:05 UTC* -- **PR** `#25274`_: (*jleroy*) Fix for issue `#25268`_ - @ *2015-07-09T13:36:26Z* + * **PR** `#14690`_: (`jacksontj`_) Multi syndic (refs: `#25938`_) - - **ISSUE** `#25268`_: (*lichtamberg*) Salt not working anymore in 2015.8/develop: ValueError: 'scope' is not in list - | refs: `#25274`_ - - **PR** `#25151`_: (*jleroy*) Support for IPv6 addresses scopes in network.interfaces - | refs: `#25274`_ `#25433`_ + * 1f20c065b8 Merge pull request `#25938`_ from jacobhammons/syndic-multimaster -- **PR** `#25272`_: (*twangboy*) Fixed problem with service not starting - @ *2015-07-08T23:29:48Z* + * ac0a8ff711 Doc on using syndic with multimaster -- **PR** `#25225`_: (*nmadhok*) Backporting fix for issue `#25223`_ on 2015.5 branch - @ *2015-07-08T15:16:18Z* +* **ISSUE** `#25839`_: (`twangboy`_) ALLUSERS="1" should be a default when installing MSI's (refs: `#25848`_) - - **ISSUE** `#25223`_: (*nmadhok*) Runner occasionally fails with a RuntimeError when fired by a reactor - | refs: `#25225`_ +* **PR** `#25848`_: (`twangboy`_) Added allusers="1" when installing msi + @ *2015-07-31 20:33:17 UTC* -- **PR** `#25214`_: (*rallytime*) A couple of doc fixes for the http tutorial - @ *2015-07-07T22:23:07Z* + * 18a9e65e1f Merge pull request `#25848`_ from twangboy/fix_25839 -- **PR** `#25194`_: (*rallytime*) Update moto version check in boto_vpc_test and update min version - @ *2015-07-07T18:27:32Z* + * e797739a1b Removed normalize_name function - - **ISSUE** `#24272`_: (*rallytime*) Fix boto_vpc_test moto version check - | refs: `#25194`_ + * ad7fdda68b Adder allusers="1" when installing msi -- **PR** `#25205`_: (*basepi*) Update releasecandidate docs - @ *2015-07-07T15:25:24Z* +* **PR** `#25898`_: (`jfindlay`_) clarify and expand syndic docs + @ *2015-07-31 20:01:23 UTC* -- **PR** `#25187`_: (*UtahDave*) Doc fixes: Fix misspelling and remove extraneous double spaces - @ *2015-07-07T01:07:04Z* + * de0a0593c2 Merge pull request `#25898`_ from jfindlay/syndic_doc -- **PR** `#25182`_: (*cachedout*) Try to re-pack long floats as strs - @ *2015-07-07T01:06:43Z* + * 4795952847 rework syndic doc -- **PR** `#25185`_: (*rallytime*) Back-port `#25128`_ to 2015.5 - @ *2015-07-07T00:58:00Z* + * a25d0eabef update syndic doc to conform to style - - **ISSUE** `#23822`_: (*sidcarter*) Zip file extracted permissions are incorrect - | refs: `#25128`_ - - **PR** `#25128`_: (*stanislavb*) Use cmd_unzip to preserve permissions - | refs: `#25185`_ +* **ISSUE** `#25852`_: (`UtahDave`_) Salt loader is not loading Salt vars in reactor python renderer (refs: `#25927`_) -- **PR** `#25181`_: (*rallytime*) Back-port `#25102`_ to 2015.5 - @ *2015-07-07T00:57:13Z* +* **PR** `#25927`_: (`jacksontj`_) Pass actual renderers to the Reactor's Compiler + @ *2015-07-31 20:00:17 UTC* - - **PR** `#25102`_: (*derBroBro*) Update win_network.py - | refs: `#25181`_ + * d1f3da548a Merge pull request `#25927`_ from jacksontj/2015.5 -- **PR** `#25179`_: (*rallytime*) Back-port `#25059`_ to 2015.5 - @ *2015-07-07T00:56:44Z* + * cf7479aa0a Pass actual renderers to the Reactor's Compiler - - **ISSUE** `#24301`_: (*iggy*) influxdb_user and influxdb_database states need virtual functions - | refs: `#25059`_ - - **PR** `#25059`_: (*babilen*) Add virtual functions to influxdb state modules - | refs: `#25179`_ +* **ISSUE** `#25810`_: (`nvx`_) winpkg highstate fails when a new package name contains a unicide character (refs: `#25921`_) -- **PR** `#25196`_: (*twangboy*) Fixed `#18919`_ false-positive on pkg.refresh - @ *2015-07-07T00:24:13Z* +* **PR** `#25921`_: (`cachedout`_) Handle non-ascii in state log + @ *2015-07-31 17:41:30 UTC* - - **ISSUE** `#18919`_: (*giner*) Windows: pkg.refresh_db returns false-positive success - | refs: `#25196`_ + * 331fc121a8 Merge pull request `#25921`_ from cachedout/issue_25810 -- **PR** `#25180`_: (*rallytime*) Back-port `#25088`_ to 2015.5 - @ *2015-07-06T20:33:45Z* + * 8074c545ea Handle non-ascii in state log - - **PR** `#25088`_: (*supertom*) Update - | refs: `#25180`_ +* **PR** `#25919`_: (`TheBigBear`_) Minor update to msi un-installer info + @ *2015-07-31 17:39:48 UTC* -- **PR** `#25191`_: (*basepi*) Add extrndest back to fileclient.is_cached in 2015.5 - @ *2015-07-06T19:35:24Z* + * 20fb8da8d4 Merge pull request `#25919`_ from TheBigBear/patch-4 - - **PR** `#25117`_: (*basepi*) Fix fileclient.is_cached - | refs: `#25191`_ + * c994d22696 Minor update to msi un-installer info -- **PR** `#25175`_: (*rallytime*) Back-port `#25020`_ to 2015.5 - @ *2015-07-06T18:53:19Z* + * **PR** `#25982`_: (`sjorge`_) salt.modules.smartos_* limit to global zone only (refs: `#25905`_) - - **ISSUE** `#25016`_: (*martinhoefling*) salt-run doc.execution fails with AttributeError - - **PR** `#25020`_: (*martinhoefling*) Fix for issue `#25016`_ - | refs: `#25175`_ +* **PR** `#25905`_: (`rallytime`_) Back-port `#25982`_ to 2015.5 + @ *2015-07-30 23:24:19 UTC* -- **PR** `#25173`_: (*rallytime*) Partial back-port of `#25019`_ - @ *2015-07-06T18:52:59Z* + * **PR** `#25892`_: (`TheBigBear`_) Update 7-zip msi un-installer instructions (refs: `#25905`_) - - **ISSUE** `#21879`_: (*bechtoldt*) Reference pages in documentation are outdated again - | refs: `#25019`_ - - **ISSUE** `#19262`_: (*bechtoldt*) salt.pillar.file_tree doesn't appear in the documentation - | refs: `#25019`_ - - **PR** `#25019`_: (*bechtoldt*) add missing module documentation to references - | refs: `#25173`_ - - **PR** `#24421`_: (*bechtoldt*) add missing module documentation - | refs: `#25019`_ - - **PR** `#21880`_: (*bechtoldt*) update references, fixes `#21879`_ - | refs: `#25019`_ - - **PR** `#20039`_: (*bechtoldt*) completing some doc references - | refs: `#25019`_ + * 9a569da4ee Merge pull request `#25905`_ from rallytime/bp-25892 -- **PR** `#25171`_: (*rallytime*) Back-port `#25001`_ to 2015.5 - @ *2015-07-06T18:51:53Z* + * 333fbdde30 Update 7-zip msi un-installer instructions - - **PR** `#25001`_: (*jasonkeene*) Add docs for key arg in ssh_known_hosts.present - | refs: `#25171`_ +* **ISSUE** `#25577`_: (`yellow1912`_) Wrong indentation in document (refs: `#25696`_) -- **PR** `#25170`_: (*rallytime*) Back-port `#24982`_ to 2015.5 - @ *2015-07-06T16:34:43Z* +* **PR** `#25890`_: (`rallytime`_) Back-port `#25698`_ to 2015.5 + @ *2015-07-30 23:12:09 UTC* - - **PR** `#24982`_: (*asyncsrc*) ec2 network_interfaces fix - | refs: `#25170`_ + * **PR** `#25698`_: (`rallytime`_) Back-port `#25659`_ to 2015.8 (refs: `#25890`_) -- **PR** `#25161`_: (*aneeshusa*) Allow checking for non-normalized systemd units. - @ *2015-07-06T15:15:31Z* + * **PR** `#25696`_: (`AkhterAli`_) Update schedule.py -- **PR** `#25151`_: (*jleroy*) Support for IPv6 addresses scopes in network.interfaces - | refs: `#25274`_ `#25433`_ - @ *2015-07-06T14:43:03Z* + * **PR** `#25659`_: (`isbm`_) Bugfix: crash at getting non-existing repo (refs: `#25698`_) -- **PR** `#25166`_: (*cachedout*) Lint `#25149`_ - @ *2015-07-06T14:40:29Z* + * 6a738c5c41 Merge pull request `#25890`_ from rallytime/bp-25696 - - **ISSUE** `#24979`_: (*mavenAtHouzz*) [Discussion] Support for more than 1 netapi.rest_tornado server process - | refs: `#25149`_ - - **PR** `#25149`_: (*jacksontj*) Saltnado multiprocess support - | refs: `#25166`_ + * 7d68e49d98 Update schedule.py -- **PR** `#25149`_: (*jacksontj*) Saltnado multiprocess support - | refs: `#25166`_ - @ *2015-07-06T14:38:43Z* +* **ISSUE** `#25650`_: (`jacksontj`_) state.running documentation is incorrect (refs: `#25894`_) - - **ISSUE** `#24979`_: (*mavenAtHouzz*) [Discussion] Support for more than 1 netapi.rest_tornado server process - | refs: `#25149`_ +* **ISSUE** `#24042`_: (`whiteinge`_) The state_events setting is not documented (refs: `#25894`_) -- **PR** `#25120`_: (*d--j*) add missing continue for exception case - @ *2015-07-02T19:38:45Z* +* **ISSUE** `#23788`_: (`k5jj`_) functions in drac.py module do not match documentation (refs: `#25894`_) -- **PR** `#25117`_: (*basepi*) Fix fileclient.is_cached - | refs: `#25191`_ - @ *2015-07-02T19:38:26Z* +* **ISSUE** `#21296`_: (`Lothiraldan`_) Possible minion enumeration using saltutil.find_job and eauth (refs: `#25894`_) -- **PR** `#25087`_: (*0xf10e*) Fix execution module for glance - now based on 2015.5! - @ *2015-07-02T19:36:27Z* +* **PR** `#25894`_: (`jacobhammons`_) Minor doc bug fixes + @ *2015-07-30 23:02:34 UTC* -- **PR** `#25129`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-07-02T17:37:40Z* + * 8abb21e206 Merge pull request `#25894`_ from jacobhammons/bug-fixes - - **ISSUE** `#18447`_: (*ryan-lane*) Can't install salt with raet using pip -e git - - **PR** `#25093`_: (*jaybocc2*) quick fix for issue `#18447`_ - - **PR** `#25069`_: (*puneetk*) Add a helper module function called list_enabled + * 3f3db4bd8e Additions for `#24042`_ -- **PR** `#25114`_: (*jfindlay*) Revert "Revert "adding states/postgres_database unit test case."" - @ *2015-07-02T01:01:29Z* + * db2129b199 Minor doc bug fixes Refs `#24042`_ Refs `#25650`_ Refs `#21296`_ Refs `#23788`_ - - **PR** `#24798`_: (*jtand*) Revert "adding states/postgres_database unit test case." - | refs: `#25114`_ - - **PR** `#24329`_: (*jayeshka*) adding states/postgres_database unit test case. - | refs: `#24798`_ +* **ISSUE** `#24036`_: (`arthurlogilab`_) [salt-cloud] Protect against passing command line arguments as names for the --destroy command in map files (refs: `#25877`_) -- **PR** `#24362`_: (*jayeshka*) adding states/postgres_user unit test case. - @ *2015-07-01T21:45:31Z* +* **PR** `#25877`_: (`rallytime`_) Protect against passing a map file in addition to VM names with --destroy + @ *2015-07-30 21:55:45 UTC* -- **PR** `#24361`_: (*jayeshka*) adding states/postgres_schema unit test case. - @ *2015-07-01T21:44:56Z* + * 59e1680182 Merge pull request `#25877`_ from rallytime/fix-24036 -- **PR** `#24331`_: (*jayeshka*) adding states/postgres_extension unit test case. - @ *2015-07-01T21:43:58Z* + * 0211972fd7 Whitespace fix + + * c6715e0404 Protect against passing a map file in addition to VM names with --destroy + + * 3aa5045138 Clean up stacktrace when referenced map file doesn't exist + +* **PR** `#25870`_: (`rallytime`_) Back-port `#25824`_ to 2015.5 + @ *2015-07-30 21:54:35 UTC* + + * **PR** `#25824`_: (`klyr`_) Fix get_managed() in file.py module for local files (refs: `#25870`_) + + * c4c9e40be6 Merge pull request `#25870`_ from rallytime/bp-25824 + + * 1fd4837beb Fix get_managed() in file.py module for local files + +* **PR** `#25885`_: (`t0rrant`_) Update Debian changelog + @ *2015-07-30 20:05:59 UTC* + + * af2326af68 Merge pull request `#25885`_ from t0rrant/patch-3 + + * 3f73900c61 Update Debian changelog + +* **ISSUE** `#25478`_: (`zyio`_) salt-ssh - Unable to locate current thin version (refs: `#25862`_) + +* **ISSUE** `#25026`_: (`sylvia-wang`_) salt-ssh "Failure deploying thin" when using salt module functions (refs: `#25862`_) + +* **PR** `#25875`_: (`rallytime`_) Back-port `#25862`_ to 2015.5 + @ *2015-07-30 17:34:02 UTC* + + * **PR** `#25862`_: (`zyio`_) Adding SCP_NOT_FOUND exit code (refs: `#25875`_) + + * 6ce0b3e5b8 Merge pull request `#25875`_ from rallytime/bp-25862 + + * d7f448d501 Needed popen.wait(). + + * 25f8042e41 Checking for scp existance. Using command -v should be POSIX + + * 6b2100a30b New exitcode for SCP not found Re: https://github.com/saltstack/salt/issues/25478 and https://github.com/saltstack/salt/issues/25026 + +* **PR** `#25873`_: (`rallytime`_) Back-port `#25855`_ to 2015.5 + @ *2015-07-30 17:33:55 UTC* + + * **PR** `#25855`_: (`puneetk`_) Patch 3 (refs: `#25873`_) + + * 66dcc5525e Merge pull request `#25873`_ from rallytime/bp-25855 + + * f1f7ce25b7 Update saltmod.py + + * 23a6806008 Update saltmod.py + +* **PR** `#25871`_: (`rallytime`_) Back-port `#25829`_ to 2015.5 + @ *2015-07-30 17:33:43 UTC* + + * **PR** `#25829`_: (`peterdemin`_) Fixed typo in salt.states.saltmod.function doc string (refs: `#25871`_) + + * bf8bd38da7 Merge pull request `#25871`_ from rallytime/bp-25829 + + * a80c47ee10 Fixed typo in salt.states.saltmod.function doc string + +* **ISSUE** `#24002`_: (`csakoda`_) File lock contention on windows minions causing highstate crash (refs: `#25788`_) + +* **PR** `#25869`_: (`rallytime`_) Back-port `#25788`_ to 2015.5 + @ *2015-07-30 17:33:33 UTC* + + * **PR** `#25788`_: (`opdude`_) Catch a hard crash when running highstate on windows (refs: `#25869`_) + + * f26310ff0b Merge pull request `#25869`_ from rallytime/bp-25788 + + * 65b18e3b34 Catch a hard crash when running highstate on windows + +* **ISSUE** `#19532`_: (`stolendog`_) salt-ssh running git clone with not root user (refs: `#25853`_) + +* **PR** `#25853`_: (`davidjb`_) Make ssh-id-wrapper accessible to non-root users + @ *2015-07-30 16:49:47 UTC* + + * 810fbb8bfb Merge pull request `#25853`_ from davidjb/ssh-id-wrapper-non-root + + * 6492bde192 Make ssh-id-wrapper accessible to non-root users + +* **ISSUE** `#25447`_: (`spo0nman`_) SaltMaster is crippled with Minion Re-Authentication (refs: `#25856`_) + +* **PR** `#25856`_: (`jfindlay`_) expand minion reauth scalability documentation + @ *2015-07-30 15:33:17 UTC* + + * b6805b068a Merge pull request `#25856`_ from jfindlay/intro_scale + + * 5921461bb1 style and usage consistency in intro_scale + + * 51dc7cacfb whitespace adjustments in intro_scale + + * 39a82467f1 expand minion reauth scalability documentation + +* **ISSUE** `#25801`_: (`themalkolm`_) Update docs that salt.states.winrepo requires `roles:salt-master` in grains. (refs: `#25840`_) + +* **PR** `#25840`_: (`jfindlay`_) add note to winrepo state docs about required grain + @ *2015-07-30 14:38:27 UTC* + + * 423d528b73 Merge pull request `#25840`_ from jfindlay/winrepo_master + + * b6cfd54f3b add note to winrepo state docs about required grain + +* **ISSUE** `#25827`_: (`0xf10e`_) "Deprecating Code" doesn't mention Usage of warn_until() w/ Release Names (refs: `#25846`_) + +* **PR** `#25846`_: (`jfindlay`_) rework deprecation documentation for release names + @ *2015-07-30 13:26:21 UTC* + + * 754c8be719 Merge pull request `#25846`_ from jfindlay/depr_code + + * d377f42c48 rework deprecation documentation for release names + +* **ISSUE** `#23288`_: (`UtahDave`_) cp.push fails to recreate empty files. (refs: `#25833`_) + +* **PR** `#25833`_: (`jahamn`_) Allows cp.push to recreate empty files + @ *2015-07-29 16:14:48 UTC* + + * d9ab4bb989 Merge pull request `#25833`_ from jahamn/fix-cp.push-not-recreating-empty-files + + * eac19fbf33 Allows cp.push to recreate empty files + +* **ISSUE** `#11474`_: (`JensRantil`_) pkgrepo.managed key_url: salt:// always use `base` env (refs: `#25831`_) + +* **PR** `#25831`_: (`rallytime`_) Add salt:// to key_url options to docs for pkgrepo.managed + @ *2015-07-29 15:38:43 UTC* + + * 6f93d64784 Merge pull request `#25831`_ from rallytime/fix-11474 + + * 067ea788e9 Add salt:// to key_url options to docs for pkgrepo.managed + +* **ISSUE** `#22699`_: (`arthurlogilab`_) salt-cloud fails on KeyError when given a nonexistant action (refs: `#25807`_) + +* **PR** `#25807`_: (`rallytime`_) Provide helpful error when using actions with a mapfile + @ *2015-07-29 15:30:15 UTC* + + * 72b3633383 Merge pull request `#25807`_ from rallytime/fix-22699 + + * 3f3005c746 Use handle_exception function in cloud cli.py + + * f91edf3a33 Provide helpful error when using actions with a mapfile + +* **PR** `#25818`_: (`jfindlay`_) fix autoruns list + @ *2015-07-29 15:29:20 UTC* + + * 71497adc0d Merge pull request `#25818`_ from jfindlay/autoruns_users + + * c2dbb65982 fix autoruns list for modern windowsen + +* **PR** `#25826`_: (`anlutro`_) Check that "onchanges" is a list + @ *2015-07-29 15:00:28 UTC* + + * 98b324c5f8 Merge pull request `#25826`_ from alprs/fix-onchanges_type_check + + * 7992a3f0f4 state.py: check that "onchanges" is a list + +* **ISSUE** `#25258`_: (`nickw8`_) windows minion repo not updating (refs: `#25798`_) + +* **PR** `#25798`_: (`twangboy`_) Fixed stacktrace on package name not found + @ *2015-07-28 22:40:14 UTC* + + * ad07dc1e27 Merge pull request `#25798`_ from twangboy/fix_25258 + + * aa19c2bf8f Fixed stacktrace on package name not found + +* **ISSUE** `#25437`_: (`lorengordon`_) Stacktrace on Windows when running pkg.list_pkgs (refs: `#25598`_, `#25763`_) + +* **PR** `#25797`_: (`twangboy`_) Changed repocache back to cached_repo + @ *2015-07-28 22:39:32 UTC* + + * **PR** `#25763`_: (`twangboy`_) Fix 25437 (refs: `#25797`_) + + * 4a38d4a606 Merge pull request `#25797`_ from twangboy/fix_revert_in_25763 + + * 81d5b5ee55 Changed repocache back to cached_repo + +* **PR** `#25793`_: (`rallytime`_) Back-port `#25730`_ to 2015.5 + @ *2015-07-28 19:37:34 UTC* + + * **PR** `#25730`_: (`sjorge`_) patchelf lives in pkgsrc (refs: `#25793`_) + + * 823f0ce350 Merge pull request `#25793`_ from rallytime/bp-25730 + + * 937779eb51 patchelf lives in pkgsrc + +* **PR** `#25792`_: (`rallytime`_) Back-port `#25688`_ to 2015.5 + @ *2015-07-28 19:37:17 UTC* + + * **PR** `#25688`_: (`bclermont`_) Don't acquire lock if there is no formatter (refs: `#25792`_) + + * 4109ae55f9 Merge pull request `#25792`_ from rallytime/bp-25688 + + * 0aa1416b6b Don't acquire lock if there is no formatter + +* **PR** `#25796`_: (`cachedout`_) Remove debug from docs + @ *2015-07-28 17:35:59 UTC* + + * 737fb1410c Merge pull request `#25796`_ from cachedout/debug_doc + + * 33bfdf3b0b Remove debug from docs + +* **ISSUE** `#24920`_: (`voileux`_) module.zpool.create on character device is not possible by salt (refs: `#25749`_) + +* **PR** `#25749`_: (`jahamn`_) Allow zpool.create on character devices + @ *2015-07-28 16:01:40 UTC* + + * a658753eff Merge pull request `#25749`_ from jahamn/fix-zpool-special-char-device-support + + * 361f6cc23f Allow zpool.create on character devices + +* **PR** `#25685`_: (`twangboy`_) Fixed regex issues with comment and uncomment + @ *2015-07-28 15:29:49 UTC* + + * 1fae76d53c Merge pull request `#25685`_ from twangboy/fix_25594 + + * a904e8329b Fixed another test failure... + + * aa077d3a86 Fixed more tests... justin findlay helped me... + + * 87c8f8dfb5 Fixed some tests... maybe... + + * 3c1a73f16c Fixed some lint + + * b3e44e342c Fixed states to work with comment_line + + * b1cedd1153 Fixed regex issues with comment and uncomment + +* **ISSUE** `#25437`_: (`lorengordon`_) Stacktrace on Windows when running pkg.list_pkgs (refs: `#25598`_, `#25763`_) + +* **PR** `#25763`_: (`twangboy`_) Fix 25437 (refs: `#25797`_) + @ *2015-07-28 15:29:27 UTC* + + * 0bdb29402a Merge pull request `#25763`_ from twangboy/fix_25437 + + * 9e70c800b9 The real fix for 25437 that doesn't break other crap + + * d7347e01e5 Revert "Fixed problem trying to load file with name of boolean type" + + * cf57712eeb Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25437 + +* **PR** `#25752`_: (`thatch45`_) State top saltenv + @ *2015-07-28 01:02:10 UTC* + + * c1236595f9 Merge pull request `#25752`_ from thatch45/state_top_saltenv + + * 65d6ec0659 don't override the minion config unless requested + + * 26c858361c Add state_top_saltenv to the config chain + + * 36a3b674a7 Add raet support for state_top_saltnev + + * f6fa025b13 Add saltenv top file support to salt master_opts + + * 4a1c53309b Add state_top_saltenv support + +* **ISSUE** `#25717`_: (`twangboy`_) Problem with chocolatey module not loading (refs: `#25755`_) + +* **PR** `#25755`_: (`twangboy`_) Fixed problem with dunder functions not being passed + @ *2015-07-27 19:31:22 UTC* + + * f367acb253 Merge pull request `#25755`_ from twangboy/fix_25717 + + * 10e410504d Fixed problem with dunder functions not being passed + +* **ISSUE** `#25352`_: (`m03`_) reg.absent reporting incorrect results (refs: `#25648`_) + +* **PR** `#25648`_: (`twangboy`_) Clarified functionality of reg module, fixed state to work with new module + @ *2015-07-27 19:30:33 UTC* + + * f05ae95f9c Merge pull request `#25648`_ from twangboy/fix_25352 + + * d6496ce814 Merge pull request `#1`_ from jfindlay/reg + + * 3b0cc6592a fix reg unit tests + + * b473fb7827 Fixed some tests... maybe... + + * ff7296d983 Fixed some more lint + + * 7a71f5ea6a Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25352 + + * f57b2b8e7a Fixed some line, added documentation + + * d78fa97a71 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25352 + + * 99d9518af8 Clarified functionality of reg module, fixed state to work with new module + +* **ISSUE** `#25154`_: (`uvsmtid`_) All data mixed on STDOUT together should generate valid JSON output (refs: `#25722`_) + +* **ISSUE** `#25153`_: (`uvsmtid`_) Multiple results should generate valid JSON output (refs: `#25722`_) + +* **PR** `#25740`_: (`rallytime`_) Back-port `#25722`_ to 2015.5 + @ *2015-07-27 16:08:40 UTC* + + * **PR** `#25722`_: (`uvsmtid`_) Minor docs changes to emphasize JSON output problems without `--static` option (refs: `#25740`_) + + * 29c66d85a4 Merge pull request `#25740`_ from rallytime/bp-25722 + + * c33eb813ea Change docs for --static option with JSON - text B + + * 89dd2ec8fb Change docs for --static option with JSON - text A + +* **PR** `#25739`_: (`rallytime`_) Back-port `#25709`_ to 2015.5 + @ *2015-07-27 16:08:27 UTC* + + * **PR** `#25709`_: (`colekowalski`_) add direct-io-mode to mount_invisible_options (refs: `#25739`_) + + * **PR** `#25699`_: (`rallytime`_) Back-port `#25660`_ to 2015.5 (refs: `#25709`_) + + * **PR** `#25660`_: (`colekowalski`_) add glusterfs' direct-io-mode to mount_invisible_keys (refs: `#25699`_, `#25709`_) + + * 135b03e53b Merge pull request `#25739`_ from rallytime/bp-25709 + + * fda2ffa44e add direct-io-mode to mount_invisible_options + +* **PR** `#25738`_: (`rallytime`_) Back-port `#25671`_ to 2015.5 + @ *2015-07-27 16:08:23 UTC* + + * **PR** `#25671`_: (`niq000`_) added a parameter so verifying SSL is now optional instead of hard-coded (refs: `#25738`_) + + * 095a923b6e Merge pull request `#25738`_ from rallytime/bp-25671 + + * 525cd70589 added a parameter so verifying SSL is now optional instead of hard-coded + +* **ISSUE** `#25229`_: (`rmatulat`_) Module git.latest kills target directory when test=True (refs: `#25608`_) + +* **PR** `#25737`_: (`rallytime`_) Back-port `#25608`_ to 2015.5 + @ *2015-07-27 16:08:18 UTC* + + * **PR** `#25608`_: (`rmatulat`_) Fix: prevent git.latest from removing target (refs: `#25737`_) + + * 05fbfe64e9 Merge pull request `#25737`_ from rallytime/bp-25608 + + * df85d734bc Fix: prevent git.latest from removing target Fixes `#25229`_ While force=True and test=True git.latest should not remove the target directory. + +* **PR** `#25733`_: (`davidjb`_) Avoid IndexError when listing mounts if mount output ends in newline + @ *2015-07-27 16:08:05 UTC* + + * 9817fc5556 Merge pull request `#25733`_ from davidjb/mount-fix + + * 6d0bce2418 Test length of comps when listing mounts + +* **ISSUE** `#22460`_: (`onmeac`_) Command setm is not supported (yet) (refs: `#25705`_) + +* **PR** `#25705`_: (`blackduckx`_) Support for setm augeas command. + @ *2015-07-27 16:07:10 UTC* + + * 82ba390b7b Merge pull request `#25705`_ from blackduckx/augeas-setm + + * cad0f2b46e Augeas: fix pylint and documentation + + * ee97896cba Support for setm augeas command. + +* **PR** `#25703`_: (`cachedout`_) Return to `str` for master_type for 2015.5 + @ *2015-07-27 16:06:22 UTC* + + * f732be365d Merge pull request `#25703`_ from cachedout/master_type_2015_5 + + * 0dc28ad3e4 Return to `str` for master_type for 2015.5 + +* **ISSUE** `#25144`_: (`johnccfm`_) user.present on Windows fails to add user to groups if group name contains a space (refs: `#25702`_) + +* **PR** `#25702`_: (`twangboy`_) Fixed win_user module for groups with spaces in the name + @ *2015-07-27 15:06:33 UTC* + + * dea3d31578 Merge pull request `#25702`_ from twangboy/fix_25144 + + * d5be7a2fdf Fixed win_user moduele for groups with spaces in the name + +* **ISSUE** `#25351`_: (`m03`_) win_servermanager.list_installed failing with "IndexError: list index out of range" (refs: `#25711`_) + +* **PR** `#25711`_: (`twangboy`_) Fixed problem with win_servermanager.list_installed + @ *2015-07-27 15:05:48 UTC* + + * 186af9b54d Merge pull request `#25711`_ from twangboy/fix_25351 + + * 82fa911931 Fixed problem with win_servermanager.list_installed + +* **ISSUE** `#25435`_: (`yee379`_) progressbar dependency missing (refs: `#25714`_) + +* **PR** `#25714`_: (`cachedout`_) Display warning when progressbar can't be loaded + @ *2015-07-25 00:10:13 UTC* + + * ad8456eeed Merge pull request `#25714`_ from cachedout/issue_25435 + + * 44f34684ef Included note in help docs + + * 4e2fee17cc Display warning when progressbar can't be loaded + +* **PR** `#25699`_: (`rallytime`_) Back-port `#25660`_ to 2015.5 (refs: `#25709`_) + @ *2015-07-24 22:11:40 UTC* + + * **PR** `#25660`_: (`colekowalski`_) add glusterfs' direct-io-mode to mount_invisible_keys (refs: `#25699`_, `#25709`_) + + * a0969ff74a Merge pull request `#25699`_ from rallytime/bp-25660 + + * 85c636d7a1 add glusterfs' direct-io-mode to mount_invisible_keys + +* **ISSUE** `#25689`_: (`anlutro`_) Minion log in salt-ssh (refs: `#25694`_) + +* **PR** `#25694`_: (`s0undt3ch`_) Salt-SSH fix for `#25689`_ + @ *2015-07-24 21:41:57 UTC* + + * fe829564f4 Merge pull request `#25694`_ from s0undt3ch/2015.5 + + * afba3bde90 Use a relative un-nested path to the salt-call logfile. + + * 6309f22a65 Fix wrong variable assignment + + * c312592c81 Have cookie JAR's respect the configured `cachedir` + +* **ISSUE** `#25250`_: (`wipfs`_) 'force' option in copy state deletes target file (refs: `#25461`_, `#25710`_) + +* **PR** `#25710`_: (`jahamn`_) Integration Testcase for Issue 25250 + @ *2015-07-24 20:57:33 UTC* + + * fb4744b2f8 Merge pull request `#25710`_ from jahamn/integration-test-for-issue-25250 + + * 24f653e963 Integration Test for Issue 25250 + +* **PR** `#25680`_: (`basepi`_) [2015.5] Move cmd.run jinja aliasing to a wrapper class to prevent side effects + @ *2015-07-24 19:52:10 UTC* + + * **PR** `#25049`_: (`terminalmage`_) Fix cmd.run when cross-called in a state/execution module (refs: `#25680`_) + + * 18c9d5454d Merge pull request `#25680`_ from basepi/jinja.alias.25049 + + * e83a0f9b2b Use new-style classes + + * 4a50bac1c2 Fix typo + + * 36410389dc Name the Nitrogen release + + * 77679596f9 Make ALIASES global + + * 01c209efd9 Fix some aliases references + + * 1644641c57 Move cmd.run aliasing to a wrapper class to prevent side effects + +* **PR** `#25682`_: (`basepi`_) [2015.5] Fix parsing args with just a hash (#) + @ *2015-07-24 19:52:01 UTC* + + * 6a5c6dcd04 Merge pull request `#25682`_ from basepi/fix.hash.parsing + + * 8d75c1b882 Fix parsing args with just a hash (#) + +* **PR** `#25695`_: (`stanislavb`_) Configurable AWS region & region from IAM metadata + @ *2015-07-24 19:36:40 UTC* + + * d330ef0d81 Merge pull request `#25695`_ from stanislavb/expose-aws-region-config-and-fetch-region-from-metadata + + * 595da6252e Configurable AWS region & region from IAM metadata + +* **PR** `#25645`_: (`kev009`_) Fix pkgng provider to work with a sources list and the underlying pkg… + @ *2015-07-24 16:33:18 UTC* + + * ea0d295d49 Merge pull request `#25645`_ from kev009/freebsd-pkgng-add + + * ee2cbb574a Fix pkgng provider to work with a sources list and the underlying pkg-add(8) + +* **PR** `#25677`_: (`aneeshusa`_) Fix pacman.list_upgrades when refresh=True. + @ *2015-07-24 16:30:06 UTC* + + * 2cad79c2f0 Merge pull request `#25677`_ from aneeshusa/fix-pacman-list-upgrades-when-refreshing + + * 7062ae4eae Fix pacman.list_upgrades when refresh=True. + +* **ISSUE** `#25674`_: (`UtahDave`_) file.managed with contents parameter uses wrong line endings on Windows (refs: `#25675`_) + +* **PR** `#25675`_: (`UtahDave`_) Use OS line endings with contents on file.managed + @ *2015-07-24 16:29:50 UTC* + + * 18e739b812 Merge pull request `#25675`_ from UtahDave/2015.5local + + * d0f9d001db Use OS line endings with contents on file.managed + +* **PR** `#25676`_: (`basepi`_) Update release candidate docs to 2015.8.0rc2 + @ *2015-07-23 20:29:37 UTC* + + * 7914f51636 Merge pull request `#25676`_ from basepi/2015.8.0rc2releasedocs + + * 882d11836b Update release candidate docs to 2015.8.0rc2 + +* **ISSUE** `#25665`_: (`nmadhok`_) salt-cloud VMware driver fails with KeyErrors if there's any existing machine in the VMware infrastructure in (invalid state) (refs: `#25666`_) + +* **PR** `#25666`_: (`nmadhok`_) Check if the properties exist before looping over them causing KeyError + @ *2015-07-23 17:55:40 UTC* + + * c36b714401 Merge pull request `#25666`_ from nmadhok/vmware-cloud-fix_2015.5 + + * 8e812296ef Check if the properties exist before looping over them causing KeyErrors Fixes `#25665`_ + +* **PR** `#25656`_: (`anlutro`_) Fix locale detection in debian/gentoo + @ *2015-07-23 16:46:40 UTC* + + * 36d04b2954 Merge pull request `#25656`_ from alprs/fix-locale_detection + + * a260236942 change variable name + + * dd2a188c05 fix tests + + * aefd0fb374 code formatting + + * e58d222fb0 fix locale detection in debian/gentoo + +* **PR** `#25661`_: (`rallytime`_) Back-port `#25624`_ to 2015.5 + @ *2015-07-23 16:26:48 UTC* + + * **PR** `#25624`_: (`bobrik`_) Fix typo in get_routes example for debian_ip (refs: `#25661`_) + + * b1c1735aae Merge pull request `#25661`_ from rallytime/bp-25624 + + * 4e1fcfa15e Fix typo in get_routes example for debian_ip + +* **ISSUE** `#15209`_: (`hubez`_) file.manage: source_hash not working with s3:// (2014.7.0rc1) (refs: `#25638`_) + +* **PR** `#25662`_: (`rallytime`_) Back-port `#25638`_ to 2015.5 + @ *2015-07-23 16:26:40 UTC* + + * **PR** `#25638`_: (`TronPaul`_) fix bad merge in 99fc7ec (refs: `#25662`_) + + * 6a2843dee2 Merge pull request `#25662`_ from rallytime/bp-25638 + + * 90d833d5dc fix bad merge 99fc7ec + +* **ISSUE** `#25413`_: (`zizkebab`_) pillar_opts default behavior is not reflected in the docs (refs: `#25644`_) + +* **PR** `#25644`_: (`cachedout`_) pillar doc fix + @ *2015-07-22 22:57:23 UTC* + + * 00f4689fe3 Merge pull request `#25644`_ from cachedout/issue_25413 + + * 8cef61e6cc pillar doc fix + +* **ISSUE** `#25540`_: (`dennisjac`_) salt highstate schedule cannot be removed (refs: `#25642`_) + +* **PR** `#25642`_: (`cachedout`_) Warn on pillar schedule delete + @ *2015-07-22 22:04:12 UTC* + + * aeaeb53ed6 Merge pull request `#25642`_ from cachedout/issue_25540 + + * 74f6b6930c Warn on pillar schedule delete + +* **ISSUE** `#25437`_: (`lorengordon`_) Stacktrace on Windows when running pkg.list_pkgs (refs: `#25598`_, `#25763`_) + +* **PR** `#25598`_: (`twangboy`_) Fixed problem trying to load file with name of boolean type + @ *2015-07-22 17:07:49 UTC* + + * 7b79e433f1 Merge pull request `#25598`_ from twangboy/fix_25437 + + * c53e11d42c Fixed problem trying to load file with name of boolean type + +* **ISSUE** `#25323`_: (`terminalmage`_) unit.modules.tls_test fails with older mock (refs: `#25604`_) + +* **PR** `#25604`_: (`terminalmage`_) Move patching of mock_open to within test + @ *2015-07-22 16:53:55 UTC* + + * f4a38a8aee Merge pull request `#25604`_ from terminalmage/fix-mock_open + + * 123b8ee1cb Fix mock_open patch + + * af82835f42 Move patching of mock_open to within test + +* **ISSUE** `saltstack/salt-bootstrap#630`_: (`jf`_) Ubuntu 12.04 (and maybe 12.x?): apt-get installing python-requests causes digital_ocean_v2 to fail with "[ERROR ] Failed to get the output of 'digital_ocean.avail_sizes()': 'Response' object has no attribute 'text'" (refs: `#25609`_) + + * **PR** `saltstack/salt-bootstrap#627`_: (`nyushi`_) Fix tornado installation on ubuntu (refs: `#25609`_) + +* **PR** `#25609`_: (`s0undt3ch`_) [2015.5] Update the bootstrap script to latest release v2015.07.22 + @ *2015-07-22 16:28:52 UTC* + + * 224484df7e Merge pull request `#25609`_ from s0undt3ch/hotfix/bootstrap-script-2015.5 + + * 96a8568336 Update the bootstrap script to latest release v2015.07.22 + +* **ISSUE** `#21912`_: (`rvora`_) pkg.latest not updating the package on CentOS though yum reports an update available (refs: `#25603`_) + +* **PR** `#25603`_: (`terminalmage`_) Add version_cmp function to yumpkg.py + @ *2015-07-22 15:42:29 UTC* + + * 07eb78c79f Merge pull request `#25603`_ from terminalmage/issue21912 + + * 99e532ba74 Add versionadded directive + + * 8a1765fc6f Add version_cmp function to yumpkg.py + + * 457e72e273 Fix refernces to __salt__['version_cmp'] + + * a19fa2296a Avoid using single-letter variable + +* **ISSUE** `#25560`_: (`dennisjac`_) scheduled highstate runs don't return results to the job cache (refs: `#25590`_) + +* **PR** `#25590`_: (`garethgreenaway`_) 2015.5 scheduled jobs return data + @ *2015-07-21 21:57:42 UTC* + + * 69ef81caba Merge pull request `#25590`_ from garethgreenaway/25560_2015_5_schedule_return_data + + * 19ca0c0b40 Switching default in 2015.5 for whether job data in returned to the mater job_cache. + +* **PR** `#25584`_: (`rallytime`_) Back-port `#24054`_ and `#25576`_ to 2015.5 + @ *2015-07-21 21:16:38 UTC* + + * **PR** `#25576`_: (`pcn`_) s3fs breaks when fetching files from s3 (refs: `#25584`_) + + * **PR** `#24054`_: (`mgwilliams`_) s3.head: return useful data (refs: `#25584`_) + + * 9ffefc867e Merge pull request `#25584`_ from rallytime/bp-24054-and-25576 + + * aa9598e3a5 s3fs breaks when fetching files from s3 + + * 1667d67c3e s3.head: return useful data + +* **ISSUE** `#23626`_: (`mirko`_) salt state 'ssh_known_hosts' doesn't take 'port' into account (refs: `#25589`_) + +* **PR** `#25589`_: (`jahamn`_) Fixes ssh_known_host not taking port into account + @ *2015-07-21 21:15:06 UTC* + + * a966e439d1 Merge pull request `#25589`_ from jahamn/Fix-ssh_known_host-not-taking-port-into-account + + * 8db7ada82d Fixed pylint e8303 errors + + * 6abad29f66 Fixed pylint errors + + * 8ae6ba1290 Merge branch '2015.5' of https://github.com/saltstack/salt into Fix-ssh_known_host-not-taking-port-into-account + +* **PR** `#25573`_: (`EvaSDK`_) Do not execute bootstrap script twice + @ *2015-07-21 18:20:04 UTC* + + * **PR** `#25465`_: (`EvaSDK`_) 2015.5.3 LXC module fixes (refs: `#25573`_) + + * df74f2c3ad Merge pull request `#25573`_ from EvaSDK/2015.5.3-lxc-fixes + + * 49cec9f9a1 Use a more persistent tmp directory + + * 96a672f8e0 Do not execute bootstrap script twice + +* **ISSUE** `#25532`_: (`attiasr`_) salt/modules/win_pkg.py list_pkgs is broken (encoding issues) (refs: `#25580`_, `#25556`_) + +* **PR** `#25580`_: (`attiasr`_) use explicit utf-8 decoding (`#25532`_) + @ *2015-07-21 15:40:49 UTC* + + * 79a809dd79 Merge pull request `#25580`_ from attiasr/patch-1 + + * 4b7dc96919 use explicit utf-8 decoding (`#25532`_) + +* **ISSUE** `#25206`_: (`jfindlay`_) fullname issues with user.add state on windows (refs: `#25568`_) + +* **PR** `#25568`_: (`twangboy`_) Fixed win_useradd module to add fullname + @ *2015-07-21 14:30:25 UTC* + + * 6edf196533 Merge pull request `#25568`_ from twangboy/fix_25206 + + * fbee445c6d Commented out a pylint error + + * 4b56dc3893 Fixed win_useradd module to add fullname + +* **ISSUE** `#21041`_: (`deuscapturus`_) state module gem.installed not working on Windows. (refs: `#25430`_, `#25561`_, `#25428`_) + +* **PR** `#25561`_: (`twangboy`_) Fixed the gem module to work on windows... without injection + @ *2015-07-20 21:12:15 UTC* + + * **PR** `#25428`_: (`twangboy`_) Fixed the gem module to work on windows (refs: `#25561`_) + + * 3c32b0b669 Merge pull request `#25561`_ from twangboy/fix_21041_again + + * aaf3f3dcd0 Fixed some line and style issues + + * e6d0e5cda7 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_21041_again + +* **PR** `#25521`_: (`cachedout`_) Fix outputter for state.orch + @ *2015-07-20 19:30:14 UTC* + + * 9e19142c35 Merge pull request `#25521`_ from cachedout/orch_outputter + + * ea40816621 Try/except + + * dd609eb440 Fix outputter for state.orch + +* **PR** `#25563`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-07-20 19:27:36 UTC* + + * 2117ac8022 Merge pull request `#25563`_ from basepi/merge-forward-2015.5 + + * 3bf2f1a722 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * 09ebaceca8 Merge pull request `#25416`_ from cachedout/str_2014_7 + + * cc514938a8 Fix broken keyword + + * d67491bb80 Removed the logger as it's not used anymore + + * 5008bfee96 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_21041_again + +* **PR** `#25559`_: (`cachedout`_) Lint win_pkg + @ *2015-07-20 17:46:29 UTC* + + * 50c257b1d5 Merge pull request `#25559`_ from cachedout/lint_win_pkg + + * 53a00add99 Lint win_pkg + +* **ISSUE** `#25532`_: (`attiasr`_) salt/modules/win_pkg.py list_pkgs is broken (encoding issues) (refs: `#25580`_, `#25556`_) + +* **PR** `#25556`_: (`attiasr`_) fix for `#25532`_ + @ *2015-07-20 17:45:11 UTC* + + * 7c7015ccda Merge pull request `#25556`_ from attiasr/patch-1 + + * 9b224e8d4e fix for `#25532`_ + +* **ISSUE** `#25538`_: (`stanislavb`_) S3 ext_pillar configuration requires verify_ssl (refs: `#25554`_) + +* **PR** `#25554`_: (`jfindlay`_) verify_ssl=True for s3 ext pillar + @ *2015-07-20 17:43:38 UTC* + + * 3c73dab2ce Merge pull request `#25554`_ from jfindlay/verify_ssl + + * ca3ab4e737 verify_ssl=True for s3 ext pillar + +* **PR** `#25551`_: (`rallytime`_) Backport `#25530`_ to 2015.5 + @ *2015-07-20 17:43:00 UTC* + + * **PR** `#25530`_: (`andre-luiz-dos-santos`_) The variable name must be last (refs: `#25551`_) + + * e3e2e6718e Merge pull request `#25551`_ from rallytime/bp-25530 + + * df5003d7f9 The variable name must be last + +* **PR** `#25533`_: (`attiasr`_) port 445 for windows bootstraping + @ *2015-07-20 15:13:06 UTC* + + * 3e3441937f Merge pull request `#25533`_ from attiasr/patch-2 + + * c7fbf68597 fix windows bootstrapping + +* **ISSUE** `#25432`_: (`gtmanfred`_) [2015.5.3][raet] raet error with SaltRaetRoadStackJoiner (refs: `#25525`_) + +* **PR** `#25525`_: (`gtmanfred`_) add make _prepare an alias for postinitio + @ *2015-07-20 15:12:38 UTC* + + * 7fc051f56d Merge pull request `#25525`_ from gtmanfred/2015.5 + + * 43950a5bc5 add make _prepare an alias for postinitio + +* **ISSUE** `#25511`_: (`rallytime`_) Make provider --> driver change backward compatible (refs: `#25519`_) + +* **ISSUE** `#23574`_: (`CedNantes`_) Failed to Deploy Salt-Minion on a Win 2012 R2 using wmware Cloud Driver from Develop branch (refs: `#25519`_) + +* **PR** `#25519`_: (`rallytime`_) Backport vmware driver to 2015.5 branch + @ *2015-07-20 15:11:26 UTC* + + * 725d1a40d0 Merge pull request `#25519`_ from rallytime/backport_vmware + + * 35e13eef1d Don't reference driver in older salt versions + + * f011890217 Add vmware back-port change to release notes + + * 0f4f560b38 Backport vmware driver to 2015.5 branch + +* **PR** `#25542`_: (`Oro`_) Fix hipchat.send_message when using API v2 + @ *2015-07-20 15:09:13 UTC* + + * 2f0d695bc0 Merge pull request `#25542`_ from Oro/fix-hipchat-v2-sendmessage + + * 3a9f5b037f Fix hipchat.send_message when using API v2 + +* **PR** `#25531`_: (`rallytime`_) Back-port `#25529`_ to 2015.5 + @ *2015-07-18 19:16:10 UTC* + + * **PR** `#25529`_: (`davidjb`_) Fix minor typo in best practice example (refs: `#25531`_) + + * 390aa7d28f Merge pull request `#25531`_ from rallytime/bp-25529 + + * 3e24381439 Fix minor typo in best practice example + +* **PR** `#25528`_: (`davidjb`_) Fix typo in extend declaration doco + @ *2015-07-18 14:22:06 UTC* + + * 6e811bfdd2 Merge pull request `#25528`_ from davidjb/patch-7 + + * bfc4f9fd85 Fix typo in extend declaration doco + +* **ISSUE** `#25486`_: (`whiteinge`_) Highstate outputter not used for state.apply (refs: `#25517`_) + +* **PR** `#25517`_: (`rallytime`_) Back-port `#25486`_ to 2015.5 + @ *2015-07-17 21:49:26 UTC* + + * **PR** `#25485`_: (`attiasr`_) fix file downloads on windows + + * b9abd723a7 Merge pull request `#25517`_ from rallytime/bp-25485 + + * 6c2f3180c2 fix file downloads on windows + +* **ISSUE** `#25479`_: (`alexandrsushko`_) multiple mount.mounted of one device (refs: `#25483`_) + +* **PR** `#25516`_: (`rallytime`_) Back-port `#25483`_ to 2015.5 + @ *2015-07-17 21:49:05 UTC* + + * **PR** `#25483`_: (`alexandrsushko`_) Added 'none' to the set of specialFSes (refs: `#25516`_) + + * 9cb436fbae Merge pull request `#25516`_ from rallytime/bp-25483 + + * e0af6e3478 Added 'none' to the set of specialFSes + +* **ISSUE** `#25493`_: (`blackduckx`_) Issue with job_args on schedule.add command (refs: `#25513`_) + +* **PR** `#25513`_: (`garethgreenaway`_) fixes to schedule.add documentation in 2015.5 + @ *2015-07-17 17:03:24 UTC* + + * daf03efb7c Merge pull request `#25513`_ from garethgreenaway/25493_2015_5_schedule_add_documentation + + * bc2414bc4d Fixing documentation for schedule.add when using the job_args parameter, value needs to be be in quotes for the value to be passed in as an array. + +* **PR** `#25465`_: (`EvaSDK`_) 2015.5.3 LXC module fixes (refs: `#25573`_) + @ *2015-07-17 15:57:54 UTC* + + * 48050cd287 Merge pull request `#25465`_ from EvaSDK/2015.5.3-lxc-fixes + + * 170eb52cc4 Fix use of undefined cmd when install of boostrap script fails + + * 86118f4a7b Install bootstrap script like dns and systemd check scripts in container + + * 978e6d56e2 Error out if configdir could not be created when preparing LXC container + + * 41b6c3c2bf Fix typo in redirecting shell output to /dev/null + + * 456393d4db Fix DNS script cleanup + +* **ISSUE** `saltstack/salt-bootstrap#611`_: (`BretFisher`_) SmartOS doesn't detect missing git, fails install (refs: `#25506`_) + +* **ISSUE** `saltstack/salt-bootstrap#607`_: (`bechtoldt`_) (git install) change source of init scripts for debian based systems (refs: `#25506`_) + +* **ISSUE** `saltstack/salt-bootstrap#602`_: (`rallytime`_) Ubuntu 14.10 Won't Bootstrap with Latest Stable (refs: `#25506`_) + +* **ISSUE** `saltstack/salt-bootstrap#598`_: (`babilen`_) Installation fails on Debian 7 due to missing easy_install (refs: `#25506`_) + +* **ISSUE** `saltstack/salt#25456`_: (`julienlavergne`_) [2015.8.0rc1] salt-bootstrap fails to install salt master (refs: `#25506`_) + +* **ISSUE** `saltstack/salt#25270`_: (`iggy`_) [2015.8.0rc1] salt-bootstrap fails to properly install a minion (refs: `#25506`_) + +* **ISSUE** `#619`_: (`syphernl`_) Only send over changed files during state.highstate (refs: #`saltstack/salt-bootstrap#621`_) + + * **PR** `saltstack/salt-bootstrap#625`_: (`hasues`_) Modify bootstrap-salt.sh unbound error with CONFIG_PROTECT_MASK for Gentoo (refs: `#25506`_) + + * **PR** `saltstack/salt-bootstrap#624`_: (`BretFisher`_) fix config and etc path on SmartOS (refs: `#25506`_) + + * **PR** `saltstack/salt-bootstrap#621`_: (`lomeroe`_) python-jinja2 has been moved to rhui-...server-releases-optional repo… (refs: `#25506`_) + + * **PR** `saltstack/salt-bootstrap#606`_: (`babilen`_) Switch to httpredir.debian.org as default Debian mirror (refs: `#25506`_) + + * **PR** `saltstack/salt-bootstrap#455`_: (`denmat`_) PR: Issue 394 (refs: `#25506`_) + +* **PR** `#25506`_: (`s0undt3ch`_) [2015.5] Update bootstrap script to latest stable release, v2015.07.17 + @ *2015-07-17 15:40:38 UTC* + + * f85f2b49fd Merge pull request `#25506`_ from s0undt3ch/hotfix/bootstrap-script + + * ab6aaa6e60 Update bootstrap script to latest stable release, v2015.07.17 + +* **ISSUE** `#25454`_: (`mschiff`_) Regression: salt 2015.5 not working in secure chroot anymore. (refs: `#25498`_) + +* **PR** `#25498`_: (`jfindlay`_) only read /proc/1/cmdline if it exists + @ *2015-07-17 15:35:33 UTC* + + * c8caf406b2 Merge pull request `#25498`_ from jfindlay/jail_init + + * c63a6c206f only read /proc/1/cmdline if it exists + +* **PR** `#25487`_: (`rallytime`_) Back-port `#25464`_ to 2015.5 + @ *2015-07-16 16:58:36 UTC* + + * **PR** `#25464`_: (`jquast`_) docfix: "cache_jobs: False" => grains_cache: False" (refs: `#25487`_) + + * 3f695a17cf Merge pull request `#25487`_ from rallytime/bp-25464 + + * e947d8ec5a docfix: "cache_jobs: False" => grains_cache: False" + +* **PR** `#25482`_: (`oeuftete`_) Fix docker.running detection of running container + @ *2015-07-16 16:58:29 UTC* + + * 331808eb7d Merge pull request `#25482`_ from oeuftete/docker-running-is-running-fix-2015-5 + + * b69379ba50 Fix docker.running detection of running container + +* **ISSUE** `#25384`_: (`rickh563`_) pyopenssl 0.14 requirement in 2015.5.3 does not work in RHEL6 : ZD-364 (refs: `#25468`_) + +* **PR** `#25468`_: (`joejulian`_) Add support for pyOpenSSL > 0.10 + @ *2015-07-16 15:10:30 UTC* + + * 7a20ecbf46 Merge pull request `#25468`_ from joejulian/use_pyopenssl_0_10 + + * 1b7a56aa38 Add support for pyOpenSSL > 0.10 + +* **PR** `#25467`_: (`rallytime`_) Add lxml dependency to opennebula docs + @ *2015-07-16 15:09:57 UTC* + + * d169905170 Merge pull request `#25467`_ from rallytime/lxml_dep + + * d326f4f686 Add lxml dependency to opennebula docs + +* **ISSUE** `#25250`_: (`wipfs`_) 'force' option in copy state deletes target file (refs: `#25461`_, `#25710`_) + +* **ISSUE** `#24647`_: (`nmadhok`_) salt.states.file.copy does not copy the file if it already exists with force=True (refs: `#25461`_) + +* **PR** `#25461`_: (`jahamn`_) Update file, if force option and content not same + @ *2015-07-15 20:15:07 UTC* + + * 89649456e0 Merge pull request `#25461`_ from jahamn/fixed-file.copy-force-option-deleting-files-without-updating-them + + * 32cf1ebbb5 Update file, if force option and content not same + +* **ISSUE** `#25431`_: (`namcois`_) Digital Ocean v2 reducing API calls by adding per_page (refs: `#25438`_) + +* **PR** `#25438`_: (`rallytime`_) Reduce digital_ocean_v2 API call frequency + @ *2015-07-15 19:40:18 UTC* + + * 146a81b7c3 Merge pull request `#25438`_ from rallytime/do_v2 + + * faf49ea2a3 Add page number change release notes + + * da6ab82837 Reduce digital_ocean_v2 API call frequency + +* **PR** `#25457`_: (`jacksontj`_) Saltnado + @ *2015-07-15 17:50:12 UTC* + + * **PR** `#25427`_: (`tony-cocco`_) Saltnado runner client results in blocking call despite being set-up as Runner.async (refs: `#25457`_) + + * cb98d79cdd Merge pull request `#25457`_ from jacksontj/saltnado + + * bc32f66b98 Add runner_async endpoint to salnado + + * b043fa9b05 Better name of method process manager is starting + +* **PR** `#25459`_: (`jahamn`_) Fixed 'defulats' typo in verify.py + @ *2015-07-15 16:53:06 UTC* + + * 3f72eb5486 Merge pull request `#25459`_ from jahamn/fix-defulats-typo-in-verify.py + + * 9bafd19f67 Fixed 'defulats' typo in verify.py + +* **PR** `#25426`_: (`jquast`_) bugfix: trailing "...done" in rabbitmq output (backport from 'develop' to 2015.5) + @ *2015-07-15 14:48:05 UTC* + + * 73566188cf Merge pull request `#25426`_ from jquast/2015.5 + + * 005a7ca2a3 bugfix: trailing "...done" in rabbitmq output + +* **PR** `#25433`_: (`jleroy`_) Support for IPv6 addresses scopes in network.interfaces (ifconfig) + @ *2015-07-15 14:44:09 UTC* + + * **PR** `#25151`_: (`jleroy`_) Support for IPv6 addresses scopes in network.interfaces (refs: `#25274`_, `#25433`_) + + * cfec990062 Merge pull request `#25433`_ from jleroy/ipv6-scope-support-ifconfig + + * bc36d05c0c Support for IPv6 addresses scopes in network.interfaces (ifconfig) + +* **ISSUE** `#21041`_: (`deuscapturus`_) state module gem.installed not working on Windows. (refs: `#25430`_, `#25561`_, `#25428`_) + +* **PR** `#25430`_: (`twangboy`_) Disabled rbenv execution module for Windows + @ *2015-07-15 14:41:18 UTC* + + * a425230c19 Merge pull request `#25430`_ from twangboy/fix_21041_2 + + * 242fc21765 Disabled rbenv execution module for Windows + + * 8b2dc681f9 Fixed the gem module to work on windows... without injection + + * c7466e7894 Fixes ssh_known_host to take port into account + +* **ISSUE** `#1846`_: (`seanchannel`_) development dependencies + +* **PR** `#25420`_: (`techhat`_) Move S3 to use AWS Signature Version 4 + @ *2015-07-14 22:03:09 UTC* + + * 9313804e27 Merge pull request `#25420`_ from techhat/s3sig4 + + * 3edf3a14e2 Linting + + * c63c2356be Move S3 to use AWS Signature Version 4 + +* **ISSUE** `#20441`_: (`deuscapturus`_) State module file.managed returns an error on Windows and test=Test (refs: `#25418`_) + +* **PR** `#25418`_: (`twangboy`_) Fixed problem with file.managed test=True + @ *2015-07-14 21:26:59 UTC* + + * 30a41d3f51 Merge pull request `#25418`_ from twangboy/fix_20441 + + * d8957856cd Fixed problem with file.managed test=True + +* **PR** `#25417`_: (`ahus1`_) extended documentation about dependencies for dig module + @ *2015-07-14 20:49:51 UTC* + + * 3805677e93 Merge pull request `#25417`_ from ahus1/patch-1 + + * 3cd194ebaf Update dig.py + + * 287f8f76e3 extended documentation about dependencies + +* **PR** `#25411`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-07-14 17:55:26 UTC* + + * 4d929071e1 Merge pull request `#25411`_ from basepi/merge-forward-2015.5 + + * 33d2451fef Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * 2a1dd1113f Merge pull request `#25375`_ from cachedout/config_fix_2014_7 + + * c041f2905f Fix error in config.py for master_type + + * 2590e23d48 Merge pull request `#25324`_ from jacobhammons/doc-theme-updates + + * 88f5fcf58d Latest help theme updates + +* **PR** `#25406`_: (`anlutro`_) Force arguments to aptpkg.version_cmp into strings + @ *2015-07-14 16:15:41 UTC* + + * 81bed62d16 Merge pull request `#25406`_ from alprs/fix-apt_version_cmp_types + + * d56efd1341 force arguments to apt_pkg.version_compare into strings + +* **PR** `#25408`_: (`rallytime`_) Back-port `#25399`_ to 2015.5 + @ *2015-07-14 16:09:06 UTC* + + * **PR** `#25399`_: (`jarpy`_) Demonstrate per-minion client_acl. (refs: `#25408`_) + + * cd9ea63ff2 Merge pull request `#25408`_ from rallytime/bp-25399 + + * da9c0eb673 Typo in client_acl ref doc. + + * 50e0baf270 Demonstrate per-minion client_acl. + +* **PR** `#25240`_: (`tankywoo`_) file make os.walk only be called one + @ *2015-07-14 16:04:49 UTC* + + * ef9f6b0ce0 Merge pull request `#25240`_ from tankywoo/fix-files-os-walk-multiple-times + + * 8044def1c0 file make os.walk only be called one + +* **PR** `#25395`_: (`rallytime`_) Back-port `#25389`_ to 2015.5 + @ *2015-07-14 03:26:34 UTC* + + * **PR** `#25389`_: (`l2ol33rt`_) Adding entropy note for gpg renderer (refs: `#25395`_) + + * d02f388b08 Merge pull request `#25395`_ from rallytime/bp-25389 + + * a086e5ad35 Adding entropy note + +* **PR** `#25392`_: (`rallytime`_) Back-port `#25256`_ to 2015.5 + @ *2015-07-14 03:25:13 UTC* + + * **PR** `#25256`_: (`yanatan16`_) Dont assume source_hash exists (refs: `#25392`_) + + * 008e3295c6 Merge pull request `#25392`_ from rallytime/bp-25256 + + * 6b2da4d582 Dont assume source_hash exists + +* **PR** `#25398`_: (`twangboy`_) Fix date + @ *2015-07-14 03:21:17 UTC* + + * 3f278963ae Merge pull request `#25398`_ from twangboy/fix_date + + * 52824f9602 Added /V1 /Z to remove scheduled task after run + + * a055cca79f Changed date of scheduled task to work in other locales + +* **PR** `#25397`_: (`GideonRed-zz`_) Introduce standard error output when cli exits with non-zero status + @ *2015-07-14 03:20:24 UTC* + + * 978d9f7117 Merge pull request `#25397`_ from GideonRed/2015.5 + + * ea7ab27f31 Introduce standard error output when cli exits with non-zero status + +* **ISSUE** `#24444`_: (`michaelkrupp`_) file.managed does not handle dead symlinks (refs: `#25383`_) + +* **PR** `#25386`_: (`cachedout`_) Lint `#25383`_ + @ *2015-07-13 21:01:10 UTC* + + * **PR** `#25383`_: (`jahamn`_) Fix manage_file function in salt/modules/file.py to handle broken sym… (refs: `#25386`_) + + * 09442abbde Merge pull request `#25386`_ from cachedout/lint_25383 + + * 7694299170 Lint `#25383`_ + +* **ISSUE** `#24444`_: (`michaelkrupp`_) file.managed does not handle dead symlinks (refs: `#25383`_) + +* **PR** `#25383`_: (`jahamn`_) Fix manage_file function in salt/modules/file.py to handle broken sym… (refs: `#25386`_) + @ *2015-07-13 20:58:23 UTC* + + * 47bcc61f55 Merge pull request `#25383`_ from jahamn/Fix-file.managed_not_handling_dead_symlinks + + * ab17aa160e Fix manage_file function in salt/modules/file.py to handle broken symlinks + +* **PR** `#25369`_: (`anlutro`_) Fix aptpkg.version_cmp + @ *2015-07-13 20:18:45 UTC* + + * c9fe10e7aa Merge pull request `#25369`_ from alprs/fix-apt_version_cmp + + * 6391b15b3e fix aptpkg.version_cmp + +* **ISSUE** `#25337`_: (`eliasp`_) `salt-call` from non-existend cwd backtraces (refs: `#25379`_) + +* **PR** `#25379`_: (`jfindlay`_) check for cwd before getting it + @ *2015-07-13 19:50:27 UTC* + + * beb0238392 Merge pull request `#25379`_ from jfindlay/check_wd + + * 6e4547ff38 check for cwd before getting it + +* **ISSUE** `#25320`_: (`podloucky-init`_) zypper module list_upgrades broken (2015.5.2) (refs: `#25334`_) + +* **PR** `#25334`_: (`jfindlay`_) return all cmd info back to zypper fcn + @ *2015-07-13 17:03:29 UTC* + + * 274622ad9b Merge pull request `#25334`_ from jfindlay/fix_zyp + + * c1e633903e return all cmd info back to zypper fcn + +* **PR** `#25339`_: (`jfindlay`_) update orchestration docs + @ *2015-07-13 16:04:26 UTC* + + * 71859c6593 Merge pull request `#25339`_ from jfindlay/orch_doc + + * 0447808d95 clarify, motivate orchestration docs + +* **ISSUE** `#22241`_: (`masterkorp`_) Salt master not properly generating the map (refs: `#25358`_) + +* **PR** `#25358`_: (`dkiser`_) Deep merge of pillar lists (refs: `#26016`_) + @ *2015-07-13 15:51:01 UTC* + + * 90a1ca02a3 Merge pull request `#25358`_ from dkiser/22241_pillar_merge_lists + + * d030e289b3 Deep merge of pillar lists + +* **ISSUE** `#25281`_: (`shinshenjs`_) Unless usage in Official Doc syntax error? (refs: `#25346`_) + +* **PR** `#25346`_: (`bechtoldt`_) set correct indention in states/requisites.rst (docs), fixes `#25281`_ + @ *2015-07-13 15:34:45 UTC* + + * 66c619fd71 Merge pull request `#25346`_ from bechtoldt/issue25281 + + * 8eb2ac1dbe set correct indention in states/requisites.rst (docs), fixes `#25281`_ + +* **PR** `#25336`_: (`terminalmage`_) Don't try to read init binary if it wasn't found + @ *2015-07-13 09:45:30 UTC* + + * b122ed931d Merge pull request `#25336`_ from terminalmage/fix-init-grain + + * f473918a53 Don't try to read init binary if it wasn't found + +* **PR** `#25350`_: (`davidjb`_) Fix documentation for file.blockreplace + @ *2015-07-13 03:41:20 UTC* + + * 1805bafc89 Merge pull request `#25350`_ from davidjb/patch-4 + + * e13a9fd74e Fix documentation for file.blockreplace + +* **ISSUE** `#19288`_: (`oba11`_) AssociatePublicIpAddress doesnt work with salt-cloud 2014.7.0 (refs: `#25326`_, `#20972`_) + +* **PR** `#25326`_: (`rallytime`_) Back-port `#20972`_ to 2015.5 + @ *2015-07-10 18:49:44 UTC* + + * **PR** `#20972`_: (`JohannesEbke`_) Fix interface cleanup when using AssociatePublicIpAddress in `#19288`_ (refs: `#25326`_) + + * b0196fccb7 Merge pull request `#25326`_ from rallytime/bp-20972 + + * 51c941f59d Also fix cleanup of interfaces when using AssociatePublicIpAddress in `#19288`_ + +* **ISSUE** `#24433`_: (`chrimi`_) Salt locale state fails, if locale has not been generated (refs: `#25290`_) + +* **PR** `#25327`_: (`rallytime`_) Back-port `#25290`_ to 2015.5 + @ *2015-07-10 18:49:37 UTC* + + * **PR** `#25290`_: (`pcdummy`_) Simple fix for locale.present on Ubuntu. (refs: `#25327`_) + + * 28450d124e Merge pull request `#25327`_ from rallytime/bp-25290 + + * 20032c55f3 Simple fix for locale.present on Ubuntu. + +* **ISSUE** `#24827`_: (`yermulnik`_) locale.present doesn't generate locales (refs: `#25309`_) + +* **PR** `#25328`_: (`rallytime`_) Back-port `#25309`_ to 2015.5 + @ *2015-07-10 17:22:59 UTC* + + * **PR** `#25309`_: (`davidjb`_) Format /etc/locale.gen correctly in salt.modules.localemod.gen_locale (refs: `#25328`_) + + * 8f666a24f3 Merge pull request `#25328`_ from rallytime/bp-25309 + + * 44d44ec574 Format /etc/locale.gen correctly on gen_locale + +* **PR** `#25322`_: (`jacobhammons`_) version change to 2015.5.3 + @ *2015-07-10 16:11:24 UTC* + + * 0a33a1d8bb Merge pull request `#25322`_ from jacobhammons/release-2015.5.3 + + * 19f88920fa version change to 2015.5.3 + +* **PR** `#25308`_: (`jacksontj`_) Make clear commands trace level logging + @ *2015-07-10 14:20:06 UTC* + + * **PR** `#24737`_: (`jacksontj`_) Move AES command logging to trace (refs: `#25308`_) + + * 2f0f59b6cb Merge pull request `#25308`_ from jacksontj/2015.5 + + * 60fc770ba2 Make clear commands trace level logging + +* **ISSUE** `#24520`_: (`nvx`_) Tomcat module fails to extract version number from snapshot builds (2015.5 regression) (refs: `#24927`_) + +* **PR** `#25269`_: (`jfindlay`_) Extract tomcat war version + @ *2015-07-10 01:28:21 UTC* + + * **PR** `#24927`_: (`egarbi`_) Tomcat module fails to extract version number from snapshot builds #2… (refs: `#25269`_) + + * 9b6646d578 Merge pull request `#25269`_ from jfindlay/tomcat + + * fd4fca172d consolidate tomcat exec and state version extract + + * 59dc833567 update tomcat war_deployed state tests + + * edca458b6c Fixed 2 blank lines around import re + + * 7e528d1050 Tomcat module fails to extract version number from snapshot builds `#24520`_ + +* **ISSUE** `#18808`_: (`amendlik`_) Add command line argument to select pillar environment (refs: `#25238`_) + +* **PR** `#25238`_: (`DmitryKuzmenko`_) Pillarenv backport 2015.5 + @ *2015-07-10 01:25:07 UTC* + + * 0f82ac3e30 Merge pull request `#25238`_ from DSRCompany/pillarenv_backport_2015.5 + + * 98792eb179 Pillarenv support in minion config, cp and cmdmod modules. + + * 88ff576f39 Support pillarenv cmdline in state.sls. Backport of PR `#23719`_ + +* **ISSUE** `#13943`_: (`Supermathie`_) Powershell commands that expect input hang forever (refs: `#25299`_) + +* **PR** `#25299`_: (`twangboy`_) Added -NonInteractive so powershell doesn't hang waiting for input + @ *2015-07-09 21:00:16 UTC* + + * 219d4cad9c Merge pull request `#25299`_ from twangboy/fix_13943 + + * c05889031f Added -NonInteractive so powershell doesn't hang waiting for input + +* **PR** `#25301`_: (`jacobhammons`_) bug fix for module function display in help + @ *2015-07-09 20:46:34 UTC* + + * 1c43892a80 Merge pull request `#25301`_ from jacobhammons/doc-bugs + + * f6561289af bug fix for module function display in help + +* **ISSUE** `#25277`_: (`jacobhammons`_) CherryPy recommended versions (refs: `#25279`_) + +* **PR** `#25279`_: (`jacobhammons`_) Additional docs on external and master job cache, assorted doc fixes + @ *2015-07-09 16:46:26 UTC* + + * 68149bc686 Merge pull request `#25279`_ from jacobhammons/job-cache-docs + + * 57dfa92d5a Fixed typos + + * 2f9e5b9125 Additional docs on external and master job cache, assorted doc fixes Refs `#25277`_ + +* **ISSUE** `#25268`_: (`lichtamberg`_) Salt not working anymore in 2015.8/develop: ValueError: 'scope' is not in list (refs: `#25274`_) + +* **PR** `#25274`_: (`jleroy`_) Fix for issue `#25268`_ + @ *2015-07-09 13:36:26 UTC* + + * **PR** `#25151`_: (`jleroy`_) Support for IPv6 addresses scopes in network.interfaces (refs: `#25274`_, `#25433`_) + + * 972fa2fb54 Merge pull request `#25274`_ from jleroy/25268-fix + + * 2c698d204b Fix for issue `#25268`_ + +* **PR** `#25272`_: (`twangboy`_) Fixed problem with service not starting + @ *2015-07-08 23:29:48 UTC* + + * 8ebb73df2d Merge pull request `#25272`_ from twangboy/service + + * e61eeba48b Fixed problem with service not starting + +* **ISSUE** `#25223`_: (`nmadhok`_) Runner occasionally fails with a RuntimeError when fired by a reactor (refs: `#25225`_) + +* **PR** `#25225`_: (`nmadhok`_) Backporting fix for issue `#25223`_ on 2015.5 branch + @ *2015-07-08 15:16:18 UTC* + + * c6efd2356c Merge pull request `#25225`_ from nmadhok/client-runtime-fix-backport-2015-2 + + * 391b7d6730 Backporting fix for issue `#25223`_ on 2015.2 branch + +* **PR** `#25214`_: (`rallytime`_) A couple of doc fixes for the http tutorial + @ *2015-07-07 22:23:07 UTC* + + * 207fbaeac4 Merge pull request `#25214`_ from rallytime/http_doc + + * d0b61f3fc1 A couple of doc fixes for the http tutorial + +* **ISSUE** `#24272`_: (`rallytime`_) Fix boto_vpc_test moto version check (refs: `#25194`_) + +* **PR** `#25194`_: (`rallytime`_) Update moto version check in boto_vpc_test and update min version + @ *2015-07-07 18:27:32 UTC* + + * 9dd5cd8a8e Merge pull request `#25194`_ from rallytime/fix-24272 + + * f959e165a1 Clean up imports + + * fbc9c0d6bf Fix Pylint + + * fe2561f415 Update moto version check in boto_vpc_test and update min version + +* **PR** `#25205`_: (`basepi`_) Update releasecandidate docs + @ *2015-07-07 15:25:24 UTC* + + * a3e9486c28 Merge pull request `#25205`_ from basepi/releasecandidatedocs + + * 452880d4aa Update releasecandidate docs + +* **PR** `#25187`_: (`UtahDave`_) Doc fixes: Fix misspelling and remove extraneous double spaces + @ *2015-07-07 01:07:04 UTC* + + * fbafd39a46 Merge pull request `#25187`_ from UtahDave/fix_misspelling + + * 65abb63003 remove some extraneous double spaces + + * c423b62aa5 fix misspelling + +* **PR** `#25182`_: (`cachedout`_) Try to re-pack long floats as strs + @ *2015-07-07 01:06:43 UTC* + + * ddee90ce23 Merge pull request `#25182`_ from cachedout/pack_long_floats + + * a192ecfd74 Try to re-pack long ints as strs + +* **ISSUE** `#23822`_: (`sidcarter`_) Zip file extracted permissions are incorrect (refs: `#25128`_) + +* **PR** `#25185`_: (`rallytime`_) Back-port `#25128`_ to 2015.5 + @ *2015-07-07 00:58:00 UTC* + + * **PR** `#25128`_: (`stanislavb`_) Use cmd_unzip to preserve permissions (refs: `#25185`_) + + * df9982b836 Merge pull request `#25185`_ from rallytime/bp-25128 + + * 1726057c8a Use cmd_unzip to preserve permissions + +* **PR** `#25181`_: (`rallytime`_) Back-port `#25102`_ to 2015.5 + @ *2015-07-07 00:57:13 UTC* + + * **PR** `#25102`_: (`derBroBro`_) Update win_network.py (refs: `#25181`_) + + * df0bb8c831 Merge pull request `#25181`_ from rallytime/bp-25102 + + * 64d8f14417 Update win_network.py + + * 6789c5b8e8 Update win_network.py + +* **ISSUE** `#24301`_: (`iggy`_) influxdb_user and influxdb_database states need virtual functions (refs: `#25059`_) + +* **PR** `#25179`_: (`rallytime`_) Back-port `#25059`_ to 2015.5 + @ *2015-07-07 00:56:44 UTC* + + * **PR** `#25059`_: (`babilen`_) Add virtual functions to influxdb state modules (refs: `#25179`_) + + * 04fdd7b0ee Merge pull request `#25179`_ from rallytime/bp-25059 + + * 1eeefbd2ab Add virtual functions to influxdb state modules + +* **ISSUE** `#18919`_: (`giner`_) Windows: pkg.refresh_db returns false-positive success (refs: `#25196`_) + +* **PR** `#25196`_: (`twangboy`_) Fixed `#18919`_ false-positive on pkg.refresh + @ *2015-07-07 00:24:13 UTC* + + * 58b7d0e653 Merge pull request `#25196`_ from twangboy/pkg_refresh + + * 12ffcd1062 Fixed `#18919`_ false-positive on pkg.refresh + +* **PR** `#25180`_: (`rallytime`_) Back-port `#25088`_ to 2015.5 + @ *2015-07-06 20:33:45 UTC* + + * **PR** `#25088`_: (`supertom`_) Update (refs: `#25180`_) + + * 4a406aca45 Merge pull request `#25180`_ from rallytime/bp-25088 + + * 4078c8db25 added message recommending JSON file be used if the libcloud version is >= 0.17.0 + +* **PR** `#25191`_: (`basepi`_) Add extrndest back to fileclient.is_cached in 2015.5 + @ *2015-07-06 19:35:24 UTC* + + * **PR** `#25117`_: (`basepi`_) Fix fileclient.is_cached (refs: `#25191`_) + + * 01ed062ca7 Merge pull request `#25191`_ from basepi/fix.fileclient.is_cached + + * 5fa74f4408 Add back in the extrndest stuff (which is now in develop) + +* **ISSUE** `#25016`_: (`martinhoefling`_) salt-run doc.execution fails with AttributeError (refs: `#25020`_) + +* **PR** `#25175`_: (`rallytime`_) Back-port `#25020`_ to 2015.5 + @ *2015-07-06 18:53:19 UTC* + + * **PR** `#25020`_: (`martinhoefling`_) Fix for issue `#25016`_ (refs: `#25175`_) + + * a9404aea5c Merge pull request `#25175`_ from rallytime/bp-25020 + + * da2e1704ea Fix for issue `#25016`_ + +* **ISSUE** `#21879`_: (`bechtoldt`_) Reference pages in documentation are outdated again (refs: `#25019`_, `#21880`_) + +* **ISSUE** `#19262`_: (`bechtoldt`_) salt.pillar.file_tree doesn't appear in the documentation (refs: `#25019`_) + +* **PR** `#25173`_: (`rallytime`_) Partial back-port of `#25019`_ + @ *2015-07-06 18:52:59 UTC* + + * **PR** `#25019`_: (`bechtoldt`_) add missing module documentation to references (refs: `#25173`_) + + * **PR** `#24421`_: (`bechtoldt`_) add missing module documentation (refs: `#25019`_) + + * **PR** `#21880`_: (`bechtoldt`_) update references, fixes `#21879`_ (refs: `#25019`_) + + * **PR** `#20039`_: (`bechtoldt`_) completing some doc references (refs: `#25019`_) + + * c70fec65b8 Merge pull request `#25173`_ from rallytime/partial-bp-25019 + + * c0c2463b64 Partial backport of `#25019`_ + +* **PR** `#25171`_: (`rallytime`_) Back-port `#25001`_ to 2015.5 + @ *2015-07-06 18:51:53 UTC* + + * **PR** `#25001`_: (`jasonkeene`_) Add docs for key arg in ssh_known_hosts.present (refs: `#25171`_) + + * c5ba9a90ba Merge pull request `#25171`_ from rallytime/bp-25001 + + * a891108793 Add docs for key arg in ssh_known_hosts.present + +* **PR** `#25170`_: (`rallytime`_) Back-port `#24982`_ to 2015.5 + @ *2015-07-06 16:34:43 UTC* + + * **PR** `#24982`_: (`asyncsrc`_) ec2 network_interfaces fix (refs: `#25170`_) + + * 3e06602545 Merge pull request `#25170`_ from rallytime/bp-24982 + + * 3e6eab3ae9 ec2 network_interfaces fix + +* **PR** `#25161`_: (`aneeshusa`_) Allow checking for non-normalized systemd units. + @ *2015-07-06 15:15:31 UTC* + + * 09602808a0 Merge pull request `#25161`_ from aneeshusa/allow-checking-non-normalized-systemd-service-availability + + * b4d544fe70 Allow checking for non-normalized systemd units. + +* **PR** `#25151`_: (`jleroy`_) Support for IPv6 addresses scopes in network.interfaces (refs: `#25274`_, `#25433`_) + @ *2015-07-06 14:43:03 UTC* + + * 3599b8abab Merge pull request `#25151`_ from jleroy/ipv6-scope-support + + * edce034e6c Support for IPv6 addresses scopes in network.interfaces + +* **ISSUE** `#24979`_: (`mavenAtHouzz`_) [Discussion] Support for more than 1 netapi.rest_tornado server process (refs: `#25149`_) + +* **PR** `#25166`_: (`cachedout`_) Lint `#25149`_ + @ *2015-07-06 14:40:29 UTC* + + * **PR** `#25149`_: (`jacksontj`_) Saltnado multiprocess support (refs: `#25166`_) + + * 66d6365a9f Merge pull request `#25166`_ from cachedout/lint_saltnado + + * 2fe167edf8 Lint `#25149`_ + +* **ISSUE** `#24979`_: (`mavenAtHouzz`_) [Discussion] Support for more than 1 netapi.rest_tornado server process (refs: `#25149`_) + +* **PR** `#25149`_: (`jacksontj`_) Saltnado multiprocess support (refs: `#25166`_) + @ *2015-07-06 14:38:43 UTC* + + * 2f1bad1c01 Merge pull request `#25149`_ from jacksontj/saltnado + + * 6aa5548e2d Enable multiprocess support in saltnado + + * 9a1351eada Change print to logger, so we can set a level and log exc_info + +* **PR** `#25120`_: (`d--j`_) add missing continue for exception case + @ *2015-07-02 19:38:45 UTC* + + * a723af0f10 Merge pull request `#25120`_ from d--j/patch-2 + + * 81d5d15dce add missing continue for error case + +* **PR** `#25117`_: (`basepi`_) Fix fileclient.is_cached (refs: `#25191`_) + @ *2015-07-02 19:38:26 UTC* + + * 6e2222241a Merge pull request `#25117`_ from basepi/fix.fileclient.is_cached + + * 38e243fdfb Add fix from merge forward + + * 52f35f761a Add import + + * 23c32a7518 Backport develop version of salt.fileclient.is_cached + +* **PR** `#25087`_: (`0xf10e`_) Fix execution module for glance - now based on 2015.5! + @ *2015-07-02 19:36:27 UTC* + + * c80990ba4f Merge pull request `#25087`_ from 0xf10e/fix_glance_2015.5 + + * 7749cc081c PEP8 W601... + + * bbda079fa5 fix pylint E302, E502, E713, E1305 + + * 3baacc72b4 use Glance API v1 for image_create + + * c3d6134da1 making pylint marginally happier + + * 19a20bf228 get valid properties for image_show() from the schema for "image" + + * 0c6a61173a add some debugging, fix a few AttributeErrors + + * aceca0e20d fix return of glance.image_show() + + * a47509e7dd fix return of image_list + + * 9f923edfab Change confusing "nt_ks" to "g_client" + + * fa2bd1a79c bit of docs/comments in image_create() + + * 5c34d0c494 merge 439b1e42053239b into 2015.5 + + * 7a3cf27948 update attributes for image_show output + + * b1bec0f1a1 fix retry w/ user/pass if token fails + + * 2f4ef6683c update attributes for image_list output + + * eef3bc7048 use _auth() from neutron plus keystoneclient, + +* **PR** `#25129`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-07-02 17:37:40 UTC* + + * 549ee47420 Merge pull request `#25129`_ from basepi/merge-forward-2015.5 + + * 187268d879 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * 36d53ef59e Merge pull request `#25093`_ from jaybocc2/2014.7 + + * c6a501ebda quick fix for issue `#18447`_ + + * 38903a94a1 Merge pull request `#25069`_ from puneetk/patch-1 + + * f0b4e600e6 Update Documentation to clarify version added + + * f8dc6030e7 Pylint updates , removing whitespace + + * 532d315dd1 [Code Review update] renamed function to is_enaled from list_enabled + + * 20b0462289 Update schedule.py + + * 4f1471d7fb Add a helper module function called list_enabled + + * **PR** `saltstack/salt#24798`_: (`justinta`_) Revert "adding states/postgres_database unit test case." (refs: `#25114`_) + + * **PR** `saltstack/salt#24329`_: (`jayeshka`_) adding states/postgres_database unit test case. (refs: #`saltstack/salt#24798`_) + +* **PR** `#25114`_: (`jfindlay`_) Revert "Revert "adding states/postgres_database unit test case."" + @ *2015-07-02 01:01:29 UTC* + + * 86f2791fdb Merge pull request `#25114`_ from saltstack/revert-24798-revert-24329-postgres_database-states-unit-test + + * 071ee44d41 Revert "Revert "adding states/postgres_database unit test case."" + +* **PR** `#24362`_: (`jayeshka`_) adding states/postgres_user unit test case. + @ *2015-07-01 21:45:31 UTC* + + * bf8c7e7a9d Merge pull request `#24362`_ from jayeshka/postgres_user-states-unit-test + + * fd1d834688 adding states/postgres_user unit test case. + +* **PR** `#24361`_: (`jayeshka`_) adding states/postgres_schema unit test case. + @ *2015-07-01 21:44:56 UTC* + + * 4195cea512 Merge pull request `#24361`_ from jayeshka/postgres_schema-states-unit-test + + * 0558b0d744 adding states/postgres_schema unit test case. + +* **PR** `#24331`_: (`jayeshka`_) adding states/postgres_extension unit test case. + @ *2015-07-01 21:43:58 UTC* + + * ada8fe57d4 Merge pull request `#24331`_ from jayeshka/postgres_extension-states-unit-test + + * 3d465a574a adding states/postgres_extension unit test case. -.. _`#1`: https://github.com/saltstack/salt/issues/1 .. _`#11474`: https://github.com/saltstack/salt/issues/11474 .. _`#12255`: https://github.com/saltstack/salt/issues/12255 .. _`#13943`: https://github.com/saltstack/salt/issues/13943 @@ -1350,9 +2467,8 @@ Changes: .. _`#19262`: https://github.com/saltstack/salt/issues/19262 .. _`#19288`: https://github.com/saltstack/salt/issues/19288 .. _`#19532`: https://github.com/saltstack/salt/issues/19532 -.. _`#2`: https://github.com/saltstack/salt/issues/2 +.. _`#1`: https://github.com/saltstack/salt/issues/1 .. _`#20039`: https://github.com/saltstack/salt/pull/20039 -.. _`#2015`: https://github.com/saltstack/salt/pull/2015 .. _`#20441`: https://github.com/saltstack/salt/issues/20441 .. _`#20972`: https://github.com/saltstack/salt/pull/20972 .. _`#21041`: https://github.com/saltstack/salt/issues/21041 @@ -1378,7 +2494,6 @@ Changes: .. _`#24106`: https://github.com/saltstack/salt/issues/24106 .. _`#24272`: https://github.com/saltstack/salt/issues/24272 .. _`#24301`: https://github.com/saltstack/salt/issues/24301 -.. _`#24329`: https://github.com/saltstack/salt/pull/24329 .. _`#24331`: https://github.com/saltstack/salt/pull/24331 .. _`#24361`: https://github.com/saltstack/salt/pull/24361 .. _`#24362`: https://github.com/saltstack/salt/pull/24362 @@ -1391,7 +2506,6 @@ Changes: .. _`#24520`: https://github.com/saltstack/salt/issues/24520 .. _`#24647`: https://github.com/saltstack/salt/issues/24647 .. _`#24737`: https://github.com/saltstack/salt/pull/24737 -.. _`#24798`: https://github.com/saltstack/salt/pull/24798 .. _`#24827`: https://github.com/saltstack/salt/issues/24827 .. _`#24882`: https://github.com/saltstack/salt/issues/24882 .. _`#24920`: https://github.com/saltstack/salt/issues/24920 @@ -1449,7 +2563,6 @@ Changes: .. _`#25258`: https://github.com/saltstack/salt/issues/25258 .. _`#25268`: https://github.com/saltstack/salt/issues/25268 .. _`#25269`: https://github.com/saltstack/salt/pull/25269 -.. _`#25270`: https://github.com/saltstack/salt/issues/25270 .. _`#25272`: https://github.com/saltstack/salt/pull/25272 .. _`#25274`: https://github.com/saltstack/salt/pull/25274 .. _`#25277`: https://github.com/saltstack/salt/issues/25277 @@ -1509,7 +2622,6 @@ Changes: .. _`#25438`: https://github.com/saltstack/salt/pull/25438 .. _`#25447`: https://github.com/saltstack/salt/issues/25447 .. _`#25454`: https://github.com/saltstack/salt/issues/25454 -.. _`#25456`: https://github.com/saltstack/salt/issues/25456 .. _`#25457`: https://github.com/saltstack/salt/pull/25457 .. _`#25459`: https://github.com/saltstack/salt/pull/25459 .. _`#25461`: https://github.com/saltstack/salt/pull/25461 @@ -1682,7 +2794,7 @@ Changes: .. _`#25970`: https://github.com/saltstack/salt/pull/25970 .. _`#25971`: https://github.com/saltstack/salt/pull/25971 .. _`#25976`: https://github.com/saltstack/salt/pull/25976 -.. _`#25982`: https://github.com/saltstack/salt/issues/25982 +.. _`#25982`: https://github.com/saltstack/salt/pull/25982 .. _`#25983`: https://github.com/saltstack/salt/issues/25983 .. _`#25984`: https://github.com/saltstack/salt/pull/25984 .. _`#25990`: https://github.com/saltstack/salt/pull/25990 @@ -1734,7 +2846,6 @@ Changes: .. _`#26147`: https://github.com/saltstack/salt/pull/26147 .. _`#26153`: https://github.com/saltstack/salt/pull/26153 .. _`#26162`: https://github.com/saltstack/salt/issues/26162 -.. _`#26163`: https://github.com/saltstack/salt/pull/26163 .. _`#26168`: https://github.com/saltstack/salt/pull/26168 .. _`#26172`: https://github.com/saltstack/salt/pull/26172 .. _`#26175`: https://github.com/saltstack/salt/pull/26175 @@ -1767,75 +2878,188 @@ Changes: .. _`#26293`: https://github.com/saltstack/salt/pull/26293 .. _`#26296`: https://github.com/saltstack/salt/pull/26296 .. _`#3`: https://github.com/saltstack/salt/issues/3 -.. _`#455`: https://github.com/saltstack/salt/issues/455 -.. _`#598`: https://github.com/saltstack/salt/issues/598 -.. _`#602`: https://github.com/saltstack/salt/pull/602 -.. _`#606`: https://github.com/saltstack/salt/pull/606 -.. _`#607`: https://github.com/saltstack/salt/issues/607 -.. _`#611`: https://github.com/saltstack/salt/issues/611 -.. _`#621`: https://github.com/saltstack/salt/pull/621 -.. _`#624`: https://github.com/saltstack/salt/pull/624 -.. _`#625`: https://github.com/saltstack/salt/issues/625 -.. _`#627`: https://github.com/saltstack/salt/pull/627 -.. _`#630`: https://github.com/saltstack/salt/issues/630 -.. _`#631`: https://github.com/saltstack/salt/issues/631 -.. _`#632`: https://github.com/saltstack/salt/pull/632 -.. _`#633`: https://github.com/saltstack/salt/pull/633 -.. _`#634`: https://github.com/saltstack/salt/issues/634 -.. _`#638`: https://github.com/saltstack/salt/pull/638 -.. _`#640`: https://github.com/saltstack/salt/pull/640 -.. _`bp-20972`: https://github.com/saltstack/salt/pull/20972 -.. _`bp-24054`: https://github.com/saltstack/salt/pull/24054 -.. _`bp-24982`: https://github.com/saltstack/salt/pull/24982 -.. _`bp-25001`: https://github.com/saltstack/salt/pull/25001 -.. _`bp-25019`: https://github.com/saltstack/salt/pull/25019 -.. _`bp-25020`: https://github.com/saltstack/salt/pull/25020 -.. _`bp-25059`: https://github.com/saltstack/salt/pull/25059 -.. _`bp-25088`: https://github.com/saltstack/salt/pull/25088 -.. _`bp-25102`: https://github.com/saltstack/salt/pull/25102 -.. _`bp-25128`: https://github.com/saltstack/salt/pull/25128 -.. _`bp-25256`: https://github.com/saltstack/salt/pull/25256 -.. _`bp-25290`: https://github.com/saltstack/salt/pull/25290 -.. _`bp-25309`: https://github.com/saltstack/salt/pull/25309 -.. _`bp-25389`: https://github.com/saltstack/salt/pull/25389 -.. _`bp-25399`: https://github.com/saltstack/salt/pull/25399 -.. _`bp-25404`: https://github.com/saltstack/salt/pull/25404 -.. _`bp-25464`: https://github.com/saltstack/salt/pull/25464 -.. _`bp-25483`: https://github.com/saltstack/salt/pull/25483 -.. _`bp-25485`: https://github.com/saltstack/salt/pull/25485 -.. _`bp-25529`: https://github.com/saltstack/salt/pull/25529 -.. _`bp-25530`: https://github.com/saltstack/salt/pull/25530 -.. _`bp-25608`: https://github.com/saltstack/salt/pull/25608 -.. _`bp-25624`: https://github.com/saltstack/salt/pull/25624 -.. _`bp-25638`: https://github.com/saltstack/salt/pull/25638 -.. _`bp-25660`: https://github.com/saltstack/salt/pull/25660 -.. _`bp-25671`: https://github.com/saltstack/salt/pull/25671 -.. _`bp-25688`: https://github.com/saltstack/salt/pull/25688 -.. _`bp-25696`: https://github.com/saltstack/salt/pull/25696 -.. _`bp-25709`: https://github.com/saltstack/salt/pull/25709 -.. _`bp-25722`: https://github.com/saltstack/salt/pull/25722 -.. _`bp-25730`: https://github.com/saltstack/salt/pull/25730 -.. _`bp-25788`: https://github.com/saltstack/salt/pull/25788 -.. _`bp-25824`: https://github.com/saltstack/salt/pull/25824 -.. _`bp-25829`: https://github.com/saltstack/salt/pull/25829 -.. _`bp-25855`: https://github.com/saltstack/salt/pull/25855 -.. _`bp-25862`: https://github.com/saltstack/salt/pull/25862 -.. _`bp-25864`: https://github.com/saltstack/salt/pull/25864 -.. _`bp-25892`: https://github.com/saltstack/salt/pull/25892 -.. _`bp-25917`: https://github.com/saltstack/salt/pull/25917 -.. _`bp-25976`: https://github.com/saltstack/salt/pull/25976 -.. _`bp-25984`: https://github.com/saltstack/salt/pull/25984 -.. _`bp-26147`: https://github.com/saltstack/salt/pull/26147 -.. _`bp-26153`: https://github.com/saltstack/salt/pull/26153 -.. _`bp-26237`: https://github.com/saltstack/salt/pull/26237 -.. _`fix-11474`: https://github.com/saltstack/salt/issues/11474 -.. _`fix-2015`: https://github.com/saltstack/salt/pull/2015 -.. _`fix-22699`: https://github.com/saltstack/salt/issues/22699 -.. _`fix-24036`: https://github.com/saltstack/salt/issues/24036 -.. _`fix-24272`: https://github.com/saltstack/salt/issues/24272 -.. _`fix-24483`: https://github.com/saltstack/salt/issues/24483 -.. _`fix-24484`: https://github.com/saltstack/salt/issues/24484 -.. _`fix-24882`: https://github.com/saltstack/salt/issues/24882 -.. _`fix-25192`: https://github.com/saltstack/salt/issues/25192 -.. _`fix-25616`: https://github.com/saltstack/salt/issues/25616 -.. _`fix-26163`: https://github.com/saltstack/salt/pull/26163 +.. _`#613`: https://github.com/saltstack/salt/issues/613 +.. _`#619`: https://github.com/saltstack/salt/issues/619 +.. _`#636`: https://github.com/saltstack/salt/issues/636 +.. _`0xf10e`: https://github.com/0xf10e +.. _`AkhterAli`: https://github.com/AkhterAli +.. _`BretFisher`: https://github.com/BretFisher +.. _`CedNantes`: https://github.com/CedNantes +.. _`DavidJFelix`: https://github.com/DavidJFelix +.. _`Deshke`: https://github.com/Deshke +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`EvaSDK`: https://github.com/EvaSDK +.. _`GideonRed-zz`: https://github.com/GideonRed-zz +.. _`JensRantil`: https://github.com/JensRantil +.. _`JohannesEbke`: https://github.com/JohannesEbke +.. _`JulianGindi`: https://github.com/JulianGindi +.. _`Lothiraldan`: https://github.com/Lothiraldan +.. _`Oro`: https://github.com/Oro +.. _`Supermathie`: https://github.com/Supermathie +.. _`TheBigBear`: https://github.com/TheBigBear +.. _`TronPaul`: https://github.com/TronPaul +.. _`UtahDave`: https://github.com/UtahDave +.. _`ahus1`: https://github.com/ahus1 +.. _`alekti`: https://github.com/alekti +.. _`alexandrsushko`: https://github.com/alexandrsushko +.. _`amendlik`: https://github.com/amendlik +.. _`amontalban`: https://github.com/amontalban +.. _`andre-luiz-dos-santos`: https://github.com/andre-luiz-dos-santos +.. _`aneeshusa`: https://github.com/aneeshusa +.. _`anlutro`: https://github.com/anlutro +.. _`ari`: https://github.com/ari +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`asyncsrc`: https://github.com/asyncsrc +.. _`attiasr`: https://github.com/attiasr +.. _`babilen`: https://github.com/babilen +.. _`bailsman`: https://github.com/bailsman +.. _`basepi`: https://github.com/basepi +.. _`bbinet`: https://github.com/bbinet +.. _`bclermont`: https://github.com/bclermont +.. _`bechtoldt`: https://github.com/bechtoldt +.. _`blackduckx`: https://github.com/blackduckx +.. _`bobrik`: https://github.com/bobrik +.. _`cachedout`: https://github.com/cachedout +.. _`chrimi`: https://github.com/chrimi +.. _`clinta`: https://github.com/clinta +.. _`colekowalski`: https://github.com/colekowalski +.. _`cro`: https://github.com/cro +.. _`csakoda`: https://github.com/csakoda +.. _`d--j`: https://github.com/d--j +.. _`davidjb`: https://github.com/davidjb +.. _`denmat`: https://github.com/denmat +.. _`dennisjac`: https://github.com/dennisjac +.. _`derBroBro`: https://github.com/derBroBro +.. _`deuscapturus`: https://github.com/deuscapturus +.. _`dkiser`: https://github.com/dkiser +.. _`driskell`: https://github.com/driskell +.. _`egarbi`: https://github.com/egarbi +.. _`eliasp`: https://github.com/eliasp +.. _`es1o`: https://github.com/es1o +.. _`fleaflicker`: https://github.com/fleaflicker +.. _`freedba`: https://github.com/freedba +.. _`fullermd`: https://github.com/fullermd +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`giner`: https://github.com/giner +.. _`gmcwhistler`: https://github.com/gmcwhistler +.. _`godlike64`: https://github.com/godlike64 +.. _`grep4linux`: https://github.com/grep4linux +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`hasues`: https://github.com/hasues +.. _`hubez`: https://github.com/hubez +.. _`iggy`: https://github.com/iggy +.. _`isbm`: https://github.com/isbm +.. _`jacksontj`: https://github.com/jacksontj +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jahamn`: https://github.com/jahamn +.. _`jarpy`: https://github.com/jarpy +.. _`jasonkeene`: https://github.com/jasonkeene +.. _`jayeshka`: https://github.com/jayeshka +.. _`jefftucker`: https://github.com/jefftucker +.. _`jf`: https://github.com/jf +.. _`jfindlay`: https://github.com/jfindlay +.. _`jleroy`: https://github.com/jleroy +.. _`jmdcal`: https://github.com/jmdcal +.. _`jodv`: https://github.com/jodv +.. _`joejulian`: https://github.com/joejulian +.. _`johnccfm`: https://github.com/johnccfm +.. _`jpic`: https://github.com/jpic +.. _`jquast`: https://github.com/jquast +.. _`julienlavergne`: https://github.com/julienlavergne +.. _`justinta`: https://github.com/justinta +.. _`k5jj`: https://github.com/k5jj +.. _`kev009`: https://github.com/kev009 +.. _`klyr`: https://github.com/klyr +.. _`l2ol33rt`: https://github.com/l2ol33rt +.. _`lichtamberg`: https://github.com/lichtamberg +.. _`loa`: https://github.com/loa +.. _`lomeroe`: https://github.com/lomeroe +.. _`lorengordon`: https://github.com/lorengordon +.. _`m03`: https://github.com/m03 +.. _`martinhoefling`: https://github.com/martinhoefling +.. _`masterkorp`: https://github.com/masterkorp +.. _`mavenAtHouzz`: https://github.com/mavenAtHouzz +.. _`mgwilliams`: https://github.com/mgwilliams +.. _`michaelkrupp`: https://github.com/michaelkrupp +.. _`mirko`: https://github.com/mirko +.. _`mschiff`: https://github.com/mschiff +.. _`namcois`: https://github.com/namcois +.. _`neilmb`: https://github.com/neilmb +.. _`nicholascapo`: https://github.com/nicholascapo +.. _`nickw8`: https://github.com/nickw8 +.. _`niq000`: https://github.com/niq000 +.. _`nmadhok`: https://github.com/nmadhok +.. _`nvx`: https://github.com/nvx +.. _`nyushi`: https://github.com/nyushi +.. _`o-sleep`: https://github.com/o-sleep +.. _`oba11`: https://github.com/oba11 +.. _`oeuftete`: https://github.com/oeuftete +.. _`onmeac`: https://github.com/onmeac +.. _`opdude`: https://github.com/opdude +.. _`pcdummy`: https://github.com/pcdummy +.. _`pcn`: https://github.com/pcn +.. _`peterdemin`: https://github.com/peterdemin +.. _`pille`: https://github.com/pille +.. _`podloucky-init`: https://github.com/podloucky-init +.. _`puneetk`: https://github.com/puneetk +.. _`rallytime`: https://github.com/rallytime +.. _`rdinoff`: https://github.com/rdinoff +.. _`rickh563`: https://github.com/rickh563 +.. _`rmatulat`: https://github.com/rmatulat +.. _`rvora`: https://github.com/rvora +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack-bot`: https://github.com/saltstack-bot +.. _`saltstack/salt#24329`: https://github.com/saltstack/salt/pull/24329 +.. _`saltstack/salt#24798`: https://github.com/saltstack/salt/pull/24798 +.. _`saltstack/salt#25270`: https://github.com/saltstack/salt/issues/25270 +.. _`saltstack/salt#25456`: https://github.com/saltstack/salt/issues/25456 +.. _`saltstack/salt-bootstrap#455`: https://github.com/saltstack/salt-bootstrap/pull/455 +.. _`saltstack/salt-bootstrap#598`: https://github.com/saltstack/salt-bootstrap/issues/598 +.. _`saltstack/salt-bootstrap#602`: https://github.com/saltstack/salt-bootstrap/issues/602 +.. _`saltstack/salt-bootstrap#606`: https://github.com/saltstack/salt-bootstrap/pull/606 +.. _`saltstack/salt-bootstrap#607`: https://github.com/saltstack/salt-bootstrap/issues/607 +.. _`saltstack/salt-bootstrap#611`: https://github.com/saltstack/salt-bootstrap/issues/611 +.. _`saltstack/salt-bootstrap#621`: https://github.com/saltstack/salt-bootstrap/pull/621 +.. _`saltstack/salt-bootstrap#624`: https://github.com/saltstack/salt-bootstrap/pull/624 +.. _`saltstack/salt-bootstrap#625`: https://github.com/saltstack/salt-bootstrap/pull/625 +.. _`saltstack/salt-bootstrap#627`: https://github.com/saltstack/salt-bootstrap/pull/627 +.. _`saltstack/salt-bootstrap#630`: https://github.com/saltstack/salt-bootstrap/issues/630 +.. _`saltstack/salt-bootstrap#631`: https://github.com/saltstack/salt-bootstrap/issues/631 +.. _`saltstack/salt-bootstrap#632`: https://github.com/saltstack/salt-bootstrap/issues/632 +.. _`saltstack/salt-bootstrap#633`: https://github.com/saltstack/salt-bootstrap/issues/633 +.. _`saltstack/salt-bootstrap#634`: https://github.com/saltstack/salt-bootstrap/pull/634 +.. _`saltstack/salt-bootstrap#638`: https://github.com/saltstack/salt-bootstrap/pull/638 +.. _`saltstack/salt-bootstrap#640`: https://github.com/saltstack/salt-bootstrap/issues/640 +.. _`seanchannel`: https://github.com/seanchannel +.. _`shinshenjs`: https://github.com/shinshenjs +.. _`sidcarter`: https://github.com/sidcarter +.. _`silenius`: https://github.com/silenius +.. _`sjorge`: https://github.com/sjorge +.. _`spo0nman`: https://github.com/spo0nman +.. _`ssgward`: https://github.com/ssgward +.. _`stanislavb`: https://github.com/stanislavb +.. _`steverweber`: https://github.com/steverweber +.. _`stolendog`: https://github.com/stolendog +.. _`supertom`: https://github.com/supertom +.. _`sylvia-wang`: https://github.com/sylvia-wang +.. _`syphernl`: https://github.com/syphernl +.. _`t0rrant`: https://github.com/t0rrant +.. _`tankywoo`: https://github.com/tankywoo +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`themalkolm`: https://github.com/themalkolm +.. _`tony-cocco`: https://github.com/tony-cocco +.. _`twangboy`: https://github.com/twangboy +.. _`uvsmtid`: https://github.com/uvsmtid +.. _`voileux`: https://github.com/voileux +.. _`vr-jack`: https://github.com/vr-jack +.. _`whiteinge`: https://github.com/whiteinge +.. _`wipfs`: https://github.com/wipfs +.. _`wt`: https://github.com/wt +.. _`yanatan16`: https://github.com/yanatan16 +.. _`yee379`: https://github.com/yee379 +.. _`yellow1912`: https://github.com/yellow1912 +.. _`yermulnik`: https://github.com/yermulnik +.. _`zizkebab`: https://github.com/zizkebab +.. _`zyio`: https://github.com/zyio diff --git a/doc/topics/releases/2015.5.5.rst b/doc/topics/releases/2015.5.5.rst index 790c00b13a..939a4c5621 100644 --- a/doc/topics/releases/2015.5.5.rst +++ b/doc/topics/releases/2015.5.5.rst @@ -2,2036 +2,375 @@ Salt 2015.5.5 Release Notes =========================== -Version 2015.5.5 is a bugfix release for :ref:`2015.5.0`. +:release: 2015-08-20 -Changes: +Version 2015.5.5 is a bugfix release for :ref:`2015.5.0 `. -- The ``cron.present`` state now correctly defaults to state ID as identifier. -- When querying for VMs in ``ditigal_ocean_v2.py``, the number of VMs to include in a page was changed from 20 - (default) to 200 to reduce the number of API calls to Digital Ocean. +Statistics +========== -- The ``vmware`` Salt-Cloud driver was back-ported from the develop branch in order for installations of Salt - that are older than 2015.8.0 to be able to use the ``vmware`` driver without stack-tracing on various - deprecation paths that were implemented in the 2015.8.0 release. +- Total Merges: **33** +- Total Issue References: **28** +- Total PR References: **39** -Changes for v2015.5.3..v2015.5.5 --------------------------------- +- Contributors: **20** (`TheBigBear`_, `arthurlogilab`_, `basepi`_, `bastiaanb`_, `cachedout`_, `driskell`_, `garethgreenaway`_, `jacobhammons`_, `jahamn`_, `jfindlay`_, `rallytime`_, `s0undt3ch`_, `scottjpack`_, `silenius`_, `sixninetynine`_, `stanislavb`_, `terminalmage`_, `thusoy`_, `twangboy`_, `vr-jack`_) -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): -*Generated at: 2015-08-20T17:02:37Z* +Changelog for v2015.5.4..v2015.5.5 +================================== -Statistics: +*Generated at: 2018-05-27 22:04:18 UTC* -- Total Merges: **280** -- Total Issue references: **168** -- Total PR references: **371** +* **ISSUE** `#26484`_: (`thusoy`_) Git state leaks HTTPS user/pw to log (refs: `#26486`_) -Changes: +* **ISSUE** `#26482`_: (`thusoy`_) Git states doesn't allow user-only auth (refs: `#26483`_) -- **PR** `#26292`_: (*jquast*) Rabbitmq 3.2.4 on Ubuntu has "...done.", not "...done" - @ *2015-08-13T19:53:29Z* +* **PR** `#26486`_: (`thusoy`_) Git: Don't leak https user/pw to log + @ *2015-08-20 16:04:52 UTC* -- **PR** `#26296`_: (*jquast*) bugfix missing `runas=None' for rabbitmqctl cmds (backport to 2015.5) - @ *2015-08-13T19:52:40Z* + * **PR** `#26483`_: (`thusoy`_) Handle user-only http auth in git module (refs: `#26486`_) -- **PR** `#26293`_: (*jfindlay*) Fix `#26268`_ - @ *2015-08-13T19:48:06Z* + * 28aa9b1058 Merge pull request `#26486`_ from thusoy/git-confidential-auth - - **ISSUE** `#25618`_: (*twangboy*) Fix reg.py to work with the registry properly - | refs: `#26268`_ - - **PR** `#26268`_: (*twangboy*) Multiple improvements to reg executionmod and state mod - | refs: `#26293`_ + * 5289165487 Git: Don't leak https user/pw to log -- **PR** `#26290`_: (*rallytime*) Only call convert_to_arn when action name is provided - @ *2015-08-13T18:48:58Z* +* **ISSUE** `#26432`_: (`centromere`_) Documentation incorrectly references salt-key on the minion (refs: `#26476`_) - - **ISSUE** `#25192`_: (*deuscapturus*) 2015.5.2 boto_cloudwatch_alarm.present not working. - | refs: `#26290`_ +* **ISSUE** `#26403`_: (`adelcast`_) Grains documentation incorrectly states they are static (refs: `#26476`_) -- **PR** `#26288`_: (*bbinet*) allow deleting grains which value is False - @ *2015-08-13T18:24:36Z* +* **ISSUE** `#26329`_: (`cro`_) Add note to eauth docs indicating default PAM service. (refs: `#26476`_) -- **PR** `#26263`_: (*rallytime*) Don't make changes when test=True for openstack present/absent funcs - @ *2015-08-13T16:30:31Z* +* **ISSUE** `#26264`_: (`grep4linux`_) state trees cannot have 'dots' in the name (refs: `#26476`_) - - **ISSUE** `#24882`_: (*nmadhok*) salt.states.openstack_config.present and salt.states.openstack_config.absent make changes when test=True - | refs: `#26263`_ +* **ISSUE** `#26233`_: (`dove-young`_) pip install salt, then start master failed on Fedora 22 (refs: `#26476`_) -- **PR** `#26265`_: (*rallytime*) Don't stacktrace on query return in ec2.create_snapshot - @ *2015-08-13T16:28:48Z* +* **PR** `#26476`_: (`jacobhammons`_) Minor doc bug fixes + @ *2015-08-19 22:52:35 UTC* - - **ISSUE** `#24484`_: (*codehotter*) clouds/ec2.py: create_snapshot throws exception - | refs: `#26265`_ + * 679ba5ee0a Merge pull request `#26476`_ from jacobhammons/doc-bugs -- **PR** `#26285`_: (*stanislavb*) Remove explicit version from instance identity URL - @ *2015-08-13T16:25:32Z* + * 499bd66378 Minor doc bug fixes Refs `#26403`_ Refs `#26432`_ Refs `#26233`_ Refs `#26264`_ Refs `#26329`_ -- **PR** `#26275`_: (*cachedout*) Re-init modules on multi-master reconnect - @ *2015-08-13T15:52:50Z* +* **ISSUE** `#26366`_: (`GreatSnoopy`_) The development tree produces hanging, 100%cpu salt-master processes (refs: `#26443`_) -- **PR** `#26273`_: (*garethgreenaway*) Fixes to schedule module in 2015.5 - @ *2015-08-13T15:34:43Z* +* **ISSUE** `#26301`_: (`waynew`_) CPU pegged out running salt-master (after running command) (refs: `#26443`_) -- **PR** `#26271`_: (*rallytime*) Fix del_root_vol_on_destroy and del_all_vols_on_destroy functionality on ec2 - @ *2015-08-12T23:22:47Z* +* **ISSUE** `#25998`_: (`driskell`_) Event subsystem discarding required events during --batch breaking it for slow running commands (refs: `#26000`_) - - **ISSUE** `#24483`_: (*codehotter*) clouds/ec2.py: del_root_vol_on_destroy and del_all_vols_on_destroy not working - | refs: `#26271`_ +* **PR** `#26443`_: (`cachedout`_) Fix connect issue in event init + @ *2015-08-19 22:50:22 UTC* -- **PR** `#26219`_: (*anlutro*) cron: make identifier default to state ID - @ *2015-08-12T18:42:33Z* + * **PR** `#26000`_: (`driskell`_) Implement full event caching for subscribed tags (refs: `#26443`_) - - **ISSUE** `#25958`_: (*anlutro*) Cron identifier does not default to state ID as documented - | refs: `#26219`_ + * 42b8c1b3f4 Merge pull request `#26443`_ from cachedout/fix_event_sub -- **PR** `#26257`_: (*rallytime*) Back-port `#26237`_ to 2015.5 - @ *2015-08-12T18:40:35Z* + * 560977bc7e Fix connect issue in event init - - **ISSUE** `#26207`_: (*fullermd*) group members setting fails with obscure error message on FreeBSD - | refs: `#26237`_ - - **PR** `#26237`_: (*silenius*) fix issue `#26207`_ - | refs: `#26257`_ +* **ISSUE** `#26343`_: (`jfindlay`_) batch error when no minions match target (refs: `#26445`_) -- **PR** `#26258`_: (*nmadhok*) Fix permission on tests/runtests.py on 2015.5 branch - @ *2015-08-12T18:40:04Z* +* **PR** `#26445`_: (`cachedout`_) Raise clean error when no minions targeted in batch mode + @ *2015-08-19 22:50:07 UTC* -- **PR** `#26261`_: (*nmadhok*) Correct spelling of integration in docs - @ *2015-08-12T18:14:48Z* + * d2df1a86ad Merge pull request `#26445`_ from cachedout/issue_26343 - - **PR** `#2015`_: (*thekuffs*) Esky / bbfreeze support + * 1600f3eccd Raise clean error when no minions targeted in batch mode -- **PR** `#26247`_: (*nmadhok*) Initial commit of unit tests for vmware cloud driver - @ *2015-08-12T16:58:24Z* +* **ISSUE** `#26482`_: (`thusoy`_) Git states doesn't allow user-only auth (refs: `#26483`_) -- **PR** `#26246`_: (*nmadhok*) Backport additions to VMware cloud driver from develop to 2015.5 branch - @ *2015-08-12T15:11:26Z* +* **PR** `#26483`_: (`thusoy`_) Handle user-only http auth in git module (refs: `#26486`_) + @ *2015-08-19 22:47:41 UTC* -- **PR** `#26239`_: (*opdude*) Fixed documentation to match function name - @ *2015-08-12T14:48:52Z* + * a9b28e9577 Merge pull request `#26483`_ from thusoy/git-user-only-auth -- **PR** `#26232`_: (*garethgreenaway*) Fix to trust_key in gpg module for 2015.5. - @ *2015-08-12T04:48:27Z* + * 09fc934acc Handle user-only http auth in git module -- **PR** `#26084`_: (*twangboy*) Added python_shell=True, quoted user input - @ *2015-08-10T21:29:35Z* +* **PR** `#26496`_: (`jfindlay`_) add dateutil dependency reporting + @ *2015-08-19 22:46:31 UTC* - - **ISSUE** `#25802`_: (*jefftucker*) Running module "npm.list" fails on Windows for masterless minion - | refs: `#26084`_ + * edc04930ae Merge pull request `#26496`_ from jfindlay/dateutil -- **PR** `#26183`_: (*cro*) Fix LDAP configuration issue. - @ *2015-08-10T19:09:41Z* + * cbe330e78b add dateutil dependency reporting -- **PR** `#26186`_: (*jacobhammons*) regenerated man pages - @ *2015-08-10T19:07:44Z* +* **PR** `#26494`_: (`cachedout`_) Remove unecessary debug statements + @ *2015-08-19 20:46:00 UTC* -- **PR** `#26182`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-08-10T19:00:10Z* + * 4fff53b842 Merge pull request `#26494`_ from cachedout/remove_debug_statements - - **ISSUE** `#25961`_: (*getabc*) [2015.5.3-2] salt-winrepo.git/salt-minion.sls fails certificate '*.wpengine.com' or 'wpengine.com' - | refs: `#26047`_ - - **ISSUE** `#25751`_: (*basepi*) Document `master_finger` more prominently - | refs: `#26088`_ - - **PR** `#26116`_: (*corux*) file.replace fails if repl string is an invalid regex and append/prepend is used - - **PR** `#26088`_: (*jacobhammons*) Master finger - - **PR** `#26047`_: (*jacobhammons*) Updated windows download links in the docs to https://repo.saltstack.com + * d717a43dcc Remove unecessary debug statements -- **PR** `#26000`_: (*driskell*) Implement full event caching for subscribed tags - @ *2015-08-10T18:57:17Z* +* **PR** `#26465`_: (`rallytime`_) Back-port `#26457`_ to 2015.5 + @ *2015-08-19 16:08:16 UTC* - - **ISSUE** `#25998`_: (*driskell*) Event subsystem discarding required events during --batch breaking it for slow running commands - | refs: `#26000`_ + * **PR** `#26457`_: (`arthurlogilab`_) docstring improvement for network.ping module execution (refs: `#26465`_) -- **PR** `#26175`_: (*rallytime*) Back-port `#26153`_ to 2015.5 - @ *2015-08-10T18:22:32Z* + * f46a0dab5d Merge pull request `#26465`_ from rallytime/bp-26457 - - **PR** `#26153`_: (*loa*) Fix dockerio state documentation typo - | refs: `#26175`_ + * b3f638ff0f docstring improvement for network.ping module execution -- **PR** `#26177`_: (*rallytime*) Back-port `#26147`_ to 2015.5 - @ *2015-08-10T18:22:01Z* +* **PR** `#26434`_: (`s0undt3ch`_) Fix missed typo + @ *2015-08-18 18:14:29 UTC* - - **ISSUE** `#26024`_: (*jpic*) lxc_conf_unset in cloud.profile is ignored - - **PR** `#26147`_: (*martinhoefling*) Fixes `#26024`_ - | refs: `#26177`_ + * c1458980f3 Merge pull request `#26434`_ from s0undt3ch/2015.5 -- **PR** `#26179`_: (*rallytime*) Back-port `#25404`_ to 2015.5 - @ *2015-08-10T18:21:50Z* + * 06dcaefcaa Fix missed typo - - **ISSUE** `#21082`_: (*clinta*) master_type failover does not failover on DNS errors - | refs: `#25404`_ - - **PR** `#25404`_: (*DmitryKuzmenko*) Fixed minion failover to next master on DNS errors. - | refs: `#26179`_ +* **ISSUE** `#26426`_: (`alxbse`_) Private/public IPs are interchanged when listing nova driver cloud nodes (refs: `#26430`_) -- **PR** `#26180`_: (*jfindlay*) fix processing of state.template - @ *2015-08-10T18:21:38Z* +* **PR** `#26430`_: (`rallytime`_) List public and private ips under the correct label + @ *2015-08-18 16:20:32 UTC* - - **ISSUE** `#26112`_: (*wt*) state.template fails with unclear error with template with only an include - | refs: `#26180`_ + * 0f64be710f Merge pull request `#26430`_ from rallytime/fix-26426 -- **PR** `#26172`_: (*nmadhok*) [Backport] Make sure variable is a dictionary before popping something from it. - @ *2015-08-10T16:42:50Z* + * 2ba97316c9 List public and private ips under the correct label - - **ISSUE** `#26162`_: (*nmadhok*) VMware cloud driver create function failing with traceback on latest develop - | refs: `#26163`_ `#26172`_ - - **PR** `#26163`_: (*nmadhok*) Make sure variable is a dictionary before popping something from it. +* **PR** `#26431`_: (`rallytime`_) Back-port `#26417`_ to 2015.5 + @ *2015-08-18 15:41:58 UTC* -- **PR** `#26168`_: (*cachedout*) Fix slack docs - @ *2015-08-10T14:57:18Z* + * **PR** `#26417`_: (`scottjpack`_) Changed t1 -> t2 micro (refs: `#26431`_) - - **ISSUE** `#26098`_: (*rdinoff*) SALT.STATES.SLACK Doc update - | refs: `#26168`_ + * 913451a414 Merge pull request `#26431`_ from rallytime/bp-26417 -- **PR** `#26127`_: (*garethgreenaway*) Fixes to salt.utils.http related to cp.get_file_str bug. - @ *2015-08-10T14:38:25Z* + * 0254a2e90e Changed t1 -> t2 micro - - **ISSUE** `#24106`_: (*nvx*) fileclient.py#get_url ignores HTTP Auth again (2015.5 regression) - | refs: `#26127`_ +* **PR** `#26378`_: (`stanislavb`_) Fix EC2 credentials from IAM roles for s3fs and s3 ext_pillar in 2015.5 + @ *2015-08-18 14:01:53 UTC* -- **PR** `#26140`_: (*nmadhok*) VMware cloud driver fixes - @ *2015-08-10T13:15:58Z* + * 952da7abaf Merge pull request `#26378`_ from stanislavb/2015.5 - - **ISSUE** `#26141`_: (*nmadhok*) salt-cloud VMware driver fails with error in parsing configuration file - | refs: `#26140`_ - - **ISSUE** `#25809`_: (*o-sleep*) vmware cloud module error message - | refs: `#26140`_ - - **ISSUE** `#25625`_: (*steverweber*) cloud vmware driver does not provide mac_address unless vmware tools is running - | refs: `#26137`_ `#26140`_ + * 39ce3127cd Let utils.aws query instance metadata -- **PR** `#26137`_: (*steverweber*) use device mac address if vmtools not active - @ *2015-08-09T03:05:36Z* +* **ISSUE** `#26245`_: (`bradthurber`_) salt v2015.5.3 gitfs.py using newer pygit2 feature than required minimum (refs: `#26420`_) - - **ISSUE** `#25625`_: (*steverweber*) cloud vmware driver does not provide mac_address unless vmware tools is running - | refs: `#26137`_ `#26140`_ +* **PR** `#26420`_: (`terminalmage`_) Only use pygit2.errors if it exists (2015.5 branch) + @ *2015-08-18 14:00:01 UTC* -- **PR** `#26119`_: (*jodv*) Backport eauth bugfix to 2015.5 - @ *2015-08-09T02:19:52Z* + * 09e96dce39 Merge pull request `#26420`_ from terminalmage/issue26245-2015.5 -- **PR** `#26135`_: (*cro*) Fix proxy minions in 2015.5 and significantly update documentation. - @ *2015-08-09T02:19:21Z* + * 19a1149067 Only use pygit2.errors if it exists (2015.5 branch) -- **PR** `#26132`_: (*TheBigBear*) minor edit - @ *2015-08-08T21:05:34Z* +* **PR** `#26409`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-08-17 23:19:56 UTC* -- **PR** `#26133`_: (*amontalban*) Fixed `#25915`_ in salt/modules/pkgng.py and salt/states/pkg.py - @ *2015-08-08T21:05:05Z* + * c5eb6bbd3e Merge pull request `#26409`_ from basepi/merge-forward-2015.5 - - **ISSUE** `#25915`_: (*ari*) FreeBSD pkg install fails + * dafed10a9e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#26111`_: (*anlutro*) Better error messages when virtualenv creation fails - @ *2015-08-07T21:42:09Z* + * da8bca09aa Merge pull request `#26242`_ from cro/anonldap4 -- **PR** `#26110`_: (*jfindlay*) check for sources before adding them to cmd str - @ *2015-08-07T21:33:23Z* + * a0d2ab1eed Remove dead code - - **ISSUE** `#26093`_: (*freedba*) archive.tar bug - | refs: `#26110`_ + * 1ecf23773e Merge pull request `#26216`_ from cro/anonldap3 -- **PR** `#26106`_: (*vr-jack*) Update __init__.py - @ *2015-08-07T21:15:55Z* + * af132d7b89 Documentation update for anonymous bind issue. -- **PR** `#26101`_: (*rallytime*) Back-port `#25984`_ to 2015.5 - @ *2015-08-07T18:56:26Z* + * 2ef54b6b13 Documentation update for anonymous bind issue. - - **ISSUE** `#25983`_: (*jmdcal*) Trying to get md5 of local zip - | refs: `#25984`_ - - **PR** `#25984`_: (*jmdcal*) Support local files without md5sum - | refs: `#26101`_ + * 5b1836bb00 Fix issue with LDAP anonymous binds. -- **PR** `#26080`_: (*techhat*) Fix string checking in s3fs - @ *2015-08-06T23:36:09Z* +* **ISSUE** `#26404`_: (`ssgward`_) Syntax error in lvm.vg_absent state causing failure (refs: `#26406`_) -- **PR** `#26079`_: (*cachedout*) Update docs to remove state.over - @ *2015-08-06T23:35:26Z* +* **PR** `#26406`_: (`jfindlay`_) fix syntax error in lvm exec module + @ *2015-08-17 21:18:25 UTC* - - **ISSUE** `#26039`_: (*basepi*) Update scheduler docs to use orchestrate instead of overstate - | refs: `#26079`_ + * 741ca6b4db Merge pull request `#26406`_ from jfindlay/lvm -- **PR** `#26058`_: (*opdude*) Fix choco version on chocolatey versions below 0.9.9 - @ *2015-08-06T18:50:10Z* + * 81d351ff8f fix syntax error in lvm exec module -- **PR** `#26068`_: (*jfindlay*) fix autoruns.list looking in wrong directory - @ *2015-08-06T18:49:48Z* +* **PR** `#26405`_: (`TheBigBear`_) dependency zip files moved to new site + @ *2015-08-17 21:17:24 UTC* -- **PR** `#26065`_: (*s0undt3ch*) [2015.5] Update to latest bootstrap stable release v2015.06.08 - @ *2015-08-06T17:09:35Z* + * a7e2d30e2a Merge pull request `#26405`_ from TheBigBear/patch-8 - - **ISSUE** `#634`_: (*loupgaroublond*) /srv/salt/_grains/ not documented - | refs: `#26065`_ - - **ISSUE** `#631`_: (*fatbox*) Can't extend the same item multiple times - | refs: `#26065`_ - - **ISSUE** `#625`_: (*whiteinge*) `cmd.run` state `user` flag is not working - | refs: `#25506`_ `#632`_ - - **PR** `#640`_: (*terminalmage*) fix syntax errors introduced in 0f776c13 - | refs: `#26065`_ - - **PR** `#638`_: (*blast-hardcheese*) Tightened up configuration documentation - | refs: `#26065`_ - - **PR** `#633`_: (*epoelke*) Bug fix to salt-key - | refs: `#26065`_ - - **PR** `#632`_: (*whiteinge*) Change the ``cmd.run`` state to use the new ``runas`` arg - | refs: `#26065`_ + * 8898d64918 dependency zip files moved to new site -- **PR** `#26061`_: (*gmcwhistler*) Patch for issue `#25994`_ - @ *2015-08-06T17:07:34Z* +* **PR** `#26298`_: (`vr-jack`_) Keep $HOME from being interpretted by Master shell + @ *2015-08-17 21:15:11 UTC* - - **ISSUE** `#25994`_: (*gmcwhistler*) module.ilo tempfile creation in __execute_cmd results in TypeError: cannot concatenate 'str' and 'int' objects + * cf0523a12e Merge pull request `#26298`_ from vr-jack/2015.5 -- **PR** `#26064`_: (*s0undt3ch*) Don't stacktrace when trying to get the default locale. - @ *2015-08-06T16:11:05Z* + * 1fd6fc6ce3 Keep $HOME from being interpretted by Master shell - - **ISSUE** `#26063`_: (*saltstack-bot*) not working with salt-cloud shows unknown locale error - | refs: `#26064`_ +* **PR** `#26324`_: (`s0undt3ch`_) Salt is now pip install'able in windows + @ *2015-08-17 20:41:34 UTC* -- **PR** `#26048`_: (*jacobhammons*) Updated windows download links in the docs to https://repo.saltstack.com - @ *2015-08-05T22:59:50Z* + * c0811d3302 Merge pull request `#26324`_ from s0undt3ch/2015.5 -- **PR** `#26044`_: (*rallytime*) Make sure the key we're comparing is also lowercase - @ *2015-08-05T19:23:54Z* + * e7cb3be2a0 Document the added options - - **ISSUE** `#25616`_: (*rallytime*) [2015.5] Provisioning Linodes Stacktraces - | refs: `#26044`_ + * 92af1c9572 Fix argument name -- **PR** `#26042`_: (*jfindlay*) fix test mode logic in state docs - @ *2015-08-05T19:23:07Z* + * 72d2fdb512 Add `pypiwin32 >= 219` as a windows install requires. -- **PR** `#26036`_: (*nicholascapo*) survey.hash: Remove manually printed text - @ *2015-08-05T19:21:59Z* + * b1105fc706 Allow mimicking the install setup command for develop/editable installations. - - **ISSUE** `#24460`_: (*nicholascapo*) Survey runner does not follow `--out` flag - | refs: `#26036`_ + * 26246a72ee Allow writing Salt's _version.py when installing in develop mode. -- **PR** `#26030`_: (*opdude*) Fix a bug in choco version that returned odd data - @ *2015-08-05T16:30:25Z* + * 71928f2194 Prefer HTTPS, fix url argument -- **PR** `#26032`_: (*jfindlay*) add test logic to state reult doc - @ *2015-08-05T16:28:32Z* + * 7b25430cc7 Download the necessary DLLs for windows -- **PR** `#26031`_: (*alekti*) Revert "Add file as supported protocol for file source_hash. Fixes `#23764`_" - @ *2015-08-05T15:32:01Z* + * 86692a92cd Install PyCrypto from a wheel in repo.saltstack.com under Windows - - **ISSUE** `#23764`_: (*es1o*) source_hash from local file is not supported. - | refs: `#25750`_ + * 915da594c2 Skip M2Crypto in Windows. -- **PR** `#26021`_: (*anlutro*) Documentation: Specify versionadded for git.present shared argument - @ *2015-08-05T14:17:38Z* + * 1ea426e299 Move code to properly handle default requirements. -- **PR** `#26020`_: (*alekti*) Correctly resolve conflict merging pull 25750 to 2015.5 - @ *2015-08-05T14:16:58Z* + * 8fda8c0db3 M2CryptoWin{32,64} should only be installed on Salt < 2015.8.0 - - **ISSUE** `#23764`_: (*es1o*) source_hash from local file is not supported. - | refs: `#25750`_ - - **PR** `#25750`_: (*alekti*) Add file as supported protocol for file source_hash. Fixes `#25701`_. - | refs: `#26020`_ + * 0ff2f19aee Override the develop command in cmdclass -- **PR** `#26016`_: (*basepi*) Revert "Deep merge of pillar lists" - @ *2015-08-05T04:59:52Z* + * a5aa752a85 Override the develop command when WITH_SETUPTOOLS is set - - **ISSUE** `#22241`_: (*masterkorp*) Salt master not properly generating the map - | refs: `#25358`_ - - **PR** `#25358`_: (*dkiser*) Deep merge of pillar lists - | refs: `#26016`_ + * 4d6841c761 Install M2CryptoWin{32,64} while installing Salt -- **PR** `#25992`_: (*twangboy*) Refactor win_system.py - @ *2015-08-05T04:54:18Z* +* **ISSUE** `#26161`_: (`bastiaanb`_) salt initscripts do not set lock file in /var/lock/subsys as required on RedHat family OSes (refs: `#26371`_) - - **ISSUE** `#12255`_: (*eliasp*) 'system.set_computer_desc' fails with non-ASCII chars - | refs: `#25992`_ - - **ISSUE** `#3`_: (*thatch45*) libvirt module +* **PR** `#26371`_: (`bastiaanb`_) fix issue `#26161`_: on RedHat family systems touch /var/lock/subsys/$SE… + @ *2015-08-17 20:39:28 UTC* -- **PR** `#26002`_: (*twangboy*) Fixed regex to account for comment character followed by whitespace - @ *2015-08-04T22:28:11Z* + * 87151736c5 Merge pull request `#26371`_ from bastiaanb/fix/issue-26161-salt-initscripts-dont-set-lockfile - - **ISSUE** `#25948`_: (*twangboy*) Fix uncomment function to handle spaces - | refs: `#26002`_ + * ec8d4b0470 test wether RETVAL is 0 with -eq rather than =. -- **PR** `#25970`_: (*jfindlay*) accept addition of layman overlay - @ *2015-08-04T15:42:28Z* + * a83a5de41e fix issue `#26161`_: on RedHat family systems touch /var/lock/subsys/$SERVICE to ensure the daemon will be stopped on shutdown. - - **ISSUE** `#25949`_: (*godlike64*) layman.add does not work with unofficial overlays - | refs: `#25970`_ +* **ISSUE** `#25801`_: (`themalkolm`_) Update docs that salt.states.winrepo requires `roles:salt-master` in grains. (refs: `#26328`_) -- **PR** `#25971`_: (*basepi*) [2015.5] salt.modules.reg Add spaces for strings split across multiple lines - @ *2015-08-04T15:39:48Z* +* **ISSUE** `#25562`_: (`jefftucker`_) winrepo state does not run on masterless minion (refs: `#26328`_) -- **PR** `#25990`_: (*rallytime*) Back-port `#25976`_ to 2015.5 - @ *2015-08-04T14:36:53Z* +* **PR** `#26402`_: (`twangboy`_) Removed documentation no longer required + @ *2015-08-17 20:35:37 UTC* - - **PR** `#25976`_: (*fleaflicker*) Typo in help output - | refs: `#25990`_ + * **PR** `#26328`_: (`twangboy`_) Removed salt-master role requirement (refs: `#26402`_) -- **PR** `#25996`_: (*attiasr*) fix msiexec package remove - @ *2015-08-04T14:36:31Z* + * 89602f56ad Merge pull request `#26402`_ from twangboy/fix_26328 -- **PR** `#25966`_: (*rallytime*) Back-port `#25864`_ to 2015.5 - @ *2015-08-03T18:48:26Z* + * ad5fa03b76 Removed documentation no longer required - - **ISSUE** `#25863`_: (*peterdemin*) pkg.installed fails on already installed package if it is in versionlock.list - | refs: `#25864`_ - - **PR** `#25864`_: (*peterdemin*) `#25863`_ state.pkg.installed fix - | refs: `#25966`_ +* **PR** `#26392`_: (`rallytime`_) Back-port `#26376`_ to 2015.5 + @ *2015-08-17 19:39:51 UTC* -- **PR** `#25967`_: (*rallytime*) Back-port `#25917`_ to 2015.5 - @ *2015-08-03T18:48:02Z* + * **PR** `#26376`_: (`TheBigBear`_) minor edit spelling (refs: `#26392`_) - - **PR** `#25917`_: (*jmdcal*) adding missing format string - | refs: `#25967`_ + * eb373e5904 Merge pull request `#26392`_ from rallytime/bp-26376 -- **PR** `#25895`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-08-03T17:12:37Z* + * a013bb5b3d minor edit - - **ISSUE** `#23764`_: (*es1o*) source_hash from local file is not supported. - | refs: `#25750`_ - - **PR** `#25750`_: (*alekti*) Add file as supported protocol for file source_hash. Fixes `#25701`_. - | refs: `#26020`_ - - **PR** `#25704`_: (*cachedout*) Ensure prior alignment with master_type in 2014.7 - - **PR** `#25657`_: (*MrCitron*) Add the ability to specify a base pattern for carbon returner - - **PR** `#25633`_: (*AkhterAli*) Update loader.py +* **ISSUE** `#16049`_: (`ryan-lane`_) boto_elb.present state requires attributes argument (refs: `#26342`_) -- **PR** `#25941`_: (*jfindlay*) add timelib to dependency versions - @ *2015-08-03T12:23:42Z* +* **PR** `#26342`_: (`rallytime`_) Don't call boto_elb._attributes_present if no attributes were provided + @ *2015-08-17 19:19:08 UTC* - - **ISSUE** `#25850`_: (*ssgward*) Need to add packages to --versions-report - | refs: `#25941`_ + * 8bb57d1631 Merge pull request `#26342`_ from rallytime/fix-16049 -- **PR** `#25951`_: (*garethgreenaway*) Log when event.fire and event.fire_master fail. - @ *2015-08-03T00:19:45Z* + * 211f6feaf5 Fix test failures - get_attributes shouldn't be called if none are provided -- **PR** `#25942`_: (*jfindlay*) typo in minion doc - @ *2015-07-31T23:34:55Z* + * d8ad023e88 Don't call boto_elb._attributes_present if no attributes were provided - - **ISSUE** `#25838`_: (*grep4linux*) docs disable_modules documentation typo - | refs: `#25942`_ +* **ISSUE** `#26155`_: (`silenius`_) pip availability in states/pip_state (refs: `#26160`_) -- **PR** `#25938`_: (*jacobhammons*) Doc on using syndic with multimaster - @ *2015-07-31T23:05:05Z* +* **PR** `#26389`_: (`rallytime`_) Back-port `#26160`_ to 2015.5 + @ *2015-08-17 19:09:16 UTC* - - **PR** `#14690`_: (*jacksontj*) Multi syndic - | refs: `#25938`_ + * **PR** `#26160`_: (`silenius`_) proposed fix for `#26155`_ (refs: `#26389`_) -- **PR** `#25848`_: (*twangboy*) Added allusers="1" when installing msi - @ *2015-07-31T20:33:17Z* + * 2fd1e06343 Merge pull request `#26389`_ from rallytime/bp-26160 - - **ISSUE** `#25839`_: (*twangboy*) ALLUSERS="1" should be a default when installing MSI's - | refs: `#25848`_ + * f0bc3765d9 No logging should happen on __virtual__ -- **PR** `#25898`_: (*jfindlay*) clarify and expand syndic docs - @ *2015-07-31T20:01:23Z* + * ca406eaf3c proposed fix for `#26155`_ -- **PR** `#25927`_: (*jacksontj*) Pass actual renderers to the Reactor's Compiler - @ *2015-07-31T20:00:17Z* +* **ISSUE** `#26266`_: (`o-sleep`_) limit pw_user.getent() from returning entire corporate list (refs: `#26300`_) - - **ISSUE** `#25852`_: (*UtahDave*) Salt loader is not loading Salt vars in reactor python renderer - | refs: `#25927`_ +* **PR** `#26300`_: (`jfindlay`_) mock pwd function calls in pw_user exec module + @ *2015-08-17 18:56:41 UTC* -- **PR** `#25921`_: (*cachedout*) Handle non-ascii in state log - @ *2015-07-31T17:41:30Z* + * 0046c6cfed Merge pull request `#26300`_ from jfindlay/pw_test - - **ISSUE** `#25810`_: (*nvx*) winpkg highstate fails when a new package name contains a unicide character - | refs: `#25921`_ + * 7e94989403 mock pwd calls in pw_user exec mod test -- **PR** `#25919`_: (*TheBigBear*) Minor update to msi un-installer info - @ *2015-07-31T17:39:48Z* + * 26f5b466f5 check for pwd on linux and BSD user exec mods -- **PR** `#25905`_: (*rallytime*) Back-port `#25982`_ to 2015.5 - @ *2015-07-30T23:24:19Z* +* **ISSUE** `#24334`_: (`afletch`_) autosign_timeout not honoured (refs: `#26386`_) - - **PR** `#25892`_: (*TheBigBear*) Update 7-zip msi un-installer instructions - | refs: `#25905`_ +* **PR** `#26386`_: (`jahamn`_) Fixes autosign_timeout usage in check_autosign_dir + @ *2015-08-17 18:34:40 UTC* -- **PR** `#25890`_: (*rallytime*) Back-port `#25698`_ to 2015.5 - @ *2015-07-30T23:12:09Z* + * 709499438b Merge pull request `#26386`_ from jahamn/fix-autosign_timeout - - **ISSUE** `#25577`_: (*yellow1912*) Wrong indentation in document - | refs: `#25696`_ - - **PR** `#25698`_: (*rallytime*) Back-port `#25659`_ to 2015.8 - | refs: `#25890`_ - - **PR** `#25696`_: (*AkhterAli*) Update schedule.py - - **PR** `#25659`_: (*isbm*) Bugfix: crash at getting non-existing repo - | refs: `#25698`_ + * b2fa2ac9d3 Fixes autosign_timeout usage in check_autosign_dir -- **PR** `#25894`_: (*jacobhammons*) Minor doc bug fixes - @ *2015-07-30T23:02:34Z* +* **ISSUE** `#25801`_: (`themalkolm`_) Update docs that salt.states.winrepo requires `roles:salt-master` in grains. (refs: `#26328`_) - - **ISSUE** `#25650`_: (*jacksontj*) state.running documentation is incorrect - | refs: `#25894`_ - - **ISSUE** `#24042`_: (*whiteinge*) The state_events setting is not documented - | refs: `#25894`_ - - **ISSUE** `#23788`_: (*k5jj*) functions in drac.py module do not match documentation - | refs: `#25894`_ - - **ISSUE** `#21296`_: (*Lothiraldan*) Possible minion enumeration using saltutil.find_job and eauth - | refs: `#25894`_ +* **ISSUE** `#25562`_: (`jefftucker`_) winrepo state does not run on masterless minion (refs: `#26328`_) -- **PR** `#25877`_: (*rallytime*) Protect against passing a map file in addition to VM names with --destroy - @ *2015-07-30T21:55:45Z* +* **PR** `#26328`_: (`twangboy`_) Removed salt-master role requirement (refs: `#26402`_) + @ *2015-08-17 18:30:17 UTC* - - **ISSUE** `#24036`_: (*arthurlogilab*) [salt-cloud] Protect against passing command line arguments as names for the --destroy command in map files - | refs: `#25877`_ + * 8d901d7b15 Merge pull request `#26328`_ from twangboy/fix_25562 -- **PR** `#25870`_: (*rallytime*) Back-port `#25824`_ to 2015.5 - @ *2015-07-30T21:54:35Z* + * d4ca1dccbf Removed salt-master role requirement - - **PR** `#25824`_: (*klyr*) Fix get_managed() in file.py module for local files - | refs: `#25870`_ +* **ISSUE** `#26327`_: (`bradthurber`_) mount.mounted opts incorrect "forced unmount and mount because options (tcp) changed" (refs: `#26362`_) -- **PR** `#25885`_: (*t0rrant*) Update Debian changelog - @ *2015-07-30T20:05:59Z* +* **PR** `#26362`_: (`garethgreenaway`_) Fixes to mount state. + @ *2015-08-17 17:44:55 UTC* -- **PR** `#25875`_: (*rallytime*) Back-port `#25862`_ to 2015.5 - @ *2015-07-30T17:34:02Z* + * 74558f5743 Merge pull request `#26362`_ from garethgreenaway/2015_5_26327_more_invisible_mount_options - - **ISSUE** `#25478`_: (*zyio*) salt-ssh - Unable to locate current thin version - | refs: `#25862`_ - - **ISSUE** `#25026`_: (*sylvia-wang*) salt-ssh "Failure deploying thin" when using salt module functions - | refs: `#25862`_ - - **PR** `#25862`_: (*zyio*) Adding SCP_NOT_FOUND exit code - | refs: `#25875`_ + * cf532d46dd Some mount options are translated to different options once a share has been mounted, eg. when specifying a protocol for NFS as either tcp or udp this option is translated into either proto=tcp or proto=udp. Change adds a lookup dictionary for these options so that a re-mount isn't forced each time. -- **PR** `#25873`_: (*rallytime*) Back-port `#25855`_ to 2015.5 - @ *2015-07-30T17:33:55Z* +* **PR** `#26379`_: (`s0undt3ch`_) [2015.5] Backport `#26353`_ + @ *2015-08-17 17:19:29 UTC* - - **PR** `#25855`_: (*puneetk*) Patch 3 - | refs: `#25873`_ + * **PR** `#26353`_: (`sixninetynine`_) fixed a typo in setup.py (refs: `#26379`_) -- **PR** `#25871`_: (*rallytime*) Back-port `#25829`_ to 2015.5 - @ *2015-07-30T17:33:43Z* + * 7dbbd90c98 Merge pull request `#26379`_ from s0undt3ch/issues/backport-26353 - - **PR** `#25829`_: (*peterdemin*) Fixed typo in salt.states.saltmod.function doc string - | refs: `#25871`_ + * 33ed315c85 fixed Packaing -> Packaging typo and added a couple comments on the setuptools/distutils abstract methods -- **PR** `#25869`_: (*rallytime*) Back-port `#25788`_ to 2015.5 - @ *2015-07-30T17:33:33Z* +* **ISSUE** `#26240`_: (`0xf10e`_) keystone.user_get raises exception when user is not found (refs: `#26277`_) - - **ISSUE** `#24002`_: (*csakoda*) File lock contention on windows minions causing highstate crash - | refs: `#25788`_ - - **PR** `#25788`_: (*opdude*) Catch a hard crash when running highstate on windows - | refs: `#25869`_ +* **PR** `#26277`_: (`rallytime`_) Handle exception when user is not found in keystone.user_get + @ *2015-08-14 19:41:59 UTC* -- **PR** `#25853`_: (*davidjb*) Make ssh-id-wrapper accessible to non-root users - @ *2015-07-30T16:49:47Z* + * bcca1b4c5a Merge pull request `#26277`_ from rallytime/fix-26240 - - **ISSUE** `#19532`_: (*stolendog*) salt-ssh running git clone with not root user - | refs: `#25853`_ + * 0b6977335e Clean it up -- **PR** `#25856`_: (*jfindlay*) expand minion reauth scalability documentation - @ *2015-07-30T15:33:17Z* + * 5edabfd271 It's a dict - git problems... - - **ISSUE** `#25447`_: (*spo0nman*) SaltMaster is crippled with Minion Re-Authentication - | refs: `#25856`_ + * 39d3eb66f0 Log error and return error - make returns consistent. -- **PR** `#25840`_: (*jfindlay*) add note to winrepo state docs about required grain - @ *2015-07-30T14:38:27Z* + * 496474d862 Handle exception when user is not found in keystone.get_user - - **ISSUE** `#25801`_: (*themalkolm*) Update docs that salt.states.winrepo requires `roles:salt-master` in grains. - | refs: `#25840`_ +* **ISSUE** `#24484`_: (`bailsman`_) clouds/ec2.py: create_snapshot throws exception (refs: `#26326`_) -- **PR** `#25846`_: (*jfindlay*) rework deprecation documentation for release names - @ *2015-07-30T13:26:21Z* +* **PR** `#26326`_: (`rallytime`_) Make ec2.create_snapshot return less unweildly and more relevant + @ *2015-08-14 19:40:47 UTC* - - **ISSUE** `#25827`_: (*0xf10e*) "Deprecating Code" doesn't mention Usage of warn_until() w/ Release Names - | refs: `#25846`_ + * 78be3a826f Merge pull request `#26326`_ from rallytime/create_snapshot_return -- **PR** `#25833`_: (*jahamn*) Allows cp.push to recreate empty files - @ *2015-07-29T16:14:48Z* + * c5395db851 Make ec2.create_snapshot return less unweildly and more relevant - - **ISSUE** `#23288`_: (*UtahDave*) cp.push fails to recreate empty files. - | refs: `#25833`_ +* **ISSUE** `#16179`_: (`UtahDave`_) Salt Cloud -l debug includes the entire bootstrap script twice in its output (refs: `#26306`_) -- **PR** `#25831`_: (*rallytime*) Add salt:// to key_url options to docs for pkgrepo.managed - @ *2015-07-29T15:38:43Z* +* **PR** `#26306`_: (`rallytime`_) Move VM creation details dict to log.trace + @ *2015-08-14 17:39:52 UTC* - - **ISSUE** `#11474`_: (*JensRantil*) pkgrepo.managed key_url: salt:// always use `base` env - | refs: `#25831`_ + * 44c9d3063b Merge pull request `#26306`_ from rallytime/fix-16179 -- **PR** `#25807`_: (*rallytime*) Provide helpful error when using actions with a mapfile - @ *2015-07-29T15:30:15Z* + * 670464258f Move VM creation details dict to log.trace - - **ISSUE** `#22699`_: (*arthurlogilab*) salt-cloud fails on KeyError when given a nonexistent action - | refs: `#25807`_ - -- **PR** `#25818`_: (*jfindlay*) fix autoruns list - @ *2015-07-29T15:29:20Z* - -- **PR** `#25826`_: (*anlutro*) Check that "onchanges" is a list - @ *2015-07-29T15:00:28Z* - -- **PR** `#25798`_: (*twangboy*) Fixed stacktrace on package name not found - @ *2015-07-28T22:40:14Z* - - - **ISSUE** `#25258`_: (*nickw8*) windows minion repo not updating - | refs: `#25798`_ - -- **PR** `#25797`_: (*twangboy*) Changed repocache back to cached_repo - @ *2015-07-28T22:39:32Z* - - - **ISSUE** `#25437`_: (*lorengordon*) Stacktrace on Windows when running pkg.list_pkgs - | refs: `#25598`_ `#25763`_ - - **PR** `#25763`_: (*twangboy*) Fix 25437 - | refs: `#25797`_ - -- **PR** `#25793`_: (*rallytime*) Back-port `#25730`_ to 2015.5 - @ *2015-07-28T19:37:34Z* - - - **PR** `#25730`_: (*sjorge*) patchelf lives in pkgsrc - | refs: `#25793`_ - -- **PR** `#25792`_: (*rallytime*) Back-port `#25688`_ to 2015.5 - @ *2015-07-28T19:37:17Z* - - - **PR** `#25688`_: (*bclermont*) Don't acquire lock if there is no formatter - | refs: `#25792`_ - -- **PR** `#25796`_: (*cachedout*) Remove debug from docs - @ *2015-07-28T17:35:59Z* - -- **PR** `#25749`_: (*jahamn*) Allow zpool.create on character devices - @ *2015-07-28T16:01:40Z* - - - **ISSUE** `#24920`_: (*voileux*) module.zpool.create on character device is not possible by salt - | refs: `#25749`_ - -- **PR** `#25685`_: (*twangboy*) Fixed regex issues with comment and uncomment - @ *2015-07-28T15:29:49Z* - -- **PR** `#25763`_: (*twangboy*) Fix 25437 - | refs: `#25797`_ - @ *2015-07-28T15:29:27Z* - - - **ISSUE** `#25437`_: (*lorengordon*) Stacktrace on Windows when running pkg.list_pkgs - | refs: `#25598`_ `#25763`_ - -- **PR** `#25752`_: (*thatch45*) State top saltenv - @ *2015-07-28T01:02:10Z* - -- **PR** `#25755`_: (*twangboy*) Fixed problem with dunder functions not being passed - @ *2015-07-27T19:31:22Z* - - - **ISSUE** `#25717`_: (*twangboy*) Problem with chocolatey module not loading - | refs: `#25755`_ - -- **PR** `#25648`_: (*twangboy*) Clarified functionality of reg module, fixed state to work with new module - @ *2015-07-27T19:30:33Z* - - - **ISSUE** `#25352`_: (*m03*) reg.absent reporting incorrect results - | refs: `#25648`_ - - **ISSUE** `#1`_: (*thatch45*) Enable regex on the salt cli - -- **PR** `#25740`_: (*rallytime*) Back-port `#25722`_ to 2015.5 - @ *2015-07-27T16:08:40Z* - - - **ISSUE** `#25154`_: (*uvsmtid*) All data mixed on STDOUT together should generate valid JSON output - | refs: `#25722`_ - - **ISSUE** `#25153`_: (*uvsmtid*) Multiple results should generate valid JSON output - | refs: `#25722`_ - - **PR** `#25722`_: (*uvsmtid*) Minor docs changes to emphasize JSON output problems without `--static` option - | refs: `#25740`_ - -- **PR** `#25739`_: (*rallytime*) Back-port `#25709`_ to 2015.5 - @ *2015-07-27T16:08:27Z* - - - **PR** `#25709`_: (*colekowalski*) add direct-io-mode to mount_invisible_options - | refs: `#25739`_ - - **PR** `#25699`_: (*rallytime*) Back-port `#25660`_ to 2015.5 - | refs: `#25709`_ - - **PR** `#25660`_: (*colekowalski*) add glusterfs' direct-io-mode to mount_invisible_keys - | refs: `#25699`_ `#25709`_ - -- **PR** `#25738`_: (*rallytime*) Back-port `#25671`_ to 2015.5 - @ *2015-07-27T16:08:23Z* - - - **PR** `#25671`_: (*niq000*) added a parameter so verifying SSL is now optional instead of hard-coded - | refs: `#25738`_ - -- **PR** `#25737`_: (*rallytime*) Back-port `#25608`_ to 2015.5 - @ *2015-07-27T16:08:18Z* - - - **ISSUE** `#25229`_: (*rall0r*) Module git.latest kills target directory when test=True - | refs: `#25608`_ - - **PR** `#25608`_: (*rall0r*) Fix: prevent git.latest from removing target - | refs: `#25737`_ - -- **PR** `#25733`_: (*davidjb*) Avoid IndexError when listing mounts if mount output ends in newline - @ *2015-07-27T16:08:05Z* - -- **PR** `#25705`_: (*blackduckx*) Support for setm augeas command. - @ *2015-07-27T16:07:10Z* - - - **ISSUE** `#22460`_: (*onmeac*) Command setm is not supported (yet) - | refs: `#25705`_ - -- **PR** `#25703`_: (*cachedout*) Return to `str` for master_type for 2015.5 - @ *2015-07-27T16:06:22Z* - -- **PR** `#25702`_: (*twangboy*) Fixed win_user module for groups with spaces in the name - @ *2015-07-27T15:06:33Z* - - - **ISSUE** `#25144`_: (*johnccfm*) user.present on Windows fails to add user to groups if group name contains a space - | refs: `#25702`_ - -- **PR** `#25711`_: (*twangboy*) Fixed problem with win_servermanager.list_installed - @ *2015-07-27T15:05:48Z* - - - **ISSUE** `#25351`_: (*m03*) win_servermanager.list_installed failing with "IndexError: list index out of range" - | refs: `#25711`_ - -- **PR** `#25714`_: (*cachedout*) Display warning when progressbar can't be loaded - @ *2015-07-25T00:10:13Z* - - - **ISSUE** `#25435`_: (*yee379*) progressbar dependency missing - | refs: `#25714`_ - -- **PR** `#25699`_: (*rallytime*) Back-port `#25660`_ to 2015.5 - | refs: `#25709`_ - @ *2015-07-24T22:11:40Z* - - - **PR** `#25660`_: (*colekowalski*) add glusterfs' direct-io-mode to mount_invisible_keys - | refs: `#25699`_ `#25709`_ - -- **PR** `#25694`_: (*s0undt3ch*) Salt-SSH fix for `#25689`_ - @ *2015-07-24T21:41:57Z* - - - **ISSUE** `#25689`_: (*anlutro*) Minion log in salt-ssh - | refs: `#25694`_ - -- **PR** `#25710`_: (*jahamn*) Integration Testcase for Issue 25250 - @ *2015-07-24T20:57:33Z* - - - **ISSUE** `#25250`_: (*wipfs*) 'force' option in copy state deletes target file - | refs: `#25461`_ `#25710`_ - -- **PR** `#25680`_: (*basepi*) [2015.5] Move cmd.run jinja aliasing to a wrapper class to prevent side effects - @ *2015-07-24T19:52:10Z* - - - **PR** `#25049`_: (*terminalmage*) Fix cmd.run when cross-called in a state/execution module - | refs: `#25680`_ - -- **PR** `#25682`_: (*basepi*) [2015.5] Fix parsing args with just a hash (#) - @ *2015-07-24T19:52:01Z* - -- **PR** `#25695`_: (*stanislavb*) Configurable AWS region & region from IAM metadata - @ *2015-07-24T19:36:40Z* - -- **PR** `#25645`_: (*kev009*) Fix pkgng provider to work with a sources list and the underlying pkg… - @ *2015-07-24T16:33:18Z* - -- **PR** `#25677`_: (*aneeshusa*) Fix pacman.list_upgrades when refresh=True. - @ *2015-07-24T16:30:06Z* - -- **PR** `#25675`_: (*UtahDave*) Use OS line endings with contents on file.managed - @ *2015-07-24T16:29:50Z* - - - **ISSUE** `#25674`_: (*UtahDave*) file.managed with contents parameter uses wrong line endings on Windows - | refs: `#25675`_ - -- **PR** `#25676`_: (*basepi*) Update release candidate docs to 2015.8.0rc2 - @ *2015-07-23T20:29:37Z* - -- **PR** `#25666`_: (*nmadhok*) Check if the properties exist before looping over them causing KeyError - @ *2015-07-23T17:55:40Z* - - - **ISSUE** `#25665`_: (*nmadhok*) salt-cloud VMware driver fails with KeyErrors if there's any existing machine in the VMware infrastructure in (invalid state) - | refs: `#25666`_ - -- **PR** `#25656`_: (*anlutro*) Fix locale detection in debian/gentoo - @ *2015-07-23T16:46:40Z* - -- **PR** `#25661`_: (*rallytime*) Back-port `#25624`_ to 2015.5 - @ *2015-07-23T16:26:48Z* - - - **PR** `#25624`_: (*bobrik*) Fix typo in get_routes example for debian_ip - | refs: `#25661`_ - -- **PR** `#25662`_: (*rallytime*) Back-port `#25638`_ to 2015.5 - @ *2015-07-23T16:26:40Z* - - - **ISSUE** `#15209`_: (*hubez*) file.manage: source_hash not working with s3:// (2014.7.0rc1) - | refs: `#25638`_ - - **PR** `#25638`_: (*TronPaul*) fix bad merge in 99fc7ec - | refs: `#25662`_ - -- **PR** `#25644`_: (*cachedout*) pillar doc fix - @ *2015-07-22T22:57:23Z* - - - **ISSUE** `#25413`_: (*zizkebab*) pillar_opts default behavior is not reflected in the docs - | refs: `#25644`_ - -- **PR** `#25642`_: (*cachedout*) Warn on pillar schedule delete - @ *2015-07-22T22:04:12Z* - - - **ISSUE** `#25540`_: (*dennisjac*) salt highstate schedule cannot be removed - | refs: `#25642`_ - -- **PR** `#25598`_: (*twangboy*) Fixed problem trying to load file with name of boolean type - @ *2015-07-22T17:07:49Z* - - - **ISSUE** `#25437`_: (*lorengordon*) Stacktrace on Windows when running pkg.list_pkgs - | refs: `#25598`_ `#25763`_ - * 7b79e433 Merge pull request `#25598`_ from twangboy/fix_25437 - -- **PR** `#25604`_: (*terminalmage*) Move patching of mock_open to within test - @ *2015-07-22T16:53:55Z* - - - **ISSUE** `#25323`_: (*terminalmage*) unit.modules.tls_test fails with older mock - | refs: `#25604`_ - -- **PR** `#25609`_: (*s0undt3ch*) [2015.5] Update the bootstrap script to latest release v2015.07.22 - @ *2015-07-22T16:28:52Z* - - - **ISSUE** `#630`_: (*syphernl*) Allow for an include statement in config files - | refs: `#25609`_ - - **PR** `#627`_: (*chjohnst*) add saltversion grain - | refs: `#25609`_ - -- **PR** `#25603`_: (*terminalmage*) Add version_cmp function to yumpkg.py - @ *2015-07-22T15:42:29Z* - - - **ISSUE** `#21912`_: (*rvora*) pkg.latest not updating the package on CentOS though yum reports an update available - | refs: `#25603`_ - -- **PR** `#25590`_: (*garethgreenaway*) 2015.5 scheduled jobs return data - @ *2015-07-21T21:57:42Z* - - - **ISSUE** `#25560`_: (*dennisjac*) scheduled highstate runs don't return results to the job cache - | refs: `#25590`_ - -- **PR** `#25584`_: (*rallytime*) Back-port `#24054`_ and `#25576`_ to 2015.5 - @ *2015-07-21T21:16:38Z* - - - **PR** `#25576`_: (*pcn*) s3fs breaks when fetching files from s3 - | refs: `#25584`_ - - **PR** `#24054`_: (*mgwilliams*) s3.head: return useful data - | refs: `#25584`_ - -- **PR** `#25589`_: (*jahamn*) Fixes ssh_known_host not taking port into account - @ *2015-07-21T21:15:06Z* - - - **ISSUE** `#23626`_: (*mirko*) salt state 'ssh_known_hosts' doesn't take 'port' into account - | refs: `#25589`_ - -- **PR** `#25573`_: (*EvaSDK*) Do not execute bootstrap script twice - @ *2015-07-21T18:20:04Z* - - - **PR** `#25465`_: (*EvaSDK*) 2015.5.3 LXC module fixes - | refs: `#25573`_ - -- **PR** `#25580`_: (*attiasr*) use explicit utf-8 decoding (`#25532`_) - @ *2015-07-21T15:40:49Z* - - - **ISSUE** `#25532`_: (*attiasr*) salt/modules/win_pkg.py list_pkgs is broken (encoding issues) - | refs: `#25556`_ `#25580`_ - -- **PR** `#25568`_: (*twangboy*) Fixed win_useradd module to add fullname - @ *2015-07-21T14:30:25Z* - - - **ISSUE** `#25206`_: (*jfindlay*) fullname issues with user.add state on windows - | refs: `#25568`_ - -- **PR** `#25561`_: (*twangboy*) Fixed the gem module to work on windows... without injection - @ *2015-07-20T21:12:15Z* - - - **ISSUE** `#21041`_: (*deuscapturus*) state module gem.installed not working on Windows. - | refs: `#25430`_ `#25561`_ `#25428`_ - - **PR** `#25428`_: (*twangboy*) Fixed the gem module to work on windows - | refs: `#25561`_ - -- **PR** `#25521`_: (*cachedout*) Fix outputter for state.orch - @ *2015-07-20T19:30:14Z* - -- **PR** `#25563`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-07-20T19:27:36Z* - - - **PR** `#25416`_: (*cachedout*) Fix broken keyword - -- **PR** `#25559`_: (*cachedout*) Lint win_pkg - @ *2015-07-20T17:46:29Z* - -- **PR** `#25556`_: (*attiasr*) fix for `#25532`_ - @ *2015-07-20T17:45:11Z* - - - **ISSUE** `#25532`_: (*attiasr*) salt/modules/win_pkg.py list_pkgs is broken (encoding issues) - | refs: `#25556`_ `#25580`_ - -- **PR** `#25554`_: (*jfindlay*) verify_ssl=True for s3 ext pillar - @ *2015-07-20T17:43:38Z* - - - **ISSUE** `#25538`_: (*stanislavb*) S3 ext_pillar configuration requires verify_ssl - | refs: `#25554`_ - -- **PR** `#25551`_: (*rallytime*) Backport `#25530`_ to 2015.5 - @ *2015-07-20T17:43:00Z* - - - **PR** `#25530`_: (*andre-luiz-dos-santos*) The variable name must be last - | refs: `#25551`_ - -- **PR** `#25533`_: (*attiasr*) port 445 for windows bootstraping - @ *2015-07-20T15:13:06Z* - -- **PR** `#25525`_: (*gtmanfred*) add make _prepare an alias for postinitio - @ *2015-07-20T15:12:38Z* - - - **ISSUE** `#25432`_: (*gtmanfred*) [2015.5.3][raet] raet error with SaltRaetRoadStackJoiner - | refs: `#25525`_ - -- **PR** `#25519`_: (*rallytime*) Backport vmware driver to 2015.5 branch - @ *2015-07-20T15:11:26Z* - - - **ISSUE** `#25511`_: (*rallytime*) Make provider --> driver change backward compatible - | refs: `#25519`_ `#25519`_ - - **ISSUE** `#23574`_: (*CedNantes*) Failed to Deploy Salt-Minion on a Win 2012 R2 using wmware Cloud Driver from Develop branch - | refs: `#25519`_ - -- **PR** `#25542`_: (*Oro*) Fix hipchat.send_message when using API v2 - @ *2015-07-20T15:09:13Z* - -- **PR** `#25531`_: (*rallytime*) Back-port `#25529`_ to 2015.5 - @ *2015-07-18T19:16:10Z* - - - **PR** `#25529`_: (*davidjb*) Fix minor typo in best practice example - | refs: `#25531`_ - -- **PR** `#25528`_: (*davidjb*) Fix typo in extend declaration doco - @ *2015-07-18T14:22:06Z* - -- **PR** `#25517`_: (*rallytime*) Back-port `#25486`_ to 2015.5 - @ *2015-07-17T21:49:26Z* - - - **ISSUE** `#25486`_: (*whiteinge*) Highstate outputter not used for state.apply - | refs: `#25517`_ - - **PR** `#25485`_: (*attiasr*) fix file downloads on windows - -- **PR** `#25516`_: (*rallytime*) Back-port `#25483`_ to 2015.5 - @ *2015-07-17T21:49:05Z* - - - **ISSUE** `#25479`_: (*alexandrsushko*) multiple mount.mounted of one device - | refs: `#25483`_ - - **PR** `#25483`_: (*alexandrsushko*) Added 'none' to the set of specialFSes - | refs: `#25516`_ - -- **PR** `#25513`_: (*garethgreenaway*) fixes to schedule.add documentation in 2015.5 - @ *2015-07-17T17:03:24Z* - - - **ISSUE** `#25493`_: (*blackduckx*) Issue with job_args on schedule.add command - | refs: `#25513`_ - -- **PR** `#25465`_: (*EvaSDK*) 2015.5.3 LXC module fixes - | refs: `#25573`_ - @ *2015-07-17T15:57:54Z* - -- **PR** `#25506`_: (*s0undt3ch*) [2015.5] Update bootstrap script to latest stable release, v2015.07.17 - @ *2015-07-17T15:40:38Z* - - - **ISSUE** `#25456`_: (*julienlavergne*) [2015.8.0rc1] salt-bootstrap fails to install salt master - | refs: `#25506`_ - - **ISSUE** `#25270`_: (*iggy*) [2015.8.0rc1] salt-bootstrap fails to properly install a minion - | refs: `#25506`_ - - **ISSUE** `#625`_: (*whiteinge*) `cmd.run` state `user` flag is not working - | refs: `#25506`_ `#632`_ - - **ISSUE** `#611`_: (*fatbox*) Peer interface fails to return data occasionally - | refs: `#25506`_ - - **ISSUE** `#607`_: (*thatch45*) next level -X support - | refs: `#25506`_ - - **ISSUE** `#598`_: (*syphernl*) Explanation on how to execute interactive installs - | refs: `#25506`_ - - **ISSUE** `#455`_: (*whiteinge*) Document common troubleshooting tips - | refs: `#25506`_ - - **PR** `#624`_: (*chjohnst*) Docs are not correct with network.ping as args are not supported - | refs: `#25506`_ - - **PR** `#621`_: (*akoumjian*) Adding ec2 cloud-init bootstrap docs - | refs: `#25506`_ - - **PR** `#606`_: (*terminalmage*) need empty line before code blocks. added ones that were missing. - | refs: `#25506`_ - - **PR** `#602`_: (*terminalmage*) State-related documentation changes - | refs: `#25506`_ - -- **PR** `#25498`_: (*jfindlay*) only read /proc/1/cmdline if it exists - @ *2015-07-17T15:35:33Z* - - - **ISSUE** `#25454`_: (*mschiff*) Regression: salt 2015.5 not working in secure chroot anymore. - | refs: `#25498`_ - -- **PR** `#25487`_: (*rallytime*) Back-port `#25464`_ to 2015.5 - @ *2015-07-16T16:58:36Z* - - - **PR** `#25464`_: (*jquast*) docfix: "cache_jobs: False" => grains_cache: False" - | refs: `#25487`_ - -- **PR** `#25482`_: (*oeuftete*) Fix docker.running detection of running container - @ *2015-07-16T16:58:29Z* - - - **PR** `#2015`_: (*thekuffs*) Esky / bbfreeze support - -- **PR** `#25468`_: (*joejulian*) Add support for pyOpenSSL > 0.10 - @ *2015-07-16T15:10:30Z* - - - **ISSUE** `#25384`_: (*rickh563*) pyopenssl 0.14 requirement in 2015.5.3 does not work in RHEL6 : ZD-364 - | refs: `#25468`_ - -- **PR** `#25467`_: (*rallytime*) Add lxml dependency to opennebula docs - @ *2015-07-16T15:09:57Z* - -- **PR** `#25461`_: (*jahamn*) Update file, if force option and content not same - @ *2015-07-15T20:15:07Z* - - - **ISSUE** `#25250`_: (*wipfs*) 'force' option in copy state deletes target file - | refs: `#25461`_ `#25710`_ - - **ISSUE** `#24647`_: (*nmadhok*) salt.states.file.copy does not copy the file if it already exists with force=True - | refs: `#25461`_ - -- **PR** `#25438`_: (*rallytime*) Reduce digital_ocean_v2 API call frequency - @ *2015-07-15T19:40:18Z* - - - **ISSUE** `#25431`_: (*namcois*) Digital Ocean v2 reducing API calls by adding per_page - | refs: `#25438`_ - -- **PR** `#25457`_: (*jacksontj*) Saltnado - @ *2015-07-15T17:50:12Z* - - - **PR** `#25427`_: (*tony-cocco*) Saltnado runner client results in blocking call despite being set-up as Runner.async - | refs: `#25457`_ - -- **PR** `#25459`_: (*jahamn*) Fixed 'defulats' typo in verify.py - @ *2015-07-15T16:53:06Z* - -- **PR** `#25426`_: (*jquast*) bugfix: trailing "...done" in rabbitmq output (backport from 'develop' to 2015.5) - @ *2015-07-15T14:48:05Z* - -- **PR** `#25433`_: (*jleroy*) Support for IPv6 addresses scopes in network.interfaces (ifconfig) - @ *2015-07-15T14:44:09Z* - - - **PR** `#25151`_: (*jleroy*) Support for IPv6 addresses scopes in network.interfaces - | refs: `#25274`_ `#25433`_ - -- **PR** `#25430`_: (*twangboy*) Disabled rbenv execution module for Windows - @ *2015-07-15T14:41:18Z* - - - **ISSUE** `#21041`_: (*deuscapturus*) state module gem.installed not working on Windows. - | refs: `#25430`_ `#25561`_ `#25428`_ - - - **ISSUE** `#1846`_: (*seanchannel*) development dependencies - -- **PR** `#25420`_: (*techhat*) Move S3 to use AWS Signature Version 4 - @ *2015-07-14T22:03:09Z* - -- **PR** `#25418`_: (*twangboy*) Fixed problem with file.managed test=True - @ *2015-07-14T21:26:59Z* - - - **ISSUE** `#20441`_: (*deuscapturus*) State module file.managed returns an error on Windows and test=Test - | refs: `#25418`_ - -- **PR** `#25417`_: (*ahus1*) extended documentation about dependencies for dig module - @ *2015-07-14T20:49:51Z* - -- **PR** `#25411`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-07-14T17:55:26Z* - - - **PR** `#25375`_: (*cachedout*) Fix error in config.py for master_type - - **PR** `#25324`_: (*jacobhammons*) Latest help theme updates - -- **PR** `#25406`_: (*anlutro*) Force arguments to aptpkg.version_cmp into strings - @ *2015-07-14T16:15:41Z* - -- **PR** `#25408`_: (*rallytime*) Back-port `#25399`_ to 2015.5 - @ *2015-07-14T16:09:06Z* - - - **PR** `#25399`_: (*jarpy*) Demonstrate per-minion client_acl. - | refs: `#25408`_ - -- **PR** `#25240`_: (*tankywoo*) file make os.walk only be called one - @ *2015-07-14T16:04:49Z* - -- **PR** `#25395`_: (*rallytime*) Back-port `#25389`_ to 2015.5 - @ *2015-07-14T03:26:34Z* - - - **PR** `#25389`_: (*l2ol33rt*) Adding entropy note for gpg renderer - | refs: `#25395`_ - -- **PR** `#25392`_: (*rallytime*) Back-port `#25256`_ to 2015.5 - @ *2015-07-14T03:25:13Z* - - - **PR** `#25256`_: (*yanatan16*) Don't assume source_hash exists - | refs: `#25392`_ - -- **PR** `#25398`_: (*twangboy*) Fix date - @ *2015-07-14T03:21:17Z* - -- **PR** `#25397`_: (*GideonRed*) Introduce standard error output when cli exits with non-zero status - @ *2015-07-14T03:20:24Z* - -- **PR** `#25386`_: (*cachedout*) Lint `#25383`_ - @ *2015-07-13T21:01:10Z* - - - **ISSUE** `#24444`_: (*michaelkrupp*) file.managed does not handle dead symlinks - | refs: `#25383`_ - - **PR** `#25383`_: (*jahamn*) Fix manage_file function in salt/modules/file.py to handle broken sym… - -- **PR** `#25383`_: (*jahamn*) Fix manage_file function in salt/modules/file.py to handle broken sym… - @ *2015-07-13T20:58:23Z* - - - **ISSUE** `#24444`_: (*michaelkrupp*) file.managed does not handle dead symlinks - | refs: `#25383`_ - -- **PR** `#25369`_: (*anlutro*) Fix aptpkg.version_cmp - @ *2015-07-13T20:18:45Z* - -- **PR** `#25379`_: (*jfindlay*) check for cwd before getting it - @ *2015-07-13T19:50:27Z* - - - **ISSUE** `#25337`_: (*eliasp*) `salt-call` from non-existend cwd backtraces - | refs: `#25379`_ - -- **PR** `#25334`_: (*jfindlay*) return all cmd info back to zypper fcn - @ *2015-07-13T17:03:29Z* - - - **ISSUE** `#25320`_: (*podloucky-init*) zypper module list_upgrades broken (2015.5.2) - | refs: `#25334`_ - -- **PR** `#25339`_: (*jfindlay*) update orchestration docs - @ *2015-07-13T16:04:26Z* - -- **PR** `#25358`_: (*dkiser*) Deep merge of pillar lists - | refs: `#26016`_ - @ *2015-07-13T15:51:01Z* - - - **ISSUE** `#22241`_: (*masterkorp*) Salt master not properly generating the map - | refs: `#25358`_ - -- **PR** `#25346`_: (*bechtoldt*) set correct indention in states/requisites.rst (docs), fixes `#25281`_ - @ *2015-07-13T15:34:45Z* - - - **ISSUE** `#25281`_: (*shinshenjs*) Unless usage in Official Doc syntax error? - -- **PR** `#25336`_: (*terminalmage*) Don't try to read init binary if it wasn't found - @ *2015-07-13T09:45:30Z* - -- **PR** `#25350`_: (*davidjb*) Fix documentation for file.blockreplace - @ *2015-07-13T03:41:20Z* - -- **PR** `#25326`_: (*rallytime*) Back-port `#20972`_ to 2015.5 - @ *2015-07-10T18:49:44Z* - - - **ISSUE** `#19288`_: (*oba11*) AssociatePublicIpAddress doesn't work with salt-cloud 2014.7.0 - | refs: `#20972`_ `#25326`_ - - **PR** `#20972`_: (*JohannesEbke*) Fix interface cleanup when using AssociatePublicIpAddress in `#19288`_ - | refs: `#25326`_ - -- **PR** `#25327`_: (*rallytime*) Back-port `#25290`_ to 2015.5 - @ *2015-07-10T18:49:37Z* - - - **ISSUE** `#24433`_: (*chrimi*) Salt locale state fails, if locale has not been generated - | refs: `#25290`_ - - **PR** `#25290`_: (*pcdummy*) Simple fix for locale.present on Ubuntu. - | refs: `#25327`_ - -- **PR** `#25328`_: (*rallytime*) Back-port `#25309`_ to 2015.5 - @ *2015-07-10T17:22:59Z* - - - **ISSUE** `#24827`_: (*yermulnik*) locale.present doesn't generate locales - | refs: `#25309`_ - - **PR** `#25309`_: (*davidjb*) Format /etc/locale.gen correctly in salt.modules.localemod.gen_locale - | refs: `#25328`_ - -- **PR** `#25322`_: (*jacobhammons*) version change to 2015.5.3 - @ *2015-07-10T16:11:24Z* - -- **PR** `#25308`_: (*jacksontj*) Make clear commands trace level logging - @ *2015-07-10T14:20:06Z* - - - **PR** `#24737`_: (*jacksontj*) Move AES command logging to trace - | refs: `#25308`_ - -- **PR** `#25269`_: (*jfindlay*) Extract tomcat war version - @ *2015-07-10T01:28:21Z* - - - **ISSUE** `#24520`_: (*nvx*) Tomcat module fails to extract version number from snapshot builds (2015.5 regression) - | refs: `#24927`_ - - **PR** `#24927`_: (*egarbi*) Tomcat module fails to extract version number from snapshot builds `#2`_… - | refs: `#25269`_ - -- **PR** `#25238`_: (*DmitryKuzmenko*) Pillarenv backport 2015.5 - @ *2015-07-10T01:25:07Z* - - - **ISSUE** `#18808`_: (*amendlik*) Add command line argument to select pillar environment - | refs: `#25238`_ - - **PR** `#23719`_: (*DmitryKuzmenko*) Support pillarenv cmdline in state.sls - -- **PR** `#25299`_: (*twangboy*) Added -NonInteractive so powershell doesn't hang waiting for input - @ *2015-07-09T21:00:16Z* - - - **ISSUE** `#13943`_: (*Supermathie*) Powershell commands that expect input hang forever - | refs: `#25299`_ - -- **PR** `#25301`_: (*jacobhammons*) bug fix for module function display in help - @ *2015-07-09T20:46:34Z* - -- **PR** `#25279`_: (*jacobhammons*) Additional docs on external and master job cache, assorted doc fixes - @ *2015-07-09T16:46:26Z* - - - **ISSUE** `#25277`_: (*jacobhammons*) CherryPy recommended versions - | refs: `#25279`_ - -- **PR** `#25274`_: (*jleroy*) Fix for issue `#25268`_ - @ *2015-07-09T13:36:26Z* - - - **ISSUE** `#25268`_: (*lichtamberg*) Salt not working anymore in 2015.8/develop: ValueError: 'scope' is not in list - | refs: `#25274`_ - - **PR** `#25151`_: (*jleroy*) Support for IPv6 addresses scopes in network.interfaces - | refs: `#25274`_ `#25433`_ - -- **PR** `#25272`_: (*twangboy*) Fixed problem with service not starting - @ *2015-07-08T23:29:48Z* - -- **PR** `#25225`_: (*nmadhok*) Backporting fix for issue `#25223`_ on 2015.5 branch - @ *2015-07-08T15:16:18Z* - - - **ISSUE** `#25223`_: (*nmadhok*) Runner occasionally fails with a RuntimeError when fired by a reactor - | refs: `#25225`_ - -- **PR** `#25214`_: (*rallytime*) A couple of doc fixes for the http tutorial - @ *2015-07-07T22:23:07Z* - -- **PR** `#25194`_: (*rallytime*) Update moto version check in boto_vpc_test and update min version - @ *2015-07-07T18:27:32Z* - - - **ISSUE** `#24272`_: (*rallytime*) Fix boto_vpc_test moto version check - | refs: `#25194`_ - -- **PR** `#25205`_: (*basepi*) Update releasecandidate docs - @ *2015-07-07T15:25:24Z* - -- **PR** `#25187`_: (*UtahDave*) Doc fixes: Fix misspelling and remove extraneous double spaces - @ *2015-07-07T01:07:04Z* - -- **PR** `#25182`_: (*cachedout*) Try to re-pack long floats as strs - @ *2015-07-07T01:06:43Z* - -- **PR** `#25185`_: (*rallytime*) Back-port `#25128`_ to 2015.5 - @ *2015-07-07T00:58:00Z* - - - **ISSUE** `#23822`_: (*sidcarter*) Zip file extracted permissions are incorrect - | refs: `#25128`_ - - **PR** `#25128`_: (*stanislavb*) Use cmd_unzip to preserve permissions - | refs: `#25185`_ - -- **PR** `#25181`_: (*rallytime*) Back-port `#25102`_ to 2015.5 - @ *2015-07-07T00:57:13Z* - - - **PR** `#25102`_: (*derBroBro*) Update win_network.py - | refs: `#25181`_ - -- **PR** `#25179`_: (*rallytime*) Back-port `#25059`_ to 2015.5 - @ *2015-07-07T00:56:44Z* - - - **ISSUE** `#24301`_: (*iggy*) influxdb_user and influxdb_database states need virtual functions - | refs: `#25059`_ - - **PR** `#25059`_: (*babilen*) Add virtual functions to influxdb state modules - | refs: `#25179`_ - -- **PR** `#25196`_: (*twangboy*) Fixed `#18919`_ false-positive on pkg.refresh - @ *2015-07-07T00:24:13Z* - - - **ISSUE** `#18919`_: (*giner*) Windows: pkg.refresh_db returns false-positive success - | refs: `#25196`_ - -- **PR** `#25180`_: (*rallytime*) Back-port `#25088`_ to 2015.5 - @ *2015-07-06T20:33:45Z* - - - **PR** `#25088`_: (*supertom*) Update - | refs: `#25180`_ - -- **PR** `#25191`_: (*basepi*) Add extrndest back to fileclient.is_cached in 2015.5 - @ *2015-07-06T19:35:24Z* - - - **PR** `#25117`_: (*basepi*) Fix fileclient.is_cached - | refs: `#25191`_ - -- **PR** `#25175`_: (*rallytime*) Back-port `#25020`_ to 2015.5 - @ *2015-07-06T18:53:19Z* - - - **ISSUE** `#25016`_: (*martinhoefling*) salt-run doc.execution fails with AttributeError - - **PR** `#25020`_: (*martinhoefling*) Fix for issue `#25016`_ - | refs: `#25175`_ - -- **PR** `#25173`_: (*rallytime*) Partial back-port of `#25019`_ - @ *2015-07-06T18:52:59Z* - - - **ISSUE** `#21879`_: (*bechtoldt*) Reference pages in documentation are outdated again - | refs: `#25019`_ - - **ISSUE** `#19262`_: (*bechtoldt*) salt.pillar.file_tree doesn't appear in the documentation - | refs: `#25019`_ - - **PR** `#25019`_: (*bechtoldt*) add missing module documentation to references - | refs: `#25173`_ - - **PR** `#24421`_: (*bechtoldt*) add missing module documentation - | refs: `#25019`_ - - **PR** `#21880`_: (*bechtoldt*) update references, fixes `#21879`_ - | refs: `#25019`_ - - **PR** `#20039`_: (*bechtoldt*) completing some doc references - | refs: `#25019`_ - -- **PR** `#25171`_: (*rallytime*) Back-port `#25001`_ to 2015.5 - @ *2015-07-06T18:51:53Z* - - - **PR** `#25001`_: (*jasonkeene*) Add docs for key arg in ssh_known_hosts.present - | refs: `#25171`_ - -- **PR** `#25170`_: (*rallytime*) Back-port `#24982`_ to 2015.5 - @ *2015-07-06T16:34:43Z* - - - **PR** `#24982`_: (*asyncsrc*) ec2 network_interfaces fix - | refs: `#25170`_ - -- **PR** `#25161`_: (*aneeshusa*) Allow checking for non-normalized systemd units. - @ *2015-07-06T15:15:31Z* - -- **PR** `#25151`_: (*jleroy*) Support for IPv6 addresses scopes in network.interfaces - | refs: `#25274`_ `#25433`_ - @ *2015-07-06T14:43:03Z* - -- **PR** `#25166`_: (*cachedout*) Lint `#25149`_ - @ *2015-07-06T14:40:29Z* - - - **ISSUE** `#24979`_: (*mavenAtHouzz*) [Discussion] Support for more than 1 netapi.rest_tornado server process - | refs: `#25149`_ - - **PR** `#25149`_: (*jacksontj*) Saltnado multiprocess support - | refs: `#25166`_ - -- **PR** `#25149`_: (*jacksontj*) Saltnado multiprocess support - | refs: `#25166`_ - @ *2015-07-06T14:38:43Z* - - - **ISSUE** `#24979`_: (*mavenAtHouzz*) [Discussion] Support for more than 1 netapi.rest_tornado server process - | refs: `#25149`_ - -- **PR** `#25120`_: (*d--j*) add missing continue for exception case - @ *2015-07-02T19:38:45Z* - -- **PR** `#25117`_: (*basepi*) Fix fileclient.is_cached - | refs: `#25191`_ - @ *2015-07-02T19:38:26Z* - -- **PR** `#25087`_: (*0xf10e*) Fix execution module for glance - now based on 2015.5! - @ *2015-07-02T19:36:27Z* - -- **PR** `#25129`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-07-02T17:37:40Z* - - - **ISSUE** `#18447`_: (*ryan-lane*) Can't install salt with raet using pip -e git - - **PR** `#25093`_: (*jaybocc2*) quick fix for issue `#18447`_ - - **PR** `#25069`_: (*puneetk*) Add a helper module function called list_enabled - -- **PR** `#25114`_: (*jfindlay*) Revert "Revert "adding states/postgres_database unit test case."" - @ *2015-07-02T01:01:29Z* - - - **PR** `#24798`_: (*jtand*) Revert "adding states/postgres_database unit test case." - | refs: `#25114`_ - - **PR** `#24329`_: (*jayeshka*) adding states/postgres_database unit test case. - | refs: `#24798`_ - -- **PR** `#24362`_: (*jayeshka*) adding states/postgres_user unit test case. - @ *2015-07-01T21:45:31Z* - -- **PR** `#24361`_: (*jayeshka*) adding states/postgres_schema unit test case. - @ *2015-07-01T21:44:56Z* - -- **PR** `#24331`_: (*jayeshka*) adding states/postgres_extension unit test case. - @ *2015-07-01T21:43:58Z* - -- **PR** `#26486`_: (*thusoy*) Git: Don't leak https user/pw to log - @ *2015-08-20T16:04:52Z* - - - **ISSUE** `#26484`_: (*thusoy*) Git state leaks HTTPS user/pw to log - | refs: `#26486`_ - - **ISSUE** `#26482`_: (*thusoy*) Git states doesn't allow user-only auth - | refs: `#26483`_ - - **PR** `#26483`_: (*thusoy*) Handle user-only http auth in git module - | refs: `#26486`_ - -- **PR** `#26476`_: (*jacobhammons*) Minor doc bug fixes - @ *2015-08-19T22:52:35Z* - - - **ISSUE** `#26432`_: (*centromere*) Documentation incorrectly references salt-key on the minion - | refs: `#26476`_ - - **ISSUE** `#26403`_: (*adelcast*) Grains documentation incorrectly states they are static - | refs: `#26476`_ - - **ISSUE** `#26329`_: (*cro*) Add note to eauth docs indicating default PAM service. - | refs: `#26476`_ - - **ISSUE** `#26264`_: (*grep4linux*) state trees cannot have 'dots' in the name - | refs: `#26476`_ - - **ISSUE** `#26233`_: (*dove-young*) pip install salt, then start master failed on Fedora 22 - | refs: `#26476`_ - -- **PR** `#26443`_: (*cachedout*) Fix connect issue in event init - @ *2015-08-19T22:50:22Z* - - - **ISSUE** `#26366`_: (*GreatSnoopy*) The development tree produces hanging, 100%cpu salt-master processes - | refs: `#26443`_ - - **ISSUE** `#26301`_: (*waynew*) CPU pegged out running salt-master (after running command) - | refs: `#26443`_ - - **ISSUE** `#25998`_: (*driskell*) Event subsystem discarding required events during --batch breaking it for slow running commands - | refs: `#26000`_ - - **PR** `#26000`_: (*driskell*) Implement full event caching for subscribed tags - | refs: `#26443`_ - -- **PR** `#26445`_: (*cachedout*) Raise clean error when no minions targeted in batch mode - @ *2015-08-19T22:50:07Z* - - - **ISSUE** `#26343`_: (*jfindlay*) batch error when no minions match target - | refs: `#26445`_ - -- **PR** `#26483`_: (*thusoy*) Handle user-only http auth in git module - | refs: `#26486`_ - @ *2015-08-19T22:47:41Z* - - - **ISSUE** `#26482`_: (*thusoy*) Git states doesn't allow user-only auth - | refs: `#26483`_ - -- **PR** `#26496`_: (*jfindlay*) add dateutil dependency reporting - @ *2015-08-19T22:46:31Z* - -- **PR** `#26494`_: (*cachedout*) Remove unnecessary debug statements - @ *2015-08-19T20:46:00Z* - -- **PR** `#26465`_: (*rallytime*) Back-port `#26457`_ to 2015.5 - @ *2015-08-19T16:08:16Z* - - - **PR** `#26457`_: (*arthurlogilab*) docstring improvement for network.ping module execution - | refs: `#26465`_ - -- **PR** `#26434`_: (*s0undt3ch*) Fix missed typo - @ *2015-08-18T18:14:29Z* - -- **PR** `#26430`_: (*rallytime*) List public and private ips under the correct label - @ *2015-08-18T16:20:32Z* - - - **ISSUE** `#26426`_: (*alxbse*) Private/public IPs are interchanged when listing nova driver cloud nodes - | refs: `#26430`_ - -- **PR** `#26431`_: (*rallytime*) Back-port `#26417`_ to 2015.5 - @ *2015-08-18T15:41:58Z* - - - **PR** `#26417`_: (*scottjpack*) Changed t1 -> t2 micro - | refs: `#26431`_ - -- **PR** `#26378`_: (*stanislavb*) Fix EC2 credentials from IAM roles for s3fs and s3 ext_pillar in 2015.5 - @ *2015-08-18T14:01:53Z* - -- **PR** `#26420`_: (*terminalmage*) Only use pygit2.errors if it exists (2015.5 branch) - @ *2015-08-18T14:00:01Z* - - - **ISSUE** `#26245`_: (*bradthurber*) salt v2015.5.3 gitfs.py using newer pygit2 feature than required minimum - | refs: `#26420`_ - -- **PR** `#26409`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - @ *2015-08-17T23:19:56Z* - - - **PR** `#26242`_: (*cro*) Remove dead code - - **PR** `#26216`_: (*cro*) Fix LDAP configuration issue. - -- **PR** `#26406`_: (*jfindlay*) fix syntax error in lvm exec module - @ *2015-08-17T21:18:25Z* - - - **ISSUE** `#26404`_: (*ssgward*) Syntax error in lvm.vg_absent state causing failure - | refs: `#26406`_ - -- **PR** `#26405`_: (*TheBigBear*) dependency zip files moved to new site - @ *2015-08-17T21:17:24Z* - -- **PR** `#26298`_: (*vr-jack*) Keep $HOME from being interpretted by Master shell - @ *2015-08-17T21:15:11Z* - -- **PR** `#26324`_: (*s0undt3ch*) Salt is now pip install'able in windows - @ *2015-08-17T20:41:34Z* - -- **PR** `#26371`_: (*bastiaanb*) fix issue `#26161`_: on RedHat family systems touch /var/lock/subsys/$SE… - @ *2015-08-17T20:39:28Z* - - - **ISSUE** `#26161`_: (*bastiaanb*) salt initscripts do not set lock file in /var/lock/subsys as required on RedHat family OSes - -- **PR** `#26402`_: (*twangboy*) Removed documentation no longer required - @ *2015-08-17T20:35:37Z* - - - **ISSUE** `#25801`_: (*themalkolm*) Update docs that salt.states.winrepo requires `roles:salt-master` in grains. - | refs: `#26328`_ - - **ISSUE** `#25562`_: (*jefftucker*) winrepo state does not run on masterless minion - | refs: `#26328`_ - - **PR** `#26328`_: (*twangboy*) Removed salt-master role requirement - | refs: `#26402`_ - -- **PR** `#26392`_: (*rallytime*) Back-port `#26376`_ to 2015.5 - @ *2015-08-17T19:39:51Z* - - - **PR** `#26376`_: (*TheBigBear*) minor edit spelling - | refs: `#26392`_ - -- **PR** `#26342`_: (*rallytime*) Don't call boto_elb._attributes_present if no attributes were provided - @ *2015-08-17T19:19:08Z* - - - **ISSUE** `#16049`_: (*ryan-lane*) boto_elb.present state requires attributes argument - | refs: `#26342`_ - -- **PR** `#26389`_: (*rallytime*) Back-port `#26160`_ to 2015.5 - @ *2015-08-17T19:09:16Z* - - - **ISSUE** `#26155`_: (*silenius*) pip availability in states/pip_state - | refs: `#26160`_ - - **PR** `#26160`_: (*silenius*) proposed fix for `#26155`_ - | refs: `#26389`_ - -- **PR** `#26300`_: (*jfindlay*) mock pwd function calls in pw_user exec module - @ *2015-08-17T18:56:41Z* - - - **ISSUE** `#26266`_: (*o-sleep*) limit pw_user.getent() from returning entire corporate list - | refs: `#26300`_ - -- **PR** `#26386`_: (*jahamn*) Fixes autosign_timeout usage in check_autosign_dir - @ *2015-08-17T18:34:40Z* - - - **ISSUE** `#24334`_: (*afletch*) autosign_timeout not honoured - | refs: `#26386`_ - -- **PR** `#26328`_: (*twangboy*) Removed salt-master role requirement - | refs: `#26402`_ - @ *2015-08-17T18:30:17Z* - - - **ISSUE** `#25801`_: (*themalkolm*) Update docs that salt.states.winrepo requires `roles:salt-master` in grains. - | refs: `#26328`_ - - **ISSUE** `#25562`_: (*jefftucker*) winrepo state does not run on masterless minion - | refs: `#26328`_ - -- **PR** `#26362`_: (*garethgreenaway*) Fixes to mount state. - @ *2015-08-17T17:44:55Z* - - - **ISSUE** `#26327`_: (*bradthurber*) mount.mounted opts incorrect "forced unmount and mount because options (tcp) changed" - | refs: `#26362`_ - -- **PR** `#26379`_: (*s0undt3ch*) [2015.5] Backport `#26353`_ - @ *2015-08-17T17:19:29Z* - - - **PR** `#26353`_: (*sixninetynine*) fixed a typo in setup.py - | refs: `#26379`_ - -- **PR** `#26277`_: (*rallytime*) Handle exception when user is not found in keystone.user_get - @ *2015-08-14T19:41:59Z* - - - **ISSUE** `#26240`_: (*0xf10e*) keystone.user_get raises exception when user is not found - | refs: `#26277`_ - -- **PR** `#26326`_: (*rallytime*) Make ec2.create_snapshot return less unweildly and more relevant - @ *2015-08-14T19:40:47Z* - - - **ISSUE** `#24484`_: (*codehotter*) clouds/ec2.py: create_snapshot throws exception - | refs: `#26326`_ - -- **PR** `#26306`_: (*rallytime*) Move VM creation details dict to log.trace - @ *2015-08-14T17:39:52Z* - - - **ISSUE** `#16179`_: (*UtahDave*) Salt Cloud -l debug includes the entire bootstrap script twice in its output - | refs: `#26306`_ - -.. _`#1`: https://github.com/saltstack/salt/issues/1 -.. _`#11474`: https://github.com/saltstack/salt/issues/11474 -.. _`#12255`: https://github.com/saltstack/salt/issues/12255 -.. _`#13943`: https://github.com/saltstack/salt/issues/13943 -.. _`#14690`: https://github.com/saltstack/salt/pull/14690 -.. _`#15209`: https://github.com/saltstack/salt/issues/15209 -.. _`#18447`: https://github.com/saltstack/salt/issues/18447 -.. _`#1846`: https://github.com/saltstack/salt/issues/1846 -.. _`#18808`: https://github.com/saltstack/salt/issues/18808 -.. _`#18919`: https://github.com/saltstack/salt/issues/18919 -.. _`#19262`: https://github.com/saltstack/salt/issues/19262 -.. _`#19288`: https://github.com/saltstack/salt/issues/19288 -.. _`#19532`: https://github.com/saltstack/salt/issues/19532 -.. _`#2`: https://github.com/saltstack/salt/issues/2 -.. _`#20039`: https://github.com/saltstack/salt/pull/20039 -.. _`#2015`: https://github.com/saltstack/salt/pull/2015 -.. _`#20441`: https://github.com/saltstack/salt/issues/20441 -.. _`#20972`: https://github.com/saltstack/salt/pull/20972 -.. _`#21041`: https://github.com/saltstack/salt/issues/21041 -.. _`#21082`: https://github.com/saltstack/salt/issues/21082 -.. _`#21296`: https://github.com/saltstack/salt/issues/21296 -.. _`#21879`: https://github.com/saltstack/salt/issues/21879 -.. _`#21880`: https://github.com/saltstack/salt/pull/21880 -.. _`#21912`: https://github.com/saltstack/salt/issues/21912 -.. _`#22241`: https://github.com/saltstack/salt/issues/22241 -.. _`#22460`: https://github.com/saltstack/salt/issues/22460 -.. _`#22699`: https://github.com/saltstack/salt/issues/22699 -.. _`#23288`: https://github.com/saltstack/salt/issues/23288 -.. _`#23574`: https://github.com/saltstack/salt/issues/23574 -.. _`#23626`: https://github.com/saltstack/salt/issues/23626 -.. _`#23719`: https://github.com/saltstack/salt/pull/23719 -.. _`#23764`: https://github.com/saltstack/salt/issues/23764 -.. _`#23788`: https://github.com/saltstack/salt/issues/23788 -.. _`#23822`: https://github.com/saltstack/salt/issues/23822 -.. _`#24002`: https://github.com/saltstack/salt/issues/24002 -.. _`#24036`: https://github.com/saltstack/salt/issues/24036 -.. _`#24042`: https://github.com/saltstack/salt/issues/24042 -.. _`#24054`: https://github.com/saltstack/salt/pull/24054 -.. _`#24106`: https://github.com/saltstack/salt/issues/24106 -.. _`#24272`: https://github.com/saltstack/salt/issues/24272 -.. _`#24301`: https://github.com/saltstack/salt/issues/24301 -.. _`#24329`: https://github.com/saltstack/salt/pull/24329 -.. _`#24331`: https://github.com/saltstack/salt/pull/24331 -.. _`#24361`: https://github.com/saltstack/salt/pull/24361 -.. _`#24362`: https://github.com/saltstack/salt/pull/24362 -.. _`#24421`: https://github.com/saltstack/salt/pull/24421 -.. _`#24433`: https://github.com/saltstack/salt/issues/24433 -.. _`#24444`: https://github.com/saltstack/salt/issues/24444 -.. _`#24460`: https://github.com/saltstack/salt/issues/24460 -.. _`#24483`: https://github.com/saltstack/salt/issues/24483 -.. _`#24484`: https://github.com/saltstack/salt/issues/24484 -.. _`#24520`: https://github.com/saltstack/salt/issues/24520 -.. _`#24647`: https://github.com/saltstack/salt/issues/24647 -.. _`#24737`: https://github.com/saltstack/salt/pull/24737 -.. _`#24798`: https://github.com/saltstack/salt/pull/24798 -.. _`#24827`: https://github.com/saltstack/salt/issues/24827 -.. _`#24882`: https://github.com/saltstack/salt/issues/24882 -.. _`#24920`: https://github.com/saltstack/salt/issues/24920 -.. _`#24927`: https://github.com/saltstack/salt/pull/24927 -.. _`#24979`: https://github.com/saltstack/salt/issues/24979 -.. _`#24982`: https://github.com/saltstack/salt/pull/24982 -.. _`#25001`: https://github.com/saltstack/salt/pull/25001 -.. _`#25016`: https://github.com/saltstack/salt/issues/25016 -.. _`#25019`: https://github.com/saltstack/salt/pull/25019 -.. _`#25020`: https://github.com/saltstack/salt/pull/25020 -.. _`#25026`: https://github.com/saltstack/salt/issues/25026 -.. _`#25049`: https://github.com/saltstack/salt/pull/25049 -.. _`#25059`: https://github.com/saltstack/salt/pull/25059 -.. _`#25069`: https://github.com/saltstack/salt/pull/25069 -.. _`#25087`: https://github.com/saltstack/salt/pull/25087 -.. _`#25088`: https://github.com/saltstack/salt/pull/25088 -.. _`#25093`: https://github.com/saltstack/salt/pull/25093 -.. _`#25102`: https://github.com/saltstack/salt/pull/25102 -.. _`#25114`: https://github.com/saltstack/salt/pull/25114 -.. _`#25117`: https://github.com/saltstack/salt/pull/25117 -.. _`#25120`: https://github.com/saltstack/salt/pull/25120 -.. _`#25128`: https://github.com/saltstack/salt/pull/25128 -.. _`#25129`: https://github.com/saltstack/salt/pull/25129 -.. _`#25144`: https://github.com/saltstack/salt/issues/25144 -.. _`#25149`: https://github.com/saltstack/salt/pull/25149 -.. _`#25151`: https://github.com/saltstack/salt/pull/25151 -.. _`#25153`: https://github.com/saltstack/salt/issues/25153 -.. _`#25154`: https://github.com/saltstack/salt/issues/25154 -.. _`#25161`: https://github.com/saltstack/salt/pull/25161 -.. _`#25166`: https://github.com/saltstack/salt/pull/25166 -.. _`#25170`: https://github.com/saltstack/salt/pull/25170 -.. _`#25171`: https://github.com/saltstack/salt/pull/25171 -.. _`#25173`: https://github.com/saltstack/salt/pull/25173 -.. _`#25175`: https://github.com/saltstack/salt/pull/25175 -.. _`#25179`: https://github.com/saltstack/salt/pull/25179 -.. _`#25180`: https://github.com/saltstack/salt/pull/25180 -.. _`#25181`: https://github.com/saltstack/salt/pull/25181 -.. _`#25182`: https://github.com/saltstack/salt/pull/25182 -.. _`#25185`: https://github.com/saltstack/salt/pull/25185 -.. _`#25187`: https://github.com/saltstack/salt/pull/25187 -.. _`#25191`: https://github.com/saltstack/salt/pull/25191 -.. _`#25192`: https://github.com/saltstack/salt/issues/25192 -.. _`#25194`: https://github.com/saltstack/salt/pull/25194 -.. _`#25196`: https://github.com/saltstack/salt/pull/25196 -.. _`#25205`: https://github.com/saltstack/salt/pull/25205 -.. _`#25206`: https://github.com/saltstack/salt/issues/25206 -.. _`#25214`: https://github.com/saltstack/salt/pull/25214 -.. _`#25223`: https://github.com/saltstack/salt/issues/25223 -.. _`#25225`: https://github.com/saltstack/salt/pull/25225 -.. _`#25229`: https://github.com/saltstack/salt/issues/25229 -.. _`#25238`: https://github.com/saltstack/salt/pull/25238 -.. _`#25240`: https://github.com/saltstack/salt/pull/25240 -.. _`#25250`: https://github.com/saltstack/salt/issues/25250 -.. _`#25256`: https://github.com/saltstack/salt/pull/25256 -.. _`#25258`: https://github.com/saltstack/salt/issues/25258 -.. _`#25268`: https://github.com/saltstack/salt/issues/25268 -.. _`#25269`: https://github.com/saltstack/salt/pull/25269 -.. _`#25270`: https://github.com/saltstack/salt/issues/25270 -.. _`#25272`: https://github.com/saltstack/salt/pull/25272 -.. _`#25274`: https://github.com/saltstack/salt/pull/25274 -.. _`#25277`: https://github.com/saltstack/salt/issues/25277 -.. _`#25279`: https://github.com/saltstack/salt/pull/25279 -.. _`#25281`: https://github.com/saltstack/salt/issues/25281 -.. _`#25290`: https://github.com/saltstack/salt/pull/25290 -.. _`#25299`: https://github.com/saltstack/salt/pull/25299 -.. _`#25301`: https://github.com/saltstack/salt/pull/25301 -.. _`#25308`: https://github.com/saltstack/salt/pull/25308 -.. _`#25309`: https://github.com/saltstack/salt/pull/25309 -.. _`#25320`: https://github.com/saltstack/salt/issues/25320 -.. _`#25322`: https://github.com/saltstack/salt/pull/25322 -.. _`#25323`: https://github.com/saltstack/salt/issues/25323 -.. _`#25324`: https://github.com/saltstack/salt/pull/25324 -.. _`#25326`: https://github.com/saltstack/salt/pull/25326 -.. _`#25327`: https://github.com/saltstack/salt/pull/25327 -.. _`#25328`: https://github.com/saltstack/salt/pull/25328 -.. _`#25334`: https://github.com/saltstack/salt/pull/25334 -.. _`#25336`: https://github.com/saltstack/salt/pull/25336 -.. _`#25337`: https://github.com/saltstack/salt/issues/25337 -.. _`#25339`: https://github.com/saltstack/salt/pull/25339 -.. _`#25346`: https://github.com/saltstack/salt/pull/25346 -.. _`#25350`: https://github.com/saltstack/salt/pull/25350 -.. _`#25351`: https://github.com/saltstack/salt/issues/25351 -.. _`#25352`: https://github.com/saltstack/salt/issues/25352 -.. _`#25358`: https://github.com/saltstack/salt/pull/25358 -.. _`#25369`: https://github.com/saltstack/salt/pull/25369 -.. _`#25375`: https://github.com/saltstack/salt/pull/25375 -.. _`#25379`: https://github.com/saltstack/salt/pull/25379 -.. _`#25383`: https://github.com/saltstack/salt/pull/25383 -.. _`#25384`: https://github.com/saltstack/salt/issues/25384 -.. _`#25386`: https://github.com/saltstack/salt/pull/25386 -.. _`#25389`: https://github.com/saltstack/salt/pull/25389 -.. _`#25392`: https://github.com/saltstack/salt/pull/25392 -.. _`#25395`: https://github.com/saltstack/salt/pull/25395 -.. _`#25397`: https://github.com/saltstack/salt/pull/25397 -.. _`#25398`: https://github.com/saltstack/salt/pull/25398 -.. _`#25399`: https://github.com/saltstack/salt/pull/25399 -.. _`#25404`: https://github.com/saltstack/salt/pull/25404 -.. _`#25406`: https://github.com/saltstack/salt/pull/25406 -.. _`#25408`: https://github.com/saltstack/salt/pull/25408 -.. _`#25411`: https://github.com/saltstack/salt/pull/25411 -.. _`#25413`: https://github.com/saltstack/salt/issues/25413 -.. _`#25416`: https://github.com/saltstack/salt/pull/25416 -.. _`#25417`: https://github.com/saltstack/salt/pull/25417 -.. _`#25418`: https://github.com/saltstack/salt/pull/25418 -.. _`#25420`: https://github.com/saltstack/salt/pull/25420 -.. _`#25426`: https://github.com/saltstack/salt/pull/25426 -.. _`#25427`: https://github.com/saltstack/salt/pull/25427 -.. _`#25428`: https://github.com/saltstack/salt/pull/25428 -.. _`#25430`: https://github.com/saltstack/salt/pull/25430 -.. _`#25431`: https://github.com/saltstack/salt/issues/25431 -.. _`#25432`: https://github.com/saltstack/salt/issues/25432 -.. _`#25433`: https://github.com/saltstack/salt/pull/25433 -.. _`#25435`: https://github.com/saltstack/salt/issues/25435 -.. _`#25437`: https://github.com/saltstack/salt/issues/25437 -.. _`#25438`: https://github.com/saltstack/salt/pull/25438 -.. _`#25447`: https://github.com/saltstack/salt/issues/25447 -.. _`#25454`: https://github.com/saltstack/salt/issues/25454 -.. _`#25456`: https://github.com/saltstack/salt/issues/25456 -.. _`#25457`: https://github.com/saltstack/salt/pull/25457 -.. _`#25459`: https://github.com/saltstack/salt/pull/25459 -.. _`#25461`: https://github.com/saltstack/salt/pull/25461 -.. _`#25464`: https://github.com/saltstack/salt/pull/25464 -.. _`#25465`: https://github.com/saltstack/salt/pull/25465 -.. _`#25467`: https://github.com/saltstack/salt/pull/25467 -.. _`#25468`: https://github.com/saltstack/salt/pull/25468 -.. _`#25478`: https://github.com/saltstack/salt/issues/25478 -.. _`#25479`: https://github.com/saltstack/salt/issues/25479 -.. _`#25482`: https://github.com/saltstack/salt/pull/25482 -.. _`#25483`: https://github.com/saltstack/salt/pull/25483 -.. _`#25485`: https://github.com/saltstack/salt/pull/25485 -.. _`#25486`: https://github.com/saltstack/salt/issues/25486 -.. _`#25487`: https://github.com/saltstack/salt/pull/25487 -.. _`#25493`: https://github.com/saltstack/salt/issues/25493 -.. _`#25498`: https://github.com/saltstack/salt/pull/25498 -.. _`#25506`: https://github.com/saltstack/salt/pull/25506 -.. _`#25511`: https://github.com/saltstack/salt/issues/25511 -.. _`#25513`: https://github.com/saltstack/salt/pull/25513 -.. _`#25516`: https://github.com/saltstack/salt/pull/25516 -.. _`#25517`: https://github.com/saltstack/salt/pull/25517 -.. _`#25519`: https://github.com/saltstack/salt/pull/25519 -.. _`#25521`: https://github.com/saltstack/salt/pull/25521 -.. _`#25525`: https://github.com/saltstack/salt/pull/25525 -.. _`#25528`: https://github.com/saltstack/salt/pull/25528 -.. _`#25529`: https://github.com/saltstack/salt/pull/25529 -.. _`#25530`: https://github.com/saltstack/salt/pull/25530 -.. _`#25531`: https://github.com/saltstack/salt/pull/25531 -.. _`#25532`: https://github.com/saltstack/salt/issues/25532 -.. _`#25533`: https://github.com/saltstack/salt/pull/25533 -.. _`#25538`: https://github.com/saltstack/salt/issues/25538 -.. _`#25540`: https://github.com/saltstack/salt/issues/25540 -.. _`#25542`: https://github.com/saltstack/salt/pull/25542 -.. _`#25551`: https://github.com/saltstack/salt/pull/25551 -.. _`#25554`: https://github.com/saltstack/salt/pull/25554 -.. _`#25556`: https://github.com/saltstack/salt/pull/25556 -.. _`#25559`: https://github.com/saltstack/salt/pull/25559 -.. _`#25560`: https://github.com/saltstack/salt/issues/25560 -.. _`#25561`: https://github.com/saltstack/salt/pull/25561 -.. _`#25563`: https://github.com/saltstack/salt/pull/25563 -.. _`#25568`: https://github.com/saltstack/salt/pull/25568 -.. _`#25573`: https://github.com/saltstack/salt/pull/25573 -.. _`#25576`: https://github.com/saltstack/salt/pull/25576 -.. _`#25577`: https://github.com/saltstack/salt/issues/25577 -.. _`#25580`: https://github.com/saltstack/salt/pull/25580 -.. _`#25584`: https://github.com/saltstack/salt/pull/25584 -.. _`#25589`: https://github.com/saltstack/salt/pull/25589 -.. _`#25590`: https://github.com/saltstack/salt/pull/25590 -.. _`#25598`: https://github.com/saltstack/salt/pull/25598 -.. _`#25603`: https://github.com/saltstack/salt/pull/25603 -.. _`#25604`: https://github.com/saltstack/salt/pull/25604 -.. _`#25608`: https://github.com/saltstack/salt/pull/25608 -.. _`#25609`: https://github.com/saltstack/salt/pull/25609 -.. _`#25616`: https://github.com/saltstack/salt/issues/25616 -.. _`#25618`: https://github.com/saltstack/salt/issues/25618 -.. _`#25624`: https://github.com/saltstack/salt/pull/25624 -.. _`#25625`: https://github.com/saltstack/salt/issues/25625 -.. _`#25633`: https://github.com/saltstack/salt/pull/25633 -.. _`#25638`: https://github.com/saltstack/salt/pull/25638 -.. _`#25642`: https://github.com/saltstack/salt/pull/25642 -.. _`#25644`: https://github.com/saltstack/salt/pull/25644 -.. _`#25645`: https://github.com/saltstack/salt/pull/25645 -.. _`#25648`: https://github.com/saltstack/salt/pull/25648 -.. _`#25650`: https://github.com/saltstack/salt/issues/25650 -.. _`#25656`: https://github.com/saltstack/salt/pull/25656 -.. _`#25657`: https://github.com/saltstack/salt/pull/25657 -.. _`#25659`: https://github.com/saltstack/salt/pull/25659 -.. _`#25660`: https://github.com/saltstack/salt/pull/25660 -.. _`#25661`: https://github.com/saltstack/salt/pull/25661 -.. _`#25662`: https://github.com/saltstack/salt/pull/25662 -.. _`#25665`: https://github.com/saltstack/salt/issues/25665 -.. _`#25666`: https://github.com/saltstack/salt/pull/25666 -.. _`#25671`: https://github.com/saltstack/salt/pull/25671 -.. _`#25674`: https://github.com/saltstack/salt/issues/25674 -.. _`#25675`: https://github.com/saltstack/salt/pull/25675 -.. _`#25676`: https://github.com/saltstack/salt/pull/25676 -.. _`#25677`: https://github.com/saltstack/salt/pull/25677 -.. _`#25680`: https://github.com/saltstack/salt/pull/25680 -.. _`#25682`: https://github.com/saltstack/salt/pull/25682 -.. _`#25685`: https://github.com/saltstack/salt/pull/25685 -.. _`#25688`: https://github.com/saltstack/salt/pull/25688 -.. _`#25689`: https://github.com/saltstack/salt/issues/25689 -.. _`#25694`: https://github.com/saltstack/salt/pull/25694 -.. _`#25695`: https://github.com/saltstack/salt/pull/25695 -.. _`#25696`: https://github.com/saltstack/salt/pull/25696 -.. _`#25698`: https://github.com/saltstack/salt/pull/25698 -.. _`#25699`: https://github.com/saltstack/salt/pull/25699 -.. _`#25701`: https://github.com/saltstack/salt/issues/25701 -.. _`#25702`: https://github.com/saltstack/salt/pull/25702 -.. _`#25703`: https://github.com/saltstack/salt/pull/25703 -.. _`#25704`: https://github.com/saltstack/salt/pull/25704 -.. _`#25705`: https://github.com/saltstack/salt/pull/25705 -.. _`#25709`: https://github.com/saltstack/salt/pull/25709 -.. _`#25710`: https://github.com/saltstack/salt/pull/25710 -.. _`#25711`: https://github.com/saltstack/salt/pull/25711 -.. _`#25714`: https://github.com/saltstack/salt/pull/25714 -.. _`#25717`: https://github.com/saltstack/salt/issues/25717 -.. _`#25722`: https://github.com/saltstack/salt/pull/25722 -.. _`#25730`: https://github.com/saltstack/salt/pull/25730 -.. _`#25733`: https://github.com/saltstack/salt/pull/25733 -.. _`#25737`: https://github.com/saltstack/salt/pull/25737 -.. _`#25738`: https://github.com/saltstack/salt/pull/25738 -.. _`#25739`: https://github.com/saltstack/salt/pull/25739 -.. _`#25740`: https://github.com/saltstack/salt/pull/25740 -.. _`#25749`: https://github.com/saltstack/salt/pull/25749 -.. _`#25750`: https://github.com/saltstack/salt/pull/25750 -.. _`#25751`: https://github.com/saltstack/salt/issues/25751 -.. _`#25752`: https://github.com/saltstack/salt/pull/25752 -.. _`#25755`: https://github.com/saltstack/salt/pull/25755 -.. _`#25763`: https://github.com/saltstack/salt/pull/25763 -.. _`#25788`: https://github.com/saltstack/salt/pull/25788 -.. _`#25792`: https://github.com/saltstack/salt/pull/25792 -.. _`#25793`: https://github.com/saltstack/salt/pull/25793 -.. _`#25796`: https://github.com/saltstack/salt/pull/25796 -.. _`#25797`: https://github.com/saltstack/salt/pull/25797 -.. _`#25798`: https://github.com/saltstack/salt/pull/25798 -.. _`#25801`: https://github.com/saltstack/salt/issues/25801 -.. _`#25802`: https://github.com/saltstack/salt/issues/25802 -.. _`#25807`: https://github.com/saltstack/salt/pull/25807 -.. _`#25809`: https://github.com/saltstack/salt/issues/25809 -.. _`#25810`: https://github.com/saltstack/salt/issues/25810 -.. _`#25818`: https://github.com/saltstack/salt/pull/25818 -.. _`#25824`: https://github.com/saltstack/salt/pull/25824 -.. _`#25826`: https://github.com/saltstack/salt/pull/25826 -.. _`#25827`: https://github.com/saltstack/salt/issues/25827 -.. _`#25829`: https://github.com/saltstack/salt/pull/25829 -.. _`#25831`: https://github.com/saltstack/salt/pull/25831 -.. _`#25833`: https://github.com/saltstack/salt/pull/25833 -.. _`#25838`: https://github.com/saltstack/salt/issues/25838 -.. _`#25839`: https://github.com/saltstack/salt/issues/25839 -.. _`#25840`: https://github.com/saltstack/salt/pull/25840 -.. _`#25846`: https://github.com/saltstack/salt/pull/25846 -.. _`#25848`: https://github.com/saltstack/salt/pull/25848 -.. _`#25850`: https://github.com/saltstack/salt/issues/25850 -.. _`#25852`: https://github.com/saltstack/salt/issues/25852 -.. _`#25853`: https://github.com/saltstack/salt/pull/25853 -.. _`#25855`: https://github.com/saltstack/salt/pull/25855 -.. _`#25856`: https://github.com/saltstack/salt/pull/25856 -.. _`#25862`: https://github.com/saltstack/salt/pull/25862 -.. _`#25863`: https://github.com/saltstack/salt/issues/25863 -.. _`#25864`: https://github.com/saltstack/salt/pull/25864 -.. _`#25869`: https://github.com/saltstack/salt/pull/25869 -.. _`#25870`: https://github.com/saltstack/salt/pull/25870 -.. _`#25871`: https://github.com/saltstack/salt/pull/25871 -.. _`#25873`: https://github.com/saltstack/salt/pull/25873 -.. _`#25875`: https://github.com/saltstack/salt/pull/25875 -.. _`#25877`: https://github.com/saltstack/salt/pull/25877 -.. _`#25885`: https://github.com/saltstack/salt/pull/25885 -.. _`#25890`: https://github.com/saltstack/salt/pull/25890 -.. _`#25892`: https://github.com/saltstack/salt/pull/25892 -.. _`#25894`: https://github.com/saltstack/salt/pull/25894 -.. _`#25895`: https://github.com/saltstack/salt/pull/25895 -.. _`#25898`: https://github.com/saltstack/salt/pull/25898 -.. _`#25905`: https://github.com/saltstack/salt/pull/25905 -.. _`#25915`: https://github.com/saltstack/salt/issues/25915 -.. _`#25917`: https://github.com/saltstack/salt/pull/25917 -.. _`#25919`: https://github.com/saltstack/salt/pull/25919 -.. _`#25921`: https://github.com/saltstack/salt/pull/25921 -.. _`#25927`: https://github.com/saltstack/salt/pull/25927 -.. _`#25938`: https://github.com/saltstack/salt/pull/25938 -.. _`#25941`: https://github.com/saltstack/salt/pull/25941 -.. _`#25942`: https://github.com/saltstack/salt/pull/25942 -.. _`#25948`: https://github.com/saltstack/salt/issues/25948 -.. _`#25949`: https://github.com/saltstack/salt/issues/25949 -.. _`#25951`: https://github.com/saltstack/salt/pull/25951 -.. _`#25958`: https://github.com/saltstack/salt/issues/25958 -.. _`#25961`: https://github.com/saltstack/salt/issues/25961 -.. _`#25966`: https://github.com/saltstack/salt/pull/25966 -.. _`#25967`: https://github.com/saltstack/salt/pull/25967 -.. _`#25970`: https://github.com/saltstack/salt/pull/25970 -.. _`#25971`: https://github.com/saltstack/salt/pull/25971 -.. _`#25976`: https://github.com/saltstack/salt/pull/25976 -.. _`#25982`: https://github.com/saltstack/salt/issues/25982 -.. _`#25983`: https://github.com/saltstack/salt/issues/25983 -.. _`#25984`: https://github.com/saltstack/salt/pull/25984 -.. _`#25990`: https://github.com/saltstack/salt/pull/25990 -.. _`#25992`: https://github.com/saltstack/salt/pull/25992 -.. _`#25994`: https://github.com/saltstack/salt/issues/25994 -.. _`#25996`: https://github.com/saltstack/salt/pull/25996 -.. _`#25998`: https://github.com/saltstack/salt/issues/25998 -.. _`#26000`: https://github.com/saltstack/salt/pull/26000 -.. _`#26002`: https://github.com/saltstack/salt/pull/26002 -.. _`#26016`: https://github.com/saltstack/salt/pull/26016 -.. _`#26020`: https://github.com/saltstack/salt/pull/26020 -.. _`#26021`: https://github.com/saltstack/salt/pull/26021 -.. _`#26024`: https://github.com/saltstack/salt/issues/26024 -.. _`#26030`: https://github.com/saltstack/salt/pull/26030 -.. _`#26031`: https://github.com/saltstack/salt/pull/26031 -.. _`#26032`: https://github.com/saltstack/salt/pull/26032 -.. _`#26036`: https://github.com/saltstack/salt/pull/26036 -.. _`#26039`: https://github.com/saltstack/salt/issues/26039 -.. _`#26042`: https://github.com/saltstack/salt/pull/26042 -.. _`#26044`: https://github.com/saltstack/salt/pull/26044 -.. _`#26047`: https://github.com/saltstack/salt/pull/26047 -.. _`#26048`: https://github.com/saltstack/salt/pull/26048 -.. _`#26058`: https://github.com/saltstack/salt/pull/26058 -.. _`#26061`: https://github.com/saltstack/salt/pull/26061 -.. _`#26063`: https://github.com/saltstack/salt/issues/26063 -.. _`#26064`: https://github.com/saltstack/salt/pull/26064 -.. _`#26065`: https://github.com/saltstack/salt/pull/26065 -.. _`#26068`: https://github.com/saltstack/salt/pull/26068 -.. _`#26079`: https://github.com/saltstack/salt/pull/26079 -.. _`#26080`: https://github.com/saltstack/salt/pull/26080 -.. _`#26084`: https://github.com/saltstack/salt/pull/26084 -.. _`#26088`: https://github.com/saltstack/salt/pull/26088 -.. _`#26093`: https://github.com/saltstack/salt/issues/26093 -.. _`#26098`: https://github.com/saltstack/salt/issues/26098 -.. _`#26101`: https://github.com/saltstack/salt/pull/26101 -.. _`#26106`: https://github.com/saltstack/salt/pull/26106 -.. _`#26110`: https://github.com/saltstack/salt/pull/26110 -.. _`#26111`: https://github.com/saltstack/salt/pull/26111 -.. _`#26112`: https://github.com/saltstack/salt/issues/26112 -.. _`#26116`: https://github.com/saltstack/salt/pull/26116 -.. _`#26119`: https://github.com/saltstack/salt/pull/26119 -.. _`#26127`: https://github.com/saltstack/salt/pull/26127 -.. _`#26132`: https://github.com/saltstack/salt/pull/26132 -.. _`#26133`: https://github.com/saltstack/salt/pull/26133 -.. _`#26135`: https://github.com/saltstack/salt/pull/26135 -.. _`#26137`: https://github.com/saltstack/salt/pull/26137 -.. _`#26140`: https://github.com/saltstack/salt/pull/26140 -.. _`#26141`: https://github.com/saltstack/salt/issues/26141 -.. _`#26147`: https://github.com/saltstack/salt/pull/26147 -.. _`#26153`: https://github.com/saltstack/salt/pull/26153 -.. _`#26162`: https://github.com/saltstack/salt/issues/26162 -.. _`#26163`: https://github.com/saltstack/salt/pull/26163 -.. _`#26168`: https://github.com/saltstack/salt/pull/26168 -.. _`#26172`: https://github.com/saltstack/salt/pull/26172 -.. _`#26175`: https://github.com/saltstack/salt/pull/26175 -.. _`#26177`: https://github.com/saltstack/salt/pull/26177 -.. _`#26179`: https://github.com/saltstack/salt/pull/26179 -.. _`#26180`: https://github.com/saltstack/salt/pull/26180 -.. _`#26182`: https://github.com/saltstack/salt/pull/26182 -.. _`#26183`: https://github.com/saltstack/salt/pull/26183 -.. _`#26186`: https://github.com/saltstack/salt/pull/26186 -.. _`#26207`: https://github.com/saltstack/salt/issues/26207 -.. _`#26219`: https://github.com/saltstack/salt/pull/26219 -.. _`#26232`: https://github.com/saltstack/salt/pull/26232 -.. _`#26237`: https://github.com/saltstack/salt/pull/26237 -.. _`#26239`: https://github.com/saltstack/salt/pull/26239 -.. _`#26246`: https://github.com/saltstack/salt/pull/26246 -.. _`#26247`: https://github.com/saltstack/salt/pull/26247 -.. _`#26257`: https://github.com/saltstack/salt/pull/26257 -.. _`#26258`: https://github.com/saltstack/salt/pull/26258 -.. _`#26261`: https://github.com/saltstack/salt/pull/26261 -.. _`#26263`: https://github.com/saltstack/salt/pull/26263 -.. _`#26265`: https://github.com/saltstack/salt/pull/26265 -.. _`#26268`: https://github.com/saltstack/salt/pull/26268 -.. _`#26271`: https://github.com/saltstack/salt/pull/26271 -.. _`#26273`: https://github.com/saltstack/salt/pull/26273 -.. _`#26275`: https://github.com/saltstack/salt/pull/26275 -.. _`#26285`: https://github.com/saltstack/salt/pull/26285 -.. _`#26288`: https://github.com/saltstack/salt/pull/26288 -.. _`#26290`: https://github.com/saltstack/salt/pull/26290 -.. _`#26292`: https://github.com/saltstack/salt/pull/26292 -.. _`#26293`: https://github.com/saltstack/salt/pull/26293 -.. _`#26296`: https://github.com/saltstack/salt/pull/26296 -.. _`#3`: https://github.com/saltstack/salt/issues/3 -.. _`#455`: https://github.com/saltstack/salt/issues/455 -.. _`#598`: https://github.com/saltstack/salt/issues/598 -.. _`#602`: https://github.com/saltstack/salt/pull/602 -.. _`#606`: https://github.com/saltstack/salt/pull/606 -.. _`#607`: https://github.com/saltstack/salt/issues/607 -.. _`#611`: https://github.com/saltstack/salt/issues/611 -.. _`#621`: https://github.com/saltstack/salt/pull/621 -.. _`#624`: https://github.com/saltstack/salt/pull/624 -.. _`#625`: https://github.com/saltstack/salt/issues/625 -.. _`#627`: https://github.com/saltstack/salt/pull/627 -.. _`#630`: https://github.com/saltstack/salt/issues/630 -.. _`#631`: https://github.com/saltstack/salt/issues/631 -.. _`#632`: https://github.com/saltstack/salt/pull/632 -.. _`#633`: https://github.com/saltstack/salt/pull/633 -.. _`#634`: https://github.com/saltstack/salt/issues/634 -.. _`#638`: https://github.com/saltstack/salt/pull/638 -.. _`#640`: https://github.com/saltstack/salt/pull/640 -.. _`bp-20972`: https://github.com/saltstack/salt/pull/20972 -.. _`bp-24054`: https://github.com/saltstack/salt/pull/24054 -.. _`bp-24982`: https://github.com/saltstack/salt/pull/24982 -.. _`bp-25001`: https://github.com/saltstack/salt/pull/25001 -.. _`bp-25019`: https://github.com/saltstack/salt/pull/25019 -.. _`bp-25020`: https://github.com/saltstack/salt/pull/25020 -.. _`bp-25059`: https://github.com/saltstack/salt/pull/25059 -.. _`bp-25088`: https://github.com/saltstack/salt/pull/25088 -.. _`bp-25102`: https://github.com/saltstack/salt/pull/25102 -.. _`bp-25128`: https://github.com/saltstack/salt/pull/25128 -.. _`bp-25256`: https://github.com/saltstack/salt/pull/25256 -.. _`bp-25290`: https://github.com/saltstack/salt/pull/25290 -.. _`bp-25309`: https://github.com/saltstack/salt/pull/25309 -.. _`bp-25389`: https://github.com/saltstack/salt/pull/25389 -.. _`bp-25399`: https://github.com/saltstack/salt/pull/25399 -.. _`bp-25404`: https://github.com/saltstack/salt/pull/25404 -.. _`bp-25464`: https://github.com/saltstack/salt/pull/25464 -.. _`bp-25483`: https://github.com/saltstack/salt/pull/25483 -.. _`bp-25485`: https://github.com/saltstack/salt/pull/25485 -.. _`bp-25529`: https://github.com/saltstack/salt/pull/25529 -.. _`bp-25530`: https://github.com/saltstack/salt/pull/25530 -.. _`bp-25608`: https://github.com/saltstack/salt/pull/25608 -.. _`bp-25624`: https://github.com/saltstack/salt/pull/25624 -.. _`bp-25638`: https://github.com/saltstack/salt/pull/25638 -.. _`bp-25660`: https://github.com/saltstack/salt/pull/25660 -.. _`bp-25671`: https://github.com/saltstack/salt/pull/25671 -.. _`bp-25688`: https://github.com/saltstack/salt/pull/25688 -.. _`bp-25696`: https://github.com/saltstack/salt/pull/25696 -.. _`bp-25709`: https://github.com/saltstack/salt/pull/25709 -.. _`bp-25722`: https://github.com/saltstack/salt/pull/25722 -.. _`bp-25730`: https://github.com/saltstack/salt/pull/25730 -.. _`bp-25788`: https://github.com/saltstack/salt/pull/25788 -.. _`bp-25824`: https://github.com/saltstack/salt/pull/25824 -.. _`bp-25829`: https://github.com/saltstack/salt/pull/25829 -.. _`bp-25855`: https://github.com/saltstack/salt/pull/25855 -.. _`bp-25862`: https://github.com/saltstack/salt/pull/25862 -.. _`bp-25864`: https://github.com/saltstack/salt/pull/25864 -.. _`bp-25892`: https://github.com/saltstack/salt/pull/25892 -.. _`bp-25917`: https://github.com/saltstack/salt/pull/25917 -.. _`bp-25976`: https://github.com/saltstack/salt/pull/25976 -.. _`bp-25984`: https://github.com/saltstack/salt/pull/25984 -.. _`bp-26147`: https://github.com/saltstack/salt/pull/26147 -.. _`bp-26153`: https://github.com/saltstack/salt/pull/26153 -.. _`bp-26237`: https://github.com/saltstack/salt/pull/26237 -.. _`fix-11474`: https://github.com/saltstack/salt/issues/11474 -.. _`fix-2015`: https://github.com/saltstack/salt/pull/2015 -.. _`fix-22699`: https://github.com/saltstack/salt/issues/22699 -.. _`fix-24036`: https://github.com/saltstack/salt/issues/24036 -.. _`fix-24272`: https://github.com/saltstack/salt/issues/24272 -.. _`fix-24483`: https://github.com/saltstack/salt/issues/24483 -.. _`fix-24882`: https://github.com/saltstack/salt/issues/24882 -.. _`fix-25192`: https://github.com/saltstack/salt/issues/25192 -.. _`fix-25616`: https://github.com/saltstack/salt/issues/25616 -.. _`fix-26163`: https://github.com/saltstack/salt/pull/26163 .. _`#16049`: https://github.com/saltstack/salt/issues/16049 .. _`#16179`: https://github.com/saltstack/salt/issues/16179 .. _`#24334`: https://github.com/saltstack/salt/issues/24334 +.. _`#24484`: https://github.com/saltstack/salt/issues/24484 .. _`#25562`: https://github.com/saltstack/salt/issues/25562 +.. _`#25801`: https://github.com/saltstack/salt/issues/25801 +.. _`#25998`: https://github.com/saltstack/salt/issues/25998 +.. _`#26000`: https://github.com/saltstack/salt/pull/26000 .. _`#26155`: https://github.com/saltstack/salt/issues/26155 .. _`#26160`: https://github.com/saltstack/salt/pull/26160 .. _`#26161`: https://github.com/saltstack/salt/issues/26161 @@ -2088,11 +427,41 @@ Changes: .. _`#26486`: https://github.com/saltstack/salt/pull/26486 .. _`#26494`: https://github.com/saltstack/salt/pull/26494 .. _`#26496`: https://github.com/saltstack/salt/pull/26496 -.. _`bp-26160`: https://github.com/saltstack/salt/pull/26160 -.. _`bp-26376`: https://github.com/saltstack/salt/pull/26376 -.. _`bp-26417`: https://github.com/saltstack/salt/pull/26417 -.. _`bp-26457`: https://github.com/saltstack/salt/pull/26457 -.. _`fix-16049`: https://github.com/saltstack/salt/issues/16049 -.. _`fix-16179`: https://github.com/saltstack/salt/issues/16179 -.. _`fix-26240`: https://github.com/saltstack/salt/issues/26240 -.. _`fix-26426`: https://github.com/saltstack/salt/issues/26426 +.. _`0xf10e`: https://github.com/0xf10e +.. _`GreatSnoopy`: https://github.com/GreatSnoopy +.. _`TheBigBear`: https://github.com/TheBigBear +.. _`UtahDave`: https://github.com/UtahDave +.. _`adelcast`: https://github.com/adelcast +.. _`afletch`: https://github.com/afletch +.. _`alxbse`: https://github.com/alxbse +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`bailsman`: https://github.com/bailsman +.. _`basepi`: https://github.com/basepi +.. _`bastiaanb`: https://github.com/bastiaanb +.. _`bradthurber`: https://github.com/bradthurber +.. _`cachedout`: https://github.com/cachedout +.. _`centromere`: https://github.com/centromere +.. _`cro`: https://github.com/cro +.. _`dove-young`: https://github.com/dove-young +.. _`driskell`: https://github.com/driskell +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`grep4linux`: https://github.com/grep4linux +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jahamn`: https://github.com/jahamn +.. _`jefftucker`: https://github.com/jefftucker +.. _`jfindlay`: https://github.com/jfindlay +.. _`o-sleep`: https://github.com/o-sleep +.. _`rallytime`: https://github.com/rallytime +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`scottjpack`: https://github.com/scottjpack +.. _`silenius`: https://github.com/silenius +.. _`sixninetynine`: https://github.com/sixninetynine +.. _`ssgward`: https://github.com/ssgward +.. _`stanislavb`: https://github.com/stanislavb +.. _`terminalmage`: https://github.com/terminalmage +.. _`themalkolm`: https://github.com/themalkolm +.. _`thusoy`: https://github.com/thusoy +.. _`twangboy`: https://github.com/twangboy +.. _`vr-jack`: https://github.com/vr-jack +.. _`waynew`: https://github.com/waynew diff --git a/doc/topics/releases/2015.5.6.rst b/doc/topics/releases/2015.5.6.rst index 58b6ce3414..a0f9470edb 100644 --- a/doc/topics/releases/2015.5.6.rst +++ b/doc/topics/releases/2015.5.6.rst @@ -2,305 +2,1489 @@ Salt 2015.5.6 Release Notes =========================== -Version 2015.5.6 is a bugfix release for :ref:`2015.5.0`. +:release: 2015-10-13 + +Version 2015.5.6 is a bugfix release for :ref:`2015.5.0 `. + + +Statistics +========== + +- Total Merges: **145** +- Total Issue References: **71** +- Total PR References: **178** + +- Contributors: **53** (`Arabus`_, `JensRantil`_, `PierreR`_, `SaltyCharles`_, `TheBigBear`_, `abh`_, `aboe76`_, `anlutro`_, `arthurlogilab`_, `aspyatkin`_, `basepi`_, `benhosmer`_, `bersace`_, `cachedout`_, `carlpett`_, `damonzheng`_, `derphilipp`_, `dmyerscough`_, `dsumsky`_, `efficks`_, `eguven`_, `garethgreenaway`_, `hexedpackets`_, `jacksontj`_, `jacobhammons`_, `jfindlay`_, `joejulian`_, `johanek`_, `julianbrost`_, `kev009`_, `lorengordon`_, `madprog`_, `marccardinal`_, `netroby`_, `nmadhok`_, `plastikos`_, `rallytime`_, `serge-p`_, `spudfkc`_, `stanislavb`_, `styro`_, `systembell`_, `tankywoo`_, `techhat`_, `terminalmage`_, `thatch45`_, `tjstansell`_, `twangboy`_, `vakulich`_, `vtek21`_, `whiteinge`_, `zmalone`_, `zyio`_) + Security Fixes --------------- +============== -CVE-2015-6941 - ``win_useradd`` module and ``salt-cloud`` display passwords in debug log +**CVE-2015-6941** The Windows :mod:`user ` module and +``salt-cloud`` display passwords in log when log level is set to ``debug`` +or more verbose. -Updated the ``win_useradd`` module return data to no longer include the password of the newly created user. The password is now replaced with the string ``XXX-REDACTED-XXX``. -Updated the Salt Cloud debug output to no longer display ``win_password`` and ``sudo_password`` authentication credentials. +For the Windows :mod:`user ` module, the password is +now replaced with the string ``XXX-REDACTED-XXX``. -CVE-2015-6918 - Git modules leaking HTTPS auth credentials to debug log +For salt-cloud, debug logging no longer displays ``win_password`` and +``sudo_password`` authentication credentials. -Updated the Git state and execution modules to no longer display HTTPS basic authentication credentials in loglevel debug output on the Salt master. These credentials are now replaced with ``REDACTED`` in the debug output. Thanks to Andreas Stieger for bringing this to our attention. +**CVE-2015-6918** Git state/execution modules log HTTPS auth credentials when +log level is set to ``debug`` or more verbose. -Changes for v2015.5.5..v2015.5.6 --------------------------------- +These credentials are now replaced with ``REDACTED`` in the debug output. +Thanks to Andreas Stieger for bringing this to our +attention. -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): -*Generated at: 2015-09-30T22:22:43Z* +Changelog for v2015.5.5..v2015.5.6 +================================== -Total Merges: **144** +*Generated at: 2018-05-27 22:13:00 UTC* -Changes: +* **PR** `#27582`_: (`jfindlay`_) add 2015.5.6 release notes + @ *2015-09-30 22:33:48 UTC* -- **PR** `#27557`_: (*jfindlay*) add doc motivating mine vs grains + * 304dc68f7f Merge pull request `#27582`_ from jfindlay/2015.5 -- **PR** `#27515`_: (*jfindlay*) save iptables rules on SuSE + * 4f0d55cda6 add 2015.5.6 release notes -- **PR** `#27509`_: (*jfindlay*) tell the user why the gluster module does not work +* **ISSUE** `#27518`_: (`srkunze`_) [Docs] Relationship between Mine and Grains (refs: `#27557`_) -- **PR** `#27379`_: (*jfindlay*) document and check dict type for pip env_vars +* **PR** `#27557`_: (`jfindlay`_) add doc motivating mine vs grains + @ *2015-09-30 17:49:46 UTC* -- **PR** `#27516`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 + * 7201ce71e4 Merge pull request `#27557`_ from jfindlay/mine_doc -- **PR** `#27472`_: (*cachedout*) Change recommended schema for data field in mysql event table + * 3727d79bad edit mine doc for style and markup -- **PR** `#27468`_: (*cachedout*) Fix 27351 + * 7e037a4666 add doc motivating mine vs grains -- **PR** `#27479`_: (*aboe76*) fix locale on opensuse and suse `#27438`_ +* **ISSUE** `#27478`_: (`rominf`_) iptables state fails to save rules (refs: `#27515`_) -- **PR** `#27483`_: (*rallytime*) Outputters should sync to output, not outputters, on the minion. +* **PR** `#27515`_: (`jfindlay`_) save iptables rules on SuSE + @ *2015-09-30 16:09:42 UTC* -- **PR** `#27484`_: (*rallytime*) Back-port `#27434`_ and `#27470`_ to 2015.5 + * 59c3d5f93e Merge pull request `#27515`_ from jfindlay/suse_fire -- **PR** `#27469`_: (*twangboy*) Added quotes to version numbers example + * 4460ad2785 save iptables rules on SuSE -- **PR** `#27467`_: (*cachedout*) file.managed: check ``contents_{pillar|grain}`` result +* **ISSUE** `#27460`_: (`llevar`_) Orchestrate runner not resolving reference to a built in state (refs: `#27509`_) -- **PR** `#27419`_: (*rallytime*) Amend error log to include multiple tips for troubleshooting. +* **PR** `#27509`_: (`jfindlay`_) tell the user why the gluster module does not work + @ *2015-09-30 15:49:16 UTC* -- **PR** `#27426`_: (*rallytime*) Don't stacktrace if there are conflicting id errors in highstate + * 9b26357b19 Merge pull request `#27509`_ from jfindlay/gluster_reason -- **PR** `#27408`_: (*rallytime*) Fix avail_locations function for the softlayer_hw driver in 2015.5 + * 1ccda538d2 tell the user why the gluster module does not work -- **PR** `#27410`_: (*jacobhammons*) Fix css layout Refs `#27389`_ +* **ISSUE** `#27372`_: (`GregMeno`_) pip.installed state fails when env_vars is not a dict (refs: `#27379`_) -- **PR** `#27336`_: (*rallytime*) [2015.5] Fixup salt-cloud logging +* **PR** `#27379`_: (`jfindlay`_) document and check dict type for pip env_vars + @ *2015-09-30 02:56:52 UTC* -- **PR** `#27358`_: (*lorengordon*) Escape search replacement text, fixes `#27356`_ + * 989733ea86 Merge pull request `#27379`_ from jfindlay/pip_vars -- **PR** `#27345`_: (*rallytime*) Allow use of rst header links by separating options out from yaml example + * aee51ffdef document and check dict type for pip env_vars -- **PR** `#26903`_: (*bersace*) Review defaults.get +* **PR** `#27516`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-09-29 17:53:33 UTC* -- **PR** `#27317`_: (*efficks*) State unzip should use unzip command instead of unzip_cmd. + * 6d773f66c3 Merge pull request `#27516`_ from basepi/merge-forward-2015.5 -- **PR** `#27309`_: (*rallytime*) Change a value list to a comma-separated string in boto_route53.present + * a08951f0fa Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#27311`_: (*jfindlay*) discuss replacement occurrences in file doc + * 5262f01325 Merge pull request `#27335`_ from rallytime/cloud-logging-7 -- **PR** `#27310`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 + * adeb1dcad4 Pylint Fix -- **PR** `#27308`_: (*terminalmage*) Fix refresh_db regression in yumpkg.py + * 588c13783c Salt-cloud logging clean up for windows functions -- **PR** `#27286`_: (*terminalmage*) Add a configurable timer for minion return retries + * 9b6000135c [2014.7] Fixup salt-cloud logging -- **PR** `#27278`_: (*rallytime*) Back-port `#27256`_ to 2015.5 +* **ISSUE** `#27447`_: (`junster1`_) Fix mysql table size for salt_events (refs: `#27472`_) -- **PR** `#27277`_: (*rallytime*) Back-port `#27230`_ to 2015.5 +* **PR** `#27472`_: (`cachedout`_) Change recommeded schema for data field in mysql event table + @ *2015-09-29 15:49:37 UTC* -- **PR** `#27253`_: (*jfindlay*) 2015.5 -> 2015.5.0 + * 68d784c3dd Merge pull request `#27472`_ from cachedout/fix_27447 -- **PR** `#27244`_: (*garethgreenaway*) Exception in cloud.ec2.create_snapshot + * 5e745ad6da Change recommeded schema for data field in mysql event table -- **PR** `#27231`_: (*jfindlay*) only write cron file if it is changed +* **PR** `#27468`_: (`cachedout`_) Fix 27351 + @ *2015-09-29 15:35:29 UTC* -- **PR** `#27233`_: (*basepi*) [2015.5] Add stub release notes for 2015.5.6 + * **PR** `#27351`_: (`SaltyCharles`_) fix sysctl truncating newline on os x (refs: `#27468`_) -- **PR** `#27208`_: (*basepi*) [2015.5] Add test.nop state + * ee6e0ed057 Merge pull request `#27468`_ from cachedout/fix_27351 -- **PR** `#27201`_: (*jfindlay*) rename hash_hostname to hash_known_hosts + * 0bc37c0d41 Fix test -- **PR** `#27214`_: (*jacksontj*) Correctly support https, port 443 is not a requirement + * f9a19720de fix sysctl truncating newline on os x -- **PR** `#27172`_: (*rallytime*) Back-port `#27150`_ to 2015.5 +* **ISSUE** `#27438`_: (`aboe76`_) can't set system locale on OpenSuse SUse (refs: `#27479`_) -- **PR** `#27194`_: (*rallytime*) Back-port `#27180`_ to 2015.5 +* **PR** `#27479`_: (`aboe76`_) fix locale on opensuse and suse `#27438`_ + @ *2015-09-29 15:34:48 UTC* -- **PR** `#27176`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 + * a214c7f84e Merge pull request `#27479`_ from aboe76/fix_locale_suse -- **PR** `#27170`_: (*rallytime*) Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples + * a8f2dad1be fix locale on opensuse and suse `#27438`_ -- **PR** `#27167`_: (*rallytime*) Back-port `#27148`_ to 2015.5 +* **ISSUE** `#17103`_: (`arthurlogilab`_) salt is looking for outputters in /var/cache/salt/minion/extmods/output not /var/cache/salt/minion/extmods/outputputters (refs: `#27483`_) -- **PR** `#27168`_: (*techhat*) Add further gating of impacket library +* **PR** `#27483`_: (`rallytime`_) Outputters should sync to output, not outputters, on the minion. + @ *2015-09-29 15:33:08 UTC* -- **PR** `#27166`_: (*rallytime*) Allow a full-query for EC2, even if there are no profiles defined + * 931f593b51 Merge pull request `#27483`_ from rallytime/fix-17103 -- **PR** `#27162`_: (*rallytime*) Be explicit in using "SoftLayer" for service queries in SoftLayer drivers + * 441241eb90 Change sync_outputters to sync_output for consistency, but alias sync_outputters -- **PR** `#27149`_: (*twangboy*) Fixed problem with add/remove path + * 105528720b Outputters should sync to output, not outputters, on the minion. -- **PR** `#27147`_: (*rallytime*) Enforce bounds in the GCE Regex +* **PR** `#27484`_: (`rallytime`_) Back-port `#27434`_ and `#27470`_ to 2015.5 + @ *2015-09-29 15:32:03 UTC* -- **PR** `#27128`_: (*eguven*) don't show diff for test run if show_diff=False + * **PR** `#27470`_: (`cachedout`_) Minor doc fixup. (refs: `#27484`_) -- **PR** `#27116`_: (*jacobhammons*) Update latest to 2015.8, 2015.5 is now previous + * **PR** `#27434`_: (`netroby`_) Doc: copy key to server via ssh-copy-id (refs: `#27484`_, `#27470`_) -- **PR** `#27033`_: (*jfindlay*) Merge `#27019`_ + * 9c2c028953 Merge pull request `#27484`_ from rallytime/bp-27434-and-27470 -- **PR** `#26942`_: (*Arabus*) Fix docker.run + * 5de2ee35ab Minor doc fixup. -- **PR** `#26977`_: (*abh*) Add support for PEERNTP network interface configuration + * af656c7e87 Doc: copy key to server via ssh-copy-id -- **PR** `#27023`_: (*jfindlay*) add test support for htpasswd state mod +* **ISSUE** `#27433`_: (`TheBigBear`_) winrepo - drops "trailing zeroes" from version numbers on un-install? (refs: `#27469`_) -- **PR** `#27074`_: (*twangboy*) Replaced password with redacted when displayed +* **PR** `#27469`_: (`twangboy`_) Added quotes to version numbers example + @ *2015-09-28 21:54:43 UTC* -- **PR** `#27073`_: (*rallytime*) Remove "use develop branch" warning from LXC tutorial + * 927874d316 Merge pull request `#27469`_ from twangboy/fix_27433 -- **PR** `#27054`_: (*rallytime*) Back-port `#27029`_ to 2015.5 + * a996ea46e2 Added quotes to version numbers example -- **PR** `#27053`_: (*rallytime*) Back-port `#26992`_ to 2015.5 +* **ISSUE** `#27342`_: (`ariscn`_) File.managed silent fail for contents_pillar (refs: `#27375`_, `#27467`_) -- **PR** `#27052`_: (*rallytime*) Back-port `#26930`_ to 2015.5 +* **PR** `#27467`_: (`cachedout`_) file.managed: check contents_{pillar|grain} result + @ *2015-09-28 20:22:16 UTC* -- **PR** `#27049`_: (*johanek*) Run repoquery less + * **PR** `#27375`_: (`jfindlay`_) file.managed: check contents_{pillar|grain} result (refs: `#27467`_) -- **PR** `#27070`_: (*stanislavb*) Deprecate salt.utils.iam in Carbon + * 382a53403f Merge pull request `#27467`_ from cachedout/lint_27375 -- **PR** `#27030`_: (*jfindlay*) Backport `#26938`_ + * 4e54a98f5e Lint `#27375`_ -- **PR** `#27025`_: (*cachedout*) Better try and error handling for prep_jid + * 278ade52d2 file.managed: check contents_{pillar|grain} result -- **PR** `#27035`_: (*terminalmage*) useradd.py: Use contextmanager to prevent leaked filehandles +* **ISSUE** `#9856`_: (`jeremyBass`_) for grant in grants: TypeError: 'bool' object is not iterable (refs: `#27419`_) -- **PR** `#27034`_: (*rallytime*) Update softlayer docs for where to find apikey +* **PR** `#27419`_: (`rallytime`_) Amend error log to include multiple tips for troubleshooting. + @ *2015-09-28 17:53:19 UTC* -- **PR** `#27024`_: (*rallytime*) Back-port `#27004`_ to 2015.5 + * ed6207a438 Merge pull request `#27419`_ from rallytime/fix-9856 -- **PR** `#27027`_: (*rallytime*) Back-port `#27013`_ to 2015.5 + * 551396564a Ammend error log to include multiple tips for troubleshooting. -- **PR** `#27026`_: (*rallytime*) Back-port `#27011`_ to 2015.5 +* **ISSUE** `#16753`_: (`johtso`_) Duplicate selector in top file gives unhelpful traceback (refs: `#27426`_) -- **PR** `#26972`_: (*twangboy*) Catch the 404 error from fileclient +* **PR** `#27426`_: (`rallytime`_) Don't stacktrace if there are conflicting id errors in highstate + @ *2015-09-28 14:52:51 UTC* -- **PR** `#26951`_: (*terminalmage*) Fix timezone module for CentOS + * 73fa89edf7 Merge pull request `#27426`_ from rallytime/fix-16753 -- **PR** `#26875`_: (*marccardinal*) LXC gateway provisioned only when IP is provided + * f6cbd81e66 Don't stacktrace if there are conflicting id errors in highstate -- **PR** `#26997`_: (*twangboy*) Fixed symlinks for windows (don't use user root) +* **ISSUE** `#27406`_: (`s-iraheta`_) salt-cloud error with Softlayer (Bare Metal Instance): TypeError: 'bool' object is not iterable and with --list-locations: Failed to get the output of 'softlayer_hw.avail_locations()': 142776 (refs: `#27408`_) -- **PR** `#27001`_: (*twangboy*) Added CLI Example for reg.delete_key_recursive +* **PR** `#27408`_: (`rallytime`_) Fix avail_locations function for the softlayer_hw driver in 2015.5 + @ *2015-09-25 23:34:50 UTC* -- **PR** `#26996`_: (*jacobhammons*) Beacon doc updates + * 5dd1b70475 Merge pull request `#27408`_ from rallytime/fix-27406-for-2015.5 -- **PR** `#26868`_: (*joejulian*) Use the actual device name when checking vgdisplay + * 39a4ae5a6c Remove hdd: 19 refs from SL docs - no longer available from SoftLayer. -- **PR** `#26955`_: (*dsumsky*) S3 ext_pillar module has broken caching mechanism (backport to 2015.5) + * de2f9234d3 Use correct default for bandwith -- **PR** `#26987`_: (*rallytime*) Back-port `#26966`_ to 2015.5 + * 42d8127f79 Don't set the optional_products default to a boolean, and then try to loop. -- **PR** `#26915`_: (*rallytime*) Update Joyent Cloud Tests + * 9d8a3d8303 Fix avail_locations function for the softlayer_hw driver in 2015.5 -- **PR** `#26971`_: (*rallytime*) Fix a couple of typos in reactor docs +* **ISSUE** `#27389`_: (`ryan-lane`_) Docs layout issue (refs: `#27410`_) -- **PR** `#26976`_: (*thatch45*) Revert "file.symlink gets windows account instead of root" +* **PR** `#27410`_: (`jacobhammons`_) Fix css layout Refs `#27389`_ + @ *2015-09-25 22:38:48 UTC* -- **PR** `#26975`_: (*whiteinge*) Remove mocks from rest_cherrypy integration tests; fix groups check bug + * 8f9a3cfbaf Merge pull request `#27410`_ from jacobhammons/doc-updates -- **PR** `#26899`_: (*twangboy*) file.symlink gets windows account instead of root + * a9fdecada1 Fix css layout Refs `#27389`_ sample typo fix in linux_acl additional module folders listed in dynamic-modules -- **PR** `#26960`_: (*rallytime*) Fix bash code block formatting in CherryPy netapi docs +* **PR** `#27336`_: (`rallytime`_) [2015.5] Fixup salt-cloud logging + @ *2015-09-24 15:02:52 UTC* -- **PR** `#26940`_: (*rallytime*) Fix minor doc typo in client api + * 3746085587 Merge pull request `#27336`_ from rallytime/cloud-logging-five -- **PR** `#26871`_: (*rallytime*) Back-port `#26852`_ to 2015.5 + * 7956b36076 [2015.5] Fixup salt-cloud logging -- **PR** `#26851`_: (*jacobhammons*) states/pkgrepo examples, suse installation updates +* **ISSUE** `#27356`_: (`lorengordon`_) file.replace fails if `repl` contains special regex characters and `append_if_not_found=True` (refs: `#27358`_) -- **PR** `#26817`_: (*jfindlay*) modify groupadd for rhel 5 +* **PR** `#27358`_: (`lorengordon`_) Escape search replacement text, fixes `#27356`_ + @ *2015-09-24 13:52:46 UTC* -- **PR** `#26824`_: (*pravka*) [salt-cloud] Fix creating droplet from snapshot in digital_ocean provider + * 5a3be10a3e Merge pull request `#27358`_ from lorengordon/escape-search-replacement-text -- **PR** `#26823`_: (*joejulian*) use dbus instead of localectl + * 88bb1fbfff Escape search replacement text, fixes `#27356`_ -- **PR** `#26820`_: (*jfindlay*) add default param in _parse_localectl in locale mod +* **ISSUE** `#19236`_: (`bramhg`_) salt-cloud : Unable to add SSD disk and unable to auto-delete disk on instance termination on GCE (refs: `#27345`_) -- **PR** `#26821`_: (*twangboy*) Fixed user.rename function in windows +* **PR** `#27345`_: (`rallytime`_) Allow use of rst header links by separating options out from yaml example + @ *2015-09-23 19:48:56 UTC* -- **PR** `#26803`_: (*twangboy*) Added check for PyMySQL if MySQLdb import fails + * 6759f79d6d Merge pull request `#27345`_ from rallytime/docs-for-19236 -- **PR** `#26815`_: (*jfindlay*) stringify linode id before performing str actions + * 1d3925bbfb Added version tag for ex_disk_type option -- **PR** `#26800`_: (*jacobhammons*) Doc bug fixes + * f23369300c Allow use of rst header links by separating options out from yaml example -- **PR** `#26793`_: (*rallytime*) Don't stacktrace if "name" is specified as a minion id in a map file +* **PR** `#26903`_: (`bersace`_) Review defaults.get + @ *2015-09-23 14:52:20 UTC* -- **PR** `#26790`_: (*rallytime*) Update Saltify docs to be more accurate and helpful + * c2efb291e2 Merge pull request `#26903`_ from bersace/fix-defaults-modules -- **PR** `#26787`_: (*jfindlay*) merge `#26775`_ + * 474d7afc95 fixup! Review defaults loading -- **PR** `#26759`_: (*terminalmage*) Backport PR `#26726`_ to 2015.5 branch + * 36141d226e fixup! Review defaults loading -- **PR** `#26768`_: (*garethgreenaway*) Fixes to ipset in 2015.5 for `#26628`_ + * 62b6495358 fixup! Review defaults loading -- **PR** `#26753`_: (*jfindlay*) import elementree from _compat in ilo exec mod + * cf0624e8b8 fixup! Review defaults loading -- **PR** `#26736`_: (*twangboy*) Changed import from smbconnection to smb3 + * 2c58bab977 fixup! Review defaults loading -- **PR** `#26714`_: (*jfindlay*) add exception placeholder for older msgpacks + * 82c5b1d8fd Review defaults loading -- **PR** `#26710`_: (*rallytime*) Update GCE driver to return True, False or a new name in __virtual__() +* **ISSUE** `#27316`_: (`efficks`_) Extracted state with zip format failed on Windows (refs: `#27317`_) -- **PR** `#26709`_: (*rallytime*) Ensure VM name is valid before trying to create Linode VM +* **PR** `#27317`_: (`efficks`_) State unzip should use unzip command instead of unzip_cmd. + @ *2015-09-23 14:41:36 UTC* -- **PR** `#26617`_: (*terminalmage*) Fix Windows failures in pip module due to raw string formatting + * a372466922 Merge pull request `#27317`_ from efficks/fix27316 -- **PR** `#26700`_: (*kev009*) Ignore the first element of kern.disks split, which is the sysctl name + * bf216c101e State unzip should use unzip command instead of unzip_cmd. Issue `#27316`_ -- **PR** `#26695`_: (*terminalmage*) Better HTTPS basic auth redaction for 2015.5 branch +* **ISSUE** `#15514`_: (`flyaruu`_) Calling a boto_route53.present state fails if the record is already there (refs: `#27309`_) -- **PR** `#26694`_: (*terminalmage*) Backport `#26693`_ to 2015.5 +* **PR** `#27309`_: (`rallytime`_) Change a value list to a comma-separated string in boto_route53.present + @ *2015-09-23 14:30:50 UTC* -- **PR** `#26681`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 + * bd3771e80f Merge pull request `#27309`_ from rallytime/fix-15514 -- **PR** `#26676`_: (*rallytime*) Back-port `#26648`_ to 2015.5 + * 9383d91ff8 Change a value list to a comma-separated string in boto_route53.present -- **PR** `#26677`_: (*rallytime*) Back-port `#26653`_ to 2015.5 +* **ISSUE** `#27297`_: (`JensRantil`_) file.replace documentation improvement (refs: `#27311`_) -- **PR** `#26675`_: (*rallytime*) Back-port `#26631`_ to 2015.5 +* **PR** `#27311`_: (`jfindlay`_) discuss replacement occurrences in file doc + @ *2015-09-22 22:23:10 UTC* -- **PR** `#26655`_: (*cheng0919*) Update win_dns_client.py + * b5fe944875 Merge pull request `#27311`_ from jfindlay/maxoc -- **PR** `#26662`_: (*jacobhammons*) update version to 2015.5 + * 8ec2e921bd discuss replacement occurrences in file doc -- **PR** `#26651`_: (*jfindlay*) add 2015.5.4 notes to 2015.5.5 notes +* **PR** `#27310`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-09-22 21:08:41 UTC* -- **PR** `#26525`_: (*jfindlay*) document check_file_meta args, remove unused arg + * ca4597b93a Merge pull request `#27310`_ from basepi/merge-forward-2015.5 -- **PR** `#26561`_: (*stanislavb*) Leave salt.utils.s3 location fallback to salt.utils.aws + * 7b75e4aed1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#26573`_: (*rallytime*) Don't stacktrace if using private_ips and delete_sshkeys together + * e90412d3b8 Merge pull request `#27252`_ from jfindlay/version.2014.7 -- **PR** `#26563`_: (*rallytime*) Fix error detection when salt-cloud config is missing a master's address + * 3d28307a00 2014.7 -> 2014.7.0 -- **PR** `#26641`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 +* **ISSUE** `#27307`_: (`terminalmage`_) Regression in yumpkg's refresh_db function (refs: `#27308`_) -- **PR** `#26620`_: (*rallytime*) Also add -Z to script args for cloud tests +* **PR** `#27308`_: (`terminalmage`_) Fix refresh_db regression in yumpkg.py + @ *2015-09-22 21:07:28 UTC* -- **PR** `#26618`_: (*rallytime*) Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests + * 982c21c79f Merge pull request `#27308`_ from terminalmage/fix-refresh_db-regression -- **PR** `#26612`_: (*rallytime*) Use an available image to test against + * 77686fb7ce Fix refresh_db regression in yumpkg.py -- **PR** `#26576`_: (*rallytime*) Ensure GCE and EC2 configuration checks are correct +* **PR** `#27286`_: (`terminalmage`_) Add a configurable timer for minion return retries + @ *2015-09-22 16:35:07 UTC* -- **PR** `#26580`_: (*rallytime*) Avoid race condition when assigning floating IPs to new VMs + * 775a4f9ad0 Merge pull request `#27286`_ from terminalmage/return_retry_timer -- **PR** `#26581`_: (*terminalmage*) Skip tests that don't work with older mock + * 540a7dfcf1 Add default values for new minion config options -- **PR** `#26591`_: (*rallytime*) Back-port `#26554`_ to 2015.5 + * 453b883820 Add a configurable timer for minion return retries -- **PR** `#26565`_: (*cachedout*) Fix many errors with __virtual__ in tests +* **PR** `#27278`_: (`rallytime`_) Back-port `#27256`_ to 2015.5 + @ *2015-09-21 19:27:51 UTC* -- **PR** `#26553`_: (*rallytime*) Back-port `#26548`_ to 2015.5 + * **PR** `#27256`_: (`julianbrost`_) Fix error handling in salt.modules.file.statvfs (refs: `#27278`_) -- **PR** `#26552`_: (*rallytime*) Back-port `#26542`_ to 2015.5 + * 02482c0572 Merge pull request `#27278`_ from rallytime/bp-27256 -- **PR** `#26551`_: (*rallytime*) Back-port `#26539`_ to 2015.5 + * 1beddf6311 Fix error handling in salt.modules.file.statvfs -- **PR** `#26549`_: (*rallytime*) Back-port `#26524`_ to 2015.5 +* **PR** `#27277`_: (`rallytime`_) Back-port `#27230`_ to 2015.5 + @ *2015-09-21 19:06:14 UTC* -- **PR** `#26527`_: (*jfindlay*) check exists and values in boto_elb listeners + * **PR** `#27230`_: (`benhosmer`_) Fix typo in AWS doc config (refs: `#27277`_) -- **PR** `#26446`_: (*stanislavb*) Fetch AWS region from EC2 instance metadata + * e36c019c37 Merge pull request `#27277`_ from rallytime/bp-27230 -- **PR** `#26546`_: (*nmadhok*) Do not raise KeyError when calling avail_images if VM/template is in disconnected state + * 3ce77db1bc Fix typo in AWS doc config -- **PR** `#26537`_: (*jfindlay*) Merge `#26481`_ +* **PR** `#27253`_: (`jfindlay`_) 2015.5 -> 2015.5.0 + @ *2015-09-18 23:44:43 UTC* -- **PR** `#26528`_: (*zmalone*) Fixing encrypt to instructions in the 2015.5 branch + * b22286476e Merge pull request `#27253`_ from jfindlay/version.2015.5 + * 967e3bb72a 2015.5 -> 2015.5.0 + +* **PR** `#27244`_: (`garethgreenaway`_) Exception in cloud.ec2.create_snapshot + @ *2015-09-18 21:41:11 UTC* + + * 51a0193b54 Merge pull request `#27244`_ from garethgreenaway/ec2_create_snapshot_no_return_data_exception + + * 820fd576b9 Fixing the cause when the r_data from aws.query is empty and an exception happens when looking for the snapshotID + +* **ISSUE** `#27215`_: (`wfhu`_) cron.file override the crontab file even if there's no change (refs: `#27231`_) + +* **PR** `#27231`_: (`jfindlay`_) only write cron file if it is changed + @ *2015-09-18 18:23:10 UTC* + + * 26540f15bc Merge pull request `#27231`_ from jfindlay/cronchange + + * 1e335297e2 only write cron file if it is changed + +* **PR** `#27233`_: (`basepi`_) [2015.5] Add stub release notes for 2015.5.6 + @ *2015-09-18 16:55:40 UTC* + + * 579f375f74 Merge pull request `#27233`_ from basepi/release.notes.stubs + + * f4563ea9b7 Add stub release notes for 2015.5.6 + +* **ISSUE** `#25423`_: (`tweenk`_) Impossible to define a file.managed for use only as a template in "use" requisites (refs: `#27208`_) + +* **PR** `#27208`_: (`basepi`_) [2015.5] Add test.nop state + @ *2015-09-18 16:50:17 UTC* + + * f5a322e3f2 Merge pull request `#27208`_ from basepi/nop.state.25423 + + * 9414b05b2c Add test.nop example + + * a84ce67b8f Add test.nop state + +* **ISSUE** `#27187`_: (`SeverinLeonhardt`_) ssh_known_hosts.present hashes other entries even with hash_hostname: false (refs: `#27201`_) + +* **PR** `#27201`_: (`jfindlay`_) rename hash_hostname to hash_known_hosts + @ *2015-09-18 15:45:03 UTC* + + * 59a07cae68 Merge pull request `#27201`_ from jfindlay/sshhash + + * 1b620b77cd rename hash_host arg to hash_known_hosts + + * 12f14ae37c update hash_known_hosts docs in ssh module + +* **PR** `#27214`_: (`jacksontj`_) Correctly support https, port 443 is not a requirement + @ *2015-09-18 15:43:05 UTC* + + * 560545c4c5 Merge pull request `#27214`_ from jacksontj/2015.5 + + * e7526bdb44 Correctly support https, port 443 is not a requirement + +* **ISSUE** `#18582`_: (`mainframe`_) Allow merging file_roots and pillar_roots from different config files included from master.d (refs: `#27150`_) + +* **PR** `#27172`_: (`rallytime`_) Back-port `#27150`_ to 2015.5 + @ *2015-09-17 17:25:51 UTC* + + * **PR** `#27150`_: (`cachedout`_) Merge config values from master.d/minion.d conf files (refs: `#27172`_) + + * 7a34c7742d Merge pull request `#27172`_ from rallytime/bp-27150 + + * 0d7ee4b209 Merge config values from master.d/minion.d conf files + +* **PR** `#27194`_: (`rallytime`_) Back-port `#27180`_ to 2015.5 + @ *2015-09-17 16:17:24 UTC* + + * **PR** `#27180`_: (`tankywoo`_) file copy ret result True if no change in test mode (refs: `#27194`_) + + * e956d88f5f Merge pull request `#27194`_ from rallytime/bp-27180 + + * 327d343fef file copy ret result True if no change in test mode + +* **PR** `#27176`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-09-17 15:00:40 UTC* + + * a02d043309 Merge pull request `#27176`_ from basepi/merge-forward-2015.5 + + * 66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * c186e51764 Merge pull request `#27117`_ from jacobhammons/release-docs-2014.7 + + * b69e11e0a4 made 2014.7 an archived release minor doc site updates + + * 69d758ee2b Merge pull request `#27114`_ from cachedout/warn_on_insecure_log + + * 507fb04683 Issue warning that some log levels may contain sensitive data + + * aa71bae8aa Merge pull request `#27075`_ from twangboy/fix_password_2014.7 + + * c0689e3215 Replaced password with redacted when displayed + +* **PR** `#27170`_: (`rallytime`_) Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples + @ *2015-09-16 22:23:51 UTC* + + * de2027426e Merge pull request `#27170`_ from rallytime/gce-docs + + * a07db909bd Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples + +* **PR** `#27167`_: (`rallytime`_) Back-port `#27148`_ to 2015.5 + @ *2015-09-16 19:56:01 UTC* + + * **PR** `#27148`_: (`hexedpackets`_) Pass file pointers to the serialize load functions. (refs: `#27167`_) + + * 28cfdfd067 Merge pull request `#27167`_ from rallytime/bp-27148 + + * d12be52355 Pass filepointers to the serialize load functions. + +* **ISSUE** `#27157`_: (`alxbse`_) salt.util.smb loads even when impacket library is missing (refs: `#27168`_) + +* **PR** `#27168`_: (`techhat`_) Add further gating of impacket library + @ *2015-09-16 18:55:56 UTC* + + * 4495f4f4d0 Merge pull request `#27168`_ from techhat/gateimpacket + + * cc448bfdc1 Add further gating of impacket library + +* **ISSUE** `#27100`_: (`hexedpackets`_) salt-cloud --full-query does nothing when no VM profiles are configured (refs: `#27166`_) + +* **PR** `#27166`_: (`rallytime`_) Allow a full-query for EC2, even if there are no profiles defined + @ *2015-09-16 17:41:40 UTC* + + * 3e5ef0dc30 Merge pull request `#27166`_ from rallytime/fix-27100 + + * 50fb3a489a Allow a full-query for EC2, even if there are no profiles defined + +* **PR** `#27162`_: (`rallytime`_) Be explicit in using "SoftLayer" for service queries in SoftLayer drivers + @ *2015-09-16 16:43:26 UTC* + + * f1c9de7ed9 Merge pull request `#27162`_ from rallytime/softlayer-service + + * d281068c70 Be explicit in using "SoftLayer" for service queries in SoftLayer drivers + +* **ISSUE** `#27133`_: (`deniswal`_) win_path.add causes the value data to be set as the value and vice versa (refs: `#27149`_) + +* **PR** `#27149`_: (`twangboy`_) Fixed problem with add/remove path + @ *2015-09-16 15:01:48 UTC* + + * 59e9dfd8de Merge pull request `#27149`_ from twangboy/fix_27133 + + * 7992b7e20a Fixed some tests... hopefully... + + * d4c8e30f5d Fixed problem with add/remove path + +* **ISSUE** `#11669`_: (`jcockhren`_) salt.cloud is out of date for new google compute engine dashboard and API (refs: `#27147`_) + +* **PR** `#27147`_: (`rallytime`_) Enforce bounds in the GCE Regex + @ *2015-09-15 21:51:55 UTC* + + * 097fcd1017 Merge pull request `#27147`_ from rallytime/fix-11669 + + * 55312ea03f Provide a more friendly error message. + + * 36555856c7 Enforce bounds in the GCE Regex + +* **PR** `#27128`_: (`eguven`_) don't show diff for test run if show_diff=False + @ *2015-09-15 14:11:55 UTC* + + * f5c3f157dd Merge pull request `#27128`_ from eguven/2015.5-fix-test-diff + + * ec2d68a84a don't show diff for test run if show_diff=False + +* **PR** `#27116`_: (`jacobhammons`_) Update latest to 2015.8, 2015.5 is now previous + @ *2015-09-15 07:34:28 UTC* + + * 088b1dbb3e Merge pull request `#27116`_ from jacobhammons/release-docs-2015.5 + + * 6e323b6dd3 Update latest to 2015.8, 2015.5 is now previous Assorted style and minor updates + +* **ISSUE** `#25352`_: (`m03`_) reg.absent reporting incorrect results (refs: `#27019`_) + +* **PR** `#27033`_: (`jfindlay`_) Merge `#27019`_ + @ *2015-09-15 07:32:17 UTC* + + * **PR** `#27019`_: (`twangboy`_) Fixed reg state module for None, 0, and '' values (refs: `#27033`_) + + * 440855b182 Merge pull request `#27033`_ from jfindlay/n0ne + + * 3334b9d548 fix comment and unit test for reg state + + * 391a09d5ac update reg state unit tests + + * ebbf2b05ca Fixed reg state module for None, 0, and '' values + +* **ISSUE** `#17088`_: (`umireon`_) state.dockerio.run: docked_onlyif and docked_unless do not work (refs: `#26942`_) + +* **PR** `#26942`_: (`Arabus`_) Fix docker.run + @ *2015-09-14 18:10:54 UTC* + + * 35fc74132a Merge pull request `#26942`_ from Arabus/fix-docker.run + + * e61e1de1f5 Fixes value typo for dockerio.loaded state + + * 39fa11b696 further linting + + * 4aec37397c Further Linting to quiet the linter + + * 7eff8ad070 Code Linting and cmd call fix + + * a51676e0eb Fixes `#17088`_ olyif and unless should run on the host + + * d0c6128b8f Fixes `#17088`_ retcode now returns True or False based on return status + + * 8b2e7cc4f5 Syntax clarification + +* **PR** `#26977`_: (`abh`_) Add support for PEERNTP network interface configuration + @ *2015-09-14 17:59:00 UTC* + + * 59f2a0c7ae Merge pull request `#26977`_ from abh/2015.5-ntppeer + + * df3d6e817f Add support for PEERNTP network interface configuration on RH derived systems + +* **ISSUE** `#27021`_: (`SEJeff`_) webutil.user_exists state does not respect test=true (refs: `#27023`_) + +* **ISSUE** `#21533`_: (`aspyatkin`_) Add option specifying user to run htpasswd module functions (refs: `#21649`_) + +* **PR** `#27023`_: (`jfindlay`_) add test support for htpasswd state mod + @ *2015-09-14 17:48:00 UTC* + + * **PR** `#21649`_: (`aspyatkin`_) Make enhancements to htpasswd modules (refs: `#27023`_) + + * e05b1f3951 Merge pull request `#27023`_ from jfindlay/htwebutilpass + + * 9f3d7890a6 add test support for htpasswd state mod + +* **PR** `#27074`_: (`twangboy`_) Replaced password with redacted when displayed + @ *2015-09-14 16:27:26 UTC* + + * 9f999c0027 Merge pull request `#27074`_ from twangboy/fix_password_2015.5 + + * fdd3537456 Replaced password with redacted when displayed + +* **PR** `#27073`_: (`rallytime`_) Remove "use develop branch" warning from LXC tutorial + @ *2015-09-11 23:51:06 UTC* + + * 46b44f85ed Merge pull request `#27073`_ from rallytime/remove-lxc-warning + + * 76c056d02b Remove "use develop branch" warning from LXC tutorial now that 2015.5.0 has been released + +* **PR** `#27054`_: (`rallytime`_) Back-port `#27029`_ to 2015.5 + @ *2015-09-11 22:29:45 UTC* + + * **PR** `#27029`_: (`spudfkc`_) Removed check for no package name (refs: `#27054`_) + + * caab21d99c Merge pull request `#27054`_ from rallytime/bp-27029 + + * 0be393be22 Removed check for no package name + +* **PR** `#27053`_: (`rallytime`_) Back-port `#26992`_ to 2015.5 + @ *2015-09-11 22:29:30 UTC* + + * **PR** `#26992`_: (`plastikos`_) Summary requires full return information. (refs: `#27053`_) + + * 0227e1cb57 Merge pull request `#27053`_ from rallytime/bp-26992 + + * 83798aff3c Do not use full return for documentation. + + * d9d5bbaa68 Summary requires full return information. + +* **PR** `#27052`_: (`rallytime`_) Back-port `#26930`_ to 2015.5 + @ *2015-09-11 22:28:11 UTC* + + * **PR** `#26930`_: (`madprog`_) aptpkg.mod_repo: Raise when key_url doesn't exist (refs: `#27052`_) + + * b72a0ef86d Merge pull request `#27052`_ from rallytime/bp-26930 + + * d9787aa318 aptpkg.mod_repo: Raise when key_url doesn't exist + +* **PR** `#27049`_: (`johanek`_) Run repoquery less + @ *2015-09-11 22:26:12 UTC* + + * 8b554dd16f Merge pull request `#27049`_ from johanek/repoquery-dedupe + + * c113916a23 When running repoquery to check for available versions of packages, run once for all packages rather than once per package + +* **PR** `#27070`_: (`stanislavb`_) Deprecate salt.utils.iam in Carbon + @ *2015-09-11 22:01:57 UTC* + + * **PR** `#26561`_: (`stanislavb`_) Leave salt.utils.s3 location fallback to salt.utils.aws (refs: `#27070`_) + + * **PR** `#26446`_: (`stanislavb`_) Fetch AWS region from EC2 instance metadata (refs: `#26561`_) + + * **PR** `#26378`_: (`stanislavb`_) Fix EC2 credentials from IAM roles for s3fs and s3 ext_pillar in 2015.5 (refs: `#26446`_) + + * cc2cbf9869 Merge pull request `#27070`_ from stanislavb/2015.5 + + * 1e6e5ddc9c Deprecate salt.utils.iam in Carbon + +* **PR** `#27030`_: (`jfindlay`_) Backport `#26938`_ + @ *2015-09-11 15:10:46 UTC* + + * **PR** `#27004`_: (`vtek21`_) Fix 'dict' object has no attribute split (refs: `#27024`_, `#27030`_) + + * **PR** `#26938`_: (`derphilipp`_) Fixes win_path module, migrates from reg.(set|get)_key to reg.(set|get)_value (refs: `#27030`_) + + * e23caa8ccf Merge pull request `#27030`_ from jfindlay/winreg + + * 120fbe78e0 remove trailing line in win_path exec module + + * b36a7107b2 update win_path exec module unit tests + + * a2dc6f2dd7 Fixes win_path module, migrates from reg.(set|get)_key to reg.(set|get)_value + +* **ISSUE** `#25581`_: (`b18`_) Salt 2015.5.2 - Could not deserialize msgpack message error. (refs: `#27025`_) + +* **PR** `#27025`_: (`cachedout`_) Better try and error handling for prep_jid + @ *2015-09-11 07:40:10 UTC* + + * 843c28b435 Merge pull request `#27025`_ from cachedout/issue_25581 + + * ecc09d9b93 Lint + + * bfcaab9ef4 Better try and error handling for prep_jid + +* **PR** `#27035`_: (`terminalmage`_) useradd.py: Use contextmanager to prevent leaked filehandles + @ *2015-09-11 07:39:41 UTC* + + * b9baa0b39a Merge pull request `#27035`_ from terminalmage/useradd-contextmanager + + * e430e97f6c Update user states to reflect changes to login class handling + + * f24b979c7c useradd.py: Use contextmanager to prevent leaked filehandles + +* **PR** `#27034`_: (`rallytime`_) Update softlayer docs for where to find apikey + @ *2015-09-10 22:29:56 UTC* + + * 1cdfdf7a92 Merge pull request `#27034`_ from rallytime/softlayer-doc-fix + + * cb641f8145 Update softlayer docs for where to find apikey + +* **PR** `#27024`_: (`rallytime`_) Back-port `#27004`_ to 2015.5 + @ *2015-09-10 21:14:21 UTC* + + * **PR** `#27004`_: (`vtek21`_) Fix 'dict' object has no attribute split (refs: `#27024`_, `#27030`_) + + * 9e06d3f01a Merge pull request `#27024`_ from rallytime/bp-27004 + + * 54d6fcf4c7 Fix 'dict' object has no attribute split + + * bb29d73c71 Fix 'dict' object has no attribute split + + * 5f1a9c46aa Fix 'dict' object has no attribute split + + * 2bfdd9724e Fix 'dict' object has no attribute split + +* **PR** `#27027`_: (`rallytime`_) Back-port `#27013`_ to 2015.5 + @ *2015-09-10 21:13:52 UTC* + + * **PR** `#27013`_: (`nmadhok`_) Remove unwanted debug statement (refs: `#27027`_) + + * 9ab2cae1e4 Merge pull request `#27027`_ from rallytime/bp-27013 + + * 19a6e9cb1c Remove unwanted debug statement. + +* **PR** `#27026`_: (`rallytime`_) Back-port `#27011`_ to 2015.5 + @ *2015-09-10 21:13:45 UTC* + + * **PR** `#27011`_: (`whiteinge`_) Move giant eventlisten.sh example out of the state.event docstring (refs: `#27026`_) + + * 2c8beb238f Merge pull request `#27026`_ from rallytime/bp-27011 + + * f8518d545f Move giant eventlisten.sh example out of the state.event docstring + +* **ISSUE** `#20522`_: (`eliasp`_) `modules.win_pkg.install()` blindly trusts `fileclient.get_url()`/unhandled exceptions (refs: `#26972`_) + +* **PR** `#26972`_: (`twangboy`_) Catch the 404 error from fileclient + @ *2015-09-10 20:53:12 UTC* + + * e8cdcc62f7 Merge pull request `#26972`_ from twangboy/fix_20522 + + * 0110786fa9 Catch the 404 error from fileclient + +* **PR** `#26951`_: (`terminalmage`_) Fix timezone module for CentOS + @ *2015-09-10 20:46:07 UTC* + + * fbc95f4685 Merge pull request `#26951`_ from terminalmage/fix-timezone + + * 30a4915762 Update tests to reflect changes to timezone module + + * b6f926919f Fix timezone module for CentOS + +* **PR** `#26875`_: (`marccardinal`_) LXC gateway provisioned only when IP is provided + @ *2015-09-10 19:31:32 UTC* + + * f2ad3c333c Merge pull request `#26875`_ from marccardinal/patch-2 + + * 36d5a62262 LXC gateway provisioned only when IP is provided + +* **ISSUE** `#26730`_: (`styro`_) __opts__['user'] on Windows minion incorrect (eg for file.symlink) (refs: `#26997`_, #`saltstack/salt`#26899`_`_, `#26899`_) + +* **PR** `#26997`_: (`twangboy`_) Fixed symlinks for windows (don't use user root) + @ *2015-09-10 18:54:50 UTC* + + * **PR** `#26899`_: (`twangboy`_) file.symlink gets windows account instead of root (refs: `#26997`_) + + * 7b2e7b1b37 Merge pull request `#26997`_ from twangboy/fix_symlink_windows + + * 89cc02d4e0 Added `versionadded` + + * 835177b0c8 Fixed symlinks for windows (don't use user root) + +* **PR** `#27001`_: (`twangboy`_) Added CLI Example for reg.delete_key_recursive + @ *2015-09-10 17:19:43 UTC* + + * 5389a85894 Merge pull request `#27001`_ from twangboy/fix_reg_docs + + * 2980bbda17 Minor clarification + + * 4684b2ddd1 Added CLI example for reg.delete_key_recursive + +* **PR** `#26996`_: (`jacobhammons`_) Beacon doc updates + @ *2015-09-10 16:47:49 UTC* + + * 37814f5dff Merge pull request `#26996`_ from jacobhammons/beacon-doc + + * e475ea688e Fixed typo + + * 2401533d9e New content added to beacon docs. + +* **ISSUE** `#26867`_: (`joejulian`_) lvm pv's can show as not belonging to their vg if symlink is used (refs: `#26868`_) + +* **PR** `#26868`_: (`joejulian`_) Use the actual device name when checking vgdisplay + @ *2015-09-10 16:08:16 UTC* + + * 4ba7eed711 Merge pull request `#26868`_ from joejulian/2015.5_lvm_vg_symlink_fix + + * 3dfb33849a Use the actual device name when checking vgdisplay + +* **PR** `#26955`_: (`dsumsky`_) S3 ext_pillar module has broken caching mechanism (backport to 2015.5) + @ *2015-09-10 14:54:01 UTC* + + * 1537e945be Merge pull request `#26955`_ from dsumsky/s3-pillar-module-cache-fix-2015.5 + + * 8219acffe7 - fixed pylint warnings + + * a3b10e8ab1 - fixed broken caching in S3 ext_pillar module (file_md5 was a list) - added debugging messages - static parameters are available as module parameters now + +* **PR** `#26987`_: (`rallytime`_) Back-port `#26966`_ to 2015.5 + @ *2015-09-09 18:42:51 UTC* + + * **PR** `#26966`_: (`TheBigBear`_) URL has changed (refs: `#26987`_) + + * 3e902e86b1 Merge pull request `#26987`_ from rallytime/bp-26966 + + * 6a29eac003 URL has changed + +* **PR** `#26915`_: (`rallytime`_) Update Joyent Cloud Tests + @ *2015-09-09 15:04:50 UTC* + + * eddb532713 Merge pull request `#26915`_ from rallytime/joyent-tests + + * d4ad42d697 Update Joyent Cloud Tests + +* **PR** `#26971`_: (`rallytime`_) Fix a couple of typos in reactor docs + @ *2015-09-09 15:03:54 UTC* + + * f86814b2a4 Merge pull request `#26971`_ from rallytime/reactor-doc-fix + + * 0214daad19 Fix a couple of typos in reactor docs + +* **ISSUE** `#26730`_: (`styro`_) __opts__['user'] on Windows minion incorrect (eg for file.symlink) (refs: `#26997`_, #`saltstack/salt`#26899`_`_, `#26899`_) + + * **PR** `saltstack/salt#26899`_: (`twangboy`_) file.symlink gets windows account instead of root (refs: `#26976`_) + +* **PR** `#26976`_: (`thatch45`_) Revert "file.symlink gets windows account instead of root" + @ *2015-09-08 22:44:19 UTC* + + * 57b1080f94 Merge pull request `#26976`_ from saltstack/revert-26899-fix_26730 + + * 6dd54e6bec Revert "file.symlink gets windows account instead of root" + +* **PR** `#26975`_: (`whiteinge`_) Remove mocks from rest_cherrypy integration tests; fix groups check bug + @ *2015-09-08 22:34:08 UTC* + + * 67be01f5fe Merge pull request `#26975`_ from whiteinge/rest_cherrypy-integration + + * 9a0989585b Add additional 'groups' check to rest_cherrypy if groups are not used + + * d68aefcfde Remove mocks from rest_cherrypy integration tests + + * 2aa3da8911 Rename the rest_cherrypy tests to conform to our convention + +* **ISSUE** `#26730`_: (`styro`_) __opts__['user'] on Windows minion incorrect (eg for file.symlink) (refs: `#26997`_, #`saltstack/salt`#26899`_`_, `#26899`_) + +* **PR** `#26899`_: (`twangboy`_) file.symlink gets windows account instead of root (refs: `#26997`_) + @ *2015-09-08 21:14:30 UTC* + + * 20a48f7f2e Merge pull request `#26899`_ from twangboy/fix_26730 + + * 9d9b3bb47a file.symlink gets windows account instead of root + +* **PR** `#26960`_: (`rallytime`_) Fix bash code block formatting in CherryPy netapi docs + @ *2015-09-08 18:14:11 UTC* + + * dbc6b862f4 Merge pull request `#26960`_ from rallytime/cherrypy-docs + + * c1420711db Fix bash code block formatting + +* **PR** `#26940`_: (`rallytime`_) Fix minor doc typo in client api + @ *2015-09-08 04:15:00 UTC* + + * f733e048c9 Merge pull request `#26940`_ from rallytime/api-doc-fix + + * 00fe6a225c Fix minor doc typo in client api + +* **ISSUE** `#26850`_: (`jfindlay`_) salt-ssh error on 2015.8 (refs: `#26852`_) + +* **PR** `#26871`_: (`rallytime`_) Back-port `#26852`_ to 2015.5 + @ *2015-09-08 03:43:08 UTC* + + * **PR** `#26852`_: (`basepi`_) [2015.8] Only reference msgpack if it imported successfully (refs: `#26871`_) + + * de9350466e Merge pull request `#26871`_ from rallytime/bp-26852 + + * 5a4c8dd2f5 Only reference msgpack if it imported successfully + +* **ISSUE** `#26644`_: (`gravyboat`_) pkgrepo should note that for ubuntu/debian all options should not be used (refs: `#26800`_, `#26851`_) + +* **ISSUE** `#26638`_: (`WackyOne`_) Suse install documentation (refs: `#26800`_, `#26851`_) + +* **PR** `#26851`_: (`jacobhammons`_) states/pkgrepo examples, suse installation updates + @ *2015-09-02 18:29:09 UTC* + + * a563af29d3 Merge pull request `#26851`_ from jacobhammons/doc-bugs + + * ac3bd47440 states/pkgrepo examples, suse installation updates Refs `#26644`_ Refs `#26638`_ + +* **ISSUE** `#26804`_: (`lrhazi`_) gpasswd error on RHEL 5 (refs: `#26817`_) + +* **PR** `#26817`_: (`jfindlay`_) modify groupadd for rhel 5 + @ *2015-09-02 14:52:53 UTC* + + * 5b1b934192 Merge pull request `#26817`_ from jfindlay/grouparg + + * 82d33939f3 modify groupadd for rhel 5 + +* **ISSUE** `#22724`_: (`ty2u`_) digital_ocean_v2.py doesn't restore snapshot (refs: `#26824`_) + +* **PR** `#26824`_: (`systembell`_) [salt-cloud] Fix creating droplet from snapshot in digital_ocean provider + @ *2015-09-02 05:18:37 UTC* + + * cdc0ea2fe3 Merge pull request `#26824`_ from pravka/fix-droplet-creation-from-snapshot-in-dov2 + + * 00e3192536 removing log + + * e4a82d78d9 removing stringification of every value in the image dict + + * cdc2b4584a fixing condition for slug check + +* **ISSUE** `#26805`_: (`joejulian`_) cur_param referenced before assignment (refs: `#26823`_, `#26820`_) + +* **PR** `#26823`_: (`joejulian`_) use dbus instead of localectl + @ *2015-09-02 00:25:25 UTC* + + * 4af6951a4c Merge pull request `#26823`_ from joejulian/ctlfix + + * a9928cb143 pep8 fixes + + * 6108ec4280 Gated dbus for os families that use it + + * e154c7b16f remove trailing spaces + + * c1c1266cc3 fix indent change + + * 0a35320aa7 Use dbus directly + +* **ISSUE** `#26805`_: (`joejulian`_) cur_param referenced before assignment (refs: `#26823`_, `#26820`_) + +* **PR** `#26820`_: (`jfindlay`_) add default param in _parse_localectl in locale mod + @ *2015-09-01 22:02:17 UTC* + + * a1749b76b8 Merge pull request `#26820`_ from jfindlay/ctlfix + + * 3a2c0d5fbb add default param in _parse_localectl in locale mod + +* **ISSUE** `#26788`_: (`ssgward`_) Windows minion user.rename gives exception (refs: `#26821`_) + +* **PR** `#26821`_: (`twangboy`_) Fixed user.rename function in windows + @ *2015-09-01 22:01:50 UTC* + + * ff733547c4 Merge pull request `#26821`_ from twangboy/fix_26788 + + * cf979e4877 Fixed user.rename function in windows + +* **ISSUE** `#26754`_: (`jefftucker`_) MySQLdb-python package should be included with windows minion installer (refs: `#26803`_) + +* **PR** `#26803`_: (`twangboy`_) Added check for PyMySQL if MySQLdb import fails + @ *2015-09-01 21:44:41 UTC* + + * c892be3255 Merge pull request `#26803`_ from twangboy/fix_26754 + + * 23576c65eb Added check for PyMySQL if MySQLdb import fails + +* **ISSUE** `#26798`_: (`jfindlay`_) stack trace from linode driver (refs: `#26815`_) + +* **PR** `#26815`_: (`jfindlay`_) stringify linode id before performing str actions + @ *2015-09-01 17:56:29 UTC* + + * 6edfa36083 Merge pull request `#26815`_ from jfindlay/linstr + + * 2ff5823944 stringify linode id before performing str actions + +* **ISSUE** `#26644`_: (`gravyboat`_) pkgrepo should note that for ubuntu/debian all options should not be used (refs: `#26800`_, `#26851`_) + +* **ISSUE** `#26638`_: (`WackyOne`_) Suse install documentation (refs: `#26800`_, `#26851`_) + +* **ISSUE** `#26192`_: (`jefftucker`_) Logging documentation does not exist (refs: `#26800`_) + +* **ISSUE** `#26108`_: (`ahammond`_) documentation around scheduling and orchestration is unclear (refs: `#26800`_) + +* **ISSUE** `#24510`_: (`ahammond`_) lack of documentation around Denied Keys (refs: `#26800`_) + +* **PR** `#26800`_: (`jacobhammons`_) Doc bug fixes + @ *2015-09-01 05:40:09 UTC* + + * 135a8a64af Merge pull request `#26800`_ from jacobhammons/doc-fixes + + * 5cca52a3c1 Fixed windows installer paths Refs `#25567`_ + + * 0ec036350d Updates to salt-ssh and salt-key `#24510`_ + + * 992edc3bb8 Doc bug fixes Refs `#26192`_ Refs `#26638`_ Refs `#26644`_ Refs `#26108`_ + +* **ISSUE** `#24021`_: (`arthurlogilab`_) [salt-cloud saltify] AttributeError: 'str' object has no attribute 'setdefault' (refs: `#26793`_) + +* **PR** `#26793`_: (`rallytime`_) Don't stacktrace if "name" is specified as a minion id in a map file + @ *2015-08-31 19:24:25 UTC* + + * da161b9516 Merge pull request `#26793`_ from rallytime/fix-name-stacktrace + + * 8601e4b341 Don't stacktrace if "name" is specified as a minion id in a map file + +* **ISSUE** `#24020`_: (`arthurlogilab`_) [salt-cloud saltify] cannot use --profile saltify machine{1..3} without a map (refs: `#26790`_) + +* **PR** `#26790`_: (`rallytime`_) Update Saltify docs to be more accurate and helpful + @ *2015-08-31 18:17:31 UTC* + + * 7c8d0a09f6 Merge pull request `#26790`_ from rallytime/saltify_docs + + * d53754f2b7 Update Saltify docs to be more accurate and helpful + +* **ISSUE** `#26773`_: (`styro`_) salt-call minor breakage on Windows (refs: `#26775`_) + +* **PR** `#26787`_: (`jfindlay`_) merge `#26775`_ + @ *2015-08-31 17:52:45 UTC* + + * **PR** `#26775`_: (`styro`_) Fix some leftover non portable exitcodes. (refs: `#26787`_) + + * 70d0268c83 Merge pull request `#26787`_ from jfindlay/imp + + * e5bbf59ec7 disable import lint in run.py + + * 8aef725243 Restore blank lines again. + + * 1710070f61 Restore blank line. + + * 59d61a8dea os module no longer required. + + * f1b8d0d509 Add missing imports. + + * 7bd8809e23 Fix some non portable exitcodes. Fixes `#26773`_ + +* **PR** `#26759`_: (`terminalmage`_) Backport PR `#26726`_ to 2015.5 branch + @ *2015-08-31 14:39:20 UTC* + + * **PR** `#26726`_: (`terminalmage`_) Redact HTTPS Basic Auth in states/funcs which deal with git remotes (refs: `#26759`_) + + * 645998dbd3 Merge pull request `#26759`_ from terminalmage/bp-26726 + + * d7f7fca7e5 More cleanup from moving auth redaction to salt.utils.url + + * 07db5a7038 fix redaction + + * 399871e6dd Add auth redaction flags to git exec module and use them in git state + + * 776dc38d73 check for ValueError when adding http basic auth + + * d2eb1f4340 Rename arguments in salt.utils.url.add_http_basic_auth + + * b45f37a467 Add http basic auth tests + + * 1ed42ea4fd Remove git unit tests, moving them to salt.utils.url tests + + * 96a55cdb59 Remove unused imports + + * 1f25a859bd Redact HTTPS Basic Auth data from remote URLs in comments and changes dict + + * eafeb6c7bf Automatically redact HTTPS basic auth + + * 6be3f8f9e1 Add support for callbacks to influence what information about commands is logged + + * c36f240a87 Add HTTPS Basic Auth funcs to salt.utils.url + +* **ISSUE** `#26628`_: (`MadsRC`_) state.ipset tries to parse wrong data (refs: `#26768`_) + +* **PR** `#26768`_: (`garethgreenaway`_) Fixes to ipset in 2015.5 for `#26628`_ + @ *2015-08-29 03:24:07 UTC* + + * 46a4bbd0e7 Merge pull request `#26768`_ from garethgreenaway/26628_2015_5_ipset_fixes + + * f0c6090c7e Fixing issue when information returned from ipset isn't in the format we expect and it causes an exception. + +* **ISSUE** `#26732`_: (`saltstack-bot`_) SmartOS pkgsrc dependency (refs: `#26753`_) + +* **PR** `#26753`_: (`jfindlay`_) import elementree from _compat in ilo exec mod + @ *2015-08-28 20:56:45 UTC* + + * 7a58878ea8 Merge pull request `#26753`_ from jfindlay/iloet + + * 211a02754f import elementree from _compat in ilo exec mod + +* **ISSUE** `#21256`_: (`dhs-rec`_) win.exe package for RH 6 (refs: `#26736`_) + +* **PR** `#26736`_: (`twangboy`_) Changed import from smbconnection to smb3 + @ *2015-08-28 17:23:42 UTC* + + * 22dbce8d61 Merge pull request `#26736`_ from twangboy/fix_21256 + + * 86f425c669 Changed import from smbconnection to smb3 + +* **ISSUE** `#26705`_: (`Galser`_) Salt-Master 2015.5.5-1 on Scientific Linux 6 fails loading some primitive pillars from YAML (refs: `#26714`_) + +* **PR** `#26714`_: (`jfindlay`_) add exception placeholder for older msgpacks + @ *2015-08-28 16:02:35 UTC* + + * 16d4e0350d Merge pull request `#26714`_ from jfindlay/pack_except + + * ebcfaf9050 add exception placeholder for older msgpacks + +* **PR** `#26710`_: (`rallytime`_) Update GCE driver to return True, False or a new name in __virtual__() + @ *2015-08-27 20:08:17 UTC* + + * 47faa8cc16 Merge pull request `#26710`_ from rallytime/gce_virtual_return + + * e6b74879d7 Remove unused import + + * 78e31585cf Update GCE driver to return True, False or a new name in __virtual__() + +* **ISSUE** `#14612`_: (`cachedout`_) Catch provider errors in salt cloud (refs: `#26709`_) + +* **PR** `#26709`_: (`rallytime`_) Ensure VM name is valid before trying to create Linode VM + @ *2015-08-27 20:07:49 UTC* + + * cf487cf0f5 Merge pull request `#26709`_ from rallytime/fix-14612 + + * bc21094ea0 versionadded and more efficient checks + + * a3ac8e7008 Whitespace fix + + * 9a4228d906 Added unit tests for new _validate_name function and adjusted regex + + * 388815112c Ensure VM name is valid before trying to create Linode VM + +* **ISSUE** `#9592`_: (`otrempe`_) pip module fails on Windows because of quoting (refs: `#26617`_) + +* **PR** `#26617`_: (`terminalmage`_) Fix Windows failures in pip module due to raw string formatting + @ *2015-08-27 19:24:53 UTC* + + * c3a6280f8c Merge pull request `#26617`_ from terminalmage/issue9592 + + * 96c3df1ed5 Don't accept non-list input for pkgs arg + + * 419221535b Lint fix + + * ede057eebc Fix tests to reflect args being passed as lists instead of strings + + * 03250dbd9f Pass command to cmd.run_all as list instead of joining + + * 1c90cdb07e salt/modules/pip.py: Remove raw string format flags + + * cd35df5ff8 Catch TypeErrors in timed_subprocess + +* **PR** `#26700`_: (`kev009`_) Ignore the first element of kern.disks split, which is the sysctl name + @ *2015-08-27 17:48:02 UTC* + + * 24a4f54f39 Merge pull request `#26700`_ from kev009/fbsd-disks-fix-2015.5 + + * 3ac97f9de4 Ignore the first element of kern.disks split, which is the sysctl name + +* **PR** `#26695`_: (`terminalmage`_) Better HTTPS basic auth redaction for 2015.5 branch + @ *2015-08-27 15:10:38 UTC* + + * 58945131b5 Merge pull request `#26695`_ from terminalmage/better-https-auth-redaction-2015.5 + + * 752d260209 Use versioninfo tuple for comparison + + * b1d253483e Better HTTPS basic auth redaction for 2015.5 branch + +* **PR** `#26694`_: (`terminalmage`_) Backport `#26693`_ to 2015.5 + @ *2015-08-27 08:16:30 UTC* + + * **PR** `#26693`_: (`serge-p`_) Update openbsdpkg.py (refs: `#26694`_) + + * 4040a312f9 Merge pull request `#26694`_ from terminalmage/bp-26693 + + * 4aec926476 Update openbsdpkg.py + +* **PR** `#26681`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-08-26 22:03:07 UTC* + + * 0b17f80fe9 Merge pull request `#26681`_ from basepi/merge-forward-2015.5 + + * 64cad371f0 Remove overmocked test + + * 40718af1d5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * c2c7fe06c8 Merge pull request `#26667`_ from nmadhok/doc-fix-2014.7 + + * 26be189689 Doc fix. Fixes `#26656`_ + + * 6bd3dccae8 Merge pull request `#26663`_ from jacobhammons/2014.7-version + + * b6af538070 version change for latest branch + + * 071a6112e5 Merge pull request `#26636`_ from rallytime/cloud-test-fixes + + * c0d83d558d Don't use id as variable + + * 2b4bc1679d Keep ec2 instance creation test the same - it works better for the ec2 output + + * b5b58eb31f Skip digital ocean tests since we can't use API v1 with v2 tests + + * 9ae1539c62 Update cloud tests to be more efficient and accurate + + * 304542b4c6 Merge pull request `#26640`_ from efficks/fixws2014 + + * ebe5d9d85c Fix function spacing + +* **PR** `#26676`_: (`rallytime`_) Back-port `#26648`_ to 2015.5 + @ *2015-08-26 19:46:01 UTC* + + * **PR** `#26648`_: (`whiteinge`_) Free 'fun' from the function signature namespace (refs: `#26676`_) + + * 75675a6ba9 Merge pull request `#26676`_ from rallytime/bp-26648 + + * 1af42eed36 Free 'fun' from the function signature namespace + +* **PR** `#26677`_: (`rallytime`_) Back-port `#26653`_ to 2015.5 + @ *2015-08-26 19:45:54 UTC* + + * **PR** `#26653`_: (`dmyerscough`_) You can provide a X-Auth-Token when requesting jobs (refs: `#26677`_) + + * d7f682cb5b Merge pull request `#26677`_ from rallytime/bp-26653 + + * 497ca96039 You can provide a X-Auth-Token when requesting jobs + +* **PR** `#26675`_: (`rallytime`_) Back-port `#26631`_ to 2015.5 + @ *2015-08-26 19:44:59 UTC* + + * **PR** `#26631`_: (`PierreR`_) Fix get_load in postgres returner (refs: `#26675`_) + + * 960dbba7ed Merge pull request `#26675`_ from rallytime/bp-26631 + + * 20eecdc7be Fix get_load + +* **PR** `#26655`_: (`damonzheng`_) Update win_dns_client.py + @ *2015-08-26 16:05:26 UTC* + + * db30926ac9 Merge pull request `#26655`_ from cheng0919/2015.5 + + * fdebc01def Update win_dns_client.py + + * 1d23d5e797 Update win_dns_client.py + + * 1a45db0fb7 Update win_dns_client.py + +* **PR** `#26662`_: (`jacobhammons`_) update version to 2015.5 + @ *2015-08-26 13:45:44 UTC* + + * a04d243471 Merge pull request `#26662`_ from jacobhammons/version + + * 4e5766fdde update version to 2015.5 + +* **PR** `#26651`_: (`jfindlay`_) add 2015.5.4 notes to 2015.5.5 notes + @ *2015-08-26 00:25:28 UTC* + + * 8a9a076ad4 Merge pull request `#26651`_ from jfindlay/2015.5 + + * dc5cee5f8f add 2015.5.4 notes to 2015.5.5 notes + +* **ISSUE** `#26497`_: (`JensRantil`_) Feature request: Make salt.states.managed support local file `source` (refs: `#26525`_) + +* **PR** `#26525`_: (`jfindlay`_) document check_file_meta args, remove unused arg + @ *2015-08-25 21:43:46 UTC* + + * 5bdefdc234 Merge pull request `#26525`_ from jfindlay/sum + + * 0297d49aa0 remove unused check_file_meta arg + + * 6a3cb1c0aa document args to file.check_file_meta exec fcn + +* **PR** `#26561`_: (`stanislavb`_) Leave salt.utils.s3 location fallback to salt.utils.aws (refs: `#27070`_) + @ *2015-08-25 21:40:30 UTC* + + * **PR** `#26446`_: (`stanislavb`_) Fetch AWS region from EC2 instance metadata (refs: `#26561`_) + + * **PR** `#26378`_: (`stanislavb`_) Fix EC2 credentials from IAM roles for s3fs and s3 ext_pillar in 2015.5 (refs: `#26446`_) + + * 84e96458b3 Merge pull request `#26561`_ from stanislavb/2015.5 + + * 50332895a1 Leave salt.utils.s3 location fallback to salt.utils.aws + +* **ISSUE** `#22550`_: (`amendlik`_) Error deleting SSH keys using salt-cloud --destroy (refs: `#26573`_) + +* **PR** `#26573`_: (`rallytime`_) Don't stacktrace if using private_ips and delete_sshkeys together + @ *2015-08-25 20:00:23 UTC* + + * 1d729734cc Merge pull request `#26573`_ from rallytime/destroy_ssh_keys_private_ips + + * 4267509c25 Don't stacktrace if using private_ips and delete_sshkeys + +* **ISSUE** `#20169`_: (`flavianh`_) [salt-cloud] Add a meaningful error when /etc/salt/cloud is missing the master's address (refs: `#26563`_) + +* **PR** `#26563`_: (`rallytime`_) Fix error detection when salt-cloud config is missing a master's address + @ *2015-08-25 20:00:11 UTC* + + * 000e5a2acf Merge pull request `#26563`_ from rallytime/fix-20169 + + * 65b285d02d Only warn if master IP is unset - must be compatible with masterless minions + + * a4c87fcf57 Simplify logic + + * 593ead08cf Fix error detection when salt-cloud config is missing a master's address + +* **PR** `#26641`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-08-25 18:17:46 UTC* + + * 19c7a6d575 Merge pull request `#26641`_ from basepi/merge-forward-2015.5 + + * a5dafa436c Already fixed on 2015.5 + + * 71c0898fb5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * 4532f98a76 Merge pull request `#26515`_ from bersace/salt-env-local-sls + + * 0727af9e3d Defaults to current saltenv in state.sls + +* **PR** `#26620`_: (`rallytime`_) Also add -Z to script args for cloud tests + @ *2015-08-24 22:03:24 UTC* + + * 2927859c8a Merge pull request `#26620`_ from rallytime/more_script_args + + * 9ae27193d8 Also add -Z to script args for cloud tests + +* **PR** `#26618`_: (`rallytime`_) Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests + @ *2015-08-24 21:15:24 UTC* + + * ed166ebd4f Merge pull request `#26618`_ from rallytime/pip-undate-cloud-tests + + * 5a2c8825ba Extra lines + + * d28672b69e Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests + +* **PR** `#26612`_: (`rallytime`_) Use an available image to test against + @ *2015-08-24 19:09:18 UTC* + + * 6d3927bed5 Merge pull request `#26612`_ from rallytime/fix-do-list-images-test + + * 1401255287 Use an available image to test against + +* **ISSUE** `#15590`_: (`jtratner`_) salt-cloud gce configuration check incorrect (refs: `#26576`_) + +* **PR** `#26576`_: (`rallytime`_) Ensure GCE and EC2 configuration checks are correct + @ *2015-08-23 18:59:46 UTC* + + * 991bbf63fe Merge pull request `#26576`_ from rallytime/fix-14604 + + * ac67a1d238 Ensure GCE configuration check is correct + + * 421f1fde1e Ensure EC2 configuration check is correct + +* **ISSUE** `#12225`_: (`arthurlogilab`_) [salt-cloud] Attribution of floating IPs works partially in parallel mode (refs: `#26580`_) + +* **PR** `#26580`_: (`rallytime`_) Avoid race condition when assigning floating IPs to new VMs + @ *2015-08-23 18:58:48 UTC* + + * 746c0008a9 Merge pull request `#26580`_ from rallytime/fix-12225 + + * e3f7db17cc Avoid race condition when assigning floating IPs to new VMs + + * afda31be74 Create _assign_floating_ips function for DRY + +* **PR** `#26581`_: (`terminalmage`_) Skip tests that don't work with older mock + @ *2015-08-22 23:06:27 UTC* + + * 965a4ba7cf Merge pull request `#26581`_ from terminalmage/fix-tests + + * 49d8bd1dbe Remove unused import + + * 81a0d4c915 Skip tests that don't work with older mock + +* **ISSUE** `#25478`_: (`zyio`_) salt-ssh - Unable to locate current thin version (refs: `#25862`_) + +* **ISSUE** `#25026`_: (`sylvia-wang`_) salt-ssh "Failure deploying thin" when using salt module functions (refs: `#25862`_) + +* **PR** `#26591`_: (`rallytime`_) Back-port `#26554`_ to 2015.5 + @ *2015-08-22 21:19:02 UTC* + + * **PR** `#26554`_: (`tjstansell`_) /bin/sh is more portable than /bin/bash (refs: `#26591`_) + + * **PR** `#25862`_: (`zyio`_) Adding SCP_NOT_FOUND exit code (refs: `#26554`_) + + * 19992c1450 Merge pull request `#26591`_ from rallytime/bp-26554 + + * 6f8bed88cb /bin/sh is more portable than /bin/bash + +* **PR** `#26565`_: (`cachedout`_) Fix many errors with __virtual__ in tests + @ *2015-08-21 21:37:54 UTC* + + * 2cd36c7ed4 Merge pull request `#26565`_ from cachedout/fix_virtual_warnings + + * 41541e4e2b Fix many errors with __virtual__ in tests + +* **ISSUE** `#19249`_: (`ahetmanski`_) Cannot create cache_dir salt master exception. (refs: `#26548`_) + +* **PR** `#26553`_: (`rallytime`_) Back-port `#26548`_ to 2015.5 + @ *2015-08-21 17:40:21 UTC* + + * **PR** `#26548`_: (`vakulich`_) Catch OSError during cache directories creation, fixes `#19249`_ (refs: `#26553`_) + + * 5a32664efd Merge pull request `#26553`_ from rallytime/bp-26548 + + * ec2b2c3e40 Catch OSError during cache directories creation, fixes `#19249`_ + +* **PR** `#26552`_: (`rallytime`_) Back-port `#26542`_ to 2015.5 + @ *2015-08-21 17:40:11 UTC* + + * **PR** `#26542`_: (`arthurlogilab`_) [doc] reactor documentation fix : returners (refs: `#26552`_) + + * 7e67e48656 Merge pull request `#26552`_ from rallytime/bp-26542 + + * 0976b1e23b [doc] reactor documentation fix : returners + +* **PR** `#26551`_: (`rallytime`_) Back-port `#26539`_ to 2015.5 + @ *2015-08-21 17:39:22 UTC* + + * **PR** `#26539`_: (`carlpett`_) Doc-fix: Escape backslash in domain\\\\username (refs: `#26551`_) + + * bcd462545d Merge pull request `#26551`_ from rallytime/bp-26539 + + * 94ff4cff40 Doc-fix: Escape backslash in domain\username + +* **PR** `#26549`_: (`rallytime`_) Back-port `#26524`_ to 2015.5 + @ *2015-08-21 17:38:50 UTC* + + * **PR** `#26524`_: (`JensRantil`_) Gracefully handle package comparison not in (-1, 0, 1) (refs: `#26549`_) + + * **PR** `#25369`_: (`anlutro`_) Fix aptpkg.version_cmp (refs: `#26524`_) + + * 4dbf61c5af Merge pull request `#26549`_ from rallytime/bp-26524 + + * 4763f28725 logging(cmp_version): output assertion + + * 673b6c683d utils(version_cmp): handle comparison not in (0,1,-1) + +* **ISSUE** `#26502`_: (`ryan-lane`_) Adding a listener with None as ports doesn't result in an invocation error in boto_elb (refs: `#26527`_) + +* **PR** `#26527`_: (`jfindlay`_) check exists and values in boto_elb listeners + @ *2015-08-21 15:27:52 UTC* + + * 1ac8287588 Merge pull request `#26527`_ from jfindlay/elb + + * 343e47f00c check exists and values in boto_elb listeners + +* **PR** `#26446`_: (`stanislavb`_) Fetch AWS region from EC2 instance metadata (refs: `#26561`_) + @ *2015-08-21 15:11:08 UTC* + + * **PR** `#26378`_: (`stanislavb`_) Fix EC2 credentials from IAM roles for s3fs and s3 ext_pillar in 2015.5 (refs: `#26446`_) + + * e4b2534aa8 Merge pull request `#26446`_ from stanislavb/2015.5-ec2-metadata-region + + * 57943ff4f7 Fetch AWS region from EC2 instance metadata + +* **PR** `#26546`_: (`nmadhok`_) Do not raise KeyError when calling avail_images if VM/template is in disconnected state + @ *2015-08-21 14:17:49 UTC* + + * d721b7b2be Merge pull request `#26546`_ from nmadhok/vmware-key-error-patch-2015.5 + + * 1dcf157256 Do not raise KeyError when calling avail_images if VM/template is in disconnected state + +* **ISSUE** `#25360`_: (`BretFisher`_) file.replace removes line feed if using YAML's multiline string syntax (refs: `#26481`_) + +* **PR** `#26537`_: (`jfindlay`_) Merge `#26481`_ + @ *2015-08-21 05:37:24 UTC* + + * **PR** `#26481`_: (`TheBigBear`_) minor note: added (refs: `#26537`_) + + * 7da87fabf1 Merge pull request `#26537`_ from jfindlay/note + + * 662e723ae0 fixup note lint in file.replace state mod + + * 332535f2e6 Update file.py + + * 598500034f Update file.py + + * ec7c7d738d minor note: added + +* **PR** `#26528`_: (`zmalone`_) Fixing encrypt to instructions in the 2015.5 branch + @ *2015-08-20 21:49:06 UTC* + + * c6d8e34730 Merge pull request `#26528`_ from zmalone/2015.5 + + * 39b111c465 Fixing encrypt to instructions in the 2015.5 branch, --homedir is not necessary here. + +.. _`#11669`: https://github.com/saltstack/salt/issues/11669 +.. _`#12225`: https://github.com/saltstack/salt/issues/12225 +.. _`#14612`: https://github.com/saltstack/salt/issues/14612 +.. _`#15514`: https://github.com/saltstack/salt/issues/15514 +.. _`#15590`: https://github.com/saltstack/salt/issues/15590 +.. _`#16753`: https://github.com/saltstack/salt/issues/16753 +.. _`#17088`: https://github.com/saltstack/salt/issues/17088 +.. _`#17103`: https://github.com/saltstack/salt/issues/17103 +.. _`#18582`: https://github.com/saltstack/salt/issues/18582 +.. _`#19236`: https://github.com/saltstack/salt/issues/19236 +.. _`#19249`: https://github.com/saltstack/salt/issues/19249 +.. _`#20169`: https://github.com/saltstack/salt/issues/20169 +.. _`#20522`: https://github.com/saltstack/salt/issues/20522 +.. _`#21256`: https://github.com/saltstack/salt/issues/21256 +.. _`#21533`: https://github.com/saltstack/salt/issues/21533 .. _`#21649`: https://github.com/saltstack/salt/pull/21649 +.. _`#22550`: https://github.com/saltstack/salt/issues/22550 +.. _`#22724`: https://github.com/saltstack/salt/issues/22724 +.. _`#24020`: https://github.com/saltstack/salt/issues/24020 +.. _`#24021`: https://github.com/saltstack/salt/issues/24021 +.. _`#24510`: https://github.com/saltstack/salt/issues/24510 +.. _`#25026`: https://github.com/saltstack/salt/issues/25026 +.. _`#25352`: https://github.com/saltstack/salt/issues/25352 +.. _`#25360`: https://github.com/saltstack/salt/issues/25360 .. _`#25369`: https://github.com/saltstack/salt/pull/25369 +.. _`#25423`: https://github.com/saltstack/salt/issues/25423 +.. _`#25478`: https://github.com/saltstack/salt/issues/25478 +.. _`#25567`: https://github.com/saltstack/salt/issues/25567 +.. _`#25581`: https://github.com/saltstack/salt/issues/25581 .. _`#25862`: https://github.com/saltstack/salt/pull/25862 +.. _`#26108`: https://github.com/saltstack/salt/issues/26108 +.. _`#26192`: https://github.com/saltstack/salt/issues/26192 .. _`#26378`: https://github.com/saltstack/salt/pull/26378 .. _`#26446`: https://github.com/saltstack/salt/pull/26446 .. _`#26481`: https://github.com/saltstack/salt/pull/26481 +.. _`#26497`: https://github.com/saltstack/salt/issues/26497 +.. _`#26502`: https://github.com/saltstack/salt/issues/26502 .. _`#26515`: https://github.com/saltstack/salt/pull/26515 .. _`#26524`: https://github.com/saltstack/salt/pull/26524 .. _`#26525`: https://github.com/saltstack/salt/pull/26525 @@ -331,12 +1515,15 @@ Changes: .. _`#26628`: https://github.com/saltstack/salt/issues/26628 .. _`#26631`: https://github.com/saltstack/salt/pull/26631 .. _`#26636`: https://github.com/saltstack/salt/pull/26636 +.. _`#26638`: https://github.com/saltstack/salt/issues/26638 .. _`#26640`: https://github.com/saltstack/salt/pull/26640 .. _`#26641`: https://github.com/saltstack/salt/pull/26641 +.. _`#26644`: https://github.com/saltstack/salt/issues/26644 .. _`#26648`: https://github.com/saltstack/salt/pull/26648 .. _`#26651`: https://github.com/saltstack/salt/pull/26651 .. _`#26653`: https://github.com/saltstack/salt/pull/26653 .. _`#26655`: https://github.com/saltstack/salt/pull/26655 +.. _`#26656`: https://github.com/saltstack/salt/issues/26656 .. _`#26662`: https://github.com/saltstack/salt/pull/26662 .. _`#26663`: https://github.com/saltstack/salt/pull/26663 .. _`#26667`: https://github.com/saltstack/salt/pull/26667 @@ -348,28 +1535,39 @@ Changes: .. _`#26694`: https://github.com/saltstack/salt/pull/26694 .. _`#26695`: https://github.com/saltstack/salt/pull/26695 .. _`#26700`: https://github.com/saltstack/salt/pull/26700 +.. _`#26705`: https://github.com/saltstack/salt/issues/26705 .. _`#26709`: https://github.com/saltstack/salt/pull/26709 .. _`#26710`: https://github.com/saltstack/salt/pull/26710 .. _`#26714`: https://github.com/saltstack/salt/pull/26714 .. _`#26726`: https://github.com/saltstack/salt/pull/26726 +.. _`#26730`: https://github.com/saltstack/salt/issues/26730 +.. _`#26732`: https://github.com/saltstack/salt/issues/26732 .. _`#26736`: https://github.com/saltstack/salt/pull/26736 .. _`#26753`: https://github.com/saltstack/salt/pull/26753 +.. _`#26754`: https://github.com/saltstack/salt/issues/26754 .. _`#26759`: https://github.com/saltstack/salt/pull/26759 .. _`#26768`: https://github.com/saltstack/salt/pull/26768 +.. _`#26773`: https://github.com/saltstack/salt/issues/26773 .. _`#26775`: https://github.com/saltstack/salt/pull/26775 .. _`#26787`: https://github.com/saltstack/salt/pull/26787 +.. _`#26788`: https://github.com/saltstack/salt/issues/26788 .. _`#26790`: https://github.com/saltstack/salt/pull/26790 .. _`#26793`: https://github.com/saltstack/salt/pull/26793 +.. _`#26798`: https://github.com/saltstack/salt/issues/26798 .. _`#26800`: https://github.com/saltstack/salt/pull/26800 .. _`#26803`: https://github.com/saltstack/salt/pull/26803 +.. _`#26804`: https://github.com/saltstack/salt/issues/26804 +.. _`#26805`: https://github.com/saltstack/salt/issues/26805 .. _`#26815`: https://github.com/saltstack/salt/pull/26815 .. _`#26817`: https://github.com/saltstack/salt/pull/26817 .. _`#26820`: https://github.com/saltstack/salt/pull/26820 .. _`#26821`: https://github.com/saltstack/salt/pull/26821 .. _`#26823`: https://github.com/saltstack/salt/pull/26823 .. _`#26824`: https://github.com/saltstack/salt/pull/26824 +.. _`#26850`: https://github.com/saltstack/salt/issues/26850 .. _`#26851`: https://github.com/saltstack/salt/pull/26851 .. _`#26852`: https://github.com/saltstack/salt/pull/26852 +.. _`#26867`: https://github.com/saltstack/salt/issues/26867 .. _`#26868`: https://github.com/saltstack/salt/pull/26868 .. _`#26871`: https://github.com/saltstack/salt/pull/26871 .. _`#26875`: https://github.com/saltstack/salt/pull/26875 @@ -398,6 +1596,7 @@ Changes: .. _`#27011`: https://github.com/saltstack/salt/pull/27011 .. _`#27013`: https://github.com/saltstack/salt/pull/27013 .. _`#27019`: https://github.com/saltstack/salt/pull/27019 +.. _`#27021`: https://github.com/saltstack/salt/issues/27021 .. _`#27023`: https://github.com/saltstack/salt/pull/27023 .. _`#27024`: https://github.com/saltstack/salt/pull/27024 .. _`#27025`: https://github.com/saltstack/salt/pull/27025 @@ -416,14 +1615,17 @@ Changes: .. _`#27073`: https://github.com/saltstack/salt/pull/27073 .. _`#27074`: https://github.com/saltstack/salt/pull/27074 .. _`#27075`: https://github.com/saltstack/salt/pull/27075 +.. _`#27100`: https://github.com/saltstack/salt/issues/27100 .. _`#27114`: https://github.com/saltstack/salt/pull/27114 .. _`#27116`: https://github.com/saltstack/salt/pull/27116 .. _`#27117`: https://github.com/saltstack/salt/pull/27117 .. _`#27128`: https://github.com/saltstack/salt/pull/27128 +.. _`#27133`: https://github.com/saltstack/salt/issues/27133 .. _`#27147`: https://github.com/saltstack/salt/pull/27147 .. _`#27148`: https://github.com/saltstack/salt/pull/27148 .. _`#27149`: https://github.com/saltstack/salt/pull/27149 .. _`#27150`: https://github.com/saltstack/salt/pull/27150 +.. _`#27157`: https://github.com/saltstack/salt/issues/27157 .. _`#27162`: https://github.com/saltstack/salt/pull/27162 .. _`#27166`: https://github.com/saltstack/salt/pull/27166 .. _`#27167`: https://github.com/saltstack/salt/pull/27167 @@ -432,10 +1634,12 @@ Changes: .. _`#27172`: https://github.com/saltstack/salt/pull/27172 .. _`#27176`: https://github.com/saltstack/salt/pull/27176 .. _`#27180`: https://github.com/saltstack/salt/pull/27180 +.. _`#27187`: https://github.com/saltstack/salt/issues/27187 .. _`#27194`: https://github.com/saltstack/salt/pull/27194 .. _`#27201`: https://github.com/saltstack/salt/pull/27201 .. _`#27208`: https://github.com/saltstack/salt/pull/27208 .. _`#27214`: https://github.com/saltstack/salt/pull/27214 +.. _`#27215`: https://github.com/saltstack/salt/issues/27215 .. _`#27230`: https://github.com/saltstack/salt/pull/27230 .. _`#27231`: https://github.com/saltstack/salt/pull/27231 .. _`#27233`: https://github.com/saltstack/salt/pull/27233 @@ -446,35 +1650,145 @@ Changes: .. _`#27277`: https://github.com/saltstack/salt/pull/27277 .. _`#27278`: https://github.com/saltstack/salt/pull/27278 .. _`#27286`: https://github.com/saltstack/salt/pull/27286 +.. _`#27297`: https://github.com/saltstack/salt/issues/27297 +.. _`#27307`: https://github.com/saltstack/salt/issues/27307 .. _`#27308`: https://github.com/saltstack/salt/pull/27308 .. _`#27309`: https://github.com/saltstack/salt/pull/27309 .. _`#27310`: https://github.com/saltstack/salt/pull/27310 .. _`#27311`: https://github.com/saltstack/salt/pull/27311 +.. _`#27316`: https://github.com/saltstack/salt/issues/27316 .. _`#27317`: https://github.com/saltstack/salt/pull/27317 .. _`#27335`: https://github.com/saltstack/salt/pull/27335 .. _`#27336`: https://github.com/saltstack/salt/pull/27336 +.. _`#27342`: https://github.com/saltstack/salt/issues/27342 .. _`#27345`: https://github.com/saltstack/salt/pull/27345 .. _`#27351`: https://github.com/saltstack/salt/pull/27351 .. _`#27356`: https://github.com/saltstack/salt/issues/27356 .. _`#27358`: https://github.com/saltstack/salt/pull/27358 +.. _`#27372`: https://github.com/saltstack/salt/issues/27372 .. _`#27375`: https://github.com/saltstack/salt/pull/27375 .. _`#27379`: https://github.com/saltstack/salt/pull/27379 .. _`#27389`: https://github.com/saltstack/salt/issues/27389 +.. _`#27406`: https://github.com/saltstack/salt/issues/27406 .. _`#27408`: https://github.com/saltstack/salt/pull/27408 .. _`#27410`: https://github.com/saltstack/salt/pull/27410 .. _`#27419`: https://github.com/saltstack/salt/pull/27419 .. _`#27426`: https://github.com/saltstack/salt/pull/27426 +.. _`#27433`: https://github.com/saltstack/salt/issues/27433 .. _`#27434`: https://github.com/saltstack/salt/pull/27434 .. _`#27438`: https://github.com/saltstack/salt/issues/27438 +.. _`#27447`: https://github.com/saltstack/salt/issues/27447 +.. _`#27460`: https://github.com/saltstack/salt/issues/27460 .. _`#27467`: https://github.com/saltstack/salt/pull/27467 .. _`#27468`: https://github.com/saltstack/salt/pull/27468 .. _`#27469`: https://github.com/saltstack/salt/pull/27469 .. _`#27470`: https://github.com/saltstack/salt/pull/27470 .. _`#27472`: https://github.com/saltstack/salt/pull/27472 +.. _`#27478`: https://github.com/saltstack/salt/issues/27478 .. _`#27479`: https://github.com/saltstack/salt/pull/27479 .. _`#27483`: https://github.com/saltstack/salt/pull/27483 .. _`#27484`: https://github.com/saltstack/salt/pull/27484 .. _`#27509`: https://github.com/saltstack/salt/pull/27509 .. _`#27515`: https://github.com/saltstack/salt/pull/27515 .. _`#27516`: https://github.com/saltstack/salt/pull/27516 +.. _`#27518`: https://github.com/saltstack/salt/issues/27518 .. _`#27557`: https://github.com/saltstack/salt/pull/27557 +.. _`#27582`: https://github.com/saltstack/salt/pull/27582 +.. _`#9592`: https://github.com/saltstack/salt/issues/9592 +.. _`#9856`: https://github.com/saltstack/salt/issues/9856 +.. _`Arabus`: https://github.com/Arabus +.. _`BretFisher`: https://github.com/BretFisher +.. _`Galser`: https://github.com/Galser +.. _`GregMeno`: https://github.com/GregMeno +.. _`JensRantil`: https://github.com/JensRantil +.. _`MadsRC`: https://github.com/MadsRC +.. _`PierreR`: https://github.com/PierreR +.. _`SEJeff`: https://github.com/SEJeff +.. _`SaltyCharles`: https://github.com/SaltyCharles +.. _`SeverinLeonhardt`: https://github.com/SeverinLeonhardt +.. _`TheBigBear`: https://github.com/TheBigBear +.. _`WackyOne`: https://github.com/WackyOne +.. _`abh`: https://github.com/abh +.. _`aboe76`: https://github.com/aboe76 +.. _`ahammond`: https://github.com/ahammond +.. _`ahetmanski`: https://github.com/ahetmanski +.. _`alxbse`: https://github.com/alxbse +.. _`amendlik`: https://github.com/amendlik +.. _`anlutro`: https://github.com/anlutro +.. _`ariscn`: https://github.com/ariscn +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`aspyatkin`: https://github.com/aspyatkin +.. _`b18`: https://github.com/b18 +.. _`basepi`: https://github.com/basepi +.. _`benhosmer`: https://github.com/benhosmer +.. _`bersace`: https://github.com/bersace +.. _`bramhg`: https://github.com/bramhg +.. _`cachedout`: https://github.com/cachedout +.. _`carlpett`: https://github.com/carlpett +.. _`damonzheng`: https://github.com/damonzheng +.. _`deniswal`: https://github.com/deniswal +.. _`derphilipp`: https://github.com/derphilipp +.. _`dhs-rec`: https://github.com/dhs-rec +.. _`dmyerscough`: https://github.com/dmyerscough +.. _`dsumsky`: https://github.com/dsumsky +.. _`efficks`: https://github.com/efficks +.. _`eguven`: https://github.com/eguven +.. _`eliasp`: https://github.com/eliasp +.. _`flavianh`: https://github.com/flavianh +.. _`flyaruu`: https://github.com/flyaruu +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gravyboat`: https://github.com/gravyboat +.. _`hexedpackets`: https://github.com/hexedpackets +.. _`jacksontj`: https://github.com/jacksontj +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jcockhren`: https://github.com/jcockhren +.. _`jefftucker`: https://github.com/jefftucker +.. _`jeremyBass`: https://github.com/jeremyBass +.. _`jfindlay`: https://github.com/jfindlay +.. _`joejulian`: https://github.com/joejulian +.. _`johanek`: https://github.com/johanek +.. _`johtso`: https://github.com/johtso +.. _`jtratner`: https://github.com/jtratner +.. _`julianbrost`: https://github.com/julianbrost +.. _`junster1`: https://github.com/junster1 +.. _`kev009`: https://github.com/kev009 +.. _`llevar`: https://github.com/llevar +.. _`lorengordon`: https://github.com/lorengordon +.. _`lrhazi`: https://github.com/lrhazi +.. _`m03`: https://github.com/m03 +.. _`madprog`: https://github.com/madprog +.. _`mainframe`: https://github.com/mainframe +.. _`marccardinal`: https://github.com/marccardinal +.. _`netroby`: https://github.com/netroby +.. _`nmadhok`: https://github.com/nmadhok +.. _`otrempe`: https://github.com/otrempe +.. _`plastikos`: https://github.com/plastikos +.. _`rallytime`: https://github.com/rallytime +.. _`rominf`: https://github.com/rominf +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`s-iraheta`: https://github.com/s-iraheta +.. _`saltstack-bot`: https://github.com/saltstack-bot +.. _`saltstack/salt#26899`: https://github.com/saltstack/salt/pull/26899 +.. _`serge-p`: https://github.com/serge-p +.. _`spudfkc`: https://github.com/spudfkc +.. _`srkunze`: https://github.com/srkunze +.. _`ssgward`: https://github.com/ssgward +.. _`stanislavb`: https://github.com/stanislavb +.. _`styro`: https://github.com/styro +.. _`sylvia-wang`: https://github.com/sylvia-wang +.. _`systembell`: https://github.com/systembell +.. _`tankywoo`: https://github.com/tankywoo +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`tjstansell`: https://github.com/tjstansell +.. _`twangboy`: https://github.com/twangboy +.. _`tweenk`: https://github.com/tweenk +.. _`ty2u`: https://github.com/ty2u +.. _`umireon`: https://github.com/umireon +.. _`vakulich`: https://github.com/vakulich +.. _`vtek21`: https://github.com/vtek21 +.. _`wfhu`: https://github.com/wfhu +.. _`whiteinge`: https://github.com/whiteinge +.. _`zmalone`: https://github.com/zmalone +.. _`zyio`: https://github.com/zyio diff --git a/doc/topics/releases/2015.5.7.rst b/doc/topics/releases/2015.5.7.rst index 3a70717de4..b86107fdf9 100644 --- a/doc/topics/releases/2015.5.7.rst +++ b/doc/topics/releases/2015.5.7.rst @@ -2,236 +2,1096 @@ Salt 2015.5.7 Release Notes =========================== -.. note:: +:release: 2015-10-13 - A significant orchestrate issue `#29110`_ was discovered during the release - process of 2015.5.7, so it has not been officially released. Please use - `2015.5.8 - `_ - instead. +Version 2015.5.7 is a bugfix release for :ref:`2015.5.0 `. -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): -*Generated at: 2015-11-13T17:11:14Z* +Statistics +========== -Total Merges: **102** +- Total Merges: **103** +- Total Issue References: **66** +- Total PR References: **135** -Changes: +- Contributors: **46** (`0xf10e`_, `JaseFace`_, `MasterNayru`_, `MrCitron`_, `Sacro`_, `ajacoutot`_, `arthurlogilab`_, `basepi`_, `belvedere-trading`_, `beverlcl`_, `blast-hardcheese`_, `blueyed`_, `bogdanr`_, `cachedout`_, `cbuechler`_, `chrigl`_, `dmyerscough`_, `eguven`_, `eliasp`_, `erchn`_, `eyj`_, `garethgreenaway`_, `gashev`_, `gnubyexample`_, `gracinet`_, `gravyboat`_, `gwaters`_, `hedinfaok`_, `iggy`_, `jacksontj`_, `jacobhammons`_, `jfindlay`_, `lorengordon`_, `mbologna`_, `msciciel`_, `nmadhok`_, `pass-by-value`_, `plastikos`_, `rallytime`_, `rominf`_, `s0undt3ch`_, `silenius`_, `sjmh`_, `stephen144`_, `terminalmage`_, `twangboy`_) -- **PR** `#28731`_: (*garethgreenaway*) Fixes to salt scheduler in 2015.5, ensuring that return_job is only used on minion scheduler -- **PR** `#28857`_: (*rallytime*) Back-port `#28851`_ to 2015.5 +.. important:: + A significant orchestrate issue (:issue:`#29110`) was discovered during the + release process of 2015.5.7, so it has not been officially released. + Please use :ref:`2015.5.8 ` instead. -- **PR** `#28856`_: (*rallytime*) Back-port `#28853`_ to 2015.5 -- **PR** `#28832`_: (*basepi*) [2015.5] Backport `#28826`_ +Changelog for v2015.5.6..v2015.5.7 +================================== -- **PR** `#28833`_: (*basepi*) [2015.5] Increase the default gather_job_timeout +*Generated at: 2018-05-27 22:16:54 UTC* -- **PR** `#28829`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 +* **PR** `#28864`_: (`jfindlay`_) add 2015.5.7 release notes + @ *2015-11-13 17:15:00 UTC* -- **PR** `#28756`_: (*MrCitron*) Fix `#25775`_ + * ec7fdc539b Merge pull request `#28864`_ from jfindlay/2015.5 -- **PR** `#28786`_: (*chrigl*) closes `#28783`_ + * 648b697951 add 2015.5.7 release notes -- **PR** `#28776`_: (*rallytime*) Back-port `#28740`_ to 2015.5 +* **ISSUE** `#27392`_: (`ahammond`_) schedule running state.orchestrate fails (refs: `#28731`_) -- **PR** `#28760`_: (*dmyerscough*) Fixing CherryPy key bug +* **PR** `#28731`_: (`garethgreenaway`_) Fixes to salt scheduler in 2015.5, ensuring that return_job is only used on minion scheduler + @ *2015-11-13 16:58:06 UTC* -- **PR** `#28746`_: (*rallytime*) Back-port `#28718`_ to 2015.5 + * bed45f4208 Merge pull request `#28731`_ from garethgreenaway/27392_2015_5_scheduler_return_job_master -- **PR** `#28705`_: (*cachedout*) Account for new headers class in tornado 4.3 + * 771e9f7b6f Fixing the salt scheduler so that it only attempts to return the job data to the master if the scheduled job is running from a minion's scheduler. -- **PR** `#28699`_: (*rallytime*) Back-port `#28670`_ to 2015.5 +* **PR** `#28857`_: (`rallytime`_) Back-port `#28851`_ to 2015.5 + @ *2015-11-13 13:56:53 UTC* -- **PR** `#28703`_: (*rallytime*) Back-port `#28690`_ to 2015.5 + * **PR** `#28851`_: (`rominf`_) [states/schedule] docstring: args, kwargs -> job_args, job_kwargs (refs: `#28857`_) -- **PR** `#28694`_: (*s0undt3ch*) [2015.5] Update to latest bootstrap script v2015.11.09 + * 06f4932876 Merge pull request `#28857`_ from rallytime/bp-28851 -- **PR** `#28669`_: (*rallytime*) Use the -q argument to strip extraneous messages from rabbitmq + * aa4b193f87 [states/schedule] docstring: args, kwargs -> job_args, job_kwargs -- **PR** `#28645`_: (*jacksontj*) Rework minion return_retry_timer +* **PR** `#28856`_: (`rallytime`_) Back-port `#28853`_ to 2015.5 + @ *2015-11-13 13:46:10 UTC* -- **PR** `#28668`_: (*twangboy*) Fixed join_domain and unjoin_domain for Windows + * **PR** `#28853`_: (`eliasp`_) Typo (with → which) (refs: `#28856`_) -- **PR** `#28666`_: (*jfindlay*) define r_data before using it in file module + * 0934a52b34 Merge pull request `#28856`_ from rallytime/bp-28853 -- **PR** `#28662`_: (*cachedout*) Add note about disabling master_alive_interval + * 37eeab2683 Typo (with → which) -- **PR** `#28627`_: (*twangboy*) Backport win_useradd +* **ISSUE** `#28828`_: (`basepi`_) salt-ssh doesn't package tornado's new deps in the thin (refs: `#28826`_) -- **PR** `#28617`_: (*cachedout*) Set restrictive umask on module sync +* **PR** `#28832`_: (`basepi`_) [2015.5] Backport `#28826`_ + @ *2015-11-12 19:32:03 UTC* -- **PR** `#28622`_: (*gravyboat*) Update puppet module wording + * **PR** `#28826`_: (`basepi`_) [2015.8] Add new tornado deps to salt-ssh thin (refs: `#28832`_) -- **PR** `#28563`_: (*s0undt3ch*) [2015.5] Update to latest bootstrap script v2015.11.04 + * eb904665dc Merge pull request `#28832`_ from basepi/backport.28826 -- **PR** `#28541`_: (*twangboy*) Fixed problem with system.set_computer_name + * 57be72eb91 Add backports_abc and singledispatch_helpers to thin as well -- **PR** `#28537`_: (*jfindlay*) decode filename to utf-8 in file.recurse state + * 897cad627b Add singledispatch to the thin -- **PR** `#28529`_: (*rallytime*) Update contributing and documentation pages to recommend submitting against branches +* **ISSUE** `#8647`_: (`Mrten`_) salt '*' highstate returns 'minion did not return', salt [minion] highstate works (refs: `#28833`_) -- **PR** `#28548`_: (*nmadhok*) [Backport] [2015.5] Tasks can be in queued state instead of running +* **PR** `#28833`_: (`basepi`_) [2015.5] Increase the default gather_job_timeout + @ *2015-11-12 19:31:58 UTC* -- **PR** `#28531`_: (*rallytime*) Add versionadded directives to virtualenv_mod state/module + * eff811a0ad Merge pull request `#28833`_ from basepi/increase.gather_job_timeout.8647 -- **PR** `#28508`_: (*twangboy*) Fixed windows tests + * c09243dd01 Increase the default gather_job_timeout -- **PR** `#28525`_: (*rallytime*) Fix spacing in doc examples for boto_route53 state and module +* **PR** `#28829`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-11-12 18:50:51 UTC* -- **PR** `#28517`_: (*rallytime*) Add state_auto_order defaults to True note to ordering docs + * e4a036365d Merge pull request `#28829`_ from basepi/merge-forward-2015.5 -- **PR** `#28512`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 + * f8b8441485 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#28448`_: (*gwaters*) added a note to the tutorial for redhat derivatives + * 76e69b4bff Merge pull request `#28777`_ from rallytime/bp-28740-2014.7 -- **PR** `#28406`_: (*rallytime*) Back-port `#28381`_ to 2015.5 + * da5fac2b36 Back-port `#28740`_ to 2014.7 -- **PR** `#28413`_: (*rallytime*) Back-port `#28400`_ to 2015.5 + * 45c73ebf2f Merge pull request `#28716`_ from rallytime/bp-28705 -- **PR** `#28366`_: (*erchn*) mark repo not enabled when pkgrepo state passes in disable: True + * 32e7bd3ea0 Account for new headers class in tornado 4.3 -- **PR** `#28373`_: (*beverlcl*) Fixing bug `#28372`_ for use_carrier option on bonding network interfaces. + * f4fe921965 Merge pull request `#28717`_ from cachedout/umask_note -- **PR** `#28359`_: (*rallytime*) Back-port `#28358`_ to 2015.5 + * 1874300e08 Add note about recommended umask -- **PR** `#28346`_: (*twangboy*) Fix installer +* **ISSUE** `#25775`_: (`trimbleagvendoraccounta`_) blockdev.formatted formats but fails. Second highstate shows success. (refs: `#28756`_) -- **PR** `#28315`_: (*gwaters*) Adding a working example of setting pillar data on the cli +* **ISSUE** `#20235`_: (`joejulian`_) blockdev.format state can fail even if it succeeds (refs: `#28756`_) -- **PR** `#28211`_: (*terminalmage*) Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch) +* **PR** `#28756`_: (`MrCitron`_) Fix `#25775`_ + @ *2015-11-12 17:47:51 UTC* -- **PR** `#28263`_: (*cachedout*) New channel for event.send + * 93562631aa Merge pull request `#28756`_ from MrCitron/fix-25775 -- **PR** `#28293`_: (*cachedout*) Minor grammar changes + * 82075c809c Add logs and correct pylint error -- **PR** `#28271`_: (*gwaters*) Update tutorial documentation + * e31e22d96a Fix 25775 -- **PR** `#28280`_: (*0xf10e*) Correct Jinja function load_* to import_* +* **ISSUE** `#28783`_: (`chrigl`_) iptables.get_saved_rules does not handle family=ipv6 (refs: `#28786`_) -- **PR** `#28255`_: (*cachedout*) Add __cli opt +* **PR** `#28786`_: (`chrigl`_) closes `#28783`_ + @ *2015-11-11 21:01:19 UTC* -- **PR** `#28213`_: (*rallytime*) If record returned None, don't continue with the state. Something went wrong + * 30cc48e37f Merge pull request `#28786`_ from chrigl/fix-28783 -- **PR** `#28238`_: (*basepi*) [2015.5] Fix schedule.present always diffing + * ba6d814553 closes `#28783`_ -- **PR** `#28174`_: (*lorengordon*) Add support for multiline regex in file.replace +* **PR** `#28776`_: (`rallytime`_) Back-port `#28740`_ to 2015.5 + @ *2015-11-11 18:02:03 UTC* -- **PR** `#28175`_: (*twangboy*) Fixes `#19673`_ + * **PR** `#28740`_: (`MasterNayru`_) Add missing S3 module import (refs: `#28776`_, `#28777`_) -- **PR** `#28140`_: (*rallytime*) Add OpenBSD installation documentation to 2015.5 branch + * 8f1d0b636e Merge pull request `#28776`_ from rallytime/bp-28740-2015.5 -- **PR** `#28138`_: (*rallytime*) Back-port `#28130`_ EC2 Sizes Only portion to 2015.5 + * 49256b7d90 Back-port `#28740`_ to 2015.5 -- **PR** `#28097`_: (*jacksontj*) For all multi-part messages, check the headers. If the header is not … +* **ISSUE** `#28732`_: (`dmyerscough`_) cherrypy API endpoint (refs: `#28760`_) -- **PR** `#28117`_: (*rallytime*) Clean up stacktrace when master can't be reached in lxc cloud driver +* **ISSUE** `#22452`_: (`whiteinge`_) rest_cherrypy /keys URL returns empty keys for minion IDs that already exist (refs: `#28760`_) -- **PR** `#28110`_: (*terminalmage*) Add explanation of file_client: local setting masterless mode +* **ISSUE** `#22451`_: (`whiteinge`_) rest_cherrypy /keys URL throws a 500 on the first request (refs: `#28760`_) -- **PR** `#28109`_: (*rallytime*) Add created reactor event to lxc cloud driver +* **ISSUE** `#22442`_: (`allanliu`_) rest_cherrypy /keys URL does not handle JSON requests (refs: `#28760`_) -- **PR** `#27996`_: (*rallytime*) Don't fail if pip package is already present and pip1 is installed +* **PR** `#28760`_: (`dmyerscough`_) Fixing CherryPy key bug + @ *2015-11-11 15:11:18 UTC* -- **PR** `#28056`_: (*rallytime*) Back-port `#28033`_ to 2015.5 + * 77d4b980f1 Merge pull request `#28760`_ from dmyerscough/28732-Fix-cherrypi-api-keys-endpoint -- **PR** `#28059`_: (*rallytime*) Back-port `#28040`_ to 2015.5 + * 206d1684b2 Fixing CherryPy key bug -- **PR** `#28047`_: (*cachedout*) Restore FTP functionality to file client +* **ISSUE** `#28714`_: (`gravyboat`_) Salt-api doesn't work with post unless data is included. (refs: `#28718`_) -- **PR** `#28032`_: (*twangboy*) Fixed win_path.py +* **PR** `#28746`_: (`rallytime`_) Back-port `#28718`_ to 2015.5 + @ *2015-11-10 18:16:40 UTC* -- **PR** `#28037`_: (*rallytime*) Back-port `#28003`_ to 2015.5 + * **PR** `#28718`_: (`sjmh`_) Account for no POST data (refs: `#28746`_) -- **PR** `#28031`_: (*jacobhammons*) Updated release notes with additional CVE information + * 6f8f04975f Merge pull request `#28746`_ from rallytime/bp-28718 -- **PR** `#28008`_: (*jfindlay*) platform independent line endings in hosts mod + * 092f441cad Account for no POST data -- **PR** `#28012`_: (*rallytime*) Clean up stack trace when something goes wrong with minion output +* **PR** `#28705`_: (`cachedout`_) Account for new headers class in tornado 4.3 (refs: `#28716`_) + @ *2015-11-09 19:24:34 UTC* -- **PR** `#27995`_: (*jacobhammons*) added link to grains security FAQ to targeting and pillar topics. + * f40c617bad Merge pull request `#28705`_ from cachedout/tornado_http_headers -- **PR** `#27986`_: (*jacobhammons*) Changed current release to 5.6 and added CVE to release notes + * 7ac6cde1ee Account for new headers class in tornado 4.3 -- **PR** `#27913`_: (*pass-by-value*) Set default +* **PR** `#28699`_: (`rallytime`_) Back-port `#28670`_ to 2015.5 + @ *2015-11-09 18:10:58 UTC* -- **PR** `#27876`_: (*terminalmage*) 2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used + * **PR** `#28670`_: (`plastikos`_) psutil can fail to look-up a uid and raise a KeyError (refs: `#28699`_) -- **PR** `#27726`_: (*jfindlay*) deprecate hash_hostname in favor of hash_known_hosts + * 604a7b4199 Merge pull request `#28699`_ from rallytime/bp-28670 -- **PR** `#27776`_: (*jfindlay*) return message when local jobs_cache not found + * e436b23296 psutil can fail to look-up a uid and raise a KeyError -- **PR** `#27766`_: (*jfindlay*) better check for debian userdel error +* **PR** `#28703`_: (`rallytime`_) Back-port `#28690`_ to 2015.5 + @ *2015-11-09 18:01:57 UTC* -- **PR** `#27758`_: (*iggy*) Remove redundant text from syslog returner + * **PR** `#28690`_: (`MrCitron`_) Fix 28689 : Check s3 ext pillar cache file before calculating expiration (refs: `#28703`_) -- **PR** `#27841`_: (*terminalmage*) Detect Manjaro Linux as Arch derivative + * 7bd3eb8370 Merge pull request `#28703`_ from rallytime/bp-28690 -- **PR** `#27852`_: (*rallytime*) Back-port `#27806`_ to 2015.5 + * a0988dab58 Fix 28689 : Check s3 ext pillar cache file before calculating expiration -- **PR** `#27838`_: (*basepi*) [2015.5] Fix highstate outputter for jobs.lookup_jid + * **PR** `saltstack/salt-bootstrap#868`_: (`cachedout`_) Always refresh the Arch Linux keyring if needed (refs: `#28694`_) -- **PR** `#27791`_: (*eguven*) 2015.5 postgres_user groups backport +* **PR** `#28694`_: (`s0undt3ch`_) [2015.5] Update to latest bootstrap script v2015.11.09 + @ *2015-11-09 17:49:53 UTC* -- **PR** `#27759`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 + * 2a40f57b93 Merge pull request `#28694`_ from s0undt3ch/2015.5 -- **PR** `#27732`_: (*jacobhammons*) update docs for __virtual__ and __virtualname__ + * 0910c6ffe4 Update to latest bootstrap script v2015.11.09 -- **PR** `#27747`_: (*Sacro*) Chocolatey doesn't have a help command. +* **ISSUE** `#26592`_: (`centromere`_) rabbitmq.list_vhosts removes final line from rabbitmqctl output (refs: `#28669`_) -- **PR** `#27733`_: (*jacobhammons*) hardening topic - updates to docs.saltstack.com theme +* **PR** `#28669`_: (`rallytime`_) Use the -q argument to strip extraneous messages from rabbitmq + @ *2015-11-08 01:07:25 UTC* -- **PR** `#27706`_: (*jacobhammons*) Assorted doc bugs + * 3249b322e8 Merge pull request `#28669`_ from rallytime/fix-26592 -- **PR** `#27695`_: (*rallytime*) Back-port `#27671`_ to 2015.5 + * 098fb815af Use the -q argument to strip extraneous messages from rabbitmq -- **PR** `#27524`_: (*jfindlay*) parse pkgng output in quiet mode for >= 1.6.1 +* **ISSUE** `#28577`_: (`jacksontj`_) Increase in master CPU usage after upgrading to 2015.8 (refs: `#28645`_) -- **PR** `#27686`_: (*rallytime*) Back-port `#27476`_ to 2015.5 +* **PR** `#28645`_: (`jacksontj`_) Rework minion return_retry_timer + @ *2015-11-07 03:40:28 UTC* -- **PR** `#27684`_: (*rallytime*) Back-port `#27656`_ to 2015.5 + * **PR** `#27286`_: (`terminalmage`_) Add a configurable timer for minion return retries (refs: `#28645`_) -- **PR** `#27683`_: (*rallytime*) Back-port `#27659`_ to 2015.5 + * 29e8250d0c Merge pull request `#28645`_ from jacksontj/2015.5 -- **PR** `#27682`_: (*rallytime*) Back-port `#27566`_ to 2015.5 + * f63c2d70a7 Rework minion return_retry_timer -- **PR** `#27681`_: (*rallytime*) Back-port `#25928`_ to 2015.5 +* **ISSUE** `#15177`_: (`baskinomics`_) system.join_domain() does not join domain on Windows Server 2012 R2 (refs: `#28668`_) -- **PR** `#27680`_: (*rallytime*) Back-port `#27535`_ to 2015.5 +* **PR** `#28668`_: (`twangboy`_) Fixed join_domain and unjoin_domain for Windows + @ *2015-11-07 03:40:04 UTC* -- **PR** `#27442`_: (*JaseFace*) Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() + * 1bbaea8aad Merge pull request `#28668`_ from twangboy/fix_15177 -- **PR** `#27641`_: (*rallytime*) Gate the psutil import and add depends doc for diskusage beacon + * 745b8f75f6 Fixed some lint -- **PR** `#27644`_: (*rallytime*) Back-port `#27640`_ to 2015.5 + * a43eb53f28 Added version added notes in docs -- **PR** `#27612`_: (*rallytime*) Fix GCE external_ip stacktraces in 2015.5 + * 6b537c8640 Fixed join_domain and unjoin_domain for Windows -- **PR** `#27568`_: (*jacobhammons*) regenerated man pages +* **ISSUE** `#8051`_: (`regilero`_) Problems with fileinput.input inplace editing in salt.states.file.replace (refs: `#28174`_) +* **ISSUE** `#7999`_: (`regilero`_) MULTILINE pattern cannot work in file.replace, fileinput always reads line by line. (refs: `#28174`_) + +* **PR** `#28666`_: (`jfindlay`_) define r_data before using it in file module + @ *2015-11-07 00:46:27 UTC* + + * **PR** `#28174`_: (`lorengordon`_) Add support for multiline regex in file.replace (refs: `#28666`_) + + * 4ad5056066 Merge pull request `#28666`_ from jfindlay/r_data + + * 29228f445f define r_data before using it in file module + +* **ISSUE** `#24758`_: (`zerthimon`_) salt-minion uses 100% CPU for periodic status.master task on a server with a lot of TCP connections (a LB). (refs: `#28662`_) + +* **PR** `#28662`_: (`cachedout`_) Add note about disabling master_alive_interval + @ *2015-11-07 00:38:12 UTC* + + * e129e889ad Merge pull request `#28662`_ from cachedout/issue_24758 + + * 78f4894333 Add note about disabling master_alive_interval + +* **PR** `#28627`_: (`twangboy`_) Backport win_useradd + @ *2015-11-06 16:57:49 UTC* + + * df121d0cec Merge pull request `#28627`_ from twangboy/backport_win_useradd + + * 87282b6354 Backport win_useradd + +* **ISSUE** `#28398`_: (`L4rS6`_) Permissions /var/cache/salt/minion/extmods (refs: `#28617`_) + +* **PR** `#28617`_: (`cachedout`_) Set restrictive umask on module sync + @ *2015-11-05 23:43:28 UTC* + + * 64a20228c6 Merge pull request `#28617`_ from cachedout/umask_module_sync + + * 227792e158 Set restrictive umask on module sync + +* **ISSUE** `#28621`_: (`gravyboat`_) Puppet module documentation should be less insulting (refs: `#28622`_) + +* **PR** `#28622`_: (`gravyboat`_) Update puppet module wording + @ *2015-11-05 20:34:07 UTC* + + * 065f8c7fb3 Merge pull request `#28622`_ from gravyboat/update_puppet_module_docs + + * 4ea28bed30 Update puppet module wording + +* **ISSUE** `#655`_: (`thatch45`_) Add general command management to service (refs: #`saltstack/salt-bootstrap#656`_) + + * **PR** `saltstack/salt-bootstrap#674`_: (`jfindlay`_) add support for repo.saltstack.com (refs: `#28563`_) + + * **PR** `saltstack/salt-bootstrap#665`_: (`mbologna`_) Change to 'dnf' as package manager for Fedora 22-> (refs: `#28563`_) + + * **PR** `saltstack/salt-bootstrap#656`_: (`eyj`_) Add bootstrap -b flag (don't install dependencies) (refs: `#28563`_) + + * **PR** `saltstack/salt-bootstrap#654`_: (`hedinfaok`_) Fixes error finding python-jinja2 in RHEL 7 (refs: `#28563`_) + + * **PR** `saltstack/salt-bootstrap#653`_: (`cbuechler`_) Make bootstrap work with FreeBSD 11-CURRENT. (refs: `#28563`_) + +* **PR** `#28563`_: (`s0undt3ch`_) [2015.5] Update to latest bootstrap script v2015.11.04 + @ *2015-11-04 15:16:31 UTC* + + * 08295de5a5 Merge pull request `#28563`_ from s0undt3ch/2015.5 + + * 16f4db79a0 Update to latest bootstrap script v2015.11.04 + +* **ISSUE** `#28173`_: (`twangboy`_) system.computer_name does not work in windows (refs: `#28541`_) + +* **PR** `#28541`_: (`twangboy`_) Fixed problem with system.set_computer_name + @ *2015-11-04 14:48:54 UTC* + + * 1e09f186ce Merge pull request `#28541`_ from twangboy/fix_28173 + + * 7edf5ce370 Fixed problem with system.set_computer_name + +* **ISSUE** `#28524`_: (`bmcorser`_) UnicodeDecodeError in states.file (refs: `#28538`_, `#28537`_) + + * **PR** `#28538`_: (`jfindlay`_) decode path and url to utf-8 in url.create (refs: `#28537`_) + +* **PR** `#28537`_: (`jfindlay`_) decode filename to utf-8 in file.recurse state + @ *2015-11-04 14:48:18 UTC* + + * f44ed780b5 Merge pull request `#28537`_ from jfindlay/decode_state_2015.5 + + * 06e514940c decode filename to utf-8 in file.recurse state + +* **ISSUE** `#28272`_: (`gravyboat`_) Update documentation contributing docs to explain how to PR against different releases (refs: `#28529`_) + +* **PR** `#28529`_: (`rallytime`_) Update contributing and documentation pages to recommend submitting against branches + @ *2015-11-04 14:47:21 UTC* + + * 6acf87593f Merge pull request `#28529`_ from rallytime/fix-28272 + + * a959681858 Add link to Sending a GH PR to documentation docs + + * 1c612e2772 Update contributing and documentation pages to recommend submitting against branches + +* **ISSUE** `#28511`_: (`nghgd`_) vmware clone task fails instead of waiting to completion (refs: `#28546`_) + +* **PR** `#28548`_: (`nmadhok`_) [Backport] [2015.5] Tasks can be in queued state instead of running + @ *2015-11-04 04:14:25 UTC* + + * **PR** `#28546`_: (`nmadhok`_) Tasks can be in queued state instead of running. (refs: `#28548`_) + + * 025bff2bf0 Merge pull request `#28548`_ from nmadhok/2015.5-task-error + + * 804a0a6537 Tasks can be in queued state instead of running. Fixes `#28511`_ + +* **ISSUE** `#24585`_: (`utahcon`_) No version data for SALT.STATES.VIRTUALENV in wiki (refs: `#28531`_) + +* **PR** `#28531`_: (`rallytime`_) Add versionadded directives to virtualenv_mod state/module + @ *2015-11-03 21:34:49 UTC* + + * 63bd3e52b3 Merge pull request `#28531`_ from rallytime/fix-24585 + + * bc577b2531 Add versionadded directives to virtualenv_mod state/module + +* **PR** `#28508`_: (`twangboy`_) Fixed windows tests + @ *2015-11-03 19:31:12 UTC* + + * ea3bf972c4 Merge pull request `#28508`_ from twangboy/fix_unit_tests_windows + + * 0da6ff7c50 Fixed some logic + + * cf1e059be5 Fixed windows tests + +* **PR** `#28525`_: (`rallytime`_) Fix spacing in doc examples for boto_route53 state and module + @ *2015-11-03 19:30:24 UTC* + + * 73c5735fc1 Merge pull request `#28525`_ from rallytime/route53_spacing + + * 6ab2ce615c Fix spacing in doc examples for boto_route53 state and module + +* **ISSUE** `#28243`_: (`guettli`_) Docs: default value of state_auto_order ? (refs: `#28517`_) + +* **PR** `#28517`_: (`rallytime`_) Add state_auto_order defaults to True note to ordering docs + @ *2015-11-03 14:04:40 UTC* + + * 2d7f934f67 Merge pull request `#28517`_ from rallytime/fix-28243 + + * be8f650901 Punctuation. + + * fd846822c1 Add state_auto_order defaults to True note to ordering docs + +* **PR** `#28512`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-11-03 00:38:08 UTC* + + * 63ce8f78d5 Merge pull request `#28512`_ from basepi/merge-forward-2015.5 + + * 61c382133a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * 4bf56cad3f Merge pull request `#28461`_ from cachedout/issue_28455 + + * 097838ec0c Wrap all cache calls in state.sls in correct umask + + * f3e61db045 Merge pull request `#28407`_ from DSRCompany/issues/24910_token_auth_fix_2014 + + * b7b5bec309 Don't request creds if auth with key. + +* **PR** `#28448`_: (`gwaters`_) added a note to the tutorial for redhat derivatives + @ *2015-10-30 18:49:53 UTC* + + * 37ceae1e88 Merge pull request `#28448`_ from gwaters/add-redhat-notes + + * e70990704a added a note to the tutorial for those that redhat so they can use the state file too. + +* **PR** `#28406`_: (`rallytime`_) Back-port `#28381`_ to 2015.5 + @ *2015-10-29 19:10:37 UTC* + + * **PR** `#28381`_: (`JaseFace`_) Add FreeBSD detection for VirtualBox (refs: `#28406`_) + + * 5ef50d60cd Merge pull request `#28406`_ from rallytime/bp-28381 + + * e5322d2c44 Add FreeBSD detection for VirtualBox + +* **PR** `#28413`_: (`rallytime`_) Back-port `#28400`_ to 2015.5 + @ *2015-10-29 18:06:46 UTC* + + * **PR** `#28400`_: (`msciciel`_) State pkg.installed: do not execute _preflight_check if not_installed list is empty in _find_install_targets (refs: `#28413`_) + + * 30d5f7bbae Merge pull request `#28413`_ from rallytime/bp-28400 + + * ae1921b922 Do not execute _preflight_check if not_installed list is empty in _find_install_targets. Calling with empty list on rhel/centos cause execution of repoquery --whatprovides without pkg list which is memory consumptive task for host and also for red hat satellite server. + +* **PR** `#28366`_: (`erchn`_) mark repo not enabled when pkgrepo state passes in disable: True + @ *2015-10-29 15:55:54 UTC* + + * 045d540aff Merge pull request `#28366`_ from erchn/fix_yumpkg_mod_repo_disabled + + * 8187a4ce20 re-arrange things a bit to have less overall changes + + * f1d570ff18 move todelete above disabled check, add comment + + * 64feec413f also remove disabled key from repo_opts + + * 2f2ebb7bb6 mark repo not enabled when pkgrepo state passes in disable: True + +* **ISSUE** `#28372`_: (`beverlcl`_) use_carrier option for bonding network interfaces are setting invalid values (refs: `#28373`_) + +* **PR** `#28373`_: (`beverlcl`_) Fixing bug `#28372`_ for use_carrier option on bonding network interfaces. + @ *2015-10-29 14:45:57 UTC* + + * 3923f4a569 Merge pull request `#28373`_ from beverlcl/fix-use_carrier-28372 + + * 32cffeceb6 Fixing bug `#28372`_ for use_carrier option on bonding network interfaces. + +* **PR** `#28359`_: (`rallytime`_) Back-port `#28358`_ to 2015.5 + @ *2015-10-28 20:43:05 UTC* + + * **PR** `#28358`_: (`arthurlogilab`_) docstring typo fix - list returners not runners (refs: `#28359`_) + + * e07e3f257b Merge pull request `#28359`_ from rallytime/bp-28358 + + * 9cacbf582b docstring typo fix - list returners not runners + +* **ISSUE** `#28000`_: (`hrumph`_) No option to stop windows minion installer from starting service in silent mode. (refs: `#28346`_) + +* **ISSUE** `#27923`_: (`twangboy`_) Salt Windows Installer fails to grab existing config (refs: `#28346`_) + +* **PR** `#28346`_: (`twangboy`_) Fix installer + @ *2015-10-28 14:21:34 UTC* + + * 282be7ba5a Merge pull request `#28346`_ from twangboy/fix_installer + + * f65e3e5275 Updated documentation to reflect the new parameter + + * a0c5223554 Fixes `#27923`_ and `#28000`_ + +* **PR** `#28315`_: (`gwaters`_) Adding a working example of setting pillar data on the cli + @ *2015-10-27 15:27:49 UTC* + + * 7858f04ebc Merge pull request `#28315`_ from gwaters/update-pillar-doc + + * b15285c0b4 adding a working example of setting pillar data on the cli + +* **ISSUE** `#28209`_: (`basepi`_) Legacy git_pillar configs cause duplicate ext_pillar calls (refs: `#28210`_) + +* **PR** `#28211`_: (`terminalmage`_) Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch) + @ *2015-10-26 14:14:02 UTC* + + * **PR** `#28210`_: (`terminalmage`_) Fix for ext_pillar being compiled twice in legacy git_pillar code (refs: `#28211`_) + + * 45305ccf29 Merge pull request `#28211`_ from terminalmage/legacy_git_pillar-2015.5 + + * 0d6a4ac115 Remove non-functional test + + * ab991d61d9 Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch) + +* **ISSUE** `#26411`_: (`whiteinge`_) salt-call cannot send custom events without Minion daemon running (refs: `#28263`_) + +* **PR** `#28263`_: (`cachedout`_) New channel for event.send + @ *2015-10-26 14:07:06 UTC* + + * a6cc84c407 Merge pull request `#28263`_ from cachedout/issue_26411-1 + + * 3b880a5f07 New channel for event.fire_master + + * 29e9533aab Stand up a new channel if using salt-call + +* **PR** `#28293`_: (`cachedout`_) Minor grammar changes + @ *2015-10-26 12:15:42 UTC* + + * **PR** `#28271`_: (`gwaters`_) Update tutorial documentation (refs: `#28293`_) + + * 788e1463d8 Merge pull request `#28293`_ from cachedout/fix_28271 + + * 499ed8519b Minor grammar changes to `#28271`_ + +* **PR** `#28271`_: (`gwaters`_) Update tutorial documentation (refs: `#28293`_) + @ *2015-10-26 12:12:37 UTC* + + * e178af0b90 Merge pull request `#28271`_ from gwaters/update-tutorial-documentation + + * f96d39483d updated the tutorial with gravyboat's suggestions + + * b1f4a2bdf4 i think i changed the wrong header, updated to fix + + * 846b3aece1 I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands wont bump into the same issue I had. + +* **ISSUE** `#28248`_: (`0xf10e`_) conventions/formula.rst: "Gather external data" suggests unavailable jinja functionality (refs: `#28280`_) + +* **PR** `#28280`_: (`0xf10e`_) Correct Jinja function load_* to import_* + @ *2015-10-25 04:11:10 UTC* + + * e3eff9b909 Merge pull request `#28280`_ from 0xf10e/patch-1 + + * 6d4316b0ac Correct Jinja function load_* to import_* + +* **PR** `#28255`_: (`cachedout`_) Add __cli opt + @ *2015-10-23 18:44:30 UTC* + + * 909fa3dc97 Merge pull request `#28255`_ from cachedout/cli_opt + + * a2408157de Add __cli opt + +* **ISSUE** `#27374`_: (`mool`_) boto_route53 state doesn't create a record (refs: `#28213`_) + +* **PR** `#28213`_: (`rallytime`_) If record returned None, don't continue with the state. Something went wrong + @ *2015-10-23 13:54:50 UTC* + + * 0fa094ae11 Merge pull request `#28213`_ from rallytime/boto_route53_state + + * 237d64ff11 If record returned None, don't continue with the state. Something went wrong. + +* **ISSUE** `#28217`_: (`Ch3LL`_) Scheduler.present tries to add the scheudler each time (refs: `#28238`_) + +* **PR** `#28238`_: (`basepi`_) [2015.5] Fix schedule.present always diffing + @ *2015-10-23 13:31:32 UTC* + + * 1768014705 Merge pull request `#28238`_ from basepi/fix.schedule.present.28217 + + * 087a8dc3c2 Only insert enabled if it's a dict + + * 5b49f41fab Fix schedule comparison to adjust for 'enabled' being added in schedule.list + + * 2dc1226ab8 Build new item with 'enabled' if available + +* **ISSUE** `#8051`_: (`regilero`_) Problems with fileinput.input inplace editing in salt.states.file.replace (refs: `#28174`_) + +* **ISSUE** `#7999`_: (`regilero`_) MULTILINE pattern cannot work in file.replace, fileinput always reads line by line. (refs: `#28174`_) + +* **PR** `#28174`_: (`lorengordon`_) Add support for multiline regex in file.replace (refs: `#28666`_) + @ *2015-10-22 14:02:43 UTC* + + * bdd48c92de Merge pull request `#28174`_ from lorengordon/file-replace-multiline + + * acdef2da60 Update docstrings with new guidance + + * 0835b005b7 Use a test that makes the extra file read unnecessary + + * 6d6121a6e5 Use `flags` when checking whether content was added previously + + * b25e609e9e Set `flags=8` since now the file is read as a MULTILINE string by default + + * 89e8dcdffd Use `finally` block to ensure mmap object is closed + + * 5aea6647c9 Add support for multiline regex in file.replace + +* **ISSUE** `#19673`_: (`holyzhou`_) partition.mkpart in parted modules doesn't work (refs: `#28175`_) + +* **PR** `#28175`_: (`twangboy`_) Fixes `#19673`_ + @ *2015-10-21 20:48:24 UTC* + + * 2225925fb5 Merge pull request `#28175`_ from twangboy/fix_19673 + + * ae8fbb208f Fixes `#19673`_ + +* **PR** `#28140`_: (`rallytime`_) Add OpenBSD installation documentation to 2015.5 branch + @ *2015-10-20 16:31:34 UTC* + + * **PR** `#28103`_: (`ajacoutot`_) OpenBSD salt package: update list of dependencies. (refs: `#28140`_) + + * ab18dcf637 Merge pull request `#28140`_ from rallytime/bsd-installation-doc + + * 458a544d83 Add OpenBSD installation documentation to 2015.5 branch + +* **ISSUE** `#28101`_: (`bogdanr`_) salt-cloud ec2 list-sizes doesn't show all available sizes (refs: `#28138`_) + +* **PR** `#28138`_: (`rallytime`_) Back-port `#28130`_ EC2 Sizes Only portion to 2015.5 + @ *2015-10-20 16:29:09 UTC* + + * **PR** `#28130`_: (`bogdanr`_) Ec2 upload public key and updated instances size list (refs: `#28138`_) + + * fad38eb3c3 Merge pull request `#28138`_ from rallytime/bp-28130-sizes-only + + * 6ab31e1886 Pylint + + * 37e4ed58a9 Added missing comma + + * 667f5e669f Added a bunch of instance sizes and updated some outdated ones + +* **ISSUE** `#26844`_: (`double-yaya`_) The function "state.sls" is running as PID XXXX and was started at .... with jid XXXX always shows the current jid (refs: `#28097`_) + +* **PR** `#28097`_: (`jacksontj`_) For all multi-part messages, check the headers. If the header is not … + @ *2015-10-20 15:00:18 UTC* + + * ce8f858536 Merge pull request `#28097`_ from jacksontj/2015.5 + + * 75e04bcbbc For all multi-part messages, check the headers. If the header is not your minion_id, skip the message + +* **ISSUE** `#23655`_: (`arthurlogilab`_) salt-cloud with lxc should not traceback when minion is unreacheable (refs: `#28117`_) + +* **PR** `#28117`_: (`rallytime`_) Clean up stacktrace when master can't be reached in lxc cloud driver + @ *2015-10-20 12:41:12 UTC* + + * 9cdb970289 Merge pull request `#28117`_ from rallytime/fix-23655 + + * dfb908e405 Clean up stacktrace when master can't be reached in lxc cloud driver + +* **PR** `#28110`_: (`terminalmage`_) Add explanation of file_client: local setting masterless mode + @ *2015-10-20 12:28:05 UTC* + + * bf7ed0a397 Merge pull request `#28110`_ from terminalmage/masterless-mode + + * ed90103124 Add explanation of file_client: local setting masterless mode + +* **ISSUE** `#27940`_: (`multani`_) salt-cloud creating lxc containers doesn't fire "salt/cloud/\*/created" event (refs: `#28109`_) + +* **PR** `#28109`_: (`rallytime`_) Add created reactor event to lxc cloud driver + @ *2015-10-19 20:32:41 UTC* + + * a569ef4980 Merge pull request `#28109`_ from rallytime/fix-27940 + + * 18b2245611 Add created reactor event to lxc cloud driver + +* **ISSUE** `#21845`_: (`kitsemets`_) pip.install: fails in v2015.2.0rc1 when the package is already installed (pip v1.0) (refs: `#27996`_) + +* **PR** `#27996`_: (`rallytime`_) Don't fail if pip package is already present and pip1 is installed + @ *2015-10-19 12:59:17 UTC* + + * d4604fdb26 Merge pull request `#27996`_ from rallytime/fix-21845 + + * f8380d751e Provide empty string as default stdout instead of None + + * f9406b5828 Don't fail if pip package is already present and pip1 is installed + +* **PR** `#28056`_: (`rallytime`_) Back-port `#28033`_ to 2015.5 + @ *2015-10-19 12:55:10 UTC* + + * **PR** `#28033`_: (`twangboy`_) Fixed win_useradd.py (refs: `#28056`_) + + * 28b97c514f Merge pull request `#28056`_ from rallytime/bp-28033 + + * af2c5ab759 Fixed win_useradd.py + +* **PR** `#28059`_: (`rallytime`_) Back-port `#28040`_ to 2015.5 + @ *2015-10-18 16:17:29 UTC* + + * **PR** `#28040`_: (`erchn`_) Swift rackspace fixes (refs: `#28059`_) + + * dfc3aaec74 Merge pull request `#28059`_ from rallytime/bp-28040 + + * 76a0d4937b Revert "Allow passing in auth_version, defaulting to 2." + + * 63d5675d34 default auth_version = 2 + + * 8072716888 remove extra spaces + + * 9770f56f04 cleanup whitespace, default to None to be consistent with profile + + * f4adfe98c0 Allow passing in auth_version, defaulting to 2. + + * fab1ad39af Rackspace support for switft module. + +* **ISSUE** `#27534`_: (`llevar`_) file.managed can't retrieve file via ftp (refs: `#28047`_) + +* **PR** `#28047`_: (`cachedout`_) Restore FTP functionality to file client + @ *2015-10-18 16:16:46 UTC* + + * d1fa036b55 Merge pull request `#28047`_ from cachedout/issue_27534 + + * 6ea37ddbca Context manager + + * 4d6f6bb371 Lint + + * 59018289dc Restore FTP functionality to file client + +* **PR** `#28032`_: (`twangboy`_) Fixed win_path.py + @ *2015-10-17 15:16:15 UTC* + + * fd2ca2df1b Merge pull request `#28032`_ from twangboy/fix_win_path + + * 2bcac93314 Fixed win_path.py + +* **ISSUE** `#26336`_: (`jfindlay`_) windows user.present broken (refs: `#28003`_) + +* **PR** `#28037`_: (`rallytime`_) Back-port `#28003`_ to 2015.5 + @ *2015-10-16 20:59:52 UTC* + + * **PR** `#28003`_: (`twangboy`_) Fix `#26336`_ (refs: `#28037`_) + + * 88c1770be4 Merge pull request `#28037`_ from rallytime/bp-28003 + + * 4fcf51fb1e Fix PR `#26336`_ + +* **PR** `#28031`_: (`jacobhammons`_) Updated release notes with additional CVE information + @ *2015-10-16 16:19:37 UTC* + + * de727d8bd2 Merge pull request `#28031`_ from jacobhammons/relnotes6 + + * 05927bb6f0 Updated release notes with additional CVE information + +* **ISSUE** `#27897`_: (`Inveracity`_) request to add \\\\r escape character for salt.states.host for windows (refs: `#28008`_) + +* **PR** `#28008`_: (`jfindlay`_) platform independent line endings in hosts mod + @ *2015-10-16 13:20:28 UTC* + + * 16c0272849 Merge pull request `#28008`_ from jfindlay/host_path + + * 9f7047dd3c platform independent line endings in hosts mod + +* **ISSUE** `#28010`_: (`vakulich`_) Error "KeyError: 'ret'" appeared during salt.state run in orchestrate module if minion had an exception (refs: `#28012`_) + +* **PR** `#28012`_: (`rallytime`_) Clean up stack trace when something goes wrong with minion output + @ *2015-10-16 12:40:59 UTC* + + * d41018fa8e Merge pull request `#28012`_ from rallytime/fix-28010 + + * 0d7059e0c2 Clean up stack trace when something goes wrong with minion output + +* **PR** `#27995`_: (`jacobhammons`_) added link to grains security FAQ to targeting and pillar topics. + @ *2015-10-15 21:15:31 UTC* + + * f728307001 Merge pull request `#27995`_ from jacobhammons/pillar-doc + + * 2870af2ba3 added link to grains security FAQ to targeting and pillar topics. + +* **PR** `#27986`_: (`jacobhammons`_) Changed current release to 5.6 and added CVE to release notes + @ *2015-10-15 17:25:41 UTC* + + * efede904a7 Merge pull request `#27986`_ from jacobhammons/dot6 + + * bb61c68c11 Changed current release to 5.6 and added CVE to release notes + +* **PR** `#27913`_: (`pass-by-value`_) Set default + @ *2015-10-14 14:03:36 UTC* + + * 831ec680d9 Merge pull request `#27913`_ from pass-by-value/proxmox_verify_ssl + + * 0b721efe37 Set default + +* **PR** `#27876`_: (`terminalmage`_) 2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used + @ *2015-10-13 14:58:45 UTC* + + * 41cccb3a30 Merge pull request `#27876`_ from terminalmage/git_pillar-AttributeError-2015.5 + + * 07794c837a 2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used + +* **ISSUE** `#27610`_: (`benburkert`_) PR `#27201`_ broke ssh_known_hosts with :port (refs: `#27726`_) + +* **ISSUE** `#27187`_: (`SeverinLeonhardt`_) ssh_known_hosts.present hashes other entries even with hash_hostname: false (refs: `#27201`_) + +* **PR** `#27726`_: (`jfindlay`_) deprecate hash_hostname in favor of hash_known_hosts + @ *2015-10-12 16:19:09 UTC* + + * **PR** `#27201`_: (`jfindlay`_) rename hash_hostname to hash_known_hosts (refs: `#27726`_) + + * c9c3b7760e Merge pull request `#27726`_ from jfindlay/hashhosts + + * ebce47de7c add docs to ssh.recv_known_host exec module fcn + + * b6ee16b1e5 deprecate hash_hostname in favor of hash_known_hosts + +* **ISSUE** `#27735`_: (`go8ose`_) saltutils.find_cached_job doesn't work (refs: `#27776`_) + +* **PR** `#27776`_: (`jfindlay`_) return message when local jobs_cache not found + @ *2015-10-12 16:11:41 UTC* + + * 18e31584b0 Merge pull request `#27776`_ from jfindlay/local_msg + + * 03afa3cffa return message when local jobs_cache not found + +* **ISSUE** `#27665`_: (`ahammond`_) user.absent should not "fail" if /var/spool/mail/ already does not exist. (refs: `#27766`_) + +* **PR** `#27766`_: (`jfindlay`_) better check for debian userdel error + @ *2015-10-12 15:14:33 UTC* + + * 86cc7b5537 Merge pull request `#27766`_ from jfindlay/debmail + + * ee78da2c27 better check for debian userdel error + +* **ISSUE** `#27756`_: (`iggy`_) syslog returner formats line incorrectly (refs: `#27758`_) + +* **PR** `#27758`_: (`iggy`_) Remove redundant text from syslog returner + @ *2015-10-12 15:09:49 UTC* + + * c224386c9a Merge pull request `#27758`_ from iggy/patch-1 + + * 0994fb6a8c Remove redundant text from syslog returner + +* **ISSUE** `#27832`_: (`viking60`_) Salt fails to recognize Manjaro (as an Arch derivate) (refs: `#27841`_) + +* **PR** `#27841`_: (`terminalmage`_) Detect Manjaro Linux as Arch derivative + @ *2015-10-12 14:53:46 UTC* + + * 34a005041f Merge pull request `#27841`_ from terminalmage/issue27832 + + * 8e09fbd6a3 Detect Manjaro Linux as Arch derivative + +* **ISSUE** `#26538`_: (`seanjnkns`_) salt.states.file.managed generates warning when used in place of salt.states.file.touch (refs: `#27806`_) + +* **PR** `#27852`_: (`rallytime`_) Back-port `#27806`_ to 2015.5 + @ *2015-10-12 14:53:17 UTC* + + * **PR** `#27806`_: (`blast-hardcheese`_) Empty string is falsy (refs: `#27852`_) + + * 3944a498ad Merge pull request `#27852`_ from rallytime/bp-27806 + + * a84bf18bc4 Empty string is falsy + +* **ISSUE** `#27831`_: (`basepi`_) v2015.5.5 highstate outputter stacktracing for jobs.lookup_jid (refs: `#27838`_) + +* **PR** `#27838`_: (`basepi`_) [2015.5] Fix highstate outputter for jobs.lookup_jid + @ *2015-10-09 22:26:28 UTC* + + * **PR** `#25521`_: (`cachedout`_) Fix outputter for state.orch (refs: `#27838`_) + + * 7508a1c474 Merge pull request `#27838`_ from basepi/fix.runner.highstate.outputter.27831 + + * 8ae9b66fd9 Don't pop 'outputter', we expect it further down + +* **PR** `#27791`_: (`eguven`_) 2015.5 postgres_user groups backport + @ *2015-10-08 23:59:08 UTC* + + * d178315f93 Merge pull request `#27791`_ from eguven/2015.5-postgres-user-groups-backport + + * 2caf1d21d6 fix test + + * bc90c5bffe improve change reporting for postgres_user groups + + * 8712bce91a backport postgres_user groups + +* **PR** `#27759`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-10-07 18:01:54 UTC* + + * b2937b6a16 Merge pull request `#27759`_ from basepi/merge-forward-2015.5 + + * 792ee084bb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * d284eb165b Merge pull request `#27390`_ from JaseFace/schedule-missing-enabled + + * 563db71bfd Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run. schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition. + +* **ISSUE** `#26673`_: (`robkinyon`_) __virtual__() doesn't work without __virtualname__ (refs: `#27732`_) + +* **PR** `#27732`_: (`jacobhammons`_) update docs for __virtual__ and __virtualname__ + @ *2015-10-07 17:29:31 UTC* + + * 4b9128b491 Merge pull request `#27732`_ from jacobhammons/26673 + + * 75cc07cf10 noted that __virtual__ can return False and an error string + + * b928e1afa8 update docs for __virtual__ and __virtualname__ Refs `#26673`_ + +* **PR** `#27747`_: (`Sacro`_) Chocolatey doesn't have a help command. + @ *2015-10-07 16:06:53 UTC* + + * a130896d1c Merge pull request `#27747`_ from Sacro/fix-chocolatey-version + + * 8f1fa9e78e Chocolatey doesn't have a help command. + +* **PR** `#27733`_: (`jacobhammons`_) hardening topic - updates to docs.saltstack.com theme + @ *2015-10-07 01:44:00 UTC* + + * 4e48651de0 Merge pull request `#27733`_ from jacobhammons/bug-fixes + + * cbecd4f553 Updated saltstack2 theme to add SaltConf16 banner + + * 117e0c2bcc Added hardening topic based on the information in Refs `#27088`_ + +* **ISSUE** `#9051`_: (`olenz`_) Add bash completion to the docs (refs: `#27706`_) + +* **ISSUE** `#27005`_: (`johanek`_) grains precedence (refs: `#27706`_) + +* **ISSUE** `#21475`_: (`quantonganh`_) Targeting with pillar should be added in to the main targeting page (refs: `#27706`_) + +* **ISSUE** `#14876`_: (`whiteinge`_) Create a pre-Salted tutorial VM (refs: `#27706`_) + +* **ISSUE** `#13407`_: (`gravyboat`_) Create page explaining how to pass variables on the command line (refs: `#27706`_) + +* **PR** `#27706`_: (`jacobhammons`_) Assorted doc bugs + @ *2015-10-06 05:35:29 UTC* + + * c58da846bf Merge pull request `#27706`_ from jacobhammons/bug-fixes + + * 76dc8de71b Assorted doc bugs Refs `#9051`_ Refs `#13407`_ Refs `#21475`_ Refs `#14876`_ Refs `#27005`_ + +* **PR** `#27695`_: (`rallytime`_) Back-port `#27671`_ to 2015.5 + @ *2015-10-05 21:57:36 UTC* + + * **PR** `#27671`_: (`gashev`_) Added skip test_ext_pillar_env_mapping if git module does not exist. (refs: `#27695`_) + + * 43fba89865 Merge pull request `#27695`_ from rallytime/bp-27671 + + * 2a88028595 Added skip test_ext_pillar_env_mapping if git module does not exist. + +* **ISSUE** `#27501`_: (`yermulnik`_) [FreeBSD] "pkg search" behavior changed since 1.5 series (refs: `#27524`_) + +* **PR** `#27524`_: (`jfindlay`_) parse pkgng output in quiet mode for >= 1.6.1 + @ *2015-10-05 21:22:40 UTC* + + * cb3d92676e Merge pull request `#27524`_ from jfindlay/pkgng_quiet + + * 5e9107b970 parse pkgng output in quiet mode for >= 1.6.0 + +* **PR** `#27686`_: (`rallytime`_) Back-port `#27476`_ to 2015.5 + @ *2015-10-05 21:17:59 UTC* + + * **PR** `#27476`_: (`belvedere-trading`_) fix for: https://github.com/saltstack/salt/issues/27373 (refs: `#27686`_) + + * 5b88c55cc3 Merge pull request `#27686`_ from rallytime/bp-27476 + + * 3e08d3de8a fix for: https://github.com/saltstack/salt/issues/27373 + +* **ISSUE** `#27655`_: (`gracinet`_) postgres_local_cache handling of success (refs: `#27656`_) + +* **PR** `#27684`_: (`rallytime`_) Back-port `#27656`_ to 2015.5 + @ *2015-10-05 21:17:55 UTC* + + * **PR** `#27656`_: (`gracinet`_) Fix `#27655`_: handling of success in postgres_local_cache (refs: `#27684`_) + + * f9ddd4647f Merge pull request `#27684`_ from rallytime/bp-27656 + + * d3780cba00 Fix `#27655`_: handling of success in postgres_local_cache + +* **PR** `#27683`_: (`rallytime`_) Back-port `#27659`_ to 2015.5 + @ *2015-10-05 21:17:30 UTC* + + * **PR** `#27659`_: (`gnubyexample`_) .pub as public key is what we should send to remote (refs: `#27683`_) + + * 7ca6f854ff Merge pull request `#27683`_ from rallytime/bp-27659 + + * 84b6ee0c58 .pub as public key is what we should send to remote + +* **PR** `#27682`_: (`rallytime`_) Back-port `#27566`_ to 2015.5 + @ *2015-10-05 21:17:26 UTC* + + * **PR** `#27566`_: (`blueyed`_) returners.local_cache: fix endless loop on OSError (refs: `#27682`_) + + * a0f3e34656 Merge pull request `#27682`_ from rallytime/bp-27566 + + * 2a44255748 minor: fix/format doc for returners.local_cache.prep_jid + + * fd485e2396 returners.local_cache: fix endless loop on OSError + +* **ISSUE** `#25813`_: (`whytewolf`_) debconf.set throwing exception in 2015.8.0rc2 (refs: `#25928`_) + +* **PR** `#27681`_: (`rallytime`_) Back-port `#25928`_ to 2015.5 + @ *2015-10-05 21:17:19 UTC* + + * **PR** `#25928`_: (`cachedout`_) Fix stacktrace for non-existant states (refs: `#27681`_) + + * 0b9ba911c4 Merge pull request `#27681`_ from rallytime/bp-25928 + + * 17e1ddf137 Fix stacktrace for non-existant states + +* **ISSUE** `#27505`_: (`silenius`_) [FreeBSD] state.service + provider daemontools is broken (refs: `#27535`_) + +* **PR** `#27680`_: (`rallytime`_) Back-port `#27535`_ to 2015.5 + @ *2015-10-05 21:17:10 UTC* + + * **PR** `#27535`_: (`silenius`_) Issue 27505 (refs: `#27680`_) + + * 23da0d316a Merge pull request `#27680`_ from rallytime/bp-27535 + + * 04aed5e105 Versionadded change since 2015.5.6 has already been tagged + + * 579f2646ba .. versionadded:: 2015.5.6 + + * cbaf46e066 python <2.7 compability (pylint issue) + + * ecde499478 s/bin/b to avoid confusion with bin() + + * 4237c5db80 add a __virtual__ to check that daemontools is installed properly + + * 623935a1bc fix doc + + * 573de3abd6 fix pylint issue + + * 5eb6a30d40 fix pep8 issues + + * 298cf4f5c0 import missing logging module + + * fe0ad36609 log was missing + + * e457083465 s/systemd/FreeBSD + + * 3512712e89 forgot service name.. + + * 8f193a7bcc fixes `#27505`_ + +* **PR** `#27442`_: (`JaseFace`_) Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() + @ *2015-10-05 18:01:29 UTC* + + * 7d7b97eab6 Merge pull request `#27442`_ from JaseFace/fix-27391-for-2015.5 + + * bfbf63e1cc Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run. schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition. + +* **ISSUE** `#26320`_: (`schlagify`_) pkg & diskusage beacons not sending alerts (refs: `#27641`_) + +* **PR** `#27641`_: (`rallytime`_) Gate the psutil import and add depends doc for diskusage beacon + @ *2015-10-05 17:00:48 UTC* + + * ccbba8656b Merge pull request `#27641`_ from rallytime/gate-psutil-diskusage + + * da2d93a3dd Gate the psutil import and add depends doc for diskusage beacon + +* **PR** `#27644`_: (`rallytime`_) Back-port `#27640`_ to 2015.5 + @ *2015-10-05 14:55:31 UTC* + + * **PR** `#27640`_: (`stephen144`_) fix typo in default pillar path (refs: `#27644`_) + + * 09183994f9 Merge pull request `#27644`_ from rallytime/bp-27640 + + * a9063a9745 fix typo in default pillar path + +* **ISSUE** `#27609`_: (`rallytime`_) GCE with various external_ip settings cause stacktraces (refs: `#27612`_) + +* **PR** `#27612`_: (`rallytime`_) Fix GCE external_ip stacktraces in 2015.5 + @ *2015-10-02 15:42:20 UTC* + + * 27fcecccbe Merge pull request `#27612`_ from rallytime/fix-27609 + + * 8dc047dc18 If external_up is set to None, don't stacktrace, just use the private ip. + + * 2ebf790f9f [salt-cloud] gce: don't stacktrace if Ephemeral is given instead of ephemeral + +* **PR** `#27568`_: (`jacobhammons`_) regenerated man pages + @ *2015-10-01 15:39:37 UTC* + + * c84a1edc1b Merge pull request `#27568`_ from jacobhammons/man-pages-five + + * b59c03d20d regenerated man pages + +.. _`#13407`: https://github.com/saltstack/salt/issues/13407 +.. _`#14876`: https://github.com/saltstack/salt/issues/14876 +.. _`#15177`: https://github.com/saltstack/salt/issues/15177 .. _`#19673`: https://github.com/saltstack/salt/issues/19673 -.. _`#25775`: https://github.com/saltstack/salt/issues/25775 -.. _`#28372`: https://github.com/saltstack/salt/issues/28372 -.. _`#28783`: https://github.com/saltstack/salt/issues/28783 -.. _`#29110`: https://github.com/saltstack/salt/issues/29110 +.. _`#20235`: https://github.com/saltstack/salt/issues/20235 +.. _`#21475`: https://github.com/saltstack/salt/issues/21475 +.. _`#21845`: https://github.com/saltstack/salt/issues/21845 +.. _`#22442`: https://github.com/saltstack/salt/issues/22442 +.. _`#22451`: https://github.com/saltstack/salt/issues/22451 +.. _`#22452`: https://github.com/saltstack/salt/issues/22452 +.. _`#23655`: https://github.com/saltstack/salt/issues/23655 +.. _`#24585`: https://github.com/saltstack/salt/issues/24585 +.. _`#24758`: https://github.com/saltstack/salt/issues/24758 .. _`#25521`: https://github.com/saltstack/salt/pull/25521 +.. _`#25775`: https://github.com/saltstack/salt/issues/25775 +.. _`#25813`: https://github.com/saltstack/salt/issues/25813 .. _`#25928`: https://github.com/saltstack/salt/pull/25928 +.. _`#26320`: https://github.com/saltstack/salt/issues/26320 +.. _`#26336`: https://github.com/saltstack/salt/issues/26336 +.. _`#26411`: https://github.com/saltstack/salt/issues/26411 +.. _`#26538`: https://github.com/saltstack/salt/issues/26538 +.. _`#26592`: https://github.com/saltstack/salt/issues/26592 +.. _`#26673`: https://github.com/saltstack/salt/issues/26673 +.. _`#26844`: https://github.com/saltstack/salt/issues/26844 +.. _`#27005`: https://github.com/saltstack/salt/issues/27005 +.. _`#27088`: https://github.com/saltstack/salt/issues/27088 +.. _`#27187`: https://github.com/saltstack/salt/issues/27187 .. _`#27201`: https://github.com/saltstack/salt/pull/27201 .. _`#27286`: https://github.com/saltstack/salt/pull/27286 +.. _`#27374`: https://github.com/saltstack/salt/issues/27374 .. _`#27390`: https://github.com/saltstack/salt/pull/27390 +.. _`#27392`: https://github.com/saltstack/salt/issues/27392 .. _`#27442`: https://github.com/saltstack/salt/pull/27442 .. _`#27476`: https://github.com/saltstack/salt/pull/27476 +.. _`#27501`: https://github.com/saltstack/salt/issues/27501 +.. _`#27505`: https://github.com/saltstack/salt/issues/27505 .. _`#27524`: https://github.com/saltstack/salt/pull/27524 +.. _`#27534`: https://github.com/saltstack/salt/issues/27534 .. _`#27535`: https://github.com/saltstack/salt/pull/27535 .. _`#27566`: https://github.com/saltstack/salt/pull/27566 .. _`#27568`: https://github.com/saltstack/salt/pull/27568 +.. _`#27609`: https://github.com/saltstack/salt/issues/27609 +.. _`#27610`: https://github.com/saltstack/salt/issues/27610 .. _`#27612`: https://github.com/saltstack/salt/pull/27612 .. _`#27640`: https://github.com/saltstack/salt/pull/27640 .. _`#27641`: https://github.com/saltstack/salt/pull/27641 .. _`#27644`: https://github.com/saltstack/salt/pull/27644 +.. _`#27655`: https://github.com/saltstack/salt/issues/27655 .. _`#27656`: https://github.com/saltstack/salt/pull/27656 .. _`#27659`: https://github.com/saltstack/salt/pull/27659 +.. _`#27665`: https://github.com/saltstack/salt/issues/27665 .. _`#27671`: https://github.com/saltstack/salt/pull/27671 .. _`#27680`: https://github.com/saltstack/salt/pull/27680 .. _`#27681`: https://github.com/saltstack/salt/pull/27681 @@ -244,23 +1104,32 @@ Changes: .. _`#27726`: https://github.com/saltstack/salt/pull/27726 .. _`#27732`: https://github.com/saltstack/salt/pull/27732 .. _`#27733`: https://github.com/saltstack/salt/pull/27733 +.. _`#27735`: https://github.com/saltstack/salt/issues/27735 .. _`#27747`: https://github.com/saltstack/salt/pull/27747 +.. _`#27756`: https://github.com/saltstack/salt/issues/27756 .. _`#27758`: https://github.com/saltstack/salt/pull/27758 .. _`#27759`: https://github.com/saltstack/salt/pull/27759 .. _`#27766`: https://github.com/saltstack/salt/pull/27766 .. _`#27776`: https://github.com/saltstack/salt/pull/27776 .. _`#27791`: https://github.com/saltstack/salt/pull/27791 .. _`#27806`: https://github.com/saltstack/salt/pull/27806 +.. _`#27831`: https://github.com/saltstack/salt/issues/27831 +.. _`#27832`: https://github.com/saltstack/salt/issues/27832 .. _`#27838`: https://github.com/saltstack/salt/pull/27838 .. _`#27841`: https://github.com/saltstack/salt/pull/27841 .. _`#27852`: https://github.com/saltstack/salt/pull/27852 .. _`#27876`: https://github.com/saltstack/salt/pull/27876 +.. _`#27897`: https://github.com/saltstack/salt/issues/27897 .. _`#27913`: https://github.com/saltstack/salt/pull/27913 +.. _`#27923`: https://github.com/saltstack/salt/issues/27923 +.. _`#27940`: https://github.com/saltstack/salt/issues/27940 .. _`#27986`: https://github.com/saltstack/salt/pull/27986 .. _`#27995`: https://github.com/saltstack/salt/pull/27995 .. _`#27996`: https://github.com/saltstack/salt/pull/27996 +.. _`#28000`: https://github.com/saltstack/salt/issues/28000 .. _`#28003`: https://github.com/saltstack/salt/pull/28003 .. _`#28008`: https://github.com/saltstack/salt/pull/28008 +.. _`#28010`: https://github.com/saltstack/salt/issues/28010 .. _`#28012`: https://github.com/saltstack/salt/pull/28012 .. _`#28031`: https://github.com/saltstack/salt/pull/28031 .. _`#28032`: https://github.com/saltstack/salt/pull/28032 @@ -271,6 +1140,7 @@ Changes: .. _`#28056`: https://github.com/saltstack/salt/pull/28056 .. _`#28059`: https://github.com/saltstack/salt/pull/28059 .. _`#28097`: https://github.com/saltstack/salt/pull/28097 +.. _`#28101`: https://github.com/saltstack/salt/issues/28101 .. _`#28103`: https://github.com/saltstack/salt/pull/28103 .. _`#28109`: https://github.com/saltstack/salt/pull/28109 .. _`#28110`: https://github.com/saltstack/salt/pull/28110 @@ -278,15 +1148,21 @@ Changes: .. _`#28130`: https://github.com/saltstack/salt/pull/28130 .. _`#28138`: https://github.com/saltstack/salt/pull/28138 .. _`#28140`: https://github.com/saltstack/salt/pull/28140 +.. _`#28173`: https://github.com/saltstack/salt/issues/28173 .. _`#28174`: https://github.com/saltstack/salt/pull/28174 .. _`#28175`: https://github.com/saltstack/salt/pull/28175 +.. _`#28209`: https://github.com/saltstack/salt/issues/28209 .. _`#28210`: https://github.com/saltstack/salt/pull/28210 .. _`#28211`: https://github.com/saltstack/salt/pull/28211 .. _`#28213`: https://github.com/saltstack/salt/pull/28213 +.. _`#28217`: https://github.com/saltstack/salt/issues/28217 .. _`#28238`: https://github.com/saltstack/salt/pull/28238 +.. _`#28243`: https://github.com/saltstack/salt/issues/28243 +.. _`#28248`: https://github.com/saltstack/salt/issues/28248 .. _`#28255`: https://github.com/saltstack/salt/pull/28255 .. _`#28263`: https://github.com/saltstack/salt/pull/28263 .. _`#28271`: https://github.com/saltstack/salt/pull/28271 +.. _`#28272`: https://github.com/saltstack/salt/issues/28272 .. _`#28280`: https://github.com/saltstack/salt/pull/28280 .. _`#28293`: https://github.com/saltstack/salt/pull/28293 .. _`#28315`: https://github.com/saltstack/salt/pull/28315 @@ -294,8 +1170,10 @@ Changes: .. _`#28358`: https://github.com/saltstack/salt/pull/28358 .. _`#28359`: https://github.com/saltstack/salt/pull/28359 .. _`#28366`: https://github.com/saltstack/salt/pull/28366 +.. _`#28372`: https://github.com/saltstack/salt/issues/28372 .. _`#28373`: https://github.com/saltstack/salt/pull/28373 .. _`#28381`: https://github.com/saltstack/salt/pull/28381 +.. _`#28398`: https://github.com/saltstack/salt/issues/28398 .. _`#28400`: https://github.com/saltstack/salt/pull/28400 .. _`#28406`: https://github.com/saltstack/salt/pull/28406 .. _`#28407`: https://github.com/saltstack/salt/pull/28407 @@ -303,8 +1181,10 @@ Changes: .. _`#28448`: https://github.com/saltstack/salt/pull/28448 .. _`#28461`: https://github.com/saltstack/salt/pull/28461 .. _`#28508`: https://github.com/saltstack/salt/pull/28508 +.. _`#28511`: https://github.com/saltstack/salt/issues/28511 .. _`#28512`: https://github.com/saltstack/salt/pull/28512 .. _`#28517`: https://github.com/saltstack/salt/pull/28517 +.. _`#28524`: https://github.com/saltstack/salt/issues/28524 .. _`#28525`: https://github.com/saltstack/salt/pull/28525 .. _`#28529`: https://github.com/saltstack/salt/pull/28529 .. _`#28531`: https://github.com/saltstack/salt/pull/28531 @@ -314,7 +1194,9 @@ Changes: .. _`#28546`: https://github.com/saltstack/salt/pull/28546 .. _`#28548`: https://github.com/saltstack/salt/pull/28548 .. _`#28563`: https://github.com/saltstack/salt/pull/28563 +.. _`#28577`: https://github.com/saltstack/salt/issues/28577 .. _`#28617`: https://github.com/saltstack/salt/pull/28617 +.. _`#28621`: https://github.com/saltstack/salt/issues/28621 .. _`#28622`: https://github.com/saltstack/salt/pull/28622 .. _`#28627`: https://github.com/saltstack/salt/pull/28627 .. _`#28645`: https://github.com/saltstack/salt/pull/28645 @@ -328,18 +1210,22 @@ Changes: .. _`#28699`: https://github.com/saltstack/salt/pull/28699 .. _`#28703`: https://github.com/saltstack/salt/pull/28703 .. _`#28705`: https://github.com/saltstack/salt/pull/28705 +.. _`#28714`: https://github.com/saltstack/salt/issues/28714 .. _`#28716`: https://github.com/saltstack/salt/pull/28716 .. _`#28717`: https://github.com/saltstack/salt/pull/28717 .. _`#28718`: https://github.com/saltstack/salt/pull/28718 .. _`#28731`: https://github.com/saltstack/salt/pull/28731 +.. _`#28732`: https://github.com/saltstack/salt/issues/28732 .. _`#28740`: https://github.com/saltstack/salt/pull/28740 .. _`#28746`: https://github.com/saltstack/salt/pull/28746 .. _`#28756`: https://github.com/saltstack/salt/pull/28756 .. _`#28760`: https://github.com/saltstack/salt/pull/28760 .. _`#28776`: https://github.com/saltstack/salt/pull/28776 .. _`#28777`: https://github.com/saltstack/salt/pull/28777 +.. _`#28783`: https://github.com/saltstack/salt/issues/28783 .. _`#28786`: https://github.com/saltstack/salt/pull/28786 .. _`#28826`: https://github.com/saltstack/salt/pull/28826 +.. _`#28828`: https://github.com/saltstack/salt/issues/28828 .. _`#28829`: https://github.com/saltstack/salt/pull/28829 .. _`#28832`: https://github.com/saltstack/salt/pull/28832 .. _`#28833`: https://github.com/saltstack/salt/pull/28833 @@ -347,3 +1233,99 @@ Changes: .. _`#28853`: https://github.com/saltstack/salt/pull/28853 .. _`#28856`: https://github.com/saltstack/salt/pull/28856 .. _`#28857`: https://github.com/saltstack/salt/pull/28857 +.. _`#28864`: https://github.com/saltstack/salt/pull/28864 +.. _`#655`: https://github.com/saltstack/salt/issues/655 +.. _`#7999`: https://github.com/saltstack/salt/issues/7999 +.. _`#8051`: https://github.com/saltstack/salt/issues/8051 +.. _`#8647`: https://github.com/saltstack/salt/issues/8647 +.. _`#9051`: https://github.com/saltstack/salt/issues/9051 +.. _`0xf10e`: https://github.com/0xf10e +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`Inveracity`: https://github.com/Inveracity +.. _`JaseFace`: https://github.com/JaseFace +.. _`L4rS6`: https://github.com/L4rS6 +.. _`MasterNayru`: https://github.com/MasterNayru +.. _`MrCitron`: https://github.com/MrCitron +.. _`Mrten`: https://github.com/Mrten +.. _`Sacro`: https://github.com/Sacro +.. _`SeverinLeonhardt`: https://github.com/SeverinLeonhardt +.. _`ahammond`: https://github.com/ahammond +.. _`ajacoutot`: https://github.com/ajacoutot +.. _`allanliu`: https://github.com/allanliu +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`basepi`: https://github.com/basepi +.. _`baskinomics`: https://github.com/baskinomics +.. _`belvedere-trading`: https://github.com/belvedere-trading +.. _`benburkert`: https://github.com/benburkert +.. _`beverlcl`: https://github.com/beverlcl +.. _`blast-hardcheese`: https://github.com/blast-hardcheese +.. _`blueyed`: https://github.com/blueyed +.. _`bmcorser`: https://github.com/bmcorser +.. _`bogdanr`: https://github.com/bogdanr +.. _`cachedout`: https://github.com/cachedout +.. _`cbuechler`: https://github.com/cbuechler +.. _`centromere`: https://github.com/centromere +.. _`chrigl`: https://github.com/chrigl +.. _`dmyerscough`: https://github.com/dmyerscough +.. _`double-yaya`: https://github.com/double-yaya +.. _`eguven`: https://github.com/eguven +.. _`eliasp`: https://github.com/eliasp +.. _`erchn`: https://github.com/erchn +.. _`eyj`: https://github.com/eyj +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gashev`: https://github.com/gashev +.. _`gnubyexample`: https://github.com/gnubyexample +.. _`go8ose`: https://github.com/go8ose +.. _`gracinet`: https://github.com/gracinet +.. _`gravyboat`: https://github.com/gravyboat +.. _`guettli`: https://github.com/guettli +.. _`gwaters`: https://github.com/gwaters +.. _`hedinfaok`: https://github.com/hedinfaok +.. _`holyzhou`: https://github.com/holyzhou +.. _`hrumph`: https://github.com/hrumph +.. _`iggy`: https://github.com/iggy +.. _`jacksontj`: https://github.com/jacksontj +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jfindlay`: https://github.com/jfindlay +.. _`joejulian`: https://github.com/joejulian +.. _`johanek`: https://github.com/johanek +.. _`kitsemets`: https://github.com/kitsemets +.. _`llevar`: https://github.com/llevar +.. _`lorengordon`: https://github.com/lorengordon +.. _`mbologna`: https://github.com/mbologna +.. _`mool`: https://github.com/mool +.. _`msciciel`: https://github.com/msciciel +.. _`multani`: https://github.com/multani +.. _`nghgd`: https://github.com/nghgd +.. _`nmadhok`: https://github.com/nmadhok +.. _`olenz`: https://github.com/olenz +.. _`pass-by-value`: https://github.com/pass-by-value +.. _`plastikos`: https://github.com/plastikos +.. _`quantonganh`: https://github.com/quantonganh +.. _`rallytime`: https://github.com/rallytime +.. _`regilero`: https://github.com/regilero +.. _`robkinyon`: https://github.com/robkinyon +.. _`rominf`: https://github.com/rominf +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack/salt-bootstrap#653`: https://github.com/saltstack/salt-bootstrap/pull/653 +.. _`saltstack/salt-bootstrap#654`: https://github.com/saltstack/salt-bootstrap/pull/654 +.. _`saltstack/salt-bootstrap#656`: https://github.com/saltstack/salt-bootstrap/pull/656 +.. _`saltstack/salt-bootstrap#665`: https://github.com/saltstack/salt-bootstrap/pull/665 +.. _`saltstack/salt-bootstrap#674`: https://github.com/saltstack/salt-bootstrap/pull/674 +.. _`saltstack/salt-bootstrap#868`: https://github.com/saltstack/salt-bootstrap/pull/868 +.. _`schlagify`: https://github.com/schlagify +.. _`seanjnkns`: https://github.com/seanjnkns +.. _`silenius`: https://github.com/silenius +.. _`sjmh`: https://github.com/sjmh +.. _`stephen144`: https://github.com/stephen144 +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`trimbleagvendoraccounta`: https://github.com/trimbleagvendoraccounta +.. _`twangboy`: https://github.com/twangboy +.. _`utahcon`: https://github.com/utahcon +.. _`vakulich`: https://github.com/vakulich +.. _`viking60`: https://github.com/viking60 +.. _`whiteinge`: https://github.com/whiteinge +.. _`whytewolf`: https://github.com/whytewolf +.. _`yermulnik`: https://github.com/yermulnik +.. _`zerthimon`: https://github.com/zerthimon diff --git a/doc/topics/releases/2015.5.8.rst b/doc/topics/releases/2015.5.8.rst index 0f5a3841c6..d4b6a6924d 100644 --- a/doc/topics/releases/2015.5.8.rst +++ b/doc/topics/releases/2015.5.8.rst @@ -1,393 +1,232 @@ +.. _release-2015-5-8: + =========================== Salt 2015.5.8 Release Notes =========================== +:release: 2015-12-01 + +Version 2015.5.8 is a bugfix release for :ref:`2015.5.0 `. + + +Statistics +========== + +- Total Merges: **17** +- Total Issue References: **12** +- Total PR References: **27** + +- Contributors: **12** (`MasterNayru`_, `TronPaul`_, `basepi`_, `cachedout`_, `cxmcc`_, `jfindlay`_, `kevinlondon`_, `messa`_, `rallytime`_, `tehmaspc`_, `twangboy`_, `whiteinge`_) + + Security Fix ============ -CVE-2015-8034: Saving ``state.sls`` cache data to disk with insecure permissions +**CVE-2015-8034** Saving :py:func:`state.sls ` cache +data to disk with insecure permissions -This affects users of the ``state.sls`` function. The state run cache on the minion was being created with incorrect permissions. This file could potentially contain sensitive data that was inserted via jinja into the state SLS files. The permissions for this file are now being set correctly. Thanks to @zmalone for bringing this issue to our attention. +This affects users of the :py:func:`state.sls ` +function. The state run cache on the minion was being created with incorrect +permissions. This file could potentially contain sensitive data that was +inserted via jinja into the state SLS files. The permissions for this file are +now being set correctly. Thanks to `zmalone`_ for bringing this issue to our +attention. -Changes -======= -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Changelog for v2015.5.7..v2015.5.8 +================================== -*Generated at: 2015-11-23T23:16:23Z* +*Generated at: 2018-05-27 22:25:07 UTC* -Total Merges: **118** +* **ISSUE** `#28883`_: (`ldelossa`_) Issues running select states - local variable 'salt' referenced before assignment (refs: `#29113`_) -Changes: +* **PR** `#29164`_: (`jfindlay`_) Backport `#29113`_ + @ *2015-11-24 21:26:17 UTC* -- **PR** `#29128`_: (*cachedout*) Set a safer default value for ret in saltmod + * **PR** `#29113`_: (`TronPaul`_) Kill unneeded import (refs: `#29164`_) -- **PR** `#29122`_: (*cachedout*) Fix broken state orchestration + * **PR** `#28740`_: (`MasterNayru`_) Add missing S3 module import (refs: `#28839`_, `#29113`_) -- **PR** `#29096`_: (*rallytime*) Back-port `#29093`_ to 2015.5 + * a26c10a811 Merge pull request `#29164`_ from jfindlay/bp-29113 -- **PR** `#29084`_: (*rallytime*) Back-port `#29055`_ to 2015.5 + * 50fab35188 kill unneeded import -- **PR** `#29083`_: (*rallytime*) Back-port `#29053`_ to 2015.5 +* **PR** `#29138`_: (`jfindlay`_) add 2015.5.8 release notes + @ *2015-11-23 23:22:48 UTC* -- **PR** `#28932`_: (*twangboy*) Fixed user.present / user.absent in windows + * 4f03196e7d Merge pull request `#29138`_ from jfindlay/2015.5 -- **PR** `#29011`_: (*rallytime*) Back-port `#28630`_ to 2015.5 + * be045f5cb1 add 2015.5.8 release notes -- **PR** `#28982`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 +* **ISSUE** `#29110`_: (`mohshami`_) 2015.8.2 broke orchestration (refs: `#29122`_) -- **PR** `#28949`_: (*whiteinge*) Add sync_sdb execution function +* **ISSUE** `#28010`_: (`vakulich`_) Error "KeyError: 'ret'" appeared during salt.state run in orchestrate module if minion had an exception (refs: `#28012`_) -- **PR** `#28930`_: (*twangboy*) Added missing import mmap required by file.py +* **PR** `#29128`_: (`cachedout`_) Set a safer default value for ret in saltmod + @ *2015-11-23 17:07:40 UTC* -- **PR** `#28908`_: (*rallytime*) A couple of spelling fixes for doc conventions page. + * **PR** `#29122`_: (`cachedout`_) Fix broken state orchestration (refs: `#29128`_) -- **PR** `#28902`_: (*whiteinge*) Fix missing JSON support for /keys endpoint + * **PR** `#28012`_: (`rallytime`_) Clean up stack trace when something goes wrong with minion output (refs: `#29122`_) -- **PR** `#28897`_: (*rallytime*) Back-port `#28873`_ to 2015.5 + * 219367a23d Merge pull request `#29128`_ from cachedout/tweak_29122 -- **PR** `#28871`_: (*basepi*) [2015.5] Fix command generation for mdadm.assemble + * b08858b040 Missed check -- **PR** `#28864`_: (*jfindlay*) add 2015.5.7 release notes + * 584efe81ee Set a safer default value for ret in saltmod -- **PR** `#28731`_: (*garethgreenaway*) Fixes to salt scheduler in 2015.5, ensuring that return_job is only used on minion scheduler +* **ISSUE** `#29110`_: (`mohshami`_) 2015.8.2 broke orchestration (refs: `#29122`_) -- **PR** `#28857`_: (*rallytime*) Back-port `#28851`_ to 2015.5 +* **ISSUE** `#28010`_: (`vakulich`_) Error "KeyError: 'ret'" appeared during salt.state run in orchestrate module if minion had an exception (refs: `#28012`_) -- **PR** `#28856`_: (*rallytime*) Back-port `#28853`_ to 2015.5 +* **PR** `#29122`_: (`cachedout`_) Fix broken state orchestration (refs: `#29128`_) + @ *2015-11-23 16:24:18 UTC* -- **PR** `#28832`_: (*basepi*) [2015.5] Backport `#28826`_ + * **PR** `#28012`_: (`rallytime`_) Clean up stack trace when something goes wrong with minion output (refs: `#29122`_) -- **PR** `#28833`_: (*basepi*) [2015.5] Increase the default gather_job_timeout + * 2250a36647 Merge pull request `#29122`_ from cachedout/issue_29110 -- **PR** `#28829`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 + * 4b9302d794 Fix broken state orchestration -- **PR** `#28756`_: (*MrCitron*) Fix `#25775`_ +* **PR** `#29096`_: (`rallytime`_) Back-port `#29093`_ to 2015.5 + @ *2015-11-22 17:02:51 UTC* -- **PR** `#28786`_: (*chrigl*) closes `#28783`_ + * **PR** `#29093`_: (`cxmcc`_) Compare gem versions as a string. (refs: `#29096`_) -- **PR** `#28776`_: (*rallytime*) Back-port `#28740`_ to 2015.5 + * 200e771efb Merge pull request `#29096`_ from rallytime/bp-29093 -- **PR** `#28760`_: (*dmyerscough*) Fixing CherryPy key bug + * f5734423a4 Compare gem versions as a string. -- **PR** `#28746`_: (*rallytime*) Back-port `#28718`_ to 2015.5 +* **PR** `#29084`_: (`rallytime`_) Back-port `#29055`_ to 2015.5 + @ *2015-11-20 20:57:54 UTC* -- **PR** `#28705`_: (*cachedout*) Account for new headers class in tornado 4.3 + * **PR** `#29055`_: (`cachedout`_) Add section to style guide (refs: `#29084`_) -- **PR** `#28699`_: (*rallytime*) Back-port `#28670`_ to 2015.5 + * d8a2018bc8 Merge pull request `#29084`_ from rallytime/bp-29055 -- **PR** `#28703`_: (*rallytime*) Back-port `#28690`_ to 2015.5 + * 52e650aed9 Add section to style guide -- **PR** `#28694`_: (*s0undt3ch*) [2015.5] Update to latest bootstrap script v2015.11.09 +* **PR** `#29083`_: (`rallytime`_) Back-port `#29053`_ to 2015.5 + @ *2015-11-20 20:57:38 UTC* -- **PR** `#28669`_: (*rallytime*) Use the -q argument to strip extraneous messages from rabbitmq + * **PR** `#29053`_: (`kevinlondon`_) Update rabbitmq_user.py (refs: `#29083`_) -- **PR** `#28645`_: (*jacksontj*) Rework minion return_retry_timer + * b5cff1a351 Merge pull request `#29083`_ from rallytime/bp-29053 -- **PR** `#28668`_: (*twangboy*) Fixed join_domain and unjoin_domain for Windows + * f1884de0e7 Update rabbitmq_user.py -- **PR** `#28666`_: (*jfindlay*) define r_data before using it in file module +* **ISSUE** `#28928`_: (`twangboy`_) Fix user.present 2015.5 (refs: `#28932`_) -- **PR** `#28662`_: (*cachedout*) Add note about disabling master_alive_interval +* **PR** `#28932`_: (`twangboy`_) Fixed user.present / user.absent in windows + @ *2015-11-18 21:45:53 UTC* -- **PR** `#28627`_: (*twangboy*) Backport win_useradd + * **PR** `#28627`_: (`twangboy`_) Backport win_useradd (refs: `#28932`_) -- **PR** `#28617`_: (*cachedout*) Set restrictive umask on module sync + * b3e3bebef0 Merge pull request `#28932`_ from twangboy/fix_28928 -- **PR** `#28622`_: (*gravyboat*) Update puppet module wording + * 0653a04887 Fixed user.present / user.absent in windows -- **PR** `#28563`_: (*s0undt3ch*) [2015.5] Update to latest bootstrap script v2015.11.04 +* **ISSUE** `#26911`_: (`dsumsky`_) file.manage state does not work with Amazon S3 URLs on Windows (refs: `#28630`_) -- **PR** `#28541`_: (*twangboy*) Fixed problem with system.set_computer_name +* **ISSUE** `#13850`_: (`ryan-lane`_) s3:// urls in file.managed (and likely elsewhere) require s3.key and s3.keyid to be in minion config (refs: `#28630`_) -- **PR** `#28537`_: (*jfindlay*) decode filename to utf-8 in file.recurse state +* **PR** `#29011`_: (`rallytime`_) Back-port `#28630`_ to 2015.5 + @ *2015-11-18 17:50:05 UTC* -- **PR** `#28529`_: (*rallytime*) Update contributing and documentation pages to recommend submitting against branches + * **PR** `#28630`_: (`messa`_) Use S3 credentials from Pillar (refs: `#29011`_) -- **PR** `#28548`_: (*nmadhok*) [Backport] [2015.5] Tasks can be in queued state instead of running + * a2e4a227e0 Merge pull request `#29011`_ from rallytime/bp-28630 -- **PR** `#28531`_: (*rallytime*) Add versionadded directives to virtualenv_mod state/module + * 7baccc1b05 Lint - newline before def -- **PR** `#28508`_: (*twangboy*) Fixed windows tests + * 9e5c16d4da Reading S3 credentials from Pillar -- **PR** `#28525`_: (*rallytime*) Fix spacing in doc examples for boto_route53 state and module + * a3216f813d Fixed requests HTTPError handler, it was still in urllib2 style -- **PR** `#28517`_: (*rallytime*) Add state_auto_order defaults to True note to ordering docs +* **PR** `#28982`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-11-18 00:49:32 UTC* -- **PR** `#28512`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 + * 1a4cd6002f Merge pull request `#28982`_ from basepi/merge-forward-2015.5 -- **PR** `#28448`_: (*gwaters*) added a note to the tutorial for redhat derivatives + * bfbb109fbd Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#28406`_: (*rallytime*) Back-port `#28381`_ to 2015.5 + * 4b8bdd0afb Merge pull request `#28839`_ from cachedout/revert_28740 -- **PR** `#28413`_: (*rallytime*) Back-port `#28400`_ to 2015.5 + * 215b26c06f Revert `#28740`_ -- **PR** `#28366`_: (*erchn*) mark repo not enabled when pkgrepo state passes in disable: True +* **ISSUE** `#28947`_: (`dmyerscough`_) sdb modules are not synced out (refs: `#28949`_) -- **PR** `#28373`_: (*beverlcl*) Fixing bug `#28372`_ for use_carrier option on bonding network interfaces. +* **PR** `#28949`_: (`whiteinge`_) Add sync_sdb execution function + @ *2015-11-17 15:35:38 UTC* -- **PR** `#28359`_: (*rallytime*) Back-port `#28358`_ to 2015.5 + * edd26d763a Merge pull request `#28949`_ from whiteinge/sync-sdb -- **PR** `#28346`_: (*twangboy*) Fix installer + * b0ec9ab25b Add sync_sdb execution function -- **PR** `#28315`_: (*gwaters*) Adding a working example of setting pillar data on the cli +* **ISSUE** `#28888`_: (`twangboy`_) Fix file.comment (refs: `#28930`_) -- **PR** `#28211`_: (*terminalmage*) Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch) +* **PR** `#28930`_: (`twangboy`_) Added missing import mmap required by file.py + @ *2015-11-16 23:17:23 UTC* -- **PR** `#28263`_: (*cachedout*) New channel for event.send + * 43da1bc4ce Merge pull request `#28930`_ from twangboy/fix_28888 -- **PR** `#28293`_: (*cachedout*) Minor grammar changes + * f5c489eaad Added missing import mmap required by file.py -- **PR** `#28271`_: (*gwaters*) Update tutorial documentation +* **PR** `#28908`_: (`rallytime`_) A couple of spelling fixes for doc conventions page. + @ *2015-11-16 02:29:35 UTC* -- **PR** `#28280`_: (*0xf10e*) Correct Jinja function load_* to import_* + * 2488b873b8 Merge pull request `#28908`_ from rallytime/doc-convention-spelling -- **PR** `#28255`_: (*cachedout*) Add __cli opt + * 60e6eddb77 A couple of spelling fixes for doc conventions page. -- **PR** `#28213`_: (*rallytime*) If record returned None, don't continue with the state. Something went wrong +* **ISSUE** `#22442`_: (`allanliu`_) rest_cherrypy /keys URL does not handle JSON requests (refs: `#28902`_) -- **PR** `#28238`_: (*basepi*) [2015.5] Fix schedule.present always diffing +* **PR** `#28902`_: (`whiteinge`_) Fix missing JSON support for /keys endpoint + @ *2015-11-15 15:36:05 UTC* -- **PR** `#28174`_: (*lorengordon*) Add support for multiline regex in file.replace + * 827a1ae020 Merge pull request `#28902`_ from whiteinge/json-keys -- **PR** `#28175`_: (*twangboy*) Fixes `#19673`_ + * 9745903301 Fix missing JSON support for /keys endpoint -- **PR** `#28140`_: (*rallytime*) Add OpenBSD installation documentation to 2015.5 branch +* **PR** `#28897`_: (`rallytime`_) Back-port `#28873`_ to 2015.5 + @ *2015-11-15 00:43:35 UTC* -- **PR** `#28138`_: (*rallytime*) Back-port `#28130`_ EC2 Sizes Only portion to 2015.5 + * **PR** `#28873`_: (`tehmaspc`_) Fix salt-cloud help output typo (refs: `#28897`_) -- **PR** `#28097`_: (*jacksontj*) For all multi-part messages, check the headers. If the header is not … + * d23bd49130 Merge pull request `#28897`_ from rallytime/bp-28873 -- **PR** `#28117`_: (*rallytime*) Clean up stacktrace when master can't be reached in lxc cloud driver + * 077e671ead Fix salt-cloud help output typo -- **PR** `#28110`_: (*terminalmage*) Add explanation of file_client: local setting masterless mode +* **ISSUE** `#28870`_: (`basepi`_) mdadm commands failing (refs: `#28871`_) -- **PR** `#28109`_: (*rallytime*) Add created reactor event to lxc cloud driver +* **PR** `#28871`_: (`basepi`_) [2015.5] Fix command generation for mdadm.assemble + @ *2015-11-13 21:54:33 UTC* -- **PR** `#27996`_: (*rallytime*) Don't fail if pip package is already present and pip1 is installed + * a9dc8b6ca6 Merge pull request `#28871`_ from basepi/mdadm.fix.28870 -- **PR** `#28056`_: (*rallytime*) Back-port `#28033`_ to 2015.5 + * 323bc2d2ac Fix command generation for mdadm.assemble -- **PR** `#28059`_: (*rallytime*) Back-port `#28040`_ to 2015.5 - -- **PR** `#28047`_: (*cachedout*) Restore FTP functionality to file client - -- **PR** `#28032`_: (*twangboy*) Fixed win_path.py - -- **PR** `#28037`_: (*rallytime*) Back-port `#28003`_ to 2015.5 - -- **PR** `#28031`_: (*jacobhammons*) Updated release notes with additional CVE information - -- **PR** `#28008`_: (*jfindlay*) platform independent line endings in hosts mod - -- **PR** `#28012`_: (*rallytime*) Clean up stack trace when something goes wrong with minion output - -- **PR** `#27995`_: (*jacobhammons*) added link to grains security FAQ to targeting and pillar topics. - -- **PR** `#27986`_: (*jacobhammons*) Changed current release to 5.6 and added CVE to release notes - -- **PR** `#27913`_: (*pass-by-value*) Set default - -- **PR** `#27876`_: (*terminalmage*) 2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used - -- **PR** `#27726`_: (*jfindlay*) deprecate hash_hostname in favor of hash_known_hosts - -- **PR** `#27776`_: (*jfindlay*) return message when local jobs_cache not found - -- **PR** `#27766`_: (*jfindlay*) better check for debian userdel error - -- **PR** `#27758`_: (*iggy*) Remove redundant text from syslog returner - -- **PR** `#27841`_: (*terminalmage*) Detect Manjaro Linux as Arch derivative - -- **PR** `#27852`_: (*rallytime*) Back-port `#27806`_ to 2015.5 - -- **PR** `#27838`_: (*basepi*) [2015.5] Fix highstate outputter for jobs.lookup_jid - -- **PR** `#27791`_: (*eguven*) 2015.5 postgres_user groups backport - -- **PR** `#27759`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 - -- **PR** `#27732`_: (*jacobhammons*) update docs for __virtual__ and __virtualname__ - -- **PR** `#27747`_: (*Sacro*) Chocolatey doesn't have a help command. - -- **PR** `#27733`_: (*jacobhammons*) hardening topic - updates to docs.saltstack.com theme - -- **PR** `#27706`_: (*jacobhammons*) Assorted doc bugs - -- **PR** `#27695`_: (*rallytime*) Back-port `#27671`_ to 2015.5 - -- **PR** `#27524`_: (*jfindlay*) parse pkgng output in quiet mode for >= 1.6.1 - -- **PR** `#27686`_: (*rallytime*) Back-port `#27476`_ to 2015.5 - -- **PR** `#27684`_: (*rallytime*) Back-port `#27656`_ to 2015.5 - -- **PR** `#27683`_: (*rallytime*) Back-port `#27659`_ to 2015.5 - -- **PR** `#27682`_: (*rallytime*) Back-port `#27566`_ to 2015.5 - -- **PR** `#27681`_: (*rallytime*) Back-port `#25928`_ to 2015.5 - -- **PR** `#27680`_: (*rallytime*) Back-port `#27535`_ to 2015.5 - -- **PR** `#27442`_: (*JaseFace*) Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() - -- **PR** `#27641`_: (*rallytime*) Gate the psutil import and add depends doc for diskusage beacon - -- **PR** `#27644`_: (*rallytime*) Back-port `#27640`_ to 2015.5 - -- **PR** `#27612`_: (*rallytime*) Fix GCE external_ip stacktraces in 2015.5 - -- **PR** `#27568`_: (*jacobhammons*) regenerated man pages - -.. _`#19673`: https://github.com/saltstack/salt/issues/19673 -.. _`#25521`: https://github.com/saltstack/salt/pull/25521 -.. _`#25775`: https://github.com/saltstack/salt/issues/25775 -.. _`#25928`: https://github.com/saltstack/salt/pull/25928 -.. _`#27201`: https://github.com/saltstack/salt/pull/27201 -.. _`#27286`: https://github.com/saltstack/salt/pull/27286 -.. _`#27390`: https://github.com/saltstack/salt/pull/27390 -.. _`#27442`: https://github.com/saltstack/salt/pull/27442 -.. _`#27476`: https://github.com/saltstack/salt/pull/27476 -.. _`#27524`: https://github.com/saltstack/salt/pull/27524 -.. _`#27535`: https://github.com/saltstack/salt/pull/27535 -.. _`#27566`: https://github.com/saltstack/salt/pull/27566 -.. _`#27568`: https://github.com/saltstack/salt/pull/27568 -.. _`#27612`: https://github.com/saltstack/salt/pull/27612 -.. _`#27640`: https://github.com/saltstack/salt/pull/27640 -.. _`#27641`: https://github.com/saltstack/salt/pull/27641 -.. _`#27644`: https://github.com/saltstack/salt/pull/27644 -.. _`#27656`: https://github.com/saltstack/salt/pull/27656 -.. _`#27659`: https://github.com/saltstack/salt/pull/27659 -.. _`#27671`: https://github.com/saltstack/salt/pull/27671 -.. _`#27680`: https://github.com/saltstack/salt/pull/27680 -.. _`#27681`: https://github.com/saltstack/salt/pull/27681 -.. _`#27682`: https://github.com/saltstack/salt/pull/27682 -.. _`#27683`: https://github.com/saltstack/salt/pull/27683 -.. _`#27684`: https://github.com/saltstack/salt/pull/27684 -.. _`#27686`: https://github.com/saltstack/salt/pull/27686 -.. _`#27695`: https://github.com/saltstack/salt/pull/27695 -.. _`#27706`: https://github.com/saltstack/salt/pull/27706 -.. _`#27726`: https://github.com/saltstack/salt/pull/27726 -.. _`#27732`: https://github.com/saltstack/salt/pull/27732 -.. _`#27733`: https://github.com/saltstack/salt/pull/27733 -.. _`#27747`: https://github.com/saltstack/salt/pull/27747 -.. _`#27758`: https://github.com/saltstack/salt/pull/27758 -.. _`#27759`: https://github.com/saltstack/salt/pull/27759 -.. _`#27766`: https://github.com/saltstack/salt/pull/27766 -.. _`#27776`: https://github.com/saltstack/salt/pull/27776 -.. _`#27791`: https://github.com/saltstack/salt/pull/27791 -.. _`#27806`: https://github.com/saltstack/salt/pull/27806 -.. _`#27838`: https://github.com/saltstack/salt/pull/27838 -.. _`#27841`: https://github.com/saltstack/salt/pull/27841 -.. _`#27852`: https://github.com/saltstack/salt/pull/27852 -.. _`#27876`: https://github.com/saltstack/salt/pull/27876 -.. _`#27913`: https://github.com/saltstack/salt/pull/27913 -.. _`#27986`: https://github.com/saltstack/salt/pull/27986 -.. _`#27995`: https://github.com/saltstack/salt/pull/27995 -.. _`#27996`: https://github.com/saltstack/salt/pull/27996 -.. _`#28003`: https://github.com/saltstack/salt/pull/28003 -.. _`#28008`: https://github.com/saltstack/salt/pull/28008 +.. _`#13850`: https://github.com/saltstack/salt/issues/13850 +.. _`#22442`: https://github.com/saltstack/salt/issues/22442 +.. _`#26911`: https://github.com/saltstack/salt/issues/26911 +.. _`#28010`: https://github.com/saltstack/salt/issues/28010 .. _`#28012`: https://github.com/saltstack/salt/pull/28012 -.. _`#28031`: https://github.com/saltstack/salt/pull/28031 -.. _`#28032`: https://github.com/saltstack/salt/pull/28032 -.. _`#28033`: https://github.com/saltstack/salt/pull/28033 -.. _`#28037`: https://github.com/saltstack/salt/pull/28037 -.. _`#28040`: https://github.com/saltstack/salt/pull/28040 -.. _`#28047`: https://github.com/saltstack/salt/pull/28047 -.. _`#28056`: https://github.com/saltstack/salt/pull/28056 -.. _`#28059`: https://github.com/saltstack/salt/pull/28059 -.. _`#28097`: https://github.com/saltstack/salt/pull/28097 -.. _`#28103`: https://github.com/saltstack/salt/pull/28103 -.. _`#28109`: https://github.com/saltstack/salt/pull/28109 -.. _`#28110`: https://github.com/saltstack/salt/pull/28110 -.. _`#28117`: https://github.com/saltstack/salt/pull/28117 -.. _`#28130`: https://github.com/saltstack/salt/pull/28130 -.. _`#28138`: https://github.com/saltstack/salt/pull/28138 -.. _`#28140`: https://github.com/saltstack/salt/pull/28140 -.. _`#28174`: https://github.com/saltstack/salt/pull/28174 -.. _`#28175`: https://github.com/saltstack/salt/pull/28175 -.. _`#28210`: https://github.com/saltstack/salt/pull/28210 -.. _`#28211`: https://github.com/saltstack/salt/pull/28211 -.. _`#28213`: https://github.com/saltstack/salt/pull/28213 -.. _`#28238`: https://github.com/saltstack/salt/pull/28238 -.. _`#28255`: https://github.com/saltstack/salt/pull/28255 -.. _`#28263`: https://github.com/saltstack/salt/pull/28263 -.. _`#28271`: https://github.com/saltstack/salt/pull/28271 -.. _`#28280`: https://github.com/saltstack/salt/pull/28280 -.. _`#28293`: https://github.com/saltstack/salt/pull/28293 -.. _`#28315`: https://github.com/saltstack/salt/pull/28315 -.. _`#28346`: https://github.com/saltstack/salt/pull/28346 -.. _`#28358`: https://github.com/saltstack/salt/pull/28358 -.. _`#28359`: https://github.com/saltstack/salt/pull/28359 -.. _`#28366`: https://github.com/saltstack/salt/pull/28366 -.. _`#28372`: https://github.com/saltstack/salt/issues/28372 -.. _`#28373`: https://github.com/saltstack/salt/pull/28373 -.. _`#28381`: https://github.com/saltstack/salt/pull/28381 -.. _`#28400`: https://github.com/saltstack/salt/pull/28400 -.. _`#28406`: https://github.com/saltstack/salt/pull/28406 -.. _`#28407`: https://github.com/saltstack/salt/pull/28407 -.. _`#28413`: https://github.com/saltstack/salt/pull/28413 -.. _`#28448`: https://github.com/saltstack/salt/pull/28448 -.. _`#28461`: https://github.com/saltstack/salt/pull/28461 -.. _`#28508`: https://github.com/saltstack/salt/pull/28508 -.. _`#28512`: https://github.com/saltstack/salt/pull/28512 -.. _`#28517`: https://github.com/saltstack/salt/pull/28517 -.. _`#28525`: https://github.com/saltstack/salt/pull/28525 -.. _`#28529`: https://github.com/saltstack/salt/pull/28529 -.. _`#28531`: https://github.com/saltstack/salt/pull/28531 -.. _`#28537`: https://github.com/saltstack/salt/pull/28537 -.. _`#28538`: https://github.com/saltstack/salt/pull/28538 -.. _`#28541`: https://github.com/saltstack/salt/pull/28541 -.. _`#28546`: https://github.com/saltstack/salt/pull/28546 -.. _`#28548`: https://github.com/saltstack/salt/pull/28548 -.. _`#28563`: https://github.com/saltstack/salt/pull/28563 -.. _`#28617`: https://github.com/saltstack/salt/pull/28617 -.. _`#28622`: https://github.com/saltstack/salt/pull/28622 .. _`#28627`: https://github.com/saltstack/salt/pull/28627 .. _`#28630`: https://github.com/saltstack/salt/pull/28630 -.. _`#28645`: https://github.com/saltstack/salt/pull/28645 -.. _`#28662`: https://github.com/saltstack/salt/pull/28662 -.. _`#28666`: https://github.com/saltstack/salt/pull/28666 -.. _`#28668`: https://github.com/saltstack/salt/pull/28668 -.. _`#28669`: https://github.com/saltstack/salt/pull/28669 -.. _`#28670`: https://github.com/saltstack/salt/pull/28670 -.. _`#28690`: https://github.com/saltstack/salt/pull/28690 -.. _`#28694`: https://github.com/saltstack/salt/pull/28694 -.. _`#28699`: https://github.com/saltstack/salt/pull/28699 -.. _`#28703`: https://github.com/saltstack/salt/pull/28703 -.. _`#28705`: https://github.com/saltstack/salt/pull/28705 -.. _`#28716`: https://github.com/saltstack/salt/pull/28716 -.. _`#28717`: https://github.com/saltstack/salt/pull/28717 -.. _`#28718`: https://github.com/saltstack/salt/pull/28718 -.. _`#28731`: https://github.com/saltstack/salt/pull/28731 .. _`#28740`: https://github.com/saltstack/salt/pull/28740 -.. _`#28746`: https://github.com/saltstack/salt/pull/28746 -.. _`#28756`: https://github.com/saltstack/salt/pull/28756 -.. _`#28760`: https://github.com/saltstack/salt/pull/28760 -.. _`#28776`: https://github.com/saltstack/salt/pull/28776 -.. _`#28777`: https://github.com/saltstack/salt/pull/28777 -.. _`#28783`: https://github.com/saltstack/salt/issues/28783 -.. _`#28786`: https://github.com/saltstack/salt/pull/28786 -.. _`#28826`: https://github.com/saltstack/salt/pull/28826 -.. _`#28829`: https://github.com/saltstack/salt/pull/28829 -.. _`#28832`: https://github.com/saltstack/salt/pull/28832 -.. _`#28833`: https://github.com/saltstack/salt/pull/28833 .. _`#28839`: https://github.com/saltstack/salt/pull/28839 -.. _`#28851`: https://github.com/saltstack/salt/pull/28851 -.. _`#28853`: https://github.com/saltstack/salt/pull/28853 -.. _`#28856`: https://github.com/saltstack/salt/pull/28856 -.. _`#28857`: https://github.com/saltstack/salt/pull/28857 -.. _`#28864`: https://github.com/saltstack/salt/pull/28864 +.. _`#28870`: https://github.com/saltstack/salt/issues/28870 .. _`#28871`: https://github.com/saltstack/salt/pull/28871 .. _`#28873`: https://github.com/saltstack/salt/pull/28873 +.. _`#28883`: https://github.com/saltstack/salt/issues/28883 +.. _`#28888`: https://github.com/saltstack/salt/issues/28888 .. _`#28897`: https://github.com/saltstack/salt/pull/28897 .. _`#28902`: https://github.com/saltstack/salt/pull/28902 .. _`#28908`: https://github.com/saltstack/salt/pull/28908 +.. _`#28928`: https://github.com/saltstack/salt/issues/28928 .. _`#28930`: https://github.com/saltstack/salt/pull/28930 .. _`#28932`: https://github.com/saltstack/salt/pull/28932 +.. _`#28947`: https://github.com/saltstack/salt/issues/28947 .. _`#28949`: https://github.com/saltstack/salt/pull/28949 .. _`#28982`: https://github.com/saltstack/salt/pull/28982 .. _`#29011`: https://github.com/saltstack/salt/pull/29011 @@ -397,5 +236,29 @@ Changes: .. _`#29084`: https://github.com/saltstack/salt/pull/29084 .. _`#29093`: https://github.com/saltstack/salt/pull/29093 .. _`#29096`: https://github.com/saltstack/salt/pull/29096 +.. _`#29110`: https://github.com/saltstack/salt/issues/29110 +.. _`#29113`: https://github.com/saltstack/salt/pull/29113 .. _`#29122`: https://github.com/saltstack/salt/pull/29122 .. _`#29128`: https://github.com/saltstack/salt/pull/29128 +.. _`#29138`: https://github.com/saltstack/salt/pull/29138 +.. _`#29164`: https://github.com/saltstack/salt/pull/29164 +.. _`MasterNayru`: https://github.com/MasterNayru +.. _`TronPaul`: https://github.com/TronPaul +.. _`allanliu`: https://github.com/allanliu +.. _`basepi`: https://github.com/basepi +.. _`cachedout`: https://github.com/cachedout +.. _`cxmcc`: https://github.com/cxmcc +.. _`dmyerscough`: https://github.com/dmyerscough +.. _`dsumsky`: https://github.com/dsumsky +.. _`jfindlay`: https://github.com/jfindlay +.. _`kevinlondon`: https://github.com/kevinlondon +.. _`ldelossa`: https://github.com/ldelossa +.. _`messa`: https://github.com/messa +.. _`mohshami`: https://github.com/mohshami +.. _`rallytime`: https://github.com/rallytime +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`tehmaspc`: https://github.com/tehmaspc +.. _`twangboy`: https://github.com/twangboy +.. _`vakulich`: https://github.com/vakulich +.. _`whiteinge`: https://github.com/whiteinge +.. _`zmalone`: https://github.com/zmalone diff --git a/doc/topics/releases/2015.5.9.rst b/doc/topics/releases/2015.5.9.rst index b837093ad0..7b7576fab4 100644 --- a/doc/topics/releases/2015.5.9.rst +++ b/doc/topics/releases/2015.5.9.rst @@ -2,100 +2,442 @@ Salt 2015.5.9 Release Notes =========================== -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +:release: 2016-01-11 -*Generated at: 2016-01-08T23:02:31Z* +Version 2015.5.9 is a bugfix release for :ref:`2015.5.0 `. -Total Merges: **44** -Changes: +Statistics +========== -- **PR** `#30237`_: (*jacobhammons*) Updated man pages and doc version for 2015.5.9 +- Total Merges: **45** +- Total Issue References: **21** +- Total PR References: **48** -- **PR** `#30207`_: (*rallytime*) Use correct spacing in rabbitmq state examples +- Contributors: **21** (`abednarik`_, `aletourneau`_, `attiasr`_, `basepi`_, `cachedout`_, `clan`_, `clarkperkins`_, `cro`_, `dmyerscough`_, `jacobhammons`_, `jfindlay`_, `jsutton`_, `justinta`_, `lorengordon`_, `markckimball`_, `mpreziuso`_, `rallytime`_, `terminalmage`_, `titilambert`_, `twangboy`_, `zmalone`_) -- **PR** `#30191`_: (*jacobhammons*) Updated doc site banners -- **PR** `#30125`_: (*abednarik*) Update user home event when createhome is set to False +Changelog for v2015.5.8..v2015.5.9 +================================== -- **PR** `#30127`_: (*jsutton*) Updating documentation and example minion config for random_master/master_shuffle. +*Generated at: 2018-05-27 22:31:06 UTC* -- **PR** `#30110`_: (*markckimball*) Fixed flag sent to salt.utils.http in order for verify_ssl to work correctly +* **PR** `#30248`_: (`jfindlay`_) add 2015.5.9 release notes + @ *2016-01-08 23:13:10 UTC* -- **PR** `#30093`_: (*zmalone*) Noting that file_roots and "state tree" should both be avoided + * 92889db638 Merge pull request `#30248`_ from jfindlay/2015.5 -- **PR** `#30097`_: (*cachedout*) Note concern about cleartext password in docs for shadow.gen_password + * 741f7aba31 add 2015.5.9 release notes -- **PR** `#30089`_: (*mpreziuso*) Fixes terminology and adds more accurate details about the algorithms +* **PR** `#30237`_: (`jacobhammons`_) Updated man pages and doc version for 2015.5.9 + @ *2016-01-08 18:10:05 UTC* -- **PR** `#30086`_: (*cachedout*) Document that gitfs needs recent libs + * 7a329d89d7 Merge pull request `#30237`_ from jacobhammons/man-pages-prev -- **PR** `#30070`_: (*cachedout*) Add documentation on debugging salt-ssh + * 2431c4c5c3 Updated man page and doc conf.py copyright year to 2016 -- **PR** `#30059`_: (*mpreziuso*) Fixes wrong function scope + * fe3da1c174 Updated man pages and doc version for 2015.5.9 -- **PR** `#30025`_: (*jtand*) Skipping some Boto tests until resolved moto issue +* **PR** `#30207`_: (`rallytime`_) Use correct spacing in rabbitmq state examples + @ *2016-01-07 18:37:35 UTC* -- **PR** `#29949`_: (*aletourneau*) Enhanced netscaler docstring + * 2c0b725924 Merge pull request `#30207`_ from rallytime/rabbitmq_states_doc_fix -- **PR** `#29941`_: (*cachedout*) Fix spelling error in boto_vpc + * 8d48c24182 Use correct spacing in rabbitmq state examples -- **PR** `#29908`_: (*cachedout*) Allow kwargs to be passed to pacman provide for update func +* **PR** `#30191`_: (`jacobhammons`_) Updated doc site banners + @ *2016-01-06 22:37:40 UTC* -- **PR** `#29909`_: (*abednarik*) FreeBSD pkgng fix for non-interactive install. + * b49cf910f4 Merge pull request `#30191`_ from jacobhammons/banner-prev -- **PR** `#29730`_: (*rallytime*) Update docker-py version requirement to 0.6.0 for dockerio.py files + * c3390955b0 Updated doc site banners -- **PR** `#29715`_: (*rallytime*) Install correct package version, if provided, for npm state. +* **ISSUE** `#29633`_: (`twellspring`_) user.present does not modify home directory (refs: `#30125`_) -- **PR** `#29721`_: (*terminalmage*) Fix display of multiline strings when iterating over a list +* **PR** `#30125`_: (`abednarik`_) Update user home event when createhome is set to False + @ *2016-01-05 18:15:38 UTC* -- **PR** `#29646`_: (*rallytime*) Don't stacktrace on kwargs.get if kwargs=None + * 9363d6f5b6 Merge pull request `#30125`_ from abednarik/update_user_home -- **PR** `#29673`_: (*rallytime*) Default value should be False and not 'False' + * 56544a77f6 Update user home event when createhome is set to False -- **PR** `#29527`_: (*jfindlay*) 2015.5.7 notes: add note about not being released +* **ISSUE** `#10155`_: (`jhenry82`_) Option to select a random master in multi-master mode (refs: `#30127`_) -- **PR** `#29539`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 +* **PR** `#30127`_: (`jsutton`_) Updating documentation and example minion config for random_master/master_shuffle. + @ *2016-01-04 19:30:50 UTC* -- **PR** `#29504`_: (*rallytime*) Document userdata_file option for EC2 driver + * 1a5d585d91 Merge pull request `#30127`_ from jsutton/clarify-documenation-for-random_master -- **PR** `#29507`_: (*rallytime*) Switch volumes and del_*_on_destroy example ordering + * 01dbf385ef Adding random_master to reference and updating master_shuffle. Adding master_shuffle to the minion example config file as it is needed for multi-master PKI. -- **PR** `#29469`_: (*abednarik*) Added Documentation note in salt cloud. +* **PR** `#30110`_: (`markckimball`_) Fixed flag sent to salt.utils.http in order for verify_ssl to work correctly + @ *2015-12-31 21:17:53 UTC* -- **PR** `#29461`_: (*dmyerscough*) Fix resource limits, systemd sets the default too small + * 28b1bbbe77 Merge pull request `#30110`_ from markckimball/fix-verify_ssl-in-joyent-cloud -- **PR** `#29439`_: (*rallytime*) Back-port `#28656`_ to 2015.5 + * e1c08cb269 Fixed flag sent to salt.utils.http in order for verify_ssl to work appropriately. -- **PR** `#29418`_: (*jacobhammons*) Added CVE 2015-8034 to 2015.5.8 release notes +* **PR** `#30093`_: (`zmalone`_) Noting that file_roots and "state tree" should both be avoided + @ *2015-12-30 22:40:05 UTC* -- **PR** `#29389`_: (*jacobhammons*) updated version numbers in documentation + * 040412b0b1 Merge pull request `#30093`_ from zmalone/pillar-notes -- **PR** `#28501`_: (*twangboy*) Requested fixes for 26898 + * cfbfd58afe Noting that file_roots and "state tree" should both be avoided, because in some environments, the actual states show up another level down. Adding notes about why this is undesirable. -- **PR** `#29348`_: (*jtand*) Fixes an file.search on python2.6 +* **ISSUE** `#28120`_: (`jtylers`_) Clear text passwords (refs: `#30097`_) -- **PR** `#29336`_: (*rallytime*) Back-port `#29276`_ to 2015.5 +* **PR** `#30097`_: (`cachedout`_) Note concern about cleartext password in docs for shadow.gen_password + @ *2015-12-30 22:37:33 UTC* -- **PR** `#29333`_: (*rallytime*) Back-port `#29280`_ to 2015.5 + * 25edefc93a Merge pull request `#30097`_ from cachedout/note_on_password_process_list -- **PR** `#29316`_: (*basepi*) [2015.5] Merge forward from 2014.7 to 2015.5 + * 58aec884ef Note concern about cleartext password in docs for shadow.gen_password -- **PR** `#29216`_: (*clan*) size is 0 doesn't mean no data, e.g, /proc/version +* **PR** `#30089`_: (`mpreziuso`_) Fixes terminology and adds more accurate details about the algorithms + @ *2015-12-30 20:02:18 UTC* -- **PR** `#29261`_: (*attiasr*) fix incorrect reinstallation of windows pkg + * 6b1c3a6bf2 Merge pull request `#30089`_ from mpreziuso/patch-1 -- **PR** `#29214`_: (*cro*) Doc for salt.utils.http should say verify_ssl not ssl_verify. + * 50533add40 Fixes terminology and adds more accurate details about the algorithms -- **PR** `#29204`_: (*lorengordon*) Use os.path.join to return full path to ca bundle +* **ISSUE** `#29921`_: (`anlutro`_) pygit 0.21 not fully supported? (refs: `#30086`_) +* **PR** `#30086`_: (`cachedout`_) Document that gitfs needs recent libs + @ *2015-12-30 19:26:05 UTC* + + * 200d09385d Merge pull request `#30086`_ from cachedout/issue_29921 + + * 8c29e2dd6a Document that gitfs needs recent libs + +* **ISSUE** `#27835`_: (`bertjwregeer`_) [FreeBSD] salt-ssh hangs forever (refs: `#30070`_) + +* **PR** `#30070`_: (`cachedout`_) Add documentation on debugging salt-ssh + @ *2015-12-29 23:00:06 UTC* + + * 404414bf57 Merge pull request `#30070`_ from cachedout/issue_27835 + + * 60431e342a Add documentation on debugging salt-ssh + +* **PR** `#30059`_: (`mpreziuso`_) Fixes wrong function scope + @ *2015-12-29 16:12:06 UTC* + + * 84db12212d Merge pull request `#30059`_ from mpreziuso/patch-1 + + * 1cb1c2da07 Fixes wrong function scope + +* **PR** `#30025`_: (`justinta`_) Skipping some Boto tests until resolved moto issue + @ *2015-12-28 15:21:45 UTC* + + * **PR** `#29725`_: (`cachedout`_) Disable some boto tests per resolution of moto issue (refs: `#30025`_) + + * 1c6c9b1a06 Merge pull request `#30025`_ from jtand/boto_tests + + * e706642152 Skipping some Boto tests until resolved moto issue + +* **ISSUE** `#28956`_: (`racooper`_) Netscaler module doc enhancements (refs: `#29949`_) + +* **PR** `#29949`_: (`aletourneau`_) Enhanced netscaler docstring + @ *2015-12-22 20:26:52 UTC* + + * 0f91021c59 Merge pull request `#29949`_ from aletourneau/2015.5 + + * cf855fe262 Fixed trailing white spaces + + * 864801e002 fixed version + + * 041d9346c4 Enhanced netscaler docstring + +* **PR** `#29941`_: (`cachedout`_) Fix spelling error in boto_vpc + @ *2015-12-22 15:49:54 UTC* + + * 229d3eb60b Merge pull request `#29941`_ from cachedout/boto_spelling + + * b11bfd07b8 Fix spelling error in boto_vpc + +* **ISSUE** `#29880`_: (`githubcdr`_) Salt pkg.uptodate fails on Arch linux (refs: `#29908`_) + +* **PR** `#29908`_: (`cachedout`_) Allow kwargs to be passed to pacman provide for update func + @ *2015-12-22 15:04:18 UTC* + + * 69c5ada636 Merge pull request `#29908`_ from cachedout/issue_29880 + + * 4cd77b4118 Allow kwargs to be passed to pacman provide for update func + +* **ISSUE** `#27056`_: (`oogali`_) pkgng provider on FreeBSD does not do BATCH=yes (refs: `#29909`_) + +* **PR** `#29909`_: (`abednarik`_) FreeBSD pkgng fix for non-interactive install. + @ *2015-12-22 15:03:50 UTC* + + * ad0de4d563 Merge pull request `#29909`_ from abednarik/freebsd_pkgng_non_interactive_fix + + * 8ac213001a FreeBSD pkgng fix for non-interactive install. + +* **ISSUE** `#24698`_: (`cmhe`_) docker.installed not working (salt 2015.5.0, docker 1.6.2, dockerpy 0.5.3) (refs: `#29730`_) + +* **PR** `#29730`_: (`rallytime`_) Update docker-py version requirement to 0.6.0 for dockerio.py files + @ *2015-12-16 14:44:40 UTC* + + * f43f3d166c Merge pull request `#29730`_ from rallytime/fix-24698 + + * 120fd5fdf0 Update docker-py version requirement to 0.6.0 for dockerio.py files + +* **ISSUE** `#23343`_: (`micaelbergeron`_) npm state ignore the requested version (refs: `#29715`_) + +* **ISSUE** `#18647`_: (`hundt`_) Version number in npm state name does not result in correct version being installed (refs: `#29715`_) + +* **PR** `#29715`_: (`rallytime`_) Install correct package version, if provided, for npm state. + @ *2015-12-15 23:19:45 UTC* + + * c393a4175a Merge pull request `#29715`_ from rallytime/fix-23343 + + * a0ed857c37 Install correct package version, if provided, for npm state. + +* **PR** `#29721`_: (`terminalmage`_) Fix display of multiline strings when iterating over a list + @ *2015-12-15 22:16:10 UTC* + + * 1310afbbc2 Merge pull request `#29721`_ from terminalmage/nested-output-multiline-fix + + * 761be9cb93 Fix display of multiline strings when iterating over a list + +* **ISSUE** `#29488`_: (`Shad0w1nk`_) salt.cloud.clouds.vmware.revert_to_snapshot crash when using the default value (refs: `#29646`_) + +* **PR** `#29646`_: (`rallytime`_) Don't stacktrace on kwargs.get if kwargs=None + @ *2015-12-15 19:02:58 UTC* + + * 52cc07cec9 Merge pull request `#29646`_ from rallytime/fix-29488 + + * c5fa9e9351 Don't stacktrace on kwargs.get if kwargs=None + +* **ISSUE** `#29661`_: (`mosuowhq`_) bug report when creating VM in /salt/cloud/clouds/nova.py (refs: `#29673`_) + +* **PR** `#29673`_: (`rallytime`_) Default value should be False and not 'False' + @ *2015-12-14 18:08:44 UTC* + + * f606c23ea8 Merge pull request `#29673`_ from rallytime/fix-29661 + + * e4af7a1157 Default value should be False and not 'False' + +* **PR** `#29527`_: (`jfindlay`_) 2015.5.7 notes: add note about not being released + @ *2015-12-08 21:08:26 UTC* + + * f77c8e7baf Merge pull request `#29527`_ from jfindlay/2015.5 + + * 1a8044f0c9 2015.5.7 notes: add note about not being released + +* **PR** `#29539`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-12-08 19:14:51 UTC* + + * 867d550271 Merge pull request `#29539`_ from basepi/merge-forward-2015.5 + + * 2c9c4ba430 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * 85aa70a6cb Merge pull request `#29392`_ from jacobhammons/2014.7 + + * d7f0db1dd8 updated version number to not reference a specific build from the latest branch + +* **ISSUE** `#12072`_: (`vk00226`_) Passing user-data when provisioning ec2 instances (refs: `#29504`_) + +* **PR** `#29504`_: (`rallytime`_) Document userdata_file option for EC2 driver + @ *2015-12-08 16:54:33 UTC* + + * de7f3d5a59 Merge pull request `#29504`_ from rallytime/fix-12072 + + * 8357c95dc2 Document userdata_file option for EC2 driver + +* **ISSUE** `#29101`_: (`jessbreckenridge`_) Salt-cloud 2015.8.0 - del_*_vols_on_destroy does not work according to docs (refs: `#29507`_) + +* **PR** `#29507`_: (`rallytime`_) Switch volumes and del_*_on_destroy example ordering + @ *2015-12-08 16:50:11 UTC* + + * 65deba8bb5 Merge pull request `#29507`_ from rallytime/ec2-doc-fix + + * 90b4823bc2 Switch volumes and del_*_on_destroy example ordering + +* **ISSUE** `#28862`_: (`trevor-h`_) salt-cloud uppercase timeout options no longer recognized (refs: `#29469`_) + +* **PR** `#29469`_: (`abednarik`_) Added Documentation note in salt cloud. + @ *2015-12-07 18:27:46 UTC* + + * 0918c9294f Merge pull request `#29469`_ from abednarik/doc_note_for_saltcloud_connection_timeout + + * 8e5c3e366a Added Documentation note in salt cloud. + +* **PR** `#29461`_: (`dmyerscough`_) Fix resource limits, systemd sets the default too small + @ *2015-12-05 16:26:34 UTC* + + * e43c7c05a6 Merge pull request `#29461`_ from dmyerscough/fix-resource-limits + + * 85a8a3b033 Fix resource limits, systemd sets the default number of open files to 4096 causing te master to complain about limits when you have a large number of keys + +* **ISSUE** `#28526`_: (`clarkperkins`_) yumpkg.installed broken in salt v2015.8.1 on CentOS 6 minions (refs: `#28656`_) + +* **PR** `#29439`_: (`rallytime`_) Back-port `#28656`_ to 2015.5 + @ *2015-12-04 22:56:17 UTC* + + * **PR** `#28656`_: (`clarkperkins`_) `#28526`_ fixed yumpkg module issue with pkg.installed (refs: `#29439`_) + + * 730f02fbdf Merge pull request `#29439`_ from rallytime/bp-28656 + + * 2f11bb021f `#28526`_ fixed yumpkg module + +* **PR** `#29418`_: (`jacobhammons`_) Added CVE 2015-8034 to 2015.5.8 release notes + @ *2015-12-04 03:02:53 UTC* + + * 197210d52e Merge pull request `#29418`_ from jacobhammons/dot8 + + * 4f51a737f9 Added CVE 2015-8034 to 2015.5.8 release notes + +* **PR** `#29389`_: (`jacobhammons`_) updated version numbers in documentation + @ *2015-12-03 16:27:23 UTC* + + * b3452f2a1a Merge pull request `#29389`_ from jacobhammons/2015.5 + + * 824721ff36 updated version numbers + +* **ISSUE** `#26898`_: (`twangboy`_) Symlinks in Windows (2015.8) (refs: `#28191`_) + +* **PR** `#28501`_: (`twangboy`_) Requested fixes for 26898 + @ *2015-12-03 01:12:12 UTC* + + * **PR** `#28420`_: (`jfindlay`_) fix removal of symbolic links on windows in the file state (refs: `#28501`_) + + * **PR** `#28191`_: (`twangboy`_) Fix 26898 (refs: `#28420`_, `#28501`_) + + * 6a7a95f28a Merge pull request `#28501`_ from twangboy/jmoney_26898 + + * c0cf33332c Fixed some Lint... + + * df17fc59d3 Merge pull request `#6`_ from jfindlay/twang_test + + * bc7e0cfe64 add file.symlink unit tests + + * 9381dc7215 orthogonalize file.symlink unit tests + + * 8f462ba044 Merge pull request `#5`_ from cachedout/fix_twangboy_test + + * 5293150d25 Fix tests + + * 7d39091c91 Fixed some more lint + + * 3dbd62af2c Fixed some tests... hopefully + + * f187db3288 Removed unnecessary logic + + * 89ebd268e6 Added file attributes restore on fail + + * 9ec72ca724 fix file state unit tests for win symlink feature + + * 69c32a663e Fixed some lint + + * 638dec5027 Fixed some tests... let's see if they're really are + + * 5ed7a99792 Replaced instances of shutil.rmtree in file state + + * 2651ce509f Fix file.remove for windows + +* **ISSUE** `#29344`_: (`justinta`_) file.search broken on python 2.6 with empty files (refs: `#29348`_) + +* **PR** `#29348`_: (`justinta`_) Fixes an file.search on python2.6 + @ *2015-12-02 23:26:36 UTC* + + * 760a521603 Merge pull request `#29348`_ from jtand/file_search_fix + + * 04f82bd4fd Fixes an file.search on python2.6 + +* **ISSUE** `#29206`_: (`mschiff`_) ssh_known_hosts.present creates wrong known_hosts lines (refs: `#29276`_) + +* **PR** `#29336`_: (`rallytime`_) Back-port `#29276`_ to 2015.5 + @ *2015-12-02 19:37:42 UTC* + + * **PR** `#29276`_: (`abednarik`_) Prevent adding port twice when adding entry in known hosts (refs: `#29336`_) + + * 51ea88d489 Merge pull request `#29336`_ from rallytime/bp-29276 + + * 3a0e19debb Prevent adding port twice when adding entry in known hosts + +* **PR** `#29333`_: (`rallytime`_) Back-port `#29280`_ to 2015.5 + @ *2015-12-02 19:37:05 UTC* + + * **PR** `#29280`_: (`cachedout`_) [Doc] Add note for SVN state (refs: `#29333`_) + + * **PR** `#29165`_: (`titilambert`_) [Doc] Add note for SVN state (refs: `#29280`_, `#29333`_) + + * 28255af52a Merge pull request `#29333`_ from rallytime/bp-29280 + + * 722d02ff4a Lint + + * 4a0040c1b4 [Doc] Add note for SVN state + +* **PR** `#29316`_: (`basepi`_) [2015.5] Merge forward from 2014.7 to 2015.5 + @ *2015-12-01 20:20:23 UTC* + + * 14e94b3593 Merge pull request `#29316`_ from basepi/merge-forward-2015.5 + + * 33f40b3c47 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * d2fb2109a3 Merge pull request `#29296`_ from douardda/patch-3 + + * d2885390f4 Use process KillMode on Debian systems also + +* **PR** `#29216`_: (`clan`_) size is 0 doesn't mean no data, e.g, /proc/version + @ *2015-11-30 20:01:43 UTC* + + * 6a2ffbfb7c Merge pull request `#29216`_ from clan/file_search_on_proc_file + + * 91a20c07a1 try mmap first + + * 8aa4f2053e remove extra space to fix lint failure + + * d34e6b1a9a use read only if has read() method + + * 3209c1cdb5 size is 0 doesn't mean no data, e.g, /proc/version + +* **PR** `#29261`_: (`attiasr`_) fix incorrect reinstallation of windows pkg + @ *2015-11-30 18:28:42 UTC* + + * d6aaae8d7b Merge pull request `#29261`_ from attiasr/patch-1 + + * 7a99b90596 add log and return if pkg already installed + + * 1843c7ab8e fix incorrect reinstallation of windows pkg + +* **PR** `#29214`_: (`cro`_) Doc for salt.utils.http should say verify_ssl not ssl_verify. + @ *2015-11-25 23:55:38 UTC* + + * 9236188867 Merge pull request `#29214`_ from cro/ssl_verify_ssl + + * e9c13c561b Doc bug--salt.utils.http takes verify_ssl not ssl_verify. + +* **ISSUE** `#29202`_: (`lorengordon`_) Broken ca bundle lookup in `salt.utils.http.get_ca_bundle` (refs: `#29204`_) + +* **PR** `#29204`_: (`lorengordon`_) Use os.path.join to return full path to ca bundle + @ *2015-11-25 20:00:42 UTC* + + * df7b35a86b Merge pull request `#29204`_ from lorengordon/fix-29202 + + * b1dae5e6fe Use os.path.join to return full path to ca bundle + +.. _`#10155`: https://github.com/saltstack/salt/issues/10155 +.. _`#12072`: https://github.com/saltstack/salt/issues/12072 +.. _`#18647`: https://github.com/saltstack/salt/issues/18647 +.. _`#23343`: https://github.com/saltstack/salt/issues/23343 +.. _`#24698`: https://github.com/saltstack/salt/issues/24698 +.. _`#26898`: https://github.com/saltstack/salt/issues/26898 +.. _`#27056`: https://github.com/saltstack/salt/issues/27056 +.. _`#27835`: https://github.com/saltstack/salt/issues/27835 +.. _`#28120`: https://github.com/saltstack/salt/issues/28120 .. _`#28191`: https://github.com/saltstack/salt/pull/28191 .. _`#28420`: https://github.com/saltstack/salt/pull/28420 .. _`#28501`: https://github.com/saltstack/salt/pull/28501 +.. _`#28526`: https://github.com/saltstack/salt/issues/28526 .. _`#28656`: https://github.com/saltstack/salt/pull/28656 +.. _`#28862`: https://github.com/saltstack/salt/issues/28862 +.. _`#28956`: https://github.com/saltstack/salt/issues/28956 +.. _`#29101`: https://github.com/saltstack/salt/issues/29101 .. _`#29165`: https://github.com/saltstack/salt/pull/29165 +.. _`#29202`: https://github.com/saltstack/salt/issues/29202 .. _`#29204`: https://github.com/saltstack/salt/pull/29204 +.. _`#29206`: https://github.com/saltstack/salt/issues/29206 .. _`#29214`: https://github.com/saltstack/salt/pull/29214 .. _`#29216`: https://github.com/saltstack/salt/pull/29216 .. _`#29261`: https://github.com/saltstack/salt/pull/29261 @@ -105,6 +447,7 @@ Changes: .. _`#29316`: https://github.com/saltstack/salt/pull/29316 .. _`#29333`: https://github.com/saltstack/salt/pull/29333 .. _`#29336`: https://github.com/saltstack/salt/pull/29336 +.. _`#29344`: https://github.com/saltstack/salt/issues/29344 .. _`#29348`: https://github.com/saltstack/salt/pull/29348 .. _`#29389`: https://github.com/saltstack/salt/pull/29389 .. _`#29392`: https://github.com/saltstack/salt/pull/29392 @@ -112,18 +455,23 @@ Changes: .. _`#29439`: https://github.com/saltstack/salt/pull/29439 .. _`#29461`: https://github.com/saltstack/salt/pull/29461 .. _`#29469`: https://github.com/saltstack/salt/pull/29469 +.. _`#29488`: https://github.com/saltstack/salt/issues/29488 .. _`#29504`: https://github.com/saltstack/salt/pull/29504 .. _`#29507`: https://github.com/saltstack/salt/pull/29507 .. _`#29527`: https://github.com/saltstack/salt/pull/29527 .. _`#29539`: https://github.com/saltstack/salt/pull/29539 +.. _`#29633`: https://github.com/saltstack/salt/issues/29633 .. _`#29646`: https://github.com/saltstack/salt/pull/29646 +.. _`#29661`: https://github.com/saltstack/salt/issues/29661 .. _`#29673`: https://github.com/saltstack/salt/pull/29673 .. _`#29715`: https://github.com/saltstack/salt/pull/29715 .. _`#29721`: https://github.com/saltstack/salt/pull/29721 .. _`#29725`: https://github.com/saltstack/salt/pull/29725 .. _`#29730`: https://github.com/saltstack/salt/pull/29730 +.. _`#29880`: https://github.com/saltstack/salt/issues/29880 .. _`#29908`: https://github.com/saltstack/salt/pull/29908 .. _`#29909`: https://github.com/saltstack/salt/pull/29909 +.. _`#29921`: https://github.com/saltstack/salt/issues/29921 .. _`#29941`: https://github.com/saltstack/salt/pull/29941 .. _`#29949`: https://github.com/saltstack/salt/pull/29949 .. _`#30025`: https://github.com/saltstack/salt/pull/30025 @@ -139,3 +487,44 @@ Changes: .. _`#30191`: https://github.com/saltstack/salt/pull/30191 .. _`#30207`: https://github.com/saltstack/salt/pull/30207 .. _`#30237`: https://github.com/saltstack/salt/pull/30237 +.. _`#30248`: https://github.com/saltstack/salt/pull/30248 +.. _`#5`: https://github.com/saltstack/salt/issues/5 +.. _`#6`: https://github.com/saltstack/salt/issues/6 +.. _`Shad0w1nk`: https://github.com/Shad0w1nk +.. _`abednarik`: https://github.com/abednarik +.. _`aletourneau`: https://github.com/aletourneau +.. _`anlutro`: https://github.com/anlutro +.. _`attiasr`: https://github.com/attiasr +.. _`basepi`: https://github.com/basepi +.. _`bertjwregeer`: https://github.com/bertjwregeer +.. _`cachedout`: https://github.com/cachedout +.. _`clan`: https://github.com/clan +.. _`clarkperkins`: https://github.com/clarkperkins +.. _`cmhe`: https://github.com/cmhe +.. _`cro`: https://github.com/cro +.. _`dmyerscough`: https://github.com/dmyerscough +.. _`githubcdr`: https://github.com/githubcdr +.. _`hundt`: https://github.com/hundt +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jessbreckenridge`: https://github.com/jessbreckenridge +.. _`jfindlay`: https://github.com/jfindlay +.. _`jhenry82`: https://github.com/jhenry82 +.. _`jsutton`: https://github.com/jsutton +.. _`jtylers`: https://github.com/jtylers +.. _`justinta`: https://github.com/justinta +.. _`lorengordon`: https://github.com/lorengordon +.. _`markckimball`: https://github.com/markckimball +.. _`micaelbergeron`: https://github.com/micaelbergeron +.. _`mosuowhq`: https://github.com/mosuowhq +.. _`mpreziuso`: https://github.com/mpreziuso +.. _`mschiff`: https://github.com/mschiff +.. _`oogali`: https://github.com/oogali +.. _`racooper`: https://github.com/racooper +.. _`rallytime`: https://github.com/rallytime +.. _`terminalmage`: https://github.com/terminalmage +.. _`titilambert`: https://github.com/titilambert +.. _`trevor-h`: https://github.com/trevor-h +.. _`twangboy`: https://github.com/twangboy +.. _`twellspring`: https://github.com/twellspring +.. _`vk00226`: https://github.com/vk00226 +.. _`zmalone`: https://github.com/zmalone diff --git a/doc/topics/releases/2015.8.0.rst b/doc/topics/releases/2015.8.0.rst index 5a34397a92..e3bf02f0cb 100644 --- a/doc/topics/releases/2015.8.0.rst +++ b/doc/topics/releases/2015.8.0.rst @@ -21,7 +21,6 @@ See the following links for instructions: - :ref:`Red Hat / CentOS 5, 6, 7 ` - :ref:`Debian 8 ` - :ref:`Windows ` -- :ref:`FreeBSD ` Send Event on State Completion ============================== @@ -65,14 +64,13 @@ for asynchronous behavior, which should greatly improve reliability and performance. .. note:: + Tornado is considered expiremental in this release. The following known + issues were being investigated at the time of release: - Tornado is considered expiremental in this release. The following known - issues were being investigated at the time of release: - - TCP tests show - performance degredation over time (:issue:`26051`) - - TCP transport stacktrace on windows minion: Future exception was never - retrieved (:issue:`25718`) - - [freebsd] TCP transport not working in 2015.8.0rc3 (:issue:`26364`) + - TCP tests show performance degredation over time (:issue:`26051`) + - TCP transport stacktrace on windows minion: Future exception was never + retrieved (:issue:`25718`) + - [freebsd] TCP transport not working in 2015.8.0rc3 (:issue:`26364`) Proxy Minion Enhancements ========================= @@ -136,8 +134,10 @@ State and Execution Module Improvements - New and improved Docker state and execution modules (:mod:`state ` and :mod:`execution module `). + .. toctree:: includes/git-2015.8.0 + - OpenStack Glance API V2 execution module - Amazon VPC state module - RallyDev execution module diff --git a/doc/topics/releases/2015.8.1.rst b/doc/topics/releases/2015.8.1.rst index 53844322ca..1dc5d55f5b 100644 --- a/doc/topics/releases/2015.8.1.rst +++ b/doc/topics/releases/2015.8.1.rst @@ -2,22 +2,41 @@ Salt 2015.8.1 Release Notes =========================== -Version 2015.8.1 is a bugfix release for :ref:`2015.8.0`. +Version 2015.8.1 is a bugfix release for :ref:`2015.8.0 `. + + +Statistics +========== + +- Total Merges: **201** +- Total Issue References: **39** +- Total PR References: **135** + +- Contributors: **40** (`DmitryKuzmenko`_, `The-Loeki`_, `TheBigBear`_, `basepi`_, `bechtoldt`_, `bernieke`_, `blueyed`_, `cachedout`_, `cedwards`_, `clinta`_, `cro`_, `deuscapturus`_, `dmurphy18`_, `dsumsky`_, `eliasp`_, `flowhamster`_, `isbm`_, `jacksontj`_, `jacobhammons`_, `jfindlay`_, `justinta`_, `l2ol33rt`_, `macgyver13`_, `meggiebot`_, `msteed`_, `multani`_, `nasenbaer13`_, `perfinion`_, `pprkut`_, `rallytime`_, `rhealitycheck`_, `ruzarowski`_, `ryan-lane`_, `s0undt3ch`_, `systembell`_, `techhat`_, `terminalmage`_, `ticosax`_, `twangboy`_, `whiteinge`_) + Security Fixes --------------- +============== -CVE-2015-6941 - ``win_useradd`` module and ``salt-cloud`` display passwords in debug log +**CVE-2015-6941** The Windows :mod:`user ` module and +``salt-cloud`` display passwords in log when log level is set to ``debug`` +or more verbose. -Updated the ``win_useradd`` module return data to no longer include the password of the newly created user. The password is now replaced with the string ``XXX-REDACTED-XXX``. -Updated the Salt Cloud debug output to no longer display ``win_password`` and ``sudo_password`` authentication credentials. Also updated the Linode driver to no longer display authentication credentials in debug logs. These credentials are now replaced with ``REDACTED`` in the debug output. +For the Windows :mod:`user ` module, the password is +now replaced with the string ``XXX-REDACTED-XXX``. -CVE-2015-6918 - Git modules leaking HTTPS auth credentials to debug log +For salt-cloud, debug logging no longer displays ``win_password`` and +``sudo_password`` authentication credentials. -Updated the Git state and execution modules to no longer display HTTPS basic authentication credentials in loglevel debug output on the Salt master. These credentials are now replaced with ``REDACTED`` in the debug output. Thanks to Andreas Stieger for bringing this to our attention. +**CVE-2015-6918** Git state/execution modules log HTTPS auth credentials when +log level is set to ``debug`` or more verbose. + +These credentials are now replaced with ``REDACTED`` in the debug output. +Thanks to Andreas Stieger for bringing this to our +attention. Major Bug Fixes ---------------- +=============== - Add support for ``spm.d/*.conf`` configuration of SPM (:issue:`27010`) - Fix ``proxy`` grains breakage for non-proxy minions (:issue:`27039`) @@ -46,252 +65,1643 @@ Major Bug Fixes - Fix x509 module to support recent versions of OpenSSL (:issue:`27326`) - Some issues with proxy minions were corrected. - -Known Issues: +Known Issues +============ - Proxy minions currently cannot execute a highstate because of the way the proxymodule is being loaded internally. This will be fixed in a future release. -Changes for v2015.8.0..v2015.8.1 --------------------------------- +Changelog for v2015.8.0..v2015.8.1 +================================== -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +*Generated at: 2018-05-27 22:48:32 UTC* -*Generated at: 2015-10-01T04:45:02Z* +* **PR** `#27588`_: (`jfindlay`_) add autogenerated 2015.8.1 release notes + @ *2015-10-01 04:52:32 UTC* -Total Merges: **200** + * 87d86e4b3e Merge pull request `#27588`_ from jfindlay/2015.8 -Changes: + * f2eb20f26b add autogenerated 2015.8.1 release notes -- **PR** `#27584`_: (*jacobhammons*) added changes list to 2015.8.1 release notes +* **PR** `#27584`_: (`jacobhammons`_) added changes list to 2015.8.1 release notes + @ *2015-10-01 04:32:47 UTC* -- **PR** `#27575`_: (*rallytime*) Don't report existing instances as running only if they're actually terminated in EC2 + * f7510baf33 Merge pull request `#27584`_ from jacobhammons/release-notes -- **PR** `#27573`_: (*basepi*) [2015.8] Use the custom yaml serializer for minion_opts for salt-ssh + * ee4a3b3549 added changes list for 2015.8.1 -- **PR** `#27514`_: (*clinta*) Recent Versions of OpenSSL don't allow importing incomplete PEMs +* **ISSUE** `#27532`_: (`centromere`_) salt-cloud does not recognize terminated instances (refs: `#27575`_) -- **PR** `#27564`_: (*jacobhammons*) Man pages +* **PR** `#27575`_: (`rallytime`_) Don't report existing instances as running only if they're actually terminated in EC2 + @ *2015-09-30 22:17:24 UTC* -- **PR** `#27522`_: (*twangboy*) Removed dependency on powershell to restart salt-minion + * 1a31b19f15 Merge pull request `#27575`_ from rallytime/fix-27532 -- **PR** `#27550`_: (*rallytime*) [2015.8] Clean up salt-cloud logging and make it more useful + * 57c6535fc2 Make sure message is the most accurate. Instance may be stopped or shutting down. -- **PR** `#27517`_: (*jacobhammons*) Updated install docs + * da6b4b3604 Don't report existing instances as running only if they're actually terminated -- **PR** `#27526`_: (*eliasp*) Add missing newlines before param listing to fix doc rendering +* **ISSUE** `#27290`_: (`pirogoeth`_) Grains set in minion_opts do not appear in a call to `grains.items`. (refs: `#27573`_) -- **PR** `#27525`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **PR** `#27573`_: (`basepi`_) [2015.8] Use the custom yaml serializer for minion_opts for salt-ssh + @ *2015-09-30 21:16:22 UTC* -- **PR** `#27513`_: (*terminalmage*) Fix integration tests for worktree addition in git >= 2.6 + * bee78a4e5c Merge pull request `#27573`_ from basepi/salt-ssh.grains.minion_opts.27290 -- **PR** `#27510`_: (*rallytime*) Merge `#27475`_ with test fixes + * 0785438b3f Use the custom yaml serializer for minion_opts for salt-ssh -- **PR** `#27451`_: (*ticosax*) [dockerng] Enforce usage of host_config and require docker-py>=1.4.0 +* **ISSUE** `#27326`_: (`ralphvanetten`_) Signing the X509 CA certificate does not work on Debian 8 (refs: `#27514`_) -- **PR** `#27461`_: (*cachedout*) Only clean context if it exists +* **PR** `#27514`_: (`clinta`_) Recent Versions of OpenSSL don't allow importing incomplete PEMs + @ *2015-09-30 19:33:12 UTC* -- **PR** `#27473`_: (*terminalmage*) salt.utils.gitfs: Don't use close_fds=True on Windows + * a4a53ecff5 Merge pull request `#27514`_ from clinta/2015.8-27326 -- **PR** `#27496`_: (*blueyed*) Fix version reporting of gitpython + * 515e62bfa7 change "None" to empty string -- **PR** `#27502`_: (*ticosax*) Add test to check we don't call inspect_image on absent images. + * 2989f24169 fix 27326 and fix minor errors in docs. -- **PR** `#27497`_: (*blueyed*) dockerng: fix image_present for forced, non-existent image +* **PR** `#27564`_: (`jacobhammons`_) Man pages + @ *2015-09-30 19:29:37 UTC* -- **PR** `#27411`_: (*terminalmage*) Fix invocation of git.config_get and git.config_set + * 6cf0228adc Merge pull request `#27564`_ from jacobhammons/man-pages -- **PR** `#27477`_: (*terminalmage*) Don't append role to hash_cachedir + * cc37dc1087 updated version in salt.7 -- **PR** `#27474`_: (*whiteinge*) Add fake pymongo version attribute for the docs + * a9dcb23a13 regenerated man pages for 2015.8.1 -- **PR** `#27466`_: (*blueyed*) Fix version reporting of python-gnupg and mysql-python +* **ISSUE** `#26629`_: (`efficks`_) Windows minion: Remove powershell dependencies (refs: `#27522`_) -- **PR** `#27465`_: (*ticosax*) Fix usage of dockerng "cmd" was `#27459`_ +* **PR** `#27522`_: (`twangboy`_) Removed dependency on powershell to restart salt-minion + @ *2015-09-30 16:19:29 UTC* -- **PR** `#27417`_: (*whiteinge*) Backport `#25243`_ into 2015.8 + * fd11e0cd95 Merge pull request `#27522`_ from twangboy/fix_26629 -- **PR** `#27423`_: (*dmurphy18*) Changes to support configurable repository for Debian / Ubuntu + * 163c54505d Fixed tests... hopefully -- **PR** `#27428`_: (*rallytime*) Back-port `#27398`_ to 2015.8 + * dc8c01ed07 Fixed some lint -- **PR** `#27429`_: (*rallytime*) Back-port `#27344`_ to 2015.8 + * 2cb0f12696 Removed dependency on powershell to restart salt-minion -- **PR** `#27450`_: (*ticosax*) [dockerng] Fix typo in docstring +* **PR** `#27550`_: (`rallytime`_) [2015.8] Clean up salt-cloud logging and make it more useful + @ *2015-09-30 15:48:53 UTC* -- **PR** `#27430`_: (*jacksontj*) Fix bug introduced in eee0291ff8b65ff1e22f4dc2447a74aa28a3ce7f + * eb76531e96 Merge pull request `#27550`_ from rallytime/cloud-logging -- **PR** `#27418`_: (*terminalmage*) Don't always remove dest path in salt.utils.files.rename() + * 9e0fccd543 Don't commit private-ip changes from testing another bug... -- **PR** `#27383`_: (*twangboy*) Uninstaller only removes specific files and dirs + * 78c85fbb31 Add unit tests for new recursive function -- **PR** `#27416`_: (*rallytime*) Back-port `#27399`_ to 2015.8 + * d9a2dc6bc5 [2015.8] Clean up salt-cloud logging and make it more useful -- **PR** `#27394`_: (*jacksontj*) Remove streamed response for fileclient to avoid HTTP redirection problems +* **ISSUE** `#27281`_: (`lrhazi`_) Wrong path for yum repo in installation-rhel-repo (refs: `#27517`_) -- **PR** `#27415`_: (*ryan-lane*) Backwards compat fixes for pecl module +* **ISSUE** `#27179`_: (`samhamilton`_) Debian Install Instructions Shows Two Different Repos (refs: `#27517`_) -- **PR** `#27407`_: (*meggiebot*) Adding stretch label definition +* **PR** `#27517`_: (`jacobhammons`_) Updated install docs + @ *2015-09-30 15:19:51 UTC* -- **PR** `#27388`_: (*basepi*) [2015.8] Fix global provider overrides + * 1f7ea7c764 Merge pull request `#27517`_ from jacobhammons/install-docs -- **PR** `#27386`_: (*rallytime*) Document tty: True usage in salt-ssh roster file + * 167fd2304e Fixed a duplicated link ID -- **PR** `#27380`_: (*jtand*) Skipping Async tests + * c05fa71f91 Updated install docs Refs `#27281`_ Refs `#27179`_ -- **PR** `#27382`_: (*terminalmage*) Revert "fixes `#27217`_ clear_old_remotes clears wrong directory (gitfs)" +* **PR** `#27526`_: (`eliasp`_) Add missing newlines before param listing to fix doc rendering + @ *2015-09-30 15:19:04 UTC* -- **PR** `#27361`_: (*cro*) Correct some issues with proxy minions + * 2a4c11ae24 Merge pull request `#27526`_ from eliasp/2015.8-modules.slack_notify-doc-params -- **PR** `#27364`_: (*ruzarowski*) SaltCloud[EC2] Fix missing credentials in modify_eni_properties api call + * 204e66943f Add missing newlines before param listing to fix doc rendering -- **PR** `#27349`_: (*jfindlay*) add freebsd install docs to release notes +* **PR** `#27525`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-09-30 03:38:22 UTC* -- **PR** `#27343`_: (*cachedout*) Close io loop before deleting attribute + * e5de9409c2 Merge pull request `#27525`_ from basepi/merge-forward-2015.8 -- **PR** `#27337`_: (*rallytime*) [2015.8] Fixup salt-cloud logging + * 1f3eb1c526 Remove useless mocked unit test -- **PR** `#27332`_: (*terminalmage*) Adjust dockerng/dockerio docstrings + * 73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 -- **PR** `#27353`_: (*cachedout*) Fix case where var not set in config + * 6d773f66c3 Merge pull request `#27516`_ from basepi/merge-forward-2015.5 -- **PR** `#27350`_: (*rallytime*) Allow IP-forwarding in GCE driver + * a08951f0fa Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#27305`_: (*cachedout*) Re-init logging system on Windows when using multiprocessing + * 5262f01325 Merge pull request `#27335`_ from rallytime/cloud-logging-7 -- **PR** `#27331`_: (*terminalmage*) dockerng: Allow both cmd and command to be used to specify command + * adeb1dcad4 Pylint Fix -- **PR** `#27327`_: (*isbm*) Fix a typo in the RPM output + * 588c13783c Salt-cloud logging clean up for windows functions -- **PR** `#27312`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 9b6000135c [2014.7] Fixup salt-cloud logging -- **PR** `#27303`_: (*jacobhammons*) Updated module doc index using https://github.com/saltstack/salt/pull… + * 68d784c3dd Merge pull request `#27472`_ from cachedout/fix_27447 -- **PR** `#27301`_: (*twangboy*) Pass ca_bundle for windows (fixes SSL Error) + * 5e745ad6da Change recommeded schema for data field in mysql event table -- **PR** `#27300`_: (*rallytime*) Back-port `#27287`_ to 2015.8 + * ee6e0ed057 Merge pull request `#27468`_ from cachedout/fix_27351 -- **PR** `#27288`_: (*rallytime*) Filter on 'name', not 'id', when listing images + * 0bc37c0d41 Fix test -- **PR** `#27283`_: (*jtand*) __grains__['osrelease'] returns a string + * f9a19720de fix sysctl truncating newline on os x -- **PR** `#27276`_: (*rallytime*) Back-port `#27218`_ to 2015.8 + * a214c7f84e Merge pull request `#27479`_ from aboe76/fix_locale_suse -- **PR** `#27275`_: (*rallytime*) Back-port `#27213`_ to 2015.8 + * a8f2dad1be fix locale on opensuse and suse `#27438`_ -- **PR** `#27274`_: (*rallytime*) Back-port `#27272`_ to 2015.8 + * 931f593b51 Merge pull request `#27483`_ from rallytime/fix-17103 -- **PR** `#27271`_: (*isbm*) Bugfix: crash on token authentication via API + * 441241eb90 Change sync_outputters to sync_output for consistency, but alias sync_outputters -- **PR** `#27251`_: (*rallytime*) Add support for post_uri in SoftLayer cloud drivers + * 105528720b Outputters should sync to output, not outputters, on the minion. -- **PR** `#27260`_: (*bechtoldt*) add missing module doc references + * 9c2c028953 Merge pull request `#27484`_ from rallytime/bp-27434-and-27470 -- **PR** `#27254`_: (*jfindlay*) 2015.2,2015.8,Beryllium -> 2015.8.0 + * 5de2ee35ab Minor doc fixup. -- **PR** `#27245`_: (*rallytime*) If two ssh keynames are found in DigitalOcean, abort and warn the user. + * af656c7e87 Doc: copy key to server via ssh-copy-id -- **PR** `#27241`_: (*jfindlay*) osrelease is only an integer for fedora + * 927874d316 Merge pull request `#27469`_ from twangboy/fix_27433 -- **PR** `#27234`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * a996ea46e2 Added quotes to version numbers example -- **PR** `#27240`_: (*isbm*) Backport of the fix of 'pkg.info*' for Beryllium + * 382a53403f Merge pull request `#27467`_ from cachedout/lint_27375 -- **PR** `#27223`_: (*pprkut*) Support firewalld per interface zone config on rh7 systems + * 4e54a98f5e Lint `#27375`_ -- **PR** `#27238`_: (*bechtoldt*) salt.modules.disk.percent() throws KeyError when partition doesn't exist + * 278ade52d2 file.managed: check contents_{pillar|grain} result -- **PR** `#27232`_: (*basepi*) [2015.8] Add stub release notes for 2015.8.1 + * ed6207a438 Merge pull request `#27419`_ from rallytime/fix-9856 -- **PR** `#27199`_: (*rallytime*) Avoid RunTimeError (dictionary changed size during iteration) with keys() + * 551396564a Ammend error log to include multiple tips for troubleshooting. -- **PR** `#27206`_: (*rallytime*) Don't repeat GCE setup instructions, and make the use of .json files clearer + * 73fa89edf7 Merge pull request `#27426`_ from rallytime/fix-16753 -- **PR** `#27210`_: (*rallytime*) Refactor some digital ocean functions + * f6cbd81e66 Don't stacktrace if there are conflicting id errors in highstate -- **PR** `#27197`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 5dd1b70475 Merge pull request `#27408`_ from rallytime/fix-27406-for-2015.5 -- **PR** `#27195`_: (*jacobhammons*) Fixed sphinx / latex build warnings and errors + * 39a4ae5a6c Remove hdd: 19 refs from SL docs - no longer available from SoftLayer. -- **PR** `#27182`_: (*bernieke*) fix restart_on_error + * de2f9234d3 Use correct default for bandwith -- **PR** `#27163`_: (*terminalmage*) Workaround upstream tornado bug affecting redirects + * 42d8127f79 Don't set the optional_products default to a boolean, and then try to loop. -- **PR** `#27177`_: (*rallytime*) Remove note - incorrect info + * 9d8a3d8303 Fix avail_locations function for the softlayer_hw driver in 2015.5 -- **PR** `#27173`_: (*rallytime*) Add the ability to specify multiple disks on the SoftLayer driver + * 8f9a3cfbaf Merge pull request `#27410`_ from jacobhammons/doc-updates -- **PR** `#27164`_: (*rallytime*) Make sure changes from `#26824`_ to digital_ocean_v2.py driver make it to digital_ocean.py in 2015.8 + * a9fdecada1 Fix css layout Refs `#27389`_ sample typo fix in linux_acl additional module folders listed in dynamic-modules -- **PR** `#27143`_: (*cachedout*) Clean grains cache on grains sync + * 3746085587 Merge pull request `#27336`_ from rallytime/cloud-logging-five -- **PR** `#27150`_: (*cachedout*) Merge config values from master.d/minion.d conf files + * 7956b36076 [2015.5] Fixup salt-cloud logging -- **PR** `#27137`_: (*jfindlay*) revert serial grain regression + * 5a3be10a3e Merge pull request `#27358`_ from lorengordon/escape-search-replacement-text -- **PR** `#27144`_: (*rallytime*) Don't stacktrace on softlayer_hw.show_all_prices if a code isn't supplied + * 88bb1fbfff Escape search replacement text, fixes `#27356`_ -- **PR** `#27139`_: (*jacobhammons*) Updated key instruction on rhel7 + * 6759f79d6d Merge pull request `#27345`_ from rallytime/docs-for-19236 -- **PR** `#27134`_: (*isbm*) Backport to 2015.8: "pkg.info" + * 1d3925bbfb Added version tag for ex_disk_type option -- **PR** `#27119`_: (*l2ol33rt*) Boto dynamodb module should be using layer 2 abstractions + * f23369300c Allow use of rst header links by separating options out from yaml example -- **PR** `#27092`_: (*perfinion*) salt/master: chdir to root not homedir + * c2efb291e2 Merge pull request `#26903`_ from bersace/fix-defaults-modules -- **PR** `#27131`_: (*jacobhammons*) Install docs + * 474d7afc95 fixup! Review defaults loading -- **PR** `#27124`_: (*jfindlay*) Backport `#27123`_ + * 36141d226e fixup! Review defaults loading -- **PR** `#27111`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 62b6495358 fixup! Review defaults loading -- **PR** `#27122`_: (*terminalmage*) Fix broken link to git-config(1) docs + * cf0624e8b8 fixup! Review defaults loading -- **PR** `#27115`_: (*jacobhammons*) Release docs + * 2c58bab977 fixup! Review defaults loading -- **PR** `#27110`_: (*rallytime*) Make sure -Q output is consistent across salt-cloud drivers + * 82c5b1d8fd Review defaults loading -- **PR** `#27050`_: (*twangboy*) Turned multiprocessing on + * a372466922 Merge pull request `#27317`_ from efficks/fix27316 -- **PR** `#27086`_: (*techhat*) Document development of SPM loader modules + * bf216c101e State unzip should use unzip command instead of unzip_cmd. Issue `#27316`_ -- **PR** `#26941`_: (*msteed*) Make elasticsearch work as master job cache + * bd3771e80f Merge pull request `#27309`_ from rallytime/fix-15514 -- **PR** `#27080`_: (*bechtoldt*) [Proposal] Add Github SPM label for issues + * 9383d91ff8 Change a value list to a comma-separated string in boto_route53.present -- **PR** `#27064`_: (*twangboy*) Fixed user docs + * b5fe944875 Merge pull request `#27311`_ from jfindlay/maxoc -- **PR** `#27072`_: (*rallytime*) Back-port `#26840`_ to 2015.8 + * 8ec2e921bd discuss replacement occurrences in file doc -- **PR** `#27060`_: (*cro*) Fix grains breakage when hosts are not Linux, Windows, or SunOS +* **PR** `#27513`_: (`terminalmage`_) Fix integration tests for worktree addition in git >= 2.6 + @ *2015-09-29 18:39:19 UTC* -- **PR** `#27051`_: (*rallytime*) Back-port `#26953`_ to 2015.8 + * 0e37fb3bd3 Merge pull request `#27513`_ from terminalmage/fix-worktree-tests -- **PR** `#26864`_: (*terminalmage*) Only do git_pillar preflight checks on new-style git_pillar configs + * 519bdd6438 Fix integration tests for worktree addition in git >= 2.6 -- **PR** `#26967`_: (*TheBigBear*) new URL for windows salt downloads +* **PR** `#27510`_: (`rallytime`_) Merge `#27475`_ with test fixes + @ *2015-09-29 18:34:32 UTC* -- **PR** `#26921`_: (*terminalmage*) Get rid of error in legacy git pillar when using branch mapping notation + * **PR** `#27475`_: (`ryan-lane`_) Use __states__ for calls to other boto states (refs: `#27510`_) -- **PR** `#26923`_: (*rallytime*) Code clean up of cloud drivers and files + * e974a3c8aa Merge pull request `#27510`_ from rallytime/ryan-lane-test-fix -- **PR** `#27010`_: (*rallytime*) Back-port `#26988`_ to 2015.8 + * cae2c4e715 Syntax fix -- **PR** `#26985`_: (*rallytime*) Fix versionadded tag + * 458547ba03 Fix test failures for boto __state__ changes + * 5e25454fc1 Followups for using __states__ + + * a01f8ac62c Use __states__ for calls to other boto states + +* **ISSUE** `#27265`_: (`Arabus`_) State: dockerng.running; creation hostconfig replaced with runtime hostconfig when using runtime options (refs: `#27451`_) + +* **PR** `#27451`_: (`ticosax`_) [dockerng] Enforce usage of host_config and require docker-py>=1.4.0 + @ *2015-09-29 15:51:28 UTC* + + * d85b0cbd69 Merge pull request `#27451`_ from ticosax/dockerng-host-config-support + + * b184faa55b Enforce usage of host_config and require docker-py>=1.4.0 + +* **PR** `#27461`_: (`cachedout`_) Only clean context if it exists + @ *2015-09-29 15:49:52 UTC* + + * e8f58a6a3f Merge pull request `#27461`_ from cachedout/clean_context_ioloop + + * 7367a4e32b Only clean context if it exists + +* **ISSUE** `#27220`_: (`TheBigBear`_) [ERROR ] Exception 'close_fds is not supported on Windows platforms if you redirect stdin/stdout/stderr' (refs: `#27473`_) + +* **PR** `#27473`_: (`terminalmage`_) salt.utils.gitfs: Don't use close_fds=True on Windows + @ *2015-09-29 15:34:03 UTC* + + * 25a30a5621 Merge pull request `#27473`_ from terminalmage/issue27220 + + * fa70ef2e31 salt.utils.gitfs: Don't use close_fds=True on Windows + +* **PR** `#27496`_: (`blueyed`_) Fix version reporting of gitpython + @ *2015-09-29 15:31:48 UTC* + + * 3807cd5c4e Merge pull request `#27496`_ from blueyed/fix-gitpython-version + + * d8969363c8 Fix version reporting of gitpython + +* **PR** `#27502`_: (`ticosax`_) Add test to check we don't call inspect_image on absent images. + @ *2015-09-29 15:15:09 UTC* + + * **PR** `#25162`_: (`ticosax`_) [dockerng] Do not call inspect_image if we know the image is not downloaded (refs: `#27502`_) + + * 057fd0729d Merge pull request `#27502`_ from ticosax/backport-test-from-develop + + * fadd9bd43e Add test to check we don't call inspect_image on absent images. + +* **PR** `#27497`_: (`blueyed`_) dockerng: fix image_present for forced, non-existent image + @ *2015-09-29 13:49:46 UTC* + + * f3da6e4bb3 Merge pull request `#27497`_ from blueyed/dockerng-fix-404-private-forced + + * e3c66cea3a dockerng: fix image_present for forced, non-existent image + +* **ISSUE** `#27205`_: (`msummers42`_) In git.config_set state CommandExecutionError occurs when global=True when using salt 2015.8.0 (refs: `#27411`_) + +* **PR** `#27411`_: (`terminalmage`_) Fix invocation of git.config_get and git.config_set + @ *2015-09-28 22:53:01 UTC* + + * 284984e6ba Merge pull request `#27411`_ from terminalmage/issue27205 + + * c3a17ae992 add missing commas + + * f2751ef7c4 Fix shadowed outer-scope attributes + + * 81a6c27010 Fix invocation of git.config_get and git.config_set + +* **ISSUE** `#27217`_: (`nasenbaer13`_) Gitfs cleans up wrong directories (refs: `#27218`_, `#27477`_, `#27276`_, `#27382`_) + +* **PR** `#27477`_: (`terminalmage`_) Don't append role to hash_cachedir + @ *2015-09-28 22:26:34 UTC* + + * cbcb5475b6 Merge pull request `#27477`_ from terminalmage/issue27217 + + * c185e99970 Second attempt to fix `#27217`_ + +* **PR** `#27474`_: (`whiteinge`_) Add fake pymongo version attribute for the docs + @ *2015-09-28 21:49:25 UTC* + + * 2f71833260 Merge pull request `#27474`_ from whiteinge/docs-pymongo-fix + + * 64b54e668a Add fake pymongo version attribute for the docs + +* **PR** `#27466`_: (`blueyed`_) Fix version reporting of python-gnupg and mysql-python + @ *2015-09-28 20:25:01 UTC* + + * 9202f956f3 Merge pull request `#27466`_ from blueyed/fix-gnupg-version + + * 9c1454fe59 Fix version reporting of mysql-python + + * 437fb4407e Fix version reporting of python-gnupg + +* **PR** `#27465`_: (`ticosax`_) Fix usage of dockerng "cmd" was `#27459`_ + @ *2015-09-28 19:27:41 UTC* + + * **PR** `#27459`_: (`terminalmage`_) Fix usage of dockerng "cmd" (refs: `#27465`_) + + * **PR** `#27444`_: (`ticosax`_) docker-py expect only `command` argument not `cmd` (refs: `#27459`_) + + * **PR** `#27331`_: (`terminalmage`_) dockerng: Allow both cmd and command to be used to specify command (refs: `#27459`_, `#27444`_) + + * 6d8e9af297 Merge pull request `#27465`_ from ticosax/fix-dockerng-cmd + + * a1ed6cda56 Skip test if docker-py is not installed + + * 6f7769aa94 Correct log messages/docstrings + + * cc8471bd1b dockerpy expect only `command` argument not `cmd` + +* **ISSUE** `#27409`_: (`pcn`_) 2015.8.0 API (cherrypy) fails to lookup job id via pepper (refs: `#27417`_) + +* **ISSUE** `#25107`_: (`whiteinge`_) Regression in RunnerClient argument handling (refs: `#25243`_) + +* **PR** `#27417`_: (`whiteinge`_) Backport `#25243`_ into 2015.8 + @ *2015-09-28 19:15:53 UTC* + + * **PR** `#25243`_: (`DmitryKuzmenko`_) Runnerclient regression fix (refs: `#27417`_) + + * aefe6d794a Merge pull request `#27417`_ from whiteinge/bp-25243 + + * 53e7a6b7c5 RunnerClient support old style commands with kwargs on top level. + + * 10b522b86c Revert "Fixed GET /jobs/ requests" + +* **PR** `#27423`_: (`dmurphy18`_) Changes to support configurable repository for Debian / Ubuntu + @ *2015-09-28 17:34:22 UTC* + + * a07411a4d9 Merge pull request `#27423`_ from dmurphy18/dgm_envfix + + * 63407fd2a9 Changes to support configurable repository for Debian / Ubuntu + +* **ISSUE** `#26689`_: (`double-yaya`_) Salt - SSH using machine IP to execute commands, without having to write a roster file (refs: `#27398`_) + +* **PR** `#27428`_: (`rallytime`_) Back-port `#27398`_ to 2015.8 + @ *2015-09-28 15:03:16 UTC* + + * **PR** `#27398`_: (`flowhamster`_) Allow cloud roster to use sudo (refs: `#27428`_) + + * d4d96bb3fc Merge pull request `#27428`_ from rallytime/bp-27398 + + * 6969326ae2 doc: added documentation to cloud roster and fixed whitespace + + * b4334649d5 Allow cloud roster to use sudo + +* **PR** `#27429`_: (`rallytime`_) Back-port `#27344`_ to 2015.8 + @ *2015-09-28 15:01:20 UTC* + + * **PR** `#27344`_: (`rhealitycheck`_) Mongo returners patch 1 (refs: `#27429`_) + + * 668c69bd7e Merge pull request `#27429`_ from rallytime/bp-27344 + + * e39a57afe1 Update mongo_return.py + + * f796c9a44b Update mongo_return.py + + * 30d07cbb27 Update mongo_return.py + + * 44ef4b48fb Update mongo_future_return.py + + * 34b160b841 Update mongo_return.py + + * b2b5623da3 Update mongo_future_return.py + + * 07f9a8b95b Update mongo_return.py + + * b7ddc83b4d Update mongo_future_return.py + + * 540b3f2690 Update mongo_return.py + + * 405edd0718 Update mongo_future_return.py + + * 5c753a54ff Update mongo_return.py + + * 06e05befa7 Update mongo_future_return.py + +* **PR** `#27450`_: (`ticosax`_) [dockerng] Fix typo in docstring + @ *2015-09-28 14:27:35 UTC* + + * c639931340 Merge pull request `#27450`_ from ticosax/fix-typo + + * 9cea62de67 Fix typo in docstring + +* **PR** `#27430`_: (`jacksontj`_) Fix bug introduced in eee0291ff8b65ff1e22f4dc2447a74aa28a3ce7f + @ *2015-09-26 01:09:40 UTC* + + * 333c305ba0 Merge pull request `#27430`_ from jacksontj/2015.8 + + * d2aff12f8f Fix bug introduced in eee0291ff8b65ff1e22f4dc2447a74aa28a3ce7f + +* **PR** `#27418`_: (`terminalmage`_) Don't always remove dest path in salt.utils.files.rename() + @ *2015-09-25 23:09:59 UTC* + + * 1f4ca089a2 Merge pull request `#27418`_ from terminalmage/file-rename + + * 7bc0949d48 Don't always remove dest path in salt.utils.files.rename() + +* **ISSUE** `#27032`_: (`lorengordon`_) Windows Installer: Please be more kind to existing configurations (refs: `#27383`_) + +* **PR** `#27383`_: (`twangboy`_) Uninstaller only removes specific files and dirs + @ *2015-09-25 22:47:24 UTC* + + * ec5faf1829 Merge pull request `#27383`_ from twangboy/fix_27032 + + * 63a7305ae9 Uninstaller only removes specific files and dirs + +* **PR** `#27416`_: (`rallytime`_) Back-port `#27399`_ to 2015.8 + @ *2015-09-25 22:39:07 UTC* + + * **PR** `#27399`_: (`multani`_) Various documentation fixes (refs: `#27416`_) + + * 9ab3c6dc5d Merge pull request `#27416`_ from rallytime/bp-27399 + + * 1d848118c9 doc: fixed indentation in salt.renderers.jinja's documentation + + * f5d053a033 doc: fixed indentation in salt.modules.consul's documentation + + * 06beea6b2f doc: fix etcd state documentation typos + + * 97e69ebb97 doc: fix state's top documentation typo + + * b411730d60 doc: fix documentation formatting for state blockdev + + * ce91bb9446 doc: fix formatting in state boto_elb + + * c69229875e doc: fix links in Docker state documentation + + * 15b751d6e2 doc: Docker state use ports and not port_bindings anymore + + * 880b6e0944 doc: fix link to docker-py documentation + + * 33db0c27f8 doc: fix RAET links + + * e69ba2f943 doc: fix rendering of salt.states.hipchat + +* **ISSUE** `#27093`_: (`TheBigBear`_) 2015.8.0 winrepo downloader corrupts some installers (refs: `#27394`_, `#27163`_) + +* **PR** `#27394`_: (`jacksontj`_) Remove streamed response for fileclient to avoid HTTP redirection problems + @ *2015-09-25 21:55:31 UTC* + + * **PR** `#27163`_: (`terminalmage`_) Workaround upstream tornado bug affecting redirects (refs: `#27394`_) + + * 9842d9728b Merge pull request `#27394`_ from jacksontj/2015.8 + + * 01132c305c Re-add files.rename call instead of os.rename + + * acf2d51440 Remove streamed response for fileclient to avoid HTTP redirection problems + + * a6ecf35f25 Revert "Remove unused import" + + * 66c73a3996 Revert "Workaround upstream tornado bug affecting redirects" + +* **PR** `#27415`_: (`ryan-lane`_) Backwards compat fixes for pecl module + @ *2015-09-25 19:40:55 UTC* + + * 44b246bf93 Merge pull request `#27415`_ from lyft/fix-pecl + + * 8be8ef585c Backwards compat fixes for pecl module + +* **PR** `#27407`_: (`meggiebot`_) Adding stretch label definition + @ *2015-09-25 18:10:46 UTC* + + * d76a77c911 Merge pull request `#27407`_ from saltstack/meggiebot-patch-1 + + * 1c779700f6 Adding stretch label definition + +* **ISSUE** `#27209`_: (`justinta`_) Provider overrides appear to be broken (refs: `#27388`_) + +* **PR** `#27388`_: (`basepi`_) [2015.8] Fix global provider overrides + @ *2015-09-25 16:49:03 UTC* + + * db6acfd832 Merge pull request `#27388`_ from basepi/provider.overrides.27209 + + * d87147e14b Don't use ret.items(), forces load of all modules + + * a5ee33a9ad pack __salt__ before loading provider overrides + +* **ISSUE** `#27354`_: (`gravyboat`_) salt-ssh roster docs should note the requiretty option (refs: `#27386`_) + +* **PR** `#27386`_: (`rallytime`_) Document tty: True usage in salt-ssh roster file + @ *2015-09-25 15:44:12 UTC* + + * b72e0b1133 Merge pull request `#27386`_ from rallytime/fix-27354 + + * 08c04da48b Document tty: True usage in salt-ssh roster file + +* **PR** `#27380`_: (`justinta`_) Skipping Async tests + @ *2015-09-25 15:13:04 UTC* + + * 51e765078a Merge pull request `#27380`_ from jtand/async_tests + + * fd0dedeb99 Skipping Async tests + +* **ISSUE** `#27217`_: (`nasenbaer13`_) Gitfs cleans up wrong directories (refs: `#27218`_, `#27477`_, `#27276`_, `#27382`_) + +* **PR** `#27382`_: (`terminalmage`_) Revert "fixes `#27217`_ clear_old_remotes clears wrong directory (gitfs)" + @ *2015-09-24 22:54:23 UTC* + + * 633af56517 Merge pull request `#27382`_ from terminalmage/revert-27218 + + * 2379748f9e Revert "fixes `#27217`_ clear_old_remotes clears wrong directory (gitfs)" + +* **PR** `#27361`_: (`cro`_) Correct some issues with proxy minions + @ *2015-09-24 16:03:38 UTC* + + * 12a021da11 Merge pull request `#27361`_ from cro/pxm_doc + + * 1a2c41c9e3 Add versionadded. + + * 93a6397598 func_alias should be list\_ and should have a corresponding list\_ fn. + + * 0221f7ee4e Pylint + + * 3a297d8036 Add release notes for proxy fixes. + + * 39df44b841 Pylint + + * e3ebff9bce Fix some problems with the rest_sample, remove unnecessary file and make sure that rest_service has the right contents. + + * f4944fe68a Fix typo in docs + +* **PR** `#27364`_: (`ruzarowski`_) SaltCloud[EC2] Fix missing credentials in modify_eni_properties api call + @ *2015-09-24 13:55:39 UTC* + + * cff74510de Merge pull request `#27364`_ from ruzarowski/2015.8-modify-eni-properties-api-call + + * 100eea46d5 Issue `#27121`_ - Remove leftover code comment + + * c58e7a00f3 Issue `#27121`_ - Attempt to fix missing credentials when modifying eni properties + + * 5d292a221e Merge remote-tracking branch 'upstream/2015.8' into 2015.8 + + * 4dbd9ebb30 Merge remote-tracking branch 'upstream/2015.8' into 2015.8 + +* **PR** `#27349`_: (`jfindlay`_) add freebsd install docs to release notes + @ *2015-09-24 13:51:02 UTC* + + * 928ef59a8a Merge pull request `#27349`_ from jfindlay/doc_typos + + * e509cfca17 fix typo in 2015.8.0 pull list + + * 7137e731d3 add FreeBSD documentation to 2015.8.0 notes + +* **ISSUE** `#26889`_: (`UtahDave`_) salt-call w/non root user outputs repeating error (refs: `#27343`_) + +* **PR** `#27343`_: (`cachedout`_) Close io loop before deleting attribute + @ *2015-09-24 13:49:55 UTC* + + * 331230ea4f Merge pull request `#27343`_ from cachedout/issue_26889 + + * 2b648e51af Close io loop before deleting attribute + +* **PR** `#27337`_: (`rallytime`_) [2015.8] Fixup salt-cloud logging + @ *2015-09-24 13:49:17 UTC* + + * cd82ead005 Merge pull request `#27337`_ from rallytime/cloud-logging-eight + + * ed18384108 Merge pull request `#7`_ from jtand/cloud-logging-eight + + * a6c1d0b408 Fixed a bug where logging_command wasnt set as a key in a couple spots + + * 8bb7cb7ff4 Use correct indexes + + * c3483002b0 [2015.8] Fixup salt-cloud logging + +* **PR** `#27332`_: (`terminalmage`_) Adjust dockerng/dockerio docstrings + @ *2015-09-24 13:45:34 UTC* + + * b2f8418ffc Merge pull request `#27332`_ from terminalmage/adjust-dockerng-docstring + + * bdbf4d8e5c Add deprecation notice to dockerio state module + + * 17829ab38d Fix name of dockerng module in dockerio docstring + + * ed5ae75180 Adjust dockerng docstrings + +* **PR** `#27353`_: (`cachedout`_) Fix case where var not set in config + @ *2015-09-23 21:45:32 UTC* + + * ac9e6c2532 Merge pull request `#27353`_ from cachedout/fix_retry_get + + * ea286e1874 Fix case where var not set in config + +* **ISSUE** `#21390`_: (`fyatzeck`_) Having trouble with GCE cloud profile assigning static IP and enabling IP forward (refs: `#27350`_) + +* **PR** `#27350`_: (`rallytime`_) Allow IP-forwarding in GCE driver + @ *2015-09-23 21:36:41 UTC* + + * 3f6b06116f Merge pull request `#27350`_ from rallytime/fix-21390 + + * 2bf566d934 Allow IP-forwarding in GCE driver + + * 484015a7a3 Added version tag for ex_disk_type option + + * a71ebc97b2 Allow use of rst header links by separating options out from yaml example + +* **ISSUE** `#27103`_: (`twangboy`_) Salt-Minion doesn't display logs for new processes with multiprocessing on (refs: `#27305`_) + +* **PR** `#27305`_: (`cachedout`_) Re-init logging system on Windows when using multiprocessing + @ *2015-09-23 15:32:32 UTC* + + * 6f3da863fc Merge pull request `#27305`_ from cachedout/issue_27103 + + * 7a7492d186 Fix typo + + * 22c653482c Re-init logging system on Windows when using multiprocessing + +* **PR** `#27331`_: (`terminalmage`_) dockerng: Allow both cmd and command to be used to specify command (refs: `#27459`_, `#27444`_) + @ *2015-09-23 15:27:43 UTC* + + * 684e33aeb2 Merge pull request `#27331`_ from terminalmage/dockerng-cmd + + * 7d4eaac8ae dockerng: Allow both cmd and command to be used to specify command + +* **PR** `#27327`_: (`isbm`_) Fix a typo in the RPM output + @ *2015-09-23 14:27:42 UTC* + + * a3f4fa1106 Merge pull request `#27327`_ from isbm/isbm-pkg-info-typofix + + * 7912f8c13b Fix typo + +* **PR** `#27312`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-09-22 22:52:14 UTC* + + * a789303d75 Merge pull request `#27312`_ from basepi/merge-forward-2015.8 + + * 647080d064 Add missing import + + * 95e70f0bef Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * ca4597b93a Merge pull request `#27310`_ from basepi/merge-forward-2015.5 + + * 7b75e4aed1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * e90412d3b8 Merge pull request `#27252`_ from jfindlay/version.2014.7 + + * 3d28307a00 2014.7 -> 2014.7.0 + + * 982c21c79f Merge pull request `#27308`_ from terminalmage/fix-refresh_db-regression + + * 77686fb7ce Fix refresh_db regression in yumpkg.py + + * 775a4f9ad0 Merge pull request `#27286`_ from terminalmage/return_retry_timer + + * 540a7dfcf1 Add default values for new minion config options + + * 453b883820 Add a configurable timer for minion return retries + + * 02482c0572 Merge pull request `#27278`_ from rallytime/bp-27256 + + * 1beddf6311 Fix error handling in salt.modules.file.statvfs + + * e36c019c37 Merge pull request `#27277`_ from rallytime/bp-27230 + + * 3ce77db1bc Fix typo in AWS doc config + + * b22286476e Merge pull request `#27253`_ from jfindlay/version.2015.5 + + * 967e3bb72a 2015.5 -> 2015.5.0 + + * 51a0193b54 Merge pull request `#27244`_ from garethgreenaway/ec2_create_snapshot_no_return_data_exception + + * 820fd576b9 Fixing the cause when the r_data from aws.query is empty and an exception happens when looking for the snapshotID + + * 26540f15bc Merge pull request `#27231`_ from jfindlay/cronchange + + * 1e335297e2 only write cron file if it is changed + +* **PR** `#27303`_: (`jacobhammons`_) Updated module doc index using https://github.com/saltstack/salt/pull… + @ *2015-09-22 19:29:04 UTC* + + * c3b690273b Merge pull request `#27303`_ from jacobhammons/ref-updates + + * 7ac98a03b6 Updated module doc index using https://github.com/saltstack/salt/pull/27203 + +* **ISSUE** `#27081`_: (`TheBigBear`_) winrepo - SSLError: [Errno 1] _ssl.c:510: error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (refs: `#27301`_) + +* **PR** `#27301`_: (`twangboy`_) Pass ca_bundle for windows (fixes SSL Error) + @ *2015-09-22 19:00:45 UTC* + + * aaa2db9943 Merge pull request `#27301`_ from twangboy/fix_27081 + + * 5c4f5f8944 Changed windows gate to check for verify_ssl option + + * e2fe5a60b5 Pass ca_bundle for windows (fixes SSL Error) + +* **PR** `#27300`_: (`rallytime`_) Back-port `#27287`_ to 2015.8 + @ *2015-09-22 16:59:07 UTC* + + * **PR** `#27287`_: (`rhealitycheck`_) Mongo returners patch 1 (refs: `#27300`_) + + * 55f4050146 Merge pull request `#27300`_ from rallytime/bp-27287 + + * e49a6dc449 Update mongo_return.py + + * 63153322b9 Update mongo_future_return.py + +* **PR** `#27288`_: (`rallytime`_) Filter on 'name', not 'id', when listing images + @ *2015-09-21 22:37:26 UTC* + + * d96462af48 Merge pull request `#27288`_ from rallytime/do-cleanup + + * 6e16fad760 Use name in all places, not id. + + * 9b34542cb0 Filter on 'name', not 'id', when listing images + +* **PR** `#27283`_: (`justinta`_) __grains__['osrelease'] returns a string + @ *2015-09-21 19:18:44 UTC* + + * 688f24e9e4 Merge pull request `#27283`_ from jtand/yumpkg_yum_fix + + * b73f5289b4 __grains__['osrelease'] returns a string. Cast to int for correct comparison + +* **ISSUE** `#27217`_: (`nasenbaer13`_) Gitfs cleans up wrong directories (refs: `#27218`_, `#27477`_, `#27276`_, `#27382`_) + +* **PR** `#27276`_: (`rallytime`_) Back-port `#27218`_ to 2015.8 + @ *2015-09-21 19:05:54 UTC* + + * **PR** `#27218`_: (`nasenbaer13`_) fixes `#27217`_ clear_old_remotes clears wrong directory (gitfs) (refs: `#27276`_) + + * 78d44a5c74 Merge pull request `#27276`_ from rallytime/bp-27218 + + * 8c0991d527 fixes `#27217`_ clear_old_remotes clears wrong directory (gitfs) + +* **PR** `#27275`_: (`rallytime`_) Back-port `#27213`_ to 2015.8 + @ *2015-09-21 19:05:18 UTC* + + * **PR** `#27213`_: (`macgyver13`_) Make get_event compatible with salt/client (refs: `#27275`_) + + * d5ce81e8e7 Merge pull request `#27275`_ from rallytime/bp-27213 + + * 5d4c90c479 Make get_event compatible with salt/client + +* **PR** `#27274`_: (`rallytime`_) Back-port `#27272`_ to 2015.8 + @ *2015-09-21 18:54:48 UTC* + + * **PR** `#27272`_: (`techhat`_) Make sure list_nodes_full contains a name attribute (refs: `#27274`_) + + * 2be21d6451 Merge pull request `#27274`_ from rallytime/bp-27272 + + * f3ea3259a5 Make sure list_nodes_full contains a name attribute + +* **PR** `#27271`_: (`isbm`_) Bugfix: crash on token authentication via API + @ *2015-09-21 15:53:09 UTC* + + * c0943dd4d1 Merge pull request `#27271`_ from isbm/isbm-bufix-27270 + + * fc524c17b9 Reduce the criteria that would match empty iterables as well as None or False values + + * 3152af78b5 Fix the crash on token auth via API (http://git.io/vn4tx) + +* **ISSUE** `#19947`_: (`gczuczy`_) Unable to supply provisioning script to softlayer create() (refs: `#27251`_) + +* **PR** `#27251`_: (`rallytime`_) Add support for post_uri in SoftLayer cloud drivers + @ *2015-09-21 15:43:16 UTC* + + * b11ce6ac2a Merge pull request `#27251`_ from rallytime/fix-19947 + + * aafb776808 Add support for post_uri in SoftLayer cloud drivers + +* **ISSUE** `#21879`_: (`bechtoldt`_) Reference pages in documentation are outdated again (refs: `#27260`_, `#25019`_, `#21880`_) + +* **ISSUE** `#19262`_: (`bechtoldt`_) salt.pillar.file_tree doesn't appear in the documentation (refs: `#27260`_, `#25019`_) + +* **PR** `#27260`_: (`bechtoldt`_) add missing module doc references + @ *2015-09-21 05:48:38 UTC* + + * **PR** `#25019`_: (`bechtoldt`_) add missing module documentation to references (refs: `#27260`_) + + * **PR** `#24421`_: (`bechtoldt`_) add missing module documentation (refs: `#27260`_, `#25019`_) + + * **PR** `#21880`_: (`bechtoldt`_) update references, fixes `#21879`_ (refs: `#27260`_, `#25019`_) + + * **PR** `#20039`_: (`bechtoldt`_) completing some doc references (refs: `#27260`_, `#25019`_) + + * de6e5abe6c Merge pull request `#27260`_ from bechtoldt/missing_refs + + * 3a7d31a91c add missing module references + +* **PR** `#27254`_: (`jfindlay`_) 2015.2,2015.8,Beryllium -> 2015.8.0 + @ *2015-09-18 23:44:46 UTC* + + * 1a32b9f778 Merge pull request `#27254`_ from jfindlay/version.2015.8 + + * 8ea15f498e 2015.2,2015.8,Beryllium -> 2015.8.0 + +* **ISSUE** `#25079`_: (`jondonas`_) Salt-cloud does not check for duplicate ssh keys when using provider such as DigitalOcean (refs: `#27245`_) + +* **PR** `#27245`_: (`rallytime`_) If two ssh keynames are found in DigitalOcean, abort and warn the user. + @ *2015-09-18 21:42:36 UTC* + + * f3a847823b Merge pull request `#27245`_ from rallytime/fix-25079 + + * 4b0f7cce1d If two ssh keynames are found in DigitalOcean, abort. + +* **ISSUE** `#27065`_: (`lorengordon`_) 2015.8.0: yumpkg reporting "Unexpected osrelease grain '6.7'" (refs: `#27241`_) + +* **PR** `#27241`_: (`jfindlay`_) osrelease is only an integer for fedora + @ *2015-09-18 21:40:50 UTC* + + * e4a5b004ae Merge pull request `#27241`_ from jfindlay/yumwarn + + * 1f7570250f osrelease is only an integer for fedora + +* **PR** `#27234`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-09-18 20:41:38 UTC* + + * f8e71f6d7d Merge pull request `#27234`_ from basepi/merge-forward-2015.8 + + * be2b0fc497 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * 579f375f74 Merge pull request `#27233`_ from basepi/release.notes.stubs + + * f4563ea9b7 Add stub release notes for 2015.5.6 + + * f5a322e3f2 Merge pull request `#27208`_ from basepi/nop.state.25423 + + * 9414b05b2c Add test.nop example + + * a84ce67b8f Add test.nop state + + * 59a07cae68 Merge pull request `#27201`_ from jfindlay/sshhash + + * 1b620b77cd rename hash_host arg to hash_known_hosts + + * 12f14ae37c update hash_known_hosts docs in ssh module + + * 560545c4c5 Merge pull request `#27214`_ from jacksontj/2015.5 + + * e7526bdb44 Correctly support https, port 443 is not a requirement + + * 7a34c7742d Merge pull request `#27172`_ from rallytime/bp-27150 + + * 0d7ee4b209 Merge config values from master.d/minion.d conf files + +* **PR** `#27240`_: (`isbm`_) Backport of the fix of 'pkg.info*' for Beryllium + @ *2015-09-18 20:02:15 UTC* + + * 2d6c75cbd7 Merge pull request `#27240`_ from isbm/isbm-pkg.info-tz-bugfix-backport-2015.8 + + * 19a361851a Return install date only if possible. + + * ff857bc8aa Return RPM package time in UTC timezone + + * eaa0f370bf Remove time fraction and return ISO in UTC + + * ce9570fce6 Return UTC timestamp for modification of path. + +* **ISSUE** `#27222`_: (`pprkut`_) Support firewalld zone configuration in network.managed state for rh7 systems (refs: `#27223`_) + +* **PR** `#27223`_: (`pprkut`_) Support firewalld per interface zone config on rh7 systems + @ *2015-09-18 19:44:45 UTC* + + * 80a45b74ed Merge pull request `#27223`_ from M2Mobi/zone + + * 48023669e7 Support permanent per interface firewalld zone configuration on rh7 systems. + + * **PR** `#27239`_: (`bechtoldt`_) test `#27238`_ prevent keyerror when partition doesn't exist (refs: `#27238`_) + +* **PR** `#27238`_: (`bechtoldt`_) salt.modules.disk.percent() throws KeyError when partition doesn't exist (refs: `#27239`_) + @ *2015-09-18 19:37:00 UTC* + + * 652b2998af Merge pull request `#27238`_ from bechtoldt/fix_disk_percent_keyerror + + * 0511f611bb prevent KeyError by checking whether partition even exists + +* **PR** `#27232`_: (`basepi`_) [2015.8] Add stub release notes for 2015.8.1 + @ *2015-09-18 16:53:01 UTC* + + * 253ac5e0c3 Merge pull request `#27232`_ from basepi/release.notes.stubs + + * 25410706ee Add stub release notes for 2015.8.1 + +* **ISSUE** `#24573`_: (`bailsman`_) cloud.profile RuntimeError: dictionary changed size during iteration (refs: `#27199`_) + +* **PR** `#27199`_: (`rallytime`_) Avoid RunTimeError (dictionary changed size during iteration) with keys() + @ *2015-09-18 15:44:27 UTC* + + * c542cd49d0 Merge pull request `#27199`_ from rallytime/fix-24573 + + * 6b2a00e947 Avoid RunTimeError (dictionary changed size during iteration) with keys() + +* **PR** `#27206`_: (`rallytime`_) Don't repeat GCE setup instructions, and make the use of .json files clearer + @ *2015-09-18 14:38:40 UTC* + + * 6b79ad69a9 Merge pull request `#27206`_ from rallytime/gce-doc-cleanup + + * cced6e9031 Don't repeat GCE setup instructions, and make the use of .json files clearer + +* **PR** `#27210`_: (`rallytime`_) Refactor some digital ocean functions + @ *2015-09-18 14:38:01 UTC* + + * 1d022eb5de Merge pull request `#27210`_ from rallytime/do-clean-up + + * 808a5b3b81 Make sure we set the full data to the ret variable + + * 9b635004e2 Refactor some digital_ocean functions to help simplify the driver + +* **PR** `#27197`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-09-17 19:53:22 UTC* + + * 8c204a45ab Merge pull request `#27197`_ from basepi/merge-forward-2015.8 + + * 2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * e956d88f5f Merge pull request `#27194`_ from rallytime/bp-27180 + + * 327d343fef file copy ret result True if no change in test mode + + * a02d043309 Merge pull request `#27176`_ from basepi/merge-forward-2015.5 + + * 66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * c186e51764 Merge pull request `#27117`_ from jacobhammons/release-docs-2014.7 + + * b69e11e0a4 made 2014.7 an archived release minor doc site updates + + * 69d758ee2b Merge pull request `#27114`_ from cachedout/warn_on_insecure_log + + * 507fb04683 Issue warning that some log levels may contain sensitive data + + * aa71bae8aa Merge pull request `#27075`_ from twangboy/fix_password_2014.7 + + * c0689e3215 Replaced password with redacted when displayed + + * de2027426e Merge pull request `#27170`_ from rallytime/gce-docs + + * a07db909bd Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples + + * 28cfdfd067 Merge pull request `#27167`_ from rallytime/bp-27148 + + * d12be52355 Pass filepointers to the serialize load functions. + + * 4495f4f4d0 Merge pull request `#27168`_ from techhat/gateimpacket + + * cc448bfdc1 Add further gating of impacket library + + * 3e5ef0dc30 Merge pull request `#27166`_ from rallytime/fix-27100 + + * 50fb3a489a Allow a full-query for EC2, even if there are no profiles defined + + * f1c9de7ed9 Merge pull request `#27162`_ from rallytime/softlayer-service + + * d281068c70 Be explicit in using "SoftLayer" for service queries in SoftLayer drivers + + * 59e9dfd8de Merge pull request `#27149`_ from twangboy/fix_27133 + + * 7992b7e20a Fixed some tests... hopefully... + + * d4c8e30f5d Fixed problem with add/remove path + + * 097fcd1017 Merge pull request `#27147`_ from rallytime/fix-11669 + + * 55312ea03f Provide a more friendly error message. + + * 36555856c7 Enforce bounds in the GCE Regex + + * f5c3f157dd Merge pull request `#27128`_ from eguven/2015.5-fix-test-diff + + * ec2d68a84a don't show diff for test run if show_diff=False + + * 088b1dbb3e Merge pull request `#27116`_ from jacobhammons/release-docs-2015.5 + + * 6e323b6dd3 Update latest to 2015.8, 2015.5 is now previous Assorted style and minor updates + + * 440855b182 Merge pull request `#27033`_ from jfindlay/n0ne + + * 3334b9d548 fix comment and unit test for reg state + + * 391a09d5ac update reg state unit tests + + * ebbf2b05ca Fixed reg state module for None, 0, and '' values + + * 35fc74132a Merge pull request `#26942`_ from Arabus/fix-docker.run + + * e61e1de1f5 Fixes value typo for dockerio.loaded state + + * 39fa11b696 further linting + + * 4aec37397c Further Linting to quiet the linter + + * 7eff8ad070 Code Linting and cmd call fix + + * a51676e0eb Fixes `#17088`_ olyif and unless should run on the host + + * d0c6128b8f Fixes `#17088`_ retcode now returns True or False based on return status + + * 8b2e7cc4f5 Syntax clarification + +* **PR** `#27195`_: (`jacobhammons`_) Fixed sphinx / latex build warnings and errors + @ *2015-09-17 17:28:37 UTC* + + * 430c48c5ea Merge pull request `#27195`_ from jacobhammons/doc-build + + * fad87e34a2 Fixed lint errors + + * e56f02b025 re-add cheatsheet do-over + + * 60a8330561 re-added cheatsheet.tex + + * f7a9e25d52 Fixed sphinx / latex build warnings and errors Added missing modules to contents + +* **PR** `#27182`_: (`bernieke`_) fix restart_on_error + @ *2015-09-17 17:24:01 UTC* + + * 8f8e75c5ff Merge pull request `#27182`_ from Awingu/2015.8 + + * 693b81f7e4 fix restart_on_error `#27127`_ + +* **ISSUE** `#27093`_: (`TheBigBear`_) 2015.8.0 winrepo downloader corrupts some installers (refs: `#27394`_, `#27163`_) + +* **PR** `#27163`_: (`terminalmage`_) Workaround upstream tornado bug affecting redirects (refs: `#27394`_) + @ *2015-09-17 16:09:01 UTC* + + * 97d2a5fddc Merge pull request `#27163`_ from terminalmage/issue27093 + + * 80b396db73 Handle potential ValueError when checking content length + + * a89c987943 Remove unused import + + * 469e18f74c Workaround upstream tornado bug affecting redirects + + * f2a562ac60 Add salt.utils.files.rename() for cross-platform renaming + +* **ISSUE** `#19954`_: (`gczuczy`_) Multiple disks on softlayer (refs: `#27173`_) + +* **PR** `#27177`_: (`rallytime`_) Remove note - incorrect info + @ *2015-09-17 01:34:04 UTC* + + * **PR** `#27173`_: (`rallytime`_) Add the ability to specify multiple disks on the SoftLayer driver (refs: `#27177`_) + + * 65c59ec2ea Merge pull request `#27177`_ from rallytime/fix-19954 + + * 531b44243d Remove note - incorrect info + +* **ISSUE** `#19954`_: (`gczuczy`_) Multiple disks on softlayer (refs: `#27173`_) + +* **PR** `#27173`_: (`rallytime`_) Add the ability to specify multiple disks on the SoftLayer driver (refs: `#27177`_) + @ *2015-09-17 00:32:57 UTC* + + * cbb7e7f1a5 Merge pull request `#27173`_ from rallytime/fix-19954 + + * 45c6aabde9 DeviceID '1' is reserved for the SWAP disk; let's skip it. + + * 54e104cf5b Don't stacktrace if local_disk isn't set + + * fe74d203f5 Add the ability to specify multiple disks on the SoftLayer driver + +* **ISSUE** `#22724`_: (`ty2u`_) digital_ocean_v2.py doesn't restore snapshot (refs: `#26824`_) + +* **PR** `#27164`_: (`rallytime`_) Make sure changes from `#26824`_ to digital_ocean_v2.py driver make it to digital_ocean.py in 2015.8 + @ *2015-09-16 18:55:17 UTC* + + * **PR** `#26824`_: (`systembell`_) [salt-cloud] Fix creating droplet from snapshot in digital_ocean provider (refs: `#27164`_) + + * 0e04588d58 Merge pull request `#27164`_ from rallytime/add-26824-changes-to-2015.8 + + * a44bd763dd Make sure changes from `#26824`_ to digital_ocean_v2.py driver make it to digital_ocean.py in 2015.8 + +* **ISSUE** `#19853`_: (`ksalman`_) master needs a way to invalidate grains on the minion (refs: `#27143`_) + +* **PR** `#27143`_: (`cachedout`_) Clean grains cache on grains sync + @ *2015-09-16 16:27:06 UTC* + + * 38d93a96fe Merge pull request `#27143`_ from cachedout/clean_grains_cache_on_sync + + * 0a660a9f80 Break apart long line + + * 6de2c2a50c Better error checking + + * 252f7c7ea9 Clean grains cache on grains sync + +* **ISSUE** `#18582`_: (`mainframe`_) Allow merging file_roots and pillar_roots from different config files included from master.d (refs: `#27150`_) + +* **PR** `#27150`_: (`cachedout`_) Merge config values from master.d/minion.d conf files (refs: `#27172`_) + @ *2015-09-16 15:36:41 UTC* + + * 626cbe61ce Merge pull request `#27150`_ from cachedout/issue_18582 + + * 6351a94d08 Merge config values from master.d/minion.d conf files + +* **ISSUE** `#27135`_: (`SEJeff`_) Regression in core grains in the latest version of salt (refs: `#27137`_) + +* **PR** `#27137`_: (`jfindlay`_) revert serial grain regression + @ *2015-09-15 21:52:25 UTC* + + * **PR** `#22267`_: (`The-Loeki`_) modify _hw core grains to use the new smbios module, add system uuid (refs: `#27137`_) + + * 72fad569b0 Merge pull request `#27137`_ from jfindlay/serial + + * 78c9687f0e revert serial grain regression + +* **PR** `#27144`_: (`rallytime`_) Don't stacktrace on softlayer_hw.show_all_prices if a code isn't supplied + @ *2015-09-15 21:52:09 UTC* + + * 58b56b9d78 Merge pull request `#27144`_ from rallytime/softlayer-fixes + + * 3963a5cf0f Don't stacktrace on softlayer_hw.show_all_prices if a code isn't supplied + +* **PR** `#27139`_: (`jacobhammons`_) Updated key instruction on rhel7 + @ *2015-09-15 16:06:14 UTC* + + * b71de75c1c Merge pull request `#27139`_ from jacobhammons/rhel-doc + + * 7ed9f6260f Updated key instruction on rhel7 + +* **PR** `#27134`_: (`isbm`_) Backport to 2015.8: "pkg.info" + @ *2015-09-15 15:57:46 UTC* + + * 0d8248930e Merge pull request `#27134`_ from isbm/isbm-pkg.info-backport-2015.8 + + * b60e6a37a7 Lintfix: E7801, C0321 + + * cb4706c7e8 Add license extraction for Dpkg. + + * 38753fe8b2 Enhance filter for the "technical" fields that are not generally needed as a package information for the CMDB + + * ffe8f14dae Implement additional package information merger + + * 2aafc469d0 Fix the size and installed-size keys + + * 3fc389435b Add homepage translator key + + * 25040c9c71 Docfix + + * 911bae1baf Add alias for 'info' of deprecation in v. Boron + + * 306958dad0 Fix renamed method + + * 6ba269fbc6 Remove 'N/A' when no data. + + * 137eb75ca2 Rename existing 'info' to 'info_available' + + * 7b376fd5c3 Implement compatible 'info_installed'. Returned keys are common to other systems with other package managers + + * ca7d0d5025 Implement compatible 'info_installed'. Returned keys are common to other systems with other package managers + + * c1faebf0b5 Implement compatible 'info_installed'. Returned keys are common to other systems with other package managers + + * f14f4036df Lint: regexp as a string + + * cabe863b81 Implement package info function + + * 0668f1da53 Implement getting package installation time + + * e03716e5b5 Implement getting general packages information + + * 8737d690fe Extract package description + + * a283d53737 Lintfix the regexp string + + * fc9c959678 Convert time to ISO 8601 + + * 9fb9296276 Return a detailed information about package(s) + +* **PR** `#27119`_: (`l2ol33rt`_) Boto dynamodb module should be using layer 2 abstractions + @ *2015-09-15 14:09:57 UTC* + + * 7f512852ef Merge pull request `#27119`_ from l2ol33rt/boto_dynamo_module_fix + + * 46c7aee367 Boto dynamodb util should be using layer 2 abstractions + +* **PR** `#27092`_: (`perfinion`_) salt/master: chdir to root not homedir + @ *2015-09-15 14:09:24 UTC* + + * 100e340111 Merge pull request `#27092`_ from perfinion/chdir-fix-2015.8 + + * 284d268855 salt/master: chdir to root not homedir + +* **PR** `#27131`_: (`jacobhammons`_) Install docs + @ *2015-09-15 12:34:38 UTC* + + * 7483556b5f Merge pull request `#27131`_ from jacobhammons/install-docs + + * d1e8af9be6 added command to remove key from rhel6 + + * 69d64f177d moved rhel5 commands to separate lines + + * 90431278ea Install instruction updates for rhel6 and debian + +* **PR** `#27124`_: (`jfindlay`_) Backport `#27123`_ + @ *2015-09-15 08:37:43 UTC* + + * **PR** `#27123`_: (`cedwards`_) update for freebsd installation documentation (refs: `#27124`_) + + * fc8afcc9f9 Merge pull request `#27124`_ from jfindlay/bp-27123 + + * 016fb5fafe Update freebsd.rst + + * 026fc9a884 update for freebsd installation documentation + +* **PR** `#27111`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-09-15 07:29:30 UTC* + + * 0d62d3470c Merge pull request `#27111`_ from basepi/merge-forward-2015.8 + + * ab519fb5ff Remove heavily-mocked unit tests + + * 274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * 59f2a0c7ae Merge pull request `#26977`_ from abh/2015.5-ntppeer + + * df3d6e817f Add support for PEERNTP network interface configuration on RH derived systems + + * e05b1f3951 Merge pull request `#27023`_ from jfindlay/htwebutilpass + + * 9f3d7890a6 add test support for htpasswd state mod + + * 9f999c0027 Merge pull request `#27074`_ from twangboy/fix_password_2015.5 + + * fdd3537456 Replaced password with redacted when displayed + + * 46b44f85ed Merge pull request `#27073`_ from rallytime/remove-lxc-warning + + * 76c056d02b Remove "use develop branch" warning from LXC tutorial now that 2015.5.0 has been released + + * caab21d99c Merge pull request `#27054`_ from rallytime/bp-27029 + + * 0be393be22 Removed check for no package name + + * 0227e1cb57 Merge pull request `#27053`_ from rallytime/bp-26992 + + * 83798aff3c Do not use full return for documentation. + + * d9d5bbaa68 Summary requires full return information. + + * b72a0ef86d Merge pull request `#27052`_ from rallytime/bp-26930 + + * d9787aa318 aptpkg.mod_repo: Raise when key_url doesn't exist + + * 8b554dd16f Merge pull request `#27049`_ from johanek/repoquery-dedupe + + * c113916a23 When running repoquery to check for available versions of packages, run once for all packages rather than once per package + + * cc2cbf9869 Merge pull request `#27070`_ from stanislavb/2015.5 + + * 1e6e5ddc9c Deprecate salt.utils.iam in Carbon + + * e23caa8ccf Merge pull request `#27030`_ from jfindlay/winreg + + * 120fbe78e0 remove trailing line in win_path exec module + + * b36a7107b2 update win_path exec module unit tests + + * a2dc6f2dd7 Fixes win_path module, migrates from reg.(set|get)_key to reg.(set|get)_value + + * 843c28b435 Merge pull request `#27025`_ from cachedout/issue_25581 + + * ecc09d9b93 Lint + + * bfcaab9ef4 Better try and error handling for prep_jid + + * b9baa0b39a Merge pull request `#27035`_ from terminalmage/useradd-contextmanager + + * e430e97f6c Update user states to reflect changes to login class handling + + * f24b979c7c useradd.py: Use contextmanager to prevent leaked filehandles + + * 1cdfdf7a92 Merge pull request `#27034`_ from rallytime/softlayer-doc-fix + + * cb641f8145 Update softlayer docs for where to find apikey + + * 9e06d3f01a Merge pull request `#27024`_ from rallytime/bp-27004 + + * 54d6fcf4c7 Fix 'dict' object has no attribute split + + * bb29d73c71 Fix 'dict' object has no attribute split + + * 5f1a9c46aa Fix 'dict' object has no attribute split + + * 2bfdd9724e Fix 'dict' object has no attribute split + + * 9ab2cae1e4 Merge pull request `#27027`_ from rallytime/bp-27013 + + * 19a6e9cb1c Remove unwanted debug statement. + + * 2c8beb238f Merge pull request `#27026`_ from rallytime/bp-27011 + + * f8518d545f Move giant eventlisten.sh example out of the state.event docstring + + * e8cdcc62f7 Merge pull request `#26972`_ from twangboy/fix_20522 + + * 0110786fa9 Catch the 404 error from fileclient + + * fbc95f4685 Merge pull request `#26951`_ from terminalmage/fix-timezone + + * 30a4915762 Update tests to reflect changes to timezone module + + * b6f926919f Fix timezone module for CentOS + + * f2ad3c333c Merge pull request `#26875`_ from marccardinal/patch-2 + + * 36d5a62262 LXC gateway provisioned only when IP is provided + + * 7b2e7b1b37 Merge pull request `#26997`_ from twangboy/fix_symlink_windows + + * 89cc02d4e0 Added `versionadded` + + * 835177b0c8 Fixed symlinks for windows (don't use user root) + + * 5389a85894 Merge pull request `#27001`_ from twangboy/fix_reg_docs + + * 2980bbda17 Minor clarification + + * 4684b2ddd1 Added CLI example for reg.delete_key_recursive + + * 37814f5dff Merge pull request `#26996`_ from jacobhammons/beacon-doc + + * e475ea688e Fixed typo + + * 2401533d9e New content added to beacon docs. + + * 4ba7eed711 Merge pull request `#26868`_ from joejulian/2015.5_lvm_vg_symlink_fix + + * 3dfb33849a Use the actual device name when checking vgdisplay + + * 1537e945be Merge pull request `#26955`_ from dsumsky/s3-pillar-module-cache-fix-2015.5 + + * 8219acffe7 - fixed pylint warnings + + * a3b10e8ab1 - fixed broken caching in S3 ext_pillar module (file_md5 was a list) - added debugging messages - static parameters are available as module parameters now + + * 3e902e86b1 Merge pull request `#26987`_ from rallytime/bp-26966 + + * 6a29eac003 URL has changed + + * eddb532713 Merge pull request `#26915`_ from rallytime/joyent-tests + + * d4ad42d697 Update Joyent Cloud Tests + + * f86814b2a4 Merge pull request `#26971`_ from rallytime/reactor-doc-fix + + * 0214daad19 Fix a couple of typos in reactor docs + + * 57b1080f94 Merge pull request `#26976`_ from saltstack/revert-26899-fix_26730 + + * 6dd54e6bec Revert "file.symlink gets windows account instead of root" + + * 67be01f5fe Merge pull request `#26975`_ from whiteinge/rest_cherrypy-integration + + * 9a0989585b Add additional 'groups' check to rest_cherrypy if groups are not used + + * d68aefcfde Remove mocks from rest_cherrypy integration tests + + * 2aa3da8911 Rename the rest_cherrypy tests to conform to our convention + + * 20a48f7f2e Merge pull request `#26899`_ from twangboy/fix_26730 + + * 9d9b3bb47a file.symlink gets windows account instead of root + + * dbc6b862f4 Merge pull request `#26960`_ from rallytime/cherrypy-docs + + * c1420711db Fix bash code block formatting + + * f733e048c9 Merge pull request `#26940`_ from rallytime/api-doc-fix + + * 00fe6a225c Fix minor doc typo in client api + + * de9350466e Merge pull request `#26871`_ from rallytime/bp-26852 + + * 5a4c8dd2f5 Only reference msgpack if it imported successfully + + * a563af29d3 Merge pull request `#26851`_ from jacobhammons/doc-bugs + + * ac3bd47440 states/pkgrepo examples, suse installation updates Refs `#26644`_ Refs `#26638`_ + + * 5b1b934192 Merge pull request `#26817`_ from jfindlay/grouparg + + * 82d33939f3 modify groupadd for rhel 5 + + * cdc0ea2fe3 Merge pull request `#26824`_ from pravka/fix-droplet-creation-from-snapshot-in-dov2 + + * 00e3192536 removing log + + * e4a82d78d9 removing stringification of every value in the image dict + + * cdc2b4584a fixing condition for slug check + + * 4af6951a4c Merge pull request `#26823`_ from joejulian/ctlfix + + * a9928cb143 pep8 fixes + + * 6108ec4280 Gated dbus for os families that use it + + * e154c7b16f remove trailing spaces + + * c1c1266cc3 fix indent change + + * 0a35320aa7 Use dbus directly + + * a1749b76b8 Merge pull request `#26820`_ from jfindlay/ctlfix + + * 3a2c0d5fbb add default param in _parse_localectl in locale mod + + * ff733547c4 Merge pull request `#26821`_ from twangboy/fix_26788 + + * cf979e4877 Fixed user.rename function in windows + + * c892be3255 Merge pull request `#26803`_ from twangboy/fix_26754 + + * 23576c65eb Added check for PyMySQL if MySQLdb import fails + + * 6edfa36083 Merge pull request `#26815`_ from jfindlay/linstr + + * 2ff5823944 stringify linode id before performing str actions + +* **PR** `#27122`_: (`terminalmage`_) Fix broken link to git-config(1) docs + @ *2015-09-15 07:25:05 UTC* + + * 886e7bc234 Merge pull request `#27122`_ from terminalmage/fix-broken-link + + * 0b212ea5b3 Fix broken link to git-config(1) docs + +* **PR** `#27115`_: (`jacobhammons`_) Release docs + @ *2015-09-14 22:19:18 UTC* + + * 551bbe70af Merge pull request `#27115`_ from jacobhammons/release-docs + + * 42eaa80997 Restored missing css + + * 9ab642295e Fixed a release notes typo and bad file rename + + * daa3f4eee0 Updated release notes, change 2015.8 to latest release for doc site + + * d939a38c8c release notes updates + +* **ISSUE** `#11993`_: (`UtahDave`_) salt-cloud -Q output not consistent across providers (refs: `#27110`_) + +* **PR** `#27110`_: (`rallytime`_) Make sure -Q output is consistent across salt-cloud drivers + @ *2015-09-14 21:48:40 UTC* + + * 89c90df909 Merge pull request `#27110`_ from rallytime/fix-11993 + + * c1abc5a19f Remove implied Nones + + * 5d7d357cdd digital_ocean list_nodes function should list public and private ips like other drivers + + * 4b27aef406 Add 'name' to the output of salt-cloud -Q commands, where needed, for consistency. + +* **PR** `#27050`_: (`twangboy`_) Turned multiprocessing on + @ *2015-09-14 17:34:18 UTC* + + * 860de8d877 Merge pull request `#27050`_ from twangboy/fix_minion_conf + + * 7e35b13022 Turned multiprocessing on + +* **PR** `#27086`_: (`techhat`_) Document develoment of SPM loader modules + @ *2015-09-13 04:52:55 UTC* + + * c78d833540 Merge pull request `#27086`_ from techhat/spmdevdocs + + * ee0c8955dd Document develoment of SPM loader modules + +* **ISSUE** `#23125`_: (`bemeyert`_) Elasticsearch as master_job_cache throws critical (refs: `#26941`_) + +* **PR** `#26941`_: (`msteed`_) Make elasticsearch work as master job cache + @ *2015-09-12 17:13:44 UTC* + + * 25b11759f9 Merge pull request `#26941`_ from msteed/issue-23125 + + * ff88fe402c add versionadded info to save_load() & get_load() + + * 5d2fae8a89 make master job cache index configurable + + * bc041fa4a7 Merge branch 'issue-23125' of github.com:msteed/salt into issue-23125 + + * 9aedc2662e issue-23125 + + * 593c4d6b2f issue-23125 + +* **PR** `#27080`_: (`bechtoldt`_) [Proposal] Add Github SPM label for issues + @ *2015-09-12 14:32:58 UTC* + + * b763d0ba52 Merge pull request `#27080`_ from bechtoldt/spm_doc + + * b9e5095bf5 add GH issue label SPM to docs + +* **PR** `#27064`_: (`twangboy`_) Fixed user docs + @ *2015-09-11 22:37:19 UTC* + + * cf59a03432 Merge pull request `#27064`_ from twangboy/user_docs + + * db03ca198e Fixed user docs + +* **PR** `#27072`_: (`rallytime`_) Back-port `#26840`_ to 2015.8 + @ *2015-09-11 22:35:52 UTC* + + * **PR** `#26840`_: (`deuscapturus`_) Update http.py (refs: `#27072`_) + + * 71c12cbf46 Merge pull request `#27072`_ from rallytime/bp-26840 + + * d0b9ececa4 Update http.py + +* **PR** `#27060`_: (`cro`_) Fix grains breakage when hosts are not Linux, Windows, or SunOS + @ *2015-09-11 17:28:49 UTC* + + * 0e7555089f Merge pull request `#27060`_ from cro/proxy_grains_breakage + + * e697326f1b Don't check for proxy in the individual is_linux/is_windows/etc functions. This breaks too many things. + +* **PR** `#27051`_: (`rallytime`_) Back-port `#26953`_ to 2015.8 + @ *2015-09-11 16:28:20 UTC* + + * **PR** `#26953`_: (`dsumsky`_) S3 ext_pillar module has broken caching mechanism (refs: `#27051`_) + + * 8ee87b9f61 Merge pull request `#27051`_ from rallytime/bp-26953 + + * eac9d9aba9 Pylint Fix + + * 453440753c - fixed pylint warnings + + * b40dfa459e - fixed broken caching in S3 ext_pillar module (file_md5 was a list) - added debugging messages - static parameters are available as module parameters now + +* **PR** `#26864`_: (`terminalmage`_) Only do git_pillar preflight checks on new-style git_pillar configs + @ *2015-09-11 07:47:12 UTC* + + * 249f55cd8c Merge pull request `#26864`_ from terminalmage/fix-git_pillar-tests + + * 0b5a653f7c Only do git_pillar preflight checks on new-style git_pillar configs + +* **PR** `#26967`_: (`TheBigBear`_) new URL for windows salt downloads + @ *2015-09-10 20:51:33 UTC* + + * efaedb8aea Merge pull request `#26967`_ from TheBigBear/patch-4 + + * 8d2c042cf7 new URL for windows salt downloads + +* **PR** `#26921`_: (`terminalmage`_) Get rid of error in legacy git pillar when using branch mapping notation + @ *2015-09-10 20:06:29 UTC* + + * 757d3c4eab Merge pull request `#26921`_ from terminalmage/legacy_git_pillar_tests + + * 28e07d5d06 Get rid of error in legacy git pillar when using branch mapping notation + +* **PR** `#26923`_: (`rallytime`_) Code clean up of cloud drivers and files + @ *2015-09-10 16:37:26 UTC* + + * 68eb508e6c Merge pull request `#26923`_ from rallytime/cloud-cleanup + + * bf33c99b08 Remove redundant parentheses + + * 5045989be7 Make sure function names comply + + * e327d9a8a4 Remove redundant parens + + * eee0291ff8 Code clean up of cloud drivers and files + +* **PR** `#27010`_: (`rallytime`_) Back-port `#26988`_ to 2015.8 + @ *2015-09-10 16:30:30 UTC* + + * **PR** `#26988`_: (`s0undt3ch`_) Process `spm.d/*.conf` and add prefix root dir support to SPM directories (refs: `#27010`_) + + * 590c46f4e3 Merge pull request `#27010`_ from rallytime/bp-26988 + + * 93b30b5ba8 Whitespace + + * 685fa911e7 Version Added for new apply_spm_config function + + * 9612a6c7ad Process `spm.d/*.conf` and add prefix root dir support to SPM directories + +* **PR** `#26985`_: (`rallytime`_) Fix versionadded tag + @ *2015-09-10 16:29:38 UTC* + + * ec185d77fa Merge pull request `#26985`_ from rallytime/versionadded-fix + + * 79eb606cb7 Fix versionadded tag + +.. _`#11993`: https://github.com/saltstack/salt/issues/11993 +.. _`#17088`: https://github.com/saltstack/salt/issues/17088 +.. _`#18582`: https://github.com/saltstack/salt/issues/18582 +.. _`#19262`: https://github.com/saltstack/salt/issues/19262 +.. _`#19853`: https://github.com/saltstack/salt/issues/19853 +.. _`#19947`: https://github.com/saltstack/salt/issues/19947 +.. _`#19954`: https://github.com/saltstack/salt/issues/19954 .. _`#20039`: https://github.com/saltstack/salt/pull/20039 -.. _`#21649`: https://github.com/saltstack/salt/pull/21649 +.. _`#21390`: https://github.com/saltstack/salt/issues/21390 +.. _`#21879`: https://github.com/saltstack/salt/issues/21879 .. _`#21880`: https://github.com/saltstack/salt/pull/21880 .. _`#22267`: https://github.com/saltstack/salt/pull/22267 +.. _`#22724`: https://github.com/saltstack/salt/issues/22724 +.. _`#23125`: https://github.com/saltstack/salt/issues/23125 .. _`#24421`: https://github.com/saltstack/salt/pull/24421 +.. _`#24573`: https://github.com/saltstack/salt/issues/24573 .. _`#25019`: https://github.com/saltstack/salt/pull/25019 +.. _`#25079`: https://github.com/saltstack/salt/issues/25079 +.. _`#25107`: https://github.com/saltstack/salt/issues/25107 .. _`#25162`: https://github.com/saltstack/salt/pull/25162 .. _`#25243`: https://github.com/saltstack/salt/pull/25243 -.. _`#26378`: https://github.com/saltstack/salt/pull/26378 -.. _`#26446`: https://github.com/saltstack/salt/pull/26446 -.. _`#26561`: https://github.com/saltstack/salt/pull/26561 +.. _`#26629`: https://github.com/saltstack/salt/issues/26629 +.. _`#26638`: https://github.com/saltstack/salt/issues/26638 +.. _`#26644`: https://github.com/saltstack/salt/issues/26644 +.. _`#26689`: https://github.com/saltstack/salt/issues/26689 .. _`#26803`: https://github.com/saltstack/salt/pull/26803 .. _`#26815`: https://github.com/saltstack/salt/pull/26815 .. _`#26817`: https://github.com/saltstack/salt/pull/26817 @@ -301,18 +1711,16 @@ Changes: .. _`#26824`: https://github.com/saltstack/salt/pull/26824 .. _`#26840`: https://github.com/saltstack/salt/pull/26840 .. _`#26851`: https://github.com/saltstack/salt/pull/26851 -.. _`#26852`: https://github.com/saltstack/salt/pull/26852 .. _`#26864`: https://github.com/saltstack/salt/pull/26864 .. _`#26868`: https://github.com/saltstack/salt/pull/26868 .. _`#26871`: https://github.com/saltstack/salt/pull/26871 .. _`#26875`: https://github.com/saltstack/salt/pull/26875 +.. _`#26889`: https://github.com/saltstack/salt/issues/26889 .. _`#26899`: https://github.com/saltstack/salt/pull/26899 .. _`#26903`: https://github.com/saltstack/salt/pull/26903 .. _`#26915`: https://github.com/saltstack/salt/pull/26915 .. _`#26921`: https://github.com/saltstack/salt/pull/26921 .. _`#26923`: https://github.com/saltstack/salt/pull/26923 -.. _`#26930`: https://github.com/saltstack/salt/pull/26930 -.. _`#26938`: https://github.com/saltstack/salt/pull/26938 .. _`#26940`: https://github.com/saltstack/salt/pull/26940 .. _`#26941`: https://github.com/saltstack/salt/pull/26941 .. _`#26942`: https://github.com/saltstack/salt/pull/26942 @@ -320,7 +1728,6 @@ Changes: .. _`#26953`: https://github.com/saltstack/salt/pull/26953 .. _`#26955`: https://github.com/saltstack/salt/pull/26955 .. _`#26960`: https://github.com/saltstack/salt/pull/26960 -.. _`#26966`: https://github.com/saltstack/salt/pull/26966 .. _`#26967`: https://github.com/saltstack/salt/pull/26967 .. _`#26971`: https://github.com/saltstack/salt/pull/26971 .. _`#26972`: https://github.com/saltstack/salt/pull/26972 @@ -330,22 +1737,17 @@ Changes: .. _`#26985`: https://github.com/saltstack/salt/pull/26985 .. _`#26987`: https://github.com/saltstack/salt/pull/26987 .. _`#26988`: https://github.com/saltstack/salt/pull/26988 -.. _`#26992`: https://github.com/saltstack/salt/pull/26992 .. _`#26996`: https://github.com/saltstack/salt/pull/26996 .. _`#26997`: https://github.com/saltstack/salt/pull/26997 .. _`#27001`: https://github.com/saltstack/salt/pull/27001 -.. _`#27004`: https://github.com/saltstack/salt/pull/27004 .. _`#27010`: https://github.com/saltstack/salt/pull/27010 -.. _`#27011`: https://github.com/saltstack/salt/pull/27011 -.. _`#27013`: https://github.com/saltstack/salt/pull/27013 -.. _`#27019`: https://github.com/saltstack/salt/pull/27019 .. _`#27023`: https://github.com/saltstack/salt/pull/27023 .. _`#27024`: https://github.com/saltstack/salt/pull/27024 .. _`#27025`: https://github.com/saltstack/salt/pull/27025 .. _`#27026`: https://github.com/saltstack/salt/pull/27026 .. _`#27027`: https://github.com/saltstack/salt/pull/27027 -.. _`#27029`: https://github.com/saltstack/salt/pull/27029 .. _`#27030`: https://github.com/saltstack/salt/pull/27030 +.. _`#27032`: https://github.com/saltstack/salt/issues/27032 .. _`#27033`: https://github.com/saltstack/salt/pull/27033 .. _`#27034`: https://github.com/saltstack/salt/pull/27034 .. _`#27035`: https://github.com/saltstack/salt/pull/27035 @@ -357,14 +1759,18 @@ Changes: .. _`#27054`: https://github.com/saltstack/salt/pull/27054 .. _`#27060`: https://github.com/saltstack/salt/pull/27060 .. _`#27064`: https://github.com/saltstack/salt/pull/27064 +.. _`#27065`: https://github.com/saltstack/salt/issues/27065 .. _`#27070`: https://github.com/saltstack/salt/pull/27070 .. _`#27072`: https://github.com/saltstack/salt/pull/27072 .. _`#27073`: https://github.com/saltstack/salt/pull/27073 .. _`#27074`: https://github.com/saltstack/salt/pull/27074 .. _`#27075`: https://github.com/saltstack/salt/pull/27075 .. _`#27080`: https://github.com/saltstack/salt/pull/27080 +.. _`#27081`: https://github.com/saltstack/salt/issues/27081 .. _`#27086`: https://github.com/saltstack/salt/pull/27086 .. _`#27092`: https://github.com/saltstack/salt/pull/27092 +.. _`#27093`: https://github.com/saltstack/salt/issues/27093 +.. _`#27103`: https://github.com/saltstack/salt/issues/27103 .. _`#27110`: https://github.com/saltstack/salt/pull/27110 .. _`#27111`: https://github.com/saltstack/salt/pull/27111 .. _`#27114`: https://github.com/saltstack/salt/pull/27114 @@ -372,18 +1778,20 @@ Changes: .. _`#27116`: https://github.com/saltstack/salt/pull/27116 .. _`#27117`: https://github.com/saltstack/salt/pull/27117 .. _`#27119`: https://github.com/saltstack/salt/pull/27119 +.. _`#27121`: https://github.com/saltstack/salt/issues/27121 .. _`#27122`: https://github.com/saltstack/salt/pull/27122 .. _`#27123`: https://github.com/saltstack/salt/pull/27123 .. _`#27124`: https://github.com/saltstack/salt/pull/27124 +.. _`#27127`: https://github.com/saltstack/salt/issues/27127 .. _`#27128`: https://github.com/saltstack/salt/pull/27128 .. _`#27131`: https://github.com/saltstack/salt/pull/27131 .. _`#27134`: https://github.com/saltstack/salt/pull/27134 +.. _`#27135`: https://github.com/saltstack/salt/issues/27135 .. _`#27137`: https://github.com/saltstack/salt/pull/27137 .. _`#27139`: https://github.com/saltstack/salt/pull/27139 .. _`#27143`: https://github.com/saltstack/salt/pull/27143 .. _`#27144`: https://github.com/saltstack/salt/pull/27144 .. _`#27147`: https://github.com/saltstack/salt/pull/27147 -.. _`#27148`: https://github.com/saltstack/salt/pull/27148 .. _`#27149`: https://github.com/saltstack/salt/pull/27149 .. _`#27150`: https://github.com/saltstack/salt/pull/27150 .. _`#27162`: https://github.com/saltstack/salt/pull/27162 @@ -397,22 +1805,25 @@ Changes: .. _`#27173`: https://github.com/saltstack/salt/pull/27173 .. _`#27176`: https://github.com/saltstack/salt/pull/27176 .. _`#27177`: https://github.com/saltstack/salt/pull/27177 -.. _`#27180`: https://github.com/saltstack/salt/pull/27180 +.. _`#27179`: https://github.com/saltstack/salt/issues/27179 .. _`#27182`: https://github.com/saltstack/salt/pull/27182 .. _`#27194`: https://github.com/saltstack/salt/pull/27194 .. _`#27195`: https://github.com/saltstack/salt/pull/27195 .. _`#27197`: https://github.com/saltstack/salt/pull/27197 .. _`#27199`: https://github.com/saltstack/salt/pull/27199 .. _`#27201`: https://github.com/saltstack/salt/pull/27201 +.. _`#27205`: https://github.com/saltstack/salt/issues/27205 .. _`#27206`: https://github.com/saltstack/salt/pull/27206 .. _`#27208`: https://github.com/saltstack/salt/pull/27208 +.. _`#27209`: https://github.com/saltstack/salt/issues/27209 .. _`#27210`: https://github.com/saltstack/salt/pull/27210 .. _`#27213`: https://github.com/saltstack/salt/pull/27213 .. _`#27214`: https://github.com/saltstack/salt/pull/27214 .. _`#27217`: https://github.com/saltstack/salt/issues/27217 .. _`#27218`: https://github.com/saltstack/salt/pull/27218 +.. _`#27220`: https://github.com/saltstack/salt/issues/27220 +.. _`#27222`: https://github.com/saltstack/salt/issues/27222 .. _`#27223`: https://github.com/saltstack/salt/pull/27223 -.. _`#27230`: https://github.com/saltstack/salt/pull/27230 .. _`#27231`: https://github.com/saltstack/salt/pull/27231 .. _`#27232`: https://github.com/saltstack/salt/pull/27232 .. _`#27233`: https://github.com/saltstack/salt/pull/27233 @@ -427,8 +1838,8 @@ Changes: .. _`#27252`: https://github.com/saltstack/salt/pull/27252 .. _`#27253`: https://github.com/saltstack/salt/pull/27253 .. _`#27254`: https://github.com/saltstack/salt/pull/27254 -.. _`#27256`: https://github.com/saltstack/salt/pull/27256 .. _`#27260`: https://github.com/saltstack/salt/pull/27260 +.. _`#27265`: https://github.com/saltstack/salt/issues/27265 .. _`#27271`: https://github.com/saltstack/salt/pull/27271 .. _`#27272`: https://github.com/saltstack/salt/pull/27272 .. _`#27274`: https://github.com/saltstack/salt/pull/27274 @@ -436,10 +1847,12 @@ Changes: .. _`#27276`: https://github.com/saltstack/salt/pull/27276 .. _`#27277`: https://github.com/saltstack/salt/pull/27277 .. _`#27278`: https://github.com/saltstack/salt/pull/27278 +.. _`#27281`: https://github.com/saltstack/salt/issues/27281 .. _`#27283`: https://github.com/saltstack/salt/pull/27283 .. _`#27286`: https://github.com/saltstack/salt/pull/27286 .. _`#27287`: https://github.com/saltstack/salt/pull/27287 .. _`#27288`: https://github.com/saltstack/salt/pull/27288 +.. _`#27290`: https://github.com/saltstack/salt/issues/27290 .. _`#27300`: https://github.com/saltstack/salt/pull/27300 .. _`#27301`: https://github.com/saltstack/salt/pull/27301 .. _`#27303`: https://github.com/saltstack/salt/pull/27303 @@ -449,7 +1862,9 @@ Changes: .. _`#27310`: https://github.com/saltstack/salt/pull/27310 .. _`#27311`: https://github.com/saltstack/salt/pull/27311 .. _`#27312`: https://github.com/saltstack/salt/pull/27312 +.. _`#27316`: https://github.com/saltstack/salt/issues/27316 .. _`#27317`: https://github.com/saltstack/salt/pull/27317 +.. _`#27326`: https://github.com/saltstack/salt/issues/27326 .. _`#27327`: https://github.com/saltstack/salt/pull/27327 .. _`#27331`: https://github.com/saltstack/salt/pull/27331 .. _`#27332`: https://github.com/saltstack/salt/pull/27332 @@ -461,8 +1876,9 @@ Changes: .. _`#27345`: https://github.com/saltstack/salt/pull/27345 .. _`#27349`: https://github.com/saltstack/salt/pull/27349 .. _`#27350`: https://github.com/saltstack/salt/pull/27350 -.. _`#27351`: https://github.com/saltstack/salt/pull/27351 .. _`#27353`: https://github.com/saltstack/salt/pull/27353 +.. _`#27354`: https://github.com/saltstack/salt/issues/27354 +.. _`#27356`: https://github.com/saltstack/salt/issues/27356 .. _`#27358`: https://github.com/saltstack/salt/pull/27358 .. _`#27361`: https://github.com/saltstack/salt/pull/27361 .. _`#27364`: https://github.com/saltstack/salt/pull/27364 @@ -472,11 +1888,13 @@ Changes: .. _`#27383`: https://github.com/saltstack/salt/pull/27383 .. _`#27386`: https://github.com/saltstack/salt/pull/27386 .. _`#27388`: https://github.com/saltstack/salt/pull/27388 +.. _`#27389`: https://github.com/saltstack/salt/issues/27389 .. _`#27394`: https://github.com/saltstack/salt/pull/27394 .. _`#27398`: https://github.com/saltstack/salt/pull/27398 .. _`#27399`: https://github.com/saltstack/salt/pull/27399 .. _`#27407`: https://github.com/saltstack/salt/pull/27407 .. _`#27408`: https://github.com/saltstack/salt/pull/27408 +.. _`#27409`: https://github.com/saltstack/salt/issues/27409 .. _`#27410`: https://github.com/saltstack/salt/pull/27410 .. _`#27411`: https://github.com/saltstack/salt/pull/27411 .. _`#27415`: https://github.com/saltstack/salt/pull/27415 @@ -489,7 +1907,7 @@ Changes: .. _`#27428`: https://github.com/saltstack/salt/pull/27428 .. _`#27429`: https://github.com/saltstack/salt/pull/27429 .. _`#27430`: https://github.com/saltstack/salt/pull/27430 -.. _`#27434`: https://github.com/saltstack/salt/pull/27434 +.. _`#27438`: https://github.com/saltstack/salt/issues/27438 .. _`#27444`: https://github.com/saltstack/salt/pull/27444 .. _`#27450`: https://github.com/saltstack/salt/pull/27450 .. _`#27451`: https://github.com/saltstack/salt/pull/27451 @@ -500,7 +1918,6 @@ Changes: .. _`#27467`: https://github.com/saltstack/salt/pull/27467 .. _`#27468`: https://github.com/saltstack/salt/pull/27468 .. _`#27469`: https://github.com/saltstack/salt/pull/27469 -.. _`#27470`: https://github.com/saltstack/salt/pull/27470 .. _`#27472`: https://github.com/saltstack/salt/pull/27472 .. _`#27473`: https://github.com/saltstack/salt/pull/27473 .. _`#27474`: https://github.com/saltstack/salt/pull/27474 @@ -520,8 +1937,73 @@ Changes: .. _`#27522`: https://github.com/saltstack/salt/pull/27522 .. _`#27525`: https://github.com/saltstack/salt/pull/27525 .. _`#27526`: https://github.com/saltstack/salt/pull/27526 +.. _`#27532`: https://github.com/saltstack/salt/issues/27532 .. _`#27550`: https://github.com/saltstack/salt/pull/27550 .. _`#27564`: https://github.com/saltstack/salt/pull/27564 .. _`#27573`: https://github.com/saltstack/salt/pull/27573 .. _`#27575`: https://github.com/saltstack/salt/pull/27575 .. _`#27584`: https://github.com/saltstack/salt/pull/27584 +.. _`#27588`: https://github.com/saltstack/salt/pull/27588 +.. _`#7`: https://github.com/saltstack/salt/issues/7 +.. _`Arabus`: https://github.com/Arabus +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`SEJeff`: https://github.com/SEJeff +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`TheBigBear`: https://github.com/TheBigBear +.. _`UtahDave`: https://github.com/UtahDave +.. _`bailsman`: https://github.com/bailsman +.. _`basepi`: https://github.com/basepi +.. _`bechtoldt`: https://github.com/bechtoldt +.. _`bemeyert`: https://github.com/bemeyert +.. _`bernieke`: https://github.com/bernieke +.. _`blueyed`: https://github.com/blueyed +.. _`cachedout`: https://github.com/cachedout +.. _`cedwards`: https://github.com/cedwards +.. _`centromere`: https://github.com/centromere +.. _`clinta`: https://github.com/clinta +.. _`cro`: https://github.com/cro +.. _`deuscapturus`: https://github.com/deuscapturus +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`double-yaya`: https://github.com/double-yaya +.. _`dsumsky`: https://github.com/dsumsky +.. _`efficks`: https://github.com/efficks +.. _`eliasp`: https://github.com/eliasp +.. _`flowhamster`: https://github.com/flowhamster +.. _`fyatzeck`: https://github.com/fyatzeck +.. _`gczuczy`: https://github.com/gczuczy +.. _`gravyboat`: https://github.com/gravyboat +.. _`isbm`: https://github.com/isbm +.. _`jacksontj`: https://github.com/jacksontj +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jfindlay`: https://github.com/jfindlay +.. _`jondonas`: https://github.com/jondonas +.. _`justinta`: https://github.com/justinta +.. _`ksalman`: https://github.com/ksalman +.. _`l2ol33rt`: https://github.com/l2ol33rt +.. _`lorengordon`: https://github.com/lorengordon +.. _`lrhazi`: https://github.com/lrhazi +.. _`macgyver13`: https://github.com/macgyver13 +.. _`mainframe`: https://github.com/mainframe +.. _`meggiebot`: https://github.com/meggiebot +.. _`msteed`: https://github.com/msteed +.. _`msummers42`: https://github.com/msummers42 +.. _`multani`: https://github.com/multani +.. _`nasenbaer13`: https://github.com/nasenbaer13 +.. _`pcn`: https://github.com/pcn +.. _`perfinion`: https://github.com/perfinion +.. _`pirogoeth`: https://github.com/pirogoeth +.. _`pprkut`: https://github.com/pprkut +.. _`rallytime`: https://github.com/rallytime +.. _`ralphvanetten`: https://github.com/ralphvanetten +.. _`rhealitycheck`: https://github.com/rhealitycheck +.. _`ruzarowski`: https://github.com/ruzarowski +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`samhamilton`: https://github.com/samhamilton +.. _`systembell`: https://github.com/systembell +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`ticosax`: https://github.com/ticosax +.. _`twangboy`: https://github.com/twangboy +.. _`ty2u`: https://github.com/ty2u +.. _`whiteinge`: https://github.com/whiteinge diff --git a/doc/topics/releases/2015.8.10.rst b/doc/topics/releases/2015.8.10.rst index 3fda94e8f2..ca96fe9dea 100644 --- a/doc/topics/releases/2015.8.10.rst +++ b/doc/topics/releases/2015.8.10.rst @@ -2,37 +2,45 @@ Salt 2015.8.10 Release Notes ============================ -Version 2015.8.10 is a bugfix release for :ref:`2015.8.0`. +Version 2015.8.10 is a bugfix release for :ref:`2015.8.0 `. -**Final Release of Debian 7 Packages** +This release includes fixes for two issues discovered in :ref:`2015.8.9 +`: + +- Pip state broken in 2015.8.9 with pip <6.0 (:issue:`33376`) +- Fix traceback in logging for config validation (:pull:`33386`) + +Final Release of Debian 7 Packages +================================== Regular security support for Debian 7 ended on April 25th 2016. As a result, 2016.3.1 and 2015.8.10 will be the last Salt releases for which Debian 7 packages are created. -.. admonition:: Mint Linux: Important Post-Upgrade Instructions +Important Post-Upgrade Instructions for Linux Mint +================================================== - As a result of some upstream changes, the ``os`` grain on Mint Linux is now - being detected as ``LinuxMint`` (:issue:`33295`). Run the following command - **after you upgrade to 2015.8.10** to reset the ``os`` grain to ``Mint`` and - the ``os_family`` grain to ``Debian``: +As a result of some upstream changes, the ``os`` grain on Mint Linux is now +being detected as ``LinuxMint`` (:issue:`33295`). Run the following command +**after you upgrade to 2015.8.10** to reset the ``os`` grain to ``Mint`` and +the ``os_family`` grain to ``Debian``: - .. code-block:: bash +.. code-block:: bash - salt -G 'os:LinuxMint' grains.setvals "{'os': 'Mint', 'os_family': 'Debian'}" + salt -G 'os:LinuxMint' grains.setvals "{'os': 'Mint', 'os_family': 'Debian'}" -Changes for v2015.8.9..v2015.8.10 ---------------------------------- +Changelog for v2015.8.9..v2015.8.10 +=================================== -Salt 2015.8.10 includes fixes for the following known issues in 2015.8.9: +*Generated at: 2018-05-28 00:51:57 UTC* -* :issue:`33376`: pip state broken in 2015.8.9 with pip <6.0 -* :pull:`33386`: Fix traceback in logging for config validation +* c3d2c4eaae Fix traceback in logging for config validation (`#33386`_) -Since 2015.8.10 includes only two fixes, the 2015.8.9 changes list is included -below for convenience: +* 2a060ea1e8 restore whitespace -.. include:: 2015.8.9.rst - :start-line: 19 +* aa1f45d664 blast, put the try/except int he right place +* be1a7659a3 maintain the fallabck because I am totally sick of this crap + +.. _`#33386`: https://github.com/saltstack/salt/pull/33386 diff --git a/doc/topics/releases/2015.8.11.rst b/doc/topics/releases/2015.8.11.rst index 8cec2335e4..9c68707cfb 100644 --- a/doc/topics/releases/2015.8.11.rst +++ b/doc/topics/releases/2015.8.11.rst @@ -2,7 +2,24 @@ Salt 2015.8.11 Release Notes ============================ -Version 2015.8.11 is a bugfix release for :ref:`2015.8.0`. +Version 2015.8.11 is a bugfix release for :ref:`2015.8.0 `. + + +Statistics +========== + +- Total Merges: **122** +- Total Issue References: **70** +- Total PR References: **221** + +- Contributors: **48** (`AAbouZaid`_, `BlaineAtAffirm`_, `DmitryKuzmenko`_, `The-Loeki`_, `abednarik`_, `babilen`_, `bebehei`_, `cachedout`_, `clinta`_, `complexsplit`_, `cro`_, `danslimmon`_, `dcolish`_, `dincamihai`_, `edgan`_, `gerhardqux`_, `ghedo`_, `isbm`_, `jacobhammons`_, `jfindlay`_, `jodv`_, `justinta`_, `l13t`_, `lomeroe`_, `lorengordon`_, `lvg01`_, `mcalmer`_, `meaksh`_, `morganwillcock`_, `oeuftete`_, `opdude`_, `phistrom`_, `rallytime`_, `rmarcinik`_, `ryan-lane`_, `sacren`_, `steverweber`_, `techhat`_, `tegbert`_, `terminalmage`_, `thatch45`_, `the-glu`_, `thegoodduke`_, `ticosax`_, `tveastman`_, `twangboy`_, `vutny`_, `zer0def`_) + + +Ubuntu 16.04 Packages +===================== + +SaltStack is now providing official Salt 2015.8 `packages +`_ for Ubuntu 16.04. Returner Changes ================ @@ -11,419 +28,1492 @@ Returner Changes accept a ``minions`` keyword argument. All returners which ship with Salt have been modified to do so. -New Configuration Parameter: ``rotate_aes_key`` -=============================================== +New Master Configuration Parameter +================================== -- ``Rotate_aes_key`` causes Salt to generate a new AES key whenever a minion key - is deleted. This eliminates the chance that a deleted minion could continue - to eavesdrop on communications with the master if it continues to run after its - key is deleted. See the entry in the documentation for :conf_master:`rotate_aes_key`. +- :conf_master:`rotate_aes_key` - if ``True``, causes Salt to generate a new + AES key whenever a minion key is deleted. This eliminates the chance that a + deleted minion could continue to eavesdrop on communications with the master + if it continues to run after its key is deleted. -Ubuntu 16.04 Packages -===================== -SaltStack is now providing official Salt 2015.8 `packages -`_ for Ubuntu 16.04. +Changelog for v2015.8.10..v2015.8.11 +==================================== -Changes for v2015.8.10..v2015.8.11 ----------------------------------- +*Generated at: 2018-05-28 01:16:12 UTC* -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +* **PR** `#34682`_: (`jfindlay`_) update 2015.8.11 release notes -*Generated at: 2016-07-14T21:16:18Z* +* **PR** `#34676`_: (`cachedout`_) Revert "Modify lodaer global test to use populated dunders" + @ *2016-07-14 18:12:55 UTC* -Total Merges: **122** + * 3192e1674b Merge pull request `#34676`_ from cachedout/partial_revert_34644 -Changes: + * 64a154826a Revert "Modify lodaer global test to use populated dunders" -- **PR** `#34676`_: (*cachedout*) Revert "Modify lodaer global test to use populated dunders" +* **PR** `#34601`_: (`lorengordon`_) Clarifies the proper way to reference states + @ *2016-07-14 14:20:41 UTC* -- **PR** `#34601`_: (*lorengordon*) Clarifies the proper way to reference states + * 3b6f1089b2 Merge pull request `#34601`_ from lorengordon/clarify-doc -* bc63f25 Lint 34644 (`#34651`_) + * bfe0dd0b8a Clarifies the proper way to reference states -* 5036026 Adjust the mine test a little bit to give it a better chance of success (`#34647`_) + * **PR** `saltstack/salt#34644`_: (`cachedout`_) Cleanup loader errors (refs: `#34651`_) -- **PR** `#34642`_: (*jtand*) Check that mysqladmin exists before running mysql integration tests + * **PR** `#34651`_: (`rallytime`_) Lint 34644 -- **PR** `#34618`_: (*jtand*) Network state integration test test=True + * **PR** `#34647`_: (`cachedout`_) Adjust the mine test a little bit to give it a better chance of success -- **PR** `#34617`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **PR** `#34642`_: (`justinta`_) Check that mysqladmin exists before running mysql integration tests + @ *2016-07-13 18:12:44 UTC* -* b90ae40 Add support for edge case when Cmd and Entrypoint can't be blanked (`#34593`_) + * 8a0209101e Merge pull request `#34642`_ from jtand/mysql_integration_cleanup -* 12b579c When sorting list actual_data, make it a list (`#34590`_) + * dd1559a599 Check that mysqladmin exists before running mysql integration tests. -* 7dd8035 Gate docker unit test to check for docker (`#34591`_) +* **PR** `#34618`_: (`justinta`_) Network state integration test test=True + @ *2016-07-13 16:30:15 UTC* -* ae38c87 Add a bunch of documentation on getting files from other environments (`#34560`_) + * 3e612c3794 Merge pull request `#34618`_ from jtand/network_integration_fix -- **PR** `#34531`_: (*terminalmage*) Support ignore_epoch argument in version comparisons + * 34bcf9ccfc Changed network state test to use test=True -- **PR** `#34545`_: (*terminalmage*) Handle cases where Docker Remote API returns an empty ExecutionDriver + * b2616833b0 Some small changes -- **PR** `#34546`_: (*rallytime*) Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test + * ed59113e94 Change network state integration test to use test=True -- **PR** `#34537`_: (*rallytime*) Rename tests.unit.simple to tests.unit.simple_test +* **PR** `#34617`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-07-12 20:11:40 UTC* -* fbab2f8 [2015.8] Update bootstrap script to latest stable (`#34527`_) + * 9f123543e5 Merge pull request `#34617`_ from rallytime/merge-2015.8 -* 6b8c76a Prevent many errors in the test suite in loader tests (`#34521`_) + * 3026df346f Merge branch '2015.5' into '2015.8' -* c2f296c Fix wrong order of retention_policy_exists (`#34507`_) + * 57df38e685 Update github IP for ssh state integration tests (`#34592`_) -- **PR** `#34518`_: (*terminalmage*) Fix pkg.latest integration test for non-LTS ubuntu + * 2e1007254b Avoid circular imports when calling salt.utils functions (`#34584`_) -- **PR** `#34513`_: (*cachedout*) Lower the log level for modules which cannot be loaded to trace +* **ISSUE** `#33649`_: (`tyhunt99`_) 2016.3.0 dockerng state fails comparing cmd configuration (refs: #saltstack/salt`#33851`_, `#33851`_) -- **PR** `#34498`_: (*rallytime*) Use -O in the wget example in the bootstrap tutorial for the develop branch + * **PR** `saltstack/salt#33851`_: (`ticosax`_) [dockerng] Add support for edge case when `Cmd` and `Entrypoint` can't be blanked (refs: `#34593`_) -* 3ebba02 Rename some unit test files by adding _test (`#34503`_) + * **PR** `#34593`_: (`rallytime`_) Back-port `#33851`_ to 2015.8 -* 8722257 Improve top file merging documentation (`#34505`_) + * **PR** `#33851`_: (`ticosax`_) [dockerng] Add support for edge case when `Cmd` and `Entrypoint` can't be blanked (refs: `#34593`_) -* 6ce7cb9 Gracefully handle non-XML output in GlusterFS execution module. (`#34492`_) + * **PR** `#34590`_: (`oeuftete`_) [2015.8] dockerng: When sorting list actual_data, make it a list -* 7529945 Use skipTest for network state integration test (`#34489`_) + * **PR** `#34591`_: (`justinta`_) Gate docker unit test to check for docker -* 0f3f87f Update dnsmasq.get_config docs to use correct config_file param. (`#34488`_) + * **PR** `#34560`_: (`terminalmage`_) Add a bunch of documentation on getting files from other environments -- **PR** `#34462`_: (*terminalmage*) Use --always when available to git describe +* **ISSUE** `#34397`_: (`jaredhanson11`_) ignore_epoch needs to be passed through to version_cmp functions (refs: `#34531`_) -- **PR** `#34467`_: (*rallytime*) Back-port `#34457`_ to 2015.8 +* **PR** `#34531`_: (`terminalmage`_) Support ignore_epoch argument in version comparisons + @ *2016-07-08 16:43:36 UTC* -- **PR** `#34432`_: (*twangboy*) Fix file.append + * 91e0656d44 Merge pull request `#34531`_ from terminalmage/issue34397 -- **PR** `#34429`_: (*terminalmage*) Skip version checking for targeted packages in pkg.latest state + * d0fec1b8f6 salt/modules/zypper.py: accept ignore_epoch argument -* 0a26459 Forgot reference to inotify (`#34455`_) + * 5ae9463c1f salt/modules/yumpkg.py: accept ignore_epoch argument -- **PR** `#34451`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * c2791117af salt/modules/rpm.py: accept ignore_epoch argument -- **PR** `#34401`_: (*terminalmage*) Use rpmdev-vercmp as a fallback for version comparison on RHEL5 + * c5de8b880d salt/modules/ebuild.py: accept ignore_epoch argument -- **PR** `#34366`_: (*steverweber*) Update service.py + * 4ee8e8f037 salt/modules/aptpkg.py: accept ignore_epoch argument -- **PR** `#34426`_: (*cro*) Document that inotify is Linux only + * 5b123b403c Pass ignore_epoch to salt.utils.compare_versions() -- **PR** `#34392`_: (*cro*) Clarify that salt-cloud doesn't get installed by bootstrap + * 07368fac40 Accept ignore_epoch argument for salt.utils.compare_versions() -- **PR** `#34373`_: (*jtand*) Network state integration test +* **PR** `#34545`_: (`terminalmage`_) Handle cases where Docker Remote API returns an empty ExecutionDriver + @ *2016-07-08 16:34:30 UTC* -* d6af1de Optimize pkg integration tests and add a couple new tests (`#34377`_) + * e99befad47 Merge pull request `#34545`_ from terminalmage/docker-exec-driver -- **PR** `#34368`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * dd5838e242 Handle cases where Docker Remote API returns an empty ExecutionDriver -* 94e0946 Back-port `#34324`_ to 2015.8 (`#34344`_) +* **PR** `#34546`_: (`rallytime`_) Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test + @ *2016-07-08 16:16:42 UTC* -* 11dc020 Making salt-ssh pass proper return codes for jinja rendering errors (`#34342`_) + * 7120d43df0 Merge pull request `#34546`_ from rallytime/rename-boto-secgroup-test -* f6bd1ad Revert py3modernize lint changes (`#34339`_) + * f8a3622be7 Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test -- **PR** `#34306`_: (*ghedo*) Fix iptables.flush state: Do not force 'filter' table when flushing +* **PR** `#34537`_: (`rallytime`_) Rename tests.unit.simple to tests.unit.simple_test + @ *2016-07-08 00:08:36 UTC* -* 0c60fea Doc clarifications to file modules, addition of new `profile` log level to docs, fixed example in dnsmasq (`#34323`_) + * ca92061821 Merge pull request `#34537`_ from rallytime/rename-simple-test -* b793426 Remove unnecessarily-disabled sanity check (`#34325`_) + * ceefb6e34c Rename tests.unit.simple to tests.unit.simple_test -- **PR** `#34335`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#34527`_: (`rallytime`_) [2015.8] Update bootstrap script to latest stable -* a6d3cc6 Typo in dockerio doc (`#34319`_) + * **PR** `#34521`_: (`cachedout`_) Prevent many errors in the test suite in loader tests -- **PR** `#34312`_: (*rallytime*) [2015.8] Update to latest bootstrap script v2016.06.27 + * **PR** `#34507`_: (`AAbouZaid`_) Fix wrong order of retention_policy_exists. -- **PR** `#34307`_: (*rallytime*) Fix test example in integration testing docs +* **PR** `#34518`_: (`terminalmage`_) Fix pkg.latest integration test for non-LTS ubuntu + @ *2016-07-07 19:29:13 UTC* -- **PR** `#34233`_: (*thegoodduke*) ipset: fix the comment containing blank + * 685df80929 Merge pull request `#34518`_ from terminalmage/fix-pkg.latest-test -- **PR** `#34257`_: (*rallytime*) Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer + * 4aef44ecdf Fix pkg.latest integration test for non-LTS ubuntu -- **PR** `#34274`_: (*clinta*) Don't escape source before calling managed +* **PR** `#34513`_: (`cachedout`_) Lower the log level for modules which cannot be loaded to trace + @ *2016-07-07 17:00:48 UTC* -- **PR** `#34258`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * a516f116d1 Merge pull request `#34513`_ from cachedout/lower_loader_log -- **PR** `#34093`_: (*terminalmage*) Catch CommandExecutionError in pkg states + * 733c5d00c0 Lower the log level for modules which cannot be loaded to trace -- **PR** `#34136`_: (*meaksh*) Fixed behavior for SUSE OS grains in 2015.8 +* **PR** `#34498`_: (`rallytime`_) Use -O in the wget example in the bootstrap tutorial for the develop branch + @ *2016-07-07 16:30:46 UTC* -* 56c7267 fix regression from `#33681`_ which causes pulling a list of s3 objects via s3.query to fail (`#34208`_) + * 63f0451041 Merge pull request `#34498`_ from rallytime/bootstrap-tutorial-doc-fix -* 02eb331 Fix a pair of gitfs bugs (`#34218`_) + * 23c5739c3b Use -O in wget develop example in bootstrap tutorial -- **PR** `#34182`_: (*rallytime*) Handle child PIDs differently depending on the availability of psutils + * **PR** `#34503`_: (`rallytime`_) Rename some unit test files by adding _test -* 5d3ec31 Clarify pkg.list_repo_pkgs docstring for held packages (`#34188`_) +* **ISSUE** `#34302`_: (`ghost`_) Salt gitfs loads top files from all branches and tags (refs: `#34505`_) -* 5bca5c4 Change target for dockerng assuming default status to Nitrogen release (`#34206`_) + * **PR** `#34505`_: (`terminalmage`_) Improve top file merging documentation -- **PR** `#34184`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#34492`_: (`zer0def`_) Gracefully handle non-XML output in GlusterFS execution module. -- **PR** `#34176`_: (*rallytime*) Back-port `#34103`_ to 2015.8 + * **PR** `#34489`_: (`justinta`_) Use skipTest for network state integration test -- **PR** `#34179`_: (*terminalmage*) Raise the correct exception when gitfs lockfile is empty +* **ISSUE** `#34261`_: (`vernondcole`_) salt.modules.dnsmasq documentation errors (refs: `#34488`_, `#34323`_) -- **PR** `#34178`_: (*terminalmage*) Remove unnecesssary comment + * **PR** `#34488`_: (`rallytime`_) Update dnsmasq.get_config docs to use correct config_file param. -* 6387d16 fix salt --summary to count not responding minions correctly (`#34165`_) +* **PR** `#34462`_: (`terminalmage`_) Use --always when available to git describe + @ *2016-07-06 03:59:33 UTC* -* e5949ea doc: add missing dot (`#34175`_) + * e2f576e847 Merge pull request `#34462`_ from terminalmage/git-describe-always -* 47595d6 Typo fix (`#34174`_) + * 6ef7ee198e Restrict use of --always to git 1.5.6 and newer -- **PR** `#34077`_: (*rallytime*) Add some grains targeting tests + * c554b22fc8 modules/git: added --always parameter for git.describe(). -- **PR** `#34142`_: (*isbm*) Move log message from INFO to DEBUG. +* **PR** `#34467`_: (`rallytime`_) Back-port `#34457`_ to 2015.8 + @ *2016-07-06 03:56:58 UTC* -* 79a719b Update documentation on "refresh" behavior in pkg states (`#34100`_) + * **PR** `#34457`_: (`ryan-lane`_) Only access key metadata if we found key metadata (refs: `#34467`_) -* 6d0d52f modules.pkg int tests: skip refresh_db upon error (`#34072`_) + * 85f1f18239 Merge pull request `#34467`_ from rallytime/bp-34457 -- **PR** `#34069`_: (*rallytime*) Add a test to check for disconnected minion messaging + * 746883741f Only access key metadata if we found key metadata -- **PR** `#34048`_: (*terminalmage*) RFC: proposed fix for multiple fileserver updates in masterless runs +* **PR** `#34432`_: (`twangboy`_) Fix file.append + @ *2016-07-05 23:14:22 UTC* -- **PR** `#34011`_: (*rallytime*) Back-port `#33948`_ and `#34009`_ to 2015.8 + * 9e15337b74 Merge pull request `#34432`_ from twangboy/fix_file.append -* bca4371 Fixed a bug in the consul.py module that was preventing services (`#34051`_) + * 13f11fddce Remove refactoring code -- **PR** `#34045`_: (*jacobhammons*) Updated latest release version + * 78f7c530bb Remove unit tests, integration tests written -* f9bfcde Always make changes to minion config if set (`#34020`_) + * b83392edea Remove len() in favor of boolean test -* e25dba4 More YAML indentation fixes in state module examples (`#34030`_) + * 4373408163 Fix line error -- **PR** `#34018`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 2479b53e2f Fix erroneous report on newline code -* 7d940ae states.file: fix indentation in YAML examples (`#34003`_) + * 75b6ed1fd5 Change back to binary read -* 4c7fac0 Remove loader test for pam module (`#34002`_) + * 65753cff6d Use os.linesep instead of \n -- **PR** `#33990`_: (*jacobhammons*) Adds links to several current Salt-related projects + * a55d63f086 Fix object names -- **PR** `#33983`_: (*twangboy*) Clarify the `account_exists` parameter + * 3e2fe12e5e Add new line if missing -- **PR** `#33951`_: (*jfindlay*) modules.gem int tests: more fixes + * 0b7821c8db Fix file.append state -- **PR** `#33984`_: (*jfindlay*) Add docs and tests to disk state +* **PR** `#34429`_: (`terminalmage`_) Skip version checking for targeted packages in pkg.latest state + @ *2016-07-05 17:50:41 UTC* -- **PR** `#33985`_: (*rallytime*) Write some more simple batch command tests + * 91e095bb41 Merge pull request `#34429`_ from terminalmage/pkg-latest-versioncheck -* 6080846 acl.ClientACL: add unit tests (`#33684`_) + * 667f31a72a Skip version checking for targeted packages in pkg.latest state -* a74f1b8 ZD 762 (`#33942`_) + * **PR** `#34455`_: (`cro`_) Forgot reference to inotify -- **PR** `#33946`_: (*rallytime*) Back-port `#33698`_ to 2015.8 +* **PR** `#34451`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-07-05 15:57:54 UTC* -- **PR** `#33952`_: (*rallytime*) Add base argument to salt-ssh grains wrapper for filter_by func + * 7bb0868c66 Merge pull request `#34451`_ from rallytime/merge-2015.8 -* 4a80649 Adds a "Generated on " line to the footer of each doc html page in the doc (`#33962`_) + * 55a91e22be Merge branch '2015.5' into '2015.8' -* b3ec39d Correct issue with ping on rotate with minion cache (`#33765`_) + * 8c72ee56e4 Merge pull request `#34435`_ from cachedout/backport_config_dir_integration -- **PR** `#33888`_: (*jfindlay*) random.org checks + * 0e2c71a537 Backport change to integraiton test suite -* 2dc1914 Add connecting_settings to boto_elb state attributes list (`#33936`_) +* **ISSUE** `#34390`_: (`mgresser`_) Use rpmdev-vercmp to determine correct version of rpms in CentOS5 (refs: `#34401`_) -* 91a2184 Wait for up to a minute for sync_after_install (`#33917`_) +* **PR** `#34401`_: (`terminalmage`_) Use rpmdev-vercmp as a fallback for version comparison on RHEL5 + @ *2016-07-01 17:42:24 UTC* -- **PR** `#33877`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * e65d1ae374 Merge pull request `#34401`_ from terminalmage/rpm-version_cmp -- **PR** `#33827`_: (*cachedout*) Fix broken locate.locate function + * 7cefd4182d Use rpmdev-vercmp as a fallback for version comparison on RHEL5 -- **PR** `#33839`_: (*cachedout*) Fix another unit test stacktrace in pkg_resource +* **PR** `#34366`_: (`steverweber`_) Update service.py + @ *2016-07-01 17:40:31 UTC* -- **PR** `#33840`_: (*cachedout*) Remove matcher tests + * 5ddf417432 Merge pull request `#34366`_ from steverweber/fix_servicerestart -- **PR** `#33836`_: (*cachedout*) Fixing more stupid unit tests + * 7847c39024 Update service.py -- **PR** `#33805`_: (*jfindlay*) states.pkg int tests: skip if pkg mgr unavailable +* **PR** `#34426`_: (`cro`_) Document that inotify is Linux only + @ *2016-07-01 17:04:38 UTC* -- **PR** `#33808`_: (*jfindlay*) fix some problems with the gem module integration tests + * 485454febb Merge pull request `#34426`_ from cro/inotify-linux-only -- **PR** `#33770`_: (*jfindlay*) service state integration tests + * 54a02f25ba Document that inotify is Linux only -- **PR** `#33691`_: (*jtand*) Gem integration test +* **PR** `#34392`_: (`cro`_) Clarify that salt-cloud doesn't get installed by bootstrap + @ *2016-06-30 18:16:23 UTC* -- **PR** `#33777`_: (*sodium-chloride*) Fix minor docstring issue of arg being missing + * fe18bbb527 Merge pull request `#34392`_ from cro/salt-cloud-doc-clarify -- **PR** `#33759`_: (*cachedout*) Catch no minions exception in batch mode + * 6cce575d40 Clarify that salt-cloud doesn't get installed by bootstrap -- **PR** `#33719`_: (*cachedout*) Catch oserror for race condition +* **PR** `#34373`_: (`justinta`_) Network state integration test + @ *2016-06-30 15:05:44 UTC* -- **PR** `#33712`_: (*meaksh*) Fix for groupadd execution module failures in SLES11 systems + * 45b8fb10d7 Merge pull request `#34373`_ from jtand/network_state_integration_test -- **PR** `#33718`_: (*rallytime*) Back-port `#33700`_ to 2015.8 + * 1d24053e36 network.system sls file -- **PR** `#33727`_: (*terminalmage*) Fix git_pillar edge case for remote repos without a master branch + * 4a9e6af542 network.routes sls file -- **PR** `#33728`_: (*jfindlay*) Make `configurable_test_state` configurable in test mode + * 76c90b2ef6 network.managed sls file -- **PR** `#33729`_: (*twangboy*) Add exclude option to win_servermanager + * 84a36369fa Added network state integration test -- **PR** `#33743`_: (*vutny*) Debian installation docs: drop section about community-maintained repo + * **PR** `#34377`_: (`terminalmage`_) Optimize pkg integration tests and add a couple new tests -* 56c0a42 Create missing jid dir if it doesn't exist (`#33653`_) +* **PR** `#34368`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-06-29 17:54:49 UTC* -- **PR** `#33654`_: (*twangboy*) Fix win servermanager + * af8ef1e461 Merge pull request `#34368`_ from rallytime/merge-2015.8 -- **PR** `#33679`_: (*terminalmage*) Only compile the template contents if they evaluate to True + * 3bce0cb510 Merge branch '2015.5' into '2015.8' -- **PR** `#33685`_: (*jfindlay*) modules.cp.get_url: add test for https:// + * 970aaa46d4 Merge pull request `#34252`_ from gtmanfred/2015.5 -- **PR** `#33581`_: (*dincamihai*) Call zypper refresh after adding/modifying a repository + * 82183f1572 return list of nodes for lxc driver when called directly -- **PR** `#33681`_: (*rallytime*) Back-port `#33599`_ to 2015.8 + * **PR** `#34344`_: (`rallytime`_) Back-port `#34324`_ to 2015.8 -- **PR** `#33396`_: (*babilen*) Issue 33393 + * **PR** `#34324`_: (`cachedout`_) Test custom grains matcher (refs: `#34344`_) -- **PR** `#33652`_: (*terminalmage*) Lower the log level for failed auths +* **ISSUE** `#33674`_: (`edgan`_) salt-ssh returns a zero code on jinja template failure. (refs: `#34316`_) -- **PR** `#33615`_: (*danslimmon*) Fix crash on unconnectable MySQL server (resolves `#33582`_) +* **ISSUE** `#28300`_: (`srkunze`_) [salt-ssh] Does not return non-zero exit code (refs: `#34316`_) -- **PR** `#33558`_: (*twangboy*) Fix win servermanager + * **PR** `#34342`_: (`rallytime`_) Back-port `#34316`_ to 2015.8 -- **PR** `#33555`_: (*cachedout*) Fix crashing Maintenence process + * **PR** `#34316`_: (`edgan`_) Making salt-ssh pass proper return codes for jinja rendering errors (refs: `#34342`_) -- **PR** `#33501`_: (*meaksh*) unit tests for rpm.checksum() and zypper.download() + * **PR** `#34339`_: (`terminalmage`_) Revert py3modernize lint changes -- **PR** `#33513`_: (*rallytime*) Add a section to the jinja docs about escaping jinja +* **PR** `#34306`_: (`ghedo`_) Fix iptables.flush state: Do not force 'filter' table when flushing + @ *2016-06-28 19:03:14 UTC* -- **PR** `#33520`_: (*jacobhammons*) Updated version numbers in the docs for the 2016.3.0 release + * 046bdaa9f2 Merge pull request `#34306`_ from ghedo/iptables_flush_table -- **PR** `#33507`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 882c6c9c86 Do not force 'filter' table when flushing -- **PR** `#33503`_: (*rallytime*) Add docs about minion config file in standalone minion docs +* **ISSUE** `#34261`_: (`vernondcole`_) salt.modules.dnsmasq documentation errors (refs: `#34488`_, `#34323`_) -- **PR** `#33474`_: (*cachedout*) Fix diskusage beacon +* **ISSUE** `#34249`_: (`ssgward`_) Clarify doc on file.copy (refs: `#34323`_) -- **PR** `#33465`_: (*meaksh*) jobs.exit_success allow one to check if a job has executed and exit successfully +* **ISSUE** `#34247`_: (`gravyboat`_) Update logging docs to mention profile level (refs: `#34323`_) -- **PR** `#33487`_: (*jtand*) Add docstring examples to glance.py and nova.py [2015.8] +* **ISSUE** `#33694`_: (`hjc`_) Document That Local Files Can Be Used as a Source for File States (refs: `#34323`_) -- **PR** `#33481`_: (*rallytime*) Fix docs about etcd config options and add pillar_opts doc + * **PR** `#34323`_: (`jacobhammons`_) Doc clarifications to file modules, addition of new `profile` log lev… -- **PR** `#33490`_: (*rallytime*) Document the postgres.psql_query function + * **PR** `#34325`_: (`terminalmage`_) Remove unnecessarily-disabled sanity check -- **PR** `#33480`_: (*jfindlay*) states.service: minor doc updates +* **PR** `#34335`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-06-28 15:07:15 UTC* -* 4f96cc1 Return full pending computer name (`#33483`_) + * c5890a0eca Merge pull request `#34335`_ from rallytime/merge-2015.8 -* a89be5e Use six.string_types in jobs runner (`#33499`_) + * 2296587536 Merge branch '2015.5' into '2015.8' -- **PR** `#33491`_: (*BlaineAtAffirm*) fix jobs.list_jobs failing with search_target + * 6cce545d92 Merge pull request `#34313`_ from rallytime/bootstrap-2015.5 -- **PR** `#33478`_: (*rallytime*) Back-port `#32484`_ to 2015.8 + * c7db73be92 [2015.5] Update to latest bootstrap script v2016.06.27 -- **PR** `#33457`_: (*rallytime*) Make doc formatting consistent and use correct versionadded + * **PR** `#34319`_: (`rallytime`_) Back-port `#34244`_ to 2015.8 -* 1dfa956 Don't allow a "repo" kwarg for pkgrepo.managed (`#33477`_) + * **PR** `#34244`_: (`the-glu`_) Typo in dockerio doc (refs: `#34319`_) -* b4071b0 Allow for config entry to be a list in a dict for beacons (`#33476`_) +* **PR** `#34312`_: (`rallytime`_) [2015.8] Update to latest bootstrap script v2016.06.27 + @ *2016-06-27 18:59:59 UTC* -- **PR** `#33469`_: (*meaksh*) check the RPM signature of zypper pkg.download packages and report errors + * dd4c937009 Merge pull request `#34312`_ from rallytime/bootstrap-2015.8 -* 00f9090 Add docs about PyYAML's 1024 character limitations for simple keys (`#33459`_) + * 944a393f89 [2015.8] Update to latest bootstrap script v2016.06.27 -* 3b12f39 Prevent several minion processes on the same machine (`#33464`_) +* **PR** `#34307`_: (`rallytime`_) Fix test example in integration testing docs + @ *2016-06-27 17:41:24 UTC* -* c8b4f33 Make --gpg-auto-import-keys a global param when calling zypper (`#33432`_) + * 91703d2dc4 Merge pull request `#34307`_ from rallytime/fix-test-example -* 0c4e38c Fix the saltutil.wheel function and add integration tests (`#33414`_) + * f44a0543fe Fix test example in integration testing docs -* e4f00f9 Make sure the path we're removing is present first - avoid an OSError (`#33440`_) +* **PR** `#34233`_: (`thegoodduke`_) ipset: fix the comment containing blank + @ *2016-06-24 19:28:34 UTC* -* 93fd00b Avoid a syntax error by using " instead of escaped ' (`#33443`_) + * d235b1245b Merge pull request `#34233`_ from thegoodduke/for_2015.8_ipset -* ec60b9c Fix virtual function (`#33436`_) + * 4da5e35bf4 ipset: fix the comment containing blank -- **PR** `#33438`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **ISSUE** `#34037`_: (`bobrik`_) salt-call ignores --config-dir resulting in failing gpg renderer (refs: `#34257`_) -* c9d0de4 Documentation update in file.serialize. (`#33421`_) +* **PR** `#34257`_: (`rallytime`_) Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer + @ *2016-06-24 17:25:04 UTC* -* f8a90eb Fix LVM parameter devices as a pure list. Comma separated lists are c… (`#33398`_) + * 65c5675a3f Merge pull request `#34257`_ from rallytime/fix-34037 -* 3989e5b Spelling correction. (`#33406`_) + * d7a5e9b10e Remove test that doesn't actually test anything -* 9accb53 Update windows pkg.[install|remove] error logic (`#33321`_) + * c4c037d600 Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer -* 04ac89d Add note about reload_modules functionality for pkg.installed (`#33374`_) +* **ISSUE** `#34273`_: (`clinta`_) file.recurse does not properly cache files, adds a pipe to path (refs: `#34274`_) -* 637c2af Add note to absolute_imports practice about __future__ import (`#33377`_) +* **PR** `#34274`_: (`clinta`_) Don't escape source before calling managed + @ *2016-06-24 17:23:35 UTC* -* d35b81d Document how to set the alias file location for alias state (`#33380`_) + * 203870f147 Merge pull request `#34274`_ from clinta/2015.8 -- **PR** `#33403`_: (*jacobhammons*) 2015.8.10 release notes + * 6572454918 Don't escape source before calling managed -- **PR** `#33381`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **PR** `#34258`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-06-24 14:27:06 UTC* -* 946d27e Fix traceback in logging for config validation (`#33386`_) + * a59dc85a15 Merge pull request `#34258`_ from rallytime/merge-2015.8 -* 38fbcf8 Add note about name parameter in git_pillar docs (`#33369`_) + * ea914b67cd Merge branch '2015.5' into '2015.8' -* 4925199 Add win_pkg to list of modules that support "version" in pkg.installed (`#33362`_) + * 8d5ed91980 Merge pull request `#34225`_ from richardscollin/fix-win-set-datetime -* 7a400a9 Add note to docs about api settings for Hipchat API v2 (`#33365`_) + * 6286771ef7 Fix win_system.set_system_date_time -* 37e1930 Add initscripts, SystemD service units and environment files for Debian (`#32857`_) + * cb1e8bf082 Merge pull request `#34232`_ from thegoodduke/for_2015.5_ipset -- **PR** `#33370`_: (*jacobhammons*) Update docs version to 2015.8.9 + * 344eb60762 ipset: fix commont containing blank -- **PR** `#33366`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **ISSUE** `#33873`_: (`hrumph`_) refresh: True not working with pkg.installed state (refs: `#34093`_) -* f248003 Remove mentions of windows not supporting pkgs param (`#33361`_) +* **PR** `#34093`_: (`terminalmage`_) Catch CommandExecutionError in pkg states + @ *2016-06-23 21:00:13 UTC* -* 4fdb097 Update job_cache and keep_jobs docs to be more specific to their behavior (`#33328`_) + * 92962957c8 Merge pull request `#34093`_ from terminalmage/issue33873 -* 2f06918 Properly detect newer Linux Mint distros (`#33359`_) + * 5edb45d746 win_pkg: refresh pkg database if refresh=True passed to version() or list_pkgs() -* d85096c Fix UnboundLocalError in git.latest (`#33340`_) + * 0078adee35 Catch CommandExecutionError in pkg states -* e602446 Describes parameters in register_instances function (`#33339`_) +* **PR** `#34136`_: (`meaksh`_) Fixed behavior for SUSE OS grains in 2015.8 + @ *2016-06-23 20:24:58 UTC* -* 5c29c65 Fix some link errors in the test writing tutorial (`#33347`_) + * **PR** `#34134`_: (`meaksh`_) Fixed behavior for SUSE OS grains in 2016.3 (refs: `#34136`_) -* e532e58 Fix network.managed for windows (`#33312`_) + * **PR** `#33903`_: (`meaksh`_) Fetching grains['os'] from /etc/os-release on SUSE systems if it is possible (refs: `#34134`_) -* 11a2525 Bp 28467 calm mine (`#33327`_) + * cb5399787c Merge pull request `#34136`_ from meaksh/salt-suse-os-detection-2015.8 -* b897f2c import ps from psutil_compat in beacons (`#33334`_) + * 97f1958863 some cleanup and renaming -* 089c1a2 remove redundant, incorrect sudo_runas config documentation (`#33318`_) + * 72c8e5d78f better way to check for openSUSE Leap -* 1f7fda2 Disambiguate non-exact matches when checking if sysv service is enabled (`#33324`_) + * 548971bdc9 Fix for SUSE OS grains in 2015.8 -* 8c1f19a Allow concurrency mode in state runs if using sudo (`#33325`_) +* **ISSUE** `#34074`_: (`fooka03`_) Unable to use S3 file backend with 2016.3.1 on Ubuntu 14.04 or 16.04 (refs: `#34208`_) -* ed14ef2 Fix master hanging after a request from minion with removed key. (`#33333`_) +* **ISSUE** `#32916`_: (`giannello`_) file.managed memory usage with s3 sources (refs: `#33599`_) -* daafa27 Cleanup comments in smbios.get output (fixes `#33266`_) (`#33306`_) + * **PR** `#34208`_: (`lomeroe`_) fix regression from `#33681`_ which causes pulling a list of s3 objects … -* bfe12d9 Fix iptables --match-set (`#23643`_) (`#33314`_) + * **PR** `#33681`_: (`rallytime`_) Back-port `#33599`_ to 2015.8 (refs: `#34208`_) -- **PR** `#33308`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#33599`_: (`lomeroe`_) Fix s3 large file download (refs: `#33681`_) +* **ISSUE** `#34213`_: (`terminalmage`_) gitfs w/pygit2 - corner case, traceback with short hexidecimal environment names (refs: `#34218`_) + +* **ISSUE** `#34212`_: (`terminalmage`_) gitfs: commit SHAs no longer available as fileserver environments (refs: `#34218`_) + + * **PR** `#34218`_: (`terminalmage`_) Fix a pair of gitfs bugs + +* **ISSUE** `#34043`_: (`rallytime`_) state execution stacktraces when psutil isn't installed (refs: `#34182`_) + +* **PR** `#34182`_: (`rallytime`_) Handle child PIDs differently depending on the availability of psutils + @ *2016-06-22 19:22:06 UTC* + + * **PR** `#33942`_: (`cachedout`_) ZD 762 (refs: `#34182`_) + + * 6d643cd528 Merge pull request `#34182`_ from rallytime/fix-34043 + + * b7d49c5052 Handle child PIDs differently depending on the availability of psutils + + * **PR** `#34188`_: (`terminalmage`_) Clarify pkg.list_repo_pkgs docstring for held packages + + * **PR** `#34206`_: (`terminalmage`_) Change target for dockerng assuming default status to Nitrogen release + +* **PR** `#34184`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-06-21 21:43:46 UTC* + + * 1c4369d093 Merge pull request `#34184`_ from rallytime/merge-2015.8 + + * 8e36e90966 Merge branch '2015.5' into '2015.8' + + * 5411ebb3b4 Merge pull request `#34141`_ from jtand/boto_vpc_test_fix + + * b7ac6c735a Moved imports to top, out of _get_moto_version function + + * 02f9ba99ba Updated version check. Moved check into it's own function + + * d445026c56 Updated test to work with new moto version. Changed strings to unicode + +* **ISSUE** `#33972`_: (`morganwillcock`_) 2016.3.1 breaks diskusage beacon (refs: `#34176`_, `#34103`_) + +* **PR** `#34176`_: (`rallytime`_) Back-port `#34103`_ to 2015.8 + @ *2016-06-21 20:01:46 UTC* + + * **PR** `#34103`_: (`morganwillcock`_) Fix diskusage beacon (refs: `#34176`_) + + * **PR** `#33474`_: (`cachedout`_) Fix diskusage beacon (refs: `#34103`_) + + * c059d6c08c Merge pull request `#34176`_ from rallytime/bp-34103 + + * 2e5e7ed03c Fix diskusage beacon + +* **ISSUE** `#34114`_: (`onorua`_) can't read PID from lock file due to exception if gitfs_global_lock is enabled (refs: `#34179`_) + +* **PR** `#34179`_: (`terminalmage`_) Raise the correct exception when gitfs lockfile is empty + @ *2016-06-21 20:00:59 UTC* + + * 5cbaaed167 Merge pull request `#34179`_ from terminalmage/issue34114 + + * 86d1b8e864 Raise the correct exception when gitfs lockfile is empty + +* **PR** `#34178`_: (`terminalmage`_) Remove unnecesssary comment + @ *2016-06-21 19:15:37 UTC* + + * 67deded119 Merge pull request `#34178`_ from terminalmage/remove-comment + + * 4965be72b1 Remove unnecesssary comment + + * **PR** `#34165`_: (`mcalmer`_) fix salt --summary to count not responding minions correctly + + * **PR** `#34175`_: (`rallytime`_) Back-port `#34128`_ to 2015.8 + + * **PR** `#34128`_: (`bebehei`_) doc: add missing dot (refs: `#34175`_) + + * **PR** `#34174`_: (`rallytime`_) Back-port `#34066`_ to 2015.8 + + * **PR** `#34066`_: (`complexsplit`_) Typo fix (refs: `#34174`_) + +* **PR** `#34077`_: (`rallytime`_) Add some grains targeting tests + @ *2016-06-21 16:06:30 UTC* + + * 3669048654 Merge pull request `#34077`_ from rallytime/grains-tests + + * 2199bb8a78 Add integration tests for grains.append + + * 37cfe70724 Add some grains targeting tests + +* **PR** `#34142`_: (`isbm`_) Move log message from INFO to DEBUG. + @ *2016-06-20 18:57:34 UTC* + + * 65fba5b4d7 Merge pull request `#34142`_ from isbm/isbm-getid-loglevel-shift + + * 236a67b702 Move log message from INFO to DEBUG. + + * **PR** `#34100`_: (`terminalmage`_) Update documentation on "refresh" behavior in pkg states + + * **PR** `#34072`_: (`jfindlay`_) modules.pkg int tests: skip refresh_db upon error + +* **PR** `#34069`_: (`rallytime`_) Add a test to check for disconnected minion messaging + @ *2016-06-16 21:18:38 UTC* + + * 1b76de1557 Merge pull request `#34069`_ from rallytime/test-minion-return-message + + * 60561ac6fc Add a test to check for disconnected minion messaging + +* **ISSUE** `#30100`_: (`armooo`_) Masterless gitfs performance (refs: `#34048`_) + +* **PR** `#34048`_: (`terminalmage`_) RFC: proposed fix for multiple fileserver updates in masterless runs + @ *2016-06-16 21:10:59 UTC* + + * 3119693dac Merge pull request `#34048`_ from terminalmage/issue30100 + + * 715e7af8a4 Ensure only one fileserver update in a masterless run + +* **PR** `#34011`_: (`rallytime`_) Back-port `#33948`_ and `#34009`_ to 2015.8 + @ *2016-06-16 15:41:02 UTC* + + * **PR** `#34009`_: (`rallytime`_) Back-port `#33948`_ to 2016.3 + add log message (refs: `#34011`_) + + * **PR** `#33948`_: (`cachedout`_) Save an entire minion cache traversal on each master pub (refs: `#34011`_, `#34009`_) + + * dd03024931 Merge pull request `#34011`_ from rallytime/bp-33948-2015.8 + + * a4660d1ff7 Warn when custom returners don't have minions kwarg in save_load + + * 78befde62f Add note to release notes about returner minions kwarg change + + * 4e7f35fa36 Fix loop over cache in auth checking! + + * 06963e0505 Save an entire minion cache traversal on each master pub + + * **PR** `#34051`_: (`tegbert`_) Fixed a bug in the consul.py module that was preventing services + +* **PR** `#34045`_: (`jacobhammons`_) Updated latest release version + @ *2016-06-15 19:22:43 UTC* + + * 8ba117c7f6 Merge pull request `#34045`_ from jacobhammons/release-prev + + * 43b4a12aa2 Updated latest release version + + * **PR** `#34020`_: (`twangboy`_) Always make changes to minion config if set (2015.8) + + * **PR** `#34030`_: (`vutny`_) More YAML indentation fixes in state module examples + + * **PR** `#34003`_: (`vutny`_) states.file: fix indentation in YAML examples (refs: `#34030`_) + +* **PR** `#34018`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-06-14 22:53:19 UTC* + + * 5b5eae4ca9 Merge pull request `#34018`_ from rallytime/merge-2015.8 + + * 77f44f3087 Merge branch '2015.5' into '2015.8' + + * 871f7966ce Lint fix for `#34000`_ (`#34005`_) + + * f758e42172 Fix incorrectly written test (`#34000`_) + + * cf6281b4cf Add loader.utils() example to calling minion_mods (`#33953`_) + + * 6b98e8a9ea Merge pull request `#33880`_ from terminalmage/zh744 + + * ea726d11c8 pkg.uptodate: Pass kwargs to pkg.list_upgrades + + * de90b35d2b salt/modules/zypper.py: add fromrepo support to list_upgrades + + * 35fbb06df5 salt/modules/win_pkg.py: add kwargs to list_upgrades + + * bf5505f425 salt/modules/solarisips.py: add kwargs to list_upgrades + + * 6e89a8be98 salt/modules/pkgutil.py: add kwargs to list_upgrades + + * 5179dbcec4 salt/modules/pacman.py: add kwargs to list_upgrades + + * 46e5a52784 salt/modules/macports.py: add kwargs to list_upgrades + + * 76143b76ca salt/modules/ebuild.py: add kwargs to list_upgrades + + * b40fc9bc62 salt/modules/brew.py: add kwargs to list_upgrades + + * 4f11c16d86 salt/modules/aptpkg.py: add fromrepo support to list_upgrades + + * cb88960ed1 Merge pull request `#33904`_ from rallytime/bp-33806 + + * 638ccf501d Work around upstream cherrypy bug + + * **PR** `#34003`_: (`vutny`_) states.file: fix indentation in YAML examples (refs: `#34030`_) + +* **ISSUE** `#20809`_: (`lorengordon`_) Function pam.read_file is not available? (refs: `#34002`_) + + * **PR** `#34002`_: (`lorengordon`_) Remove loader test for pam module + +* **PR** `#33990`_: (`jacobhammons`_) Adds links to several current Salt-related projects + @ *2016-06-14 01:15:20 UTC* + + * c4dab6a074 Merge pull request `#33990`_ from jacobhammons/community-projects + + * b20213fd79 Adds links to several current Salt-related projects Removes the salt_projects.rst file which hasn't been updated in a long time, this is replaced by the updated topics/projects/index.rst file Adds a note about Salt Pack to the installation doc + +* **PR** `#33983`_: (`twangboy`_) Clarify the `account_exists` parameter + @ *2016-06-14 01:11:48 UTC* + + * 444c15792c Merge pull request `#33983`_ from twangboy/fix_docs_join_domain + + * b057be04b4 Fix typo, more documentation + + * d8c2f3e57a Clarify the `account_exists` parameter + +* **PR** `#33951`_: (`jfindlay`_) modules.gem int tests: more fixes + @ *2016-06-14 00:46:43 UTC* + + * 9bd2317992 Merge pull request `#33951`_ from jfindlay/gem_tests + + * 2eb633ccad modules.gem int tests: only check known installed gems + + * 9f3e18b037 modules.gem int tests: (un)install a non-core gem + +* **PR** `#33984`_: (`jfindlay`_) Add docs and tests to disk state + @ *2016-06-14 00:43:38 UTC* + + * 53baae6eb1 Merge pull request `#33984`_ from jfindlay/disk_capacity + + * 6cbe31e6c2 states.disk: rewrite unit tests + + * 82c77b533f states.disk.status: validate percent values + + * aedc4e15e5 states.disk: add documentation + +* **PR** `#33985`_: (`rallytime`_) Write some more simple batch command tests + @ *2016-06-14 00:38:05 UTC* + + * fa5efb6a69 Merge pull request `#33985`_ from rallytime/more-batch-tests + + * 3e7ab8c7b3 Write some more simple batch command tests + + * **PR** `#33684`_: (`jfindlay`_) add acl unit tests + + * **PR** `#33942`_: (`cachedout`_) ZD 762 (refs: `#34182`_) + +* **PR** `#33946`_: (`rallytime`_) Back-port `#33698`_ to 2015.8 + @ *2016-06-13 15:55:22 UTC* + + * **PR** `#33698`_: (`opdude`_) Vsphere fixes (refs: `#33946`_) + + * 0281d491c6 Merge pull request `#33946`_ from rallytime/bp-33698 + + * 5fdfed1cb9 Make sure we only use GetConnection if we are using a proxy salt minion + + * 1505c5724b Fix a bug with self signed certificates and creating a new VM + +* **ISSUE** `#33911`_: (`xlotlu`_) salt-ssh + grains.filter_by Type error: filter_by() got an unexpected keyword argument 'base' (refs: `#33952`_) + +* **PR** `#33952`_: (`rallytime`_) Add base argument to salt-ssh grains wrapper for filter_by func + @ *2016-06-13 15:51:33 UTC* + + * dff3f51955 Merge pull request `#33952`_ from rallytime/fix-33911 + + * 03b7cbbd2c Add base argument to salt-ssh grains wrapper for filter_by func + + * **PR** `#33962`_: (`jacobhammons`_) Adds a "Generated on " line to the html footer + +* **ISSUE** `#29525`_: (`apergos`_) master config setting ping_on_rotate is broken if minion_data_cache is disabled (refs: `#33765`_) + + * **PR** `#33765`_: (`cachedout`_) Correct issue with ping on rotate with minion cache + +* **PR** `#33888`_: (`jfindlay`_) random.org checks + @ *2016-06-10 15:45:07 UTC* + + * 378dd7ca06 Merge pull request `#33888`_ from jfindlay/random_check + + * 6acee3cc30 modules.random_org._query: only return text if present + + * 82f95429db modules.random_org unit tests: skip if random.org down + + * 1f9422e0cd utils.http.query: also except gaierror with tornado + +* **ISSUE** `#31499`_: (`Reiner030`_) FeatureRequest: boto_elb misses connection_settings - idle_timeout (refs: `#33936`_) + + * **PR** `#33936`_: (`rallytime`_) Add connecting_settings to boto_elb state attributes list + +* **ISSUE** `#29249`_: (`timcharper`_) `salt-cloud` `sync_after_install: all` does not seem to sync anything at all (refs: `#33917`_) + + * **PR** `#33917`_: (`techhat`_) Wait for up to a minute for sync_after_install + +* **PR** `#33877`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-06-09 14:50:42 UTC* + + * ef6da0be5d Merge pull request `#33877`_ from rallytime/merge-2015.8 + + * 398534a9e7 Fix ret return from merge-conflict resolution + + * b8e4706074 Merge branch '2015.5' into '2015.8' + + * cdda593c50 Merge pull request `#33829`_ from terminalmage/update-versionchanged + + * f7028eb1c6 Update versionchanged directive + + * b8e6c144d8 Merge pull request `#33833`_ from terminalmage/issue33645 + + * 91745c2a67 Support syncing pillar modules to masterless minions + + * e061788e81 Merge pull request `#33814`_ from terminalmage/archive-extracted-xz + + * 897a716df2 Support extraction of XZ archives in archive.extracted state + + * fa983e91cf Merge pull request `#33778`_ from sodium-chloride/2015.5-2016-0604-1938 + + * a5fb6d7a69 Fix minor docstring issues + + * b9133326c8 Merge pull request `#33726`_ from jtand/sysmod_skip_valid_docs_glance + + * ebee8a89af glance.warn_until shouldn't be checked for a doc string + + * 137f0b19f3 Merge pull request `#33611`_ from TargetHolding/2015.5 + + * 1dd15a603b solve' TypeError: expected string or buffer' in json/decoder.py + + * eaf42ca892 solve AttributeError: 'module' object has no attribute 'exception' + +* **ISSUE** `#33810`_: (`chiro79`_) locate.locate fails always (refs: `#33827`_) + +* **PR** `#33827`_: (`cachedout`_) Fix broken locate.locate function + @ *2016-06-08 13:49:57 UTC* + + * ec09095c45 Merge pull request `#33827`_ from cachedout/issue_33810 + + * 9d36f1e474 Fix broken locate.locate function + +* **PR** `#33839`_: (`cachedout`_) Fix another unit test stacktrace in pkg_resource + @ *2016-06-08 13:32:55 UTC* + + * f7b3d0eda0 Merge pull request `#33839`_ from cachedout/fix_pkgresource_test_stacktrace + + * 435547a747 Fix another unit test stacktrace in pkg_resource + +* **PR** `#33840`_: (`cachedout`_) Remove matcher tests + @ *2016-06-08 13:31:41 UTC* + + * 5f081ef31c Merge pull request `#33840`_ from cachedout/remove_matcher_unit_tests + + * 6297448377 Remove matcher tests + +* **PR** `#33836`_: (`cachedout`_) Fixing more stupid unit tests + @ *2016-06-07 21:34:04 UTC* + + * cda032dab2 Merge pull request `#33836`_ from cachedout/fix_winserver_manager_test + + * 453fb1ac91 Fixing more stupid unit tests + +* **PR** `#33805`_: (`jfindlay`_) states.pkg int tests: skip if pkg mgr unavailable + @ *2016-06-07 14:40:47 UTC* + + * 1db559afe9 Merge pull request `#33805`_ from jfindlay/pkg_tests + + * 0c069ddc95 states.pkg int tests: skip if pkg mgr unavailable + +* **PR** `#33808`_: (`jfindlay`_) fix some problems with the gem module integration tests + @ *2016-06-07 14:40:25 UTC* + + * 3984b65486 Merge pull request `#33808`_ from jfindlay/gem_tests + + * f7c19a1a58 modules.gem int tests: relax version checks + + * 6af47d2ba7 modules.gem int tests: remove pkgs before testing install + +* **PR** `#33770`_: (`jfindlay`_) service state integration tests + @ *2016-06-07 14:37:54 UTC* + + * c30d8a8c61 Merge pull request `#33770`_ from jfindlay/service_tests + + * f13f914755 states.service: add integration tests + + * 90aee79c39 states.service.mod_watch: update unit test + + * d210a92f09 states.service.mod_watch: update sfun and force docs + +* **PR** `#33691`_: (`justinta`_) Gem integration test + @ *2016-06-06 11:13:23 UTC* + + * 7fdfbe9a28 Merge pull request `#33691`_ from jtand/gem_integration_test + + * ff2dae103d ubuntu doesn't install default gems when ruby is installed + + * 504df9a65a Fixed lint error + + * 0cb1bfa0d3 Removed extra : + + * 86f59b3e80 Made more pythonic + + * 2f36f34981 Fixed salt.util import. Added status check to make sure external resource is available + + * 400a71ec33 Removed redundancies + + * 91db411bea A couple lint fixes + + * c97f3319b9 Add check for gem binary + + * 210aceb402 Refactored tests to not use return messages + + * 9d437bd45d Removed artifact from testing + + * 134e1fa888 Fixed typos, and added destructiveTest decorator + + * 37bc3ad8fd Fixed typo, uninstalled to uninstall + + * 5b23b91ac6 Integration test for gem module + +* **PR** `#33777`_: (`sacren`_) Fix minor docstring issue of arg being missing + @ *2016-06-06 10:44:59 UTC* + + * bb4194bb79 Merge pull request `#33777`_ from sodium-chloride/2015.8-2016-0604-1939 + + * c1fd830a1a Fix minor docstring issue of arg being missing + +* **ISSUE** `#31219`_: (`gladiatr72`_) when the minions have all been destroyed... (refs: `#33759`_) + +* **PR** `#33759`_: (`cachedout`_) Catch no minions exception in batch mode + @ *2016-06-03 21:22:49 UTC* + + * c749aea409 Merge pull request `#33759`_ from cachedout/issue_31219 + + * 15a39f8646 Catch no minions exception in batch mode + +* **ISSUE** `#33554`_: (`jfindlay`_) local cache missing directories while running test suite (refs: `#33653`_) + +* **PR** `#33719`_: (`cachedout`_) Catch oserror for race condition + @ *2016-06-03 17:25:26 UTC* + + * **PR** `#33653`_: (`cachedout`_) Create missing jid dir if it doesn't exist (refs: `#33719`_) + + * 47d668e071 Merge pull request `#33719`_ from cachedout/fixup_33653 + + * 635efa248b Change to just surround the mkdir + + * 21b7123a60 Catch oserror for race condition + +* **PR** `#33712`_: (`meaksh`_) Fix for groupadd execution module failures in SLES11 systems + @ *2016-06-03 16:13:06 UTC* + + * 11e39e7203 Merge pull request `#33712`_ from meaksh/fix-for-groupadd-module-failures-in-SLE11-2015.8 + + * ab738416ba pylint fix + + * bf27e5d36e test_members cleanup + + * ba815dbf76 improvements on groupadd unit tests + + * 3bbc5ae0d9 one line is better + + * a53dc192c9 fix groupadd module for sles11 systems + +* **PR** `#33718`_: (`rallytime`_) Back-port `#33700`_ to 2015.8 + @ *2016-06-03 16:10:44 UTC* + + * **PR** `#33700`_: (`sacren`_) Fix incorrect args passed to timezone.set_hwclock (refs: `#33718`_) + + * 2c450a7494 Merge pull request `#33718`_ from rallytime/bp-33700 + + * a6a446121a Fix speed issue + + * a41146730a Fix incorrect args passed to timezone.set_hwclock + +* **ISSUE** `#33725`_: (`terminalmage`_) git_pillar w/pygit2 fails to checkout a non-master branch when remote repo has no master branch (refs: `#33727`_) + +* **PR** `#33727`_: (`terminalmage`_) Fix git_pillar edge case for remote repos without a master branch + @ *2016-06-03 16:03:59 UTC* + + * b07701f0a0 Merge pull request `#33727`_ from terminalmage/issue33725 + + * d8ba7ed5a5 Fix git_pillar edge case for remote repos without a master branch + +* **PR** `#33728`_: (`jfindlay`_) Make `configurable_test_state` configurable in test mode + @ *2016-06-03 16:02:57 UTC* + + * 015e50cec8 Merge pull request `#33728`_ from jfindlay/test_state_test + + * 87e018af2a states.test.configurable_test_state: add unit tests + + * c2d0679c4b states.test.configurable_test_state: refactor change_data + + * f06ff1af1f states.test.configurable_test_state test mode + +* **PR** `#33729`_: (`twangboy`_) Add exclude option to win_servermanager + @ *2016-06-03 15:53:13 UTC* + + * 1cf8fe3f1d Merge pull request `#33729`_ from twangboy/fix_win_servermanager + + * 2de91d166f Fix docstring + + * 9870479d99 Add exclude option to state + + * 50bd76e206 Add exclude option + +* **ISSUE** `#31816`_: (`vutny`_) Deprecate or update the http://debian.saltstack.com/ (refs: `#33743`_) + +* **PR** `#33743`_: (`vutny`_) Debian installation docs: drop section about community-maintained repo + @ *2016-06-03 15:29:45 UTC* + + * 6c150d840d Merge pull request `#33743`_ from vutny/drop-debian-community-repo-doc + + * 8621f5be54 Debian installation docs: drop section about community-maintained repository + +* **ISSUE** `#33554`_: (`jfindlay`_) local cache missing directories while running test suite (refs: `#33653`_) + + * **PR** `#33653`_: (`cachedout`_) Create missing jid dir if it doesn't exist (refs: `#33719`_) + +* **PR** `#33654`_: (`twangboy`_) Fix win servermanager + @ *2016-06-02 17:55:45 UTC* + + * 8a566ff4b9 Merge pull request `#33654`_ from twangboy/fix_win_servermanager + + * 6c7b21676a Fix lint and tests + + * 4775e6bdf0 Add additional params to state + + * b0af32346d Add additional params to install and remove + +* **ISSUE** `#33424`_: (`thusoy`_) Error logging with non-environment branches in gitfs (refs: `#33679`_) + +* **PR** `#33679`_: (`terminalmage`_) Only compile the template contents if they evaluate to True + @ *2016-06-02 17:20:00 UTC* + + * 996ff56dd4 Merge pull request `#33679`_ from terminalmage/issue33424 + + * 9da40c4437 Append empty dictionaries for saltenvs with no top file + + * 5eb1b3ca62 Only compile the template contents if they evaluate to True + +* **PR** `#33685`_: (`jfindlay`_) modules.cp.get_url: add test for https:// + @ *2016-06-01 22:25:41 UTC* + + * c8dc70b96a Merge pull request `#33685`_ from jfindlay/get_url_test + + * 2b5035fdc0 modules.cp.get_url: add test for https:// + +* **PR** `#33581`_: (`dincamihai`_) Call zypper refresh after adding/modifying a repository + @ *2016-06-01 22:25:11 UTC* + + * 5e022ff29c Merge pull request `#33581`_ from dincamihai/2015.8 + + * 788730ea72 DRY test + + * 1d3769ccfa Improve zypper_patcher_config looks + + * 42d8d4195c Assert only gpgautoimport: True works + + * ced75e8e62 Reverse if conditions and rename variable + + * 80bfbe5c52 Reduce dicts and lists to one line where possible + + * 1d5d6d7d60 Update test method names to pass pylint + + * c7ae5907ee Call zypper refresh after adding/modifying a repository + +* **ISSUE** `#32916`_: (`giannello`_) file.managed memory usage with s3 sources (refs: `#33599`_) + +* **PR** `#33681`_: (`rallytime`_) Back-port `#33599`_ to 2015.8 (refs: `#34208`_) + @ *2016-06-01 21:14:29 UTC* + + * **PR** `#33599`_: (`lomeroe`_) Fix s3 large file download (refs: `#33681`_) + + * 069ee15b7c Merge pull request `#33681`_ from rallytime/bp-33599 + + * 45143a599b use requests streaming for uploads/downloads to file (return_bin unchanged) allows downloading files larger than amount of memory (non-stream reads into memory before writing to disk or uploading) + + * 4a9b23f03f first go at having requests use streaming for get/put requests + +* **ISSUE** `#33393`_: (`babilen`_) pip.installed does not work with ancient pip versions (refs: `#33396`_) + +* **PR** `#33396`_: (`babilen`_) Issue 33393 + @ *2016-06-01 21:12:03 UTC* + + * 13537c4891 Merge pull request `#33396`_ from babilen/issue-33393 + + * 57e0475cd4 Make pip InstallationError import more robust + + * 291a3e21fa Remove duplicated code. + +* **PR** `#33652`_: (`terminalmage`_) Lower the log level for failed auths + @ *2016-06-01 16:37:09 UTC* + + * 7bce4ece1a Merge pull request `#33652`_ from terminalmage/zh723 + + * 411841603a Lower the log level for failed auths + +* **ISSUE** `#33582`_: (`waxie`_) mysql module gives traceback if no working authentication (refs: `#33615`_) + +* **PR** `#33615`_: (`danslimmon`_) Fix crash on unconnectable MySQL server (resolves `#33582`_) + @ *2016-05-31 16:03:51 UTC* + + * 504989388a Merge pull request `#33615`_ from danslimmon/mysql-traceback-33582 + + * 180099ae9f Wrote test for broken server connection + + * c6c3ff02e3 Added some error checking to resolve `#33582`_. + +* **PR** `#33558`_: (`twangboy`_) Fix win servermanager + @ *2016-05-27 22:05:43 UTC* + + * b47182e47c Merge pull request `#33558`_ from twangboy/fix_win_servermanager + + * 62a6bde0ea Fix comment when already installed + + * 79bc7195dc Fix unit tests + + * 56a6f6bb83 Fix changes + + * 8ebe99ec5e Fix restart_needed + + * 6e478cbda0 Add restart needed + + * 72ebf26616 Add missing import + + * 193583be96 Use dictionary compare for changes in remove + + * 1ae7dd76c1 Use dictionary compare for changes + +* **ISSUE** `#33544`_: (`tjuup`_) Salt 2016.3.0 (Boron) clean_old_jobs fails (refs: `#33555`_) + +* **PR** `#33555`_: (`cachedout`_) Fix crashing Maintenence process + @ *2016-05-26 19:25:39 UTC* + + * 58d89d66e3 Merge pull request `#33555`_ from cachedout/issue_33544 + + * fe7ee7a470 Fix crashing Maintenence process + +* **PR** `#33501`_: (`meaksh`_) unit tests for rpm.checksum() and zypper.download() + @ *2016-05-26 14:34:27 UTC* + + * d052908729 Merge pull request `#33501`_ from meaksh/zypper-download-check-signature-2015.8 + + * eaaef25c79 lint issue fixed + + * 6b6febb211 unit tests for rpm.checksum() and zypper.download() + +* **ISSUE** `#33319`_: (`ghost`_) Salt interpets jinja syntax in contents pillar (refs: `#33513`_) + +* **PR** `#33513`_: (`rallytime`_) Add a section to the jinja docs about escaping jinja + @ *2016-05-26 14:24:58 UTC* + + * e2d0c4abb1 Merge pull request `#33513`_ from rallytime/fix-33319 + + * 81c1471209 Add a section to the jinja docs about escaping jinja + +* **PR** `#33520`_: (`jacobhammons`_) Updated version numbers in the docs for the 2016.3.0 release + @ *2016-05-26 14:15:00 UTC* + + * fabc15e616 Merge pull request `#33520`_ from jacobhammons/release-notes.8 + + * 42e358af7d Updated version numbers in the docs for the 2016.3.0 release + +* **PR** `#33507`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-05-25 19:14:41 UTC* + + * 5a6b037cbd Merge pull request `#33507`_ from rallytime/merge-2015.8 + + * 03b0c97520 Merge branch '2015.5' into '2015.8' + + * 6f7fda0354 Merge pull request `#33486`_ from jtand/2015.5 + + * d1e210fff8 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 + + * ee2ae0ea8a Added docstring examples to glance.image_schema and schema_get + + * 59e90064e6 modules.swift.head does not have a body. Should not be checked for a docstring right now. + + * f72ec1479b Merge pull request `#33482`_ from rallytime/pillar-opts-docs + + * 087564528d Add pillar_opts docs to master.rst + + * dc644b145d Merge pull request `#33488`_ from rallytime/fix-18752 + + * b0a9f4181f Add docs for the syndic_finger config + + * a4e84aa7d2 Merge pull request `#33454`_ from scubahub/2015.5 + + * df3c0b8e78 Correct (and make consistent) determination of the test flag. + + * 3a52ace673 manage account information for pam (`#33473`_) + +* **ISSUE** `#15252`_: (`gravyboat`_) Standalone minion docs don't explain what file is being modified. (refs: `#33503`_) + +* **PR** `#33503`_: (`rallytime`_) Add docs about minion config file in standalone minion docs + @ *2016-05-25 17:23:08 UTC* + + * ee76be3b0b Merge pull request `#33503`_ from rallytime/fix-15252 + + * cfc07f7641 Add docs about minion config file in standalone minion docs + +* **PR** `#33474`_: (`cachedout`_) Fix diskusage beacon (refs: `#34103`_) + @ *2016-05-25 17:10:54 UTC* + + * e9b648e461 Merge pull request `#33474`_ from cachedout/issue_29451 + + * aa2bac3a0d Remove debugging + + * 68d8050cb8 Fix diskusage beacon + +* **PR** `#33465`_: (`meaksh`_) jobs.exit_success allow to check if a job has executed and exit successfully + @ *2016-05-25 16:52:53 UTC* + + * 3bfb6bf719 Merge pull request `#33465`_ from meaksh/check-if-job-returns-successfully-2015.8 + + * 9deb70fd8e jobs.exit_success() now works parsing the results of jobs.lookup_id() + + * 7ba40c4f31 jobs.exit_success allow to check if a job has executed and exit successfully + + * **PR** `saltstack/salt-jenkins#175`_: (`justinta`_) Adding back shade to setup states (refs: `#33487`_) + +* **PR** `#33487`_: (`justinta`_) Add docstring examples to glance.py and nova.py [2015.8] + @ *2016-05-25 16:47:25 UTC* + + * 70eb7b66f3 Merge pull request `#33487`_ from jtand/glance_doc_fixes + + * 0b1cae05d9 Added docstring examples to glance methods and nova.list + + * ebf1256545 Don't need to check swift.head due to it having no body + +* **ISSUE** `#33423`_: (`warden`_) etcd profile doesn't work when used in master conf file (refs: `#33481`_) + +* **PR** `#33481`_: (`rallytime`_) Fix docs about etcd config options and add pillar_opts doc (refs: `#33482`_) + @ *2016-05-25 16:41:56 UTC* + + * 56ea979916 Merge pull request `#33481`_ from rallytime/fix-33423 + + * 7fd3e8f361 Fix docs about etcd config options and add pillar_opts doc + +* **ISSUE** `#16319`_: (`lsh-0`_) create a postgresql `query` function (refs: `#33490`_) + +* **PR** `#33490`_: (`rallytime`_) Document the postgres.psql_query function + @ *2016-05-25 16:41:22 UTC* + + * 2394cdc4bf Merge pull request `#33490`_ from rallytime/fix-16319 + + * 0c5548f9d1 Document the postgres.psql_query function + +* **PR** `#33480`_: (`jfindlay`_) states.service: minor doc updates + @ *2016-05-25 16:38:14 UTC* + + * ede232f0f1 Merge pull request `#33480`_ from jfindlay/service_doc + + * 29c00a1b1b states.service: clarify function description language + + * 6a9ae09e79 states.service.__virtual__: add load fail reason + + * **PR** `#33483`_: (`twangboy`_) Return full pending computer name (2015.8) + +* **ISSUE** `#32444`_: (`justindesilets`_) Feature Request - jobs runner list by target (refs: `#33491`_) + + * **PR** `#33499`_: (`cachedout`_) Use six.string_types in jobs runner + + * **PR** `#33491`_: (`BlaineAtAffirm`_) fix jobs.list_jobs failing with search_target (refs: `#33499`_) + +* **ISSUE** `#32444`_: (`justindesilets`_) Feature Request - jobs runner list by target (refs: `#33491`_) + +* **PR** `#33491`_: (`BlaineAtAffirm`_) fix jobs.list_jobs failing with search_target (refs: `#33499`_) + @ *2016-05-25 15:11:22 UTC* + + * 2e24a04565 Merge pull request `#33491`_ from BlaineAtAffirm/2015.8 + + * 7599b18995 fix jobs.list_jobs failing with search_target + +* **ISSUE** `#33467`_: (`beelit94`_) Orchestration gives exception when a target does not exist (refs: `#33478`_) + +* **ISSUE** `#32479`_: (`ssgward`_) Orchestration gives exception when a target does not exist (refs: `#32484`_, `#33478`_) + +* **PR** `#33478`_: (`rallytime`_) Back-port `#32484`_ to 2015.8 + @ *2016-05-24 19:14:23 UTC* + + * **PR** `#32484`_: (`cachedout`_) Only unsub if we have a jid (refs: `#33478`_) + + * 1861af427e Merge pull request `#33478`_ from rallytime/bp-32484 + + * 042f17efa4 Only unsub if we have a jid + +* **PR** `#33457`_: (`rallytime`_) Make doc formatting consistent and use correct versionadded + @ *2016-05-24 17:52:34 UTC* + + * b8154b678e Merge pull request `#33457`_ from rallytime/doc-formatting + + * 82f8f3efff Make doc formatting consistent and use correct versionadded + + * **PR** `#33477`_: (`terminalmage`_) Don't allow a "repo" kwarg for pkgrepo.managed + +* **ISSUE** `#29451`_: (`githubcdr`_) 2015.8.3 pillar beacons bugged? (refs: `#33476`_) + + * **PR** `#33476`_: (`cachedout`_) Allow for config entry to be a list in a dict for beacons + +* **PR** `#33469`_: (`meaksh`_) check the RPM signature of zypper pkg.download packages and report errors + @ *2016-05-24 16:09:05 UTC* + + * 9f56ab4c45 Merge pull request `#33469`_ from meaksh/zypper-download-check-signature-2015.8 + + * a65071a6d1 simpler rpm.checksum function + + * 80fe303e38 Renamed check_sig to checksum and some refactoring + + * d56e3f4258 bugfix: showing errors when a package download fails using zypper pkg.download + + * 8a21b9149e check the signature of downloaded RPM files + +* **ISSUE** `#33389`_: (`DaveQB`_) Too many hostnames in pillar? (refs: `#33459`_) + + * **PR** `#33459`_: (`rallytime`_) Add docs about PyYAML's 1024 character limitations for simple keys + + * **PR** `#33464`_: (`isbm`_) Prevent several minion processes on the same machine + + * **PR** `#33432`_: (`dincamihai`_) Make --gpg-auto-import-keys a global param when calling zypper + +* **ISSUE** `#32446`_: (`sel-fish`_) " salt '*' saltutil.wheel minions.connected " not work (refs: `#33414`_) + + * **PR** `#33414`_: (`rallytime`_) Fix the saltutil.wheel function and add integration tests + +* **ISSUE** `#29286`_: (`harlanbarnes`_) Can't disable Job Cache? (refs: `#33328`_) + + * **PR** `#33440`_: (`rallytime`_) Make sure the path we're removing is present first - avoid an OSError + + * **PR** `#33328`_: (`rallytime`_) Update job_cache and keep_jobs docs to be more specific to their behavior (refs: `#33440`_) + +* **ISSUE** `#26913`_: (`imchairmanm`_) manage.bootstrap runner quotation escape bug (refs: `#33443`_) + + * **PR** `#33443`_: (`rallytime`_) Avoid a syntax error by using " instead of escaped ' + + * **PR** `#33436`_: (`rmarcinik`_) Fix virtual function + +* **PR** `#33438`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-05-23 17:50:51 UTC* + + * 6e94a4a03b Merge pull request `#33438`_ from rallytime/merge-2015.8 + + * 7c41c34528 Merge branch '2015.5' into '2015.8' + + * 2cc650965a update 2015.5.11 release notes (`#33412`_) + + * dc8ce2d8b1 Fix traceback in logging for config validation (`#33386`_) (`#33405`_) + +* **ISSUE** `#33395`_: (`fmnisme`_) salt doc error (refs: `#33421`_) + + * **PR** `#33421`_: (`abednarik`_) Documentation update in file.serialize. + + * **PR** `#33398`_: (`lvg01`_) Fix LVM parameter devices as a pure list. Comma seperated lists are c… + + * **PR** `#33406`_: (`rallytime`_) Back-port `#33387`_ to 2015.8 + + * **PR** `#33387`_: (`tveastman`_) Spelling correction. (refs: `#33406`_) + +* **ISSUE** `#33298`_: (`lorengordon`_) Windows: pkg.install returns failed for msiexec/instmsi exit code 3010 (ERROR_SUCCESS_REBOOT_REQUIRED) (refs: `#33321`_) + + * **PR** `#33321`_: (`lorengordon`_) Update windows pkg.[install|remove] error logic + +* **ISSUE** `#29252`_: (`mitar`_) reload_modules is not documented for the pkg state (refs: `#33374`_) + + * **PR** `#33374`_: (`rallytime`_) Add note about reload_modules functionality for pkg.installed + +* **ISSUE** `#31430`_: (`The-Loeki`_) Salt Coding Style regarding absolute_imports (refs: `#33377`_) + + * **PR** `#33377`_: (`rallytime`_) Add note to absolute_imports practice about __future__ import + +* **ISSUE** `#21720`_: (`kaithar`_) Revisiting aliases.file option. (refs: `#33380`_) + + * **PR** `#33380`_: (`rallytime`_) Document how to set the alias file location for alias state + +* **PR** `#33403`_: (`jacobhammons`_) 2015.8.10 release notes + @ *2016-05-20 16:02:50 UTC* + + * 3c9def310c Merge pull request `#33403`_ from jacobhammons/dot10 + + * e850c298a9 2015.8.10 release notes + +* **PR** `#33381`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-05-20 15:58:11 UTC* + + * 91059224f6 Merge pull request `#33381`_ from rallytime/merge-2015.8 + + * 5aec32b20f Merge branch '2015.5' into '2015.8' + + * d15f5e2cef Merge pull request `#33383`_ from thatch45/2015.5 + + * f5ebcba21c restore whitespace + + * 1d8b289db1 blast, put the try/except int he right place + + * 081e6c5b83 maintain the fallabck because I am totally sick of this crap + + * 755acfb97e Improve doc clarity for disable_modules documentation (`#33379`_) + + * 8ef7697806 Merge branch '2015.5' into '2015.8' + + * 2b5ad128bf Better YAML syntax error handling (`#33375`_) + + * bb3e98cad2 Merge pull request `#33372`_ from jacobhammons/release-update + + * 5ce502160b revved 2015.8 branch to .9 in version selector + + * **PR** `#33386`_: (`terminalmage`_) Fix traceback in logging for config validation (refs: `#33405`_) + +* **ISSUE** `#27737`_: (`mpaolini`_) name param never mentioned in pillar_ext git documentation (refs: `#33369`_) + + * **PR** `#33369`_: (`rallytime`_) Add note about name parameter in git_pillar docs + +* **ISSUE** `#32913`_: (`hrumph`_) Possible problem with salt.states.pkg.installed documentation (refs: `#33362`_) + + * **PR** `#33362`_: (`rallytime`_) Add win_pkg to list of modules that support "version" in pkg.installed + +* **ISSUE** `#27779`_: (`jbouse`_) [Doc] Hipchat returner documentation update (refs: `#33365`_) + + * **PR** `#33365`_: (`rallytime`_) Add note to docs about api settings for Hipchat API v2 + + * **PR** `saltstack/salt-bootstrap#828`_: (`vutny`_) Fix bootstrapping from git on Debian 8 by installing latest `tornado` via pip (refs: `#32857`_) + + * **PR** `#820`_: (`dcolish`_) Refactor of cli parsers, normalize around conf_file (refs: #`saltstack/salt-bootstrap#828`_) + + * **PR** `#32857`_: (`vutny`_) Add initscripts, SystemD service units and environment files for Debian + +* **PR** `#33370`_: (`jacobhammons`_) Update docs version to 2015.8.9 + @ *2016-05-19 19:59:15 UTC* + + * 80f52a658e Merge pull request `#33370`_ from jacobhammons/2015.8.9 + + * 146b4df6be Updates docs version to 2015.8.9 Adds note regarding the os grain on Mint Linux Adds an FAQ regarding grains that change due to upstream changes + +* **PR** `#33366`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-05-19 19:41:40 UTC* + + * 3e5689abbf Merge pull request `#33366`_ from rallytime/merge-2015.8 + + * 52b3128678 Merge branch '2015.5' into '2015.8' + + * 55be0abf4d Expanded documentation for boto_elb state and module (`#33341`_) + +* **ISSUE** `#33313`_: (`morganwillcock`_) pkg.py: pkgs parameter documented as not supported on Windows (refs: `#33361`_) + +* **ISSUE** `#3313`_: (`mou`_) If no fileserver backend initialized there should be warning or error message on performing various file operations (refs: `#33361`_) + + * **PR** `#33361`_: (`rallytime`_) Remove mentions of windows not supporting pkgs param + +* **ISSUE** `#29286`_: (`harlanbarnes`_) Can't disable Job Cache? (refs: `#33328`_) + + * **PR** `#33328`_: (`rallytime`_) Update job_cache and keep_jobs docs to be more specific to their behavior (refs: `#33440`_) + +* **ISSUE** `#33295`_: (`andrew-vant`_) Linux Mint service module not correctly detected. (refs: `#33359`_) + + * **PR** `#33359`_: (`terminalmage`_) Properly detect newer Linux Mint distros + +* **ISSUE** `#32260`_: (`jagguli`_) git.latest UnboundLocalError: local variable 'desired_upstream' referenced before assignmen (refs: `#33340`_) + + * **PR** `#33340`_: (`terminalmage`_) Fix UnboundLocalError in git.latest + + * **PR** `#33339`_: (`phistrom`_) states.boto_elb Describe parameters in register_instances function + + * **PR** `#33347`_: (`rallytime`_) Fix some link errors in the test writing tutorial + + * **PR** `#33312`_: (`twangboy`_) Fix network.managed for windows + + * **PR** `#33327`_: (`cro`_) Bp 28467 calm mine + + * **PR** `#28467`_: (`jodv`_) Make mine.update more manageable for large environments (refs: `#33327`_) + + * **PR** `#33334`_: (`jfindlay`_) import ps from psutil_compat in beacons + +* **ISSUE** `#21520`_: (`jfindlay`_) sudo.salt_call is broken (refs: `#25089`_) + + * **PR** `#33318`_: (`jfindlay`_) remove redundant, incorrect sudo_runas config documentation + + * **PR** `#25089`_: (`jfindlay`_) fix minion sudo (refs: `#33318`_) + + * **PR** `#22480`_: (`thatch45`_) Add sudo user docs into salt (refs: `#33318`_) + + * **PR** `#20226`_: (`thatch45`_) Allow sudo priv escalation (refs: `#25089`_, `#33318`_) + +* **ISSUE** `#33323`_: (`terminalmage`_) Overeager globbing in systemd.py for sysv service detection (refs: `#33324`_) + + * **PR** `#33324`_: (`terminalmage`_) Disambiguate non-exact matches when checking if sysv service is enabled + +* **ISSUE** `#30130`_: (`dreampuf`_) Non-root minion not work with state.sls module (refs: `#33325`_) + + * **PR** `#33325`_: (`cachedout`_) Allow concurrency mode in state runs if using sudo + +* **ISSUE** `#29674`_: (`jakehilton`_) Salt Master Hang (refs: `#33333`_) + + * **PR** `#33333`_: (`DmitryKuzmenko`_) Fix master hanging after a request from minion with removed key. + +* **ISSUE** `#33266`_: (`Timandes`_) Method `grains.items` returns unexpected `manufacturer` information (refs: `#33302`_) + + * **PR** `#33306`_: (`rallytime`_) Back-port `#33302`_ to 2015.8 + + * **PR** `#33302`_: (`The-Loeki`_) Cleanup comments in smbios.get output (fixes `#33266`_) (refs: `#33306`_) + +* **ISSUE** `#23643`_: (`falzm`_) Error in iptables module: argument --match-set: expected 2 argument(s) (refs: `#33314`_, `#33301`_, `#28325`_) + + * **PR** `#33314`_: (`gerhardqux`_) Fix iptables --match-set (`#23643`_) + + * **PR** `#33301`_: (`gerhardqux`_) Fix iptables --match-set (`#23643`_) (refs: `#33314`_) + + * **PR** `#28325`_: (`l13t`_) Fix issue wiith --match-set option. `#23643`_ (refs: `#33314`_) + +* **PR** `#33308`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-05-17 19:26:05 UTC* + + * d0ed1616b0 Merge pull request `#33308`_ from rallytime/merge-2015.8 + + * 1c43a62f85 Merge branch '2015.5' into '2015.8' + + * 9b42a05519 Added some more docs for master and minion config settings (`#33292`_) + + * 5004d2fa61 Merge branch '2015.5' into '2015.8' + + * 8acee5e06c Fix iptables --match-set (`#23643`_) (`#33301`_) + + * 757ef20a31 fix "loose" typo (`#33290`_) + + * b7d98da64d Add auth_tries config option to minion.rst docs (`#33287`_) + + * 061851bcbf Document minion_id_caching config value (`#33282`_) + +.. _`#15252`: https://github.com/saltstack/salt/issues/15252 +.. _`#16319`: https://github.com/saltstack/salt/issues/16319 .. _`#20226`: https://github.com/saltstack/salt/pull/20226 +.. _`#20809`: https://github.com/saltstack/salt/issues/20809 +.. _`#21520`: https://github.com/saltstack/salt/issues/21520 +.. _`#21720`: https://github.com/saltstack/salt/issues/21720 .. _`#22480`: https://github.com/saltstack/salt/pull/22480 .. _`#23643`: https://github.com/saltstack/salt/issues/23643 .. _`#25089`: https://github.com/saltstack/salt/pull/25089 +.. _`#26913`: https://github.com/saltstack/salt/issues/26913 +.. _`#27737`: https://github.com/saltstack/salt/issues/27737 +.. _`#27779`: https://github.com/saltstack/salt/issues/27779 +.. _`#28300`: https://github.com/saltstack/salt/issues/28300 .. _`#28325`: https://github.com/saltstack/salt/pull/28325 .. _`#28467`: https://github.com/saltstack/salt/pull/28467 +.. _`#29249`: https://github.com/saltstack/salt/issues/29249 +.. _`#29252`: https://github.com/saltstack/salt/issues/29252 +.. _`#29286`: https://github.com/saltstack/salt/issues/29286 +.. _`#29451`: https://github.com/saltstack/salt/issues/29451 +.. _`#29525`: https://github.com/saltstack/salt/issues/29525 +.. _`#29674`: https://github.com/saltstack/salt/issues/29674 +.. _`#30100`: https://github.com/saltstack/salt/issues/30100 +.. _`#30130`: https://github.com/saltstack/salt/issues/30130 +.. _`#31219`: https://github.com/saltstack/salt/issues/31219 +.. _`#31430`: https://github.com/saltstack/salt/issues/31430 +.. _`#31499`: https://github.com/saltstack/salt/issues/31499 +.. _`#31816`: https://github.com/saltstack/salt/issues/31816 +.. _`#32260`: https://github.com/saltstack/salt/issues/32260 +.. _`#32444`: https://github.com/saltstack/salt/issues/32444 +.. _`#32446`: https://github.com/saltstack/salt/issues/32446 +.. _`#32479`: https://github.com/saltstack/salt/issues/32479 .. _`#32484`: https://github.com/saltstack/salt/pull/32484 .. _`#32857`: https://github.com/saltstack/salt/pull/32857 +.. _`#32913`: https://github.com/saltstack/salt/issues/32913 +.. _`#32916`: https://github.com/saltstack/salt/issues/32916 +.. _`#3313`: https://github.com/saltstack/salt/issues/3313 .. _`#33266`: https://github.com/saltstack/salt/issues/33266 .. _`#33282`: https://github.com/saltstack/salt/pull/33282 -.. _`#33286`: https://github.com/saltstack/salt/pull/33286 .. _`#33287`: https://github.com/saltstack/salt/pull/33287 .. _`#33290`: https://github.com/saltstack/salt/pull/33290 .. _`#33292`: https://github.com/saltstack/salt/pull/33292 +.. _`#33295`: https://github.com/saltstack/salt/issues/33295 +.. _`#33298`: https://github.com/saltstack/salt/issues/33298 .. _`#33301`: https://github.com/saltstack/salt/pull/33301 .. _`#33302`: https://github.com/saltstack/salt/pull/33302 .. _`#33306`: https://github.com/saltstack/salt/pull/33306 .. _`#33308`: https://github.com/saltstack/salt/pull/33308 .. _`#33312`: https://github.com/saltstack/salt/pull/33312 +.. _`#33313`: https://github.com/saltstack/salt/issues/33313 .. _`#33314`: https://github.com/saltstack/salt/pull/33314 .. _`#33318`: https://github.com/saltstack/salt/pull/33318 +.. _`#33319`: https://github.com/saltstack/salt/issues/33319 .. _`#33321`: https://github.com/saltstack/salt/pull/33321 +.. _`#33323`: https://github.com/saltstack/salt/issues/33323 .. _`#33324`: https://github.com/saltstack/salt/pull/33324 .. _`#33325`: https://github.com/saltstack/salt/pull/33325 .. _`#33327`: https://github.com/saltstack/salt/pull/33327 @@ -451,6 +1541,9 @@ Changes: .. _`#33383`: https://github.com/saltstack/salt/pull/33383 .. _`#33386`: https://github.com/saltstack/salt/pull/33386 .. _`#33387`: https://github.com/saltstack/salt/pull/33387 +.. _`#33389`: https://github.com/saltstack/salt/issues/33389 +.. _`#33393`: https://github.com/saltstack/salt/issues/33393 +.. _`#33395`: https://github.com/saltstack/salt/issues/33395 .. _`#33396`: https://github.com/saltstack/salt/pull/33396 .. _`#33398`: https://github.com/saltstack/salt/pull/33398 .. _`#33403`: https://github.com/saltstack/salt/pull/33403 @@ -459,6 +1552,8 @@ Changes: .. _`#33412`: https://github.com/saltstack/salt/pull/33412 .. _`#33414`: https://github.com/saltstack/salt/pull/33414 .. _`#33421`: https://github.com/saltstack/salt/pull/33421 +.. _`#33423`: https://github.com/saltstack/salt/issues/33423 +.. _`#33424`: https://github.com/saltstack/salt/issues/33424 .. _`#33432`: https://github.com/saltstack/salt/pull/33432 .. _`#33436`: https://github.com/saltstack/salt/pull/33436 .. _`#33438`: https://github.com/saltstack/salt/pull/33438 @@ -469,6 +1564,7 @@ Changes: .. _`#33459`: https://github.com/saltstack/salt/pull/33459 .. _`#33464`: https://github.com/saltstack/salt/pull/33464 .. _`#33465`: https://github.com/saltstack/salt/pull/33465 +.. _`#33467`: https://github.com/saltstack/salt/issues/33467 .. _`#33469`: https://github.com/saltstack/salt/pull/33469 .. _`#33473`: https://github.com/saltstack/salt/pull/33473 .. _`#33474`: https://github.com/saltstack/salt/pull/33474 @@ -490,6 +1586,8 @@ Changes: .. _`#33507`: https://github.com/saltstack/salt/pull/33507 .. _`#33513`: https://github.com/saltstack/salt/pull/33513 .. _`#33520`: https://github.com/saltstack/salt/pull/33520 +.. _`#33544`: https://github.com/saltstack/salt/issues/33544 +.. _`#33554`: https://github.com/saltstack/salt/issues/33554 .. _`#33555`: https://github.com/saltstack/salt/pull/33555 .. _`#33558`: https://github.com/saltstack/salt/pull/33558 .. _`#33581`: https://github.com/saltstack/salt/pull/33581 @@ -497,19 +1595,23 @@ Changes: .. _`#33599`: https://github.com/saltstack/salt/pull/33599 .. _`#33611`: https://github.com/saltstack/salt/pull/33611 .. _`#33615`: https://github.com/saltstack/salt/pull/33615 +.. _`#33649`: https://github.com/saltstack/salt/issues/33649 .. _`#33652`: https://github.com/saltstack/salt/pull/33652 .. _`#33653`: https://github.com/saltstack/salt/pull/33653 .. _`#33654`: https://github.com/saltstack/salt/pull/33654 +.. _`#33674`: https://github.com/saltstack/salt/issues/33674 .. _`#33679`: https://github.com/saltstack/salt/pull/33679 .. _`#33681`: https://github.com/saltstack/salt/pull/33681 .. _`#33684`: https://github.com/saltstack/salt/pull/33684 .. _`#33685`: https://github.com/saltstack/salt/pull/33685 .. _`#33691`: https://github.com/saltstack/salt/pull/33691 +.. _`#33694`: https://github.com/saltstack/salt/issues/33694 .. _`#33698`: https://github.com/saltstack/salt/pull/33698 .. _`#33700`: https://github.com/saltstack/salt/pull/33700 .. _`#33712`: https://github.com/saltstack/salt/pull/33712 .. _`#33718`: https://github.com/saltstack/salt/pull/33718 .. _`#33719`: https://github.com/saltstack/salt/pull/33719 +.. _`#33725`: https://github.com/saltstack/salt/issues/33725 .. _`#33726`: https://github.com/saltstack/salt/pull/33726 .. _`#33727`: https://github.com/saltstack/salt/pull/33727 .. _`#33728`: https://github.com/saltstack/salt/pull/33728 @@ -521,8 +1623,8 @@ Changes: .. _`#33777`: https://github.com/saltstack/salt/pull/33777 .. _`#33778`: https://github.com/saltstack/salt/pull/33778 .. _`#33805`: https://github.com/saltstack/salt/pull/33805 -.. _`#33806`: https://github.com/saltstack/salt/pull/33806 .. _`#33808`: https://github.com/saltstack/salt/pull/33808 +.. _`#33810`: https://github.com/saltstack/salt/issues/33810 .. _`#33814`: https://github.com/saltstack/salt/pull/33814 .. _`#33827`: https://github.com/saltstack/salt/pull/33827 .. _`#33829`: https://github.com/saltstack/salt/pull/33829 @@ -531,11 +1633,13 @@ Changes: .. _`#33839`: https://github.com/saltstack/salt/pull/33839 .. _`#33840`: https://github.com/saltstack/salt/pull/33840 .. _`#33851`: https://github.com/saltstack/salt/pull/33851 +.. _`#33873`: https://github.com/saltstack/salt/issues/33873 .. _`#33877`: https://github.com/saltstack/salt/pull/33877 .. _`#33880`: https://github.com/saltstack/salt/pull/33880 .. _`#33888`: https://github.com/saltstack/salt/pull/33888 .. _`#33903`: https://github.com/saltstack/salt/pull/33903 .. _`#33904`: https://github.com/saltstack/salt/pull/33904 +.. _`#33911`: https://github.com/saltstack/salt/issues/33911 .. _`#33917`: https://github.com/saltstack/salt/pull/33917 .. _`#33936`: https://github.com/saltstack/salt/pull/33936 .. _`#33942`: https://github.com/saltstack/salt/pull/33942 @@ -545,6 +1649,7 @@ Changes: .. _`#33952`: https://github.com/saltstack/salt/pull/33952 .. _`#33953`: https://github.com/saltstack/salt/pull/33953 .. _`#33962`: https://github.com/saltstack/salt/pull/33962 +.. _`#33972`: https://github.com/saltstack/salt/issues/33972 .. _`#33983`: https://github.com/saltstack/salt/pull/33983 .. _`#33984`: https://github.com/saltstack/salt/pull/33984 .. _`#33985`: https://github.com/saltstack/salt/pull/33985 @@ -558,16 +1663,20 @@ Changes: .. _`#34018`: https://github.com/saltstack/salt/pull/34018 .. _`#34020`: https://github.com/saltstack/salt/pull/34020 .. _`#34030`: https://github.com/saltstack/salt/pull/34030 +.. _`#34037`: https://github.com/saltstack/salt/issues/34037 +.. _`#34043`: https://github.com/saltstack/salt/issues/34043 .. _`#34045`: https://github.com/saltstack/salt/pull/34045 .. _`#34048`: https://github.com/saltstack/salt/pull/34048 .. _`#34051`: https://github.com/saltstack/salt/pull/34051 .. _`#34066`: https://github.com/saltstack/salt/pull/34066 .. _`#34069`: https://github.com/saltstack/salt/pull/34069 .. _`#34072`: https://github.com/saltstack/salt/pull/34072 +.. _`#34074`: https://github.com/saltstack/salt/issues/34074 .. _`#34077`: https://github.com/saltstack/salt/pull/34077 .. _`#34093`: https://github.com/saltstack/salt/pull/34093 .. _`#34100`: https://github.com/saltstack/salt/pull/34100 .. _`#34103`: https://github.com/saltstack/salt/pull/34103 +.. _`#34114`: https://github.com/saltstack/salt/issues/34114 .. _`#34128`: https://github.com/saltstack/salt/pull/34128 .. _`#34134`: https://github.com/saltstack/salt/pull/34134 .. _`#34136`: https://github.com/saltstack/salt/pull/34136 @@ -584,15 +1693,22 @@ Changes: .. _`#34188`: https://github.com/saltstack/salt/pull/34188 .. _`#34206`: https://github.com/saltstack/salt/pull/34206 .. _`#34208`: https://github.com/saltstack/salt/pull/34208 +.. _`#34212`: https://github.com/saltstack/salt/issues/34212 +.. _`#34213`: https://github.com/saltstack/salt/issues/34213 .. _`#34218`: https://github.com/saltstack/salt/pull/34218 .. _`#34225`: https://github.com/saltstack/salt/pull/34225 .. _`#34232`: https://github.com/saltstack/salt/pull/34232 .. _`#34233`: https://github.com/saltstack/salt/pull/34233 .. _`#34244`: https://github.com/saltstack/salt/pull/34244 +.. _`#34247`: https://github.com/saltstack/salt/issues/34247 +.. _`#34249`: https://github.com/saltstack/salt/issues/34249 .. _`#34252`: https://github.com/saltstack/salt/pull/34252 .. _`#34257`: https://github.com/saltstack/salt/pull/34257 .. _`#34258`: https://github.com/saltstack/salt/pull/34258 +.. _`#34261`: https://github.com/saltstack/salt/issues/34261 +.. _`#34273`: https://github.com/saltstack/salt/issues/34273 .. _`#34274`: https://github.com/saltstack/salt/pull/34274 +.. _`#34302`: https://github.com/saltstack/salt/issues/34302 .. _`#34306`: https://github.com/saltstack/salt/pull/34306 .. _`#34307`: https://github.com/saltstack/salt/pull/34307 .. _`#34312`: https://github.com/saltstack/salt/pull/34312 @@ -610,7 +1726,9 @@ Changes: .. _`#34368`: https://github.com/saltstack/salt/pull/34368 .. _`#34373`: https://github.com/saltstack/salt/pull/34373 .. _`#34377`: https://github.com/saltstack/salt/pull/34377 +.. _`#34390`: https://github.com/saltstack/salt/issues/34390 .. _`#34392`: https://github.com/saltstack/salt/pull/34392 +.. _`#34397`: https://github.com/saltstack/salt/issues/34397 .. _`#34401`: https://github.com/saltstack/salt/pull/34401 .. _`#34426`: https://github.com/saltstack/salt/pull/34426 .. _`#34429`: https://github.com/saltstack/salt/pull/34429 @@ -646,7 +1764,105 @@ Changes: .. _`#34617`: https://github.com/saltstack/salt/pull/34617 .. _`#34618`: https://github.com/saltstack/salt/pull/34618 .. _`#34642`: https://github.com/saltstack/salt/pull/34642 -.. _`#34644`: https://github.com/saltstack/salt/pull/34644 .. _`#34647`: https://github.com/saltstack/salt/pull/34647 .. _`#34651`: https://github.com/saltstack/salt/pull/34651 .. _`#34676`: https://github.com/saltstack/salt/pull/34676 +.. _`#34682`: https://github.com/saltstack/salt/pull/34682 +.. _`#820`: https://github.com/saltstack/salt/pull/820 +.. _`AAbouZaid`: https://github.com/AAbouZaid +.. _`BlaineAtAffirm`: https://github.com/BlaineAtAffirm +.. _`DaveQB`: https://github.com/DaveQB +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`Reiner030`: https://github.com/Reiner030 +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`Timandes`: https://github.com/Timandes +.. _`abednarik`: https://github.com/abednarik +.. _`andrew-vant`: https://github.com/andrew-vant +.. _`apergos`: https://github.com/apergos +.. _`armooo`: https://github.com/armooo +.. _`babilen`: https://github.com/babilen +.. _`bebehei`: https://github.com/bebehei +.. _`beelit94`: https://github.com/beelit94 +.. _`bobrik`: https://github.com/bobrik +.. _`cachedout`: https://github.com/cachedout +.. _`chiro79`: https://github.com/chiro79 +.. _`clinta`: https://github.com/clinta +.. _`complexsplit`: https://github.com/complexsplit +.. _`cro`: https://github.com/cro +.. _`danslimmon`: https://github.com/danslimmon +.. _`dcolish`: https://github.com/dcolish +.. _`dincamihai`: https://github.com/dincamihai +.. _`dreampuf`: https://github.com/dreampuf +.. _`edgan`: https://github.com/edgan +.. _`falzm`: https://github.com/falzm +.. _`fmnisme`: https://github.com/fmnisme +.. _`fooka03`: https://github.com/fooka03 +.. _`gerhardqux`: https://github.com/gerhardqux +.. _`ghedo`: https://github.com/ghedo +.. _`ghost`: https://github.com/ghost +.. _`giannello`: https://github.com/giannello +.. _`githubcdr`: https://github.com/githubcdr +.. _`gladiatr72`: https://github.com/gladiatr72 +.. _`gravyboat`: https://github.com/gravyboat +.. _`harlanbarnes`: https://github.com/harlanbarnes +.. _`hjc`: https://github.com/hjc +.. _`hrumph`: https://github.com/hrumph +.. _`imchairmanm`: https://github.com/imchairmanm +.. _`isbm`: https://github.com/isbm +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jagguli`: https://github.com/jagguli +.. _`jakehilton`: https://github.com/jakehilton +.. _`jaredhanson11`: https://github.com/jaredhanson11 +.. _`jbouse`: https://github.com/jbouse +.. _`jfindlay`: https://github.com/jfindlay +.. _`jodv`: https://github.com/jodv +.. _`justindesilets`: https://github.com/justindesilets +.. _`justinta`: https://github.com/justinta +.. _`kaithar`: https://github.com/kaithar +.. _`l13t`: https://github.com/l13t +.. _`lomeroe`: https://github.com/lomeroe +.. _`lorengordon`: https://github.com/lorengordon +.. _`lsh-0`: https://github.com/lsh-0 +.. _`lvg01`: https://github.com/lvg01 +.. _`mcalmer`: https://github.com/mcalmer +.. _`meaksh`: https://github.com/meaksh +.. _`mgresser`: https://github.com/mgresser +.. _`mitar`: https://github.com/mitar +.. _`morganwillcock`: https://github.com/morganwillcock +.. _`mou`: https://github.com/mou +.. _`mpaolini`: https://github.com/mpaolini +.. _`oeuftete`: https://github.com/oeuftete +.. _`onorua`: https://github.com/onorua +.. _`opdude`: https://github.com/opdude +.. _`phistrom`: https://github.com/phistrom +.. _`rallytime`: https://github.com/rallytime +.. _`rmarcinik`: https://github.com/rmarcinik +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`sacren`: https://github.com/sacren +.. _`saltstack/salt#33851`: https://github.com/saltstack/salt/pull/33851 +.. _`saltstack/salt#34644`: https://github.com/saltstack/salt/pull/34644 +.. _`saltstack/salt-bootstrap#828`: https://github.com/saltstack/salt-bootstrap/pull/828 +.. _`saltstack/salt-jenkins#175`: https://github.com/saltstack/salt-jenkins/pull/175 +.. _`sel-fish`: https://github.com/sel-fish +.. _`srkunze`: https://github.com/srkunze +.. _`ssgward`: https://github.com/ssgward +.. _`steverweber`: https://github.com/steverweber +.. _`techhat`: https://github.com/techhat +.. _`tegbert`: https://github.com/tegbert +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`the-glu`: https://github.com/the-glu +.. _`thegoodduke`: https://github.com/thegoodduke +.. _`thusoy`: https://github.com/thusoy +.. _`ticosax`: https://github.com/ticosax +.. _`timcharper`: https://github.com/timcharper +.. _`tjuup`: https://github.com/tjuup +.. _`tveastman`: https://github.com/tveastman +.. _`twangboy`: https://github.com/twangboy +.. _`tyhunt99`: https://github.com/tyhunt99 +.. _`vernondcole`: https://github.com/vernondcole +.. _`vutny`: https://github.com/vutny +.. _`warden`: https://github.com/warden +.. _`waxie`: https://github.com/waxie +.. _`xlotlu`: https://github.com/xlotlu +.. _`zer0def`: https://github.com/zer0def diff --git a/doc/topics/releases/2015.8.12.rst b/doc/topics/releases/2015.8.12.rst index 226d810dec..ed93299020 100644 --- a/doc/topics/releases/2015.8.12.rst +++ b/doc/topics/releases/2015.8.12.rst @@ -2,133 +2,772 @@ Salt 2015.8.12 Release Notes ============================ -Version 2015.8.12 is a bugfix release for :ref:`2015.8.0`. +Version 2015.8.12 is a bugfix release for :ref:`2015.8.0 `. -Changes for v2015.8.11..v2015.8.12 ----------------------------------- +Statistics +========== -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +- Total Merges: **58** +- Total Issue References: **43** +- Total PR References: **117** -*Generated at: 2016-08-19T16:06:27Z* +- Contributors: **29** (`Azidburn`_, `Ch3LL`_, `UtahDave`_, `bobrik`_, `cachedout`_, `cedwards`_, `deepakhj`_, `dere`_, `gongled`_, `gtmanfred`_, `hrumph`_, `hu-dabao`_, `isbm`_, `jacobhammons`_, `jfindlay`_, `jmesquita`_, `junovitch`_, `justinta`_, `kev009`_, `martinhoefling`_, `multani`_, `rallytime`_, `randomed`_, `sjorge`_, `terminalmage`_, `thatch45`_, `theothergraham`_, `twangboy`_, `whiteinge`_) -Total Merges: **57** -Changes: +Changelog for v2015.8.11..v2015.8.12 +==================================== -- **PR** `#35611`_: (rallytime*) Everything in the sample master config file should be commented out -- **PR** `#35569`_: (*rallytime) Write test for multiple unless commands where 1st cmd passes and 2nd fails -- **PR** `#35600`_: (*rallytime) Update release notes for 2015.8.12 -- **PR** `#35599`_: (*rallytime*) Update release notes for 2015.8.12 -- **PR** `#35584`_: (*terminalmage*) Update linux_sysctl tests to reflect new context key -- **PR** `#35575`_: (*terminalmage*) Add warning about AWS flagging of nmap usage -- **PR** `#35577`_: (*terminalmage*) Unit file changes for 2015.8.12, 2016.3.3 -- **PR** `#35566`_: (*rallytime*) Back-port `#35545`_ to 2015.8 -- **PR** `#35545`_: (*hu-dabao*) `fix-35384`_, fix cmd.run unless -- **PR** `#35492`_: (*terminalmage*) Clarify config.get docstring -- **PR** `#35483`_: (*gtmanfred*) use __utils__ in salt.cloud -- **PR** `#35546`_: (*whiteinge*) Salt api eauth fail gracefully -- **PR** `#35525`_: (*UtahDave*) add missing glob import -- **PR** `#35540`_: (*rallytime*) Whitespace fix for 2015.8 -- **PR** `#35510`_: (*terminalmage*) Better systemd integration -- **PR** `#35513`_: (*cachedout*) Might be a good idea to be able to download the software we make -- **PR** `#35302`_: (*Ch3LL*) Add job cache test -- **PR** `#35512`_: (*cachedout*) Fixup 35419 -- **PR** `#35497`_: (*deepakhj*) Fixes spacing in requirements files -- **PR** `#35508`_: (*terminalmage*) Add Carbon to versionadded for git.diff -- **PR** `#35486`_: (*rallytime*) Update bootstrap script to latest stable (2016.08.16) -- **PR** `#35413`_: (*cachedout*) Resolve path issues with cp.push -- **PR** `#35476`_: (*cachedout*) Fixup SSH bug where sudo without sudo user would break -- **PR** `#35471`_: (*terminalmage*) win_pkg: Fix traceback when package is not installed -- **PR** `#35448`_: (*isbm*) Add ignore_repo_failure option to suppress zypper's exit code 106 on … -- **PR** `#35451`_: (*isbm*) Bugfix: zypper mod repo unchanged -- **PR** `#35453`_: (*theothergraham*) fixes `#34279`_ - disk cache ttl expiry -- **PR** `#35459`_: (*thatch45*) Ensure that output for salt-ssh gets back -- **PR** `#35460`_: (*rallytime*) [2015.8] Update bootstrap script to latest stable (2016.08.15) -- **PR** `#35442`_: (*cachedout*) Fix cp.push_dir pushing empty dirs -- **PR** `#35436`_: (*cachedout*) Minor doc fixup -- **PR** `#35132`_: (*sjorge*) fixes , causing lots of mayham (onchange) with 2016.3.2 for me -- **PR** `#35394`_: (*rallytime*) Back-port `#34573`_ to 2015.8 -- **PR** `#34573`_: (*cedwards*) Update freebsd.rst -- **PR** `#35359`_: (*terminalmage*) Clean up open filehandles -- **PR** `#35339`_: (*isbm*) Bugfix: Prevent continuous restart, if a dependency wasn't installed -- **PR** `#35357`_: (*twangboy*) Fix file.recurse with clean: True on Windows (2015.8) -- **PR** `#35323`_: (*thatch45*) Fix issue with bad error check in salt-vt -- **PR** `#35325`_: (*kev009*) Fix freebsd netstat route on fbsd 10+ -- **PR** `#35301`_: (*bobrik*) Pass port to ssh.check_known_host, closes `#35264`_ -- **PR** `#35309`_: (*terminalmage*) file.recurse: Do not convert octal mode string to int -- **PR** `#35290`_: (*terminalmage*) Resolve a couple bugs in orchestration output -- **PR** `#35211`_: (*cachedout*) Alternative sudo users for salt-ssh -- **PR** `#35271`_: (*bobrik*) Default state_output_profile to True everywhere, closes `#35166`_ -- **PR** `#35233`_: (*terminalmage*) Do not attempt to get fqdn_ip{4,6} grains when ipv{4,6} grains are empty -- **PR** `#35202`_: (*multani*) doc: fix broken links in the test documentation page -- **PR** `#35236`_: (*rallytime*) Back-port `#35119`_ to 2015.8 -- **PR** `#35119`_: (*derekmaciel*) Assume two EVRs are equal if E and V are equal but one R is missing. -- **PR** `#35240`_: (*derekmaciel*) Backport `#35225`_ to 2015.8 -- **PR** `#35225`_: (*derekmaciel*) Add missing documentation for pkg.installed -- **PR** `#35241`_: (*terminalmage*) Ensure max recursion in gitfs results in no blob object being returned. -- **PR** `#35245`_: (*rallytime*) Back-port `#35039`_ to 2015.8 -- **PR** `#35039`_: (*whiteinge*) Add saltenv support to module.run -- **PR** `#35249`_: (*terminalmage*) Fix regression in git.latest -- **PR** `#35174`_: (*rallytime*) Back-port `#35146`_ to 2015.8 -- **PR** `#35146`_: (*cachedout*) Don't discard running beacons config when listing becaons -- **PR** `#34827`_: (*thatch45*) fix beacon list to include all beacons being processed -- **PR** `#35173`_: (*rallytime*) Back-port `#35135`_ to 2015.8 -- **PR** `#35135`_: (*rallytime*) Add missing CLI Examples to aws_sqs module funcs -- **PR** `#35145`_: (*jacobhammons*) doc version update to 2015.8.11, updates to release notes -- **PR** `#35114`_: (*terminalmage*) Add clarification docs on a common git_pillar misconfiguration -- **PR** `#34768`_: (*hrumph*) Fixes `#34767`_ -- **PR** `#35043`_: (*rallytime*) Start release notes file for 2015.8.12 -- **PR** `#35050`_: (*terminalmage*) [orchestration] Properly handle runner/wheel funcs which accept a 'saltdev' argument -- **PR** `#35066`_: (*jfindlay*) returners.postgres_local_cache: do not log in __virtual__ -- **PR** `#35024`_: (*bobrik*) Cache systemd unit update check per unit, closes `#34927`_ -- **PR** `#35026`_: (*cachedout*) Expressly deny a minion if a key cannot be found -- **PR** `#35000`_: (*rallytime*) Back-port `#33875`_ and `#34999`_ to 2015.8 -- **PR** `#33875`_: (*jmesquita*) Fix naive fileserver map diff algorithm -- **PR** `#34994`_: (*rallytime*) Back-port `#34835`_ to 2015.8 -- **PR** `#34835`_: (*thatch45*) Make the mine and publish combine minion and master opts in salt-ssh -- **PR** `#34991`_: (*cachedout*) SSH timeout -- **PR** `#34976`_: (*cachedout*) Refine errors in client -- **PR** `#34831`_: (*thatch45*) If the thin does not match, then redeploy, don't error -- **PR** `#34916`_: (*cachedout*) Master performance improvement -- **PR** `#34911`_: (*cachedout*) Backport `#34906`_ -- **PR** `#34906`_: (*cachedout*) Set timeout for run_salt in test suite -- **PR** `#34898`_: (*hrumph*) Stop multiple refreshes during call to pkg.list_upgrades -- **PR** `#34606`_: (*isbm*) Bugfix: Exit on configuration read (backport) -- **PR** `#34862`_: (*thatch45*) Fix salt-ssh cacheing issue -- **PR** `#34869`_: (*terminalmage*) Fail git.latest states with uncommitted changes when force_reset=False -- **PR** `#34859`_: (*cachedout*) Fix wheel test -- **PR** `#34822`_: (*thatch45*) Fix salt-ssh state.high and state.low -- **PR** `#34847`_: (*cachedout*) Add an option to skip the verification of client_acl users -- **PR** `#34827`_: (*thatch45*) fix beacon list to include all beacons being processed -- **PR** `#34833`_: (*rallytime*) Back-port `#28521`_ to 2015.8 -- **PR** `#28521`_: (*gongled*) SPM: packaging doesn't work in Python 2.6. Fixed. -- **PR** `#34823`_: (*rallytime*) Back-port `#25276`_ to 2015.8 -- **PR** `#25276`_: (*jacobhammons*) copy spm.1 man page during setup -- **PR** `#34828`_: (*thatch45*) Fix `#34648`_ -- **PR** `#34818`_: (*jtand*) Skip mysql state test if mysqladmin is not available -- **PR** `#34642`_: (*jtand*) Check that mysqladmin exists before running mysql integration tests -- **PR** `#34803`_: (*junovitch*) salt/state.py: set `chunk['order'] = 0' with `order: first'; fixes `#24744`_ -- **PR** `#34773`_: (*randomed*) Bugfix: Startup states on minions are not being written to mysql returner -- **PR** `#34751`_: (*cachedout*) Remove unnedeed config test -- **PR** `#34606`_: (*isbm*) Bugfix: Exit on configuration read (backport) -- **PR** `#34754`_: (*cachedout*) Disable test -- **PR** `#34741`_: (*rallytime*) Back-port `#34726`_ to 2015.8 -- **PR** `#34726`_: (*martinhoefling*) Always loop over updated keys in non recursive update -- **PR** `#34721`_: (*rallytime*) Add output_file option to master config docs -- **PR** `#34689`_: (*Azidburn*) fix second run problems with pkg.installed using sources -- **PR** `#34695`_: (*isbm*) Bugfix: Zypper `pkg.list_products` returns False on some empty values (2015.8) +*Generated at: 2018-05-28 01:19:12 UTC* + +* **PR** `#35614`_: (`rallytime`_) Update release notes for 2015.8.12 + +* **PR** `#35611`_: (`rallytime`_) Everything in the sample master config file should be commented out + +* **ISSUE** `#35384`_: (`ghost`_) The unless requisite stops at first successful command (refs: `#35569`_) + + * **PR** `saltstack/salt#35545`_: (`hu-dabao`_) fix-35384, fix cmd.run unless (refs: `#35566`_) + +* **PR** `#35569`_: (`rallytime`_) Write test for multiple unless commands where 1st cmd passes and 2nd fails + @ *2016-08-19 19:28:01 UTC* + + * **PR** `#35566`_: (`rallytime`_) Back-port `#35545`_ to 2015.8 (refs: `#35569`_) + + * **PR** `#35545`_: (`hu-dabao`_) fix-35384, fix cmd.run unless (refs: `#35569`_, `#35566`_) + + * c9070c212f Merge pull request `#35569`_ from rallytime/test-for-35384 + + * 30f42d5352 Write test for multiple unless commands where 1st cmd passes and 2nd fails + + * **PR** `#35600`_: (`rallytime`_) Update release notes for 2015.8.12 + + * **PR** `#35599`_: (`rallytime`_) Update release notes for 2015.8.12 + + * **PR** `#35584`_: (`terminalmage`_) Update linux_sysctl tests to reflect new context key + + * **PR** `#35575`_: (`terminalmage`_) Add warning about AWS flagging of nmap usage + +* **PR** `#35577`_: (`terminalmage`_) Unit file changes for 2015.8.12, 2016.3.3 + @ *2016-08-18 20:36:25 UTC* + + * 26a7f7d9f7 Merge pull request `#35577`_ from terminalmage/unit-file-changes + + * 6cb0fb47f3 pkg/salt-syndic.service: change Type to notify + + * 175ba99e0e pkg/salt-minion.service: remove KillMode, change Type to notify + + * 540ec28954 pkg/salt-master.service: remove KillMode + + * 69fad464ab pkg/salt-api.service: change Type to notify + + * **PR** `saltstack/salt#35545`_: (`hu-dabao`_) fix-35384, fix cmd.run unless (refs: `#35566`_) + + * **PR** `#35566`_: (`rallytime`_) Back-port `#35545`_ to 2015.8 (refs: `#35569`_) + + * **PR** `#35545`_: (`hu-dabao`_) fix-35384, fix cmd.run unless (refs: `#35569`_, `#35566`_) + + * **PR** `#35492`_: (`terminalmage`_) Clarify config.get docstring + +* **ISSUE** `saltstack/salt#18419`_: (`jasonrm`_) salt-cloud fails to run as non-root user (refs: `#35483`_) + +* **ISSUE** `#34806`_: (`jerrykan`_) salt-cloud ignores sock_dir when firing event (refs: `#35483`_) + +* **PR** `#35483`_: (`gtmanfred`_) use __utils__ in salt.cloud + @ *2016-08-18 13:32:22 UTC* + + * 205d8e2e7b Merge pull request `#35483`_ from gtmanfred/2015.8 + + * 2d8ec1e9db use __opts__ in salt.utils.cloud for cache functions + +* **PR** `#35546`_: (`whiteinge`_) Salt api eauth fail gracefully + @ *2016-08-18 07:21:55 UTC* + + * 70fa2d0901 Merge pull request `#35546`_ from whiteinge/salt-api-eauth-fail-gracefully + + * eb3574adae Don't fail hard if the user's permissions cannot be found + + * ec597bd54c Change groups check in token to look for truthy values + + * **PR** `#35525`_: (`UtahDave`_) add missing glob import + + * **PR** `#35540`_: (`rallytime`_) Whitespace fix for 2015.8 + +* **ISSUE** `#33803`_: (`dmurphy18`_) systemd notification is not fully supported by Salt (refs: `#35510`_) + +* **ISSUE** `#33516`_: (`Ch3LL`_) When upgrading from 2015.8.10 to 2016.3.0 on centos7/redhat7 I have to restart the salt-minion twice (refs: `#35510`_) + +* **PR** `#35510`_: (`terminalmage`_) Better systemd integration + @ *2016-08-17 18:54:11 UTC* + + * fd3274c800 Merge pull request `#35510`_ from terminalmage/issue33516 + + * 5b5f19d269 Update zypper unit test to reflect call to config.get + + * 2730edb516 Add note about systemd-run usage in package states + + * e2d9e87e10 salt/modules/systemd.py: Use systemd-run --scope where needed + + * 22919a25bc Notify systemd on salt-api start + + * a40b3f8a08 Notify systemd on syndic start + + * e847d3af30 Notify systemd on minion start + + * d648887afc salt/modules/zypper.py: Use systemd-run --scope where needed + + * 2e17976722 salt/modules/yumpkg.py: Use systemd-run --scope where needed + + * 86b59c1e74 salt/modules/pacman.py: Use systemd-run --scope where needed + + * e32d92c6d5 salt/modules/ebuild.py: Use systemd-run --scope where needed + + * c7d21d3ae3 salt/modules/aptpkg.py: Use systemd-run --scope where needed + + * f83e0ef242 Add unit tests for salt.utils.systemd + + * 5b12f030c6 Add func to salt.utils.systemd to tell if scopes are available + + * **PR** `#35513`_: (`cachedout`_) Might be a good idea to be able to download the software we make + +* **PR** `#35302`_: (`Ch3LL`_) Add job cache test + @ *2016-08-17 10:45:28 UTC* + + * 9f87081cef Merge pull request `#35302`_ from Ch3LL/add_job_cache_test + + * ccb2a5cadf remove unused imports + + * 512ae81dfd remove TMP and add integration.TMP + + * c9b7c3cf80 need to add returners option in other places + + * 7316df7a02 fix pylint + + * 50a4f0fe6a fix comment + + * 6837acf742 add job cache integration tests + +* **PR** `#35512`_: (`cachedout`_) Fixup 35419 + @ *2016-08-17 10:11:17 UTC* + + * 1c82c6bee5 Merge pull request `#35512`_ from cachedout/fixup_35419 + + * 253662541a Fix import + + * f16a30786b Fixes consul.agent_service_register which was broken for registering service checks. + +* **PR** `#35497`_: (`deepakhj`_) Fixes spacing in requirements files + @ *2016-08-17 09:34:15 UTC* + + * e1a373fa4c Merge pull request `#35497`_ from deepakhj/2015.8 + + * 685db4ab88 Fix spacing + +* **PR** `#35508`_: (`terminalmage`_) Add Carbon to versionadded for git.diff + @ *2016-08-17 06:17:12 UTC* + + * 4048255ed6 Merge pull request `#35508`_ from terminalmage/update-docstring + + * 67c945fce0 Add Carbon to versionadded for git.diff + + * **PR** `#35486`_: (`rallytime`_) Update bootstrap script to latest stable (2016.08.16) + +* **ISSUE** `#35296`_: (`szjur`_) cp.push_dir gets confused when using upload_path and is probably insecure too (refs: `#35413`_) + +* **PR** `#35413`_: (`cachedout`_) Resolve path issues with cp.push + @ *2016-08-16 16:40:39 UTC* + + * 240fc12863 Merge pull request `#35413`_ from cachedout/issue_35296 + + * fb8a12d677 Fix silly error + + * 3646cf1afa Additional checks on master and integration test + + * 09efde7634 Splat the list into os.path.join + + * fc0d5878bc Set file_recv on test master + + * 81c4d136c5 Transition file push paths to lists + +* **ISSUE** `saltstack/salt#35380`_: (`anlutro`_) salt-ssh with sudo stopped working (refs: `#35476`_) + +* **PR** `#35476`_: (`cachedout`_) Fixup SSH bug where sudo without sudo user would break + @ *2016-08-16 15:41:25 UTC* + + * c3319b2a8b Merge pull request `#35476`_ from cachedout/issue_35380 + + * c05fcf33d1 Fixup SSH bug where sudo without sudo user would break + +* **PR** `#35471`_: (`terminalmage`_) win_pkg: Fix traceback when package is not installed + @ *2016-08-16 02:02:00 UTC* + + * 004778c966 Merge pull request `#35471`_ from terminalmage/issue34479 + + * e243c63e43 win_pkg: Fix traceback when package is not installed + +* **PR** `#35448`_: (`isbm`_) Add ignore_repo_failure option to suppress zypper's exit code 106 on … + @ *2016-08-16 01:39:43 UTC* + + * 5c9428c32d Merge pull request `#35448`_ from isbm/isbm-zypper-106-fix + + * dd82e6a848 Add ignore_repo_failure option to suppress zypper's exit code 106 on unavailable repos + +* **PR** `#35451`_: (`isbm`_) Bugfix: zypper mod repo unchanged + @ *2016-08-16 01:38:25 UTC* + + * 1473474b04 Merge pull request `#35451`_ from isbm/isbm-zypper-mod_repo-unchanged + + * 8790197d86 Fix Unit test for suppressing the exception removal on non-modified repos + + * 3f00c6997a Remove zypper's raise exception if mod_repo has no arguments and/or no changes + +* **ISSUE** `saltstack/salt#34279`_: (`vmadura`_) Salt 2016.3.1 - Master Side Pillar Cache (backend: Disk) never Expires. (refs: `#35453`_) + +* **ISSUE** `#34279`_: (`vmadura`_) Salt 2016.3.1 - Master Side Pillar Cache (backend: Disk) never Expires. (refs: `#35453`_) + +* **PR** `#35453`_: (`theothergraham`_) fixes `#34279`_ - disk cache ttl expiry + @ *2016-08-16 01:34:33 UTC* + + * a8c4f17f50 Merge pull request `#35453`_ from theothergraham/fix_CacheDisk + + * ae5b233d51 fixes `#34279`_ + +* **PR** `#35459`_: (`thatch45`_) Ensure that output for salt-ssh gets back + @ *2016-08-16 01:29:16 UTC* + + * d8c35b5260 Merge pull request `#35459`_ from thatch45/shim_fix + + * 10037b00cb Some environments refuse to return the command output + + * **PR** `#35460`_: (`rallytime`_) [2015.8] Update bootstrap script to latest stable (2016.08.15) + +* **ISSUE** `saltstack/salt#35010`_: (`vchav73`_) cp.push_dir returns incorrect result for non-existent directories (refs: `#35442`_) + + * **PR** `#35442`_: (`cachedout`_) Fix cp.push_dir pushing empty dirs + +* **ISSUE** `saltstack/salt#35387`_: (`mzealey`_) Document reload_grains and reload_pillar (refs: `#35436`_) + + * **PR** `#35436`_: (`cachedout`_) Minor doc fixup + +* **ISSUE** `saltstack/salt#35121`_: (`sjorge`_) file.append always results in change (refs: `#35132`_) + +* **PR** `#35132`_: (`sjorge`_) fixes , causing lots of mayham (onchange) with 2016.3.2 for me + @ *2016-08-15 07:11:22 UTC* + + * a0b128a85a Merge pull request `#35132`_ from sjorge/2015.8-35121 + + * 5cb38c8ae0 switch to fpread().splitlines(), as per @lorengordon suggestion + + * 634f1dded5 fixes `#35121`_, causing lots of mayham (onchange) with 2016.3.2 for me + + * **PR** `saltstack/salt#34573`_: (`cedwards`_) Update freebsd.rst (refs: `#35394`_) + + * **PR** `#35394`_: (`rallytime`_) Back-port `#34573`_ to 2015.8 + + * **PR** `#34573`_: (`cedwards`_) Update freebsd.rst (refs: `#35394`_) + + * **PR** `#35359`_: (`terminalmage`_) Clean up open filehandles + +* **PR** `#35339`_: (`isbm`_) Bugfix: Prevent continuous restart, if a dependency wasn't installed + @ *2016-08-11 16:15:17 UTC* + + * 9ea7a34c30 Merge pull request `#35339`_ from isbm/isbm-2015.8-minion-importerror-fix + + * 12af60b7be Fix continuous minion restart if a dependency wasn't installed + +* **PR** `#35357`_: (`twangboy`_) Fix file.recurse with clean: True on Windows (2015.8) + @ *2016-08-11 00:44:14 UTC* + + * fd9b05ace4 Merge pull request `#35357`_ from twangboy/file.recurse.clean.2015.8 + + * d328ec0157 Fix file.recurse with clean: True + +* **PR** `#35323`_: (`thatch45`_) Fix issue with bad error check in salt-vt + @ *2016-08-10 11:33:49 UTC* + + * 4618b433e9 Merge pull request `#35323`_ from thatch45/ssh_crazy + + * 8a5b47b5d7 Collect all error data from the wfuncs call + + * 11864c31b7 supress a stack trace to show clean ssh error + + * 9fbfa282fa wow this solves an issue! + +* **PR** `#35325`_: (`kev009`_) Fix freebsd netstat route on fbsd 10+ + @ *2016-08-10 11:33:12 UTC* + + * cfae862972 Merge pull request `#35325`_ from kev009/fbsd-netstat-route + + * 0d49dd3c29 Fix fbsd netstat route on fbsd 10+ + +* **ISSUE** `#35264`_: (`bobrik`_) ssh_known_hosts.present is not idempotent in test=true with port (refs: `#35301`_) + + * **PR** `#35301`_: (`bobrik`_) Pass port to ssh.check_known_host, closes `#35264`_ + +* **ISSUE** `#34945`_: (`babilen`_) file.recurse breaks directory permissions (refs: `#35309`_) + + * **PR** `#35309`_: (`terminalmage`_) file.recurse: Do not convert octal mode string to int + +* **ISSUE** `#35051`_: (`terminalmage`_) Runner/Wheel funcs still print return data to console when invoked from orchestration (refs: `#35290`_) + +* **PR** `#35290`_: (`terminalmage`_) Resolve a couple bugs in orchestration output + @ *2016-08-09 15:27:00 UTC* + + * 2efc1b333b Merge pull request `#35290`_ from terminalmage/issue35051 + + * d621aa7b61 Update runner/wheel unit tests to reflect new key in ret dict + + * 90c12a9c7b Add __orchestration__ key to orch returns for runner/wheel funcs + + * 7b8c3b86e7 Suppress error about invalid changes data for orchestration jobs + + * 54a1704d6c Suppress event for wheel/runner funcs executed from orchestration + + * f409f62bf2 Accept print_event option in WheelClient.cmd() + + * b42b25ccce Add cmd func for RunnerClient + + * 480065fe00 Add print_event option to client mixins + +* **ISSUE** `#31074`_: (`turtletraction`_) salt-ssh sudo_user execution not running as sudo_user (refs: `#35211`_) + +* **PR** `#35211`_: (`cachedout`_) Alternative sudo users for salt-ssh + @ *2016-08-08 15:40:55 UTC* + + * f8158124d5 Merge pull request `#35211`_ from cachedout/issue_31074 + + * 6f53232e6d Better error handling and a workaround for group mismatch. + + * 5b56a4acf7 Docs + + * ae04e7aaeb Initial POC + +* **ISSUE** `#35166`_: (`bobrik`_) state_output_profile defaults are confusing (refs: `#35271`_) + +* **PR** `#35271`_: (`bobrik`_) Default state_output_profile to True everywhere, closes `#35166`_ + @ *2016-08-08 14:36:24 UTC* + + * 3e4eb13daa Merge pull request `#35271`_ from bobrik/default-output-profile + + * 6cdee21036 Default state_output_profile to True everywhere, closes `#35166`_ + +* **ISSUE** `#32719`_: (`azweb76`_) Salt-Call Hangs when IPv6 is disabled on System (refs: `#35233`_) + +* **PR** `#35233`_: (`terminalmage`_) Do not attempt to get fqdn_ip{4,6} grains when ipv{4,6} grains are empty + @ *2016-08-06 22:58:32 UTC* + + * 673e1aa1aa Merge pull request `#35233`_ from terminalmage/issue32719 + + * 730a077041 Do not attempt to get fqdn_ip{4,6} grains when ipv{4,6} grains are empty + +* **PR** `#35202`_: (`multani`_) doc: fix broken links in the test documentation page + @ *2016-08-06 08:29:41 UTC* + + * cdf3c0fe73 Merge pull request `#35202`_ from multani/fix/test-doc + + * 1642dba5d1 doc: fix broken links in the test documentation page + +* **ISSUE** `saltstack/salt#34861`_: (`dere`_) minion incorrectly reports package cannot be installed (refs: `#35119`_) + +* **PR** `#35236`_: (`rallytime`_) Back-port `#35119`_ to 2015.8 + @ *2016-08-06 08:10:54 UTC* + + * **PR** `#35119`_: (`dere`_) Assume two EVRs are equal if E and V are equal but one R is missing. (refs: `#35236`_) + + * e1331cd2a3 Merge pull request `#35236`_ from rallytime/bp-35119 + + * 9ade78de7b Revise unnecessary code duplication + + * 7c15f5b20a Fix formatting + + * 64f93f8938 Assume two EVRs are equal if E and V are equal but one R is missing. + +* **ISSUE** `saltstack/salt#29785`_: (`paul-mulvihill`_) pkg.installed to accept 'latest' as a version keyword (refs: `#35225`_) + +* **ISSUE** `#29785`_: (`paul-mulvihill`_) pkg.installed to accept 'latest' as a version keyword (refs: `#35240`_) + +* **PR** `#35240`_: (`dere`_) Backport `#35225`_ to 2015.8 + @ *2016-08-06 07:54:19 UTC* + + * **PR** `#35225`_: (`dere`_) Add missing documentation for pkg.installed (refs: `#35240`_) + + * 4f2b8aa5b6 Merge pull request `#35240`_ from derekmaciel/bp-35225 + + * 9ed47f713a Add missing documentation for pkg.installed + +* **PR** `#35241`_: (`terminalmage`_) Ensure max recursion in gitfs results in no blob object being returned. + @ *2016-08-06 07:53:49 UTC* + + * 4bcfaa97d0 Merge pull request `#35241`_ from terminalmage/gitfs-fixes + + * e05648cc2d Break from loop when file is found + + * 6764a88601 Ensure that failed recursion results in no blob object being returned + + * **PR** `saltstack/salt#35039`_: (`whiteinge`_) Add saltenv support to module.run (refs: `#35245`_) + +* **PR** `#35245`_: (`rallytime`_) Back-port `#35039`_ to 2015.8 + @ *2016-08-06 07:52:44 UTC* + + * **PR** `#35039`_: (`whiteinge`_) Add saltenv support to module.run (refs: `#35245`_) + + * f6d7360e0b Merge pull request `#35245`_ from rallytime/bp-35039 + + * 51ab9cd6d4 Add saltenv support to module.run + +* **ISSUE** `#35214`_: (`tdenny`_) git.latest fails on non-fast-forward when a fast-forward is possible (refs: `#35249`_) + +* **PR** `#35249`_: (`terminalmage`_) Fix regression in git.latest + @ *2016-08-06 07:52:15 UTC* + + * d65a5c7134 Merge pull request `#35249`_ from terminalmage/issue35214 + + * bcd5129e9f Fix regression in git.latest when update is fast-forward + + * e2e8bbbfde Add integration test for `#35214`_ + +* **ISSUE** `saltstack/salt#34691`_: (`dmacvicar`_) beacons.list does not include beacons configured from the pillar/ext_pillar (refs: #saltstack/salt`#34827`_, `#34827`_) + + * **PR** `saltstack/salt#35146`_: (`cachedout`_) Don't discard running beacons config when listing becaons (refs: `#35174`_) + + * **PR** `saltstack/salt#34827`_: (`thatch45`_) fix beacon list to include all beacons being processed (refs: `#35146`_, #`saltstack/salt`#35146`_`_) + + * **PR** `#35174`_: (`rallytime`_) Back-port `#35146`_ to 2015.8 + + * **PR** `#35146`_: (`cachedout`_) Don't discard running beacons config when listing becaons (refs: `#35174`_) + + * **PR** `saltstack/salt#35135`_: (`rallytime`_) Add missing CLI Examples to aws_sqs module funcs (refs: `#35173`_) + + * **PR** `#35173`_: (`rallytime`_) Back-port `#35135`_ to 2015.8 + + * **PR** `#35135`_: (`rallytime`_) Add missing CLI Examples to aws_sqs module funcs (refs: `#35173`_) + + * **PR** `#35145`_: (`jacobhammons`_) doc version update to 2015.8.11, updates to release notes + +* **PR** `#35114`_: (`terminalmage`_) Add clarification docs on a common git_pillar misconfiguration + @ *2016-08-02 00:30:48 UTC* + + * 81845ee31d Merge pull request `#35114`_ from terminalmage/git_pillar-env-remap-docs + + * 5951554e9f Add clarification docs on a common git_pillar misconfiguration + +* **ISSUE** `saltstack/salt#34767`_: (`hrumph`_) Ensure that pkg.installed function refreshes properly with windows. (refs: `#34768`_) + +* **ISSUE** `#34767`_: (`hrumph`_) Ensure that pkg.installed function refreshes properly with windows. (refs: `#34768`_) + +* **PR** `#34768`_: (`hrumph`_) Fixes `#34767`_ + @ *2016-08-01 21:46:16 UTC* + + * 88a9fb1b31 Merge pull request `#34768`_ from hrumph/bad-installed-state + + * e1fcb8311d Put pkg.latest_version in try/except structure Move refreshed or refresh to different spot (just for code tidyness) + + * e0b6261659 changed name of varibale 'refreshed' to 'was_refreshed' + + * 340110b4b4 Move check for rtag to outermost-nesting in function + + * ac67c6b493 Lint fix + + * 0435a1375e Get rid of repetition in code by using new "refreshed" variable instead + + * 3b1dc978e2 Lint fix + + * a9bd1b92b9 lint fixes + + * 71d69343ef Fixes `#34767`_ + +* **PR** `#35043`_: (`rallytime`_) Start release notes file for 2015.8.12 + @ *2016-08-01 17:22:04 UTC* + + * 343576408f Merge pull request `#35043`_ from rallytime/new-release-notes + + * bdcc81a384 Start release notes file for 2015.8.12 + +* **PR** `#35050`_: (`terminalmage`_) [orchestration] Properly handle runner/wheel funcs which accept a 'saltdev' argument + @ *2016-08-01 15:48:08 UTC* + + * 848bf0272f Merge pull request `#35050`_ from terminalmage/fix-saltdev-arg + + * 40cfa7cf17 Avoid needlessly running 2 argspecs in salt.utils.format_call() + + * fd186b7e4c Pass environment as 'saltdev' if runner/wheel func accepts a saltdev argument + + * 951b52ab93 Pass __env__ from saltmod orch states to to saltutil.{runner,wheel} + +* **PR** `#35066`_: (`jfindlay`_) returners.postgres_local_cache: do not log in __virtual__ + @ *2016-07-30 01:32:17 UTC* + + * 2144178ae0 Merge pull request `#35066`_ from jfindlay/postgres_log + + * c2c442234f returners.postgres_local_cache: do not log in __virtual__ + +* **ISSUE** `#34927`_: (`bobrik`_) Salt does not run "systemd daemon-reload" on unit override (refs: `#35024`_) + +* **PR** `#35024`_: (`bobrik`_) Cache systemd unit update check per unit, closes `#34927`_ + @ *2016-07-28 17:56:29 UTC* + + * 7121618142 Merge pull request `#35024`_ from bobrik/daemon-reload-fix + + * c300615e9d Cache systemd unit update check per unit, closes `#34927`_ + + * **PR** `#35026`_: (`cachedout`_) Expressly deny a minion if a key cannot be found + + * **PR** `saltstack/salt#33875`_: (`jmesquita`_) Fix naive fileserver map diff algorithm (refs: `#35000`_) + +* **PR** `#35000`_: (`rallytime`_) Back-port `#33875`_ and `#34999`_ to 2015.8 + @ *2016-07-27 21:55:58 UTC* + + * **PR** `#34999`_: (`cachedout`_) Fixup `#33875`_ (refs: `#35000`_) + + * **PR** `#33875`_: (`jmesquita`_) Fix naive fileserver map diff algorithm (refs: `#35000`_, `#34999`_) + + * 2b511f3013 Merge pull request `#35000`_ from rallytime/bp-33875 + + * 35696ad637 Pylint fix + + * f9fd6ddd8a Fixup `#33875`_ + + * 56b1f6c651 Fix naive fileserver map diff algorithm + +* **ISSUE** `saltstack/salt#34526`_: (`danielmotaleite`_) salt-ssh + mine = weird error (refs: `#34835`_, #`saltstack/salt`#34835`_`_) + + * **PR** `saltstack/salt#34835`_: (`thatch45`_) Make the mine and publish combine minion and master opts in salt-ssh (refs: `#34994`_) + +* **PR** `#34994`_: (`rallytime`_) Back-port `#34835`_ to 2015.8 + @ *2016-07-27 18:21:10 UTC* + + * **PR** `#34835`_: (`thatch45`_) Make the mine and publish combine minion and master opts in salt-ssh (refs: `#34994`_) + + * 837bc6ba7d Merge pull request `#34994`_ from rallytime/bp-34835 + + * 9268a793de same thing for the mine in salt-ssh + + * 3e11e19714 Fix the mine in salt ssh + +* **PR** `#34991`_: (`cachedout`_) SSH timeout + @ *2016-07-27 17:24:38 UTC* + + * b58c663d8d Merge pull request `#34991`_ from cachedout/ssh_timeout + + * 39cd8da399 Lint diff against salt-testing + + * 443e5cdde2 Add timeout to ssh tests + + * **PR** `#34976`_: (`cachedout`_) Refine errors in client + +* **ISSUE** `#34509`_: (`srkunze`_) No atomic thin.tgz deploy (refs: `#34831`_) + +* **PR** `#34831`_: (`thatch45`_) If the thin does not match, then redeploy, don't error + @ *2016-07-26 22:27:01 UTC* + + * a83cdf9339 Merge pull request `#34831`_ from thatch45/recoverssh + + * fa73041a49 If the thin does not match, then redeploy, don't error + + * **PR** `#34916`_: (`cachedout`_) Master performance improvement + +* **PR** `#34911`_: (`cachedout`_) Backport `#34906`_ + @ *2016-07-22 23:23:24 UTC* + + * **PR** `#34906`_: (`cachedout`_) Set timeout for run_salt in test suite (refs: `#34911`_) + + * 34dc2fd792 Merge pull request `#34911`_ from cachedout/backport_34906 + + * 8becec2f4f Backport `#34906`_ + +* **ISSUE** `saltstack/salt#33620`_: (`TheBigBear`_) [2016.3.0] win_pkg: pkg.list_upgrades loops (almost) endlessly - cmds take VERY long (refs: `#34898`_) + +* **PR** `#34898`_: (`hrumph`_) Stop multiple refreshes during call to pkg.list_upgrades + @ *2016-07-22 22:28:42 UTC* + + * 6ccc27f697 Merge pull request `#34898`_ from hrumph/list_upgrades_refresh + + * acd4b1a23b Fixes `#33620`_ + +* **PR** `#34606`_: (`isbm`_) Bugfix: Exit on configuration read (backport) (refs: `#34751`_) + @ *2016-07-22 17:35:18 UTC* + + * 5c13ee0e72 Merge pull request `#34606`_ from isbm/isbm-config-reading-exit-2015.8 + + * 5f5b802c0c Add option to master config reader on ignoring system exit for wrong configuration + + * 6fc677f177 Ignore minion config errors everywhere but the minion itself + + * 8699194647 Remove deprecation: BaseException.message deprecated as of 2.6 + + * 0e65cfec91 Fix lint: E8302 + + * 67faa56bf1 Use Salt default exit codes instead of hard-coded values + + * a84556e596 Exit immediately on configuration error + + * 43d965907c Raise an exception on any found wrong configuration file + + * 30ed728d05 Cover exception handling in the utils.parsers + + * 5e8c0c6bdb Introduce configuration error exception + +* **ISSUE** `saltstack/salt#27783`_: (`anlutro`_) salt-ssh not properly updating file_lists, causing file.recurse to fail (refs: `#34862`_) + + * **PR** `#34862`_: (`thatch45`_) Fix salt-ssh cacheing issue + +* **ISSUE** `#34725`_: (`akoumjian`_) `git.latest` with `force_reset` set to `True` does not reset local changes, causing it to fail. (refs: `#34869`_) + + * **PR** `#34869`_: (`terminalmage`_) Fail git.latest states with uncommitted changes when force_reset=False + +* **PR** `#34859`_: (`cachedout`_) Fix wheel test + @ *2016-07-21 19:55:25 UTC* + + * 4f4381e5b9 Merge pull request `#34859`_ from cachedout/fix_wheel_test + + * b4be66dedf Fix wheel test + +* **ISSUE** `saltstack/salt#34798`_: (`Ch3LL`_) exception when running state.low over salt-ssh (refs: `#34822`_) + +* **ISSUE** `saltstack/salt#34796`_: (`Ch3LL`_) exception when running state.high over salt-ssh (refs: `#34822`_) + +* **PR** `#34822`_: (`thatch45`_) Fix salt-ssh state.high and state.low + @ *2016-07-21 19:16:19 UTC* + + * acc9e31c02 Merge pull request `#34822`_ from thatch45/ssh_fixes + + * b5de492143 fix `#34798`_ + + * 5ad6bd7307 fix `#34796`_ + +* **PR** `#34847`_: (`cachedout`_) Add an option to skip the verification of client_acl users + @ *2016-07-21 17:55:55 UTC* + + * 5d91139bc9 Merge pull request `#34847`_ from cachedout/pwall + + * 2c8298dc6e Profile logging + + * 3affafa2e9 Add an option to skip the verification of client_acl users + +* **ISSUE** `saltstack/salt#34691`_: (`dmacvicar`_) beacons.list does not include beacons configured from the pillar/ext_pillar (refs: #saltstack/salt`#34827`_, `#34827`_) + +* **PR** `#34827`_: (`thatch45`_) fix beacon list to include all beacons being processed + @ *2016-07-21 14:49:56 UTC* + + * 07d1d36653 Merge pull request `#34827`_ from thatch45/34691 + + * 1ccf35eca4 fix beacon list to include all beacons being processed + + * **PR** `saltstack/salt#28521`_: (`gongled`_) SPM: packaging doesn't work in Python 2.6. Fixed. (refs: `#34833`_) + +* **PR** `#34833`_: (`rallytime`_) Back-port `#28521`_ to 2015.8 + @ *2016-07-21 14:37:24 UTC* + + * **PR** `#28521`_: (`gongled`_) SPM: packaging doesn't work in Python 2.6. Fixed. (refs: `#34833`_) + + * b375720251 Merge pull request `#34833`_ from rallytime/bp-28521 + + * e50a6783ce SPM: packaging doesn't work in Python 2.6. Fixed. + +* **ISSUE** `#25213`_: (`aboe76`_) Add spm man page to setup.py (refs: #saltstack/salt`#25276`_, `#25276`_) + + * **PR** `saltstack/salt#25276`_: (`jacobhammons`_) copy spm.1 man page during setup (refs: `#34823`_) + +* **PR** `#34823`_: (`rallytime`_) Back-port `#25276`_ to 2015.8 + @ *2016-07-20 20:56:04 UTC* + + * **PR** `#25276`_: (`jacobhammons`_) copy spm.1 man page during setup (refs: `#34823`_) + + * 042646582f Merge pull request `#34823`_ from rallytime/bp-25276 + + * a028796eff copy spm.1 man page during setup Refs `#25213`_ + +* **ISSUE** `saltstack/salt#34648`_: (`bortels`_) Error that % cannot start token (refs: `#34828`_) + +* **ISSUE** `#34648`_: (`bortels`_) Error that % cannot start token (refs: `#34828`_) + + * **PR** `#34828`_: (`thatch45`_) Fix `#34648`_ + + * **PR** `saltstack/salt#34642`_: (`justinta`_) Check that mysqladmin exists before running mysql integration tests (refs: `#34818`_) + +* **PR** `#34818`_: (`justinta`_) Skip mysql state test if mysqladmin is not available + @ *2016-07-20 16:10:35 UTC* + + * 98fa4a404e Merge pull request `#34818`_ from jtand/mysql_state_integration_test_cleanup + + * 9abb6f91bb Skip mysql state test if mysqladmin is not available + +* **ISSUE** `saltstack/salt#26278`_: (`jiahua-h`_) "order: first" doesn't work? (refs: `#34803`_) + +* **ISSUE** `saltstack/salt#24744`_: (`anlutro`_) Allow states to define order: first (refs: `#34803`_) + +* **ISSUE** `#24744`_: (`anlutro`_) Allow states to define order: first (refs: `#34803`_) + +* **PR** `#34803`_: (`junovitch`_) salt/state.py: set 'chunk['order'] = 0' with 'order: first'; fixes `#24744`_ + @ *2016-07-20 13:56:20 UTC* + + * 6636f2b449 Merge pull request `#34803`_ from junovitch/issue_24744 + + * 64c850410f salt/state.py: set 'chunk['order'] = 0' with 'order: first'; fixes `#24744`_ + +* **PR** `#34773`_: (`randomed`_) Bugfix: Startup states on minions are not being written to mysql returner + @ *2016-07-19 12:39:53 UTC* + + * 58021035a9 Merge pull request `#34773`_ from randomed/mysql-returner-startup/2015.8 + + * 0cd55eb7d7 Add jid=req handling for mysql returner. It should also store the return jid into the jid list table. + + * **PR** `#34751`_: (`cachedout`_) Remove unnedeed config test + + * **PR** `#34606`_: (`isbm`_) Bugfix: Exit on configuration read (backport) (refs: `#34751`_) + +* **PR** `#34754`_: (`cachedout`_) Disable test + @ *2016-07-18 18:40:50 UTC* + + * f19caac8e4 Merge pull request `#34754`_ from cachedout/disable_mid_test + + * 46901c6e65 Disable test + +* **ISSUE** `saltstack/salt#34678`_: (`martinhoefling`_) config.get module is broken due to bug in dictupdate.py (refs: `#34726`_, #`saltstack/salt`#34726`_`_, `#34741`_) + + * **PR** `saltstack/salt#34726`_: (`martinhoefling`_) Always loop over updated keys in non recursive update (refs: `#34741`_) + +* **PR** `#34741`_: (`rallytime`_) Back-port `#34726`_ to 2015.8 + @ *2016-07-18 18:00:23 UTC* + + * **PR** `#34726`_: (`martinhoefling`_) Always loop over updated keys in non recursive update (refs: `#34741`_) + + * 81f29006f2 Merge pull request `#34741`_ from rallytime/bp-34726 + + * d949110993 Loop over updated keys in non recursive update + +* **ISSUE** `saltstack/salt#34703`_: (`Cashwini`_) Is it possible to return output from python execution module to a file on salt master? (refs: `#34721`_) + +* **PR** `#34721`_: (`rallytime`_) Add output_file option to master config docs + @ *2016-07-16 20:04:03 UTC* + + * e9e5bbe38b Merge pull request `#34721`_ from rallytime/fix-34703 + + * 9c803d05a5 Add output_file option to master config docs + +* **ISSUE** `saltstack/salt#32276`_: (`javicacheiro`_) pkg.installed using sources from master fails with file not found after first succesful run (refs: `#34689`_) + +* **PR** `#34689`_: (`Azidburn`_) fix second run problems with pkg.installed using sources + @ *2016-07-15 21:19:39 UTC* + + * 08d00f3a61 Merge pull request `#34689`_ from Azidburn/fix_pkg_sources + + * 2c0fc919b3 fix second run problems with pkg.installed using sources + +* **PR** `#34695`_: (`isbm`_) Bugfix: Zypper `pkg.list_products` returns False on some empty values (2015.8) + @ *2016-07-15 21:08:00 UTC* + + * 4cb1ded520 Merge pull request `#34695`_ from isbm/isbm-zypper-product-boolean-values + + * 5ed5142fbc Update test data for 'registerrelease' and 'productline' fields + + * 21444ee240 Bugfix: return boolean only for 'isbase' and 'installed' attributes -.. _`#18419`: https://github.com/saltstack/salt/issues/18419 .. _`#24744`: https://github.com/saltstack/salt/issues/24744 .. _`#25213`: https://github.com/saltstack/salt/issues/25213 .. _`#25276`: https://github.com/saltstack/salt/pull/25276 -.. _`#26278`: https://github.com/saltstack/salt/issues/26278 -.. _`#27783`: https://github.com/saltstack/salt/issues/27783 .. _`#28521`: https://github.com/saltstack/salt/pull/28521 .. _`#29785`: https://github.com/saltstack/salt/issues/29785 .. _`#31074`: https://github.com/saltstack/salt/issues/31074 -.. _`#32276`: https://github.com/saltstack/salt/issues/32276 .. _`#32719`: https://github.com/saltstack/salt/issues/32719 .. _`#33516`: https://github.com/saltstack/salt/issues/33516 .. _`#33620`: https://github.com/saltstack/salt/issues/33620 @@ -136,16 +775,11 @@ Changes: .. _`#33875`: https://github.com/saltstack/salt/pull/33875 .. _`#34279`: https://github.com/saltstack/salt/issues/34279 .. _`#34509`: https://github.com/saltstack/salt/issues/34509 -.. _`#34526`: https://github.com/saltstack/salt/issues/34526 .. _`#34573`: https://github.com/saltstack/salt/pull/34573 .. _`#34606`: https://github.com/saltstack/salt/pull/34606 -.. _`#34642`: https://github.com/saltstack/salt/pull/34642 .. _`#34648`: https://github.com/saltstack/salt/issues/34648 -.. _`#34678`: https://github.com/saltstack/salt/issues/34678 .. _`#34689`: https://github.com/saltstack/salt/pull/34689 -.. _`#34691`: https://github.com/saltstack/salt/issues/34691 .. _`#34695`: https://github.com/saltstack/salt/pull/34695 -.. _`#34703`: https://github.com/saltstack/salt/issues/34703 .. _`#34721`: https://github.com/saltstack/salt/pull/34721 .. _`#34725`: https://github.com/saltstack/salt/issues/34725 .. _`#34726`: https://github.com/saltstack/salt/pull/34726 @@ -169,7 +803,6 @@ Changes: .. _`#34835`: https://github.com/saltstack/salt/pull/34835 .. _`#34847`: https://github.com/saltstack/salt/pull/34847 .. _`#34859`: https://github.com/saltstack/salt/pull/34859 -.. _`#34861`: https://github.com/saltstack/salt/issues/34861 .. _`#34862`: https://github.com/saltstack/salt/pull/34862 .. _`#34869`: https://github.com/saltstack/salt/pull/34869 .. _`#34898`: https://github.com/saltstack/salt/pull/34898 @@ -181,9 +814,8 @@ Changes: .. _`#34976`: https://github.com/saltstack/salt/pull/34976 .. _`#34991`: https://github.com/saltstack/salt/pull/34991 .. _`#34994`: https://github.com/saltstack/salt/pull/34994 -.. _`#34999`: https://github.com/saltstack/salt/issues/34999 +.. _`#34999`: https://github.com/saltstack/salt/pull/34999 .. _`#35000`: https://github.com/saltstack/salt/pull/35000 -.. _`#35010`: https://github.com/saltstack/salt/issues/35010 .. _`#35024`: https://github.com/saltstack/salt/pull/35024 .. _`#35026`: https://github.com/saltstack/salt/pull/35026 .. _`#35039`: https://github.com/saltstack/salt/pull/35039 @@ -223,9 +855,7 @@ Changes: .. _`#35339`: https://github.com/saltstack/salt/pull/35339 .. _`#35357`: https://github.com/saltstack/salt/pull/35357 .. _`#35359`: https://github.com/saltstack/salt/pull/35359 -.. _`#35380`: https://github.com/saltstack/salt/issues/35380 .. _`#35384`: https://github.com/saltstack/salt/issues/35384 -.. _`#35387`: https://github.com/saltstack/salt/issues/35387 .. _`#35394`: https://github.com/saltstack/salt/pull/35394 .. _`#35413`: https://github.com/saltstack/salt/pull/35413 .. _`#35436`: https://github.com/saltstack/salt/pull/35436 @@ -257,13 +887,90 @@ Changes: .. _`#35599`: https://github.com/saltstack/salt/pull/35599 .. _`#35600`: https://github.com/saltstack/salt/pull/35600 .. _`#35611`: https://github.com/saltstack/salt/pull/35611 -.. _`bp-25276`: https://github.com/saltstack/salt/pull/25276 -.. _`bp-28521`: https://github.com/saltstack/salt/pull/28521 -.. _`bp-33875`: https://github.com/saltstack/salt/pull/33875 -.. _`bp-34726`: https://github.com/saltstack/salt/pull/34726 -.. _`bp-34835`: https://github.com/saltstack/salt/pull/34835 -.. _`bp-35039`: https://github.com/saltstack/salt/pull/35039 -.. _`bp-35119`: https://github.com/saltstack/salt/pull/35119 -.. _`bp-35225`: https://github.com/saltstack/salt/pull/35225 -.. _`fix-34703`: https://github.com/saltstack/salt/issues/34703 -.. _`fix-35384`: https://github.com/saltstack/salt/issues/35384 +.. _`#35614`: https://github.com/saltstack/salt/pull/35614 +.. _`Azidburn`: https://github.com/Azidburn +.. _`Cashwini`: https://github.com/Cashwini +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`TheBigBear`: https://github.com/TheBigBear +.. _`UtahDave`: https://github.com/UtahDave +.. _`aboe76`: https://github.com/aboe76 +.. _`akoumjian`: https://github.com/akoumjian +.. _`anlutro`: https://github.com/anlutro +.. _`azweb76`: https://github.com/azweb76 +.. _`babilen`: https://github.com/babilen +.. _`bobrik`: https://github.com/bobrik +.. _`bortels`: https://github.com/bortels +.. _`cachedout`: https://github.com/cachedout +.. _`cedwards`: https://github.com/cedwards +.. _`danielmotaleite`: https://github.com/danielmotaleite +.. _`deepakhj`: https://github.com/deepakhj +.. _`dere`: https://github.com/dere +.. _`dmacvicar`: https://github.com/dmacvicar +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`ghost`: https://github.com/ghost +.. _`gongled`: https://github.com/gongled +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`hrumph`: https://github.com/hrumph +.. _`hu-dabao`: https://github.com/hu-dabao +.. _`isbm`: https://github.com/isbm +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jasonrm`: https://github.com/jasonrm +.. _`javicacheiro`: https://github.com/javicacheiro +.. _`jerrykan`: https://github.com/jerrykan +.. _`jfindlay`: https://github.com/jfindlay +.. _`jiahua-h`: https://github.com/jiahua-h +.. _`jmesquita`: https://github.com/jmesquita +.. _`junovitch`: https://github.com/junovitch +.. _`justinta`: https://github.com/justinta +.. _`kev009`: https://github.com/kev009 +.. _`martinhoefling`: https://github.com/martinhoefling +.. _`multani`: https://github.com/multani +.. _`mzealey`: https://github.com/mzealey +.. _`paul-mulvihill`: https://github.com/paul-mulvihill +.. _`rallytime`: https://github.com/rallytime +.. _`randomed`: https://github.com/randomed +.. _`saltstack/salt#18419`: https://github.com/saltstack/salt/issues/18419 +.. _`saltstack/salt#24744`: https://github.com/saltstack/salt/issues/24744 +.. _`saltstack/salt#25276`: https://github.com/saltstack/salt/pull/25276 +.. _`saltstack/salt#26278`: https://github.com/saltstack/salt/issues/26278 +.. _`saltstack/salt#27783`: https://github.com/saltstack/salt/issues/27783 +.. _`saltstack/salt#28521`: https://github.com/saltstack/salt/pull/28521 +.. _`saltstack/salt#29785`: https://github.com/saltstack/salt/issues/29785 +.. _`saltstack/salt#32276`: https://github.com/saltstack/salt/issues/32276 +.. _`saltstack/salt#33620`: https://github.com/saltstack/salt/issues/33620 +.. _`saltstack/salt#33875`: https://github.com/saltstack/salt/pull/33875 +.. _`saltstack/salt#34279`: https://github.com/saltstack/salt/issues/34279 +.. _`saltstack/salt#34526`: https://github.com/saltstack/salt/issues/34526 +.. _`saltstack/salt#34573`: https://github.com/saltstack/salt/pull/34573 +.. _`saltstack/salt#34642`: https://github.com/saltstack/salt/pull/34642 +.. _`saltstack/salt#34648`: https://github.com/saltstack/salt/issues/34648 +.. _`saltstack/salt#34678`: https://github.com/saltstack/salt/issues/34678 +.. _`saltstack/salt#34691`: https://github.com/saltstack/salt/issues/34691 +.. _`saltstack/salt#34703`: https://github.com/saltstack/salt/issues/34703 +.. _`saltstack/salt#34726`: https://github.com/saltstack/salt/pull/34726 +.. _`saltstack/salt#34767`: https://github.com/saltstack/salt/issues/34767 +.. _`saltstack/salt#34796`: https://github.com/saltstack/salt/issues/34796 +.. _`saltstack/salt#34798`: https://github.com/saltstack/salt/issues/34798 +.. _`saltstack/salt#34827`: https://github.com/saltstack/salt/pull/34827 +.. _`saltstack/salt#34835`: https://github.com/saltstack/salt/pull/34835 +.. _`saltstack/salt#34861`: https://github.com/saltstack/salt/issues/34861 +.. _`saltstack/salt#35010`: https://github.com/saltstack/salt/issues/35010 +.. _`saltstack/salt#35039`: https://github.com/saltstack/salt/pull/35039 +.. _`saltstack/salt#35121`: https://github.com/saltstack/salt/issues/35121 +.. _`saltstack/salt#35135`: https://github.com/saltstack/salt/pull/35135 +.. _`saltstack/salt#35146`: https://github.com/saltstack/salt/pull/35146 +.. _`saltstack/salt#35380`: https://github.com/saltstack/salt/issues/35380 +.. _`saltstack/salt#35387`: https://github.com/saltstack/salt/issues/35387 +.. _`saltstack/salt#35545`: https://github.com/saltstack/salt/pull/35545 +.. _`sjorge`: https://github.com/sjorge +.. _`srkunze`: https://github.com/srkunze +.. _`szjur`: https://github.com/szjur +.. _`tdenny`: https://github.com/tdenny +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`theothergraham`: https://github.com/theothergraham +.. _`turtletraction`: https://github.com/turtletraction +.. _`twangboy`: https://github.com/twangboy +.. _`vchav73`: https://github.com/vchav73 +.. _`vmadura`: https://github.com/vmadura +.. _`whiteinge`: https://github.com/whiteinge diff --git a/doc/topics/releases/2015.8.13.rst b/doc/topics/releases/2015.8.13.rst index 87c59a1a9b..4bd54fcbc5 100644 --- a/doc/topics/releases/2015.8.13.rst +++ b/doc/topics/releases/2015.8.13.rst @@ -8,44 +8,18 @@ Version 2015.8.13 is a bugfix release for :ref:`2015.8.0 `. Security Fixes ============== -CVE-2017-5192: local_batch client external authentication not respected +**CVE-2017-5192** local_batch client external authentication not respected The ``LocalClient.cmd_batch()`` method client does not accept ``external_auth`` credentials and so access to it from salt-api has been removed for now. This vulnerability allows code execution for already-authenticated users and is only in effect when running salt-api as the ``root`` user. -CVE-2017-5200: Salt-api allows arbitrary command execution on a salt-master via -Salt's ssh_client +**CVE-2017-5200** Salt-api allows arbitrary command execution on a salt-master +via Salt's ssh_client Users of Salt-API and salt-ssh could execute a command on the salt master via a hole when both systems were enabled. We recommend everyone on the 2015.8 branch upgrade to a patched release as soon as possible. - - -Changes for v2015.8.12..v2015.8.13 ----------------------------------- - -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): - -*Generated at: 2017-01-09T21:17:06Z* - -Statistics: - -- Total Merges: **3** -- Total Issue references: **3** -- Total PR references: **5** - -Changes: - -* 3428232 Clean up tests and docs for batch execution -* 3d8f3d1 Remove batch execution from NetapiClient and Saltnado -* 97b0f64 Lintfix -* d151666 Add explanation comment -* 62f2c87 Add docstring -* 9b0a786 Explain what it is about and how to configure that -* 5ea3579 Pick up a specified roster file from the configured locations -* 3a8614c Disable custom rosters in API -* c0e5a11 Add roster disable flag diff --git a/doc/topics/releases/2015.8.14.rst b/doc/topics/releases/2015.8.14.rst deleted file mode 100644 index 98137ab017..0000000000 --- a/doc/topics/releases/2015.8.14.rst +++ /dev/null @@ -1,5 +0,0 @@ -============================ -Salt 2015.8.14 Release Notes -============================ - -Version 2015.8.14 is a bugfix release for :ref:`2015.8.0 `. diff --git a/doc/topics/releases/2015.8.2.rst b/doc/topics/releases/2015.8.2.rst index 302ae12991..aa69c5e50a 100644 --- a/doc/topics/releases/2015.8.2.rst +++ b/doc/topics/releases/2015.8.2.rst @@ -2,611 +2,3550 @@ Salt 2015.8.2 Release Notes =========================== -.. note:: +Version 2015.8.2 is a bugfix release for :ref:`2015.8.0 `. - A significant orchestrate issue `#29110`_ was discovered during the release - process of 2015.8.2, so it has not been officially released. Please use - `2015.8.3 - `_ - instead. +Statistics +========== -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +- Total Merges: **379** +- Total Issue References: **138** +- Total PR References: **351** -*Generated at: 2015-11-13T17:24:04Z* +- Contributors: **83** (`DmitryKuzmenko`_, `JaseFace`_, `LoveIsGrief`_, `MasterNayru`_, `Oro`_, `SmithSamuelM`_, `The-Loeki`_, `TheBigBear`_, `aboe76`_, `ajacoutot`_, `anlutro`_, `avinassh`_, `basepi`_, `bdrung`_, `bechtoldt`_, `bernieke`_, `blueyed`_, `cachedout`_, `cbuechler`_, `cedwards`_, `clarkperkins`_, `cro`_, `dkiser`_, `douglas-vaz`_, `dr4Ke`_, `eguven`_, `eliasp`_, `erchn`_, `eyj`_, `favadi`_, `flavio`_, `garethgreenaway`_, `gravyboat`_, `gtmanfred`_, `hedinfaok`_, `hexedpackets`_, `hyn-salt`_, `isbm`_, `itsamenathan`_, `jacksontj`_, `jacobhammons`_, `jeffreyctang`_, `jejenone`_, `jfindlay`_, `johnsocp`_, `justinta`_, `keesbos`_, `lathama`_, `ldobson`_, `lomeroe`_, `martinhoefling`_, `mbarrien`_, `mbologna`_, `merll`_, `mrosedale`_, `msteed`_, `multani`_, `nasenbaer13`_, `nmadhok`_, `notpeter`_, `opdude`_, `papertigers`_, `pass-by-value`_, `plastikos`_, `quantonganh`_, `rallytime`_, `redmcg`_, `rowillia`_, `ruzarowski`_, `ryan-lane`_, `s0undt3ch`_, `sdm24`_, `sjansen`_, `skizunov`_, `srkunze`_, `techhat`_, `terminalmage`_, `ticosax`_, `tkwilliams`_, `toddtomkinson`_, `twangboy`_, `twellspring`_, `whiteinge`_) -Total Merges: **378** -Changes: +.. important:: + A significant orchestrate issue (:issue:`#29110`) was discovered during the + release process of 2015.8.2, so it has not been officially released. + Please use :ref:`2015.8.3 ` instead. -- **PR** `#28730`_: (*garethgreenaway*) Fixes to how return_job is handled in the scheduler for the salt master. -- **PR** `#28848`_: (*cro*) Lint +Changelog for v2015.8.1..v2015.8.2 +================================== -- **PR** `#28842`_: (*cachedout*) Add transport setting to shell test +*Generated at: 2018-05-27 23:17:44 UTC* -- **PR** `#28837`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **PR** `#28865`_: (`jfindlay`_) add 2015.8.2 release notes + @ *2015-11-13 17:30:18 UTC* -- **PR** `#28827`_: (*jacksontj*) Cleanup virtual_timer in loader + * af297bb0ae Merge pull request `#28865`_ from jfindlay/2015.8 -- **PR** `#28836`_: (*cachedout*) Cast to dict to fix wheel tests in tcp + * 1f847fc9ba add 2015.8.2 release notes -- **PR** `#28834`_: (*cachedout*) Fix breakage in tcp server +* **ISSUE** `#27392`_: (`ahammond`_) schedule running state.orchestrate fails (refs: `#28730`_) -- **PR** `#28804`_: (*cachedout*) TCP test fixes +* **PR** `#28730`_: (`garethgreenaway`_) Fixes to how return_job is handled in the scheduler for the salt master. + @ *2015-11-13 16:58:20 UTC* -- **PR** `#28826`_: (*basepi*) [2015.8] Add new tornado deps to salt-ssh thin + * 15672a3faa Merge pull request `#28730`_ from garethgreenaway/27392_2015_8_scheduler_return_job_master -- **PR** `#28759`_: (*jfindlay*) simplify stdin use of stdin in at.present state + * 882350a543 Fixing the salt scheduler so that it only attempts to return the job data to the master if the scheduled job is running from a minion's scheduler. -- **PR** `#28824`_: (*rallytime*) Back-port `#28778`_ and `#28820`_ to 2015.8 +* **PR** `#28848`_: (`cro`_) Lint + @ *2015-11-13 13:46:36 UTC* -- **PR** `#28803`_: (*jfindlay*) decode strings to utf-8 + * 5560cb662b Merge pull request `#28848`_ from cro/fx2_multi_creds -- **PR** `#28782`_: (*rallytime*) Fixes to rabbitmq user state + * f032bffd7c Lint -- **PR** `#28789`_: (*nmadhok*) Provide ability to enable/disable customization for newly create VMs using VMware salt-cloud driver + * 6bb6703c3e Merge branch 'fx2_multi_creds' of git://github.com/cro/salt into cro -- **PR** `#28768`_: (*mrosedale*) 2015.8 + * 3b7d22248c Fix fallback credentials, add grains based on dracr.server_info and dracr.inventory, fix short-circuited for loop that was preventing retrieval of most data from CMC and DRAC devices, format responses from racadm more clearly. -- **PR** `#28772`_: (*rallytime*) rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list. + * b86c614564 Better logic around fallback credentials. -- **PR** `#28774`_: (*rallytime*) Back-port `#28725`_ to 2015.8 + * 2701826a99 Update fx2.py, fix typos in new fallback parameters. -- **PR** `#28775`_: (*rallytime*) Back-port `#28740`_ to 2015.8 + * 8ce5348808 Better variable name. -- **PR** `#28755`_: (*rallytime*) Move most vmware driver list_* functions to use salt.utils.vmware functions + * 92038b8718 Default configuration file for proxy minions. -- **PR** `#28744`_: (*jfindlay*) import gate elementtree +* **PR** `#28842`_: (`cachedout`_) Add transport setting to shell test + @ *2015-11-12 21:43:11 UTC* -- **PR** `#28758`_: (*jfindlay*) remove redundant logic in useradd execution module + * 778ace3ca5 Merge pull request `#28842`_ from cachedout/tcp_shell_test -- **PR** `#28757`_: (*mbarrien*) Bug fix: pip command to not quote spaces in cmd line args + * 785bf94f55 Add transport setting to shell test -- **PR** `#28764`_: (*multani*) Various documentation fixes +* **PR** `#28837`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-11-12 21:17:14 UTC* -- **PR** `#28752`_: (*aboe76*) Update openSUSE grain for tumbleweed + * 5639971744 Merge pull request `#28837`_ from basepi/merge-forward-2015.8 -- **PR** `#28713`_: (*hexedpackets*) Rename consul.list to consul.list_keys. + * 1c91ad6765 fix lint -- **PR** `#28719`_: (*jacobhammons*) removed dependencies info from docs + * 4b706ac76a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 -- **PR** `#28709`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * eb904665dc Merge pull request `#28832`_ from basepi/backport.28826 -- **PR** `#28710`_: (*rallytime*) Pass kwargs correctly to _get_group from get_group_id + * 57be72eb91 Add backports_abc and singledispatch_helpers to thin as well -- **PR** `#28698`_: (*rallytime*) Back-port `#28530`_ to 2015.8 + * 897cad627b Add singledispatch to the thin -- **PR** `#28700`_: (*rallytime*) Back-port `#28679`_ to 2015.8 + * eff811a0ad Merge pull request `#28833`_ from basepi/increase.gather_job_timeout.8647 -- **PR** `#28695`_: (*s0undt3ch*) [2015.8] Update to latest bootstrap script v2015.11.09 + * c09243dd01 Increase the default gather_job_timeout -- **PR** `#28656`_: (*clarkperkins*) `#28526`_ fixed yumpkg module issue with pkg.installed + * e4a036365d Merge pull request `#28829`_ from basepi/merge-forward-2015.5 -- **PR** `#28672`_: (*jfindlay*) add OS grain support for SuSE Leap + * f8b8441485 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#28673`_: (*jfindlay*) add hidden_opts to mount.mounted + * 76e69b4bff Merge pull request `#28777`_ from rallytime/bp-28740-2014.7 -- **PR** `#28667`_: (*cro*) saltutil.sync_all should sync proxymodules as well as the rest. + * da5fac2b36 Back-port `#28740`_ to 2014.7 -- **PR** `#28665`_: (*jfindlay*) fixes to windows execution and state modules + * 45c73ebf2f Merge pull request `#28716`_ from rallytime/bp-28705 -- **PR** `#28660`_: (*techhat*) Don't sign empty regions + * 32e7bd3ea0 Account for new headers class in tornado 4.3 -- **PR** `#28632`_: (*terminalmage*) Fixes/improvements to pkgbuild state/modules + * f4fe921965 Merge pull request `#28717`_ from cachedout/umask_note -- **PR** `#28658`_: (*techhat*) Remove _pkgdb_fun() references + * 1874300e08 Add note about recommended umask -- **PR** `#28653`_: (*rallytime*) Provide possible parameters for boto_rds.present engine values + * 5aeab71f76 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 -- **PR** `#28649`_: (*bdrung*) Fix OS related grains on Debian + * 93562631aa Merge pull request `#28756`_ from MrCitron/fix-25775 -- **PR** `#28646`_: (*rallytime*) Back-port `#28614`_ to 2015.8 + * 82075c809c Add logs and correct pylint error -- **PR** `#28647`_: (*rallytime*) Back-port `#28624`_ to 2015.8 + * e31e22d96a Fix 25775 -- **PR** `#28648`_: (*rallytime*) Merge branch '2015.5' into '2015.8' + * 30cc48e37f Merge pull request `#28786`_ from chrigl/fix-28783 -- **PR** `#28638`_: (*anlutro*) Salt-SSH: Return more concise error when SSH command fails + * ba6d814553 closes `#28783`_ -- **PR** `#28644`_: (*pass-by-value*) Make sure versionchanged is correct + * 8f1d0b636e Merge pull request `#28776`_ from rallytime/bp-28740-2015.5 -- **PR** `#28615`_: (*The-Loeki*) Fixes to FreeBSD pkg + * 49256b7d90 Back-port `#28740`_ to 2015.5 -- **PR** `#28613`_: (*cachedout*) Add facility to deepcopy bound methods in Py2.6 and apply to grains + * 77d4b980f1 Merge pull request `#28760`_ from dmyerscough/28732-Fix-cherrypi-api-keys-endpoint -- **PR** `#28612`_: (*rallytime*) Remove unsupported storage_type argument for parity with boto_rds module + * 206d1684b2 Fixing CherryPy key bug -- **PR** `#28611`_: (*rallytime*) [2015.8] Be explicit about salt.utils.vmware function calls + * 6f8f04975f Merge pull request `#28746`_ from rallytime/bp-28718 -- **PR** `#28610`_: (*pass-by-value*) Lxc config additions + * 092f441cad Account for no POST data -- **PR** `#28602`_: (*nasenbaer13*) Allow setting of custom dimensions in asg alarm specification +* **ISSUE** `#28549`_: (`ldelossa`_) dockerng module issue (refs: `#28827`_) -- **PR** `#28596`_: (*rallytime*) Merge branch '2015.5' into '2015.8' +* **PR** `#28827`_: (`jacksontj`_) Cleanup virtual_timer in loader + @ *2015-11-12 19:39:29 UTC* -- **PR** `#28593`_: (*blueyed*) doc: fix typo with salt.states.file: s/preseve/preserve/ + * c4fb185147 Merge pull request `#28827`_ from jacksontj/2015.8 -- **PR** `#28578`_: (*twangboy*) Fixed the script... something got broke... + * f49502fd48 `__modules__` isn't a global, although `__salt__` is -- **PR** `#28579`_: (*jfindlay*) fix __virtual__ returns: tls,uptime mods + * c734cb8876 Fix virtual_timer branch such that it will catch exceptions. -- **PR** `#28584`_: (*rallytime*) If AssociatePublicIpAddress is set to True, don't auto-assign eip. +* **PR** `#28836`_: (`cachedout`_) Cast to dict to fix wheel tests in tcp + @ *2015-11-12 19:22:44 UTC* -- **PR** `#28576`_: (*jacksontj*) Only encode the zmq message once + * 21520c6c1d Merge pull request `#28836`_ from cachedout/fix_tcp_wheel_tests -- **PR** `#28587`_: (*cachedout*) Reset yaml rendering hooks to avoid leaks + * 8d3244166b Cast to dict to fix wheel tests in tcp -- **PR** `#28581`_: (*basepi*) Revert b4875e585a165482c4c1ddc8987d76b0a71ef1b0 +* **PR** `#28834`_: (`cachedout`_) Fix breakage in tcp server + @ *2015-11-12 18:57:18 UTC* -- **PR** `#28573`_: (*jacksontj*) Add `body` to salt.utils.http.query returns + * 560671a170 Merge pull request `#28834`_ from cachedout/tcp_revert_master_uri -- **PR** `#28564`_: (*s0undt3ch*) [2015.8] Update to latest bootstrap script v2015.11.04 + * 755d493bed Fix breakage in tcp server -- **PR** `#28561`_: (*Oro*) Issue `#28527`_ boto_rds.create does not work +* **PR** `#28804`_: (`cachedout`_) TCP test fixes + @ *2015-11-12 18:39:25 UTC* -- **PR** `#28560`_: (*bdrung*) Fix various typos + * 224602437a Merge pull request `#28804`_ from cachedout/tcp_test_fixes -- **PR** `#28550`_: (*jfindlay*) check timedatectl errno and return stdout on failure + * f799971280 Change logic -- **PR** `#28545`_: (*jfindlay*) pass on concurrent create of jid_dir in local_cache + * 52ed06500a Fix typo -- **PR** `#28544`_: (*rallytime*) Start moving some vmware.py cloud funcs to utils/vmware.py + * 9b18f372e6 Normalize IPC check among transports -- **PR** `#28543`_: (*gtmanfred*) clean up changes for pkg.uptodate and supervisord.dead + * e8ead2bfed Allow for tcp transport in publish -- **PR** `#28538`_: (*jfindlay*) decode path and url to utf-8 in url.create + * e33b903e7b Allow for tcp transport in mine -- **PR** `#28533`_: (*jfindlay*) decode highstate error messages to utf-8 + * 3d80e67a2d Allow for tcp transport in auth -- **PR** `#28547`_: (*nmadhok*) [Backport] [2015.8] Tasks can be in queued state instead of running +* **ISSUE** `#28828`_: (`basepi`_) salt-ssh doesn't package tornado's new deps in the thin (refs: `#28826`_) -- **PR** `#28535`_: (*techhat*) Fail gracefully if 169.254* isn't available +* **PR** `#28826`_: (`basepi`_) [2015.8] Add new tornado deps to salt-ssh thin (refs: `#28832`_) + @ *2015-11-12 18:14:43 UTC* -- **PR** `#28536`_: (*cro*) Default configuration file for proxy minions. + * 49992070db Merge pull request `#28826`_ from basepi/salt-ssh.singledispatch.thin -- **PR** `#28534`_: (*rallytime*) Add versionadded directive for vpc_name arg in boto_secgroup.present + * 1e1a74fd61 Add backports_abc and singledispatch_helpers to thin as well -- **PR** `#28516`_: (*rallytime*) Back-port `#28489`_ to 2015.8 + * da1a2773dd Add singledispatch to the thin -- **PR** `#28506`_: (*basepi*) [2015.8] Log minion list for all rosters, at debug level +* **PR** `#28759`_: (`jfindlay`_) simplify stdin use of stdin in at.present state + @ *2015-11-12 18:11:55 UTC* -- **PR** `#28514`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#28187`_: (`sjansen`_) fix at.present (refs: `#28759`_) -- **PR** `#28502`_: (*cachedout*) Lint `#28427`_ + * af52c3272f Merge pull request `#28759`_ from jfindlay/at -- **PR** `#28464`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 987d1fee7c simplify stdin use of stdin in at.present state -- **PR** `#28486`_: (*rallytime*) Back-port `#26945`_ to 2015.8 +* **PR** `#28824`_: (`rallytime`_) Back-port `#28778`_ and `#28820`_ to 2015.8 + @ *2015-11-12 18:06:31 UTC* -- **PR** `#28472`_: (*gtmanfred*) overwrite more than one value with names + * **PR** `#28820`_: (`cro`_) Add versionadded directives for chronos and marathon proxy grains. (refs: `#28824`_) -- **PR** `#28493`_: (*rallytime*) Back-port `#28492`_ to 2015.8 + * **PR** `#28778`_: (`toddtomkinson`_) marathon and chronos proxy minions (refs: `#28824`_) -- **PR** `#28494`_: (*whiteinge*) Fix filter_by passing incorrect parameters to match functions + * 08891cb210 Merge pull request `#28824`_ from rallytime/bp-28778-and-28820 -- **PR** `#28491`_: (*rallytime*) Back-port `#28388`_ to 2015.8 + * ab5943995b Change versionaddeds to 2015.8.2 from Boron -- **PR** `#28465`_: (*twangboy*) Fix `#12363`_: Password Expiration in Windows + * da7ad0df99 Add versionadded directives. -- **PR** `#28485`_: (*nasenbaer13*) Fix invalid usage of _get_conn causing `#28484`_ + * 4bdd10fdf5 documentation updates -- **PR** `#28454`_: (*sdm24*) Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config + * 675bc2acce more pylint fixes -- **PR** `#28487`_: (*cachedout*) Lint 28456 + * 8e19b5c518 pylint fixes -- **PR** `#28457`_: (*sdm24*) Clarified comments for grains/core.py for ip_interfaces, ip4_interfac… + * ba94878f45 marathon and chronos proxy minions -- **PR** `#28473`_: (*anlutro*) Show check_cmd output on failure +* **ISSUE** `#23271`_: (`twisty7867`_) Unicode paths break file states with masterless minion on Vagrant/Ubuntu 14.04 (refs: `#28803`_) -- **PR** `#28460`_: (*jtand*) Skipped wipefs test if wipefs does not exist on OS +* **PR** `#28803`_: (`jfindlay`_) decode strings to utf-8 + @ *2015-11-12 04:59:38 UTC* -- **PR** `#28426`_: (*terminalmage*) pkgbuild.built: make template engine optional + * 30ea94439c Merge pull request `#28803`_ from jfindlay/sdecodes -- **PR** `#28422`_: (*cachedout*) Handle windows logging on thread_multi [WIP] + * 11163380cf sdecode chunk name in state compiler -- **PR** `#28425`_: (*twangboy*) Fix `#13513`_ - Reflection + * 7f95c483e1 sdecode strings in file state -- **PR** `#28417`_: (*rallytime*) Add note about azure sdk version to getting started docs + * fe4d08526d sdecode strings in highstate outputter -- **PR** `#28410`_: (*jacksontj*) Add retries to the zeromq.AsyncReqMessageClient +* **ISSUE** `#25363`_: (`syphernl`_) rabbitmq_{user|vhost}.present in test=True reports unnecessary changes (refs: `#28269`_) -- **PR** `#28404`_: (*rallytime*) Back-port `#28395`_ to 2015.8 +* **ISSUE** `#24856`_: (`pruiz`_) rabbitmq_user state incorrectly reports result=True when using test=true (refs: `#28269`_) -- **PR** `#28405`_: (*opdude*) Detect legacy versions of chocolatey correctly +* **PR** `#28782`_: (`rallytime`_) Fixes to rabbitmq user state + @ *2015-11-12 00:59:57 UTC* -- **PR** `#28187`_: (*sjansen*) fix at.present + * **PR** `#28269`_: (`rallytime`_) Refactor rabbitmq_user state to use test=True correctly (refs: `#28782`_, `#28772`_) -- **PR** `#28375`_: (*merll*) Merge pillar includes correctly + * 59b505ff7c Merge pull request `#28782`_ from rallytime/rabbitmq-user-state -- **PR** `#28376`_: (*ryan-lane*) Support update of route53 records with multiple values + * e2b0fee57e Don't change perms list, only existing perms should be a dictionary. -- **PR** `#28377`_: (*terminalmage*) Deprecate 'always' in favor of 'force' in pkgbuild.built + * 7601647d69 Revert "rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list." -- **PR** `#28380`_: (*cro*) Add missing call for service provider +* **ISSUE** `#28429`_: (`cbuechler`_) salt-cloud VMware driver fails with uncustomizable guest when not customizing guest (refs: `#28789`_) -- **PR** `#28348`_: (*jfindlay*) salt.utils.alias informs user they are using a renamed function +* **PR** `#28789`_: (`nmadhok`_) Provide ability to enable/disable customization for newly create VMs using VMware salt-cloud driver + @ *2015-11-11 22:48:57 UTC* -- **PR** `#28364`_: (*jtand*) In CentOS 5 the .split() causes a stacktrace. + * 098d48ad26 Merge pull request `#28789`_ from nmadhok/2015.8-customization-fix -- **PR** `#28361`_: (*rallytime*) Back-port `#28087`_ to 2015.8 + * 9294ebd984 Provide ability to enable/disable customization for new VMs. Fixes `#28429`_ -- **PR** `#28360`_: (*multani*) Various documentation fixes +* **ISSUE** `#28692`_: (`mrosedale`_) puppet.run fails with arguments (refs: `#28768`_) -- **PR** `#28370`_: (*rallytime*) Back-port `#28276`_ to 2015.8 +* **PR** `#28768`_: (`mrosedale`_) 2015.8 + @ *2015-11-11 19:29:11 UTC* -- **PR** `#28353`_: (*merll*) Consider each pillar match only once. + * 1e510be55b Merge pull request `#28768`_ from mrosedale/2015.8 -- **PR** `#28334`_: (*anlutro*) iptables needs -m comment for --comment to work + * fbbbdcc02e Update puppet.py -- **PR** `#28340`_: (*jfindlay*) sdecode file and dir lists in fileclient + * 1c1a4b4410 Update puppet.py -- **PR** `#28344`_: (*ryan-lane*) Fix iptables state for non-filter tables + * 59bd6aef5c Merge pull request `#1`_ from mrosedale/mrosedale-patch-1 -- **PR** `#28343`_: (*rallytime*) Back-port `#28342`_ to 2015.8 + * c26ea916aa Update puppet.py -- **PR** `#28330`_: (*rallytime*) Back-port `#28305`_ to 2015.8 +* **ISSUE** `#25363`_: (`syphernl`_) rabbitmq_{user|vhost}.present in test=True reports unnecessary changes (refs: `#28269`_) -- **PR** `#28270`_: (*rallytime*) Refactor RabbitMQ Plugin State to correctly use test=true and format errors +* **ISSUE** `#24856`_: (`pruiz`_) rabbitmq_user state incorrectly reports result=True when using test=true (refs: `#28269`_) -- **PR** `#28269`_: (*rallytime*) Refactor rabbitmq_user state to use test=True correctly +* **PR** `#28772`_: (`rallytime`_) rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list. + @ *2015-11-11 18:17:09 UTC* -- **PR** `#28299`_: (*rallytime*) Add test for availability_zone check to boto_vpc_tests + * **PR** `#28269`_: (`rallytime`_) Refactor rabbitmq_user state to use test=True correctly (refs: `#28782`_, `#28772`_) -- **PR** `#28306`_: (*sdm24*) Updated the Nodegroup docs to include how to target nodegroups in SLS Jinja + * a6cad46301 Merge pull request `#28772`_ from rallytime/rabbitmq-user-state -- **PR** `#28308`_: (*rallytime*) Firewalld state services should use --add-service, not --new-service + * 07482211eb rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list. -- **PR** `#28302`_: (*DmitryKuzmenko*) Always close socket even if there is no stream. +* **ISSUE** `#28724`_: (`quantonganh`_) Exception occurred when calling boto_vpc.route_table_present with test=True (refs: `#28725`_) -- **PR** `#28282`_: (*keesbos*) Fix for __env__ in legacy git_pillar +* **PR** `#28774`_: (`rallytime`_) Back-port `#28725`_ to 2015.8 + @ *2015-11-11 18:16:27 UTC* -- **PR** `#28258`_: (*pass-by-value*) Add service module for ssh proxy example + * **PR** `#28725`_: (`quantonganh`_) boto_vpc: return an empty dict in case cannot get the route tables (refs: `#28774`_) -- **PR** `#28294`_: (*bechtoldt*) correct a bad default value in http utility + * d570ac48f4 Merge pull request `#28774`_ from rallytime/bp-28725 -- **PR** `#28185`_: (*jtand*) Added single package return for latest_version, fixed other bug. + * c3420461c3 boto_vpc: return an empty dict in case cannot get the route tables -- **PR** `#28297`_: (*cachedout*) Lint fix proxy junos +* **PR** `#28775`_: (`rallytime`_) Back-port `#28740`_ to 2015.8 + @ *2015-11-11 17:57:24 UTC* -- **PR** `#28210`_: (*terminalmage*) Fix for ext_pillar being compiled twice in legacy git_pillar code + * **PR** `#28740`_: (`MasterNayru`_) Add missing S3 module import (refs: `#28777`_, `#28775`_, `#28776`_) -- **PR** `#28265`_: (*jfindlay*) fix blockdev execution and state modules + * 806d1b3669 Merge pull request `#28775`_ from rallytime/bp-28740 -- **PR** `#28266`_: (*rallytime*) Back-port `#28260`_ to 2015.8 + * 8a2780da18 Add missing S3 module import -- **PR** `#28253`_: (*rallytime*) Back-port `#28063`_ to 2015.8 +* **PR** `#28755`_: (`rallytime`_) Move most vmware driver list_* functions to use salt.utils.vmware functions + @ *2015-11-11 17:49:16 UTC* -- **PR** `#28231`_: (*rallytime*) Make sure we're compairing strings when getting images in the DO driver + * f273c46f07 Merge pull request `#28755`_ from rallytime/vmware-utils -- **PR** `#28224`_: (*techhat*) Optimize create_repo for large packages + * 5abe010023 Move most vmware driver list_* functions to use salt.utils.vmware functions -- **PR** `#28214`_: (*rallytime*) Don't stacktrace if invalid credentials are passed to boto_route53 state +* **ISSUE** `#28655`_: (`sjorge`_) possible issue with state module boto_cfn/docker/... (refs: `#28744`_) -- **PR** `#28228`_: (*rallytime*) Back-port `#27562`_ to 2015.8 +* **PR** `#28744`_: (`jfindlay`_) import gate elementtree + @ *2015-11-11 16:29:12 UTC* -- **PR** `#28232`_: (*rallytime*) Add documentation to supply the ssh_username: freebsd config to DO docs + * 0d912bf0d4 Merge pull request `#28744`_ from jfindlay/elementttree -- **PR** `#28198`_: (*jacobhammons*) Added note regarding missing spm exe on Debian/Ubuntu + * e321d60002 import gate elementtree in artifactory module -- **PR** `#28182`_: (*erchn*) Some fixes for nova driver for Rackspace + * f20f3f697b import gate elementtree in boto_iam state -- **PR** `#28181`_: (*rallytime*) Revamp firewalld state to be more stateful. + * 9845d2f2c6 import gate elementtree in boto_cfn state -- **PR** `#28176`_: (*cro*) Add ping function +* **ISSUE** `#28726`_: (`feigenblatt`_) user.present ignores "createhome: False" (refs: `#28758`_) -- **PR** `#28167`_: (*The-Loeki*) file.serialize needs to add a final newline to serialized files +* **PR** `#28758`_: (`jfindlay`_) remove redundant logic in useradd execution module + @ *2015-11-11 16:22:21 UTC* -- **PR** `#28168`_: (*rallytime*) Make sure availability zone gets passed in boto_vpc module when creating subnet + * b65e786351 Merge pull request `#28758`_ from jfindlay/user -- **PR** `#28148`_: (*basepi*) [2015.8] Only expand nodegroups to lists if there is a nested nodegroup + * dbd582cd8d fix doc formatting in user.present state -- **PR** `#28155`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 3824d2e9fc only change/report new home when createhome is True -- **PR** `#28149`_: (*pass-by-value*) Add clarification to cloud profile doc about host + * 3fbf81611f remove redundant logic in useradd execution module -- **PR** `#28146`_: (*cachedout*) Lint dracr.py +* **PR** `#28757`_: (`mbarrien`_) Bug fix: pip command to not quote spaces in cmd line args + @ *2015-11-11 16:08:46 UTC* -- **PR** `#28141`_: (*rallytime*) Don't use RAM for root disk size in linode.py + * 6eced26013 Merge pull request `#28757`_ from mbarrien/fix-pip-cmd -- **PR** `#28143`_: (*jtand*) Removed blank line at end of chassis.py + * 6df6cb82a6 Fix pip command to not quote spaces in cmd line args -- **PR** `#28021`_: (*blueyed*) Handle includes in `include_config` recursively +* **PR** `#28764`_: (`multani`_) Various documentation fixes + @ *2015-11-11 16:06:10 UTC* -- **PR** `#28095`_: (*rallytime*) Back-port `#28001`_ to 2015.8 + * 356bf2987d Merge pull request `#28764`_ from multani/fix/docs -- **PR** `#28096`_: (*rallytime*) Back-port `#28061`_ to 2015.8 + * 1a31b69763 doc: fix documentation formatting in salt.utils.jinja -- **PR** `#28139`_: (*rallytime*) Back-port `#28103`_ to 2015.8 + * 59c105b4b9 doc: fix documentation formatting in salt.states.boto_iam* -- **PR** `#28098`_: (*jacksontj*) For all multi-part messages, check the headers. If the header is not … + * cbb167c8ee doc: fix documentation formatting in in salt.modules.lxc -- **PR** `#28134`_: (*bernieke*) fix unicode pillar values `#3436`_ + * cb03a89e52 doc: fix documentation formatting in salt.modules.aptpkg -- **PR** `#28076`_: (*redmcg*) Replace option 'i' with an explicit queryformat +* **PR** `#28752`_: (`aboe76`_) Update openSUSE grain for tumbleweed + @ *2015-11-11 03:54:37 UTC* -- **PR** `#28119`_: (*jacksontj*) Check if the remote exists before casting to a string. + * d77c24e70d Merge pull request `#28752`_ from aboe76/suse_tumbleweed_grain -- **PR** `#28105`_: (*jfindlay*) add reason for not loading localemod + * 764cb16ef0 Update openSUSE grain for tumbleweed -- **PR** `#28108`_: (*cachedout*) Set logfile permsissions correctly +* **ISSUE** `#28712`_: (`hexedpackets`_) Service registration in the Consul module is broken (refs: `#28713`_) -- **PR** `#27922`_: (*cro*) WIP States/Modules for managing Dell FX2 chassis via salt-proxy +* **PR** `#28713`_: (`hexedpackets`_) Rename consul.list to consul.list_keys. + @ *2015-11-11 00:57:23 UTC* -- **PR** `#28104`_: (*pass-by-value*) Add documentation for proxy minion ssh + * a620bc5596 Merge pull request `#28713`_ from hexedpackets/fix-consul-module -- **PR** `#28020`_: (*DmitryKuzmenko*) LazyLoader deepcopy fix. + * 0889907b3c Make consul.list a function alias. -- **PR** `#27933`_: (*eliasp*) Provide all git pillar dirs in `opts[pillar_roots]` +* **PR** `#28719`_: (`jacobhammons`_) removed dependencies info from docs + @ *2015-11-10 00:04:53 UTC* -- **PR** `#28013`_: (*rallytime*) Back-port `#27891`_ to 2015.8 + * decc31a766 Merge pull request `#28719`_ from jacobhammons/spm -- **PR** `#28018`_: (*rallytime*) Add example to Writing Grains of how grains can be loaded twice + * d7017be031 removed dependencies info from docs -- **PR** `#28084`_: (*cachedout*) `#28069`_ with lint +* **PR** `#28709`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-11-09 23:38:27 UTC* -- **PR** `#28079`_: (*The-Loeki*) Fix for trace dump on failing imports for win32com & pythoncom 4 win_task + * 989069f44a Merge pull request `#28709`_ from basepi/merge-forward-2015.8 -- **PR** `#28081`_: (*The-Loeki*) fix for glance state trace error on import failure + * 2d04ddc108 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 -- **PR** `#28066`_: (*jacksontj*) Use the generic `text` attribute, not .body of the handler + * f40c617bad Merge pull request `#28705`_ from cachedout/tornado_http_headers -- **PR** `#28019`_: (*rallytime*) Clean up version added and deprecated msgs to be accurate + * 7ac6cde1ee Account for new headers class in tornado 4.3 -- **PR** `#28058`_: (*rallytime*) Back-port `#28041`_ to 2015.8 + * c90431eddc Rip out unit test that doesn't apply anymore -- **PR** `#28055`_: (*rallytime*) Back-port `#28043`_ to 2015.8 + * aeeaa7c90d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 -- **PR** `#28046`_: (*pass-by-value*) Add pkg install and remove functions + * 604a7b4199 Merge pull request `#28699`_ from rallytime/bp-28670 -- **PR** `#28050`_: (*ryan-lane*) Use a better method for checking dynamodb table existence + * e436b23296 psutil can fail to look-up a uid and raise a KeyError -- **PR** `#28042`_: (*jfindlay*) fix repo path in ubuntu installation documentation + * 7bd3eb8370 Merge pull request `#28703`_ from rallytime/bp-28690 -- **PR** `#28033`_: (*twangboy*) Fixed win_useradd.py + * a0988dab58 Fix 28689 : Check s3 ext pillar cache file before calculating expiration -- **PR** `#28027`_: (*cro*) Make ssh conn persistent. + * 2a40f57b93 Merge pull request `#28694`_ from s0undt3ch/2015.5 -- **PR** `#28029`_: (*jacobhammons*) Updated release notes with additional CVE information + * 0910c6ffe4 Update to latest bootstrap script v2015.11.09 -- **PR** `#28022`_: (*jacobhammons*) Updated Debian and Ubuntu repo paths with new structure for 2015.8.1 + * 3249b322e8 Merge pull request `#28669`_ from rallytime/fix-26592 -- **PR** `#27983`_: (*rallytime*) Pip state run result should be False, not None, if installation error occurs. + * 098fb815af Use the -q argument to strip extraneous messages from rabbitmq -- **PR** `#27991`_: (*twangboy*) Fix for `#20678`_ + * 29e8250d0c Merge pull request `#28645`_ from jacksontj/2015.5 -- **PR** `#27997`_: (*rallytime*) Remove note about pip bug with pip v1 vs pip v2 return codes + * f63c2d70a7 Rework minion return_retry_timer -- **PR** `#27994`_: (*jtand*) Fix schedule_test failure + * 1bbaea8aad Merge pull request `#28668`_ from twangboy/fix_15177 -- **PR** `#27992`_: (*cachedout*) Make load beacon config into list + * 745b8f75f6 Fixed some lint -- **PR** `#28003`_: (*twangboy*) Fix `#26336`_ + * a43eb53f28 Added version added notes in docs -- **PR** `#27984`_: (*rallytime*) Versionadded for clean_file option for pkgrepo + * 6b537c8640 Fixed join_domain and unjoin_domain for Windows -- **PR** `#27989`_: (*ryan-lane*) Do not try to remove the main route table association + * 4ad5056066 Merge pull request `#28666`_ from jfindlay/r_data -- **PR** `#27982`_: (*pass-by-value*) Add example for salt-proxy over SSH + * 29228f445f define r_data before using it in file module -- **PR** `#27985`_: (*jacobhammons*) Changed current release to 8.1 and added CVEs to release notes + * e129e889ad Merge pull request `#28662`_ from cachedout/issue_24758 -- **PR** `#27979`_: (*cachedout*) Fix regression with key whitespace + * 78f4894333 Add note about disabling master_alive_interval -- **PR** `#27977`_: (*cachedout*) Decode unicode names in fileclient/server + * df121d0cec Merge pull request `#28627`_ from twangboy/backport_win_useradd -- **PR** `#27981`_: (*jtand*) Fixed trailing whitespace lint + * 87282b6354 Backport win_useradd -- **PR** `#27969`_: (*jeffreyctang*) fix parse of { on next line +* **ISSUE** `#28469`_: (`mlalpho`_) state boto_secgroup.present fails to find vpc_name (refs: `#28710`_, `#28534`_) -- **PR** `#27978`_: (*terminalmage*) Add note about dockerng.inspect_image usage +* **PR** `#28710`_: (`rallytime`_) Pass kwargs correctly to _get_group from get_group_id + @ *2015-11-09 22:29:09 UTC* -- **PR** `#27955`_: (*pass-by-value*) Bp 27868 + * 8d5ab15c16 Merge pull request `#28710`_ from rallytime/fix-28469 -- **PR** `#27953`_: (*The-Loeki*) Fix CloudStack cloud for new 'driver' syntax + * 0571608f5d Pass kwargs correctly to _get_group from get_group_id -- **PR** `#27965`_: (*ryan-lane*) Fail in boto_asg.present if alarms fail +* **PR** `#28698`_: (`rallytime`_) Back-port `#28530`_ to 2015.8 + @ *2015-11-09 18:11:51 UTC* -- **PR** `#27958`_: (*twangboy*) Added new functionality to win_task.py + * **PR** `#28530`_: (`skizunov`_) AsyncTCPReqChannel will fail after 10 uses (refs: `#28614`_, `#28698`_) -- **PR** `#27959`_: (*techhat*) Change __opts__ to self.opts + * cfa0cec19c Merge pull request `#28698`_ from rallytime/bp-28530 -- **PR** `#27943`_: (*rallytime*) Back-port `#27910`_ to 2015.8 + * d94d0db805 AsyncTCPReqChannel will fail after 10 uses -- **PR** `#27944`_: (*rallytime*) Back-port `#27909`_ to 2015.8 +* **ISSUE** `#28678`_: (`johnsocp`_) Error in netapi/rest_tornado preventing it from starting (refs: `#28679`_) -- **PR** `#27946`_: (*jtand*) Changed grain to look at osmajorrelease instead of osrelease +* **PR** `#28700`_: (`rallytime`_) Back-port `#28679`_ to 2015.8 + @ *2015-11-09 18:07:44 UTC* -- **PR** `#27914`_: (*rallytime*) Use eipalloc instead of eni in EC2 interface properties example + * **PR** `#28679`_: (`johnsocp`_) Adding err variable definition to fix error that is preventing rest_tornado from initializing (refs: `#28700`_) -- **PR** `#27926`_: (*rallytime*) Back-port `#27905`_ to 2015.8 + * 2fe9e2e7c5 Merge pull request `#28700`_ from rallytime/bp-28679 -- **PR** `#27927`_: (*ryan-lane*) Do not manage ingress or egress rules if set to None + * 4e0870e636 Adding variable definition for issue `#28678`_ -- **PR** `#27928`_: (*rallytime*) Back-port `#27908`_ to 2015.8 + * **PR** `saltstack/salt-bootstrap#868`_: (`cachedout`_) Always refresh the Arch Linux keyring if needed (refs: `#28695`_, `#28694`_) -- **PR** `#27676`_: (*ticosax*) [dockerng] WIP No more runtime args passed to docker.start() +* **PR** `#28695`_: (`s0undt3ch`_) [2015.8] Update to latest bootstrap script v2015.11.09 + @ *2015-11-09 17:50:15 UTC* -- **PR** `#27885`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 8ccea2a855 Merge pull request `#28695`_ from s0undt3ch/2015.8 -- **PR** `#27882`_: (*twangboy*) Created win_task.py module + * bb6c60a330 Update to latest bootstrap script v2015.11.09 -- **PR** `#27802`_: (*terminalmage*) Correct warning logging when update lock is present for git_pillar/winrepo, add runner function for clearing git_pillar/winrepo locks +* **ISSUE** `#28526`_: (`clarkperkins`_) yumpkg.installed broken in salt v2015.8.1 on CentOS 6 minions (refs: `#28656`_) -- **PR** `#27886`_: (*rallytime*) Handle group lists as well as comma-separated group strings. +* **PR** `#28656`_: (`clarkperkins`_) `#28526`_ fixed yumpkg module issue with pkg.installed + @ *2015-11-09 05:16:00 UTC* -- **PR** `#27746`_: (*anlutro*) timezone module: handle timedatectl errors + * 61ba00b1c3 Merge pull request `#28656`_ from clarkperkins/bugfix/fix-yumpkg-module -- **PR** `#27816`_: (*anlutro*) Make system.reboot use `shutdown -r` when available + * e11f87be93 `#28526`_ fixed yumpkg module -- **PR** `#27874`_: (*rallytime*) Add mention of Periodic Table naming scheme to deprecation docs +* **ISSUE** `#28588`_: (`aboe76`_) openSUSE Leap not recognized as 'Suse' os grain and os_family grain (2015.8.1 ) (refs: `#28672`_) -- **PR** `#27883`_: (*terminalmage*) Work around --is-ancestor not being present in git-merge-base before git 1.8.0 +* **PR** `#28672`_: (`jfindlay`_) add OS grain support for SuSE Leap + @ *2015-11-08 01:05:51 UTC* -- **PR** `#27877`_: (*rallytime*) Back-port `#27774`_ to 2015.8 + * 54484e4e29 Merge pull request `#28672`_ from jfindlay/suse_grain -- **PR** `#27878`_: (*rallytime*) Use apache2ctl binary on SUSE in apache module + * b44ba6fa9c add OS grain support for SuSE Leap -- **PR** `#27879`_: (*cro*) Add docs for 2015.8.2+ changes to proxies +* **ISSUE** `#28603`_: (`alexharrington`_) MooseFS/LizardFS mount options force remount (refs: `#28673`_) -- **PR** `#27731`_: (*cro*) Add __proxy__ to replace opts['proxymodule'] +* **PR** `#28673`_: (`jfindlay`_) add hidden_opts to mount.mounted + @ *2015-11-08 00:51:19 UTC* -- **PR** `#27745`_: (*anlutro*) Add pip_upgrade arg to virtualenv.managed state + * 476f55ebc0 Merge pull request `#28673`_ from jfindlay/mount_hide -- **PR** `#27809`_: (*ticosax*) [dockerng] Remove dockerng.ps caching + * 1dcaa8e1d7 add hidden_opts to mount.mounted -- **PR** `#27859`_: (*ticosax*) [dockerng] Clarify doc port bindings + * d3aff8f6b8 minor refactor of mount state -- **PR** `#27748`_: (*multani*) Fix `#8646`_ +* **PR** `#28667`_: (`cro`_) saltutil.sync_all should sync proxymodules as well as the rest. + @ *2015-11-07 01:09:28 UTC* -- **PR** `#27850`_: (*rallytime*) Back-port `#27722`_ to 2015.8 + * 24d75709fa Merge pull request `#28667`_ from cro/proxy_sync_all -- **PR** `#27851`_: (*rallytime*) Back-port `#27771`_ to 2015.8 + * 08e53b317f Sync proxymodules with sync_all -- **PR** `#27833`_: (*jfindlay*) decode path before string ops in fileclient +* **PR** `#28665`_: (`jfindlay`_) fixes to windows execution and state modules + @ *2015-11-07 00:47:38 UTC* -- **PR** `#27837`_: (*jfindlay*) reverse truth in python_shell documentation + * 019c13948a Merge pull request `#28665`_ from jfindlay/win_fixorz -- **PR** `#27860`_: (*flavio*) Fix OS related grains on openSUSE and SUSE Linux Enterprise + * e8c7371b56 fix minor doc issues in win_system module -- **PR** `#27768`_: (*rallytime*) Clean up bootstrap function to be slightly cleaner + * 5828f391b9 handle error on nonexistent net dev in win_network -- **PR** `#27797`_: (*isbm*) Zypper module clusterfix + * d1560f9ea9 check for wua time setting as a str -- **PR** `#27849`_: (*rallytime*) Don't require a size parameter for proxmox profiles +* **ISSUE** `#28542`_: (`Ch3LL`_) s3.get execution module returns error (refs: `#28660`_) -- **PR** `#27827`_: (*techhat*) Add additional error checking to SPM +* **PR** `#28660`_: (`techhat`_) Don't sign empty regions + @ *2015-11-06 20:49:25 UTC* -- **PR** `#27826`_: (*martinhoefling*) Fixes `#27825`_ + * ce3ce7ddf2 Merge pull request `#28660`_ from techhat/emptyregion -- **PR** `#27824`_: (*techhat*) Update Azure errors + * a52518494a Don't sign empty regions -- **PR** `#27795`_: (*eguven*) better change reporting for postgres_user groups +* **PR** `#28632`_: (`terminalmage`_) Fixes/improvements to pkgbuild state/modules + @ *2015-11-06 20:48:07 UTC* -- **PR** `#27799`_: (*terminalmage*) Fix usage of identity file in git.latest + * 0583575f82 Merge pull request `#28632`_ from terminalmage/pkgbuild-fixes -- **PR** `#27717`_: (*pass-by-value*) Proxy beacon example + * 59f31b4dca Initialize logging in pkgbuild state -- **PR** `#27793`_: (*anlutro*) update code that changes log level of salt-ssh shim command + * af0b2c4a33 Fix false-positives for pkgbuild.built state -- **PR** `#27761`_: (*terminalmage*) Merge git pillar data instead of using dict.update() + * d83e779eac rpmbuild: Change return data to include a list of packages built -- **PR** `#27741`_: (*ticosax*) [dockerng] pass filters argument to dockerng.ps + * 03d9321379 debbuild: Change return data to include a list of packages built -- **PR** `#27760`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **ISSUE** `#28591`_: (`ssgward`_) SPM package install error (refs: `#28658`_) -- **PR** `#27757`_: (*jfindlay*) fix virtual fcn return doc indentation +* **PR** `#28658`_: (`techhat`_) Remove _pkgdb_fun() references + @ *2015-11-06 20:25:59 UTC* -- **PR** `#27754`_: (*rallytime*) Change test.nop version directive to 2015.8.1 + * b82abadd9b Merge pull request `#28658`_ from techhat/issue28591 -- **PR** `#27734`_: (*jacobhammons*) Updated saltstack2 theme to add SaltConf16 banner + * 4f2b175467 Remove _pkgdb_fun() references -- **PR** `#27727`_: (*rallytime*) Merge `#27719`_ w/pylint fix +* **ISSUE** `#28470`_: (`mlalpho`_) salt boto_rds.present fails to execute, too many arguments (refs: `#28612`_, `#28653`_) -- **PR** `#27724`_: (*jfindlay*) update __virtual__ return documentation +* **PR** `#28653`_: (`rallytime`_) Provide possible parameters for boto_rds.present engine values + @ *2015-11-06 18:58:35 UTC* -- **PR** `#27725`_: (*basepi*) Fix global injection for state cross calls + * e59d160120 Merge pull request `#28653`_ from rallytime/boto_rds_engine_docs -- **PR** `#27628`_: (*ticosax*) [dockerng] Add support of `labels` parameter for dockerng + * 7b30d7e002 Provide possible parameters for boto_rds.present engine values -- **PR** `#27704`_: (*jacobhammons*) Update compound matcher docs to clarify the usage of alternate delimi… +* **PR** `#28649`_: (`bdrung`_) Fix OS related grains on Debian + @ *2015-11-06 18:25:46 UTC* -- **PR** `#27705`_: (*rallytime*) Merge `#27602`_ with final pylint fix + * 911761d8bc Merge pull request `#28649`_ from bdrung/2015.8 -- **PR** `#27691`_: (*notpeter*) Faster timeout (3s vs 2min) for instance metadata lookups. `#13850`_. + * 92a17d4cae Fix OS related grains on Debian -- **PR** `#27696`_: (*blueyed*) loader.proxy: call `_modules_dirs` only once +* **ISSUE** `#26889`_: (`UtahDave`_) salt-call w/non root user outputs repeating error (refs: `#28113`_, `#27343`_) -- **PR** `#27630`_: (*ticosax*) Expose container_id in mine.get_docker +* **PR** `#28646`_: (`rallytime`_) Back-port `#28614`_ to 2015.8 + @ *2015-11-06 18:19:08 UTC* -- **PR** `#27600`_: (*blueyed*) dockerng: use docker.version=auto by default + * **PR** `#28614`_: (`skizunov`_) Fixed memory leak in AsyncTCPReqChannel (refs: `#28646`_) -- **PR** `#27689`_: (*rallytime*) Merge `#27448`_ with test fixes + * **PR** `#28530`_: (`skizunov`_) AsyncTCPReqChannel will fail after 10 uses (refs: `#28614`_, `#28698`_) -- **PR** `#27693`_: (*jacobhammons*) initial engines topic, updates to windows repo docs + * **PR** `#28113`_: (`skizunov`_) 'RuntimeError: IOLoop is closing' thrown in Minion on TCP transport (refs: `#28614`_) -- **PR** `#27601`_: (*blueyed*) dockerng: handle None in container.Names + * **PR** `#27343`_: (`cachedout`_) Close io loop before deleting attribute (refs: `#28614`_) -- **PR** `#27596`_: (*blueyed*) gitfs: fix UnboundLocalError for 'msg' + * 7531bc7334 Merge pull request `#28646`_ from rallytime/bp-28614 -- **PR** `#27651`_: (*eliasp*) Check for existence of 'subnetId' key in subnet dict + * 034cf28e57 Fixed memory leak in AsyncTCPReqChannel -- **PR** `#27639`_: (*rallytime*) Docement version added for new artifactory options +* **PR** `#28647`_: (`rallytime`_) Back-port `#28624`_ to 2015.8 + @ *2015-11-06 18:18:32 UTC* -- **PR** `#27677`_: (*rallytime*) Back-port `#27675`_ to 2015.8 + * **PR** `#28624`_: (`hyn-salt`_) Added reasoning why boto_cloudwatch.py cannot be loaded. (refs: `#28647`_) -- **PR** `#27637`_: (*rallytime*) Back-port `#27604`_ to 2015.8 + * a829120746 Merge pull request `#28647`_ from rallytime/bp-28624 -- **PR** `#27657`_: (*garethgreenaway*) Fix to pkg state module + * 3b59cfae5f Added reasoning why boto_cloudwatch.py cannot be loaded. -- **PR** `#27632`_: (*rallytime*) Back-port `#27539`_ to 2015.8 +* **PR** `#28648`_: (`rallytime`_) Merge branch '2015.5' into '2015.8' + @ *2015-11-06 17:46:59 UTC* -- **PR** `#27633`_: (*rallytime*) Back-port `#27559`_ to 2015.8 + * 52d70c986d Merge pull request `#28648`_ from rallytime/merge-2015.8 -- **PR** `#27579`_: (*rallytime*) Change boto_route53 region default to 'universal' to avoid problems with boto library + * 81c4974fde Merge branch '2015.5' into '2015.8' -- **PR** `#27581`_: (*tkwilliams*) Add support for 'vpc_name' tag in boto_secgroup module and state + * 64a20228c6 Merge pull request `#28617`_ from cachedout/umask_module_sync -- **PR** `#27624`_: (*nasenbaer13*) Wait for sync is not passed to boto_route53 state + * 227792e158 Set restrictive umask on module sync -- **PR** `#27614`_: (*blueyed*) doc: minor fixes to doc and comments + * 065f8c7fb3 Merge pull request `#28622`_ from gravyboat/update_puppet_module_docs -- **PR** `#27627`_: (*eyj*) Fix crash in boto_asg.get_instances if the requested attribute is None + * 4ea28bed30 Update puppet module wording -- **PR** `#27616`_: (*jacobhammons*) Updated windows software repository docs +* **PR** `#28638`_: (`anlutro`_) Salt-SSH: Return more concise error when SSH command fails + @ *2015-11-06 16:54:46 UTC* -- **PR** `#27569`_: (*lomeroe*) boto_vpc.get_subnet_association now returns a dict w/key of vpc_id, a… + * 4722e41787 Merge pull request `#28638`_ from alprs/saltssh-handle_ssh_errors -- **PR** `#27567`_: (*whiteinge*) Use getattr to fetch psutil.version_info + * 5419b98363 return concise error when ssh fails -- **PR** `#27583`_: (*tkwilliams*) Fixup zypper module +* **PR** `#28644`_: (`pass-by-value`_) Make sure versionchanged is correct + @ *2015-11-06 16:53:31 UTC* -- **PR** `#27597`_: (*blueyed*) gitfs: remove unused variable "bad_per_remote_conf" + * e72e60d4b4 Merge pull request `#28644`_ from pass-by-value/update_versionchanged -- **PR** `#27585`_: (*ryan-lane*) Fix undefined variable in cron state module + * f4c297e794 Make sure versionchanged is correct -.. _`#3436`: https://github.com/saltstack/salt/issues/3436 -.. _`#8646`: https://github.com/saltstack/salt/issues/8646 +* **ISSUE** `#8`_: (`thatch45`_) Network persistence (refs: `#28615`_) + +* **ISSUE** `#64`_: (`thatch45`_) State file rendering system (refs: `#28615`_) + +* **ISSUE** `#54`_: (`thatch45`_) Release items (refs: `#28615`_) + +* **PR** `#28615`_: (`The-Loeki`_) Fixes to FreeBSD pkg + @ *2015-11-05 23:43:33 UTC* + + * **PR** `#198`_: (`techhat`_) Basic salt support for Tomcat (refs: `#28615`_) + + * cf79722260 Merge pull request `#28615`_ from The-Loeki/patch-1 + + * a9ee178e0d rehash is a shell builtin, needs cmd.shell to work + + * 17f3852bdd environ.get has no output_loglevel + +* **PR** `#28613`_: (`cachedout`_) Add facility to deepcopy bound methods in Py2.6 and apply to grains + @ *2015-11-05 23:28:50 UTC* + + * **PR** `#28587`_: (`cachedout`_) Reset yaml rendering hooks to avoid leaks (refs: `#28613`_) + + * 9196c57e3f Merge pull request `#28613`_ from cachedout/py26_method_deepcopy + + * 0935fcf4fc Spelling is hard + + * 2435b45195 Move to compat module to avoid namespace collisions in salt.utils + + * f519661875 Add facility to deepcopy bound methods in Py2.6 and apply to grains + +* **ISSUE** `#28527`_: (`Oro`_) boto_rds.create needs storage_type, which does not exist in boto.rds2 create_db_instance (refs: `#28561`_) + +* **ISSUE** `#28470`_: (`mlalpho`_) salt boto_rds.present fails to execute, too many arguments (refs: `#28612`_, `#28653`_) + +* **PR** `#28612`_: (`rallytime`_) Remove unsupported storage_type argument for parity with boto_rds module + @ *2015-11-05 19:07:42 UTC* + + * **PR** `#28561`_: (`Oro`_) Issue `#28527`_ boto_rds.create does not work (refs: `#28612`_) + + * 2032d61e68 Merge pull request `#28612`_ from rallytime/fix-28470 + + * 8fd26a5488 Remove unsupported storage_type argument for parity with boto_rds module + +* **PR** `#28611`_: (`rallytime`_) [2015.8] Be explicit about salt.utils.vmware function calls + @ *2015-11-05 18:43:36 UTC* + + * d81330ac7f Merge pull request `#28611`_ from rallytime/vmware-utils-fix + + * f46547eb56 [2015.8] Be explicit about salt.utils.vmware function calls and avoid namespacing + +* **PR** `#28610`_: (`pass-by-value`_) Lxc config additions + @ *2015-11-05 18:43:05 UTC* + + * 35dbca24e7 Merge pull request `#28610`_ from pass-by-value/lxc_config_additions + + * 83193641ca Add doc about cloud lxc options + + * 8977ddad59 Add argument to init + + * 2be3f8b5bb Add bootstrap delay and systemd check options + +* **ISSUE** `#28601`_: (`nasenbaer13`_) boto_asg.present overwrites custom dimensions in alarms (refs: `#28602`_) + +* **PR** `#28602`_: (`nasenbaer13`_) Allow setting of custom dimensions in asg alarm specification + @ *2015-11-05 15:00:24 UTC* + + * 464aa6b062 Merge pull request `#28602`_ from eyj/fix-28601 + + * 963ad4250a Allow setting of custom dimensions in asg alarm specification + +* **PR** `#28596`_: (`rallytime`_) Merge branch '2015.5' into '2015.8' + @ *2015-11-05 14:25:09 UTC* + + * 572d95b3e1 Merge pull request `#28596`_ from rallytime/merge-2015.8 + + * eec9d69387 Merge branch '2015.5' into '2015.8' + + * 08295de5a5 Merge pull request `#28563`_ from s0undt3ch/2015.5 + + * 16f4db79a0 Update to latest bootstrap script v2015.11.04 + + * 1e09f186ce Merge pull request `#28541`_ from twangboy/fix_28173 + + * 7edf5ce370 Fixed problem with system.set_computer_name + + * f44ed780b5 Merge pull request `#28537`_ from jfindlay/decode_state_2015.5 + + * 06e514940c decode filename to utf-8 in file.recurse state + + * 6acf87593f Merge pull request `#28529`_ from rallytime/fix-28272 + + * a959681858 Add link to Sending a GH PR to documentation docs + + * 1c612e2772 Update contributing and documentation pages to recommend submitting against branches + + * 025bff2bf0 Merge pull request `#28548`_ from nmadhok/2015.5-task-error + + * 804a0a6537 Tasks can be in queued state instead of running. Fixes `#28511`_ + + * 63bd3e52b3 Merge pull request `#28531`_ from rallytime/fix-24585 + + * bc577b2531 Add versionadded directives to virtualenv_mod state/module + + * ea3bf972c4 Merge pull request `#28508`_ from twangboy/fix_unit_tests_windows + + * 0da6ff7c50 Fixed some logic + + * cf1e059be5 Fixed windows tests + + * 73c5735fc1 Merge pull request `#28525`_ from rallytime/route53_spacing + + * 6ab2ce615c Fix spacing in doc examples for boto_route53 state and module + + * 2d7f934f67 Merge pull request `#28517`_ from rallytime/fix-28243 + + * be8f650901 Punctuation. + + * fd846822c1 Add state_auto_order defaults to True note to ordering docs + +* **PR** `#28593`_: (`blueyed`_) doc: fix typo with salt.states.file: s/preseve/preserve/ + @ *2015-11-04 22:33:25 UTC* + + * 73c33e0b4a Merge pull request `#28593`_ from blueyed/fix-typo-preserve + + * eaf27d6ee7 doc: fix typo with salt.states.file: s/preseve/preserve/ + +* **PR** `#28578`_: (`twangboy`_) Fixed the script... something got broke... + @ *2015-11-04 22:00:18 UTC* + + * 8b483ee354 Merge pull request `#28578`_ from twangboy/fix_windows_installer_script + + * 90b19a3279 Fixed the script... something got broke... + +* **PR** `#28579`_: (`jfindlay`_) fix __virtual__ returns: tls,uptime mods + @ *2015-11-04 22:00:02 UTC* + + * 7ca7ed4b37 Merge pull request `#28579`_ from jfindlay/virt_ret + + * 333c132378 fix __virtual__ returns: tls,uptime mods + +* **ISSUE** `#27574`_: (`jgill`_) salt-cloud: Could not associate elastic ip address with network interface (refs: `#28584`_) + +* **PR** `#28584`_: (`rallytime`_) If AssociatePublicIpAddress is set to True, don't auto-assign eip. + @ *2015-11-04 21:59:38 UTC* + + * **PR** `#25315`_: (`ruzarowski`_) [cloud:EC2] Move handling of AssociatePublicIpAddress to associate_eip/allocate_new_eip logic depending on value type (refs: `#28584`_) + + * ae764c6b5c Merge pull request `#28584`_ from rallytime/fix-27574 + + * 490e1bd5bb If AssociatePublicIpAddress is set to True, don't auto-assign eip. + +* **ISSUE** `#28392`_: (`jacksontj`_) AsyncZeroMQReqChannel does not implement `tries` (2015.8) (refs: `#28410`_) + +* **PR** `#28576`_: (`jacksontj`_) Only encode the zmq message once + @ *2015-11-04 21:59:20 UTC* + + * **PR** `#28410`_: (`jacksontj`_) Add retries to the zeromq.AsyncReqMessageClient (refs: `#28576`_) + + * 231cdd4316 Merge pull request `#28576`_ from jacksontj/transport + + * b29fc676a3 Only encode the zmq message once + +* **PR** `#28587`_: (`cachedout`_) Reset yaml rendering hooks to avoid leaks (refs: `#28613`_) + @ *2015-11-04 21:37:11 UTC* + + * ab62f5cd12 Merge pull request `#28587`_ from cachedout/fix_yaml_render_leak + + * 2da64bd736 Reset yaml rendering hooks to avoid leaks + +* **ISSUE** `#3436`_: (`madduck`_) Pillar does not handle Unicode data (refs: `#28134`_, #saltstack/salt`#28134`_) + + * **PR** `saltstack/salt#28134`_: (`bernieke`_) fix unicode pillar values `#3436`_ (refs: `#28581`_) + +* **PR** `#28581`_: (`basepi`_) Revert b4875e585a165482c4c1ddc8987d76b0a71ef1b0 + @ *2015-11-04 19:28:20 UTC* + + * 69081d00e0 Merge pull request `#28581`_ from saltstack/revert-28134-2015.8 + + * 0a07c90d5e Revert b4875e585a165482c4c1ddc8987d76b0a71ef1b0 + +* **ISSUE** `#28477`_: (`anlutro`_) KeyError with file.managed HTTPS source (refs: `#28573`_) + +* **PR** `#28573`_: (`jacksontj`_) Add `body` to salt.utils.http.query returns + @ *2015-11-04 17:18:19 UTC* + + * ea3658eac8 Merge pull request `#28573`_ from jacksontj/2015.8 + + * d55ea7550b Add `body` to salt.utils.http.query returns + +* **ISSUE** `#655`_: (`thatch45`_) Add general command management to service (refs: #`saltstack/salt-bootstrap#656`_) + + * **PR** `saltstack/salt-bootstrap#674`_: (`jfindlay`_) add support for repo.saltstack.com (refs: `#28564`_, `#28563`_) + + * **PR** `saltstack/salt-bootstrap#665`_: (`mbologna`_) Change to 'dnf' as package manager for Fedora 22-> (refs: `#28564`_, `#28563`_) + + * **PR** `saltstack/salt-bootstrap#656`_: (`eyj`_) Add bootstrap -b flag (don't install dependencies) (refs: `#28564`_, `#28563`_) + + * **PR** `saltstack/salt-bootstrap#654`_: (`hedinfaok`_) Fixes error finding python-jinja2 in RHEL 7 (refs: `#28564`_, `#28563`_) + + * **PR** `saltstack/salt-bootstrap#653`_: (`cbuechler`_) Make bootstrap work with FreeBSD 11-CURRENT. (refs: `#28564`_, `#28563`_) + +* **PR** `#28564`_: (`s0undt3ch`_) [2015.8] Update to latest bootstrap script v2015.11.04 + @ *2015-11-04 15:29:46 UTC* + + * 3a729c2b40 Merge pull request `#28564`_ from s0undt3ch/2015.8 + + * b6a53a6bfb Update to latest bootstrap script v2015.11.04 + +* **ISSUE** `#28527`_: (`Oro`_) boto_rds.create needs storage_type, which does not exist in boto.rds2 create_db_instance (refs: `#28561`_) + +* **PR** `#28561`_: (`Oro`_) Issue `#28527`_ boto_rds.create does not work (refs: `#28612`_) + @ *2015-11-04 15:13:09 UTC* + + * fed4c6f482 Merge pull request `#28561`_ from Oro/fix-boto-rds-create + + * 54782b6fd9 Removed exception message where there is no exception + + * e08f45c824 Issue `#28527`_ boto_rds.create does not work + +* **PR** `#28560`_: (`bdrung`_) Fix various typos + @ *2015-11-04 15:06:36 UTC* + + * ec924e8410 Merge pull request `#28560`_ from bdrung/2015.8 + + * 89dcb66310 Fix the wrong "allow to do" phrase + + * 859b6b46a6 Fix typo an nonexistant -> nonexistent + + * 66921cc61e Fix typo an succesfully -> successfully + + * c1e3ef7c8d Fix typo an explicitely -> explicitly + + * 029a95398c Fix typo an superflous -> superfluous + + * 026c215933 Fix typo an unecessary -> unnecessary + + * 5f7fc5f94b Fix typo an edditable -> editable + + * 0b768944c2 Fix typo an deamon -> daemon + + * 5af49881d7 Fix typo an completly -> completely + + * 14d2a16f74 Fix typos of compatibility + + * 46a5a9b073 Fix typo an suppored -> supported + + * abc490a78e Fix typo an usefull -> useful + + * ddd412180c Fix typo an targetting -> targeting + + * 610a6a77ae Fix typo an verison -> version + + * e0a5d46a1e Fix typo an seperated -> separated + + * 7f11cfd5e1 Fix typo an helpfull -> helpful + + * 2e9b520d84 Fix typos of omitted + + * 3029f64481 Fix typo an compatbility -> compatibility + + * 470e82f17f Fix typo an dictionnary -> dictionary + + * 5843c7aa24 Fix typo an optionnal -> optional + + * 730d0f95e7 Fix typo an transfered -> transferred + + * c7e7884de2 Fix typo an recieved -> received + + * 50eea287f3 Fix typo an managment -> management + + * cb01da81c6 Fix typos of parameter + + * 45fcc7d339 Fix typo an dont -> don't + + * 3624935d32 Fix typo an other -> another + + * d16afe2607 Fix typo sofwares -> software + + * b9b7cbe525 Fix typo sofware -> software + + * 8edd2c1add Fix typos of dependency + + * 3a5e2e3437 Fix typo documention -> documentation + +* **ISSUE** `#28528`_: (`schlagify`_) timezone.system error: CommandExecutionError: Failed to parse timedatectl output, this is likely a bug (refs: `#28550`_) + +* **PR** `#28550`_: (`jfindlay`_) check timedatectl errno and return stdout on failure + @ *2015-11-04 15:00:24 UTC* + + * bd0b291b63 Merge pull request `#28550`_ from jfindlay/ctl_err + + * 11a9a5868f simplify timezone module unit test mocks + + * 476b651c94 update timezone module unit tests for timedatectl + + * 5c0e5dacc0 check timedatectl errno and return stdout on failure + +* **ISSUE** `#19249`_: (`ahetmanski`_) Cannot create cache_dir salt master exception. (refs: `#28545`_) + +* **PR** `#28545`_: (`jfindlay`_) pass on concurrent create of jid_dir in local_cache + @ *2015-11-04 14:54:11 UTC* + + * e048667c91 Merge pull request `#28545`_ from jfindlay/concurrent_dir + + * 58ad699331 pass on concurrent create of cache_dir in roots fs + + * e456184b04 pass on concurrent create of jid_dir in local_cache + +* **PR** `#28544`_: (`rallytime`_) Start moving some vmware.py cloud funcs to utils/vmware.py + @ *2015-11-04 14:52:59 UTC* + + * 082ffd5734 Merge pull request `#28544`_ from rallytime/vmware-utils + + * 403fe37704 Pylint. + + * d9301eea95 Don't move _set_cd_or_dvd_backing_type yet + + * 8d69639230 Start moving some vmware.py cloud funcs to utils/vmware.py + +* **PR** `#28543`_: (`gtmanfred`_) clean up changes for pkg.uptodate and supervisord.dead + @ *2015-11-04 14:49:46 UTC* + + * bf4f7cdc4b Merge pull request `#28543`_ from gtmanfred/2015.8 + + * 3d57b392cb return changes if supervisord stopped process + + * 5547a34acc return empty changes if server is uptodate + +* **ISSUE** `#28524`_: (`bmcorser`_) UnicodeDecodeError in states.file (refs: `#28537`_, `#28538`_) + +* **PR** `#28538`_: (`jfindlay`_) decode path and url to utf-8 in url.create (refs: `#28537`_) + @ *2015-11-04 14:48:34 UTC* + + * d345768b81 Merge pull request `#28538`_ from jfindlay/decode_state + + * b05dfc5c58 decode path and url to utf-8 in url.create + +* **ISSUE** `#28476`_: (`ColorFuzzy`_) state.sls UnicodeDecodeError (refs: `#28533`_) + +* **PR** `#28533`_: (`jfindlay`_) decode highstate error messages to utf-8 + @ *2015-11-04 14:47:55 UTC* + + * 2e0c8264db Merge pull request `#28533`_ from jfindlay/decode_err + + * 9c9bb75c37 decode highstate error messages to utf-8 + +* **PR** `#28547`_: (`nmadhok`_) [Backport] [2015.8] Tasks can be in queued state instead of running + @ *2015-11-04 04:13:30 UTC* + + * cfc3146b2d Merge pull request `#28547`_ from nmadhok/2015.8-task-error + + * 3fb1f9ee6b Tasks can be in queued state instead of running. Fixes `#28511`_ + +* **PR** `#28535`_: (`techhat`_) Fail gracefully if 169.254* isn't available + @ *2015-11-03 22:39:38 UTC* + + * 7e22e7cf24 Merge pull request `#28535`_ from techhat/fixcreds + + * 8d9224bd09 Catch timeouts too + + * fa46dbb2a3 Lint + + * f05a5e0936 Fail gracefully if 169.254* isn't available + +* **PR** `#28536`_: (`cro`_) Default configuration file for proxy minions. + @ *2015-11-03 21:26:27 UTC* + + * 9a5208e8aa Merge pull request `#28536`_ from cro/proxyconf + + * 1e031c4940 Default configuration file for proxy minions. + +* **ISSUE** `#28469`_: (`mlalpho`_) state boto_secgroup.present fails to find vpc_name (refs: `#28710`_, `#28534`_) + +* **PR** `#28534`_: (`rallytime`_) Add versionadded directive for vpc_name arg in boto_secgroup.present + @ *2015-11-03 19:30:04 UTC* + + * 2bc78a32ef Merge pull request `#28534`_ from rallytime/fix-28469 + + * ebe3b34ae7 Add versionadded directive for vpc_name arg in boto_secgroup.present + +* **PR** `#28516`_: (`rallytime`_) Back-port `#28489`_ to 2015.8 + @ *2015-11-03 14:05:54 UTC* + + * **PR** `#28489`_: (`TheBigBear`_) Update windows-package-manager.rst (minor edit) adding missing single quote pairs. (refs: `#28516`_) + + * c6a6fe0089 Merge pull request `#28516`_ from rallytime/bp-28489 + + * 2e5684a1e4 Update windows-package-manager.rst + +* **PR** `#28506`_: (`basepi`_) [2015.8] Log minion list for all rosters, at debug level + @ *2015-11-03 14:05:22 UTC* + + * 36a217acbd Merge pull request `#28506`_ from basepi/salt-ssh.minions.log.debug + + * 06cdb50494 Log minion list for all rosters, at debug level + +* **PR** `#28514`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-11-03 01:19:33 UTC* + + * 8cbea63e40 Merge pull request `#28514`_ from basepi/merge-forward-2015.8 + + * 463a03b2a9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * 63ce8f78d5 Merge pull request `#28512`_ from basepi/merge-forward-2015.5 + + * 61c382133a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * 4bf56cad3f Merge pull request `#28461`_ from cachedout/issue_28455 + + * 097838ec0c Wrap all cache calls in state.sls in correct umask + + * f3e61db045 Merge pull request `#28407`_ from DSRCompany/issues/24910_token_auth_fix_2014 + + * b7b5bec309 Don't request creds if auth with key. + +* **PR** `#28502`_: (`cachedout`_) Lint `#28427`_ + @ *2015-11-02 21:09:20 UTC* + + * **PR** `#28427`_: (`cro`_) More updates (refs: `#28502`_) + + * b919f55f8d Merge pull request `#28502`_ from cachedout/lint_28427 + + * 459a342102 Lint `#28427`_ + + * d354885c3d Lint + + * dbb1f0899e Lint + + * 749383c413 Lint + + * 0fa067ea30 Add datacenter getter/setter, change 'dell_switch' to just 'switch', trap call to change_password. + + * 4bcb5a508b Add datacenter getter/setter, change 'dell_switch' to just 'switch', trap call to change_password. + +* **PR** `#28464`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-11-02 20:18:21 UTC* + + * 238411c8ce Merge pull request `#28464`_ from basepi/merge-forward-2015.8 + + * 6f6e687cb4 Mock master_uri for even tests + + * 3286a5250f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * 37ceae1e88 Merge pull request `#28448`_ from gwaters/add-redhat-notes + + * e70990704a added a note to the tutorial for those that redhat so they can use the state file too. + + * 5ef50d60cd Merge pull request `#28406`_ from rallytime/bp-28381 + + * e5322d2c44 Add FreeBSD detection for VirtualBox + + * 30d5f7bbae Merge pull request `#28413`_ from rallytime/bp-28400 + + * ae1921b922 Do not execute _preflight_check if not_installed list is empty in _find_install_targets. Calling with empty list on rhel/centos cause execution of repoquery --whatprovides without pkg list which is memory consumptive task for host and also for red hat satellite server. + + * 045d540aff Merge pull request `#28366`_ from erchn/fix_yumpkg_mod_repo_disabled + + * 8187a4ce20 re-arrange things a bit to have less overall changes + + * f1d570ff18 move todelete above disabled check, add comment + + * 64feec413f also remove disabled key from repo_opts + + * 2f2ebb7bb6 mark repo not enabled when pkgrepo state passes in disable: True + + * 3923f4a569 Merge pull request `#28373`_ from beverlcl/fix-use_carrier-28372 + + * 32cffeceb6 Fixing bug `#28372`_ for use_carrier option on bonding network interfaces. + + * e07e3f257b Merge pull request `#28359`_ from rallytime/bp-28358 + + * 9cacbf582b docstring typo fix - list returners not runners + + * 282be7ba5a Merge pull request `#28346`_ from twangboy/fix_installer + + * f65e3e5275 Updated documentation to reflect the new parameter + + * a0c5223554 Fixes `#27923`_ and `#28000`_ + + * 7858f04ebc Merge pull request `#28315`_ from gwaters/update-pillar-doc + + * b15285c0b4 adding a working example of setting pillar data on the cli + + * 45305ccf29 Merge pull request `#28211`_ from terminalmage/legacy_git_pillar-2015.5 + + * 0d6a4ac115 Remove non-functional test + + * ab991d61d9 Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch) + + * a6cc84c407 Merge pull request `#28263`_ from cachedout/issue_26411-1 + + * 3b880a5f07 New channel for event.fire_master + + * 29e9533aab Stand up a new channel if using salt-call + + * 788e1463d8 Merge pull request `#28293`_ from cachedout/fix_28271 + + * 499ed8519b Minor grammar changes to `#28271`_ + + * e178af0b90 Merge pull request `#28271`_ from gwaters/update-tutorial-documentation + + * f96d39483d updated the tutorial with gravyboat's suggestions + + * b1f4a2bdf4 i think i changed the wrong header, updated to fix + + * 846b3aece1 I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands wont bump into the same issue I had. + + * e3eff9b909 Merge pull request `#28280`_ from 0xf10e/patch-1 + + * 6d4316b0ac Correct Jinja function load_* to import_* + + * 909fa3dc97 Merge pull request `#28255`_ from cachedout/cli_opt + + * a2408157de Add __cli opt + + * 0fa094ae11 Merge pull request `#28213`_ from rallytime/boto_route53_state + + * 237d64ff11 If record returned None, don't continue with the state. Something went wrong. + + * 1768014705 Merge pull request `#28238`_ from basepi/fix.schedule.present.28217 + + * 087a8dc3c2 Only insert enabled if it's a dict + + * 5b49f41fab Fix schedule comparison to adjust for 'enabled' being added in schedule.list + + * 2dc1226ab8 Build new item with 'enabled' if available + + * bdd48c92de Merge pull request `#28174`_ from lorengordon/file-replace-multiline + + * acdef2da60 Update docstrings with new guidance + + * 0835b005b7 Use a test that makes the extra file read unnecessary + + * 6d6121a6e5 Use `flags` when checking whether content was added previously + + * b25e609e9e Set `flags=8` since now the file is read as a MULTILINE string by default + + * 89e8dcdffd Use `finally` block to ensure mmap object is closed + + * 5aea6647c9 Add support for multiline regex in file.replace + + * 2225925fb5 Merge pull request `#28175`_ from twangboy/fix_19673 + + * ae8fbb208f Fixes `#19673`_ + +* **ISSUE** `#15583`_: (`dr4Ke`_) state grain.present should accept dict values (isn't it?) (refs: `#26945`_) + +* **ISSUE** `#11870`_: (`gpkvt`_) Nested Grain-Support for grains.present / grains.absent (refs: `#26945`_) + +* **PR** `#28486`_: (`rallytime`_) Back-port `#26945`_ to 2015.8 + @ *2015-11-02 18:43:35 UTC* + + * **PR** `#26945`_: (`dr4Ke`_) Feature state grains support nested and dict (refs: `#28486`_) + + * a25ce38fda Merge pull request `#28486`_ from rallytime/bp-26945 + + * 8d26bbd777 grains module and state: documentation fixes + + * df7e936910 grains module and state: use a unique object... + + * df8ec1184c grains module documentation fixes + + * 25e9a5c9ad grains state and module: fix version strings + + * eee2318873 grains state: allow deleting grain with 'False' value + + * c92326f5ea grains module: yaml representer for OrderedDict + + * 2c9c8d4073 grains state doc update + + * 576252da05 grains state: list_present, list_absent support nested grain + + * 62a1f37d86 grains state: nested support for grains.append + + * 3019a055c9 grains state: rewrite doc + example + + * c19cff517a grains state: more tests + + * cc844e4a2c grains state tests: test the grain file content as well + + * 1c5cd4c82d grains state: changes comment more accurate + + * 563fd2b56c grains state: use DEFAULT_TARGET_DELIM + + * c63913e602 grains module: simpler comment for already set key + + * 2000180791 grains.present uses grains.set + + * a03c79b13b module grains.set default comment is a string + + * 64e9e2c3b3 grains.absent uses set(None) + + * 6b8c245b87 grains state: new tests for nested grains + +* **PR** `#28472`_: (`gtmanfred`_) overwrite more than one value with names + @ *2015-11-02 17:56:53 UTC* + + * f3640b3ad6 Merge pull request `#28472`_ from gtmanfred/2015.8 + + * 8b90ccedf5 overwrite more than one value with names + +* **PR** `#28493`_: (`rallytime`_) Back-port `#28492`_ to 2015.8 + @ *2015-11-02 17:54:09 UTC* + + * **PR** `#28492`_: (`cedwards`_) Updated FreeBSD installation docs (refs: `#28493`_) + + * e31ef51053 Merge pull request `#28493`_ from rallytime/bp-28492 + + * ffc77259c9 Updated FreeBSD installation docs: + +* **PR** `#28494`_: (`whiteinge`_) Fix filter_by passing incorrect parameters to match functions + @ *2015-11-02 17:53:55 UTC* + + * 38c77206db Merge pull request `#28494`_ from whiteinge/match-filter_by-argfix + + * e61ac75d6f Fix filter_by passing incorrect parameters to match functions + +* **ISSUE** `#23685`_: (`Snergster`_) inotify beacon on file. 'change' event to reactor to reset file to known state will cause loop (refs: `#28388`_) + +* **PR** `#28491`_: (`rallytime`_) Back-port `#28388`_ to 2015.8 + @ *2015-11-02 17:13:23 UTC* + + * **PR** `#28388`_: (`cachedout`_) Beacon state disable (refs: `#28491`_) + + * d19affd44d Merge pull request `#28491`_ from rallytime/bp-28388 + + * f740a19477 Working right now + + * 700eaebad0 Disable starting to come to life + + * f8b17748ef More fixing + + * 04585a2878 Documentation for disable_during_state_run + + * dbbd53689d Add documentation note in inotify beacon + + * 40217fe813 More refactoring and add new option to disable during state run + + * 19af5e5ed3 Starting on refactor of beacon config parsing + +* **ISSUE** `#12363`_: (`joehealy`_) unable to manage password expiry of windows users (refs: `#28465`_) + +* **PR** `#28465`_: (`twangboy`_) Fix `#12363`_: Password Expiration in Windows + @ *2015-11-02 17:01:18 UTC* + + * f7042ba967 Merge pull request `#28465`_ from twangboy/fix_12363 + + * bcf7d58dbb Fixed array if there's a problem with user.info + + * 4b36cb8b6e Added documentation to win_shadow + + * fc8f197f69 Fix `#12363`_ + +* **ISSUE** `#28484`_: (`nasenbaer13`_) Elasticcache subnet group creation raises TypeError (refs: `#28485`_) + +* **PR** `#28485`_: (`nasenbaer13`_) Fix invalid usage of _get_conn causing `#28484`_ + @ *2015-11-02 16:47:52 UTC* + + * ec0cbec00b Merge pull request `#28485`_ from eyj/fix_28484 + + * 9d80fb6070 Fix invalid usage of _get_conn causing `#28484`_ + +* **ISSUE** `#28453`_: (`sdm24`_) Fix Formatting for Nodegroup Targetting Docs (refs: `#28454`_) + +* **ISSUE** `#28268`_: (`gravyboat`_) Update nodegroup docs to explain how to target via nodegroups (refs: `#28306`_) + +* **PR** `#28454`_: (`sdm24`_) Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config + @ *2015-11-02 15:14:40 UTC* + + * **PR** `#28306`_: (`sdm24`_) Updated the Nodegroup docs to include how to target nodegroups in SLS Jinja (refs: `#28454`_) + + * 1116798f21 Merge pull request `#28454`_ from sdm24/fix-formatting-in-nodegroup-docs + + * b968581eb1 Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config + +* **PR** `#28487`_: (`cachedout`_) Lint 28456 + @ *2015-11-02 14:52:27 UTC* + + * fac7803a59 Merge pull request `#28487`_ from cachedout/lint_28456 + + * 58fe15437a Lint `#28456`_ + + * 322a28bb06 updated states.virtualenv_mod comments to reflect that some kwargs need 'distribute: True' + +* **ISSUE** `#24775`_: (`ymote`_) jinja returned host ip address with square bracket (refs: `#28457`_) + +* **PR** `#28457`_: (`sdm24`_) Clarified comments for grains/core.py for ip_interfaces, ip4_interfac… + @ *2015-11-02 14:47:59 UTC* + + * 22a4f14625 Merge pull request `#28457`_ from sdm24/update-grain-ip-interfaces-comments + + * eb92afe238 Clarified comments for grains/core.py for ip_interfaces, ip4_interfaces, and ip6_interfaces, to explicitly state that the ips for each interface are passed as a list + +* **PR** `#28473`_: (`anlutro`_) Show check_cmd output on failure + @ *2015-11-02 14:15:30 UTC* + + * 5818b28c85 Merge pull request `#28473`_ from alprs/feature-cmd_check_output + + * a772ce330a fix tests + + * 90b01e9e0d show check_cmd output on failure + +* **PR** `#28460`_: (`justinta`_) Skipped wipefs test if wipefs does not exist on OS + @ *2015-10-31 04:09:32 UTC* + + * cfe39df7ac Merge pull request `#28460`_ from jtand/wipe_fs_fix + + * 7ca79f1f7b Skipped wipefs test if wipefs does not exist on OS + +* **PR** `#28426`_: (`terminalmage`_) pkgbuild.built: make template engine optional + @ *2015-10-30 17:13:36 UTC* + + * 9b44b5e347 Merge pull request `#28426`_ from terminalmage/pkgbuild-template + + * 6d32497848 pkgbuild.built: make template engine optional + +* **ISSUE** `#28123`_: (`hrumph`_) local.cmd not working for windows minions (refs: `#28422`_) + +* **PR** `#28422`_: (`cachedout`_) Handle windows logging on thread_multi [WIP] + @ *2015-10-30 17:12:26 UTC* + + * 31777cb4e9 Merge pull request `#28422`_ from cachedout/issue_28123 + + * fd3b2a9e20 Handle windows logging on thread_multi + +* **ISSUE** `#13513`_: (`ironwilliamcash`_) Windows Registry Key Problem on 64bit Machine (refs: `#28425`_) + +* **PR** `#28425`_: (`twangboy`_) Fix `#13513`_ - Reflection + @ *2015-10-30 17:07:23 UTC* + + * f9992fc948 Merge pull request `#28425`_ from twangboy/fix_13513 + + * beb141df69 Fixed some lint + + * 0d747355c4 Fix `#13513`_ + +* **ISSUE** `#27980`_: (`rayba`_) salt-cloud 2015.5.0 azure provider could not be loaded (refs: `#28417`_) + +* **PR** `#28417`_: (`rallytime`_) Add note about azure sdk version to getting started docs + @ *2015-10-29 19:47:05 UTC* + + * 4c8cd064a4 Merge pull request `#28417`_ from rallytime/azure-version-warning + + * 8e3a2ba7e7 Add note about azure sdk version to getting started docs + +* **ISSUE** `#28392`_: (`jacksontj`_) AsyncZeroMQReqChannel does not implement `tries` (2015.8) (refs: `#28410`_) + +* **PR** `#28410`_: (`jacksontj`_) Add retries to the zeromq.AsyncReqMessageClient (refs: `#28576`_) + @ *2015-10-29 18:05:50 UTC* + + * 7ead823731 Merge pull request `#28410`_ from jacksontj/2015.8 + + * 70b5ae9b1d Add retries to the zeromq.AsyncReqMessageClient + +* **ISSUE** `#28382`_: (`cedwards`_) [FreeBSD] user state option `empty_password: True` fails with Traceback (refs: `#28395`_) + +* **PR** `#28404`_: (`rallytime`_) Back-port `#28395`_ to 2015.8 + @ *2015-10-29 16:09:20 UTC* + + * **PR** `#28395`_: (`cedwards`_) Updating bsd_shadow to match mainline shadow (refs: `#28404`_) + + * 50845a1e91 Merge pull request `#28404`_ from rallytime/bp-28395 + + * badcb677e9 Use correct version release number + + * c5c66b8bab Updating bsd_shadow to match mainline shadow + +* **PR** `#28405`_: (`opdude`_) Detect legacy versions of chocolatey correctly + @ *2015-10-29 15:57:30 UTC* + + * e746b564b4 Merge pull request `#28405`_ from Unity-Technologies/hotfix/choco-version-detect + + * 0076d73872 Make sure we exit out correctly when checking for choco version + + * 157e0f446d Detect legacy versions of chocolatey correctly + +* **PR** `#28187`_: (`sjansen`_) fix at.present (refs: `#28759`_) + @ *2015-10-29 15:49:18 UTC* + + * 4304001a8f Merge pull request `#28187`_ from sjansen/patch-1 + + * 52c915e29d fix at.present + +* **PR** `#28375`_: (`merll`_) Merge pillar includes correctly + @ *2015-10-29 15:12:48 UTC* + + * 5efac26c10 Merge pull request `#28375`_ from Precis/fix-pillar-include-loop + + * f8e2c26473 Variable err is from previous loop, too. + + * 042314246f Unit test for merging included pillars. + + * a42c51f9bf Do not merge previous values in pillar include loop. + +* **PR** `#28376`_: (`ryan-lane`_) Support update of route53 records with multiple values + @ *2015-10-29 14:54:47 UTC* + + * **PR** `#28374`_: (`ryan-lane`_) Support update of route53 records with multiple values (refs: `#28376`_) + + * a69b124aaa Merge pull request `#28376`_ from lyft/multivalue-route53-values-2015.8 + + * cd221515a1 Support update of route53 records with multiple values + +* **PR** `#28377`_: (`terminalmage`_) Deprecate 'always' in favor of 'force' in pkgbuild.built + @ *2015-10-29 14:42:22 UTC* + + * 9e5a510e73 Merge pull request `#28377`_ from terminalmage/force-pkgbuild + + * f18305e19e Add versionadded directive + + * 7046d0d896 Deprecate 'always' in favor of 'force' in pkgbuild.built + +* **PR** `#28380`_: (`cro`_) Add missing call for service provider + @ *2015-10-29 14:26:55 UTC* + + * cd632f798d Merge pull request `#28380`_ from cro/sshprox_fix + + * 7bcc275dce Lint + logic error. + + * 92d712a54b Add a missing call for the service provider + +* **ISSUE** `#28202`_: (`guettli`_) Docs: Difference between modules.cron.rm_job and modules.cron.rm (refs: `#28348`_) + +* **PR** `#28348`_: (`jfindlay`_) salt.utils.alias informs user they are using a renamed function + @ *2015-10-28 20:46:36 UTC* + + * e7571e6d61 Merge pull request `#28348`_ from jfindlay/alias + + * 7915d7e5e8 use alias util to formally alias module functions + + * 6a8b61bd12 create function alias to improve api documentation + +* **PR** `#28364`_: (`justinta`_) In CentOS 5 the .split() causes a stacktrace. + @ *2015-10-28 20:46:02 UTC* + + * 072eb98a26 Merge pull request `#28364`_ from jtand/blockdev_test_fix + + * 3b4d03ff1a In CentOS 5 the .split() causes a stacktrace. Confirmed.split() appears to be unneeded in other OSs. + +* **ISSUE** `#26415`_: (`CaesarC`_) salt.wheel.WheelClient doesn't work follow the python api(AttributeError: 'NoneType' object has no attribute 'get') (refs: `#28087`_) + +* **PR** `#28361`_: (`rallytime`_) Back-port `#28087`_ to 2015.8 + @ *2015-10-28 20:44:32 UTC* + + * **PR** `#28087`_: (`DmitryKuzmenko`_) Revert "Update __init__.py" (refs: `#28361`_) + + * 06b928cfdb Merge pull request `#28361`_ from rallytime/bp-28087 + + * 41536e55b9 Revert "Update __init__.py" + +* **PR** `#28360`_: (`multani`_) Various documentation fixes + @ *2015-10-28 20:43:20 UTC* + + * d9e5fba9b5 Merge pull request `#28360`_ from multani/fix/docs + + * ed4a54f839 doc: fix warnings in clouds.linode + + * 5a9c4c2d60 doc: simplified states.postgres_tablespace introduction + + * cf38ff1384 doc: fix rendering of titles in the /ref/states/all/ index page + +* **PR** `#28370`_: (`rallytime`_) Back-port `#28276`_ to 2015.8 + @ *2015-10-28 20:37:49 UTC* + + * **PR** `#28276`_: (`plastikos`_) Correct state pkg.updtodate to succeed when packages are up-to-date (refs: `#28370`_) + + * 4157c8331b Merge pull request `#28370`_ from rallytime/bp-28276 + + * 227ddbcb24 Simplify setting success when there are no pkg updates. + + * cd58165138 Correct state pkg.updtodate to succeed when packages are up-to-date + +* **ISSUE** `#27890`_: (`dkiser`_) pillar recurse list strategy (refs: `#27891`_) + +* **ISSUE** `#25954`_: (`tbaker57`_) [2015.8.0rc2] pillar merge strategy default behaviour change (refs: `#28353`_) + +* **PR** `#28353`_: (`merll`_) Consider each pillar match only once. + @ *2015-10-28 15:05:21 UTC* + + * **PR** `#27891`_: (`dkiser`_) introduce recurse_list pillar_source_merging_strategy (refs: `#28353`_, `#28013`_) + + * 3942b4d0e6 Merge pull request `#28353`_ from Precis/fix-pillar-sls-matches + + * 2f3f2d6f29 Consider each pillar match only once. + +* **PR** `#28334`_: (`anlutro`_) iptables needs -m comment for --comment to work + @ *2015-10-28 14:24:52 UTC* + + * 0d8bea6c43 Merge pull request `#28334`_ from alprs/fix-iptables_comment + + * 170ea7c50d iptables needs -m comment for --comment to work + +* **ISSUE** `#27789`_: (`eduherraiz`_) UnicodeDecodeError: 'ascii' codec can't decode byte in 2015.8.0 (refs: `#28340`_, `#27833`_) + +* **PR** `#28340`_: (`jfindlay`_) sdecode file and dir lists in fileclient + @ *2015-10-28 14:23:10 UTC* + + * 7000b6ee8f Merge pull request `#28340`_ from jfindlay/decode_client + + * bd9151b5e3 sdecode file and dir lists in fileclient + +* **PR** `#28344`_: (`ryan-lane`_) Fix iptables state for non-filter tables + @ *2015-10-28 14:21:54 UTC* + + * 48448c9a48 Merge pull request `#28344`_ from lyft/fix-iptables-non-filter + + * 21ba070b3d Fix iptables state for non-filter tables + +* **PR** `#28343`_: (`rallytime`_) Back-port `#28342`_ to 2015.8 + @ *2015-10-28 13:58:28 UTC* + + * **PR** `#28342`_: (`gravyboat`_) Fix up a dup doc entry for the file state. (refs: `#28343`_) + + * 72f0c106cf Merge pull request `#28343`_ from rallytime/bp-28342 + + * 03d15dd090 Fix up a dup doc entry. + +* **PR** `#28330`_: (`rallytime`_) Back-port `#28305`_ to 2015.8 + @ *2015-10-27 17:20:35 UTC* + + * **PR** `#28305`_: (`rowillia`_) Fix Cabal states. (refs: `#28330`_) + + * 64d5c2362a Merge pull request `#28330`_ from rallytime/bp-28305 + + * a46dbcb62b Fix Cabal states. + +* **ISSUE** `#21216`_: (`syphernl`_) State rabbitmq_plugin missing proper error handling (refs: `#28270`_) + +* **PR** `#28270`_: (`rallytime`_) Refactor RabbitMQ Plugin State to correctly use test=true and format errors + @ *2015-10-27 17:18:35 UTC* + + * a44c8d8dab Merge pull request `#28270`_ from rallytime/refactor_rabbitmq_plugin_state + + * 9e40c3a6a6 Fine tuning and fix tests + + * d50916ccdd Pylint fix + + * 196b18146d Refactor RabbitMQ Plugin State to correctly use test=true and format errors + +* **ISSUE** `#25363`_: (`syphernl`_) rabbitmq_{user|vhost}.present in test=True reports unnecessary changes (refs: `#28269`_) + +* **ISSUE** `#24856`_: (`pruiz`_) rabbitmq_user state incorrectly reports result=True when using test=true (refs: `#28269`_) + +* **PR** `#28269`_: (`rallytime`_) Refactor rabbitmq_user state to use test=True correctly (refs: `#28782`_, `#28772`_) + @ *2015-10-27 17:17:42 UTC* + + * 4efd07eba5 Merge pull request `#28269`_ from rallytime/refactor_rabbitmq_user_state + + * aebbcb88ea Pylint fix + + * 19b8b868a3 Clean-up/fixes to rabbitmq_user state and test adjustments + + * 3e0e8fc8c6 Refactor rabbitmq_user state to use test=True correctly + +* **ISSUE** `#27855`_: (`dverbeek84`_) boto_vpc is not reading availability_zone (refs: `#28299`_, `#28168`_) + +* **PR** `#28299`_: (`rallytime`_) Add test for availability_zone check to boto_vpc_tests + @ *2015-10-27 14:17:11 UTC* + + * **PR** `#28168`_: (`rallytime`_) Make sure availability zone gets passed in boto_vpc module when creating subnet (refs: `#28299`_) + + * 93a930615e Merge pull request `#28299`_ from rallytime/tests-for-28168 + + * 65fdb50246 Get the list indice to compart before looking at keys + + * 95defb87c5 Add test for availability_zone check to boto_vpc_tests + +* **ISSUE** `#28268`_: (`gravyboat`_) Update nodegroup docs to explain how to target via nodegroups (refs: `#28306`_) + +* **PR** `#28306`_: (`sdm24`_) Updated the Nodegroup docs to include how to target nodegroups in SLS Jinja (refs: `#28454`_) + @ *2015-10-27 14:07:12 UTC* + + * 0ab7c0053d Merge pull request `#28306`_ from sdm24/update-nodegroup-docs-with-state-targeting + + * 02cac9d8c0 Update nodegroups.rst + + * b2c3307c2e Update nodegroups.rst + + * e79a930f57 updated nodegroups.rst + + * f2a6bc94df Updated the Nodegroup docs to include how to target nodegroups in SLS Jinja + +* **ISSUE** `#27435`_: (`LukeCarrier`_) firewalld state: firewalld.prepare calls new_service, not add_service (refs: `#28308`_) + +* **PR** `#28308`_: (`rallytime`_) Firewalld state services should use --add-service, not --new-service + @ *2015-10-27 14:02:45 UTC* + + * bba26ffeca Merge pull request `#28308`_ from rallytime/fix-27435 + + * d37298f973 Don't forget to pass the zone! + + * fcafe6f355 Firewalld state services should use --add-service, not --new-service + +* **ISSUE** `#21744`_: (`rallytime`_) [2015.5] Multi-Master Minions Block on Authentication (refs: `#28302`_) + +* **PR** `#28302`_: (`DmitryKuzmenko`_) Always close socket even if there is no stream. + @ *2015-10-27 01:08:41 UTC* + + * 044737ba6e Merge pull request `#28302`_ from DSRCompany/issues/21744_fix_context_term + + * b0fc66fa68 Always close socket even if there is no stream. + +* **PR** `#28282`_: (`keesbos`_) Fix for __env__ in legacy git_pillar + @ *2015-10-26 21:20:25 UTC* + + * 2f2f51906d Merge pull request `#28282`_ from keesbos/git-pillar-env-fix + + * d46e09afc6 Fix for __env__ in legacy git_pillar + +* **PR** `#28258`_: (`pass-by-value`_) Add service module for ssh proxy example + @ *2015-10-26 14:57:47 UTC* + + * 6a92bfbd42 Merge pull request `#28258`_ from pass-by-value/ssh_service + + * 04bc1c64ad Add versionadded information + + * 76d8d859f1 Add service module for ssh proxy example + +* **PR** `#28294`_: (`bechtoldt`_) correct a bad default value in http utility + @ *2015-10-26 14:45:27 UTC* + + * **PR** `#25668`_: (`techhat`_) Sanitize sensitive fields in http.query() (refs: `#28294`_) + + * 25778cf1ba Merge pull request `#28294`_ from bechtoldt/fix_bad_param_default_val + + * 4852c03d08 don't iterate over var that is NoneType + +* **PR** `#28185`_: (`justinta`_) Added single package return for latest_version, fixed other bug. + @ *2015-10-26 14:09:40 UTC* + + * 0245820b73 Merge pull request `#28185`_ from jtand/zypper_pkg + + * 457ff5d085 Added back nfo.get lines after finding the problem in them + + * 5cdb15c9e3 Added single package return for latest_version, fixed other bug. + +* **PR** `#28297`_: (`cachedout`_) Lint fix proxy junos + @ *2015-10-26 13:59:44 UTC* + + * **PR** `#28116`_: (`jejenone`_) converted junos proxy minion to new __proxy__ global (refs: `#28297`_) + + * 443b486c22 Merge pull request `#28297`_ from cachedout/lint_fix_proxy_junos + + * 5194d9a2ef Lint + + * 28eff3caf2 converted junos proxy minion to new __proxy__ global added cli() in junos.py module to execute arbitrary command + +* **ISSUE** `#28209`_: (`basepi`_) Legacy git_pillar configs cause duplicate ext_pillar calls (refs: `#28210`_) + +* **PR** `#28210`_: (`terminalmage`_) Fix for ext_pillar being compiled twice in legacy git_pillar code (refs: `#28211`_) + @ *2015-10-26 12:36:58 UTC* + + * c8dd79d683 Merge pull request `#28210`_ from terminalmage/legacy_git_pillar + + * 86f00e71bf Remove non-functional test + + * b80da6e23a Fix for ext_pillar being compiled twice in legacy git_pillar code + +* **ISSUE** `#28203`_: (`edhgoose`_) blockdev.formatted failing on 2nd+ run, despite disk already being formatted (refs: `#28265`_) + +* **PR** `#28265`_: (`jfindlay`_) fix blockdev execution and state modules + @ *2015-10-26 12:27:36 UTC* + + * 62485e567f Merge pull request `#28265`_ from jfindlay/blockdev + + * 0dc72135de update blockdev exec and state module unit tests + + * 07253cb5fb move fstype checks to blockdev execution module + + * 20ec4a1dc6 move fs create logic from blockdev state to module + + * 613671a85c safer examples in blockdev exec module docs + + * 359df1bcf7 refactor dump in blockdev exec module + + * 88acc9356d check, notify for deps in blockdev exec/state mods + +* **PR** `#28266`_: (`rallytime`_) Back-port `#28260`_ to 2015.8 + @ *2015-10-26 12:20:56 UTC* + + * **PR** `#28260`_: (`justinta`_) Ioflo lint (refs: `#28266`_) + + * 556d7d583e Merge pull request `#28266`_ from rallytime/bp-28260 + + * 03509e60b2 Removed unnecessary blank line + + * 2d06c97879 Moved lint disable to end of offending line + + * d13fe0cf53 Disabled lint check for ioflo + +* **PR** `#28253`_: (`rallytime`_) Back-port `#28063`_ to 2015.8 + @ *2015-10-23 18:10:56 UTC* + + * **PR** `#28063`_: (`SmithSamuelM`_) Fixes broken Salt Raet. master.flo file path broken (refs: `#28253`_) + + * acd2214c9d Merge pull request `#28253`_ from rallytime/bp-28063 + + * db4aa58f7b Changed reference to reflect refactor of ioflo package locations as of ioflo 1.2.3 Deprecated package locations still supported in ioflo for now + + * 87abf84b54 Changed reference to reflect refactor of ioflo package locations as of ioflo 1.2.3 Deprecated package locations still supported in ioflo for now + + * 19a81dcb77 Fixed exception in loader when no file extension + + * 2afbe6803c Raet Salt broken when config moved to package directory The path to the master.flo file no longer worked This fixes + + * a177bf8f47 fixed unittests missing close of roadstack caused error on other tests + +* **ISSUE** `#28227`_: (`jfindlay`_) DigitalOcean FreeBSD profile fails with `image: 10.2` (refs: `#28231`_) + +* **PR** `#28231`_: (`rallytime`_) Make sure we're compairing strings when getting images in the DO driver + @ *2015-10-23 13:49:37 UTC* + + * 570e7faa3b Merge pull request `#28231`_ from rallytime/fix-28227 + + * 0985780f12 Make sure we're compairing strings when getting images in the DO driver + +* **PR** `#28224`_: (`techhat`_) Optimize create_repo for large packages + @ *2015-10-23 13:40:06 UTC* + + * 1c55513ce3 Merge pull request `#28224`_ from techhat/spmoptimize + + * faeef55d2f Optimize create_repo for large packages + +* **ISSUE** `#27374`_: (`mool`_) boto_route53 state doesn't create a record (refs: `#28214`_, `#28213`_) + +* **PR** `#28214`_: (`rallytime`_) Don't stacktrace if invalid credentials are passed to boto_route53 state + @ *2015-10-23 13:37:30 UTC* + + * **PR** `#28213`_: (`rallytime`_) If record returned None, don't continue with the state. Something went wrong (refs: `#28214`_) + + * f269f40905 Merge pull request `#28214`_ from rallytime/fix_boto_route53_stacktrace + + * cdeb8caabe Pylint Fix + + * 11c475b0ad Don't stacktrace if invalid credentials are passed to boto_route53 state + +* **PR** `#28228`_: (`rallytime`_) Back-port `#27562`_ to 2015.8 + @ *2015-10-23 13:34:42 UTC* + + * **PR** `#27562`_: (`techhat`_) Add dependency resolution to SPM (refs: `#28228`_) + + * 0775d159f8 Merge pull request `#28228`_ from rallytime/bp-27562 + + * 847809541e Updates as per @s0undt3ch + + * cf5fefdf5f Add dependency resolution to SPM + +* **ISSUE** `#28230`_: (`jfindlay`_) DigitalOcean FreeBSD fails to bootstrap: `Please use the freebsd@ user to access this droplet.` (refs: `#28232`_) + +* **PR** `#28232`_: (`rallytime`_) Add documentation to supply the ssh_username: freebsd config to DO docs + @ *2015-10-23 13:31:52 UTC* + + * af241dc054 Merge pull request `#28232`_ from rallytime/fix-28230 + + * 8b06ab4335 Add documentation to supply the ssh_username: freebsd config to DO docs + +* **PR** `#28198`_: (`jacobhammons`_) Added note regarding missing spm exe on Debian/Ubuntu + @ *2015-10-22 04:40:18 UTC* + + * 36dc12c62c Merge pull request `#28198`_ from jacobhammons/docs + + * cfadda0c0c Added note regarding missing spm exe on Debian/Ubuntu Minor fixes to spm docs + +* **PR** `#28182`_: (`erchn`_) Some fixes for nova driver for Rackspace + @ *2015-10-21 21:26:18 UTC* + + * fbad88fb99 Merge pull request `#28182`_ from erchn/fix_nova_rackspace + + * 7b54f04ba2 wrap server_list[_detailed] in try/except block for TypeError + + * b7f8487615 rackconnectv3 default to False, not 'False' get private_ips in rackconnectv2 environment and populate data object get public_ips and put in data object before returning "result" structure + +* **ISSUE** `#27454`_: (`MrFishFinger`_) firewalld returns a dictionary rather than a string in the ret['comment'] (refs: `#28181`_) + +* **PR** `#28181`_: (`rallytime`_) Revamp firewalld state to be more stateful. + @ *2015-10-21 21:19:18 UTC* + + * a1a924f170 Merge pull request `#28181`_ from rallytime/fix-27454 + + * 3e13880af8 Make sure we catch all potential exceptions + + * cb4efa87e8 Make sure state returns False when execution module calls fail + + * 232b2825e4 Revamp firewalld state to be more stateful. + +* **PR** `#28176`_: (`cro`_) Add ping function + @ *2015-10-21 20:49:54 UTC* + + * d93ad103c7 Merge pull request `#28176`_ from cro/ssh_no_ping + + * 3e05437f15 Add ping function + +* **PR** `#28167`_: (`The-Loeki`_) file.serialize needs to add a final newline to serialized files + @ *2015-10-21 17:12:33 UTC* + + * 8e08f39381 Merge pull request `#28167`_ from The-Loeki/patch-1 + + * 46bf6d4fa3 Update file.serialize test for Python serialized + + * 66831fd087 file.serialize needs to add a final newline to serialized files + +* **ISSUE** `#27855`_: (`dverbeek84`_) boto_vpc is not reading availability_zone (refs: `#28299`_, `#28168`_) + +* **PR** `#28168`_: (`rallytime`_) Make sure availability zone gets passed in boto_vpc module when creating subnet (refs: `#28299`_) + @ *2015-10-21 14:48:03 UTC* + + * 559a517ad6 Merge pull request `#28168`_ from rallytime/fix-27855 + + * 50fb77dc50 Make sure availability zone gets passed in boto_vpc module when creating subnet + +* **ISSUE** `#26107`_: (`thecosmicfrog`_) Issue targeting nodegroups - Invalid compound target: ( L@ ... ) (refs: `#28148`_) + +* **ISSUE** `#24660`_: (`Mrten`_) nodegroups not backwards compatible (refs: `#28148`_) + +* **PR** `#28148`_: (`basepi`_) [2015.8] Only expand nodegroups to lists if there is a nested nodegroup + @ *2015-10-21 13:20:06 UTC* + + * dcd90363fe Merge pull request `#28148`_ from basepi/fix.nodegroup.backwards.compat.24660 + + * 11d6a2b6ac Add some docs + + * 036d767a98 Keep track of recursive nodegroup_comp calls, keep list format if it's recursing + + * 155634a0aa Finish thought + + * 528b16756b Only expand nodegroups to lists if there is a nested nodegroup + +* **PR** `#28155`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-10-20 23:48:41 UTC* + + * 053ad408c7 Merge pull request `#28155`_ from basepi/merge-forward-2015.8 + + * c4c889f97b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * ab18dcf637 Merge pull request `#28140`_ from rallytime/bsd-installation-doc + + * 458a544d83 Add OpenBSD installation documentation to 2015.5 branch + + * fad38eb3c3 Merge pull request `#28138`_ from rallytime/bp-28130-sizes-only + + * 6ab31e1886 Pylint + + * 37e4ed58a9 Added missing comma + + * 667f5e669f Added a bunch of instance sizes and updated some outdated ones + + * ce8f858536 Merge pull request `#28097`_ from jacksontj/2015.5 + + * 75e04bcbbc For all multi-part messages, check the headers. If the header is not your minion_id, skip the message + + * 9cdb970289 Merge pull request `#28117`_ from rallytime/fix-23655 + + * dfb908e405 Clean up stacktrace when master can't be reached in lxc cloud driver + + * bf7ed0a397 Merge pull request `#28110`_ from terminalmage/masterless-mode + + * ed90103124 Add explanation of file_client: local setting masterless mode + + * a569ef4980 Merge pull request `#28109`_ from rallytime/fix-27940 + + * 18b2245611 Add created reactor event to lxc cloud driver + + * d4604fdb26 Merge pull request `#27996`_ from rallytime/fix-21845 + + * f8380d751e Provide empty string as default stdout instead of None + + * f9406b5828 Don't fail if pip package is already present and pip1 is installed + + * 28b97c514f Merge pull request `#28056`_ from rallytime/bp-28033 + + * af2c5ab759 Fixed win_useradd.py + + * dfc3aaec74 Merge pull request `#28059`_ from rallytime/bp-28040 + + * 76a0d4937b Revert "Allow passing in auth_version, defaulting to 2." + + * 63d5675d34 default auth_version = 2 + + * 8072716888 remove extra spaces + + * 9770f56f04 cleanup whitespace, default to None to be consistent with profile + + * f4adfe98c0 Allow passing in auth_version, defaulting to 2. + + * fab1ad39af Rackspace support for switft module. + + * d1fa036b55 Merge pull request `#28047`_ from cachedout/issue_27534 + + * 6ea37ddbca Context manager + + * 4d6f6bb371 Lint + + * 59018289dc Restore FTP functionality to file client + + * fd2ca2df1b Merge pull request `#28032`_ from twangboy/fix_win_path + + * 2bcac93314 Fixed win_path.py + + * 88c1770be4 Merge pull request `#28037`_ from rallytime/bp-28003 + + * 4fcf51fb1e Fix PR `#26336`_ + + * de727d8bd2 Merge pull request `#28031`_ from jacobhammons/relnotes6 + + * 05927bb6f0 Updated release notes with additional CVE information + + * 16c0272849 Merge pull request `#28008`_ from jfindlay/host_path + + * 9f7047dd3c platform independent line endings in hosts mod + + * d41018fa8e Merge pull request `#28012`_ from rallytime/fix-28010 + + * 0d7059e0c2 Clean up stack trace when something goes wrong with minion output + + * f728307001 Merge pull request `#27995`_ from jacobhammons/pillar-doc + + * 2870af2ba3 added link to grains security FAQ to targeting and pillar topics. + + * efede904a7 Merge pull request `#27986`_ from jacobhammons/dot6 + + * bb61c68c11 Changed current release to 5.6 and added CVE to release notes + + * 831ec680d9 Merge pull request `#27913`_ from pass-by-value/proxmox_verify_ssl + + * 0b721efe37 Set default + + * 41cccb3a30 Merge pull request `#27876`_ from terminalmage/git_pillar-AttributeError-2015.5 + + * 07794c837a 2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used + +* **PR** `#28149`_: (`pass-by-value`_) Add clarification to cloud profile doc about host + @ *2015-10-20 19:46:05 UTC* + + * 53dd01fc24 Merge pull request `#28149`_ from pass-by-value/proxmox_profile_doc_change + + * bc371c55cd Add clarification to cloud profile doc about host + +* **PR** `#28146`_: (`cachedout`_) Lint dracr.py + @ *2015-10-20 17:55:07 UTC* + + * 7badd634ae Merge pull request `#28146`_ from cachedout/lint_dracr + + * 8b057f39e8 Lint dracr.py + +* **ISSUE** `#28118`_: (`basepi`_) Salt-cloud Linode driver using RAM number for disk size (refs: `#28141`_) + +* **PR** `#28141`_: (`rallytime`_) Don't use RAM for root disk size in linode.py + @ *2015-10-20 17:32:29 UTC* + + * 5f99bd4dc6 Merge pull request `#28141`_ from rallytime/fix-28118 + + * 59f8e41554 Don't use RAM for root disk size in linode.py + +* **PR** `#28143`_: (`justinta`_) Removed blank line at end of chassis.py + @ *2015-10-20 16:39:35 UTC* + + * 7cd0440c33 Merge pull request `#28143`_ from jtand/lint_fix + + * 427df95515 removed extraneous file + + * 1a58283f23 Removed blank line at end of chassis.py + +* **PR** `#28021`_: (`blueyed`_) Handle includes in `include_config` recursively + @ *2015-10-20 16:19:37 UTC* + + * 858875e9fd Merge pull request `#28021`_ from blueyed/recursive-include + + * 1d80520958 Handle includes in `include_config` recursively + +* **ISSUE** `#27998`_: (`papertigers`_) pkgin install broken (refs: `#28001`_) + +* **PR** `#28095`_: (`rallytime`_) Back-port `#28001`_ to 2015.8 + @ *2015-10-20 16:18:11 UTC* + + * **PR** `#28001`_: (`papertigers`_) `#27998`_ Cleanup pkgin isatty mess (refs: `#28095`_) + + * 4dbaec6b0c Merge pull request `#28095`_ from rallytime/bp-28001 + + * ddf8a8d2bb Cleanup pkgin isatty mess + +* **ISSUE** `#28060`_: (`LoveIsGrief`_) Default paths for test environment (refs: `#28061`_) + +* **PR** `#28096`_: (`rallytime`_) Back-port `#28061`_ to 2015.8 + @ *2015-10-20 16:15:34 UTC* + + * **PR** `#28061`_: (`LoveIsGrief`_) Fix `#28060`_ - Default paths for test environment (refs: `#28096`_) + + * 572487073c Merge pull request `#28096`_ from rallytime/bp-28061 + + * cb8a72d580 Fix `#28060`_ + +* **PR** `#28139`_: (`rallytime`_) Back-port `#28103`_ to 2015.8 + @ *2015-10-20 16:15:05 UTC* + + * **PR** `#28103`_: (`ajacoutot`_) OpenBSD salt package: update list of dependencies. (refs: `#28140`_, `#28139`_) + + * 9ce526260b Merge pull request `#28139`_ from rallytime/bp-28103 + + * bc9159a126 OpenBSD salt package: update list of dependencies. + +* **ISSUE** `#26844`_: (`double-yaya`_) The function "state.sls" is running as PID XXXX and was started at .... with jid XXXX always shows the current jid (refs: `#28098`_, `#28097`_) + +* **PR** `#28098`_: (`jacksontj`_) For all multi-part messages, check the headers. If the header is not … + @ *2015-10-20 15:00:08 UTC* + + * 97dfb00a68 Merge pull request `#28098`_ from jacksontj/2015.8 + + * 6d26842925 For all multi-part messages, check the headers. If the header is not your minion-id or a broadcast, drop the message. + +* **ISSUE** `#3436`_: (`madduck`_) Pillar does not handle Unicode data (refs: `#28134`_, #saltstack/salt`#28134`_) + +* **PR** `#28134`_: (`bernieke`_) fix unicode pillar values `#3436`_ + @ *2015-10-20 14:51:10 UTC* + + * b4875e585a Merge pull request `#28134`_ from Awingu/2015.8 + + * 53285f7781 fix unicode pillar values `#3436`_ + +* **PR** `#28076`_: (`redmcg`_) Replace option 'i' with an explicit queryformat + @ *2015-10-20 13:59:57 UTC* + + * f990a21029 Merge pull request `#28076`_ from redmcg/2015.8 + + * 07413ec162 Remove unnecessary padding from rpm.info + + * 4987530986 Replace option 'i' with an explicit queryformat + +* **PR** `#28119`_: (`jacksontj`_) Check if the remote exists before casting to a string. + @ *2015-10-20 12:34:10 UTC* + + * 3fdb52d1bf Merge pull request `#28119`_ from jacksontj/fetch_issue + + * c012dcc2f6 Check if the remote exists before casting to a string. + +* **ISSUE** `#28080`_: (`githubcdr`_) Salt minion locale module missing on Archlinux (refs: `#28105`_) + +* **PR** `#28105`_: (`jfindlay`_) add reason for not loading localemod + @ *2015-10-20 12:25:40 UTC* + + * 69ab1d30e2 Merge pull request `#28105`_ from jfindlay/locale_msg + + * 1e75665a9a add reason for not loading localemod + +* **ISSUE** `#28074`_: (`eliasp`_) Salt logfiles are created world-readable (refs: `#28108`_) + +* **PR** `#28108`_: (`cachedout`_) Set logfile permsissions correctly + @ *2015-10-20 12:25:22 UTC* + + * 8db7e016ec Merge pull request `#28108`_ from cachedout/issue_28074 + + * b416dcc07b Set logfile permsissions correctly + +* **PR** `#27922`_: (`cro`_) WIP States/Modules for managing Dell FX2 chassis via salt-proxy + @ *2015-10-19 23:29:21 UTC* + + * 1085eeab2b Merge pull request `#27922`_ from cro/fx2 + + * 6ccafa2ae5 Lint + + * 104c3cbe7f Lint + + * fe75594737 Lint + + * 479137cef8 Lint + + * 3712066fc9 More docs. + + * 2a3ebf5688 More Documentation. + + * 4ce2f8bb11 Documentation. + + * 18663306fb Cleanup, add blade_idrac stub + + * 0957beea46 Lint fixes and some changes by @rallytime + + * cca310eee0 WIP modules and states for managing Dell FX2 chassis via salt-proxy + +* **PR** `#28104`_: (`pass-by-value`_) Add documentation for proxy minion ssh + @ *2015-10-19 19:30:20 UTC* + + * a715803c92 Merge pull request `#28104`_ from pass-by-value/proxy_ssh_docs + + * 7c8f236115 Add documentation for proxy minion ssh + +* **ISSUE** `#27130`_: (`githubcdr`_) salt-run broken in 2015.8? (refs: `#28020`_) + +* **PR** `#28020`_: (`DmitryKuzmenko`_) LazyLoader deepcopy fix. + @ *2015-10-19 13:17:57 UTC* + + * 07cac0b434 Merge pull request `#28020`_ from DSRCompany/issues/27130_loader_deepcopy_fix + + * 5353518623 Fix lint errors + + * 8c256c94f4 LazyLoader deepcopy fix. + +* **ISSUE** `#27932`_: (`eliasp`_) Can't include Pillar SLS across GitPillar repositories (refs: `#27933`_) + +* **PR** `#27933`_: (`eliasp`_) Provide all git pillar dirs in `opts[pillar_roots]` + @ *2015-10-19 13:05:54 UTC* + + * f884df5d78 Merge pull request `#27933`_ from eliasp/fix-27932 + + * 05782aa78f Provide all git pillar dirs in `opts[pillar_roots]` + +* **ISSUE** `#27890`_: (`dkiser`_) pillar recurse list strategy (refs: `#27891`_) + +* **PR** `#28013`_: (`rallytime`_) Back-port `#27891`_ to 2015.8 + @ *2015-10-19 12:57:51 UTC* + + * **PR** `#27891`_: (`dkiser`_) introduce recurse_list pillar_source_merging_strategy (refs: `#28353`_, `#28013`_) + + * 1db6406bef Merge pull request `#28013`_ from rallytime/bp-27891 + + * 9ea33bf0e4 Pylint fixes + + * 4af5b5c33f introduce recurse_list pillar_source_merging_strategy + +* **ISSUE** `#27938`_: (`mostafahussein`_) Grains are not rendering correctly (refs: `#28018`_) + +* **PR** `#28018`_: (`rallytime`_) Add example to Writing Grains of how grains can be loaded twice + @ *2015-10-19 12:47:10 UTC* + + * 26b3e01dda Merge pull request `#28018`_ from rallytime/fix-27938 + + * c23af0d8e2 Clarify loading vs rendering the final grains data structure + + * a4d7fb7e60 Add example to Writing Grains of how grains can be loaded twice + +* **PR** `#28084`_: (`cachedout`_) `#28069`_ with lint + @ *2015-10-19 12:18:38 UTC* + + * **PR** `#28069`_: (`blueyed`_) dockerng: use error from modules.dockerng in states' __virtual__ (refs: `#28084`_) + + * c6e7dd4812 Merge pull request `#28084`_ from cachedout/lint_28069 + + * 8026212733 Lint + + * 7a2c80cf6f dockerng: use error from modules.dockerng in states' __virtual__ + +* **PR** `#28079`_: (`The-Loeki`_) Fix for trace dump on failing imports for win32com & pythoncom 4 win_task + @ *2015-10-19 12:12:11 UTC* + + * 428e64e24d Merge pull request `#28079`_ from The-Loeki/fix-trace-on-windows-tasks + + * 869e212e81 Fix for trace dump on failing imports for win32com & pythoncom 4 win_task + +* **PR** `#28081`_: (`The-Loeki`_) fix for glance state trace error on import failure + @ *2015-10-19 12:08:47 UTC* + + * 2ac8fd793d Merge pull request `#28081`_ from The-Loeki/fix-trace-on-keystone-state + + * 258e11f754 fix for glance state trace error on import failure + +* **ISSUE** `#27794`_: (`The-Loeki`_) Requests backend for HTTP fetches is broken after removing streamed response handlers (refs: `#28066`_) + +* **PR** `#28066`_: (`jacksontj`_) Use the generic `text` attribute, not .body of the handler + @ *2015-10-18 16:17:12 UTC* + + * a2128c8f80 Merge pull request `#28066`_ from jacksontj/issue_27794 + + * b1bf79821d Use the generic `text` attribute, not .body of the handler + +* **ISSUE** `#27828`_: (`cubranic`_) Note the version when 'user' and 'group' became available in docs for archive.extracted (refs: `#28019`_) + +* **PR** `#28019`_: (`rallytime`_) Clean up version added and deprecated msgs to be accurate + @ *2015-10-17 17:31:50 UTC* + + * 9c974c9a41 Merge pull request `#28019`_ from rallytime/fix-27828 + + * aca864643f Clean up version added and deprecated msgs to be accurate + +* **PR** `#28058`_: (`rallytime`_) Back-port `#28041`_ to 2015.8 + @ *2015-10-17 17:27:19 UTC* + + * **PR** `#28041`_: (`gtmanfred`_) use the correct discover_extensions (refs: `#28058`_) + + * 9adcd3b90d Merge pull request `#28058`_ from rallytime/bp-28041 + + * 04ad8dc521 use the correct discover_extensions + +* **PR** `#28055`_: (`rallytime`_) Back-port `#28043`_ to 2015.8 + @ *2015-10-17 17:26:37 UTC* + + * **PR** `#28043`_: (`gtmanfred`_) the nova driver does not require libcloud (refs: `#28055`_) + + * 6db970c93a Merge pull request `#28055`_ from rallytime/bp-28043 + + * 744e556be7 the nova driver does not require libcloud + +* **PR** `#28046`_: (`pass-by-value`_) Add pkg install and remove functions + @ *2015-10-17 14:56:24 UTC* + + * d7263d2a8e Merge pull request `#28046`_ from pass-by-value/proxy_minion_ssh_example_additions + + * 3435d28fc9 Add pkg install and remove functions + +* **PR** `#28050`_: (`ryan-lane`_) Use a better method for checking dynamodb table existence + @ *2015-10-17 14:55:52 UTC* + + * dd0fdd827e Merge pull request `#28050`_ from lyft/better-dynamo-exists-check-2015.8 + + * 24fff4ea12 Use a better method for checking dynamodb table existence + +* **ISSUE** `#28038`_: (`gtmanfred`_) [Docs] the ubuntu repo documentation needs to be fixed (refs: `#28042`_) + +* **PR** `#28042`_: (`jfindlay`_) fix repo path in ubuntu installation documentation + @ *2015-10-16 19:30:52 UTC* + + * 027092e2fb Merge pull request `#28042`_ from jfindlay/ubuntu_docs + + * ae92a8a1dc fix repo path in ubuntu installation documentation + +* **PR** `#28033`_: (`twangboy`_) Fixed win_useradd.py (refs: `#28056`_) + @ *2015-10-16 19:19:44 UTC* + + * a3390cfbe6 Merge pull request `#28033`_ from twangboy/fix_win_useradd + + * 2137b5f79a Fixed win_useradd.py + +* **PR** `#28027`_: (`cro`_) Make ssh conn persistent. + @ *2015-10-16 18:50:51 UTC* + + * 4f81358e9a Merge pull request `#28027`_ from cro/persistent_ssh + + * 8b4067b6db Spelling, lint. + + * 76a93d5922 Spelling. + + * c800f60338 Default multiprocessing to False since anything that needs salt.vt will have trouble with our forking model. + + * cc0ad81b3d Lint, remove debug. + + * e41b677450 Make SSH connection 'persistent'. Note that right now this requires 'multiprocessing: False' in /etc/salt/proxy. + +* **PR** `#28029`_: (`jacobhammons`_) Updated release notes with additional CVE information + @ *2015-10-16 16:19:33 UTC* + + * 4dec2f9307 Merge pull request `#28029`_ from jacobhammons/relnotes8 + + * 0d1b691549 Updated release notes with additional CVE information + +* **PR** `#28022`_: (`jacobhammons`_) Updated Debian and Ubuntu repo paths with new structure for 2015.8.1 + @ *2015-10-16 15:31:36 UTC* + + * 5286c01f39 Merge pull request `#28022`_ from jacobhammons/install + + * e4d7df8695 Updated Debian and Ubuntu repo paths with new structure for 2015.8.1 + +* **ISSUE** `#27971`_: (`srkunze`_) pip.installed returned Result: None (refs: `#27983`_) + +* **PR** `#27983`_: (`rallytime`_) Pip state run result should be False, not None, if installation error occurs. + @ *2015-10-16 13:37:42 UTC* + + * 340229355c Merge pull request `#27983`_ from rallytime/fix-27971 + + * 9855290b99 Maintain stateful output if something went wrong running the pip command + + * 5bcc89bb8e Pip state run result should be False, not None, if installation error occurs. + +* **ISSUE** `#20678`_: (`damon-atkins`_) Windows Installer (Separation/Downloader/Contains VC++) (refs: `#27991`_) + +* **PR** `#27991`_: (`twangboy`_) Fix for `#20678`_ + @ *2015-10-16 13:33:48 UTC* + + * 97d473af0d Merge pull request `#27991`_ from twangboy/fix_20678 + + * 5254ba18b3 Fix for `#20678`_ + +* **ISSUE** `#21845`_: (`kitsemets`_) pip.install: fails in v2015.2.0rc1 when the package is already installed (pip v1.0) (refs: `#27996`_) + +* **PR** `#27997`_: (`rallytime`_) Remove note about pip bug with pip v1 vs pip v2 return codes + @ *2015-10-16 13:23:58 UTC* + + * **PR** `#27996`_: (`rallytime`_) Don't fail if pip package is already present and pip1 is installed (refs: `#27997`_) + + * bd7b39bc18 Merge pull request `#27997`_ from rallytime/remove-pip-bug-note + + * f08d488313 Remove note about pip bug with pip v1 vs pip v2 return codes + +* **PR** `#27994`_: (`justinta`_) Fix schedule_test failure + @ *2015-10-16 13:20:56 UTC* + + * 3256e38932 Merge pull request `#27994`_ from jtand/schedule_test-fix + + * cd67843bd0 Fix schedule_test failure + +* **ISSUE** `#27949`_: (`itsamenathan`_) Error enabling or disabling a beacon on a minion (refs: `#27992`_) + +* **PR** `#27992`_: (`cachedout`_) Make load beacon config into list + @ *2015-10-16 12:43:53 UTC* + + * 4a7a25eef7 Merge pull request `#27992`_ from cachedout/issue_27949 + + * 8944e1395a Make load beacon config into list + +* **ISSUE** `#26336`_: (`jfindlay`_) windows user.present broken (refs: `#28003`_) + +* **PR** `#28003`_: (`twangboy`_) Fix `#26336`_ (refs: `#28037`_) + @ *2015-10-16 12:43:07 UTC* + + * bae81d3a8d Merge pull request `#28003`_ from twangboy/fix_26336 + + * 6c94146d86 Fix PR `#26336`_ + +* **PR** `#27984`_: (`rallytime`_) Versionadded for clean_file option for pkgrepo + @ *2015-10-15 18:57:54 UTC* + + * **PR** `#19561`_: (`favadi`_) add pkgrepo.managed clean_file option (refs: `#27984`_) + + * e15eeee2d3 Merge pull request `#27984`_ from rallytime/version-clean-file + + * b094c8843e Versionadded for clean_file option for pkgrepo + +* **PR** `#27989`_: (`ryan-lane`_) Do not try to remove the main route table association + @ *2015-10-15 18:57:42 UTC* + + * 6efa71a482 Merge pull request `#27989`_ from lyft/boto_vpc-main-route-association2-2015.8 + + * 296931d29f Do not try to remove the main route table association + +* **PR** `#27982`_: (`pass-by-value`_) Add example for salt-proxy over SSH + @ *2015-10-15 17:27:57 UTC* + + * 7169fad02d Merge pull request `#27982`_ from pass-by-value/proxy_ssh_sample + + * b85f6ab339 Add example for salt-proxy over SSH + +* **PR** `#27985`_: (`jacobhammons`_) Changed current release to 8.1 and added CVEs to release notes + @ *2015-10-15 17:27:05 UTC* + + * d0be1ab98e Merge pull request `#27985`_ from jacobhammons/dot1 + + * 236992b2be Changed current release to 8.1 and added CVEs to release notes + +* **ISSUE** `#27750`_: (`justyns`_) Salt-master too sensitive to whitespace in public keys (again) (refs: `#27979`_) + +* **ISSUE** `#21910`_: (`justyns`_) Salt-master too whitespace-sensitive when dealing with minion pub keys (refs: `#22115`_) + +* **PR** `#27979`_: (`cachedout`_) Fix regression with key whitespace + @ *2015-10-15 15:26:08 UTC* + + * **PR** `#22115`_: (`douglas-vaz`_) Strip whitespace characters using strip() for pub key check (refs: `#27979`_) + + * 7e4058605d Merge pull request `#27979`_ from cachedout/issue_27750 + + * 12c6bf4358 Fix regression with key whitespace + +* **ISSUE** `#27712`_: (`eduherraiz`_) saltutil.sync_all can't sync with the minion (refs: `#27977`_) + +* **PR** `#27977`_: (`cachedout`_) Decode unicode names in fileclient/server + @ *2015-10-15 15:17:01 UTC* + + * 6f8925ee84 Merge pull request `#27977`_ from cachedout/issuse_27712 + + * 5173ef43c8 Decode unicode names in fileclient/server + +* **PR** `#27981`_: (`justinta`_) Fixed trailing whitespace lint + @ *2015-10-15 15:10:15 UTC* + + * fc1375fc39 Merge pull request `#27981`_ from jtand/cloudstack-lint + + * 5dfad190c2 Fixed trailing whitespace lint + +* **PR** `#27969`_: (`jeffreyctang`_) fix parse of { on next line + @ *2015-10-15 15:04:33 UTC* + + * 1ae302b202 Merge pull request `#27969`_ from jeffreyctang/logrotate_parse + + * 2c9b2bc367 lint fixes + + * 8c6197d42e fix parse of { on next line + +* **PR** `#27978`_: (`terminalmage`_) Add note about dockerng.inspect_image usage + @ *2015-10-15 14:54:10 UTC* + + * a4ba982b1d Merge pull request `#27978`_ from terminalmage/dockerng-inspect_image-docstring + + * 595f4a6939 Add note about dockerng.inspect_image usage + +* **PR** `#27955`_: (`pass-by-value`_) Bp 27868 + @ *2015-10-15 12:43:37 UTC* + + * **PR** `#27868`_: (`pass-by-value`_) Add SSHConnection object + + * bd9d1ed8b5 Merge pull request `#27955`_ from pass-by-value/bp-27868 + + * c02ec8b943 Fix pylint errors + + * 6553d135d0 Add SSHConnection object + +* **PR** `#27953`_: (`The-Loeki`_) Fix CloudStack cloud for new 'driver' syntax + @ *2015-10-15 12:38:58 UTC* + + * c50802a80f Merge pull request `#27953`_ from The-Loeki/patch-1 + + * f0d5c9f375 Pop deprecated 'provider' into new 'driver' key + + * 4e6b09edd1 Fix CloudStack cloud for new 'driver' syntax + +* **PR** `#27965`_: (`ryan-lane`_) Fail in boto_asg.present if alarms fail + @ *2015-10-15 12:32:53 UTC* + + * 7006c37627 Merge pull request `#27965`_ from lyft/HOTFIX-boto-asg-fix + + * b8f4079c33 Fail in boto_asg.present if alarms fail + +* **PR** `#27958`_: (`twangboy`_) Added new functionality to win_task.py + @ *2015-10-15 12:30:31 UTC* + + * 6624ec1f48 Merge pull request `#27958`_ from twangboy/update_win_task + + * 6ecbdba246 Added run_wait function + + * 5731bdcadb Clarified an error + + * 23b9c1c199 Added new functionality + +* **ISSUE** `#27956`_: (`The-Loeki`_) Salt-cloud CLI 2015.8 borks out with global name '__opts__' is not defined (refs: `#27959`_) + +* **PR** `#27959`_: (`techhat`_) Change __opts__ to self.opts + @ *2015-10-14 22:29:13 UTC* + + * 1efa87a964 Merge pull request `#27959`_ from techhat/issue27956 + + * bc01c48122 Change __opts__ to self.opts + +* **PR** `#27943`_: (`rallytime`_) Back-port `#27910`_ to 2015.8 + @ *2015-10-14 20:27:20 UTC* + + * **PR** `#27910`_: (`twellspring`_) htpasswd state add comment about dependency on apache2-utils (refs: `#27943`_) + + * 877e217388 Merge pull request `#27943`_ from rallytime/bp-27910 + + * 33b3d8f5b3 Clarify that apache2-utils is for Debian-based distros + + * 8ca0bc823c Add dependency on apache2-utils + +* **PR** `#27944`_: (`rallytime`_) Back-port `#27909`_ to 2015.8 + @ *2015-10-14 20:26:52 UTC* + + * **PR** `#27909`_: (`twellspring`_) htpasswd module add comment about dependency on apache2-utils (refs: `#27944`_) + + * 5f6edc8ac2 Merge pull request `#27944`_ from rallytime/bp-27909 + + * a3401c11b1 Clarify that apache2-utils is for Debian-based distros + + * 08b7bdeb97 Add dependency on apache2-utils + +* **PR** `#27946`_: (`justinta`_) Changed grain to look at osmajorrelease instead of osrelease + @ *2015-10-14 19:54:08 UTC* + + * f29ca5f87b Merge pull request `#27946`_ from jtand/pkgrepo-fix + + * d88ac2589f Changed grain to look at osmajorrelease instead of osrelease + +* **ISSUE** `#27815`_: (`tbaker57`_) Documentation regarding associate_eip for EC2 profiles (refs: `#27914`_) + +* **PR** `#27914`_: (`rallytime`_) Use eipalloc instead of eni in EC2 interface properties example + @ *2015-10-14 14:37:52 UTC* + + * bb900d428b Merge pull request `#27914`_ from rallytime/fix-27815 + + * 13a9bc9053 Use eipalloc instead of eni in EC2 interface properties example + +* **PR** `#27926`_: (`rallytime`_) Back-port `#27905`_ to 2015.8 + @ *2015-10-14 14:35:37 UTC* + + * **PR** `#27905`_: (`itsamenathan`_) Small documentation error for beacon disable (refs: `#27926`_) + + * 679e603905 Merge pull request `#27926`_ from rallytime/bp-27905 + + * 30e6b055ec Small documentation error fixed + +* **ISSUE** `#27911`_: (`ryan-lane`_) rules_egress in boto_secgroup should not manage egress rules, if set to None (refs: `#27927`_) + +* **PR** `#27927`_: (`ryan-lane`_) Do not manage ingress or egress rules if set to None + @ *2015-10-14 14:03:17 UTC* + + * 3b4d86467b Merge pull request `#27927`_ from lyft/boto_secgroup-fixes-2015.8 + + * 0fedcc9a0b Update docs + + * 9cc65bba76 Do not manage ingress or egress rules if set to None + +* **PR** `#27928`_: (`rallytime`_) Back-port `#27908`_ to 2015.8 + @ *2015-10-14 14:00:50 UTC* + + * **PR** `#27908`_: (`lathama`_) Documentation note kwargs for mdadm state already mentioned in module (refs: `#27928`_) + + * b0f9db409d Merge pull request `#27928`_ from rallytime/bp-27908 + + * 7febb06223 Sneaky white space + + * 31d54bbe63 Note kwags for mdadm in state + +* **ISSUE** `#27661`_: (`alf`_) The dockerng module uses deprecated API in docker-py (refs: `#27676`_) + +* **PR** `#27676`_: (`ticosax`_) [dockerng] WIP No more runtime args passed to docker.start() + @ *2015-10-14 13:38:41 UTC* + + * 2d0b16559e Merge pull request `#27676`_ from ticosax/no-more-arg-to-docker-start + + * a1d0ba392f fixup! Do not pass any argument to docker.start + + * 8cddbb15c4 prevent potential error while reporting mismatch versions to user. + + * 65c8762e1f Do not pass any argument to docker.start + + * d8cca2a009 docker.version_info is now provided. + +* **PR** `#27885`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-10-13 22:44:20 UTC* + + * 722327ee5f Merge pull request `#27885`_ from basepi/merge-forward-2015.8 + + * 5ecd5615f2 Remove failing heavily-mocked test + + * 3b5e16db67 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * c9c3b7760e Merge pull request `#27726`_ from jfindlay/hashhosts + + * ebce47de7c add docs to ssh.recv_known_host exec module fcn + + * b6ee16b1e5 deprecate hash_hostname in favor of hash_known_hosts + + * 18e31584b0 Merge pull request `#27776`_ from jfindlay/local_msg + + * 03afa3cffa return message when local jobs_cache not found + + * 86cc7b5537 Merge pull request `#27766`_ from jfindlay/debmail + + * ee78da2c27 better check for debian userdel error + + * c224386c9a Merge pull request `#27758`_ from iggy/patch-1 + + * 0994fb6a8c Remove redundant text from syslog returner + + * 34a005041f Merge pull request `#27841`_ from terminalmage/issue27832 + + * 8e09fbd6a3 Detect Manjaro Linux as Arch derivative + + * 3944a498ad Merge pull request `#27852`_ from rallytime/bp-27806 + + * a84bf18bc4 Empty string is falsy + + * 7508a1c474 Merge pull request `#27838`_ from basepi/fix.runner.highstate.outputter.27831 + + * 8ae9b66fd9 Don't pop 'outputter', we expect it further down + + * d178315f93 Merge pull request `#27791`_ from eguven/2015.5-postgres-user-groups-backport + + * 2caf1d21d6 fix test + + * bc90c5bffe improve change reporting for postgres_user groups + + * 8712bce91a backport postgres_user groups + +* **ISSUE** `#26908`_: (`twangboy`_) Fix `service.restart salt-minion` for other locales (refs: `#27882`_) + +* **ISSUE** `#26906`_: (`mblixter`_) Bug fix #22020 causes a new bug due to the expected date format for the /SD parameter in schtask.exe (refs: `#27882`_) + +* **PR** `#27882`_: (`twangboy`_) Created win_task.py module + @ *2015-10-13 16:54:13 UTC* + + * 36f05fb526 Merge pull request `#27882`_ from twangboy/win_task_module + + * 56c3f3ebb2 Fixed an egregious error with an import + + * 07939ea29c More lint + + * 14e060ed9c Fixed some tests + + * 1e1bd29426 Fixed some lint + + * 082277a727 Win_service.py to use the new task module + + * 2212b52620 Created win_task.py module + +* **ISSUE** `#27738`_: (`fphhotchips`_) Git Pillar locks not managed by fileserver runner (refs: `#27802`_) + +* **PR** `#27802`_: (`terminalmage`_) Correct warning logging when update lock is present for git_pillar/winrepo, add runner function for clearing git_pillar/winrepo locks + @ *2015-10-13 15:09:11 UTC* + + * 577191696d Merge pull request `#27802`_ from terminalmage/issue27738 + + * 1dbc3b5489 Fix comment in docstring that trailed off mid-sentence + + * 94b5fc572f Process both old and ng winrepo configs when clearing git locks + + * 7f4366d42e Add CLI example + + * 3952c66888 Change log message to reflect new runner function + + * c00ef718bf Add cache.clear_git_lock runner function + + * d7ca297f7b Add salt.fileserver.clear_lock() + + * 947ed5f739 Clarify docstring + +* **ISSUE** `#26632`_: (`ryanwalder`_) postgres_user crashes when trying to add groups formed in a list (refs: `#27886`_) + +* **PR** `#27886`_: (`rallytime`_) Handle group lists as well as comma-separated group strings. + @ *2015-10-13 15:00:10 UTC* + + * d655bb3616 Merge pull request `#27886`_ from rallytime/fix-26632 + + * d235abf907 Handle group lists as well as comma-separated group strings. + +* **ISSUE** `#26313`_: (`anlutro`_) Timezone module error when timedatectl fails to query server (refs: `#27746`_) + +* **PR** `#27746`_: (`anlutro`_) timezone module: handle timedatectl errors + @ *2015-10-13 14:55:27 UTC* + + * a158cd50e6 Merge pull request `#27746`_ from alprs/fix-timedatectl_failure + + * f616b550b2 lint - use indexed curly brace formatting + + * bc0f167850 update timezone mod unit tests for errors + + * ef26f067b2 timezone module: handle timedatectl errors + +* **ISSUE** `#27710`_: (`anlutro`_) salt-ssh and system.reboot/shutdown (refs: `#27816`_) + +* **PR** `#27816`_: (`anlutro`_) Make system.reboot use `shutdown -r` when available + @ *2015-10-13 14:52:06 UTC* + + * 9dc19caa79 Merge pull request `#27816`_ from alprs/fix-reboot_delay + + * 04ef51e524 make system.reboot use `shutdown -r` when available + +* **PR** `#27874`_: (`rallytime`_) Add mention of Periodic Table naming scheme to deprecation docs + @ *2015-10-13 14:51:45 UTC* + + * dd92b8a2e3 Merge pull request `#27874`_ from rallytime/deprecation-docs + + * 8c056ba501 Add mention of Periodic Table naming scheme to deprecation docs + +* **PR** `#27883`_: (`terminalmage`_) Work around --is-ancestor not being present in git-merge-base before git 1.8.0 + @ *2015-10-13 14:51:27 UTC* + + * 7f96ebd69e Merge pull request `#27883`_ from terminalmage/git-merge_base-is_ancestor + + * 45c666e8dd Work around --is-ancestor not being present in git-merge-base before git 1.8.0 + + * 38d715ec0a Remove redundant SaltInvocationError raises + +* **ISSUE** `#24111`_: (`yermulnik`_) cli option '--summary' got broken after upgrade to 2015.5.1 (refs: `#24732`_) + +* **PR** `#27877`_: (`rallytime`_) Back-port `#27774`_ to 2015.8 + @ *2015-10-13 14:50:45 UTC* + + * **PR** `#27774`_: (`plastikos`_) Summary is not correctly inspecting return data to identify not responding|connected minions (refs: `#27877`_) + + * **PR** `#27099`_: (`plastikos`_) Fix access to ret parameter of _print_returns_summary() (reverts 54b33dd35948 `#24732`_) (refs: `#27774`_) + + * **PR** `#24732`_: (`msteed`_) Fix stacktrace when `--summary` is used (refs: `#27099`_) + + * 4fb20d9b4f Merge pull request `#27877`_ from rallytime/bp-27774 + + * d940d87306 Summary is not correctly inspecting return data to identify not responding|connected minions. + +* **ISSUE** `#26284`_: (`storner`_) apache_module.enable fails on SUSE (SLES 11 SP3) (refs: `#27878`_) + +* **PR** `#27878`_: (`rallytime`_) Use apache2ctl binary on SUSE in apache module + @ *2015-10-13 14:45:56 UTC* + + * 97da0a87e3 Merge pull request `#27878`_ from rallytime/fix-26284 + + * 87f0d987a3 Use apache2ctl binary on SUSE in apache module + +* **PR** `#27879`_: (`cro`_) Add docs for 2015.8.2+ changes to proxies + @ *2015-10-13 14:45:30 UTC* + + * 067968c0e4 Merge pull request `#27879`_ from cro/proxydoc + + * 5b33df9d19 Add docs for 2015.8.2+ changes + +* **PR** `#27731`_: (`cro`_) Add __proxy__ to replace opts['proxymodule'] + @ *2015-10-12 20:41:22 UTC* + + * 922e2018ef Merge pull request `#27731`_ from cro/dunder_proxy + + * ba3e423b87 Missing object item throws an AttributeError not a NameError. + + * 4cf2b56d5f Lint. + + * dc07245df2 @rallytime is awesome. Moved proxy=None to end of def minion_mods + + * 3152d8ee3f Minor loader fix + + * b15083d719 Flip sense of test for grains load at end of regular minion startup + + * 37c145bcd5 More places where salt.state.State needs a proxy param, sysmod had wrong __proxyenabled__, core grains were checking for proxy the wrong way. + + * ed23f36279 One more check for presence of __proxy__ + + * 62d9f5092e what was I thinking? + + * ccf366e1a5 Lint + + * 8aef6e8aa9 Fix comment + + * 48f9755103 Oops, forgot temp var. + + * f0360ca00e More cleanup, found another spot where proxy needed to be passed to a load_modules. + + * 81a4abfe5a __proxy__ is getting nuked somewhere + + * f9461ff298 Add config option so old-style proxymodules will keep loading + + * 3d6ed5b7ff Remove debug statement. + + * b5a19a9740 Enable syncing proxymodules from the master. Proxymodules can go in /srv/salt/_proxy. + + * f878011543 Lint, and some parameter fixes to add proxy= to some overridden load_modules fns. + + * 22f035d8eb Remove debug statement + + * 4432499b45 More progress toward __proxy__ + + * 1a229c17b2 Further work on __proxy__ + + * 85fd6a41c7 One more check for presence of __proxy__ + + * 15e1d3e3df Forgot absolute_import. + + * c5d9d54f19 Fix py3 lint + + * dd50c33543 This module was accidentally overwriting core grains during tests. + + * 525256fa68 Some calls to highstate won't have __proxy__ in scope + + * a615e5a876 what was I thinking? + + * fae3f3ca83 Lint + + * b049377cbe Remove rest_sample_test, it wasn't testing anything + + * 42188480d4 Fix comment + + * 4112c583e4 Oops, forgot temp var. + + * e9b281041c More cleanup, found another spot where proxy needed to be passed to a load_modules. + + * 64f967d731 __proxy__ is getting nuked somewhere + + * bdffb9f57b Add config option so old-style proxymodules will keep loading + + * b79b6a39dd Remove debug statement. + + * 02fc2d9323 Enable syncing proxymodules from the master. Proxymodules can go in /srv/salt/_proxy. + + * 72032650b8 Add __proxy__ to the list of builtins. + + * db4c034596 Lint, and some parameter fixes to add proxy= to some overridden load_modules fns. + + * 1032ad28fc Remove debug statement + + * c41e49d8e5 Make sure that the __proxy__ gets passed all the way into the state system. + + * 4a20d48b35 More progress toward __proxy__ + + * d337f4329e Further work on __proxy__ + +* **ISSUE** `#26904`_: (`anlutro`_) pip install --upgrade with virtualenv.managed? (refs: `#27745`_) + +* **PR** `#27745`_: (`anlutro`_) Add pip_upgrade arg to virtualenv.managed state + @ *2015-10-12 16:11:02 UTC* + + * 644f003fb2 Merge pull request `#27745`_ from alprs/fix-virtualenv_pip_upgrade + + * 4bd219f8d4 add pip_upgrade arg to virtualenv.managed state, clean up docstring + +* **PR** `#27809`_: (`ticosax`_) [dockerng] Remove dockerng.ps caching + @ *2015-10-12 16:07:48 UTC* + + * 698f477336 Merge pull request `#27809`_ from ticosax/remove-dockerng.ps-caching + + * 0eb1145856 Remove caching to prevent returning stale data from dockerng.ps + +* **PR** `#27859`_: (`ticosax`_) [dockerng] Clarify doc port bindings + @ *2015-10-12 16:06:27 UTC* + + * e96d06d71a Merge pull request `#27859`_ from ticosax/clarify-doc-port-bindings + + * 75f7a3ec55 Must be a string + +* **ISSUE** `#8646`_: (`micahhausler`_) Make the clean parameter in the file.directory state respect foreign require_in (refs: `#27748`_) + +* **PR** `#27748`_: (`multani`_) Fix `#8646`_ + @ *2015-10-12 15:55:57 UTC* + + * ba2a39d4b7 Merge pull request `#27748`_ from multani/fix-8646 + + * 6d95cbc998 Fix lint errors + + * 4ff9f4be2a Fix file.directory with clean=true and require_in with states ID + + * 0d391275de Test cases to demonstrate bug `#8646`_ + +* **ISSUE** `#27721`_: (`ldobson`_) boto_cloudwatch_alarm.present returns diff on no change (refs: `#27722`_) + +* **PR** `#27850`_: (`rallytime`_) Back-port `#27722`_ to 2015.8 + @ *2015-10-12 15:31:58 UTC* + + * **PR** `#27722`_: (`ldobson`_) Sorted compare for alarm actions (refs: `#27850`_) + + * ce1493e06b Merge pull request `#27850`_ from rallytime/bp-27722 + + * 33936605a0 Sorted compare for alarm actions + +* **PR** `#27851`_: (`rallytime`_) Back-port `#27771`_ to 2015.8 + @ *2015-10-12 15:31:06 UTC* + + * **PR** `#27771`_: (`srkunze`_) [VIRTUALENV_MOD] added docs strings to explain parameters (refs: `#27851`_) + + * c95437a710 Merge pull request `#27851`_ from rallytime/bp-27771 + + * 144a743503 added docs strings to explain parameters + +* **ISSUE** `#27789`_: (`eduherraiz`_) UnicodeDecodeError: 'ascii' codec can't decode byte in 2015.8.0 (refs: `#28340`_, `#27833`_) + +* **PR** `#27833`_: (`jfindlay`_) decode path before string ops in fileclient + @ *2015-10-12 15:26:39 UTC* + + * a41b59bf6e Merge pull request `#27833`_ from jfindlay/path_decode + + * 66c74e591e decode path before string ops in fileclient + +* **ISSUE** `#27804`_: (`chrismcmacken`_) cmd.run/cmd.run_all documentation contradictory for python_shell argument (refs: `#27837`_) + +* **PR** `#27837`_: (`jfindlay`_) reverse truth in python_shell documentation + @ *2015-10-12 15:25:13 UTC* + + * e264db7702 Merge pull request `#27837`_ from jfindlay/true_shell + + * 1c9708a457 reverse truth in python_shell documentation + +* **PR** `#27860`_: (`flavio`_) Fix OS related grains on openSUSE and SUSE Linux Enterprise + @ *2015-10-12 15:22:59 UTC* + + * faec838744 Merge pull request `#27860`_ from flavio/fix-os-grains-on-suse-and-opensuse + + * fc8d296d72 Fix OS related grains on openSUSE and SUSE Linux Enterprise + +* **PR** `#27768`_: (`rallytime`_) Clean up bootstrap function to be slightly cleaner + @ *2015-10-12 15:06:54 UTC* + + * 4ac5344c31 Merge pull request `#27768`_ from rallytime/cleanup_bootstrap + + * 9df6e106c3 Clean up bootstrap function to be slightly cleaner + +* **PR** `#27797`_: (`isbm`_) Zypper module clusterfix + @ *2015-10-12 15:06:02 UTC* + + * e1bd91e392 Merge pull request `#27797`_ from isbm/isbm-zypper-fixes + + * 36281f6b06 Bugfix: crash if no package specified on adding a lock + + * 29806a1af9 Bugfix: crash if no package specified on removing lock + + * 453a18ea15 Return an actual amount of removed locks. + + * eaa6af9898 Bugfix: sometimes error goes to the STDOUT instead of STDERR in the RPM + + * 350340dafa Bugfix: use boolean type instead of string "Yes" or "No" (NOTE: this was forgotten) + + * decb989eb4 Bugfix and refactor due to the crash on unknown package and incorrect return value + + * a6c285bd12 Initialization fix + + * 510dedd29f Bugfix: newer Zypper includes also a version of installed package + + * f9bef516de Bugfix: broken "upgrade_available" and should always return dict. + +* **ISSUE** `#27821`_: (`leodus`_) Deploy VM on Proxmox requires 'size' configuration setting? Not according the docs! (refs: `#27849`_) + +* **PR** `#27849`_: (`rallytime`_) Don't require a size parameter for proxmox profiles + @ *2015-10-11 01:33:28 UTC* + + * 286b08a0f5 Merge pull request `#27849`_ from rallytime/fix-27821 + + * 1bf17c7d48 Don't require a size parameter for proxmox profiles + +* **PR** `#27827`_: (`techhat`_) Add additional error checking to SPM + @ *2015-10-09 18:23:09 UTC* + + * 4a69db27cd Merge pull request `#27827`_ from techhat/spmfixes + + * ffc8df223b Add additional error checking to SPM + +* **ISSUE** `#27825`_: (`martinhoefling`_) Salt-api is not adding cors headers if auth fails (refs: `#27826`_) + +* **PR** `#27826`_: (`martinhoefling`_) Fixes `#27825`_ + @ *2015-10-09 16:08:05 UTC* + + * 9bc19ba7d2 Merge pull request `#27826`_ from martinhoefling/fix-27825 + + * 401e7de33d Fixes `#27825`_ + +* **PR** `#27824`_: (`techhat`_) Update Azure errors + @ *2015-10-09 15:25:14 UTC* + + * 1e2dede122 Merge pull request `#27824`_ from techhat/azureerrors + + * 5b23ac7099 Update Azure errors + +* **PR** `#27795`_: (`eguven`_) better change reporting for postgres_user groups + @ *2015-10-08 23:56:53 UTC* + + * ec35666ff2 Merge pull request `#27795`_ from eguven/2015.8-postgres_user-group-change + + * ffffede412 better change reporting for postgres_user groups + +* **ISSUE** `#27703`_: (`ryan-lane`_) git.latest seems to ignore the user argument in 2015.8 (refs: `#27799`_) + +* **PR** `#27799`_: (`terminalmage`_) Fix usage of identity file in git.latest + @ *2015-10-08 23:36:19 UTC* + + * 5420006209 Merge pull request `#27799`_ from terminalmage/issue27703 + + * 75d2b07b0c Pass user in calls to git.rev_parse + + * 786786a245 Fix wrong argument name for _git_run() + +* **PR** `#27717`_: (`pass-by-value`_) Proxy beacon example + @ *2015-10-08 22:58:49 UTC* + + * 0533a2b1dd Merge pull request `#27717`_ from pass-by-value/proxy_beacon_example + + * cac3da1ffa Fix pylint error + + * 7fef5ea08c Make a call to beacon end point + + * 497f965c33 Comment + + * 8ad7082913 Add example beacon that works with salt-proxy + +* **PR** `#27793`_: (`anlutro`_) update code that changes log level of salt-ssh shim command + @ *2015-10-08 19:20:12 UTC* + + * dd9dba8f59 Merge pull request `#27793`_ from alprs/fix-salt_ssh_b64_log + + * 2597d13fc8 update code that changes log level of salt-ssh shim command + +* **ISSUE** `#27714`_: (`The-Loeki`_) 2015.8 git_pillar merge inconsistency/bug (refs: `#27761`_) + +* **PR** `#27761`_: (`terminalmage`_) Merge git pillar data instead of using dict.update() + @ *2015-10-08 15:00:18 UTC* + + * bccb74ffc5 Merge pull request `#27761`_ from terminalmage/issue27714 + + * d149095bb0 Merge git pillar data instead of using dict.update() + +* **PR** `#27741`_: (`ticosax`_) [dockerng] pass filters argument to dockerng.ps + @ *2015-10-08 03:40:14 UTC* + + * 2ae7ada3c9 Merge pull request `#27741`_ from ticosax/docker.containers-filters + + * 821ed72f37 pass filters argument to dockerng.ps + +* **PR** `#27760`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-10-07 19:11:17 UTC* + + * 82a51cebde Merge pull request `#27760`_ from basepi/merge-forward-2015.8 + + * 35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * b2937b6a16 Merge pull request `#27759`_ from basepi/merge-forward-2015.5 + + * 792ee084bb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * d284eb165b Merge pull request `#27390`_ from JaseFace/schedule-missing-enabled + + * 563db71bfd Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run. schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition. + + * 4b9128b491 Merge pull request `#27732`_ from jacobhammons/26673 + + * 75cc07cf10 noted that __virtual__ can return False and an error string + + * b928e1afa8 update docs for __virtual__ and __virtualname__ Refs `#26673`_ + + * a130896d1c Merge pull request `#27747`_ from Sacro/fix-chocolatey-version + + * 8f1fa9e78e Chocolatey doesn't have a help command. + + * 4e48651de0 Merge pull request `#27733`_ from jacobhammons/bug-fixes + + * cbecd4f553 Updated saltstack2 theme to add SaltConf16 banner + + * 117e0c2bcc Added hardening topic based on the information in Refs `#27088`_ + + * c58da846bf Merge pull request `#27706`_ from jacobhammons/bug-fixes + + * 76dc8de71b Assorted doc bugs Refs `#9051`_ Refs `#13407`_ Refs `#21475`_ Refs `#14876`_ Refs `#27005`_ + + * 43fba89865 Merge pull request `#27695`_ from rallytime/bp-27671 + + * 2a88028595 Added skip test_ext_pillar_env_mapping if git module does not exist. + + * cb3d92676e Merge pull request `#27524`_ from jfindlay/pkgng_quiet + + * 5e9107b970 parse pkgng output in quiet mode for >= 1.6.0 + + * 5b88c55cc3 Merge pull request `#27686`_ from rallytime/bp-27476 + + * 3e08d3de8a fix for: https://github.com/saltstack/salt/issues/27373 + + * f9ddd4647f Merge pull request `#27684`_ from rallytime/bp-27656 + + * d3780cba00 Fix `#27655`_: handling of success in postgres_local_cache + + * 7ca6f854ff Merge pull request `#27683`_ from rallytime/bp-27659 + + * 84b6ee0c58 .pub as public key is what we should send to remote + + * a0f3e34656 Merge pull request `#27682`_ from rallytime/bp-27566 + + * 2a44255748 minor: fix/format doc for returners.local_cache.prep_jid + + * fd485e2396 returners.local_cache: fix endless loop on OSError + + * 0b9ba911c4 Merge pull request `#27681`_ from rallytime/bp-25928 + + * 17e1ddf137 Fix stacktrace for non-existant states + + * 23da0d316a Merge pull request `#27680`_ from rallytime/bp-27535 + + * 04aed5e105 Versionadded change since 2015.5.6 has already been tagged + + * 579f2646ba .. versionadded:: 2015.5.6 + + * cbaf46e066 python <2.7 compability (pylint issue) + + * ecde499478 s/bin/b to avoid confusion with bin() + + * 4237c5db80 add a __virtual__ to check that daemontools is installed properly + + * 623935a1bc fix doc + + * 573de3abd6 fix pylint issue + + * 5eb6a30d40 fix pep8 issues + + * 298cf4f5c0 import missing logging module + + * fe0ad36609 log was missing + + * e457083465 s/systemd/FreeBSD + + * 3512712e89 forgot service name.. + + * 8f193a7bcc fixes `#27505`_ + + * 7d7b97eab6 Merge pull request `#27442`_ from JaseFace/fix-27391-for-2015.5 + + * bfbf63e1cc Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run. schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition. + + * ccbba8656b Merge pull request `#27641`_ from rallytime/gate-psutil-diskusage + + * da2d93a3dd Gate the psutil import and add depends doc for diskusage beacon + + * 09183994f9 Merge pull request `#27644`_ from rallytime/bp-27640 + + * a9063a9745 fix typo in default pillar path + + * 27fcecccbe Merge pull request `#27612`_ from rallytime/fix-27609 + + * 8dc047dc18 If external_up is set to None, don't stacktrace, just use the private ip. + + * 2ebf790f9f [salt-cloud] gce: don't stacktrace if Ephemeral is given instead of ephemeral + + * c84a1edc1b Merge pull request `#27568`_ from jacobhammons/man-pages-five + + * b59c03d20d regenerated man pages + + * 304dc68f7f Merge pull request `#27582`_ from jfindlay/2015.5 + + * 4f0d55cda6 add 2015.5.6 release notes + + * 7201ce71e4 Merge pull request `#27557`_ from jfindlay/mine_doc + + * 3727d79bad edit mine doc for style and markup + + * 7e037a4666 add doc motivating mine vs grains + + * 59c3d5f93e Merge pull request `#27515`_ from jfindlay/suse_fire + + * 4460ad2785 save iptables rules on SuSE + + * 9b26357b19 Merge pull request `#27509`_ from jfindlay/gluster_reason + + * 1ccda538d2 tell the user why the gluster module does not work + + * 989733ea86 Merge pull request `#27379`_ from jfindlay/pip_vars + + * aee51ffdef document and check dict type for pip env_vars + +* **ISSUE** `#27643`_: (`blueyed`_) Please document extended return values of __virtual__ (refs: `#27724`_) + +* **ISSUE** `#26755`_: (`lorengordon`_) Associate package dependencies to modules/states? (refs: `#27724`_) + +* **PR** `#27757`_: (`jfindlay`_) fix virtual fcn return doc indentation + @ *2015-10-07 17:50:18 UTC* + + * **PR** `#27724`_: (`jfindlay`_) update __virtual__ return documentation (refs: `#27757`_) + + * **PR** `#27116`_: (`jacobhammons`_) Update latest to 2015.8, 2015.5 is now previous (refs: `#27724`_) + + * aced4229cb Merge pull request `#27757`_ from jfindlay/virtret + + * 03400ef45b fix virtual fcn return doc indentation + +* **ISSUE** `#27636`_: (`brian-bk`_) Salt-ssh cannot do simple state 'test.nop': "'test.nop' is not available." (refs: `#27754`_) + +* **PR** `#27754`_: (`rallytime`_) Change test.nop version directive to 2015.8.1 + @ *2015-10-07 15:59:55 UTC* + + * 57b5b594bd Merge pull request `#27754`_ from rallytime/fix-27636 + + * 31b9852d9a Change test.nop version directive to 2015.8.1 + +* **PR** `#27734`_: (`jacobhammons`_) Updated saltstack2 theme to add SaltConf16 banner + @ *2015-10-07 01:43:53 UTC* + + * 9a0171089d Merge pull request `#27734`_ from jacobhammons/theme-updates + + * 3a52d3606b Updated saltstack2 theme to add SaltConf16 banner + +* **ISSUE** `#27595`_: (`ralphvanetten`_) Debian package does not depend on python-m2crypto which is required by the x509 state/module (refs: `#27719`_) + +* **PR** `#27727`_: (`rallytime`_) Merge `#27719`_ w/pylint fix + @ *2015-10-06 21:13:37 UTC* + + * **PR** `#27719`_: (`jfindlay`_) tell user when x509 exec/state module can't load (refs: `#27727`_) + + * d3f2dfe835 Merge pull request `#27727`_ from rallytime/merge-27719 + + * a7fd156162 Pylint + + * 6bf2ee2751 tell user when x509 exec/state module can't load + +* **ISSUE** `#27643`_: (`blueyed`_) Please document extended return values of __virtual__ (refs: `#27724`_) + +* **ISSUE** `#26755`_: (`lorengordon`_) Associate package dependencies to modules/states? (refs: `#27724`_) + +* **PR** `#27724`_: (`jfindlay`_) update __virtual__ return documentation (refs: `#27757`_) + @ *2015-10-06 21:06:47 UTC* + + * **PR** `#27116`_: (`jacobhammons`_) Update latest to 2015.8, 2015.5 is now previous (refs: `#27724`_) + + * f26bcd2d21 Merge pull request `#27724`_ from jfindlay/virtret + + * 6bddf80546 update __virtual__ return documentation + +* **ISSUE** `#27481`_: (`basepi`_) Fix issues with cross-calling states (refs: `#27725`_) + +* **PR** `#27725`_: (`basepi`_) Fix global injection for state cross calls + @ *2015-10-06 21:02:15 UTC* + + * d67e8c5c2c Merge pull request `#27725`_ from basepi/states.cross.call.27481 + + * e12269d871 Remove unused import + + * 4e6505b2e7 Return the wrapper (whoops) + + * fadb954676 Use new method for injecting globals into state functions + + * 17b267470a Add decorator for injecting globals into functions in the loader + +* **PR** `#27628`_: (`ticosax`_) [dockerng] Add support of `labels` parameter for dockerng + @ *2015-10-06 13:58:40 UTC* + + * 06e67d25f8 Merge pull request `#27628`_ from ticosax/dockerng-container-label + + * edf625c8b4 Add support of `labels` parameter for dockerng + +* **ISSUE** `#26604`_: (`ari`_) Poor compound matcher documentation (2015.8 docs) (refs: `#27704`_) + +* **PR** `#27704`_: (`jacobhammons`_) Update compound matcher docs to clarify the usage of alternate delimi… + @ *2015-10-06 05:36:55 UTC* + + * e47d849af6 Merge pull request `#27704`_ from jacobhammons/26604 + + * 1c51ce28a9 Update compound matcher docs to clarify the usage of alternate delimiters Refs `#26604`_ + +* **PR** `#27705`_: (`rallytime`_) Merge `#27602`_ with final pylint fix + @ *2015-10-05 23:36:50 UTC* + + * **PR** `#27602`_: (`blueyed`_) dockerng: fix/enhance version warning in __virtual__ (refs: `#27705`_) + + * 2491ce40f1 Merge pull request `#27705`_ from rallytime/merge-27602 + + * 81aad83386 Ignore import error + + * 561dc4cf94 dockerng: fix/enhance version warning in __virtual__ + +* **ISSUE** `#13850`_: (`ryan-lane`_) s3:// urls in file.managed (and likely elsewhere) require s3.key and s3.keyid to be in minion config (refs: `#27691`_) + +* **PR** `#27691`_: (`notpeter`_) Faster timeout (3s vs 2min) for instance metadata lookups. `#13850`_. + @ *2015-10-05 22:55:52 UTC* + + * b76eb08c68 Merge pull request `#27691`_ from notpeter/iam_fail_faster + + * 3d9483b4e2 Faster timeout (3s vs 2min) for instance metadata lookups. `#13850`_. + +* **PR** `#27696`_: (`blueyed`_) loader.proxy: call `_modules_dirs` only once + @ *2015-10-05 22:42:32 UTC* + + * fc78f49dc5 Merge pull request `#27696`_ from blueyed/load-proxy-call-_module_dirs-only-once + + * 55a76be6c1 loader.proxy: call `_modules_dirs` only once + +* **PR** `#27630`_: (`ticosax`_) Expose container_id in mine.get_docker + @ *2015-10-05 21:56:53 UTC* + + * 77516912fa Merge pull request `#27630`_ from ticosax/include-container-id-docker-mine + + * 7293ded2f6 fixup! Expose container_id in mine.get_docker + + * 9e56a7e9db Expose container_id in mine.get_docker + +* **PR** `#27600`_: (`blueyed`_) dockerng: use docker.version=auto by default + @ *2015-10-05 21:29:14 UTC* + + * 8453cb3eb1 Merge pull request `#27600`_ from blueyed/dockerng-auto-version + + * 53c6e3b3de dockerng: use docker.version=auto by default + +* **PR** `#27689`_: (`rallytime`_) Merge `#27448`_ with test fixes + @ *2015-10-05 21:17:41 UTC* + + * **PR** `#27448`_: (`JaseFace`_) Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() (refs: `#27689`_) + + * 7a4291008e Merge pull request `#27689`_ from rallytime/fix-tests-27448 + + * 05a506ec9f Use correct comment in test + + * 8296fefb31 Merge `#27448`_ with test fixes + + * d9f5e9fd2f Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run. schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition. + +* **ISSUE** `#27520`_: (`rmarcinik`_) winrepo is unavailable in 2015.8 (refs: `#27616`_, `#27693`_) + +* **ISSUE** `#23239`_: (`cachedout`_) [RFC] Deprecate ext_processses (refs: `#27693`_) + +* **PR** `#27693`_: (`jacobhammons`_) initial engines topic, updates to windows repo docs + @ *2015-10-05 21:05:26 UTC* + + * 4ddc87157a Merge pull request `#27693`_ from jacobhammons/doc-updates + + * 5a3e72fc8e __ops__ to __opts__ + + * 5a9867aad1 initial engines topic, updates to windows repo docs Refs `#23239`_ Refs `#27520`_ + +* **PR** `#27601`_: (`blueyed`_) dockerng: handle None in container.Names + @ *2015-10-05 20:32:19 UTC* + + * f7f48d1eef Merge pull request `#27601`_ from blueyed/dockerng-none-names + + * b1442ac904 dockerng: handle None in container.Names + +* **PR** `#27596`_: (`blueyed`_) gitfs: fix UnboundLocalError for 'msg' + @ *2015-10-05 20:18:00 UTC* + + * 3ffb5a3369 Merge pull request `#27596`_ from blueyed/fix-gitfs-UnboundLocalError + + * e70cbda490 gitfs: fix UnboundLocalError for 'msg' + +* **PR** `#27651`_: (`eliasp`_) Check for existence of 'subnetId' key in subnet dict + @ *2015-10-05 17:01:34 UTC* + + * 4d7be3f972 Merge pull request `#27651`_ from eliasp/2015.8-cloud.clouds.ec2-check-for-subnetId-before-using-it + + * f21a763809 Check for existence of 'subnetId' key in subnet dict + +* **ISSUE** `#23370`_: (`lisa2lisa`_) salt artifactory.downloaded module ignore classifier (refs: `#27639`_) + +* **PR** `#27639`_: (`rallytime`_) Docement version added for new artifactory options + @ *2015-10-05 17:01:21 UTC* + + * d9266505a7 Merge pull request `#27639`_ from rallytime/fix-23370 + + * 6de99bd5b7 Docement version added for new artifactory options + +* **PR** `#27677`_: (`rallytime`_) Back-port `#27675`_ to 2015.8 + @ *2015-10-05 15:47:34 UTC* + + * **PR** `#27675`_: (`avinassh`_) Fix a typo (refs: `#27677`_) + + * 771e5136f1 Merge pull request `#27677`_ from rallytime/bp-27675 + + * bfa0acfbfe Fix a typo + +* **PR** `#27637`_: (`rallytime`_) Back-port `#27604`_ to 2015.8 + @ *2015-10-05 14:54:59 UTC* + + * **PR** `#27604`_: (`plastikos`_) Fix module path to SaltCacheError (refs: `#27637`_) + + * 6bc5ddc561 Merge pull request `#27637`_ from rallytime/bp-27604 + + * 3d2ee4297d Fix module path to SaltCacheError + +* **ISSUE** `#19291`_: (`gfa`_) pkg module could accept version: latest (refs: `#27657`_) + +* **PR** `#27657`_: (`garethgreenaway`_) Fix to pkg state module + @ *2015-10-03 23:56:02 UTC* + + * 905acc6229 Merge pull request `#27657`_ from garethgreenaway/19291_pkg_state_latest_fix + + * c950527b24 When latest is passed in the state as the version to install, once the package is installed the state runs will fail. pkg.latest_version returned an empty string once the package is installed so we need to grab the installed version in that case to avoid passing an empty string to the pkg module in question. + +* **ISSUE** `#27538`_: (`lomeroe`_) boto_iam is not passing parameters properly on a handful of function calls (refs: `#27539`_) + +* **PR** `#27632`_: (`rallytime`_) Back-port `#27539`_ to 2015.8 + @ *2015-10-02 19:28:39 UTC* + + * **PR** `#27539`_: (`lomeroe`_) boto_iam updates to function calls that were not passing arguments properly (refs: `#27632`_) + + * 83ae6a1432 Merge pull request `#27632`_ from rallytime/bp-27539 + + * 2b0afd0230 Add versionadded to new path option + + * e54afed73a moving path kwarg to end of function definition + +* **ISSUE** `#27545`_: (`lomeroe`_) boto_asg allow removing launch configuration with 'absent' state (refs: `#27546`_) + +* **ISSUE** `#27544`_: (`lomeroe`_) boto_asg state incorrectly processes return from boto_vpc.get_subnet_association (refs: `#27559`_, `#27546`_) + +* **PR** `#27633`_: (`rallytime`_) Back-port `#27559`_ to 2015.8 + @ *2015-10-02 19:22:07 UTC* + + * **PR** `#27559`_: (`lomeroe`_) vpc_id fix for boto_vpc.get_subnet_association (refs: `#27633`_) + + * **PR** `#27546`_: (`lomeroe`_) boto_asg state updates (refs: `#27559`_) + + * 888e9bdf5d Merge pull request `#27633`_ from rallytime/bp-27559 + + * 3f03815ada rebasing + +* **ISSUE** `#27463`_: (`ryan-lane`_) boto_route53 module should default to region universal, rather then None (refs: `#27579`_) + +* **PR** `#27579`_: (`rallytime`_) Change boto_route53 region default to 'universal' to avoid problems with boto library + @ *2015-10-02 18:56:17 UTC* + + * 8b7da5e469 Merge pull request `#27579`_ from rallytime/fix-27463 + + * d5956132ef Change boto_route53 region default to 'universal' to avoid problems with boto library + +* **PR** `#27581`_: (`tkwilliams`_) Add support for 'vpc_name' tag in boto_secgroup module and state + @ *2015-10-02 15:40:40 UTC* + + * ce4c64a2e3 Merge pull request `#27581`_ from tkwilliams/boto_secgroup_add_vpc_name + + * 159cccf43f Faulty check logic around optional params + + * 84ab0bbd74 One last bug to squash. Seriously. It's the last one. Ever! - fixed param vpc_id being passed where vpc_name was intended. + + * 002cbf5cde Grrr. Add back the import of SaltInvocationError that pylint wanted me to remove :) + + * 0671c0d8d9 Consolidate some redundant code - thanks @ryan-lane ! + + * fae1199276 Followed @ryan-lane's suggestion to remove duplicated code from boto_vpc and instead call into that module + + * 3a38a440b7 Merge remote-tracking branch 'upstream/2015.8' into boto_secgroup_add_vpc_name + + * f7ef0bcd4c Fixups for picayune pylint pedantery :) + + * 35b66e28a3 Merge remote-tracking branch 'upstream/2015.8' into boto_secgroup_add_vpc_name + + * 6770f721f8 Add support for 'vpc_name' tag in boto_secgroup module and state + +* **PR** `#27624`_: (`nasenbaer13`_) Wait for sync is not passed to boto_route53 state + @ *2015-10-02 15:37:44 UTC* + + * fb6f6b9ce4 Merge pull request `#27624`_ from eyj/fix_wait_for_sync + + * ed6a8c0aa6 Wait for sync is not passed to boto_route53 state + +* **PR** `#27614`_: (`blueyed`_) doc: minor fixes to doc and comments + @ *2015-10-02 15:34:02 UTC* + + * eb59cb8d1c Merge pull request `#27614`_ from blueyed/doc-minor + + * 98a8c0f055 doc: minor fixes to doc and comments + +* **PR** `#27627`_: (`eyj`_) Fix crash in boto_asg.get_instances if the requested attribute is None + @ *2015-10-02 15:33:32 UTC* + + * 61f8a6f39f Merge pull request `#27627`_ from eyj/pr-instance-attribute + + * 03d7c6af3d Fix crash in boto_asg.get_instances if the requested attribute may be None + +* **ISSUE** `#27549`_: (`carlpett`_) Document winrepo_remotes_ng (refs: `#27616`_) + +* **ISSUE** `#27520`_: (`rmarcinik`_) winrepo is unavailable in 2015.8 (refs: `#27616`_, `#27693`_) + +* **PR** `#27616`_: (`jacobhammons`_) Updated windows software repository docs + @ *2015-10-02 05:04:37 UTC* + + * 764d70af79 Merge pull request `#27616`_ from jacobhammons/win-repo-docs + + * 1c8b32ce26 Updated windows software repository docs + +* **ISSUE** `#27543`_: (`lomeroe`_) boto_elb incorrectly processes return from boto_vpc.get_subnet_assocaition (refs: `#27569`_) + +* **PR** `#27569`_: (`lomeroe`_) boto_vpc.get_subnet_association now returns a dict w/key of vpc_id, a… + @ *2015-10-01 16:03:06 UTC* + + * db963b7864 Merge pull request `#27569`_ from lomeroe/fix_boto_elb + + * ae09a0fb61 boto_vpc.get_subnet_association now returns a dict w/key of vpc_id, adding code to handle the dict now + +* **ISSUE** `#25441`_: (`ahammond`_) modules.ps documentation missing (refs: `#27567`_) + +* **PR** `#27567`_: (`whiteinge`_) Use getattr to fetch psutil.version_info + @ *2015-10-01 15:39:59 UTC* + + * b269cd4754 Merge pull request `#27567`_ from whiteinge/psutil-version-fix + + * 7ebe9acc44 Use getattr to fetch psutil.version_info + +* **PR** `#27583`_: (`tkwilliams`_) Fixup zypper module + @ *2015-10-01 15:38:53 UTC* + + * 9cc69e2440 Merge pull request `#27583`_ from tkwilliams/fix_zypper + + * cdd44e4128 Fixup zypper module - expected return type of pkg.latest was changed without updating zypper module - unchecked list deref fixed - "zypper info -t" out-of-date status field format has changed + +* **PR** `#27597`_: (`blueyed`_) gitfs: remove unused variable "bad_per_remote_conf" + @ *2015-10-01 15:38:15 UTC* + + * 5ca7e72c70 Merge pull request `#27597`_ from blueyed/gitfs-remove-unused-bad_per_remote_conf + + * 58af4d68f0 gitfs: remove unused variable "bad_per_remote_conf" + +* **PR** `#27585`_: (`ryan-lane`_) Fix undefined variable in cron state module + @ *2015-10-01 05:05:58 UTC* + + * 9805bdeddf Merge pull request `#27585`_ from lyft/cron-fix + + * 5474666b61 Fix undefined variable in cron state module + +.. _`#11870`: https://github.com/saltstack/salt/issues/11870 .. _`#12363`: https://github.com/saltstack/salt/issues/12363 +.. _`#13407`: https://github.com/saltstack/salt/issues/13407 .. _`#13513`: https://github.com/saltstack/salt/issues/13513 .. _`#13850`: https://github.com/saltstack/salt/issues/13850 +.. _`#14876`: https://github.com/saltstack/salt/issues/14876 +.. _`#15583`: https://github.com/saltstack/salt/issues/15583 +.. _`#19249`: https://github.com/saltstack/salt/issues/19249 +.. _`#19291`: https://github.com/saltstack/salt/issues/19291 +.. _`#19561`: https://github.com/saltstack/salt/pull/19561 +.. _`#19673`: https://github.com/saltstack/salt/issues/19673 +.. _`#198`: https://github.com/saltstack/salt/pull/198 +.. _`#1`: https://github.com/saltstack/salt/issues/1 .. _`#20678`: https://github.com/saltstack/salt/issues/20678 -.. _`#29110`: https://github.com/saltstack/salt/issues/29110 +.. _`#21216`: https://github.com/saltstack/salt/issues/21216 +.. _`#21475`: https://github.com/saltstack/salt/issues/21475 +.. _`#21744`: https://github.com/saltstack/salt/issues/21744 +.. _`#21845`: https://github.com/saltstack/salt/issues/21845 +.. _`#21910`: https://github.com/saltstack/salt/issues/21910 .. _`#22115`: https://github.com/saltstack/salt/pull/22115 +.. _`#23239`: https://github.com/saltstack/salt/issues/23239 +.. _`#23271`: https://github.com/saltstack/salt/issues/23271 +.. _`#23370`: https://github.com/saltstack/salt/issues/23370 +.. _`#23685`: https://github.com/saltstack/salt/issues/23685 +.. _`#24111`: https://github.com/saltstack/salt/issues/24111 +.. _`#24660`: https://github.com/saltstack/salt/issues/24660 +.. _`#24732`: https://github.com/saltstack/salt/pull/24732 +.. _`#24775`: https://github.com/saltstack/salt/issues/24775 +.. _`#24856`: https://github.com/saltstack/salt/issues/24856 .. _`#25315`: https://github.com/saltstack/salt/pull/25315 -.. _`#25521`: https://github.com/saltstack/salt/pull/25521 +.. _`#25363`: https://github.com/saltstack/salt/issues/25363 +.. _`#25441`: https://github.com/saltstack/salt/issues/25441 .. _`#25668`: https://github.com/saltstack/salt/pull/25668 -.. _`#25928`: https://github.com/saltstack/salt/pull/25928 +.. _`#25954`: https://github.com/saltstack/salt/issues/25954 +.. _`#26107`: https://github.com/saltstack/salt/issues/26107 +.. _`#26284`: https://github.com/saltstack/salt/issues/26284 +.. _`#26313`: https://github.com/saltstack/salt/issues/26313 .. _`#26336`: https://github.com/saltstack/salt/issues/26336 +.. _`#26415`: https://github.com/saltstack/salt/issues/26415 +.. _`#26604`: https://github.com/saltstack/salt/issues/26604 +.. _`#26632`: https://github.com/saltstack/salt/issues/26632 +.. _`#26673`: https://github.com/saltstack/salt/issues/26673 +.. _`#26755`: https://github.com/saltstack/salt/issues/26755 +.. _`#26844`: https://github.com/saltstack/salt/issues/26844 +.. _`#26889`: https://github.com/saltstack/salt/issues/26889 +.. _`#26904`: https://github.com/saltstack/salt/issues/26904 +.. _`#26906`: https://github.com/saltstack/salt/issues/26906 +.. _`#26908`: https://github.com/saltstack/salt/issues/26908 .. _`#26945`: https://github.com/saltstack/salt/pull/26945 +.. _`#27005`: https://github.com/saltstack/salt/issues/27005 +.. _`#27088`: https://github.com/saltstack/salt/issues/27088 .. _`#27099`: https://github.com/saltstack/salt/pull/27099 .. _`#27116`: https://github.com/saltstack/salt/pull/27116 -.. _`#27201`: https://github.com/saltstack/salt/pull/27201 -.. _`#27286`: https://github.com/saltstack/salt/pull/27286 +.. _`#27130`: https://github.com/saltstack/salt/issues/27130 .. _`#27343`: https://github.com/saltstack/salt/pull/27343 +.. _`#27374`: https://github.com/saltstack/salt/issues/27374 .. _`#27379`: https://github.com/saltstack/salt/pull/27379 .. _`#27390`: https://github.com/saltstack/salt/pull/27390 +.. _`#27392`: https://github.com/saltstack/salt/issues/27392 +.. _`#27435`: https://github.com/saltstack/salt/issues/27435 .. _`#27442`: https://github.com/saltstack/salt/pull/27442 .. _`#27448`: https://github.com/saltstack/salt/pull/27448 -.. _`#27476`: https://github.com/saltstack/salt/pull/27476 +.. _`#27454`: https://github.com/saltstack/salt/issues/27454 +.. _`#27463`: https://github.com/saltstack/salt/issues/27463 +.. _`#27481`: https://github.com/saltstack/salt/issues/27481 +.. _`#27505`: https://github.com/saltstack/salt/issues/27505 .. _`#27509`: https://github.com/saltstack/salt/pull/27509 .. _`#27515`: https://github.com/saltstack/salt/pull/27515 +.. _`#27520`: https://github.com/saltstack/salt/issues/27520 .. _`#27524`: https://github.com/saltstack/salt/pull/27524 -.. _`#27535`: https://github.com/saltstack/salt/pull/27535 +.. _`#27538`: https://github.com/saltstack/salt/issues/27538 .. _`#27539`: https://github.com/saltstack/salt/pull/27539 +.. _`#27543`: https://github.com/saltstack/salt/issues/27543 +.. _`#27544`: https://github.com/saltstack/salt/issues/27544 +.. _`#27545`: https://github.com/saltstack/salt/issues/27545 .. _`#27546`: https://github.com/saltstack/salt/pull/27546 +.. _`#27549`: https://github.com/saltstack/salt/issues/27549 .. _`#27557`: https://github.com/saltstack/salt/pull/27557 .. _`#27559`: https://github.com/saltstack/salt/pull/27559 .. _`#27562`: https://github.com/saltstack/salt/pull/27562 -.. _`#27566`: https://github.com/saltstack/salt/pull/27566 .. _`#27567`: https://github.com/saltstack/salt/pull/27567 .. _`#27568`: https://github.com/saltstack/salt/pull/27568 .. _`#27569`: https://github.com/saltstack/salt/pull/27569 +.. _`#27574`: https://github.com/saltstack/salt/issues/27574 .. _`#27579`: https://github.com/saltstack/salt/pull/27579 .. _`#27581`: https://github.com/saltstack/salt/pull/27581 .. _`#27582`: https://github.com/saltstack/salt/pull/27582 .. _`#27583`: https://github.com/saltstack/salt/pull/27583 .. _`#27585`: https://github.com/saltstack/salt/pull/27585 +.. _`#27595`: https://github.com/saltstack/salt/issues/27595 .. _`#27596`: https://github.com/saltstack/salt/pull/27596 .. _`#27597`: https://github.com/saltstack/salt/pull/27597 .. _`#27600`: https://github.com/saltstack/salt/pull/27600 @@ -622,16 +3561,16 @@ Changes: .. _`#27630`: https://github.com/saltstack/salt/pull/27630 .. _`#27632`: https://github.com/saltstack/salt/pull/27632 .. _`#27633`: https://github.com/saltstack/salt/pull/27633 +.. _`#27636`: https://github.com/saltstack/salt/issues/27636 .. _`#27637`: https://github.com/saltstack/salt/pull/27637 .. _`#27639`: https://github.com/saltstack/salt/pull/27639 -.. _`#27640`: https://github.com/saltstack/salt/pull/27640 .. _`#27641`: https://github.com/saltstack/salt/pull/27641 +.. _`#27643`: https://github.com/saltstack/salt/issues/27643 .. _`#27644`: https://github.com/saltstack/salt/pull/27644 .. _`#27651`: https://github.com/saltstack/salt/pull/27651 -.. _`#27656`: https://github.com/saltstack/salt/pull/27656 +.. _`#27655`: https://github.com/saltstack/salt/issues/27655 .. _`#27657`: https://github.com/saltstack/salt/pull/27657 -.. _`#27659`: https://github.com/saltstack/salt/pull/27659 -.. _`#27671`: https://github.com/saltstack/salt/pull/27671 +.. _`#27661`: https://github.com/saltstack/salt/issues/27661 .. _`#27675`: https://github.com/saltstack/salt/pull/27675 .. _`#27676`: https://github.com/saltstack/salt/pull/27676 .. _`#27677`: https://github.com/saltstack/salt/pull/27677 @@ -646,11 +3585,16 @@ Changes: .. _`#27693`: https://github.com/saltstack/salt/pull/27693 .. _`#27695`: https://github.com/saltstack/salt/pull/27695 .. _`#27696`: https://github.com/saltstack/salt/pull/27696 +.. _`#27703`: https://github.com/saltstack/salt/issues/27703 .. _`#27704`: https://github.com/saltstack/salt/pull/27704 .. _`#27705`: https://github.com/saltstack/salt/pull/27705 .. _`#27706`: https://github.com/saltstack/salt/pull/27706 +.. _`#27710`: https://github.com/saltstack/salt/issues/27710 +.. _`#27712`: https://github.com/saltstack/salt/issues/27712 +.. _`#27714`: https://github.com/saltstack/salt/issues/27714 .. _`#27717`: https://github.com/saltstack/salt/pull/27717 .. _`#27719`: https://github.com/saltstack/salt/pull/27719 +.. _`#27721`: https://github.com/saltstack/salt/issues/27721 .. _`#27722`: https://github.com/saltstack/salt/pull/27722 .. _`#27724`: https://github.com/saltstack/salt/pull/27724 .. _`#27725`: https://github.com/saltstack/salt/pull/27725 @@ -660,11 +3604,13 @@ Changes: .. _`#27732`: https://github.com/saltstack/salt/pull/27732 .. _`#27733`: https://github.com/saltstack/salt/pull/27733 .. _`#27734`: https://github.com/saltstack/salt/pull/27734 +.. _`#27738`: https://github.com/saltstack/salt/issues/27738 .. _`#27741`: https://github.com/saltstack/salt/pull/27741 .. _`#27745`: https://github.com/saltstack/salt/pull/27745 .. _`#27746`: https://github.com/saltstack/salt/pull/27746 .. _`#27747`: https://github.com/saltstack/salt/pull/27747 .. _`#27748`: https://github.com/saltstack/salt/pull/27748 +.. _`#27750`: https://github.com/saltstack/salt/issues/27750 .. _`#27754`: https://github.com/saltstack/salt/pull/27754 .. _`#27757`: https://github.com/saltstack/salt/pull/27757 .. _`#27758`: https://github.com/saltstack/salt/pull/27758 @@ -676,19 +3622,24 @@ Changes: .. _`#27771`: https://github.com/saltstack/salt/pull/27771 .. _`#27774`: https://github.com/saltstack/salt/pull/27774 .. _`#27776`: https://github.com/saltstack/salt/pull/27776 +.. _`#27789`: https://github.com/saltstack/salt/issues/27789 .. _`#27791`: https://github.com/saltstack/salt/pull/27791 .. _`#27793`: https://github.com/saltstack/salt/pull/27793 +.. _`#27794`: https://github.com/saltstack/salt/issues/27794 .. _`#27795`: https://github.com/saltstack/salt/pull/27795 .. _`#27797`: https://github.com/saltstack/salt/pull/27797 .. _`#27799`: https://github.com/saltstack/salt/pull/27799 .. _`#27802`: https://github.com/saltstack/salt/pull/27802 -.. _`#27806`: https://github.com/saltstack/salt/pull/27806 +.. _`#27804`: https://github.com/saltstack/salt/issues/27804 .. _`#27809`: https://github.com/saltstack/salt/pull/27809 +.. _`#27815`: https://github.com/saltstack/salt/issues/27815 .. _`#27816`: https://github.com/saltstack/salt/pull/27816 +.. _`#27821`: https://github.com/saltstack/salt/issues/27821 .. _`#27824`: https://github.com/saltstack/salt/pull/27824 .. _`#27825`: https://github.com/saltstack/salt/issues/27825 .. _`#27826`: https://github.com/saltstack/salt/pull/27826 .. _`#27827`: https://github.com/saltstack/salt/pull/27827 +.. _`#27828`: https://github.com/saltstack/salt/issues/27828 .. _`#27833`: https://github.com/saltstack/salt/pull/27833 .. _`#27837`: https://github.com/saltstack/salt/pull/27837 .. _`#27838`: https://github.com/saltstack/salt/pull/27838 @@ -697,6 +3648,7 @@ Changes: .. _`#27850`: https://github.com/saltstack/salt/pull/27850 .. _`#27851`: https://github.com/saltstack/salt/pull/27851 .. _`#27852`: https://github.com/saltstack/salt/pull/27852 +.. _`#27855`: https://github.com/saltstack/salt/issues/27855 .. _`#27859`: https://github.com/saltstack/salt/pull/27859 .. _`#27860`: https://github.com/saltstack/salt/pull/27860 .. _`#27868`: https://github.com/saltstack/salt/pull/27868 @@ -709,30 +3661,39 @@ Changes: .. _`#27883`: https://github.com/saltstack/salt/pull/27883 .. _`#27885`: https://github.com/saltstack/salt/pull/27885 .. _`#27886`: https://github.com/saltstack/salt/pull/27886 +.. _`#27890`: https://github.com/saltstack/salt/issues/27890 .. _`#27891`: https://github.com/saltstack/salt/pull/27891 .. _`#27905`: https://github.com/saltstack/salt/pull/27905 .. _`#27908`: https://github.com/saltstack/salt/pull/27908 .. _`#27909`: https://github.com/saltstack/salt/pull/27909 .. _`#27910`: https://github.com/saltstack/salt/pull/27910 +.. _`#27911`: https://github.com/saltstack/salt/issues/27911 .. _`#27913`: https://github.com/saltstack/salt/pull/27913 .. _`#27914`: https://github.com/saltstack/salt/pull/27914 .. _`#27922`: https://github.com/saltstack/salt/pull/27922 +.. _`#27923`: https://github.com/saltstack/salt/issues/27923 .. _`#27926`: https://github.com/saltstack/salt/pull/27926 .. _`#27927`: https://github.com/saltstack/salt/pull/27927 .. _`#27928`: https://github.com/saltstack/salt/pull/27928 +.. _`#27932`: https://github.com/saltstack/salt/issues/27932 .. _`#27933`: https://github.com/saltstack/salt/pull/27933 +.. _`#27938`: https://github.com/saltstack/salt/issues/27938 .. _`#27943`: https://github.com/saltstack/salt/pull/27943 .. _`#27944`: https://github.com/saltstack/salt/pull/27944 .. _`#27946`: https://github.com/saltstack/salt/pull/27946 +.. _`#27949`: https://github.com/saltstack/salt/issues/27949 .. _`#27953`: https://github.com/saltstack/salt/pull/27953 .. _`#27955`: https://github.com/saltstack/salt/pull/27955 +.. _`#27956`: https://github.com/saltstack/salt/issues/27956 .. _`#27958`: https://github.com/saltstack/salt/pull/27958 .. _`#27959`: https://github.com/saltstack/salt/pull/27959 .. _`#27965`: https://github.com/saltstack/salt/pull/27965 .. _`#27969`: https://github.com/saltstack/salt/pull/27969 +.. _`#27971`: https://github.com/saltstack/salt/issues/27971 .. _`#27977`: https://github.com/saltstack/salt/pull/27977 .. _`#27978`: https://github.com/saltstack/salt/pull/27978 .. _`#27979`: https://github.com/saltstack/salt/pull/27979 +.. _`#27980`: https://github.com/saltstack/salt/issues/27980 .. _`#27981`: https://github.com/saltstack/salt/pull/27981 .. _`#27982`: https://github.com/saltstack/salt/pull/27982 .. _`#27983`: https://github.com/saltstack/salt/pull/27983 @@ -746,6 +3707,8 @@ Changes: .. _`#27995`: https://github.com/saltstack/salt/pull/27995 .. _`#27996`: https://github.com/saltstack/salt/pull/27996 .. _`#27997`: https://github.com/saltstack/salt/pull/27997 +.. _`#27998`: https://github.com/saltstack/salt/issues/27998 +.. _`#28000`: https://github.com/saltstack/salt/issues/28000 .. _`#28001`: https://github.com/saltstack/salt/pull/28001 .. _`#28003`: https://github.com/saltstack/salt/pull/28003 .. _`#28008`: https://github.com/saltstack/salt/pull/28008 @@ -762,7 +3725,7 @@ Changes: .. _`#28032`: https://github.com/saltstack/salt/pull/28032 .. _`#28033`: https://github.com/saltstack/salt/pull/28033 .. _`#28037`: https://github.com/saltstack/salt/pull/28037 -.. _`#28040`: https://github.com/saltstack/salt/pull/28040 +.. _`#28038`: https://github.com/saltstack/salt/issues/28038 .. _`#28041`: https://github.com/saltstack/salt/pull/28041 .. _`#28042`: https://github.com/saltstack/salt/pull/28042 .. _`#28043`: https://github.com/saltstack/salt/pull/28043 @@ -773,12 +3736,15 @@ Changes: .. _`#28056`: https://github.com/saltstack/salt/pull/28056 .. _`#28058`: https://github.com/saltstack/salt/pull/28058 .. _`#28059`: https://github.com/saltstack/salt/pull/28059 +.. _`#28060`: https://github.com/saltstack/salt/issues/28060 .. _`#28061`: https://github.com/saltstack/salt/pull/28061 .. _`#28063`: https://github.com/saltstack/salt/pull/28063 .. _`#28066`: https://github.com/saltstack/salt/pull/28066 .. _`#28069`: https://github.com/saltstack/salt/pull/28069 +.. _`#28074`: https://github.com/saltstack/salt/issues/28074 .. _`#28076`: https://github.com/saltstack/salt/pull/28076 .. _`#28079`: https://github.com/saltstack/salt/pull/28079 +.. _`#28080`: https://github.com/saltstack/salt/issues/28080 .. _`#28081`: https://github.com/saltstack/salt/pull/28081 .. _`#28084`: https://github.com/saltstack/salt/pull/28084 .. _`#28087`: https://github.com/saltstack/salt/pull/28087 @@ -795,8 +3761,9 @@ Changes: .. _`#28113`: https://github.com/saltstack/salt/pull/28113 .. _`#28116`: https://github.com/saltstack/salt/pull/28116 .. _`#28117`: https://github.com/saltstack/salt/pull/28117 +.. _`#28118`: https://github.com/saltstack/salt/issues/28118 .. _`#28119`: https://github.com/saltstack/salt/pull/28119 -.. _`#28130`: https://github.com/saltstack/salt/pull/28130 +.. _`#28123`: https://github.com/saltstack/salt/issues/28123 .. _`#28134`: https://github.com/saltstack/salt/pull/28134 .. _`#28138`: https://github.com/saltstack/salt/pull/28138 .. _`#28139`: https://github.com/saltstack/salt/pull/28139 @@ -817,12 +3784,17 @@ Changes: .. _`#28185`: https://github.com/saltstack/salt/pull/28185 .. _`#28187`: https://github.com/saltstack/salt/pull/28187 .. _`#28198`: https://github.com/saltstack/salt/pull/28198 +.. _`#28202`: https://github.com/saltstack/salt/issues/28202 +.. _`#28203`: https://github.com/saltstack/salt/issues/28203 +.. _`#28209`: https://github.com/saltstack/salt/issues/28209 .. _`#28210`: https://github.com/saltstack/salt/pull/28210 .. _`#28211`: https://github.com/saltstack/salt/pull/28211 .. _`#28213`: https://github.com/saltstack/salt/pull/28213 .. _`#28214`: https://github.com/saltstack/salt/pull/28214 .. _`#28224`: https://github.com/saltstack/salt/pull/28224 +.. _`#28227`: https://github.com/saltstack/salt/issues/28227 .. _`#28228`: https://github.com/saltstack/salt/pull/28228 +.. _`#28230`: https://github.com/saltstack/salt/issues/28230 .. _`#28231`: https://github.com/saltstack/salt/pull/28231 .. _`#28232`: https://github.com/saltstack/salt/pull/28232 .. _`#28238`: https://github.com/saltstack/salt/pull/28238 @@ -833,6 +3805,7 @@ Changes: .. _`#28263`: https://github.com/saltstack/salt/pull/28263 .. _`#28265`: https://github.com/saltstack/salt/pull/28265 .. _`#28266`: https://github.com/saltstack/salt/pull/28266 +.. _`#28268`: https://github.com/saltstack/salt/issues/28268 .. _`#28269`: https://github.com/saltstack/salt/pull/28269 .. _`#28270`: https://github.com/saltstack/salt/pull/28270 .. _`#28271`: https://github.com/saltstack/salt/pull/28271 @@ -857,23 +3830,23 @@ Changes: .. _`#28346`: https://github.com/saltstack/salt/pull/28346 .. _`#28348`: https://github.com/saltstack/salt/pull/28348 .. _`#28353`: https://github.com/saltstack/salt/pull/28353 -.. _`#28358`: https://github.com/saltstack/salt/pull/28358 .. _`#28359`: https://github.com/saltstack/salt/pull/28359 .. _`#28360`: https://github.com/saltstack/salt/pull/28360 .. _`#28361`: https://github.com/saltstack/salt/pull/28361 .. _`#28364`: https://github.com/saltstack/salt/pull/28364 .. _`#28366`: https://github.com/saltstack/salt/pull/28366 .. _`#28370`: https://github.com/saltstack/salt/pull/28370 +.. _`#28372`: https://github.com/saltstack/salt/issues/28372 .. _`#28373`: https://github.com/saltstack/salt/pull/28373 .. _`#28374`: https://github.com/saltstack/salt/pull/28374 .. _`#28375`: https://github.com/saltstack/salt/pull/28375 .. _`#28376`: https://github.com/saltstack/salt/pull/28376 .. _`#28377`: https://github.com/saltstack/salt/pull/28377 .. _`#28380`: https://github.com/saltstack/salt/pull/28380 -.. _`#28381`: https://github.com/saltstack/salt/pull/28381 +.. _`#28382`: https://github.com/saltstack/salt/issues/28382 .. _`#28388`: https://github.com/saltstack/salt/pull/28388 +.. _`#28392`: https://github.com/saltstack/salt/issues/28392 .. _`#28395`: https://github.com/saltstack/salt/pull/28395 -.. _`#28400`: https://github.com/saltstack/salt/pull/28400 .. _`#28404`: https://github.com/saltstack/salt/pull/28404 .. _`#28405`: https://github.com/saltstack/salt/pull/28405 .. _`#28406`: https://github.com/saltstack/salt/pull/28406 @@ -885,7 +3858,9 @@ Changes: .. _`#28425`: https://github.com/saltstack/salt/pull/28425 .. _`#28426`: https://github.com/saltstack/salt/pull/28426 .. _`#28427`: https://github.com/saltstack/salt/pull/28427 +.. _`#28429`: https://github.com/saltstack/salt/issues/28429 .. _`#28448`: https://github.com/saltstack/salt/pull/28448 +.. _`#28453`: https://github.com/saltstack/salt/issues/28453 .. _`#28454`: https://github.com/saltstack/salt/pull/28454 .. _`#28456`: https://github.com/saltstack/salt/pull/28456 .. _`#28457`: https://github.com/saltstack/salt/pull/28457 @@ -893,8 +3868,12 @@ Changes: .. _`#28461`: https://github.com/saltstack/salt/pull/28461 .. _`#28464`: https://github.com/saltstack/salt/pull/28464 .. _`#28465`: https://github.com/saltstack/salt/pull/28465 +.. _`#28469`: https://github.com/saltstack/salt/issues/28469 +.. _`#28470`: https://github.com/saltstack/salt/issues/28470 .. _`#28472`: https://github.com/saltstack/salt/pull/28472 .. _`#28473`: https://github.com/saltstack/salt/pull/28473 +.. _`#28476`: https://github.com/saltstack/salt/issues/28476 +.. _`#28477`: https://github.com/saltstack/salt/issues/28477 .. _`#28484`: https://github.com/saltstack/salt/issues/28484 .. _`#28485`: https://github.com/saltstack/salt/pull/28485 .. _`#28486`: https://github.com/saltstack/salt/pull/28486 @@ -907,13 +3886,16 @@ Changes: .. _`#28502`: https://github.com/saltstack/salt/pull/28502 .. _`#28506`: https://github.com/saltstack/salt/pull/28506 .. _`#28508`: https://github.com/saltstack/salt/pull/28508 +.. _`#28511`: https://github.com/saltstack/salt/issues/28511 .. _`#28512`: https://github.com/saltstack/salt/pull/28512 .. _`#28514`: https://github.com/saltstack/salt/pull/28514 .. _`#28516`: https://github.com/saltstack/salt/pull/28516 .. _`#28517`: https://github.com/saltstack/salt/pull/28517 +.. _`#28524`: https://github.com/saltstack/salt/issues/28524 .. _`#28525`: https://github.com/saltstack/salt/pull/28525 .. _`#28526`: https://github.com/saltstack/salt/issues/28526 .. _`#28527`: https://github.com/saltstack/salt/issues/28527 +.. _`#28528`: https://github.com/saltstack/salt/issues/28528 .. _`#28529`: https://github.com/saltstack/salt/pull/28529 .. _`#28530`: https://github.com/saltstack/salt/pull/28530 .. _`#28531`: https://github.com/saltstack/salt/pull/28531 @@ -924,12 +3906,13 @@ Changes: .. _`#28537`: https://github.com/saltstack/salt/pull/28537 .. _`#28538`: https://github.com/saltstack/salt/pull/28538 .. _`#28541`: https://github.com/saltstack/salt/pull/28541 +.. _`#28542`: https://github.com/saltstack/salt/issues/28542 .. _`#28543`: https://github.com/saltstack/salt/pull/28543 .. _`#28544`: https://github.com/saltstack/salt/pull/28544 .. _`#28545`: https://github.com/saltstack/salt/pull/28545 -.. _`#28546`: https://github.com/saltstack/salt/pull/28546 .. _`#28547`: https://github.com/saltstack/salt/pull/28547 .. _`#28548`: https://github.com/saltstack/salt/pull/28548 +.. _`#28549`: https://github.com/saltstack/salt/issues/28549 .. _`#28550`: https://github.com/saltstack/salt/pull/28550 .. _`#28560`: https://github.com/saltstack/salt/pull/28560 .. _`#28561`: https://github.com/saltstack/salt/pull/28561 @@ -942,9 +3925,13 @@ Changes: .. _`#28581`: https://github.com/saltstack/salt/pull/28581 .. _`#28584`: https://github.com/saltstack/salt/pull/28584 .. _`#28587`: https://github.com/saltstack/salt/pull/28587 +.. _`#28588`: https://github.com/saltstack/salt/issues/28588 +.. _`#28591`: https://github.com/saltstack/salt/issues/28591 .. _`#28593`: https://github.com/saltstack/salt/pull/28593 .. _`#28596`: https://github.com/saltstack/salt/pull/28596 +.. _`#28601`: https://github.com/saltstack/salt/issues/28601 .. _`#28602`: https://github.com/saltstack/salt/pull/28602 +.. _`#28603`: https://github.com/saltstack/salt/issues/28603 .. _`#28610`: https://github.com/saltstack/salt/pull/28610 .. _`#28611`: https://github.com/saltstack/salt/pull/28611 .. _`#28612`: https://github.com/saltstack/salt/pull/28612 @@ -964,6 +3951,7 @@ Changes: .. _`#28648`: https://github.com/saltstack/salt/pull/28648 .. _`#28649`: https://github.com/saltstack/salt/pull/28649 .. _`#28653`: https://github.com/saltstack/salt/pull/28653 +.. _`#28655`: https://github.com/saltstack/salt/issues/28655 .. _`#28656`: https://github.com/saltstack/salt/pull/28656 .. _`#28658`: https://github.com/saltstack/salt/pull/28658 .. _`#28660`: https://github.com/saltstack/salt/pull/28660 @@ -973,11 +3961,11 @@ Changes: .. _`#28667`: https://github.com/saltstack/salt/pull/28667 .. _`#28668`: https://github.com/saltstack/salt/pull/28668 .. _`#28669`: https://github.com/saltstack/salt/pull/28669 -.. _`#28670`: https://github.com/saltstack/salt/pull/28670 .. _`#28672`: https://github.com/saltstack/salt/pull/28672 .. _`#28673`: https://github.com/saltstack/salt/pull/28673 +.. _`#28678`: https://github.com/saltstack/salt/issues/28678 .. _`#28679`: https://github.com/saltstack/salt/pull/28679 -.. _`#28690`: https://github.com/saltstack/salt/pull/28690 +.. _`#28692`: https://github.com/saltstack/salt/issues/28692 .. _`#28694`: https://github.com/saltstack/salt/pull/28694 .. _`#28695`: https://github.com/saltstack/salt/pull/28695 .. _`#28698`: https://github.com/saltstack/salt/pull/28698 @@ -987,12 +3975,14 @@ Changes: .. _`#28705`: https://github.com/saltstack/salt/pull/28705 .. _`#28709`: https://github.com/saltstack/salt/pull/28709 .. _`#28710`: https://github.com/saltstack/salt/pull/28710 +.. _`#28712`: https://github.com/saltstack/salt/issues/28712 .. _`#28713`: https://github.com/saltstack/salt/pull/28713 .. _`#28716`: https://github.com/saltstack/salt/pull/28716 .. _`#28717`: https://github.com/saltstack/salt/pull/28717 -.. _`#28718`: https://github.com/saltstack/salt/pull/28718 .. _`#28719`: https://github.com/saltstack/salt/pull/28719 +.. _`#28724`: https://github.com/saltstack/salt/issues/28724 .. _`#28725`: https://github.com/saltstack/salt/pull/28725 +.. _`#28726`: https://github.com/saltstack/salt/issues/28726 .. _`#28730`: https://github.com/saltstack/salt/pull/28730 .. _`#28740`: https://github.com/saltstack/salt/pull/28740 .. _`#28744`: https://github.com/saltstack/salt/pull/28744 @@ -1013,6 +4003,7 @@ Changes: .. _`#28777`: https://github.com/saltstack/salt/pull/28777 .. _`#28778`: https://github.com/saltstack/salt/pull/28778 .. _`#28782`: https://github.com/saltstack/salt/pull/28782 +.. _`#28783`: https://github.com/saltstack/salt/issues/28783 .. _`#28786`: https://github.com/saltstack/salt/pull/28786 .. _`#28789`: https://github.com/saltstack/salt/pull/28789 .. _`#28803`: https://github.com/saltstack/salt/pull/28803 @@ -1021,6 +4012,7 @@ Changes: .. _`#28824`: https://github.com/saltstack/salt/pull/28824 .. _`#28826`: https://github.com/saltstack/salt/pull/28826 .. _`#28827`: https://github.com/saltstack/salt/pull/28827 +.. _`#28828`: https://github.com/saltstack/salt/issues/28828 .. _`#28829`: https://github.com/saltstack/salt/pull/28829 .. _`#28832`: https://github.com/saltstack/salt/pull/28832 .. _`#28833`: https://github.com/saltstack/salt/pull/28833 @@ -1029,3 +4021,162 @@ Changes: .. _`#28837`: https://github.com/saltstack/salt/pull/28837 .. _`#28842`: https://github.com/saltstack/salt/pull/28842 .. _`#28848`: https://github.com/saltstack/salt/pull/28848 +.. _`#28865`: https://github.com/saltstack/salt/pull/28865 +.. _`#3436`: https://github.com/saltstack/salt/issues/3436 +.. _`#54`: https://github.com/saltstack/salt/issues/54 +.. _`#64`: https://github.com/saltstack/salt/issues/64 +.. _`#655`: https://github.com/saltstack/salt/issues/655 +.. _`#8646`: https://github.com/saltstack/salt/issues/8646 +.. _`#8`: https://github.com/saltstack/salt/issues/8 +.. _`#9051`: https://github.com/saltstack/salt/issues/9051 +.. _`CaesarC`: https://github.com/CaesarC +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`ColorFuzzy`: https://github.com/ColorFuzzy +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`JaseFace`: https://github.com/JaseFace +.. _`LoveIsGrief`: https://github.com/LoveIsGrief +.. _`LukeCarrier`: https://github.com/LukeCarrier +.. _`MasterNayru`: https://github.com/MasterNayru +.. _`MrFishFinger`: https://github.com/MrFishFinger +.. _`Mrten`: https://github.com/Mrten +.. _`Oro`: https://github.com/Oro +.. _`SmithSamuelM`: https://github.com/SmithSamuelM +.. _`Snergster`: https://github.com/Snergster +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`TheBigBear`: https://github.com/TheBigBear +.. _`UtahDave`: https://github.com/UtahDave +.. _`aboe76`: https://github.com/aboe76 +.. _`ahammond`: https://github.com/ahammond +.. _`ahetmanski`: https://github.com/ahetmanski +.. _`ajacoutot`: https://github.com/ajacoutot +.. _`alexharrington`: https://github.com/alexharrington +.. _`alf`: https://github.com/alf +.. _`anlutro`: https://github.com/anlutro +.. _`ari`: https://github.com/ari +.. _`avinassh`: https://github.com/avinassh +.. _`basepi`: https://github.com/basepi +.. _`bdrung`: https://github.com/bdrung +.. _`bechtoldt`: https://github.com/bechtoldt +.. _`bernieke`: https://github.com/bernieke +.. _`blueyed`: https://github.com/blueyed +.. _`bmcorser`: https://github.com/bmcorser +.. _`brian-bk`: https://github.com/brian-bk +.. _`cachedout`: https://github.com/cachedout +.. _`carlpett`: https://github.com/carlpett +.. _`cbuechler`: https://github.com/cbuechler +.. _`cedwards`: https://github.com/cedwards +.. _`chrismcmacken`: https://github.com/chrismcmacken +.. _`clarkperkins`: https://github.com/clarkperkins +.. _`cro`: https://github.com/cro +.. _`cubranic`: https://github.com/cubranic +.. _`damon-atkins`: https://github.com/damon-atkins +.. _`dkiser`: https://github.com/dkiser +.. _`double-yaya`: https://github.com/double-yaya +.. _`douglas-vaz`: https://github.com/douglas-vaz +.. _`dr4Ke`: https://github.com/dr4Ke +.. _`dverbeek84`: https://github.com/dverbeek84 +.. _`edhgoose`: https://github.com/edhgoose +.. _`eduherraiz`: https://github.com/eduherraiz +.. _`eguven`: https://github.com/eguven +.. _`eliasp`: https://github.com/eliasp +.. _`erchn`: https://github.com/erchn +.. _`eyj`: https://github.com/eyj +.. _`favadi`: https://github.com/favadi +.. _`feigenblatt`: https://github.com/feigenblatt +.. _`flavio`: https://github.com/flavio +.. _`fphhotchips`: https://github.com/fphhotchips +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gfa`: https://github.com/gfa +.. _`githubcdr`: https://github.com/githubcdr +.. _`gpkvt`: https://github.com/gpkvt +.. _`gravyboat`: https://github.com/gravyboat +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`guettli`: https://github.com/guettli +.. _`hedinfaok`: https://github.com/hedinfaok +.. _`hexedpackets`: https://github.com/hexedpackets +.. _`hrumph`: https://github.com/hrumph +.. _`hyn-salt`: https://github.com/hyn-salt +.. _`ironwilliamcash`: https://github.com/ironwilliamcash +.. _`isbm`: https://github.com/isbm +.. _`itsamenathan`: https://github.com/itsamenathan +.. _`jacksontj`: https://github.com/jacksontj +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jeffreyctang`: https://github.com/jeffreyctang +.. _`jejenone`: https://github.com/jejenone +.. _`jfindlay`: https://github.com/jfindlay +.. _`jgill`: https://github.com/jgill +.. _`joehealy`: https://github.com/joehealy +.. _`johnsocp`: https://github.com/johnsocp +.. _`justinta`: https://github.com/justinta +.. _`justyns`: https://github.com/justyns +.. _`keesbos`: https://github.com/keesbos +.. _`kitsemets`: https://github.com/kitsemets +.. _`lathama`: https://github.com/lathama +.. _`ldelossa`: https://github.com/ldelossa +.. _`ldobson`: https://github.com/ldobson +.. _`leodus`: https://github.com/leodus +.. _`lisa2lisa`: https://github.com/lisa2lisa +.. _`lomeroe`: https://github.com/lomeroe +.. _`lorengordon`: https://github.com/lorengordon +.. _`madduck`: https://github.com/madduck +.. _`martinhoefling`: https://github.com/martinhoefling +.. _`mbarrien`: https://github.com/mbarrien +.. _`mblixter`: https://github.com/mblixter +.. _`mbologna`: https://github.com/mbologna +.. _`merll`: https://github.com/merll +.. _`micahhausler`: https://github.com/micahhausler +.. _`mlalpho`: https://github.com/mlalpho +.. _`mool`: https://github.com/mool +.. _`mostafahussein`: https://github.com/mostafahussein +.. _`mrosedale`: https://github.com/mrosedale +.. _`msteed`: https://github.com/msteed +.. _`multani`: https://github.com/multani +.. _`nasenbaer13`: https://github.com/nasenbaer13 +.. _`nmadhok`: https://github.com/nmadhok +.. _`notpeter`: https://github.com/notpeter +.. _`opdude`: https://github.com/opdude +.. _`papertigers`: https://github.com/papertigers +.. _`pass-by-value`: https://github.com/pass-by-value +.. _`plastikos`: https://github.com/plastikos +.. _`pruiz`: https://github.com/pruiz +.. _`quantonganh`: https://github.com/quantonganh +.. _`rallytime`: https://github.com/rallytime +.. _`ralphvanetten`: https://github.com/ralphvanetten +.. _`rayba`: https://github.com/rayba +.. _`redmcg`: https://github.com/redmcg +.. _`rmarcinik`: https://github.com/rmarcinik +.. _`rowillia`: https://github.com/rowillia +.. _`ruzarowski`: https://github.com/ruzarowski +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`ryanwalder`: https://github.com/ryanwalder +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack/salt#28134`: https://github.com/saltstack/salt/pull/28134 +.. _`saltstack/salt-bootstrap#653`: https://github.com/saltstack/salt-bootstrap/pull/653 +.. _`saltstack/salt-bootstrap#654`: https://github.com/saltstack/salt-bootstrap/pull/654 +.. _`saltstack/salt-bootstrap#656`: https://github.com/saltstack/salt-bootstrap/pull/656 +.. _`saltstack/salt-bootstrap#665`: https://github.com/saltstack/salt-bootstrap/pull/665 +.. _`saltstack/salt-bootstrap#674`: https://github.com/saltstack/salt-bootstrap/pull/674 +.. _`saltstack/salt-bootstrap#868`: https://github.com/saltstack/salt-bootstrap/pull/868 +.. _`schlagify`: https://github.com/schlagify +.. _`sdm24`: https://github.com/sdm24 +.. _`sjansen`: https://github.com/sjansen +.. _`sjorge`: https://github.com/sjorge +.. _`skizunov`: https://github.com/skizunov +.. _`srkunze`: https://github.com/srkunze +.. _`ssgward`: https://github.com/ssgward +.. _`storner`: https://github.com/storner +.. _`syphernl`: https://github.com/syphernl +.. _`tbaker57`: https://github.com/tbaker57 +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`thecosmicfrog`: https://github.com/thecosmicfrog +.. _`ticosax`: https://github.com/ticosax +.. _`tkwilliams`: https://github.com/tkwilliams +.. _`toddtomkinson`: https://github.com/toddtomkinson +.. _`twangboy`: https://github.com/twangboy +.. _`twellspring`: https://github.com/twellspring +.. _`twisty7867`: https://github.com/twisty7867 +.. _`whiteinge`: https://github.com/whiteinge +.. _`yermulnik`: https://github.com/yermulnik +.. _`ymote`: https://github.com/ymote diff --git a/doc/topics/releases/2015.8.3.rst b/doc/topics/releases/2015.8.3.rst index 77666b210b..22408d36cf 100644 --- a/doc/topics/releases/2015.8.3.rst +++ b/doc/topics/releases/2015.8.3.rst @@ -1,1165 +1,797 @@ +.. _release-2015-8-3: + =========================== Salt 2015.8.3 Release Notes =========================== +Version 2015.8.3 is a bugfix release for :ref:`2015.8.0 `. + + +Statistics +========== + +- Total Merges: **74** +- Total Issue References: **26** +- Total PR References: **64** + +- Contributors: **30** (`DmitryKuzmenko`_, `RealKelsar`_, `alexproca`_, `anlutro`_, `basepi`_, `bogdanr`_, `cachedout`_, `cedwards`_, `chrigl`_, `cro`_, `fcrozat`_, `gtmanfred`_, `isbm`_, `jfindlay`_, `kiorky`_, `kt97679`_, `lomeroe`_, `lorengordon`_, `mhoogendoorn`_, `nmadhok`_, `optix2000`_, `paulnivin`_, `quantonganh`_, `rallytime`_, `s0undt3ch`_, `schwing`_, `sjorge`_, `tampakrap`_, `terminalmage`_, `ticosax`_) + + Security Fix ============ -CVE-2015-8034: Saving ``state.sls`` cache data to disk with insecure permissions +**CVE-2015-8034** Saving :py:func:`state.sls ` cache +data to disk with insecure permissions -This affects users of the ``state.sls`` function. The state run cache on the minion was being created with incorrect permissions. This file could potentially contain sensitive data that was inserted via jinja into the state SLS files. The permissions for this file are now being set correctly. Thanks to @zmalone for bringing this issue to our attention. +This affects users of the :py:func:`state.sls ` +function. The state run cache on the minion was being created with incorrect +permissions. This file could potentially contain sensitive data that was +inserted via jinja into the state SLS files. The permissions for this file are +now being set correctly. Thanks to `zmalone`_ for bringing this issue to our +attention. -Changes -======= -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Changelog for v2015.8.2..v2015.8.3 +================================== -*Generated at: 2015-11-25T00:03:40Z* +*Generated at: 2018-05-27 23:24:21 UTC* -Merges: **452** +* **PR** `#29173`_: (`jfindlay`_) add 2015.8.3 release notes + @ *2015-11-25 00:07:51 UTC* -Changes: + * 345206b68e Merge pull request `#29173`_ from jfindlay/2015.8 -- **PR** `#29172`_: (*basepi*) [2015.8] Backport new philips_hue proxy features from develop + * 212f7dd281 add 2015.8.3 release notes -- **PR** `#29167`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * cafbb49cb6 add note on 2015.8.2 release notes -- **PR** `#29141`_: (*optix2000*) Add test case for require: sls with only import statements +* **PR** `#29172`_: (`basepi`_) [2015.8] Backport new philips_hue proxy features from develop + @ *2015-11-24 23:52:55 UTC* -- **PR** `#29072`_: (*terminalmage*) Several gitfs/git_pillar fixes + * 5e88e9e9c0 Merge pull request `#29172`_ from basepi/philips_backport -- **PR** `#29118`_: (*ticosax*) [dockerng] Add networking capabilities + * 1df6c3083b Backport new philips_hue proxy features from develop -- **PR** `#29145`_: (*anlutro*) Remove duplicate import of salt.utils.s3 +* **PR** `#29167`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-11-24 21:40:34 UTC* -- **PR** `#29148`_: (*lomeroe*) correcting parameter calls to boto get_zone/create_zone functions in … + * 2fb1ca0eac Merge pull request `#29167`_ from basepi/merge-forward-2015.8 -- **PR** `#29108`_: (*lorengordon*) Enforce length as an int, fixes `#29107`_ + * 525f9fbbbb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 -- **PR** `#29125`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * a26c10a811 Merge pull request `#29164`_ from jfindlay/bp-29113 -- **PR** `#29126`_: (*fcrozat*) Fix deployment when umask is non-standard + * 50fab35188 kill unneeded import -- **PR** `#29124`_: (*rallytime*) Back-port `#28130`_ to 2015.8 + * 4f03196e7d Merge pull request `#29138`_ from jfindlay/2015.5 -- **PR** `#29076`_: (*RealKelsar*) We can't query installed use flags for a non installed pkg + * be045f5cb1 add 2015.5.8 release notes -- **PR** `#29097`_: (*rallytime*) Back-port `#29070`_ to 2015.8 +* **PR** `#29141`_: (`optix2000`_) Add test case for require: sls with only import statements + @ *2015-11-24 16:17:57 UTC* -- **PR** `#29090`_: (*gtmanfred*) clean up novaclient module + * 68d6c454b8 Merge pull request `#29141`_ from optix2000/full_sls_import -- **PR** `#29095`_: (*terminalmage*) Add warning about pygit2 API instability + * 596843e8d6 Add test case for sls with only import Tests https://github.com/saltstack/salt/issues/10852 -- **PR** `#28919`_: (*cro*) Update Philips Hue proxy minion to support __proxy__ instead of proxymodule stored in __opts__ +* **ISSUE** `#29015`_: (`jakehilton`_) git_pillar not honoring git_pillar_base (refs: `#29072`_) -- **PR** `#29065`_: (*cachedout*) Handle failures inside python's inspect if a module is reloaded +* **ISSUE** `#28311`_: (`strocknar`_) git_pillar conflicts (refs: `#29072`_) -- **PR** `#29057`_: (*paulnivin*) Add local file support for file.managed source list +* **ISSUE** `#27432`_: (`mafrosis`_) Using specific tag as GitFS remote (refs: `#29072`_) -- **PR** `#29017`_: (*jfindlay*) pagerduty runner: add missing salt.utils import +* **PR** `#29072`_: (`terminalmage`_) Several gitfs/git_pillar fixes + @ *2015-11-24 16:04:39 UTC* -- **PR** `#29039`_: (*anlutro*) Allow passing list of pip packages to virtualenv.managed + * 732f5364a2 Merge pull request `#29072`_ from terminalmage/issue28311 -- **PR** `#29047`_: (*schwing*) Fix salt.modules.gpg.import_key exception: 'GPG_1_3_1 referenced before assignment' + * dae738fda3 Use common code to detect envs -- **PR** `#29050`_: (*terminalmage*) Make git_pillar global config option docs more prominent + * a9c0cacb77 Don't add head ref if head red matches desired ref -- **PR** `#29048`_: (*nmadhok*) Fix incorrect debug log statement + * e7540e956b pygit2: Don't clean local heads along with stale remote refs -- **PR** `#29024`_: (*jfindlay*) cache runner test: add new unit tests + * 1e6c46f554 pygit2: Properly resolve base saltenv from tag ref -- **PR** `#28967`_: (*cro*) Fix some issues with password changes + * 0c592ab552 Support string whitelist/blacklist -- **PR** `#29020`_: (*basepi*) [2015.8] Add special list-only nodegroup support to salt-ssh + * 744487864d Fix base branch detection for git_pillar -- **PR** `#28970`_: (*terminalmage*) Properly handle non-string saltenvs + * 1cd9a4d1b4 Add some debug logging for git_pillar -- **PR** `#28959`_: (*rallytime*) Add blade password example and make note of timeout + * fac588c0bb Add HEAD ref in git_pillar/winrepo checkout -- **PR** `#29000`_: (*kiorky*) [Mergeable] Fix up LXC +* **PR** `#29118`_: (`ticosax`_) [dockerng] Add networking capabilities + @ *2015-11-24 15:47:36 UTC* -- **PR** `#29014`_: (*jfindlay*) systemd module: remove unneeded col command + * 95689ee1a4 Merge pull request `#29118`_ from ticosax/dockerng-network -- **PR** `#28983`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * e98d18ba41 Expose docker networking as state -- **PR** `#28969`_: (*rallytime*) Back-port `#28825`_ to 2015.8 + * 94135d91c3 cosmetic -- **PR** `#28787`_: (*chrigl*) closes `#28784`_ + * 17ff5c1ab5 Add expose networking to modules.dockerng -- **PR** `#28944`_: (*rallytime*) The ret result must contain 'name', not 'chassis_name' for the state compiler. +* **ISSUE** `#29144`_: (`anlutro`_) Error in fileclient with file.managed (refs: `#29145`_) -- **PR** `#28957`_: (*terminalmage*) Fix version number for new state option +* **PR** `#29145`_: (`anlutro`_) Remove duplicate import of salt.utils.s3 + @ *2015-11-24 15:36:05 UTC* -- **PR** `#28950`_: (*DmitryKuzmenko*) PR 28812 which test fix + * 4b4f212d2d Merge pull request `#29145`_ from alprs/fix-duplicate_import -- **PR** `#28812`_: (*isbm*) Enhance 'which' decorator reliability + * e1101bea19 Remove duplicate import of salt.utils.s3 -- **PR** `#28934`_: (*terminalmage*) git.latest: Add update_head option to prevent local HEAD from being updated +* **ISSUE** `#29147`_: (`lomeroe`_) boto_route53 unexpected keyword arguments in create_zone() (refs: `#29148`_) -- **PR** `#28937`_: (*rallytime*) Update dellchassis state example to use correct jinja syntax +* **PR** `#29148`_: (`lomeroe`_) correcting parameter calls to boto get_zone/create_zone functions in … + @ *2015-11-24 15:33:53 UTC* -- **PR** `#28889`_: (*jfindlay*) state compiler: relax aggregate conditional check + * 6079569580 Merge pull request `#29148`_ from lomeroe/boto_route53_create_zone_fix-backport -- **PR** `#28921`_: (*rallytime*) Back-port `#25470`_ to 2015.8 + * 75408ccf99 correcting parameter calls to boto get_zone/create_zone functions in create_zone parameter check on create_zone on private_zone=True add boto version requirement -- **PR** `#28922`_: (*rallytime*) Change 2015.8.2 release note title to reflect proper version +* **ISSUE** `#29107`_: (`lorengordon`_) Salt hangs when passing a string representation as the `length` parameter to `random.get_str()` (refs: `#29108`_) -- **PR** `#28891`_: (*jfindlay*) rh_service module: fix logic in _chkconfig_is_enabled +* **PR** `#29108`_: (`lorengordon`_) Enforce length as an int, fixes `#29107`_ + @ *2015-11-23 19:06:52 UTC* -- **PR** `#28892`_: (*jfindlay*) grains.core: correctly identify SLES 11 distrib_id + * 17638c734b Merge pull request `#29108`_ from lorengordon/type-enforce-length -- **PR** `#28910`_: (*lorengordon*) Fix winrepo command in windows pkg mgmt doc + * c71825d3b0 Enforce length as an int, fixes `#29107`_ -- **PR** `#28896`_: (*rallytime*) Back-port `#28855`_ to 2015.8 +* **PR** `#29125`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-11-23 18:48:46 UTC* -- **PR** `#28895`_: (*rallytime*) Back-port `#28823`_ to 2015.8 + * 233ab8a474 Merge pull request `#29125`_ from basepi/merge-forward-2015.8 -- **PR** `#28885`_: (*kt97679*) fix for: service.enabled fails on xen server `#28754`_ + * 1432cc806d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 -- **PR** `#28880`_: (*terminalmage*) Add "profile" loglevel + * 219367a23d Merge pull request `#29128`_ from cachedout/tweak_29122 -- **PR** `#28882`_: (*basepi*) [2015.8] salt-ssh: Check return type to make sure it's an error + * b08858b040 Missed check -- **PR** `#28867`_: (*rallytime*) [fx2 grains] Grains functions should return dictionaries + * 584efe81ee Set a safer default value for ret in saltmod -- **PR** `#28863`_: (*mhoogendoorn*) Fix ebuild.install causing extra refresh_db calls. + * 8d86bc3056 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 -- **PR** `#28865`_: (*jfindlay*) add 2015.8.2 release notes + * 2250a36647 Merge pull request `#29122`_ from cachedout/issue_29110 -- **PR** `#28730`_: (*garethgreenaway*) Fixes to how return_job is handled in the scheduler for the salt master. + * 4b9302d794 Fix broken state orchestration -- **PR** `#28848`_: (*cro*) Lint + * 200e771efb Merge pull request `#29096`_ from rallytime/bp-29093 -- **PR** `#28842`_: (*cachedout*) Add transport setting to shell test + * f5734423a4 Compare gem versions as a string. -- **PR** `#28837`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * d8a2018bc8 Merge pull request `#29084`_ from rallytime/bp-29055 -- **PR** `#28827`_: (*jacksontj*) Cleanup virtual_timer in loader + * 52e650aed9 Add section to style guide -- **PR** `#28836`_: (*cachedout*) Cast to dict to fix wheel tests in tcp + * b5cff1a351 Merge pull request `#29083`_ from rallytime/bp-29053 -- **PR** `#28834`_: (*cachedout*) Fix breakage in tcp server + * f1884de0e7 Update rabbitmq_user.py -- **PR** `#28804`_: (*cachedout*) TCP test fixes + * b3e3bebef0 Merge pull request `#28932`_ from twangboy/fix_28928 -- **PR** `#28826`_: (*basepi*) [2015.8] Add new tornado deps to salt-ssh thin + * 0653a04887 Fixed user.present / user.absent in windows -- **PR** `#28759`_: (*jfindlay*) simplify stdin use of stdin in at.present state + * a2e4a227e0 Merge pull request `#29011`_ from rallytime/bp-28630 -- **PR** `#28824`_: (*rallytime*) Back-port `#28778`_ and `#28820`_ to 2015.8 + * 7baccc1b05 Lint - newline before def -- **PR** `#28803`_: (*jfindlay*) decode strings to utf-8 + * 9e5c16d4da Reading S3 credentials from Pillar -- **PR** `#28782`_: (*rallytime*) Fixes to rabbitmq user state + * a3216f813d Fixed requests HTTPError handler, it was still in urllib2 style -- **PR** `#28789`_: (*nmadhok*) Provide ability to enable/disable customization for newly create VMs using VMware salt-cloud driver + * 1a4cd6002f Merge pull request `#28982`_ from basepi/merge-forward-2015.5 -- **PR** `#28768`_: (*mrosedale*) 2015.8 + * bfbb109fbd Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 -- **PR** `#28772`_: (*rallytime*) rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list. + * 4b8bdd0afb Merge pull request `#28839`_ from cachedout/revert_28740 -- **PR** `#28774`_: (*rallytime*) Back-port `#28725`_ to 2015.8 + * 215b26c06f Revert `#28740`_ -- **PR** `#28775`_: (*rallytime*) Back-port `#28740`_ to 2015.8 +* **ISSUE** `#29005`_: (`fcrozat`_) non-standard umask breaks salt-call call in salt-ssh (refs: `#29126`_) -- **PR** `#28755`_: (*rallytime*) Move most vmware driver list_* functions to use salt.utils.vmware functions +* **ISSUE** `#28830`_: (`fcrozat`_) non-standard umask breaks salt-ssh deployement (refs: `#29126`_) -- **PR** `#28744`_: (*jfindlay*) import gate elementtree +* **PR** `#29126`_: (`fcrozat`_) Fix deployment when umask is non-standard + @ *2015-11-23 17:53:46 UTC* -- **PR** `#28758`_: (*jfindlay*) remove redundant logic in useradd execution module + * dc0d47fa2e Merge pull request `#29126`_ from fcrozat/2015.8 -- **PR** `#28757`_: (*mbarrien*) Bug fix: pip command to not quote spaces in cmd line args + * 4da11a5f3c Fix deployment when umask is non-standard. Fixes `#29005`_ -- **PR** `#28764`_: (*multani*) Various documentation fixes + * bbccb752f9 Fix deployment when umask is non-standard. Fixes `#28830`_ -- **PR** `#28752`_: (*aboe76*) Update openSUSE grain for tumbleweed +* **PR** `#29124`_: (`rallytime`_) Back-port `#28130`_ to 2015.8 + @ *2015-11-23 17:31:00 UTC* -- **PR** `#28713`_: (*hexedpackets*) Rename consul.list to consul.list_keys. + * **PR** `#29120`_: (`alexproca`_) Import keypair (refs: `#29124`_) -- **PR** `#28719`_: (*jacobhammons*) removed dependencies info from docs + * **PR** `#28130`_: (`bogdanr`_) Ec2 upload public key and updated instances size list (refs: `#29124`_) -- **PR** `#28709`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 994d8bd71a Merge pull request `#29124`_ from rallytime/bp-28130 -- **PR** `#28710`_: (*rallytime*) Pass kwargs correctly to _get_group from get_group_id + * e290ea4a3f Pylint Fix -- **PR** `#28698`_: (*rallytime*) Back-port `#28530`_ to 2015.8 + * 9d8e5c8b4d Added missing comma -- **PR** `#28700`_: (*rallytime*) Back-port `#28679`_ to 2015.8 + * 4a7eee08a8 Documented import_keypair for the ec2 driver -- **PR** `#28695`_: (*s0undt3ch*) [2015.8] Update to latest bootstrap script v2015.11.09 + * 715c12014c Added a bunch of instance sizes and updated some outdated ones -- **PR** `#28656`_: (*clarkperkins*) `#28526`_ fixed yumpkg module issue with pkg.installed + * 506ff01f65 Import public key -- **PR** `#28672`_: (*jfindlay*) add OS grain support for SuSE Leap +* **PR** `#29076`_: (`RealKelsar`_) We can't query installed use flags for a non installed pkg + @ *2015-11-23 16:19:40 UTC* -- **PR** `#28673`_: (*jfindlay*) add hidden_opts to mount.mounted + * d9c32011b4 Merge pull request `#29076`_ from RealKelsar/2015.8 -- **PR** `#28667`_: (*cro*) saltutil.sync_all should sync proxymodules as well as the rest. + * f3d1ba1509 We can't query installed use flags for a non installed pkg. Also one if is enough... -- **PR** `#28665`_: (*jfindlay*) fixes to windows execution and state modules + * 96566d3060 We can't query installed use flags for a non installed pkg -- **PR** `#28660`_: (*techhat*) Don't sign empty regions +* **ISSUE** `#29100`_: (`quantonganh`_) boto_ec2.exists does not use region when checking? (refs: `#29070`_) -- **PR** `#28632`_: (*terminalmage*) Fixes/improvements to pkgbuild state/modules +* **PR** `#29097`_: (`rallytime`_) Back-port `#29070`_ to 2015.8 + @ *2015-11-22 17:03:04 UTC* -- **PR** `#28658`_: (*techhat*) Remove _pkgdb_fun() references + * **PR** `#29070`_: (`quantonganh`_) boto_ec2: missing region when checking existence of an EC2 instance (refs: `#29097`_) -- **PR** `#28653`_: (*rallytime*) Provide possible parameters for boto_rds.present engine values + * 1931870f26 Merge pull request `#29097`_ from rallytime/bp-29070 -- **PR** `#28649`_: (*bdrung*) Fix OS related grains on Debian + * 3b202efadc boto_ec2: missing region when checking existence of an EC2 instance -- **PR** `#28646`_: (*rallytime*) Back-port `#28614`_ to 2015.8 +* **PR** `#29090`_: (`gtmanfred`_) clean up novaclient module + @ *2015-11-21 15:43:58 UTC* -- **PR** `#28647`_: (*rallytime*) Back-port `#28624`_ to 2015.8 + * bb28b9186b Merge pull request `#29090`_ from gtmanfred/2015.8 -- **PR** `#28648`_: (*rallytime*) Merge branch '2015.5' into '2015.8' + * 2aab45f9d2 clean up novaclient module -- **PR** `#28638`_: (*anlutro*) Salt-SSH: Return more concise error when SSH command fails +* **PR** `#29095`_: (`terminalmage`_) Add warning about pygit2 API instability + @ *2015-11-21 15:38:59 UTC* -- **PR** `#28644`_: (*pass-by-value*) Make sure versionchanged is correct + * 4ff54c6429 Merge pull request `#29095`_ from terminalmage/pygit2-warning -- **PR** `#28615`_: (*The-Loeki*) Fixes to FreeBSD pkg + * 139f5ba4c3 Add warning about pygit2 API instability -- **PR** `#28613`_: (*cachedout*) Add facility to deepcopy bound methods in Py2.6 and apply to grains +* **PR** `#28919`_: (`cro`_) Update Philips Hue proxy minion to support __proxy__ instead of proxymodule stored in __opts__ + @ *2015-11-21 15:31:36 UTC* -- **PR** `#28612`_: (*rallytime*) Remove unsupported storage_type argument for parity with boto_rds module + * 27160b0454 Merge pull request `#28919`_ from cro/hue_proxy_backport -- **PR** `#28611`_: (*rallytime*) [2015.8] Be explicit about salt.utils.vmware function calls + * 8823225c81 Add 'versionadded' -- **PR** `#28610`_: (*pass-by-value*) Lxc config additions + * 6bdf98d2c6 Backport philips_hue proxy module to 2015.8, use __proxy__ instead of opts['proxymodule'] -- **PR** `#28602`_: (*nasenbaer13*) Allow setting of custom dimensions in asg alarm specification + * 0945d3b5b2 Add the license -- **PR** `#28596`_: (*rallytime*) Merge branch '2015.5' into '2015.8' + * a8be2d7382 Fix the docstring -- **PR** `#28593`_: (*blueyed*) doc: fix typo with salt.states.file: s/preseve/preserve/ + * 13a8973f94 Validate if "requests" are around. NOTE: this will be changed soon! -- **PR** `#28578`_: (*twangboy*) Fixed the script... something got broke... + * 835e84181b Fix the documentation -- **PR** `#28579`_: (*jfindlay*) fix __virtual__ returns: tls,uptime mods + * 68accf6180 Allow view status from all lamps, if not specified -- **PR** `#28584`_: (*rallytime*) If AssociatePublicIpAddress is set to True, don't auto-assign eip. + * 96adc9cca9 Fix lint issues -- **PR** `#28576`_: (*jacksontj*) Only encode the zmq message once + * cd00c5d99f Remove dead code -- **PR** `#28587`_: (*cachedout*) Reset yaml rendering hooks to avoid leaks + * 6a08d2b6b5 Implement static grains for the Philips HUE -- **PR** `#28581`_: (*basepi*) Revert b4875e585a165482c4c1ddc8987d76b0a71ef1b0 + * 5d3c3e09fc Bugfix: show all devices, if no specific IDs were passed -- **PR** `#28573`_: (*jacksontj*) Add `body` to salt.utils.http.query returns + * 76e86d2d7d Implement color temperature -- **PR** `#28564`_: (*s0undt3ch*) [2015.8] Update to latest bootstrap script v2015.11.04 + * a2d87a18cc Fix the documentation -- **PR** `#28561`_: (*Oro*) Issue `#28527`_ boto_rds.create does not work + * adeecb49d4 Implement brightness -- **PR** `#28560`_: (*bdrung*) Fix various typos + * a2b1a71e01 Fix crash if the controller is down -- **PR** `#28550`_: (*jfindlay*) check timedatectl errno and return stdout on failure + * a7d5aafbe3 Update documentation for the color settings -- **PR** `#28545`_: (*jfindlay*) pass on concurrent create of jid_dir in local_cache + * 15f83e180d Add more preset colors -- **PR** `#28544`_: (*rallytime*) Start moving some vmware.py cloud funcs to utils/vmware.py + * 44339f3dc1 Impement color setter with transition -- **PR** `#28543`_: (*gtmanfred*) clean up changes for pkg.uptodate and supervisord.dead + * 0f4d5b9eac Implement effects method -- **PR** `#28538`_: (*jfindlay*) decode path and url to utf-8 in url.create + * f341910174 Implement alert function -- **PR** `#28533`_: (*jfindlay*) decode highstate error messages to utf-8 + * e0c95b4c7f Separate device (lamps) getter -- **PR** `#28547`_: (*nmadhok*) [Backport] [2015.8] Tasks can be in queued state instead of running + * 37ed834a63 Implement lamp rename -- **PR** `#28535`_: (*techhat*) Fail gracefully if 169.254* isn't available + * 66b155c3db Enhance _set method so it can set more than just lights status -- **PR** `#28536`_: (*cro*) Default configuration file for proxy minions. + * 8e94aad5c1 Enhance internal ping report on failures (device is not reachable) -- **PR** `#28534`_: (*rallytime*) Add versionadded directive for vpc_name arg in boto_secgroup.present + * 3bf79e6920 Implement blink function -- **PR** `#28516`_: (*rallytime*) Back-port `#28489`_ to 2015.8 + * 334371d660 Use blink on internal ping -- **PR** `#28506`_: (*basepi*) [2015.8] Log minion list for all rosters, at debug level + * a8e4c2162c Fix bug: call in a proper order, if all devices -- **PR** `#28514`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * a98d5187f8 Remove the debug -- **PR** `#28502`_: (*cachedout*) Lint `#28427`_ + * a1244223bf Enhance switch method -- **PR** `#28464`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * e902764e25 Switch all lamps if IDs are not passed -- **PR** `#28486`_: (*rallytime*) Back-port `#26945`_ to 2015.8 + * 1e508e9155 Fix bug: crash, if only one lamp ID is passed -- **PR** `#28472`_: (*gtmanfred*) overwrite more than one value with names + * c0e6706d9a Implement status -- **PR** `#28493`_: (*rallytime*) Back-port `#28492`_ to 2015.8 + * 6d8e6d6e23 Fix lint -- **PR** `#28494`_: (*whiteinge*) Fix filter_by passing incorrect parameters to match functions + * db053fbd8b Add licence -- **PR** `#28491`_: (*rallytime*) Back-port `#28388`_ to 2015.8 + * 2abdb19934 Implement proxy minion configuration -- **PR** `#28465`_: (*twangboy*) Fix `#12363`_: Password Expiration in Windows + * 1a75be3f71 Cleanup code -- **PR** `#28485`_: (*nasenbaer13*) Fix invalid usage of _get_conn causing `#28484`_ + * 1a46a180bc Implement light switch ON/OFF -- **PR** `#28454`_: (*sdm24*) Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config + * cc5ee382c5 Implement lights method. -- **PR** `#28487`_: (*cachedout*) Lint 28456 + * bfbe4160b2 Add constants class-struct -- **PR** `#28457`_: (*sdm24*) Clarified comments for grains/core.py for ip_interfaces, ip4_interfac… + * 7a8d72de3f Implement device state change -- **PR** `#28473`_: (*anlutro*) Show check_cmd output on failure + * d769bc85a7 Implement available device listing -- **PR** `#28460`_: (*jtand*) Skipped wipefs test if wipefs does not exist on OS + * c9e7f4dc18 Cleanup code -- **PR** `#28426`_: (*terminalmage*) pkgbuild.built: make template engine optional + * 5503b6f20e Implement Philips HUE wrapper caller for Minion Proxy -- **PR** `#28422`_: (*cachedout*) Handle windows logging on thread_multi [WIP] + * 1b11d1ec74 Initial implementation of Philips HUE proxy -- **PR** `#28425`_: (*twangboy*) Fix `#13513`_ - Reflection +* **ISSUE** `#28810`_: (`syedaali`_) test.ping is not available (refs: `#29065`_) -- **PR** `#28417`_: (*rallytime*) Add note about azure sdk version to getting started docs +* **ISSUE** `#28761`_: (`syedaali`_) Numerous module import errors in /var/log/salt/minion (test,oracle,archive) (refs: `#29065`_) -- **PR** `#28410`_: (*jacksontj*) Add retries to the zeromq.AsyncReqMessageClient +* **ISSUE** `#25756`_: (`nshalman`_) Esky builds on SmartOS broken in 2015.5 branch (refs: `#25946`_, `#25923`_) -- **PR** `#28404`_: (*rallytime*) Back-port `#28395`_ to 2015.8 +* **PR** `#29065`_: (`cachedout`_) Handle failures inside python's inspect if a module is reloaded + @ *2015-11-20 18:10:42 UTC* -- **PR** `#28405`_: (*opdude*) Detect legacy versions of chocolatey correctly + * **PR** `#25946`_: (`sjorge`_) Fix for salt.utils.decorators under esky (refs: `#29065`_) -- **PR** `#28187`_: (*sjansen*) fix at.present + * **PR** `#25923`_: (`sjorge`_) Fix for salt.utils.decorators and module.__name__ under esky (refs: `#25946`_) -- **PR** `#28375`_: (*merll*) Merge pillar includes correctly + * 88c0354c0c Merge pull request `#29065`_ from cachedout/issue_28810 -- **PR** `#28376`_: (*ryan-lane*) Support update of route53 records with multiple values + * 4767503eb2 Remove trailing whitespace -- **PR** `#28377`_: (*terminalmage*) Deprecate 'always' in favor of 'force' in pkgbuild.built + * c5b667f048 Handle failures inside python's inspect if a module is reloaded -- **PR** `#28380`_: (*cro*) Add missing call for service provider +* **PR** `#29057`_: (`paulnivin`_) Add local file support for file.managed source list + @ *2015-11-19 21:57:34 UTC* -- **PR** `#28348`_: (*jfindlay*) salt.utils.alias informs user they are using a renamed function + * 714ef8ff27 Merge pull request `#29057`_ from lyft/file-manage-local-source-list -- **PR** `#28364`_: (*jtand*) In CentOS 5 the .split() causes a stacktrace. + * 3d7aa19cd8 Support local files in list of sources -- **PR** `#28361`_: (*rallytime*) Back-port `#28087`_ to 2015.8 + * d175061c5d Add tests for file.source_list with local files -- **PR** `#28360`_: (*multani*) Various documentation fixes + * 4f8e2a30fe Update documentation to clarify URL support for lists of sources with file.managed -- **PR** `#28370`_: (*rallytime*) Back-port `#28276`_ to 2015.8 +* **ISSUE** `#28981`_: (`mimianddaniel`_) 2015.8.2 import pagerduty error (refs: `#29017`_) -- **PR** `#28353`_: (*merll*) Consider each pillar match only once. +* **PR** `#29017`_: (`jfindlay`_) pagerduty runner: add missing salt.utils import + @ *2015-11-19 19:28:35 UTC* -- **PR** `#28334`_: (*anlutro*) iptables needs -m comment for --comment to work + * f4f43381fc Merge pull request `#29017`_ from jfindlay/pager_util -- **PR** `#28340`_: (*jfindlay*) sdecode file and dir lists in fileclient + * 5cc06207fe pagerduty runner: add missing salt.utils import -- **PR** `#28344`_: (*ryan-lane*) Fix iptables state for non-filter tables +* **PR** `#29039`_: (`anlutro`_) Allow passing list of pip packages to virtualenv.managed + @ *2015-11-19 19:13:50 UTC* -- **PR** `#28343`_: (*rallytime*) Back-port `#28342`_ to 2015.8 + * 1c61bce0a6 Merge pull request `#29039`_ from alprs/feature-virtualenv_pip_pkgs -- **PR** `#28330`_: (*rallytime*) Back-port `#28305`_ to 2015.8 + * f9bff51382 allow passing list of pip packages to virtualenv.managed -- **PR** `#28270`_: (*rallytime*) Refactor RabbitMQ Plugin State to correctly use test=true and format errors +* **PR** `#29047`_: (`schwing`_) Fix salt.modules.gpg.import_key exception: 'GPG_1_3_1 referenced before assignment' + @ *2015-11-19 19:07:36 UTC* -- **PR** `#28269`_: (*rallytime*) Refactor rabbitmq_user state to use test=True correctly + * b692ab1cfb Merge pull request `#29047`_ from schwing/fix-gpg-exception -- **PR** `#28299`_: (*rallytime*) Add test for availability_zone check to boto_vpc_tests + * 813f6e6808 Fix 'GPG_1_3_1 referenced before assignment' -- **PR** `#28306`_: (*sdm24*) Updated the Nodegroup docs to include how to target nodegroups in SLS Jinja +* **PR** `#29050`_: (`terminalmage`_) Make git_pillar global config option docs more prominent + @ *2015-11-19 19:06:38 UTC* -- **PR** `#28308`_: (*rallytime*) Firewalld state services should use --add-service, not --new-service + * b4fc2f28a4 Merge pull request `#29050`_ from terminalmage/issue29015 -- **PR** `#28302`_: (*DmitryKuzmenko*) Always close socket even if there is no stream. + * 20da057a94 Make git_pillar global config option docs more prominent -- **PR** `#28282`_: (*keesbos*) Fix for __env__ in legacy git_pillar +* **PR** `#29048`_: (`nmadhok`_) Fix incorrect debug log statement + @ *2015-11-19 19:04:10 UTC* -- **PR** `#28258`_: (*pass-by-value*) Add service module for ssh proxy example + * 4b3b2fe1e7 Merge pull request `#29048`_ from nmadhok/patch-1 -- **PR** `#28294`_: (*bechtoldt*) correct a bad default value in http utility + * 9489d6c3b6 Update vmware.py -- **PR** `#28185`_: (*jtand*) Added single package return for latest_version, fixed other bug. +* **PR** `#29024`_: (`jfindlay`_) cache runner test: add new unit tests + @ *2015-11-19 19:02:54 UTC* -- **PR** `#28297`_: (*cachedout*) Lint fix proxy junos + * e52c117368 Merge pull request `#29024`_ from jfindlay/run_test -- **PR** `#28210`_: (*terminalmage*) Fix for ext_pillar being compiled twice in legacy git_pillar code + * 0c0bce3ea6 cache runner test: add new unit tests -- **PR** `#28265`_: (*jfindlay*) fix blockdev execution and state modules +* **PR** `#28967`_: (`cro`_) Fix some issues with password changes + @ *2015-11-19 18:57:39 UTC* -- **PR** `#28266`_: (*rallytime*) Back-port `#28260`_ to 2015.8 + * bcec8d8608 Merge pull request `#28967`_ from cro/fx2_switch -- **PR** `#28253`_: (*rallytime*) Back-port `#28063`_ to 2015.8 + * 67b5b9b8d2 Add docs on automatic lockout on failed auth attempts. -- **PR** `#28231`_: (*rallytime*) Make sure we're compairing strings when getting images in the DO driver + * 8a3cea4d95 Lint. -- **PR** `#28224`_: (*techhat*) Optimize create_repo for large packages + * 04095e3b74 Prevent stacktrace if something goes wrong retrieving inventory -- **PR** `#28214`_: (*rallytime*) Don't stacktrace if invalid credentials are passed to boto_route53 state + * e7cbce15a5 Don't need to get grains at init time here now that we are confirming username and password differently. -- **PR** `#28228`_: (*rallytime*) Back-port `#27562`_ to 2015.8 + * e42100cf8a Switch from admin_password and fallback_admin_password to a list of passwords to try. -- **PR** `#28232`_: (*rallytime*) Add documentation to supply the ssh_username: freebsd config to DO docs + * 4b382e977d Add 'versionadded' -- **PR** `#28198`_: (*jacobhammons*) Added note regarding missing spm exe on Debian/Ubuntu +* **ISSUE** `#8516`_: (`xoJIog`_) salt-ssh not working with nodegroups and lists (refs: `#29020`_) -- **PR** `#28182`_: (*erchn*) Some fixes for nova driver for Rackspace +* **PR** `#29020`_: (`basepi`_) [2015.8] Add special list-only nodegroup support to salt-ssh + @ *2015-11-18 21:15:50 UTC* -- **PR** `#28181`_: (*rallytime*) Revamp firewalld state to be more stateful. + * 14b5d0ed0f Merge pull request `#29020`_ from basepi/salt-ssh.nodegroups.8516 -- **PR** `#28176`_: (*cro*) Add ping function + * 6433abf36f Rename ssh_nodegroups to ssh_list_nodegroups -- **PR** `#28167`_: (*The-Loeki*) file.serialize needs to add a final newline to serialized files + * bd8487b3b9 Properly save minion list in local_cache for ssh jobs -- **PR** `#28168`_: (*rallytime*) Make sure availability zone gets passed in boto_vpc module when creating subnet + * 4b1bf7d5e2 Add support for comma separated list matching in salt-ssh -- **PR** `#28148`_: (*basepi*) [2015.8] Only expand nodegroups to lists if there is a nested nodegroup + * 65c6528cbc Add "nodegroup" matching to salt-ssh -- **PR** `#28155`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 688a78c08c Add new ssh_nodegroups config -- **PR** `#28149`_: (*pass-by-value*) Add clarification to cloud profile doc about host +* **ISSUE** `#28911`_: (`ccmills`_) GitFS numeric tags cause errors with environments (refs: `#28970`_) -- **PR** `#28146`_: (*cachedout*) Lint dracr.py +* **PR** `#28970`_: (`terminalmage`_) Properly handle non-string saltenvs + @ *2015-11-18 20:38:41 UTC* -- **PR** `#28141`_: (*rallytime*) Don't use RAM for root disk size in linode.py + * 89801b172a Merge pull request `#28970`_ from terminalmage/issue28911 -- **PR** `#28143`_: (*jtand*) Removed blank line at end of chassis.py + * ec64ec85d6 Force file_roots environments to be strings -- **PR** `#28021`_: (*blueyed*) Handle includes in `include_config` recursively + * b2690140c7 Properly handle non-string saltenvs -- **PR** `#28095`_: (*rallytime*) Back-port `#28001`_ to 2015.8 +* **ISSUE** `#28945`_: (`rallytime`_) Dell Chassis State Example Improvements (refs: `#28959`_) -- **PR** `#28096`_: (*rallytime*) Back-port `#28061`_ to 2015.8 +* **PR** `#28959`_: (`rallytime`_) Add blade password example and make note of timeout + @ *2015-11-18 19:39:04 UTC* -- **PR** `#28139`_: (*rallytime*) Back-port `#28103`_ to 2015.8 + * 83c54351c9 Merge pull request `#28959`_ from rallytime/fix-28945 -- **PR** `#28098`_: (*jacksontj*) For all multi-part messages, check the headers. If the header is not … + * 2f326b57bf Clarify chassis password functionality -- **PR** `#28134`_: (*bernieke*) fix unicode pillar values `#3436`_ + * 3614a88811 Add blade password example and make note of timeout -- **PR** `#28076`_: (*redmcg*) Replace option 'i' with an explicit queryformat +* **PR** `#29000`_: (`kiorky`_) [Mergeable] Fix up LXC + @ *2015-11-18 18:02:47 UTC* -- **PR** `#28119`_: (*jacksontj*) Check if the remote exists before casting to a string. + * d8dc81bb2c Merge pull request `#29000`_ from kiorky/2015.8_lxc -- **PR** `#28105`_: (*jfindlay*) add reason for not loading localemod + * a4d197821a LXC: doc -- **PR** `#28108`_: (*cachedout*) Set logfile permsissions correctly + * 43fb0eff02 lxc: remove useless and error prone uses_systemd knob -- **PR** `#27922`_: (*cro*) WIP States/Modules for managing Dell FX2 chassis via salt-proxy + * 7ec08cd41c Fix bootstrap delay kwarg exchange -- **PR** `#28104`_: (*pass-by-value*) Add documentation for proxy minion ssh +* **ISSUE** `#28995`_: (`timcharper`_) systemd.get_all broken on non-bsd systems / salt-bootstrap failure (refs: `#29014`_) -- **PR** `#28020`_: (*DmitryKuzmenko*) LazyLoader deepcopy fix. +* **PR** `#29014`_: (`jfindlay`_) systemd module: remove unneeded col command + @ *2015-11-18 17:58:59 UTC* -- **PR** `#27933`_: (*eliasp*) Provide all git pillar dirs in `opts[pillar_roots]` + * eedd50e7c3 Merge pull request `#29014`_ from jfindlay/sysctl_col -- **PR** `#28013`_: (*rallytime*) Back-port `#27891`_ to 2015.8 + * d75e4d5d21 systemd module: line wrap function comment -- **PR** `#28018`_: (*rallytime*) Add example to Writing Grains of how grains can be loaded twice + * 960d2b936d systemd module: remove unneeded col command -- **PR** `#28084`_: (*cachedout*) `#28069`_ with lint +* **PR** `#28983`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-11-18 00:49:36 UTC* -- **PR** `#28079`_: (*The-Loeki*) Fix for trace dump on failing imports for win32com & pythoncom 4 win_task + * ac85cfdbd0 Merge pull request `#28983`_ from basepi/merge-forward-2015.8 -- **PR** `#28081`_: (*The-Loeki*) fix for glance state trace error on import failure + * f1c80ab943 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 -- **PR** `#28066`_: (*jacksontj*) Use the generic `text` attribute, not .body of the handler + * edd26d763a Merge pull request `#28949`_ from whiteinge/sync-sdb -- **PR** `#28019`_: (*rallytime*) Clean up version added and deprecated msgs to be accurate + * b0ec9ab25b Add sync_sdb execution function -- **PR** `#28058`_: (*rallytime*) Back-port `#28041`_ to 2015.8 + * 43da1bc4ce Merge pull request `#28930`_ from twangboy/fix_28888 -- **PR** `#28055`_: (*rallytime*) Back-port `#28043`_ to 2015.8 + * f5c489eaad Added missing import mmap required by file.py -- **PR** `#28046`_: (*pass-by-value*) Add pkg install and remove functions + * 2488b873b8 Merge pull request `#28908`_ from rallytime/doc-convention-spelling -- **PR** `#28050`_: (*ryan-lane*) Use a better method for checking dynamodb table existence + * 60e6eddb77 A couple of spelling fixes for doc conventions page. -- **PR** `#28042`_: (*jfindlay*) fix repo path in ubuntu installation documentation + * 827a1ae020 Merge pull request `#28902`_ from whiteinge/json-keys -- **PR** `#28033`_: (*twangboy*) Fixed win_useradd.py + * 9745903301 Fix missing JSON support for /keys endpoint -- **PR** `#28027`_: (*cro*) Make ssh conn persistent. + * d23bd49130 Merge pull request `#28897`_ from rallytime/bp-28873 -- **PR** `#28029`_: (*jacobhammons*) Updated release notes with additional CVE information + * 077e671ead Fix salt-cloud help output typo -- **PR** `#28022`_: (*jacobhammons*) Updated Debian and Ubuntu repo paths with new structure for 2015.8.1 + * a9dc8b6ca6 Merge pull request `#28871`_ from basepi/mdadm.fix.28870 -- **PR** `#27983`_: (*rallytime*) Pip state run result should be False, not None, if installation error occurs. + * 323bc2d2ac Fix command generation for mdadm.assemble -- **PR** `#27991`_: (*twangboy*) Fix for `#20678`_ + * ec7fdc539b Merge pull request `#28864`_ from jfindlay/2015.5 -- **PR** `#27997`_: (*rallytime*) Remove note about pip bug with pip v1 vs pip v2 return codes + * 648b697951 add 2015.5.7 release notes -- **PR** `#27994`_: (*jtand*) Fix schedule_test failure + * bed45f4208 Merge pull request `#28731`_ from garethgreenaway/27392_2015_5_scheduler_return_job_master -- **PR** `#27992`_: (*cachedout*) Make load beacon config into list + * 771e9f7b6f Fixing the salt scheduler so that it only attempts to return the job data to the master if the scheduled job is running from a minion's scheduler. -- **PR** `#28003`_: (*twangboy*) Fix `#26336`_ + * 06f4932876 Merge pull request `#28857`_ from rallytime/bp-28851 -- **PR** `#27984`_: (*rallytime*) Versionadded for clean_file option for pkgrepo + * aa4b193f87 [states/schedule] docstring: args, kwargs -> job_args, job_kwargs -- **PR** `#27989`_: (*ryan-lane*) Do not try to remove the main route table association + * 0934a52b34 Merge pull request `#28856`_ from rallytime/bp-28853 -- **PR** `#27982`_: (*pass-by-value*) Add example for salt-proxy over SSH + * 37eeab2683 Typo (with → which) -- **PR** `#27985`_: (*jacobhammons*) Changed current release to 8.1 and added CVEs to release notes +* **PR** `#28969`_: (`rallytime`_) Back-port `#28825`_ to 2015.8 + @ *2015-11-17 20:43:30 UTC* -- **PR** `#27979`_: (*cachedout*) Fix regression with key whitespace + * **PR** `#28825`_: (`s0undt3ch`_) Take into account a pygit2 bug (refs: `#28969`_) -- **PR** `#27977`_: (*cachedout*) Decode unicode names in fileclient/server + * f172a0ee03 Merge pull request `#28969`_ from rallytime/bp-28825 -- **PR** `#27981`_: (*jtand*) Fixed trailing whitespace lint + * 40f4ac5b21 Add missing import -- **PR** `#27969`_: (*jeffreyctang*) fix parse of { on next line + * 2c43da1578 Take into account a pygit2 bug -- **PR** `#27978`_: (*terminalmage*) Add note about dockerng.inspect_image usage +* **ISSUE** `#28784`_: (`chrigl`_) iptables.get_saved_rules tests pretty much useless (refs: `#28787`_) -- **PR** `#27955`_: (*pass-by-value*) Bp 27868 +* **ISSUE** `#28783`_: (`chrigl`_) iptables.get_saved_rules does not handle family=ipv6 (refs: `#28787`_) -- **PR** `#27953`_: (*The-Loeki*) Fix CloudStack cloud for new 'driver' syntax +* **PR** `#28787`_: (`chrigl`_) closes `#28784`_ + @ *2015-11-17 15:54:04 UTC* -- **PR** `#27965`_: (*ryan-lane*) Fail in boto_asg.present if alarms fail + * 1e9214f4e4 Merge pull request `#28787`_ from chrigl/fix-28784 -- **PR** `#27958`_: (*twangboy*) Added new functionality to win_task.py + * 8639e3e9c3 closes `#28784`_ -- **PR** `#27959`_: (*techhat*) Change __opts__ to self.opts +* **PR** `#28944`_: (`rallytime`_) The ret result must contain 'name', not 'chassis_name' for the state compiler. + @ *2015-11-17 15:34:21 UTC* -- **PR** `#27943`_: (*rallytime*) Back-port `#27910`_ to 2015.8 + * d63344575a Merge pull request `#28944`_ from rallytime/dellchassis-state-name-fix -- **PR** `#27944`_: (*rallytime*) Back-port `#27909`_ to 2015.8 + * f3ea01bbfa Make sure dellchassis.blade_idrac has a name arg and a ret['name'] -- **PR** `#27946`_: (*jtand*) Changed grain to look at osmajorrelease instead of osrelease + * fb718539e9 The ret result must contain 'name', not 'chassis_name' for the state compiler -- **PR** `#27914`_: (*rallytime*) Use eipalloc instead of eni in EC2 interface properties example +* **PR** `#28957`_: (`terminalmage`_) Fix version number for new state option + @ *2015-11-17 15:33:50 UTC* -- **PR** `#27926`_: (*rallytime*) Back-port `#27905`_ to 2015.8 + * fcef9f8995 Merge pull request `#28957`_ from terminalmage/fix-docstring -- **PR** `#27927`_: (*ryan-lane*) Do not manage ingress or egress rules if set to None + * f159000de2 Fix version number for new state option -- **PR** `#27928`_: (*rallytime*) Back-port `#27908`_ to 2015.8 +* **PR** `#28950`_: (`DmitryKuzmenko`_) PR 28812 which test fix + @ *2015-11-17 15:32:16 UTC* -- **PR** `#27676`_: (*ticosax*) [dockerng] WIP No more runtime args passed to docker.start() + * **PR** `#28812`_: (`isbm`_) Enhance 'which' decorator reliability (refs: `#28950`_) -- **PR** `#27885`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 5b680c938a Merge pull request `#28950`_ from DSRCompany/pr/28812_which -- **PR** `#27882`_: (*twangboy*) Created win_task.py module + * 18571000c5 Fix which test in PR`#28812`_ -- **PR** `#27802`_: (*terminalmage*) Correct warning logging when update lock is present for git_pillar/winrepo, add runner function for clearing git_pillar/winrepo locks +* **PR** `#28812`_: (`isbm`_) Enhance 'which' decorator reliability (refs: `#28950`_) + @ *2015-11-17 15:32:10 UTC* -- **PR** `#27886`_: (*rallytime*) Handle group lists as well as comma-separated group strings. + * 73719928f9 Merge pull request `#28812`_ from isbm/isbm-which-decorator-enhancement -- **PR** `#27746`_: (*anlutro*) timezone module: handle timedatectl errors + * 20033eeeb7 Save modified environment path -- **PR** `#27816`_: (*anlutro*) Make system.reboot use `shutdown -r` when available + * 2d43199d20 Preserve 'first found first win' ordering -- **PR** `#27874`_: (*rallytime*) Add mention of Periodic Table naming scheme to deprecation docs + * 1c59eedec2 Enhance 'which' decorator reliability for peculiar environments -- **PR** `#27883`_: (*terminalmage*) Work around --is-ancestor not being present in git-merge-base before git 1.8.0 +* **PR** `#28934`_: (`terminalmage`_) git.latest: Add update_head option to prevent local HEAD from being updated + @ *2015-11-17 15:15:16 UTC* -- **PR** `#27877`_: (*rallytime*) Back-port `#27774`_ to 2015.8 + * facc34efed Merge pull request `#28934`_ from terminalmage/issue27883 -- **PR** `#27878`_: (*rallytime*) Use apache2ctl binary on SUSE in apache module + * 6a35a39ca5 Add update_head option to git.latest -- **PR** `#27879`_: (*cro*) Add docs for 2015.8.2+ changes to proxies + * 3787f7ed00 Change return output of git.fetch to a dict -- **PR** `#27731`_: (*cro*) Add __proxy__ to replace opts['proxymodule'] + * 9ca0f8f440 Add redirect_stderr argument to cmd.run_all -- **PR** `#27745`_: (*anlutro*) Add pip_upgrade arg to virtualenv.managed state +* **PR** `#28937`_: (`rallytime`_) Update dellchassis state example to use correct jinja syntax + @ *2015-11-17 15:12:28 UTC* -- **PR** `#27809`_: (*ticosax*) [dockerng] Remove dockerng.ps caching + * 7da93aad5b Merge pull request `#28937`_ from rallytime/chassis-doc-fix -- **PR** `#27859`_: (*ticosax*) [dockerng] Clarify doc port bindings + * d53713ddba We only need one fancy pillar example to match our state. -- **PR** `#27748`_: (*multani*) Fix `#8646`_ + * e2926b1996 Update dellchassis state example to use correct jinja syntax -- **PR** `#27850`_: (*rallytime*) Back-port `#27722`_ to 2015.8 +* **ISSUE** `#27961`_: (`ahammond`_) aggregate: False should disable aggregation even when state_aggregate: True enabled (refs: `#28889`_) -- **PR** `#27851`_: (*rallytime*) Back-port `#27771`_ to 2015.8 +* **PR** `#28889`_: (`jfindlay`_) state compiler: relax aggregate conditional check + @ *2015-11-16 17:39:24 UTC* -- **PR** `#27833`_: (*jfindlay*) decode path before string ops in fileclient + * 16ebda999e Merge pull request `#28889`_ from jfindlay/aggregate -- **PR** `#27837`_: (*jfindlay*) reverse truth in python_shell documentation + * eb9970019a state compiler: relax aggregate conditional check -- **PR** `#27860`_: (*flavio*) Fix OS related grains on openSUSE and SUSE Linux Enterprise +* **ISSUE** `#24803`_: (`cachedout`_) Rewrite GPG renderer tests (refs: `#25470`_) -- **PR** `#27768`_: (*rallytime*) Clean up bootstrap function to be slightly cleaner +* **PR** `#28921`_: (`rallytime`_) Back-port `#25470`_ to 2015.8 + @ *2015-11-16 17:38:59 UTC* -- **PR** `#27797`_: (*isbm*) Zypper module clusterfix + * **PR** `#25470`_: (`jfindlay`_) `#24314`_ with tests (refs: `#28921`_) -- **PR** `#27849`_: (*rallytime*) Don't require a size parameter for proxmox profiles + * **PR** `#24314`_: (`cedwards`_) refactor gpg renderer; removing dependency on python-gnupg (refs: `#28921`_, `#25470`_) -- **PR** `#27827`_: (*techhat*) Add additional error checking to SPM + * 91a327bbce Merge pull request `#28921`_ from rallytime/bp-25470 -- **PR** `#27826`_: (*martinhoefling*) Fixes `#27825`_ + * a5eee74c20 Change Beryllium to 2015.8.3 release -- **PR** `#27824`_: (*techhat*) Update Azure errors + * 5ce61abf57 rewrite GPG unit tests -- **PR** `#27795`_: (*eguven*) better change reporting for postgres_user groups + * 7aa424209e reduce globals in GPG renderer for easier testing -- **PR** `#27799`_: (*terminalmage*) Fix usage of identity file in git.latest + * de5b6682ef log error and return ciphered txt on decrypt error -- **PR** `#27717`_: (*pass-by-value*) Proxy beacon example + * 6afb344fe3 updated logic to properly detect GPG_KEYDIR path -- **PR** `#27793`_: (*anlutro*) update code that changes log level of salt-ssh shim command + * bc9750b85e refactor gpg renderer; removing dependency on python-gnupg -- **PR** `#27761`_: (*terminalmage*) Merge git pillar data instead of using dict.update() +* **PR** `#28922`_: (`rallytime`_) Change 2015.8.2 release note title to reflect proper version + @ *2015-11-16 16:47:33 UTC* -- **PR** `#27741`_: (*ticosax*) [dockerng] pass filters argument to dockerng.ps + * 3707eb1e7c Merge pull request `#28922`_ from rallytime/release-notes-ver -- **PR** `#27760`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 61029f8db1 Change 2015.8.2 release note title to reflect proper version -- **PR** `#27757`_: (*jfindlay*) fix virtual fcn return doc indentation +* **ISSUE** `#23971`_: (`dumol`_) Problems disabling a service in SLES11 SP3. (refs: `#28891`_) -- **PR** `#27754`_: (*rallytime*) Change test.nop version directive to 2015.8.1 +* **PR** `#28891`_: (`jfindlay`_) rh_service module: fix logic in _chkconfig_is_enabled + @ *2015-11-16 02:44:14 UTC* -- **PR** `#27734`_: (*jacobhammons*) Updated saltstack2 theme to add SaltConf16 banner + * 23eae0d9e0 Merge pull request `#28891`_ from jfindlay/chkconfig_check -- **PR** `#27727`_: (*rallytime*) Merge `#27719`_ w/pylint fix + * e32a9aab85 rh_service._chkconfig_is_enabled unit tests -- **PR** `#27724`_: (*jfindlay*) update __virtual__ return documentation + * 5a93b7e53c rh_service module: fix logic in _chkconfig_is_enabled -- **PR** `#27725`_: (*basepi*) Fix global injection for state cross calls +* **ISSUE** `#24019`_: (`dumol`_) SUSE Linux Enterprise Server 11 SP3 not detected as SLES. (refs: `#28892`_) -- **PR** `#27628`_: (*ticosax*) [dockerng] Add support of `labels` parameter for dockerng +* **PR** `#28892`_: (`jfindlay`_) grains.core: correctly identify SLES 11 distrib_id + @ *2015-11-16 02:30:30 UTC* -- **PR** `#27704`_: (*jacobhammons*) Update compound matcher docs to clarify the usage of alternate delimi… + * 8e6acd97ae Merge pull request `#28892`_ from jfindlay/sles_grain -- **PR** `#27705`_: (*rallytime*) Merge `#27602`_ with final pylint fix + * 1cfdc500c9 grains.core: correctly identify SLES 11 distrib_id -- **PR** `#27691`_: (*notpeter*) Faster timeout (3s vs 2min) for instance metadata lookups. `#13850`_. +* **PR** `#28910`_: (`lorengordon`_) Fix winrepo command in windows pkg mgmt doc + @ *2015-11-16 02:29:12 UTC* -- **PR** `#27696`_: (*blueyed*) loader.proxy: call `_modules_dirs` only once + * cf929c3847 Merge pull request `#28910`_ from lorengordon/patch-1 -- **PR** `#27630`_: (*ticosax*) Expose container_id in mine.get_docker + * 64655398b3 Fix winrepo command in windows pkg mgmt doc -- **PR** `#27600`_: (*blueyed*) dockerng: use docker.version=auto by default +* **PR** `#28896`_: (`rallytime`_) Back-port `#28855`_ to 2015.8 + @ *2015-11-15 00:43:15 UTC* -- **PR** `#27689`_: (*rallytime*) Merge `#27448`_ with test fixes + * **PR** `#28855`_: (`tampakrap`_) fix the os grain in sle11sp4 to be SUSE instead of SLES (refs: `#28896`_) -- **PR** `#27693`_: (*jacobhammons*) initial engines topic, updates to windows repo docs + * 7a4fb9a790 Merge pull request `#28896`_ from rallytime/bp-28855 -- **PR** `#27601`_: (*blueyed*) dockerng: handle None in container.Names + * baf238f270 fix the os grain in sle11sp4 to be SUSE instead of SLES -- **PR** `#27596`_: (*blueyed*) gitfs: fix UnboundLocalError for 'msg' +* **PR** `#28895`_: (`rallytime`_) Back-port `#28823`_ to 2015.8 + @ *2015-11-15 00:43:07 UTC* -- **PR** `#27651`_: (*eliasp*) Check for existence of 'subnetId' key in subnet dict + * **PR** `#28823`_: (`tampakrap`_) Add support for priority and humanname in pkrepo zypper backend (refs: `#28895`_) -- **PR** `#27639`_: (*rallytime*) Docement version added for new artifactory options + * 64dc3c23e0 Merge pull request `#28895`_ from rallytime/bp-28823 -- **PR** `#27677`_: (*rallytime*) Back-port `#27675`_ to 2015.8 + * d167a6b83d Add support for priority and humanname in pkrepo zypper backend -- **PR** `#27637`_: (*rallytime*) Back-port `#27604`_ to 2015.8 +* **ISSUE** `#28754`_: (`kt97679`_) service.enabled fails on xen server (refs: `#28885`_) -- **PR** `#27657`_: (*garethgreenaway*) Fix to pkg state module +* **PR** `#28885`_: (`kt97679`_) fix for: service.enabled fails on xen server `#28754`_ + @ *2015-11-14 04:55:38 UTC* -- **PR** `#27632`_: (*rallytime*) Back-port `#27539`_ to 2015.8 + * a45ce78e20 Merge pull request `#28885`_ from kt97679/2015.8 -- **PR** `#27633`_: (*rallytime*) Back-port `#27559`_ to 2015.8 + * 7d0f1f11cb fix for: service.enabled fails on xen server `#28754`_ -- **PR** `#27579`_: (*rallytime*) Change boto_route53 region default to 'universal' to avoid problems with boto library +* **PR** `#28880`_: (`terminalmage`_) Add "profile" loglevel + @ *2015-11-14 02:07:25 UTC* -- **PR** `#27581`_: (*tkwilliams*) Add support for 'vpc_name' tag in boto_secgroup module and state + * 58b57e77be Merge pull request `#28880`_ from terminalmage/profile-logging -- **PR** `#27624`_: (*nasenbaer13*) Wait for sync is not passed to boto_route53 state + * a62852d407 Add @wraps decorator -- **PR** `#27614`_: (*blueyed*) doc: minor fixes to doc and comments + * cac9f17307 Add profile logging for template rendering -- **PR** `#27627`_: (*eyj*) Fix crash in boto_asg.get_instances if the requested attribute is None + * c625725f70 Add decorator to do profile-level logging for a function -- **PR** `#27616`_: (*jacobhammons*) Updated windows software repository docs + * 5a2b94ce39 Add "profile" loglevel -- **PR** `#27569`_: (*lomeroe*) boto_vpc.get_subnet_association now returns a dict w/key of vpc_id, a… +* **ISSUE** `#28881`_: (`basepi`_) salt-ssh stacktraces on first run (refs: `#28882`_) -- **PR** `#27567`_: (*whiteinge*) Use getattr to fetch psutil.version_info +* **PR** `#28882`_: (`basepi`_) [2015.8] salt-ssh: Check return type to make sure it's an error + @ *2015-11-14 00:14:46 UTC* -- **PR** `#27583`_: (*tkwilliams*) Fixup zypper module + * 5dc7fccb07 Merge pull request `#28882`_ from basepi/salt-ssh.stacktrace.28881 -- **PR** `#27597`_: (*blueyed*) gitfs: remove unused variable "bad_per_remote_conf" + * f1a1cad607 Check return type to make sure it's actually an error -- **PR** `#27585`_: (*ryan-lane*) Fix undefined variable in cron state module +* **PR** `#28867`_: (`rallytime`_) [fx2 grains] Grains functions should return dictionaries + @ *2015-11-13 21:14:13 UTC* -.. _`#3436`: https://github.com/saltstack/salt/issues/3436 -.. _`#8646`: https://github.com/saltstack/salt/issues/8646 -.. _`#12363`: https://github.com/saltstack/salt/issues/12363 -.. _`#13513`: https://github.com/saltstack/salt/issues/13513 -.. _`#13850`: https://github.com/saltstack/salt/issues/13850 -.. _`#20678`: https://github.com/saltstack/salt/issues/20678 -.. _`#22115`: https://github.com/saltstack/salt/pull/22115 + * 430e9376f6 Merge pull request `#28867`_ from rallytime/fx2-grains-patch + + * 022cf5d230 [fx2 grains] Grains functions should return dictionaries + +* **ISSUE** `#28859`_: (`mhoogendoorn`_) ebuild.install runs `refresh_db()` when `refresh=False` is given. (refs: `#28863`_) + +* **PR** `#28863`_: (`mhoogendoorn`_) Fix ebuild.install causing extra refresh_db calls. + @ *2015-11-13 18:46:03 UTC* + + * 304072456e Merge pull request `#28863`_ from mhoogendoorn/fix-issue-28859 + + * eca09b89a4 Fix ebuild.install causing extra refresh_db calls. + +.. _`#23971`: https://github.com/saltstack/salt/issues/23971 +.. _`#24019`: https://github.com/saltstack/salt/issues/24019 .. _`#24314`: https://github.com/saltstack/salt/pull/24314 -.. _`#25315`: https://github.com/saltstack/salt/pull/25315 +.. _`#24803`: https://github.com/saltstack/salt/issues/24803 .. _`#25470`: https://github.com/saltstack/salt/pull/25470 -.. _`#25521`: https://github.com/saltstack/salt/pull/25521 -.. _`#25668`: https://github.com/saltstack/salt/pull/25668 +.. _`#25756`: https://github.com/saltstack/salt/issues/25756 .. _`#25923`: https://github.com/saltstack/salt/pull/25923 -.. _`#25928`: https://github.com/saltstack/salt/pull/25928 .. _`#25946`: https://github.com/saltstack/salt/pull/25946 -.. _`#26336`: https://github.com/saltstack/salt/issues/6336 -.. _`#26945`: https://github.com/saltstack/salt/pull/26945 -.. _`#27099`: https://github.com/saltstack/salt/pull/27099 -.. _`#27116`: https://github.com/saltstack/salt/pull/27116 -.. _`#27201`: https://github.com/saltstack/salt/pull/27201 -.. _`#27286`: https://github.com/saltstack/salt/pull/27286 -.. _`#27343`: https://github.com/saltstack/salt/pull/27343 -.. _`#27379`: https://github.com/saltstack/salt/pull/27379 -.. _`#27390`: https://github.com/saltstack/salt/pull/27390 -.. _`#27442`: https://github.com/saltstack/salt/pull/27442 -.. _`#27448`: https://github.com/saltstack/salt/pull/27448 -.. _`#27476`: https://github.com/saltstack/salt/pull/27476 -.. _`#27509`: https://github.com/saltstack/salt/pull/27509 -.. _`#27515`: https://github.com/saltstack/salt/pull/27515 -.. _`#27524`: https://github.com/saltstack/salt/pull/27524 -.. _`#27535`: https://github.com/saltstack/salt/pull/27535 -.. _`#27539`: https://github.com/saltstack/salt/pull/27539 -.. _`#27546`: https://github.com/saltstack/salt/pull/27546 -.. _`#27557`: https://github.com/saltstack/salt/pull/27557 -.. _`#27559`: https://github.com/saltstack/salt/pull/27559 -.. _`#27562`: https://github.com/saltstack/salt/pull/27562 -.. _`#27566`: https://github.com/saltstack/salt/pull/27566 -.. _`#27567`: https://github.com/saltstack/salt/pull/27567 -.. _`#27568`: https://github.com/saltstack/salt/pull/27568 -.. _`#27569`: https://github.com/saltstack/salt/pull/27569 -.. _`#27579`: https://github.com/saltstack/salt/pull/27579 -.. _`#27581`: https://github.com/saltstack/salt/pull/27581 -.. _`#27582`: https://github.com/saltstack/salt/pull/27582 -.. _`#27583`: https://github.com/saltstack/salt/pull/27583 -.. _`#27585`: https://github.com/saltstack/salt/pull/27585 -.. _`#27596`: https://github.com/saltstack/salt/pull/27596 -.. _`#27597`: https://github.com/saltstack/salt/pull/27597 -.. _`#27600`: https://github.com/saltstack/salt/pull/27600 -.. _`#27601`: https://github.com/saltstack/salt/pull/27601 -.. _`#27602`: https://github.com/saltstack/salt/pull/27602 -.. _`#27604`: https://github.com/saltstack/salt/pull/27604 -.. _`#27612`: https://github.com/saltstack/salt/pull/27612 -.. _`#27614`: https://github.com/saltstack/salt/pull/27614 -.. _`#27616`: https://github.com/saltstack/salt/pull/27616 -.. _`#27624`: https://github.com/saltstack/salt/pull/27624 -.. _`#27627`: https://github.com/saltstack/salt/pull/27627 -.. _`#27628`: https://github.com/saltstack/salt/pull/27628 -.. _`#27630`: https://github.com/saltstack/salt/pull/27630 -.. _`#27632`: https://github.com/saltstack/salt/pull/27632 -.. _`#27633`: https://github.com/saltstack/salt/pull/27633 -.. _`#27637`: https://github.com/saltstack/salt/pull/27637 -.. _`#27639`: https://github.com/saltstack/salt/pull/27639 -.. _`#27640`: https://github.com/saltstack/salt/pull/27640 -.. _`#27641`: https://github.com/saltstack/salt/pull/27641 -.. _`#27644`: https://github.com/saltstack/salt/pull/27644 -.. _`#27651`: https://github.com/saltstack/salt/pull/27651 -.. _`#27656`: https://github.com/saltstack/salt/pull/27656 -.. _`#27657`: https://github.com/saltstack/salt/pull/27657 -.. _`#27659`: https://github.com/saltstack/salt/pull/27659 -.. _`#27671`: https://github.com/saltstack/salt/pull/27671 -.. _`#27675`: https://github.com/saltstack/salt/pull/27675 -.. _`#27676`: https://github.com/saltstack/salt/pull/27676 -.. _`#27677`: https://github.com/saltstack/salt/pull/27677 -.. _`#27680`: https://github.com/saltstack/salt/pull/27680 -.. _`#27681`: https://github.com/saltstack/salt/pull/27681 -.. _`#27682`: https://github.com/saltstack/salt/pull/27682 -.. _`#27683`: https://github.com/saltstack/salt/pull/27683 -.. _`#27684`: https://github.com/saltstack/salt/pull/27684 -.. _`#27686`: https://github.com/saltstack/salt/pull/27686 -.. _`#27689`: https://github.com/saltstack/salt/pull/27689 -.. _`#27691`: https://github.com/saltstack/salt/pull/27691 -.. _`#27693`: https://github.com/saltstack/salt/pull/27693 -.. _`#27695`: https://github.com/saltstack/salt/pull/27695 -.. _`#27696`: https://github.com/saltstack/salt/pull/27696 -.. _`#27704`: https://github.com/saltstack/salt/pull/27704 -.. _`#27705`: https://github.com/saltstack/salt/pull/27705 -.. _`#27706`: https://github.com/saltstack/salt/pull/27706 -.. _`#27717`: https://github.com/saltstack/salt/pull/27717 -.. _`#27719`: https://github.com/saltstack/salt/pull/27719 -.. _`#27722`: https://github.com/saltstack/salt/pull/27722 -.. _`#27724`: https://github.com/saltstack/salt/pull/27724 -.. _`#27725`: https://github.com/saltstack/salt/pull/27725 -.. _`#27726`: https://github.com/saltstack/salt/pull/27726 -.. _`#27727`: https://github.com/saltstack/salt/pull/27727 -.. _`#27731`: https://github.com/saltstack/salt/pull/27731 -.. _`#27732`: https://github.com/saltstack/salt/pull/27732 -.. _`#27733`: https://github.com/saltstack/salt/pull/27733 -.. _`#27734`: https://github.com/saltstack/salt/pull/27734 -.. _`#27741`: https://github.com/saltstack/salt/pull/27741 -.. _`#27745`: https://github.com/saltstack/salt/pull/27745 -.. _`#27746`: https://github.com/saltstack/salt/pull/27746 -.. _`#27747`: https://github.com/saltstack/salt/pull/27747 -.. _`#27748`: https://github.com/saltstack/salt/pull/27748 -.. _`#27754`: https://github.com/saltstack/salt/pull/27754 -.. _`#27757`: https://github.com/saltstack/salt/pull/27757 -.. _`#27758`: https://github.com/saltstack/salt/pull/27758 -.. _`#27759`: https://github.com/saltstack/salt/pull/27759 -.. _`#27760`: https://github.com/saltstack/salt/pull/27760 -.. _`#27761`: https://github.com/saltstack/salt/pull/27761 -.. _`#27766`: https://github.com/saltstack/salt/pull/27766 -.. _`#27768`: https://github.com/saltstack/salt/pull/27768 -.. _`#27771`: https://github.com/saltstack/salt/pull/27771 -.. _`#27774`: https://github.com/saltstack/salt/pull/27774 -.. _`#27776`: https://github.com/saltstack/salt/pull/27776 -.. _`#27791`: https://github.com/saltstack/salt/pull/27791 -.. _`#27793`: https://github.com/saltstack/salt/pull/27793 -.. _`#27795`: https://github.com/saltstack/salt/pull/27795 -.. _`#27797`: https://github.com/saltstack/salt/pull/27797 -.. _`#27799`: https://github.com/saltstack/salt/pull/27799 -.. _`#27802`: https://github.com/saltstack/salt/pull/27802 -.. _`#27806`: https://github.com/saltstack/salt/pull/27806 -.. _`#27809`: https://github.com/saltstack/salt/pull/27809 -.. _`#27816`: https://github.com/saltstack/salt/pull/27816 -.. _`#27824`: https://github.com/saltstack/salt/pull/27824 -.. _`#27825`: https://github.com/saltstack/salt/issues/27825 -.. _`#27826`: https://github.com/saltstack/salt/pull/27826 -.. _`#27827`: https://github.com/saltstack/salt/pull/27827 -.. _`#27833`: https://github.com/saltstack/salt/pull/27833 -.. _`#27837`: https://github.com/saltstack/salt/pull/27837 -.. _`#27838`: https://github.com/saltstack/salt/pull/27838 -.. _`#27841`: https://github.com/saltstack/salt/pull/27841 -.. _`#27849`: https://github.com/saltstack/salt/pull/27849 -.. _`#27850`: https://github.com/saltstack/salt/pull/27850 -.. _`#27851`: https://github.com/saltstack/salt/pull/27851 -.. _`#27852`: https://github.com/saltstack/salt/pull/27852 -.. _`#27859`: https://github.com/saltstack/salt/pull/27859 -.. _`#27860`: https://github.com/saltstack/salt/pull/27860 -.. _`#27868`: https://github.com/saltstack/salt/pull/27868 -.. _`#27874`: https://github.com/saltstack/salt/pull/27874 -.. _`#27876`: https://github.com/saltstack/salt/pull/27876 -.. _`#27877`: https://github.com/saltstack/salt/pull/27877 -.. _`#27878`: https://github.com/saltstack/salt/pull/27878 -.. _`#27879`: https://github.com/saltstack/salt/pull/27879 -.. _`#27882`: https://github.com/saltstack/salt/pull/27882 -.. _`#27883`: https://github.com/saltstack/salt/pull/27883 -.. _`#27885`: https://github.com/saltstack/salt/pull/27885 -.. _`#27886`: https://github.com/saltstack/salt/pull/27886 -.. _`#27891`: https://github.com/saltstack/salt/pull/27891 -.. _`#27905`: https://github.com/saltstack/salt/pull/27905 -.. _`#27908`: https://github.com/saltstack/salt/pull/27908 -.. _`#27909`: https://github.com/saltstack/salt/pull/27909 -.. _`#27910`: https://github.com/saltstack/salt/pull/27910 -.. _`#27913`: https://github.com/saltstack/salt/pull/27913 -.. _`#27914`: https://github.com/saltstack/salt/pull/27914 -.. _`#27922`: https://github.com/saltstack/salt/pull/27922 -.. _`#27926`: https://github.com/saltstack/salt/pull/27926 -.. _`#27927`: https://github.com/saltstack/salt/pull/27927 -.. _`#27928`: https://github.com/saltstack/salt/pull/27928 -.. _`#27933`: https://github.com/saltstack/salt/pull/27933 -.. _`#27943`: https://github.com/saltstack/salt/pull/27943 -.. _`#27944`: https://github.com/saltstack/salt/pull/27944 -.. _`#27946`: https://github.com/saltstack/salt/pull/27946 -.. _`#27953`: https://github.com/saltstack/salt/pull/27953 -.. _`#27955`: https://github.com/saltstack/salt/pull/27955 -.. _`#27958`: https://github.com/saltstack/salt/pull/27958 -.. _`#27959`: https://github.com/saltstack/salt/pull/27959 -.. _`#27965`: https://github.com/saltstack/salt/pull/27965 -.. _`#27969`: https://github.com/saltstack/salt/pull/27969 -.. _`#27977`: https://github.com/saltstack/salt/pull/27977 -.. _`#27978`: https://github.com/saltstack/salt/pull/27978 -.. _`#27979`: https://github.com/saltstack/salt/pull/27979 -.. _`#27981`: https://github.com/saltstack/salt/pull/27981 -.. _`#27982`: https://github.com/saltstack/salt/pull/27982 -.. _`#27983`: https://github.com/saltstack/salt/pull/27983 -.. _`#27984`: https://github.com/saltstack/salt/pull/27984 -.. _`#27985`: https://github.com/saltstack/salt/pull/27985 -.. _`#27986`: https://github.com/saltstack/salt/pull/27986 -.. _`#27989`: https://github.com/saltstack/salt/pull/27989 -.. _`#27991`: https://github.com/saltstack/salt/pull/27991 -.. _`#27992`: https://github.com/saltstack/salt/pull/27992 -.. _`#27994`: https://github.com/saltstack/salt/pull/27994 -.. _`#27995`: https://github.com/saltstack/salt/pull/27995 -.. _`#27996`: https://github.com/saltstack/salt/pull/27996 -.. _`#27997`: https://github.com/saltstack/salt/pull/27997 -.. _`#28001`: https://github.com/saltstack/salt/pull/28001 -.. _`#28003`: https://github.com/saltstack/salt/pull/28003 -.. _`#28008`: https://github.com/saltstack/salt/pull/28008 -.. _`#28012`: https://github.com/saltstack/salt/pull/28012 -.. _`#28013`: https://github.com/saltstack/salt/pull/28013 -.. _`#28018`: https://github.com/saltstack/salt/pull/28018 -.. _`#28019`: https://github.com/saltstack/salt/pull/28019 -.. _`#28020`: https://github.com/saltstack/salt/pull/28020 -.. _`#28021`: https://github.com/saltstack/salt/pull/28021 -.. _`#28022`: https://github.com/saltstack/salt/pull/28022 -.. _`#28027`: https://github.com/saltstack/salt/pull/28027 -.. _`#28029`: https://github.com/saltstack/salt/pull/28029 -.. _`#28031`: https://github.com/saltstack/salt/pull/28031 -.. _`#28032`: https://github.com/saltstack/salt/pull/28032 -.. _`#28033`: https://github.com/saltstack/salt/pull/28033 -.. _`#28037`: https://github.com/saltstack/salt/pull/28037 -.. _`#28040`: https://github.com/saltstack/salt/pull/28040 -.. _`#28041`: https://github.com/saltstack/salt/pull/28041 -.. _`#28042`: https://github.com/saltstack/salt/pull/28042 -.. _`#28043`: https://github.com/saltstack/salt/pull/28043 -.. _`#28046`: https://github.com/saltstack/salt/pull/28046 -.. _`#28047`: https://github.com/saltstack/salt/pull/28047 -.. _`#28050`: https://github.com/saltstack/salt/pull/28050 -.. _`#28055`: https://github.com/saltstack/salt/pull/28055 -.. _`#28056`: https://github.com/saltstack/salt/pull/28056 -.. _`#28058`: https://github.com/saltstack/salt/pull/28058 -.. _`#28059`: https://github.com/saltstack/salt/pull/28059 -.. _`#28061`: https://github.com/saltstack/salt/pull/28061 -.. _`#28063`: https://github.com/saltstack/salt/pull/28063 -.. _`#28066`: https://github.com/saltstack/salt/pull/28066 -.. _`#28069`: https://github.com/saltstack/salt/pull/28069 -.. _`#28076`: https://github.com/saltstack/salt/pull/28076 -.. _`#28079`: https://github.com/saltstack/salt/pull/28079 -.. _`#28081`: https://github.com/saltstack/salt/pull/28081 -.. _`#28084`: https://github.com/saltstack/salt/pull/28084 -.. _`#28087`: https://github.com/saltstack/salt/pull/28087 -.. _`#28095`: https://github.com/saltstack/salt/pull/28095 -.. _`#28096`: https://github.com/saltstack/salt/pull/28096 -.. _`#28097`: https://github.com/saltstack/salt/pull/28097 -.. _`#28098`: https://github.com/saltstack/salt/pull/28098 -.. _`#28103`: https://github.com/saltstack/salt/pull/28103 -.. _`#28104`: https://github.com/saltstack/salt/pull/28104 -.. _`#28105`: https://github.com/saltstack/salt/pull/28105 -.. _`#28108`: https://github.com/saltstack/salt/pull/28108 -.. _`#28109`: https://github.com/saltstack/salt/pull/28109 -.. _`#28110`: https://github.com/saltstack/salt/pull/28110 -.. _`#28113`: https://github.com/saltstack/salt/pull/28113 -.. _`#28116`: https://github.com/saltstack/salt/pull/28116 -.. _`#28117`: https://github.com/saltstack/salt/pull/28117 -.. _`#28119`: https://github.com/saltstack/salt/pull/28119 +.. _`#27432`: https://github.com/saltstack/salt/issues/27432 +.. _`#27961`: https://github.com/saltstack/salt/issues/27961 .. _`#28130`: https://github.com/saltstack/salt/pull/28130 -.. _`#28134`: https://github.com/saltstack/salt/pull/28134 -.. _`#28138`: https://github.com/saltstack/salt/pull/28138 -.. _`#28139`: https://github.com/saltstack/salt/pull/28139 -.. _`#28140`: https://github.com/saltstack/salt/pull/28140 -.. _`#28141`: https://github.com/saltstack/salt/pull/28141 -.. _`#28143`: https://github.com/saltstack/salt/pull/28143 -.. _`#28146`: https://github.com/saltstack/salt/pull/28146 -.. _`#28148`: https://github.com/saltstack/salt/pull/28148 -.. _`#28149`: https://github.com/saltstack/salt/pull/28149 -.. _`#28155`: https://github.com/saltstack/salt/pull/28155 -.. _`#28167`: https://github.com/saltstack/salt/pull/28167 -.. _`#28168`: https://github.com/saltstack/salt/pull/28168 -.. _`#28174`: https://github.com/saltstack/salt/pull/28174 -.. _`#28175`: https://github.com/saltstack/salt/pull/28175 -.. _`#28176`: https://github.com/saltstack/salt/pull/28176 -.. _`#28181`: https://github.com/saltstack/salt/pull/28181 -.. _`#28182`: https://github.com/saltstack/salt/pull/28182 -.. _`#28185`: https://github.com/saltstack/salt/pull/28185 -.. _`#28187`: https://github.com/saltstack/salt/pull/28187 -.. _`#28198`: https://github.com/saltstack/salt/pull/28198 -.. _`#28210`: https://github.com/saltstack/salt/pull/28210 -.. _`#28211`: https://github.com/saltstack/salt/pull/28211 -.. _`#28213`: https://github.com/saltstack/salt/pull/28213 -.. _`#28214`: https://github.com/saltstack/salt/pull/28214 -.. _`#28224`: https://github.com/saltstack/salt/pull/28224 -.. _`#28228`: https://github.com/saltstack/salt/pull/28228 -.. _`#28231`: https://github.com/saltstack/salt/pull/28231 -.. _`#28232`: https://github.com/saltstack/salt/pull/28232 -.. _`#28238`: https://github.com/saltstack/salt/pull/28238 -.. _`#28253`: https://github.com/saltstack/salt/pull/28253 -.. _`#28255`: https://github.com/saltstack/salt/pull/28255 -.. _`#28258`: https://github.com/saltstack/salt/pull/28258 -.. _`#28260`: https://github.com/saltstack/salt/pull/28260 -.. _`#28263`: https://github.com/saltstack/salt/pull/28263 -.. _`#28265`: https://github.com/saltstack/salt/pull/28265 -.. _`#28266`: https://github.com/saltstack/salt/pull/28266 -.. _`#28269`: https://github.com/saltstack/salt/pull/28269 -.. _`#28270`: https://github.com/saltstack/salt/pull/28270 -.. _`#28271`: https://github.com/saltstack/salt/pull/28271 -.. _`#28276`: https://github.com/saltstack/salt/pull/28276 -.. _`#28280`: https://github.com/saltstack/salt/pull/28280 -.. _`#28282`: https://github.com/saltstack/salt/pull/28282 -.. _`#28293`: https://github.com/saltstack/salt/pull/28293 -.. _`#28294`: https://github.com/saltstack/salt/pull/28294 -.. _`#28297`: https://github.com/saltstack/salt/pull/28297 -.. _`#28299`: https://github.com/saltstack/salt/pull/28299 -.. _`#28302`: https://github.com/saltstack/salt/pull/28302 -.. _`#28305`: https://github.com/saltstack/salt/pull/28305 -.. _`#28306`: https://github.com/saltstack/salt/pull/28306 -.. _`#28308`: https://github.com/saltstack/salt/pull/28308 -.. _`#28315`: https://github.com/saltstack/salt/pull/28315 -.. _`#28330`: https://github.com/saltstack/salt/pull/28330 -.. _`#28334`: https://github.com/saltstack/salt/pull/28334 -.. _`#28340`: https://github.com/saltstack/salt/pull/28340 -.. _`#28342`: https://github.com/saltstack/salt/pull/28342 -.. _`#28343`: https://github.com/saltstack/salt/pull/28343 -.. _`#28344`: https://github.com/saltstack/salt/pull/28344 -.. _`#28346`: https://github.com/saltstack/salt/pull/28346 -.. _`#28348`: https://github.com/saltstack/salt/pull/28348 -.. _`#28353`: https://github.com/saltstack/salt/pull/28353 -.. _`#28358`: https://github.com/saltstack/salt/pull/28358 -.. _`#28359`: https://github.com/saltstack/salt/pull/28359 -.. _`#28360`: https://github.com/saltstack/salt/pull/28360 -.. _`#28361`: https://github.com/saltstack/salt/pull/28361 -.. _`#28364`: https://github.com/saltstack/salt/pull/28364 -.. _`#28366`: https://github.com/saltstack/salt/pull/28366 -.. _`#28370`: https://github.com/saltstack/salt/pull/28370 -.. _`#28373`: https://github.com/saltstack/salt/pull/28373 -.. _`#28374`: https://github.com/saltstack/salt/pull/28374 -.. _`#28375`: https://github.com/saltstack/salt/pull/28375 -.. _`#28376`: https://github.com/saltstack/salt/pull/28376 -.. _`#28377`: https://github.com/saltstack/salt/pull/28377 -.. _`#28380`: https://github.com/saltstack/salt/pull/28380 -.. _`#28381`: https://github.com/saltstack/salt/pull/28381 -.. _`#28388`: https://github.com/saltstack/salt/pull/28388 -.. _`#28395`: https://github.com/saltstack/salt/pull/28395 -.. _`#28400`: https://github.com/saltstack/salt/pull/28400 -.. _`#28404`: https://github.com/saltstack/salt/pull/28404 -.. _`#28405`: https://github.com/saltstack/salt/pull/28405 -.. _`#28406`: https://github.com/saltstack/salt/pull/28406 -.. _`#28407`: https://github.com/saltstack/salt/pull/28407 -.. _`#28410`: https://github.com/saltstack/salt/pull/28410 -.. _`#28413`: https://github.com/saltstack/salt/pull/28413 -.. _`#28417`: https://github.com/saltstack/salt/pull/28417 -.. _`#28422`: https://github.com/saltstack/salt/pull/28422 -.. _`#28425`: https://github.com/saltstack/salt/pull/28425 -.. _`#28426`: https://github.com/saltstack/salt/pull/28426 -.. _`#28427`: https://github.com/saltstack/salt/pull/28427 -.. _`#28448`: https://github.com/saltstack/salt/pull/28448 -.. _`#28454`: https://github.com/saltstack/salt/pull/28454 -.. _`#28456`: https://github.com/saltstack/salt/pull/28456 -.. _`#28457`: https://github.com/saltstack/salt/pull/28457 -.. _`#28460`: https://github.com/saltstack/salt/pull/28460 -.. _`#28461`: https://github.com/saltstack/salt/pull/28461 -.. _`#28464`: https://github.com/saltstack/salt/pull/28464 -.. _`#28465`: https://github.com/saltstack/salt/pull/28465 -.. _`#28472`: https://github.com/saltstack/salt/pull/28472 -.. _`#28473`: https://github.com/saltstack/salt/pull/28473 -.. _`#28484`: https://github.com/saltstack/salt/issues/28484 -.. _`#28485`: https://github.com/saltstack/salt/pull/28485 -.. _`#28486`: https://github.com/saltstack/salt/pull/28486 -.. _`#28487`: https://github.com/saltstack/salt/pull/28487 -.. _`#28489`: https://github.com/saltstack/salt/pull/28489 -.. _`#28491`: https://github.com/saltstack/salt/pull/28491 -.. _`#28492`: https://github.com/saltstack/salt/pull/28492 -.. _`#28493`: https://github.com/saltstack/salt/pull/28493 -.. _`#28494`: https://github.com/saltstack/salt/pull/28494 -.. _`#28502`: https://github.com/saltstack/salt/pull/28502 -.. _`#28506`: https://github.com/saltstack/salt/pull/28506 -.. _`#28508`: https://github.com/saltstack/salt/pull/28508 -.. _`#28512`: https://github.com/saltstack/salt/pull/28512 -.. _`#28514`: https://github.com/saltstack/salt/pull/28514 -.. _`#28516`: https://github.com/saltstack/salt/pull/28516 -.. _`#28517`: https://github.com/saltstack/salt/pull/28517 -.. _`#28525`: https://github.com/saltstack/salt/pull/28525 -.. _`#28526`: https://github.com/saltstack/salt/issues/28526 -.. _`#28527`: https://github.com/saltstack/salt/issues/28527 -.. _`#28529`: https://github.com/saltstack/salt/pull/28529 -.. _`#28530`: https://github.com/saltstack/salt/pull/28530 -.. _`#28531`: https://github.com/saltstack/salt/pull/28531 -.. _`#28533`: https://github.com/saltstack/salt/pull/28533 -.. _`#28534`: https://github.com/saltstack/salt/pull/28534 -.. _`#28535`: https://github.com/saltstack/salt/pull/28535 -.. _`#28536`: https://github.com/saltstack/salt/pull/28536 -.. _`#28537`: https://github.com/saltstack/salt/pull/28537 -.. _`#28538`: https://github.com/saltstack/salt/pull/28538 -.. _`#28541`: https://github.com/saltstack/salt/pull/28541 -.. _`#28543`: https://github.com/saltstack/salt/pull/28543 -.. _`#28544`: https://github.com/saltstack/salt/pull/28544 -.. _`#28545`: https://github.com/saltstack/salt/pull/28545 -.. _`#28546`: https://github.com/saltstack/salt/pull/28546 -.. _`#28547`: https://github.com/saltstack/salt/pull/28547 -.. _`#28548`: https://github.com/saltstack/salt/pull/28548 -.. _`#28550`: https://github.com/saltstack/salt/pull/28550 -.. _`#28560`: https://github.com/saltstack/salt/pull/28560 -.. _`#28561`: https://github.com/saltstack/salt/pull/28561 -.. _`#28563`: https://github.com/saltstack/salt/pull/28563 -.. _`#28564`: https://github.com/saltstack/salt/pull/28564 -.. _`#28573`: https://github.com/saltstack/salt/pull/28573 -.. _`#28576`: https://github.com/saltstack/salt/pull/28576 -.. _`#28578`: https://github.com/saltstack/salt/pull/28578 -.. _`#28579`: https://github.com/saltstack/salt/pull/28579 -.. _`#28581`: https://github.com/saltstack/salt/pull/28581 -.. _`#28584`: https://github.com/saltstack/salt/pull/28584 -.. _`#28587`: https://github.com/saltstack/salt/pull/28587 -.. _`#28593`: https://github.com/saltstack/salt/pull/28593 -.. _`#28596`: https://github.com/saltstack/salt/pull/28596 -.. _`#28602`: https://github.com/saltstack/salt/pull/28602 -.. _`#28610`: https://github.com/saltstack/salt/pull/28610 -.. _`#28611`: https://github.com/saltstack/salt/pull/28611 -.. _`#28612`: https://github.com/saltstack/salt/pull/28612 -.. _`#28613`: https://github.com/saltstack/salt/pull/28613 -.. _`#28614`: https://github.com/saltstack/salt/pull/28614 -.. _`#28615`: https://github.com/saltstack/salt/pull/28615 -.. _`#28617`: https://github.com/saltstack/salt/pull/28617 -.. _`#28622`: https://github.com/saltstack/salt/pull/28622 -.. _`#28624`: https://github.com/saltstack/salt/pull/28624 -.. _`#28627`: https://github.com/saltstack/salt/pull/28627 -.. _`#28630`: https://github.com/saltstack/salt/pull/28630 -.. _`#28632`: https://github.com/saltstack/salt/pull/28632 -.. _`#28638`: https://github.com/saltstack/salt/pull/28638 -.. _`#28644`: https://github.com/saltstack/salt/pull/28644 -.. _`#28645`: https://github.com/saltstack/salt/pull/28645 -.. _`#28646`: https://github.com/saltstack/salt/pull/28646 -.. _`#28647`: https://github.com/saltstack/salt/pull/28647 -.. _`#28648`: https://github.com/saltstack/salt/pull/28648 -.. _`#28649`: https://github.com/saltstack/salt/pull/28649 -.. _`#28653`: https://github.com/saltstack/salt/pull/28653 -.. _`#28656`: https://github.com/saltstack/salt/pull/28656 -.. _`#28658`: https://github.com/saltstack/salt/pull/28658 -.. _`#28660`: https://github.com/saltstack/salt/pull/28660 -.. _`#28662`: https://github.com/saltstack/salt/pull/28662 -.. _`#28665`: https://github.com/saltstack/salt/pull/28665 -.. _`#28666`: https://github.com/saltstack/salt/pull/28666 -.. _`#28667`: https://github.com/saltstack/salt/pull/28667 -.. _`#28668`: https://github.com/saltstack/salt/pull/28668 -.. _`#28669`: https://github.com/saltstack/salt/pull/28669 -.. _`#28670`: https://github.com/saltstack/salt/pull/28670 -.. _`#28672`: https://github.com/saltstack/salt/pull/28672 -.. _`#28673`: https://github.com/saltstack/salt/pull/28673 -.. _`#28679`: https://github.com/saltstack/salt/pull/28679 -.. _`#28690`: https://github.com/saltstack/salt/pull/28690 -.. _`#28694`: https://github.com/saltstack/salt/pull/28694 -.. _`#28695`: https://github.com/saltstack/salt/pull/28695 -.. _`#28698`: https://github.com/saltstack/salt/pull/28698 -.. _`#28699`: https://github.com/saltstack/salt/pull/28699 -.. _`#28700`: https://github.com/saltstack/salt/pull/28700 -.. _`#28703`: https://github.com/saltstack/salt/pull/28703 -.. _`#28705`: https://github.com/saltstack/salt/pull/28705 -.. _`#28709`: https://github.com/saltstack/salt/pull/28709 -.. _`#28710`: https://github.com/saltstack/salt/pull/28710 -.. _`#28713`: https://github.com/saltstack/salt/pull/28713 -.. _`#28716`: https://github.com/saltstack/salt/pull/28716 -.. _`#28717`: https://github.com/saltstack/salt/pull/28717 -.. _`#28718`: https://github.com/saltstack/salt/pull/28718 -.. _`#28719`: https://github.com/saltstack/salt/pull/28719 -.. _`#28725`: https://github.com/saltstack/salt/pull/28725 -.. _`#28730`: https://github.com/saltstack/salt/pull/28730 +.. _`#28311`: https://github.com/saltstack/salt/issues/28311 .. _`#28731`: https://github.com/saltstack/salt/pull/28731 .. _`#28740`: https://github.com/saltstack/salt/pull/28740 -.. _`#28744`: https://github.com/saltstack/salt/pull/28744 -.. _`#28746`: https://github.com/saltstack/salt/pull/28746 -.. _`#28752`: https://github.com/saltstack/salt/pull/28752 .. _`#28754`: https://github.com/saltstack/salt/issues/28754 -.. _`#28755`: https://github.com/saltstack/salt/pull/28755 -.. _`#28756`: https://github.com/saltstack/salt/pull/28756 -.. _`#28757`: https://github.com/saltstack/salt/pull/28757 -.. _`#28758`: https://github.com/saltstack/salt/pull/28758 -.. _`#28759`: https://github.com/saltstack/salt/pull/28759 -.. _`#28760`: https://github.com/saltstack/salt/pull/28760 -.. _`#28764`: https://github.com/saltstack/salt/pull/28764 -.. _`#28768`: https://github.com/saltstack/salt/pull/28768 -.. _`#28772`: https://github.com/saltstack/salt/pull/28772 -.. _`#28774`: https://github.com/saltstack/salt/pull/28774 -.. _`#28775`: https://github.com/saltstack/salt/pull/28775 -.. _`#28776`: https://github.com/saltstack/salt/pull/28776 -.. _`#28777`: https://github.com/saltstack/salt/pull/28777 -.. _`#28778`: https://github.com/saltstack/salt/pull/28778 -.. _`#28782`: https://github.com/saltstack/salt/pull/28782 -.. _`#28784`: https://github.com/saltstack/salt/pull/issues/28784 -.. _`#28786`: https://github.com/saltstack/salt/pull/28786 +.. _`#28761`: https://github.com/saltstack/salt/issues/28761 +.. _`#28783`: https://github.com/saltstack/salt/issues/28783 +.. _`#28784`: https://github.com/saltstack/salt/issues/28784 .. _`#28787`: https://github.com/saltstack/salt/pull/28787 -.. _`#28789`: https://github.com/saltstack/salt/pull/28789 -.. _`#28803`: https://github.com/saltstack/salt/pull/28803 -.. _`#28804`: https://github.com/saltstack/salt/pull/28804 +.. _`#28810`: https://github.com/saltstack/salt/issues/28810 .. _`#28812`: https://github.com/saltstack/salt/pull/28812 -.. _`#28820`: https://github.com/saltstack/salt/pull/28820 .. _`#28823`: https://github.com/saltstack/salt/pull/28823 -.. _`#28824`: https://github.com/saltstack/salt/pull/28824 .. _`#28825`: https://github.com/saltstack/salt/pull/28825 -.. _`#28826`: https://github.com/saltstack/salt/pull/28826 -.. _`#28827`: https://github.com/saltstack/salt/pull/28827 -.. _`#28829`: https://github.com/saltstack/salt/pull/28829 -.. _`#28832`: https://github.com/saltstack/salt/pull/28832 -.. _`#28833`: https://github.com/saltstack/salt/pull/28833 -.. _`#28834`: https://github.com/saltstack/salt/pull/28834 -.. _`#28836`: https://github.com/saltstack/salt/pull/28836 -.. _`#28837`: https://github.com/saltstack/salt/pull/28837 +.. _`#28830`: https://github.com/saltstack/salt/issues/28830 .. _`#28839`: https://github.com/saltstack/salt/pull/28839 -.. _`#28842`: https://github.com/saltstack/salt/pull/28842 -.. _`#28848`: https://github.com/saltstack/salt/pull/28848 -.. _`#28851`: https://github.com/saltstack/salt/pull/28851 -.. _`#28853`: https://github.com/saltstack/salt/pull/28853 .. _`#28855`: https://github.com/saltstack/salt/pull/28855 .. _`#28856`: https://github.com/saltstack/salt/pull/28856 .. _`#28857`: https://github.com/saltstack/salt/pull/28857 +.. _`#28859`: https://github.com/saltstack/salt/issues/28859 .. _`#28863`: https://github.com/saltstack/salt/pull/28863 .. _`#28864`: https://github.com/saltstack/salt/pull/28864 -.. _`#28865`: https://github.com/saltstack/salt/pull/28865 .. _`#28867`: https://github.com/saltstack/salt/pull/28867 .. _`#28871`: https://github.com/saltstack/salt/pull/28871 -.. _`#28873`: https://github.com/saltstack/salt/pull/28873 .. _`#28880`: https://github.com/saltstack/salt/pull/28880 +.. _`#28881`: https://github.com/saltstack/salt/issues/28881 .. _`#28882`: https://github.com/saltstack/salt/pull/28882 .. _`#28885`: https://github.com/saltstack/salt/pull/28885 .. _`#28889`: https://github.com/saltstack/salt/pull/28889 @@ -1171,6 +803,7 @@ Changes: .. _`#28902`: https://github.com/saltstack/salt/pull/28902 .. _`#28908`: https://github.com/saltstack/salt/pull/28908 .. _`#28910`: https://github.com/saltstack/salt/pull/28910 +.. _`#28911`: https://github.com/saltstack/salt/issues/28911 .. _`#28919`: https://github.com/saltstack/salt/pull/28919 .. _`#28921`: https://github.com/saltstack/salt/pull/28921 .. _`#28922`: https://github.com/saltstack/salt/pull/28922 @@ -1179,6 +812,7 @@ Changes: .. _`#28934`: https://github.com/saltstack/salt/pull/28934 .. _`#28937`: https://github.com/saltstack/salt/pull/28937 .. _`#28944`: https://github.com/saltstack/salt/pull/28944 +.. _`#28945`: https://github.com/saltstack/salt/issues/28945 .. _`#28949`: https://github.com/saltstack/salt/pull/28949 .. _`#28950`: https://github.com/saltstack/salt/pull/28950 .. _`#28957`: https://github.com/saltstack/salt/pull/28957 @@ -1186,11 +820,15 @@ Changes: .. _`#28967`: https://github.com/saltstack/salt/pull/28967 .. _`#28969`: https://github.com/saltstack/salt/pull/28969 .. _`#28970`: https://github.com/saltstack/salt/pull/28970 +.. _`#28981`: https://github.com/saltstack/salt/issues/28981 .. _`#28982`: https://github.com/saltstack/salt/pull/28982 .. _`#28983`: https://github.com/saltstack/salt/pull/28983 +.. _`#28995`: https://github.com/saltstack/salt/issues/28995 .. _`#29000`: https://github.com/saltstack/salt/pull/29000 +.. _`#29005`: https://github.com/saltstack/salt/issues/29005 .. _`#29011`: https://github.com/saltstack/salt/pull/29011 .. _`#29014`: https://github.com/saltstack/salt/pull/29014 +.. _`#29015`: https://github.com/saltstack/salt/issues/29015 .. _`#29017`: https://github.com/saltstack/salt/pull/29017 .. _`#29020`: https://github.com/saltstack/salt/pull/29020 .. _`#29024`: https://github.com/saltstack/salt/pull/29024 @@ -1198,8 +836,6 @@ Changes: .. _`#29047`: https://github.com/saltstack/salt/pull/29047 .. _`#29048`: https://github.com/saltstack/salt/pull/29048 .. _`#29050`: https://github.com/saltstack/salt/pull/29050 -.. _`#29053`: https://github.com/saltstack/salt/pull/29053 -.. _`#29055`: https://github.com/saltstack/salt/pull/29055 .. _`#29057`: https://github.com/saltstack/salt/pull/29057 .. _`#29065`: https://github.com/saltstack/salt/pull/29065 .. _`#29070`: https://github.com/saltstack/salt/pull/29070 @@ -1208,13 +844,12 @@ Changes: .. _`#29083`: https://github.com/saltstack/salt/pull/29083 .. _`#29084`: https://github.com/saltstack/salt/pull/29084 .. _`#29090`: https://github.com/saltstack/salt/pull/29090 -.. _`#29093`: https://github.com/saltstack/salt/pull/29093 .. _`#29095`: https://github.com/saltstack/salt/pull/29095 .. _`#29096`: https://github.com/saltstack/salt/pull/29096 .. _`#29097`: https://github.com/saltstack/salt/pull/29097 +.. _`#29100`: https://github.com/saltstack/salt/issues/29100 .. _`#29107`: https://github.com/saltstack/salt/issues/29107 .. _`#29108`: https://github.com/saltstack/salt/pull/29108 -.. _`#29113`: https://github.com/saltstack/salt/pull/29113 .. _`#29118`: https://github.com/saltstack/salt/pull/29118 .. _`#29120`: https://github.com/saltstack/salt/pull/29120 .. _`#29122`: https://github.com/saltstack/salt/pull/29122 @@ -1224,8 +859,54 @@ Changes: .. _`#29128`: https://github.com/saltstack/salt/pull/29128 .. _`#29138`: https://github.com/saltstack/salt/pull/29138 .. _`#29141`: https://github.com/saltstack/salt/pull/29141 +.. _`#29144`: https://github.com/saltstack/salt/issues/29144 .. _`#29145`: https://github.com/saltstack/salt/pull/29145 +.. _`#29147`: https://github.com/saltstack/salt/issues/29147 .. _`#29148`: https://github.com/saltstack/salt/pull/29148 .. _`#29164`: https://github.com/saltstack/salt/pull/29164 .. _`#29167`: https://github.com/saltstack/salt/pull/29167 .. _`#29172`: https://github.com/saltstack/salt/pull/29172 +.. _`#29173`: https://github.com/saltstack/salt/pull/29173 +.. _`#8516`: https://github.com/saltstack/salt/issues/8516 +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`RealKelsar`: https://github.com/RealKelsar +.. _`ahammond`: https://github.com/ahammond +.. _`alexproca`: https://github.com/alexproca +.. _`anlutro`: https://github.com/anlutro +.. _`basepi`: https://github.com/basepi +.. _`bogdanr`: https://github.com/bogdanr +.. _`cachedout`: https://github.com/cachedout +.. _`ccmills`: https://github.com/ccmills +.. _`cedwards`: https://github.com/cedwards +.. _`chrigl`: https://github.com/chrigl +.. _`cro`: https://github.com/cro +.. _`dumol`: https://github.com/dumol +.. _`fcrozat`: https://github.com/fcrozat +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`isbm`: https://github.com/isbm +.. _`jakehilton`: https://github.com/jakehilton +.. _`jfindlay`: https://github.com/jfindlay +.. _`kiorky`: https://github.com/kiorky +.. _`kt97679`: https://github.com/kt97679 +.. _`lomeroe`: https://github.com/lomeroe +.. _`lorengordon`: https://github.com/lorengordon +.. _`mafrosis`: https://github.com/mafrosis +.. _`mhoogendoorn`: https://github.com/mhoogendoorn +.. _`mimianddaniel`: https://github.com/mimianddaniel +.. _`nmadhok`: https://github.com/nmadhok +.. _`nshalman`: https://github.com/nshalman +.. _`optix2000`: https://github.com/optix2000 +.. _`paulnivin`: https://github.com/paulnivin +.. _`quantonganh`: https://github.com/quantonganh +.. _`rallytime`: https://github.com/rallytime +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`schwing`: https://github.com/schwing +.. _`sjorge`: https://github.com/sjorge +.. _`strocknar`: https://github.com/strocknar +.. _`syedaali`: https://github.com/syedaali +.. _`tampakrap`: https://github.com/tampakrap +.. _`terminalmage`: https://github.com/terminalmage +.. _`ticosax`: https://github.com/ticosax +.. _`timcharper`: https://github.com/timcharper +.. _`xoJIog`: https://github.com/xoJIog +.. _`zmalone`: https://github.com/zmalone diff --git a/doc/topics/releases/2015.8.4.rst b/doc/topics/releases/2015.8.4.rst index 2cd072ad78..019815d987 100644 --- a/doc/topics/releases/2015.8.4.rst +++ b/doc/topics/releases/2015.8.4.rst @@ -1,25 +1,40 @@ +.. _release-2015-8-4: + =========================== Salt 2015.8.4 Release Notes =========================== +Version 2015.8.4 is a bugfix release for :ref:`2015.8.0 `. + + +Statistics +========== + +- Total Merges: **322** +- Total Issue References: **120** +- Total PR References: **312** + +- Contributors: **78** (`AkhterAli`_, `DmitryKuzmenko`_, `MadsRC`_, `Oro`_, `The-Loeki`_, `abednarik`_, `akissa`_, `anlutro`_, `basepi`_, `bastiaanb`_, `bdrung`_, `borgstrom`_, `cachedout`_, `clan`_, `clinta`_, `cournape`_, `cro`_, `ctrlrsf`_, `dmacvicar`_, `dmurphy18`_, `dnd`_, `dr4Ke`_, `eliasp`_, `fcrozat`_, `frioux`_, `galet`_, `garethgreenaway`_, `gqgunhed`_, `gtmanfred`_, `hexedpackets`_, `isbm`_, `jacksontj`_, `jacobhammons`_, `jfindlay`_, `jleimbach`_, `job`_, `joejulian`_, `julianbrost`_, `justinta`_, `kingsquirrel152`_, `kiorky`_, `l2ol33rt`_, `lagesag`_, `lorengordon`_, `mbarrien`_, `mpreziuso`_, `multani`_, `nmadhok`_, `oeuftete`_, `opdude`_, `optix2000`_, `pass-by-value`_, `paulnivin`_, `plastikos`_, `pritambaral`_, `rallytime`_, `rasathus`_, `rmatulat`_, `ruxandraburtica`_, `ryan-lane`_, `s0undt3ch`_, `seanjnkns`_, `serge-p`_, `sjorge`_, `stanislavb`_, `tbaker57`_, `techhat`_, `terminalmage`_, `thatch45`_, `thegoodduke`_, `thomaso-mirodin`_, `ticosax`_, `timcharper`_, `tkunicki`_, `trevor-h`_, `twangboy`_, `whiteinge`_, `whytewolf`_) + + Known Issues ============ -``in_`` requisites (:issue:`30820`) +- ``*_in`` requisites (:issue:`30820`) -This issue affects all users targeting an explicit ``- name: `` with a ``_in`` -requisite (such as ``watch_in`` or ``require_in``). If you are not using explicit ``- -name: `` arguments, are targeting with the state ID instead of the name, -or are not using ``_in`` requisites, then you should be safe to upgrade to -2015.8.4. + This issue affects all users targeting an explicit ``- name: `` with a + ``_in`` requisite (such as ``watch_in`` or ``require_in``). If you are not + using explicit ``- name: `` arguments, are targeting with the state ID + instead of the name, or are not using ``_in`` requisites, then you should be + safe to upgrade to 2015.8.4. -This issue is resolved in the :ref:`2015.8.5 <2015.8.5>` release. + This issue is resolved in the :ref:`2015.8.5 ` release. Security Fix ============ -CVE-2016-1866: Improper handling of clear messages on the minion, which could -result in executing commands not sent by the master. +**CVE-2016-1866** Improper handling of clear messages on the minion, which +could result in executing commands not sent by the master. This issue affects only the 2015.8.x releases of Salt. In order for an attacker to use this attack vector, they would have to execute a successful attack on an @@ -33,588 +48,3038 @@ We recommend everyone upgrade to 2015.8.4 as soon as possible. Core Changes ============ -- **PR** `#28994`_: *timcharper* Salt S3 module has learned how to assume IAM roles +- Support for IAM roles added to S3 module -- Added option ``mock=True`` for :mod:`state.sls ` and - :mod:`state.highstate `. This allows the salt - state compiler to process sls data in a state run without actually calling - the state functions, thus providing feedback on the validity of the arguments - used for the functions beyond the preprocessing validation provided by - ``state.show_sls`` (:issue:`30118` and :issue:`30189`). +- Added option ``mock=True`` for :py:func:`state.sls ` + and :py:func:`state.highstate `. This allows + the state compiler to process sls data in a state run without actually + calling the state functions, thus providing feedback on the validity of the + arguments used for the functions beyond the preprocessing validation provided + by :py:func:`state.show_sls ` (:issue:`30118` + and :issue:`30189`). .. code-block:: shell - salt '*' state.sls core,edit.vim mock=True - salt '*' state.highstate mock=True - salt '*' state.apply edit.vim mock=True + salt '*' state.sls core,edit.vim mock=True + salt '*' state.highstate mock=True + salt '*' state.apply edit.vim mock=True -Changes for v2015.8.3..v2015.8.4 --------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Changelog for v2015.8.3..v2015.8.4 +================================== -*Generated at: 2016-01-25T17:48:35Z* +*Generated at: 2018-05-27 23:28:18 UTC* -Total Merges: **320** +* **PR** `#30615`_: (`jfindlay`_) add 2015.8.4 release notes + @ *2016-01-25 18:11:02 UTC* -Changes: + * 1c6c394d0e Merge pull request `#30615`_ from jfindlay/2015.8 -- **PR** `#30613`_: (*basepi*) Fix minion/syndic clearfuncs + * e4043403e4 add 2015.8.4 release notes -- **PR** `#30609`_: (*seanjnkns*) Fix documentation for pillar_merge_lists which default is False, not … +* **PR** `#30612`_: (`rallytime`_) Back-port `#29940`_ to 2015.8 + @ *2016-01-25 17:52:43 UTC* -- **PR** `#30584`_: (*julianbrost*) file.line state: add missing colon in docstring + * **PR** `#29940`_: (`dr4Ke`_) file.line: better diff (refs: `#30612`_) -- **PR** `#30589`_: (*terminalmage*) Merge 2015.5 into 2015.8 + * ec50581aad Merge pull request `#30612`_ from rallytime/bp-29940 -- **PR** `#30599`_: (*multani*) Documentation formatting fixes + * 3ebb8249d7 file.line: better diff -- **PR** `#30554`_: (*rallytime*) Make the salt-cloud actions output more verbose and helpful +* **PR** `#30613`_: (`basepi`_) Fix minion/syndic clearfuncs + @ *2016-01-25 17:40:59 UTC* -- **PR** `#30549`_: (*techhat*) Salt Virt cleanup + * 48373e0ea9 Merge pull request `#30613`_ from basepi/minion_clearfuncs_2015.8 -- **PR** `#30553`_: (*techhat*) AWS: Support 17-character IDs + * a3c3182f39 Correctly handle clearfuncs on the syndic -- **PR** `#30532`_: (*whiteinge*) Add execution module for working in sls files + * 098ce4335d Correct handle clearfuncs on the minion -- **PR** `#30529`_: (*terminalmage*) Merge 2015.5 into 2015.8 +* **ISSUE** `#29601`_: (`seanjnkns`_) pillars not merging properly with 2015.8.3 (refs: `#30062`_) -- **PR** `#30526`_: (*twangboy*) Added FlushKey to make sure it's changes are saved to disk +* **PR** `#30609`_: (`seanjnkns`_) Fix documentation for pillar_merge_lists which default is False, not … + @ *2016-01-25 17:15:45 UTC* -- **PR** `#30521`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#30062`_: (`seanjnkns`_) Remove recurse_list from pillar_source_merging_strategy and add pilla… (refs: `#30609`_, `#30458`_) -- **PR** `#30485`_: (*jtand*) Updated pip_state to work with pip 8.0 on 2015.8 + * 89b4f3de1b Merge pull request `#30609`_ from seanjnkns/backport_30602 -- **PR** `#30494`_: (*isbm*) Zypper: info_installed — 'errors' flag change to type 'boolean' + * 9924acdc43 Fix documentation for pillar_merge_lists which default is False, not True. From PR `#30062`_ -- **PR** `#30506`_: (*jacksontj*) Properly remove newlines after reading the file +* **PR** `#30584`_: (`julianbrost`_) file.line state: add missing colon in docstring + @ *2016-01-25 16:37:38 UTC* -- **PR** `#30508`_: (*rallytime*) Fix Linode driver cloning functionality + * 24ead62c41 Merge pull request `#30584`_ from julianbrost/fix-doc-file-line-missing-colon -- **PR** `#30522`_: (*terminalmage*) Update git.list_worktree tests to reflect new return data + * 2ab367f95b file.line state: add missing colon in docstring -- **PR** `#30483`_: (*borgstrom*) Pyobjects recursive import support (for 2015.8) +* **PR** `#30589`_: (`terminalmage`_) Merge 2015.5 into 2015.8 + @ *2016-01-25 16:20:41 UTC* -- **PR** `#30491`_: (*jacksontj*) Add multi-IP support to network state + * a7ba2df5e2 Merge pull request `#30589`_ from terminalmage/2015.5-2015.8 -- **PR** `#30496`_: (*anlutro*) Fix KeyError when adding ignored pillars + * d649551fbf Merge branch '2015.5' into 2015.5-2015.8 -- **PR** `#30359`_: (*kingsquirrel152*) Removes suspected copy/paste error for zmq_filtering functionailty + * a823e21428 Merge pull request `#30582`_ from terminalmage/dnf-repoquery-multiple-targets -- **PR** `#30448`_: (*cournape*) Fix osx scripts location + * 410da789f9 yumpkg.check_db: run separate repoquery commands when multiple names passed -- **PR** `#30457`_: (*rallytime*) Remove fsutils references from modules list + * 8e56be7f4c Merge pull request `#30548`_ from jacobhammons/doc-fixes -- **PR** `#30453`_: (*rallytime*) Make sure private AND public IPs are listed for Linode driver + * 03c51bb54d Added placeholder release notes for 2015.5.10 Changed old doc links from docs.saltstack.org to docs.saltstack.com -- **PR** `#30458`_: (*rallytime*) Back-port `#30062`_ to 2015.8 + * 1aafd4c5b5 Merge pull request `#30530`_ from terminalmage/yumpkg-dnf-cleanup -- **PR** `#30468`_: (*timcharper*) make note of s3 role assumption in upcoming changelog + * 2586f71bcf 2015.5 tweaks from `#30529`_ -- **PR** `#30470`_: (*whiteinge*) Add example of the match_dict format to accept_dict wheel function +* **PR** `#30599`_: (`multani`_) Documentation formatting fixes + @ *2016-01-25 15:37:46 UTC* -- **PR** `#30450`_: (*gtmanfred*) fix extension loading in novaclient + * 3a55d11916 Merge pull request `#30599`_ from multani/fix/docs -- **PR** `#30212`_: (*abednarik*) Fix incorrect file permissions in file.line + * 038ecc4acd For doc formatting of salt.states.module -- **PR** `#29947`_: (*jfindlay*) fileclient: decode file list from master + * 4062c63b9f Fix doc formatting for yaml_idiosyncrasies -- **PR** `#30363`_: (*terminalmage*) Use native "list" subcommand to list git worktrees + * 6efb77bc04 Fix doc formatting of salt.modules.parted -- **PR** `#30445`_: (*jtand*) Boto uses False for is_default instead of None + * a329adfb21 Add missing salt.queues.* documentation -- **PR** `#30406`_: (*frioux*) Add an example of how to use file.managed/check_cmd + * 2465cf4ba5 Remove non-existing documentation -- **PR** `#30424`_: (*isbm*) Check if byte strings are properly encoded in UTF-8 + * 814e64c304 Fix documentation markup in salt.modules.osquery -- **PR** `#30405`_: (*jtand*) Updated glusterfs.py for python2.6 compatibility. + * d2614d6169 Fix documentation markup for salt.modules.ipmi -- **PR** `#30396`_: (*pass-by-value*) Remove hardcoded val + * 276eb3a843 Fix GCE documentation -- **PR** `#30391`_: (*jtand*) Added else statements +* **ISSUE** `#10157`_: (`martinb3`_) salt-cloud actions don't have very useful error messages (refs: `#30554`_) -- **PR** `#30375`_: (*rallytime*) Wrap formatted log statements with six.u() in cloud/__init__.py +* **PR** `#30554`_: (`rallytime`_) Make the salt-cloud actions output more verbose and helpful + @ *2016-01-22 20:23:18 UTC* -- **PR** `#30384`_: (*isbm*) Bugfix: info_available does not work correctly on SLE 11 series + * b1e604add3 Merge pull request `#30554`_ from rallytime/fix-10157 -- **PR** `#30376`_: (*pritambaral*) Fix FLO_DIR path in 2015.8 + * 6fa952f16d Make the salt-cloud actions output more verbose and helpful -- **PR** `#30389`_: (*jtand*) Older versions of ipset don't support comments +* **PR** `#30549`_: (`techhat`_) Salt Virt cleanup + @ *2016-01-22 18:45:18 UTC* -- **PR** `#30373`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 2eb5a3803d Merge pull request `#30549`_ from techhat/virtcleanup -- **PR** `#30372`_: (*jacobhammons*) Updated man pages for 2015.8.4, updated copyright to 2016 + * 9baab73cd0 Fix copy pasta -- **PR** `#30370`_: (*rallytime*) Remove incomplete function + * 6413c11f29 Salt Virt cleanup -- **PR** `#30366`_: (*rallytime*) Back-port `#28702`_ to 2015.8 +* **PR** `#30553`_: (`techhat`_) AWS: Support 17-character IDs + @ *2016-01-22 18:41:46 UTC* -- **PR** `#30361`_: (*cro*) Flip the sense of the test for proxymodule imports, add more fns for esxi proxy + * f63b183e43 Merge pull request `#30553`_ from techhat/awsid -- **PR** `#30267`_: (*isbm*) Fix RPM issues with the date/time and add package attributes filtering + * a95fbff4bc Support 17-character IDs -- **PR** `#30360`_: (*jfindlay*) file.remove, file.absent: mention recursive dir removal +* **PR** `#30532`_: (`whiteinge`_) Add execution module for working in sls files + @ *2016-01-22 17:25:16 UTC* -- **PR** `#30221`_: (*mbarrien*) No rolcatupdate for user_exist in Postgres>=9.5 `#26845`_ + * 05d05263ab Merge pull request `#30532`_ from whiteinge/slsutil-mod -- **PR** `#30358`_: (*terminalmage*) Add libgit2 version to versions-report + * a57d9984e4 Add slsutil to doc index -- **PR** `#30346`_: (*pass-by-value*) Prevent orphaned volumes + * 155966c9d2 Add execution module for working in sls files -- **PR** `#30349`_: (*rallytime*) Back-port `#30347`_ to 2015.8 +* **PR** `#30529`_: (`terminalmage`_) Merge 2015.5 into 2015.8 (refs: `#30530`_) + @ *2016-01-22 17:19:39 UTC* -- **PR** `#30354`_: (*anlutro*) Make sure all ignore_missing SLSes are caught + * 1da1bb9afc Merge pull request `#30529`_ from terminalmage/2015.5-2015.8 -- **PR** `#30356`_: (*nmadhok*) Adding code author + * e85ad690fb Lint fixes -- **PR** `#30340`_: (*jtand*) Updated seed_test.py for changes made to seed module + * 43829ecee6 Docstring tweaks -- **PR** `#30339`_: (*jfindlay*) Backport `#26511`_ + * 92d5a2a49c Fix spelling -- **PR** `#30343`_: (*rallytime*) Fix 2015.8 from incomplete back-port + * fdc60fc04a Modify pkg.group_installed to reflect changes in yumpkg.py -- **PR** `#30342`_: (*eliasp*) Correct whitespace placement in error message + * a118eb5d2e Merge branch '2015.5' into 2015.5-2015.8 -- **PR** `#30308`_: (*rallytime*) Back-port `#30257`_ to 2015.8 + * 7798d42272 Merge pull request `#30484`_ from terminalmage/dnf-yumpkg-2015.5 -- **PR** `#30187`_: (*rallytime*) Back-port `#27606`_ to 2015.8 + * 330e26d1da Hide get_locked_packages -- **PR** `#30223`_: (*serge-p*) adding support for DragonFly BSD + * 5a637420e8 Backport DNF support to 2015.5 branch -- **PR** `#30238`_: (*rallytime*) Reinit crypto before calling RSA.generate when generating keys. +* **PR** `#30526`_: (`twangboy`_) Added FlushKey to make sure it's changes are saved to disk + @ *2016-01-22 02:33:13 UTC* -- **PR** `#30246`_: (*dmacvicar*) Add missing return data to scheduled jobs (`#24237`_) + * e366f6a7fd Merge pull request `#30526`_ from twangboy/reg_flushkey -- **PR** `#30292`_: (*thegoodduke*) ipset: fix test=true & add comment for every entry + * 23085ffbbb Added FlushKey to make sure it's changes are saved to disk -- **PR** `#30275`_: (*abednarik*) Add permanent argument in firewalld. +* **PR** `#30521`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-01-21 23:05:03 UTC* -- **PR** `#30328`_: (*cachedout*) Fix file test + * cdc731b8c5 Merge pull request `#30521`_ from basepi/merge-forward-2015.8 -- **PR** `#30310`_: (*pass-by-value*) Empty bucket fix + * f22f5ff851 Fix lint -- **PR** `#30211`_: (*techhat*) Execute choot on the correct path + * 117fb205de Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 -- **PR** `#30309`_: (*rallytime*) Back-port `#30304`_ to 2015.8 + * b348f804b1 Merge pull request `#30512`_ from jfindlay/repo_test -- **PR** `#30278`_: (*nmadhok*) If datacenter is specified in the config, then look for managed objects under it + * 66f06f2bd3 disable pkgrepo test for ubuntu 15.10+ -- **PR** `#30305`_: (*jacobhammons*) Changed examples to use the "example.com" domain instead of "mycompan… + * a9348dfef8 Merge pull request `#30478`_ from jtand/pip_8_update -- **PR** `#30249`_: (*mpreziuso*) Fixes performance and timeout issues on win_pkg.install + * 6227368830 Convert version to int, instead of comparing strings to ints -- **PR** `#30217`_: (*pass-by-value*) Make sure cloud actions can be called via salt run + * 20384a4810 Added InstallationError to except block -- **PR** `#30268`_: (*terminalmage*) Optimize file_tree ext_pillar and update file.managed to allow for binary contents + * baa274bca9 Updated pip_state to work with pip 8.0 -- **PR** `#30245`_: (*rallytime*) Boto secgroup/iam_role: Add note stating us-east-1 is default region + * a30147c64f Merge pull request `#30482`_ from borgstrom/pyobjects_recursive -- **PR** `#30299`_: (*rallytime*) ESXi Proxy minions states are located at salt.states.esxi, not vsphere. + * 2c55a7580b Fixup lint errors -- **PR** `#30202`_: (*opdude*) Fixed the periodic call to beacons + * b46df0e4b5 Allow recursive salt:// imports -- **PR** `#30303`_: (*jacobhammons*) Changed notes to indicate that functions are matched using regular ex… + * 51bfa16173 Add test to prove that recursive imports are currently broken -- **PR** `#30284`_: (*terminalmage*) salt.utils.gitfs: Fix Dulwich env detection and submodule handling + * 5c7cc51937 Merge pull request `#30459`_ from jfindlay/pkg_tests -- **PR** `#30280`_: (*jfindlay*) add state mocking to release notes + * fb9972f590 modules.pkg: disable repo int test for ubuntu 15.10 -- **PR** `#30273`_: (*rallytime*) Back-port `#30121`_ to 2015.8 + * dd2ceb4c07 Merge pull request `#30443`_ from jtand/boto_vpc_5 -- **PR** `#30301`_: (*cachedout*) Accept whatever comes into hightstate mock for state tests + * 2f77152479 Boto uses False for is_default instead of None -- **PR** `#30282`_: (*cachedout*) Fix file.append logic + * 62d9dddced Merge pull request `#30420`_ from attiasr/patch-1 -- **PR** `#30289`_: (*cro*) Fix problems with targeting proxies by grains + * 4de343c5a1 Backport `#26853`_ -- **PR** `#30293`_: (*cro*) Ensure we don't log stuff we shouldn't +* **PR** `#30485`_: (`justinta`_) Updated pip_state to work with pip 8.0 on 2015.8 + @ *2016-01-21 22:55:38 UTC* -- **PR** `#30279`_: (*cachedout*) Allow modules to be packed into boto utils + * 019af349af Merge pull request `#30485`_ from jtand/pip_8_update_2015.8 -- **PR** `#30186`_: (*rallytime*) Update CLI Examples in boto_ec2 module to reflect correct arg/kwarg positioning + * 9cb17332fa Updated pip_state to work with pip 8.0 on 2015.8 -- **PR** `#30156`_: (*abednarik*) Add option in file.append to ignore_whitespace. +* **PR** `#30494`_: (`isbm`_) Zypper: info_installed — 'errors' flag change to type 'boolean' + @ *2016-01-21 22:55:05 UTC* -- **PR** `#30189`_: (*rallytime*) Back-port `#30185`_ to 2015.8 + * 3259fde362 Merge pull request `#30494`_ from isbm/isbm-zypper-nfoinst-bool-fix -- **PR** `#30215`_: (*jacobhammons*) Assorted doc bug fixes + * 4d7659270e Place the boolean check -- **PR** `#30206`_: (*cachedout*) Revert "Fix incorrect file permissions in file.line" + * 58db1c3b16 Fix typo -- **PR** `#30190`_: (*jacobhammons*) Updated doc site banners + * 43254aa993 Update docstring according to the boolean flag -- **PR** `#30180`_: (*jfindlay*) modules.x509._dec2hex: add fmt index for 2.6 compat + * a7d3e0d5ad Change 'errors' flag to boolean. -- **PR** `#30179`_: (*terminalmage*) Backport `#26962`_ to 2015.8 branch +* **PR** `#30506`_: (`jacksontj`_) Properly remove newlines after reading the file + @ *2016-01-21 22:53:57 UTC* -- **PR** `#29693`_: (*abednarik*) Handle missing source file in ssh_auth. + * 596892326d Merge pull request `#30506`_ from jacksontj/2015.8 -- **PR** `#30155`_: (*rallytime*) Update boto_secgroup and boto_iam_role docs to only use region OR profile + * e1dea6f843 Properly remove newlines after reading the file -- **PR** `#30158`_: (*rallytime*) Move _option(value) calls to __salt__['config.option'] in boto utils +* **ISSUE** `#30444`_: (`dnd`_) Cloning linode server with salt-cloud fails trying to create disk config (refs: `#30508`_) -- **PR** `#30160`_: (*dmurphy18*) Fix parsing disk usage for line with no number and AIX values in Kilos +* **ISSUE** `#30432`_: (`dnd`_) Cloning linode server with salt-cloud requires payment term (refs: `#30508`_) -- **PR** `#30162`_: (*rallytime*) Update list_present and append grains state function docs to be more clear. +* **PR** `#30508`_: (`rallytime`_) Fix Linode driver cloning functionality + @ *2016-01-21 22:53:36 UTC* -- **PR** `#30163`_: (*rallytime*) Add warning about using "=" in file.line function + * 15c7aedd46 Merge pull request `#30508`_ from rallytime/linode-clone-fixes -- **PR** `#30164`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * d26ed74bde Make sure the correct profile parameters are being checked when cloning -- **PR** `#30168`_: (*abednarik*) Fix incorrect file permissions in file.line + * 1d7e229377 Fix Linode driver cloning functionality. -- **PR** `#30154`_: (*Oro*) Fix file serialize on windows +* **PR** `#30522`_: (`terminalmage`_) Update git.list_worktree tests to reflect new return data + @ *2016-01-21 22:34:20 UTC* -- **PR** `#30144`_: (*rallytime*) Added generic ESXCLI command ability to ESXi Proxy Minion + * 79528c59c3 Merge pull request `#30522`_ from terminalmage/fix-worktree-tests -- **PR** `#30142`_: (*terminalmage*) Fix dockerng.push, and allow for multiple images + * ea0ca70187 Add git.list_worktrees unit test -- **PR** `#30075`_: (*joejulian*) Convert glusterfs module to use xml + * 393015edbb Remove git.list_worktrees tests -- **PR** `#30129`_: (*optix2000*) Clean up _uptodate() in git state +* **ISSUE** `#30465`_: (`alandrees`_) Nested imports with pyobjects (refs: `#30483`_, `#30482`_) -- **PR** `#30139`_: (*rallytime*) Back-port `#29589`_ to 2015.8 +* **PR** `#30483`_: (`borgstrom`_) Pyobjects recursive import support (for 2015.8) + @ *2016-01-21 15:55:27 UTC* -- **PR** `#30124`_: (*abednarik*) Update regex to detect ip alias in OpenBSD. + * 119f025073 Merge pull request `#30483`_ from borgstrom/pyobjects_recursive-2015.8 -- **PR** `#30133`_: (*stanislavb*) Fix typo in gpgkey URL + * 788b672e3a Fixup lint errors -- **PR** `#30126`_: (*stanislavb*) Log S3 API error message + * e148ea2d52 Allow recursive salt:// imports -- **PR** `#30128`_: (*oeuftete*) Log retryable transport errors as warnings + * 6bbac64d3a Add test to prove that recursive imports are currently broken -- **PR** `#30096`_: (*cachedout*) Add rm_special to crontab module +* **PR** `#30491`_: (`jacksontj`_) Add multi-IP support to network state + @ *2016-01-21 15:51:42 UTC* -- **PR** `#30106`_: (*techhat*) Ensure last dir + * d8d19cf75d Merge pull request `#30491`_ from jacksontj/2015.8 -- **PR** `#30101`_: (*gtmanfred*) fix bug where nova driver exits with no adminPass + * 82213555ca Normalize yaml spacing to 2 space -- **PR** `#30090`_: (*techhat*) Add argument to isdir() + * 3d1469b8d9 Add example of multiple addrs/ipv6addrs to docs -- **PR** `#30094`_: (*rallytime*) Fix doc formatting for cloud.create example in module.py state + * 91c8a1b4e4 Add support for multiple IP addresses per interface to rh_ip -- **PR** `#30095`_: (*rallytime*) Add the list_nodes_select function to linode driver +* **PR** `#30496`_: (`anlutro`_) Fix KeyError when adding ignored pillars + @ *2016-01-21 15:51:03 UTC* -- **PR** `#30082`_: (*abednarik*) Fixed saltversioninfo grain return + * 56332ca504 Merge pull request `#30496`_ from alprs/fix-ignored_pillars_keyerror -- **PR** `#30084`_: (*rallytime*) Back-port `#29987`_ to 2015.8 + * bbcb783621 fix KeyError when adding ignored pillars -- **PR** `#30071`_: (*rallytime*) Merge branch '2015.5' into '2015.8' +* **PR** `#30359`_: (`kingsquirrel152`_) Removes suspected copy/paste error for zmq_filtering functionailty + @ *2016-01-20 18:42:42 UTC* -- **PR** `#30067`_: (*ryan-lane*) Pass in kwargs to boto_secgroup.convert_to_group_ids explicitly + * e425cbd654 Merge pull request `#30359`_ from distil/zmq_filtering_bug_fix -- **PR** `#30069`_: (*techhat*) Ensure that pki_dir exists + * 44bfbbf15b Removes suspected copy/paste error. -- **PR** `#30064`_: (*rallytime*) Add Syndic documentation to miscellaneous Salt Cloud config options +* **PR** `#30448`_: (`cournape`_) Fix osx scripts location + @ *2016-01-20 17:59:29 UTC* -- **PR** `#30049`_: (*rallytime*) Add some more unit tests for the vsphere execution module + * 13add7d142 Merge pull request `#30448`_ from cournape/fix-osx-scripts-location -- **PR** `#30060`_: (*rallytime*) Back-port `#27104`_ to 2015.8 + * 3c27ab5310 BUG: fix osx .pkg script locations to match the .plist files. -- **PR** `#30048`_: (*jacobhammons*) Remove internal APIs from rest_cherrypy docs. + * ed9ab68d3b BUG: fix missing sudo when linking certify cert. -- **PR** `#30043`_: (*rallytime*) Be explicit about importing from salt.utils.jinja to avoid circular imports +* **ISSUE** `#22820`_: (`VynceMontgomery`_) some docs missing again (cf #22720) (refs: `#30457`_) -- **PR** `#30038`_: (*rallytime*) Back-port `#30017`_ to 2015.8 +* **PR** `#30457`_: (`rallytime`_) Remove fsutils references from modules list + @ *2016-01-20 16:43:50 UTC* -- **PR** `#30036`_: (*rallytime*) Back-port `#29995`_ to 2015.8 + * 2b7d20cee7 Merge pull request `#30457`_ from rallytime/fix-22820 -- **PR** `#30035`_: (*rallytime*) Back-port `#29895`_ to 2015.8 + * 3288ff104d Remove fsutils references from modules list -- **PR** `#30034`_: (*rallytime*) Back-port `#29893`_ to 2015.8 +* **ISSUE** `#30442`_: (`ssplatt`_) salt-cloud linode query only lists private or public IP, not both (refs: `#30453`_) -- **PR** `#30033`_: (*rallytime*) Back-port `#29876`_ to 2015.8 +* **PR** `#30453`_: (`rallytime`_) Make sure private AND public IPs are listed for Linode driver + @ *2016-01-20 16:41:51 UTC* -- **PR** `#30029`_: (*terminalmage*) git.latest: Fix handling of nonexistent branches + * e706b71871 Merge pull request `#30453`_ from rallytime/fix-30442 -- **PR** `#30016`_: (*anlutro*) Properly normalize locales in locale.gen_locale + * a1f882f4fe Make sure private AND public IPs are listed for Linode driver -- **PR** `#30015`_: (*anlutro*) locale module: don't escape the slash in \\n +* **ISSUE** `#29601`_: (`seanjnkns`_) pillars not merging properly with 2015.8.3 (refs: `#30062`_) -- **PR** `#30022`_: (*gqgunhed*) Two minor typos fixed +* **PR** `#30458`_: (`rallytime`_) Back-port `#30062`_ to 2015.8 + @ *2016-01-20 16:40:23 UTC* -- **PR** `#30026`_: (*anlutro*) states.at: fix wrong variable being used + * **PR** `#30062`_: (`seanjnkns`_) Remove recurse_list from pillar_source_merging_strategy and add pilla… (refs: `#30609`_, `#30458`_) -- **PR** `#29966`_: (*multani*) Fix bigip state/module documentation + serializers documentation + * 73f372dc98 Merge pull request `#30458`_ from rallytime/bp-30062 -- **PR** `#29904`_: (*twangboy*) Improvements to osx packaging scripts + * 9665d9655f Set (pillar\_)merge_lists to default for PR `#30062`_ -- **PR** `#29950`_: (*multani*) boto_iam: fix deletion of IAM users when using delete_keys=true + * 7ea4dbf478 Fix lint for PR30062 -- **PR** `#29937`_: (*multani*) Fix states.boto_iam group users + * e44a30620b Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead -- **PR** `#29934`_: (*multani*) Fix state.boto_iam virtual name +* **PR** `#30468`_: (`timcharper`_) make note of s3 role assumption in upcoming changelog + @ *2016-01-20 16:28:04 UTC* -- **PR** `#29943`_: (*cachedout*) Check args correctly in boto_rds + * c3fb4006b0 Merge pull request `#30468`_ from timcharper/2015.8 -- **PR** `#29924`_: (*gqgunhed*) fixed: uptime now working on non-US Windows + * 721c1c871b make note of s3 role assumption in upcoming changelog -- **PR** `#29883`_: (*serge-p*) fix for nfs mounts in _active_mounts_openbsd() +* **PR** `#30470`_: (`whiteinge`_) Add example of the match_dict format to accept_dict wheel function + @ *2016-01-20 16:26:16 UTC* -- **PR** `#29894`_: (*techhat*) Support Saltfile in SPM + * c611541916 Merge pull request `#30470`_ from whiteinge/match_dict -- **PR** `#29856`_: (*rallytime*) Added some initial unit tests for the salt.modules.vsphere.py file + * 5034e13f5d Add example of the match_dict format to accept_dict wheel function -- **PR** `#29855`_: (*rallytime*) Back-port `#29740`_ to 2015.8 +* **ISSUE** `#28017`_: (`ThomasZhou`_) Using salt-cloud nova driver, raise error: SaltNova' object has no attribute '_discover_extensions' (refs: `#30450`_) -- **PR** `#29890`_: (*multani*) Various documentation fixes +* **PR** `#30450`_: (`gtmanfred`_) fix extension loading in novaclient + @ *2016-01-19 21:16:32 UTC* -- **PR** `#29850`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * d70e6b312a Merge pull request `#30450`_ from gtmanfred/2015.8 -- **PR** `#29811`_: (*anlutro*) influxdb: add retention policy module functions + * 4aa6faaf48 fix extension loading in novaclient -- **PR** `#29814`_: (*basepi*) [2015.8][Windows] Fix multi-master on windows +* **ISSUE** `#30150`_: (`rapenne-s`_) file.line reset permissions to 600 (refs: `#30212`_, `#30168`_) -- **PR** `#29819`_: (*rallytime*) Add esxi module and state to docs build +* **PR** `#30212`_: (`abednarik`_) Fix incorrect file permissions in file.line + @ *2016-01-19 21:15:48 UTC* -- **PR** `#29832`_: (*jleimbach*) Fixed typo in order to use the keyboard module for RHEL without systemd + * 0af5e16809 Merge pull request `#30212`_ from abednarik/fix_file_line_permissions -- **PR** `#29803`_: (*rallytime*) Add vSphere module to doc ref module tree + * dec15d1357 Fix incorrect file permissions in file.line -- **PR** `#29767`_: (*abednarik*) Hosts file update in mod_hostname. +* **ISSUE** `#29918`_: (`WangWenchao`_) UnicodeDecodeError when saltutil.sync_modules for Windows salt-minion 2015.8.3 (refs: `#29947`_) -- **PR** `#29772`_: (*terminalmage*) pygit2: skip submodules when traversing tree +* **PR** `#29947`_: (`jfindlay`_) fileclient: decode file list from master + @ *2016-01-19 20:36:32 UTC* -- **PR** `#29765`_: (*gtmanfred*) allow nova driver to be boot from volume + * 3c12b451fe Merge pull request `#29947`_ from jfindlay/remote_decode -- **PR** `#29773`_: (*l2ol33rt*) Append missing wget in debian installation guide + * b9241fb6b0 state: use simple string formatting for messages -- **PR** `#29800`_: (*rallytime*) Back-port `#29769`_ to 2015.8 + * f6162f168c fileclient: decode file list from master -- **PR** `#29775`_: (*paulnivin*) Change listen requisite resolution from name to ID declaration +* **ISSUE** `#30203`_: (`terminalmage`_) Update salt.modules.git.list_worktrees() to use 'git worktree list' for Git >= 2.7.0 (refs: `#30363`_) -- **PR** `#29754`_: (*rallytime*) Back-port `#29719`_ to 2015.8 +* **PR** `#30363`_: (`terminalmage`_) Use native "list" subcommand to list git worktrees + @ *2016-01-19 20:35:41 UTC* -- **PR** `#29713`_: (*The-Loeki*) Pillar-based cloud providers still forcing use of deprecated 'provider' + * 6e8b1e89a5 Merge pull request `#30363`_ from terminalmage/issue30203 -- **PR** `#29729`_: (*rallytime*) Further clarifications on "unless" and "onlyif" requisites. + * ee40491166 Fix redefined variable -- **PR** `#29737`_: (*akissa*) fix pillar sqlite3 documentation examples + * 5f95851987 Use native "list" subcommand to list git worktrees -- **PR** `#29743`_: (*akissa*) fix pillar sqlite not honouring config options + * 911105f27c Fix incorrect missing gitdir file detection -- **PR** `#29723`_: (*rallytime*) Clarify db_user and db_password kwargs for postgres_user.present state function +* **PR** `#30445`_: (`justinta`_) Boto uses False for is_default instead of None + @ *2016-01-19 18:28:18 UTC* -- **PR** `#29722`_: (*rallytime*) Link "stateful" kwargs to definition of what "stateful" means for cmd state. + * dfb9dec84f Merge pull request `#30445`_ from jtand/boto_vpc_8 -- **PR** `#29724`_: (*rallytime*) Add examples of using multiple matching levels to Pillar docs + * 00943ff1e6 Boto uses False for is_default instead of None -- **PR** `#29726`_: (*cachedout*) Disable some boto tests per resolution of moto issue +* **PR** `#30406`_: (`frioux`_) Add an example of how to use file.managed/check_cmd + @ *2016-01-19 18:23:49 UTC* -- **PR** `#29708`_: (*lagesag*) Fix test=True for file.directory with recurse ignore_files/ignore_dirs. + * f9b3f3f038 Merge pull request `#30406`_ from ZipRecruiter/check-cmd-example -- **PR** `#29642`_: (*cachedout*) Correctly restart daemonized minions on failure + * 92e0d77a9a Add an example of how to use file.managed/check_cmd -- **PR** `#29599`_: (*cachedout*) Clean up minion shutdown +* **PR** `#30424`_: (`isbm`_) Check if byte strings are properly encoded in UTF-8 + @ *2016-01-19 17:52:25 UTC* -- **PR** `#29675`_: (*clinta*) allow returning all refs + * 05ad3dcc94 Merge pull request `#30424`_ from isbm/isbm-zypper-utf-8-errors -- **PR** `#29683`_: (*rallytime*) Catch more specific error to pass the error message through elegantly. + * a0f263f411 Clarify the error message -- **PR** `#29687`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 12f8e93247 Update documentation accordingly. -- **PR** `#29681`_: (*clinta*) fix bare/mirror in git.latest + * 1d384b6abd Add error handling to the RPM broken strings -- **PR** `#29644`_: (*rallytime*) Fixed a couple more ESXi proxy minion bugs + * cf0dad3a6c Rename keywords arguments variable to a default name. -- **PR** `#29645`_: (*rallytime*) Back-port `#29558`_ to 2015.8 + * 26aa801342 Check if byte strings are properly encoded in UTF-8 -- **PR** `#29632`_: (*jfindlay*) reduce severity of tls module __virtual__ logging +* **ISSUE** `#30051`_: (`joejulian`_) glusterfs.status fails with glusterfs 3.7 (refs: `#30075`_) -- **PR** `#29606`_: (*abednarik*) Fixed duplicate mtu entry in RedHat 7 network configuration. +* **PR** `#30405`_: (`justinta`_) Updated glusterfs.py for python2.6 compatibility. + @ *2016-01-15 22:50:06 UTC* -- **PR** `#29613`_: (*rallytime*) Various ESXi Proxy Minion Bug Fixes + * **PR** `#30075`_: (`joejulian`_) Convert glusterfs module to use xml (refs: `#30405`_) -- **PR** `#29628`_: (*DmitryKuzmenko*) Don't create io_loop before fork + * 1bace55e45 Merge pull request `#30405`_ from jtand/glusterfs_py26 -- **PR** `#29609`_: (*basepi*) [2015.8][salt-ssh] Add ability to set salt-ssh command umask in roster + * a332e06c4a Fixed lint error -- **PR** `#29603`_: (*basepi*) Fix orchestration failure-checking + * 522b4990ef Updated the rest of glusterfs.py for python2.6 compatibility -- **PR** `#29597`_: (*terminalmage*) dockerng: Prevent exception when API response contains empty dictionary + * 971ce58cd6 updated list_peers to be python2.6 compatible -- **PR** `#29596`_: (*rallytime*) Back-port `#29587`_ to 2015.8 +* **PR** `#30396`_: (`pass-by-value`_) Remove hardcoded val + @ *2016-01-15 22:03:53 UTC* -- **PR** `#29588`_: (*rallytime*) Added ESXi Proxy Minion Tutorial + * cb1c0958bd Merge pull request `#30396`_ from pass-by-value/remove_hardcoded_val -- **PR** `#29572`_: (*gtmanfred*) [nova] use old discover_extensions if available + * dd90b325e7 Get vm info -- **PR** `#29545`_: (*terminalmage*) git.latest: init submodules if not yet initialized + * 9430ad1465 Remove hardcoded value -- **PR** `#29548`_: (*rallytime*) Back-port `#29449`_ to 2015.8 +* **PR** `#30391`_: (`justinta`_) Added else statements + @ *2016-01-15 19:17:55 UTC* -- **PR** `#29547`_: (*rallytime*) Refactored ESXCLI-based functions to accept a list of esxi_hosts + * **PR** `#30389`_: (`justinta`_) Older versions of ipset don't support comments (refs: `#30391`_) -- **PR** `#29563`_: (*anlutro*) Fix a call to deprecated method in python-influxdb + * 60737c970e Merge pull request `#30391`_ from jtand/ipset -- **PR** `#29565`_: (*bdrung*) Fix typos and missing release note + * 345b056406 Fixed lint error -- **PR** `#29540`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * c20f9b6a87 Added else statements -- **PR** `#29499`_: (*rallytime*) Initial commit of ESXi Proxy Minion +* **ISSUE** `#30277`_: (`webtrekker`_) [salt-cloud] Error actioning machines: 'ascii' codec can't encode character u'\\\\xa0' in position 20 (refs: `#30374`_) -- **PR** `#29526`_: (*jfindlay*) 2015.8.2 notes: add note about not being released +* **PR** `#30375`_: (`rallytime`_) Wrap formatted log statements with six.u() in cloud/__init__.py + @ *2016-01-15 18:41:55 UTC* -- **PR** `#29531`_: (*jfindlay*) grains.core: handle undefined variable + * **PR** `#30374`_: (`rallytime`_) Wrap formatted log statements with six.u() in the VMware module (refs: `#30375`_) -- **PR** `#29538`_: (*basepi*) [2015.8] [salt-ssh] Remove umask around actual execution for salt-ssh + * 6ac1f6cf54 Merge pull request `#30375`_ from rallytime/fix-cloud-log-formatting -- **PR** `#29505`_: (*rallytime*) Update boto_rds state docs to include funky yaml syntax for "tags" option. + * 5e7fb0c428 Wrap formatted log statements with six.u() in cloud/__init__.py -- **PR** `#29513`_: (*bdrung*) Drop obsolete syslog.target from systemd services +* **PR** `#30384`_: (`isbm`_) Bugfix: info_available does not work correctly on SLE 11 series + @ *2016-01-15 18:31:57 UTC* -- **PR** `#29500`_: (*rallytime*) Back-port `#29467`_ to 2015.8 + * c478148b60 Merge pull request `#30384`_ from isbm/isbm-zypper-info-avaiable-fix -- **PR** `#29463`_: (*abednarik*) Add **kwargs to debconf.set. + * c7bc20e865 Split information, that is compatible with the Zypper's output on SLE11. -- **PR** `#29399`_: (*jfindlay*) modules.status: add human_readable option to uptime +* **PR** `#30376`_: (`pritambaral`_) Fix FLO_DIR path in 2015.8 + @ *2016-01-15 18:25:49 UTC* -- **PR** `#29433`_: (*cro*) Files for building .pkg files for MacOS X + * 9fe2df82bd Merge pull request `#30376`_ from pritambaral/fix/flo-dir -- **PR** `#29455`_: (*jfindlay*) modules.nova.__init__: do not return ``None`` + * 534879e79f Revert "Raet Salt broken when config moved to package directory" -- **PR** `#29454`_: (*jfindlay*) rh_service module __virtual__ return error messages +* **PR** `#30389`_: (`justinta`_) Older versions of ipset don't support comments (refs: `#30391`_) + @ *2016-01-15 17:41:02 UTC* -- **PR** `#29476`_: (*tbaker57*) Doc fix - route_table_present needs subnet_names (not subnets) as a key + * 3ac3804ddc Merge pull request `#30389`_ from jtand/ipset -- **PR** `#29487`_: (*rallytime*) Back-port `#29450`_ to 2015.8 + * fac6c3f6ae Fixed some typos from testing -- **PR** `#29441`_: (*rallytime*) Make sure docs line up with blade_idrac function specs + * 67d4997316 Older versions of ipset don't support comments -- **PR** `#29440`_: (*rallytime*) Back-port `#28925`_ to 2015.8 +* **PR** `#30373`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-01-15 16:23:38 UTC* -- **PR** `#29435`_: (*galet*) Grains return wrong OS version and other OS related values for Oracle Linux + * 4cc9422bf8 Merge pull request `#30373`_ from basepi/merge-forward-2015.8 -- **PR** `#29430`_: (*rall0r*) Fix host.present state limitation + * 5b53bf2597 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 -- **PR** `#29417`_: (*jacobhammons*) Repo install updates + * 5a923b3aa9 Merge pull request `#30364`_ from rallytime/fix-30341 -- **PR** `#29402`_: (*techhat*) Add rate limiting to linode + * 79bcf151cb Add TLS version imports and add linode driver documentation notices -- **PR** `#29400`_: (*twangboy*) Fix `#19332`_ + * f037fd9c27 Merge pull request `#30184`_ from rallytime/bp-30166 -- **PR** `#29398`_: (*cachedout*) Lint 29288 + * fa6b1b3022 adding split_env call to cp.hash_file to pick up saltenv in file query parameter -- **PR** `#29331`_: (*DmitryKuzmenko*) Bugfix - `#29116`_ raet dns error + * 1d8413fd2f Merge pull request `#30291`_ from thegoodduke/for_fix_ipset -- **PR** `#29390`_: (*jacobhammons*) updated version numbers in documentation + * 62d6ccf561 ipset: fix test=true & add comment for every entry -- **PR** `#29381`_: (*nmadhok*) No need to deepcopy since six.iterkeys() creates a copy + * 92889db638 Merge pull request `#30248`_ from jfindlay/2015.5 -- **PR** `#29349`_: (*cro*) Fix mis-setting chassis names + * 741f7aba31 add 2015.5.9 release notes -- **PR** `#29334`_: (*rallytime*) Back-port `#29237`_ to 2015.8 + * 7a329d89d7 Merge pull request `#30237`_ from jacobhammons/man-pages-prev -- **PR** `#29300`_: (*ticosax*) [dockerng] Add support for volume management in dockerng + * 2431c4c5c3 Updated man page and doc conf.py copyright year to 2016 -- **PR** `#29218`_: (*clan*) check service enable state in test mode + * fe3da1c174 Updated man pages and doc version for 2015.5.9 -- **PR** `#29315`_: (*jfindlay*) dev tutorial doc: fix markup errors + * 2c0b725924 Merge pull request `#30207`_ from rallytime/rabbitmq_states_doc_fix -- **PR** `#29317`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 8d48c24182 Use correct spacing in rabbitmq state examples -- **PR** `#29240`_: (*clan*) handle acl_type ``[[d]efault:][user|group|mask|other]`` + * b49cf910f4 Merge pull request `#30191`_ from jacobhammons/banner-prev -- **PR** `#29305`_: (*lorengordon*) Add 'file' as a source_hash proto + * c3390955b0 Updated doc site banners -- **PR** `#29272`_: (*jfindlay*) win_status module: handle 12 hour time in uptime +* **PR** `#30372`_: (`jacobhammons`_) Updated man pages for 2015.8.4, updated copyright to 2016 + @ *2016-01-14 23:18:40 UTC* -- **PR** `#29289`_: (*terminalmage*) file.managed: Allow local file sources to use source_hash + * a9edb194a4 Merge pull request `#30372`_ from jacobhammons/man-pages -- **PR** `#29264`_: (*anlutro*) Prevent ssh_auth.absent from running when test=True + * 891ddafcba Updated man pages for 2015.8.4, updated copyright to 2016 -- **PR** `#29277`_: (*terminalmage*) Update git_pillar runner to support new git ext_pillar config schema +* **PR** `#30370`_: (`rallytime`_) Remove incomplete function + @ *2016-01-14 22:49:45 UTC* -- **PR** `#29283`_: (*cachedout*) Single-quotes and use format + * e77585de17 Merge pull request `#30370`_ from rallytime/remove-incomplete-func -- **PR** `#29139`_: (*thomaso-mirodin*) [salt-ssh] Add a range roster and range targeting options for the flat roster + * e220fa5125 Remove incomplete function -- **PR** `#29282`_: (*cachedout*) dev docs: add development tutorial +* **ISSUE** `#23215`_: (`lichtamberg`_) Rbenv: gem.installed not using correct ruby version if it's not default on 2015.02 (refs: `#28702`_) -- **PR** `#28994`_: (*timcharper*) add support to s3 for aws role assumption +* **PR** `#30366`_: (`rallytime`_) Back-port `#28702`_ to 2015.8 + @ *2016-01-14 21:10:03 UTC* -- **PR** `#29278`_: (*techhat*) Add verify_log to SPM + * **PR** `#28702`_: (`dnd`_) Pass RBENV_VERSION in env dict, and protect shlex.split (refs: `#30366`_) -- **PR** `#29067`_: (*jacksontj*) Fix infinite recursion in state compiler for prereq of SLSs + * eb1ecd9732 Merge pull request `#30366`_ from rallytime/bp-28702 -- **PR** `#29207`_: (*jfindlay*) do not shadow ret function argument + * 4f2274a275 Remove extra line -- **PR** `#29215`_: (*rallytime*) Back-port `#29192`_ to 2015.8 + * 048b13cf73 Pass RBENV_VERSION in env dict, and protect shlex.split -- **PR** `#29217`_: (*clan*) show duration only if state_output_profile is False +* **PR** `#30361`_: (`cro`_) Flip the sense of the test for proxymodule imports, add more fns for esxi proxy + @ *2016-01-14 20:54:08 UTC* -- **PR** `#29221`_: (*ticosax*) [dokcerng] Docu network mode + * 40594efc0b Merge pull request `#30361`_ from cro/esxi-proxy2 -- **PR** `#29269`_: (*jfindlay*) win_status module: fix function names in docs + * 8f7490ca98 Missed return statement. -- **PR** `#29213`_: (*rallytime*) Move _wait_for_task func from vmware cloud to vmware utils + * 389ede9e3e Lint -- **PR** `#29271`_: (*techhat*) Pass full path for digest (SPM) + * 9db34d6ffe Lint -- **PR** `#29244`_: (*isbm*) List products consistently across all SLES systems + * b5c7a46f7a Lint -- **PR** `#29255`_: (*garethgreenaway*) fixes to consul module + * 1a3b1f2626 Don't use short variables -- **PR** `#29208`_: (*whytewolf*) Glance more profile errors + * b80577182a Remove stub functions. -- **PR** `#29200`_: (*jfindlay*) mount state: unmount by device is optional + * 58f7fc3285 Don't use single character variables. -- **PR** `#29205`_: (*trevor-h*) Fixes `#29187`_ - using winrm on EC2 + * e712664bcf Better comment. -- **PR** `#29170`_: (*cachedout*) Migrate pydsl tests to integration test suite + * 9e9a37d0d4 Indentation. -- **PR** `#29198`_: (*jfindlay*) rh_ip module: only set the mtu once + * 6c9bf76e19 Revert earlier vmware change for ssl cert checking. -- **PR** `#29135`_: (*jfindlay*) ssh_known_hosts.present state: catch not found exc + * db8a281ab8 Flip the sense of the test for items (modules, etc) loaded by the proxy. Now load everything a regular minion would load, and only check to make sure __proxyenabled__ is present for proxymodules and grains -- **PR** `#29196`_: (*s0undt3ch*) We need novaclient imported to compare versions + * 00c4ef6ec2 Need a list -- **PR** `#29059`_: (*terminalmage*) Work around upstream pygit2 bug + * 0da7a6d6d1 Recreate the pr -- **PR** `#29112`_: (*eliasp*) Prevent backtrace (KeyError) in `ssh_known_hosts.present` state +* **PR** `#30267`_: (`isbm`_) Fix RPM issues with the date/time and add package attributes filtering + @ *2016-01-14 18:00:01 UTC* -- **PR** `#29178`_: (*whytewolf*) Profile not being passed to keystone.endpoint_get in _auth. so if a p… + * f4118be6e4 Merge pull request `#30267`_ from isbm/isbm-zypper-isotimefix + * 18281e7e0b Add "\*time_t" as a separate attributes + + * 4105157cfd Add \*time_t to the docs + + * 78e16a7b00 Construct RPM query dynamically + + * 6992d74806 Update documentation for the valid package attributes + + * 6710e4900d Use renamed variable (filter_attrs to attr) + + * b68e1228e9 Remove unnecessary check for the "name" key + + * e5b3e77186 Remove key transformations + + * 9ac52c9123 Add zone to the ISO from unix time + + * d352c08305 Fix lint: unused import + + * d571381f76 Update the documentation for the Zypper module + + * 5651a043e6 Update documentation for lowpkg + + * 7edb0e8f3f Replace "\*_date_iso" with "\*_date" and use Unix time as "\*_date_time_t" + + * b2b21f877a Add epoch (note: this is empty on SUSE systems) + + * 0eebe10d9a Clarify description + + * a745d9ecdf Fix syntax for the documentation in zypper module + + * c95c2d24db Fix the documentation syntax + + * 1fb84538b1 Update documentation + + * 43ebff4dd7 Return build date in Unix ticks + + * bdaa1e4d6e Add package architecture attribute + + * ba64df4def Update documentation + + * 6e3743dce6 Incorporate lowpkg.info into info_installed + + * b72b8d5323 Fix the documentation + + * 181314b20e Add filtering per attributes feature + + * 39e70ef762 Fix ISO and Unix time of the package for RPM systems on C locale. + +* **ISSUE** `#30330`_: (`JensRantil`_) salt.state.file.absent doesn't document recursiveness (refs: `#30360`_) + +* **PR** `#30360`_: (`jfindlay`_) file.remove, file.absent: mention recursive dir removal + @ *2016-01-14 17:30:26 UTC* + + * b61cb7a238 Merge pull request `#30360`_ from jfindlay/remove_doc + + * a21ccd2700 file.remove, file.absent: mention recursive dir removal + +* **ISSUE** `#26845`_: (`maio`_) Postgres module (user_exists) doesn't work with PostgreSQL 9.5 (refs: `#30221`_) + +* **PR** `#30221`_: (`mbarrien`_) No rolcatupdate for user_exist in Postgres>=9.5 `#26845`_ + @ *2016-01-14 16:52:49 UTC* + + * ba8d128025 Merge pull request `#30221`_ from mbarrien/postgres-9.5 + + * a8f2bc7998 No rolcatupdate for user_exist in Postgres>=9.5 `#26845`_ + +* **PR** `#30358`_: (`terminalmage`_) Add libgit2 version to versions-report + @ *2016-01-14 16:37:28 UTC* + + * 4787c2c9ad Merge pull request `#30358`_ from terminalmage/libgit2-version + + * 89fe571791 Add libgit2 version to versions-report + +* **PR** `#30346`_: (`pass-by-value`_) Prevent orphaned volumes + @ *2016-01-14 16:37:08 UTC* + + * af2ddfd31c Merge pull request `#30346`_ from pass-by-value/aws_vols_attach + + * 19fce03ee2 Prevent orphaned volumes + +* **PR** `#30349`_: (`rallytime`_) Back-port `#30347`_ to 2015.8 + @ *2016-01-14 16:26:37 UTC* + + * **PR** `#30347`_: (`rallytime`_) Merge `#30231`_ with updates to dependency documentation (refs: `#30349`_) + + * **PR** `#30231`_: (`nmadhok`_) Fix issue where pyVmomi 6.0.0 raises SSL Error for systems using Python2.7+ (refs: `#30347`_) + + * bccb8f3b5b Merge pull request `#30349`_ from rallytime/bp-30347 + + * df70afdaa3 Merge `#30231`_ with updates to dependency documentation + + * a7c2ad5505 Fix issue where pyVmomi 6.0.0 raises SSL Error for systems using Python2.7+ + +* **PR** `#30354`_: (`anlutro`_) Make sure all ignore_missing SLSes are catched + @ *2016-01-14 16:24:19 UTC* + + * **PR** `#19429`_: (`ryan-lane`_) Add new ignore_missing option to pillar top (refs: `#30354`_) + + * 7ee61f0d62 Merge pull request `#30354`_ from alprs/fix-pillar_ignore_missing + + * 2f662bbc8d make sure *all* ignore_missing slses are catched + +* **PR** `#30356`_: (`nmadhok`_) Adding code author + @ *2016-01-14 16:23:08 UTC* + + * 4bdade6010 Merge pull request `#30356`_ from nmadhok/patch-1 + + * 581e4f5dc7 Adding code author + +* **PR** `#30340`_: (`justinta`_) Updated seed_test.py for changes made to seed module + @ *2016-01-13 22:50:34 UTC* + + * d5b8776355 Merge pull request `#30340`_ from jtand/seed_test_fix + + * ee764ee952 Updated seed_test.py for changes made to seed module + +* **ISSUE** `#26478`_: (`rasathus`_) nested upstart services are not supported (refs: `#26511`_) + +* **PR** `#30339`_: (`jfindlay`_) Backport `#26511`_ + @ *2016-01-13 22:35:17 UTC* + + * **PR** `#26511`_: (`rasathus`_) Adds support for nested upstart scripts in the form of subfolder/serv… (refs: `#30339`_) + + * 3bbed62d07 Merge pull request `#30339`_ from jfindlay/bp-26511 + + * 89d9cd5e38 Adds support for nested upstart scripts in the form of subfolder/service. This is implemented via an os.walk through the /etc/init folder, rather than the previous glob for \*.conf method. + +* **ISSUE** `#28339`_: (`boboli`_) salt-call state.highstate fails with ZMQError when minion has no id set in /etc/salt/minion (refs: `#28423`_, `#28431`_) + +* **PR** `#30343`_: (`rallytime`_) Fix 2015.8 from incomplete back-port + @ *2016-01-13 21:56:26 UTC* + + * **PR** `#30187`_: (`rallytime`_) Back-port `#27606`_ to 2015.8 (refs: `#30343`_) + + * **PR** `#28431`_: (`plastikos`_) Use a broader test for unset "id" (refs: `#30343`_) + + * **PR** `#28423`_: (`cachedout`_) Fix issue with empty str as default minion id (refs: `#28431`_) + + * **PR** `#28189`_: (`plastikos`_) Always get default option settings from salt.config (refs: `#30343`_, `#28431`_) + + * **PR** `#28131`_: (`cachedout`_) Set a fallback HWM (refs: `#30343`_) + + * **PR** `#27606`_: (`plastikos`_) RFC: Add additional ZMQ tuning parameters necessary for 1k+ minions per master [WIP] (refs: `#30343`_, `#30187`_) + + * 6079a96e6e Merge pull request `#30343`_ from rallytime/fix-2015.8 + + * 5eef9d5067 Use a broader test for unset "id" + + * 460a3c98cc Additional corrections to use option defaults directly from salt.config + + * 4e53ef0bf6 Always get default option settings from salt.config + + * 94ee6f88af Set a fallback HWM + +* **PR** `#30342`_: (`eliasp`_) Correct whitespace placement in error message + @ *2016-01-13 21:32:26 UTC* + + * 7276d808ff Merge pull request `#30342`_ from eliasp/2015.8-log-message-format + + * 8e37e36ac7 Correct whitespace placement in error message + +* **ISSUE** `#30250`_: (`mbarrien`_) npm.bootstrap state runs even when test=True (refs: `#30257`_) + +* **PR** `#30308`_: (`rallytime`_) Back-port `#30257`_ to 2015.8 + @ *2016-01-13 19:20:13 UTC* + + * **PR** `#30257`_: (`abednarik`_) Add test in npm state. (refs: `#30308`_) + + * 10b5728f84 Merge pull request `#30308`_ from rallytime/bp-30257 + + * 0b0d73756e Fix typos in nmp module. + + * deeeb71dda Add test in npm state. + +* **PR** `#30187`_: (`rallytime`_) Back-port `#27606`_ to 2015.8 (refs: `#30343`_) + @ *2016-01-13 19:03:11 UTC* + + * **PR** `#27606`_: (`plastikos`_) RFC: Add additional ZMQ tuning parameters necessary for 1k+ minions per master [WIP] (refs: `#30343`_, `#30187`_) + + * afa61c03db Merge pull request `#30187`_ from rallytime/bp-27606 + + * 8ef6d6c6fd Add additional ZMQ tuning parameters necessary for 1,000+ minions per server. Start collecting tuning parameters together in the master config file. + +* **PR** `#30223`_: (`serge-p`_) adding support for DragonFly BSD + @ *2016-01-13 18:24:29 UTC* + + * 7e89a460e4 Merge pull request `#30223`_ from serge-p/patch-11 + + * ec798acbcd Update pkgng.py + + * 45206dfe3d adding support for DragonFly BSD + +* **ISSUE** `#28396`_: (`ymote`_) salt-cloud parallel provisioning (-P option) failed on 2015.8.1 (refs: `#30238`_) + +* **ISSUE** `#23824`_: (`kiorky`_) salt.crypt broken in develop (refs: `#23825`_) + +* **PR** `#30238`_: (`rallytime`_) Reinit crypto before calling RSA.generate when generating keys. + @ *2016-01-13 18:22:11 UTC* + + * **PR** `#23825`_: (`kiorky`_) Fix crypto (refs: `#30238`_) + + * 5a8da62008 Merge pull request `#30238`_ from rallytime/fix-28396 + + * 41d9df45bb Reinit crypto before calling RSA.generate when generating keys. + +* **ISSUE** `#24237`_: (`Grokzen`_) Minion schedule return data missing some fields (refs: `#30246`_) + +* **PR** `#30246`_: (`dmacvicar`_) Add missing return data to scheduled jobs (`#24237`_) + @ *2016-01-13 17:51:49 UTC* + + * 15707e0ac8 Merge pull request `#30246`_ from dmacvicar/dmacvicar-2015.8-24237 + + * c462139dbb lint: E8713(test-for-membership-should-be-not-in) + + * 5a1b2ca486 include the 'success' field in scheduled jobs return data (part of `#24237`_) + + * f72a4ca42d add retcode to scheduled jobs return data (part of `#24237`_) + +* **PR** `#30292`_: (`thegoodduke`_) ipset: fix test=true & add comment for every entry + @ *2016-01-13 17:49:16 UTC* + + * **PR** `#30170`_: (`thegoodduke`_) ipset: fix comment and test (refs: `#30291`_, `#30292`_) + + * 8706720148 Merge pull request `#30292`_ from thegoodduke/fix_ipset + + * 49d70bff16 ipset: fix test=true & add comment for every entry + +* **ISSUE** `#30240`_: (`snw1968`_) firewalld inconsistent permanent option used for services but not ports - other options required (refs: `#30275`_) + +* **PR** `#30275`_: (`abednarik`_) Add permanent argument in firewalld. + @ *2016-01-13 17:44:43 UTC* + + * ea607675f5 Merge pull request `#30275`_ from abednarik/fix_firewalld_ports_permanent + + * e3d4bf51da Add permanent argument in firewalld. + +* **PR** `#30328`_: (`cachedout`_) Fix file test + @ *2016-01-13 17:42:22 UTC* + + * f02db44757 Merge pull request `#30328`_ from cachedout/fix_file_test + + * dcfba51556 Lint + + * b9921128af Kill pointless tests + + * 63c157d0a3 Fix test_managed + +* **PR** `#30310`_: (`pass-by-value`_) Empty bucket fix + @ *2016-01-13 17:30:45 UTC* + + * edd94aea2c Merge pull request `#30310`_ from pass-by-value/empty_bucket_fix + + * aef5a8898c Add fix for else code path + + * 9398c44945 Check and report empty S3 bucket + +* **PR** `#30211`_: (`techhat`_) Execute choot on the correct path + @ *2016-01-13 16:53:40 UTC* + + * f23f0f30d4 Merge pull request `#30211`_ from techhat/tmppath + + * 11ac2ff0bf Revert "We're putting the keys directly in place; -c isn't used" + + * e75b48f5ff We're putting the keys directly in place; -c isn't used + + * 5d7a0f6d81 Execute choot on the correct path + +* **ISSUE** `#30286`_: (`tkunicki`_) salt-cloud ec2 spot requests fail with userdata_file in config or profile (refs: `#30304`_) + +* **PR** `#30309`_: (`rallytime`_) Back-port `#30304`_ to 2015.8 + @ *2016-01-13 16:41:53 UTC* + + * **PR** `#30304`_: (`tkunicki`_) add spot_prefix to UserData param (refs: `#30309`_) + + * 5154c71127 Merge pull request `#30309`_ from rallytime/bp-30304 + + * 4a8cc87b47 add spot_prefix to UserData param + +* **PR** `#30278`_: (`nmadhok`_) If datacenter is specified in the config, then look for managed objects under it + @ *2016-01-13 15:29:36 UTC* + + * 1624d6cebd Merge pull request `#30278`_ from nmadhok/2015.8-samename-objects-fix + + * b0e86afa00 get_mor_by_property needs container_ref to be a positional parameter + + * 56dfc63f91 If datacenter is specified, start all searches under datacenter + + * fcf77b738e If datacenter is specified then look under it instead of looking under inventory root folder + +* **PR** `#30305`_: (`jacobhammons`_) Changed examples to use the "example.com" domain instead of "mycompan… + @ *2016-01-12 20:42:10 UTC* + + * fc9304f7f8 Merge pull request `#30305`_ from jacobhammons/example-domain + + * 53d17f1f85 Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" + +* **PR** `#30249`_: (`mpreziuso`_) Fixes performance and timeout issues on win_pkg.install + @ *2016-01-12 20:14:54 UTC* + + * 3bd02a898f Merge pull request `#30249`_ from mpreziuso/patch-2 + + * d6e6e10534 Fixes lint issues + + * 3251424838 Fixes performance and timeout issues on win_pkg.install + +* **PR** `#30217`_: (`pass-by-value`_) Make sure cloud actions can be called via salt run + @ *2016-01-12 20:11:13 UTC* + + * 461a741e14 Merge pull request `#30217`_ from pass-by-value/cloud_actions_dispatch + + * 1f68ce05bc Fix pylint error + + * d5b1b60b99 Add CLI Example + + * 5264449fdb Make sure cloud actions can be called via salt run + +* **ISSUE** `#9569`_: (`clearclaw`_) How can a binary file, such as a license key, be distributed via Pillar? (refs: `#30268`_) + +* **PR** `#30268`_: (`terminalmage`_) Optimize file_tree ext_pillar and update file.managed to allow for binary contents + @ *2016-01-12 20:09:19 UTC* + + * 4a6b53f329 Merge pull request `#30268`_ from terminalmage/issue9569 + + * 724b2f36ce Add file_tree/file.managed/contents_pillar example to FAQ + + * 854c7d9978 Remove old FAQ item referencing gitfs bug in 0.16.x + + * e9a6d709f9 salt.states.file.managed: Allow for binary contents + + * 1ba448b619 salt.pillar.file_tree: Optimizations, deprecate raw_data + + * 650cc0af5c salt.modules.file: Improve docstrings + +* **ISSUE** `#29078`_: (`Reiner030`_) boto_secgroup didn't work as expected in Debian Jessie (refs: `#30155`_) + +* **PR** `#30245`_: (`rallytime`_) Boto secgroup/iam_role: Add note stating us-east-1 is default region + @ *2016-01-12 20:04:31 UTC* + + * **PR** `#30155`_: (`rallytime`_) Update boto_secgroup and boto_iam_role docs to only use region OR profile (refs: `#30245`_) + + * dbe7bcdc9a Merge pull request `#30245`_ from rallytime/botosecgroup-docs + + * 406a138f76 Boto secgroup/iam_role: Add note stating us-east-1 is default region + +* **PR** `#30299`_: (`rallytime`_) ESXi Proxy minions states are located at salt.states.esxi, not vsphere. + @ *2016-01-12 20:03:31 UTC* + + * 6b183778f1 Merge pull request `#30299`_ from rallytime/esxi-proxy-doc-fix + + * db68fc48a8 Fix CLI Example syntax + + * 1cb9f29798 ESXi Proxy minions states are located at salt.states.esxi, not vsphere. + +* **PR** `#30202`_: (`opdude`_) Fixed the periodic call to beacons + @ *2016-01-12 19:58:44 UTC* + + * 903289d3fb Merge pull request `#30202`_ from Unity-Technologies/hotfix/beacon_periodic + + * ea7a86fa7d Fixed the periodic call to beacons + +* **PR** `#30303`_: (`jacobhammons`_) Changed notes to indicate that functions are matched using regular ex… + @ *2016-01-12 19:15:16 UTC* + + * 48d2bd9e78 Merge pull request `#30303`_ from jacobhammons/pcre-match + + * e5079ab4c9 Changed notes to indicate that functions are matched using regular expressions instead of minions + +* **ISSUE** `#29684`_: (`snarfmonkey`_) Upgrade from 2015.8.1 to 2015.8.3 via apt for Ubuntu 14.04 causes Dulwich-backed gitfs to stop working (refs: `#30284`_) + +* **PR** `#30284`_: (`terminalmage`_) salt.utils.gitfs: Fix Dulwich env detection and submodule handling + @ *2016-01-12 19:11:36 UTC* + + * 675ac4b43f Merge pull request `#30284`_ from terminalmage/issue29684 + + * a746014f7e salt.utils.gitfs: Fix Dulwich env detection and submodule handling + +* **PR** `#30280`_: (`jfindlay`_) add state mocking to release notes + @ *2016-01-12 19:10:40 UTC* + + * 8f65e822d7 Merge pull request `#30280`_ from jfindlay/state_mock_doc + + * 22c1129f02 modules.state.sls,highstate: mock versionadded + + * 934de30939 add state mock to 2015.8.4 release notes + +* **ISSUE** `#30117`_: (`MadsRC`_) Service beacons fails with Stacktraces (refs: `#30121`_) + +* **PR** `#30273`_: (`rallytime`_) Back-port `#30121`_ to 2015.8 + @ *2016-01-12 19:10:16 UTC* + + * **PR** `#30121`_: (`MadsRC`_) Patch for issue `#30117`_ (refs: `#30273`_) + + * c9ade42d10 Merge pull request `#30273`_ from rallytime/bp-30121 + + * c8c30f2105 I fail at linting... Fixed my uppercase/lowercase problem + + * 0877b33026 Fixed some linting issues + + * 8ec36497a1 Added note about systemd and uncleanshutdown. Also fixed line lenght of comments to max 80 characters as per PEP0008 + + * a50428d02c On an unclean shutdown, if oncleanshutdown is given a path, an keyy:value of shutdown:unclean is added to the returned data. The documentation states that the key should be 'uncleanshutdown' and that the value should either be True or False. This is fixed in the code + + * 51b57f1820 Fixed issue number `#30117`_ - When no parameters are given to a service, the service object is of type None and thus isn't iterable. This is contrary to the documentation which states that there are default values. Default values added as False + +* **PR** `#30301`_: (`cachedout`_) Accept whatever comes into hightstate mock for state tests + @ *2016-01-12 18:33:14 UTC* + + * 3a5a84a790 Merge pull request `#30301`_ from cachedout/fix_state_tests + + * 2c62b464b1 Accept whatever comes into hightstate mock for state tests + +* **ISSUE** `#28586`_: (`zmalone`_) file.append does not differentiate between tabs and spaces (refs: `#30156`_) + +* **PR** `#30282`_: (`cachedout`_) Fix file.append logic + @ *2016-01-12 18:27:30 UTC* + + * **PR** `#30156`_: (`abednarik`_) Add option in file.append to ignore_whitespace. (refs: `#30282`_) + + * 8438d19815 Merge pull request `#30282`_ from cachedout/fix_30156 + + * 3f633ff15e Lint + + * 99dd11dec2 Remove debugging + + * 35ef585c54 Fix logic error in file.append + +* **PR** `#30289`_: (`cro`_) Fix problems with targeting proxies by grains + @ *2016-01-12 18:16:57 UTC* + + * 530c9ec6ec Merge pull request `#30289`_ from cro/proxy_grains_fix + + * 8362d76440 Add comments. + + * 4e50962642 Merge branch 'proxy_grains_fix' of github.com:cro/salt into proxy_grains_fix + + * 61bb6a9a14 Lint. + + * 7c35333509 Force a grains sync after we load the proxy's grains. + + * 2855ba7da5 Disallow non-proxyenabled modules and grains + + * 8fd8f3beb7 Lint. + + * 144fea02e5 Force a grains sync after we load the proxy's grains. + + * 5ecf85017b Disallow non-proxyenabled modules and grains + +* **PR** `#30293`_: (`cro`_) Ensure we don't log stuff we shouldn't + @ *2016-01-12 18:04:25 UTC* + + * 75b83453cf Merge pull request `#30293`_ from cro/proxy_log_cleanup + + * b358fe370c Merge remote-tracking branch 'origin/proxy_log_cleanup' into proxy_log_cleanup + + * c9a5680427 Add unused 'output_loglevel' kwarg. This is here for when we alias cmd.run_all directly to _run_all_quiet in certain chicken-and-egg situations where modules need to work both before and after the __salt__ dictionary is populated (cf dracr.py). + + * 8c46de12e4 Ensure we don't log stuff we shouldn't. + + * 3267d92216 Add unused 'output_loglevel' kwarg. This is here for when we alias cmd.run_all directly to _run_all_quiet in certain chicken-and-egg situations where modules need to work both before and after the __salt__ dictionary is populated (cf dracr.py). + + * 6a86bdc6da Ensure we don't log stuff we shouldn't. + +* **PR** `#30279`_: (`cachedout`_) Allow modules to be packed into boto utils + @ *2016-01-12 16:53:54 UTC* + + * 46681658e0 Merge pull request `#30279`_ from cachedout/boto_pack + + * 11d27ba694 Mock config module in utils test + + * 62a1818287 Lint + + * cf440036dd Remove unused import + + * 36d55ea0ad Allow modules to be packed into boto utils + +* **ISSUE** `#29951`_: (`Reiner030`_) boto_ec2 params needed (refs: `#30186`_) + +* **PR** `#30186`_: (`rallytime`_) Update CLI Examples in boto_ec2 module to reflect correct arg/kwarg positioning + @ *2016-01-08 19:00:45 UTC* + + * 54b9641330 Merge pull request `#30186`_ from rallytime/fix-29951 + + * a943b505cc Update CLI Examples in boto_ec2 module to reflect correct arg/kwarg positioning + +* **ISSUE** `#28586`_: (`zmalone`_) file.append does not differentiate between tabs and spaces (refs: `#30156`_) + +* **PR** `#30156`_: (`abednarik`_) Add option in file.append to ignore_whitespace. (refs: `#30282`_) + @ *2016-01-08 16:07:23 UTC* + + * 1256fd11e1 Merge pull request `#30156`_ from abednarik/ignore_whitespace_file_append + + * af68086e5c Add option in file.append to ignore_whitespace. + +* **PR** `#30189`_: (`rallytime`_) Back-port `#30185`_ to 2015.8 + @ *2016-01-07 23:32:05 UTC* + + * **PR** `#30185`_: (`cachedout`_) Fix `#30118`_ (refs: `#30189`_) + + * **PR** `#30118`_: (`thatch45`_) State mock (refs: `#30185`_, `#30189`_) + + * ad7522c98d Merge pull request `#30189`_ from rallytime/bp-30185 + + * 70681bf03b Fix for mock state PR `#30118`_ + + * f9480f66d8 change arg to mocked to try test suite collision fix + + * 2fbdcda703 fix some typos + + * 6f757b8c81 Add Mock to state.sls + + * fb0cbd185e fix issue where the name may be in 2 places + + * 5f0326e521 Start on the state mock system + +* **ISSUE** `#9319`_: (`gravyboat`_) Update Reactor docs with an example using salt-cloud from the commandline. (refs: `#30215`_) + +* **ISSUE** `#8146`_: (`basepi`_) Make implications of extra accepted keys on timeouts more obvious (refs: `#30215`_) + +* **ISSUE** `#6853`_: (`Psycojoker`_) Salt formulas should be way more visible in the documentation (refs: `#30215`_) + +* **ISSUE** `#4381`_: (`mlister2006`_) peer_run: glob, pcre matching. Better docs (refs: `#30215`_) + +* **ISSUE** `#2229`_: (`alekibango`_) how to debug zeromq problem with hanging salt communication? (refs: `#30215`_) + +* **ISSUE** `#15042`_: (`cvrebert`_) percent signs not escaped in cron commands (refs: `#30215`_) + +* **ISSUE** `#14946`_: (`ryan-lane`_) reload_modules not documented in global state arguments documentation (refs: `#30215`_) + +* **ISSUE** `#13777`_: (`gravyboat`_) Update top module docs with more concise examples (refs: `#30215`_) + +* **ISSUE** `#13036`_: (`tminn`_) salstack tomcat module (refs: `#30215`_) + +* **PR** `#30215`_: (`jacobhammons`_) Assorted doc bug fixes + @ *2016-01-07 21:53:27 UTC* + + * 8f30f7045a Merge pull request `#30215`_ from jacobhammons/doc-issues + + * 44ce704206 Updated `zmq_monitor` docs + + * 0d2111d397 Assorted doc bug fixes + +* **ISSUE** `#30204`_: (`anlutro`_) salt can't find local cache return file (refs: `#30206`_) + +* **PR** `#30206`_: (`cachedout`_) Revert "Fix incorrect file permissions in file.line" + @ *2016-01-07 17:55:48 UTC* + + * 2000800915 Merge pull request `#30206`_ from cachedout/revert_30168 + + * ee786293e7 Revert "Fix incorrect file permissions in file.line" + +* **PR** `#30190`_: (`jacobhammons`_) Updated doc site banners + @ *2016-01-06 22:37:34 UTC* + + * 5632ccb796 Merge pull request `#30190`_ from jacobhammons/banners + + * 266023baf1 Updated doc site banners + +* **ISSUE** `#30171`_: (`jamusj`_) Python 2.7 dependency in x509.py (refs: `#30180`_) + +* **PR** `#30180`_: (`jfindlay`_) modules.x509._dec2hex: add fmt index for 2.6 compat + @ *2016-01-06 19:48:50 UTC* + + * 9a83247992 Merge pull request `#30180`_ from jfindlay/2.7x509 + + * 907469d04a modules.x509._dec2hex: add fmt index for 2.6 compat + +* **PR** `#30179`_: (`terminalmage`_) Backport `#26962`_ to 2015.8 branch + @ *2016-01-06 19:48:30 UTC* + + * **PR** `#26962`_: (`ctrlrsf`_) Add --state-verbose command line option to salt cmd (refs: `#30179`_) + + * 6516d5b5d0 Merge pull request `#30179`_ from terminalmage/bp-26962 + + * 08f2021f52 Fix pylint warnings: unnecessary parens after if keyword + + * a2ec721661 Add --state-verbose command line option to salt cmd + +* **ISSUE** `#29654`_: (`schaarsc`_) ssh_auth should report missing source (refs: `#29693`_) + +* **PR** `#29693`_: (`abednarik`_) Handle missing source file in ssh_auth. + @ *2016-01-06 17:13:06 UTC* + + * 27df7276bc Merge pull request `#29693`_ from abednarik/handle_missing_source_in_ssh_auth + + * fc024e3cf4 Handle missing source file in ssh_auth. + +* **ISSUE** `#29078`_: (`Reiner030`_) boto_secgroup didn't work as expected in Debian Jessie (refs: `#30155`_) + +* **PR** `#30155`_: (`rallytime`_) Update boto_secgroup and boto_iam_role docs to only use region OR profile (refs: `#30245`_) + @ *2016-01-06 17:09:50 UTC* + + * f9863dd9fb Merge pull request `#30155`_ from rallytime/boto-secgroup-docfix + + * f0381a955f Update boto_secgroup and boto_iam_role docs to only use region OR profile. + +* **ISSUE** `#29905`_: (`Reiner030`_) pillar referencing for boto profiles seems not completely working right / docu missing (refs: `#30158`_) + +* **PR** `#30158`_: (`rallytime`_) Move _option(value) calls to __salt__['config.option'] in boto utils + @ *2016-01-06 16:35:59 UTC* + + * e36e8e2e73 Merge pull request `#30158`_ from rallytime/fix-29905 + + * 3321c5d408 Move _option(value) calls to __salt__['config.option'] in boto utils + +* **ISSUE** `#29770`_: (`Ch3LL`_) disk.usage does not work on AIX (refs: `#30160`_) + +* **PR** `#30160`_: (`dmurphy18`_) Fix parsing disk usage for line with no number and AIX values in Kilos + @ *2016-01-06 16:34:45 UTC* + + * ec009a6812 Merge pull request `#30160`_ from saltstack/aix_dskusage + + * 8450df0483 Fix parsing disk usage for line with no number and AIX values in Kilos + +* **ISSUE** `#29919`_: (`abcfy2`_) State ``grains.append`` cannot append to a non-exist grain name. (refs: `#30162`_) + +* **PR** `#30162`_: (`rallytime`_) Update list_present and append grains state function docs to be more clear. + @ *2016-01-06 16:33:25 UTC* + + * f808ffbbbd Merge pull request `#30162`_ from rallytime/fix-29919 + + * 9bbd129c60 Update list_present and append grains state function docs to be more clear + +* **ISSUE** `#28923`_: (`aabognah`_) passing argument with '=no' to file.line (refs: `#30163`_) + +* **PR** `#30163`_: (`rallytime`_) Add warning about using "=" in file.line function + @ *2016-01-06 16:32:39 UTC* + + * 83245930a6 Merge pull request `#30163`_ from rallytime/fix-28923 + + * 0e4f91fca2 Add warning about using "=" in file.line function + +* **PR** `#30164`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-01-06 16:28:59 UTC* + + * 106efd258a Merge pull request `#30164`_ from basepi/merge-forward-2015.8 + + * d73a7d6c4d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * 9363d6f5b6 Merge pull request `#30125`_ from abednarik/update_user_home + + * 56544a77f6 Update user home event when createhome is set to False + + * 1a5d585d91 Merge pull request `#30127`_ from jsutton/clarify-documenation-for-random_master + + * 01dbf385ef Adding random_master to reference and updating master_shuffle. Adding master_shuffle to the minion example config file as it is needed for multi-master PKI. + + * 28b1bbbe77 Merge pull request `#30110`_ from markckimball/fix-verify_ssl-in-joyent-cloud + + * e1c08cb269 Fixed flag sent to salt.utils.http in order for verify_ssl to work appropriately. + + * 040412b0b1 Merge pull request `#30093`_ from zmalone/pillar-notes + + * cfbfd58afe Noting that file_roots and "state tree" should both be avoided, because in some environments, the actual states show up another level down. Adding notes about why this is undesirable. + + * 25edefc93a Merge pull request `#30097`_ from cachedout/note_on_password_process_list + + * 58aec884ef Note concern about cleartext password in docs for shadow.gen_password + + * 6b1c3a6bf2 Merge pull request `#30089`_ from mpreziuso/patch-1 + + * 50533add40 Fixes terminology and adds more accurate details about the algorithms + + * 200d09385d Merge pull request `#30086`_ from cachedout/issue_29921 + + * 8c29e2dd6a Document that gitfs needs recent libs + + * 404414bf57 Merge pull request `#30070`_ from cachedout/issue_27835 + + * 60431e342a Add documentation on debugging salt-ssh + +* **ISSUE** `#30150`_: (`rapenne-s`_) file.line reset permissions to 600 (refs: `#30212`_, `#30168`_) + +* **PR** `#30168`_: (`abednarik`_) Fix incorrect file permissions in file.line + @ *2016-01-06 16:25:08 UTC* + + * e5d87a02b9 Merge pull request `#30168`_ from abednarik/2015.8 + + * 79daa25a15 Fix incorrect file permissions in file.line + +* **PR** `#30154`_: (`Oro`_) Fix file serialize on windows + @ *2016-01-05 18:08:40 UTC* + + * bed38d1a65 Merge pull request `#30154`_ from Oro/fix-file-serialize-windows + + * 071a675f8a Fix file serialize on windows + +* **PR** `#30144`_: (`rallytime`_) Added generic ESXCLI command ability to ESXi Proxy Minion + @ *2016-01-05 16:23:38 UTC* + + * 7d51d8bb46 Merge pull request `#30144`_ from rallytime/vsphere-esxcli-cmd + + * 2f9ec5db96 Added generic ESXCLI command ability to ESXi Proxy Minion + +* **ISSUE** `#29994`_: (`adithep`_) dockerng.push should not auto tag :latest (refs: `#30142`_) + +* **ISSUE** `#29993`_: (`adithep`_) Dockerng as a whole is not compatible with v2 registries. (refs: `#30142`_) + +* **PR** `#30142`_: (`terminalmage`_) Fix dockerng.push, and allow for multiple images + @ *2016-01-04 22:53:50 UTC* + + * 1a21b3d46b Merge pull request `#30142`_ from terminalmage/issue29994 + + * 66698986e4 Fix dockerng.push, and allow for multiple images + +* **ISSUE** `#30051`_: (`joejulian`_) glusterfs.status fails with glusterfs 3.7 (refs: `#30075`_) + +* **PR** `#30075`_: (`joejulian`_) Convert glusterfs module to use xml (refs: `#30405`_) + @ *2016-01-04 20:33:58 UTC* + + * 5419699bd2 Merge pull request `#30075`_ from iodatacenters/2015.8_gluster_usexml + + * 01a8e7ee10 Convert glusterfs module to use xml + +* **PR** `#30129`_: (`optix2000`_) Clean up _uptodate() in git state + @ *2016-01-04 20:23:18 UTC* + + * a6d94358ed Merge pull request `#30129`_ from optix2000/2015.8 + + * c68ea6332a No point to recast comments to a string. _uptodate() should only accept strings for comments. + + * 6c5bac4909 Properly fix concat list issue in git state. + +* **ISSUE** `#28814`_: (`peter-slovak`_) The "virtual" grain detection with virt-what on LXC incorrectly yields "physical" (refs: `#29589`_) + +* **PR** `#30139`_: (`rallytime`_) Back-port `#29589`_ to 2015.8 + @ *2016-01-04 20:22:47 UTC* + + * **PR** `#29589`_: (`abednarik`_) Added lxc in virt-what list. (refs: `#30139`_) + + * 68dfa0f5de Merge pull request `#30139`_ from rallytime/bp-29589 + + * 2c73990ff2 Added lxc in virt-what list. + +* **ISSUE** `#29833`_: (`iMilnb`_) salt minion won't start: Non valid IP address match on BSD alias format (refs: `#30124`_) + +* **PR** `#30124`_: (`abednarik`_) Update regex to detect ip alias in OpenBSD. + @ *2016-01-04 19:48:28 UTC* + + * dd8d3e6f6b Merge pull request `#30124`_ from abednarik/fix_openbsd_ip_alias + + * 595a12977d Update regex to detect ip alias in OpenBSD. + +* **PR** `#30133`_: (`stanislavb`_) Fix typo in gpgkey URL + @ *2016-01-04 19:29:57 UTC* + + * c3014be84b Merge pull request `#30133`_ from stanislavb/fix-gpg-key-url-typo + + * d81f6f7206 Fix typo in gpgkey URL + +* **ISSUE** `#29912`_: (`rterbush`_) s3 ext_pillar fails if key and keyid are not provided (refs: `#30126`_) + +* **PR** `#30126`_: (`stanislavb`_) Log S3 API error message + @ *2016-01-04 19:22:39 UTC* + + * c06671a259 Merge pull request `#30126`_ from stanislavb/2015.8 + + * 8c4a101c8f Log S3 API error message + +* **PR** `#30128`_: (`oeuftete`_) Log retryable transport errors as warnings + @ *2016-01-04 19:15:31 UTC* + + * aeec21ea65 Merge pull request `#30128`_ from oeuftete/fileclient-attempt-error-to-warning + + * a5d99b13e1 Log retryable transport errors as warnings + +* **ISSUE** `#28171`_: (`srkunze`_) cron.rm cannot remove @special entries (refs: `#30096`_) + +* **PR** `#30096`_: (`cachedout`_) Add rm_special to crontab module + @ *2016-01-01 00:56:08 UTC* + + * 941bcaed07 Merge pull request `#30096`_ from cachedout/issue_28171 + + * 259a0582ac Add docs + + * ad9424820e Add rm_special to crontab module + +* **PR** `#30106`_: (`techhat`_) Ensure last dir + @ *2016-01-01 00:52:54 UTC* + + * cb0f80831f Merge pull request `#30106`_ from techhat/seeddirs + + * 01d1a49937 Ensure last dir + +* **PR** `#30101`_: (`gtmanfred`_) fix bug where nova driver exits with no adminPass + @ *2015-12-31 13:45:16 UTC* + + * 6bc968db9a Merge pull request `#30101`_ from gtmanfred/2015.8 + + * 1b98f7af38 fix bug where nova driver exits with no adminPass + +* **PR** `#30090`_: (`techhat`_) Add argument to isdir() + @ *2015-12-30 22:41:02 UTC* + + * 3652dbae76 Merge pull request `#30090`_ from techhat/seeddirs + + * f7c7d9c7c2 Add lstrip + + * c70257163b Add argument to isdir() + +* **PR** `#30094`_: (`rallytime`_) Fix doc formatting for cloud.create example in module.py state + @ *2015-12-30 22:40:24 UTC* + + * a12bda4b30 Merge pull request `#30094`_ from rallytime/module_state_doc_fix + + * 8fbee322b9 Fix doc formatting for cloud.create example in module.py state + +* **PR** `#30095`_: (`rallytime`_) Add the list_nodes_select function to linode driver + @ *2015-12-30 21:06:58 UTC* + + * d7f46b5438 Merge pull request `#30095`_ from rallytime/select_query_linode + + * 4731d9442e Add the list_nodes_select function to linode driver + +* **ISSUE** `#28763`_: (`cybacolt`_) grain saltversioninfo not returning values by index (refs: `#30082`_) + +* **PR** `#30082`_: (`abednarik`_) Fixed saltversioninfo grain return + @ *2015-12-30 18:23:17 UTC* + + * dce64c0868 Merge pull request `#30082`_ from abednarik/fix_grain_saltversion_index + + * 882e9ac9ed Fixed saltversioninfo grain return. + +* **PR** `#30084`_: (`rallytime`_) Back-port `#29987`_ to 2015.8 + @ *2015-12-30 18:19:09 UTC* + + * **PR** `#29987`_: (`pass-by-value`_) Make sure output file works for salt cloud (refs: `#30084`_) + + * 5602b8833e Merge pull request `#30084`_ from rallytime/bp-29987 + + * 16e1df90e9 Make sure output file works for salt cloud + +* **PR** `#30071`_: (`rallytime`_) Merge branch '2015.5' into '2015.8' + @ *2015-12-29 23:18:00 UTC* + + * 654cab0314 Merge pull request `#30071`_ from rallytime/merge-forward-2015.8 + + * 394d7548c5 Additional spelling fixes for boto_vpc module + + * f7e58a241c Merge branch '2015.5' into '2015.8' + + * 84db12212d Merge pull request `#30059`_ from mpreziuso/patch-1 + + * 1cb1c2da07 Fixes wrong function scope + + * 1c6c9b1a06 Merge pull request `#30025`_ from jtand/boto_tests + + * e706642152 Skipping some Boto tests until resolved moto issue + + * 0f91021c59 Merge pull request `#29949`_ from aletourneau/2015.5 + + * cf855fe262 Fixed trailing white spaces + + * 864801e002 fixed version + + * 041d9346c4 Enhanced netscaler docstring + + * 229d3eb60b Merge pull request `#29941`_ from cachedout/boto_spelling + + * b11bfd07b8 Fix spelling error in boto_vpc + + * 69c5ada636 Merge pull request `#29908`_ from cachedout/issue_29880 + + * 4cd77b4118 Allow kwargs to be passed to pacman provide for update func + + * ad0de4d563 Merge pull request `#29909`_ from abednarik/freebsd_pkgng_non_interactive_fix + + * 8ac213001a FreeBSD pkgng fix for non-interactive install. + +* **PR** `#30067`_: (`ryan-lane`_) Pass in kwargs to boto_secgroup.convert_to_group_ids explicitly + @ *2015-12-29 23:04:33 UTC* + + * 1bf9853808 Merge pull request `#30067`_ from lyft/boto-elb-stable-fix + + * ae22edb1b4 Pass in kwargs to boto_secgroup.convert_to_group_ids explicitly + +* **PR** `#30069`_: (`techhat`_) Ensure that pki_dir exists + @ *2015-12-29 23:03:23 UTC* + + * 0a37c4de1a Merge pull request `#30069`_ from techhat/seeddirs + + * 0f05d49bde Ensure that pki_dir exists + +* **ISSUE** `#30045`_: (`AkhterAli`_) salt-cloud make syndic not possible. (refs: `#30064`_) + +* **PR** `#30064`_: (`rallytime`_) Add Syndic documentation to miscellaneous Salt Cloud config options + @ *2015-12-29 20:15:45 UTC* + + * 896655602e Merge pull request `#30064`_ from rallytime/fix-30045 + + * 6176f383e5 Spelling fixes + + * 83c05729d6 Add Syndic documentation to miscellaneous Salt Cloud config options + +* **PR** `#30049`_: (`rallytime`_) Add some more unit tests for the vsphere execution module + @ *2015-12-29 17:07:41 UTC* + + * bad6daca93 Merge pull request `#30049`_ from rallytime/esxi-unit-tests + + * 1a83147986 Remove unnecessary import block + + * 695107ae6e Add some more unit tests for the vsphere execution module + +* **PR** `#30060`_: (`rallytime`_) Back-port `#27104`_ to 2015.8 + @ *2015-12-29 17:06:58 UTC* + + * **PR** `#27104`_: (`hexedpackets`_) Remove only the file extension when checking missing cached nodes. (refs: `#30060`_) + + * cedee772d7 Merge pull request `#30060`_ from rallytime/bp-27104 + + * f0566c4b8f Remove only the file extension on cached node files instead of replacing every '.p' substring. + +* **ISSUE** `#28540`_: (`whiteinge`_) The rest_cherrypy automodule docs are hard to digest (refs: `#30048`_) + +* **PR** `#30048`_: (`jacobhammons`_) Remove internal APIs from rest_cherrypy docs. + @ *2015-12-28 23:24:13 UTC* + + * 87667e2de6 Merge pull request `#30048`_ from jacobhammons/28540 + + * a04cebd48c Remove internal APIs from rest_cherrypy docs. Refs `#28540`_ + +* **ISSUE** `#29960`_: (`anlutro`_) Circular import in salt.utils.jinja (refs: `#30043`_) + +* **PR** `#30043`_: (`rallytime`_) Be explicit about importing from salt.utils.jinja to avoid circular imports + @ *2015-12-28 21:35:18 UTC* + + * 3c63527313 Merge pull request `#30043`_ from rallytime/fix-29960 + + * a157c78bc8 Be explicit about importing from salt.utils.jinja to avoid circular imports + +* **PR** `#30038`_: (`rallytime`_) Back-port `#30017`_ to 2015.8 + @ *2015-12-28 20:41:45 UTC* + + * **PR** `#30017`_: (`anlutro`_) Change how alternatives states check for installed (refs: `#30038`_) + + * 6cdca314c7 Merge pull request `#30038`_ from rallytime/bp-30017 + + * aab35b883e Add versionadded directive for new check_exists function. + + * ca290ec3e1 change how alternatives states check for installed + +* **PR** `#30036`_: (`rallytime`_) Back-port `#29995`_ to 2015.8 + @ *2015-12-28 20:41:04 UTC* + + * **PR** `#29995`_: (`ruxandraburtica`_) Location from profiles not correctly set (refs: `#30036`_) + + * c846e7bc86 Merge pull request `#30036`_ from rallytime/bp-29995 + + * 129a6d7b9f Added vm\_ to the get_location query. + + * af8d01a367 Updated ec2 file to correctly propagate location. + +* **PR** `#30035`_: (`rallytime`_) Back-port `#29895`_ to 2015.8 + @ *2015-12-28 20:20:58 UTC* + + * **PR** `#29895`_: (`pass-by-value`_) Do not SSH to the instance if deploy is False (refs: `#30035`_) + + * 27b0bd2c34 Merge pull request `#30035`_ from rallytime/bp-29895 + + * 09f208fe63 Do not SSH to the instance if deploy is False + +* **PR** `#30034`_: (`rallytime`_) Back-port `#29893`_ to 2015.8 + @ *2015-12-28 20:20:51 UTC* + + * **PR** `#29893`_: (`pass-by-value`_) Add info about VolumeType (refs: `#30034`_) + + * 9e385369b7 Merge pull request `#30034`_ from rallytime/bp-29893 + + * 2fcf1590b8 Add info about VolumeType + +* **PR** `#30033`_: (`rallytime`_) Back-port `#29876`_ to 2015.8 + @ *2015-12-28 20:20:42 UTC* + + * **PR** `#29876`_: (`abednarik`_) Updated Cloud msic section. (refs: `#30033`_) + + * 4d4dfd692a Merge pull request `#30033`_ from rallytime/bp-29876 + + * a257249789 Add versionadded to SSH Port docs + + * 0bb83e51aa Updated Cloud msic section. + +* **PR** `#30029`_: (`terminalmage`_) git.latest: Fix handling of nonexistant branches + @ *2015-12-28 19:39:29 UTC* + + * a5f7d9c2fc Merge pull request `#30029`_ from terminalmage/git.latest-nonexistant-branch + + * 0b95894c9f git.latest: Fix handling of nonexistant branches + +* **PR** `#30016`_: (`anlutro`_) Properly normalize locales in locale.gen_locale + @ *2015-12-28 15:33:48 UTC* + + * e7fe24dc64 Merge pull request `#30016`_ from alprs/fix-gen_locale_normalize + + * 75eb4511d3 properly normalize locales in locale.gen_locale + +* **PR** `#30015`_: (`anlutro`_) locale module: don't escape the slash in \\n + @ *2015-12-28 15:31:20 UTC* + + * 90611e95f4 Merge pull request `#30015`_ from alprs/fix-gen_locale_escaped_newline + + * 5799729aee locale module: don't escape the slash in \n + +* **PR** `#30022`_: (`gqgunhed`_) Two minor typos fixed + @ *2015-12-28 15:22:24 UTC* + + * b871ce5310 Merge pull request `#30022`_ from gqgunhed/winrepo_typo + + * a052ff016e fixed minor typos and a :ref: link + + * e47db1a076 Merge remote-tracking branch 'refs/remotes/saltstack/2015.8' into winrepo_typo + + * 0c4c8b9b5c Merge remote-tracking branch 'refs/remotes/saltstack/2015.8' into 2015.8 + +* **PR** `#30026`_: (`anlutro`_) states.at: fix wrong variable being used + @ *2015-12-28 15:21:23 UTC* + + * 4b8ac20d45 Merge pull request `#30026`_ from alprs/fix-at_without_tag_job + + * c0fe9c09bd states.at: fix wrong variable being used + +* **PR** `#29966`_: (`multani`_) Fix bigip state/module documentation + serializers documentation + @ *2015-12-23 15:06:46 UTC* + + * a3410fdf41 Merge pull request `#29966`_ from multani/fix/docs + + * e6e36372a4 doc: fix documentation link for salt.serializers + + * 23ef472a07 bigip: fix documentation formatting, remove warnings during doc building + +* **PR** `#29904`_: (`twangboy`_) Improvements to osx packaging scripts + @ *2015-12-22 21:40:23 UTC* + + * **PR** `#29858`_: (`twangboy`_) Osx build (refs: `#29904`_) + + * 8f8c8cedd0 Merge pull request `#29904`_ from twangboy/osx_build + + * 0be53953af Added function to download and check hashes, added hash files + + * 7f0b87bfb3 Added pre/post flight scripts (not running) + + * 9eeb6da7bd Improvements to osx packaging scripts + +* **PR** `#29950`_: (`multani`_) boto_iam: fix deletion of IAM users when using delete_keys=true + @ *2015-12-22 18:43:07 UTC* + + * 9522bdf4a5 Merge pull request `#29950`_ from multani/fix/states.boto_iam-delete-user + + * 516c8661f4 boto_iam: fix deletion of IAM users when using delete_keys=true + +* **PR** `#29937`_: (`multani`_) Fix states.boto_iam group users + @ *2015-12-22 17:33:02 UTC* + + * be95d4d79a Merge pull request `#29937`_ from multani/fix/states.boto_iam-group-users + + * 5c86a78d75 boto_iam: handle group's users empty list by removing all users of the group + + * f3461053df boto_iam: passes connection information down to callees + +* **PR** `#29934`_: (`multani`_) Fix state.boto_iam virtual name + @ *2015-12-22 17:16:25 UTC* + + * 4f2cc5eba7 Merge pull request `#29934`_ from multani/fix/boto_iam + + * 503ede4178 Fix state.boto_iam virtual name + +* **ISSUE** `#29933`_: (`Reiner030`_) boto_rds.absent misses pillar variables for final backup (refs: `#29943`_) + +* **PR** `#29943`_: (`cachedout`_) Check args correctly in boto_rds + @ *2015-12-22 17:15:48 UTC* + + * b36302291d Merge pull request `#29943`_ from cachedout/issue_29933 + + * 8bab5eaeaa Check args correctly in boto_rds + +* **PR** `#29924`_: (`gqgunhed`_) fixed: uptime now working on non-US Windows + @ *2015-12-22 15:03:17 UTC* + + * 02ed5b8fd1 Merge pull request `#29924`_ from gqgunhed/gqgunhed-2015.8 + + * b67c3b45e1 removed duplicate datetime line + + * ed8ee91dcf fixed: uptime now working on non-US Windows + +* **PR** `#29883`_: (`serge-p`_) fix for nfs mounts in _active_mounts_openbsd() + @ *2015-12-21 18:26:49 UTC* + + * 5e44639334 Merge pull request `#29883`_ from serge-p/patch-6 + + * dd94332f24 Update mount.py + + * 9d059a1ea5 fix for nfs mounts in _active_mounts_openbsd() + +* **ISSUE** `#29866`_: (`tony`_) spm(1) command should obey Saltfile (refs: `#29894`_) + +* **PR** `#29894`_: (`techhat`_) Support Saltfile in SPM + @ *2015-12-21 18:03:07 UTC* + + * 08fd81cc3d Merge pull request `#29894`_ from techhat/spmsaltfile + + * 279ec61274 Support Saltfile in SPM + +* **PR** `#29856`_: (`rallytime`_) Added some initial unit tests for the salt.modules.vsphere.py file + @ *2015-12-21 17:12:20 UTC* + + * 4f46255044 Merge pull request `#29856`_ from rallytime/esxi-unit-tests + + * b908ebd123 Added some initial unit tests for the salt.modules.vsphere.py file + +* **PR** `#29855`_: (`rallytime`_) Back-port `#29740`_ to 2015.8 + @ *2015-12-21 17:11:28 UTC* + + * **PR** `#29740`_: (`kiorky`_) Type mess in git.latest (refs: `#29855`_) + + * 096fec6182 Merge pull request `#29855`_ from rallytime/bp-29740 + + * 4c5e277367 Type mess in git.latest + +* **PR** `#29890`_: (`multani`_) Various documentation fixes + @ *2015-12-21 16:25:15 UTC* + + * 02ab9b8858 Merge pull request `#29890`_ from multani/fix/docs + + * 5aa0e9b1e0 Fix documentation typo for pillars + + * f2b41d04d7 Fix rendering issues for Cherrypy netapi documentation. + + * 6922da46dc doc: fix warnings + some rendering issues + +* **PR** `#29850`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-12-18 21:33:49 UTC* + + * 50f48c4bf3 Merge pull request `#29850`_ from basepi/merge-forward-2015.8 + + * 7402599c62 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * f43f3d166c Merge pull request `#29730`_ from rallytime/fix-24698 + + * 120fd5fdf0 Update docker-py version requirement to 0.6.0 for dockerio.py files + + * c393a4175a Merge pull request `#29715`_ from rallytime/fix-23343 + + * a0ed857c37 Install correct package version, if provided, for npm state. + + * 1310afbbc2 Merge pull request `#29721`_ from terminalmage/nested-output-multiline-fix + + * 761be9cb93 Fix display of multiline strings when iterating over a list + + * 52cc07cec9 Merge pull request `#29646`_ from rallytime/fix-29488 + + * c5fa9e9351 Don't stacktrace on kwargs.get if kwargs=None + +* **PR** `#29811`_: (`anlutro`_) influxdb: add retention policy module functions + @ *2015-12-18 17:19:02 UTC* + + * 05d2aaaef2 Merge pull request `#29811`_ from alprs/feature-influxdb_retention + + * 51088d938a add tests, rename a function to more closely mirror influxdb + + * 785da17a67 missing comma + + * 7e9e9a1030 influxdb: add retention policy module functions + +* **ISSUE** `#29396`_: (`Ch3LL`_) Windows 2012 Multi-Master ZMQError (refs: `#29814`_) + +* **PR** `#29814`_: (`basepi`_) [2015.8][Windows] Fix multi-master on windows + @ *2015-12-18 17:16:52 UTC* + + * 7eefaac58a Merge pull request `#29814`_ from basepi/multi-master.windows.29396 + + * 2405501d75 Add documentation for tcp ipc_mode and multi-master + + * 307e867980 For tcp ipc_mode, give each minion different pub/pull ports + + * 5a21893e82 Fix ipc_mode check in windows + +* **PR** `#29819`_: (`rallytime`_) Add esxi module and state to docs build + @ *2015-12-18 16:20:27 UTC* + + * fb4eb28645 Merge pull request `#29819`_ from rallytime/esxi-docs + + * e7c5863468 Add esxi module and state to docs build + +* **PR** `#29832`_: (`jleimbach`_) Fixed typo in order to use the keyboard module for RHEL without systemd + @ *2015-12-18 16:04:57 UTC* + + * e865c787a4 Merge pull request `#29832`_ from jleimbach/fix-keyboard.py-for-rhel-without-systemd + + * 7b72b3c52c Fixed typo in order to use the keyboard module for RHEL without systemd + +* **PR** `#29803`_: (`rallytime`_) Add vSphere module to doc ref module tree + @ *2015-12-17 18:52:56 UTC* + + * 4044f3bb93 Merge pull request `#29803`_ from rallytime/vsphere-docs + + * 3b7f5540ec Add vSphere module to doc ref module tree + +* **ISSUE** `#29751`_: (`ether42`_) mod_hostname behavior is systemd dependant (refs: `#29767`_) + +* **PR** `#29767`_: (`abednarik`_) Hosts file update in mod_hostname. + @ *2015-12-17 18:31:18 UTC* + + * 9b4c2194f6 Merge pull request `#29767`_ from abednarik/network_mod_hpstname_fix + + * eebd3e3e4a Hosts file update in mod_hostname. + +* **ISSUE** `#29631`_: (`joshughes`_) pygit2: git submodules cause traceback in file_list (refs: `#29772`_) + +* **PR** `#29772`_: (`terminalmage`_) pygit2: skip submodules when traversing tree + @ *2015-12-17 18:23:16 UTC* + + * 0c65eeb82b Merge pull request `#29772`_ from terminalmage/issue29631 + + * 8c4ea64b0d pygit2: skip submodules when traversing tree + +* **PR** `#29765`_: (`gtmanfred`_) allow nova driver to be boot from volume + @ *2015-12-17 18:20:33 UTC* + + * 1b430b251f Merge pull request `#29765`_ from gtmanfred/2015.8 + + * e95f7561c5 cloudnetworks should be making public_ips a list + + * ec7e45fbfb add documentation for boot from volume on nova driver + + * eafcc5e3ac Add boot from volume for openstack nova + +* **PR** `#29773`_: (`l2ol33rt`_) Append missing wget in debian installation guide + @ *2015-12-17 17:29:18 UTC* + + * c4f226f31e Merge pull request `#29773`_ from l2ol33rt/debian_install_docfix + + * 64cb4b0540 Append missing wget in debian installation guide + +* **PR** `#29800`_: (`rallytime`_) Back-port `#29769`_ to 2015.8 + @ *2015-12-17 17:28:52 UTC* + + * **PR** `#29769`_: (`pass-by-value`_) Add documentation about scopes (GCE) (refs: `#29800`_) + + * aca4da3abc Merge pull request `#29800`_ from rallytime/bp-29769 + + * 10bfcb8cb0 Add documentation about scopes (GCE) + +* **PR** `#29775`_: (`paulnivin`_) Change listen requisite resolution from name to ID declaration + @ *2015-12-16 22:56:03 UTC* + + * ab61f78295 Merge pull request `#29775`_ from lyft/listen-id-declaration-resolution-stable + + * ff3a809c11 Change listen requisite resolution from name to ID declaration + +* **PR** `#29754`_: (`rallytime`_) Back-port `#29719`_ to 2015.8 + @ *2015-12-16 17:25:51 UTC* + + * **PR** `#29719`_: (`gqgunhed`_) fixed: include all items from kern.disks split (refs: `#29754`_) + + * 5af64b64f2 Merge pull request `#29754`_ from rallytime/bp-29719 + + * ed275977e3 fixed: include all items from kern.disks split + +* **PR** `#29713`_: (`The-Loeki`_) Pillar-based cloud providers still forcing use of deprecated 'provider' + @ *2015-12-16 14:51:31 UTC* + + * **PR** `#27953`_: (`The-Loeki`_) Fix CloudStack cloud for new 'driver' syntax (refs: `#29713`_) + + * b3f17fdaf8 Merge pull request `#29713`_ from The-Loeki/patch-1 + + * 35fe2a5c18 lint fix + + * dfab6f8186 Update __init__.py + + * 65e2d9ac1e Pillar-based cloud providers still forcing use of deprecated 'provider' + +* **ISSUE** `#14634`_: (`Sacro`_) 'unless' documentation isn't logically plausible (refs: `#29729`_) + +* **PR** `#29729`_: (`rallytime`_) Further clarifications on "unless" and "onlyif" requisites. + @ *2015-12-16 14:45:06 UTC* + + * 1f4810be0f Merge pull request `#29729`_ from rallytime/fix-14634 + + * 45b77fb288 Add note about shell truthiness vs python truthiness + + * 3bfb87c031 Spelling fixes + + * 15c466cc12 Further clarifications on "unless" and "onlyif" requisites. + +* **ISSUE** `#29736`_: (`akissa`_) Pillar sqlite3 examples incorrect (refs: `#29737`_) + +* **PR** `#29737`_: (`akissa`_) fix pillar sqlite3 documentation examples + @ *2015-12-16 14:41:57 UTC* + + * 7084f79199 Merge pull request `#29737`_ from akissa/fix-pillar-sqlite3-examples + + * 1c98f8d609 fix pillar sqlite3 documentation examples + +* **ISSUE** `#29741`_: (`akissa`_) Pillar Sqlite3 does not honour database config option when using salt-call (refs: `#29743`_) + +* **PR** `#29743`_: (`akissa`_) fix pillar sqlite not honouring config options + @ *2015-12-16 14:40:27 UTC* + + * e977096409 Merge pull request `#29743`_ from akissa/fix-pillar-sqlite3-does-not-honour-config + + * 6184fb1ae1 fix pillar sqlite not honouring config options + +* **ISSUE** `#29152`_: (`guettli`_) docs for states.postgres_user.present: name and password twice? (refs: `#29723`_) + +* **PR** `#29723`_: (`rallytime`_) Clarify db_user and db_password kwargs for postgres_user.present state function + @ *2015-12-15 23:58:43 UTC* + + * 2cea0b0a2d Merge pull request `#29723`_ from rallytime/fix-29152 + + * 8d8fdd0a27 Clarify db_user and db_password kwargs for postgres_user.present state function + +* **ISSUE** `#29154`_: (`guettli`_) [Docs] for cmd.run. Missing link to details for "stateful" (refs: `#29722`_) + +* **PR** `#29722`_: (`rallytime`_) Link "stateful" kwargs to definition of what "stateful" means for cmd state. + @ *2015-12-15 23:25:48 UTC* + + * 30eab23c43 Merge pull request `#29722`_ from rallytime/fix-29154 + + * 5c045a86af Link "stateful" kwargs to definition of what "stateful" means for cmd state. + +* **ISSUE** `#29091`_: (`gravyboat`_) Salt pillar best practices should show 2 matchers in base (refs: `#29724`_) + +* **PR** `#29724`_: (`rallytime`_) Add examples of using multiple matching levels to Pillar docs + @ *2015-12-15 23:02:32 UTC* + + * c9ca1a371e Merge pull request `#29724`_ from rallytime/fix-29091 + + * 45080f3629 Add examples of using multiple matching levels to Pillar docs + +* **PR** `#29726`_: (`cachedout`_) Disable some boto tests per resolution of moto issue + @ *2015-12-15 22:15:35 UTC* + + * 4985cc57f1 Merge pull request `#29726`_ from cachedout/disable_moto_2015_8 + + * d19827fd3a Disable some boto tests per resolution of moto issue + +* **ISSUE** `#25723`_: (`jamesog`_) file.directory fails in test mode when using recurse ignore_files (refs: `#29708`_) + +* **PR** `#29708`_: (`lagesag`_) Fix test=True for file.directory with recurse ignore_files/ignore_dirs. + @ *2015-12-15 19:15:14 UTC* + + * aba82abffd Merge pull request `#29708`_ from lagesag/fix-file-directory-test-mode + + * a872b5eecf PyLint fix `#25723`_ + + * 3e46cb9213 Fix test=True for file.directory with recurse ignore_files/ignore_dirs. + +* **ISSUE** `#29199`_: (`hubez`_) 2015.8.1 and 2015.5.6: salt-minion self-restart doesn't work in daemon mode. Works when not a daemon (refs: `#29642`_) + +* **PR** `#29642`_: (`cachedout`_) Correctly restart deamonized minions on failure + @ *2015-12-15 19:02:40 UTC* + + * 7c38dec0ad Merge pull request `#29642`_ from cachedout/issue_29199 + + * 8b2c6817cf Sleep before restart + + * 4105e2abfb Correctly restart deamonized minions on failure + +* **PR** `#29599`_: (`cachedout`_) Clean up minion shutdown + @ *2015-12-15 19:01:35 UTC* + + * bd918394c3 Merge pull request `#29599`_ from cachedout/clean_minion_shutdown + + * 0b917971fe Log at debug level instead + + * a04280ceb3 Re-raise error to preserve restart behavior + + * dc480e332a Clean up warning on failed master ping. + + * 049a3dbbbc Additional fixes. + + * 8a4969b730 Clean up minion shutdown + +* **PR** `#29675`_: (`clinta`_) allow returning all refs + @ *2015-12-15 18:55:36 UTC* + + * 31eb291caf Merge pull request `#29675`_ from clinta/git-ls-remote-noref + + * f8c34b0c76 version updated + + * 73b169e7dd lint, remove trainling whitespace + + * 8400e68426 allow returning all refs + +* **PR** `#29683`_: (`rallytime`_) Catch more specific error to pass the error message through elegantly. + @ *2015-12-15 18:41:54 UTC* + + * 7c50533d3f Merge pull request `#29683`_ from rallytime/vsan_fixes + + * afc003079e Catch more specifc error to pass the error message through elegantly. + +* **PR** `#29687`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-12-15 18:38:46 UTC* + + * 30499e4896 Merge pull request `#29687`_ from basepi/merge-forward-2015.8 + + * b51cba59c0 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * f606c23ea8 Merge pull request `#29673`_ from rallytime/fix-29661 + + * e4af7a1157 Default value should be False and not 'False' + + * f77c8e7baf Merge pull request `#29527`_ from jfindlay/2015.5 + + * 1a8044f0c9 2015.5.7 notes: add note about not being released + +* **ISSUE** `#27611`_: (`benburkert`_) PR #26818 broke git.latest with :mirror/:bare (refs: `#29681`_) + +* **PR** `#29681`_: (`clinta`_) fix bare/mirror in git.latest + @ *2015-12-15 18:37:16 UTC* + + * 3c427e82bf Merge pull request `#29681`_ from clinta/git-mirror + + * b387072a6f fix bare/mirror in git.latest + +* **PR** `#29644`_: (`rallytime`_) Fixed a couple more ESXi proxy minion bugs + @ *2015-12-14 18:36:28 UTC* + + * fe0778dad5 Merge pull request `#29644`_ from rallytime/esxi-fixes + + * 577d5487a3 Fixed a couple more ESXi proxy minion bugs + +* **PR** `#29645`_: (`rallytime`_) Back-port `#29558`_ to 2015.8 + @ *2015-12-14 18:11:38 UTC* + + * **PR** `#29558`_: (`ruxandraburtica`_) Returning security group when no VPC id is given (refs: `#29645`_) + + * ef2c9e3f61 Merge pull request `#29645`_ from rallytime/bp-29558 + + * 2cf9374342 Replaced tabs with spaces. + + * 5e7e3fe682 Returning security group when no VPC id is given, even if the group is not in EC2-classic. + +* **ISSUE** `#29630`_: (`c4t3l`_) Fresh minion install (2015.8.3) returns service __virtual__ is False errors on salt-calls (refs: `#29632`_) + +* **ISSUE** `#29581`_: (`zmalone`_) Complaints about pyOpenSSL version on Saltstack 2015.8.3 (refs: `#29632`_) + +* **PR** `#29632`_: (`jfindlay`_) reduce severity of tls module __virtual__ logging + @ *2015-12-11 20:11:32 UTC* + + * a2a7f1527b Merge pull request `#29632`_ from jfindlay/tls_virt + + * 3ed6a052fd modules.tls.__virtual__: don't spam everyone's error log + + * 76a200e780 modules.tls.__virtual__: refactor cert path comment + + * 0a0532e598 modules.tls.__virtual__: remove redundant parens + +* **ISSUE** `#29598`_: (`javicacheiro`_) Duplicated MTU entry added (refs: `#29606`_) + +* **PR** `#29606`_: (`abednarik`_) Fixed duplicate mtu entry in RedHat 7 network configuration. + @ *2015-12-11 17:24:45 UTC* + + * f6f3aa6613 Merge pull request `#29606`_ from abednarik/remove_duplicate_mtu_entry_rh7_net_template + + * afb2f887ba Fixed duplicate mtu entry in RedHat 7 network configuration. + +* **PR** `#29613`_: (`rallytime`_) Various ESXi Proxy Minion Bug Fixes + @ *2015-12-11 17:18:58 UTC* + + * c7e73bc4c8 Merge pull request `#29613`_ from rallytime/esxi-fixes + + * aa5dd88b6f Various ESXi Proxy Minion Bug Fixes + +* **ISSUE** `#26364`_: (`cedwards`_) [freebsd] TCP transport not working in 2015.8.0rc3 (refs: `#29628`_) + +* **PR** `#29628`_: (`DmitryKuzmenko`_) Don't create io_loop before fork + @ *2015-12-11 17:15:11 UTC* + + * a56c763423 Merge pull request `#29628`_ from DSRCompany/bug/26364_freebsd_tcp + + * 729ffcae36 Don't create io_loop before fork + +* **PR** `#29609`_: (`basepi`_) [2015.8][salt-ssh] Add ability to set salt-ssh command umask in roster + @ *2015-12-10 22:52:27 UTC* + + * 41b8117237 Merge pull request `#29609`_ from basepi/salt-ssh.umask.29574 + + * 0afa5b0d5d Add cmd_umask to roster docs + + * 5c03f892bc Allow setting the cmd_umask from within the roster + +* **ISSUE** `#29586`_: (`basepi`_) Orchestrate doesn't handle minion error properly (refs: `#29603`_) + +* **ISSUE** `#29546`_: (`jefferyharrell`_) Can't seem to get orchestrate to recognize a failed state (refs: `#29603`_) + +* **PR** `#29603`_: (`basepi`_) Fix orchestration failure-checking + @ *2015-12-10 21:23:57 UTC* + + * 1e394f5ab1 Merge pull request `#29603`_ from basepi/orchestrate.failures.29546 + + * 2bdcadaa27 Remove unnecessary and + + * 501f91a388 Fix error in failure checking for salt.state within orchestration + +* **ISSUE** `#29584`_: (`kwilliams057`_) dockerng image-present fails when trying to pull from registry (refs: `#29597`_) + +* **PR** `#29597`_: (`terminalmage`_) dockerng: Prevent exception when API response contains empty dictionary + @ *2015-12-10 19:57:42 UTC* + + * b5b80b9324 Merge pull request `#29597`_ from terminalmage/issue29584 + + * d68067b5db dockerng: Prevent exception when API response contains empty dictionary + +* **ISSUE** `#29585`_: (`job`_) cidr argument in salt.modules.network.ip_addrs6() is broken (refs: `#29587`_) + +* **PR** `#29596`_: (`rallytime`_) Back-port `#29587`_ to 2015.8 + @ *2015-12-10 19:57:18 UTC* + + * **PR** `#29587`_: (`job`_) Fix the 'cidr' arg in salt.modules.network.ip_addrs6() (refs: `#29596`_) + + * ffb54cced7 Merge pull request `#29596`_ from rallytime/bp-29587 + + * bfb75ce363 Fix the 'cidr' arg in salt.modules.network.ip_addrs6() + +* **PR** `#29588`_: (`rallytime`_) Added ESXi Proxy Minion Tutorial + @ *2015-12-10 16:17:51 UTC* + + * 08dd663a27 Merge pull request `#29588`_ from rallytime/esxi-proxy-tutorial + + * 5a2bb260d3 Added ESXi Proxy Minion Tutorial + +* **ISSUE** `#29557`_: (`arthurlogilab`_) [modules/nova] AttributeError: 'module' object has no attribute 'discover_extensions' when using nova.image_list (refs: `#29572`_) + +* **PR** `#29572`_: (`gtmanfred`_) [nova] use old discover_extensions if available + @ *2015-12-09 17:35:42 UTC* + + * fe5db23863 Merge pull request `#29572`_ from gtmanfred/2015.8 + + * d0ffa520f4 use old discover_extensions if available + +* **ISSUE** `#29009`_: (`LoveIsGrief`_) git.latest doesn't checkout submodules (refs: `#29545`_) + +* **PR** `#29545`_: (`terminalmage`_) git.latest: init submodules if not yet initialized + @ *2015-12-09 16:19:42 UTC* + + * ecbc60ba05 Merge pull request `#29545`_ from terminalmage/issue29009 + + * 6619503aec git.latest: init submodules if not yet initialized + +* **PR** `#29548`_: (`rallytime`_) Back-port `#29449`_ to 2015.8 + @ *2015-12-09 16:19:07 UTC* + + * **PR** `#29449`_: (`AkhterAli`_) Adding message for null public IP (refs: `#29548`_) + + * 3b2c93a2e5 Merge pull request `#29548`_ from rallytime/bp-29449 + + * 3715cd7d65 Adding message for null public IP + +* **PR** `#29547`_: (`rallytime`_) Refactored ESXCLI-based functions to accept a list of esxi_hosts + @ *2015-12-09 16:08:03 UTC* + + * fd67903bf9 Merge pull request `#29547`_ from rallytime/esxi-proxy + + * 469648dd07 Refactored ESXCLI-based functions to accept a list of esxi_hosts + +* **PR** `#29563`_: (`anlutro`_) Fix a call to deprecated method in python-influxdb + @ *2015-12-09 16:00:24 UTC* + + * 21437f9235 Merge pull request `#29563`_ from alprs/fix-influx_deprecated_method + + * 7c69c177ed update test + + * 46d7d92069 fix a call to deprecated method in python-influxdb + +* **PR** `#29565`_: (`bdrung`_) Fix typos and missing release note + @ *2015-12-09 15:59:21 UTC* + + * f29e0a7021 Merge pull request `#29565`_ from bdrung/2015.8 + + * b96d8ff1d9 Minor update to release notes for missing fix + + * e72354aac4 Fix typo specfic -> specific + + * 5708355762 Fix typo comparsion -> comparison + +* **PR** `#29540`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-12-08 21:27:01 UTC* + + * 25d3a75d8c Merge pull request `#29540`_ from basepi/merge-forward-2015.8 + + * e59364ad1d Fix failing unit test + + * 9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * 867d550271 Merge pull request `#29539`_ from basepi/merge-forward-2015.5 + + * 2c9c4ba430 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * 85aa70a6cb Merge pull request `#29392`_ from jacobhammons/2014.7 + + * d7f0db1dd8 updated version number to not reference a specific build from the latest branch + + * de7f3d5a59 Merge pull request `#29504`_ from rallytime/fix-12072 + + * 8357c95dc2 Document userdata_file option for EC2 driver + + * 65deba8bb5 Merge pull request `#29507`_ from rallytime/ec2-doc-fix + + * 90b4823bc2 Switch volumes and del_*_on_destroy example ordering + + * 0918c9294f Merge pull request `#29469`_ from abednarik/doc_note_for_saltcloud_connection_timeout + + * 8e5c3e366a Added Documentation note in salt cloud. + + * e43c7c05a6 Merge pull request `#29461`_ from dmyerscough/fix-resource-limits + + * 85a8a3b033 Fix resource limits, systemd sets the default number of open files to 4096 causing te master to complain about limits when you have a large number of keys + + * 730f02fbdf Merge pull request `#29439`_ from rallytime/bp-28656 + + * 2f11bb021f `#28526`_ fixed yumpkg module + + * 197210d52e Merge pull request `#29418`_ from jacobhammons/dot8 + + * 4f51a737f9 Added CVE 2015-8034 to 2015.5.8 release notes + + * b3452f2a1a Merge pull request `#29389`_ from jacobhammons/2015.5 + + * 824721ff36 updated version numbers + + * 6a7a95f28a Merge pull request `#28501`_ from twangboy/jmoney_26898 + + * c0cf33332c Fixed some Lint... + + * df17fc59d3 Merge pull request `#6`_ from jfindlay/twang_test + + * bc7e0cfe64 add file.symlink unit tests + + * 9381dc7215 orthogonalize file.symlink unit tests + + * 8f462ba044 Merge pull request `#5`_ from cachedout/fix_twangboy_test + + * 5293150d25 Fix tests + + * 7d39091c91 Fixed some more lint + + * 3dbd62af2c Fixed some tests... hopefully + + * f187db3288 Removed unnecessary logic + + * 89ebd268e6 Added file attributes restore on fail + + * 9ec72ca724 fix file state unit tests for win symlink feature + + * 69c32a663e Fixed some lint + + * 638dec5027 Fixed some tests... let's see if they're really are + + * 5ed7a99792 Replaced instances of shutil.rmtree in file state + + * 2651ce509f Fix file.remove for windows + + * 760a521603 Merge pull request `#29348`_ from jtand/file_search_fix + + * 04f82bd4fd Fixes an file.search on python2.6 + + * 51ea88d489 Merge pull request `#29336`_ from rallytime/bp-29276 + + * 3a0e19debb Prevent adding port twice when adding entry in known hosts + + * 28255af52a Merge pull request `#29333`_ from rallytime/bp-29280 + + * 722d02ff4a Lint + + * 4a0040c1b4 [Doc] Add note for SVN state + +* **PR** `#29499`_: (`rallytime`_) Initial commit of ESXi Proxy Minion + @ *2015-12-08 21:10:13 UTC* + + * 3ae096b7ac Merge pull request `#29499`_ from rallytime/esxi-proxy + + * d8b1ba3991 Make sure ESXCLI gating is correct in vsphere __virtual__ + + * 55589f8021 Provide some more inline comments for longer functions + + * baf2f8ce7a Pylint fix + + * 763ae5d676 VMotion functions, gate ESXCLI requirement, allow protocol/port for ESXCLI function + + * d909df254e Bug fixes for esxi states + + * 7102677679 Bug fixes and move ntp and ssh service start/stop/restart to single funcs + + * 77b37add84 Added syslog_configured state, and some minor bug fixes + + * df49f533f6 More state functions and a couple of bug fixes + + * a50c74cfe2 Merge pull request `#13`_ from cro/esxi-proxy3 + + * 87fc980f33 Add syslog config and network firewall rules enable + + * 42be49f481 Merge pull request `#11`_ from cro/esxi-proxy + + * d858642f05 Add documentation. + + * 43879d1dfe Functions for setting network coredumps + + * 7d7d2afa7f Initial commit of ESXi state and refactored vsan_add_disks to include a get function. + + * bc945a48db Add execution module functions to upload ssh key for root and retrieve ssh key for root. + + * 238b0f5bea Update error return policy and add service running/policy functions + + * 9ba9019419 Initial commit of ESXi proxy work. + +* **PR** `#29526`_: (`jfindlay`_) 2015.8.2 notes: add note about not being released + @ *2015-12-08 21:09:50 UTC* + + * 873f6a9460 Merge pull request `#29526`_ from jfindlay/2015.8 + + * 917e6f850c 2015.8.2 notes: add note about not being released + +* **ISSUE** `#29484`_: (`m7v8`_) patchlevel detection broken for openSuSE (refs: `#29531`_) + +* **PR** `#29531`_: (`jfindlay`_) grains.core: handle undefined variable + @ *2015-12-08 21:07:38 UTC* + + * 3de61e3655 Merge pull request `#29531`_ from jfindlay/suse_patch + + * 1ad5a088fc grains.core: handle undefined variable + +* **ISSUE** `#29486`_: (`m7v8`_) Pull request breaks our setup (umask) (refs: `#29538`_) + +* **ISSUE** `#29005`_: (`fcrozat`_) non-standard umask breaks salt-call call in salt-ssh (refs: `#29126`_) + +* **ISSUE** `#28830`_: (`fcrozat`_) non-standard umask breaks salt-ssh deployement (refs: `#29126`_) + +* **PR** `#29538`_: (`basepi`_) [2015.8] [salt-ssh] Remove umask around actual execution for salt-ssh + @ *2015-12-08 20:45:58 UTC* + + * **PR** `#29126`_: (`fcrozat`_) Fix deployment when umask is non-standard (refs: `#29538`_) + + * 1d8014411a Merge pull request `#29538`_ from basepi/salt-ssh.umask.29486 + + * 5edfa014f5 Remove umask around actual execution for salt-ssh + +* **ISSUE** `#28715`_: (`mlalpho`_) Tagging Resources with boto_rds (refs: `#29505`_) + +* **PR** `#29505`_: (`rallytime`_) Update boto_rds state docs to include funky yaml syntax for "tags" option. + @ *2015-12-08 17:05:02 UTC* + + * fb02fc1ef1 Merge pull request `#29505`_ from rallytime/fix-28715 + + * f43f851a92 Update boto_rds state docs to include funky yaml syntax for "tags" option. + +* **PR** `#29513`_: (`bdrung`_) Drop obsolete syslog.target from systemd services + @ *2015-12-08 16:05:01 UTC* + + * 38888add5e Merge pull request `#29513`_ from bdrung/2015.8 + + * b1a4ade618 Drop obsolete syslog.target from systemd services + +* **PR** `#29500`_: (`rallytime`_) Back-port `#29467`_ to 2015.8 + @ *2015-12-07 23:24:00 UTC* + + * **PR** `#29467`_: (`serge-p`_) Update module.py (refs: `#29500`_) + + * 148dad6674 Merge pull request `#29500`_ from rallytime/bp-29467 + + * ca0be8bff0 Update module.py + +* **ISSUE** `#29001`_: (`olfway`_) debconf.set doesn't support "prereq" in states (refs: `#29463`_) + +* **PR** `#29463`_: (`abednarik`_) Add \*\*kwargs to debconf.set. + @ *2015-12-07 19:56:05 UTC* + + * 9d11acc7db Merge pull request `#29463`_ from abednarik/debconf_fix_prereq_support + + * b17f1fed43 Add \*\*kwargs to debconf.set. + +* **ISSUE** `#29311`_: (`Reiner030`_) Feature Request: System uptime also in seconds (refs: `#29399`_) + +* **PR** `#29399`_: (`jfindlay`_) modules.status: add human_readable option to uptime + @ *2015-12-07 19:53:52 UTC* + + * 7efd6dd140 Merge pull request `#29399`_ from jfindlay/second_up + + * 1903124814 modules.win_status: add reason to virtual ret + + * 35ba7da470 modules.status: add reason to __virtual__ return + + * 48e7beb0eb modules.status: add in_seconds option to uptime + +* **PR** `#29433`_: (`cro`_) Files for building .pkg files for MacOS X + @ *2015-12-07 19:47:23 UTC* + + * 042daf91b8 Merge pull request `#29433`_ from cro/mac_native_pkg + + * 8e191ae264 Add web references + + * 5f1459d708 Update mac packaging + + * 092b7ddd0a First crack at build files for Mac OS X Native package + +* **ISSUE** `#29445`_: (`shawnbutts`_) salt.loaded.int.module.nova.__virtual__() is wrongly returning `None`. (refs: `#29455`_) + +* **PR** `#29455`_: (`jfindlay`_) modules.nova.__init__: do not return ``None`` + @ *2015-12-07 19:44:00 UTC* + + * 5ff3749108 Merge pull request `#29455`_ from jfindlay/nova_none + + * 19da8233c8 modules.nova.__init__: do not return ``None`` + +* **PR** `#29454`_: (`jfindlay`_) rh_service module __virtual__ return error messages + @ *2015-12-07 19:32:15 UTC* + + * 289e9d169e Merge pull request `#29454`_ from jfindlay/rh_service + + * 9975508f86 modules.rh_service.__virtual__: handle SUSE osrelease as num + + * d7ab7bf51f modules.rh_service: __virtual__ error messages + +* **PR** `#29476`_: (`tbaker57`_) Doc fix - route_table_present needs subnet_names (not subnets) as a key + @ *2015-12-07 18:47:22 UTC* + + * cb465927d6 Merge pull request `#29476`_ from tbaker57/boto_vpc_docfix + + * 36946640b8 Fix - don't specify 'name' key inside the list - just the subnet names + + * 5cab4b775a Doc fix - route_table_present needs subnet_names (not subnets) as a key + +* **PR** `#29487`_: (`rallytime`_) Back-port `#29450`_ to 2015.8 + @ *2015-12-07 17:25:23 UTC* + + * **PR** `#29450`_: (`pass-by-value`_) Raise error if dracr password is above 20 chars (refs: `#29487`_) + + * 6696cf6eb5 Merge pull request `#29487`_ from rallytime/bp-29450 + + * 2c55c55ff1 Raise error if dracr password is above 20 chars + +* **ISSUE** `#29133`_: (`cedwards`_) FX2 proxy-minion dellchassis idrac state incomplete (refs: `#29441`_) + +* **PR** `#29441`_: (`rallytime`_) Make sure docs line up with blade_idrac function specs + @ *2015-12-05 16:30:27 UTC* + + * a1ffc5aacb Merge pull request `#29441`_ from rallytime/fix-doc-dellchassis + + * cf62361830 Make sure docs line up with blade_idrac function specs + +* **PR** `#29440`_: (`rallytime`_) Back-port `#28925`_ to 2015.8 + @ *2015-12-05 00:21:26 UTC* + + * **PR** `#28925`_: (`pass-by-value`_) Fx2 firmware update (refs: `#29440`_) + + * 6cc6f776bc Merge pull request `#29440`_ from rallytime/bp-28925 + + * 1b57a57c48 Lint fixes + + * 7cea3afb4f Support multiple hosts + + * 0be3620715 Set kwarg + + * b7324b5102 Add doc for new state + + * 613dd0b7a2 Make sure creds are set before ``racadm update`` + + * 929e679b25 Add firmware update state to dellchassis + + * 6356af3b99 Raise error + + * 820ad7b3df Validate file existence + + * 94704304ec Add firmware update functions to module + +* **ISSUE** `#29425`_: (`paclat`_) services for older OEL releases. (refs: `#29435`_) + +* **PR** `#29435`_: (`galet`_) Grains return wrong OS version and other OS related values for Oracle Linux + @ *2015-12-05 00:19:11 UTC* + + * 129f45f7c3 Merge pull request `#29435`_ from galet/2015.8 + + * fdaa81ccf8 Grains return wrong OS version and other OS related values for Oracle Linux + + * c494ddd5fc Grains return wrong OS version and other OS related values for Oracle Linux + +* **ISSUE** `saltstack/salt#29313`_: (`rmatulat`_) state/host.present and alias-assignment to multiple IPs fails (refs: `#29430`_) + +* **PR** `#29430`_: (`rmatulat`_) Fix host.present state limitation + @ *2015-12-04 23:08:20 UTC* + + * e2b43a3f1e Merge pull request `#29430`_ from rall0r/2015.8 + + * d3dacff4a2 Fix host.present state limitation + +* **PR** `#29417`_: (`jacobhammons`_) Repo install updates + @ *2015-12-04 02:39:41 UTC* + + * ab890b632a Merge pull request `#29417`_ from jacobhammons/repo-install-updates + + * d58182c5fa updated repo path for RHEL installation + + * 5e54359869 Updated Debian, RHEL / Cent, Ubuntu installation instructions with new repo structure for 2015.8.3. Added CVE-2015-8034 to release notes. + +* **PR** `#29402`_: (`techhat`_) Add rate limiting to linode + @ *2015-12-03 20:27:10 UTC* + + * cb1e2e6e73 Merge pull request `#29402`_ from techhat/ratelimit + + * f0a4d93077 Add rate limiting to linode + +* **ISSUE** `#19332`_: (`QuinnyPig`_) Nondeterminism in Pillar (refs: `#29400`_) + +* **PR** `#29400`_: (`twangboy`_) Fix `#19332`_ + @ *2015-12-03 20:25:16 UTC* + + * 8fe39d0ef8 Merge pull request `#29400`_ from twangboy/fix_19332 + + * 7bdddaca53 Fixed grammer + + * d965d00a09 Fix `#19332`_ + +* **PR** `#29398`_: (`cachedout`_) Lint 29288 + @ *2015-12-03 18:03:53 UTC* + + * d2c0fcbc97 Merge pull request `#29398`_ from cachedout/lint_29288 + + * 3b0033e529 Lint `#29288`_ + + * 386459ca6d Merge pull request `#1`_ from jfindlay/glustest + + * 4d6c71aa80 modules.glusterfs: fix start_volume unit test + + * f336c44630 Bootstrap failed, retrying + + * bd729cb3ea Set default GlusterFS version to 6 + + * 443bfc6a81 Fixed volume status for >= 3.7 in glusterfs.py + +* **ISSUE** `#29116`_: (`johnsocp`_) Unresolvable masters in the minions masters list cause minion to raise an error (refs: `#29331`_) + +* **PR** `#29331`_: (`DmitryKuzmenko`_) Bugfix - `#29116`_ raet dns error + @ *2015-12-03 17:10:40 UTC* + + * 5b8e7820ac Merge pull request `#29331`_ from DSRCompany/bug/29116_raet_dns_error_2 + + * 8c2b217af5 Make pylint happy + + * e5672ee716 Don't exit if no master found + + * 1c324f5467 Don't fail if can't connect to master + +* **PR** `#29390`_: (`jacobhammons`_) updated version numbers in documentation + @ *2015-12-03 17:02:05 UTC* + + * 7bc6b1210d Merge pull request `#29390`_ from jacobhammons/2015.8 + + * 486935b233 updated version numbers + +* **ISSUE** `#25446`_: (`DmitryKuzmenko`_) Stack overflow on LazyLoader deep copying (refs: `#29381`_) + +* **PR** `#29381`_: (`nmadhok`_) No need to deepcopy since six.iterkeys() creates a copy + @ *2015-12-03 15:54:52 UTC* + + * fd677e1d58 Merge pull request `#29381`_ from nmadhok/2015.8-runtime-fix + + * f109698196 No need to deepcopy since six.iterkeys() creates a copy + +* **PR** `#29349`_: (`cro`_) Fix mis-setting chassis names + @ *2015-12-03 00:56:54 UTC* + + * 2973025058 Merge pull request `#29349`_ from cro/fx2_name_fix + + * 95d6d72a5d Fix mis-setting the name of the chassis. + +* **ISSUE** `#29236`_: (`sjorge`_) network.mod_bufsize has wrong docstring (refs: `#29237`_) + +* **ISSUE** `#29235`_: (`sjorge`_) network.get_bufsize has wrong docstring (refs: `#29237`_) + +* **ISSUE** `#29234`_: (`sjorge`_) network.dig should only be available if we have the 'dig' binary (refs: `#29237`_) + +* **ISSUE** `#29233`_: (`sjorge`_) network.default_route does not seem to honor the family parameter (refs: `#29237`_) + +* **ISSUE** `#29232`_: (`sjorge`_) network.active_tcp seems linux specific (refs: `#29237`_) + +* **ISSUE** `#29231`_: (`sjorge`_) docstrings in salt/utils/network.py are incorrect (refs: `#29237`_) + +* **PR** `#29334`_: (`rallytime`_) Back-port `#29237`_ to 2015.8 + @ *2015-12-02 19:37:31 UTC* + + * **PR** `#29237`_: (`sjorge`_) Module network fixes (refs: `#29334`_) + + * 17d80c051a Merge pull request `#29334`_ from rallytime/bp-29237 + + * 598226def1 fix unit test (attempt 1) + + * a461d7bf12 changed from Boron to 2015.8.4, so this can be backported + + * 3892b12514 fix up a few remarks from jfindlay + + * 2f940e22aa also we should keep returning {} for other systems + + * 4953f58894 forgot to remove a debug line, how embarasing + + * e96f3c0c3b fix docs in salt/utils/network.py `#29231`_ - looks like this got copied at some point + + * 3888bb403f fixup network.default_route with family set on SunOS `#29233`_ + + * c0e6ea98a6 fix network.active_tcp on SunOS (we fake it until we make it) `#29232`_ + + * 92f881284e add decorator to network.dig `#29234`_ + + * 77950eb55c fix docstring for get_bufsize `#29235`_ + + * 52fb80cd18 fix docstring for mod_bufsize `#29236`_ + +* **ISSUE** `#28990`_: (`adithep`_) Dockerng volume (refs: `#29300`_) + +* **PR** `#29300`_: (`ticosax`_) [dockerng] Add support for volume management in dockerng + @ *2015-12-02 17:48:53 UTC* + + * 5ec7947595 Merge pull request `#29300`_ from ticosax/dockerng-volumes + + * 80d085ea92 fix typo + + * cb9cb463b0 Provide states for managing docker volumes + + * dff6fa1fb2 Add execution module to manage docker volumes + +* **PR** `#29218`_: (`clan`_) check service enable state in test mode + @ *2015-12-02 15:31:00 UTC* + + * 99b7d87688 Merge pull request `#29218`_ from clan/service_state + + * a1250a9729 check service enable state in test mode + +* **PR** `#29315`_: (`jfindlay`_) dev tutorial doc: fix markup errors + @ *2015-12-01 21:42:17 UTC* + + * 08ced73b13 Merge pull request `#29315`_ from jfindlay/docs + + * e8e23dc444 dev tutorial doc: fix markup errors + +* **PR** `#29317`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2015-12-01 21:28:30 UTC* + + * a3a463ff8b Merge pull request `#29317`_ from basepi/merge-forward-2015.8 + + * 0d90dd3a19 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * 14e94b3593 Merge pull request `#29316`_ from basepi/merge-forward-2015.5 + + * 33f40b3c47 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 + + * d2fb2109a3 Merge pull request `#29296`_ from douardda/patch-3 + + * d2885390f4 Use process KillMode on Debian systems also + + * 6a2ffbfb7c Merge pull request `#29216`_ from clan/file_search_on_proc_file + + * 91a20c07a1 try mmap first + + * 8aa4f2053e remove extra space to fix lint failure + + * d34e6b1a9a use read only if has read() method + + * 3209c1cdb5 size is 0 doesn't mean no data, e.g, /proc/version + + * d6aaae8d7b Merge pull request `#29261`_ from attiasr/patch-1 + + * 7a99b90596 add log and return if pkg already installed + + * 1843c7ab8e fix incorrect reinstallation of windows pkg + + * 9236188867 Merge pull request `#29214`_ from cro/ssl_verify_ssl + + * e9c13c561b Doc bug--salt.utils.http takes verify_ssl not ssl_verify. + + * df7b35a86b Merge pull request `#29204`_ from lorengordon/fix-29202 + + * b1dae5e6fe Use os.path.join to return full path to ca bundle + +* **PR** `#29240`_: (`clan`_) handle acl_type [[d]efault:][user|group|mask|other] + @ *2015-12-01 17:56:20 UTC* + + * 39667fda12 Merge pull request `#29240`_ from clan/linux_acl + + * 02429aca69 handle acl_type [[d]efault:][user|group|mask|other] + +* **PR** `#29305`_: (`lorengordon`_) Add 'file' as a source_hash proto + @ *2015-12-01 17:39:37 UTC* + + * 027bed7c90 Merge pull request `#29305`_ from lorengordon/source_hash_protos + + * 53fdf0bf97 Update message for invalid source_hash + + * 2d20d71bd5 Add `file` as a source_hash proto + +* **ISSUE** `#29251`_: (`adamsewell`_) status.uptime causes exception on Windows minion 2015.8.1 (refs: `#29272`_) + +* **PR** `#29272`_: (`jfindlay`_) win_status module: handle 12 hour time in uptime + @ *2015-12-01 16:33:12 UTC* + + * 1129ee1d2e Merge pull request `#29272`_ from jfindlay/win_up_time + + * 6a2315109e win_status module: python timedelta to find uptime + + * b7a535341f win_status module: handle 12 hour time in uptime + +* **ISSUE** `#26526`_: (`JensRantil`_) Managing a file:// source fails (refs: `#29289`_) + +* **PR** `#29289`_: (`terminalmage`_) file.managed: Allow local file sources to use source_hash + @ *2015-12-01 16:19:27 UTC* + + * 0fd3e8b0fb Merge pull request `#29289`_ from terminalmage/issue26526 + + * 64ae3f996e file.managed: Allow local file sources to use source_hash + +* **ISSUE** `#29262`_: (`anlutro`_) ssh_auth.absent removes keys when test=True (refs: `#29264`_) + +* **PR** `#29264`_: (`anlutro`_) Prevent ssh_auth.absent from running when test=True + @ *2015-11-30 21:54:15 UTC* + + * 8d32d8d43d Merge pull request `#29264`_ from alprs/fix-ssh_auth_absent_test + + * 9193676f9c fix ssh_auth_test + + * febbfa792f prevent ssh_auth.absent from running when test=True + +* **ISSUE** `#29071`_: (`eliasp`_) `git_pillar.update` runner can't handle >=2015.8.0 configuration (refs: `#29277`_) + +* **PR** `#29277`_: (`terminalmage`_) Update git_pillar runner to support new git ext_pillar config schema + @ *2015-11-30 21:39:51 UTC* + + * 459d30f27f Merge pull request `#29277`_ from terminalmage/issue29071 + + * 6981bb3be7 Update git_pillar runner to support new git ext_pillar config schema + + * 293c8e635c Separate repo locking logic into its own function + +* **PR** `#29283`_: (`cachedout`_) Single-quotes and use format + @ *2015-11-30 21:34:41 UTC* + + * **PR** `#29139`_: (`thomaso-mirodin`_) [salt-ssh] Add a range roster and range targeting options for the flat roster (refs: `#29283`_) + + * df1f0d93c7 Merge pull request `#29283`_ from cachedout/style_29139 + + * d764497b17 Single-quotes and use format + +* **PR** `#29139`_: (`thomaso-mirodin`_) [salt-ssh] Add a range roster and range targeting options for the flat roster (refs: `#29283`_) + @ *2015-11-30 21:25:50 UTC* + + * 3aa84b6763 Merge pull request `#29139`_ from thomaso-mirodin/salt-ssh-flat-roster-range-filter + + * 56b3302fe9 Pylint fixes for PR `#29139`_ + + * e010f2d3b5 Add a range roster for salt-ssh + + * c5eeb77ebc Add range support to salt-ssh's flat roster + +* **PR** `#29282`_: (*cachedout*) dev docs: add development tutorial (refs: `#29282`_) + @ *2015-11-30 21:14:50 UTC* + + * dbf7755aa2 Merge pull request `#29282`_ from cachedout/fix_29279 + + * 1efaab2dd5 Fix typo in `#29279`_ + + * a5ea39132f dev docs: add development tutorial + +* **ISSUE** `#28991`_: (`timcharper`_) allow role-assumption with s3 credentials (refs: `#28994`_) + +* **PR** `#28994`_: (`timcharper`_) add support to s3 for aws role assumption + @ *2015-11-30 20:52:18 UTC* + + * 87e4aa4fae Merge pull request `#28994`_ from timcharper/2015.8.1-dev + + * e060986828 add support to s3 for aws role assumption + +* **ISSUE** `#29209`_: (`ssgward`_) SPM logging level doesn't seem to be functional (refs: `#29278`_) + +* **PR** `#29278`_: (`techhat`_) Add verify_log to SPM + @ *2015-11-30 20:48:32 UTC* + + * 3d16434f14 Merge pull request `#29278`_ from techhat/issue29209 + + * 759e8c4542 Add verify_log to SPM + +* **PR** `#29067`_: (`jacksontj`_) Fix infinite recursion in state compiler for prereq of SLSs + @ *2015-11-30 20:27:09 UTC* + + * d651d7167e Merge pull request `#29067`_ from jacksontj/2015.8 + + * 64e439cda2 Add test for infinite recursion with sls prerequisites + + * d687682016 No reason to continuously resolve the k, v pair here since it doesn't change in the inner loop + + * 6d747df5db Correctly resolve requisite_in for SLS requisites + +* **ISSUE** `#29161`_: (`jefferyharrell`_) saltmod.state's ret argument seems to do nothing (refs: `#29207`_) + +* **PR** `#29207`_: (`jfindlay`_) do not shadow ret function argument + @ *2015-11-30 20:14:06 UTC* + + * d42bcea905 Merge pull request `#29207`_ from jfindlay/ret_non_shadow + + * 5de0b93ac6 saltutil.cmd module: do not shadow ret function argument + + * 7809f2a389 saltmod.state state: do not shadow ret function argument + +* **PR** `#29215`_: (`rallytime`_) Back-port `#29192`_ to 2015.8 + @ *2015-11-30 20:12:30 UTC* + + * **PR** `#29192`_: (`bastiaanb`_) fix issue 29191: only try partial matches when a wildcard has been sp… (refs: `#29215`_) + + * 8cc1d8de46 Merge pull request `#29215`_ from rallytime/bp-29192 + + * 5226cd8f79 remove trailing whitespace fix subdict_match test cases + + * 44713cdb95 fix issue 29191: only try partial matches when a wildcard has been specified + +* **PR** `#29217`_: (`clan`_) show duration only if state_output_profile is False + @ *2015-11-30 20:11:18 UTC* + + * **PR** `#19320`_: (`clan`_) add 'state_output_profile' option for profile output (refs: `#29217`_) + + * f488d25911 Merge pull request `#29217`_ from clan/highstate_duration + + * 9bdaae8325 show duration only if state_output_profile is False + +* **PR** `#29221`_: (`ticosax`_) [dokcerng] Docu network mode + @ *2015-11-30 19:22:49 UTC* + + * e5bd1c293d Merge pull request `#29221`_ from ticosax/docu-network_mode + + * a0b674a0ea Extend documentation of network_mode parameter. + +* **ISSUE** `#29250`_: (`adamsewell`_) status.cpu_load is not available on Salt 2015.8.1 (refs: `#29269`_) + +* **PR** `#29269`_: (`jfindlay`_) win_status module: fix function names in docs + @ *2015-11-30 19:14:24 UTC* + + * 7fd02c2145 Merge pull request `#29269`_ from jfindlay/winstatus + + * f2f2dab491 win_status module: fix function names in docs + +* **PR** `#29213`_: (`rallytime`_) Move _wait_for_task func from vmware cloud to vmware utils + @ *2015-11-30 18:53:24 UTC* + + * 6c2e62f7d4 Merge pull request `#29213`_ from rallytime/vmware_utils_wait_for_task + + * 44e7f83686 Move _wait_for_task func from vmware cloud to vmware utils + +* **PR** `#29271`_: (`techhat`_) Pass full path for digest (SPM) + @ *2015-11-30 18:35:42 UTC* + + * 69cbc09ca0 Merge pull request `#29271`_ from techhat/issue29212 + + * 6cd6a0ace0 Pass full path for digest (SPM) + +* **PR** `#29244`_: (`isbm`_) List products consistently across all SLES systems + @ *2015-11-30 18:31:42 UTC* + + * 1efe484309 Merge pull request `#29244`_ from isbm/isbm-zypper-products + + * db36a73b16 Remove code duplication + + * d62abedbf7 Remove dead code + + * 302b5d3bc1 List products consistently across all SLES systems + +* **ISSUE** `#29119`_: (`mo-mughrabi`_) salt.modules.consul.catalog_register does not accept address as a string (refs: `#29255`_) + +* **PR** `#29255`_: (`garethgreenaway`_) fixes to consul module + @ *2015-11-30 18:30:02 UTC* + + * 318ad36449 Merge pull request `#29255`_ from garethgreenaway/29119_consul_module_fixes + + * 655b0ec403 various fixes to the consul execution module, in particular a fix to address `#29119`_ + +* **PR** `#29208`_: (`whytewolf`_) Glance more profile errors + @ *2015-11-25 23:50:27 UTC* + + * b225263279 Merge pull request `#29208`_ from whytewolf/glance_more_profile_errors + + * c8fe514ec1 found 3 more spots where the profile was not being passed through. + + * b2e3c1f8de Merge pull request `#1`_ from saltstack/2015.8 + +* **ISSUE** `#29140`_: (`davidballano`_) mount.unmounted is not behaving as I would expect (refs: `#29200`_) + +* **PR** `#29200`_: (`jfindlay`_) mount state: unmount by device is optional + @ *2015-11-25 20:03:22 UTC* + + * 6d3c04516f Merge pull request `#29200`_ from jfindlay/singular_umount + + * b54de47b1b mount state: unmount by device is optional + +* **ISSUE** `#29187`_: (`trevor-h`_) salt-cloud Windows provisioning on EC2 fails to use winrm (refs: `#29205`_) + +* **PR** `#29205`_: (`trevor-h`_) Fixes `#29187`_ - using winrm on EC2 + @ *2015-11-25 20:00:01 UTC* + + * fffcf9fef6 Merge pull request `#29205`_ from trevor-h/fix-salt-cloud-winrm-ec2 + + * 48e0edd0d2 Fixes `#29187`_ - using winrm on EC2 + +* **PR** `#29170`_: (`cachedout`_) Migrate pydsl tests to integration test suite + @ *2015-11-25 19:56:48 UTC* + + * 1937a47dec Merge pull request `#29170`_ from cachedout/refactor_pydsl_test + + * 2477ff2eab Add __init__ and pydsl test + + * 063f075a99 Add integration renderer tests to the suite + + * 81bf332be4 Migrate pydsl tests to integration test suite + +* **ISSUE** `#29137`_: (`Dravu`_) MTU is output twice when used in network.managed (refs: `#29198`_) + +* **PR** `#29198`_: (`jfindlay`_) rh_ip module: only set the mtu once + @ *2015-11-25 18:11:09 UTC* + + * 11d68f7b1c Merge pull request `#29198`_ from jfindlay/single_mtu + + * 0a8952f6ac rh_ip module: only set the mtu once + +* **ISSUE** `#29111`_: (`eliasp`_) Backtrace in state `ssh_known_hosts.present` when `ssh-keygen` is not available (refs: `#29135`_) + +* **PR** `#29135`_: (`jfindlay`_) ssh_known_hosts.present state: catch not found exc + @ *2015-11-25 18:10:43 UTC* + + * f19355e0bb Merge pull request `#29135`_ from jfindlay/ssh_except + + * 363add7131 ssh_known_hosts.present state: catch not found exc + +* **PR** `#29196`_: (`s0undt3ch`_) We need novaclient imported to compare versions + @ *2015-11-25 17:16:27 UTC* + + * 6a12197e13 Merge pull request `#29196`_ from s0undt3ch/2015.8 + + * 78a7c34f2b We need novaclient imported to compare versions + +* **ISSUE** `#28072`_: (`jchv`_) pygit 0.23.2 is not supported in Salt 2015.8.1 (refs: `#29059`_) + +* **PR** `#29059`_: (`terminalmage`_) Work around upstream pygit2 bug + @ *2015-11-25 16:39:30 UTC* + + * 0c0e15d4e9 Merge pull request `#29059`_ from terminalmage/issue28072 + + * 82e223087e Work around upstream pygit2 bug + +* **PR** `#29112`_: (`eliasp`_) Prevent backtrace (KeyError) in `ssh_known_hosts.present` state + @ *2015-11-25 16:25:57 UTC* + + * cc69c87dd2 Merge pull request `#29112`_ from eliasp/ssh_known_hosts.present-backtrace-test + + * 3f19c311e8 Prevent backtrace (KeyError) in `ssh_known_hosts.present` state + +* **PR** `#29178`_: (`whytewolf`_) Profile not being passed to keystone.endpoint_get in _auth. so if a p… + @ *2015-11-25 16:09:49 UTC* + + * 7775d65089 Merge pull request `#29178`_ from whytewolf/glance_keystone_profile_fix + + * 807dd426a6 Profile not being passed to keystone.endpoint_get in _auth. so if a profiles are being used, then keystone.endpoint_get will not be able to authenticate causing glance to not be able to get it's endpoint. + +.. _`#10157`: https://github.com/saltstack/salt/issues/10157 +.. _`#11`: https://github.com/saltstack/salt/issues/11 +.. _`#13036`: https://github.com/saltstack/salt/issues/13036 +.. _`#13777`: https://github.com/saltstack/salt/issues/13777 +.. _`#13`: https://github.com/saltstack/salt/issues/13 +.. _`#14634`: https://github.com/saltstack/salt/issues/14634 +.. _`#14946`: https://github.com/saltstack/salt/issues/14946 +.. _`#15042`: https://github.com/saltstack/salt/issues/15042 +.. _`#19320`: https://github.com/saltstack/salt/pull/19320 .. _`#19332`: https://github.com/saltstack/salt/issues/19332 -.. _`#24237`: https://github.com/saltstack/salt/issues/24237 -.. _`#29116`: https://github.com/saltstack/salt/issues/29116 -.. _`#29187`: https://github.com/saltstack/salt/issues/29187 +.. _`#19429`: https://github.com/saltstack/salt/pull/19429 +.. _`#1`: https://github.com/saltstack/salt/issues/1 +.. _`#2229`: https://github.com/saltstack/salt/issues/2229 +.. _`#22820`: https://github.com/saltstack/salt/issues/22820 +.. _`#23215`: https://github.com/saltstack/salt/issues/23215 +.. _`#23824`: https://github.com/saltstack/salt/issues/23824 .. _`#23825`: https://github.com/saltstack/salt/pull/23825 +.. _`#24237`: https://github.com/saltstack/salt/issues/24237 +.. _`#25446`: https://github.com/saltstack/salt/issues/25446 +.. _`#25723`: https://github.com/saltstack/salt/issues/25723 +.. _`#26364`: https://github.com/saltstack/salt/issues/26364 +.. _`#26478`: https://github.com/saltstack/salt/issues/26478 .. _`#26511`: https://github.com/saltstack/salt/pull/26511 -.. _`#26853`: https://github.com/saltstack/salt/pull/26853 +.. _`#26526`: https://github.com/saltstack/salt/issues/26526 .. _`#26845`: https://github.com/saltstack/salt/issues/26845 +.. _`#26853`: https://github.com/saltstack/salt/pull/26853 .. _`#26962`: https://github.com/saltstack/salt/pull/26962 .. _`#27104`: https://github.com/saltstack/salt/pull/27104 .. _`#27606`: https://github.com/saltstack/salt/pull/27606 +.. _`#27611`: https://github.com/saltstack/salt/issues/27611 .. _`#27953`: https://github.com/saltstack/salt/pull/27953 +.. _`#28017`: https://github.com/saltstack/salt/issues/28017 +.. _`#28072`: https://github.com/saltstack/salt/issues/28072 .. _`#28131`: https://github.com/saltstack/salt/pull/28131 +.. _`#28171`: https://github.com/saltstack/salt/issues/28171 .. _`#28189`: https://github.com/saltstack/salt/pull/28189 -.. _`#28191`: https://github.com/saltstack/salt/pull/28191 -.. _`#28420`: https://github.com/saltstack/salt/pull/28420 +.. _`#28339`: https://github.com/saltstack/salt/issues/28339 +.. _`#28396`: https://github.com/saltstack/salt/issues/28396 .. _`#28423`: https://github.com/saltstack/salt/pull/28423 .. _`#28431`: https://github.com/saltstack/salt/pull/28431 .. _`#28501`: https://github.com/saltstack/salt/pull/28501 -.. _`#28656`: https://github.com/saltstack/salt/pull/28656 +.. _`#28526`: https://github.com/saltstack/salt/issues/28526 +.. _`#28540`: https://github.com/saltstack/salt/issues/28540 +.. _`#28586`: https://github.com/saltstack/salt/issues/28586 .. _`#28702`: https://github.com/saltstack/salt/pull/28702 +.. _`#28715`: https://github.com/saltstack/salt/issues/28715 +.. _`#28763`: https://github.com/saltstack/salt/issues/28763 +.. _`#28814`: https://github.com/saltstack/salt/issues/28814 +.. _`#28830`: https://github.com/saltstack/salt/issues/28830 +.. _`#28923`: https://github.com/saltstack/salt/issues/28923 .. _`#28925`: https://github.com/saltstack/salt/pull/28925 +.. _`#28990`: https://github.com/saltstack/salt/issues/28990 +.. _`#28991`: https://github.com/saltstack/salt/issues/28991 .. _`#28994`: https://github.com/saltstack/salt/pull/28994 +.. _`#29001`: https://github.com/saltstack/salt/issues/29001 +.. _`#29005`: https://github.com/saltstack/salt/issues/29005 +.. _`#29009`: https://github.com/saltstack/salt/issues/29009 .. _`#29059`: https://github.com/saltstack/salt/pull/29059 .. _`#29067`: https://github.com/saltstack/salt/pull/29067 +.. _`#29071`: https://github.com/saltstack/salt/issues/29071 +.. _`#29078`: https://github.com/saltstack/salt/issues/29078 +.. _`#29091`: https://github.com/saltstack/salt/issues/29091 +.. _`#29111`: https://github.com/saltstack/salt/issues/29111 .. _`#29112`: https://github.com/saltstack/salt/pull/29112 +.. _`#29116`: https://github.com/saltstack/salt/issues/29116 +.. _`#29119`: https://github.com/saltstack/salt/issues/29119 .. _`#29126`: https://github.com/saltstack/salt/pull/29126 +.. _`#29133`: https://github.com/saltstack/salt/issues/29133 .. _`#29135`: https://github.com/saltstack/salt/pull/29135 +.. _`#29137`: https://github.com/saltstack/salt/issues/29137 .. _`#29139`: https://github.com/saltstack/salt/pull/29139 -.. _`#29165`: https://github.com/saltstack/salt/pull/29165 +.. _`#29140`: https://github.com/saltstack/salt/issues/29140 +.. _`#29152`: https://github.com/saltstack/salt/issues/29152 +.. _`#29154`: https://github.com/saltstack/salt/issues/29154 +.. _`#29161`: https://github.com/saltstack/salt/issues/29161 .. _`#29170`: https://github.com/saltstack/salt/pull/29170 .. _`#29178`: https://github.com/saltstack/salt/pull/29178 +.. _`#29187`: https://github.com/saltstack/salt/issues/29187 .. _`#29192`: https://github.com/saltstack/salt/pull/29192 .. _`#29196`: https://github.com/saltstack/salt/pull/29196 .. _`#29198`: https://github.com/saltstack/salt/pull/29198 +.. _`#29199`: https://github.com/saltstack/salt/issues/29199 .. _`#29200`: https://github.com/saltstack/salt/pull/29200 .. _`#29204`: https://github.com/saltstack/salt/pull/29204 .. _`#29205`: https://github.com/saltstack/salt/pull/29205 .. _`#29207`: https://github.com/saltstack/salt/pull/29207 .. _`#29208`: https://github.com/saltstack/salt/pull/29208 +.. _`#29209`: https://github.com/saltstack/salt/issues/29209 .. _`#29213`: https://github.com/saltstack/salt/pull/29213 .. _`#29214`: https://github.com/saltstack/salt/pull/29214 .. _`#29215`: https://github.com/saltstack/salt/pull/29215 @@ -622,20 +3087,27 @@ Changes: .. _`#29217`: https://github.com/saltstack/salt/pull/29217 .. _`#29218`: https://github.com/saltstack/salt/pull/29218 .. _`#29221`: https://github.com/saltstack/salt/pull/29221 +.. _`#29231`: https://github.com/saltstack/salt/issues/29231 +.. _`#29232`: https://github.com/saltstack/salt/issues/29232 +.. _`#29233`: https://github.com/saltstack/salt/issues/29233 +.. _`#29234`: https://github.com/saltstack/salt/issues/29234 +.. _`#29235`: https://github.com/saltstack/salt/issues/29235 +.. _`#29236`: https://github.com/saltstack/salt/issues/29236 .. _`#29237`: https://github.com/saltstack/salt/pull/29237 .. _`#29240`: https://github.com/saltstack/salt/pull/29240 .. _`#29244`: https://github.com/saltstack/salt/pull/29244 +.. _`#29250`: https://github.com/saltstack/salt/issues/29250 +.. _`#29251`: https://github.com/saltstack/salt/issues/29251 .. _`#29255`: https://github.com/saltstack/salt/pull/29255 .. _`#29261`: https://github.com/saltstack/salt/pull/29261 +.. _`#29262`: https://github.com/saltstack/salt/issues/29262 .. _`#29264`: https://github.com/saltstack/salt/pull/29264 .. _`#29269`: https://github.com/saltstack/salt/pull/29269 .. _`#29271`: https://github.com/saltstack/salt/pull/29271 .. _`#29272`: https://github.com/saltstack/salt/pull/29272 -.. _`#29276`: https://github.com/saltstack/salt/pull/29276 .. _`#29277`: https://github.com/saltstack/salt/pull/29277 .. _`#29278`: https://github.com/saltstack/salt/pull/29278 .. _`#29279`: https://github.com/saltstack/salt/pull/29279 -.. _`#29280`: https://github.com/saltstack/salt/pull/29280 .. _`#29282`: https://github.com/saltstack/salt/pull/29282 .. _`#29283`: https://github.com/saltstack/salt/pull/29283 .. _`#29288`: https://github.com/saltstack/salt/pull/29288 @@ -643,6 +3115,7 @@ Changes: .. _`#29296`: https://github.com/saltstack/salt/pull/29296 .. _`#29300`: https://github.com/saltstack/salt/pull/29300 .. _`#29305`: https://github.com/saltstack/salt/pull/29305 +.. _`#29311`: https://github.com/saltstack/salt/issues/29311 .. _`#29315`: https://github.com/saltstack/salt/pull/29315 .. _`#29316`: https://github.com/saltstack/salt/pull/29316 .. _`#29317`: https://github.com/saltstack/salt/pull/29317 @@ -656,18 +3129,21 @@ Changes: .. _`#29389`: https://github.com/saltstack/salt/pull/29389 .. _`#29390`: https://github.com/saltstack/salt/pull/29390 .. _`#29392`: https://github.com/saltstack/salt/pull/29392 +.. _`#29396`: https://github.com/saltstack/salt/issues/29396 .. _`#29398`: https://github.com/saltstack/salt/pull/29398 .. _`#29399`: https://github.com/saltstack/salt/pull/29399 .. _`#29400`: https://github.com/saltstack/salt/pull/29400 .. _`#29402`: https://github.com/saltstack/salt/pull/29402 .. _`#29417`: https://github.com/saltstack/salt/pull/29417 .. _`#29418`: https://github.com/saltstack/salt/pull/29418 +.. _`#29425`: https://github.com/saltstack/salt/issues/29425 .. _`#29430`: https://github.com/saltstack/salt/pull/29430 .. _`#29433`: https://github.com/saltstack/salt/pull/29433 .. _`#29435`: https://github.com/saltstack/salt/pull/29435 .. _`#29439`: https://github.com/saltstack/salt/pull/29439 .. _`#29440`: https://github.com/saltstack/salt/pull/29440 .. _`#29441`: https://github.com/saltstack/salt/pull/29441 +.. _`#29445`: https://github.com/saltstack/salt/issues/29445 .. _`#29449`: https://github.com/saltstack/salt/pull/29449 .. _`#29450`: https://github.com/saltstack/salt/pull/29450 .. _`#29454`: https://github.com/saltstack/salt/pull/29454 @@ -677,6 +3153,8 @@ Changes: .. _`#29467`: https://github.com/saltstack/salt/pull/29467 .. _`#29469`: https://github.com/saltstack/salt/pull/29469 .. _`#29476`: https://github.com/saltstack/salt/pull/29476 +.. _`#29484`: https://github.com/saltstack/salt/issues/29484 +.. _`#29486`: https://github.com/saltstack/salt/issues/29486 .. _`#29487`: https://github.com/saltstack/salt/pull/29487 .. _`#29499`: https://github.com/saltstack/salt/pull/29499 .. _`#29500`: https://github.com/saltstack/salt/pull/29500 @@ -691,32 +3169,44 @@ Changes: .. _`#29539`: https://github.com/saltstack/salt/pull/29539 .. _`#29540`: https://github.com/saltstack/salt/pull/29540 .. _`#29545`: https://github.com/saltstack/salt/pull/29545 +.. _`#29546`: https://github.com/saltstack/salt/issues/29546 .. _`#29547`: https://github.com/saltstack/salt/pull/29547 .. _`#29548`: https://github.com/saltstack/salt/pull/29548 +.. _`#29557`: https://github.com/saltstack/salt/issues/29557 .. _`#29558`: https://github.com/saltstack/salt/pull/29558 .. _`#29563`: https://github.com/saltstack/salt/pull/29563 .. _`#29565`: https://github.com/saltstack/salt/pull/29565 .. _`#29572`: https://github.com/saltstack/salt/pull/29572 +.. _`#29581`: https://github.com/saltstack/salt/issues/29581 +.. _`#29584`: https://github.com/saltstack/salt/issues/29584 +.. _`#29585`: https://github.com/saltstack/salt/issues/29585 +.. _`#29586`: https://github.com/saltstack/salt/issues/29586 .. _`#29587`: https://github.com/saltstack/salt/pull/29587 .. _`#29588`: https://github.com/saltstack/salt/pull/29588 .. _`#29589`: https://github.com/saltstack/salt/pull/29589 .. _`#29596`: https://github.com/saltstack/salt/pull/29596 .. _`#29597`: https://github.com/saltstack/salt/pull/29597 +.. _`#29598`: https://github.com/saltstack/salt/issues/29598 .. _`#29599`: https://github.com/saltstack/salt/pull/29599 +.. _`#29601`: https://github.com/saltstack/salt/issues/29601 .. _`#29603`: https://github.com/saltstack/salt/pull/29603 .. _`#29606`: https://github.com/saltstack/salt/pull/29606 .. _`#29609`: https://github.com/saltstack/salt/pull/29609 .. _`#29613`: https://github.com/saltstack/salt/pull/29613 .. _`#29628`: https://github.com/saltstack/salt/pull/29628 +.. _`#29630`: https://github.com/saltstack/salt/issues/29630 +.. _`#29631`: https://github.com/saltstack/salt/issues/29631 .. _`#29632`: https://github.com/saltstack/salt/pull/29632 .. _`#29642`: https://github.com/saltstack/salt/pull/29642 .. _`#29644`: https://github.com/saltstack/salt/pull/29644 .. _`#29645`: https://github.com/saltstack/salt/pull/29645 .. _`#29646`: https://github.com/saltstack/salt/pull/29646 +.. _`#29654`: https://github.com/saltstack/salt/issues/29654 .. _`#29673`: https://github.com/saltstack/salt/pull/29673 .. _`#29675`: https://github.com/saltstack/salt/pull/29675 .. _`#29681`: https://github.com/saltstack/salt/pull/29681 .. _`#29683`: https://github.com/saltstack/salt/pull/29683 +.. _`#29684`: https://github.com/saltstack/salt/issues/29684 .. _`#29687`: https://github.com/saltstack/salt/pull/29687 .. _`#29693`: https://github.com/saltstack/salt/pull/29693 .. _`#29708`: https://github.com/saltstack/salt/pull/29708 @@ -727,17 +3217,20 @@ Changes: .. _`#29722`: https://github.com/saltstack/salt/pull/29722 .. _`#29723`: https://github.com/saltstack/salt/pull/29723 .. _`#29724`: https://github.com/saltstack/salt/pull/29724 -.. _`#29725`: https://github.com/saltstack/salt/pull/29725 .. _`#29726`: https://github.com/saltstack/salt/pull/29726 .. _`#29729`: https://github.com/saltstack/salt/pull/29729 .. _`#29730`: https://github.com/saltstack/salt/pull/29730 +.. _`#29736`: https://github.com/saltstack/salt/issues/29736 .. _`#29737`: https://github.com/saltstack/salt/pull/29737 .. _`#29740`: https://github.com/saltstack/salt/pull/29740 +.. _`#29741`: https://github.com/saltstack/salt/issues/29741 .. _`#29743`: https://github.com/saltstack/salt/pull/29743 +.. _`#29751`: https://github.com/saltstack/salt/issues/29751 .. _`#29754`: https://github.com/saltstack/salt/pull/29754 .. _`#29765`: https://github.com/saltstack/salt/pull/29765 .. _`#29767`: https://github.com/saltstack/salt/pull/29767 .. _`#29769`: https://github.com/saltstack/salt/pull/29769 +.. _`#29770`: https://github.com/saltstack/salt/issues/29770 .. _`#29772`: https://github.com/saltstack/salt/pull/29772 .. _`#29773`: https://github.com/saltstack/salt/pull/29773 .. _`#29775`: https://github.com/saltstack/salt/pull/29775 @@ -747,10 +3240,12 @@ Changes: .. _`#29814`: https://github.com/saltstack/salt/pull/29814 .. _`#29819`: https://github.com/saltstack/salt/pull/29819 .. _`#29832`: https://github.com/saltstack/salt/pull/29832 +.. _`#29833`: https://github.com/saltstack/salt/issues/29833 .. _`#29850`: https://github.com/saltstack/salt/pull/29850 .. _`#29855`: https://github.com/saltstack/salt/pull/29855 .. _`#29856`: https://github.com/saltstack/salt/pull/29856 .. _`#29858`: https://github.com/saltstack/salt/pull/29858 +.. _`#29866`: https://github.com/saltstack/salt/issues/29866 .. _`#29876`: https://github.com/saltstack/salt/pull/29876 .. _`#29883`: https://github.com/saltstack/salt/pull/29883 .. _`#29890`: https://github.com/saltstack/salt/pull/29890 @@ -758,18 +3253,28 @@ Changes: .. _`#29894`: https://github.com/saltstack/salt/pull/29894 .. _`#29895`: https://github.com/saltstack/salt/pull/29895 .. _`#29904`: https://github.com/saltstack/salt/pull/29904 +.. _`#29905`: https://github.com/saltstack/salt/issues/29905 .. _`#29908`: https://github.com/saltstack/salt/pull/29908 .. _`#29909`: https://github.com/saltstack/salt/pull/29909 +.. _`#29912`: https://github.com/saltstack/salt/issues/29912 +.. _`#29918`: https://github.com/saltstack/salt/issues/29918 +.. _`#29919`: https://github.com/saltstack/salt/issues/29919 .. _`#29924`: https://github.com/saltstack/salt/pull/29924 +.. _`#29933`: https://github.com/saltstack/salt/issues/29933 .. _`#29934`: https://github.com/saltstack/salt/pull/29934 .. _`#29937`: https://github.com/saltstack/salt/pull/29937 +.. _`#29940`: https://github.com/saltstack/salt/pull/29940 .. _`#29941`: https://github.com/saltstack/salt/pull/29941 .. _`#29943`: https://github.com/saltstack/salt/pull/29943 .. _`#29947`: https://github.com/saltstack/salt/pull/29947 .. _`#29949`: https://github.com/saltstack/salt/pull/29949 .. _`#29950`: https://github.com/saltstack/salt/pull/29950 +.. _`#29951`: https://github.com/saltstack/salt/issues/29951 +.. _`#29960`: https://github.com/saltstack/salt/issues/29960 .. _`#29966`: https://github.com/saltstack/salt/pull/29966 .. _`#29987`: https://github.com/saltstack/salt/pull/29987 +.. _`#29993`: https://github.com/saltstack/salt/issues/29993 +.. _`#29994`: https://github.com/saltstack/salt/issues/29994 .. _`#29995`: https://github.com/saltstack/salt/pull/29995 .. _`#30015`: https://github.com/saltstack/salt/pull/30015 .. _`#30016`: https://github.com/saltstack/salt/pull/30016 @@ -784,8 +3289,10 @@ Changes: .. _`#30036`: https://github.com/saltstack/salt/pull/30036 .. _`#30038`: https://github.com/saltstack/salt/pull/30038 .. _`#30043`: https://github.com/saltstack/salt/pull/30043 +.. _`#30045`: https://github.com/saltstack/salt/issues/30045 .. _`#30048`: https://github.com/saltstack/salt/pull/30048 .. _`#30049`: https://github.com/saltstack/salt/pull/30049 +.. _`#30051`: https://github.com/saltstack/salt/issues/30051 .. _`#30059`: https://github.com/saltstack/salt/pull/30059 .. _`#30060`: https://github.com/saltstack/salt/pull/30060 .. _`#30062`: https://github.com/saltstack/salt/pull/30062 @@ -808,6 +3315,7 @@ Changes: .. _`#30101`: https://github.com/saltstack/salt/pull/30101 .. _`#30106`: https://github.com/saltstack/salt/pull/30106 .. _`#30110`: https://github.com/saltstack/salt/pull/30110 +.. _`#30117`: https://github.com/saltstack/salt/issues/30117 .. _`#30118`: https://github.com/saltstack/salt/pull/30118 .. _`#30121`: https://github.com/saltstack/salt/pull/30121 .. _`#30124`: https://github.com/saltstack/salt/pull/30124 @@ -820,6 +3328,7 @@ Changes: .. _`#30139`: https://github.com/saltstack/salt/pull/30139 .. _`#30142`: https://github.com/saltstack/salt/pull/30142 .. _`#30144`: https://github.com/saltstack/salt/pull/30144 +.. _`#30150`: https://github.com/saltstack/salt/issues/30150 .. _`#30154`: https://github.com/saltstack/salt/pull/30154 .. _`#30155`: https://github.com/saltstack/salt/pull/30155 .. _`#30156`: https://github.com/saltstack/salt/pull/30156 @@ -828,9 +3337,9 @@ Changes: .. _`#30162`: https://github.com/saltstack/salt/pull/30162 .. _`#30163`: https://github.com/saltstack/salt/pull/30163 .. _`#30164`: https://github.com/saltstack/salt/pull/30164 -.. _`#30166`: https://github.com/saltstack/salt/pull/30166 .. _`#30168`: https://github.com/saltstack/salt/pull/30168 .. _`#30170`: https://github.com/saltstack/salt/pull/30170 +.. _`#30171`: https://github.com/saltstack/salt/issues/30171 .. _`#30179`: https://github.com/saltstack/salt/pull/30179 .. _`#30180`: https://github.com/saltstack/salt/pull/30180 .. _`#30184`: https://github.com/saltstack/salt/pull/30184 @@ -841,6 +3350,8 @@ Changes: .. _`#30190`: https://github.com/saltstack/salt/pull/30190 .. _`#30191`: https://github.com/saltstack/salt/pull/30191 .. _`#30202`: https://github.com/saltstack/salt/pull/30202 +.. _`#30203`: https://github.com/saltstack/salt/issues/30203 +.. _`#30204`: https://github.com/saltstack/salt/issues/30204 .. _`#30206`: https://github.com/saltstack/salt/pull/30206 .. _`#30207`: https://github.com/saltstack/salt/pull/30207 .. _`#30211`: https://github.com/saltstack/salt/pull/30211 @@ -852,20 +3363,24 @@ Changes: .. _`#30231`: https://github.com/saltstack/salt/pull/30231 .. _`#30237`: https://github.com/saltstack/salt/pull/30237 .. _`#30238`: https://github.com/saltstack/salt/pull/30238 +.. _`#30240`: https://github.com/saltstack/salt/issues/30240 .. _`#30245`: https://github.com/saltstack/salt/pull/30245 .. _`#30246`: https://github.com/saltstack/salt/pull/30246 .. _`#30248`: https://github.com/saltstack/salt/pull/30248 .. _`#30249`: https://github.com/saltstack/salt/pull/30249 +.. _`#30250`: https://github.com/saltstack/salt/issues/30250 .. _`#30257`: https://github.com/saltstack/salt/pull/30257 .. _`#30267`: https://github.com/saltstack/salt/pull/30267 .. _`#30268`: https://github.com/saltstack/salt/pull/30268 .. _`#30273`: https://github.com/saltstack/salt/pull/30273 .. _`#30275`: https://github.com/saltstack/salt/pull/30275 +.. _`#30277`: https://github.com/saltstack/salt/issues/30277 .. _`#30278`: https://github.com/saltstack/salt/pull/30278 .. _`#30279`: https://github.com/saltstack/salt/pull/30279 .. _`#30280`: https://github.com/saltstack/salt/pull/30280 .. _`#30282`: https://github.com/saltstack/salt/pull/30282 .. _`#30284`: https://github.com/saltstack/salt/pull/30284 +.. _`#30286`: https://github.com/saltstack/salt/issues/30286 .. _`#30289`: https://github.com/saltstack/salt/pull/30289 .. _`#30291`: https://github.com/saltstack/salt/pull/30291 .. _`#30292`: https://github.com/saltstack/salt/pull/30292 @@ -879,6 +3394,7 @@ Changes: .. _`#30309`: https://github.com/saltstack/salt/pull/30309 .. _`#30310`: https://github.com/saltstack/salt/pull/30310 .. _`#30328`: https://github.com/saltstack/salt/pull/30328 +.. _`#30330`: https://github.com/saltstack/salt/issues/30330 .. _`#30339`: https://github.com/saltstack/salt/pull/30339 .. _`#30340`: https://github.com/saltstack/salt/pull/30340 .. _`#30342`: https://github.com/saltstack/salt/pull/30342 @@ -909,7 +3425,10 @@ Changes: .. _`#30406`: https://github.com/saltstack/salt/pull/30406 .. _`#30420`: https://github.com/saltstack/salt/pull/30420 .. _`#30424`: https://github.com/saltstack/salt/pull/30424 +.. _`#30432`: https://github.com/saltstack/salt/issues/30432 +.. _`#30442`: https://github.com/saltstack/salt/issues/30442 .. _`#30443`: https://github.com/saltstack/salt/pull/30443 +.. _`#30444`: https://github.com/saltstack/salt/issues/30444 .. _`#30445`: https://github.com/saltstack/salt/pull/30445 .. _`#30448`: https://github.com/saltstack/salt/pull/30448 .. _`#30450`: https://github.com/saltstack/salt/pull/30450 @@ -917,6 +3436,7 @@ Changes: .. _`#30457`: https://github.com/saltstack/salt/pull/30457 .. _`#30458`: https://github.com/saltstack/salt/pull/30458 .. _`#30459`: https://github.com/saltstack/salt/pull/30459 +.. _`#30465`: https://github.com/saltstack/salt/issues/30465 .. _`#30468`: https://github.com/saltstack/salt/pull/30468 .. _`#30470`: https://github.com/saltstack/salt/pull/30470 .. _`#30478`: https://github.com/saltstack/salt/pull/30478 @@ -945,4 +3465,156 @@ Changes: .. _`#30589`: https://github.com/saltstack/salt/pull/30589 .. _`#30599`: https://github.com/saltstack/salt/pull/30599 .. _`#30609`: https://github.com/saltstack/salt/pull/30609 +.. _`#30612`: https://github.com/saltstack/salt/pull/30612 .. _`#30613`: https://github.com/saltstack/salt/pull/30613 +.. _`#30615`: https://github.com/saltstack/salt/pull/30615 +.. _`#4381`: https://github.com/saltstack/salt/issues/4381 +.. _`#5`: https://github.com/saltstack/salt/issues/5 +.. _`#6853`: https://github.com/saltstack/salt/issues/6853 +.. _`#6`: https://github.com/saltstack/salt/issues/6 +.. _`#8146`: https://github.com/saltstack/salt/issues/8146 +.. _`#9319`: https://github.com/saltstack/salt/issues/9319 +.. _`#9569`: https://github.com/saltstack/salt/issues/9569 +.. _`AkhterAli`: https://github.com/AkhterAli +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`Dravu`: https://github.com/Dravu +.. _`Grokzen`: https://github.com/Grokzen +.. _`JensRantil`: https://github.com/JensRantil +.. _`LoveIsGrief`: https://github.com/LoveIsGrief +.. _`MadsRC`: https://github.com/MadsRC +.. _`Oro`: https://github.com/Oro +.. _`Psycojoker`: https://github.com/Psycojoker +.. _`QuinnyPig`: https://github.com/QuinnyPig +.. _`Reiner030`: https://github.com/Reiner030 +.. _`Sacro`: https://github.com/Sacro +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`ThomasZhou`: https://github.com/ThomasZhou +.. _`VynceMontgomery`: https://github.com/VynceMontgomery +.. _`WangWenchao`: https://github.com/WangWenchao +.. _`aabognah`: https://github.com/aabognah +.. _`abcfy2`: https://github.com/abcfy2 +.. _`abednarik`: https://github.com/abednarik +.. _`adamsewell`: https://github.com/adamsewell +.. _`adithep`: https://github.com/adithep +.. _`akissa`: https://github.com/akissa +.. _`alandrees`: https://github.com/alandrees +.. _`alekibango`: https://github.com/alekibango +.. _`anlutro`: https://github.com/anlutro +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`basepi`: https://github.com/basepi +.. _`bastiaanb`: https://github.com/bastiaanb +.. _`bdrung`: https://github.com/bdrung +.. _`benburkert`: https://github.com/benburkert +.. _`boboli`: https://github.com/boboli +.. _`borgstrom`: https://github.com/borgstrom +.. _`c4t3l`: https://github.com/c4t3l +.. _`cachedout`: https://github.com/cachedout +.. _`cedwards`: https://github.com/cedwards +.. _`clan`: https://github.com/clan +.. _`clearclaw`: https://github.com/clearclaw +.. _`clinta`: https://github.com/clinta +.. _`cournape`: https://github.com/cournape +.. _`cro`: https://github.com/cro +.. _`ctrlrsf`: https://github.com/ctrlrsf +.. _`cvrebert`: https://github.com/cvrebert +.. _`cybacolt`: https://github.com/cybacolt +.. _`davidballano`: https://github.com/davidballano +.. _`dmacvicar`: https://github.com/dmacvicar +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`dnd`: https://github.com/dnd +.. _`dr4Ke`: https://github.com/dr4Ke +.. _`eliasp`: https://github.com/eliasp +.. _`ether42`: https://github.com/ether42 +.. _`fcrozat`: https://github.com/fcrozat +.. _`frioux`: https://github.com/frioux +.. _`galet`: https://github.com/galet +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gqgunhed`: https://github.com/gqgunhed +.. _`gravyboat`: https://github.com/gravyboat +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`guettli`: https://github.com/guettli +.. _`hexedpackets`: https://github.com/hexedpackets +.. _`hubez`: https://github.com/hubez +.. _`iMilnb`: https://github.com/iMilnb +.. _`isbm`: https://github.com/isbm +.. _`jacksontj`: https://github.com/jacksontj +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jamesog`: https://github.com/jamesog +.. _`jamusj`: https://github.com/jamusj +.. _`javicacheiro`: https://github.com/javicacheiro +.. _`jchv`: https://github.com/jchv +.. _`jefferyharrell`: https://github.com/jefferyharrell +.. _`jfindlay`: https://github.com/jfindlay +.. _`jleimbach`: https://github.com/jleimbach +.. _`job`: https://github.com/job +.. _`joejulian`: https://github.com/joejulian +.. _`johnsocp`: https://github.com/johnsocp +.. _`joshughes`: https://github.com/joshughes +.. _`julianbrost`: https://github.com/julianbrost +.. _`justinta`: https://github.com/justinta +.. _`kingsquirrel152`: https://github.com/kingsquirrel152 +.. _`kiorky`: https://github.com/kiorky +.. _`kwilliams057`: https://github.com/kwilliams057 +.. _`l2ol33rt`: https://github.com/l2ol33rt +.. _`lagesag`: https://github.com/lagesag +.. _`lichtamberg`: https://github.com/lichtamberg +.. _`lorengordon`: https://github.com/lorengordon +.. _`m7v8`: https://github.com/m7v8 +.. _`maio`: https://github.com/maio +.. _`martinb3`: https://github.com/martinb3 +.. _`mbarrien`: https://github.com/mbarrien +.. _`mlalpho`: https://github.com/mlalpho +.. _`mlister2006`: https://github.com/mlister2006 +.. _`mo-mughrabi`: https://github.com/mo-mughrabi +.. _`mpreziuso`: https://github.com/mpreziuso +.. _`multani`: https://github.com/multani +.. _`nmadhok`: https://github.com/nmadhok +.. _`oeuftete`: https://github.com/oeuftete +.. _`olfway`: https://github.com/olfway +.. _`opdude`: https://github.com/opdude +.. _`optix2000`: https://github.com/optix2000 +.. _`paclat`: https://github.com/paclat +.. _`pass-by-value`: https://github.com/pass-by-value +.. _`paulnivin`: https://github.com/paulnivin +.. _`peter-slovak`: https://github.com/peter-slovak +.. _`plastikos`: https://github.com/plastikos +.. _`pritambaral`: https://github.com/pritambaral +.. _`rallytime`: https://github.com/rallytime +.. _`rapenne-s`: https://github.com/rapenne-s +.. _`rasathus`: https://github.com/rasathus +.. _`rmatulat`: https://github.com/rmatulat +.. _`rterbush`: https://github.com/rterbush +.. _`ruxandraburtica`: https://github.com/ruxandraburtica +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack/salt#29313`: https://github.com/saltstack/salt/issues/29313 +.. _`schaarsc`: https://github.com/schaarsc +.. _`seanjnkns`: https://github.com/seanjnkns +.. _`serge-p`: https://github.com/serge-p +.. _`shawnbutts`: https://github.com/shawnbutts +.. _`sjorge`: https://github.com/sjorge +.. _`snarfmonkey`: https://github.com/snarfmonkey +.. _`snw1968`: https://github.com/snw1968 +.. _`srkunze`: https://github.com/srkunze +.. _`ssgward`: https://github.com/ssgward +.. _`ssplatt`: https://github.com/ssplatt +.. _`stanislavb`: https://github.com/stanislavb +.. _`tbaker57`: https://github.com/tbaker57 +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`thegoodduke`: https://github.com/thegoodduke +.. _`thomaso-mirodin`: https://github.com/thomaso-mirodin +.. _`ticosax`: https://github.com/ticosax +.. _`timcharper`: https://github.com/timcharper +.. _`tkunicki`: https://github.com/tkunicki +.. _`tminn`: https://github.com/tminn +.. _`tony`: https://github.com/tony +.. _`trevor-h`: https://github.com/trevor-h +.. _`twangboy`: https://github.com/twangboy +.. _`webtrekker`: https://github.com/webtrekker +.. _`whiteinge`: https://github.com/whiteinge +.. _`whytewolf`: https://github.com/whytewolf +.. _`ymote`: https://github.com/ymote +.. _`zmalone`: https://github.com/zmalone diff --git a/doc/topics/releases/2015.8.5.rst b/doc/topics/releases/2015.8.5.rst index 1babd1cc33..bc2d795ab1 100644 --- a/doc/topics/releases/2015.8.5.rst +++ b/doc/topics/releases/2015.8.5.rst @@ -1,16 +1,15 @@ -.. _2015.8.5: +.. _release-2015-8-5: =========================== Salt 2015.8.5 Release Notes =========================== -.. admonition:: About this Release +Version 2015.8.5 is a bugfix release for :ref:`2015.8.0 `. - Salt 2015.8.5 is identical to the 2015.8.4 release with the addition of - a fix for :issue:`30820`, fixed by **PR** `#30833`_. For convenience, the - content from the 2015.8.4 release notes is included below. - -.. _`#30833`: https://github.com/saltstack/salt/pull/30833 +.. important:: About this Release + Salt 2015.8.5 is identical to the 2015.8.4 release with the addition of a + fix for :issue:`30820`, fixed by :pull:`30833`. See :ref:`here + ` for the 2015.8.4 release notes. Known Issue in ``boto_*`` execution modules =========================================== @@ -22,15 +21,14 @@ following: 1. Download the ``boto_*`` execution modules that you would like to update from the 2015.8 branch of Salt. A complete list of affected modules with the - specific changes is available in **PR** `#30867`_. + specific changes is available in :pull`30867`. A simple way to get the updated modules is to `download `_ a zip file of the 2015.8 branch from GitHub. The updated modules are in the ``salt\modules`` directory. -2. Copy the ``boto_*`` modules to the ``\srv\salt\_modules`` directory on your - Salt master. +2. Place the ``boto_*`` modules into ``salt://_modules``. 3. Run the following command to sync these modules to all Salt minions: @@ -39,11 +37,9 @@ following: salt '*' saltutil.sync_modules -.. _`#30867`: https://github.com/saltstack/salt/pull/30867/files +Changelog for v2015.8.4..v2015.8.5 +================================== --------------------------- +*Generated at: 2018-05-27 23:47:32 UTC* -**2015.8.4 Release Notes** - -.. include:: 2015.8.4.rst - :start-line: 16 +* c7db4350d5 Fix regression in scanning for state with 'name' param diff --git a/doc/topics/releases/2015.8.7.rst b/doc/topics/releases/2015.8.7.rst index d88f0c2a98..36c5180848 100644 --- a/doc/topics/releases/2015.8.7.rst +++ b/doc/topics/releases/2015.8.7.rst @@ -2,16 +2,29 @@ Salt 2015.8.7 Release Notes =========================== +Version 2015.8.7 is a bugfix release for :ref:`2015.8.0 `. + .. note:: Salt 2015.8.4, 2015.8.5, and 2015.8.7 were all released within a short period due to regressions found soon after the releases of 2015.8.4 and - 2015.8.5. These release notes contain all of the changes since 2015.8.3 to - make it easier to see everything that has changed recently. + 2015.8.5. See :ref:`here ` for the 2015.8.4 release + notes, and :ref:`here ` for the 2015.8.5 release notes. -Changes for v2015.8.4..v2015.8.7 --------------------------------- -For :py:mod:`pkg.installed ` states, on Linux +Statistics +========== + +- Total Merges: **2** +- Total Issue References: **1** +- Total PR References: **5** + +- Contributors: **4** (`gtmanfred`_, `justinta`_, `pass-by-value`_, `terminalmage`_) + + +Change to Epoch Support for YUM/DNF +=================================== + +For :py:func:`pkg.installed ` states, on Linux distributions which use yum/dnf, packages which have a non-zero epoch in the version number now require this epoch to be included when specifying an exact version for a package. For example: @@ -22,92 +35,88 @@ version for a package. For example: pkg.installed: - version: 2:7.4.160-1.el7 -The :py:mod:`pkg.latest_version ` and -:py:mod:`pkg.list_repo_pkgs ` functions can -be used to get the correct version string to use, as they will now contain the -epoch when it is non-zero. +The :py:func:`pkg.latest_version ` and +:py:func:`pkg.list_repo_pkgs ` functions +can be used to get the correct version string to use, as they will now contain +the epoch when it is non-zero. -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): -*Generated at: 2016-02-11T22:13:51Z* +Changelog for v2015.8.5..v2015.8.7 +================================== -Statistics: +*Generated at: 2018-05-28 00:17:59 UTC* -- Total Merges: **2** -- Total Issue references: **0** -- Total PR references: **3** +* **PR** `#31111`_: (`justinta`_) Fixes failing npm test on arch. + @ *2016-02-10 21:51:47 UTC* -Changes: + * 8d84c636cf Merge pull request `#31111`_ from jtand/8_4_npm_fix -- **PR** `#31111`_: (*jtand*) Fixes failing npm test on arch. - @ *2016-02-10T21:51:47Z* + * b0a48e5ef2 Fixes failing npm test on arch. - * 8d84c63 Merge pull request `#31111`_ from jtand/8_4_npm_fix - * b0a48e5 Fixes failing npm test on arch. + * **PR** `#30217`_: (`pass-by-value`_) Make sure cloud actions can be called via salt run - * 733c6ab Some 3rd-party modules (e.g. gnupg) define custom log levels that emit at INFO level and above. This patch sets the color data lookups to default to TextFormat('reset') rather than producing a stack trace every time a log message is generated from an affected module. +* **ISSUE** `#31014`_: (`gtmanfred`_) [2015.8] pkg breaks for yum pkgs.latest if the packages has an epoch (refs: `#31031`_, `#31015`_) - * 3f71fd0 Revert `#30217`_ +* **PR** `#31092`_: (`terminalmage`_) Apply PR `#31031`_ to 2015.8.4.follow_up + @ *2016-02-10 20:54:37 UTC* - - **PR** `#30217`_: (*pass-by-value*) Make sure cloud actions can be called via salt run + * **PR** `#31031`_: (`terminalmage`_) More complete fix for `#31014`_ (refs: `#31092`_) -- **PR** `#31092`_: (*terminalmage*) Apply PR `#31031`_ to 2015.8.4.follow_up - @ *2016-02-10T20:54:37Z* + * **PR** `#31015`_: (`gtmanfred`_) include possible epoch in version for rpm (refs: `#31031`_) - * 5a6a93e Merge pull request `#31092`_ from terminalmage/issue31014-2015.8.4.follow_up - * 2767a4e Don't handle epoch specially for dnf + * 5a6a93e98b Merge pull request `#31092`_ from terminalmage/issue31014-2015.8.4.follow_up - * e5dfcc0 More efficient way to add the epoch before version number + * 2767a4e519 Don't handle epoch specially for dnf - * ed74627 include possible epoch in version for rpm + * e5dfcc0ef2 More efficient way to add the epoch before version number - * 6c6b66a Comment multiprocessing line in minion config + * ed7462793c include possible epoch in version for rpm - * 1f7dfef Set multiprocessing to true in config.py + * 6c6b66aedd Comment multiprocessing line in minion config - * 433c645 Fix remove placeholder files + * 1f7dfefc4a Set multiprocessing to true in config.py - * 7103756 Remove placeholder files + * 433c645c20 Fix remove placeholder files - * 20b381f Set overwrite to off + * 71037560d4 Remove placeholder files - * ca50f56 Fix boto_secgroup + * 20b381fdf7 Set overwrite to off - * fd571d2 Fix boto test failures + * ca50f56d6c Fix boto_secgroup - * cfb6588 Fix regression when contents_pillar/contents_grains is a list. + * fd571d23de Fix boto test failures - * 881d866 utils.aws: use time lib to conver to epoch seconds + * cfb6588744 Fix regression when contents_pillar/contents_grains is a list. - * 3141292 The call to cp.get_url needs the saltenv, if you're using environments other than base, it will fail. + * 881d8669e3 utils.aws: use time lib to conver to epoch seconds - * a869401 Fix regression in git_pillar when multiple remotes are configured + * 31412920fc The call to cp.get_url needs the saltenv, if you're using environments other than base, it will fail. - * 2243f25 Properly set the default value for pillar_merge_lists + * a8694014a9 Fix regression in git_pillar when multiple remotes are configured - * c7472ff Lint + * 2243f25be5 Properly set the default value for pillar_merge_lists - * d868711 Fix failing boto_vpc module unit tests + * c7472ff6aa Lint - * ed09516 Fix failing state module tests + * d868711a83 Fix failing boto_vpc module unit tests - * fd0e940 Pylint fix + * ed09516469 Fix failing state module tests - * bc780a7 Don't use pack=pack. Just pass in pack=__salt__ always. + * fd0e940088 Pylint fix - * 1ae022d Pass in 'pack' variable to utils.boto.assign_funcs function from ALL boto modules. + * bc780a7c25 Don't use pack=pack. Just pass in pack=__salt__ always. - * 1efaff1 Remove bad symlinks in osx pkg dirs + * 1ae022dbfe Pass in 'pack' variable to utils.boto.assign_funcs function from ALL boto modules. - * c7db435 Fix regression in scanning for state with 'name' param + * 1efaff107d Remove bad symlinks in osx pkg dirs .. _`#30217`: https://github.com/saltstack/salt/pull/30217 -.. _`#31031`: https://github.com/saltstack/salt/issues/31031 +.. _`#31014`: https://github.com/saltstack/salt/issues/31014 +.. _`#31015`: https://github.com/saltstack/salt/pull/31015 +.. _`#31031`: https://github.com/saltstack/salt/pull/31031 .. _`#31092`: https://github.com/saltstack/salt/pull/31092 .. _`#31111`: https://github.com/saltstack/salt/pull/31111 - --------------------------- - -.. include:: 2015.8.4.rst - :start-line: 17 - +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`justinta`: https://github.com/justinta +.. _`pass-by-value`: https://github.com/pass-by-value +.. _`terminalmage`: https://github.com/terminalmage diff --git a/doc/topics/releases/2015.8.8.2.rst b/doc/topics/releases/2015.8.8.2.rst new file mode 100644 index 0000000000..bcd880f4ce --- /dev/null +++ b/doc/topics/releases/2015.8.8.2.rst @@ -0,0 +1,41 @@ +.. _release-2015-8-8-2: + +============================= +Salt 2015.8.8.2 Release Notes +============================= + +Version 2015.8.8.2 is a bugfix release for :ref:`2015.8.0 `. + + +Fixes to 2015.8.8 +================= + +Salt 2015.8.8.2 includes fixes for the following known issues in 2015.8.8: + +- Key master with value [...] has an invalid type of list Error (:issue:`32044`) +- Failed to import module win_dacl Error (:issue:`32004`) +- Wrong validation type for file_ignore_glob key (:issue:`32114`) +- Fix file.managed for windows (:issue:`31969`) + +.. important:: + :issue:`32183` prevents Salt Cloud from installing the Salt minion on new + systems. To workaround this issue, call ``salt-cloud -u`` to update the + bootstrap script to the latest version. + + +Changelog for v2015.8.8..v2015.8.8.2 +==================================== + +*Generated at: 2018-05-28 00:29:12 UTC* + +* 403563e441 Change type check errors to debug loglevel + +* 8323005b3d Support multiple valid option types when performing type checks + +* 2f95082a96 Fixed validation type for file_ignore_glob Fixes `#32114`_ + +* 2685e61d9e Move constant declaration into member variable to avoid issues when modules can't be loaded. + +* bc10d7dede Add apply_template_on_contents for windows + +.. _`#32114`: https://github.com/saltstack/salt/issues/32114 diff --git a/doc/topics/releases/2015.8.8.rst b/doc/topics/releases/2015.8.8.rst index fd5991cb4e..9b7eab82d1 100644 --- a/doc/topics/releases/2015.8.8.rst +++ b/doc/topics/releases/2015.8.8.rst @@ -2,33 +2,28 @@ Salt 2015.8.8 Release Notes =========================== -.. important:: 2015.8.8.2 was released shortly after 2015.8.8 to fix several - known issues. If you installed 2015.8.8 before 03/30/2016, you likely have - installed 2015.8.8 and can optionally upgrade (find out which version you - have installed using ``salt --version``. The latest version is - ``2015.8.8.2``). +Version 2015.8.8 is a bugfix release for :ref:`2015.8.0 `. -Salt 2015.8.8.2 -=============== +.. important:: + Version :ref:`2015.8.8.2 ` was released shortly after + 2015.8.8 to fix several known issues. If you installed 2015.8.8 before + 03/30/2016, you likely have installed 2015.8.8 and can optionally upgrade + (find out which version you have installed using ``salt --version``. -Salt 2015.8.8.2 includes fixes for the following known issues in 2015.8.8: +Statistics +========== -- :issue:`32044`: Key master with value [...] has an invalid type of list Error -- :issue:`32004`: Failed to import module win_dacl Error -- :issue:`32114`: Wrong validation type for file_ignore_glob key -- :issue:`31969`: Fix file.managed for windows +- Total Merges: **313** +- Total Issue References: **146** +- Total PR References: **312** -.. important:: :issue:`32183` prevents Salt Cloud from installing the Salt minion - on new systems. To workaround this issue, call ``salt-cloud -u`` to update the - bootstrap script to the latest version. +- Contributors: **74** (`Ch3LL`_, `DmitryKuzmenko`_, `JohannesEbke`_, `RabidCicada`_, `Talkless`_, `The-Loeki`_, `abednarik`_, `anlutro`_, `basepi`_, `bdrung`_, `cachedout`_, `captaininspiration`_, `clarkperkins`_, `clinta`_, `cro`_, `darix`_, `dmacvicar`_, `dr4Ke`_, `dschaller`_, `edencrane`_, `garethgreenaway`_, `gladiatr72`_, `gtmanfred`_, `iacopo-papalini`_, `isbm`_, `jacksontj`_, `jacobhammons`_, `jakehilton`_, `jespada`_, `jfindlay`_, `joejulian`_, `justinta`_, `kiorky`_, `kraney`_, `llua`_, `mcalmer`_, `mchugh19`_, `mew1033`_, `mlalpho`_, `moltob`_, `multani`_, `myii`_, `opdude`_, `paiou`_, `pass-by-value`_, `peripatetic-sojourner`_, `pprince`_, `rallytime`_, `redmcg`_, `replicant0wnz`_, `rhansen`_, `rmtmckenzie`_, `s0undt3ch`_, `sakateka`_, `sbreidba`_, `seanjnkns`_, `sjmh`_, `sjorge`_, `skizunov`_, `szeestraten`_, `tbaker57`_, `techhat`_, `terminalmage`_, `thusoy`_, `ticosax`_, `twangboy`_, `virtualguy`_, `vutny`_, `whiteinge`_, `xmj`_, `xopher-mc`_, `yannis666`_, `youngnick`_, `zygiss`_) -Salt 2015.8.8 -============= Security Fix ------------- +============ -CVE-2016-3176: Insecure configuration of PAM external authentication service +**CVE-2016-3176** Insecure configuration of PAM external authentication service This issue affects all Salt versions prior to 2015.8.8/2015.5.10 when PAM :ref:`external authentication ` is enabled. This issue involves @@ -41,7 +36,7 @@ This update defines the PAM eAuth ``service`` that users authenticate against in the Salt Master configuration. Read Before Upgrading Debian 7 (Wheezy) from 2015.8.7 to 2015.8.8 ------------------------------------------------------------------ +================================================================= Before you upgrade from 2015.8.7 on Debian 7, you must run the following commands to remove previous packages: @@ -56,9 +51,10 @@ the second command might not be necessary. These have been replaced by ``python-crypto`` and ``python-libcloud`` with ~bpo70+1 moniker. Read Before Upgrading Debian 8 (Jessie) from Salt Versions Earlier than 2015.8.4 --------------------------------------------------------------------------------- +================================================================================ -Salt ``systemd`` service files are missing the following statement in these versions: +Salt ``systemd`` service files are missing the following statement in these +versions: .. code-block:: ini @@ -68,569 +64,3259 @@ Salt ``systemd`` service files are missing the following statement in these vers This statement must be added to successfully upgrade on these earlier versions of Salt. -Changes for v2015.8.7..v2015.8.8 --------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Changelog for v2015.8.7..v2015.8.8 +================================== -*Generated at: 2016-03-17T21:03:44Z* +*Generated at: 2018-05-28 00:23:11 UTC* -Total Merges: **312** +* **PR** `#31964`_: (`jfindlay`_) update 2015.8.8 release notes + @ *2016-03-17 21:22:04 UTC* -Changes: + * b9d0336cf8 Merge pull request `#31964`_ from jfindlay/2015.8 -- **PR** `#31947`_: (*cro*) Move proxymodule assignment earlier in proxy minion init + * b984659678 update 2015.8.8 release notes -- **PR** `#31948`_: (*rallytime*) Revert "not not" deletion and add comment as to why that is there +* **ISSUE** `#31586`_: (`frogunder`_) Proxy minion service.modules fails (refs: `#31601`_) -- **PR** `#31952`_: (*rallytime*) Fix lint for 2015.8 branch +* **ISSUE** `#31585`_: (`frogunder`_) Proxy minion commands causing exceptions (refs: `#31601`_) -- **PR** `#31933`_: (*rallytime*) Fix linking syntax in testing docs +* **PR** `#31947`_: (`cro`_) Move proxymodule assignment earlier in proxy minion init + @ *2016-03-17 18:14:23 UTC* -- **PR** `#31930`_: (*cro*) Backport changes from 2016.3 + * **PR** `#31601`_: (`cro`_) Proxy fixes for `#31585`_ and `#31586`_ -- **PR** `#31924`_: (*jfindlay*) update 2015.8.8 release notes + * fefb694104 Merge pull request `#31947`_ from cro/bp-31601 -- **PR** `#31922`_: (*cachedout*) For 2015.8 head + * 4eb193edb7 Lint, unrelated but fixed anyway. -- **PR** `#31904`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * d661081016 Lint. -- **PR** `#31906`_: (*sbreidba*) Win_dacl module: fix FULLCONTROL / FILE_ALL_ACCESS definition + * 59e0a6f923 Dont add this file -- **PR** `#31745`_: (*isbm*) Fix the always-false behavior on checking state + * c68b968403 Old-style proxymodules need to be setup earlier in minion init. Also include more correct comments in config.py -- **PR** `#31911`_: (*rallytime*) Merge `#31903`_ with pylint fix +* **PR** `#31948`_: (`rallytime`_) Revert "not not" deletion and add comment as to why that is there + @ *2016-03-17 17:00:22 UTC* -- **PR** `#31883`_: (*paiou*) Fix scaleway cloud provider and manage x86 servers + * a86490ee68 Merge pull request `#31948`_ from rallytime/disable-pylint-error -- **PR** `#31903`_: (*terminalmage*) Use remote_ref instead of local_ref to see if checkout is necessary + * 86196cd59d Revert "not not" deletion and add comment as to why that is there -- **PR** `#31845`_: (*sakateka*) Now a check_file_meta deletes temporary files when test=True +* **PR** `#31952`_: (`rallytime`_) Fix lint for 2015.8 branch + @ *2016-03-17 16:59:49 UTC* -- **PR** `#31901`_: (*rallytime*) Back-port `#31846`_ to 2015.8 + * db3af864ae Merge pull request `#31952`_ from rallytime/lint-2015.8 -- **PR** `#31905`_: (*terminalmage*) Update versionadded directive + * 3e964ec9d4 Fix lint for 2015.8 branch -- **PR** `#31902`_: (*rallytime*) Update versionadded tag for new funcs +* **PR** `#31933`_: (`rallytime`_) Fix linking syntax in testing docs + @ *2016-03-17 14:44:13 UTC* -- **PR** `#31888`_: (*terminalmage*) Fix salt.utils.decorators.Depends + * 9ab4d6164b Merge pull request `#31933`_ from rallytime/fix-test-links -- **PR** `#31857`_: (*sjorge*) gen_password and del_password missing from solaris_shadow + * 06dd2c0411 Fix linking syntax in testing docs -- **PR** `#31879`_: (*cro*) Clarify some comments +* **ISSUE** `#31586`_: (`frogunder`_) Proxy minion service.modules fails (refs: `#31601`_) -- **PR** `#31815`_: (*dr4Ke*) Fix template on contents 2015.8 +* **ISSUE** `#31585`_: (`frogunder`_) Proxy minion commands causing exceptions (refs: `#31601`_) -- **PR** `#31818`_: (*anlutro*) Prevent event logs from writing huge amounts of data +* **PR** `#31930`_: (`cro`_) Backport changes from 2016.3 + @ *2016-03-16 22:12:29 UTC* -- **PR** `#31836`_: (*terminalmage*) Fix git_pillar race condition + * **PR** `#31601`_: (`cro`_) Proxy fixes for `#31585`_ and `#31586`_ -- **PR** `#31824`_: (*rallytime*) Back-port `#31819`_ to 2015.8 + * 723d0ca19f Merge pull request `#31930`_ from cro/bp-31601 -- **PR** `#31856`_: (*szeestraten*) Adds missing docs for Virtual Network and Subnet options in salt-cloud Azure cloud profile + * aa9a288b5a Add these files back in -- **PR** `#31839`_: (*jfindlay*) add 2015.8.8 release notes + * 916ef26957 Remove .orig file mistakenly added, reformat example. -- **PR** `#31828`_: (*gtmanfred*) Remove ability of authenticating user to specify pam service + * 3c8185571d Lint. -- **PR** `#31787`_: (*anlutro*) Fix user_create and db_create for new versions of influxdb + * 9de9b9e86d Missin import -- **PR** `#31800`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * d571f3b8fe Backport PR`#31601`_ -- **PR** `#31797`_: (*Ch3LL*) Change pkg name to less for suse pkg.info_installed test +* **PR** `#31924`_: (`jfindlay`_) update 2015.8.8 release notes + @ *2016-03-16 22:10:15 UTC* -- **PR** `#31793`_: (*xopher-mc*) fixing init system detection on sles 11, refs `#31617`_ + * ce765ad2df Merge pull request `#31924`_ from jfindlay/2015.8 -- **PR** `#31786`_: (*isbm*) Bugfix: zypper doesn't detect base product on SLE11 series + * 64dd8aebb2 update 2015.8.8 release notes -- **PR** `#31780`_: (*gtmanfred*) use already created vsphere connection +* **ISSUE** `#31890`_: (`damon-atkins`_) salt/fileclient.py get_url should include the URL in any error message (refs: `#31922`_) -- **PR** `#31779`_: (*sbreidba*) win_dacl state & module: return comment field as strings, not lists. +* **PR** `#31922`_: (`cachedout`_) For 2015.8 head + @ *2016-03-16 19:07:11 UTC* -- **PR** `#31723`_: (*sjorge*) file_ignore_regex is a list, not bool + * 390ef9fea7 Merge pull request `#31922`_ from cachedout/issue_31890_1 -- **PR** `#31747`_: (*techhat*) Use get_local_client with MASTER opts, not MINION + * da075d9341 For 2015.8 head -- **PR** `#31688`_: (*whiteinge*) Various SMTP returner fixes +* **PR** `#31904`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-03-16 17:23:54 UTC* -- **PR** `#31752`_: (*rallytime*) Back-port `#31686`_ to 2015.8 + * 03e8b72655 Merge pull request `#31904`_ from rallytime/merge-2015.8 -- **PR** `#31733`_: (*jacobhammons*) docs to clarify cloud configuration + * f8b4b1b211 last pylint! -- **PR** `#31775`_: (*techhat*) Show correct provider/driver name + * 892591a39c More pylint fixes -- **PR** `#31754`_: (*techhat*) Check all providers, not just the current one + * 35b2076584 Pylint fixes -- **PR** `#31735`_: (*rallytime*) Add reboot, start, and stop actions to digital ocean driver + * 1a1ce05186 Merge branch '2015.5' into '2015.8' -- **PR** `#31770`_: (*anlutro*) Fix influxdb user functionality for version 0.9+ + * 440e0dcbe0 Merge pull request `#31825`_ from jtand/udpate_pylintrc -- **PR** `#31743`_: (*Talkless*) Fix parentheses mismatch in documentation + * 9a14e02766 Updated beacons/sh.py to work with enumerate() -- **PR** `#31162`_: (*isbm*) Remove MD5 digest from everywhere and default to SHA256 + * 0ecec691a0 Adjusted beacons to work with enumerate better -- **PR** `#31670`_: (*terminalmage*) Write lists of minions targeted by syndic masters to job cache + * f509b4113e Fixed final lint error -- **PR** `#31711`_: (*ticosax*) [dockerng] Port and Volume comparison should consider Dockerfile + * 5945b3f11f Fix and disable pylint errors -- **PR** `#31719`_: (*techhat*) Don't worry about KeyErrors if the node is already removed + * 06ae6eaf55 Fixed pylint errors on jboss state and module -- **PR** `#31713`_: (*ticosax*) [dockerng] Fix dockerng.network_present when container is given by name + * de96db97c8 Fixed more pylint errors, and disabled some more -- **PR** `#31705`_: (*peripatetic-sojourner*) Foreman pillar + * c07b0a20b5 Merge branch 'lint_fixes' into udpate_pylintrc -- **PR** `#31702`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 2e6a152308 Fixed lint error in lxc.py -- **PR** `#31700`_: (*s0undt3ch*) It's a function! + * 908ca1a439 Fixed lint error in ssh_py_shim -- **PR** `#31679`_: (*cro*) Fix bad link to the sample REST endpoint in salt-contrib. + * 404c1b50f7 Changed range(len()) to enumerate() -- **PR** `#31668`_: (*rallytime*) Some more testing documentation improvements + * 1e13586546 Changed range(len()) to enumerate() -- **PR** `#31653`_: (*DmitryKuzmenko*) Don't attempt to verify token if it wasn't sent to master. + * 9ccce7a9a5 Added more disables -- **PR** `#31629`_: (*darix*) Fix services on sles + * 9c1aab3b4e Updated .testing.pylintrc to match newer versions of pylint -- **PR** `#31641`_: (*rallytime*) Improve Salt Testing tutorial to be a more comprehensive intro + * 471c9444a3 Merge pull request `#31900`_ from rallytime/fix-psutil-warning -- **PR** `#31651`_: (*dr4Ke*) test case: test_list_present_nested_already + * 22403d69ae Add "python module" clarification to ps __virtual__ warning. -- **PR** `#31643`_: (*opdude*) Make sure we are really updating the mercurial repository + * c44c1b5e59 Merge pull request `#31878`_ from rallytime/fix-psutil-warning -- **PR** `#31598`_: (*terminalmage*) Remove limitations on validation types for eauth targets + * 44b29f72a1 Make sure __virtual__ error message is helpful when psutil is missing -- **PR** `#31627`_: (*jakehilton*) Handling error from using gevent 1.1. + * 5c592b6768 Merge pull request `#31852`_ from rallytime/merge-2015.5 -- **PR** `#31630`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 1470de17fa Merge branch '2014.7' into '2015.5' -- **PR** `#31594`_: (*rallytime*) Back-port `#31589`_ to 2015.8 + * 218c902091 Merge pull request `#31834`_ from jfindlay/2014.7 -- **PR** `#31604`_: (*joejulian*) Workaround for non-xml output from gluster cli when not tty + * 358fdad0c8 add 2014.7.8 release notes -- **PR** `#31583`_: (*vutny*) Remove trailing white spaces + * a423c6cd04 Merge pull request `#31833`_ from jfindlay/2014.7 -- **PR** `#31592`_: (*rallytime*) Back-port `#31546`_ to 2015.8 + * 6910fcc584 add 2014.7.9 release notes -- **PR** `#31593`_: (*rallytime*) Back-port `#31570`_ to 2015.8 + * c5e7c03953 Merge pull request `#31826`_ from gtmanfred/2014.7 -- **PR** `#31567`_: (*cachedout*) Restore FIPS compliance when using master_finger + * d73f70ebb2 Remove ability of authenticating user to specify pam service -- **PR** `#31568`_: (*twangboy*) Grant permissions using SID instead of name + * 0cc1d5db03 Merge pull request `#31827`_ from gtmanfred/2015.5 -- **PR** `#31561`_: (*jtand*) Skipped test + * 979173b78a Remove ability of authenticating user to specify pam service -- **PR** `#31550`_: (*rallytime*) Correct versionadded tag for win_service.config + * 8cf0b9eb3d Merge pull request `#31810`_ from whiteinge/saltenv-jinja-var -- **PR** `#31549`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * cb72b19240 Fix outdated Jinja 'env' variable reference -- **PR** `#31544`_: (*DmitryKuzmenko*) Protect getattr from recursion +* **PR** `#31906`_: (`sbreidba`_) Win_dacl module: fix FULLCONTROL / FILE_ALL_ACCESS definition + @ *2016-03-16 15:20:19 UTC* -- **PR** `#31525`_: (*DmitryKuzmenko*) Issues/30643 merge forward fixes + * a4b3462346 Merge pull request `#31906`_ from sbreidba/win_dacl_fixes -- **PR** `#31536`_: (*virtualguy*) Remove debian repo from raspbian installation + * 54d81b9b42 Fix FULLCONTROL / FILE_ALL_ACCESS definition (bugfix and code simplification). Use consistent mechanism fro obtaining user SID. Allow wildcarding (via optional parameters) for a variety of methods (get, rm_ace, check_ace). -- **PR** `#31528`_: (*vutny*) Correct Salt Cloud documentation about updating Salt Bootstrap script +* **PR** `#31745`_: (`isbm`_) Fix the always-false behavior on checking state + @ *2016-03-15 23:02:20 UTC* -- **PR** `#31539`_: (*DmitryKuzmenko*) Added temporary workaround for CentOS 7 os-release id bug. + * b068eaa963 Merge pull request `#31745`_ from isbm/isbm-always-minion-errcode-2-fix -- **PR** `#31508`_: (*mcalmer*) Zypper correct exit code checking + * 1882e1c960 Adjust test -- **PR** `#31510`_: (*vutny*) Add installation guide for Raspbian (Debian on Raspberry Pi) + * f96c8f9b5e Keep first level away from lists. -- **PR** `#31498`_: (*Ch3LL*) rename methods in pkg states test + * baaed005b8 Fix PEP8 continuation -- **PR** `#31471`_: (*cachedout*) Correct issue where duplicate items in grains list during state run will result in duplicate grains + * 1db61ea59a Fix the always-false behavior on checking state (there are always lists at some point!) -- **PR** `#31455`_: (*ticosax*) [dockerng] Disable notset check +* **PR** `#31911`_: (`rallytime`_) Merge `#31903`_ with pylint fix + @ *2016-03-15 20:35:35 UTC* -- **PR** `#31488`_: (*isbm*) Unit Test for Zypper's "remove" and "purge" + * **PR** `#31903`_: (`terminalmage`_) Use remote_ref instead of local_ref to see if checkout is necessary (refs: `#31911`_) -- **PR** `#31485`_: (*jacobhammons*) Fixed transport description in minion / master config + * d05c3eeba9 Merge pull request `#31911`_ from rallytime/merge-31903-with-pylint -- **PR** `#31411`_: (*jtand*) Added some beacons execution module integration tests + * 85e5acd11a Merge `#31903`_ with pylint fix -- **PR** `#31475`_: (*jacobhammons*) Assorted doc issues +* **PR** `#31883`_: (`paiou`_) Fix scaleway cloud provider and manage x86 servers + @ *2016-03-15 20:31:18 UTC* -- **PR** `#31477`_: (*vutny*) Correct installation documentation for Ubuntu + * 819a4a8b54 Merge pull request `#31883`_ from mvpstars/scaleway-x86 -- **PR** `#31479`_: (*isbm*) Zypper unit tests & fixes + * 1662a080e1 Update scaleway cloud provider to manage x86 servers -- **PR** `#31445`_: (*rallytime*) Only use LONGSIZE in rpm.info if available. Otherwise, use SIZE. +* **PR** `#31903`_: (`terminalmage`_) Use remote_ref instead of local_ref to see if checkout is necessary (refs: `#31911`_) + @ *2016-03-15 20:04:56 UTC* -- **PR** `#31464`_: (*Ch3LL*) integartion test: ensure decorator only runs on one method and not class + * 142c47c50d Merge pull request `#31903`_ from terminalmage/fix-git-pillar -- **PR** `#31458`_: (*vutny*) Correct installation documentation for Debian + * af29940e1c Use remote_ref instead of local_ref to see if checkout is necessary -- **PR** `#31457`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **PR** `#31845`_: (`sakateka`_) Now a check_file_meta deletes temporary files when test=True + @ *2016-03-15 19:55:21 UTC* -- **PR** `#31439`_: (*rallytime*) Fix lowpkg.info function for Ubuntu 12 - make sure we have a pkg name + * ffd65c36e5 Merge pull request `#31845`_ from sakateka/check_file_meta_clean_tmp -- **PR** `#31456`_: (*RabidCicada*) Clarified the form of requisite targets/requisite-references + * 5b30336b89 Now a check_file_meta deletes temporary files when test=True -- **PR** `#31453`_: (*DmitryKuzmenko*) Backport cp_geturl fix for large files into 2015.8 +* **ISSUE** `#31791`_: (`alexbleotu`_) Proxy minion starts spinning after running state.highstate (refs: `#31846`_) -- **PR** `#31444`_: (*jacobhammons*) Documentation updates - ddns state, file.line state/exe function, installation dependencies +* **ISSUE** `#31728`_: (`bgridley`_) Custom grains syncing problem with proxy minion which causes high CPU utilization (refs: `#31846`_) -- **PR** `#31341`_: (*twangboy*) Clarification on Windows Package Manager docs +* **PR** `#31901`_: (`rallytime`_) Back-port `#31846`_ to 2015.8 + @ *2016-03-15 19:12:43 UTC* -- **PR** `#31380`_: (*kiorky*) Bring up ext_pillar rendering errors as well + * **PR** `#31846`_: (`cro`_) Proxy infinite loop (refs: `#31901`_) -- **PR** `#31418`_: (*terminalmage*) Fix core grains when Debian OS detected as 'Debian GNU/Linux' + * 7428c73724 Merge pull request `#31901`_ from rallytime/bp-31846 -- **PR** `#31429`_: (*mcalmer*) fix argument handling for pkg.download + * 1edd6ce302 Extra comment. -- **PR** `#31432`_: (*ticosax*) [dockerng] Hotfix docker 1.10.2 + * 6c2ef03b11 Fix event bus flood caused by unexpected recursive call. -- **PR** `#31420`_: (*twangboy*) Handle Unversioned Packages +* **PR** `#31905`_: (`terminalmage`_) Update versionadded directive + @ *2016-03-15 18:43:06 UTC* -- **PR** `#31417`_: (*jacobhammons*) ddns state docs updated with notes regarding the name, zone, and keyfile. + * 37f1ce9be2 Merge pull request `#31905`_ from terminalmage/update-versionadded -- **PR** `#31391`_: (*redmcg*) Added sanity check: is 'pillar' in self.opts + * dcc196c9e1 Update versionadded directive -- **PR** `#31376`_: (*cro*) Some distros don't have a /lib/systemd +* **PR** `#31902`_: (`rallytime`_) Update versionadded tag for new funcs + @ *2016-03-15 18:41:08 UTC* -- **PR** `#31352`_: (*ticosax*) [dockerng] Pull missing images when calling dockerng.running + * **PR** `#31857`_: (`sjorge`_) gen_password and del_password missing from solaris_shadow (refs: `#31902`_) -- **PR** `#31378`_: (*mcalmer*) Zypper refresh handling + * 35f6407d11 Merge pull request `#31902`_ from rallytime/update-version-31857 -- **PR** `#31373`_: (*terminalmage*) Use --set-upstream instead of --track to set upstream on older git + * 5cd09150cd Update versionadded tag for new funcs -- **PR** `#31390`_: (*abednarik*) Fix Logrotate module. +* **PR** `#31888`_: (`terminalmage`_) Fix salt.utils.decorators.Depends + @ *2016-03-15 17:09:54 UTC* -- **PR** `#31354`_: (*ticosax*) [dockerng] Don't require auth for all registries + * 1be9c91761 Merge pull request `#31888`_ from terminalmage/fix-depends-decorator -- **PR** `#31368`_: (*whiteinge*) Update list of netapi clients for autoclass + * 394410e2b0 Add integration test for depends decorator -- **PR** `#31367`_: (*techhat*) Add docs on how to actually use SDB + * caa3cc1007 Fix salt.utils.decorators.Depends -- **PR** `#31357`_: (*ticosax*) [dockerng] Support docker inconsistencies +* **PR** `#31857`_: (`sjorge`_) gen_password and del_password missing from solaris_shadow (refs: `#31902`_) + @ *2016-03-14 20:29:51 UTC* -- **PR** `#31353`_: (*ticosax*) [dockerng] Fix when ports are integers + * d357e4ea44 Merge pull request `#31857`_ from sjorge/solarish_shadow -- **PR** `#31346`_: (*ticosax*) Backport `#31130`_ to 2015.8 + * 38231303f3 .9 release as mentioned by rallytime -- **PR** `#31332`_: (*terminalmage*) Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options + * 3e25f70968 fix version added -- **PR** `#31305`_: (*mcalmer*) call zypper with option --non-interactive everywhere + * d768ed25b4 develop, 2016.3 and 2015.8 has missing gen_password and del_password for shadow module -- **PR** `#31337`_: (*jacobhammons*) Release notes and versioning for 2015.8.7 +* **PR** `#31879`_: (`cro`_) Clarify some comments + @ *2016-03-14 19:59:35 UTC* -- **PR** `#31326`_: (*ticosax*) [dockerng ] Detect settings removal + * 1b0b2d3f1a Merge pull request `#31879`_ from cro/idrac_fixes_0314 -- **PR** `#31292`_: (*twangboy*) Fix dunder virtual to check for Remote Administration Tools + * 42ef3a7970 Extra comment. -- **PR** `#31287`_: (*joejulian*) Rework tests and fix reverse peering with gluster 3.7 +* **ISSUE** `#8927`_: (`brutasse`_) file state: unable to use `contents_pillar` with `template: jinja` (refs: `#31815`_) -- **PR** `#31196`_: (*sakateka*) Here are a few fixes utils.network +* **ISSUE** `#26944`_: (`boltronics`_) file.managed contents and contents_pillar should support a template rendering engine (refs: `#31815`_) -- **PR** `#31299`_: (*rallytime*) Allow state-output and state-verbose default settings to be set from CLI +* **ISSUE** `#14664`_: (`jacksontj`_) Unable to have a template with file.managed contents (or contents_pillar) (refs: `#31815`_) -- **PR** `#31317`_: (*terminalmage*) Fix versonadded directive +* **PR** `#31815`_: (`dr4Ke`_) Fix template on contents 2015.8 + @ *2016-03-14 17:41:46 UTC* -- **PR** `#31301`_: (*terminalmage*) Corrected fix for `#30999`_ + * fb81bbea23 Merge pull request `#31815`_ from dr4Ke/fix_template_on_contents_2015.8 -- **PR** `#31302`_: (*terminalmage*) Audit CLI opts used in git states + * dcd6f5a5a9 test for file.apply_template_on_contents -- **PR** `#31312`_: (*terminalmage*) Merge 2015.5 into 2015.8 + * 10d882296d file.managed: templating contents, not just files -- **PR** `#31225`_: (*pprince*) Fix in file_tree pillar (Fixes `#31223`_.) +* **PR** `#31818`_: (`anlutro`_) Prevent event logs from writing huge amounts of data + @ *2016-03-14 17:27:47 UTC* -- **PR** `#31233`_: (*mcalmer*) implement version_cmp for zypper + * aa120cb716 Merge pull request `#31818`_ from alprs/fix-event_logging_spam -- **PR** `#31273`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 83fa136da7 work on event logging -- **PR** `#31253`_: (*gtmanfred*) allow for nova servers to be built with premade volumes +* **ISSUE** `#31293`_: (`deuscapturus`_) Git Pillars lose HEAD reference over time (refs: `#31836`_) -- **PR** `#31271`_: (*rallytime*) Back-port `#30689`_ to 2015.8 +* **ISSUE** `#29239`_: (`timwsuqld`_) Occasionaly git_pillar pull fails causing incorrect results of highstate (when running highstate for multiple minions) (refs: `#31836`_) -- **PR** `#31255`_: (*jacobhammons*) Fixes `#30461`_ +* **PR** `#31836`_: (`terminalmage`_) Fix git_pillar race condition + @ *2016-03-14 15:48:28 UTC* -- **PR** `#31189`_: (*dmacvicar*) Fix crash with scheduler and runners (`#31106`_) + * f2445bdbdc Merge pull request `#31836`_ from terminalmage/issue31293 -- **PR** `#31201`_: (*The-Loeki*) Utilize prepared grains var in master-side ipcidr matching + * 5048fa857c Fix duplicate output -- **PR** `#31239`_: (*terminalmage*) Improve logging when master cannot decode a payload + * 155b84b88a salt.fileserver: Add ability to clear checkout locks -- **PR** `#31190`_: (*twangboy*) Clear minion cache before caching from master + * af410d8dd1 Pass through the lock_type -- **PR** `#31226`_: (*pprince*) Minor docs fix: file_tree pillar (Fixes `#31124`_) + * 3d7796d5dd salt.runners.cache: Add ability to clear checkout locks -- **PR** `#31234`_: (*mcalmer*) improve doc for list_pkgs + * 8e086099f5 salt.utils.gitfs: rewrite locking code -- **PR** `#31237`_: (*mcalmer*) add handling for OEM products + * 06b212519c Add GitLockError exception class -- **PR** `#31182`_: (*rallytime*) Back-port `#31172`_ to 2015.8 + * ad04ccfb93 Strip whitespace when splitting -- **PR** `#31191`_: (*rallytime*) Make sure doc example matches kwarg +* **PR** `#31824`_: (`rallytime`_) Back-port `#31819`_ to 2015.8 + @ *2016-03-13 19:59:32 UTC* -- **PR** `#31171`_: (*Ch3LL*) added logic to check for installed package + * **PR** `#31819`_: (`mchugh19`_) raise error on unsupported distro (refs: `#31824`_) -- **PR** `#31177`_: (*Ch3LL*) add integration test for issue `#30934`_ + * 5464be07b1 Merge pull request `#31824`_ from rallytime/bp-31819 -- **PR** `#31181`_: (*cachedout*) Lint 2015.8 branch + * 4d516adade raise error on unsupported distro -- **PR** `#31169`_: (*rallytime*) Back-port `#29718`_ to 2015.8 +* **ISSUE** `#24559`_: (`iacopo-papalini`_) salt-cloud - Azure - should be possible to specify virtual network & subnet in profile (refs: `#31856`_, `#24569`_) -- **PR** `#31170`_: (*rallytime*) Back-port `#31157`_ to 2015.8 +* **PR** `#31856`_: (`szeestraten`_) Adds missing docs for Virtual Network and Subnet options in salt-cloud Azure cloud profile + @ *2016-03-13 19:06:52 UTC* -- **PR** `#31147`_: (*cro*) Documentation clarifications. + * **PR** `#24569`_: (`iacopo-papalini`_) Fix Issue `#24559`_ - salt-cloud - Azure - should be possible to specify… (refs: `#31856`_) -- **PR** `#31153`_: (*edencrane*) Fixed invalid host causing 'reference to variable before assignment' + * 7781b357e0 Merge pull request `#31856`_ from szeestraten/add-missing-docs-for-azure-cloud-profile -- **PR** `#31152`_: (*garethgreenaway*) fixes to beacon module, state module and friends + * a1a2229405 Adds missing docs for Azure cloud profile -- **PR** `#31149`_: (*jfindlay*) add 2015.8.7 release notes +* **PR** `#31839`_: (`jfindlay`_) add 2015.8.8 release notes + @ *2016-03-11 23:23:34 UTC* -- **PR** `#31134`_: (*isbm*) Fix types in the output data and return just a list of products + * 3f88f3a8cf Merge pull request `#31839`_ from jfindlay/2015.8 -- **PR** `#31120`_: (*gtmanfred*) Clean up some bugs in the nova driver + * 47ac41ba27 add 2015.8.8 release notes -- **PR** `#31132`_: (*rallytime*) Make sure required profile configurations passed in a map file work +* **PR** `#31828`_: (`gtmanfred`_) Remove ability of authenticating user to specify pam service + @ *2016-03-11 20:40:37 UTC* -- **PR** `#31131`_: (*Ch3LL*) integration test for issue `#31014`_ + * 46bdd10a56 Merge pull request `#31828`_ from gtmanfred/2015.8 -- **PR** `#31133`_: (*cachedout*) Fixup 31121 + * 7c3134a3d3 Remove ability of authenticating user to specify pam service -- **PR** `#31125`_: (*isbm*) Force-kill websocket's child processes faster than default two minutes. +* **ISSUE** `#30489`_: (`chris-martin`_) influxdb_user.present fails: "InfluxDBClient' object has no attribute 'get_list_cluster_admins" (refs: `#31787`_, `#31770`_) -- **PR** `#31119`_: (*sakateka*) fixes for ipv6-only multi-master faliover +* **PR** `#31787`_: (`anlutro`_) Fix user_create and db_create for new versions of influxdb + @ *2016-03-11 15:19:22 UTC* -- **PR** `#31107`_: (*techhat*) Don't try to add a non-existent IP address + * 3d370b471c Merge pull request `#31787`_ from alprs/fix-influxdb_user -- **PR** `#31108`_: (*jtand*) Changed npm integration test to install request. + * 6a5211c8d8 don't swallow exceptions -- **PR** `#31105`_: (*cachedout*) Lint 30975 + * a7e9c1e381 fix db_create for influxdb 0.9+ -- **PR** `#31100`_: (*jfindlay*) states.x509: docs: peer.sls -> peer.conf + * 5a8a645d4b fix create_user for new versions of influxdb -- **PR** `#31103`_: (*twangboy*) Point to reg.delete_key_recursive +* **PR** `#31800`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-03-10 20:49:53 UTC* -- **PR** `#31093`_: (*techhat*) Ensure double directories don't get created + * 7fb2331ebc Merge pull request `#31800`_ from rallytime/merge-2015.8 -- **PR** `#31095`_: (*jfindlay*) modules.file, states.file: explain symbolic links + * 44c15f0b16 Merge branch '2015.5' into '2015.8' -- **PR** `#31061`_: (*rallytime*) Revert `#30217`_ - was causing salt-cloud -a breakage + * 970ef0e445 Merge pull request `#31744`_ from brejoc/fix-attribute-error-with-older-libcloud/2015.5 -- **PR** `#31090`_: (*rallytime*) Back-port `#30542`_ to 2015.8 + * bb29dc2283 Added version to libcloud depends statement -- **PR** `#31085`_: (*jacksontj*) Correctly remove path we added after loader is completed + * 87f9534fce Added log message with update suggestion for libcloud -- **PR** `#31037`_: (*vutny*) Update RHEL installation guide to reflect latest repo changes + * 72eab406cd Fix for AttributeError with libcloud <0.15 -- **PR** `#31050`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * df2d23ba5d Merge pull request `#31740`_ from terminalmage/issue31666 -- **PR** `#31053`_: (*cachedout*) Fix boto test failures + * aeaf5864cd Fall back to False when pillar_opts not set -- **PR** `#31029`_: (*twangboy*) Windows defaults to multiprocessing true + * fe19d77eb4 Add default value for pillar_opts on minion -- **PR** `#30998`_: (*dmacvicar*) add_key/reject_key: do not crash w/Permission denied: '/var/cache/salt/master/.dfn' (`#27796`_) + * e22f5c0a26 Merge pull request `#31750`_ from rallytime/bp-26170 -- **PR** `#31049`_: (*twangboy*) Fix versionadded in win_service.config + * 3c11234a05 Make sure variable is a dictionary before popping something from it. -- **PR** `#30987`_: (*youngnick*) Changed glusterfs.peer() module so state can handle localhost peering attempts. + * 9162925dd0 Merge pull request `#31689`_ from rallytime/bp-29467 -- **PR** `#31042`_: (*moltob*) Allow using Windows path in archive.extracted name attribute + * 1f8f4cb99b Update module.py -- **PR** `#31012`_: (*terminalmage*) Fix gitfs/git_pillar/winrepo provider to allow lowercase values +* **PR** `#31797`_: (`Ch3LL`_) Change pkg name to less for suse pkg.info_installed test + @ *2016-03-10 19:08:16 UTC* -- **PR** `#31024`_: (*jfindlay*) modules.aptpkg.upgrade: clarify dist-upgrade usage + * 75dfb2ed40 Merge pull request `#31797`_ from Ch3LL/fix_pkginfo_test -- **PR** `#31028`_: (*twangboy*) Fix config overwrite by windows installer + * 910f0d9ffc change pkg name to less for suse -- **PR** `#31031`_: (*terminalmage*) More complete fix for `#31014`_ +* **ISSUE** `#31617`_: (`tampakrap`_) service.running fails on sle11 sp3 and sp4 (refs: `#31629`_, `#31793`_) -- **PR** `#31026`_: (*terminalmage*) Fix regression when contents_pillar/contents_grains is a list. +* **PR** `#31793`_: (`xopher-mc`_) fixing init system detection on sles 11, refs `#31617`_ + @ *2016-03-10 18:42:27 UTC* -- **PR** `#30978`_: (*garethgreenaway*) fixes to state.py in 2015.8 + * 1386b72bbf Merge pull request `#31793`_ from xopher-mc/fix_sles_state_service_module -- **PR** `#30893`_: (*bdrung*) Make build reproducible + * d242cb19b4 fixing init system dectection on sles 11, refs `#31617`_ -- **PR** `#30945`_: (*cachedout*) Note that pillar cli args are sent via pub +* **PR** `#31786`_: (`isbm`_) Bugfix: zypper doesn't detect base product on SLE11 series + @ *2016-03-10 18:12:46 UTC* -- **PR** `#31002`_: (*rmtmckenzie*) Fix lxc cloud provided minion reporting present + * 2f28c166dd Merge pull request `#31786`_ from isbm/isbm-zypper-list-products-sles11 -- **PR** `#31007`_: (*jtand*) Fixed rabbitmq_vhost test failure. + * ee1a002673 Update test case to cover SLE11 and SLE12 -- **PR** `#31004`_: (*rallytime*) Remove overstate docs and a few references. + * 4b134fb2ab Add SLE11 product info snapshot, rename previous -- **PR** `#30965`_: (*anlutro*) Fix rabbitmq_vhost.present result when test=True + * 3c5fc857b2 Bugfix: on SLE11 series base product reported as additional -- **PR** `#30955`_: (*Ch3LL*) docs: add clarification when source is not defined +* **ISSUE** `#31776`_: (`gtmanfred`_) ProxyMinion does not close connections (at least with esxi proxy) (refs: `#31780`_) -- **PR** `#30941`_: (*rallytime*) Back-port `#30879`_ to 2015.8 +* **PR** `#31780`_: (`gtmanfred`_) use already created vsphere connection + @ *2016-03-10 17:41:53 UTC* -- **PR** `#30940`_: (*twangboy*) Fix Build Process for OSX + * d6f669623c Merge pull request `#31780`_ from gtmanfred/2015.8 -- **PR** `#30944`_: (*jacobhammons*) 2015.8.5 release notes linking and clean up + * 070eaf07f0 use already created vsphere connection -- **PR** `#30905`_: (*joejulian*) Add realpath to lvm.pvdisplay and use it in vg_present +* **ISSUE** `#31772`_: (`sbreidba`_) win_dacl state causes state.apply output to be YAML, not highstate (refs: `#31779`_) -- **PR** `#30924`_: (*youngnick*) Fix small bug with starting volumes after creation. +* **PR** `#31779`_: (`sbreidba`_) win_dacl state & module: return comment field as strings, not lists. + @ *2016-03-10 17:41:08 UTC* -- **PR** `#30910`_: (*cro*) fix iDRAC state + * a067de3712 Merge pull request `#31779`_ from sbreidba/win-dacl-highstate-output-2015.8 -- **PR** `#30919`_: (*garethgreenaway*) Fixes to ssh_auth state module + * aeb2bfcf46 win_dacl state & module: return comment field as strings, not lists. -- **PR** `#30920`_: (*jacobhammons*) Versioned to 2015.8.5, added known issue `#30300`_ to release notes +* **ISSUE** `#31563`_: (`sjorge`_) regression in 2016.3 from today? (refs: `#31723`_, `#31707`_) -- **PR** `#30894`_: (*terminalmage*) git module/state: Handle identity files more gracefully +* **PR** `#31723`_: (`sjorge`_) file_ignore_regex is a list, not bool + @ *2016-03-09 23:36:10 UTC* -- **PR** `#30750`_: (*jfindlay*) extract whole war version + * **PR** `#31707`_: (`sjorge`_) Fix incorrect default types for master_tops and file_ignore_regex (refs: `#31723`_) -- **PR** `#30884`_: (*rallytime*) Move checks for private_key file existence and permissions to create function + * baeefac252 Merge pull request `#31723`_ from sjorge/2015.8-file_ignore_regex -- **PR** `#30888`_: (*ticosax*) Backport `#30797`_ to 2015.8 + * df1ba94cbb file_ignore_regex is a list, not bool -- **PR** `#30895`_: (*bdrung*) Fix various typos +* **ISSUE** `#27960`_: (`The-Loeki`_) salt-cloud CLI 2015.8 borks out with SaltClientError: 'timeout' (refs: `#31747`_) -- **PR** `#30889`_: (*anlutro*) Make msgpack an optional dependency in salt.utils.cache +* **PR** `#31747`_: (`techhat`_) Use get_local_client with MASTER opts, not MINION + @ *2016-03-09 23:14:58 UTC* -- **PR** `#30896`_: (*vutny*) Update nodegroups parameter examples in master config example and docs + * cd43cf919c Merge pull request `#31747`_ from techhat/issue27960 -- **PR** `#30898`_: (*abednarik*) Fix pkg install with version. + * 44c100d610 Use get_local_client with MASTER opts, not MINION -- **PR** `#30867`_: (*rallytime*) Pass in 'pack' variable to utils.boto.assign_funcs function from ALL boto modules +* **PR** `#31688`_: (`whiteinge`_) Various SMTP returner fixes + @ *2016-03-09 22:40:37 UTC* -- **PR** `#30849`_: (*jfindlay*) utils.aws: use time lib to conver to epoch seconds + * 286ea1f61b Merge pull request `#31688`_ from whiteinge/smtp-renderer -- **PR** `#30874`_: (*terminalmage*) Fix regression in git_pillar when multiple remotes are configured + * 76671b6a81 Check if we have a StringIO and grab the string instead -- **PR** `#30850`_: (*jfindlay*) modules.dpkg._get_pkg_info: allow for ubuntu 12.04 + * 17b8cd755f Add a default for the subject -- **PR** `#30852`_: (*replicant0wnz*) Added more descriptive error message + * 26479bee24 Clean up the SMTP returner docstring and show an actual config example -- **PR** `#30847`_: (*terminalmage*) Backport `#30844`_ to 2015.8 branch + * 74563f17ed Make sure the email subject and body are strings -- **PR** `#30860`_: (*vutny*) Correct installation documentation for RHEL-based distributions + * fc69d08e8e Default to just 'jinja' for the SMTP renderer -- **PR** `#30841`_: (*jacobhammons*) Release notes for 2015.8.5 + * 2af7cd2789 Add missing 'port' to smtp options -- **PR** `#30835`_: (*terminalmage*) Integration test for `#30820`_ +* **PR** `#31752`_: (`rallytime`_) Back-port `#31686`_ to 2015.8 + @ *2016-03-09 21:23:01 UTC* -- **PR** `#30837`_: (*jacobhammons*) Added known issue `#30820`_ to release notes + * **PR** `#31686`_: (`myii`_) Fix typo in example for section `winrepo_dir_ng` (refs: `#31752`_) -- **PR** `#30832`_: (*rallytime*) Add grains modules to salt modindex + * 1d6d982e5c Merge pull request `#31752`_ from rallytime/bp-31686 -- **PR** `#30822`_: (*rallytime*) Make sure setting list_user_permissions to ['', '', ''] doesn't stacktrace + * e4df5d9a55 Fix typo in example for section `winrepo_dir_ng` -- **PR** `#30833`_: (*terminalmage*) Fix regression in scanning for state with 'name' param +* **PR** `#31733`_: (`jacobhammons`_) docs to clarify cloud configuration + @ *2016-03-09 20:54:10 UTC* -- **PR** `#30823`_: (*yannis666*) Fix for mine to merge configuration on update. + * ec90294442 Merge pull request `#31733`_ from jacobhammons/cloud-docs -- **PR** `#30827`_: (*jacobhammons*) Version to 2015.8.4, added CVE 2016-1866 to release notes + * 209c641a41 Made udpates as suggested by @rallytime -- **PR** `#30813`_: (*anlutro*) Properly set the default value for pillar_merge_lists + * 26d4991cb3 moved previous intro to new quick start topic (topics/cloud/qs.rst) added new intro that explains the salt cloud configuration files added an inheritance and minion startup state example to topics/cloud/config.rst -- **PR** `#30826`_: (*cachedout*) Fix 30682 +* **ISSUE** `#26498`_: (`rallytime`_) [salt-cloud] Able to create multiple VMs with the same name across providers (refs: `#31754`_, `#31775`_) -- **PR** `#30818`_: (*rallytime*) Back-port `#30790`_ to 2015.8 +* **PR** `#31775`_: (`techhat`_) Show correct provider/driver name + @ *2016-03-09 20:53:10 UTC* -- **PR** `#30815`_: (*vutny*) Pick right user argument for updating reactor function's low data + * 92ba7f3495 Merge pull request `#31775`_ from techhat/correctmsg -- **PR** `#30747`_: (*jfindlay*) modules.lxc.running_systemd: use `command -v` not `which` + * c1433650b4 Show correct provider/driver name -- **PR** `#30800`_: (*twangboy*) Ability to handle special case installations +* **ISSUE** `#26498`_: (`rallytime`_) [salt-cloud] Able to create multiple VMs with the same name across providers (refs: `#31754`_, `#31775`_) -- **PR** `#30794`_: (*rallytime*) A spelling fix and some spacing fixes for the boto_ec2 module docs +* **PR** `#31754`_: (`techhat`_) Check all providers, not just the current one + @ *2016-03-09 18:38:19 UTC* -- **PR** `#30756`_: (*basepi*) [2015.8] Fix two error conditions in the highstate outputter + * 249a3602eb Merge pull request `#31754`_ from techhat/issue26498 -- **PR** `#30788`_: (*rallytime*) Fix incorrect doc example for dellchassis blade_idrac state + * 08c61446b7 Check all providers, not just the current one -- **PR** `#30791`_: (*Ch3LL*) do not shadow ret function argument for salt.function +* **ISSUE** `#31639`_: (`mshirley`_) salt-cloud digital ocean api v2 doesn't implement all available actions (refs: `#31735`_) -- **PR** `#30726`_: (*sjmh*) Fix improper use of yield in generator +* **PR** `#31735`_: (`rallytime`_) Add reboot, start, and stop actions to digital ocean driver + @ *2016-03-09 17:57:58 UTC* -- **PR** `#30752`_: (*terminalmage*) Backport systemd and yum/dnf optimizations from develop into 2015.8 + * 7ad521f7a5 Merge pull request `#31735`_ from rallytime/fix-31639 -- **PR** `#30759`_: (*thusoy*) Allow managing empty files + * 67d1aa6740 Remove experimental/incomplete function -- **PR** `#30758`_: (*thusoy*) Support mounting labelled volumes with multiple drives + * b209623ca9 Add reboot, start, and stop actions to digital ocean driver -- **PR** `#30686`_: (*cachedout*) Master-side pillar caching +* **ISSUE** `#30489`_: (`chris-martin`_) influxdb_user.present fails: "InfluxDBClient' object has no attribute 'get_list_cluster_admins" (refs: `#31787`_, `#31770`_) -- **PR** `#30675`_: (*jfindlay*) handle non-ascii minion IDs +* **PR** `#31770`_: (`anlutro`_) Fix influxdb user functionality for version 0.9+ + @ *2016-03-09 17:09:26 UTC* -- **PR** `#30691`_: (*rallytime*) Make sure we use the "instance" kwarg in cloud.action. + * fd3610c6a4 Merge pull request `#31770`_ from alprs/fix-influxdb_user -- **PR** `#30713`_: (*rallytime*) Fix-up autodoc proxy modules for consistency + * 1349bdd2e8 fix influxdb user functionality for version 0.9+ -- **PR** `#30741`_: (*jfindlay*) states.locale.__virtual__: return exec mod load err +* **PR** `#31743`_: (`Talkless`_) Fix parentheses missmatch in documentation + @ *2016-03-08 18:01:23 UTC* -- **PR** `#30751`_: (*basepi*) [2015.8] Merge forward from 2015.5 to 2015.8 + * c0868307df Merge pull request `#31743`_ from Talkless/patch-1 -- **PR** `#30720`_: (*clinta*) x509.pem_managed does not return changes dict + * 26ff46dbc6 Fix parenthesis missmatch in documentation -- **PR** `#30687`_: (*clarkperkins*) Setting 'del_root_vol_on_destroy' changes the root volume type to 'standard' +* **PR** `#31162`_: (`isbm`_) Remove MD5 digest from everywhere and default to SHA256 + @ *2016-03-07 19:11:36 UTC* -- **PR** `#30673`_: (*terminalmage*) Properly derive the git_pillar cachedir from the id instead of the URL + * 826fea6582 Merge pull request `#31162`_ from isbm/isbm-md5-to-sha1 -- **PR** `#30666`_: (*cachedout*) Fix grains cache + * 9d64abed0c Fix PyLint -- **PR** `#30623`_: (*twangboy*) Added service.config function + * 327ea11139 Add daemons unit test to verify hash_type settings -- **PR** `#30678`_: (*rallytime*) Back-port `#30668`_ to 2015.8 + * f3aecc0b22 Standardize logging -- **PR** `#30677`_: (*clarkperkins*) Fix EC2 volume creation logic + * 51f556243d Verify if hash_type is using vulnerable algorithms -- **PR** `#30680`_: (*cro*) Merge forward from 2015.5, primarily for `#30671`_ + * 95ec634f00 Report environment failure, if any -- **PR** `#30663`_: (*isbm*) Zypper: latest version bugfix and epoch support feature + * 63eedefe54 Use mixin for the daemon classes -- **PR** `#30652`_: (*mew1033*) Fix sh beacon + * 82dd383630 Create a mixin class that will be reused in the similar instances (daemons) -- **PR** `#30657`_: (*jfindlay*) [2015.8] Backport `#30378`_ and `#29650`_ + * 36da8f5efa Use MD5 hash algorithm by default (until deprecated) -- **PR** `#30656`_: (*rallytime*) [2015.8] Merge 2015.5 into 2015.8 + * 584325797c Remove SHA1 in favor of SHA256 -- **PR** `#30644`_: (*tbaker57*) Another go at fixing 30573 + * 373493c13f Remove SHA1 for SHA256 -- **PR** `#30611`_: (*isbm*) Bugfix: Zypper `pkg.latest` crash fix + * d5cb4dd424 Remove sha1 to sha265 -- **PR** `#30631`_: (*rallytime*) Refactor rabbitmq_cluster states to use test=true functionality correctly + * 73b8d35e01 Add note to the Tomcat module for SHA256 -- **PR** `#30628`_: (*rallytime*) Refactor rabbitmq_policy states to use test=true functionality correctly + * efb78f1055 Remove SHA1 to SHA265 by default -- **PR** `#30624`_: (*cro*) Remove bad symlinks from osx pkg dir + * 6198976edb Use SHA1 by default instead of MD5 -- **PR** `#30622`_: (*rallytime*) Add glance state to list of state modules + * 73f2df76ce Use SHA1 hash by default in Tomcat module, refactor for support different algorithms -- **PR** `#30618`_: (*rallytime*) Back-port `#30591`_ to 2015.8 + * 0d4e4e31f8 Use SHA1 hash by default -- **PR** `#30625`_: (*jfindlay*) doc.topics.eauth: clarify client_acl vs eauth + * 785717703b Use configurable hash_type for general Key fingerprinting + * f0d931f4d0 Use hash_type configuration for the Cloud + + * 95cb59dec7 Set defalt hash as SHA1 in config and explain why. + + * 8f9543c292 Set config hash_type to SHA1 + + * 413eca124d Set default checksum for key fingerprint to SHA1 + +* **ISSUE** `#30528`_: (`UtahDave`_) Missing Minion notifications missing from job cache (refs: `#31670`_) + +* **PR** `#31670`_: (`terminalmage`_) Write lists of minions targeted by syndic masters to job cache + @ *2016-03-07 18:51:53 UTC* + + * a1f32b71bd Merge pull request `#31670`_ from terminalmage/issue30528 + + * 65e5a3c53e Pass syndic_id to save_minions() + + * cf94c2597a Add argument to save_minions() to pass a syndic ID + + * cb92114377 Add syndic_id param for API compatibility + + * 1d39eec69b Skip events with minion lists but no jid + + * 651e3926f7 lint fixes + + * 0f175a4edf salt.returners.sqlite3_return: add no-op save_minions() func for API compatibility + + * f8664103b1 salt.returners.redis_return: add no-op save_minions() func for API compatibility + + * 0ea1b76c22 salt.returners.postgres_local_cache: add no-op save_minions() func for API compatibility + + * d6d794b484 salt.returners.postgres: add no-op save_minions() func for API compatibility + + * 82750ab699 salt.returners.pgjsonb: add no-op save_minions() func for API compatibility + + * d8f90f6578 salt.returners.odbc: add no-op save_minions() func for API compatibility + + * a1957c3706 salt.returners.mysql: add no-op save_minions() func for API compatibility + + * ef6aa5de1c salt.returners.multi_returner: add no-op save_minions() func for API compatibility + + * 5b4eb58d99 salt.returners.mongo_return: add no-op save_minions() func for API compatibility + + * da1acbb8f2 salt.returners.mongo_future_return: add no-op save_minions() func for API compatibility + + * c13bb6549c salt.returners.memcache_return: add no-op save_minions() func for API compatibility + + * 4322ad9ef3 salt.returners.influxdb_return: add no-op save_minions() func for API compatibility + + * 1dd106183c salt.returners.etcd_return: add no-op save_minions() func for API compatibility + + * 8e80535516 salt.returners.couchdb_return: add no-op save_minions() func for API compatibility + + * 44538dfced salt.returners.cassandra_cql_return: add no-op save_minions() func for API compatibility + + * 084a78407a salt.returners.couchbase_return: move minion list updates to new save_minions() func + + * f731dc5d32 Update a job's minion list to include minion lists forwarded by syndic + + * 504f7df460 Add utils function to invoke a returner's save_minions() func + + * 0b4616a3eb Separate writing of serialized minion list into its own function + + * 214fedc3f6 Simplify jobs.get_jobs logic, generally improve jobs runner docs + + * 3f527be748 Add an exception class for errors encountered while locking files. + + * 1e6b43eef8 Add a contextmanager for file locking + + * 978b6cb32f Add missing RST file for slsutil module + + * 2ad8ceffc2 Add salt.utils.split_input() + +* **ISSUE** `#31595`_: (`dverbeek84`_) dockerng ports specified in Dockerfile must be in sls file otherwise salt gives an error (refs: `#31711`_) + +* **PR** `#31711`_: (`ticosax`_) [dockerng] Port and Volume comparison should consider Dockerfile + @ *2016-03-07 18:25:19 UTC* + + * 24568b1a5d Merge pull request `#31711`_ from ticosax/fix-port-and-volume-discovery + + * cf38691597 Port and Volume comparison should consider Dockerfile + +* **ISSUE** `#31579`_: (`bradthurber`_) salt-cloud delete with a map file fails when multiple providers defined (refs: `#31719`_) + +* **PR** `#31719`_: (`techhat`_) Don't worry about KeyErrors if the node is already removed + @ *2016-03-07 18:16:40 UTC* + + * b936e09fb3 Merge pull request `#31719`_ from techhat/issue31579 + + * 88905095c9 Don't worry about KeyErrors if the node is already removed + +* **PR** `#31713`_: (`ticosax`_) [dockerng] Fix dockerng.network_present when container is given by name + @ *2016-03-07 15:14:41 UTC* + + * 604eb87e82 Merge pull request `#31713`_ from ticosax/fix-dockerng-networking-container_id + + * 3837cf44ca Fix network_present by dealing with containers ID's instead of names. + +* **ISSUE** `#31704`_: (`peripatetic-sojourner`_) Foreman external pillar doesn't load (refs: `#31705`_) + +* **PR** `#31705`_: (`peripatetic-sojourner`_) Foreman pillar + @ *2016-03-07 14:24:58 UTC* + + * 8f28e4510d Merge pull request `#31705`_ from peripatetic-sojourner/foreman_pillar + + * ba33d75949 passing lint test + + * 63e39a8999 refactored parameter population for foreman pillar + + * c3325bc15d add return of virtualname + +* **PR** `#31702`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-03-06 19:24:47 UTC* + + * aa5c13f0b8 Merge pull request `#31702`_ from rallytime/merge-2015.8 + + * 6559ea15b0 Merge branch '2015.5' into '2015.8' + + * d7914cdb14 Merge pull request `#31687`_ from cachedout/rm_gpg_test + + * 8b00513ebb Removed useless tests + + * bd4d12a155 Merge pull request `#31660`_ from terminalmage/issue31619 + + * da954d7b92 Add integration test for packages with epoch in version + + * 4fa7e4defe Move epoch removal + + * 290192af56 Remove epoch from version string if present when installing with yum + + * e33c1f456a Merge pull request `#31683`_ from rallytime/bp-31578 + + * 8fe46789b7 allow queueing of state runs through saltmod + + * 27f443895d Merge pull request `#31682`_ from cachedout/cache_meaning + + * a75e146125 Add definition of job cache to glossary + + * bd04c964d1 Merge pull request `#31658`_ from rallytime/add-style-to-contrib + + * 6b526b5878 Add mentioned of Salt's Coding Style docs to the Contributing docs + + * 10658dffe6 Merge pull request `#31655`_ from rallytime/pylint-docs + + * 6e0377d376 Make note of pylint dependencies in docs + + * 6075774a01 Merge pull request `#31440`_ from cachedout/master_tops_type + + * f49cc75049 Set correct type for master_tops config value + +* **PR** `#31700`_: (`s0undt3ch`_) It's a function! + @ *2016-03-06 17:33:58 UTC* + + * ace290629e Merge pull request `#31700`_ from s0undt3ch/2015.8 + + * 1ca2beea3e It's a function! + +* **PR** `#31679`_: (`cro`_) Fix bad link to the sample REST endpoint in salt-contrib. + @ *2016-03-04 21:05:50 UTC* + + * cf438aa873 Merge pull request `#31679`_ from cro/proxy_contrib_doc_fix + + * d638971b73 Correct url to salt-contrib + +* **ISSUE** `#21932`_: (`clinta`_) Salt Coding Style docs should list requirements for salt pylintrc (refs: `#31655`_) + +* **PR** `#31668`_: (`rallytime`_) Some more testing documentation improvements + @ *2016-03-04 20:48:57 UTC* + + * **PR** `#31658`_: (`rallytime`_) Add mentioned of Salt's Coding Style docs to the Contributing docs (refs: `#31668`_) + + * **PR** `#31655`_: (`rallytime`_) Make note of pylint dependencies in docs (refs: `#31668`_) + + * **PR** `#31641`_: (`rallytime`_) Improve Salt Testing tutorial to be a more comprehensive intro (refs: `#31668`_) + + * 97127a8b83 Merge pull request `#31668`_ from rallytime/testing-docs + + * beb9d0fe84 Ensure all integration test classes and funcs are documented w/examples + + * 7f8ebf7c97 Found another spelling error + + * c8c188535f Spelling fix + + * f260c51762 Some more testing documentation improvements + +* **ISSUE** `#29753`_: (`jakehilton`_) New minion fails to authenticate properly to multi-master setup (refs: `#31653`_) + +* **PR** `#31653`_: (`DmitryKuzmenko`_) Don't attempt to verify token if it wasn't sent to master. + @ *2016-03-03 17:39:35 UTC* + + * 2ed7286af1 Merge pull request `#31653`_ from DSRCompany/issues/29753_multimaster_auth_fail + + * 2557707cc7 Don't attempt to verify token if it wasn't sent to master. + +* **ISSUE** `#31617`_: (`tampakrap`_) service.running fails on sle11 sp3 and sp4 (refs: `#31629`_, `#31793`_) + +* **PR** `#31629`_: (`darix`_) Fix services on sles + @ *2016-03-03 16:41:27 UTC* + + * 118fcde425 Merge pull request `#31629`_ from darix/fix-services-on-sles + + * 9b8d6cbb72 make the suse check consistent with rh_service.py + + * c0c8a77242 Fix numerical check of osrelease + +* **PR** `#31641`_: (`rallytime`_) Improve Salt Testing tutorial to be a more comprehensive intro (refs: `#31668`_) + @ *2016-03-03 16:08:47 UTC* + + * 4d1701de60 Merge pull request `#31641`_ from rallytime/testing-tutorial + + * 6ab3961748 Improve Salt Testing tutorial to be a more comprehensive intro + +* **ISSUE** `#30651`_: (`sjorge`_) salt.states.grains.list_present should not show changes if none are made! (refs: `#31651`_, `#30689`_) + +* **PR** `#31651`_: (`dr4Ke`_) test case: test_list_present_nested_already + @ *2016-03-03 16:02:55 UTC* + + * **PR** `#30689`_: (`sjorge`_) fix for `#30651`_ grains.list_present and grains.list_absent (refs: `#31651`_, `#31271`_) + + * 584f8401b8 Merge pull request `#31651`_ from dr4Ke/test_case_for_30689 + + * fc9dd356e8 test case: test_list_present_nested_already + +* **PR** `#31643`_: (`opdude`_) Make sure we are really updating the mercurial repository + @ *2016-03-03 14:30:53 UTC* + + * 5566f1f2a7 Merge pull request `#31643`_ from Unity-Technologies/hotfix/hg-fix-repo-updated + + * ca41c4b8c1 Make sure we are really updating the mercurial repository + +* **ISSUE** `#30761`_: (`sjmh`_) Cannot target subsets of minions when using pillar and external_auth (refs: `#31598`_) + +* **PR** `#31598`_: (`terminalmage`_) Remove limitations on validation types for eauth targets + @ *2016-03-02 22:14:41 UTC* + + * 36c790eede Merge pull request `#31598`_ from terminalmage/issue30761 + + * 5dedaa2d9d Remove limitations on validation types for eauth targets + +* **PR** `#31627`_: (`jakehilton`_) Handling error from using gevent 1.1. + @ *2016-03-02 22:01:22 UTC* + + * cc4c31cf7f Merge pull request `#31627`_ from jakehilton/2015.8 + + * 02fb5ed616 Handling error from using gevent 1.1. + +* **PR** `#31630`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-03-02 20:49:52 UTC* + + * 191241e71a Merge pull request `#31630`_ from rallytime/merge-2015.8 + + * 75bb692990 Merge branch '2015.5' into '2015.8' + + * 6d31b8918f Merge pull request `#31622`_ from jfindlay/query_doc + + * 4e48fec806 doc/topics/tutorials/http: update query decoding docs + + * dbf6e0786c Merge pull request `#31558`_ from cachedout/ensure_ssh_installed + + * cecc6e0a5f Don't stacktrace if ssh binary is not installed with salt-ssh + +* **PR** `#31594`_: (`rallytime`_) Back-port `#31589`_ to 2015.8 + @ *2016-03-02 16:33:24 UTC* + + * **PR** `#31589`_: (`techhat`_) Ensure that the latest node data is returned (refs: `#31594`_) + + * 38ddd62aef Merge pull request `#31594`_ from rallytime/bp-31589 + + * 6cd89459c7 Ensure that the latest node data is returned + +* **ISSUE** `#31596`_: (`joejulian`_) gluster --xml does not always produce xml with legacy versions (refs: `#31604`_) + +* **PR** `#31604`_: (`joejulian`_) Workaround for non-xml output from gluster cli when not tty + @ *2016-03-02 15:53:44 UTC* + + * 86a0fc46b4 Merge pull request `#31604`_ from joejulian/2015.8_31596_workaround_no_xml_when_not_tty + + * c567a823a9 Workaround for non-xml output from gluster cli when not tty + +* **PR** `#31583`_: (`vutny`_) Remove trailing white spaces + @ *2016-03-02 15:38:01 UTC* + + * 36ce240596 Merge pull request `#31583`_ from vutny/remove-trailing-white-spaces + + * bbcad93a8d Fix trailing white spaces in Salt PRM spec file + + * 86433f2378 Revert changes in files used by `roots_test.py` integration test + + * e7a8dbf498 Remove trailing white spaces in tests files + + * 776b2ea9a6 Remove trailing white spaces in files under `salt/` dir + + * fbfc3abccf Remove trailing white spaces in files under `pkg/` dir + + * aebc48163d Remove trailing white spaces in documentation files + + * 7eaf778695 Remove trailing white spaces in conf dir file + +* **PR** `#31592`_: (`rallytime`_) Back-port `#31546`_ to 2015.8 + @ *2016-03-01 23:51:02 UTC* + + * **PR** `#31546`_: (`terminalmage`_) Rework of PR `#31529`_ (refs: `#31592`_) + + * **PR** `#31529`_: (`llua`_) nspawn.py: Fix bad keyword assignment (refs: `#31546`_) + + * c9fe8d87f3 Merge pull request `#31592`_ from rallytime/bp-31546 + + * 9a296bd1bf Use clean_kwargs and invalid_kwargs utils funcs to handle invalid kwargs + + * 43099a2b63 nspawn.py: Fix bad keyword assignment + +* **ISSUE** `#30866`_: (`kevinquinnyo`_) WheelClient cmd returns None but wheel functions called directly work (refs: `#31570`_) + +* **ISSUE** `#26415`_: (`CaesarC`_) salt.wheel.WheelClient doesn't work follow the python api(AttributeError: 'NoneType' object has no attribute 'get') (refs: `#28087`_) + +* **PR** `#31593`_: (`rallytime`_) Back-port `#31570`_ to 2015.8 + @ *2016-03-01 23:50:05 UTC* + + * **PR** `#31570`_: (`cro`_) Need to return the value (refs: `#31593`_) + + * **PR** `#28087`_: (`DmitryKuzmenko`_) Revert "Update __init__.py" (refs: `#31570`_) + + * c8dbc93ac6 Merge pull request `#31593`_ from rallytime/bp-31570 + + * b2294d0a28 Need to return the value + +* **ISSUE** `#28585`_: (`robthralls`_) FIPS compliance (2015.8.1-1) (refs: `#31567`_) + +* **PR** `#31567`_: (`cachedout`_) Restore FIPS compliance when using master_finger + @ *2016-03-01 19:50:03 UTC* + + * 068807558a Merge pull request `#31567`_ from cachedout/issue_28585 + + * 7006a1eecf Fix failed unit test + + * 10cd328dda Lint + + * 174337d020 Restore FIPS compliance when using master_finger + +* **PR** `#31568`_: (`twangboy`_) Grant permissions using SID instead of name + @ *2016-03-01 04:22:53 UTC* + + * 77d9aae8bb Merge pull request `#31568`_ from twangboy/fix_perms + + * 1f6a95694d Grant permissions using SID instead of name + +* **ISSUE** `#31516`_: (`justinta`_) beacons.enable_beacon does not write to beacons.conf on some OS's (refs: `#31561`_) + +* **PR** `#31561`_: (`justinta`_) Skipped test + @ *2016-03-01 04:11:22 UTC* + + * ada5ab344d Merge pull request `#31561`_ from jtand/beacons_test_fix + + * 196dd4db99 Skipped test + +* **ISSUE** `#31041`_: (`fredrikaverpil`_) Reading about win_service in 2015.8.5 docs, but it's not available in 2015.8.5 (refs: `#31550`_, `#31049`_) + +* **PR** `#31550`_: (`rallytime`_) Correct versionadded tag for win_service.config + @ *2016-02-29 21:11:24 UTC* + + * **PR** `#31049`_: (`twangboy`_) Fix versionadded in win_service.config (refs: `#31550`_) + + * 658c1865ab Merge pull request `#31550`_ from rallytime/win_service-docs + + * 51aa26334c Correct versionadded tag for win_service.config + +* **PR** `#31549`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-02-29 18:46:35 UTC* + + * 9bb9a54f8d Merge pull request `#31549`_ from rallytime/merge-2015.8 + + * b683df9b82 Pylint fix + + * 24505d2dcf Merge branch '2015.5' into '2015.8' + + * 060a60fd90 Merge pull request `#31521`_ from terminalmage/issue24753 + + * 0d352bbc16 Add fileclient tests + + * d9370a8041 Update cp module salt-ssh wrapper to use new cachedir param + + * 0320494b1d Update the SSH state module wrappers to pass an alternate cachedir + + * 65bdcb3afa Accept and pass through the alternate cachedir when prepping the thin tar + + * c3f7a2f2e5 Add ability to specify an alternate base dir for file caching + + * 92f8f89218 Merge pull request `#31497`_ from rallytime/remove-timeout-dup + + * 83e6480d20 Remove duplicate "timeout" definition in Roster docs + + * da001bcb49 Merge pull request `#31472`_ from rallytime/update-contributing-docs + + * 5871e4d1e0 Update contributing docs + + * f35e2dd1d3 Merge pull request `#31461`_ from DSRCompany/issues/30183_fix_multimaster_failover_2015.5 + + * 3d09c3b7a3 Set auth retry count to 0 if multimaster mode is failover. + +* **ISSUE** `#29701`_: (`tonyyang132`_) Running salt-call on salt master would crash the master node with code level 2015.8.3 (refs: `#31544`_) + +* **ISSUE** `#27063`_: (`lorengordon`_) 2015.8.0: Error writing to `/var/log/salt/minion`? (refs: `#31544`_) + +* **PR** `#31544`_: (`DmitryKuzmenko`_) Protect getattr from recursion + @ *2016-02-29 17:48:15 UTC* + + * 5a6aff1791 Merge pull request `#31544`_ from DSRCompany/issues/29701_getattr_recursion_protection + + * b7a45b8fae Protect getattr from recursion + +* **ISSUE** `#30643`_: (`Ch3LL`_) multi-master failover stack trace when minion fails over to other master (refs: `#31512`_, `#31525`_) + +* **ISSUE** `#30181`_: (`jakehilton`_) Minion failover only works once (refs: `#31512`_) + +* **ISSUE** `#29567`_: (`freebsdly`_) multi master failover successful but execute command ‘salt * test.ping’ on second master return ‘Minion did not return. [No response]’ (refs: `#31512`_) + +* **PR** `#31525`_: (`DmitryKuzmenko`_) Issues/30643 merge forward fixes + @ *2016-02-29 16:08:47 UTC* + + * **PR** `#31512`_: (`DmitryKuzmenko`_) Don't fork in try with critical finally logic. (refs: `#31525`_) + + * **PR** `#30796`_: (`skizunov`_) Fix minion failover after disconnect (refs: `#31512`_, `#31525`_) + + * d5a4daa17b Merge pull request `#31525`_ from DSRCompany/issues/30643_merge_forward_fixes + + * a50b33d96a Don't fork in try with critical finally logic. + + * 877bc25381 Fix minion failover after disconnect + +* **ISSUE** `#24955`_: (`damonnk`_) Minion fails to start after bootstrap on Raspberry PI (refs: `#31536`_) + +* **PR** `#31536`_: (`virtualguy`_) Remove debian repo from raspbian installation + @ *2016-02-29 15:32:52 UTC* + + * 95af21325f Merge pull request `#31536`_ from virtrnd/remove-jessie-backports-from-raspbian-install + + * e48900ac55 Use python-tornado from jessie-backports for pure debian + + * 6e338e2601 Remove debian repo from raspbian installation + +* **ISSUE** `#31193`_: (`gwaters`_) RHEL7 gpg key problem (refs: `#31528`_) + +* **PR** `#31528`_: (`vutny`_) Correct Salt Cloud documentation about updating Salt Bootstrap script + @ *2016-02-29 15:30:59 UTC* + + * 5965319600 Merge pull request `#31528`_ from vutny/cloud-bootstrap-doc + + * f7beeb69f2 Correct Salt Cloud documentation about updating Salt Bootstrap script + +* **ISSUE** `#31365`_: (`cwicklein`_) osrelease_info broken for CentOS 7 (refs: `#31539`_) + +* **PR** `#31539`_: (`DmitryKuzmenko`_) Added temporary workaround for CentOS 7 os-release id bug. + @ *2016-02-29 15:30:34 UTC* + + * 96c0926298 Merge pull request `#31539`_ from DSRCompany/issues/31365_centos7_osrelease_fix + + * a3b806d126 Added temporary workaround for CentOS 7 os-release id bug. + +* **PR** `#31508`_: (`mcalmer`_) Zypper correct exit code checking + @ *2016-02-26 15:21:23 UTC* + + * 95db870325 Merge pull request `#31508`_ from mcalmer/zypper-correct-exit-code-checking + + * 66e8f6aa37 restructure the code a bit + + * f5c125de19 remove new lines between zypper command and check result + + * 1425c6496c use specialized assert functions for tests + + * f266cfdaac test _zypper_check_result() + + * aff6467782 adapt tests to new zypper_check_result() output + + * edad780cdf use _zypper_check_result() + + * 7c5d5a2b7a add _zypper_check_result() to raise and error or return stdout + + * a6785ef7a9 check zypper exit code everywhere + + * 935b0510c9 add function to check zypper exit codes + +* **ISSUE** `saltstack/salt-bootstrap#695`_: (`mtippett`_) Install Failures With Raspbian Jessie (refs: `#31510`_, `#31477`_, `#31458`_) + +* **PR** `#31510`_: (`vutny`_) Add installation guide for Raspbian (Debian on Raspberry Pi) + @ *2016-02-26 15:06:57 UTC* + + * e51126179c Merge pull request `#31510`_ from vutny/debian-raspbian-install-guide + + * 50f3e072b1 Add instruction how to install salt-minion on Debian Jessie from Stretch + + * abcd505178 Update Debian installation guide with information about Raspbian + +* **PR** `#31498`_: (`Ch3LL`_) rename methods in pkg states test + @ *2016-02-25 23:29:51 UTC* + + * 9d458bb420 Merge pull request `#31498`_ from Ch3LL/rename_test + + * 29a53f4353 rename methods in pkg states test + +* **ISSUE** `#31427`_: (`githubcdr`_) salt.states.grains.list_present adds duplicates names (refs: `#31471`_) + +* **PR** `#31471`_: (`cachedout`_) Correct issue where duplicate items in grains list during state run will result in duplicate grains + @ *2016-02-25 20:15:20 UTC* + + * 625da0d261 Merge pull request `#31471`_ from cachedout/issue_31427 + + * 74c3053c91 Remove debugging + + * 30eb5fccf7 Additional tests, but disable the test for distinct lists, because of a problem with context in test suite + + * 3d2aec05e5 Check for duplicate grains during list insertion + +* **ISSUE** `#29727`_: (`oeuftete`_) dockerng.running does not pull image as documented (refs: `#31352`_, `#31455`_) + +* **PR** `#31455`_: (`ticosax`_) [dockerng] Disable notset check + @ *2016-02-25 19:15:09 UTC* + + * e85ae2341a Merge pull request `#31455`_ from ticosax/diable-NOTSET-check + + * e072937243 dockerd returns sometimes `None` or `[]` for ports. + + * 5630401889 _api_mismatch was a good idea + +* **PR** `#31488`_: (`isbm`_) Unit Test for Zypper's "remove" and "purge" + @ *2016-02-25 17:52:33 UTC* + + * e68a0947b7 Merge pull request `#31488`_ from isbm/isbm-zypper-ut-removepurge + + * d30f2e4627 Implement unit test for remove and purge + + * 4caf201052 Refactor code (a bit) + + * df89da4d15 Fix the docstring + +* **PR** `#31485`_: (`jacobhammons`_) Fixed transport description in minion / master config + @ *2016-02-25 17:04:15 UTC* + + * cd87760c87 Merge pull request `#31485`_ from jacobhammons/2015.8 + + * 748acab8b5 Fixed zeromq casing in transport settings + + * 765a226907 Fixed transport description in minion / master config + +* **PR** `#31411`_: (`justinta`_) Added some beacons execution module integration tests + @ *2016-02-25 16:16:26 UTC* + + * fb1ef92e2b Merge pull request `#31411`_ from jtand/beacons_tests + + * 7d32b56015 Added some more checks to verify beacon changes were actually happening + + * 2da5285c03 Added codeauthor + + * fd1e2838ea Lint + + * 421a112914 Added config_dir to test minion config + + * bf6a4c0983 Fixed lint error + + * 3566fbbcca More updates to beacons test + + * 37c4bf22d2 Updated beacons integration test + + * 6db628be1a Basic integration tests for beacons execution module + + * 3b238c2e68 Started adding beacons execution module tests + +* **ISSUE** `#31216`_: (`oliver-dungey`_) pkg.installed documentation not consistent with implementation (refs: `#31475`_) + +* **ISSUE** `#30464`_: (`sjmh`_) pillar_env minion config option needs to be documented (refs: `#31475`_) + +* **ISSUE** `#30261`_: (`MadsRC`_) Add ability to define custom beacons (refs: `#31475`_) + +* **ISSUE** `#29636`_: (`ronnix`_) Documentation for the refresh_password arg in postgres_user.present is confusing (refs: `#31475`_) + +* **ISSUE** `#29528`_: (`apergos`_) nitpick for "Using Salt at scale" tutorial (refs: `#31475`_) + +* **ISSUE** `#29520`_: (`arthurlogilab`_) [doc] transport option not in default master configuration nor in the example file of the documentation (refs: `#31475`_) + +* **ISSUE** `#10330`_: (`jhenry82`_) exclude keyword not working (refs: `#31475`_) + +* **PR** `#31475`_: (`jacobhammons`_) Assorted doc issues + @ *2016-02-25 16:03:54 UTC* + + * 2e9a705e75 Merge pull request `#31475`_ from jacobhammons/2015.8 + + * a72dc15720 Assorted doc issues Fixes `#10330`_ Fixes `#31216`_ Fixes `#30464`_ Fixes `#29520`_ Fixes `#30261`_ Fixes `#29636`_ Fixes `#29528`_ + +* **ISSUE** `saltstack/salt-bootstrap#695`_: (`mtippett`_) Install Failures With Raspbian Jessie (refs: `#31510`_, `#31477`_, `#31458`_) + +* **PR** `#31477`_: (`vutny`_) Correct installation documentation for Ubuntu + @ *2016-02-25 16:01:38 UTC* + + * 3905dd81d3 Merge pull request `#31477`_ from vutny/correct-doc-install-ubuntu + + * 172f34a6ca Correct headers in Debian/Ubuntu/SUSE install instructions + + * 4248f9ea0a Add common packages installation section to Debian install guide + + * 8c6e179870 Add note about `amd64` packages to Ubuntu install guide + + * afaa24723a Update Ubuntu install guide: + +* **PR** `#31479`_: (`isbm`_) Zypper unit tests & fixes + @ *2016-02-25 15:58:15 UTC* + + * f027dc0cf8 Merge pull request `#31479`_ from isbm/isbm-zypper-unittest + + * 9f64333ccb Do not use Zypper purge (reason: too dangerous) + + * bc05acf7c3 Fix PyLint + + * c0eab8b549 Add space before "assert" keyword + + * 6bcb89a8f6 Implement list packages test + + * 78837d2926 Add mocking data + + * 0b64b8137f Implement test for version compare, where python fall-back algorithm is called + + * 18b30a3274 Implement test for version compare, where RPM algorithm is called + + * 59eca53441 Adjust test case for the third package in the test static data + + * 8034cf0b91 Add third test package static info + + * 90f209569a Implement test for the upgrade_available + + * ad87e719d6 Bugfix: when only one package, no dict is returned. Still upgrade_available should return boolean. + + * 7eb5f19cb4 Implement test for latest_available + + * e372c0b596 Implement test for the info_available + + * 447771c0fc Add Zypper static data for the available packages + + * 6989871d27 Implement test for info_installed + + * 0cc6bce4aa Use strings instead of unicode strings + + * 3342c03987 Implement list upgrades test + + * 8862d7af65 Add list upgrades Zypper static data + + * 4d38d318f4 Implement error handling test for listing upgrades + + * 080b4ee617 Do not strip the output + + * 53338402a5 Use renamed zypper products data file + + * c6135975b0 Rename Zypper products static test data file + + * ab3ff53d89 Reimplement list_upgrades to use XML output from Zypper instead + + * e87864986d Add Zypper unit test: test_list_products and test_refresh_db + + * cd6419fc9c Add Zypper Unit Test installed products sample data + +* **ISSUE** `#31370`_: (`Ch3LL`_) pkg.info_installed on ubuntu12 does not output info and stack trace (refs: `#31439`_) + +* **ISSUE** `#31366`_: (`Ch3LL`_) pkg.info_installed on centos5 does not output info (refs: `#31445`_) + +* **PR** `#31445`_: (`rallytime`_) Only use LONGSIZE in rpm.info if available. Otherwise, use SIZE. + @ *2016-02-24 18:35:31 UTC* + + * **PR** `#31439`_: (`rallytime`_) Fix lowpkg.info function for Ubuntu 12 - make sure we have a pkg name (refs: `#31445`_) + + * 987dd89979 Merge pull request `#31445`_ from rallytime/fix-31366 + + * 42415a4a7b Make rpm_tags query more concise + + * 9965fe188a Added to pkg.info_installed test for RedHat and Suse systems + + * 47cc7c3466 Add error check when retcode is 0, but stderr is present + + * 294371243d Only use LONGSIZE in rpm.info if available. Otherwise, use SIZE. + +* **PR** `#31464`_: (`Ch3LL`_) integartion test: ensure decorator only runs on one method and not class + @ *2016-02-24 18:35:00 UTC* + + * 979c8b4faa Merge pull request `#31464`_ from Ch3LL/fix_int_test + + * a387d175d8 integartion test- ensure decorator only runs on one method and not entire class + +* **ISSUE** `saltstack/salt-bootstrap#695`_: (`mtippett`_) Install Failures With Raspbian Jessie (refs: `#31510`_, `#31477`_, `#31458`_) + +* **PR** `#31458`_: (`vutny`_) Correct installation documentation for Debian + @ *2016-02-24 17:01:09 UTC* + + * aa0a9a03dd Merge pull request `#31458`_ from vutny/correct-doc-install-debian + + * 42aa7eeafd Add section about installation from the Debian Main Repository + + * 07dece2f8f Remove duplicate post-installation section for Debian install guide + + * 10c05f6943 Add install section for Debian Stretch (Testing) from community repository + + * b2c78e08dc Add note about supported Debian architectures on SaltStack corp repo + +* **PR** `#31457`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-02-24 16:42:17 UTC* + + * 330c4d8b0f Merge pull request `#31457`_ from rallytime/merge-2015.8 + + * 94b3cf08c7 Merge branch '2015.5' into '2015.8' + + * 26733ce988 Merge pull request `#31442`_ from sastorsl/salt-modules-file.py-copy-check-src + + * 0a4132866d removed lint in the exception string + + * f8b5d498c3 Add os.path.exists(src) to file.py, def copy + + * e480727d27 Merge pull request `#31441`_ from cachedout/issue_30739 + + * ffcfad1570 Include localhost minions in presence detection for runner + + * 91ff95f093 Merge pull request `#31416`_ from carlwgeorge/selinux_doc_fix + + * 0e6846d72e selinux module documentation fix + + * 7d01979898 Merge pull request `#31336`_ from terminalmage/config-validation-logging + + * 795008bad1 Improve config validation logging + + * fed096a29d Merge pull request `#31374`_ from sjorge/solarish_hwaddr + + * bdf2576dfb missed a .format and messed up the join + + * bbd2fdc96d fix for illumos/solaris hwaddr + + * 6ee17f905b Merge pull request `#31339`_ from jacobhammons/dot7prev + + * 07120a8d48 changed latest release to 2015.8.7 + +* **ISSUE** `#31370`_: (`Ch3LL`_) pkg.info_installed on ubuntu12 does not output info and stack trace (refs: `#31439`_) + +* **PR** `#31439`_: (`rallytime`_) Fix lowpkg.info function for Ubuntu 12 - make sure we have a pkg name (refs: `#31445`_) + @ *2016-02-24 16:24:46 UTC* + + * e553f18dc4 Merge pull request `#31439`_ from rallytime/fix-31370 + + * 1931c61563 Only run this pkg.info_installed test on distros that have that func + + * 0488668a00 Fix lowpkg.info function for Ubuntu 12 - make sure we have a pkg name + +* **PR** `#31456`_: (`RabidCicada`_) Clarified the form of requisite targets/requisite-references + @ *2016-02-24 16:24:00 UTC* + + * fcb12dbe96 Merge pull request `#31456`_ from RabidCicada/clarify-requisites-doc + + * 87f4843490 Clarified the form of requisite targets/requisite-references + +* **ISSUE** `#30431`_: (`nbow`_) cp.get_url with large files results in an Uncaught Exception (refs: `#30704`_) + +* **ISSUE** `#27093`_: (`TheBigBear`_) 2015.8.0 winrepo downloader corrupts some installers (refs: `#30704`_) + +* **PR** `#31453`_: (`DmitryKuzmenko`_) Backport cp_geturl fix for large files into 2015.8 + @ *2016-02-24 15:38:24 UTC* + + * **PR** `#30704`_: (`DmitryKuzmenko`_) Issues/30431 get url large file (refs: `#31453`_) + + * 7dac1db55d Merge pull request `#31453`_ from DSRCompany/issues/30431_get_url_large_file_2015.8_backbort + + * 664bdec2b3 Backport cp_geturl fix for large files into 2015.8 + +* **PR** `#31444`_: (`jacobhammons`_) Documentation updates - ddns state, file.line state/exe function, installation dependencies + @ *2016-02-23 22:40:05 UTC* + + * 8f6c4be618 Merge pull request `#31444`_ from jacobhammons/ddns-docs + + * 0b8fce1de4 Fixes `#31402`_ Added arguments to state `file.line` to fix issue where exe module uses `line` and state module uses `name`. Reformatted parameters in exe module `file.line` placeholder release notes for 2015.5.8 + + * 0b1fdf7e21 Added note clarifying when dnspython is not required + +* **PR** `#31341`_: (`twangboy`_) Clarification on Windows Package Manager docs + @ *2016-02-23 16:09:18 UTC* + + * 42027e0d72 Merge pull request `#31341`_ from twangboy/package_manager_docs + + * c16cfc6360 Fix typos + + * 8dff065cec Fix some formatting issues + + * dfef24f13b Merge branch '2015.8' of https://github.com/saltstack/salt into 2015.8 + + * 807257b138 Clarification for Windows Package Manger + +* **PR** `#31380`_: (`kiorky`_) Bring up ext_pillar rendering errors as well + @ *2016-02-23 16:08:39 UTC* + + * 30d968c0a7 Merge pull request `#31380`_ from kiorky/p + + * e3e97a43ce Bring up ext_pillar rendering errors as well + +* **ISSUE** `#31410`_: (`terminalmage`_) Debian GNU/Linux grains broken in head of 2015.8 branch (refs: `#31418`_) + +* **PR** `#31418`_: (`terminalmage`_) Fix core grains when Debian OS detected as 'Debian GNU/Linux' + @ *2016-02-23 15:49:49 UTC* + + * 64ed9fcd01 Merge pull request `#31418`_ from terminalmage/fix-debian-grains + + * 5c833efc01 Support running grains tests + + * 0e0cd17160 Rename core.py to core_test.py + + * d3cd1b596d Add unit test for core grains + + * e3d549d376 Fix debian grains setup + +* **PR** `#31429`_: (`mcalmer`_) fix argument handling for pkg.download + @ *2016-02-23 15:48:23 UTC* + + * ec01b994bd Merge pull request `#31429`_ from mcalmer/fix-refresh-arguments + + * 299c07fa7d fix argument handling for pkg.download + +* **PR** `#31432`_: (`ticosax`_) [dockerng] Hotfix docker 1.10.2 + @ *2016-02-23 15:39:04 UTC* + + * 05c12b9ba1 Merge pull request `#31432`_ from ticosax/hotfix-docker-1.10.2 + + * 1e9f6ff324 handle inconsistencies in dockerd API + + * 8484815f58 pep8 + +* **PR** `#31420`_: (`twangboy`_) Handle Unversioned Packages + @ *2016-02-22 23:46:24 UTC* + + * fb81e905e4 Merge pull request `#31420`_ from twangboy/unversioned_pkgs + + * 816e991e87 Fix version check + + * 85d8b938ad Match unversioned packages to winrepo + +* **PR** `#31417`_: (`jacobhammons`_) ddns state docs updated with notes regarding the name, zone, and keyfile. + @ *2016-02-22 23:16:48 UTC* + + * 19d7810478 Merge pull request `#31417`_ from jacobhammons/ddns-docs + + * 5c4cbbb572 Added notes regarding the name, zone, and keyfile. + +* **PR** `#31391`_: (`redmcg`_) Added sanity check: is 'pillar' in self.opts + @ *2016-02-22 20:05:27 UTC* + + * ac6af79abc Merge pull request `#31391`_ from redmcg/master_schedule_fix + + * 91e74feaf3 Added sanity check: is 'pillar' in self.opts + +* **PR** `#31376`_: (`cro`_) Some distros don't have a /lib/systemd + @ *2016-02-22 18:11:39 UTC* + + * c7bd13c9c9 Merge pull request `#31376`_ from cro/suse_service2 + + * f3fec5562e We need one more mocked return from listdir. + + * ab9d9e7008 Can't add a tuple and a string. + + * 8f12bdb1a0 Check to see if a path is a link, because it's likely that if it IS a link, one of the other paths points to it. Ignore so we don't get duplicates. + + * 8f0e866f1b Some distros do not seem to have a /lib/systemd, but do have a /usr/lib/systemd + +* **ISSUE** `#29727`_: (`oeuftete`_) dockerng.running does not pull image as documented (refs: `#31352`_, `#31455`_) + +* **ISSUE** `#27976`_: (`syphernl`_) Module dockerng.inspect_image always returns 404 (refs: `#31352`_) + +* **PR** `#31352`_: (`ticosax`_) [dockerng] Pull missing images when calling dockerng.running + @ *2016-02-22 16:54:10 UTC* + + * 105821efc7 Merge pull request `#31352`_ from ticosax/pull-image-on-running + + * 8c86eeb4dc Pull missing images when calling dockerng.running + +* **PR** `#31378`_: (`mcalmer`_) Zypper refresh handling + @ *2016-02-22 16:50:28 UTC* + + * 83294e4f3a Merge pull request `#31378`_ from mcalmer/zypper-refresh-handling + + * 274e6467be do not change kwargs in refresh while checking a value + + * 644b14c273 simplify checking the refresh paramater + + * db0e0de2fd add refresh option to more functions + + * 5836be3f59 unify behavior of refresh + +* **ISSUE** `#31229`_: (`eykd`_) git.latest broken behavior in 2015.8.x on older Git (refs: `#31373`_) + +* **PR** `#31373`_: (`terminalmage`_) Use --set-upstream instead of --track to set upstream on older git + @ *2016-02-22 16:46:00 UTC* + + * e24685b89a Merge pull request `#31373`_ from terminalmage/issue31229 + + * 28f0a75cc1 Use --set-upstream instead of --track to set upstream on older git + +* **ISSUE** `#31137`_: (`jeffreyctang`_) logrotate creates .bak files in /etc/logrotate.d which logrotate reads. (refs: `#31390`_) + +* **PR** `#31390`_: (`abednarik`_) Fix Logrotate module. + @ *2016-02-22 16:09:15 UTC* + + * c5790bc4d6 Merge pull request `#31390`_ from abednarik/remove_deprecated_psed_in_lorgotate + + * c1e0ff7785 Fix Logrotate module. + +* **ISSUE** `#28004`_: (`warden`_) dockerng.image_present should allow public repository pulling by default (refs: `#31354`_) + +* **PR** `#31354`_: (`ticosax`_) [dockerng] Dont require auth for all registries + @ *2016-02-20 05:45:10 UTC* + + * 174ee10fc2 Merge pull request `#31354`_ from ticosax/dont-require-auth-for-all-registries + + * 4a9f661d66 It exists public registries where auth is not required. + +* **PR** `#31368`_: (`whiteinge`_) Update list of netapi clients for autoclass + @ *2016-02-19 20:57:28 UTC* + + * 8d0498eff4 Merge pull request `#31368`_ from whiteinge/netapi-client-list + + * 0cfe5d89a0 Update list of netapi clients for autoclass + +* **PR** `#31367`_: (`techhat`_) Add docs on how to actually use SDB + @ *2016-02-19 20:07:17 UTC* + + * 9b0e29107b Merge pull request `#31367`_ from techhat/sdbdocs + + * eea192a545 Add docs on how to actually use SDB + +* **PR** `#31357`_: (`ticosax`_) [dockerng] Support docker inconsistencies + @ *2016-02-19 20:02:08 UTC* + + * 7e599f0e27 Merge pull request `#31357`_ from ticosax/support-docker-inconsistencies + + * 3672b8e7b1 docker daemon returns sometimes empty list and sometimes None + +* **PR** `#31353`_: (`ticosax`_) [dockerng] Fix when ports are integers + @ *2016-02-19 19:55:30 UTC* + + * **PR** `#31326`_: (`ticosax`_) [dockerng ] Detect settings removal (refs: `#31353`_) + + * 18bd78260d Merge pull request `#31353`_ from ticosax/fix-when-port-are-integers + + * 20fdc43968 Follow up for `#31326`_ + +* **PR** `#31346`_: (`ticosax`_) Backport `#31130`_ to 2015.8 + @ *2016-02-19 19:46:48 UTC* + + * **PR** `#31130`_: (`ticosax`_) Saltnado: provide also get parameters to the context (refs: `#31346`_) + + * dec254a7a2 Merge pull request `#31346`_ from ticosax/backport-31130-to-2015.8 + + * a8dc33a5e3 Saltnado provide also get parameters to the context + +* **PR** `#31332`_: (`terminalmage`_) Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options + @ *2016-02-19 18:31:29 UTC* + + * d639d65381 Merge pull request `#31332`_ from terminalmage/issue31167 + + * eebc325040 Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options + +* **PR** `#31305`_: (`mcalmer`_) call zypper with option --non-interactive everywhere + @ *2016-02-19 18:14:57 UTC* + + * d067e77fee Merge pull request `#31305`_ from mcalmer/zypper-non-interactive-everywhere + + * 75e776761c write a zypper command builder function + + * 3df302fcb7 call zypper with option --non-interactive everywhere + +* **PR** `#31337`_: (`jacobhammons`_) Release notes and versioning for 2015.8.7 + @ *2016-02-19 00:20:30 UTC* + + * 98a14f8090 Merge pull request `#31337`_ from jacobhammons/dot7 + + * d4fb33939e Release notes and versioning for 2015.8.7 + +* **PR** `#31326`_: (`ticosax`_) [dockerng ] Detect settings removal (refs: `#31353`_) + @ *2016-02-18 22:02:50 UTC* + + * f0ba9c1eca Merge pull request `#31326`_ from ticosax/2015.8-dockerng-detect-settings-removal + + * 7bedd86ebe Add detection of removed settings. + +* **PR** `#31292`_: (`twangboy`_) Fix dunder virtual to check for Remote Administration Tools + @ *2016-02-18 18:57:26 UTC* + + * 130f515391 Merge pull request `#31292`_ from twangboy/win_servermanager + + * 89b47ab3c5 Update return documentation for install/remove + + * a0be43120b Fix cmd_quote error + + * 13cd57a890 Remove repeating Import ServerManager command + + * 3270a2859f Add check for server manager module + + * 4bdae47a44 Added checks for Windows 2008 R2 + +* **ISSUE** `#30932`_: (`johje349`_) Glusterfs peered fails on secondary host in 2015.8.4 (refs: `#31287`_) + +* **PR** `#31287`_: (`joejulian`_) Rework tests and fix reverse peering with gluster 3.7 + @ *2016-02-18 17:57:23 UTC* + + * 5d31714b44 Merge pull request `#31287`_ from joejulian/2015.8_30932_peer_probe_by_ip + + * 783e9b2e13 Rework tests and fix reverse peering with gluster 3.7 + +* **PR** `#31196`_: (`sakateka`_) Here are a few fixes utils.network + @ *2016-02-18 17:27:00 UTC* + + * a2f6447f8d Merge pull request `#31196`_ from sakateka/utils-network-fix + + * a7b11024dd fix typo + + * 92fd48fcf7 Do not Fallback to use lsof if proc available + +* **ISSUE** `#29795`_: (`vutny`_) Unable to override state-output setting in command line (refs: `#31299`_) + +* **PR** `#31299`_: (`rallytime`_) Allow state-output and state-verbose default settings to be set from CLI + @ *2016-02-18 17:25:23 UTC* + + * d20a30b8be Merge pull request `#31299`_ from rallytime/fix-29795 + + * 483f31922b Allow state-output and state-verbose default settings to be set from CLI + +* **PR** `#31317`_: (`terminalmage`_) Fix versonadded directive + @ *2016-02-18 16:56:32 UTC* + + * 25d8af21c9 Merge pull request `#31317`_ from terminalmage/git-version-audit + + * acc3b54621 Fix versonadded directive + +* **ISSUE** `#30999`_: (`orymate`_) git.latest rev=tag fails with old git(1) (refs: `#31245`_, `#31301`_) + +* **PR** `#31301`_: (`terminalmage`_) Corrected fix for `#30999`_ + @ *2016-02-18 15:59:40 UTC* + + * **PR** `#31245`_: (`jespada`_) fix git state for git version older than 1.9.2 (refs: `#31301`_) + + * f2b662371c Merge pull request `#31301`_ from terminalmage/issue30999 + + * 625af70e08 Fix --unset-upstream handling + + * 7940881797 fix git state github issue `#30999`_ + +* **PR** `#31302`_: (`terminalmage`_) Audit CLI opts used in git states + @ *2016-02-18 15:58:48 UTC* + + * 408d89e174 Merge pull request `#31302`_ from terminalmage/git-version-audit + + * ca410c0a94 Audit CLI opts used in git states + +* **PR** `#31312`_: (`terminalmage`_) Merge 2015.5 into 2015.8 + @ *2016-02-18 15:57:08 UTC* + + * 098f05eb3c Merge pull request `#31312`_ from terminalmage/merge-forward-2015.5-2015.8 + + * 808d150fe4 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.5-2015.8 + + * cd3400e67e Merge pull request `#31288`_ from notpeter/ssh_known_hosts_docs + + * 3f573d89a2 Improve salt.states.ssh_known_hosts documentation. + + * 875d9925fa Merge pull request `#31183`_ from heyfife/fix-gce-named-static-ip-reservation + + * 26774e2323 Fixed named external_ip reservation/re-use code. + + * e56c402c0c Merge pull request `#31032`_ from terminalmage/issue31001 + + * 42daea4509 yumpkg.py: Remove repoquery usage everywhere but check_db + + * 50befbc149 backport salt.utils.pkg.rpm to 2015.5 + + * a1ad14994a Move salt.utils.itersplit() to salt.utils.itertools.split() + + * 5b8646ce64 Ignore failure to install new enough dnf-plugins-core + + * defe0859fd Ensure that dnf-plugins-core 0.1.15 is installed + + * cec69b74f0 Merge pull request `#31264`_ from sjorge/if_missing-155-fix + + * 545edbf5e1 fix if_missing gets appended to dirs list, take III + +* **ISSUE** `#31223`_: (`pprince`_) file_tree pillar: fails when data files at root end in '\\\\n' (refs: `#31225`_) + +* **PR** `#31225`_: (`pprince`_) Fix in file_tree pillar (Fixes `#31223`_.) + @ *2016-02-18 06:06:12 UTC* + + * c58f654bc3 Merge pull request `#31225`_ from pprince/PR/bugfix/file_tree + + * d592d8636b Fix regression in file_tree pillar (Fixes `#31223`_.) + +* **PR** `#31233`_: (`mcalmer`_) implement version_cmp for zypper + @ *2016-02-17 20:20:19 UTC* + + * fe9e5d27e6 Merge pull request `#31233`_ from mcalmer/2015.8-zypperpy-add-version_cmp + + * 389a4b2548 Check if rpm-python can be imported + + * 6ad6a90955 pylint changes + + * 7beaf26068 implement version_cmp for zypper + +* **PR** `#31273`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-02-17 20:14:05 UTC* + + * 93c03a400b Merge pull request `#31273`_ from rallytime/merge-2015.5 + + * 11cfb636fb Pylint fix + + * 023ad4635c Merge branch '2015.5' into '2015.8' + + * fa3f474de9 Merge pull request `#31110`_ from cachedout/fixup_30730 + + * 5bf5848e04 Fixup unit test + + * f558f68e0a Fixes pylint warnings + + * 56a975ec43 Attempt to fix pylint warnings + + * 55d71be057 Make documentation and code examples consistent with code + + * 1f04fed6f8 Change parameter name from includes to skips + + * ccf5e13e7d Adding support for skipHidden in SetInclude + + * 4f2d4af2e7 Variable names standardization + + * f5917ac1e8 Fixes typo + + * 26e5236073 Invert RebootRequired logic + + * 8065a7abf6 Add basic documentation and define how the skips parameter works. + + * 389fea7508 Change parameter name from includes to skips + + * 30e1fef906 Adding support for skipHidden in SetInclude + + * 1244eea5be Variable names standardization, consistent if/else logic with states.win_update + +* **PR** `#31253`_: (`gtmanfred`_) allow for nova servers to be built with premade volumes + @ *2016-02-17 17:55:39 UTC* + + * dc2e7c8956 Merge pull request `#31253`_ from gtmanfred/2015.8 + + * 36bf06e539 fix doc for boot_volume + + * 9660c91b57 allow for nova servers to be built with premade volumes + +* **ISSUE** `#30651`_: (`sjorge`_) salt.states.grains.list_present should not show changes if none are made! (refs: `#31651`_, `#30689`_) + +* **PR** `#31271`_: (`rallytime`_) Back-port `#30689`_ to 2015.8 + @ *2016-02-17 16:52:36 UTC* + + * **PR** `#30689`_: (`sjorge`_) fix for `#30651`_ grains.list_present and grains.list_absent (refs: `#31651`_, `#31271`_) + + * 29e3dd091d Merge pull request `#31271`_ from rallytime/bp-30689 + + * 3dae79d516 fix nested grains always show update due to __grains__.get() not supporting the ":" seperator + +* **ISSUE** `#30461`_: (`jfindlay`_) update documentation on bootstrap-supported platforms (refs: `#31255`_) + +* **PR** `#31255`_: (`jacobhammons`_) Fixes `#30461`_ + @ *2016-02-17 02:23:46 UTC* + + * fcfc6f4fd3 Merge pull request `#31255`_ from jacobhammons/doc-fixes + + * 3c4f8215c3 Fixes `#30461`_ Credited Sebastian Kramer for finding CVE 2016-1866 in release notes Added note about salt virt not working on KVM in a VM + +* **ISSUE** `#31106`_: (`rvandegrift`_) Exception from scheduled runner (refs: `#31189`_) + +* **PR** `#31189`_: (`dmacvicar`_) Fix crash with scheduler and runners (`#31106`_) + @ *2016-02-16 18:49:36 UTC* + + * 62d76902ce Merge pull request `#31189`_ from dmacvicar/dmacvicar-2015.8-31106 + + * 9ad8cb1e6b Fix crash with scheduler and runners (`#31106`_) + +* **ISSUE** `#30962`_: (`fantasy86`_) Targeting by matching ip address doesn't work (refs: `#31201`_) + +* **ISSUE** `#30169`_: (`colinlabs`_) Can't use Subnet/IP Address Matching (refs: `#31201`_) + +* **ISSUE** `#29733`_: (`roshan3133`_) salt -S test.ping command output getting list of minions which did not not return. (refs: `#31201`_) + +* **ISSUE** `#29188`_: (`bergemalm`_) Unable to target minions via ipcidr in 2015.8 (refs: `#31201`_) + +* **PR** `#31201`_: (`The-Loeki`_) Utilize prepared grains var in master-side ipcidr matching + @ *2016-02-16 18:36:10 UTC* + + * dc78d0a504 Merge pull request `#31201`_ from The-Loeki/patch-1 + + * 318689d728 Correct ordering of address/network matching, improve performance of master-side cidr matching + + * 4e4e0926da Utilize prepared grains var in master-side ipcidr matching + +* **PR** `#31239`_: (`terminalmage`_) Improve logging when master cannot decode a payload + @ *2016-02-16 16:35:46 UTC* + + * 60bbac36fa Merge pull request `#31239`_ from terminalmage/better-bad-load-logging + + * 1fbe3cba1f Improve logging when master cannot decode a payload + +* **ISSUE** `#31185`_: (`twangboy`_) pkg.refresh_db leaves old sls files if the name changes (refs: `#31190`_) + +* **PR** `#31190`_: (`twangboy`_) Clear minion cache before caching from master + @ *2016-02-16 16:11:26 UTC* + + * 80f1c3553b Merge pull request `#31190`_ from twangboy/refresh_db + + * 860437665d Fix some lint + + * 799d938d6a Clear minion cache before caching from master + +* **PR** `#31226`_: (`pprince`_) Minor docs fix: file_tree pillar (Fixes `#31124`_) + @ *2016-02-16 15:25:33 UTC* + + * **PR** `#31124`_: (`zygiss`_) Make load beacon cross-platform (refs: `#31226`_) + + * 28a2b8097b Merge pull request `#31226`_ from pprince/PR/docfix/file_tree + + * c13852fbbf Minor docs fix: file_tree pillar (Fixes `#31124`_) + +* **PR** `#31234`_: (`mcalmer`_) improve doc for list_pkgs + @ *2016-02-16 15:25:06 UTC* + + * 9afad13306 Merge pull request `#31234`_ from mcalmer/zypperpy-comment-list_pkgs + + * e3bb862a32 improve doc for list_pkgs + +* **PR** `#31237`_: (`mcalmer`_) add handling for OEM products + @ *2016-02-16 15:12:21 UTC* + + * e8f3a707ae Merge pull request `#31237`_ from mcalmer/zypper_py-add-OEM-product-handling + + * d773b7317b add handling for OEM products + +* **PR** `#31182`_: (`rallytime`_) Back-port `#31172`_ to 2015.8 + @ *2016-02-13 21:36:07 UTC* + + * **PR** `#31172`_: (`techhat`_) Use correct deploy directory (refs: `#31182`_) + + * 415654ee9e Merge pull request `#31182`_ from rallytime/bp-31172 + + * a743778e98 Use correct deploy directory + +* **ISSUE** `#27498`_: (`arthurlogilab`_) [runner] salt-run cache.clear_mine_func broken, can't take clear_mine_func (refs: `#31191`_) + +* **PR** `#31191`_: (`rallytime`_) Make sure doc example matches kwarg + @ *2016-02-13 21:34:57 UTC* + + * 434e05667a Merge pull request `#31191`_ from rallytime/fix-27498 + + * 0bdbaa49d1 Make sure doc example matches kwarg + +* **PR** `#31171`_: (`Ch3LL`_) added logic to check for installed package + @ *2016-02-12 22:10:21 UTC* + + * c5e5af827c Merge pull request `#31171`_ from Ch3LL/megan-20158 + + * a12e2f566b fix lint error + + * a123efd4ef added logic to check for installed package + +* **ISSUE** `#30934`_: (`marnovdm`_) contents_pillar no longer works with lists in 2015.8.5 (refs: `#31026`_, `#31177`_) + +* **PR** `#31177`_: (`Ch3LL`_) add integration test for issue `#30934`_ + @ *2016-02-12 22:09:31 UTC* + + * a024d3536f Merge pull request `#31177`_ from Ch3LL/test_content_pillars + + * 9204e3f562 add integration test for issue 30934w + +* **PR** `#31181`_: (`cachedout`_) Lint 2015.8 branch + @ *2016-02-12 21:57:02 UTC* + + * 1f22335e28 Merge pull request `#31181`_ from cachedout/lint_20158 + + * 4c0be11627 Lint 2015.8 branch + +* **ISSUE** `#29423`_: (`l13t`_) iptables and match-set with two parameters (refs: `#29718`_) + +* **PR** `#31169`_: (`rallytime`_) Back-port `#29718`_ to 2015.8 + @ *2016-02-12 18:28:13 UTC* + + * **PR** `#29718`_: (`thusoy`_) Support match-sets in iptables module (refs: `#31169`_) + + * 4d1b49c1e7 Merge pull request `#31169`_ from rallytime/bp-29718 + + * ceae2a16f8 Support match-sets in iptables module + +* **PR** `#31170`_: (`rallytime`_) Back-port `#31157`_ to 2015.8 + @ *2016-02-12 18:27:49 UTC* + + * **PR** `#31157`_: (`captaininspiration`_) Fix locale generation on Ubuntu (refs: `#31170`_) + + * f2efd3e6c1 Merge pull request `#31170`_ from rallytime/bp-31157 + + * 27776b5f4e Fix locale generation on Ubuntu + +* **PR** `#31147`_: (`cro`_) Documentation clarifications. + @ *2016-02-12 17:16:27 UTC* + + * 7f49fbb70d Merge pull request `#31147`_ from cro/fx2_doc + + * a005e4af55 Documentation clarifications. + +* **PR** `#31153`_: (`edencrane`_) Fixed invalid host causing 'reference to variable before assignment' + @ *2016-02-12 16:30:19 UTC* + + * 7986b9e033 Merge pull request `#31153`_ from edencrane/fix-network-connect-invalid-hostname + + * a14c4bb5f2 Fixed invalid host causing 'reference to variable before assignment' + +* **ISSUE** `#30994`_: (`onorua`_) beacon enable from state is failing (refs: `#31152`_) + +* **PR** `#31152`_: (`garethgreenaway`_) fixes to beacon module, state module and friends + @ *2016-02-12 16:27:40 UTC* + + * f5ab76801b Merge pull request `#31152`_ from garethgreenaway/30994_beacon_add_failing_and_other_fixes + + * 91b14dca40 fixing the beacon module and state module to handle passing enabled properly. Also reworking how what is returned from the validating functions is handled to ensure when beacon configurations aren't validate the results indicate exactly why. + +* **PR** `#31149`_: (`jfindlay`_) add 2015.8.7 release notes + @ *2016-02-12 00:06:15 UTC* + + * c8047d979d Merge pull request `#31149`_ from jfindlay/2015.8 + + * b58783b895 add 2015.8.7 release notes + +* **PR** `#31134`_: (`isbm`_) Fix types in the output data and return just a list of products + @ *2016-02-11 20:19:22 UTC* + + * 5c394ac49c Merge pull request `#31134`_ from isbm/isbm-zypper-list-products + + * 670a326e3d Fix types in the output data and return just a list of products + +* **ISSUE** `#31115`_: (`nfillot`_) 2015.8.5 salt-cloud nova valid ip address was not found (refs: `#31120`_) + +* **ISSUE** `#29758`_: (`zaide`_) 2015.8.3 salt-call runners.cloud : local variable 'access_ip' referenced before assignment (refs: `#31120`_) + +* **ISSUE** `#29666`_: (`tminn`_) Nova driver broken for 2015.8.[1-3] (refs: `#31120`_) + +* **PR** `#31120`_: (`gtmanfred`_) Clean up some bugs in the nova driver + @ *2016-02-11 20:17:41 UTC* + + * 8f2e3a26e5 Merge pull request `#31120`_ from gtmanfred/2015.8 + + * 4a411c0817 fix comment + + * 47ecb7a150 include all ips in public_ips or private_ips + + * b2e8202f5d dont exit on a missing server + + * 8ad1ee6db4 clean up references to access_ip extra network + +* **ISSUE** `#31099`_: (`Ch3LL`_) Cannot specify size in map file in 2015.8 (refs: `#31132`_) + +* **PR** `#31132`_: (`rallytime`_) Make sure required profile configurations passed in a map file work + @ *2016-02-11 20:16:46 UTC* + + * 2d592a398e Merge pull request `#31132`_ from rallytime/fix-31099 + + * 1da03da9df Pylint fix + + * 337592ec56 Make sure required profile configurations passed in a map file work + +* **ISSUE** `#31014`_: (`gtmanfred`_) [2015.8] pkg breaks for yum pkgs.latest if the packages has an epoch (refs: `#31131`_, `#31015`_, `#31031`_) + +* **PR** `#31131`_: (`Ch3LL`_) integration test for issue `#31014`_ + @ *2016-02-11 17:33:23 UTC* + + * b831e0a865 Merge pull request `#31131`_ from Ch3LL/megan-20158 + + * af82b1233a integration test for issue `#31014`_ + +* **PR** `#31133`_: (`cachedout`_) Fixup 31121 + @ *2016-02-11 17:32:24 UTC* + + * e378afd891 Merge pull request `#31133`_ from cachedout/fixup_31121 + + * a4040da46d Fix bad unit test + + * 0e68fafb74 Fix alternative module and state. + +* **PR** `#31125`_: (`isbm`_) Force-kill websocket's child processes faster than default two minutes. + @ *2016-02-11 16:50:57 UTC* + + * a4a40262f8 Merge pull request `#31125`_ from isbm/isbm-salt-api-service + + * f73f70375c Force-kill websocket's child processes faster than default two minutes. + +* **PR** `#31119`_: (`sakateka`_) fixes for ipv6-only multi-master faliover + @ *2016-02-11 16:21:45 UTC* + + * 79c85859bc Merge pull request `#31119`_ from sakateka/fix-for-ipv6only-failover + + * 2c45d151d1 fix unintentional breaking changes + + * 043a5e6fd7 fixes for ipv6-only multi-master faliover + +* **PR** `#31107`_: (`techhat`_) Don't try to add a non-existent IP address + @ *2016-02-10 21:52:42 UTC* + + * 825b510030 Merge pull request `#31107`_ from techhat/nebulaprivip + + * 1fa69982c4 Don't try to add a non-existent IP address + +* **PR** `#31108`_: (`justinta`_) Changed npm integration test to install request. + @ *2016-02-10 21:52:02 UTC* + + * c56a819fd8 Merge pull request `#31108`_ from jtand/npm_test_fix + + * a5eac47b25 Changed npm integration test to install request. + +* **PR** `#31105`_: (`cachedout`_) Lint 30975 + @ *2016-02-10 21:11:21 UTC* + + * de1abae9d1 Merge pull request `#31105`_ from cachedout/lint_30975 + + * 446b4c2aff Lint `#30975`_ + + * b4fe9aaa11 fixes issue in which s3.role_arn was defaulting to '' + +* **ISSUE** `#31069`_: (`symphorien`_) Wrong filename in documentation for x509 state (refs: `#31100`_) + +* **PR** `#31100`_: (`jfindlay`_) states.x509: docs: peer.sls -> peer.conf + @ *2016-02-10 20:47:45 UTC* + + * 2e5499748a Merge pull request `#31100`_ from jfindlay/x509_sls + + * 6c303b99c2 states.x509: docs: peer.sls -> peer.conf + +* **PR** `#31103`_: (`twangboy`_) Point to reg.delete_key_recursive + @ *2016-02-10 20:46:53 UTC* + + * f2bede1c00 Merge pull request `#31103`_ from twangboy/fix_reg_state + + * fe1ca906d2 Point to reg.delete_key_recursive + +* **PR** `#31093`_: (`techhat`_) Ensure double directories don't get created + @ *2016-02-10 18:53:47 UTC* + + * 94fa76831f Merge pull request `#31093`_ from techhat/spmfix + + * 4f4c8877ad Ensure double directories don't get created + +* **ISSUE** `#31056`_: (`JensRantil`_) file.symlink documentation improvement (refs: `#31095`_) + +* **PR** `#31095`_: (`jfindlay`_) modules.file, states.file: explain symbolic links + @ *2016-02-10 18:53:24 UTC* + + * c015ca865c Merge pull request `#31095`_ from jfindlay/link_doc + + * 7d9df6b26c modules.file, states.file: explain symbolic links + +* **ISSUE** `#31059`_: (`mf-collinhayden`_) salt-cloud rename fails in 2015.8.5 (refs: `#31061`_) + +* **ISSUE** `#30950`_: (`tmaulik`_) Salt-cloud create_snapshot is not recognizing snapshot_name parameter in salt 2015.8.5 (refs: `#31061`_) + +* **PR** `#31061`_: (`rallytime`_) Revert `#30217`_ - was causing salt-cloud -a breakage + @ *2016-02-10 18:13:59 UTC* + + * **PR** `#30217`_: (`pass-by-value`_) Make sure cloud actions can be called via salt run (refs: `#31061`_, `#30691`_) + + * 4d6706b3e7 Merge pull request `#31061`_ from rallytime/revert-breakage + + * ced2d9f922 Revert `#30217`_ + +* **ISSUE** `#31088`_: (`gladiatr72`_) request for color logging fix backport (refs: `#31090`_) + +* **PR** `#31090`_: (`rallytime`_) Back-port `#30542`_ to 2015.8 + @ *2016-02-10 18:06:38 UTC* + + * **PR** `#30542`_: (`gladiatr72`_) address color log dict lookup exceptions w/ non-posix log level names (refs: `#31090`_) + + * 482eea9883 Merge pull request `#31090`_ from rallytime/bp-30542 + + * 67a713f2f6 Some 3rd-party modules (e.g. gnupg) define custom log levels that emit at INFO level and above. This patch sets the color data lookups to default to TextFormat('reset') rather than producing a stack trace every time a log message is generated from an affected module. + +* **PR** `#31085`_: (`jacksontj`_) Correctly remove path we added after loader is completed + @ *2016-02-10 17:47:22 UTC* + + * 5dcaa8d387 Merge pull request `#31085`_ from jacksontj/2015.8 + + * dd5051c9e6 Correctly pop the path we added after loader is completed. + +* **ISSUE** `#28142`_: (`zmalone`_) Deprecate or update the copr repo (refs: `#31037`_) + +* **PR** `#31037`_: (`vutny`_) Update RHEL installation guide to reflect latest repo changes + @ *2016-02-10 17:36:04 UTC* + + * 27bf83fa59 Merge pull request `#31037`_ from vutny/correct-doc-install-on-rhel + + * 6370ddda9f Update RHEL installation guide + + * afdaefbf3d Add `systemctl` examples for RHEL 7 to the installation guide + + * 069a661eb1 Correct ZeroMQ4 repo install guide for RHEL + + * d2a9d67b5b Update installation instruction for community repos on RHEL + + * bbdf2523c8 Add workaround for RHEL 7 systems mentioned in the issue `#29094`_ + +* **PR** `#31050`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-02-09 20:13:34 UTC* + + * 8704750cf9 Merge pull request `#31050`_ from basepi/merge-forward-2015.8 + + * d86e014a39 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * 1c699a1664 Merge pull request `#30974`_ from rallytime/bp-30949 + + * ff6542f593 Replace cfdisk with sfdisk + + * c7f87cc371 Merge pull request `#30942`_ from rallytime/bp-30897 + + * 885e00ba54 Only remove the word linux from distroname when its not part of the name + + * 35b7f62669 Merge pull request `#30922`_ from jacobhammons/prev-rel-notes + + * 57c1ec637a Rev latest version to 2015.8.5 + + * 2488bb902e Merge pull request `#30865`_ from abednarik/better_boto_elb_error + + * 3561e8c19b Better boto elb error message. + + * 4da04f82c8 Merge pull request `#30831`_ from jacobhammons/readme-update + + * 01a92f5d98 Updated readme + + * 90c1ea9f6c Merge pull request `#30829`_ from jacobhammons/release-2015.5 + + * c95bb60148 Version to 2015.8.4 + + * 80a36793cb Merge pull request `#30784`_ from rallytime/bp-24952 + + * a07908bdea Don't split the string on a single line + + * e978f5392f Merge pull request `#30764`_ from terminalmage/issue30560 + + * 39736afcd7 Work around yum versionlock's inability to remove holds by package name alone + + * 6f565c0d76 Merge pull request `#30760`_ from toanju/2015.5 + + * dc4256f7df Changed output format of arp_ip_target from list to comma delimited string + + * 1c205b4898 Merge pull request `#30757`_ from yannis666/fix-for-mine-update-merge + + * 61bb23e256 Fix to mine update to merge configuration + + * f9fde8f6a7 Merge pull request `#30749`_ from abednarik/fix_network_system_test + + * 1e9e97df59 Fix Netwotk hostname Module in Debian systems. + +* **PR** `#31053`_: (`cachedout`_) Fix boto test failures + @ *2016-02-09 20:02:16 UTC* + + * f13ffd4608 Merge pull request `#31053`_ from cachedout/boto_test_fix + + * c73b5a4a66 Fix boto_secgroup + + * 25bcc68357 Fix boto test failures + +* **ISSUE** `#30938`_: (`lorengordon`_) Windows: Upgrade overwrites minion config file (refs: `#31029`_, `#31028`_) + +* **PR** `#31029`_: (`twangboy`_) Windows defaults to multiprocessing true + @ *2016-02-09 18:20:36 UTC* + + * 87f2816ef5 Merge pull request `#31029`_ from twangboy/win_defaults + + * baffbbdb74 Comment multiprocessing line in minion config + + * 933544b8c8 Set multiprocessing to true in config.py + +* **ISSUE** `#27796`_: (`onsmribah`_) IOError: [Errno 13] Permission denied: '/var/cache/salt/master/.dfn' when using python salt.wheel module (refs: `#30998`_) + +* **PR** `#30998`_: (`dmacvicar`_) add_key/reject_key: do not crash w/Permission denied: '/var/cache/salt/master/.dfn' (`#27796`_) + @ *2016-02-09 17:57:36 UTC* + + * 0dcdd0a2a7 Merge pull request `#30998`_ from dmacvicar/dmacvicar-2015.8-27796 + + * 9602fe2aeb Do not crash on add_key/reject_key if the previous one set the drop file. (`#27796`_) + +* **ISSUE** `#31041`_: (`fredrikaverpil`_) Reading about win_service in 2015.8.5 docs, but it's not available in 2015.8.5 (refs: `#31550`_, `#31049`_) + +* **PR** `#31049`_: (`twangboy`_) Fix versionadded in win_service.config (refs: `#31550`_) + @ *2016-02-09 17:55:07 UTC* + + * e773fc822a Merge pull request `#31049`_ from twangboy/win_svc_docs + + * 98005255d1 Fix versionadded in win_service.config + +* **PR** `#30987`_: (`youngnick`_) Changed glusterfs.peer() module so state can handle localhost peering attempts. + @ *2016-02-09 17:51:58 UTC* + + * c3f115724a Merge pull request `#30987`_ from youngnick/add-back-localhost-peer-handling + + * 730b5ef3e2 Update tests to cover new peering return val. + + * b2407305e8 Changed glusterfs.peer() module call return val so state can handle localhost peering attempts. + +* **PR** `#31042`_: (`moltob`_) Allow using Windows path in archive.extracted name attribute + @ *2016-02-09 17:47:20 UTC* + + * 8518655bfb Merge pull request `#31042`_ from moltob/fix-archive-winpath + + * 9dcc617a53 Allow using Windows path in archive.extracted name attribute, including drive letter colon and backslashes. + +* **PR** `#31012`_: (`terminalmage`_) Fix gitfs/git_pillar/winrepo provider to allow lowercase values + @ *2016-02-09 17:24:25 UTC* + + * 1950359580 Merge pull request `#31012`_ from terminalmage/fix-gitfs-provider-lc + + * 763581798b Add unit tests to ensure a valid provider + + * 49ec61d58b Fix gitfs/git_pillar/winrepo provider to allow lowercase values + +* **ISSUE** `#30983`_: (`JensRantil`_) salt.modules.aptpkg.upgrade does not necessarily do `apt-get dist-upgrade` (refs: `#31024`_) + +* **PR** `#31024`_: (`jfindlay`_) modules.aptpkg.upgrade: clarify dist-upgrade usage + @ *2016-02-09 17:20:57 UTC* + + * 3d8681b63e Merge pull request `#31024`_ from jfindlay/dist_upgrade + + * 3d1be080ad modules.aptpkg.upgrade: clarify dist-upgrade usage + +* **ISSUE** `#30938`_: (`lorengordon`_) Windows: Upgrade overwrites minion config file (refs: `#31029`_, `#31028`_) + +* **PR** `#31028`_: (`twangboy`_) Fix config overwrite by windows installer + @ *2016-02-09 17:20:24 UTC* + + * a0454ffb00 Merge pull request `#31028`_ from twangboy/fix_installer + + * 8876893b5c Fix remove placeholder files + + * 788855cc94 Remove placeholder files + + * c834a9d5e5 Set overwrite to off + +* **ISSUE** `#31014`_: (`gtmanfred`_) [2015.8] pkg breaks for yum pkgs.latest if the packages has an epoch (refs: `#31131`_, `#31015`_, `#31031`_) + +* **PR** `#31031`_: (`terminalmage`_) More complete fix for `#31014`_ + @ *2016-02-09 17:04:42 UTC* + + * **PR** `#31015`_: (`gtmanfred`_) include possible epoch in version for rpm (refs: `#31031`_) + + * 071b9d4904 Merge pull request `#31031`_ from terminalmage/issue31014 + + * 6d15a17d6b Fix yumpkg _get_branch_option() + + * 4b855a85ee Don't handle epoch specially for dnf + + * 5244de2fae More efficient way to add the epoch before version number + + * e1211ed89f include possible epoch in version for rpm + +* **ISSUE** `#30934`_: (`marnovdm`_) contents_pillar no longer works with lists in 2015.8.5 (refs: `#31026`_, `#31177`_) + +* **PR** `#31026`_: (`terminalmage`_) Fix regression when contents_pillar/contents_grains is a list. + @ *2016-02-09 00:03:15 UTC* + + * 2b8f7a12e7 Merge pull request `#31026`_ from terminalmage/issue30934 + + * f43aaf4dff Fix regression when contents_pillar/contents_grains is a list. + +* **ISSUE** `#30472`_: (`sjorge`_) KeyError with schedule (refs: `#30978`_) + +* **PR** `#30978`_: (`garethgreenaway`_) fixes to state.py in 2015.8 + @ *2016-02-08 18:49:05 UTC* + + * de215bd0cd Merge pull request `#30978`_ from garethgreenaway/30472_state_functions_no_default_retcode + + * e33b5140f6 removing extra spaces. + + * f668ccf1f7 removing duplicate code, just set the default in the _set_retcode function + + * 5f2f0f60c0 The functions in the state module that return a retcode when something goes wrong, eg. a 1 or a 2, do not return a 0 when things go the way they're supposed to go. With the recent changes to the scheduler to ensure that the retcode is returned this is problematic and results in exceptions when a state function is run from the schedule. This simple fix ensures a default retcode of 0 exists, it is then override in the _set_retcode function if there is an issue with the run + +* **PR** `#30893`_: (`bdrung`_) Make build reproducible + @ *2016-02-08 18:44:35 UTC* + + * 65fbf980cf Merge pull request `#30893`_ from bdrung/reproducible + + * 089c869ec3 Make build reproducible + +* **PR** `#30945`_: (`cachedout`_) Note that pillar cli args are sent via pub + @ *2016-02-08 18:43:59 UTC* + + * 5b0c7649c7 Merge pull request `#30945`_ from cachedout/note_pillar_cli + + * 3ff7d49555 Note that pillar cli args are sent via pub + +* **ISSUE** `#31000`_: (`rmtmckenzie`_) Salt-cloud profile state fails to create LXC minion (refs: `#31002`_) + +* **PR** `#31002`_: (`rmtmckenzie`_) Fix lxc cloud provided minion reporting present + @ *2016-02-08 18:14:50 UTC* + + * 3b7b6f2398 Merge pull request `#31002`_ from rmtmckenzie/cloud-lxc-provide-fix + + * 9b17fdce5e Fix lxc cloud provided minion reporting present + +* **PR** `#31007`_: (`justinta`_) Fixed rabbitmq_vhost test failure. + @ *2016-02-08 17:48:00 UTC* + + * c48122ae9a Merge pull request `#31007`_ from jtand/rabbitmq_vhost_test_fix + + * 962e0deda5 Fixed rabbitmq_vhost test failure. + +* **ISSUE** `#30993`_: (`fredrikaverpil`_) Overstate: "This documentation has been moved here" (dead end) (refs: `#31004`_) + +* **PR** `#31004`_: (`rallytime`_) Remove overstate docs and a few references. + @ *2016-02-08 17:08:24 UTC* + + * 811461e4b4 Merge pull request `#31004`_ from rallytime/fix-30993 + + * 33eb6ba125 Remove overstate docs and a few references. + +* **PR** `#30965`_: (`anlutro`_) Fix rabbitmq_vhost.present result when test=True + @ *2016-02-08 04:34:45 UTC* + + * 64125de6c7 Merge pull request `#30965`_ from alprs/fix-rabbitmq_vhost_present_test + + * 2313747958 return changes when test=True + + * 95c8e74b72 make the code a bit simpler + + * aba29a73c4 fix rabbitmq_vhost.present result when test=True + +* **PR** `#30955`_: (`Ch3LL`_) docs: add clarification when source is not defined + @ *2016-02-06 18:29:33 UTC* + + * ef02779391 Merge pull request `#30955`_ from Ch3LL/clarify_file_doc + + * 97b57ed2b1 docs: add clarification when source is not defined + +* **PR** `#30941`_: (`rallytime`_) Back-port `#30879`_ to 2015.8 + @ *2016-02-05 21:15:20 UTC* + + * **PR** `#30879`_: (`rhansen`_) Don't delete a Docker volume if the volume's driver differs (refs: `#30941`_) + + * d9785451c0 Merge pull request `#30941`_ from rallytime/bp-30879 + + * eb6f289fc1 change default for volume_present()'s force parameter to False + + * 34f3057e04 add 'force' to replace (or not) volumes with driver mismatch + + * d6d3b15738 typo fixes + +* **PR** `#30940`_: (`twangboy`_) Fix Build Process for OSX + @ *2016-02-05 18:44:34 UTC* + + * 21a83065aa Merge pull request `#30940`_ from twangboy/mac_build_3 + + * 3654a0e0c2 Change 2015 to 2016 in license file + + * aa7d0602a8 Update instructions in readme.md for shasum + + * 6f1a8f4146 Added code to add /opt/salt/bin to the path + + * 1e7468a08c Disable master, syndic, and api in postinstall + + * d49b3dcf1b Re-added start on load and keep alive + + * 3ff50a2254 Removed keepalive option + + * eb5d04bdf1 Remove autostart for api, master, and syndic + + * 3c0cce34c9 Added minimum requirements for installation + + * 1dcc23c85b Fix error on kickstart command + + * 7a163c46d8 Change to new way of starting and stopping services + + * 23d47722b7 Fix preinstall and postinstall scripts + + * 7ef723d815 Upgrade to latest pip + + * 0f09ad517f Updated pip dependencies + + * d3d4c1d13f Removed GPL Licensed software from build + +* **PR** `#30944`_: (`jacobhammons`_) 2015.8.5 release notes linking and clean up + @ *2016-02-05 17:40:10 UTC* + + * 183b500055 Merge pull request `#30944`_ from jacobhammons/rel-notes + + * fbb7605366 2015.8.5 release notes linking and clean up + +* **ISSUE** `#30882`_: (`hoonetorg`_) state lvm.vg_present broken with pv on devicemapper-dev (centos 7.2) (refs: `#30905`_) + +* **ISSUE** `#26867`_: (`joejulian`_) lvm pv's can show as not belonging to their vg if symlink is used (refs: `#30905`_) + +* **PR** `#30905`_: (`joejulian`_) Add realpath to lvm.pvdisplay and use it in vg_present + @ *2016-02-05 17:05:32 UTC* + + * 91806b03b9 Merge pull request `#30905`_ from joejulian/2015.8_fix_lvm_pv_mapper + + * f96650f3c3 Add realpath to lvm.pvdisplay and use it in vg_present + +* **ISSUE** `#30923`_: (`youngnick`_) Starting a glusterfs volume after creation fails with an exception in 2015.8 and after. (refs: `#30924`_) + +* **PR** `#30924`_: (`youngnick`_) Fix small bug with starting volumes after creation. + @ *2016-02-05 16:58:22 UTC* + + * af2832b69d Merge pull request `#30924`_ from youngnick/glusterfs-start-volume-bug + + * be5295cf7b Fix small bug with starting volumes after creation. + +* **PR** `#30910`_: (`cro`_) fix iDRAC state + @ *2016-02-05 16:49:06 UTC* + + * 3a6666ad25 Merge pull request `#30910`_ from cro/fx2_idrac + + * 68af2ab185 Lint. + + * c274c7ef6c Lint. + + * 3e38b762bf Add generic command for executing racadm commands on individual blades in a chassis. + + * 05979010f5 Finish the idrac state, fix problem with grains not loading sometimes. + +* **PR** `#30919`_: (`garethgreenaway`_) Fixes to ssh_auth state module + @ *2016-02-05 16:15:28 UTC* + + * 101fa12479 Merge pull request `#30919`_ from garethgreenaway/ssh_auth_cp_get_url_needs_saltenv + + * c9ba038553 The call to cp.get_url needs the saltenv, if you're using environments other than base, it will fail. + +* **ISSUE** `#30300`_: (`AkhterAli`_) boto_route53 __salt__ not defined. (refs: `#30867`_, `#30920`_) + +* **PR** `#30920`_: (`jacobhammons`_) Versioned to 2015.8.5, added known issue `#30300`_ to release notes + @ *2016-02-05 01:12:17 UTC* + + * 6d4fd11dd0 Merge pull request `#30920`_ from jacobhammons/release-notes + + * 93d47f8615 Versioned to 2015.8.5, added known issue `#30300`_ to release notes + +* **PR** `#30894`_: (`terminalmage`_) git module/state: Handle identity files more gracefully + @ *2016-02-04 23:55:01 UTC* + + * 3d3321ab92 Merge pull request `#30894`_ from terminalmage/issue30858 + + * 08741eb969 Update versionadded/versionchanged + + * 8909d430e1 salt.states.git.latest(): Prevent tracebacks when git ssh auth fails + + * c961cf1c7d git: only use passphrase-protected key if invoked using salt-call + + * 0b286f1bc3 Add global ssh_config path to git ssh wrapper + + * f813cce4ad Add salt.modules.ssh.key_is_encrypted() + + * 1ae7c53e17 Add salt.utils.files.process_read_exception() + +* **ISSUE** `#30694`_: (`pankajghadge`_) Tomcat war deployment version issue in new SALT version (refs: `#30750`_) + +* **PR** `#30750`_: (`jfindlay`_) extract whole war version + @ *2016-02-04 21:41:01 UTC* + + * 2415b3e62e Merge pull request `#30750`_ from jfindlay/war_version + + * 4b01c28ff9 modules,states.tomcat: allow specifying war version + + * 6deecdca0f states.tomcat: _extract_war_version parses path + + * 8dd3b6dfe9 modules.war._extract_war_version: allow non-semver + +* **ISSUE** `#30817`_: (`bogdanr`_) If the private_key filespecified in the provider is missing then the driver will be disabled (refs: `#30884`_) + +* **PR** `#30884`_: (`rallytime`_) Move checks for private_key file existence and permissions to create function + @ *2016-02-04 21:03:23 UTC* + + * 6a6456eaa6 Merge pull request `#30884`_ from rallytime/fix-30817 + + * 086ddae476 We need to check for a key_filename before looking for the path + + * e79321b418 Move checks for private_key file existence and permissions to create function + +* **PR** `#30888`_: (`ticosax`_) Backport `#30797`_ to 2015.8 + @ *2016-02-04 21:02:25 UTC* + + * **PR** `#30797`_: (`rhansen`_) don't delete existing Docker volume if driver unspecified (refs: `#30888`_) + + * 4ae2d829f0 Merge pull request `#30888`_ from ticosax/backport-30797 + + * 413c47a45f don't delete existing Docker volume if driver unspecified + + * 68b51be869 add additional states.dockerng.volume_present() unit tests + + * 849b94ed73 document the behavior if the driver is unspecified + +* **PR** `#30895`_: (`bdrung`_) Fix various typos + @ *2016-02-04 20:55:10 UTC* + + * 4372851ad9 Merge pull request `#30895`_ from bdrung/2015.8 + + * 708f2ff8ea Fix typo reponse -> response + + * 72c4eab6d7 Fix typo propogate -> propagate + + * 4912e365cb Fix typo directores -> directories + + * 74c8aba03e Fix typo exeption -> exception + + * 4692d84b07 Fix typos of improvement + + * 213fc2d858 Fix typo occuring -> occurring + + * fe6124003b Fix typo nonexistant -> nonexistent + + * 56ce7479b1 Fix typo catched -> caught + + * 821e690e65 Fix typo develoment -> development + + * b51279e086 Fix typo overide -> override + + * 4f2f04ea7d Fix typo relevent -> relevant + + * fe8be562c5 Fix typo existance -> existence + + * 4a2f4de1a8 Fix typo accross -> across + + * 9ae50c993e Fix typo Lenth -> Length + + * 20e79981e1 Fix typo preferrably -> preferably + + * f8d9f608dd Fix typo addres -> address + + * a7f12a13f0 Fix typo keywork -> keyword + + * bf92c3663b Fix typo formating -> formatting + + * ca4450d881 Fix typo wont -> won't + + * cd72b12161 Fix typo thats -> that's + + * 6db9724ec7 Fix typo doesnt -> doesn't + + * 58d46a7e98 Fix typo certficate -> certificate + +* **ISSUE** `#30887`_: (`anlutro`_) salt-ssh fails on import msgpack - 2015.8 (refs: `#30889`_) + +* **PR** `#30889`_: (`anlutro`_) Make msgpack an optional dependency in salt.utils.cache + @ *2016-02-04 20:53:39 UTC* + + * cdca33021a Merge pull request `#30889`_ from alprs/fix-cache_msgpack_optional + + * ab7aae3221 make msgpack an optional dependency in salt.utils.cache + +* **ISSUE** `#6602`_: (`corywright`_) Add ability to match on nodegroups to the compound matcher (refs: `#30896`_) + +* **ISSUE** `#25292`_: (`lichtamberg`_) Nodegroup matching in pillars via salt-SSH? (refs: `#30896`_) + +* **PR** `#30896`_: (`vutny`_) Update nodegroups parameter examples in master config example and docs + @ *2016-02-04 20:52:35 UTC* + + * 0dff45b4ac Merge pull request `#30896`_ from vutny/nodegroups-in-master-config-example + + * 936c1ff6c8 Add explanation about `N@` classifier. Inspired by `#25292`_ + + * 8bc2426816 Update example in master config documentation reference + + * ca8c0bdc3f Update nodegroups section example in master config according to docs + +* **ISSUE** `#30792`_: (`bender-the-greatest`_) Specifying version in pkgs list returns failure even though it succeeds (on Ubuntu) (refs: `#30898`_) + +* **PR** `#30898`_: (`abednarik`_) Fix pkg install with version. + @ *2016-02-04 20:52:14 UTC* + + * 33a400e943 Merge pull request `#30898`_ from abednarik/fix_pkg_version_debian_family + + * b15cdfd799 Fix pkg install with version. + +* **ISSUE** `#30843`_: (`HeathNaylor`_) SALT.STATES.BOTO_ELB register_instances error (refs: `#30867`_) + +* **ISSUE** `#30808`_: (`Reiner030`_) Nice2have: better boto error handling when AWS service isn't available (here: some authentication problems) (refs: `#30867`_) + +* **ISSUE** `#30300`_: (`AkhterAli`_) boto_route53 __salt__ not defined. (refs: `#30867`_, `#30920`_) + +* **PR** `#30867`_: (`rallytime`_) Pass in 'pack' variable to utils.boto.assign_funcs function from ALL boto modules + @ *2016-02-04 18:37:05 UTC* + + * **PR** `#30279`_: (`cachedout`_) Allow modules to be packed into boto utils (refs: `#30867`_) + + * 89bac9076a Merge pull request `#30867`_ from rallytime/boto-utils-fix + + * 6ad7642f6d Lint + + * 58778dfc88 Fix failing boto_vpc module unit tests + + * adb85892de Fix failing state module tests + + * b5ec0991b0 Pylint fix + + * c26c01568f Don't use pack=pack. Just pass in pack=__salt__ always. + + * 6146209c53 Pass in 'pack' variable to utils.boto.assign_funcs function from ALL boto modules. + +* **ISSUE** `#30798`_: (`tbaker57`_) salt/utils/aws.py has Python 2.7 dependency (refs: `#30849`_) + +* **PR** `#30849`_: (`jfindlay`_) utils.aws: use time lib to conver to epoch seconds + @ *2016-02-03 22:47:31 UTC* + + * 276cf626b0 Merge pull request `#30849`_ from jfindlay/aws_seconds + + * 17ae74dab1 utils.aws: use time lib to conver to epoch seconds + +* **ISSUE** `#30869`_: (`Ch3LL`_) git pillar: do not see all pillar data with multiple repos in 2015.8.4 (refs: `#30874`_) + +* **PR** `#30874`_: (`terminalmage`_) Fix regression in git_pillar when multiple remotes are configured + @ *2016-02-03 22:24:02 UTC* + + * 4cbc8a8250 Merge pull request `#30874`_ from terminalmage/issue30869 + + * 9cf0c8126d Fix regression in git_pillar when multiple remotes are configured + +* **ISSUE** `#30814`_: (`gpenin`_) [2015.8.*][Ubuntu 12.04 LTS][dpkg.py] Invalid "${binary:Package}" field in dpkg-query (refs: `#30850`_) + +* **PR** `#30850`_: (`jfindlay`_) modules.dpkg._get_pkg_info: allow for ubuntu 12.04 + @ *2016-02-03 16:33:26 UTC* + + * 8410842aea Merge pull request `#30850`_ from jfindlay/dpkg_var + + * d53a88762e modules.dpkg._get_pkg_info: handle older ubuntu + + * d3c6732539 modules.dpkg._get_pkg_info: use pythonic initializers + +* **PR** `#30852`_: (`replicant0wnz`_) Added more descriptive error message + @ *2016-02-03 16:30:15 UTC* + + * 9a3ec9d028 Merge pull request `#30852`_ from replicant0wnz/error-message-libgit + + * c3649023b5 Added more descriptive error message + +* **PR** `#30847`_: (`terminalmage`_) Backport `#30844`_ to 2015.8 branch + @ *2016-02-03 16:26:46 UTC* + + * **PR** `#30844`_: (`terminalmage`_) Perform initial gitfs/git_pillar fetch when init'ing remotes on masterless minion (refs: `#30847`_) + + * **PR** `#30703`_: (`kraney`_) Fix for gitfs ext_pillar on standalone minion (refs: `#30844`_) + + * 0338f445d9 Merge pull request `#30847`_ from terminalmage/bp-30844 + + * 58c4c01743 Add __role to master opts for gitfs integration tests + + * 17dfec2dd4 Only perform initial fetch when running on a minion + + * 53c4b4aaa4 gitfs: add initial fetch to pygit2 and dulwich + + * 78f92e9ab2 Fix for gitfs ext_pillar on standalone minion + +* **PR** `#30860`_: (`vutny`_) Correct installation documentation for RHEL-based distributions + @ *2016-02-03 16:13:09 UTC* + + * e51182495c Merge pull request `#30860`_ from vutny/correct-doc-install-on-rhel + + * 6648fd4c62 Correct links to Fedora COPR repositories + + * 083037fccc Remove duplicate post-installation tasks section + +* **PR** `#30841`_: (`jacobhammons`_) Release notes for 2015.8.5 + @ *2016-02-03 00:04:05 UTC* + + * f1cf027308 Merge pull request `#30841`_ from jacobhammons/release-notes + + * 6d0562ef86 Release notes for 2015.8.5 + +* **ISSUE** `#30820`_: (`Supermathie`_) State runs involving watch_in or extending break on 2015.8.4 (refs: `#30837`_, `#30835`_, `#30833`_) + +* **PR** `#30835`_: (`terminalmage`_) Integration test for `#30820`_ + @ *2016-02-02 23:51:53 UTC* + + * f8ac6002d3 Merge pull request `#30835`_ from terminalmage/issue30820 + + * ef14956db0 Integration test for `#30820`_ + +* **ISSUE** `#30820`_: (`Supermathie`_) State runs involving watch_in or extending break on 2015.8.4 (refs: `#30837`_, `#30835`_, `#30833`_) + +* **PR** `#30837`_: (`jacobhammons`_) Added known issue `#30820`_ to release notes + @ *2016-02-02 22:33:43 UTC* + + * e0901854ce Merge pull request `#30837`_ from jacobhammons/release-notes + + * 29e12a7fef Added known issue `#30820`_ to release notes + +* **ISSUE** `#28790`_: (`jfindlay`_) add grains (and others?) to salt modindex (refs: `#30832`_) + +* **PR** `#30832`_: (`rallytime`_) Add grains modules to salt modindex + @ *2016-02-02 21:47:46 UTC* + + * b512c7757a Merge pull request `#30832`_ from rallytime/fix-28790 + + * ca044dd201 Add grains modules to salt modindex + +* **ISSUE** `#28971`_: (`belt-ascendlearning`_) if the user exists, but has no permissions, rabbitmq_user.list_user_permissions() blows (refs: `#30822`_) + +* **PR** `#30822`_: (`rallytime`_) Make sure setting list_user_permissions to ['', '', ''] doesn't stacktrace + @ *2016-02-02 21:42:26 UTC* + + * 75db37a97d Merge pull request `#30822`_ from rallytime/rabbitmq-user-state-fixes + + * 272cc653ca Make sure setting list_user_permissions to ['', '', ''] doesn't stacktrace + + * a7afa7a368 Don't return a set() when checking for new tags in rabbitmq_user state + +* **ISSUE** `#30820`_: (`Supermathie`_) State runs involving watch_in or extending break on 2015.8.4 (refs: `#30837`_, `#30835`_, `#30833`_) + +* **PR** `#30833`_: (`terminalmage`_) Fix regression in scanning for state with 'name' param + @ *2016-02-02 21:25:09 UTC* + + * 557766f20b Merge pull request `#30833`_ from terminalmage/issue30820 + + * be3b8e2be6 Fix regression in scanning for state with 'name' param + +* **ISSUE** `#30722`_: (`yannis666`_) mine config is not merged from minion config and pillar (refs: `#30757`_, `#30823`_) + +* **PR** `#30823`_: (`yannis666`_) Fix for mine to merge configuration on update. + @ *2016-02-02 20:21:24 UTC* + + * ec4e2bb9bb Merge pull request `#30823`_ from yannis666/fix-for-mine-update-merge2 + + * 99c7c12aba Fix for mine to merge configuration on update. This fix was previously applied to 2015.5. It fixes `#30722`_ + +* **PR** `#30827`_: (`jacobhammons`_) Version to 2015.8.4, added CVE 2016-1866 to release notes + @ *2016-02-02 20:03:31 UTC* + + * d24b9f1ea1 Merge pull request `#30827`_ from jacobhammons/release-2015.8 + + * dfc1f7a57d Version to 2015.8.4, added CVE 2016-1866 to release notes + +* **ISSUE** `#30809`_: (`anlutro`_) Master configuration "pillar_merge_lists" has no effect (refs: `#30813`_) + +* **ISSUE** `#29601`_: (`seanjnkns`_) pillars not merging properly with 2015.8.3 (refs: `#30062`_) + +* **PR** `#30813`_: (`anlutro`_) Properly set the default value for pillar_merge_lists + @ *2016-02-02 19:53:52 UTC* + + * **PR** `#30458`_: (`rallytime`_) Back-port `#30062`_ to 2015.8 (refs: `#30813`_) + + * **PR** `#30062`_: (`seanjnkns`_) Remove recurse_list from pillar_source_merging_strategy and add pilla… (refs: `#30813`_, `#30458`_) + + * f83845d7c3 Merge pull request `#30813`_ from alprs/fix-pillar_merge_list_default + + * ec34cabee8 Properly set the default value for pillar_merge_lists + +* **PR** `#30826`_: (`cachedout`_) Fix 30682 + @ *2016-02-02 19:40:05 UTC* + + * a3feba4a26 Merge pull request `#30826`_ from cachedout/fix_30682 + + * 3b246db0b0 Fix stupid test + + * 12dc677628 Changed list conversion to use correct method and return whole set + + * 97eb4b8bf7 Pop values from new_tags set before loading into dict value + +* **PR** `#30818`_: (`rallytime`_) Back-port `#30790`_ to 2015.8 + @ *2016-02-02 18:57:55 UTC* + + * **PR** `#30790`_: (`xmj`_) salt/modules/sysrc.py: Fix documentation for set\_ (refs: `#30818`_) + + * b25b845d05 Merge pull request `#30818`_ from rallytime/bp-30790 + + * c7c66afd0c salt/modules/sysrc.py: Fix documentation for set\_ + +* **ISSUE** `#30604`_: (`vutny`_) Reactor overwrites `user` argument when calling runner or wheel module (refs: `#30815`_) + +* **PR** `#30815`_: (`vutny`_) Pick right user argument for updating reactor function's low data + @ *2016-02-02 16:50:23 UTC* + + * 3cb7a9ee54 Merge pull request `#30815`_ from vutny/reactor-low-data-fix + + * 4d4d67f9ac Pick right user argument for updating reactor function's low data + +* **ISSUE** `#30676`_: (`bwillcox`_) testsystemd.sh tries to use 'which' that does not exist in centos 7 lxc rootfs (refs: `#30747`_) + +* **PR** `#30747`_: (`jfindlay`_) modules.lxc.running_systemd: use `command -v` not `which` + @ *2016-02-02 14:54:17 UTC* + + * 36752906c4 Merge pull request `#30747`_ from jfindlay/lxc_which + + * f8f867570f modules.lxc.running_systemd: use `command -v` not `which` + +* **PR** `#30800`_: (`twangboy`_) Ability to handle special case installations + @ *2016-02-02 14:25:44 UTC* + + * 8abb5b30ad Merge pull request `#30800`_ from twangboy/chrome + + * fe0747c14e Fix another typo + + * 2815efc522 Fixes spelling + + * 6027e1ec53 Updates documentation to reflect new features + + * 1444ab1a48 Adds return success/failure for reg.broadcast_change + + * f2a36904d2 Fixes problem with missing key in old + + * 581a4df523 Added logic for dealing with latest in remove + + * c4357a6d80 Adds more logic for detecting latest + + * 40a66a2501 Logic for handling version: latest + + * b7dadd3b9b Fixes message formatting + + * a305c8ceae Added more descriptive failure message + + * fe49dcb57c Added broadcast change to force registry update + +* **PR** `#30794`_: (`rallytime`_) A spelling fix and some spacing fixes for the boto_ec2 module docs + @ *2016-02-01 21:45:33 UTC* + + * 7b44c0844d Merge pull request `#30794`_ from rallytime/boto_ec2-mod-doc-fix + + * 5188bc4b96 A spelling fix and some spacing fixes for the boto_ec2 module docs + +* **ISSUE** `#23789`_: (`hoonetorg`_) log output of salt orchestrate run changed between 2014.7.5 and 2015.5.0 significantly - hard to debug (refs: `#30756`_) + +* **PR** `#30756`_: (`basepi`_) [2015.8] Fix two error conditions in the highstate outputter + @ *2016-02-01 21:39:23 UTC* + + * 1f87ad0387 Merge pull request `#30756`_ from basepi/highstate.outputter.23789 + + * 16ad24d42c Import the logger + + * 1b5c6a240c Handle non-string types in comment + + * 11e34d047b Ensure rdurations are all floats for the highstate outputter + +* **PR** `#30788`_: (`rallytime`_) Fix incorrect doc example for dellchassis blade_idrac state + @ *2016-02-01 21:20:29 UTC* + + * 46adb2d1af Merge pull request `#30788`_ from rallytime/fix-dellchassis-doc-example + + * bfc16d9f7a Fix incorrect doc example for dellchassis blade_idrac state + +* **ISSUE** `#29161`_: (`jefferyharrell`_) saltmod.state's ret argument seems to do nothing (refs: `#30791`_, `#29207`_) + +* **PR** `#30791`_: (`Ch3LL`_) do not shadow ret function argument for salt.function + @ *2016-02-01 20:07:31 UTC* + + * **PR** `#29207`_: (`jfindlay`_) do not shadow ret function argument (refs: `#30791`_) + + * 333041aeb1 Merge pull request `#30791`_ from Ch3LL/2015.8 + + * d54f220c0a do not shadow ret function argument for salt.function + +* **ISSUE** `#30706`_: (`carsonoid`_) minion traceback when Log4mongo installed but not configured (refs: `#30726`_) + +* **PR** `#30726`_: (`sjmh`_) Fix improper use of yield in generator + @ *2016-02-01 18:13:24 UTC* + + * ce3be26e8f Merge pull request `#30726`_ from sjmh/fix/log4mongo + + * d501f1cc03 Fix improper use of yield in generator + +* **PR** `#30752`_: (`terminalmage`_) Backport systemd and yum/dnf optimizations from develop into 2015.8 + @ *2016-02-01 18:11:42 UTC* + + * a49b75e065 Merge pull request `#30752`_ from terminalmage/zh459 + + * 8a836c88f4 Update systemd tests + + * 54ddb92474 Backport yum/dnf optimizations from develop into 2015.8 + + * 1ec13699b6 Backport systemd optimizations from develop into 2015.8 + +* **PR** `#30759`_: (`thusoy`_) Allow managing empty files + @ *2016-01-31 19:06:37 UTC* + + * ea15628446 Merge pull request `#30759`_ from thusoy/empty-files + + * c6244b46ac Allow managing empty files + +* **PR** `#30758`_: (`thusoy`_) Support mounting labelled volumes with multiple drives + @ *2016-01-31 19:04:03 UTC* + + * 120d8344e4 Merge pull request `#30758`_ from thusoy/multi-device-mount + + * 9a6dc4898f Support mounting labelled volumes with multiple drives + +* **PR** `#30686`_: (`cachedout`_) Master-side pillar caching + @ *2016-01-31 18:52:47 UTC* + + * 9e8af2f994 Merge pull request `#30686`_ from cachedout/pillar_cache_2015_8 + + * 02d8ff626a Pillar cache for master + +* **ISSUE** `#30662`_: (`JoaquinVeira`_) UnicodeDecodeError on 2015.8 (refs: `#30675`_) + +* **PR** `#30675`_: (`jfindlay`_) handle non-ascii minion IDs + @ *2016-01-29 23:12:10 UTC* + + * 4008e1719a Merge pull request `#30675`_ from jfindlay/decode_id + + * 8f6737b6c4 output.key: decode minion ids to unicode + + * 7a16f1c941 config: decode id to unicode + +* **ISSUE** `#29602`_: (`multani`_) cloud.action start raises "got an unexpected keyword argument 'kwargs'" (refs: `#30691`_) + +* **PR** `#30691`_: (`rallytime`_) Make sure we use the "instance" kwarg in cloud.action. + @ *2016-01-29 23:11:37 UTC* + + * **PR** `#30217`_: (`pass-by-value`_) Make sure cloud actions can be called via salt run (refs: `#31061`_, `#30691`_) + + * 5ca75fbdc9 Merge pull request `#30691`_ from rallytime/cloud-action-instance + + * 0873a41601 Make note of empty dict return in docstring + + * 64a73502ed Make sure we just the "instance" kwarg in cloud.action. + +* **PR** `#30713`_: (`rallytime`_) Fix-up autodoc proxy modules for consistency + @ *2016-01-29 23:10:54 UTC* + + * 7c632d61d3 Merge pull request `#30713`_ from rallytime/proxy-module-docs + + * 86c3f2016e Fix-up autodoc proxy modules for consistency + +* **ISSUE** `#30654`_: (`Horgix`_) Misleading locale(mod) module behavior (refs: `#30741`_) + +* **PR** `#30741`_: (`jfindlay`_) states.locale.__virtual__: return exec mod load err + @ *2016-01-29 23:00:41 UTC* + + * 1f5f41cc07 Merge pull request `#30741`_ from jfindlay/locale_state + + * a3a2a44735 states.locale.__virtual__: return exec mod load err + +* **PR** `#30751`_: (`basepi`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-01-29 22:43:41 UTC* + + * 716c2bb7c8 Merge pull request `#30751`_ from basepi/merge-forward-2015.8 + + * 84eeab7720 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 + + * 076268089a Merge pull request `#30699`_ from abednarik/save_load_retry_time + + * 186872cf49 Add Retry to save_load. + + * 8d79d1b9c7 Merge pull request `#30659`_ from sjmh/fix-scsi + + * 3544dd995e Fix lsscsi issues for certain platforms + +* **PR** `#30720`_: (`clinta`_) x509.pem_managed does not return changes dict + @ *2016-01-29 17:07:26 UTC* + + * 1f0d0f591e Merge pull request `#30720`_ from clinta/fix-pem-managed-changes + + * 5c28efa9d3 return changes on test as well + + * e611f0269c fix typos and no changes returned for pem_managed + +* **PR** `#30687`_: (`clarkperkins`_) Setting 'del_root_vol_on_destroy' changes the root volume type to 'standard' + @ *2016-01-28 00:02:26 UTC* + + * **PR** `#30677`_: (`clarkperkins`_) Fix EC2 volume creation logic (refs: `#30687`_) + + * 36db0f99ed Merge pull request `#30687`_ from clarkperkins/bugfix/del-root-vol-loses-type + + * a71e181c18 Don't set on a volume when creating from a snapshot + + * 8cef43c68d When setting del_root_vol_on_destroy, preserve the existing volumeType on the AMI + +* **ISSUE** `#28257`_: (`peterzalewski`_) git_pillar remote with multiple branches yields conflicting cachedirs or checkout conflict (refs: `#30673`_) + +* **PR** `#30673`_: (`terminalmage`_) Properly derive the git_pillar cachedir from the id instead of the URL + @ *2016-01-27 23:52:01 UTC* + + * 690b8d26b9 Merge pull request `#30673`_ from terminalmage/issue28257 + + * 8b5933fab4 Properly derive the git_pillar cachedir from the id instead of the URL + + * 62654ade1d Add additional reason for pillar env being found + +* **PR** `#30666`_: (`cachedout`_) Fix grains cache + @ *2016-01-27 22:23:12 UTC* + + * 9f0e97693c Merge pull request `#30666`_ from cachedout/grains_cache_fix + + * 52716694f5 Fix grains cache + +* **PR** `#30623`_: (`twangboy`_) Added service.config function + @ *2016-01-27 21:08:12 UTC* + + * 8b17c77d72 Merge pull request `#30623`_ from twangboy/add_config + + * c70e182cdf Fixed indenting... got messed up somehow... + + * 246f75f2dd Renamed variables, updated docs, added tag + + * a4534ee94c Fixed documentation + + * 54b50236a6 Fixed another error + + * 76a0cf33e5 Fixed syntax error + + * 3937380b79 Added service.config function + +* **PR** `#30678`_: (`rallytime`_) Back-port `#30668`_ to 2015.8 + @ *2016-01-27 20:39:25 UTC* + + * **PR** `#30668`_: (`multani`_) Fix salt.modules.mount documentation (refs: `#30678`_) + + * 6af1927bd3 Merge pull request `#30678`_ from rallytime/bp-30668 + + * 7c7076e6af Fix salt.modules.mount documentation + +* **PR** `#30677`_: (`clarkperkins`_) Fix EC2 volume creation logic (refs: `#30687`_) + @ *2016-01-27 18:09:29 UTC* + + * 6c71b29f25 Merge pull request `#30677`_ from clarkperkins/bugfix/ec2-volume-logic + + * bfec052e7d Added some extra documentation + + * ed2eee8e39 Allow volume params to be set even when specifying a snapshot + +* **ISSUE** `#18980`_: (`lrhazi`_) salt-cloud: ExtraData: unpack(b) received extra data. (refs: `#30671`_) + +* **PR** `#30680`_: (`cro`_) Merge forward from 2015.5, primarily for `#30671`_ + @ *2016-01-27 17:56:48 UTC* + + * **PR** `#30671`_: (`techhat`_) Add file locking to cloud index (refs: `#30680`_) + + * 36142390d4 Merge pull request `#30680`_ from cro/mf20155-20158-20160127 + + * f8ae3a20ff Merge remote-tracking branch 'upstream/2015.5' into mf20155-20158-20160127 Mergeforward from 2015.5. + + * 516919525a Merge pull request `#30671`_ from techhat/lockcloud + + * 4719f8d4ea Whitespace + + * 8e7eca23e4 Add file locking to cloud index + +* **PR** `#30663`_: (`isbm`_) Zypper: latest version bugfix and epoch support feature + @ *2016-01-27 17:10:42 UTC* + + * f6feddecb4 Merge pull request `#30663`_ from isbm/isbm-zypper-latest-versionfail + + * 4336487765 Add support for epoch in Zypper + + * 12d515fa0c Fix package status filtering on latest version + +* **PR** `#30652`_: (`mew1033`_) Fix sh beacon + @ *2016-01-27 17:00:29 UTC* + + * 9d8ddeb525 Merge pull request `#30652`_ from mew1033/fix-sh-beacon + + * 256d037e0f Fix sh beacon + +* **ISSUE** `#29678`_: (`dschaller`_) NPM Install Forces Silent (refs: `#29650`_) + +* **PR** `#30657`_: (`jfindlay`_) [2015.8] Backport `#30378`_ and `#29650`_ + @ *2016-01-27 00:34:00 UTC* + + * **PR** `#30378`_: (`dschaller`_) Adding silent flag to npm.bootstrap (refs: `#30657`_) + + * **PR** `#29650`_: (`dschaller`_) Adding ability to disable npm install silent flag (refs: `#30657`_) + + * 1fa1963895 Merge pull request `#30657`_ from jfindlay/backport_quiet + + * ca4adbf382 Adding ability to disable npm install silent flag + + * afe149eb6d Adding ability to disable npm install silent flag + + * c1101b5f0b Adding ability to disable npm install silent flag + + * d29ad8bbf6 Adding ability to disable npm install silent flag + + * 7a21dbf0d9 Adding silent flag to npm.bootstrap + + * 354c0bdf26 Adding silent flag to npm.bootstrap + +* **PR** `#30656`_: (`rallytime`_) [2015.8] Merge 2015.5 into 2015.8 + @ *2016-01-27 00:33:30 UTC* + + * 3621651bf8 Merge pull request `#30656`_ from rallytime/merge-forward-2015.8 + + * 76ab6981a5 Merge branch '2015.5' into 2015.8 + + * 643c9c9616 Merge pull request `#30586`_ from abednarik/fix_comment_line_perms + + * 8b395a42cb Fix comment_line permissions. + +* **PR** `#30644`_: (`tbaker57`_) Another go at fixing 30573 + @ *2016-01-26 20:18:41 UTC* + + * 30e03a8b0c Merge pull request `#30644`_ from tbaker57/another_go_at_30573 + + * 267b8827fd Another go at fixing 30573 + +* **PR** `#30611`_: (`isbm`_) Bugfix: Zypper `pkg.latest` crash fix + @ *2016-01-26 16:35:47 UTC* + + * 7d307e2a04 Merge pull request `#30611`_ from isbm/isbm-zypper-latest + + * a7141be651 Put 'kwargs' on its own line according to the common pattern + + * ee9b3f859b Bugfix: do not treat SLS id as a package name if an empty 'pkgs' list specified. + + * d3cfd8ed41 Cleanup formatting + + * 1bdbaac658 Add error handling + + * 2ec5cec8a4 Add a new line before the last return + + * 424383b8c4 Remove unnecessary complexity and string increment + + * 48e8d90343 Avoid backslashes where they are not needed + + * 6df5d500f0 Use regexp type for the string. + + * c2ca141956 Get version as an explicit parameter + + * 9e944db706 Check the version of the package, instead of the package name + + * 59ea758efb Fix formatting + + * 514f6349d4 Bugfix: crash on "key not found" error + + * ea75f55a1a Fix PEP8: line continuation + + * ece35ebc26 Replace old fashion string memcopy with the list + + * 716445e588 Fix PEP8: line continuation + + * 0f11079ff9 Fix PEP8 for the operator + +* **ISSUE** `#7811`_: (`kiall`_) RabbitMQ Cluster/Plugins/Policy etc states do not track changes, preventing "watch" from working (refs: `#30631`_) + +* **PR** `#30631`_: (`rallytime`_) Refactor rabbitmq_cluster states to use test=true functionality correctly + @ *2016-01-26 16:23:49 UTC* + + * 5bc11d7539 Merge pull request `#30631`_ from rallytime/fix-7811 + + * bf9ffded6d Refactor rabbitmq_cluster states to use test=true functionality correctly + +* **ISSUE** `#25658`_: (`tsaridas`_) rabbitmq_policy.present state (refs: `#30628`_) + +* **PR** `#30628`_: (`rallytime`_) Refactor rabbitmq_policy states to use test=true functionality correctly + @ *2016-01-26 00:21:03 UTC* + + * ef6c4e8377 Merge pull request `#30628`_ from rallytime/fix-25658 + + * 1e8e86007c Refactor rabbitmq_policy states to use test=true functionality correctly + +* **PR** `#30624`_: (`cro`_) Remove bad symlinks from osx pkg dir + @ *2016-01-26 00:02:25 UTC* + + * 80d0e428aa Merge pull request `#30624`_ from cro/remove_bad_symlinks + + * f5fd38624e Remove bad symlinks in osx pkg dirs + +* **ISSUE** `#30621`_: (`zer0def`_) Current latest (2015.8.3) list of builtin states docu doesn't list 'glance' (refs: `#30622`_) + +* **PR** `#30622`_: (`rallytime`_) Add glance state to list of state modules + @ *2016-01-25 23:55:54 UTC* + + * 330ea9a292 Merge pull request `#30622`_ from rallytime/fix-30621 + + * 57b7e6cc93 Add glance state to list of state modules + +* **ISSUE** `#19288`_: (`oba11`_) AssociatePublicIpAddress doesnt work with salt-cloud 2014.7.0 (refs: `#20972`_, `#30591`_) + +* **PR** `#30618`_: (`rallytime`_) Back-port `#30591`_ to 2015.8 + @ *2016-01-25 23:55:20 UTC* + + * **PR** `#30591`_: (`mlalpho`_) salt-cloud-clouds-ec2 AssociatePublicIpAddress fix (refs: `#30618`_) + + * **PR** `#20972`_: (`JohannesEbke`_) Fix interface cleanup when using AssociatePublicIpAddress in `#19288`_ (refs: `#30591`_) + + * f00d8f398a Merge pull request `#30618`_ from rallytime/bp-30591 + + * 2c9d59fa42 looks like a re-merge of PR `#20972`_ which relates to `#19288`_ + +* **ISSUE** `#30587`_: (`sjorge`_) [docs] docs confusing on client_acl and external_auth usage (refs: `#30625`_) + +* **PR** `#30625`_: (`jfindlay`_) doc.topics.eauth: clarify client_acl vs eauth + @ *2016-01-25 23:03:24 UTC* + + * 6b940d9655 Merge pull request `#30625`_ from jfindlay/eauth_acl + + * b5e2cff028 doc.topics.eauth: clarify client_acl vs eauth + +.. _`#10330`: https://github.com/saltstack/salt/issues/10330 +.. _`#14664`: https://github.com/saltstack/salt/issues/14664 +.. _`#18980`: https://github.com/saltstack/salt/issues/18980 +.. _`#19288`: https://github.com/saltstack/salt/issues/19288 +.. _`#20972`: https://github.com/saltstack/salt/pull/20972 +.. _`#21932`: https://github.com/saltstack/salt/issues/21932 +.. _`#23789`: https://github.com/saltstack/salt/issues/23789 +.. _`#24559`: https://github.com/saltstack/salt/issues/24559 +.. _`#24569`: https://github.com/saltstack/salt/pull/24569 +.. _`#24955`: https://github.com/saltstack/salt/issues/24955 +.. _`#25292`: https://github.com/saltstack/salt/issues/25292 +.. _`#25658`: https://github.com/saltstack/salt/issues/25658 +.. _`#26415`: https://github.com/saltstack/salt/issues/26415 +.. _`#26498`: https://github.com/saltstack/salt/issues/26498 +.. _`#26867`: https://github.com/saltstack/salt/issues/26867 +.. _`#26944`: https://github.com/saltstack/salt/issues/26944 +.. _`#27063`: https://github.com/saltstack/salt/issues/27063 +.. _`#27093`: https://github.com/saltstack/salt/issues/27093 +.. _`#27498`: https://github.com/saltstack/salt/issues/27498 .. _`#27796`: https://github.com/saltstack/salt/issues/27796 +.. _`#27960`: https://github.com/saltstack/salt/issues/27960 +.. _`#27976`: https://github.com/saltstack/salt/issues/27976 +.. _`#28004`: https://github.com/saltstack/salt/issues/28004 +.. _`#28087`: https://github.com/saltstack/salt/pull/28087 +.. _`#28142`: https://github.com/saltstack/salt/issues/28142 +.. _`#28257`: https://github.com/saltstack/salt/issues/28257 +.. _`#28585`: https://github.com/saltstack/salt/issues/28585 +.. _`#28790`: https://github.com/saltstack/salt/issues/28790 +.. _`#28971`: https://github.com/saltstack/salt/issues/28971 +.. _`#29094`: https://github.com/saltstack/salt/issues/29094 +.. _`#29161`: https://github.com/saltstack/salt/issues/29161 +.. _`#29188`: https://github.com/saltstack/salt/issues/29188 +.. _`#29207`: https://github.com/saltstack/salt/pull/29207 +.. _`#29239`: https://github.com/saltstack/salt/issues/29239 +.. _`#29423`: https://github.com/saltstack/salt/issues/29423 +.. _`#29520`: https://github.com/saltstack/salt/issues/29520 +.. _`#29528`: https://github.com/saltstack/salt/issues/29528 +.. _`#29567`: https://github.com/saltstack/salt/issues/29567 +.. _`#29601`: https://github.com/saltstack/salt/issues/29601 +.. _`#29602`: https://github.com/saltstack/salt/issues/29602 +.. _`#29636`: https://github.com/saltstack/salt/issues/29636 .. _`#29650`: https://github.com/saltstack/salt/pull/29650 +.. _`#29666`: https://github.com/saltstack/salt/issues/29666 +.. _`#29678`: https://github.com/saltstack/salt/issues/29678 +.. _`#29701`: https://github.com/saltstack/salt/issues/29701 .. _`#29718`: https://github.com/saltstack/salt/pull/29718 +.. _`#29727`: https://github.com/saltstack/salt/issues/29727 +.. _`#29733`: https://github.com/saltstack/salt/issues/29733 +.. _`#29753`: https://github.com/saltstack/salt/issues/29753 +.. _`#29758`: https://github.com/saltstack/salt/issues/29758 +.. _`#29795`: https://github.com/saltstack/salt/issues/29795 .. _`#30062`: https://github.com/saltstack/salt/pull/30062 +.. _`#30169`: https://github.com/saltstack/salt/issues/30169 +.. _`#30181`: https://github.com/saltstack/salt/issues/30181 .. _`#30217`: https://github.com/saltstack/salt/pull/30217 +.. _`#30261`: https://github.com/saltstack/salt/issues/30261 .. _`#30279`: https://github.com/saltstack/salt/pull/30279 .. _`#30300`: https://github.com/saltstack/salt/issues/30300 .. _`#30378`: https://github.com/saltstack/salt/pull/30378 +.. _`#30431`: https://github.com/saltstack/salt/issues/30431 .. _`#30458`: https://github.com/saltstack/salt/pull/30458 .. _`#30461`: https://github.com/saltstack/salt/issues/30461 +.. _`#30464`: https://github.com/saltstack/salt/issues/30464 +.. _`#30472`: https://github.com/saltstack/salt/issues/30472 +.. _`#30489`: https://github.com/saltstack/salt/issues/30489 +.. _`#30528`: https://github.com/saltstack/salt/issues/30528 .. _`#30542`: https://github.com/saltstack/salt/pull/30542 .. _`#30586`: https://github.com/saltstack/salt/pull/30586 +.. _`#30587`: https://github.com/saltstack/salt/issues/30587 .. _`#30591`: https://github.com/saltstack/salt/pull/30591 +.. _`#30604`: https://github.com/saltstack/salt/issues/30604 .. _`#30611`: https://github.com/saltstack/salt/pull/30611 .. _`#30618`: https://github.com/saltstack/salt/pull/30618 +.. _`#30621`: https://github.com/saltstack/salt/issues/30621 .. _`#30622`: https://github.com/saltstack/salt/pull/30622 .. _`#30623`: https://github.com/saltstack/salt/pull/30623 .. _`#30624`: https://github.com/saltstack/salt/pull/30624 .. _`#30625`: https://github.com/saltstack/salt/pull/30625 .. _`#30628`: https://github.com/saltstack/salt/pull/30628 .. _`#30631`: https://github.com/saltstack/salt/pull/30631 +.. _`#30643`: https://github.com/saltstack/salt/issues/30643 .. _`#30644`: https://github.com/saltstack/salt/pull/30644 +.. _`#30651`: https://github.com/saltstack/salt/issues/30651 .. _`#30652`: https://github.com/saltstack/salt/pull/30652 +.. _`#30654`: https://github.com/saltstack/salt/issues/30654 .. _`#30656`: https://github.com/saltstack/salt/pull/30656 .. _`#30657`: https://github.com/saltstack/salt/pull/30657 .. _`#30659`: https://github.com/saltstack/salt/pull/30659 +.. _`#30662`: https://github.com/saltstack/salt/issues/30662 .. _`#30663`: https://github.com/saltstack/salt/pull/30663 .. _`#30666`: https://github.com/saltstack/salt/pull/30666 .. _`#30668`: https://github.com/saltstack/salt/pull/30668 .. _`#30671`: https://github.com/saltstack/salt/pull/30671 .. _`#30673`: https://github.com/saltstack/salt/pull/30673 .. _`#30675`: https://github.com/saltstack/salt/pull/30675 +.. _`#30676`: https://github.com/saltstack/salt/issues/30676 .. _`#30677`: https://github.com/saltstack/salt/pull/30677 .. _`#30678`: https://github.com/saltstack/salt/pull/30678 .. _`#30680`: https://github.com/saltstack/salt/pull/30680 @@ -638,11 +3324,14 @@ Changes: .. _`#30687`: https://github.com/saltstack/salt/pull/30687 .. _`#30689`: https://github.com/saltstack/salt/pull/30689 .. _`#30691`: https://github.com/saltstack/salt/pull/30691 +.. _`#30694`: https://github.com/saltstack/salt/issues/30694 .. _`#30699`: https://github.com/saltstack/salt/pull/30699 .. _`#30703`: https://github.com/saltstack/salt/pull/30703 .. _`#30704`: https://github.com/saltstack/salt/pull/30704 +.. _`#30706`: https://github.com/saltstack/salt/issues/30706 .. _`#30713`: https://github.com/saltstack/salt/pull/30713 .. _`#30720`: https://github.com/saltstack/salt/pull/30720 +.. _`#30722`: https://github.com/saltstack/salt/issues/30722 .. _`#30726`: https://github.com/saltstack/salt/pull/30726 .. _`#30741`: https://github.com/saltstack/salt/pull/30741 .. _`#30747`: https://github.com/saltstack/salt/pull/30747 @@ -655,17 +3344,24 @@ Changes: .. _`#30758`: https://github.com/saltstack/salt/pull/30758 .. _`#30759`: https://github.com/saltstack/salt/pull/30759 .. _`#30760`: https://github.com/saltstack/salt/pull/30760 +.. _`#30761`: https://github.com/saltstack/salt/issues/30761 .. _`#30764`: https://github.com/saltstack/salt/pull/30764 .. _`#30784`: https://github.com/saltstack/salt/pull/30784 .. _`#30788`: https://github.com/saltstack/salt/pull/30788 .. _`#30790`: https://github.com/saltstack/salt/pull/30790 .. _`#30791`: https://github.com/saltstack/salt/pull/30791 +.. _`#30792`: https://github.com/saltstack/salt/issues/30792 .. _`#30794`: https://github.com/saltstack/salt/pull/30794 .. _`#30796`: https://github.com/saltstack/salt/pull/30796 .. _`#30797`: https://github.com/saltstack/salt/pull/30797 +.. _`#30798`: https://github.com/saltstack/salt/issues/30798 .. _`#30800`: https://github.com/saltstack/salt/pull/30800 +.. _`#30808`: https://github.com/saltstack/salt/issues/30808 +.. _`#30809`: https://github.com/saltstack/salt/issues/30809 .. _`#30813`: https://github.com/saltstack/salt/pull/30813 +.. _`#30814`: https://github.com/saltstack/salt/issues/30814 .. _`#30815`: https://github.com/saltstack/salt/pull/30815 +.. _`#30817`: https://github.com/saltstack/salt/issues/30817 .. _`#30818`: https://github.com/saltstack/salt/pull/30818 .. _`#30820`: https://github.com/saltstack/salt/issues/30820 .. _`#30822`: https://github.com/saltstack/salt/pull/30822 @@ -679,6 +3375,7 @@ Changes: .. _`#30835`: https://github.com/saltstack/salt/pull/30835 .. _`#30837`: https://github.com/saltstack/salt/pull/30837 .. _`#30841`: https://github.com/saltstack/salt/pull/30841 +.. _`#30843`: https://github.com/saltstack/salt/issues/30843 .. _`#30844`: https://github.com/saltstack/salt/pull/30844 .. _`#30847`: https://github.com/saltstack/salt/pull/30847 .. _`#30849`: https://github.com/saltstack/salt/pull/30849 @@ -686,39 +3383,50 @@ Changes: .. _`#30852`: https://github.com/saltstack/salt/pull/30852 .. _`#30860`: https://github.com/saltstack/salt/pull/30860 .. _`#30865`: https://github.com/saltstack/salt/pull/30865 +.. _`#30866`: https://github.com/saltstack/salt/issues/30866 .. _`#30867`: https://github.com/saltstack/salt/pull/30867 +.. _`#30869`: https://github.com/saltstack/salt/issues/30869 .. _`#30874`: https://github.com/saltstack/salt/pull/30874 .. _`#30879`: https://github.com/saltstack/salt/pull/30879 +.. _`#30882`: https://github.com/saltstack/salt/issues/30882 .. _`#30884`: https://github.com/saltstack/salt/pull/30884 +.. _`#30887`: https://github.com/saltstack/salt/issues/30887 .. _`#30888`: https://github.com/saltstack/salt/pull/30888 .. _`#30889`: https://github.com/saltstack/salt/pull/30889 .. _`#30893`: https://github.com/saltstack/salt/pull/30893 .. _`#30894`: https://github.com/saltstack/salt/pull/30894 .. _`#30895`: https://github.com/saltstack/salt/pull/30895 .. _`#30896`: https://github.com/saltstack/salt/pull/30896 -.. _`#30897`: https://github.com/saltstack/salt/pull/30897 .. _`#30898`: https://github.com/saltstack/salt/pull/30898 .. _`#30905`: https://github.com/saltstack/salt/pull/30905 .. _`#30910`: https://github.com/saltstack/salt/pull/30910 .. _`#30919`: https://github.com/saltstack/salt/pull/30919 .. _`#30920`: https://github.com/saltstack/salt/pull/30920 .. _`#30922`: https://github.com/saltstack/salt/pull/30922 +.. _`#30923`: https://github.com/saltstack/salt/issues/30923 .. _`#30924`: https://github.com/saltstack/salt/pull/30924 +.. _`#30932`: https://github.com/saltstack/salt/issues/30932 .. _`#30934`: https://github.com/saltstack/salt/issues/30934 +.. _`#30938`: https://github.com/saltstack/salt/issues/30938 .. _`#30940`: https://github.com/saltstack/salt/pull/30940 .. _`#30941`: https://github.com/saltstack/salt/pull/30941 .. _`#30942`: https://github.com/saltstack/salt/pull/30942 .. _`#30944`: https://github.com/saltstack/salt/pull/30944 .. _`#30945`: https://github.com/saltstack/salt/pull/30945 -.. _`#30949`: https://github.com/saltstack/salt/pull/30949 +.. _`#30950`: https://github.com/saltstack/salt/issues/30950 .. _`#30955`: https://github.com/saltstack/salt/pull/30955 +.. _`#30962`: https://github.com/saltstack/salt/issues/30962 .. _`#30965`: https://github.com/saltstack/salt/pull/30965 .. _`#30974`: https://github.com/saltstack/salt/pull/30974 .. _`#30975`: https://github.com/saltstack/salt/pull/30975 .. _`#30978`: https://github.com/saltstack/salt/pull/30978 +.. _`#30983`: https://github.com/saltstack/salt/issues/30983 .. _`#30987`: https://github.com/saltstack/salt/pull/30987 +.. _`#30993`: https://github.com/saltstack/salt/issues/30993 +.. _`#30994`: https://github.com/saltstack/salt/issues/30994 .. _`#30998`: https://github.com/saltstack/salt/pull/30998 .. _`#30999`: https://github.com/saltstack/salt/issues/30999 +.. _`#31000`: https://github.com/saltstack/salt/issues/31000 .. _`#31002`: https://github.com/saltstack/salt/pull/31002 .. _`#31004`: https://github.com/saltstack/salt/pull/31004 .. _`#31007`: https://github.com/saltstack/salt/pull/31007 @@ -732,15 +3440,21 @@ Changes: .. _`#31031`: https://github.com/saltstack/salt/pull/31031 .. _`#31032`: https://github.com/saltstack/salt/pull/31032 .. _`#31037`: https://github.com/saltstack/salt/pull/31037 +.. _`#31041`: https://github.com/saltstack/salt/issues/31041 .. _`#31042`: https://github.com/saltstack/salt/pull/31042 .. _`#31049`: https://github.com/saltstack/salt/pull/31049 .. _`#31050`: https://github.com/saltstack/salt/pull/31050 .. _`#31053`: https://github.com/saltstack/salt/pull/31053 +.. _`#31056`: https://github.com/saltstack/salt/issues/31056 +.. _`#31059`: https://github.com/saltstack/salt/issues/31059 .. _`#31061`: https://github.com/saltstack/salt/pull/31061 +.. _`#31069`: https://github.com/saltstack/salt/issues/31069 .. _`#31085`: https://github.com/saltstack/salt/pull/31085 +.. _`#31088`: https://github.com/saltstack/salt/issues/31088 .. _`#31090`: https://github.com/saltstack/salt/pull/31090 .. _`#31093`: https://github.com/saltstack/salt/pull/31093 .. _`#31095`: https://github.com/saltstack/salt/pull/31095 +.. _`#31099`: https://github.com/saltstack/salt/issues/31099 .. _`#31100`: https://github.com/saltstack/salt/pull/31100 .. _`#31103`: https://github.com/saltstack/salt/pull/31103 .. _`#31105`: https://github.com/saltstack/salt/pull/31105 @@ -748,6 +3462,7 @@ Changes: .. _`#31107`: https://github.com/saltstack/salt/pull/31107 .. _`#31108`: https://github.com/saltstack/salt/pull/31108 .. _`#31110`: https://github.com/saltstack/salt/pull/31110 +.. _`#31115`: https://github.com/saltstack/salt/issues/31115 .. _`#31119`: https://github.com/saltstack/salt/pull/31119 .. _`#31120`: https://github.com/saltstack/salt/pull/31120 .. _`#31124`: https://github.com/saltstack/salt/pull/31124 @@ -757,6 +3472,7 @@ Changes: .. _`#31132`: https://github.com/saltstack/salt/pull/31132 .. _`#31133`: https://github.com/saltstack/salt/pull/31133 .. _`#31134`: https://github.com/saltstack/salt/pull/31134 +.. _`#31137`: https://github.com/saltstack/salt/issues/31137 .. _`#31147`: https://github.com/saltstack/salt/pull/31147 .. _`#31149`: https://github.com/saltstack/salt/pull/31149 .. _`#31152`: https://github.com/saltstack/salt/pull/31152 @@ -767,25 +3483,27 @@ Changes: .. _`#31170`: https://github.com/saltstack/salt/pull/31170 .. _`#31171`: https://github.com/saltstack/salt/pull/31171 .. _`#31172`: https://github.com/saltstack/salt/pull/31172 -.. _`#31176`: https://github.com/saltstack/salt/pull/31176 .. _`#31177`: https://github.com/saltstack/salt/pull/31177 .. _`#31181`: https://github.com/saltstack/salt/pull/31181 .. _`#31182`: https://github.com/saltstack/salt/pull/31182 .. _`#31183`: https://github.com/saltstack/salt/pull/31183 +.. _`#31185`: https://github.com/saltstack/salt/issues/31185 .. _`#31189`: https://github.com/saltstack/salt/pull/31189 .. _`#31190`: https://github.com/saltstack/salt/pull/31190 .. _`#31191`: https://github.com/saltstack/salt/pull/31191 +.. _`#31193`: https://github.com/saltstack/salt/issues/31193 .. _`#31196`: https://github.com/saltstack/salt/pull/31196 .. _`#31201`: https://github.com/saltstack/salt/pull/31201 +.. _`#31216`: https://github.com/saltstack/salt/issues/31216 .. _`#31223`: https://github.com/saltstack/salt/issues/31223 .. _`#31225`: https://github.com/saltstack/salt/pull/31225 .. _`#31226`: https://github.com/saltstack/salt/pull/31226 +.. _`#31229`: https://github.com/saltstack/salt/issues/31229 .. _`#31233`: https://github.com/saltstack/salt/pull/31233 .. _`#31234`: https://github.com/saltstack/salt/pull/31234 .. _`#31237`: https://github.com/saltstack/salt/pull/31237 .. _`#31239`: https://github.com/saltstack/salt/pull/31239 .. _`#31245`: https://github.com/saltstack/salt/pull/31245 -.. _`#31250`: https://github.com/saltstack/salt/pull/31250 .. _`#31253`: https://github.com/saltstack/salt/pull/31253 .. _`#31255`: https://github.com/saltstack/salt/pull/31255 .. _`#31264`: https://github.com/saltstack/salt/pull/31264 @@ -794,6 +3512,7 @@ Changes: .. _`#31287`: https://github.com/saltstack/salt/pull/31287 .. _`#31288`: https://github.com/saltstack/salt/pull/31288 .. _`#31292`: https://github.com/saltstack/salt/pull/31292 +.. _`#31293`: https://github.com/saltstack/salt/issues/31293 .. _`#31299`: https://github.com/saltstack/salt/pull/31299 .. _`#31301`: https://github.com/saltstack/salt/pull/31301 .. _`#31302`: https://github.com/saltstack/salt/pull/31302 @@ -811,21 +3530,26 @@ Changes: .. _`#31353`: https://github.com/saltstack/salt/pull/31353 .. _`#31354`: https://github.com/saltstack/salt/pull/31354 .. _`#31357`: https://github.com/saltstack/salt/pull/31357 +.. _`#31365`: https://github.com/saltstack/salt/issues/31365 +.. _`#31366`: https://github.com/saltstack/salt/issues/31366 .. _`#31367`: https://github.com/saltstack/salt/pull/31367 .. _`#31368`: https://github.com/saltstack/salt/pull/31368 +.. _`#31370`: https://github.com/saltstack/salt/issues/31370 .. _`#31373`: https://github.com/saltstack/salt/pull/31373 .. _`#31374`: https://github.com/saltstack/salt/pull/31374 .. _`#31376`: https://github.com/saltstack/salt/pull/31376 .. _`#31378`: https://github.com/saltstack/salt/pull/31378 .. _`#31380`: https://github.com/saltstack/salt/pull/31380 -.. _`#31382`: https://github.com/saltstack/salt/pull/31382 .. _`#31390`: https://github.com/saltstack/salt/pull/31390 .. _`#31391`: https://github.com/saltstack/salt/pull/31391 +.. _`#31402`: https://github.com/saltstack/salt/issues/31402 +.. _`#31410`: https://github.com/saltstack/salt/issues/31410 .. _`#31411`: https://github.com/saltstack/salt/pull/31411 .. _`#31416`: https://github.com/saltstack/salt/pull/31416 .. _`#31417`: https://github.com/saltstack/salt/pull/31417 .. _`#31418`: https://github.com/saltstack/salt/pull/31418 .. _`#31420`: https://github.com/saltstack/salt/pull/31420 +.. _`#31427`: https://github.com/saltstack/salt/issues/31427 .. _`#31429`: https://github.com/saltstack/salt/pull/31429 .. _`#31432`: https://github.com/saltstack/salt/pull/31432 .. _`#31439`: https://github.com/saltstack/salt/pull/31439 @@ -853,6 +3577,7 @@ Changes: .. _`#31508`: https://github.com/saltstack/salt/pull/31508 .. _`#31510`: https://github.com/saltstack/salt/pull/31510 .. _`#31512`: https://github.com/saltstack/salt/pull/31512 +.. _`#31516`: https://github.com/saltstack/salt/issues/31516 .. _`#31521`: https://github.com/saltstack/salt/pull/31521 .. _`#31525`: https://github.com/saltstack/salt/pull/31525 .. _`#31528`: https://github.com/saltstack/salt/pull/31528 @@ -865,15 +3590,20 @@ Changes: .. _`#31550`: https://github.com/saltstack/salt/pull/31550 .. _`#31558`: https://github.com/saltstack/salt/pull/31558 .. _`#31561`: https://github.com/saltstack/salt/pull/31561 +.. _`#31563`: https://github.com/saltstack/salt/issues/31563 .. _`#31567`: https://github.com/saltstack/salt/pull/31567 .. _`#31568`: https://github.com/saltstack/salt/pull/31568 .. _`#31570`: https://github.com/saltstack/salt/pull/31570 -.. _`#31578`: https://github.com/saltstack/salt/pull/31578 +.. _`#31579`: https://github.com/saltstack/salt/issues/31579 .. _`#31583`: https://github.com/saltstack/salt/pull/31583 +.. _`#31585`: https://github.com/saltstack/salt/issues/31585 +.. _`#31586`: https://github.com/saltstack/salt/issues/31586 .. _`#31589`: https://github.com/saltstack/salt/pull/31589 .. _`#31592`: https://github.com/saltstack/salt/pull/31592 .. _`#31593`: https://github.com/saltstack/salt/pull/31593 .. _`#31594`: https://github.com/saltstack/salt/pull/31594 +.. _`#31595`: https://github.com/saltstack/salt/issues/31595 +.. _`#31596`: https://github.com/saltstack/salt/issues/31596 .. _`#31598`: https://github.com/saltstack/salt/pull/31598 .. _`#31601`: https://github.com/saltstack/salt/pull/31601 .. _`#31604`: https://github.com/saltstack/salt/pull/31604 @@ -882,6 +3612,7 @@ Changes: .. _`#31627`: https://github.com/saltstack/salt/pull/31627 .. _`#31629`: https://github.com/saltstack/salt/pull/31629 .. _`#31630`: https://github.com/saltstack/salt/pull/31630 +.. _`#31639`: https://github.com/saltstack/salt/issues/31639 .. _`#31641`: https://github.com/saltstack/salt/pull/31641 .. _`#31643`: https://github.com/saltstack/salt/pull/31643 .. _`#31651`: https://github.com/saltstack/salt/pull/31651 @@ -900,12 +3631,14 @@ Changes: .. _`#31689`: https://github.com/saltstack/salt/pull/31689 .. _`#31700`: https://github.com/saltstack/salt/pull/31700 .. _`#31702`: https://github.com/saltstack/salt/pull/31702 +.. _`#31704`: https://github.com/saltstack/salt/issues/31704 .. _`#31705`: https://github.com/saltstack/salt/pull/31705 .. _`#31707`: https://github.com/saltstack/salt/pull/31707 .. _`#31711`: https://github.com/saltstack/salt/pull/31711 .. _`#31713`: https://github.com/saltstack/salt/pull/31713 .. _`#31719`: https://github.com/saltstack/salt/pull/31719 .. _`#31723`: https://github.com/saltstack/salt/pull/31723 +.. _`#31728`: https://github.com/saltstack/salt/issues/31728 .. _`#31733`: https://github.com/saltstack/salt/pull/31733 .. _`#31735`: https://github.com/saltstack/salt/pull/31735 .. _`#31740`: https://github.com/saltstack/salt/pull/31740 @@ -917,11 +3650,14 @@ Changes: .. _`#31752`: https://github.com/saltstack/salt/pull/31752 .. _`#31754`: https://github.com/saltstack/salt/pull/31754 .. _`#31770`: https://github.com/saltstack/salt/pull/31770 +.. _`#31772`: https://github.com/saltstack/salt/issues/31772 .. _`#31775`: https://github.com/saltstack/salt/pull/31775 +.. _`#31776`: https://github.com/saltstack/salt/issues/31776 .. _`#31779`: https://github.com/saltstack/salt/pull/31779 .. _`#31780`: https://github.com/saltstack/salt/pull/31780 .. _`#31786`: https://github.com/saltstack/salt/pull/31786 .. _`#31787`: https://github.com/saltstack/salt/pull/31787 +.. _`#31791`: https://github.com/saltstack/salt/issues/31791 .. _`#31793`: https://github.com/saltstack/salt/pull/31793 .. _`#31797`: https://github.com/saltstack/salt/pull/31797 .. _`#31800`: https://github.com/saltstack/salt/pull/31800 @@ -947,6 +3683,7 @@ Changes: .. _`#31879`: https://github.com/saltstack/salt/pull/31879 .. _`#31883`: https://github.com/saltstack/salt/pull/31883 .. _`#31888`: https://github.com/saltstack/salt/pull/31888 +.. _`#31890`: https://github.com/saltstack/salt/issues/31890 .. _`#31900`: https://github.com/saltstack/salt/pull/31900 .. _`#31901`: https://github.com/saltstack/salt/pull/31901 .. _`#31902`: https://github.com/saltstack/salt/pull/31902 @@ -962,3 +3699,163 @@ Changes: .. _`#31947`: https://github.com/saltstack/salt/pull/31947 .. _`#31948`: https://github.com/saltstack/salt/pull/31948 .. _`#31952`: https://github.com/saltstack/salt/pull/31952 +.. _`#31964`: https://github.com/saltstack/salt/pull/31964 +.. _`#6602`: https://github.com/saltstack/salt/issues/6602 +.. _`#7811`: https://github.com/saltstack/salt/issues/7811 +.. _`#8927`: https://github.com/saltstack/salt/issues/8927 +.. _`AkhterAli`: https://github.com/AkhterAli +.. _`CaesarC`: https://github.com/CaesarC +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`HeathNaylor`: https://github.com/HeathNaylor +.. _`Horgix`: https://github.com/Horgix +.. _`JensRantil`: https://github.com/JensRantil +.. _`JoaquinVeira`: https://github.com/JoaquinVeira +.. _`JohannesEbke`: https://github.com/JohannesEbke +.. _`MadsRC`: https://github.com/MadsRC +.. _`RabidCicada`: https://github.com/RabidCicada +.. _`Reiner030`: https://github.com/Reiner030 +.. _`Supermathie`: https://github.com/Supermathie +.. _`Talkless`: https://github.com/Talkless +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`TheBigBear`: https://github.com/TheBigBear +.. _`UtahDave`: https://github.com/UtahDave +.. _`abednarik`: https://github.com/abednarik +.. _`alexbleotu`: https://github.com/alexbleotu +.. _`anlutro`: https://github.com/anlutro +.. _`apergos`: https://github.com/apergos +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`basepi`: https://github.com/basepi +.. _`bdrung`: https://github.com/bdrung +.. _`belt-ascendlearning`: https://github.com/belt-ascendlearning +.. _`bender-the-greatest`: https://github.com/bender-the-greatest +.. _`bergemalm`: https://github.com/bergemalm +.. _`bgridley`: https://github.com/bgridley +.. _`bogdanr`: https://github.com/bogdanr +.. _`boltronics`: https://github.com/boltronics +.. _`bradthurber`: https://github.com/bradthurber +.. _`brutasse`: https://github.com/brutasse +.. _`bwillcox`: https://github.com/bwillcox +.. _`cachedout`: https://github.com/cachedout +.. _`captaininspiration`: https://github.com/captaininspiration +.. _`carsonoid`: https://github.com/carsonoid +.. _`chris-martin`: https://github.com/chris-martin +.. _`clarkperkins`: https://github.com/clarkperkins +.. _`clinta`: https://github.com/clinta +.. _`colinlabs`: https://github.com/colinlabs +.. _`corywright`: https://github.com/corywright +.. _`cro`: https://github.com/cro +.. _`cwicklein`: https://github.com/cwicklein +.. _`damon-atkins`: https://github.com/damon-atkins +.. _`damonnk`: https://github.com/damonnk +.. _`darix`: https://github.com/darix +.. _`deuscapturus`: https://github.com/deuscapturus +.. _`dmacvicar`: https://github.com/dmacvicar +.. _`dr4Ke`: https://github.com/dr4Ke +.. _`dschaller`: https://github.com/dschaller +.. _`dverbeek84`: https://github.com/dverbeek84 +.. _`edencrane`: https://github.com/edencrane +.. _`eykd`: https://github.com/eykd +.. _`fantasy86`: https://github.com/fantasy86 +.. _`fredrikaverpil`: https://github.com/fredrikaverpil +.. _`freebsdly`: https://github.com/freebsdly +.. _`frogunder`: https://github.com/frogunder +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`githubcdr`: https://github.com/githubcdr +.. _`gladiatr72`: https://github.com/gladiatr72 +.. _`gpenin`: https://github.com/gpenin +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`gwaters`: https://github.com/gwaters +.. _`hoonetorg`: https://github.com/hoonetorg +.. _`iacopo-papalini`: https://github.com/iacopo-papalini +.. _`isbm`: https://github.com/isbm +.. _`jacksontj`: https://github.com/jacksontj +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jakehilton`: https://github.com/jakehilton +.. _`jefferyharrell`: https://github.com/jefferyharrell +.. _`jeffreyctang`: https://github.com/jeffreyctang +.. _`jespada`: https://github.com/jespada +.. _`jfindlay`: https://github.com/jfindlay +.. _`jhenry82`: https://github.com/jhenry82 +.. _`joejulian`: https://github.com/joejulian +.. _`johje349`: https://github.com/johje349 +.. _`justinta`: https://github.com/justinta +.. _`kevinquinnyo`: https://github.com/kevinquinnyo +.. _`kiall`: https://github.com/kiall +.. _`kiorky`: https://github.com/kiorky +.. _`kraney`: https://github.com/kraney +.. _`l13t`: https://github.com/l13t +.. _`lichtamberg`: https://github.com/lichtamberg +.. _`llua`: https://github.com/llua +.. _`lorengordon`: https://github.com/lorengordon +.. _`lrhazi`: https://github.com/lrhazi +.. _`marnovdm`: https://github.com/marnovdm +.. _`mcalmer`: https://github.com/mcalmer +.. _`mchugh19`: https://github.com/mchugh19 +.. _`mew1033`: https://github.com/mew1033 +.. _`mf-collinhayden`: https://github.com/mf-collinhayden +.. _`mlalpho`: https://github.com/mlalpho +.. _`moltob`: https://github.com/moltob +.. _`mshirley`: https://github.com/mshirley +.. _`mtippett`: https://github.com/mtippett +.. _`multani`: https://github.com/multani +.. _`myii`: https://github.com/myii +.. _`nbow`: https://github.com/nbow +.. _`nfillot`: https://github.com/nfillot +.. _`oba11`: https://github.com/oba11 +.. _`oeuftete`: https://github.com/oeuftete +.. _`oliver-dungey`: https://github.com/oliver-dungey +.. _`onorua`: https://github.com/onorua +.. _`onsmribah`: https://github.com/onsmribah +.. _`opdude`: https://github.com/opdude +.. _`orymate`: https://github.com/orymate +.. _`paiou`: https://github.com/paiou +.. _`pankajghadge`: https://github.com/pankajghadge +.. _`pass-by-value`: https://github.com/pass-by-value +.. _`peripatetic-sojourner`: https://github.com/peripatetic-sojourner +.. _`peterzalewski`: https://github.com/peterzalewski +.. _`pprince`: https://github.com/pprince +.. _`rallytime`: https://github.com/rallytime +.. _`redmcg`: https://github.com/redmcg +.. _`replicant0wnz`: https://github.com/replicant0wnz +.. _`rhansen`: https://github.com/rhansen +.. _`rmtmckenzie`: https://github.com/rmtmckenzie +.. _`robthralls`: https://github.com/robthralls +.. _`ronnix`: https://github.com/ronnix +.. _`roshan3133`: https://github.com/roshan3133 +.. _`rvandegrift`: https://github.com/rvandegrift +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`sakateka`: https://github.com/sakateka +.. _`saltstack/salt-bootstrap#695`: https://github.com/saltstack/salt-bootstrap/issues/695 +.. _`sbreidba`: https://github.com/sbreidba +.. _`seanjnkns`: https://github.com/seanjnkns +.. _`sjmh`: https://github.com/sjmh +.. _`sjorge`: https://github.com/sjorge +.. _`skizunov`: https://github.com/skizunov +.. _`symphorien`: https://github.com/symphorien +.. _`syphernl`: https://github.com/syphernl +.. _`szeestraten`: https://github.com/szeestraten +.. _`tampakrap`: https://github.com/tampakrap +.. _`tbaker57`: https://github.com/tbaker57 +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thusoy`: https://github.com/thusoy +.. _`ticosax`: https://github.com/ticosax +.. _`timwsuqld`: https://github.com/timwsuqld +.. _`tmaulik`: https://github.com/tmaulik +.. _`tminn`: https://github.com/tminn +.. _`tonyyang132`: https://github.com/tonyyang132 +.. _`tsaridas`: https://github.com/tsaridas +.. _`twangboy`: https://github.com/twangboy +.. _`virtualguy`: https://github.com/virtualguy +.. _`vutny`: https://github.com/vutny +.. _`warden`: https://github.com/warden +.. _`whiteinge`: https://github.com/whiteinge +.. _`xmj`: https://github.com/xmj +.. _`xopher-mc`: https://github.com/xopher-mc +.. _`yannis666`: https://github.com/yannis666 +.. _`youngnick`: https://github.com/youngnick +.. _`zaide`: https://github.com/zaide +.. _`zer0def`: https://github.com/zer0def +.. _`zmalone`: https://github.com/zmalone +.. _`zygiss`: https://github.com/zygiss diff --git a/doc/topics/releases/2015.8.9.rst b/doc/topics/releases/2015.8.9.rst index 8053ed83fb..35133c63e9 100644 --- a/doc/topics/releases/2015.8.9.rst +++ b/doc/topics/releases/2015.8.9.rst @@ -1,518 +1,1892 @@ +.. _release-2015-8-9: + =========================== Salt 2015.8.9 Release Notes =========================== Version 2015.8.9 is a bugfix release for :ref:`2015.8.0`. -.. admonition:: Mint Linux: Important Post-Upgrade Instructions - As a result of some upstream changes, the ``os`` grain on Mint Linux is now - being detected as ``LinuxMint`` (:issue:`33295`). Run the following command - **after you upgrade to 2015.8.9** to reset the ``os`` grain to ``Mint`` and - the ``os_family`` grain to ``Debian``: +Statistics +========== - .. code-block:: bash +- Total Merges: **145** +- Total Issue References: **110** +- Total PR References: **264** - salt -G 'os:LinuxMint' grains.setvals "{'os': 'Mint', 'os_family': 'Debian'}" +- Contributors: **71** (`Ch3LL`_, `DmitryKuzmenko`_, `DylanFrese`_, `Ferbla`_, `Kurocon`_, `Lothiraldan`_, `RuriRyan`_, `Talkless`_, `The-Loeki`_, `UtahDave`_, `Xiami2012`_, `abednarik`_, `afletch`_, `ahammond`_, `ahus1`_, `aletourneau`_, `alxf`_, `amontalban`_, `anlutro`_, `arthurlogilab`_, `atengler`_, `basepi`_, `bdrung`_, `bradthurber`_, `cachedout`_, `captaininspiration`_, `cedwards`_, `clarkperkins`_, `clinta`_, `cro`_, `dmurphy18`_, `exowaucka`_, `garethgreenaway`_, `guettli`_, `idonin`_, `isbm`_, `jacobhammons`_, `jbonachera`_, `jfindlay`_, `jfray`_, `junster1`_, `justinta`_, `krak3n`_, `lalmeras`_, `lloydoliver`_, `lomeroe`_, `mcalmer`_, `mitar`_, `mrproper`_, `multani`_, `nmadhok`_, `notpeter`_, `onorua`_, `paclat`_, `papertigers`_, `rallytime`_, `rkgrunt`_, `sakateka`_, `sbreidba`_, `schancel`_, `sjorge`_, `stk0vrfl0w`_, `techhat`_, `terminalmage`_, `thatch45`_, `ticosax`_, `tomlaredo`_, `twangboy`_, `twellspring`_, `vutny`_, `whiteinge`_) -Changes for v2015.8.8..v2015.8.9 --------------------------------- +Important Post-Upgrade Instructions for Linux Mint +================================================== -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +As a result of some upstream changes, the ``os`` grain on Mint Linux is now +being detected as ``LinuxMint`` (:issue:`33295`). Run the following command +**after you upgrade to 2015.8.9** to reset the ``os`` grain to ``Mint`` and the +``os_family`` grain to ``Debian``: -*Generated at: 2016-05-17T17:09:39Z* +.. code-block:: bash -Total Merges: **145** + salt -G 'os:LinuxMint' grains.setvals "{'os': 'Mint', 'os_family': 'Debian'}" -Changes: -- **PR** `#33293`_: (*twangboy*) Fix minion start retry on Windows (2015.8) +Changelog for v2015.8.8.2..v2015.8.9 +==================================== -* 22c4331 linux_acl: Allow '-' as a separation character in ACL permissions. Fixes `#31270`_ (`#33172`_) (`#33305`_) +*Generated at: 2018-05-28 00:36:04 UTC* -* 7a181f2 Handle more ipv6 error as an exception `#33299`_ (`#33300`_) +* **PR** `#33310`_: (`jfindlay`_) update 2015.8.9 release notes -* eb47a15 Ignore retcode when checking service's status (`#33294`_) +* **PR** `#33293`_: (`twangboy`_) Fix minion start retry on Windows (2015.8) + @ *2016-05-17 17:03:41 UTC* -- **PR** `#33274`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * e3eff27c55 Merge pull request `#33293`_ from twangboy/fix_33277_2015_8 -* 4f3596a Add comment for test=true w/o changes ret and add changes dict example (`#33254`_) + * 652f0079db Fix minion start retry on Windows -* 2a30c48 Update Git Policy docs to match Contribution guide (`#33252`_) +* **ISSUE** `#31270`_: (`4001982248998`_) acl.present: TypeError on subsequent runs (refs: `#33172`_) -* 056c273 Fix `#33238`_ (`#33239`_) + * **PR** `#33305`_: (`rallytime`_) Back-port `#33172`_ to 2015.8 -* 1cd34ab Properly report on invalid gitfs/git_pillar/winrepo repos (`#33245`_) + * **PR** `#33172`_: (`Kurocon`_) linux_acl: Allow '-' as a separation character in ACL permissions. Fi… (refs: `#33305`_) -- **PR** `#33253`_: (*rallytime*) Update the release process docs +* **ISSUE** `#33299`_: (`jbonachera`_) salt-cloud: scp_file() and sftp_file() don't work with ipv4-only hosts (refs: `#33300`_) -* 8c2c5b1 update 2015.8.9 release notes (`#33251`_) +* **ISSUE** `#33243`_: (`jbonachera`_) salt-cloud: wait_for_port() doesn't work with ipv4-only hosts (refs: `#33246`_, `#33300`_) -* 8ee8ee3 Handle ipv6 error as an exception (`#33246`_) + * **PR** `#33300`_: (`jbonachera`_) Handle more ipv6 error as an exception `#33299`_ -* 855bed3 Check rendered YAML for invalid keys (`#33213`_) +* **ISSUE** `#26062`_: (`silenius`_) service.status is broken under FreeBSD (refs: `#33294`_) -* 6fb25a8 Make note of files that begin with '_' in master.d or minion.d dirs (`#33224`_) +* **ISSUE** `#23435`_: (`JaseFace`_) service.status currently reports an error on FreeBSD if the service isn't running (refs: `#33294`_) -* a6dc0d2 Gate jnpr imports in salt.proxy.junos.py (`#33150`_) + * **PR** `#33294`_: (`terminalmage`_) Ignore retcode when checking service's status -* 64a89c4 Add docs for the http state (`#33222`_) +* **PR** `#33274`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-05-16 16:41:32 UTC* -* 0a32163 Don't stacktrace when using --out=highstate at CLI during staterun. (`#33215`_) + * 06edba448e Merge pull request `#33274`_ from rallytime/merge-2015.8 -* 04d714d propagate opts to salt.util.http call (`#33219`_) + * bf641d3a66 Merge branch '2015.5' into '2015.8' -* c8236c0 update 2015.8.9 release notes (`#33237`_) + * 8fa72f6588 Clarify file.replace MULTILINE flag interaction with regex anchors (`#33137`_) -- **PR** `#33217`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 4b1f460256 update 2015.5.11 release notes (`#33236`_) -* 730bec1 [2015.8] Merge forward from 2015.5 to 2015.8 (`#33207`_) +* **ISSUE** `#30258`_: (`rallytime`_) Changes dictionary return should be mentioned in test state docs (refs: `#33254`_) -* 379b151 Add a fetch when compiling git_pillar for masterless minions (`#33204`_) + * **PR** `#33254`_: (`rallytime`_) Add comment for test=true w/o changes ret and add changes dict example -* b3805d8 cloud.clouds.ec2: cache each named node (`#33164`_) +* **ISSUE** `#30946`_: (`rallytime`_) Update SaltStack Git Policy Documentation (refs: `#33252`_) -* 86db5df Properly handle failed git commands when redirect_stderr=True (`#33203`_) + * **PR** `#33252`_: (`rallytime`_) Update Git Policy docs to match Contribution guide -* 8a0950d Don't force use of global ssh_config when git identity file is specified (`#33152`_) +* **ISSUE** `#33238`_: (`clinta`_) x509 CSR fails if the csr does not contain any extensions (refs: `#33239`_) -* ce07133 update 2015.8.9 release notes (`#33198`_) + * **PR** `#33239`_: (`clinta`_) Fix `#33238`_ -- **PR** `#33188`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#33245`_: (`terminalmage`_) Backport `#33244`_ to 2015.8 -* e9108e0 add 2015.8.9 release notes (`#33161`_) + * **PR** `#33244`_: (`terminalmage`_) Properly report on invalid gitfs/git_pillar/winrepo repos (refs: `#33245`_) -* 2d9919e [2015.8] Update to latest bootstrap script v2016.05.10 (`#33156`_) + * **PR** `#32238`_: (`ticosax`_) [gitfs] only 2 argument are passed to this template when render error message (refs: `#33244`_, `#33245`_) -* 033bef2 Hash fileclients by opts (`#33142`_) +* **ISSUE** `#30605`_: (`eyj`_) Update development/conventions/release.rst docs - they're out of date with the current process. (refs: `#33253`_) -* f520fa3 Back-port `#31769`_ to 2015.8 (`#33139`_) +* **PR** `#33253`_: (`rallytime`_) Update the release process docs + @ *2016-05-13 21:28:11 UTC* -- **PR** `#33144`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 94a53da92e Merge pull request `#33253`_ from rallytime/fix-30605 -- **PR** `#33140`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * a129d05b6d Update the release process docs -* ad607ef If cache_jobs: True is set, populate the local job cache when running salt-call (`#33100`_) + * **PR** `#33251`_: (`jfindlay`_) update 2015.8.9 release notes -* 64689a6 Fix broken parsing of usermgmt.conf on OpenBSD (`#33135`_) +* **ISSUE** `#33243`_: (`jbonachera`_) salt-cloud: wait_for_port() doesn't work with ipv4-only hosts (refs: `#33246`_, `#33300`_) -* 06a382e Add a check that the cmdline of the found proc matches (`#33129`_) + * **PR** `#33246`_: (`techhat`_) Handle ipv6 error as an exception -* 10018e9 salt.utils.gitfs: fix formatting for warning messages (`#33064`_) +* **ISSUE** `#33073`_: (`robnagler`_) TypeError: unhashable type: 'dict' (refs: `#33213`_) -* d45b599 Fix 33058 (`#33099`_) + * **PR** `#33213`_: (`terminalmage`_) Check rendered YAML for invalid keys -- **PR** `#33106`_: (*abednarik*) Moved _finger_fail method to parent class. +* **ISSUE** `#21903`_: (`basepi`_) Document _file.conf pattern for master.d/ and minion.d/ (refs: `#33224`_) -* 20c7e10 clarify docs that map is designed to be run once. is not stateful (`#33102`_) + * **PR** `#33224`_: (`rallytime`_) Make note of files that begin with '_' in master.d or minion.d dirs -* 558561d cloud.query needs to define mapper.opts (`#33098`_) +* **ISSUE** `#31975`_: (`rajvidhimar`_) Docstrings not reflected in the salt documenation. (refs: `#33150`_) -- **PR** `#33096`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#33150`_: (`rallytime`_) Gate jnpr imports in salt.proxy.junos.py -* 22a327b salt-cloud: fix ipv6-only virtual machines (`#32865`_) +* **ISSUE** `#21315`_: (`ryan-lane`_) No example documentation for http.query state (refs: `#33222`_) -* e788f7e modules.npm: do not log npm --version at info level (`#33084`_) + * **PR** `#33222`_: (`rallytime`_) Add docs for the http state -- **PR** `#33081`_: (*jfindlay*) ssh docs: install py-2.6 for RHEL 5 +* **ISSUE** `#29796`_: (`vutny`_) Fail to use 'highstate' outputter explicitly (refs: `#33215`_) -- **PR** `#33088`_: (*isbm*) Bugfix: Restore boolean values from the repo configuration + * **PR** `#33215`_: (`rallytime`_) Don't stacktrace when using --out=highstate at CLI during state run. -* 2c6326f fix tests for file.blockplace to remove newline (`#33082`_) + * **PR** `#33219`_: (`lalmeras`_) propagate opts to salt.util.http call -- **PR** `#32892`_: (*isbm*) Resolve Zypper locks on asynchronous calls + * **PR** `#33154`_: (`lalmeras`_) propagate opts to salt.util.http call (refs: `#33219`_) -* 3e0bf23 Add fun_args to scheduled return data (part of `#24237`_) (`#33039`_) + * **PR** `#33237`_: (`jfindlay`_) update 2015.8.9 release notes -* 264c0d4 Don't append a newline when creating new content with blockreplace (`#33049`_) +* **PR** `#33217`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-05-12 22:45:39 UTC* -* 54b783a Pass all data to batch.run() call when using --failhard (`#33048`_) + * 6dc5d605b1 Merge pull request `#33217`_ from rallytime/merge-forward-2015.8 -* 2dbfa55 Display command output when command fails with batch + failhard options (`#33050`_) + * 4655607b58 Merge branch '2015.5' into '2015.8' -* add9199 Allow security_groups kwarg for boto_elb.present to be string or list (`#33053`_) + * 698f1eb657 Merge pull request `#33211`_ from cachedout/user_kill -* 111701c [2015.8] Merge forward from 2015.5 to 2015.8 (`#33054`_) + * d4f2e5baa7 Don't try to kill a parent proc if we can't -* 1066063 File and User test fixes for 2015.8 on Fedora23 (`#33056`_) + * f86832911e Resolve issue with pkg module on Mint Linux (`#33205`_) -* f97b5d5 Back-port `#33030`_ to 2015.8 (`#33040`_) + * a09e1b6335 Add pip installed and removed test (`#33178`_) -* e90a501 Update the docs for saltutil.find_job to be more clear/accurate (`#33017`_) + * 96e3586f12 update 2015.5.11 release notes (`#33197`_) -* d3d77ce Add saltenv to the cmd.script state function (`#33031`_) + * 09b072a412 Fix file.managed for Windows (`#33181`_) -* 3434f44 Fix syndic regression (`#33021`_) + * **PR** `#33207`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 -* 4bb3ca5 Compare uid and gid instead of name and group (`#32674`_) +* **ISSUE** `#32917`_: (`bradthurber`_) standalone minion pygit2 pillar data doesn't refresh without manual git fetch (refs: `#33204`_) -* 9ca5b02 Allow batch mode to use verbose option, as well as show_jid. (`#32996`_) + * **PR** `#33204`_: (`terminalmage`_) Add a fetch when compiling git_pillar for masterless minions -* 81c0fa4 Fixed glusterfs.peered output (`#32955`_) +* **ISSUE** `#33162`_: (`jfindlay`_) Key error with salt.utils.cloud.cache_node and EC2 (refs: `#33164`_) -* 8c70d7a Clarify some arg docs (`#32994`_) + * **PR** `#33164`_: (`jfindlay`_) cloud.clouds.ec2: cache each named node -* 00fbeab Fix boto_secgroup_test (`#32986`_) +* **ISSUE** `#32385`_: (`aronneagu`_) git.latest throws expected string or buffer (refs: `#33203`_) -* 3362367 fix user cron on solarish operating systems (`#32970`_) + * **PR** `#33203`_: (`terminalmage`_) Properly handle failed git commands when redirect_stderr=True -* 07e38bc salt.log.setup: process user args before format (`#32796`_) +* **ISSUE** `#32685`_: (`gidantribal`_) git state does not take into account ssh config file (refs: `#33152`_) -* b2d7c81 doc.ref.states.ordering: clarify requisite change (`#32934`_) + * **PR** `#33152`_: (`terminalmage`_) Don't force use of global ssh_config when git identity file is specified -* df41d5d mode should default to 'text' (`#32928`_) + * **PR** `#33198`_: (`jfindlay`_) update 2015.8.9 release notes -* f581a82 Remove FileClient class references from docs - it doesn't exist. (`#32925`_) +* **PR** `#33188`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-05-11 22:32:29 UTC* -* 31b96de Update contents_grains option with relevant docs (`#32922`_) + * 6177a6a36f Merge pull request `#33188`_ from rallytime/merge-2015.8 -- **PR** `#32926`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * f12bba6ebc Merge branch '2015.5' into '2015.8' -* 1cd6a45 specify volume tags in profile configuration (`#32908`_) + * 30868ab06c [2015.5] Update to latest bootstrap script v2016.05.11 (`#33185`_) -* 85ca86d Update docs to warn users that -1 isn't valid for iptables insert state (`#32906`_) + * 264ad34b3b Pip fix (`#33180`_) -* cb68706 Allow profile options to be specified in provider file when using maps (`#32900`_) + * 43288b268d add 2015.5.11 release notes (`#33160`_) -* 1a55fcb Clarify service state opening docs - uses 'service' virtualname (`#32880`_) + * e0da8fda7d [2015.5] Update to latest bootstrap script v2016.05.10 (`#33155`_) -- **PR** `#32884`_: (*terminalmage*) Fix incorrect deprecation notice + * **PR** `#33161`_: (`jfindlay`_) add 2015.8.9 release notes -- **PR** `#32878`_: (*jacobhammons*) added note about updating the bootstrap script in salt-cloud using th… + * **PR** `#33156`_: (`rallytime`_) [2015.8] Update to latest bootstrap script v2016.05.10 -- **PR** `#32869`_: (*rallytime*) Use correct config setting in cloud syndic docs +* **ISSUE** `#25040`_: (`yi9`_) grains.get can't get minion's /etc/salt/grains value in multi-master set up (refs: `#33142`_) -- **PR** `#32844`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#33142`_: (`cachedout`_) Hash fileclients by opts -* eb8fb6b Back-port `#31139`_ to 2015.8 (`#32868`_) +* **ISSUE** `#22142`_: (`multani`_) State `acl.present` doesn't allow to set "default" ACLs (refs: `#31769`_) -* 4bb5545 backport PR `#32732`_ for issue `#23714`_ (`#32847`_) + * **PR** `#33139`_: (`rallytime`_) Back-port `#31769`_ to 2015.8 -* 5ea003b Add pyvmomi version warning to Getting Started with VMware docs (`#32845`_) + * **PR** `#31769`_: (`DylanFrese`_) Fix acl.present and acl.absent when adding default ACLs (refs: `#33139`_) -* 44f08d0 Pass None as memory limit. (`#32841`_) +* **PR** `#33144`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-05-10 19:40:31 UTC* -* feebe69 Back-port `#32813`_ to 2015.8 (`#32839`_) + * 2800762b44 Merge pull request `#33144`_ from rallytime/merge-2015.8 -* 3b81031 various improvements on cloud deploy script docs (`#32659`_) + * 449176f06e Merge branch '2015.5' into '2015.8' -* bf85987 update bootstrap to 2016.04.18 release (`#32668`_) + * 6cd1641840 Merge pull request `#33141`_ from jtand/disable_local_pkg_install_test -* 83dee63 Back-port `#29322`_ to 2015.8 (`#32785`_) + * 8b1e34fb17 Skipping salt-call --local test -- **PR** `#32787`_: (*rallytime*) Back-port `#32722`_ to 2015.8 +* **PR** `#33140`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-05-10 16:57:55 UTC* -- **PR** `#32786`_: (*rallytime*) Back-port `#32703`_ to 2015.8 + * 72d075e14e Merge pull request `#33140`_ from rallytime/merge-2015.8 -* a6a42740 Merge branch 'pr-32775' into 2015.8 + * c732c8104b Merge branch '2015.5' into '2015.8' -* cda00f4 Improve documentation on pygit2 versions (`#32779`_) + * 878d34a865 Doc mock decorators (`#33132`_) -* 1d6d234 Properly handle minion failback failure. (`#32749`_) +* **ISSUE** `#32834`_: (`beardedeagle`_) Masterless Minion - Unable to query job cache (refs: `#33017`_, `#33100`_) -* 3751a27 Document pillar cache options (`#32643`_) + * **PR** `#33100`_: (`rallytime`_) If cache_jobs: True is set, populate the local job cache when running salt-call -* 35c8af3 modules.win_dacl: consistent case of dacl constants (`#32720`_) + * **PR** `#33135`_: (`stk0vrfl0w`_) Fix broken parsing of usermgmt.conf on OpenBSD -* 2cd0817 Update external auth documentation to list supported matcher. (`#32733`_) + * **PR** `#33129`_: (`rallytime`_) Back-port `#33101`_ to 2015.8 -* bba089d Check dependencies type before appling str operations (`#32693`_) + * **PR** `#33101`_: (`thatch45`_) Add a check that the cmdline of the found proc matches (refs: `#33129`_) -* 3aa0605 Handle when beacon not configured and we try to enable/disable them (`#32692`_) + * **PR** `#33064`_: (`terminalmage`_) salt.utils.gitfs: fix formatting for warning messages -- **PR** `#32718`_: (*garethgreenaway*) Fixes to schedule.list in 2015.8 +* **ISSUE** `#33058`_: (`aclemetson`_) Unable to run "win_servermanager.list_available" on minion. (refs: `#33099`_) -- **PR** `#32684`_: (*captaininspiration*) Fix routes for redhat < 6 + * **PR** `#33099`_: (`twangboy`_) Fix 33058 -* 7cdd512 Handle a couple of arguments better (Azure) (`#32683`_) +* **ISSUE** `#32999`_: (`basepi`_) Stacktrace for `master_finger` mismatch on minion (refs: `#33106`_) -* aaa03bc Fix for issue 32523 (`#32672`_) +* **PR** `#33106`_: (`abednarik`_) Moved _finger_fail method to parent class. + @ *2016-05-09 16:31:09 UTC* -* 21081b1 Don't access deprecated Exception.message attribute. (`#32556`_) + * 8acc3147d6 Merge pull request `#33106`_ from abednarik/abednarik_master_Finger_stacktrace -* 5d1e9a4 Lower log level for pillar cache (`#32655`_) + * 91a69ba54a Moved _finger_fail method to parent class. -- **PR** `#32588`_: (*anlutro*) Fix salt-ssh module function call argument type juggling by JSON encoding them + * **PR** `#33102`_: (`Ch3LL`_) clarify docs that map is designed to be run once. is not stateful -* 5e7edfc yumpkg: Ignore epoch in version comparison for explicit versions without an epoch (`#32563`_) + * **PR** `#33098`_: (`rallytime`_) Back-port `#33061`_ to 2015.8 -* fea6056 Fixing critical bug to remove only the specified Host instead of the entire Host cluster (`#32640`_) + * **PR** `#33061`_: (`ahammond`_) cloud.query needs to define mapper.opts (refs: `#33098`_) -* 0477f66 align OS grains from older SLES with current one (`#32649`_) +* **PR** `#33096`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-05-06 19:27:57 UTC* -* 8d46244 Prevent crash if pygit2 package is requesting re-compilation of the e… (`#32652`_) + * c1f7aed8a5 Merge pull request `#33096`_ from rallytime/merge-2015.8 -- **PR** `#32614`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 0fd5e9d157 Merge branch '2015.5' into '2015.8' -- **PR** `#32616`_: (*rallytime*) Back-port `#32547`_ to 2015.8 + * 30edeadafd Lower display of msgpack failure msg to debug (`#33078`_) -* 3047471 Fix comments value in salt.states.pkgrepo example (`#32604`_) + * d4928c5a22 Use saltstack repo in buildpackage.py on CentOS 5 (`#33080`_) -* ab9da90 Revert PR `#32480`_ and apply `#32314`_ with fixes / documentation (`#32558`_) + * 61d126cb98 add test for installing package while using salt-call --local (`#33025`_) -* c84c921 Better log message on minion restart if master couldn't be reached. (`#32576`_) + * 6d3e4e8935 File and User test fixes for 2015.5 on Fedora23 (`#33055`_) -* 3c81798 Don't return None from eval_master (`#32555`_) + * d48b2b8b52 test pillar.items output (`#33060`_) -- **PR** `#32536`_: (*rallytime*) Back-port `#31898`_ to 2015.8 + * 398793bfc0 Fix minor document error of test.assertion (`#33067`_) -* d12a1c2 Fix binary search and replace (`#32542`_) + * f8757631b2 Saltfile with pillar tests (`#33045`_) -- **PR** `#32539`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 1d7892421e Backport `#33021`_ manually to 2015.5 (`#33044`_) -- **PR** `#32531`_: (*ticosax*) [dockerng] Fix support of dockerng.volume_present when no volume is on present. + * f00b5f91b3 Add run_on_start docs to schedule.rst (`#32958`_) -* 5d73d54 Enhance dockerng.wait() to control success on exit_code and on already stopped containers (`#32475`_) + * **PR** `#32865`_: (`idonin`_) salt-cloud: fix ipv6-only virtual machines -* 214f01e Bugfix: salt-key crashes if tries to generate keys to the directory w/o write access (`#32436`_) + * **PR** `#33084`_: (`jfindlay`_) modules.npm: do not log npm --version at info level -* 288839f Turn on exc_info when logging failed minion startup (`#32515`_) +* **ISSUE** `#33068`_: (`pythonwood`_) salt-ssh do not support centos5 because old-version-python ? (refs: `#33081`_) -* 08a8020 Add ignore_epoch option to pkg.installed/removed/purged states (`#32520`_) +* **PR** `#33081`_: (`jfindlay`_) ssh docs: install py-2.6 for RHEL 5 + @ *2016-05-06 15:18:39 UTC* -* 492ebfc Isbm zypper list products sles11 crash (`#32505`_) + * 3808d05838 Merge pull request `#33081`_ from jfindlay/ssh_doc -* ae89882 Clear VCS fsbackend and git_pillar locks on master start (`#32480`_) + * a2c927b173 ssh docs: install py-2.6 for RHEL 5 -* a6482a3 Use win32api to get Total System Memory (`#32491`_) +* **PR** `#33088`_: (`isbm`_) Bugfix: Restore boolean values from the repo configuration + @ *2016-05-06 15:13:27 UTC* -- **PR** `#32487`_: (*terminalmage*) Add explanation of nonzero epoch requirement to pkg.installed state documentation + * 6d604926d3 Merge pull request `#33088`_ from isbm/isbm-zypper-fix-booleans -- **PR** `#32482`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 3ca203eb8e Bugfix (follow-up): setting priority requires non-positive integer -* f5bd6bd Backport 31164 and 31364 (`#32474`_) + * 79a46e091c Add repo config test -- **PR** `#32450`_: (*cachedout*) Pass parser options into batch mode + * 222b8369ca Add test data for repos -* b299835 Issue `#28706`_: Fix state user.present behavior. (`#32448`_) + * b746fa35f0 Bugfix: Restore boolean values from the repo configuration -* cef33d5 Argument name in docs should match actual arg name (`#32445`_) +* **ISSUE** `#12422`_: (`creaky`_) Bug: file.blockreplace inserts additional blank line on multi-line content (refs: `#33049`_) -- **PR** `#32432`_: (*ticosax*) [dockerng] Fix Domainname introspection + * **PR** `#33082`_: (`Ch3LL`_) Fix tests for file.blockplace to remove newline -- **PR** `#32427`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#33049`_: (`thatch45`_) Don't append a newline when creating new content with blockreplace (refs: `#33082`_) -- **PR** `#32423`_: (*jtand*) Update glusterfs_test to be inline with `#32312`_ +* **PR** `#32892`_: (`isbm`_) Resolve Zypper locks on asynchronous calls + @ *2016-05-05 14:34:59 UTC* -- **PR** `#32425`_: (*cachedout*) Fix salt-cloud parallel provisioning + * fb89877cf2 Merge pull request `#32892`_ from isbm/isbm-zypper-env-variables -* 51fb2ac FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg #1409 for more info. + * 1601a7e07a Prevent the use of "refreshable" together with "nolock" option. -* 709410a Improve git_pillar documentation/logging + * 52e1be2fa9 Remove unused variable in a constructor. Adjust the docstring accordingly. -* c53efc3 Update master config docs + * 7e00f566ef Move log message down to the point where it actually sleeps. Rephrase the message. -- **PR** `#32323`_: (*mcalmer*) fix sorting by latest version when called with an attribute + * 4b7dab83ff Fix PID file path for SLE11 -- **PR** `#32376`_: (*amontalban*) Fixes saltstack/salt`#28262`_ + * 7f37961d4b Rename tags -* 0d9a06b Cleaner deprecation process with decorators + * c55b0fab58 Test DOM parsing -* 6979fda Correcty index glusterfs bricks + * c54e928e4f Add exception handling test -- **PR** `#32393`_: (*jfindlay*) modules.win_timezone: don't list all zones in debug log + * 3d245bbe84 Parse DOM out of the box, when XML mode is called -- **PR** `#32372`_: (*rallytime*) Back-port `#32358`_ to 2015.8 + * 6a98f523ac Add Zypper caller test suite -- **PR** `#32392`_: (*multani*) Fix documentation on boto_asg and boto_elb modules and states + * f189f90124 Bugfix: always trigger __getattr__ to reset and increment the configuration before the call. -- **PR** `#32373`_: (*cachedout*) Resolve memory leak in authentication + * 7e1712dd80 Fix tests according to the new calling model -- **PR** `#32126`_: (*cro*) Add a couple CLI examples for the highstate outputter. + * 3a30b7fbcd Remove an obsolete test case -- **PR** `#32353`_: (*mcalmer*) Prevent metadata download when listing installed products + * 6e5877a2ee Add Zypper Call mock -- **PR** `#32321`_: (*abednarik*) Better message when minion fail to start + * bb5540cb4a Bugfix: inverted logic on raising (or not) exceptions -- **PR** `#32345`_: (*nmadhok*) [2015.8] Check if profile key exists in ``vm_`` dict + * ce9262fe71 Make Zypper caller module-level reusable -- **PR** `#32343`_: (*Ferbla*) Fixed win_wua example documentation + * 77dc8695af Update docstrings according to the bugfix -- **PR** `#32360`_: (*rallytime*) Make sure hash_type is lowercase in master/minion config files + * 46d86b21d5 Bugfix: accept refresh override param -- **PR** `#32361`_: (*cro*) SDB is no longer experimental + * cb40618262 Fire an event about released Zypper with its result -- **PR** `#32336`_: (*rallytime*) Back-port `#28639`_ to 2015.8 + * 0728f0bc00 Replace string values with the constants -- **PR** `#32332`_: (*rallytime*) Don't unsubscribe from open events on the CLI too early on long-running commands + * 6af3f7141b Check if zypper lock exists and add more debug logging -- **PR** `#32333`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 0167b30a75 Add Zypper lock constant -- **PR** `#32289`_: (*rallytime*) New salt-cloud instances should not use old hash_type default. + * 370ff21d36 Fire an event to the Master about blocked Zypper. -- **PR** `#32291`_: (*twangboy*) Fix bad output for chocolatey.version (fixes `#14277`_) + * 1727ca3de2 Use new Zypper call implementation -- **PR** `#32295`_: (*rallytime*) Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config + * 485164aa5c Remove blocking-prone Zypper call implementation -- **PR** `#32315`_: (*ahus1*) fixing file.managed with requests lib + * f161f0612c Implement block-proof Zypper call implementation -- **PR** `#32316`_: (*vutny*) Update Salt Bootstrap tutorial + * baf35ed708 Remove one-char variables -- **PR** `#32325`_: (*bdrung*) Re-add shebang to ssh-id-wrapper shell script + * 2c94eb016f Remove an unused variable -- **PR** `#32326`_: (*bdrung*) Fix typos + * 6869ebc557 Remove an empty line -- **PR** `#32300`_: (*twangboy*) Add documentation to disable winrepo/winrepo_ng + * 7e06489da9 Remove verbose wrapping -- **PR** `#32288`_: (*terminalmage*) use dictupdate.merge instead of dict.update to merge CLI pillar overrides + * 2131ff04af Standarize zypper call to "run_all" -- **PR** `#32243`_: (*isbm*) Ensure latest pkg.info_installed ensure latest + * 046ef44ca3 Bugfix: version_cmp crashes in CLI if there are versions, that looks like integer or float. -- **PR** `#32268`_: (*ticosax*) [dockerng] Improve detection for older versions of docker-py + * b869a92eea Change Zypper calls to a single point -- **PR** `#32258`_: (*jacobhammons*) Replaces incorrect reference to `master_alive_check` +* **ISSUE** `#24237`_: (`Grokzen`_) Minion schedule return data missing some fields (refs: `#33039`_) -- **PR** `#32254`_: (*twangboy*) Fix Display Name with spaces in win_servermanager + * **PR** `#33039`_: (`The-Loeki`_) Add fun_args to scheduled return data (part of `#24237`_) -- **PR** `#32248`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **ISSUE** `#12422`_: (`creaky`_) Bug: file.blockreplace inserts additional blank line on multi-line content (refs: `#33049`_) -- **PR** `#32230`_: (*terminalmage*) systemd.py: Support both update-rc.d and chkconfig as managers of sysv services + * **PR** `#33049`_: (`thatch45`_) Don't append a newline when creating new content with blockreplace (refs: `#33082`_) -- **PR** `#32249`_: (*jacobhammons*) Fixes windows download paths to account for patch +* **ISSUE** `#24996`_: (`danlsgiga`_) --failhard option not working as expected (refs: `#33048`_) -- **PR** `#32221`_: (*dmurphy18*) Fix version check, fix extracting Major and Minor versions from __ver… + * **PR** `#33048`_: (`rallytime`_) Pass all data to batch.run() call when using --failhard -- **PR** `#32227`_: (*twangboy*) Remove list2cmdline usage from win_service.py +* **ISSUE** `#32452`_: (`nicholascapo`_) cmd.run_all with --batch and --failhard gives no output on failure (refs: `#33050`_) -- **PR** `#32239`_: (*anlutro*) Add state file name to warning log line + * **PR** `#33050`_: (`rallytime`_) Display command output when command fails with batch + failhard options -- **PR** `#32215`_: (*DmitryKuzmenko*) rhel oscodename +* **ISSUE** `#33041`_: (`anitakrueger`_) boto_elb.present security_groups kwarg is a list - needs documentation (refs: `#33053`_) -- **PR** `#32217`_: (*jacobhammons*) 2015.8.8.2 release notes + * **PR** `#33053`_: (`rallytime`_) Allow security_groups kwarg for boto_elb.present to be string or list -- **PR** `#32212`_: (*rallytime*) Back-port `#32197`_ to 2015.8 + * **PR** `#33054`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 -- **PR** `#32211`_: (*rallytime*) Back-port `#32210`_ to 2015.8 + * **PR** `#33056`_: (`justinta`_) File and User test fixes for 2015.8 on Fedora23 -- **PR** `#32209`_: (*rallytime*) Back-port `#32208`_ to 2015.8 +* **ISSUE** `#32472`_: (`esn89`_) salt-minion is stuck in a restart loop with not much info: (refs: `#33030`_) -- **PR** `#32204`_: (*ticosax*) [dockerng] Consider labels carried by the image when comparing user defined labels. + * **PR** `#33040`_: (`rallytime`_) Back-port `#33030`_ to 2015.8 -- **PR** `#32186`_: (*rallytime*) Add some "best practices" information to test documentation + * **PR** `#33030`_: (`thatch45`_) When we restart the minion we should show the error that caused it (refs: `#33040`_) -- **PR** `#32176`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **ISSUE** `#32834`_: (`beardedeagle`_) Masterless Minion - Unable to query job cache (refs: `#33017`_, `#33100`_) -- **PR** `#32163`_: (*rallytime*) Update nacl.config docs to use key value instead of 'None' + * **PR** `#33017`_: (`rallytime`_) Update the docs for saltutil.find_job to be more clear/accurate -- **PR** `#32166`_: (*vutny*) `salt.states.file`: correct examples with multiline YAML string + * **PR** `#33031`_: (`rallytime`_) Back-port `#33002`_ to 2015.8 -- **PR** `#32168`_: (*rallytime*) Lint 2015.8 + * **PR** `#33002`_: (`whiteinge`_) Add saltenv to the cmd.script state function (refs: `#33031`_) -- **PR** `#32165`_: (*terminalmage*) Make __virtual__ for rhservice.py more robust + * **PR** `#33021`_: (`UtahDave`_) Fix syndic regression (refs: `#33044`_) -- **PR** `#32160`_: (*cachedout*) Fix beacon tutorial docs +* **ISSUE** `#11801`_: (`slai`_) Salt does not match user names properly under Windows (refs: `#32674`_) -- **PR** `#32145`_: (*paclat*) fixes 29817 + * **PR** `#32674`_: (`twangboy`_) Compare uid and gid instead of name and group -- **PR** `#32133`_: (*basepi*) Pass eauth user/groups through salt-api to destination functions +* **ISSUE** `#32856`_: (`DeanScothern`_) jjid not shown when running the salt command line with --batch-size using either --verbose or --show-jid with certain salt versions (refs: `#32996`_) -- **PR** `#32127`_: (*rallytime*) Add runners to __salt__ docs +* **ISSUE** `#31738`_: (`igorwidlinski`_) salt --show-jid does not show job id when run in batch mode (refs: `#32450`_) -- **PR** `#32143`_: (*DmitryKuzmenko*) Set auth retry count to 0 if multimaster mode is failover. + * **PR** `#32996`_: (`rallytime`_) Allow batch mode to use verbose option, as well as show_jid. -- **PR** `#32134`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#32450`_: (`cachedout`_) Pass parser options into batch mode (refs: `#32996`_) -- **PR** `#32091`_: (*clarkperkins*) Fixed the regression in 410da78 +* **ISSUE** `#32954`_: (`atengler`_) glusterfs.peered fails with 'NoneType' object is not iterable (refs: `#32955`_) -- **PR** `#32135`_: (*rallytime*) [2015.8] Support multiple valid option types when performing type checks + * **PR** `#32955`_: (`atengler`_) Fixed glusterfs.peered output -- **PR** `#31760`_: (*sakateka*) SMinion need wait future from eval_master +* **ISSUE** `#26011`_: (`rodriguezsergio`_) states.virtualenv != modules.virtualenv (refs: `#32994`_) -- **PR** `#32106`_: (*jfindlay*) update suse master service patch + * **PR** `#32994`_: (`rallytime`_) Clarify some arg docs for virtualenv state -- **PR** `#32130`_: (*jacobhammons*) Added known issues 32004 and 32044 to 2015.8.8 release notes + * **PR** `#32986`_: (`justinta`_) Fix boto_secgroup_test -- **PR** `#32105`_: (*clarkperkins*) Fixed invalid deploy_scripts_search_path +* **ISSUE** `#32777`_: (`sjorge`_) cron.present broken on Solarish systems if user specified (refs: `#32970`_) -- **PR** `#32117`_: (*tomlaredo*) Fixed validation type for file_ignore_glob + * **PR** `#32970`_: (`sjorge`_) fix user cron on solarish operating systems -- **PR** `#32113`_: (*sakateka*) Fix log message for AsyncAuth initialization + * **PR** `#32796`_: (`jfindlay`_) salt.log.setup: process user args before format -- **PR** `#32116`_: (*ticosax*) Obtain default value of `memory_swap` from the container. +* **ISSUE** `#32891`_: (`guettli`_) docs: Note " This document represents behavior exhibited by Salt requisites as of version 0.9.7 of Salt." (refs: `#32934`_) -- **PR** `#32098`_: (*rallytime*) Back-port `#32083`_ to 2015.8 + * **PR** `#32934`_: (`jfindlay`_) doc.ref.states.ordering: clarify requisite change -- **PR** `#32099`_: (*jacobhammons*) 2015.8.8 release docs +* **ISSUE** `#32882`_: (`papertigers`_) carbon_return is missing a default value. (refs: `#32883`_) -- **PR** `#32088`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#32928`_: (`rallytime`_) Back-port `#32883`_ to 2015.8 -- **PR** `#32074`_: (*Xiami2012*) Fix code for proto args in modules.iptables + * **PR** `#32883`_: (`papertigers`_) mode should default to 'text' (refs: `#32928`_) -- **PR** `#32053`_: (*basepi*) [2015.8] Fix rabbitmq_user.present tag handling +* **ISSUE** `#32646`_: (`deamen`_) FileClient Class ( client = salt.minion.FileClient(__opts__) ) does not exist (refs: `#32925`_) -- **PR** `#32023`_: (*sbreidba*) Move constant declaration into member variable to avoid issues when m… + * **PR** `#32925`_: (`rallytime`_) Remove FileClient class references from docs - it doesn't exist. -- **PR** `#32026`_: (*techhat*) Don't require the decode_out file to already exist +* **ISSUE** `#23683`_: (`gravyboat`_) contents_grains should have an example (refs: `#32922`_) -- **PR** `#32019`_: (*rallytime*) Back-port `#32012`_ to 2015.8 + * **PR** `#32922`_: (`rallytime`_) Update contents_grains option with relevant docs -- **PR** `#32015`_: (*ticosax*) [dockerng] Fix ports exposition when protocol is passed. +* **PR** `#32926`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-04-28 19:47:52 UTC* -- **PR** `#31999`_: (*jacobhammons*) Fixes a doc build exception caused by missing mocks for modules.win_dacl + * e60c12640d Merge pull request `#32926`_ from rallytime/merge-2015.8 -- **PR** `#31992`_: (*notpeter*) salt-cloud: add D2 and G2 EC2 instance types + * 5a184881be Merge branch '2015.5' into '2015.8' -- **PR** `#31981`_: (*lloydoliver*) include rotational disks in grains under linux + * edce22a143 backport PR `#32732`_ to 2015.5 fixes `#23714`_ (`#32848`_) -- **PR** `#31970`_: (*twangboy*) Add apply_template_on_contents for windows + * **PR** `#32908`_: (`Ch3LL`_) Specify EBS volume tags in profile configuration in aws -- **PR** `#31960`_: (*aletourneau*) fixed ec2 get_console_output +* **ISSUE** `#23952`_: (`neogenix`_) iptables state append doesn't honor position -1 (refs: `#32906`_) -- **PR** `#31958`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * **PR** `#32906`_: (`rallytime`_) Update docs to warn users that -1 isn't valid for iptables insert state -* 3934c66 Merge branch '2015.5' into '2015.8' +* **ISSUE** `#32510`_: (`Ch3LL`_) Cannot specify image in provider file when using map file (refs: `#32900`_) -- **PR** `#31935`_: (*twangboy*) Back port nullsoft build script from 2015.8 + * **PR** `#32900`_: (`rallytime`_) Allow profile options to be specified in provider file when using maps -- **PR** `#31912`_: (*jfindlay*) log.mixins: remove extermporaneous .record +* **ISSUE** `#30855`_: (`guettli`_) Docs: does salt.states.service support systemd? (refs: `#32880`_) + * **PR** `#32880`_: (`rallytime`_) Clarify service state opening docs - uses 'service' virtualname + +* **PR** `#32884`_: (`terminalmage`_) Fix incorrect deprecation notice + @ *2016-04-27 15:47:35 UTC* + + * e1b40b3b76 Merge pull request `#32884`_ from terminalmage/fix-incorrect-deprecation-notice + + * b307c5452a Fix incorrect deprecation notice + +* **PR** `#32878`_: (`jacobhammons`_) added note about updating the bootstrap script in salt-cloud using th… + @ *2016-04-26 21:09:51 UTC* + + * a2921b9da0 Merge pull request `#32878`_ from jacobhammons/salt-cloud + + * 3887938727 added note about updating the bootstrap script in salt-cloud using the -u flag, removed the saltconf banner. + +* **ISSUE** `#32861`_: (`bradthurber`_) Is it master_syndic or syndic_master? (refs: `#32869`_) + +* **PR** `#32869`_: (`rallytime`_) Use correct config setting in cloud syndic docs + @ *2016-04-26 19:13:21 UTC* + + * 71db10fd2c Merge pull request `#32869`_ from rallytime/fix-32861 + + * 0e73daa126 Use correct config setting in cloud syndic docs + +* **PR** `#32844`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-04-26 17:38:08 UTC* + + * 02c681311f Merge pull request `#32844`_ from rallytime/merge-2015.8 + + * 1fc9de1d04 Add 'file.source_list' mock to archive state unit tests + + * 9064d3bbfb Merge branch '2015.5' into '2015.8' + + * 9b5c14c37c `salt-cloud -u` downloads stable version from bootstrap.saltstack.com by default (`#32837`_) + + * 9725804448 update bootstrap to 2016.04.18 release (`#32667`_) + + * c842e1e437 Merge pull request `#32776`_ from rallytime/merge-2015.5 + + * 7ecbf9f885 Merge pull request #14 from whiteinge/runner-async-low + + * 211f7b4af1 Format low data correct for runner_async + + * ce72851861 Merge branch '2014.7' into '2015.5' + + * 2775edc176 Saltnado /run fix (`#32590`_) + + * b19c5a5ce7 Verify auth in saltnado run (`#32552`_) + + * 67d0c81184 Support remote sources in a source list (`#32691`_) + + * bd5442d768 Merge pull request `#32686`_ from cachedout/issue_32661 + + * f704df90bc Fix stacktrace in batch with dup minion ids + + * 3ec9502a86 Update "Low Hanging Fruit" to "Help Wanted" (`#32675`_) + + * 77bea56b68 Additional documentation on calling exec modules from templates (`#32657`_) + + * c910b8dd51 Fixing critical bug to remove only the specified Host instead of the entire Host cluster (`#32639`_) + + * 4568565d45 Add _syspaths.py to .gitignore (`#32638`_) + +* **ISSUE** `#32799`_: (`belt`_) ssh_auth.present creates ~/~${USER}/.ssh (refs: `#32868`_) + + * **PR** `#32868`_: (`rallytime`_) Back-port `#31139`_ to 2015.8 + + * **PR** `#31139`_: (`exowaucka`_) Improve %h and %u handling in SSH module (refs: `#32868`_) + +* **ISSUE** `#23714`_: (`naemono`_) file.copy force ignored during highstate, but not with 'salt-call state.sls_id' (refs: `#32732`_, `#32847`_, `#32848`_) + + * **PR** `#32847`_: (`lomeroe`_) backport PR `#32732`_ for issue `#23714`_ + + * **PR** `#32732`_: (`lomeroe`_) correct use of force flag in file.copy `#23714`_ (refs: `#32847`_, `#32848`_) + +* **ISSUE** `#32824`_: (`bradthurber`_) salt-cloud vmware: wrong pyvmomi installed for RHEL/CentOS 6 (refs: `#32845`_) + + * **PR** `#32845`_: (`rallytime`_) Add pyvmomi version warning to Getting Started with VMware docs + +* **ISSUE** `#25492`_: (`hernanc`_) "docker-py mem_limit has been moved to host_config in API version 1.19" error (refs: `#26518`_, `#32818`_) + + * **PR** `#32841`_: (`rallytime`_) Back-port `#32818`_ to 2015.8 + + * **PR** `#32818`_: (`mitar`_) Pass None as memory limit (refs: `#32841`_) + + * **PR** `#26518`_: (`krak3n`_) Fix for `#25492`_ (refs: `#32818`_) + +* **ISSUE** `#32605`_: (`Talkless`_) pkgrepo.managed with apt does not add comments value later (refs: `#32813`_) + + * **PR** `#32839`_: (`rallytime`_) Back-port `#32813`_ to 2015.8 + + * **PR** `#32813`_: (`abednarik`_) Add comments as an option for apt in pkgrepo.managed. (refs: `#32839`_) + + * **PR** `#32659`_: (`anlutro`_) Various improvements on cloud deploy script docs + + * **PR** `#32668`_: (`jfindlay`_) [2015.8] update bootstrap to 2016.04.18 release + + * **PR** `#32785`_: (`rallytime`_) Back-port `#29322`_ to 2015.8 + + * **PR** `#29322`_: (`mrproper`_) add http proxy support for tornado (refs: `#32785`_) + +* **ISSUE** `#32710`_: (`bradthurber`_) conf/master missing many gitfs and git_pillar parameters (refs: `#32722`_) + +* **PR** `#32787`_: (`rallytime`_) Back-port `#32722`_ to 2015.8 + @ *2016-04-25 15:19:21 UTC* + + * **PR** `#32722`_: (`bradthurber`_) Catch up the conf/master file to include gitfs/git_pillar parms from … (refs: `#32787`_) + + * 96a3d4e556 Merge pull request `#32787`_ from rallytime/bp-32722 + + * 8d7148d41b Catch up the conf/master file to include gitfs/git_pillar parms from recent releases + +* **PR** `#32786`_: (`rallytime`_) Back-port `#32703`_ to 2015.8 + @ *2016-04-25 15:19:13 UTC* + + * **PR** `#32703`_: (`schancel`_) Make example top file match templated version (refs: `#32786`_) + + * 36f70f5847 Merge pull request `#32786`_ from rallytime/bp-32703 + + * baa4df25c9 Make example top file match templated version + + * 227ef4aabb Fix unnecessary capitalization + + * 73cd9f26c3 Merge branch 'gitfs_perremote_doc_updates' of https://github.com/l2ol33rt/salt into pr-32775 + + * b69d406ada Including name per-remote config option in example + + * **PR** `#32779`_: (`terminalmage`_) Improve documentation on pygit2 versions + +* **ISSUE** `#32609`_: (`anlutro`_) Tornado ioloop fails when master disconnects? (refs: `#32749`_) + + * **PR** `#32749`_: (`DmitryKuzmenko`_) Properly handle minion failback failure. + +* **ISSUE** `#32144`_: (`vutny`_) Pillar targeting starts to work only after calling `saltutil.refresh_pillar` (refs: `#32643`_) + + * **PR** `#32643`_: (`vutny`_) Document pillar cache options + +* **ISSUE** `#32705`_: (`joakimkarlsson`_) win_dacl.present: Specifying propagations for a directory fails (refs: `#32720`_) + + * **PR** `#32720`_: (`jfindlay`_) modules.win_dacl: consistent case of dacl constants + +* **ISSUE** `#30761`_: (`sjmh`_) Cannot target subsets of minions when using pillar and external_auth (refs: `#31598`_) + +* **ISSUE** `#21303`_: (`Lothiraldan`_) Explicit and document ACL rules format (refs: `#32733`_) + + * **PR** `#32733`_: (`Lothiraldan`_) Update external auth documentation to list supported matcher. + + * **PR** `#31598`_: (`terminalmage`_) Remove limitations on validation types for eauth targets (refs: `#32733`_) + + * **PR** `#32693`_: (`techhat`_) Check dependencies type before appling str operations + + * **PR** `#32692`_: (`garethgreenaway`_) Handle when beacon not configured and we try to enable/disable them + +* **PR** `#32718`_: (`garethgreenaway`_) Fixes to schedule.list in 2015.8 + @ *2016-04-20 19:51:24 UTC* + + * f52af5a596 Merge pull request `#32718`_ from garethgreenaway/2015_8_schedule_list_fix + + * 7fa5d809d2 backporting a fix from develop where the use of splay would result in seconds=0 in the schedule.list when there was no seconds specified in the origina schedule + +* **PR** `#32684`_: (`captaininspiration`_) Fix routes for redhat < 6 + @ *2016-04-19 19:18:20 UTC* + + * **PR** `#32682`_: (`captaininspiration`_) Fix routes for redhat < 6 (refs: `#32684`_) + + * f63566e452 Merge pull request `#32684`_ from captaininspiration/2015.8 + + * 640c7a90da Fix routes for redhat < 6 + + * **PR** `#32683`_: (`techhat`_) Handle a couple of arguments better (Azure) + +* **ISSUE** `#32523`_: (`junster1`_) network.py/loader.py failing because cfn variable is not defined before use. (refs: `#32672`_) + + * **PR** `#32672`_: (`junster1`_) Fix for issue 32523 + +* **ISSUE** `#32517`_: (`Ch3LL`_) Minion restarting and erroring when cannot reach the masters in multi-master failover (refs: `#32555`_, `#32556`_) + + * **PR** `#32556`_: (`DmitryKuzmenko`_) Don't access deprecated Exception.message attribute. + + * **PR** `#32655`_: (`cachedout`_) Lower log level for pillar cache + +* **ISSUE** `#31542`_: (`duk3luk3`_) jinja stringifies dict before passing it to execution module (maybe salt-ssh specific?) (refs: `#32588`_) + +* **PR** `#32588`_: (`anlutro`_) Fix salt-ssh module function call argument type juggling by JSON encoding them + @ *2016-04-18 15:57:14 UTC* + + * a6a427463d Merge pull request `#32588`_ from alprs/fix-salt_ssh_module_types + + * d912f1c3c6 json encode arguments passed to an execution module function call + +* **ISSUE** `#32229`_: (`seanjnkns`_) 2015.8.8.2: pkg.installed fails to update packages with epoch (refs: `#32563`_) + + * **PR** `#32563`_: (`terminalmage`_) yumpkg: Ignore epoch in version comparison for explict versions without an epoch + + * **PR** `#32640`_: (`nmadhok`_) [2015.8] - Fixing critical bug to remove only the specified Host instead of the entire Host cluster + + * **PR** `#32649`_: (`mcalmer`_) align OS grains from older SLES with current one + + * **PR** `#32652`_: (`isbm`_) Prevent crash if pygit2 package is requesting re-compilation of the e… + +* **PR** `#32614`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-04-15 19:27:47 UTC* + + * 05a41a13cd Merge pull request `#32614`_ from rallytime/merge-2015.8 + + * 046e401dd8 Merge branch '2015.5' into '2015.8' + + * 027b502335 Merge pull request `#32561`_ from gtmanfred/user_passwords + + * 3db5e78d5d redact passwords and hashes from user.present updates + +* **PR** `#32616`_: (`rallytime`_) Back-port `#32547`_ to 2015.8 + @ *2016-04-15 19:27:36 UTC* + + * **PR** `#32547`_: (`cro`_) Expand on the open-source vs open-core FAQ (refs: `#32616`_) + + * ef17bde054 Merge pull request `#32616`_ from rallytime/bp-32547 + + * 4242bc7399 Language clarification. + + * 965e3bc1d1 Expand on the open-source vs open-core FAQ + + * **PR** `#32604`_: (`Talkless`_) Fix comments value in salt.states.pkgrepo example + + * **PR** `#32558`_: (`terminalmage`_) Revert PR `#32480`_ and apply `#32314`_ with fixes / documentation + + * **PR** `#32480`_: (`terminalmage`_) Clear VCS fsbackend and git_pillar locks on master start (refs: `#32558`_) + + * **PR** `#32314`_: (`onorua`_) prevent eternal gitfs lock due to process crash (refs: `#32480`_, `#32558`_) + +* **ISSUE** `#32519`_: (`Ch3LL`_) Minion restarting and erroring when cannot reach the master (refs: `#32576`_) + + * **PR** `#32576`_: (`DmitryKuzmenko`_) Better log message on minion restart if master couldn't be reached. + +* **ISSUE** `#32517`_: (`Ch3LL`_) Minion restarting and erroring when cannot reach the masters in multi-master failover (refs: `#32555`_, `#32556`_) + + * **PR** `#32555`_: (`DmitryKuzmenko`_) Don't return None from eval_master + +* **PR** `#32536`_: (`rallytime`_) Back-port `#31898`_ to 2015.8 + @ *2016-04-13 18:49:05 UTC* + + * **PR** `#31898`_: (`afletch`_) Ensure rh_service not used on CloudLinux 7 (refs: `#32536`_) + + * 27e91e40cc Merge pull request `#32536`_ from rallytime/bp-31898 + + * 60d80c4dee Ensure rh_service not used on CloudLinux 7 + + * **PR** `#32542`_: (`twangboy`_) Fix binary search and replace + +* **PR** `#32539`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-04-13 15:10:08 UTC* + + * cce7de76b0 Merge pull request `#32539`_ from rallytime/merge-2015.8 + + * fbaeb165c9 Merge branch '2015.5' into merge-2015.8 + + * 7307bcb88e Merge pull request `#32538`_ from rallytime/bp-32528 + + * 46a4e8a310 Remove merge conflict line + + * e0d947c707 Document "grains" setting in the minion configuration reference + +* **ISSUE** `#32493`_: (`bberberov`_) dockerng.volume_present fails when no volumes already exist on the system (refs: `#32531`_) + +* **PR** `#32531`_: (`ticosax`_) [dockerng] Fix support of dockerng.volume_present when no volume is on present. + @ *2016-04-13 14:42:13 UTC* + + * 1834bdefe3 Merge pull request `#32531`_ from ticosax/support-no-volumes + + * 958b2ec749 Fix support of dockerng.volume_present when no volume is on present. + + * **PR** `#32475`_: (`ticosax`_) [dockerng] Enhance dockerng.wait() to control success on exit_code and on already stopped containers + + * **PR** `#32436`_: (`isbm`_) Bugfix: salt-key crashes if tries to generate keys to the directory w/o write access + + * **PR** `#32515`_: (`terminalmage`_) Turn on exc_info when logging failed minion startup + + * **PR** `#32520`_: (`terminalmage`_) Add ignore_epoch option to pkg.installed/removed/purged states + + * **PR** `#32505`_: (`isbm`_) Isbm zypper list products sles11 crash + + * **PR** `#32480`_: (`terminalmage`_) Clear VCS fsbackend and git_pillar locks on master start (refs: `#32558`_) + + * **PR** `#32314`_: (`onorua`_) prevent eternal gitfs lock due to process crash (refs: `#32480`_, `#32558`_) + +* **ISSUE** `#32327`_: (`joakimkarlsson`_) salt-minion fails to start on Windows (refs: `#32491`_) + + * **PR** `#32491`_: (`twangboy`_) Use win32api to get Total System Memory + +* **ISSUE** `#31927`_: (`afletch`_) pkg.installed compares version including package epoch (pkg.version problem?) (refs: `#32487`_) + +* **PR** `#32487`_: (`terminalmage`_) Add explanation of nonzero epoch requirement to pkg.installed state documentation + @ *2016-04-11 20:48:57 UTC* + + * e335e313fe Merge pull request `#32487`_ from terminalmage/epoch-documentation + + * e04cf879b6 Document new behavior of pkg.installed for yum/dnf packages with non-zero epoch + + * 61e9761224 Add explanation of nonzero epoch requirement to pkg.installed state documentation + +* **PR** `#32482`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-04-11 20:12:26 UTC* + + * e8de50ff37 Merge pull request `#32482`_ from rallytime/merge-2015.8 + + * 1b04f0ddec Merge branch '2015.5' into '2015.8' + + * 29333e533e Add documentation for some master/minion configs (`#32454`_) + + * 100c6e1b25 Merge pull request `#32458`_ from terminalmage/clarify-providers-docs + + * 500d3ebbaa Add link to provider override docs to all group providers + + * 83ca01f620 dd link to provider override docs to all shadow providers + + * c5fe38789d Add link to provider override docs to all user providers + + * 5c1c1dda59 Add link to provider override docs to all service providers + + * 736f2befc9 Add link to provider override docs to all package providers + + * f9306347cc Clarify the scope of the provider param in states. + + * af24c82ab0 Add documentation on virtual module provider overrides to the module docs + + * 0bc6c97a63 Improve docstrings + + * 1948920674 Add external ref to windows package manager docs + + * e7fa21438c Add new doc pages to toctree + + * f0de1236ec Move the tables of virtual modules to individual documentation pages + +* **ISSUE** `#30183`_: (`jakehilton`_) Minion startup extremely delayed when first master in failover multi master setup is down (refs: `#31364`_, `#31382`_, `#32143`_) + +* **ISSUE** `#29643`_: (`matthayes`_) Can't get batch mode and --failhard to work as expected (refs: `#31164`_) + +* **ISSUE** `#28569`_: (`andrejohansson`_) Reactor alert on highstate fail (refs: `#31164`_) + + * **PR** `#32474`_: (`DmitryKuzmenko`_) Backport 31164 and 31364 + + * **PR** `#32441`_: (`cachedout`_) Backport 31164 31364 (refs: `#32474`_) + + * **PR** `#31364`_: (`DmitryKuzmenko`_) Don't send REQ while another one is waiting for response. (refs: `#32441`_, `#32474`_) + + * **PR** `#31164`_: (`DmitryKuzmenko`_) Issues/29643 fix invalid retcode (refs: `#32441`_, `#32474`_) + +* **ISSUE** `#31738`_: (`igorwidlinski`_) salt --show-jid does not show job id when run in batch mode (refs: `#32450`_) + +* **PR** `#32450`_: (`cachedout`_) Pass parser options into batch mode (refs: `#32996`_) + @ *2016-04-08 23:03:49 UTC* + + * 7bf44aea72 Merge pull request `#32450`_ from cachedout/issue_31738 + + * 74d0fa06b4 Pass parser options into batch mode + +* **ISSUE** `#28706`_: (`kkaig`_) user.present:groups vs group.present:members (refs: `#30824`_, `#32448`_) + + * **PR** `#32448`_: (`rallytime`_) Back-port `#30824`_ to 2015.8 + + * **PR** `#30824`_: (`alxf`_) Issue `#28706`_: Fix state user.present behavior. (refs: `#32448`_) + +* **ISSUE** `#31851`_: (`rhansen`_) error using module.run -> saltutil.runner -> state.orchestrate: "The following arguments are missing: _fun" (refs: `#32445`_) + + * **PR** `#32445`_: (`rallytime`_) Argument name in docs should match actual arg name + + * **PR** `#26676`_: (`rallytime`_) Back-port `#26648`_ to 2015.5 (refs: `#32445`_) + + * **PR** `#26648`_: (`whiteinge`_) Free 'fun' from the function signature namespace (refs: `#26676`_) + +* **ISSUE** `#32033`_: (`timcharper`_) SaltStack `modules.dockerng` `_compare` does not handle docker implicit Domainname properly (issue when using network_mode: host) (refs: `#32116`_, `#32432`_) + +* **PR** `#32432`_: (`ticosax`_) [dockerng] Fix Domainname introspection + @ *2016-04-08 16:12:19 UTC* + + * a36f9499fc Merge pull request `#32432`_ from ticosax/fix-domainname-introspection + + * 505b5b0168 Fix Domainname introspection + +* **PR** `#32427`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-04-08 15:39:13 UTC* + + * def911974c Merge pull request `#32427`_ from rallytime/merge-2015.8 + + * 9531ea6ef5 Merge branch '2015.5' into '2015.8' + + * 0809126d8e Merge `#32293`_ with test fixes (`#32418`_) + + * bbd8260a42 Ignore Raspbian in service.py __virtual__ (`#32421`_) + + * 690addf0b4 FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info. + + * a36866d7db Merge pull request `#32399`_ from amontalban/2015.5 + + * e1ffbd615a Fixes `saltstack/salt#28262`_ for 2015.5 branch + + * 3f03c5fcf9 Merge pull request `#32374`_ from cachedout/issue_32066 + + * 62389d1d1a Update proxmox documentation + + * 8578089beb Merge pull request `#32339`_ from Ch3LL/fix_doc_multi-master + + * 2774da288d remove reference to master_alive_check + +* **ISSUE** `#32311`_: (`rkgrunt`_) glusterfs module incorrectly indexes into name of bricks (refs: `#32312`_) + +* **PR** `#32423`_: (`justinta`_) Update glusterfs_test to be inline with `#32312`_ + @ *2016-04-07 21:53:03 UTC* + + * **PR** `#32312`_: (`rkgrunt`_) Fixed glusterfs module (refs: `#32423`_) + + * 5bc8c326ce Merge pull request `#32423`_ from jtand/glusterfs_test_fix + + * 6f98bd50eb Update glusterfs_test to be inline with `#32312`_ + +* **ISSUE** `#31632`_: (`zieba88`_) salt-cloud map parallel provisioning -P option failed on 2015.8.5 (refs: `#32425`_) + +* **PR** `#32425`_: (`cachedout`_) Fix salt-cloud paralell provisioning + @ *2016-04-07 21:52:06 UTC* + + * c07e02bacb Merge pull request `#32425`_ from cachedout/issue_31632 + + * 127c0829ee Fix salt-cloud paralell provisioning + +* **PR** `#32323`_: (`mcalmer`_) fix sorting by latest version when called with an attribute + @ *2016-04-07 06:24:35 UTC* + + * 2cc054bbc0 Merge pull request `#32323`_ from mcalmer/fix-ensure-installed-latest-with-attributes + + * cb1f30ee10 fix sorting by latest version when called with an attribute + +* **ISSUE** `saltstack/salt#28262`_: (`palica`_) FreeBSD pkgng provider raising error for minion (refs: `#32376`_) + +* **ISSUE** `#28262`_: (`palica`_) FreeBSD pkgng provider raising error for minion (refs: `#32376`_, `#32399`_) + +* **PR** `#32376`_: (`amontalban`_) Fixes `saltstack/salt#28262`_ (refs: `#32399`_) + @ *2016-04-06 20:30:10 UTC* + + * 802580ee1a Merge pull request `#32376`_ from amontalban/2015.8 + + * 823d0c362b Fixes `saltstack/salt#28262`_ + +* **ISSUE** `#32375`_: (`truescotw`_) jinja template copying file but not replacing tags (refs: `#32393`_) + +* **PR** `#32393`_: (`jfindlay`_) modules.win_timezone: don't list all zones in debug log + @ *2016-04-06 18:10:43 UTC* + + * ad77d76cad Merge pull request `#32393`_ from jfindlay/win_zone + + * c01c1b9da2 modules.win_timezone: don't list all zones in debug log + +* **PR** `#32372`_: (`rallytime`_) Back-port `#32358`_ to 2015.8 + @ *2016-04-06 16:35:05 UTC* + + * **PR** `#32358`_: (`arthurlogilab`_) outputter virt_list does not exist anymore (refs: `#32372`_) + + * 76ae95863d Merge pull request `#32372`_ from rallytime/bp-32358 + + * 95e0fe7744 outputter virt_list does not exist anymore + +* **PR** `#32392`_: (`multani`_) Fix documentation on boto_asg and boto_elb modules and states + @ *2016-04-06 16:34:36 UTC* + + * c612baa119 Merge pull request `#32392`_ from multani/2015.8 + + * 77c4772752 Fix documentation on boto_asg and boto_elb modules and states + +* **ISSUE** `#32201`_: (`boltronics`_) salt-minion memory leak waiting on master to accept key (refs: `#32373`_) + +* **PR** `#32373`_: (`cachedout`_) Resolve memory leak in authentication + @ *2016-04-06 15:19:55 UTC* + + * b706d3aa4d Merge pull request `#32373`_ from cachedout/issue_32201 + + * d9e4a0f372 Resolve memory leak in authentication + +* **PR** `#32126`_: (`cro`_) Add a couple CLI examples for the highstate outputter. + @ *2016-04-05 17:23:29 UTC* + + * 097aa7ccfc Merge pull request `#32126`_ from cro/outputter_terse_docs + + * dafe279e60 Lint + + * abc2de0119 More clarification. + + * 85221e515b Expand docs for highstate outputter. Add CLI examples for when 'state_output: filter' is set. + +* **PR** `#32353`_: (`mcalmer`_) Prevent metadata download when listing installed products + @ *2016-04-05 17:02:15 UTC* + + * eab3b99be2 Merge pull request `#32353`_ from mcalmer/prevent-refresh-on-list-installed-products + + * e32212ad53 Prevent metadata download when listing installed products + +* **ISSUE** `#32255`_: (`jakosky`_) Salt-minion 2015.8.8 should display helpful error when regular file /var/log/salt/minion exists but a directory is expected. (refs: `#32321`_) + +* **PR** `#32321`_: (`abednarik`_) Better message when minion fail to start + @ *2016-04-05 16:28:06 UTC* + + * 64abec94e7 Merge pull request `#32321`_ from abednarik/minion_start_fail_log + + * 4c72adc03a Better message when minion fail to start + +* **ISSUE** `#30147`_: (`anandnevase`_) salt.cloud.CloudClient method create() not working for VMware driver (refs: `#32344`_) + +* **PR** `#32345`_: (`nmadhok`_) [2015.8] Check if profile key exists in vm\_ dict + @ *2016-04-05 16:16:36 UTC* + + * **PR** `#32344`_: (`nmadhok`_) Check if profile key exists in vm\_ dict (refs: `#32345`_) + + * 59aca733ea Merge pull request `#32345`_ from nmadhok/patch-4 + + * 42d7a54240 Check if profile key exists in vm\_ dict + +* **PR** `#32343`_: (`Ferbla`_) Fixed win_wua example documentation + @ *2016-04-05 16:14:37 UTC* + + * bb033c238d Merge pull request `#32343`_ from Ferbla/2015.8 + + * e2f0f16564 Fixed win_wua example documentation + +* **ISSUE** `#32354`_: (`elsmorian`_) Incorrect capitalisation when telling users to change hash_type to SHA256 (refs: `#32360`_) + +* **PR** `#32360`_: (`rallytime`_) Make sure hash_type is lowercase in master/minion config files + @ *2016-04-05 16:10:46 UTC* + + * 3219a8d176 Merge pull request `#32360`_ from rallytime/fix-32354 + + * 8b47c205df Make sure hash_type is lowercase in master/minion config files + +* **PR** `#32361`_: (`cro`_) SDB is no longer experimental + @ *2016-04-05 16:10:23 UTC* + + * fb530256f6 Merge pull request `#32361`_ from cro/remove_sdb_exp_flag + + * 3bbe284d89 Remove 'experimental' warning from SDB docs. + +* **PR** `#32336`_: (`rallytime`_) Back-port `#28639`_ to 2015.8 + @ *2016-04-04 20:53:11 UTC* + + * **PR** `#28639`_: (`RuriRyan`_) Fixed handling of the disabled option for yumpkg (refs: `#32336`_) + + * e1ef4a9d66 Merge pull request `#32336`_ from rallytime/bp-28639 + + * 0829143dd1 Fixed handling of the disabled option for yumpkg + +* **ISSUE** `#32305`_: (`Ch3LL`_) Receiving NoResponse Errors when running commands that take a longer time (refs: `#32332`_) + +* **PR** `#32332`_: (`rallytime`_) Don't unsubscribe from open events on the CLI too early on long-running commands + @ *2016-04-04 20:39:39 UTC* + + * **PR** `#32145`_: (`paclat`_) fixes 29817 (refs: `#32332`_) + + * 6ee5a9729c Merge pull request `#32332`_ from rallytime/fix-32305 + + * 8dc1161c8a Don't unsubscribe from open events on the CLI too early on long-running commands + +* **PR** `#32333`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-04-04 20:06:02 UTC* + + * 22b296d2fd Merge pull request `#32333`_ from rallytime/merge-2015.8 + + * d7b4b8b081 Merge branch '2015.5' into '2015.8' + + * fbdc47cc55 Merge pull request `#32284`_ from rallytime/config-audit + + * 0491513204 Don't be so explicit. Just use string_types. + + * 083c477fd3 Use six.string_types in config default tuples + + * 7e642b8381 Audit config.py default types and values - first sweep + + * 0a6d44e57b Merge pull request `#32302`_ from terminalmage/fix-missing-release + + * 413c371ccd Properly support packages with blank "Release" param in pkg.latest_version + +* **ISSUE** `#32246`_: (`danlsgiga`_) IMPORTANT: Do not use md5 hashing algorithm! Please set "hash_type" to SHA256 in Salt Minion config! (refs: `#32289`_) + +* **PR** `#32289`_: (`rallytime`_) New salt-cloud instances should not use old hash_type default. + @ *2016-04-04 17:52:09 UTC* + + * **PR** `#31162`_: (`isbm`_) Remove MD5 digest from everywhere and default to SHA256 (refs: `#32289`_) + + * 28cc054244 Merge pull request `#32289`_ from rallytime/fix-32246 + + * 66acc00c71 New salt-cloud instances should not use old hash_type default. + +* **ISSUE** `#14277`_: (`Sacro`_) Chocolatey.version doesn't tell you anything informative. (refs: `#32291`_) + +* **PR** `#32291`_: (`twangboy`_) Fix bad output for chocolatey.version (fixes `#14277`_) + @ *2016-04-04 17:50:54 UTC* + + * 5fb90a1040 Merge pull request `#32291`_ from twangboy/fix_14277 + + * 53f6a28297 Fix problem with return on installed packages + + * f5bd004ab0 Fix chocolatey.version function + +* **ISSUE** `#32183`_: (`llamallama`_) Salt Cloud 2015.8.8 not installing salt minions on new nodes (refs: `#32295`_) + +* **PR** `#32295`_: (`rallytime`_) Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config + @ *2016-04-04 17:38:47 UTC* + + * edbab99164 Merge pull request `#32295`_ from rallytime/test-cloud-deploy-dir + + * 4037476f40 Patch call to os.path.isdir so we know both search paths are in tuple + + * 49a4eec051 Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config + +* **ISSUE** `#23617`_: (`porterjamesj`_) file.managed with proxy broken in 2015.5 (refs: `#32315`_) + +* **PR** `#32315`_: (`ahus1`_) fixing file.managed with requests lib + @ *2016-04-04 17:20:11 UTC* + + * 4389680bc5 Merge pull request `#32315`_ from ahus1/fix_file_managed_http_requests + + * a867d23383 ensure streaming mode (use for example by file.managed) will works for requests backend + +* **ISSUE** `saltstack/salt-bootstrap#782`_: (`ninjada`_) Bootstrap and Links & Documentation still broken due to fedoraproject redirect to fedorainfracloud.org (refs: `#32316`_) + +* **ISSUE** `saltstack/salt-bootstrap#742`_: (`dennisfoconnor`_) Non-Development Script Broken on Amazon Linux (refs: `#32316`_) + +* **ISSUE** `saltstack/salt-bootstrap#695`_: (`mtippett`_) Install Failures With Raspbian Jessie (refs: `#32316`_) + +* **PR** `#32316`_: (`vutny`_) Update Salt Bootstrap tutorial + @ *2016-04-04 17:18:12 UTC* + + * 9065201761 Merge pull request `#32316`_ from vutny/update-bootstrap-tutorial + + * b9698f015d Update Salt Bootstrap tutorial + +* **PR** `#32325`_: (`bdrung`_) Re-add shebang to ssh-id-wrapper shell script + @ *2016-04-04 17:08:41 UTC* + + * 352f3c01d1 Merge pull request `#32325`_ from bdrung/fix-shebang + + * ffe585f078 Re-add shebang to ssh-id-wrapper shell script + +* **PR** `#32326`_: (`bdrung`_) Fix typos + @ *2016-04-04 16:41:41 UTC* + + * f16e332b3a Merge pull request `#32326`_ from bdrung/fix-typos + + * a7db152333 Fix typo dont -> don't + + * d4c037301b Fix typo missmatch -> mismatch + + * 70dba70ff0 Fix typo additonal -> addition + + * 68c60903aa Fix typo mutliple -> multiple + + * 0f2c779b90 Fix typo fucntion -> function + + * 0c9e4c8c80 Fix typo avilable -> available + + * 920abe2ec7 Fix typo formated -> formatted + + * e56dd4bb23 Fix typo ommitted -> omitted + + * f99e6f1f13 Fix typo ouptut -> output + + * d3804094f2 Fix typo wether -> whether + + * 538fb6fae2 Fix typo perfomed -> performed + + * db7af998ee Fix typo santized -> sanitized + + * d7af01da2b Fix typo coresponding -> corresponding + + * 301e78b5be Fix typo vaules -> values + + * 8cada9573f Fix typos of retrieve + + * b484d6f9c9 Fix typo directorys -> directories + +* **PR** `#32300`_: (`twangboy`_) Add documentation to disable winrepo/winrepo_ng + @ *2016-04-01 21:23:09 UTC* + + * 664043d7e7 Merge pull request `#32300`_ from twangboy/fix_28767 + + * c971a3b054 Add documentation for disabled the winrepos + +* **ISSUE** `#18429`_: (`somenick`_) Pillars passed from command-line override pillar subtrees instead of merging (refs: `#32288`_) + +* **PR** `#32288`_: (`terminalmage`_) use dictupdate.merge instead of dict.update to merge CLI pillar overrides + @ *2016-04-01 16:30:30 UTC* + + * 42a25f6b9d Merge pull request `#32288`_ from terminalmage/issue18429 + + * db31732137 use dictupdate.merge instead of dict.update to merge CLI pillar overrides + +* **PR** `#32243`_: (`isbm`_) Ensure latest pkg.info_installed ensure latest + @ *2016-03-31 16:09:59 UTC* + + * 3e374e7ec6 Merge pull request `#32243`_ from isbm/isbm-zypper-list-installed-ensure-latest + + * fba3d509ac Fix the documentation + + * 73ad8a2bfc Fix lint + + * f07c7ea792 Add lowpkg tests for version comparison + + * afdf451d87 Remove tests from the zypper_test that belongs to rpm_test + + * 3706a21c29 Fix condition from returning None on 0 + + * 0a68ebff16 Remove suse/redhat checks, refactor code. + + * 30c8f7216b Move "string to EVR" function to the utilities + + * fb014a40b0 Sort installed pkgs data by version_cmp + + * b57e439d57 Merge yumpkg's and zypper's version_cmp for a common use + + * ebd13a283c Remove version_cmp from Zypper module and use just lowpkg alias + + * b46d5b526a Remove version_cmp from the yumpkg and use just a lowpkg alias + + * f4d9881e61 Force-sort the RPM output to ensure latest version of the multi-package on top of the list. + +* **ISSUE** `#32261`_: (`arthurlogilab`_) dockerng : AttributeError: 'module' object has no attribute 'version_info' (refs: `#32262`_, `#32268`_) + +* **PR** `#32268`_: (`ticosax`_) [dockerng] Improve detection for older versions of docker-py + @ *2016-03-31 14:51:46 UTC* + + * **PR** `#32262`_: (`arthurlogilab`_) Catch Attribute Error when docker.version_info doesn't exist (refs: `#32268`_) + + * 88fa3c5f71 Merge pull request `#32268`_ from ticosax/handle-dockerpy-old + + * 05116aaa40 Improve detection for older versions of docker-py + +* **PR** `#32258`_: (`jacobhammons`_) Replaces incorrect reference to `master_alive_check` + @ *2016-03-31 14:41:09 UTC* + + * a491897a3b Merge pull request `#32258`_ from jacobhammons/alive-interval-docs + + * ff8ca5ac2e Replaces incorrect reference to `master_alive_check` with `master_alive_interval` in docs + +* **PR** `#32254`_: (`twangboy`_) Fix Display Name with spaces in win_servermanager + @ *2016-03-31 14:38:22 UTC* + + * 8c68d8ac41 Merge pull request `#32254`_ from twangboy/fix_31334 + + * e5f02c52be Fix a pylint error + + * 5ca4ad6675 Fix unit tests for state + + * 12d530f8f0 Fix win_servermanager state + + * b26cb76abb Fix unit tests + + * 1d5bcee390 Fix 31344 + +* **PR** `#32248`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-03-30 21:10:01 UTC* + + * 0f5e67de5d Merge pull request `#32248`_ from rallytime/merge-2015.8 + + * d743f8cc4e Merge branch '2015.5' into '2015.8' + + * 5d08db7c92 Merge pull request `#32162`_ from terminalmage/issue31963 + + * 5c1bdb812c Fix pkgrepo integration test + + * e7fb3095ce Properly handle yum/zypper repositories in pkgrepo.managed + + * add2111fec Use six.iteritems instead of dict.items + + * 6c21881c38 Docstring tweaks + + * ecbb78b649 Remove useless function + + * 06f3309552 Normalize variable naming to match other functions + + * 690537ca8b Look for apt-add-repository in PATH instead of assuming it's there + + * 709d80bb1b aptpkg: Accept \*\*kwargs instead of a dict for pkg.expand_repo_def + + * 4fcdaab428 Merge pull request `#32223`_ from twangboy/fix_31976 + + * b7fcae97ce Create minion.d directory, fixes `#31976`_ + + * 3309ff6a29 Merge pull request `#32218`_ from cachedout/issue_31501 + + * 6795d6aef0 Only display error when tty is True in salt-ssh + + * 6e0cb22c96 Merge pull request `#32196`_ from jtand/cherrypy_pam_test_lint_fix + + * bd3942e0fd Fixed pylint error in app_pam_test.py + +* **ISSUE** `#32169`_: (`sknutsonsf`_) CommandNotFoundError: update-rc.d during service.enabled on Centos 7 (refs: `#32230`_) + +* **PR** `#32230`_: (`terminalmage`_) systemd.py: Support both update-rc.d and chkconfig as managers of sysv services + @ *2016-03-30 21:09:43 UTC* + + * 6216c37885 Merge pull request `#32230`_ from terminalmage/issue32169 + + * 45af3e902a systemd.py: Support both update-rc.d and chkconfig as managers of sysv services + +* **PR** `#32249`_: (`jacobhammons`_) Fixes windows download paths to account for patch + @ *2016-03-30 20:26:53 UTC* + + * bde2a1fc98 Merge pull request `#32249`_ from jacobhammons/dot8 + + * 50d1df2482 Fixes windows download paths to account for patch + +* **PR** `#32221`_: (`dmurphy18`_) Fix version check, fix extracting Major and Minor versions from __ver… + @ *2016-03-30 14:50:31 UTC* + + * 1d9321d043 Merge pull request `#32221`_ from dmurphy18/fix_version_check + + * 96cf024e63 Fix version check, fix extracting Major and Minor versions from __version__ + +* **ISSUE** `#32031`_: (`travispaul`_) Unable to manage Windows services that contain a space in the service name (refs: `#32227`_) + +* **PR** `#32227`_: (`twangboy`_) Remove list2cmdline usage from win_service.py + @ *2016-03-30 14:43:17 UTC* + + * 22bd1e6b29 Merge pull request `#32227`_ from twangboy/fix_32031 + + * 58772b036d Remove list2cmdline usage + +* **PR** `#32239`_: (`anlutro`_) Add state file name to warning log line + @ *2016-03-30 14:37:54 UTC* + + * 7fce438b67 Merge pull request `#32239`_ from alprs/fix-file_log_warning + + * 72adae3702 add state file name to log line + +* **ISSUE** `#31365`_: (`cwicklein`_) osrelease_info broken for CentOS 7 (refs: `#32215`_) + +* **PR** `#32215`_: (`DmitryKuzmenko`_) rhel oscodename + @ *2016-03-29 19:14:50 UTC* + + * 3c3028f347 Merge pull request `#32215`_ from DSRCompany/issues/rhel_oscodename + + * dc2a3b81ac Ignore lsb codename from os-release for newest RHEL + +* **PR** `#32217`_: (`jacobhammons`_) 2015.8.8.2 release notes + @ *2016-03-29 17:53:22 UTC* + + * bf59f06733 Merge pull request `#32217`_ from jacobhammons/dot8 + + * 596444e2b4 2015.8.8.2 release notes Adds banner notifiying user when they are viewing release notes for an old release + +* **ISSUE** `#31844`_: (`Talkless`_) slspath is not documented (refs: `#32197`_) + +* **PR** `#32212`_: (`rallytime`_) Back-port `#32197`_ to 2015.8 + @ *2016-03-29 15:50:58 UTC* + + * **PR** `#32197`_: (`twellspring`_) documentation fix issue 31844 (refs: `#32212`_) + + * ab8b70d985 Merge pull request `#32212`_ from rallytime/bp-32197 + + * 5fdd81ace9 documentation fix issue 31844 + +* **ISSUE** `#31931`_: (`gravyboat`_) Ordering States documentation should note top.sls adheres to this rule (refs: `#32193`_) + +* **PR** `#32211`_: (`rallytime`_) Back-port `#32210`_ to 2015.8 + @ *2016-03-29 15:50:42 UTC* + + * **PR** `#32210`_: (`rallytime`_) Merge `#32193`_ with pylint fix (refs: `#32211`_) + + * **PR** `#32193`_: (`twellspring`_) Documentation fix 31931 (refs: `#32210`_, `#32211`_) + + * 200d82cc3e Merge pull request `#32211`_ from rallytime/bp-32210 + + * 7b9c05487c Whitespace fix. + + * abd432746c documentation-fix-31931 + + * 79086f8f04 service.py documentation update for 32084 + +* **ISSUE** `#32084`_: (`guettli`_) Docs: Please provide a link from "service.running" to "watch" (refs: `#32192`_) + +* **PR** `#32209`_: (`rallytime`_) Back-port `#32208`_ to 2015.8 + @ *2016-03-29 15:50:27 UTC* + + * **PR** `#32208`_: (`rallytime`_) Merge `#32192`_ with pylint fix (refs: `#32209`_) + + * **PR** `#32192`_: (`twellspring`_) service.py documentation update for 32084 (refs: `#32208`_, `#32209`_) + + * 32da8d4c57 Merge pull request `#32209`_ from rallytime/bp-32208 + + * 777a2c4e83 Whitespace fix. + + * e3db0640ec service.py documentation update for 32084 + +* **ISSUE** `#31595`_: (`dverbeek84`_) dockerng ports specified in Dockerfile must be in sls file otherwise salt gives an error (refs: `#32204`_) + +* **PR** `#32204`_: (`ticosax`_) [dockerng] Consider labels carried by the image when comparing user defined labels. + @ *2016-03-29 14:39:22 UTC* + + * 7154104591 Merge pull request `#32204`_ from ticosax/label-from-image + + * c989ae5a7e Merge user defined labels with one carried by the image + +* **PR** `#32186`_: (`rallytime`_) Add some "best practices" information to test documentation + @ *2016-03-29 00:22:48 UTC* + + * 5877a19f59 Merge pull request `#32186`_ from rallytime/testing-docs + + * 40d09c822e Add some "best practices" information to test documentation + +* **PR** `#32176`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-03-28 23:16:09 UTC* + + * b44adffc12 Merge pull request `#32176`_ from rallytime/merge-2015.8 + + * e8658697a6 Pylint fix for integration import + + * 527bc3e491 Pylint fix + + * e9abd2d420 Merge branch '2015.5' into '2015.8' + + * 6b8b8b51c0 Merge pull request `#32154`_ from Ch3LL/ch3ll_pam_2015.5 + + * ba605b0128 fix more pylint and add ability to close cherrypy engine + + * 2d4dc4da05 add teardown call + + * d115878714 fix pylint error + + * 4c1ab082b6 add pam salt-api tests + + * 230443be6c Merge pull request `#32170`_ from gtmanfred/lxc_cloud_name + + * eb7d82e7be add name for lxc for use with cloud cache + + * 32b0421a34 Merge pull request `#32164`_ from terminalmage/issue31731-2015.5 + + * 18439c4f89 Make __virtual__ for rhservice.py more robust (2015.5 branch) + + * 6212e9aa56 Merge pull request `#32141`_ from paclat/issue_32108 + + * 72c5d12d43 fixes 32108 + +* **ISSUE** `#27605`_: (`jmcook1`_) nacl module documentation/possible bug (refs: `#32163`_) + +* **PR** `#32163`_: (`rallytime`_) Update nacl.config docs to use key value instead of 'None' + @ *2016-03-28 14:46:40 UTC* + + * 1afb048801 Merge pull request `#32163`_ from rallytime/fix-27605 + + * e2d09f57dc Update nacl.config docs to use key value instead of 'None' + +* **PR** `#32166`_: (`vutny`_) `salt.states.file`: correct examples with multiline YAML string + @ *2016-03-28 14:45:32 UTC* + + * c08ba3f8a9 Merge pull request `#32166`_ from vutny/fix-multiline-yaml-string-example + + * 34aaea93b4 Another indentation fix in `salt.states.alternatives` + + * 85d0576583 `salt.states.file`: correct examples with multiline YAML string + +* **PR** `#32168`_: (`rallytime`_) Lint 2015.8 + @ *2016-03-27 18:26:50 UTC* + + * f2e986cf65 Merge pull request `#32168`_ from rallytime/lint-2015.8 + + * ba6b19d72c Lint 2015.8 + +* **ISSUE** `#31731`_: (`sjorge`_) rh_service references osrelease before it is available, also does not return bool (refs: `#32165`_) + +* **PR** `#32165`_: (`terminalmage`_) Make __virtual__ for rhservice.py more robust (refs: `#32164`_) + @ *2016-03-27 18:21:16 UTC* + + * **PR** `#32164`_: (`terminalmage`_) Make __virtual__ for rhservice.py more robust (2015.5 branch) (refs: `#32165`_) + + * ae472617af Merge pull request `#32165`_ from terminalmage/issue31731 + + * 559eb7da52 Make __virtual__ for rhservice.py more robust + +* **ISSUE** `#31944`_: (`Inveracity`_) traceback in _determine_beacon_config(...) in beacon/__init__.py line 105 (refs: `#32160`_) + +* **PR** `#32160`_: (`cachedout`_) Fix beacon tutorial docs + @ *2016-03-25 22:32:51 UTC* + + * 63c8bf3542 Merge pull request `#32160`_ from cachedout/issue_31944 + + * 104ada5b6f Fix beacon tutorial docs + +* **PR** `#32145`_: (`paclat`_) fixes 29817 (refs: `#32332`_) + @ *2016-03-25 16:55:47 UTC* + + * bff94a5160 Merge pull request `#32145`_ from paclat/issue_29817 + + * 5d970ca031 fixes 29817 + +* **PR** `#32133`_: (`basepi`_) Pass eauth user/groups through salt-api to destination functions + @ *2016-03-25 16:49:46 UTC* + + * 245249d347 Merge pull request `#32133`_ from basepi/api_user_passthrough + + * 41ba309839 Change the kwarg names to be more specific + + * 40f7e596d8 Pass eauth user/groups through salt-api to destination functions + +* **PR** `#32127`_: (`rallytime`_) Add runners to __salt__ docs + @ *2016-03-25 15:54:02 UTC* + + * a09aa18036 Merge pull request `#32127`_ from rallytime/dunder-docs + + * 482690ef33 Add note to docs about __salt__ referencing runner modules + + * a11d2e413a Add runners to __salt__ docs + +* **ISSUE** `#30183`_: (`jakehilton`_) Minion startup extremely delayed when first master in failover multi master setup is down (refs: `#31364`_, `#31382`_, `#32143`_) + +* **PR** `#32143`_: (`DmitryKuzmenko`_) Set auth retry count to 0 if multimaster mode is failover. + @ *2016-03-25 15:23:09 UTC* + + * **PR** `#31382`_: (`DmitryKuzmenko`_) Set auth retry count to 0 if multimaster mode is failover (refs: `#32143`_) + + * cc224b877a Merge pull request `#32143`_ from DSRCompany/issues/30183_failover_fix + + * 93d34a2573 Set auth retry count to 0 if multimaster mode is failover. + +* **PR** `#32134`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-03-25 15:22:08 UTC* + + * 0679a61871 Merge pull request `#32134`_ from rallytime/merge-2015.8 + + * 6886681410 Fix test failures + + * 7554d0f42d Merge branch '2015.5' into '2015.8' + + * bdd7ea89d5 Merge pull request `#32129`_ from terminalmage/issue32044 + + * 34ca1ea12e Change type check errors to debug loglevel + + * 5462081488 Support multiple valid option types when performing type checks + + * c42014eb54 Merge pull request `#32056`_ from bstevenson/fix-list_absent + + * 1500aae027 set deleted value to list + + * 1dc8f5f289 unit test update + + * 39adf86fec Fixed negation logic + + * be9388173b Removed has_key in lieu of in + + * e48593ed81 Comments and Changes output fixes + + * b98f5517de Updated to conform to proper ret values + + * d18b4be80b remove whitespace end of line 186:q + + * d2b89c85ad fix formating + + * 103cee9e29 cleaned up formating + + * 7a4d7f0bff added whitespace + + * 8ea5b545b0 Loop through list values in list_absent + + * 848ce5647f Merge pull request `#32096`_ from rallytime/bp-32065 + + * 36a9d6a374 Fix an issue with the minion targeting example + + * 9b332d48b9 Merge pull request `#32104`_ from jacobhammons/dot10 + + * b9fc882a1e One additional known issue for 2015.5.10 release notes + + * ff51d548e1 Merge pull request `#32100`_ from jacobhammons/dot10 + + * 544a1661ce 2015.5.10 release docs + + * 72a20f9799 Merge pull request `#32038`_ from terminalmage/issue32037 + + * 8b2d983324 Add reference to state tutorial to state.apply docstring + + * 9b4fe8443e Move highstate usage details to top of state.apply docstring + + * 74ee8c54bc Clarify prior role of state.highstate in states tutorial + + * 1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply + +* **ISSUE** `#26129`_: (`GreatSnoopy`_) salt yumpkg implementation painfully slow in some circumstances (refs: `#32091`_) + +* **PR** `#32091`_: (`clarkperkins`_) Fixed the regression in 410da78 + @ *2016-03-25 14:53:08 UTC* + + * ad924226ca Merge pull request `#32091`_ from clarkperkins/bugfix/yumpkg-repoquery + + * d2119ea608 Added comment so this issue doesn't regress again + + * 1455fab9e3 Fixed the regression in 410da78 + +* **ISSUE** `#32044`_: (`ScoreUnder`_) Multiple masters throwing warnings? "Key master with value [...] has an invalid type of list, a str is required for this value" (refs: `#32129`_) + +* **PR** `#32135`_: (`rallytime`_) [2015.8] Support multiple valid option types when performing type checks + @ *2016-03-24 22:42:28 UTC* + + * **PR** `#32129`_: (`terminalmage`_) Support multiple valid option types when performing type checks (refs: `#32135`_, `#32284`_) + + * b84908d51f Merge pull request `#32135`_ from rallytime/32129-to-2915.8 + + * 7d43bdd721 Change type check errors to debug loglevel + + * ed5abf4381 Support multiple valid option types when performing type checks + +* **PR** `#31760`_: (`sakateka`_) SMinion need wait future from eval_master + @ *2016-03-24 22:08:56 UTC* + + * b23a08f3f4 Merge pull request `#31760`_ from sakateka/fix_master_switch + + * 3d7874029a Run self.eval_master in self.io_loop.run_sync + + * 3b4425652b SMinion need wait future from eval_master + +* **PR** `#32106`_: (`jfindlay`_) update suse master service patch + @ *2016-03-24 21:34:01 UTC* + + * 5efe37ddc8 Merge pull request `#32106`_ from jfindlay/suse_patch + + * 8de84b4251 update suse master service patch + +* **PR** `#32130`_: (`jacobhammons`_) Added known issues 32004 and 32044 to 2015.8.8 release notes + @ *2016-03-24 19:59:41 UTC* + + * 939c1b17d5 Merge pull request `#32130`_ from jacobhammons/dot8 + + * 21eee08842 Added known issues 32004 and 32044 to 2015.8.8 release notes + +* **PR** `#32105`_: (`clarkperkins`_) Fixed invalid deploy_scripts_search_path + @ *2016-03-24 17:36:27 UTC* + + * 2d8abf4717 Merge pull request `#32105`_ from clarkperkins/bugfix/invalid-deploy-script-path + + * 5a9f4e947e Fixed invalid deploy_scripts_search_path + +* **ISSUE** `#32114`_: (`tomlaredo`_) Wrong validation type for file_ignore_glob key (refs: `#32117`_) + +* **PR** `#32117`_: (`tomlaredo`_) Fixed validation type for file_ignore_glob + @ *2016-03-24 17:28:22 UTC* + + * fe4112d7f9 Merge pull request `#32117`_ from rodacom/fix_32114 + + * c6f83ba00b Fixed validation type for file_ignore_glob Fixes `#32114`_ + +* **PR** `#32113`_: (`sakateka`_) Fix log message for AsyncAuth initialization + @ *2016-03-24 17:27:04 UTC* + + * 93d86d249c Merge pull request `#32113`_ from sakateka/correct_log_message + + * 71148d77ab Fix log message for AsyncAuth initialization + +* **ISSUE** `#32033`_: (`timcharper`_) SaltStack `modules.dockerng` `_compare` does not handle docker implicit Domainname properly (issue when using network_mode: host) (refs: `#32116`_, `#32432`_) + +* **PR** `#32116`_: (`ticosax`_) Obtain default value of `memory_swap` from the container. + @ *2016-03-24 15:56:54 UTC* + + * 294177f428 Merge pull request `#32116`_ from ticosax/memory_swap-default-from-container + + * fe439db4d3 Obtain default value of `memory_swap` from the container. + +* **PR** `#32098`_: (`rallytime`_) Back-port `#32083`_ to 2015.8 + @ *2016-03-23 21:49:01 UTC* + + * **PR** `#32083`_: (`guettli`_) "Fire Event Notifications" moved down (refs: `#32098`_) + + * d5bb8f6372 Merge pull request `#32098`_ from rallytime/bp-32083 + + * 4a3a6629ce "Fire Event Notifications" moved down + +* **PR** `#32099`_: (`jacobhammons`_) 2015.8.8 release docs + @ *2016-03-23 20:02:40 UTC* + + * e45107ce96 Merge pull request `#32099`_ from jacobhammons/dot8 + + * 8ec5d989ad 2015.8.8 release docs + +* **PR** `#32088`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-03-23 17:52:37 UTC* + + * 9e11f3aac5 Merge pull request `#32088`_ from rallytime/merge-2015.8 + + * 59c3b7e82e Merge branch '2015.5' into '2015.8' + + * 908a7bf5cd Merge pull request `#32051`_ from terminalmage/fix-state-apply-output + + * 7d7cb45565 Fix outputter for state.apply + + * 0e66f678d4 Merge pull request `#32002`_ from abednarik/pkg_manjaron_issue31788 + + * 1b052d0a66 Added Manajro Linux to virtual. List extended with ManajaroLinux in order su load pacman module. + + * ba5bf62c1a Merge pull request `#31957`_ from rallytime/merge-2015.5 + + * 1b6ec5d445 Merge branch '2014.7' into '2015.5' + + * ba73deee46 Merge pull request `#31929`_ from twangboy/fix_build_script + + * 2c5599d2bc Backport build script from 2015.8 + + * ce74991dd0 Fix nsi script to work with new build process + + * a52e3ad7a1 Merge pull request `#31972`_ from terminalmage/zh-584 + + * 1e5639e495 Make lack of python-ldap module more explicit when LDAP eauth is enabled + +* **PR** `#32074`_: (`Xiami2012`_) Fix code for proto args in modules.iptables + @ *2016-03-23 16:37:58 UTC* + + * bc9a899bc8 Merge pull request `#32074`_ from Xiami2012/fix_iptables + + * aae3af7e49 Fix code for proto args in modules.iptables + +* **PR** `#32053`_: (`basepi`_) [2015.8] Fix rabbitmq_user.present tag handling + @ *2016-03-22 20:33:51 UTC* + + * 3e08dd0a93 Merge pull request `#32053`_ from basepi/fix_rabbitmq + + * 95c08f55e9 Tear out useless unit test + + * bed048e1e7 Remove leftover arg (lint) + + * 08868cb32a Fix tag handling code for rabbitmq_user.present + + * 3b6d25b4e9 Remove leading whitespace on tags + +* **ISSUE** `#32004`_: (`sjorge`_) win_dacl module stacktrace: NameError: name 'ntsecuritycon' is not defined (refs: `#32023`_) + +* **PR** `#32023`_: (`sbreidba`_) Move constant declaration into member variable to avoid issues when m… + @ *2016-03-21 20:18:23 UTC* + + * 553ecaca25 Merge pull request `#32023`_ from sbreidba/bugfix_32004 + + * 711a0a9844 Move constant declaration into member variable to avoid issues when modules can't be loaded. + +* **PR** `#32026`_: (`techhat`_) Don't require the decode_out file to already exist + @ *2016-03-21 20:17:05 UTC* + + * 65c634d197 Merge pull request `#32026`_ from techhat/decodeout + + * f27da41b71 Don't require the decode_out file to already exist + +* **PR** `#32019`_: (`rallytime`_) Back-port `#32012`_ to 2015.8 + @ *2016-03-21 15:54:31 UTC* + + * **PR** `#32012`_: (`jfray`_) There were two identical blocks concerning Windows Deploy Timeouts. This (refs: `#32019`_) + + * 1d4246bfd7 Merge pull request `#32019`_ from rallytime/bp-32012 + + * 26eee1505f There were two identical blocks concerning Windows Deploy Timeouts. This pull request removes the extra block of text. + +* **ISSUE** `#32013`_: (`timcharper`_) SaltStack dockerng.running state ports configuration responding to Docker's injection of UDP params (refs: `#32015`_) + +* **PR** `#32015`_: (`ticosax`_) [dockerng] Fix ports exposition when protocol is passed. + @ *2016-03-21 15:22:19 UTC* + + * d117db3efb Merge pull request `#32015`_ from ticosax/fix-port-comparison-udp + + * e511864a55 Fix ports exposition when protocol is passed. + +* **PR** `#31999`_: (`jacobhammons`_) Fixes a doc build exception caused by missing mocks for modules.win_dacl + @ *2016-03-19 15:49:40 UTC* + + * c72ab6a073 Merge pull request `#31999`_ from jacobhammons/mock-modules2 + + * 31bb573abc Fixes a doc build exception caused by missing mocks for modules.win_dacl + +* **PR** `#31992`_: (`notpeter`_) salt-cloud: add D2 and G2 EC2 instance types + @ *2016-03-18 21:37:21 UTC* + + * 398ab909f0 Merge pull request `#31992`_ from notpeter/2015.8 + + * e3854c8569 D2 and G2 EC2 instance types. + +* **PR** `#31981`_: (`lloydoliver`_) include rotational disks in grains under linux + @ *2016-03-18 15:54:00 UTC* + + * ad8ada7eef Merge pull request `#31981`_ from lloydoliver/linux-disk-grain-fix + + * 9c44604438 include rotational disks in grains under linux + +* **PR** `#31970`_: (`twangboy`_) Add apply_template_on_contents for windows + @ *2016-03-18 15:37:29 UTC* + + * 9be508e8f0 Merge pull request `#31970`_ from twangboy/fix_win_file + + * dfeae191c1 Add apply_template_on_contents for windows + +* **PR** `#31960`_: (`aletourneau`_) fixed ec2 get_console_output + @ *2016-03-18 15:13:48 UTC* + + * 810c6dbcbe Merge pull request `#31960`_ from aletourneau/2015.8_ec2-getconsoleoutput + + * 8305978879 fixed ec2 get_console_output + +* **PR** `#31958`_: (`rallytime`_) [2015.8] Merge forward from 2015.5 to 2015.8 + @ *2016-03-18 15:12:44 UTC* + + * 1c7dc364ad Merge pull request `#31958`_ from rallytime/merge-2015.8 + +* **PR** `#31935`_: (`twangboy`_) Back port nullsoft build script from 2015.8 + @ *2016-03-17 14:54:50 UTC* + + * 2d1f2a0c2e Merge pull request `#31935`_ from twangboy/fix_build_script2 + + * 4af8c9dbfc Back port nullsoft build script from 2015.8 + +* **PR** `#31912`_: (`jfindlay`_) log.mixins: remove extermporaneous .record + @ *2016-03-16 01:56:46 UTC* + + * 43240dc566 Merge pull request `#31912`_ from jfindlay/log_mixin + + * 9f9c694654 log.mixins: remove extermporaneous .record + +.. _`#11801`: https://github.com/saltstack/salt/issues/11801 +.. _`#12422`: https://github.com/saltstack/salt/issues/12422 .. _`#14277`: https://github.com/saltstack/salt/issues/14277 +.. _`#18429`: https://github.com/saltstack/salt/issues/18429 +.. _`#21303`: https://github.com/saltstack/salt/issues/21303 +.. _`#21315`: https://github.com/saltstack/salt/issues/21315 +.. _`#21903`: https://github.com/saltstack/salt/issues/21903 +.. _`#22142`: https://github.com/saltstack/salt/issues/22142 +.. _`#23435`: https://github.com/saltstack/salt/issues/23435 +.. _`#23617`: https://github.com/saltstack/salt/issues/23617 +.. _`#23683`: https://github.com/saltstack/salt/issues/23683 .. _`#23714`: https://github.com/saltstack/salt/issues/23714 +.. _`#23952`: https://github.com/saltstack/salt/issues/23952 .. _`#24237`: https://github.com/saltstack/salt/issues/24237 +.. _`#24996`: https://github.com/saltstack/salt/issues/24996 +.. _`#25040`: https://github.com/saltstack/salt/issues/25040 +.. _`#25492`: https://github.com/saltstack/salt/issues/25492 +.. _`#26011`: https://github.com/saltstack/salt/issues/26011 +.. _`#26062`: https://github.com/saltstack/salt/issues/26062 +.. _`#26129`: https://github.com/saltstack/salt/issues/26129 .. _`#26518`: https://github.com/saltstack/salt/pull/26518 .. _`#26648`: https://github.com/saltstack/salt/pull/26648 .. _`#26676`: https://github.com/saltstack/salt/pull/26676 +.. _`#27605`: https://github.com/saltstack/salt/issues/27605 .. _`#28262`: https://github.com/saltstack/salt/issues/28262 +.. _`#28569`: https://github.com/saltstack/salt/issues/28569 .. _`#28639`: https://github.com/saltstack/salt/pull/28639 .. _`#28706`: https://github.com/saltstack/salt/issues/28706 .. _`#29322`: https://github.com/saltstack/salt/pull/29322 +.. _`#29643`: https://github.com/saltstack/salt/issues/29643 +.. _`#29796`: https://github.com/saltstack/salt/issues/29796 +.. _`#30147`: https://github.com/saltstack/salt/issues/30147 +.. _`#30183`: https://github.com/saltstack/salt/issues/30183 +.. _`#30258`: https://github.com/saltstack/salt/issues/30258 +.. _`#30605`: https://github.com/saltstack/salt/issues/30605 +.. _`#30761`: https://github.com/saltstack/salt/issues/30761 .. _`#30824`: https://github.com/saltstack/salt/pull/30824 +.. _`#30855`: https://github.com/saltstack/salt/issues/30855 +.. _`#30946`: https://github.com/saltstack/salt/issues/30946 .. _`#31139`: https://github.com/saltstack/salt/pull/31139 .. _`#31162`: https://github.com/saltstack/salt/pull/31162 .. _`#31164`: https://github.com/saltstack/salt/pull/31164 .. _`#31270`: https://github.com/saltstack/salt/issues/31270 .. _`#31364`: https://github.com/saltstack/salt/pull/31364 +.. _`#31365`: https://github.com/saltstack/salt/issues/31365 .. _`#31382`: https://github.com/saltstack/salt/pull/31382 +.. _`#31542`: https://github.com/saltstack/salt/issues/31542 +.. _`#31595`: https://github.com/saltstack/salt/issues/31595 .. _`#31598`: https://github.com/saltstack/salt/pull/31598 +.. _`#31632`: https://github.com/saltstack/salt/issues/31632 +.. _`#31731`: https://github.com/saltstack/salt/issues/31731 +.. _`#31738`: https://github.com/saltstack/salt/issues/31738 .. _`#31760`: https://github.com/saltstack/salt/pull/31760 .. _`#31769`: https://github.com/saltstack/salt/pull/31769 -.. _`#31826`: https://github.com/saltstack/salt/pull/31826 +.. _`#31844`: https://github.com/saltstack/salt/issues/31844 +.. _`#31851`: https://github.com/saltstack/salt/issues/31851 .. _`#31898`: https://github.com/saltstack/salt/pull/31898 .. _`#31912`: https://github.com/saltstack/salt/pull/31912 +.. _`#31927`: https://github.com/saltstack/salt/issues/31927 .. _`#31929`: https://github.com/saltstack/salt/pull/31929 +.. _`#31931`: https://github.com/saltstack/salt/issues/31931 .. _`#31935`: https://github.com/saltstack/salt/pull/31935 +.. _`#31944`: https://github.com/saltstack/salt/issues/31944 .. _`#31957`: https://github.com/saltstack/salt/pull/31957 .. _`#31958`: https://github.com/saltstack/salt/pull/31958 .. _`#31960`: https://github.com/saltstack/salt/pull/31960 .. _`#31970`: https://github.com/saltstack/salt/pull/31970 .. _`#31972`: https://github.com/saltstack/salt/pull/31972 +.. _`#31975`: https://github.com/saltstack/salt/issues/31975 +.. _`#31976`: https://github.com/saltstack/salt/issues/31976 .. _`#31981`: https://github.com/saltstack/salt/pull/31981 .. _`#31992`: https://github.com/saltstack/salt/pull/31992 .. _`#31999`: https://github.com/saltstack/salt/pull/31999 .. _`#32002`: https://github.com/saltstack/salt/pull/32002 +.. _`#32004`: https://github.com/saltstack/salt/issues/32004 .. _`#32012`: https://github.com/saltstack/salt/pull/32012 +.. _`#32013`: https://github.com/saltstack/salt/issues/32013 .. _`#32015`: https://github.com/saltstack/salt/pull/32015 .. _`#32019`: https://github.com/saltstack/salt/pull/32019 .. _`#32023`: https://github.com/saltstack/salt/pull/32023 .. _`#32026`: https://github.com/saltstack/salt/pull/32026 +.. _`#32031`: https://github.com/saltstack/salt/issues/32031 +.. _`#32033`: https://github.com/saltstack/salt/issues/32033 .. _`#32038`: https://github.com/saltstack/salt/pull/32038 +.. _`#32044`: https://github.com/saltstack/salt/issues/32044 .. _`#32051`: https://github.com/saltstack/salt/pull/32051 .. _`#32053`: https://github.com/saltstack/salt/pull/32053 .. _`#32056`: https://github.com/saltstack/salt/pull/32056 -.. _`#32065`: https://github.com/saltstack/salt/pull/32065 .. _`#32074`: https://github.com/saltstack/salt/pull/32074 .. _`#32083`: https://github.com/saltstack/salt/pull/32083 +.. _`#32084`: https://github.com/saltstack/salt/issues/32084 .. _`#32088`: https://github.com/saltstack/salt/pull/32088 .. _`#32091`: https://github.com/saltstack/salt/pull/32091 .. _`#32096`: https://github.com/saltstack/salt/pull/32096 @@ -523,6 +1897,7 @@ Changes: .. _`#32105`: https://github.com/saltstack/salt/pull/32105 .. _`#32106`: https://github.com/saltstack/salt/pull/32106 .. _`#32113`: https://github.com/saltstack/salt/pull/32113 +.. _`#32114`: https://github.com/saltstack/salt/issues/32114 .. _`#32116`: https://github.com/saltstack/salt/pull/32116 .. _`#32117`: https://github.com/saltstack/salt/pull/32117 .. _`#32126`: https://github.com/saltstack/salt/pull/32126 @@ -534,6 +1909,7 @@ Changes: .. _`#32135`: https://github.com/saltstack/salt/pull/32135 .. _`#32141`: https://github.com/saltstack/salt/pull/32141 .. _`#32143`: https://github.com/saltstack/salt/pull/32143 +.. _`#32144`: https://github.com/saltstack/salt/issues/32144 .. _`#32145`: https://github.com/saltstack/salt/pull/32145 .. _`#32154`: https://github.com/saltstack/salt/pull/32154 .. _`#32160`: https://github.com/saltstack/salt/pull/32160 @@ -543,13 +1919,16 @@ Changes: .. _`#32165`: https://github.com/saltstack/salt/pull/32165 .. _`#32166`: https://github.com/saltstack/salt/pull/32166 .. _`#32168`: https://github.com/saltstack/salt/pull/32168 +.. _`#32169`: https://github.com/saltstack/salt/issues/32169 .. _`#32170`: https://github.com/saltstack/salt/pull/32170 .. _`#32176`: https://github.com/saltstack/salt/pull/32176 +.. _`#32183`: https://github.com/saltstack/salt/issues/32183 .. _`#32186`: https://github.com/saltstack/salt/pull/32186 .. _`#32192`: https://github.com/saltstack/salt/pull/32192 .. _`#32193`: https://github.com/saltstack/salt/pull/32193 .. _`#32196`: https://github.com/saltstack/salt/pull/32196 .. _`#32197`: https://github.com/saltstack/salt/pull/32197 +.. _`#32201`: https://github.com/saltstack/salt/issues/32201 .. _`#32204`: https://github.com/saltstack/salt/pull/32204 .. _`#32208`: https://github.com/saltstack/salt/pull/32208 .. _`#32209`: https://github.com/saltstack/salt/pull/32209 @@ -562,14 +1941,18 @@ Changes: .. _`#32221`: https://github.com/saltstack/salt/pull/32221 .. _`#32223`: https://github.com/saltstack/salt/pull/32223 .. _`#32227`: https://github.com/saltstack/salt/pull/32227 +.. _`#32229`: https://github.com/saltstack/salt/issues/32229 .. _`#32230`: https://github.com/saltstack/salt/pull/32230 .. _`#32238`: https://github.com/saltstack/salt/pull/32238 .. _`#32239`: https://github.com/saltstack/salt/pull/32239 .. _`#32243`: https://github.com/saltstack/salt/pull/32243 +.. _`#32246`: https://github.com/saltstack/salt/issues/32246 .. _`#32248`: https://github.com/saltstack/salt/pull/32248 .. _`#32249`: https://github.com/saltstack/salt/pull/32249 .. _`#32254`: https://github.com/saltstack/salt/pull/32254 +.. _`#32255`: https://github.com/saltstack/salt/issues/32255 .. _`#32258`: https://github.com/saltstack/salt/pull/32258 +.. _`#32261`: https://github.com/saltstack/salt/issues/32261 .. _`#32262`: https://github.com/saltstack/salt/pull/32262 .. _`#32268`: https://github.com/saltstack/salt/pull/32268 .. _`#32284`: https://github.com/saltstack/salt/pull/32284 @@ -580,6 +1963,8 @@ Changes: .. _`#32295`: https://github.com/saltstack/salt/pull/32295 .. _`#32300`: https://github.com/saltstack/salt/pull/32300 .. _`#32302`: https://github.com/saltstack/salt/pull/32302 +.. _`#32305`: https://github.com/saltstack/salt/issues/32305 +.. _`#32311`: https://github.com/saltstack/salt/issues/32311 .. _`#32312`: https://github.com/saltstack/salt/pull/32312 .. _`#32314`: https://github.com/saltstack/salt/pull/32314 .. _`#32315`: https://github.com/saltstack/salt/pull/32315 @@ -588,6 +1973,7 @@ Changes: .. _`#32323`: https://github.com/saltstack/salt/pull/32323 .. _`#32325`: https://github.com/saltstack/salt/pull/32325 .. _`#32326`: https://github.com/saltstack/salt/pull/32326 +.. _`#32327`: https://github.com/saltstack/salt/issues/32327 .. _`#32332`: https://github.com/saltstack/salt/pull/32332 .. _`#32333`: https://github.com/saltstack/salt/pull/32333 .. _`#32336`: https://github.com/saltstack/salt/pull/32336 @@ -596,13 +1982,16 @@ Changes: .. _`#32344`: https://github.com/saltstack/salt/pull/32344 .. _`#32345`: https://github.com/saltstack/salt/pull/32345 .. _`#32353`: https://github.com/saltstack/salt/pull/32353 +.. _`#32354`: https://github.com/saltstack/salt/issues/32354 .. _`#32358`: https://github.com/saltstack/salt/pull/32358 .. _`#32360`: https://github.com/saltstack/salt/pull/32360 .. _`#32361`: https://github.com/saltstack/salt/pull/32361 .. _`#32372`: https://github.com/saltstack/salt/pull/32372 .. _`#32373`: https://github.com/saltstack/salt/pull/32373 .. _`#32374`: https://github.com/saltstack/salt/pull/32374 +.. _`#32375`: https://github.com/saltstack/salt/issues/32375 .. _`#32376`: https://github.com/saltstack/salt/pull/32376 +.. _`#32385`: https://github.com/saltstack/salt/issues/32385 .. _`#32392`: https://github.com/saltstack/salt/pull/32392 .. _`#32393`: https://github.com/saltstack/salt/pull/32393 .. _`#32399`: https://github.com/saltstack/salt/pull/32399 @@ -617,18 +2006,24 @@ Changes: .. _`#32445`: https://github.com/saltstack/salt/pull/32445 .. _`#32448`: https://github.com/saltstack/salt/pull/32448 .. _`#32450`: https://github.com/saltstack/salt/pull/32450 +.. _`#32452`: https://github.com/saltstack/salt/issues/32452 .. _`#32454`: https://github.com/saltstack/salt/pull/32454 .. _`#32458`: https://github.com/saltstack/salt/pull/32458 +.. _`#32472`: https://github.com/saltstack/salt/issues/32472 .. _`#32474`: https://github.com/saltstack/salt/pull/32474 .. _`#32475`: https://github.com/saltstack/salt/pull/32475 .. _`#32480`: https://github.com/saltstack/salt/pull/32480 .. _`#32482`: https://github.com/saltstack/salt/pull/32482 .. _`#32487`: https://github.com/saltstack/salt/pull/32487 .. _`#32491`: https://github.com/saltstack/salt/pull/32491 +.. _`#32493`: https://github.com/saltstack/salt/issues/32493 .. _`#32505`: https://github.com/saltstack/salt/pull/32505 +.. _`#32510`: https://github.com/saltstack/salt/issues/32510 .. _`#32515`: https://github.com/saltstack/salt/pull/32515 +.. _`#32517`: https://github.com/saltstack/salt/issues/32517 +.. _`#32519`: https://github.com/saltstack/salt/issues/32519 .. _`#32520`: https://github.com/saltstack/salt/pull/32520 -.. _`#32528`: https://github.com/saltstack/salt/pull/32528 +.. _`#32523`: https://github.com/saltstack/salt/issues/32523 .. _`#32531`: https://github.com/saltstack/salt/pull/32531 .. _`#32536`: https://github.com/saltstack/salt/pull/32536 .. _`#32538`: https://github.com/saltstack/salt/pull/32538 @@ -645,12 +2040,15 @@ Changes: .. _`#32588`: https://github.com/saltstack/salt/pull/32588 .. _`#32590`: https://github.com/saltstack/salt/pull/32590 .. _`#32604`: https://github.com/saltstack/salt/pull/32604 +.. _`#32605`: https://github.com/saltstack/salt/issues/32605 +.. _`#32609`: https://github.com/saltstack/salt/issues/32609 .. _`#32614`: https://github.com/saltstack/salt/pull/32614 .. _`#32616`: https://github.com/saltstack/salt/pull/32616 .. _`#32638`: https://github.com/saltstack/salt/pull/32638 .. _`#32639`: https://github.com/saltstack/salt/pull/32639 .. _`#32640`: https://github.com/saltstack/salt/pull/32640 .. _`#32643`: https://github.com/saltstack/salt/pull/32643 +.. _`#32646`: https://github.com/saltstack/salt/issues/32646 .. _`#32649`: https://github.com/saltstack/salt/pull/32649 .. _`#32652`: https://github.com/saltstack/salt/pull/32652 .. _`#32655`: https://github.com/saltstack/salt/pull/32655 @@ -664,11 +2062,14 @@ Changes: .. _`#32682`: https://github.com/saltstack/salt/pull/32682 .. _`#32683`: https://github.com/saltstack/salt/pull/32683 .. _`#32684`: https://github.com/saltstack/salt/pull/32684 +.. _`#32685`: https://github.com/saltstack/salt/issues/32685 .. _`#32686`: https://github.com/saltstack/salt/pull/32686 .. _`#32691`: https://github.com/saltstack/salt/pull/32691 .. _`#32692`: https://github.com/saltstack/salt/pull/32692 .. _`#32693`: https://github.com/saltstack/salt/pull/32693 .. _`#32703`: https://github.com/saltstack/salt/pull/32703 +.. _`#32705`: https://github.com/saltstack/salt/issues/32705 +.. _`#32710`: https://github.com/saltstack/salt/issues/32710 .. _`#32718`: https://github.com/saltstack/salt/pull/32718 .. _`#32720`: https://github.com/saltstack/salt/pull/32720 .. _`#32722`: https://github.com/saltstack/salt/pull/32722 @@ -676,13 +2077,17 @@ Changes: .. _`#32733`: https://github.com/saltstack/salt/pull/32733 .. _`#32749`: https://github.com/saltstack/salt/pull/32749 .. _`#32776`: https://github.com/saltstack/salt/pull/32776 +.. _`#32777`: https://github.com/saltstack/salt/issues/32777 .. _`#32779`: https://github.com/saltstack/salt/pull/32779 .. _`#32785`: https://github.com/saltstack/salt/pull/32785 .. _`#32786`: https://github.com/saltstack/salt/pull/32786 .. _`#32787`: https://github.com/saltstack/salt/pull/32787 .. _`#32796`: https://github.com/saltstack/salt/pull/32796 +.. _`#32799`: https://github.com/saltstack/salt/issues/32799 .. _`#32813`: https://github.com/saltstack/salt/pull/32813 .. _`#32818`: https://github.com/saltstack/salt/pull/32818 +.. _`#32824`: https://github.com/saltstack/salt/issues/32824 +.. _`#32834`: https://github.com/saltstack/salt/issues/32834 .. _`#32837`: https://github.com/saltstack/salt/pull/32837 .. _`#32839`: https://github.com/saltstack/salt/pull/32839 .. _`#32841`: https://github.com/saltstack/salt/pull/32841 @@ -690,28 +2095,35 @@ Changes: .. _`#32845`: https://github.com/saltstack/salt/pull/32845 .. _`#32847`: https://github.com/saltstack/salt/pull/32847 .. _`#32848`: https://github.com/saltstack/salt/pull/32848 +.. _`#32856`: https://github.com/saltstack/salt/issues/32856 +.. _`#32861`: https://github.com/saltstack/salt/issues/32861 .. _`#32865`: https://github.com/saltstack/salt/pull/32865 .. _`#32868`: https://github.com/saltstack/salt/pull/32868 .. _`#32869`: https://github.com/saltstack/salt/pull/32869 .. _`#32878`: https://github.com/saltstack/salt/pull/32878 .. _`#32880`: https://github.com/saltstack/salt/pull/32880 +.. _`#32882`: https://github.com/saltstack/salt/issues/32882 .. _`#32883`: https://github.com/saltstack/salt/pull/32883 .. _`#32884`: https://github.com/saltstack/salt/pull/32884 +.. _`#32891`: https://github.com/saltstack/salt/issues/32891 .. _`#32892`: https://github.com/saltstack/salt/pull/32892 .. _`#32900`: https://github.com/saltstack/salt/pull/32900 .. _`#32906`: https://github.com/saltstack/salt/pull/32906 .. _`#32908`: https://github.com/saltstack/salt/pull/32908 +.. _`#32917`: https://github.com/saltstack/salt/issues/32917 .. _`#32922`: https://github.com/saltstack/salt/pull/32922 .. _`#32925`: https://github.com/saltstack/salt/pull/32925 .. _`#32926`: https://github.com/saltstack/salt/pull/32926 .. _`#32928`: https://github.com/saltstack/salt/pull/32928 .. _`#32934`: https://github.com/saltstack/salt/pull/32934 +.. _`#32954`: https://github.com/saltstack/salt/issues/32954 .. _`#32955`: https://github.com/saltstack/salt/pull/32955 .. _`#32958`: https://github.com/saltstack/salt/pull/32958 .. _`#32970`: https://github.com/saltstack/salt/pull/32970 .. _`#32986`: https://github.com/saltstack/salt/pull/32986 .. _`#32994`: https://github.com/saltstack/salt/pull/32994 .. _`#32996`: https://github.com/saltstack/salt/pull/32996 +.. _`#32999`: https://github.com/saltstack/salt/issues/32999 .. _`#33002`: https://github.com/saltstack/salt/pull/33002 .. _`#33017`: https://github.com/saltstack/salt/pull/33017 .. _`#33021`: https://github.com/saltstack/salt/pull/33021 @@ -720,6 +2132,7 @@ Changes: .. _`#33031`: https://github.com/saltstack/salt/pull/33031 .. _`#33039`: https://github.com/saltstack/salt/pull/33039 .. _`#33040`: https://github.com/saltstack/salt/pull/33040 +.. _`#33041`: https://github.com/saltstack/salt/issues/33041 .. _`#33044`: https://github.com/saltstack/salt/pull/33044 .. _`#33045`: https://github.com/saltstack/salt/pull/33045 .. _`#33048`: https://github.com/saltstack/salt/pull/33048 @@ -729,10 +2142,13 @@ Changes: .. _`#33054`: https://github.com/saltstack/salt/pull/33054 .. _`#33055`: https://github.com/saltstack/salt/pull/33055 .. _`#33056`: https://github.com/saltstack/salt/pull/33056 +.. _`#33058`: https://github.com/saltstack/salt/issues/33058 .. _`#33060`: https://github.com/saltstack/salt/pull/33060 .. _`#33061`: https://github.com/saltstack/salt/pull/33061 .. _`#33064`: https://github.com/saltstack/salt/pull/33064 .. _`#33067`: https://github.com/saltstack/salt/pull/33067 +.. _`#33068`: https://github.com/saltstack/salt/issues/33068 +.. _`#33073`: https://github.com/saltstack/salt/issues/33073 .. _`#33078`: https://github.com/saltstack/salt/pull/33078 .. _`#33080`: https://github.com/saltstack/salt/pull/33080 .. _`#33081`: https://github.com/saltstack/salt/pull/33081 @@ -762,6 +2178,7 @@ Changes: .. _`#33156`: https://github.com/saltstack/salt/pull/33156 .. _`#33160`: https://github.com/saltstack/salt/pull/33160 .. _`#33161`: https://github.com/saltstack/salt/pull/33161 +.. _`#33162`: https://github.com/saltstack/salt/issues/33162 .. _`#33164`: https://github.com/saltstack/salt/pull/33164 .. _`#33172`: https://github.com/saltstack/salt/pull/33172 .. _`#33178`: https://github.com/saltstack/salt/pull/33178 @@ -786,6 +2203,7 @@ Changes: .. _`#33237`: https://github.com/saltstack/salt/pull/33237 .. _`#33238`: https://github.com/saltstack/salt/issues/33238 .. _`#33239`: https://github.com/saltstack/salt/pull/33239 +.. _`#33243`: https://github.com/saltstack/salt/issues/33243 .. _`#33244`: https://github.com/saltstack/salt/pull/33244 .. _`#33245`: https://github.com/saltstack/salt/pull/33245 .. _`#33246`: https://github.com/saltstack/salt/pull/33246 @@ -799,3 +2217,143 @@ Changes: .. _`#33299`: https://github.com/saltstack/salt/issues/33299 .. _`#33300`: https://github.com/saltstack/salt/pull/33300 .. _`#33305`: https://github.com/saltstack/salt/pull/33305 +.. _`#33310`: https://github.com/saltstack/salt/pull/33310 +.. _`4001982248998`: https://github.com/4001982248998 +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DeanScothern`: https://github.com/DeanScothern +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`DylanFrese`: https://github.com/DylanFrese +.. _`Ferbla`: https://github.com/Ferbla +.. _`GreatSnoopy`: https://github.com/GreatSnoopy +.. _`Grokzen`: https://github.com/Grokzen +.. _`Inveracity`: https://github.com/Inveracity +.. _`JaseFace`: https://github.com/JaseFace +.. _`Kurocon`: https://github.com/Kurocon +.. _`Lothiraldan`: https://github.com/Lothiraldan +.. _`RuriRyan`: https://github.com/RuriRyan +.. _`Sacro`: https://github.com/Sacro +.. _`ScoreUnder`: https://github.com/ScoreUnder +.. _`Talkless`: https://github.com/Talkless +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`UtahDave`: https://github.com/UtahDave +.. _`Xiami2012`: https://github.com/Xiami2012 +.. _`abednarik`: https://github.com/abednarik +.. _`aclemetson`: https://github.com/aclemetson +.. _`afletch`: https://github.com/afletch +.. _`ahammond`: https://github.com/ahammond +.. _`ahus1`: https://github.com/ahus1 +.. _`aletourneau`: https://github.com/aletourneau +.. _`alxf`: https://github.com/alxf +.. _`amontalban`: https://github.com/amontalban +.. _`anandnevase`: https://github.com/anandnevase +.. _`andrejohansson`: https://github.com/andrejohansson +.. _`anitakrueger`: https://github.com/anitakrueger +.. _`anlutro`: https://github.com/anlutro +.. _`aronneagu`: https://github.com/aronneagu +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`atengler`: https://github.com/atengler +.. _`basepi`: https://github.com/basepi +.. _`bberberov`: https://github.com/bberberov +.. _`bdrung`: https://github.com/bdrung +.. _`beardedeagle`: https://github.com/beardedeagle +.. _`belt`: https://github.com/belt +.. _`boltronics`: https://github.com/boltronics +.. _`bradthurber`: https://github.com/bradthurber +.. _`cachedout`: https://github.com/cachedout +.. _`captaininspiration`: https://github.com/captaininspiration +.. _`cedwards`: https://github.com/cedwards +.. _`clarkperkins`: https://github.com/clarkperkins +.. _`clinta`: https://github.com/clinta +.. _`creaky`: https://github.com/creaky +.. _`cro`: https://github.com/cro +.. _`cwicklein`: https://github.com/cwicklein +.. _`danlsgiga`: https://github.com/danlsgiga +.. _`deamen`: https://github.com/deamen +.. _`dennisfoconnor`: https://github.com/dennisfoconnor +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`duk3luk3`: https://github.com/duk3luk3 +.. _`dverbeek84`: https://github.com/dverbeek84 +.. _`elsmorian`: https://github.com/elsmorian +.. _`esn89`: https://github.com/esn89 +.. _`exowaucka`: https://github.com/exowaucka +.. _`eyj`: https://github.com/eyj +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gidantribal`: https://github.com/gidantribal +.. _`gravyboat`: https://github.com/gravyboat +.. _`guettli`: https://github.com/guettli +.. _`hernanc`: https://github.com/hernanc +.. _`idonin`: https://github.com/idonin +.. _`igorwidlinski`: https://github.com/igorwidlinski +.. _`isbm`: https://github.com/isbm +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jakehilton`: https://github.com/jakehilton +.. _`jakosky`: https://github.com/jakosky +.. _`jbonachera`: https://github.com/jbonachera +.. _`jfindlay`: https://github.com/jfindlay +.. _`jfray`: https://github.com/jfray +.. _`jmcook1`: https://github.com/jmcook1 +.. _`joakimkarlsson`: https://github.com/joakimkarlsson +.. _`junster1`: https://github.com/junster1 +.. _`justinta`: https://github.com/justinta +.. _`kkaig`: https://github.com/kkaig +.. _`krak3n`: https://github.com/krak3n +.. _`lalmeras`: https://github.com/lalmeras +.. _`llamallama`: https://github.com/llamallama +.. _`lloydoliver`: https://github.com/lloydoliver +.. _`lomeroe`: https://github.com/lomeroe +.. _`matthayes`: https://github.com/matthayes +.. _`mcalmer`: https://github.com/mcalmer +.. _`mitar`: https://github.com/mitar +.. _`mrproper`: https://github.com/mrproper +.. _`mtippett`: https://github.com/mtippett +.. _`multani`: https://github.com/multani +.. _`naemono`: https://github.com/naemono +.. _`neogenix`: https://github.com/neogenix +.. _`nicholascapo`: https://github.com/nicholascapo +.. _`ninjada`: https://github.com/ninjada +.. _`nmadhok`: https://github.com/nmadhok +.. _`notpeter`: https://github.com/notpeter +.. _`onorua`: https://github.com/onorua +.. _`paclat`: https://github.com/paclat +.. _`palica`: https://github.com/palica +.. _`papertigers`: https://github.com/papertigers +.. _`porterjamesj`: https://github.com/porterjamesj +.. _`pythonwood`: https://github.com/pythonwood +.. _`rajvidhimar`: https://github.com/rajvidhimar +.. _`rallytime`: https://github.com/rallytime +.. _`rhansen`: https://github.com/rhansen +.. _`rkgrunt`: https://github.com/rkgrunt +.. _`robnagler`: https://github.com/robnagler +.. _`rodriguezsergio`: https://github.com/rodriguezsergio +.. _`ryan-lane`: https://github.com/ryan-lane +.. _`sakateka`: https://github.com/sakateka +.. _`saltstack/salt#28262`: https://github.com/saltstack/salt/issues/28262 +.. _`saltstack/salt-bootstrap#695`: https://github.com/saltstack/salt-bootstrap/issues/695 +.. _`saltstack/salt-bootstrap#742`: https://github.com/saltstack/salt-bootstrap/issues/742 +.. _`saltstack/salt-bootstrap#782`: https://github.com/saltstack/salt-bootstrap/issues/782 +.. _`sbreidba`: https://github.com/sbreidba +.. _`schancel`: https://github.com/schancel +.. _`seanjnkns`: https://github.com/seanjnkns +.. _`silenius`: https://github.com/silenius +.. _`sjmh`: https://github.com/sjmh +.. _`sjorge`: https://github.com/sjorge +.. _`sknutsonsf`: https://github.com/sknutsonsf +.. _`slai`: https://github.com/slai +.. _`somenick`: https://github.com/somenick +.. _`stk0vrfl0w`: https://github.com/stk0vrfl0w +.. _`syphernl`: https://github.com/syphernl +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`ticosax`: https://github.com/ticosax +.. _`timcharper`: https://github.com/timcharper +.. _`tomlaredo`: https://github.com/tomlaredo +.. _`travispaul`: https://github.com/travispaul +.. _`truescotw`: https://github.com/truescotw +.. _`twangboy`: https://github.com/twangboy +.. _`twellspring`: https://github.com/twellspring +.. _`twinshadow`: https://github.com/twinshadow +.. _`vutny`: https://github.com/vutny +.. _`whiteinge`: https://github.com/whiteinge +.. _`yi9`: https://github.com/yi9 +.. _`zieba88`: https://github.com/zieba88 diff --git a/doc/topics/releases/2016.11.0.rst b/doc/topics/releases/2016.11.0.rst index a432adc506..549a13bc95 100644 --- a/doc/topics/releases/2016.11.0.rst +++ b/doc/topics/releases/2016.11.0.rst @@ -103,8 +103,8 @@ Additional Features - source: salt://path/to/myapp - dir_mode: 755 - file_mode: keep - -- The ``junos`` state module is now available. It has all the functions + +- The ``junos`` state module is now available. It has all the functions that are present in the ``junos`` execution module. - The ``junos`` state module is now available. It has all the functions @@ -275,9 +275,9 @@ Pillar Changes ref:`utility modules ` synced to the correct location on the Master so that they are available in execution modules called from Pillar SLS files. - + Junos Module Changes -=================== +==================== - The following new functionalities were added to the junos module @@ -288,6 +288,8 @@ Junos Module Changes - zeroize - Remove all configuration information on the Routing Engines and reset all key values on a device. - file_copy - Copy file from proxy to the Junos device. +.. _release-2016-11-0-network-automation-napalm: + Network Automation: NAPALM ========================== @@ -296,7 +298,9 @@ of Salt. It is based on a the `NAPALM `_. + +- see `the complete list of supported devices + `_. The connection is established via the :mod:`NAPALM proxy `. diff --git a/doc/topics/releases/2016.11.1.rst b/doc/topics/releases/2016.11.1.rst index 479b54985b..d1c999dc13 100644 --- a/doc/topics/releases/2016.11.1.rst +++ b/doc/topics/releases/2016.11.1.rst @@ -4,1033 +4,880 @@ Salt 2016.11.1 Release Notes Version 2016.11.1 is a bugfix release for :ref:`2016.11.0 `. -Changes for v2016.11.0..v2016.11.1 ----------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): - -*Generated at: 2016-12-09T21:54:17Z* - -Statistics: +Statistics +========== - Total Merges: **89** -- Total Issue references: **55** -- Total PR references: **155** +- Total Issue References: **29** +- Total PR References: **83** -Changes: +- Contributors: **30** (`Ch3LL`_, `Da-Juan`_, `DmitryKuzmenko`_, `MTecknology`_, `adelcast`_, `attiasr`_, `bbinet`_, `cachedout`_, `cro`_, `dmurphy18`_, `gtmanfred`_, `isbm`_, `jeanpralo`_, `kraney`_, `kstreee`_, `lorengordon`_, `mateiw`_, `mirceaulinic`_, `morsik`_, `mschneider82`_, `rallytime`_, `rbjorklin`_, `scott-w`_, `sjorge`_, `skizunov`_, `techhat`_, `terminalmage`_, `thatch45`_, `ticosax`_, `whiteinge`_) -- **PR** `#38182`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-12-09T21:25:47Z* +Changelog for v2016.11.0..v2016.11.1 +==================================== - - **PR** `#38177`_: (*vutny*) Correct `cp.get_file_str` docstring and add integration tests - - **PR** `#38163`_: (*Ch3LL*) enabled ec2 cloud tests - - **PR** `#38153`_: (*vutny*) Master config includes may contain errors and be safely skipped - * 23c0393 Merge pull request `#38182`_ from rallytime/merge-2016.11 - * 627242a Merge branch '2016.3' into '2016.11' +*Generated at: 2018-05-27 14:25:03 UTC* - * 65b2ad7 Merge pull request `#38163`_ from Ch3LL/enabled_ec2_cloud +* **PR** `#38186`_: (`Ch3LL`_) add 2016.11.1 changelog to release notes - * be74c45 enabled ec2 cloud tests +* **PR** `#38182`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-12-09 21:25:47 UTC* - * b63f74e Merge pull request `#38177`_ from vutny/fix-cp-get-file-str + * 23c039347e Merge pull request `#38182`_ from rallytime/merge-2016.11 - * a449980 Correct `cp.get_file_str` docstring and add integration tests + * 627242ab5d Merge branch '2016.3' into '2016.11' - * 7596313 Merge pull request `#38153`_ from vutny/master-includes-error-tolerance + * 65b2ad7b14 Merge pull request `#38163`_ from Ch3LL/enabled_ec2_cloud - * cd0154e Master config includes may contain errors and be safely skipped + * be74c45463 enabled ec2 cloud tests -- **PR** `#38158`_: (*cachedout*) Fix type problem in grains.filter_by - @ *2016-12-09T21:24:40Z* + * b63f74e034 Merge pull request `#38177`_ from vutny/fix-cp-get-file-str - - **ISSUE** `#38094`_: (*bartuss7*) TypeError: object of type 'float' has no len() in grains.filter_by - | refs: `#38158`_ - * 8355adc Merge pull request `#38158`_ from cachedout/issue_38094 - * e8196e2 Lint, remove set literal + * a449980672 Correct `cp.get_file_str` docstring and add integration tests - * 9f4ebb3 Fix type problem in grains.filter_by + * 7596313be0 Merge pull request `#38153`_ from vutny/master-includes-error-tolerance -- **PR** `#38156`_: (*terminalmage*) Remove rtag when windows minion refreshes early in state - @ *2016-12-09T21:15:01Z* + * cd0154ee93 Master config includes may contain errors and be safely skipped - - **ISSUE** `#38090`_: (*jf*) pkg.installed does not seem to refresh the repo database, no matter what - | refs: `#38113`_ `#38156`_ - * 31a157d Merge pull request `#38156`_ from terminalmage/fix-windows-refresh - * 258bd4c Remove rtag when windows minion refreshes early in state +* **ISSUE** `#38094`_: (`bfilipek`_) TypeError: object of type 'float' has no len() in grains.filter_by (refs: `#38158`_) -- **PR** `#38183`_: (*cro*) Fix bad set operations when setting up securitygroups in AWS. - @ *2016-12-09T21:12:10Z* +* **PR** `#38158`_: (`cachedout`_) Fix type problem in grains.filter_by + @ *2016-12-09 21:24:40 UTC* - - **ISSUE** `#37981`_: (*tazaki*) Salt-cloud ec2 vpc securitygroupid always returning default - | refs: `#38183`_ - - **PR** `#37891`_: (*isbm*) rsync port to 2015.8 - * c638952 Merge pull request `#38183`_ from cro/fix_37891 - * 0527d6f Fix bad set operations when setting up securitygroups in AWS. Fixes `#37891`_. + * 8355adc535 Merge pull request `#38158`_ from cachedout/issue_38094 -* fc95045 Reset socket default timeout to None (fixes daemons_tests failures) (`#38181`_) + * e8196e23c2 Lint, remove set literal - - **PR** `#38181`_: (*rallytime*) Reset socket default timeout to None (fixes daemons_tests failures) + * 9f4ebb3c18 Fix type problem in grains.filter_by -- **PR** `#38148`_: (*whiteinge*) Remove ssh_async from NetapiClient clients; it is not implemented - @ *2016-12-09T18:49:42Z* +* **ISSUE** `#38090`_: (`jf`_) pkg.installed does not seem to refresh the repo database, no matter what (refs: `#38113`_, `#38156`_) - * 7ccbedd Merge pull request `#38148`_ from whiteinge/no-ssh-async-client - * cb58cd4 Remove ssh_async from NetapiClient clients; it is not implemented +* **PR** `#38156`_: (`terminalmage`_) Remove rtag when windows minion refreshes early in state + @ *2016-12-09 21:15:01 UTC* -- **PR** `#38160`_: (*terminalmage*) Update information about xz-utils in archive state/module docs - @ *2016-12-09T18:34:03Z* + * 31a157d902 Merge pull request `#38156`_ from terminalmage/fix-windows-refresh - * 8d4e194 Merge pull request `#38160`_ from terminalmage/update-archive-docs - * 8e4ad3c Update information about xz-utils in archive state/module docs + * 258bd4c2aa Remove rtag when windows minion refreshes early in state -- **PR** `#38164`_: (*techhat*) Add Azure ARM docs for 2016.11.0 - @ *2016-12-09T18:00:22Z* +* **ISSUE** `#37981`_: (`tazaki`_) Salt-cloud ec2 vpc securitygroupid always returning default (refs: `#38183`_) - - **ISSUE** `#38024`_: (*Ch3LL*) 2016.11.0 release notes missing azure arm reference - | refs: `#38164`_ - * 05136f0 Merge pull request `#38164`_ from techhat/azuredocs - * 71b787e Add Azure ARM docs for 2016.11.0 +* **PR** `#38183`_: (`cro`_) Fix bad set operations when setting up securitygroups in AWS. + @ *2016-12-09 21:12:10 UTC* -- **PR** `#38173`_: (*rallytime*) Bump some win* module deprecations from Nitrogen to Oxygen - @ *2016-12-09T16:57:29Z* + * c638952684 Merge pull request `#38183`_ from cro/fix_37891 - * e3c858c Merge pull request `#38173`_ from rallytime/update-win-deprecation-versions - * 09a50b2 Bump some win* module deprecations from Nitrogen to Oxygen + * 0527d6f25e Fix bad set operations when setting up securitygroups in AWS. Fixes `#37891`_. -- **PR** `#38036`_: (*terminalmage*) archive.extracted: fix problems with overwrite arg - @ *2016-12-08T19:08:41Z* + * **PR** `#38181`_: (`rallytime`_) Reset socket default timeout to None (fixes daemons_tests failures) - - **PR** `#37889`_: (*isbm*) Allow overwrite archives extraction - | refs: `#38036`_ - * 827bf59 Merge pull request `#38036`_ from terminalmage/archive-extracted-override - * a1c70c7 archive.extracted: fix problems with overwrite arg +* **PR** `#38148`_: (`whiteinge`_) Remove ssh_async from NetapiClient clients; it is not implemented + @ *2016-12-09 18:49:42 UTC* -- **PR** `#38133`_: (*terminalmage*) Fix edge case in creation of trans tar for salt-thin - @ *2016-12-08T17:47:26Z* + * 7ccbedd2cc Merge pull request `#38148`_ from whiteinge/no-ssh-async-client - * 50773a5 Merge pull request `#38133`_ from terminalmage/zd1067 - * 71e0bd0 Fix edge case in creation of trans tar for salt-thin + * cb58cd4795 Remove ssh_async from NetapiClient clients; it is not implemented -- **PR** `#38138`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-12-07T20:15:56Z* +* **PR** `#38160`_: (`terminalmage`_) Update information about xz-utils in archive state/module docs + @ *2016-12-09 18:34:03 UTC* - - **PR** `#38134`_: (*rallytime*) Skip daemon unit tests when running on Python 2.6 - * 6026cb2 Merge pull request `#38138`_ from rallytime/merge-2016.11 - * 28b56ea Merge branch '2016.3' into '2016.11' + * 8d4e194400 Merge pull request `#38160`_ from terminalmage/update-archive-docs - * 86091db Skip daemon unit tests when running on Python 2.6 (`#38134`_) + * 8e4ad3cff3 Update information about xz-utils in archive state/module docs -- **PR** `#38130`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-12-07T20:11:19Z* +* **ISSUE** `#38024`_: (`Ch3LL`_) 2016.11.0 release notes missing azure arm reference (refs: `#38164`_) - - **ISSUE** `#38091`_: (*tjyang*) [WARNING ] salt.loaded.int.module.zenoss.__virtual__() is wrongly returning `None`. - | refs: `#38102`_ - - **ISSUE** `#36707`_: (*do3meli*) slow FreeBSD sysctl module with test=true - | refs: `#36794`_ - - **PR** `#38104`_: (*rallytime*) Back-port `#36794`_ to 2016.3 - - **PR** `#38102`_: (*rallytime*) Add False + msg tuple return if requests is missing for zenoss module - - **PR** `#36794`_: (*do3meli*) FreeBSD sysctl module now handels config_file parameter in show method - | refs: `#38104`_ - * 90478ef Merge pull request `#38130`_ from rallytime/merge-2016.11 - * 4d7d9ab Merge branch '2016.3' into '2016.11' +* **PR** `#38164`_: (`techhat`_) Add Azure ARM docs for 2016.11.0 + @ *2016-12-09 18:00:22 UTC* - * d3d98fd4 Merge pull request `#38102`_ from rallytime/`fix-38091`_ + * 05136f0d8c Merge pull request `#38164`_ from techhat/azuredocs - * 4f79d5a Add False + msg tuple return if requests is missing for zenoss module + * 71b787e250 Add Azure ARM docs for 2016.11.0 - * 8c8cbc2 Merge pull request `#38104`_ from rallytime/`bp-36794`_ +* **PR** `#38173`_: (`rallytime`_) Bump some win* module deprecations from Nitrogen to Oxygen + @ *2016-12-09 16:57:29 UTC* - * c906c8a Pylint fixes + * e3c858cc28 Merge pull request `#38173`_ from rallytime/update-win-deprecation-versions - * da3ebf8 FreeBSD sysctl module now handels config_file parameter in show method + * 09a50b25e7 Bump some win* module deprecations from Nitrogen to Oxygen -* 1a42e24 Fix beacon index (`#38129`_) +* **PR** `#38036`_: (`terminalmage`_) archive.extracted: fix problems with overwrite arg + @ *2016-12-08 19:08:41 UTC* - - **PR** `#38129`_: (*Ch3LL*) Fix beacon index + * **PR** `#37889`_: (`isbm`_) Allow overwrite archives extraction (refs: `#38036`_) -* bbdfcab Add versionadded tags for network module funcs (`#38127`_) + * 827bf59999 Merge pull request `#38036`_ from terminalmage/archive-extracted-override - - **PR** `#38127`_: (*rallytime*) Add versionadded tags for network module funcs + * a1c70c7b95 archive.extracted: fix problems with overwrite arg -- **PR** `#38043`_: (*MTecknology*) Debian networking fix - @ *2016-12-07T17:32:18Z* +* **PR** `#38133`_: (`terminalmage`_) Fix edge case in creation of trans tar for salt-thin + @ *2016-12-08 17:47:26 UTC* - - **ISSUE** `#38042`_: (*MTecknology*) [2016.11.0] Invalid interfaces file produced by debian_ip module - | refs: `#38043`_ - * fd06bab Merge pull request `#38043`_ from MTecknology/2016.11 - * 6d5e132 Removing trailing whitespace from previous commit + * 50773a5f96 Merge pull request `#38133`_ from terminalmage/zd1067 - * f882674 Adding some options that are valid for inet6 blocks. + * 71e0bd023f Fix edge case in creation of trans tar for salt-thin - * 81cb688 Better check for dual stack. +* **PR** `#38138`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-12-07 20:15:56 UTC* - * 525c746 May Cthulhu take mercy on my soul for this commit. + * 6026cb23b2 Merge pull request `#38138`_ from rallytime/merge-2016.11 - * 300ca60 I guess this makes the previous commit a bit redundant, but I'm not sure if I want to remove it. + * 28b56ea3b4 Merge branch '2016.3' into '2016.11' - * 6e7fc39 This now seems absurdly obvious, but I'm not ruling out that I'll break everything. + * 86091db647 Skip daemon unit tests when running on Python 2.6 (`#38134`_) - * 82d2b89 Rolling back unit test. +* **PR** `#38130`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-12-07 20:11:19 UTC* - * b3edbcf Adding larger and more complete debian_ip unit test. + * 90478ef25e Merge pull request `#38130`_ from rallytime/merge-2016.11 - * 3afd7b6 Adding the valid/documented 'slaves' option. + * 4d7d9abb41 Merge branch '2016.3' into '2016.11' - * b6b1adc Typo: missing closing parenthesis + * d3d98fd4eb Merge pull request `#38102`_ from rallytime/fix-38091 - * 756e41c Fixing a typo; line should not be commented + * 4f79d5a0d1 Add False + msg tuple return if requests is missing for zenoss module - * 32a1374 Corrects expected return value + * 8c8cbc2734 Merge pull request `#38104`_ from rallytime/bp-36794 - * 88f9d9f Mostly whitespace & comment changes + * c906c8a0d5 Pylint fixes - * 41ffb8d Removing redundant line + * da3ebf83e6 FreeBSD sysctl module now handels config_file parameter in show method - * 3a81686 Ensure iface_dict not being populated will not produce a stacktrace + * **PR** `#38129`_: (`Ch3LL`_) Fix beacon index - * 4de2cb2 Corrects regression in debian_ip/debian_eth.jinja + * **PR** `#38127`_: (`rallytime`_) Add versionadded tags for network module funcs -- **PR** `#38107`_: (*cachedout*) Status beacon should raise proper exception - @ *2016-12-07T17:21:49Z* +* **ISSUE** `#38042`_: (`MTecknology`_) [2016.11.0] Invalid interfaces file produced by debian_ip module (refs: `#38043`_) - - **PR** `#38088`_: (*dmurphy18*) Updated to match formulas and allow for missing functions - | refs: `#38107`_ - * 4b9a7f2 Merge pull request `#38107`_ from cachedout/supercede_38088 - * 73d7248 Change to log.debug per Tom +* **PR** `#38043`_: (`MTecknology`_) Debian networking fix + @ *2016-12-07 17:32:18 UTC* - * da135b1 Fix docs + * fd06bab673 Merge pull request `#38043`_ from MTecknology/2016.11 - * 792b422 Pylint fix + * 6d5e132e44 Removing trailing whitespace from previous commit - * 88e03bb Fix typo + * f882674acf Adding some options that are valid for inet6 blocks. - * a8ce153 Status beacon should raise proper exception + * 81cb688d4c Better check for dual stack. -- **PR** `#38101`_: (*lorengordon*) Clarifies file.replace behavior on symlinks - @ *2016-12-07T13:27:11Z* + * 525c746274 May Cthulhu take mercy on my soul for this commit. - * da8f5ac Merge pull request `#38101`_ from lorengordon/file-replace-note - * 345990f Clarifies file.replace behavior on symlinks + * 300ca6047e I guess this makes the previous commit a bit redundant, but I'm not sure if I want to remove it. -- **PR** `#38113`_: (*terminalmage*) Revert changes to refresh tag for pkg states - @ *2016-12-07T13:11:14Z* + * 6e7fc39c68 This now seems absurdly obvious, but I'm not ruling out that I'll break everything. - - **ISSUE** `#38090`_: (*jf*) pkg.installed does not seem to refresh the repo database, no matter what - | refs: `#38113`_ `#38156`_ - * d47761f Merge pull request `#38113`_ from terminalmage/issue38090 - * 9f347df Revert changes to refresh tag for pkg states + * 82d2b89e0c Rolling back unit test. -- **PR** `#38120`_: (*Da-Juan*) Fix status beacon config default values - @ *2016-12-07T13:08:33Z* + * b3edbcfd05 Adding larger and more complete debian_ip unit test. - - **ISSUE** `#37976`_: (*t0nyhays*) Error when status beacon fires (2016.11.0) - | refs: `#38120`_ - * d4c34e0 Merge pull request `#38120`_ from Da-Juan/2016.11 - * 7e4a35e Fix status beacon config default values + * 3afd7b6cf4 Adding the valid/documented 'slaves' option. -- **PR** `#38114`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-12-07T12:45:04Z* + * b6b1adc091 Typo: missing closing parenthesis - - **ISSUE** `#38037`_: (*dmurphy18*) pkg.latest and yumpkg.latest_version return incorrect package versions 2016.3 and 2016.11 - | refs: `#38045`_ - - **ISSUE** `#37939`_: (*Talkless*) file.comment always report changes in test=True mode - | refs: `#38039`_ - - **ISSUE** `#35342`_: (*morganwillcock*) win_pkg: refresh_db doesn't remove cached items which have been renamed or removed - | refs: `#38083`_ - - **PR** `#38083`_: (*twangboy*) Only delete .sls files from winrepo-ng [DO NOT MERGE FORWARD] - - **PR** `#38059`_: (*rallytime*) Call exec_test for the Syndic daemon in tests.unit.daemons_test.py - - **PR** `#38057`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - | refs: `#38059`_ - - **PR** `#38045`_: (*terminalmage*) yumpkg.py: don't include non-upgrade versions found by "yum list available" - - **PR** `#38039`_: (*rallytime*) Check to see if a line is already commented before moving on - - **PR** `#38034`_: (*cachedout*) Modify daemons test to use multiprocessing - | refs: `#38059`_ - * 6868089 Merge pull request `#38114`_ from rallytime/merge-2016.11 - * fec9dec Merge branch '2016.3' into '2016.11' + * 756e41caf2 Fixing a typo; line should not be commented - * fbc8776 Merge pull request `#38083`_ from twangboy/fix_refresh_db + * 32a1374748 Corrects expected return value - * 978af6d Remove only .sls files from the cached winrepo-ng + * 88f9d9f22c Mostly whitespace & comment changes - * 9dcfdee Merge pull request `#38059`_ from rallytime/daemons-test-fix + * 41ffb8d805 Removing redundant line - * eb372b2 Add missing "not" statement: The last syndic test should assertFalse() + * 3a8168667b Ensure iface_dict not being populated will not produce a stacktrace - * 4e10f8e Call exec_test for the Syndic daemon in tests.unit.daemons_test.py + * 4de2cb2805 Corrects regression in debian_ip/debian_eth.jinja - * 9cd42b9 Merge pull request `#38039`_ from rallytime/`fix-37939`_ +* **PR** `#38107`_: (`cachedout`_) Status beacon should raise proper exception + @ *2016-12-07 17:21:49 UTC* - * 1da7aac Update unit tests to account for additional file.search call + * **PR** `#38088`_: (`dmurphy18`_) Updated to match formulas and allow for missing functions (refs: `#38107`_) - * 8a685b1 Check to see if a line is already commented before moving on + * 4b9a7f2295 Merge pull request `#38107`_ from cachedout/supercede_38088 - * f2c0455 Write an integration test demonstrating the issue + * 73d724845d Change to log.debug per Tom - * a34a763 Merge pull request `#38045`_ from terminalmage/issue38037 + * da135b1b59 Fix docs - * 6528950 Simplify logic for matching desired pkg arch with actual pkg arch + * 792b422dc2 Pylint fix - * 3babbcd yumpkg.py: don't include non-upgrade versions found by "yum list available" + * 88e03bba6d Fix typo -- **PR** `#38109`_: (*gtmanfred*) mode needs to be an integer - @ *2016-12-07T11:58:24Z* + * a8ce153252 Status beacon should raise proper exception - * b9920e5 Merge pull request `#38109`_ from gtmanfred/2016.11 - * 7546760 mode needs to be an integer +* **PR** `#38101`_: (`lorengordon`_) Clarifies file.replace behavior on symlinks + @ *2016-12-07 13:27:11 UTC* -- **PR** `#38103`_: (*rallytime*) Back-port `#37283`_ to 2016.11 - @ *2016-12-06T23:12:59Z* + * da8f5ac0c6 Merge pull request `#38101`_ from lorengordon/file-replace-note - - **PR** `#37283`_: (*jeanpralo*) Handle docker-compose up to version 1.9.0 - | refs: `#38103`_ - - **PR** `#37215`_: (*mschneider82*) removed version check - | refs: `#37283`_ - * fd77dcb Merge pull request `#38103`_ from rallytime/`bp-37283`_ - * 11944df handle up to version 1.9.0 + * 345990f2b0 Clarifies file.replace behavior on symlinks -- **PR** `#38057`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - | refs: `#38059`_ - @ *2016-12-06T23:11:41Z* +* **ISSUE** `#38090`_: (`jf`_) pkg.installed does not seem to refresh the repo database, no matter what (refs: `#38113`_, `#38156`_) - - **ISSUE** `#37945`_: (*gstachowiak*) Missing exception handling in salt.master.Maintenance. Process never completes. - | refs: `#37961`_ - - **ISSUE** `#37867`_: (*tobiasBora*) Bug into lsb_release that crash salt - | refs: `#37962`_ - - **ISSUE** `#37737`_: (*b-harper*) python client api CloudClient multiple calls needed - | refs: `#37928`_ - - **ISSUE** `#37059`_: (*basepi*) Beacon fileserver operations cause scheduled jobs with fileserver operations to hang - | refs: `#37899`_ - - **ISSUE** `#35088`_: (*Modulus*) salt/cloud/ec2.py encoding problems. - | refs: `#37912`_ - - **PR** `#38034`_: (*cachedout*) Modify daemons test to use multiprocessing - | refs: `#38059`_ - - **PR** `#38002`_: (*laleocen*) fix broken yaml code block - - **PR** `#37995`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - - **PR** `#37978`_: (*terminalmage*) Add clarifying language to ext_pillar_first docs - - **PR** `#37964`_: (*terminalmage*) Add clarification on expr_form usage and future deprecation - - **PR** `#37962`_: (*cachedout*) Catch possible exception from lsb_release - - **PR** `#37961`_: (*cachedout*) Handle empty tokens safely - - **PR** `#37950`_: (*vutny*) Set default Salt Master address for a Syndic (like for a Minion) - - **PR** `#37929`_: (*gtmanfred*) add list_nodes_min to nova driver - - **PR** `#37928`_: (*techhat*) Don't modify self.opts directly - - **PR** `#37926`_: (*kontrolld*) Fixes no IPv6 functionality in /etc/sysconfig/network - - **PR** `#37925`_: (*kontrolld*) Fix missing ipv6 options centos network - - **PR** `#37924`_: (*cachedout*) Update test for new gem ver - - **PR** `#37921`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - - **PR** `#37918`_: (*rallytime*) [2015.8] Update version numbers in doc config for 2016.11.0 release - - **PR** `#37914`_: (*terminalmage*) Update earlier release channels' docs with Carbon release notes - - **PR** `#37912`_: (*attiasr*) fix encoding problem aws responses - - **PR** `#37899`_: (*DmitryKuzmenko*) Clear functions context in schedule tasks for ZeroMQ. - - **PR** `#37272`_: (*vutny*) Get default logging level and log file from default opts dict - * 5d9d6b9 Merge pull request `#38057`_ from rallytime/merge-2016.11 - * 3428840 Fix SaltKeyOptionParserTestCase test failures +* **PR** `#38113`_: (`terminalmage`_) Revert changes to refresh tag for pkg states + @ *2016-12-07 13:11:14 UTC* - * 186e2d0 Don't allow libcloud mock module injection in unit/states/libcloud_dns_test.py either + * d47761f349 Merge pull request `#38113`_ from terminalmage/issue38090 - * d513a60 Do not allow libcloud to be injected as a mock value in the libcloud_dns_test + * 9f347df012 Revert changes to refresh tag for pkg states - * 74a417e Update the mocked cloud configs to also include master configs +* **ISSUE** `#37976`_: (`t0nyhays`_) Error when status beacon fires (2016.11.0) (refs: `#38120`_) - * f2c8cb1 Better merge conflict resolution from the initial merge +* **PR** `#38120`_: (`Da-Juan`_) Fix status beacon config default values + @ *2016-12-07 13:08:33 UTC* - * 8fd53a4 Merge branch '2016.3' into '2016.11' + * d4c34e0a58 Merge pull request `#38120`_ from Da-Juan/2016.11 - * 6724fe4 Modify daemons test to use multiprocessing (`#38034`_) + * 7e4a35e8ad Fix status beacon config default values - * 6942d5d Merge pull request `#37995`_ from rallytime/merge-2016.3 +* **PR** `#38114`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-12-07 12:45:04 UTC* - * b44e179 Merge branch '2015.8' into '2016.3' + * 6868089a87 Merge pull request `#38114`_ from rallytime/merge-2016.11 - * 7a7e367 Merge pull request `#37978`_ from terminalmage/ext_pillar_first-docs + * fec9dec23a Merge branch '2016.3' into '2016.11' - * 61ed9a8 Add clarifying language to ext_pillar_first docs + * fbc87769b9 Merge pull request `#38083`_ from twangboy/fix_refresh_db - * cd66c17 fix broken yaml code block (`#38002`_) + * 978af6d83c Remove only .sls files from the cached winrepo-ng - * 3dd45fb Merge pull request `#37912`_ from attiasr/fix_aws_response_encoding + * 9dcfdeef6b Merge pull request `#38059`_ from rallytime/daemons-test-fix - * ba4ec4e use Requests result encoding to encode the text + * eb372b27d8 Add missing "not" statement: The last syndic test should assertFalse() - * abe4eb3 fix encoding problem aws responses + * 4e10f8e018 Call exec_test for the Syndic daemon in tests.unit.daemons_test.py - * 69a74a4 Merge pull request `#37950`_ from vutny/fix-starting-up-syndic + * 9cd42b9b3f Merge pull request `#38039`_ from rallytime/fix-37939 - * 7d9bc9a syndic_master: correct default value, documentation and example config + * 1da7aacfbe Update unit tests to account for additional file.search call - * 92a7c7e Set default Salt Master address for a Syndic (like for a Minion) + * 8a685b1820 Check to see if a line is already commented before moving on - * 7f269bc Add clarification on expr_form usage and future deprecation (`#37964`_) + * f2c045520d Write an integration test demonstrating the issue - * 1001987 Catch possible exception from lsb_release (`#37962`_) + * a34a763984 Merge pull request `#38045`_ from terminalmage/issue38037 - * 330021c Handle empty tokens safely (`#37961`_) + * 65289503d9 Simplify logic for matching desired pkg arch with actual pkg arch - * ea46639 Merge pull request `#37272`_ from vutny/fix-getting-default-logging-opts + * 3babbcda94 yumpkg.py: don't include non-upgrade versions found by "yum list available" - * e5ce523 Fix description in the Salt Syndic usage info +* **PR** `#38109`_: (`gtmanfred`_) mode needs to be an integer + @ *2016-12-07 11:58:24 UTC* - * 518a3dd Add unit tests for Salt parsers processing logging options + * b9920e54ee Merge pull request `#38109`_ from gtmanfred/2016.11 - * 83d6a44 Add `ssh_log_file` option to master config and documentation + * 7546760eb3 mode needs to be an integer - * c8a0915 Fix configuration example and documentation for `syndic_log_file` option +* **PR** `#38103`_: (`rallytime`_) Back-port `#37283`_ to 2016.11 + @ *2016-12-06 23:12:59 UTC* - * e64dd3e Correct default attributes for various parser classes + * **PR** `#37283`_: (`jeanpralo`_) Handle docker-compose up to version 1.9.0 (refs: `#38103`_) - * 82a2e21 Fix default usage string for Salt command line programs + * **PR** `#37215`_: (`mschneider82`_) removed version check (refs: `#37283`_) - * 45dffa2 Fix readding and updating logfile and pidfile config options for Salt API + * fd77dcbd0f Merge pull request `#38103`_ from rallytime/bp-37283 - * f47253c Fix reading and applying Salt Cloud default configuration + * 11944df69b handle up to version 1.9.0 - * fad5bec Work with a copy of default opts dictionaries +* **PR** `#38057`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 (refs: `#38059`_) + @ *2016-12-06 23:11:41 UTC* - * b7c2481 Fix `log_level_logfile` config value type + * 5d9d6b9280 Merge pull request `#38057`_ from rallytime/merge-2016.11 - * 1bd76a1 Fix setting temporary log level if CLI option omitted + * 342884018b Fix SaltKeyOptionParserTestCase test failures - * 121848c Fix obtaining `log_granular_levels` config setting + * 186e2d0d03 Don't allow libcloud mock module injection in unit/states/libcloud_dns_test.py either - * 44cf07f Make CLI options take precedence for setting up logfile_logger + * d513a60189 Do not allow libcloud to be injected as a mock value in the libcloud_dns_test - * 61afaf1 Fix setting option attributes when processing `log_level` and `log_file` + * 74a417e527 Update the mocked cloud configs to also include master configs - * 3c60e23 Fix processing of `log_level_logfile` config setting + * f2c8cb13d0 Better merge conflict resolution from the initial merge - * 55a0af5 Use attribute functions for getting/setting options and config values + * 8fd53a4808 Merge branch '2016.3' into '2016.11' - * c25f2d0 Fix getting Salt API default logfile option + * 6724fe4871 Modify daemons test to use multiprocessing (`#38034`_) - * f242237 Remove processing of unused and undocumented `cli_*_log_*` config options + * 6942d5d95b Merge pull request `#37995`_ from rallytime/merge-2016.3 - * 2065e83 Get default logging level and file from default opts dict + * b44e17921c Merge branch '2015.8' into '2016.3' - * f2f957d Merge pull request `#37925`_ from kontrolld/add-ipv6-centos-network + * 7a7e36728f Merge pull request `#37978`_ from terminalmage/ext_pillar_first-docs - * ac2b477 Adding IPv6 functionality for CentOS /etc/sysconfig/network + * 61ed9a8657 Add clarifying language to ext_pillar_first docs - * c07ad11 Merge pull request `#37899`_ from DSRCorporation/bugs/37059_schedule_task_hang + * cd66c179cb fix broken yaml code block (`#38002`_) - * 9497748 Clear functions context in schedule tasks for ZeroMQ. + * 3dd45fbedf Merge pull request `#37912`_ from attiasr/fix_aws_response_encoding - * a55519d Merge pull request `#37928`_ from techhat/issue37737 + * ba4ec4e7f1 use Requests result encoding to encode the text - * a09a60e Don't modify self.opts directly + * abe4eb3b98 fix encoding problem aws responses - * 9d17f1c Merge pull request `#37929`_ from gtmanfred/2016.3 + * 69a74a4d2d Merge pull request `#37950`_ from vutny/fix-starting-up-syndic - * c7d2c73 add list_nodes_min to nova driver + * 7d9bc9abce syndic_master: correct default value, documentation and example config - * 3bb743b Merge pull request `#37926`_ from kontrolld/fix-ipv6-centos-network + * 92a7c7ed1b Set default Salt Master address for a Syndic (like for a Minion) - * 3ed42e5 updated + * 7f269bc7f9 Add clarification on expr_form usage and future deprecation (`#37964`_) - * 3b3bc4f Fixes no IPv6 functionality in /etc/sysconfig/network + * 1001987f64 Catch possible exception from lsb_release (`#37962`_) - * 271170a Merge pull request `#37921`_ from rallytime/merge-2016.3 + * 330021cd8b Handle empty tokens safely (`#37961`_) - * 523a67c Merge branch '2015.8' into '2016.3' + * ea46639ce7 Merge pull request `#37272`_ from vutny/fix-getting-default-logging-opts - * 4cdc6cf Update earlier release channels' docs with Carbon release notes (`#37914`_) + * e5ce52388a Fix description in the Salt Syndic usage info - * d31491a [2015.8] Update version numbers in doc config for 2016.11.0 release (`#37918`_) + * 518a3dd7ee Add unit tests for Salt parsers processing logging options - * 6cd6429 Merge pull request `#37924`_ from cachedout/fix_gem_states + * 83d6a44254 Add `ssh_log_file` option to master config and documentation - * 894cca3 Update test for new gem ver + * c8a0915460 Fix configuration example and documentation for `syndic_log_file` option -* 9969544 Account for case where vim install already exists and is at an older version (`#38112`_) + * e64dd3ed6b Correct default attributes for various parser classes - - **PR** `#38112`_: (*rallytime*) Account for case where vim install already exists and is at an older version + * 82a2e216b3 Fix default usage string for Salt command line programs -- **PR** `#38021`_: (*mateiw*) Add master_tops support in salt-ssh - @ *2016-12-06T14:26:22Z* + * 45dffa292f Fix readding and updating logfile and pidfile config options for Salt API - - **ISSUE** `#19502`_: (*kt97679*) salt-ssh fails to run state.highstate with custom master_tops - | refs: `#38021`_ - * f8c67a9 Merge pull request `#38021`_ from mateiw/salt-ssh_master_tops - * 65a0f10 Add/remove newlines + * f47253c21b Fix reading and applying Salt Cloud default configuration - * 7037fa1 Add master_tops support in salt-ssh + * fad5bec936 Work with a copy of default opts dictionaries -* 1bb31bb Start release notes file for 2016.11.1 release (`#38084`_) + * b7c24811e5 Fix `log_level_logfile` config value type - - **PR** `#38084`_: (*rallytime*) Start release notes file for 2016.11.1 release + * 1bd76a1d96 Fix setting temporary log level if CLI option omitted -- **PR** `#37878`_: (*kstreee*) Makes threads avoid blocking waiting while communicating using Zeromq. - @ *2016-12-05T19:50:46Z* + * 121848cc77 Fix obtaining `log_granular_levels` config setting - * 7829551 Merge pull request `#37878`_ from kstreee/2016.11 - * 9103878 Fixes blocking waiting through implementing a socket pool class. + * 44cf07fec2 Make CLI options take precedence for setting up logfile_logger -- **PR** `#37987`_: (*rbjorklin*) consul_pillar support for limiting pillar exposure via minion targeting - @ *2016-12-05T19:48:20Z* + * 61afaf1792 Fix setting option attributes when processing `log_level` and `log_file` - - **PR** `#37985`_: (*rbjorklin*) consul_pillar support for limiting pillar exposure via minion targeting - | refs: `#37987`_ - * 0809ccd Merge pull request `#37987`_ from rbjorklin/consul-pillar-target - * 5d0454a Ignore W1401 (anomalous-backslash-in-string) + * 3c60e2388e Fix processing of `log_level_logfile` config setting - * 2e929a5 Linting fixes + * 55a0af5bbd Use attribute functions for getting/setting options and config values - * 171cab1 Fixed possible incorrect behavior if target wasn't on start/end of str + * c25f2d091e Fix getting Salt API default logfile option - * 7440582 consul_pillar support for limiting pillar exposure via minion targeting + * f2422373c1 Remove processing of unused and undocumented `cli_*_log_*` config options -- **PR** `#38067`_: (*terminalmage*) Remove virtual funcs for archive state/module - @ *2016-12-05T16:37:23Z* + * 2065e8311c Get default logging level and file from default opts dict - - **ISSUE** `#38062`_: (*UtahDave*) archive execution module not loading on Windows in 2016.11.0 - | refs: `#38067`_ - * 83dcfe8 Merge pull request `#38067`_ from terminalmage/issue38062 - * 2e0f26a Remove virtual funcs for archive state/module + * f2f957da6c Merge pull request `#37925`_ from kontrolld/add-ipv6-centos-network -- **PR** `#38058`_: (*rallytime*) Remove initdb dependency in postgres module - @ *2016-12-04T04:19:02Z* + * ac2b477412 Adding IPv6 functionality for CentOS /etc/sysconfig/network - - **ISSUE** `#38001`_: (*tomlaredo*) Regression on postgres_group.present ('postgres_group' __virtual__ returned False) - | refs: `#38023`_ - - **ISSUE** `#37986`_: (*marek-obuchowicz*) Module postgres - wrong docs, doesn't work with debian 8.5 - | refs: `#38023`_ - - **ISSUE** `#37935`_: (*ipmb*) Postgres module regression on 2016.11 - | refs: `#37946`_ `#37993`_ `#38023`_ `#38058`_ - - **PR** `#38023`_: (*gtmanfred*) Expand error message for postgres states - | refs: `#38058`_ - - **PR** `#37993`_: (*ticosax*) Remove initdb dependency to consume postgres module. - | refs: `#38058`_ - * c993367 Merge pull request `#38058`_ from rallytime/remove-init-db-dep - * c1ceeca Remove initdb dependency in postgres module + * c07ad11279 Merge pull request `#37899`_ from DSRCorporation/bugs/37059_schedule_task_hang -- **PR** `#38004`_: (*terminalmage*) Fix regression in user/group mgmt for archive.extracted - @ *2016-12-02T18:28:49Z* + * 9497748546 Clear functions context in schedule tasks for ZeroMQ. - - **ISSUE** `#37969`_: (*lordcirth*) Archive.extracted fails if -user: root is specified - | refs: `#38004`_ - * 1ac53e5 Merge pull request `#38004`_ from terminalmage/issue37969 - * 23bb90a Add integration test for archive.extracted with user/group set to root + * a55519db40 Merge pull request `#37928`_ from techhat/issue37737 - * e5ee721 Don't use simple boolean check on uid/gid + * a09a60e89b Don't modify self.opts directly -- **PR** `#38051`_: (*Ch3LL*) add docs for hash_type change to sha256 - @ *2016-12-02T18:11:36Z* + * 9d17f1ce90 Merge pull request `#37929`_ from gtmanfred/2016.3 - - **ISSUE** `#37941`_: (*L4rS6*) Outdated documentation for 2016.11.x - | refs: `#38051`_ - * e90cbbe Merge pull request `#38051`_ from Ch3LL/fix_hash_docs - * e95f88f add docs for hash_type change to sha256 + * c7d2c73503 add list_nodes_min to nova driver -- **PR** `#38028`_: (*terminalmage*) Pass full_return to saltutil.runner - @ *2016-12-02T09:49:31Z* + * 3bb743b59f Merge pull request `#37926`_ from kontrolld/fix-ipv6-centos-network - - **ISSUE** `#38000`_: (*morganwillcock*) 2016.11.0: saltutil.runner returns a different dict structure and breaks template rendering - | refs: `#38028`_ - * 1b52289 Merge pull request `#38028`_ from terminalmage/issue38000 - * 9bf13d5 Pass full_return to saltutil.runner + * 3ed42e5b44 updated -- **PR** `#38044`_: (*terminalmage*) Remove debugging code - @ *2016-12-02T09:43:44Z* + * 3b3bc4f239 Fixes no IPv6 functionality in /etc/sysconfig/network - - **ISSUE** `#37980`_: (*tveastman*) Having 'git' in fileserver_backends and no gitfs_remotes defined causes a crash - | refs: `#38044`_ - * 41c44ff Merge pull request `#38044`_ from terminalmage/issue37980 - * f70a040 Remove debugging code + * 271170a9f3 Merge pull request `#37921`_ from rallytime/merge-2016.3 -- **PR** `#38035`_: (*dmurphy18*) Updated to return status from make_repo similar to rpmbuild.py - @ *2016-12-01T22:30:53Z* + * 523a67c422 Merge branch '2015.8' into '2016.3' - * 9661258 Merge pull request `#38035`_ from dmurphy18/fix_debbuild - * 3bca96e Updated to return status from make_repo similar to rpmbuild.py + * 4cdc6cf5ec Update earlier release channels' docs with Carbon release notes (`#37914`_) -- **PR** `#38023`_: (*gtmanfred*) Expand error message for postgres states - | refs: `#38058`_ - @ *2016-12-01T22:05:06Z* + * d31491a7fe [2015.8] Update version numbers in doc config for 2016.11.0 release (`#37918`_) - - **ISSUE** `#38001`_: (*tomlaredo*) Regression on postgres_group.present ('postgres_group' __virtual__ returned False) - | refs: `#38023`_ - - **ISSUE** `#37986`_: (*marek-obuchowicz*) Module postgres - wrong docs, doesn't work with debian 8.5 - | refs: `#38023`_ - - **ISSUE** `#37935`_: (*ipmb*) Postgres module regression on 2016.11 - | refs: `#37946`_ `#37993`_ `#38023`_ `#38058`_ - * 141b5c5 Merge pull request `#38023`_ from gtmanfred/2016.11 - * 1aa43eb Expand error message for postgres states + * 6cd6429ac0 Merge pull request `#37924`_ from cachedout/fix_gem_states - * ac72ee6 Revert "Updated the bins_dir to default to pg_bin `#37935`_" + * 894cca3427 Update test for new gem ver -- **PR** `#38026`_: (*rallytime*) Back-port `#38015`_ to 2016.11 - @ *2016-12-01T19:16:15Z* + * **PR** `#38112`_: (`rallytime`_) Account for case where vim install already exists and is at an older version - - **PR** `#38015`_: (*morsik*) Typo fix - | refs: `#38026`_ - * 7948642 Merge pull request `#38026`_ from rallytime/`bp-38015`_ - * 11becf3 Typo fix +* **ISSUE** `#19502`_: (`kt97679`_) salt-ssh fails to run state.highstate with custom master_tops (refs: `#38021`_) -* e51448f Added Carbon release notes. Fixed sphinx errors in the file. (`#38022`_) +* **PR** `#38021`_: (`mateiw`_) Add master_tops support in salt-ssh + @ *2016-12-06 14:26:22 UTC* - - **PR** `#38022`_: (*DmitryKuzmenko*) Added Carbon release notes. Fixed sphinx errors in the file. + * f8c67a9598 Merge pull request `#38021`_ from mateiw/salt-ssh_master_tops -* 6f34332 Adjust code examples to use the actual bootstrap-salt.sh file name (`#38011`_) + * 65a0f102fd Add/remove newlines - - **PR** `#38011`_: (*rallytime*) Adjust code examples to use the actual bootstrap-salt.sh file name + * 7037fa116d Add master_tops support in salt-ssh -- **PR** `#37954`_: (*gtmanfred*) use sleep from path for docker.sls_build - @ *2016-11-30T18:08:45Z* + * **PR** `#38084`_: (`rallytime`_) Start release notes file for 2016.11.1 release - - **ISSUE** `#37940`_: (*alex-zel*) dockerng.sls_build fails on some distributions - | refs: `#37954`_ - * 0a04127 Merge pull request `#37954`_ from gtmanfred/2016.11 - * 9caf0b4 use sleep from path for docker.sls_build +* **PR** `#37878`_: (`kstreee`_) Makes threads avoid blocking waiting while communicating using Zeromq. + @ *2016-12-05 19:50:46 UTC* -- **PR** `#37993`_: (*ticosax*) Remove initdb dependency to consume postgres module. - | refs: `#38058`_ - @ *2016-11-30T18:08:13Z* + * 78295516e7 Merge pull request `#37878`_ from kstreee/2016.11 - - **ISSUE** `#37935`_: (*ipmb*) Postgres module regression on 2016.11 - | refs: `#37946`_ `#37993`_ `#38023`_ `#38058`_ - * 4ef5c98 Merge pull request `#37993`_ from ticosax/remove-initdb-requirement - * c5c7a53 Remove initdb dependency to consume postgres module. + * 9103878c4f Fixes blocking waiting through implementing a socket pool class. -- **PR** `#37997`_: (*cachedout*) Update gem test for 2016.11 - @ *2016-11-30T17:13:45Z* +* **PR** `#37987`_: (`rbjorklin`_) consul_pillar support for limiting pillar exposure via minion targeting + @ *2016-12-05 19:48:20 UTC* - * 2e55656 Merge pull request `#37997`_ from cachedout/gem_test_carbon - * 1d221aa Update gem test for 2016.11 + * **PR** `#37985`_: (`rbjorklin`_) consul_pillar support for limiting pillar exposure via minion targeting (refs: `#37987`_) -- **PR** `#37979`_: (*terminalmage*) Revert addition of pillar_roots_override_ext_pillar - @ *2016-11-30T14:34:24Z* + * 0809ccd429 Merge pull request `#37987`_ from rbjorklin/consul-pillar-target - - **ISSUE** `#36723`_: (*white-hat*) ext_pillar_first option is broken in 2016.3 - | refs: `#36807`_ - - **ISSUE** `#24501`_: (*astehlik*) Order in top.sls file is not respected for pillar data in local mode - | refs: `#31316`_ - - **ISSUE** `#19332`_: (*QuinnyPig*) Nondeterminism in Pillar - | refs: `#31316`_ - - **PR** `#36807`_: (*terminalmage*) Fix pillar merging when ext_pillar_first is enabled - | refs: `#37979`_ `#37979`_ - - **PR** `#31316`_: (*kraney*) Let ext_pillar_first determine the override order - | refs: `#37979`_ `#37979`_ - * ca3a948 Merge pull request `#37979`_ from terminalmage/revert-pillar-change - * 6135dfa Revert addition of pillar_roots_override_ext_pillar + * 5d0454a7ca Ignore W1401 (anomalous-backslash-in-string) -* 186b3c7 Fix RST link format (`#37958`_) (`#37970`_) + * 2e929a5ecc Linting fixes - - **PR** `#37970`_: (*rallytime*) Back-port `#37958`_ to 2016.11 - - **PR** `#37958`_: (*mirceaulinic*) Fix RST link format in Carbon release notes - | refs: `#37970`_ + * 171cab1726 Fixed possible incorrect behavior if target wasn't on start/end of str -* 6976be4 Pylint fix (`#37971`_) + * 7440582ce8 consul_pillar support for limiting pillar exposure via minion targeting - - **PR** `#37971`_: (*rallytime*) Lint 2016.11 sooner rather than later - - **PR** `#37955`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - | refs: `#37971`_ +* **ISSUE** `#38062`_: (`UtahDave`_) archive execution module not loading on Windows in 2016.11.0 (refs: `#38067`_) -- **PR** `#37946`_: (*scott-w*) Updated the bins_dir to default to pg_bin - @ *2016-11-29T16:48:27Z* +* **PR** `#38067`_: (`terminalmage`_) Remove virtual funcs for archive state/module + @ *2016-12-05 16:37:23 UTC* - - **ISSUE** `#37935`_: (*ipmb*) Postgres module regression on 2016.11 - | refs: `#37946`_ `#37993`_ `#38023`_ `#38058`_ - * 36f9140 Merge pull request `#37946`_ from scott-w/37935-fix-bin-dir - * d33d403 Restored missing initdb `#37935`_ + * 83dcfe81ea Merge pull request `#38067`_ from terminalmage/issue38062 - * a041b9f Use Salt deprecation warning `#37935`_ + * 2e0f26a084 Remove virtual funcs for archive state/module - * a967893 Updated the bins_dir to default to pg_bin `#37935`_ +* **ISSUE** `#38001`_: (`tomlaredo`_) Regression on postgres_group.present ('postgres_group' __virtual__ returned False) (refs: `#38023`_) -- **PR** `#37889`_: (*isbm*) Allow overwrite archives extraction - | refs: `#38036`_ - @ *2016-11-29T16:18:57Z* +* **ISSUE** `#37986`_: (`marek-obuchowicz`_) Module postgres - wrong docs, doesn't work with debian 8.5 (refs: `#38023`_) - * d8650c5 Merge pull request `#37889`_ from isbm/isbm-states-archive-fix - * e67706b Document the behaviour. +* **ISSUE** `#37935`_: (`ipmb`_) Postgres module regression on 2016.11 (refs: `#37946`_, `#37993`_, `#38023`_, `#38058`_) - * 1970814 Prevent crash during externally changed archive permissions +* **PR** `#38058`_: (`rallytime`_) Remove initdb dependency in postgres module + @ *2016-12-04 04:19:02 UTC* - * 91b4257 Add overwrite option so the extraction of the archive can be always performed. + * **PR** `#38023`_: (`gtmanfred`_) Expand error message for postgres states (refs: `#38058`_) - * e6958f7 Remove nonsense comment and react on generally absent path name + * **PR** `#37993`_: (`ticosax`_) Remove initdb dependency to consume postgres module. (refs: `#38058`_) -- **PR** `#37869`_: (*isbm*) Input sanitation (16.11) - @ *2016-11-29T16:17:16Z* + * c9933670f9 Merge pull request `#38058`_ from rallytime/remove-init-db-dep - * e2b9e58 Merge pull request `#37869`_ from isbm/isbm-input-sanitation-16.11 - * f9ec5d6 Use six instead of builtins + * c1ceeca3d3 Remove initdb dependency in postgres module - * 203dfcb Use American spelling instead +* **ISSUE** `#37969`_: (`lordcirth`_) Archive.extracted fails if -user: root is specified (refs: `#38004`_) - * 91ed307 Sanitise input for the keys and IDs +* **PR** `#38004`_: (`terminalmage`_) Fix regression in user/group mgmt for archive.extracted + @ *2016-12-02 18:28:49 UTC* - * 86623f9 Add a stub for ID sanitiser (at the moment same as hostname) + * 1ac53e5196 Merge pull request `#38004`_ from terminalmage/issue37969 - * 637144c Rename "general.py" to "sanitisers.py" + * 23bb90a7ce Add integration test for archive.extracted with user/group set to root - * f2571fc Add hostname sanitiser + * e5ee721696 Don't use simple boolean check on uid/gid - * 3ae086a Add filename sanitiser +* **ISSUE** `#37941`_: (`L4rS6`_) Outdated documentation for 2016.11.x (refs: `#38051`_) - * 816b1d1 Add general sanitisers +* **PR** `#38051`_: (`Ch3LL`_) add docs for hash_type change to sha256 + @ *2016-12-02 18:11:36 UTC* -- **PR** `#37884`_: (*isbm*) Do not include "gpg-pubkey" packages, filtering by their name - @ *2016-11-28T21:11:37Z* + * e90cbbef08 Merge pull request `#38051`_ from Ch3LL/fix_hash_docs - * e539a94 Merge pull request `#37884`_ from isbm/isbm-zypper-gpgkey-pkg-filter - * 038374a Do not include "gpg-pubkey" packages, filtering by their name + * e95f88fbe3 add docs for hash_type change to sha256 -- **PR** `#37882`_: (*attiasr*) multiple issues in boto_rds state and module - @ *2016-11-28T21:09:11Z* +* **ISSUE** `#38000`_: (`morganwillcock`_) 2016.11.0: saltutil.runner returns a different dict structure and breaks template rendering (refs: `#38028`_) - * eb3d81a Merge pull request `#37882`_ from attiasr/fix_missing_tags - * 73b3c5f Add newline +* **PR** `#38028`_: (`terminalmage`_) Pass full_return to saltutil.runner + @ *2016-12-02 09:49:31 UTC* - * 166c42b fix boto_rds.describe + * 1b52289508 Merge pull request `#38028`_ from terminalmage/issue38000 - * ddd88ba fix boto_rds.describe parameters and subnetgroup_present + * 9bf13d55b4 Pass full_return to saltutil.runner - * bfe7f92 fix missing tags in call to boto_rds.exists +* **ISSUE** `#37980`_: (`tveastman`_) Having 'git' in fileserver_backends and no gitfs_remotes defined causes a crash (refs: `#38044`_) -* 8f986b2 Remove release candidate doc ref from 2016.11.0 release notes (`#37931`_) +* **PR** `#38044`_: (`terminalmage`_) Remove debugging code + @ *2016-12-02 09:43:44 UTC* - - **PR** `#37931`_: (*rallytime*) Remove release candidate doc ref from 2016.11.0 release notes + * 41c44ff684 Merge pull request `#38044`_ from terminalmage/issue37980 -- **PR** `#37930`_: (*cachedout*) Remove dictionary comprehension in netusers - @ *2016-11-28T20:27:06Z* + * f70a0409b3 Remove debugging code - * 3d2dabc Merge pull request `#37930`_ from cachedout/fix_comp - * 670e832 Remove dictionary comprehension in netusers +* **PR** `#38035`_: (`dmurphy18`_) Updated to return status from make_repo similar to rpmbuild.py + @ *2016-12-01 22:30:53 UTC* -- **PR** `#37923`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-11-28T19:55:03Z* + * 9661258f22 Merge pull request `#38035`_ from dmurphy18/fix_debbuild - - **ISSUE** `#37870`_: (*fj40crawler*) salt.states.augeas.change returns None when test=True - | refs: `#37895`_ - - **ISSUE** `#37732`_: (*dhaines*) list_semod() (from modules/selinux.py) incompatible with policycoreutils-2.5 (RHEL 7.3) - | refs: `#37736`_ - - **ISSUE** `#37287`_: (*AaronM-Cloudtek*) salt.states.ddns.present: 'NS' record type always returns as changed - | refs: `#37785`_ - - **ISSUE** `#32829`_: (*tyhunt99*) Dockerng appears to not be using docker registries pillar data - | refs: `#36893`_ `#36893`_ - - **PR** `#37916`_: (*rallytime*) [2016.3] Update version numbers in doc config for 2016.11.0 release - - **PR** `#37907`_: (*Talkless*) Fix server trust in test run of svn.latest - - **PR** `#37896`_: (*toanju*) rh networking: add missing values - - **PR** `#37895`_: (*fj40crawler*) Change return value for salt/states/augeas.py to be True instead of N… - - **PR** `#37886`_: (*bdrung*) Fix various spelling mistakes - - **PR** `#37866`_: (*meaksh*) Backport `#37149`_ `#36938`_ and `#36784`_ to 2016.3 - - **PR** `#37863`_: (*rallytime*) Back-port `#36893`_ to 2016.3 - - **PR** `#37857`_: (*meaksh*) Backport `#37149`_ and `#36938`_ to 2015.8 - | refs: `#37866`_ - - **PR** `#37856`_: (*meaksh*) Backport `#36784`_ to 2015.8 - | refs: `#37866`_ - - **PR** `#37847`_: (*laleocen*) add multiline encryption documentation to nacl - - **PR** `#37797`_: (*clan*) check count of columns after split - - **PR** `#37785`_: (*AaronM-Cloudtek*) respect trailing dot in ddns name parameter - - **PR** `#37762`_: (*twangboy*) Add pre_versions to chocolatey.installed - - **PR** `#37736`_: (*dhaines*) handle semodule version >=2.4 (`#37732`_) and fix typo - - **PR** `#37149`_: (*dincamihai*) Fix pkg.latest_version when latest already installed - | refs: `#37866`_ `#37857`_ - - **PR** `#36938`_: (*wanparo*) acl.delfacl: fix position of -X option to setfacl - | refs: `#37866`_ `#37857`_ - - **PR** `#36893`_: (*tyhunt99*) add option to force a reauth for a docker registry - | refs: `#37863`_ - - **PR** `#36784`_: (*moio*) OS grains for SLES Expanded Support - | refs: `#37866`_ `#37856`_ - * 0f8b187 Merge pull request `#37923`_ from rallytime/merge-2016.11 - * da7f551 Don't let 2016.3 doc config changes overwrite the 2016.11 changes + * 3bca96e7f2 Updated to return status from make_repo similar to rpmbuild.py - * dfedd11 Merge branch '2016.3' into '2016.11' +* **ISSUE** `#38001`_: (`tomlaredo`_) Regression on postgres_group.present ('postgres_group' __virtual__ returned False) (refs: `#38023`_) - * c35ba1f Merge pull request `#37916`_ from rallytime/doc-update-2016.3 +* **ISSUE** `#37986`_: (`marek-obuchowicz`_) Module postgres - wrong docs, doesn't work with debian 8.5 (refs: `#38023`_) - * bd40592 [2016.3] Update version numbers in doc config for 2016.11.0 release +* **ISSUE** `#37935`_: (`ipmb`_) Postgres module regression on 2016.11 (refs: `#37946`_, `#37993`_, `#38023`_, `#38058`_) - * e13a248 Merge pull request `#37785`_ from Cloudtek/ddns-respect-trailing-dot +* **PR** `#38023`_: (`gtmanfred`_) Expand error message for postgres states (refs: `#38058`_) + @ *2016-12-01 22:05:06 UTC* - * 262e3b3 respect trailing dot in ddns name parameter + * 141b5c5656 Merge pull request `#38023`_ from gtmanfred/2016.11 - * c03b389 Merge pull request `#37895`_ from fj40crawler/fix-augeas-return-for-test + * 1aa43eba80 Expand error message for postgres states - * ddc238d Fixed augeas_test.py to match True v.s. None for test_change_in_test_mode + * ac72ee600e Revert "Updated the bins_dir to default to pg_bin `#37935`_" - * ef75c45 Merge branch '2016.3' of github.com:saltstack/salt into fix-augeas-return-for-test +* **PR** `#38026`_: (`rallytime`_) Back-port `#38015`_ to 2016.11 + @ *2016-12-01 19:16:15 UTC* - * b0fe0cd Change return value for salt/states/augeas.py to be True instead of None for cases where salt is run with test=True. Fixes `#37870`_ + * **PR** `#38015`_: (`morsik`_) Typo fix (refs: `#38026`_) - * fdbc31e Merge pull request `#37907`_ from Talkless/patch-2 + * 79486421f5 Merge pull request `#38026`_ from rallytime/bp-38015 - * 072a319 Fix server trust in test run of svn.latest + * 11becf3e68 Typo fix - * f39fdf4 Merge pull request `#37896`_ from toanju/2016.3 + * **PR** `#38022`_: (`DmitryKuzmenko`_) Added Carbon release notes. Fixed sphinx errors in the file. - * c953041 rh networking: add missing values + * **PR** `#38011`_: (`rallytime`_) Adjust code examples to use the actual bootstrap-salt.sh file name - * ea935c5 Merge pull request `#37886`_ from bdrung/fix-typos +* **ISSUE** `#37940`_: (`alex-zel`_) dockerng.sls_build fails on some distributions (refs: `#37954`_) - * 9a51ba5 Fix various spelling mistakes +* **PR** `#37954`_: (`gtmanfred`_) use sleep from path for docker.sls_build + @ *2016-11-30 18:08:45 UTC* - * 371b0a8 Merge pull request `#37736`_ from dhaines/issue-37732 + * 0a041277ea Merge pull request `#37954`_ from gtmanfred/2016.11 - * 7ef590a Update selinux.py + * 9caf0b406d use sleep from path for docker.sls_build - * 516a67e fix indexing error +* **ISSUE** `#37935`_: (`ipmb`_) Postgres module regression on 2016.11 (refs: `#37946`_, `#37993`_, `#38023`_, `#38058`_) - * 4e49c1e fix typo +* **PR** `#37993`_: (`ticosax`_) Remove initdb dependency to consume postgres module. (refs: `#38058`_) + @ *2016-11-30 18:08:13 UTC* - * b16f2d8 handle semodule version >=2.4 (`#37732`_) and fix typo + * 4ef5c98845 Merge pull request `#37993`_ from ticosax/remove-initdb-requirement - * 87aeb66 Merge pull request `#37797`_ from clan/extfs + * c5c7a53d72 Remove initdb dependency to consume postgres module. - * acf0f96 check count of columns after split +* **PR** `#37997`_: (`cachedout`_) Update gem test for 2016.11 + @ *2016-11-30 17:13:45 UTC* - * f7c7109 Merge pull request `#37762`_ from twangboy/fix_chocolatey_state + * 2e5565685c Merge pull request `#37997`_ from cachedout/gem_test_carbon - * 9696b6d Use keyword args instead of relying on ordering + * 1d221aa91c Update gem test for 2016.11 - * 398eaa0 Add pre_versions to the available arguments +* **ISSUE** `#36723`_: (`white-hat`_) ext_pillar_first option is broken in 2016.3 (refs: `#36807`_) - * 56baa92 Merge pull request `#37866`_ from meaksh/2016.3-`bp-37149`_-36938-36784 +* **ISSUE** `#24501`_: (`astehlik`_) Order in top.sls file is not respected for pillar data in local mode (refs: `#31316`_) - * 9d8d578 Fix pkg.latest_version when latest already installed +* **ISSUE** `#19332`_: (`QuinnyPig`_) Nondeterminism in Pillar (refs: `#31316`_) - * ffca0d4 - acl.delfacl: fix position of -X option to setfacl +* **PR** `#37979`_: (`terminalmage`_) Revert addition of pillar_roots_override_ext_pillar + @ *2016-11-30 14:34:24 UTC* - * 3dfed6b Adjust linux_acl unit test argument ordering + * **PR** `#36807`_: (`terminalmage`_) Fix pillar merging when ext_pillar_first is enabled (refs: `#37979`_) - * f185ecd core.py: quote style fixed + * **PR** `#31316`_: (`kraney`_) Let ext_pillar_first determine the override order (refs: `#37979`_) - * 8404d13 Setting up OS grains for SLES Expanded Support (SUSE's Red Hat compatible platform) + * ca3a9488f1 Merge pull request `#37979`_ from terminalmage/revert-pillar-change - * d0cc7f0 Merge pull request `#37863`_ from rallytime/`bp-36893`_ + * 6135dfa4dd Revert addition of pillar_roots_override_ext_pillar - * 4c70534 Add versionadded to reauth option in dockerng module + * **PR** `#37970`_: (`rallytime`_) Back-port `#37958`_ to 2016.11 - * 5ca2c38 added documentation for the new reuth option in docker registry configuration + * **PR** `#37958`_: (`mirceaulinic`_) Fix RST link format in Carbon release notes (refs: `#37970`_) - * 5b0c11a add option to force a reauth for a docker registry + * **PR** `#37971`_: (`rallytime`_) Lint 2016.11 sooner rather than later - * b17a118 add multiline encryption documentation to nacl (`#37847`_) + * **PR** `#37955`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 (refs: `#37971`_) -* 1427115 Add a release notes reference to the docker-sls tutorial (`#37927`_) +* **ISSUE** `#37935`_: (`ipmb`_) Postgres module regression on 2016.11 (refs: `#37946`_, `#37993`_, `#38023`_, `#38058`_) - - **PR** `#37927`_: (*thatch45*) Add a release notes reference to the docker-sls tutorial +* **PR** `#37946`_: (`scott-w`_) Updated the bins_dir to default to pg_bin + @ *2016-11-29 16:48:27 UTC* -* d204099 [2016.11] Update version numbers in doc config for 2016.11.0 release (`#37917`_) + * 36f91408c5 Merge pull request `#37946`_ from scott-w/37935-fix-bin-dir - - **PR** `#37917`_: (*rallytime*) [2016.11] Update version numbers in doc config for 2016.11.0 release + * d33d403969 Restored missing initdb `#37935`_ -- **PR** `#37890`_: (*bbinet*) Fix support for extra_mods='six' to add six module to a thin.tgz tarball - @ *2016-11-28T13:53:06Z* + * a041b9f8e8 Use Salt deprecation warning `#37935`_ - * ee00592 Merge pull request `#37890`_ from bbinet/fix-genthin-six - * 7fceaa3 Fix support for extra_mods='six' to add six module to a thin.tgz tarball + * a96789353f Updated the bins_dir to default to pg_bin `#37935`_ -* 47d21d9 Don't skip pillar compilation when master_type=='disable' (`#37843`_) +* **PR** `#37889`_: (`isbm`_) Allow overwrite archives extraction (refs: `#38036`_) + @ *2016-11-29 16:18:57 UTC* - - **ISSUE** `#37713`_: (*aboe76*) masterless minion can't call pillar.item from pillar stack (development branch) - | refs: `#37843`_ - - **PR** `#37843`_: (*terminalmage*) Don't skip pillar compilation when master_type=='disable' - - **PR** `#32521`_: (*adelcast*) Fix salt-call on standalone minion case - | refs: `#37843`_ + * d8650c5474 Merge pull request `#37889`_ from isbm/isbm-states-archive-fix -* 16ce844 Eliminate warning when 'ssl' not set (`#37849`_) + * e67706bd29 Document the behaviour. - - **ISSUE** `#37449`_: (*thatch45*) Allow TLS connections in the Tornado TCP transport - | refs: `#37776`_ `#37859`_ - - **PR** `#37849`_: (*skizunov*) Eliminate warning when 'ssl' not set - - **PR** `#37776`_: (*DmitryKuzmenko*) Full TLS/SSL options support as provided by Tornado TCPServer. - | refs: `#37849`_ + * 1970814111 Prevent crash during externally changed archive permissions -* 0c607cc An example configuration for TLS/SSL. (`#37859`_) + * 91b42578b2 Add overwrite option so the extraction of the archive can be always performed. - - **ISSUE** `#37449`_: (*thatch45*) Allow TLS connections in the Tornado TCP transport - | refs: `#37776`_ `#37859`_ - - **PR** `#37859`_: (*DmitryKuzmenko*) TLS example config + * e6958f7f15 Remove nonsense comment and react on generally absent path name -* 7c1cfa8 Clarify the master_type docs (`#37841`_) +* **PR** `#37869`_: (`isbm`_) Input sanitation (16.11) + @ *2016-11-29 16:17:16 UTC* - - **PR** `#37841`_: (*terminalmage*) Clarify the master_type docs + * e2b9e58d30 Merge pull request `#37869`_ from isbm/isbm-input-sanitation-16.11 -* 2bc42b8 PY3: Fix exception when handling connect exception in TCP transport (`#37831`_) + * f9ec5d68af Use six instead of builtins - - **PR** `#37831`_: (*skizunov*) PY3: Fix exception when handling connect exception in TCP transport + * 203dfcb238 Use American spelling instead -- **PR** `#37829`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-11-22T15:26:00Z* + * 91ed307af9 Sanitise input for the keys and IDs - - **ISSUE** `#37787`_: (*elyulka*) user.present state fails to change loginclass on FreeBSD - | refs: `#37827`_ - - **ISSUE** `#37751`_: (*freach*) Documentation salt.states.dockerng.running: "privileged" property undocumented - | refs: `#37789`_ - - **ISSUE** `#37653`_: (*gravyboat*) Salt.cron docs don't wrap @hourly and @daily correctly in quotes for the examples - | refs: `#37816`_ - - **ISSUE** `#37383`_: (*edwardsdanielj*) Orchestration arguments (kwarg) not being interperted / How I learned to stop worrying about documentation and love experimenting - | refs: `#37817`_ - - **ISSUE** `#31953`_: (*sjorge*) Documentation for salt.states.cron is incorrect - | refs: `#32157`_ - - **ISSUE** `#19269`_: (*markuskramerIgitt*) Undocumented feature `names:` of `file.directory` - | refs: `#37823`_ - - **ISSUE** `#15697`_: (*arthurlogilab*) keystone.user_present should not re-set the password when user exists - | refs: `#37821`_ - - **ISSUE** `#5999`_: (*pille*) libvirt.keys does not work - | refs: `#37820`_ - - **PR** `#37827`_: (*silenius*) add missing chloginclass - - **PR** `#37826`_: (*rallytime*) Update branch refs to more relevant branch - - **PR** `#37823`_: (*rallytime*) Add "names" option to file state docs: point users to highstate doc examples - - **PR** `#37822`_: (*laleocen*) add documentation for multiline encryption using nacl - | refs: `#37826`_ - - **PR** `#37821`_: (*rallytime*) Clarify keystone.user_present password state docs with default behavior - - **PR** `#37820`_: (*rallytime*) Add some dependency documentation to libvirt docs - - **PR** `#37817`_: (*rallytime*) Update orchestrate runner file.copy doc example - - **PR** `#37816`_: (*rallytime*) Back-port `#32157`_ to 2016.3 - - **PR** `#37812`_: (*rallytime*) Back-port `#37790`_ to 2016.3 - - **PR** `#37811`_: (*rallytime*) Back-port `#37789`_ to 2016.3 - - **PR** `#37810`_: (*rallytime*) Back-port `#37775`_ to 2016.3 - - **PR** `#37790`_: (*sofixa*) Update cloud/proxmox.rst with more options and LXC - | refs: `#37812`_ - - **PR** `#37789`_: (*fedusia*) issue: 37751 - | refs: `#37811`_ - - **PR** `#37775`_: (*calve*) Document `python` argument in `salt.states.virtualenv_mod` - | refs: `#37810`_ - - **PR** `#37772`_: (*bdrung*) Support initializing OpenSSL 1.1 - - **PR** `#32157`_: (*cachedout*) Add quotes to cron doc - | refs: `#37816`_ - * dd81d2f Merge pull request `#37829`_ from rallytime/merge-2016.11 - * 3d6d32e Merge branch '2016.3' into '2016.11' + * 86623f913d Add a stub for ID sanitiser (at the moment same as hostname) - * aa37487 add missing chloginclass (`#37827`_) + * 637144c841 Rename "general.py" to "sanitisers.py" - * 0e74bad Update branch refs to more relevant branch (`#37826`_) + * f2571fc8bf Add hostname sanitiser - * 6a9b49c Add "names" option to file state docs: point users to highstate doc examples (`#37823`_) + * 3ae086aff4 Add filename sanitiser - * aaf587d Clarify keystone.user_present password state docs with default behavior (`#37821`_) + * 816b1d1977 Add general sanitisers - * c300863 Add some dependency documentation to libvirt docs (`#37820`_) +* **PR** `#37884`_: (`isbm`_) Do not include "gpg-pubkey" packages, filtering by their name + @ *2016-11-28 21:11:37 UTC* - * 485270f Merge pull request `#37772`_ from bdrung/openssl1.1 + * e539a94a56 Merge pull request `#37884`_ from isbm/isbm-zypper-gpgkey-pkg-filter - * 819c965 Support initializing OpenSSL 1.1 + * 038374a586 Do not include "gpg-pubkey" packages, filtering by their name - * 4910912 Update orchestrate runner file.copy doc example (`#37817`_) +* **PR** `#37882`_: (`attiasr`_) multiple issues in boto_rds state and module + @ *2016-11-28 21:09:11 UTC* - * c5d3d8b Merge pull request `#37816`_ from rallytime/`bp-32157`_ + * eb3d81a1de Merge pull request `#37882`_ from attiasr/fix_missing_tags - * d9c2971 Add quotes to cron doc + * 73b3c5fa1a Add newline - * 97e6b6a Merge pull request `#37812`_ from rallytime/`bp-37790`_ + * 166c42bc51 fix boto_rds.describe - * ca3b6e7 Update proxmox.rst with more options and LXC + * ddd88ba047 fix boto_rds.describe parameters and subnetgroup_present - * 27703c5 Merge pull request `#37811`_ from rallytime/`bp-37789`_ + * bfe7f92cb4 fix missing tags in call to boto_rds.exists - * ba3fef4 fix comment + * **PR** `#37931`_: (`rallytime`_) Remove release candidate doc ref from 2016.11.0 release notes - * a021f76 issue: 37751 Add documentation for option privileged +* **PR** `#37930`_: (`cachedout`_) Remove dictionary comprehension in netusers + @ *2016-11-28 20:27:06 UTC* - * adac9d7 Merge pull request `#37810`_ from rallytime/`bp-37775`_ + * 3d2dabc7b7 Merge pull request `#37930`_ from cachedout/fix_comp - * 2bed914 Document `python` argument in `salt.states.virtualenv_mod` + * 670e83200b Remove dictionary comprehension in netusers -* c66b51b network.routes should not raise exception if no interface (`#37794`_) +* **PR** `#37923`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-11-28 19:55:03 UTC* - - **PR** `#37794`_: (*sjorge*) network.routes should not raise exception if no interface + * 0f8b187d15 Merge pull request `#37923`_ from rallytime/merge-2016.11 -- **PR** `#37815`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-11-21T20:22:49Z* + * da7f5518eb Don't let 2016.3 doc config changes overwrite the 2016.11 changes - - **ISSUE** `#37742`_: (*blaketmiller*) Cannot match on nodegroup when checking minions - | refs: `#37763`_ - - **ISSUE** `#37725`_: (*secumod*) salt-call incorrectly parses master hostname:port from minion config - | refs: `#37766`_ - - **PR** `#37766`_: (*cachedout*) Fix ip/port issue with salt-call - - **PR** `#37763`_: (*cachedout*) Add nodegroup check to ckminions - * 628c4a3 Merge pull request `#37815`_ from rallytime/merge-2016.11 - * c6b5fd3 Merge branch '2016.3' into '2016.11' + * dfedd1185a Merge branch '2016.3' into '2016.11' - * 7de7844 Add nodegroup check to ckminions (`#37763`_) + * c35ba1f390 Merge pull request `#37916`_ from rallytime/doc-update-2016.3 - * d674369 Fix ip/port issue with salt-call (`#37766`_) + * bd40592289 [2016.3] Update version numbers in doc config for 2016.11.0 release -- **PR** `#37776`_: (*DmitryKuzmenko*) Full TLS/SSL options support as provided by Tornado TCPServer. - | refs: `#37849`_ - @ *2016-11-21T20:11:52Z* + * e13a2488c8 Merge pull request `#37785`_ from Cloudtek/ddns-respect-trailing-dot - - **ISSUE** `#37449`_: (*thatch45*) Allow TLS connections in the Tornado TCP transport - | refs: `#37776`_ `#37859`_ - * 0b30b93 Merge pull request `#37776`_ from DSRCorporation/features/37449_tls - * 6857b9b Documented new TLS/SSL settings. + * 262e3b3697 respect trailing dot in ddns name parameter - * e42898f Full TLS/SSL options support as provided by Tornado TCPServer. + * c03b389422 Merge pull request `#37895`_ from fj40crawler/fix-augeas-return-for-test -- **PR** `#37773`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-11-18T19:18:42Z* + * ddc238df36 Fixed augeas_test.py to match True v.s. None for test_change_in_test_mode - - **ISSUE** `#36629`_: (*yhekma*) The pillar run module does not honor saltenv - | refs: `#37738`_ - - **ISSUE** `#33709`_: (*msummers42*) Any/All Salt-SSH invocations in 2016.3.0 Fails with AttributeError: 'module' object has no attribute 'BASE_THORIUM_ROOTS_DIR' - | refs: `#37767`_ - - **PR** `#37767`_: (*cachedout*) Add thorium path to syspaths - - **PR** `#37760`_: (*hu-dabao*) Fix couchbase returner and add couple of more features - - **PR** `#37745`_: (*cro*) Switch default filter tag for ONE resources from user only to all resources - - **PR** `#37738`_: (*terminalmage*) Allow pillar.get to retrieve fresh pillar data when saltenv passed - * 3835f91 Merge pull request `#37773`_ from rallytime/merge-2016.11 - * c859fc9 Merge branch '2016.3' into '2016.11' + * ef75c459c0 Merge branch '2016.3' of github.com:saltstack/salt into fix-augeas-return-for-test - * c62ff6b Add thorium path to syspaths (`#37767`_) + * b0fe0cd256 Change return value for salt/states/augeas.py to be True instead of None for cases where salt is run with test=True. Fixes `#37870`_ - * bff949f Merge pull request `#37760`_ from hu-dabao/fix_cb_returner + * fdbc31e8d8 Merge pull request `#37907`_ from Talkless/patch-2 - * de372f2 1. returner no need to check whether the jid exists for external job cache setup 2. add full_ret to return doc so that the document will be informative 3. make ttl as a config attribute because salt-minion does not have keep_jobs attribute 4. add password into config attribute 5. update the documents accordingly + * 072a319490 Fix server trust in test run of svn.latest - * 1f976ac Merge pull request `#37738`_ from terminalmage/issue36629 + * f39fdf443f Merge pull request `#37896`_ from toanju/2016.3 - * da46678 Allow pillar.get to retrieve fresh pillar data when saltenv passed + * c95304188e rh networking: add missing values - * 7aee7fc Switch default filter tag for ONE resources from user only to all resources (`#37745`_) + * ea935c5a91 Merge pull request `#37886`_ from bdrung/fix-typos -- **PR** `#37764`_: (*mirceaulinic*) Doc fixes and `replace` feature - @ *2016-11-18T03:15:31Z* + * 9a51ba5c5b Fix various spelling mistakes - * 6f0f70c Merge pull request `#37764`_ from cloudflare/NET-UPDATE - * c3f0202 Replace feature and doc fixes + * 371b0a86d9 Merge pull request `#37736`_ from dhaines/issue-37732 + * 7ef590a505 Update selinux.py + + * 516a67e6a3 fix indexing error + + * 4e49c1e991 fix typo + + * b16f2d8400 handle semodule version >=2.4 (`#37732`_) and fix typo + + * 87aeb66fbf Merge pull request `#37797`_ from clan/extfs + + * acf0f960ef check count of columns after split + + * f7c7109152 Merge pull request `#37762`_ from twangboy/fix_chocolatey_state + + * 9696b6dfa5 Use keyword args instead of relying on ordering + + * 398eaa074d Add pre_versions to the available arguments + + * 56baa92d55 Merge pull request `#37866`_ from meaksh/2016.3-bp-37149-36938-36784 + + * 9d8d578109 Fix pkg.latest_version when latest already installed + + * ffca0d491c - acl.delfacl: fix position of -X option to setfacl + + * 3dfed6b841 Adjust linux_acl unit test argument ordering + + * f185ecdde1 core.py: quote style fixed + + * 8404d13424 Setting up OS grains for SLES Expanded Support (SUSE's Red Hat compatible platform) + + * d0cc7f0d56 Merge pull request `#37863`_ from rallytime/bp-36893 + + * 4c70534991 Add versionadded to reauth option in dockerng module + + * 5ca2c388c2 added documentation for the new reuth option in docker registry configuration + + * 5b0c11ab47 add option to force a reauth for a docker registry + + * b17a118e72 add multiline encryption documentation to nacl (`#37847`_) + + * **PR** `#37927`_: (`thatch45`_) Add a release notes reference to the docker-sls tutorial + + * **PR** `#37917`_: (`rallytime`_) [2016.11] Update version numbers in doc config for 2016.11.0 release + +* **PR** `#37890`_: (`bbinet`_) Fix support for extra_mods='six' to add six module to a thin.tgz tarball + @ *2016-11-28 13:53:06 UTC* + + * ee00592995 Merge pull request `#37890`_ from bbinet/fix-genthin-six + + * 7fceaa3476 Fix support for extra_mods='six' to add six module to a thin.tgz tarball + +* **ISSUE** `#37713`_: (`aboe76`_) masterless minion can't call pillar.item from pillar stack (development branch) (refs: `#37843`_) + + * **PR** `#37843`_: (`terminalmage`_) Don't skip pillar compilation when master_type=='disable' + + * **PR** `#32521`_: (`adelcast`_) Fix salt-call on standalone minion case (refs: `#37843`_) + +* **ISSUE** `#37449`_: (`thatch45`_) Allow TLS connections in the Tornado TCP transport (refs: `#37776`_, `#37859`_) + + * **PR** `#37849`_: (`skizunov`_) Eliminate warning when 'ssl' not set + + * **PR** `#37776`_: (`DmitryKuzmenko`_) Full TLS/SSL options support as provided by Tornado TCPServer. (refs: `#37849`_) + +* **ISSUE** `#37449`_: (`thatch45`_) Allow TLS connections in the Tornado TCP transport (refs: `#37776`_, `#37859`_) + + * **PR** `#37859`_: (`DmitryKuzmenko`_) TLS example config + + * **PR** `#37841`_: (`terminalmage`_) Clarify the master_type docs + + * **PR** `#37831`_: (`skizunov`_) PY3: Fix exception when handling connect exception in TCP transport + +* **PR** `#37829`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-11-22 15:26:00 UTC* + + * dd81d2fa67 Merge pull request `#37829`_ from rallytime/merge-2016.11 + + * 3d6d32edc5 Merge branch '2016.3' into '2016.11' + + * aa3748744c add missing chloginclass (`#37827`_) + + * 0e74bad284 Update branch refs to more relevant branch (`#37826`_) + + * 6a9b49c782 Add "names" option to file state docs: point users to highstate doc examples (`#37823`_) + + * aaf587de63 Clarify keystone.user_present password state docs with default behavior (`#37821`_) + + * c300863159 Add some dependency documentation to libvirt docs (`#37820`_) + + * 485270f74e Merge pull request `#37772`_ from bdrung/openssl1.1 + + * 819c9658ed Support initializing OpenSSL 1.1 + + * 4910912ffa Update orchestrate runner file.copy doc example (`#37817`_) + + * c5d3d8b66a Merge pull request `#37816`_ from rallytime/bp-32157 + + * d9c297119e Add quotes to cron doc + + * 97e6b6aabe Merge pull request `#37812`_ from rallytime/bp-37790 + + * ca3b6e7874 Update proxmox.rst with more options and LXC + + * 27703c54bc Merge pull request `#37811`_ from rallytime/bp-37789 + + * ba3fef48e1 fix comment + + * a021f76a9b issue: 37751 Add documentation for option privileged + + * adac9d7c0c Merge pull request `#37810`_ from rallytime/bp-37775 + + * 2bed91437b Document `python` argument in `salt.states.virtualenv_mod` + + * **PR** `#37794`_: (`sjorge`_) network.routes should not raise exception if no interface + +* **PR** `#37815`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-11-21 20:22:49 UTC* + + * 628c4a3d27 Merge pull request `#37815`_ from rallytime/merge-2016.11 + + * c6b5fd3715 Merge branch '2016.3' into '2016.11' + + * 7de784411d Add nodegroup check to ckminions (`#37763`_) + + * d674369efc Fix ip/port issue with salt-call (`#37766`_) + +* **ISSUE** `#37449`_: (`thatch45`_) Allow TLS connections in the Tornado TCP transport (refs: `#37776`_, `#37859`_) + +* **PR** `#37776`_: (`DmitryKuzmenko`_) Full TLS/SSL options support as provided by Tornado TCPServer. (refs: `#37849`_) + @ *2016-11-21 20:11:52 UTC* + + * 0b30b93dbb Merge pull request `#37776`_ from DSRCorporation/features/37449_tls + + * 6857b9b8b1 Documented new TLS/SSL settings. + + * e42898f2e3 Full TLS/SSL options support as provided by Tornado TCPServer. + +* **PR** `#37773`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-11-18 19:18:42 UTC* + + * 3835f91d99 Merge pull request `#37773`_ from rallytime/merge-2016.11 + + * c859fc9ec1 Merge branch '2016.3' into '2016.11' + + * c62ff6b023 Add thorium path to syspaths (`#37767`_) + + * bff949f4e9 Merge pull request `#37760`_ from hu-dabao/fix_cb_returner + + * de372f277e 1. returner no need to check whether the jid exists for external job cache setup 2. add full_ret to return doc so that the document will be informative 3. make ttl as a config attribute because salt-minion does not have keep_jobs attribute 4. add password into config attribute 5. update the documents accordingly + + * 1f976ac212 Merge pull request `#37738`_ from terminalmage/issue36629 + + * da46678c51 Allow pillar.get to retrieve fresh pillar data when saltenv passed + + * 7aee7fc63c Switch default filter tag for ONE resources from user only to all resources (`#37745`_) + +* **PR** `#37764`_: (`mirceaulinic`_) Doc fixes and `replace` feature + @ *2016-11-18 03:15:31 UTC* + + * 6f0f70c9a3 Merge pull request `#37764`_ from cloudflare/NET-UPDATE + + * c3f0202fdd Replace feature and doc fixes -.. _`#15697`: https://github.com/saltstack/salt/issues/15697 -.. _`#19269`: https://github.com/saltstack/salt/issues/19269 .. _`#19332`: https://github.com/saltstack/salt/issues/19332 .. _`#19502`: https://github.com/saltstack/salt/issues/19502 .. _`#24501`: https://github.com/saltstack/salt/issues/24501 .. _`#31316`: https://github.com/saltstack/salt/pull/31316 -.. _`#31953`: https://github.com/saltstack/salt/issues/31953 -.. _`#32157`: https://github.com/saltstack/salt/pull/32157 .. _`#32521`: https://github.com/saltstack/salt/pull/32521 -.. _`#32829`: https://github.com/saltstack/salt/issues/32829 -.. _`#33709`: https://github.com/saltstack/salt/issues/33709 -.. _`#35088`: https://github.com/saltstack/salt/issues/35088 -.. _`#35342`: https://github.com/saltstack/salt/issues/35342 -.. _`#36629`: https://github.com/saltstack/salt/issues/36629 -.. _`#36707`: https://github.com/saltstack/salt/issues/36707 .. _`#36723`: https://github.com/saltstack/salt/issues/36723 -.. _`#36784`: https://github.com/saltstack/salt/pull/36784 -.. _`#36794`: https://github.com/saltstack/salt/pull/36794 .. _`#36807`: https://github.com/saltstack/salt/pull/36807 -.. _`#36893`: https://github.com/saltstack/salt/pull/36893 -.. _`#36938`: https://github.com/saltstack/salt/pull/36938 -.. _`#37059`: https://github.com/saltstack/salt/issues/37059 -.. _`#37149`: https://github.com/saltstack/salt/pull/37149 .. _`#37215`: https://github.com/saltstack/salt/pull/37215 .. _`#37272`: https://github.com/saltstack/salt/pull/37272 .. _`#37283`: https://github.com/saltstack/salt/pull/37283 -.. _`#37287`: https://github.com/saltstack/salt/issues/37287 -.. _`#37383`: https://github.com/saltstack/salt/issues/37383 .. _`#37449`: https://github.com/saltstack/salt/issues/37449 -.. _`#37653`: https://github.com/saltstack/salt/issues/37653 .. _`#37713`: https://github.com/saltstack/salt/issues/37713 -.. _`#37725`: https://github.com/saltstack/salt/issues/37725 .. _`#37732`: https://github.com/saltstack/salt/issues/37732 .. _`#37736`: https://github.com/saltstack/salt/pull/37736 -.. _`#37737`: https://github.com/saltstack/salt/issues/37737 .. _`#37738`: https://github.com/saltstack/salt/pull/37738 -.. _`#37742`: https://github.com/saltstack/salt/issues/37742 .. _`#37745`: https://github.com/saltstack/salt/pull/37745 -.. _`#37751`: https://github.com/saltstack/salt/issues/37751 .. _`#37760`: https://github.com/saltstack/salt/pull/37760 .. _`#37762`: https://github.com/saltstack/salt/pull/37762 .. _`#37763`: https://github.com/saltstack/salt/pull/37763 @@ -1039,12 +886,8 @@ Changes: .. _`#37767`: https://github.com/saltstack/salt/pull/37767 .. _`#37772`: https://github.com/saltstack/salt/pull/37772 .. _`#37773`: https://github.com/saltstack/salt/pull/37773 -.. _`#37775`: https://github.com/saltstack/salt/pull/37775 .. _`#37776`: https://github.com/saltstack/salt/pull/37776 .. _`#37785`: https://github.com/saltstack/salt/pull/37785 -.. _`#37787`: https://github.com/saltstack/salt/issues/37787 -.. _`#37789`: https://github.com/saltstack/salt/pull/37789 -.. _`#37790`: https://github.com/saltstack/salt/pull/37790 .. _`#37794`: https://github.com/saltstack/salt/pull/37794 .. _`#37797`: https://github.com/saltstack/salt/pull/37797 .. _`#37810`: https://github.com/saltstack/salt/pull/37810 @@ -1055,7 +898,6 @@ Changes: .. _`#37817`: https://github.com/saltstack/salt/pull/37817 .. _`#37820`: https://github.com/saltstack/salt/pull/37820 .. _`#37821`: https://github.com/saltstack/salt/pull/37821 -.. _`#37822`: https://github.com/saltstack/salt/pull/37822 .. _`#37823`: https://github.com/saltstack/salt/pull/37823 .. _`#37826`: https://github.com/saltstack/salt/pull/37826 .. _`#37827`: https://github.com/saltstack/salt/pull/37827 @@ -1065,12 +907,9 @@ Changes: .. _`#37843`: https://github.com/saltstack/salt/pull/37843 .. _`#37847`: https://github.com/saltstack/salt/pull/37847 .. _`#37849`: https://github.com/saltstack/salt/pull/37849 -.. _`#37856`: https://github.com/saltstack/salt/pull/37856 -.. _`#37857`: https://github.com/saltstack/salt/pull/37857 .. _`#37859`: https://github.com/saltstack/salt/pull/37859 .. _`#37863`: https://github.com/saltstack/salt/pull/37863 .. _`#37866`: https://github.com/saltstack/salt/pull/37866 -.. _`#37867`: https://github.com/saltstack/salt/issues/37867 .. _`#37869`: https://github.com/saltstack/salt/pull/37869 .. _`#37870`: https://github.com/saltstack/salt/issues/37870 .. _`#37878`: https://github.com/saltstack/salt/pull/37878 @@ -1100,10 +939,8 @@ Changes: .. _`#37930`: https://github.com/saltstack/salt/pull/37930 .. _`#37931`: https://github.com/saltstack/salt/pull/37931 .. _`#37935`: https://github.com/saltstack/salt/issues/37935 -.. _`#37939`: https://github.com/saltstack/salt/issues/37939 .. _`#37940`: https://github.com/saltstack/salt/issues/37940 .. _`#37941`: https://github.com/saltstack/salt/issues/37941 -.. _`#37945`: https://github.com/saltstack/salt/issues/37945 .. _`#37946`: https://github.com/saltstack/salt/pull/37946 .. _`#37950`: https://github.com/saltstack/salt/pull/37950 .. _`#37954`: https://github.com/saltstack/salt/pull/37954 @@ -1141,7 +978,6 @@ Changes: .. _`#38034`: https://github.com/saltstack/salt/pull/38034 .. _`#38035`: https://github.com/saltstack/salt/pull/38035 .. _`#38036`: https://github.com/saltstack/salt/pull/38036 -.. _`#38037`: https://github.com/saltstack/salt/issues/38037 .. _`#38039`: https://github.com/saltstack/salt/pull/38039 .. _`#38042`: https://github.com/saltstack/salt/issues/38042 .. _`#38043`: https://github.com/saltstack/salt/pull/38043 @@ -1157,7 +993,6 @@ Changes: .. _`#38084`: https://github.com/saltstack/salt/pull/38084 .. _`#38088`: https://github.com/saltstack/salt/pull/38088 .. _`#38090`: https://github.com/saltstack/salt/issues/38090 -.. _`#38091`: https://github.com/saltstack/salt/issues/38091 .. _`#38094`: https://github.com/saltstack/salt/issues/38094 .. _`#38101`: https://github.com/saltstack/salt/pull/38101 .. _`#38102`: https://github.com/saltstack/salt/pull/38102 @@ -1187,15 +1022,52 @@ Changes: .. _`#38181`: https://github.com/saltstack/salt/pull/38181 .. _`#38182`: https://github.com/saltstack/salt/pull/38182 .. _`#38183`: https://github.com/saltstack/salt/pull/38183 -.. _`#5999`: https://github.com/saltstack/salt/issues/5999 -.. _`bp-32157`: https://github.com/saltstack/salt/pull/32157 -.. _`bp-36794`: https://github.com/saltstack/salt/pull/36794 -.. _`bp-36893`: https://github.com/saltstack/salt/pull/36893 -.. _`bp-37149`: https://github.com/saltstack/salt/pull/37149 -.. _`bp-37283`: https://github.com/saltstack/salt/pull/37283 -.. _`bp-37775`: https://github.com/saltstack/salt/pull/37775 -.. _`bp-37789`: https://github.com/saltstack/salt/pull/37789 -.. _`bp-37790`: https://github.com/saltstack/salt/pull/37790 -.. _`bp-38015`: https://github.com/saltstack/salt/pull/38015 -.. _`fix-37939`: https://github.com/saltstack/salt/issues/37939 -.. _`fix-38091`: https://github.com/saltstack/salt/issues/38091 +.. _`#38186`: https://github.com/saltstack/salt/pull/38186 +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`Da-Juan`: https://github.com/Da-Juan +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`L4rS6`: https://github.com/L4rS6 +.. _`MTecknology`: https://github.com/MTecknology +.. _`QuinnyPig`: https://github.com/QuinnyPig +.. _`UtahDave`: https://github.com/UtahDave +.. _`aboe76`: https://github.com/aboe76 +.. _`adelcast`: https://github.com/adelcast +.. _`alex-zel`: https://github.com/alex-zel +.. _`astehlik`: https://github.com/astehlik +.. _`attiasr`: https://github.com/attiasr +.. _`bbinet`: https://github.com/bbinet +.. _`bfilipek`: https://github.com/bfilipek +.. _`cachedout`: https://github.com/cachedout +.. _`cro`: https://github.com/cro +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`ipmb`: https://github.com/ipmb +.. _`isbm`: https://github.com/isbm +.. _`jeanpralo`: https://github.com/jeanpralo +.. _`jf`: https://github.com/jf +.. _`kraney`: https://github.com/kraney +.. _`kstreee`: https://github.com/kstreee +.. _`kt97679`: https://github.com/kt97679 +.. _`lordcirth`: https://github.com/lordcirth +.. _`lorengordon`: https://github.com/lorengordon +.. _`marek-obuchowicz`: https://github.com/marek-obuchowicz +.. _`mateiw`: https://github.com/mateiw +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`morganwillcock`: https://github.com/morganwillcock +.. _`morsik`: https://github.com/morsik +.. _`mschneider82`: https://github.com/mschneider82 +.. _`rallytime`: https://github.com/rallytime +.. _`rbjorklin`: https://github.com/rbjorklin +.. _`scott-w`: https://github.com/scott-w +.. _`sjorge`: https://github.com/sjorge +.. _`skizunov`: https://github.com/skizunov +.. _`t0nyhays`: https://github.com/t0nyhays +.. _`tazaki`: https://github.com/tazaki +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`ticosax`: https://github.com/ticosax +.. _`tomlaredo`: https://github.com/tomlaredo +.. _`tveastman`: https://github.com/tveastman +.. _`white-hat`: https://github.com/white-hat +.. _`whiteinge`: https://github.com/whiteinge diff --git a/doc/topics/releases/2016.11.2.rst b/doc/topics/releases/2016.11.2.rst index aff3a91a8b..f6db00f49c 100644 --- a/doc/topics/releases/2016.11.2.rst +++ b/doc/topics/releases/2016.11.2.rst @@ -5,18 +5,28 @@ Salt 2016.11.2 Release Notes Version 2016.11.2 is a bugfix release for :ref:`2016.11.0 `. +Statistics +========== + +- Total Merges: **157** +- Total Issue References: **34** +- Total PR References: **116** + +- Contributors: **45** (`Ch3LL`_, `Cybolic`_, `DmitryKuzmenko`_, `UtahDave`_, `Vaelatern`_, `alex-zel`_, `alxwr`_, `amendlik`_, `anlutro`_, `aosagie`_, `basdusee`_, `bbinet`_, `benediktwerner`_, `cachedout`_, `clinta`_, `cro`_, `dereckson`_, `disaster123`_, `ewapptus`_, `ezh`_, `folti`_, `gmacon`_, `gqgunhed`_, `gtmanfred`_, `kkoppel`_, `lorengordon`_, `martintamare`_, `mcalmer`_, `meaksh`_, `mirceaulinic`_, `mostafahussein`_, `mvdwalle`_, `rallytime`_, `rbjorklin`_, `scthi`_, `sjorge`_, `techhat`_, `terminalmage`_, `tsaridas`_, `twangboy`_, `vutny`_, `wolfpackmars2`_, `yhekma`_, `yopito`_, `yue9944882`_) + + Security Fixes ============== -CVE-2017-5192: local_batch client external authentication not respected +**CVE-2017-5192** local_batch client external authentication not respected The ``LocalClient.cmd_batch()`` method client does not accept ``external_auth`` credentials and so access to it from salt-api has been removed for now. This vulnerability allows code execution for already-authenticated users and is only in effect when running salt-api as the ``root`` user. -CVE-2017-5200: Salt-api allows arbitrary command execution on a salt-master via -Salt's ssh_client +**CVE-2017-5200** Salt-api allows arbitrary command execution on a salt-master +via Salt's ssh_client Users of Salt-API and salt-ssh could execute a command on the salt master via a hole when both systems were enabled. @@ -24,1407 +34,1299 @@ hole when both systems were enabled. We recommend everyone upgrade to 2016.11.2 as soon as possible. -Changes for v2016.11.1..v2016.11.2 ----------------------------------- +Changelog for v2016.11.1..v2016.11.2 +==================================== -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +*Generated at: 2018-05-27 19:28:11 UTC* -*Generated at: 2017-01-20T21:19:44Z* +* **PR** `#38859`_: (`alxwr`_) fix parsing of sockstat -4 + @ *2017-01-23 16:47:22 UTC* -Statistics: + * ec59ae67c8 Merge pull request `#38859`_ from alxwr/2016.11 -- Total Merges: **155** -- Total Issue references: **70** -- Total PR references: **200** + * 30fe5641c7 fix parsing of sockstat -4 -Changes: +* **PR** `#38850`_: (`techhat`_) Strip .p from cache file names + @ *2017-01-23 16:28:46 UTC* + * 5fe6db6201 Merge pull request `#38850`_ from techhat/stripcache -- **PR** `#38819`_: (*twangboy*) Remove `Users` from c:\\salt [DO NOT MERGE FORWARD] - @ *2017-01-20T20:17:35Z* + * 109cb62e76 Remove .p from test - * 4913c4f Merge pull request `#38819`_ from twangboy/salt_perms_2016.11 - * eb04ed7 Remove `User` from c:\\salt + * 534aa3f527 Strip .p from cache file names -- **PR** `#38815`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-01-20T18:53:01Z* + * **PR** `#38848`_: (`Ch3LL`_) add 2016.11.2 changelog to release notes - - **ISSUE** `#38629`_: (*Arabus*) Conflicting documentation about default value of pillar_opts - | refs: `#38792`_ - - **ISSUE** `#38622`_: (*mikejford*) Incorrect saltenv argument documentation in salt.modules.state - | refs: `#38789`_ - - **ISSUE** `#38388`_: (*johje349*) No INFO logs in minion log file - | refs: `#38808`_ - - **ISSUE** `#36598`_: (*ikkaro*) CloudClient vmware driver reusing SI bug - | refs: `#38813`_ - - **ISSUE** `#10`_: (*thatch45*) list jobs option - - **PR** `#38813`_: (*gtmanfred*) catch SIGPIPE in vmware connection - - **PR** `#38812`_: (*rallytime*) Update pyobjects test to be a list - - **PR** `#38809`_: (*twangboy*) Fix get_hostname to handle longer computer names - - **PR** `#38808`_: (*vutny*) Fix `#38388`_ - - **PR** `#38792`_: (*rallytime*) Update pillar tutorial lanuage regarding pillar_opts settings - - **PR** `#38790`_: (*cachedout*) Fix typo in pyobjects test - - **PR** `#38789`_: (*rallytime*) Update some saltenv refs to environment in salt.modules.state docs - - **PR** `#38668`_: (*terminalmage*) Fix proposal for `#38604`_ - * a275b97 Merge pull request `#38815`_ from rallytime/merge-2016.11 - * ce6d1b1 Make sure we're using the opts dict mocking in parsers_test +* **PR** `#38819`_: (`twangboy`_) Remove `Users` from c:\\salt [DO NOT MERGE FORWARD] + @ *2017-01-20 20:17:35 UTC* - * 315b2c8 Merge branch '2016.3' into '2016.11' + * 4913c4f90c Merge pull request `#38819`_ from twangboy/salt_perms_2016.11 - * d14f0c6 Merge pull request `#38812`_ from rallytime/pyobjects-test + * eb04ed7eef Remove `User` from c:\salt - * f3e84c1 Update pyobjects test to be a list +* **PR** `#38815`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-01-20 18:53:01 UTC* - * 50f03f8 Merge pull request `#38813`_ from gtmanfred/2016.3 + * a275b9714e Merge pull request `#38815`_ from rallytime/merge-2016.11 - * ce3472c catch SIGPIPE in vmware connection + * ce6d1b103d Make sure we're using the opts dict mocking in parsers_test - * 23b8b47 Merge pull request `#38809`_ from twangboy/fix_hostname_2016.3 + * 315b2c8712 Merge branch '2016.3' into '2016.11' - * d57a51f Fix tests for get_hostname + * d14f0c64eb Merge pull request `#38812`_ from rallytime/pyobjects-test - * 7ca3fd7 Fix get_hostname to handle longer computer names + * f3e84c1ab7 Update pyobjects test to be a list - * 1033bbd Merge pull request `#38808`_ from vutny/`fix-38388`_ + * 50f03f8057 Merge pull request `#38813`_ from gtmanfred/2016.3 - * 9bd203f Fix `#38388`_ + * ce3472cec2 catch SIGPIPE in vmware connection - * f3ae3cd Merge pull request `#38668`_ from terminalmage/issue38604 + * 23b8b47258 Merge pull request `#38809`_ from twangboy/fix_hostname_2016.3 - * 0ea97cd Merge pull request `#10`_ from cachedout/pr-38668 + * d57a51f9f9 Fix tests for get_hostname - * db81afc Munge retcode into return data for batching + * 7ca3fd7484 Fix get_hostname to handle longer computer names - * a642a99 Return the ret data from batch execution instead of raw data + * 1033bbdde8 Merge pull request `#38808`_ from vutny/fix-38388 - * c6a19a9 Merge pull request `#38789`_ from rallytime/`fix-38622`_ + * 9bd203ffcc Fix `#38388`_ - * af41fe0 Update some saltenv refs to environment in salt.modules.state docs + * f3ae3cd5c8 Merge pull request `#38668`_ from terminalmage/issue38604 - * e0bf700 Merge pull request `#38790`_ from cachedout/fix_pyobjects_test_typo + * 0ea97cdad9 Merge pull request `#10`_ from cachedout/pr-38668 - * a66afb5 Fix typo in pyobjects test + * db81afc035 Munge retcode into return data for batching - * 6e9785e Merge pull request `#38792`_ from rallytime/`fix-38629`_ + * a642a995dc Return the ret data from batch execution instead of raw data - * 1e125e2 Update pillar tutorial lanuage regarding pillar_opts settings + * c6a19a9e5a Merge pull request `#38789`_ from rallytime/fix-38622 -- **PR** `#38832`_: (*terminalmage*) archive.extracted: Identify symlinks when checking for incorrect types - @ *2017-01-20T18:36:15Z* + * af41fe0c6e Update some saltenv refs to environment in salt.modules.state docs - * efe1bf1 Merge pull request `#38832`_ from terminalmage/issue38711 - * d10c068 Update archive state unit tests to reflect symlinks in archive.list + * e0bf700020 Merge pull request `#38790`_ from cachedout/fix_pyobjects_test_typo - * d6adfb6 Identify symlinks when looking for incorrect types + * a66afb5f0f Fix typo in pyobjects test - * 09b9e95 archive.list: organize symlinks separately from files in verbose mode + * 6e9785edea Merge pull request `#38792`_ from rallytime/fix-38629 - * e6483f0 Support removing symlinks in salt.utils.rm_rf + * 1e125e2844 Update pillar tutorial lanuage regarding pillar_opts settings -- **PR** `#38726`_: (*twangboy*) Add VC Redist 2008 SP1 MFC to installer - @ *2017-01-19T19:13:42Z* +* **PR** `#38832`_: (`terminalmage`_) archive.extracted: Identify symlinks when checking for incorrect types + @ *2017-01-20 18:36:15 UTC* - * 10a3d8b Merge pull request `#38726`_ from twangboy/vcredist - * f00a653 change extensions .ext to .exe + * efe1bf10e8 Merge pull request `#38832`_ from terminalmage/issue38711 - * 98c40e2 Add VC Redist 2008 SP1 MFC to installer + * d10c068e25 Update archive state unit tests to reflect symlinks in archive.list -- **PR** `#38810`_: (*UtahDave*) Fix beacon doc - @ *2017-01-18T21:37:21Z* + * d6adfb6d12 Identify symlinks when looking for incorrect types - * d5f2d92 Merge pull request `#38810`_ from UtahDave/fix_beacon_doc_zd1035 - * dbe9edb fix reactor example. + * 09b9e95f7c archive.list: organize symlinks separately from files in verbose mode -- **PR** `#38811`_: (*techhat*) Show a lot less data when requesting a VM - @ *2017-01-18T21:08:03Z* + * e6483f096d Support removing symlinks in salt.utils.rm_rf - * 88faf08 Merge pull request `#38811`_ from techhat/sanvm - * 47c1932 Show a lot less data when requesting a VM +* **PR** `#38726`_: (`twangboy`_) Add VC Redist 2008 SP1 MFC to installer + @ *2017-01-19 19:13:42 UTC* -* a8a6215 refine the os detection in archive test (`#38807`_) + * 10a3d8b8dd Merge pull request `#38726`_ from twangboy/vcredist - - **PR** `#38807`_: (*Ch3LL*) refine the os detection in archive test + * f00a65355d change extensions .ext to .exe -- **PR** `#38799`_: (*aosagie*) Parse ansible dynamic inventory output correctly - @ *2017-01-18T15:32:47Z* + * 98c40e278c Add VC Redist 2008 SP1 MFC to installer - * e3ca688 Merge pull request `#38799`_ from aosagie/fix-ansible-dynamic-roster - * 26d6f69 Parse ansible dynamic inventory output correctly +* **PR** `#38810`_: (`UtahDave`_) Fix beacon doc + @ *2017-01-18 21:37:21 UTC* -- **PR** `#38787`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-01-18T08:39:08Z* + * d5f2d92a4e Merge pull request `#38810`_ from UtahDave/fix_beacon_doc_zd1035 - - **ISSUE** `#38524`_: (*rbjorklin*) salt-api seems to ignore rest_timeout since 2016.11.0 - | refs: `#38527`_ `#38585`_ - - **ISSUE** `#38479`_: (*tyeapple*) api_logfile setting takes no effect - | refs: `#38585`_ - - **PR** `#38796`_: (*cachedout*) Revert "Fixed prepending of root_dir override to the other paths" - - **PR** `#38774`_: (*vutny*) DOCS: add C++ compiler installation on RHEL required for bundled 0mq - - **PR** `#38749`_: (*vutny*) pkg build modules throw better exception message if keyid wasn't found - - **PR** `#38707`_: (*alexbleotu*) Fixed prepending of root_dir override to the other paths - | refs: `#38796`_ - - **PR** `#38585`_: (*rallytime*) Follow up to PR `#38527`_ - - **PR** `#38570`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - | refs: `#38585`_ - - **PR** `#38560`_: (*Ch3LL*) fix api logfile - | refs: `#38585`_ - - **PR** `#38527`_: (*rbjorklin*) salt-api no longer forces the default timeout - | refs: `#38585`_ `#38585`_ `#38585`_ - * 76df6a4 Merge pull request `#38787`_ from rallytime/merge-2016.11 - * 2aad54c Merge branch '2016.3' into '2016.11' + * dbe9edb806 fix reactor example. - * 3417adc Merge pull request `#38796`_ from saltstack/revert-38707-root_dir_fix-gh +* **PR** `#38811`_: (`techhat`_) Show a lot less data when requesting a VM + @ *2017-01-18 21:08:03 UTC* - * cb080f3 Revert "Fixed prepending of root_dir override to the other paths" + * 88faf08a71 Merge pull request `#38811`_ from techhat/sanvm - * 64d866f Merge branch '2016.3' into '2016.11' + * 47c19325cf Show a lot less data when requesting a VM - * bab3479 Merge pull request `#38585`_ from rallytime/follow-up-38527 + * **PR** `#38807`_: (`Ch3LL`_) refine the os detection in archive test - * 0558720 Pylint fix: add line at end of file +* **PR** `#38799`_: (`aosagie`_) Parse ansible dynamic inventory output correctly + @ *2017-01-18 15:32:47 UTC* - * fa01367 Keep a copy of the DEFAULT_API_OPTS and restore them after the test run + * e3ca6881c8 Merge pull request `#38799`_ from aosagie/fix-ansible-dynamic-roster - * 2ad0763 Test clean up + * 26d6f699a7 Parse ansible dynamic inventory output correctly - * fd2ee7d Add some simple unit tests for salt.config.api_config function +* **PR** `#38787`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-01-18 08:39:08 UTC* - * 3d2fefc Make sure the pidfile and log_file values are overridden by api opts + * 76df6a43f3 Merge pull request `#38787`_ from rallytime/merge-2016.11 - * 1f6b540 Make sure the pidfile and log_file values are overridden by api opts + * 2aad54c49f Merge branch '2016.3' into '2016.11' - * 04d307f salt-api no longer forces the default timeout + * 3417adc617 Merge pull request `#38796`_ from saltstack/revert-38707-root_dir_fix-gh - * 0fb6bb7 Merge pull request `#38707`_ from alexbleotu/root_dir_fix-gh + * cb080f3bbe Revert "Fixed prepending of root_dir override to the other paths" - * 0bac8c8 Fixed prepending of root_dir override to the other paths + * 64d866f7ab Merge branch '2016.3' into '2016.11' - * 96c9dc1 Merge pull request `#38774`_ from vutny/dev-test-docs + * bab3479a3c Merge pull request `#38585`_ from rallytime/follow-up-38527 - * 4620dc4 DOCS: add C++ compiler installation on RHEL required for bundled 0mq + * 05587201b6 Pylint fix: add line at end of file - * aedfbb7 Merge pull request `#38749`_ from vutny/pkg-build-better-exception-msg + * fa01367599 Keep a copy of the DEFAULT_API_OPTS and restore them after the test run - * 53f2be5 pkg build modules throw better exception message if keyid wasn't found + * 2ad07634d9 Test clean up -- **PR** `#38660`_: (*techhat*) Don't force salt.cache to use cachedir from opts - @ *2017-01-17T18:38:35Z* + * fd2ee7db30 Add some simple unit tests for salt.config.api_config function - * 4e6146f Merge pull request `#38660`_ from techhat/cachedir - * be55b57 One last fix + * 3d2fefc83b Make sure the pidfile and log_file values are overriden by api opts - * fc24b24 Add correct function name + * 1f6b540e46 Make sure the pidfile and log_file values are overriden by api opts - * 9bbecf7 Typo fix + * 04d307f917 salt-api no longer forces the default timeout - * 436ba28 Change getlist back to list (using _list) + * 0fb6bb7b77 Merge pull request `#38707`_ from alexbleotu/root_dir_fix-gh - * ff734fe Default to CACHE_DIR in syspaths + * 0bac8c8be3 Fixed prepending of root_dir override to the other paths - * 380abd3 Add cachedir args to tests + * 96c9dc10f7 Merge pull request `#38774`_ from vutny/dev-test-docs - * deb08c0 Not every module will need cachedir + * 4620dc4afa DOCS: add C++ compiler installation on RHEL required for bundled 0mq - * 4489f7c Don't force salt.cache to use cachedir from opts + * aedfbb7a43 Merge pull request `#38749`_ from vutny/pkg-build-better-exception-msg -- **PR** `#38667`_: (*rallytime*) Back-port `#37982`_ to 2016.11 - @ *2017-01-17T15:42:13Z* + * 53f2be5b21 pkg build modules throw better exception message if keyid wasn't found - - **ISSUE** `#37948`_: (*djacobs2016*) ssh_known_hosts.present is failing when checking key/host - | refs: `#37982`_ `#37982`_ - - **ISSUE** `#33932`_: (*folti*) ssh_known_hosts.present: hashing global known hosts file makes it readable by root only - | refs: `#33933`_ - - **PR** `#37982`_: (*wolfpackmars2*) Update ssh.py - | refs: `#38667`_ - - **PR** `#33933`_: (*folti*) ssh: keep original permissions, when hashing known_hosts - | refs: `#38667`_ - * 89dc86e Merge pull request `#38667`_ from rallytime/`bp-37982`_ - * be91e46 Update ssh.py +* **PR** `#38660`_: (`techhat`_) Don't force salt.cache to use cachedir from opts + @ *2017-01-17 18:38:35 UTC* -- **PR** `#38759`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-01-17T15:22:01Z* + * 4e6146f65f Merge pull request `#38660`_ from techhat/cachedir - - **ISSUE** `#38674`_: (*jackywu*) There is no code to use parameter 'event_publisher_pub_hwm' in saltstack-2016.3 - | refs: `#38723`_ - - **ISSUE** `#20`_: (*thatch45*) Sort sys.doc output - - **ISSUE** `#19`_: (*thatch45*) Sending a faulty command kills all the minions! - - **PR** `#38743`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - - **PR** `#38739`_: (*vutny*) DOCS: correct examples of running test suite - - **PR** `#38735`_: (*vutny*) DOCS: add links to File State Backups page where necessary - - **PR** `#38731`_: (*rallytime*) Various follow up fixes - - **PR** `#38723`_: (*rallytime*) Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py - - **PR** `#38720`_: (*dereckson*) Proofread jinja_to_execution_module tutorial - - **PR** `#38693`_: (*twangboy*) Update jinja2 to 2.9.4 - - **PR** `#38669`_: (*rallytime*) Update bootstrap script verstion to latest release - - **PR** `#38602`_: (*terminalmage*) Fix failing unit.states.boto_vpc_test.BotoVpcRouteTableTestCase.test_present_with_routes - - **PR** `#29294`_: (*skizunov*) ZeroMQ no longer required when transport is TCP - | refs: `#38723`_ `#38723`_ - * 751e14c Merge pull request `#38759`_ from rallytime/merge-2016.11 - * 30e8a66 Merge branch '2016.3' into '2016.11' + * be55b57abf One last fix - * 8466b34 Merge pull request `#38743`_ from rallytime/merge-2016.3 + * fc24b24998 Add correct function name - * d24776f Merge branch '2015.8' into '2016.3' + * 9bbecf7960 Typo fix - * 6869621 Merge pull request `#38731`_ from rallytime/merge-2015.8 + * 436ba28f08 Change getlist back to list (using _list) - * 9eb191b Pylint fix + * ff734fe93b Default to CACHE_DIR in syspaths - * b910499 Various follow up fixes + * 380abd3744 Add cachedir args to tests - * e8309a6 Add release notes for 2015.8.13 + * deb08c0587 Not every module will need cachedir - * f881f36 Merge pull request `#20`_ from rallytime/2015.8.12_follow_up-batch-tests + * 4489f7cac0 Don't force salt.cache to use cachedir from opts - * 3428232 Clean up tests and docs for batch execution +* **ISSUE** `#37948`_: (`djacobs2016`_) ssh_known_hosts.present is failing when checking key/host (refs: `#37982`_) - * c80b20b Merge pull request `#19`_ from whiteinge/batchclient +* **ISSUE** `#33932`_: (`folti`_) ssh_known_hosts.present: hashing global known hosts file makes it readable by root only (refs: `#33933`_) - * 3d8f3d1 Remove batch execution from NetapiClient and Saltnado +* **PR** `#38667`_: (`rallytime`_) Back-port `#37982`_ to 2016.11 + @ *2017-01-17 15:42:13 UTC* - * 97b0f64 Lintfix + * **PR** `#37982`_: (`wolfpackmars2`_) Update ssh.py (refs: `#38667`_) - * d151666 Add explanation comment + * **PR** `#33933`_: (`folti`_) ssh: keep original permissions, when hashing known_hosts (refs: `#38667`_) - * 62f2c87 Add docstring + * 89dc86e2bc Merge pull request `#38667`_ from rallytime/bp-37982 - * 9b0a786 Explain what it is about and how to configure that + * be91e46a93 Update ssh.py - * 5ea3579 Pick up a specified roster file from the configured locations +* **PR** `#38759`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-01-17 15:22:01 UTC* - * 3a8614c Disable custom rosters in API + * 751e14c523 Merge pull request `#38759`_ from rallytime/merge-2016.11 - * c0e5a11 Add roster disable flag + * 30e8a66fb0 Merge branch '2016.3' into '2016.11' - * e9c59e9 Merge pull request `#38602`_ from terminalmage/fix-boto-test + * 8466b34e82 Merge pull request `#38743`_ from rallytime/merge-2016.3 - * 3424a10 Fix failing unit.states.boto_vpc_test.BotoVpcRouteTableTestCase.test_present_with_routes + * d24776f5e9 Merge branch '2015.8' into '2016.3' - * a642cde Merge pull request `#38723`_ from rallytime/`fix-38674`_ + * 6869621ed1 Merge pull request `#38731`_ from rallytime/merge-2015.8 - * 706c885 Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py + * 9eb191b6ac Pylint fix - * fc545af Merge pull request `#38669`_ from rallytime/update-bootstrap-script + * b910499dbe Various follow up fixes - * 78ba76e Update bootstrap script verstion to latest release + * e8309a6bbf Add release notes for 2015.8.13 - * 50d417f Merge pull request `#38693`_ from twangboy/update_jinja + * f881f366b7 Merge pull request `#20`_ from rallytime/2015.8.12_follow_up-batch-tests - * e0c7e55 Update jinja2 to 2.9.4 + * 34282322c0 Clean up tests and docs for batch execution - * f4233bb Merge pull request `#38739`_ from vutny/fix-runtests-doc + * c80b20b957 Merge pull request `#19`_ from whiteinge/batchclient - * b872bb6 DOCS: correct examples of running test suite + * 3d8f3d18f6 Remove batch execution from NetapiClient and Saltnado - * 51d4707 DOCS: add links to File State Backups page where necessary (`#38735`_) + * 97b0f64923 Lintfix - * 6d3717b Proofread jinja_to_execution_module tutorial (`#38720`_) + * d1516664f7 Add explanation comment -- **PR** `#38778`_: (*mirceaulinic*) Fix "Error using napalm netusers" - @ *2017-01-17T15:20:27Z* + * 62f2c87080 Add docstring - - **ISSUE** `#38775`_: (*charburns*) Error using napalm netusers - | refs: `#38778`_ - * bb6291d Merge pull request `#38778`_ from cloudflare/`fix-38775`_ - * b3388f7 Fix `#38775`_ + * 9b0a786aeb Explain what it is about and how to configure that -- **PR** `#38664`_: (*clinta*) X509 Improvements. Expose setting permissions, encrypted private keys, and combined key and cert management in one state - @ *2017-01-17T02:20:18Z* + * 5ea3579e10 Pick up a specified roster file from the configured locations - - **ISSUE** `#38528`_: (*MorphBonehunter*) x509 make permissions configurable - | refs: `#38664`_ - - **ISSUE** `#38081`_: (*haraldrudell*) x509 state or module cannot generate password protected private keys - | refs: `#38664`_ - * 6663107 Merge pull request `#38664`_ from clinta/x509-passphrase2 - * 77c7872 pep8 + * 3a8614c5df Disable custom rosters in API - * a2b20ee No mutable default args, remove unneeded import + * c0e5a1171d Add roster disable flag - * b48b85c bug fixes + * e9c59e9b8f Merge pull request `#38602`_ from terminalmage/fix-boto-test - * f62393b pep8 + * 3424a108ac Fix failing unit.states.boto_vpc_test.BotoVpcRouteTableTestCase.test_present_with_routes - * c861324 change documentation + * a642cdef79 Merge pull request `#38723`_ from rallytime/fix-38674 - * 9a0abde expose passphrase functionality to state + * 706c885f55 Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py - * e47a93d add passphrase to execution module + * fc545af10b Merge pull request `#38669`_ from rallytime/update-bootstrap-script - * a4d6598 preserve detailed change reports + * 78ba76e34c Update bootstrap script verstion to latest release - * d0ad251 combine private key and cert management + * 50d417f267 Merge pull request `#38693`_ from twangboy/update_jinja - * 3d1474d cross call file.managed to get permissions options + * e0c7e5549b Update jinja2 to 2.9.4 -- **PR** `#38682`_: (*mirceaulinic*) [2016.11.2/napalm] Better error message when NotImplementedError raised - @ *2017-01-15T18:34:25Z* + * f4233bb18d Merge pull request `#38739`_ from vutny/fix-runtests-doc - * bf6d74c Merge pull request `#38682`_ from cloudflare/NotImplementedError-MSG - * f847639 Better error message when NotImplementedError raised + * b872bb63f6 DOCS: correct examples of running test suite -- **PR** `#38695`_: (*rallytime*) Pass in client_args when calling influxdb execution module funcs - @ *2017-01-15T18:33:48Z* + * 51d4707071 DOCS: add links to File State Backups page where necessary (`#38735`_) - - **ISSUE** `#37996`_: (*stefan-as*) influxdb_user.present does not pass client_args - | refs: `#38695`_ - * df12e49 Merge pull request `#38695`_ from rallytime/`fix-37996`_ - * 05b0975 Pass in client_args when calling influxdb execution module funcs + * 6d3717b9ee Proofread jinja_to_execution_module tutorial (`#38720`_) -- **PR** `#38651`_: (*rallytime*) Don't lose the set reference for ec2 securitygroup ids - @ *2017-01-15T18:06:25Z* +* **ISSUE** `#38775`_: (`charburns`_) Error using napalm netusers (refs: `#38778`_) - - **ISSUE** `#38521`_: (*vladvasiliu*) State cloud.present on AWS: TypeError: 'NoneType' object is not iterable - | refs: `#38651`_ - - **ISSUE** `#37981`_: (*tazaki*) Salt-cloud ec2 vpc securitygroupid always returning default - | refs: `#38183`_ - - **PR** `#38183`_: (*cro*) Fix bad set operations when setting up securitygroups in AWS. - | refs: `#38651`_ - * 834e546 Merge pull request `#38651`_ from rallytime/`fix-38521`_ - * 830c03c Don't lose the set reference for ec2 securitygroup ids +* **PR** `#38778`_: (`mirceaulinic`_) Fix "Error using napalm netusers" + @ *2017-01-17 15:20:27 UTC* -- **PR** `#38659`_: (*techhat*) Turn None into an empty string (for minion matching) - @ *2017-01-15T18:02:03Z* + * bb6291d93a Merge pull request `#38778`_ from cloudflare/fix-38775 - - **ISSUE** `#38216`_: (*pgrishin*) salt-run: can't get cache.grains - | refs: `#38659`_ - * 8b38cfe Merge pull request `#38659`_ from techhat/issue38216 - * 4073c91 Turn None into an empty string (for minion matching) + * b3388f7162 Fix `#38775`_ -- **PR** `#38703`_: (*yhekma*) The `test` option is only valid for the minion, not the master - @ *2017-01-15T17:56:22Z* +* **ISSUE** `#38528`_: (`MorphBonehunter`_) x509 make permissions configurable (refs: `#38664`_) - * 0ad5d22 Merge pull request `#38703`_ from yhekma/docfix - * 57df3bf The `test` option is only valid for the minion, not the master +* **ISSUE** `#38081`_: (`haraldrudell`_) x509 state or module cannot generate password protected private keys (refs: `#38664`_) -- **PR** `#38718`_: (*terminalmage*) Fix for dynamic git_pillar when pillarenv is used - @ *2017-01-15T14:37:30Z* +* **PR** `#38664`_: (`clinta`_) X509 Improvements. Expose setting permissions, encrypted private keys, and combined key and cert management in one state + @ *2017-01-17 02:20:18 UTC* - * 8c1222e Merge pull request `#38718`_ from terminalmage/zd909 - * 12bbea5 Fix for dynamic git_pillar when pillarenv is used + * 6663107021 Merge pull request `#38664`_ from clinta/x509-passphrase2 -- **PR** `#38676`_: (*yhekma*) Removed overloading of list() - @ *2017-01-15T05:42:13Z* + * 77c78723fe pep8 - - **ISSUE** `#38677`_: (*yhekma*) consul cache backend broken - | refs: `#38676`_ - * aae8b54 Merge pull request `#38676`_ from yhekma/2016.11 - * 3237d23 Localfs should also be changed of course + * a2b20ee518 No mutable default args, remove unneeded import - * 9d9de67 We do not want to overload the list() type because if we do, we turn this function into a recursive one, which results in an exception because set() cannot be concatenated with str ('/') + * b48b85cc70 bug fixes -- **PR** `#38713`_: (*rallytime*) Add NameError to exception in avahi_announce beacon - @ *2017-01-15T05:33:04Z* + * f62393b864 pep8 - - **ISSUE** `#38684`_: (*rukender*) 2016.11.1 :[ERROR][11182] Failed to import beacons avahi_announce - | refs: `#38713`_ - * c246ab4 Merge pull request `#38713`_ from rallytime/`fix-38684`_ - * db60bed Add NameError to exception in avahi_announce beacon + * c8613243a1 change documentation -- **PR** `#38729`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-01-13T23:15:33Z* + * 9a0abde9ac expose passphrase functionality to state - - **ISSUE** `#38648`_: (*ericuldall*) No release file error from PPA on Ubuntu - | refs: `#38650`_ - - **ISSUE** `#38572`_: (*COLABORATI*) ppa:saltstack/salt failure - | refs: `#38650`_ - - **ISSUE** `#38087`_: (*UtahDave*) The 'data' field in the return from a minion below a syndic is wrapped in an extra 'data' field. - | refs: `#38657`_ - - **ISSUE** `#36548`_: (*abonillasuse*) openstack auth with nova driver - | refs: `#38647`_ - - **ISSUE** `#34504`_: (*AvinashDeluxeVR*) Installation documentation for Ubuntu server and Windows minion leads the user to use different salt versions. - | refs: `#38650`_ - - **PR** `#38657`_: (*DmitryKuzmenko*) Publish the 'data' field content for Syndic evets - - **PR** `#38650`_: (*rallytime*) Remove the installation instructions for out-of-date community ppa - - **PR** `#38649`_: (*Ch3LL*) fix unit.modules.file_test - - **PR** `#38647`_: (*gtmanfred*) Allow novaclient to use keystoneauth1 sessions for authentication - * 6c14774 Merge pull request `#38729`_ from rallytime/merge-2016.11 - * 4e1e45d Merge branch '2016.3' into '2016.11' + * e47a93d496 add passphrase to execution module - * 7b850d4 Merge pull request `#38647`_ from gtmanfred/nova + * a4d6598f1e preserve detailed change reports - * 5be9b60 add documentation about using keystoneauth for v3 + * d0ad251778 combine private key and cert management - * 7b657ca add the ability to use keystone v2 and v3 + * 3d1474d911 cross call file.managed to get permissions options - * 5646ae1 add ability to use keystoneauth to authenitcate in nova driver +* **PR** `#38682`_: (`mirceaulinic`_) [2016.11.2/napalm] Better error message when NotImplementedError raised + @ *2017-01-15 18:34:25 UTC* - * 383768d Merge pull request `#38650`_ from rallytime/remove-ubuntu-ppa-docs + * bf6d74c98e Merge pull request `#38682`_ from cloudflare/NotImplementedError-MSG - * 30429b2 Remove the installation instructions for out-of-date community ppa + * f847639dee Better error message when NotImplementedError raised - * 7d9f56e Merge pull request `#38657`_ from DSRCorporation/bugs/38087_syndic_event_format_fix +* **ISSUE** `#37996`_: (`stefan-as`_) influxdb_user.present does not pass client_args (refs: `#38695`_) - * 594c33f Publish the 'data' field content for Syndic evets +* **PR** `#38695`_: (`rallytime`_) Pass in client_args when calling influxdb execution module funcs + @ *2017-01-15 18:33:48 UTC* - * 8398751 Merge pull request `#38649`_ from Ch3LL/test_apply_template + * df12e49d80 Merge pull request `#38695`_ from rallytime/fix-37996 - * 47f8b68 fix unit.modules.file_test + * 05b0975888 Pass in client_args when calling influxdb execution module funcs -- **PR** `#38635`_: (*lorengordon*) Sends pass-through params to state module - @ *2017-01-10T20:01:59Z* +* **ISSUE** `#38521`_: (`vladvasiliu`_) State cloud.present on AWS: TypeError: 'NoneType' object is not iterable (refs: `#38651`_) - - **ISSUE** `#38631`_: (*doitian*) In Orchestration, kwargs are not passed to state.sls in masterless mode - | refs: `#38635`_ - * cfd82d1 Merge pull request `#38635`_ from lorengordon/issue-38631 - * 1466613 Sends pass-through params to state module +* **ISSUE** `#37981`_: (`tazaki`_) Salt-cloud ec2 vpc securitygroupid always returning default (refs: `#38183`_) -- **PR** `#38640`_: (*mirceaulinic*) Import napalm_base instead of napalm - @ *2017-01-10T19:58:01Z* +* **PR** `#38651`_: (`rallytime`_) Don't lose the set reference for ec2 securitygroup ids + @ *2017-01-15 18:06:25 UTC* - * 017094a Merge pull request `#38640`_ from cloudflare/NAPALM-IMPORTS - * 8f13f63 Import napalm_base instead of napalm + * **PR** `#38183`_: (`cro`_) Fix bad set operations when setting up securitygroups in AWS. (refs: `#38651`_) -- **PR** `#38661`_: (*techhat*) Add sane cache defaults for minion and cloud - @ *2017-01-10T19:55:15Z* + * 834e5469fc Merge pull request `#38651`_ from rallytime/fix-38521 - * 7966313 Merge pull request `#38661`_ from techhat/sanedefault - * aee4064 Add a sane cache default for cloud + * 830c03cec6 Don't lose the set reference for ec2 securitygroup ids - * c9e01a3 Add a sane cache default for minions +* **ISSUE** `#38216`_: (`pgrishin`_) salt-run: can't get cache.grains (refs: `#38659`_) -- **PR** `#38645`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-01-10T19:54:06Z* +* **PR** `#38659`_: (`techhat`_) Turn None into an empty string (for minion matching) + @ *2017-01-15 18:02:03 UTC* - - **ISSUE** `#38558`_: (*multani*) pillar.get("...", default=var, merge=true) updates default value - | refs: `#38579`_ `#38579`_ - - **ISSUE** `#37355`_: (*Firewire2002*) salt-ssh - ImportError: No module named backports.ssl_match_hostname - | refs: `#37358`_ - - **ISSUE** `#34600`_: (*davidpsv17*) Error trying a salt-ssh test.ping - | refs: `#37358`_ - - **ISSUE** `#27355`_: (*jerob*) salt ssh error with debian 7 on target - | refs: `#37358`_ - - **PR** `#38626`_: (*cachedout*) Revert "Fix/workaround for issue `#37355`_" - - **PR** `#38618`_: (*rallytime*) Back-port `#38579`_ to 2016.3 - - **PR** `#38579`_: (*zwo-bot*) Fix `#38558`_ - pillar.get with default= ...,merge=true influence subsequent calls of pillar.get - | refs: `#38618`_ - - **PR** `#37358`_: (*Firewire2002*) Fix/workaround for issue `#37355`_ - | refs: `#38626`_ - - **PR** `#35390`_: (*alexandr-orlov*) Returns back missed proper grains dictionary for file module - * b0ed91c Merge pull request `#38645`_ from rallytime/merge-2016.11 - * 7a668e9 Merge branch '2016.3' into '2016.11' + * 8b38cfea8d Merge pull request `#38659`_ from techhat/issue38216 - * 74ddc71 Merge pull request `#38626`_ from saltstack/revert-37358-2016.3.3_issue37355 + * 4073c91584 Turn None into an empty string (for minion matching) - * e912ac9 Revert "Fix/workaround for issue `#37355`_" +* **PR** `#38703`_: (`yhekma`_) The `test` option is only valid for the minion, not the master + @ *2017-01-15 17:56:22 UTC* - * 5e58b32 Merge pull request `#37358`_ from Firewire2002/2016.3.3_issue37355 + * 0ad5d22ad4 Merge pull request `#38703`_ from yhekma/docfix - * 910da18 fixed typo + * 57df3bf148 The `test` option is only valid for the minion, not the master - * 4fbc5dd fixed wrong renamed variable and spaces +* **PR** `#38718`_: (`terminalmage`_) Fix for dynamic git_pillar when pillarenv is used + @ *2017-01-15 14:37:30 UTC* - * 92366e6 issue `#37355`_ + * 8c1222e7db Merge pull request `#38718`_ from terminalmage/zd909 - * 7dc87ab issue `#37355`_ + * 12bbea5a24 Fix for dynamic git_pillar when pillarenv is used - * 2878180 issue `#37355`_ +* **ISSUE** `#38677`_: (`yhekma`_) consul cache backend broken (refs: `#38676`_) - * 6c2fe61 Merge pull request `#35390`_ from alexandr-orlov/2016.3 +* **PR** `#38676`_: (`yhekma`_) Removed overloading of list() + @ *2017-01-15 05:42:13 UTC* - * cd5ae17 fxd missed proper grains dictionary + * aae8b54860 Merge pull request `#38676`_ from yhekma/2016.11 - * 2579cfa Merge pull request `#38618`_ from rallytime/`bp-38579`_ + * 3237d23e1c Localfs should also be changed of course - * 2052ece Add copy import + * 9d9de67219 We do not want to overload the list() type because if we do, we turn this function into a recursive one, which results in an exception because set() cannot be concatenated with str ('/') - * 2c8845a add test for pillar.get() + default value +* **ISSUE** `#38684`_: (`rukender`_) 2016.11.1 :[ERROR][11182] Failed to import beacons avahi_announce (refs: `#38713`_) - * c2f98d2 ticket 38558: add unit test, deepcopy() only if necessary +* **PR** `#38713`_: (`rallytime`_) Add NameError to exception in avahi_announce beacon + @ *2017-01-15 05:33:04 UTC* - * 30ae0a1 added deepcopy of default if merge=True + * c246ab41c5 Merge pull request `#38713`_ from rallytime/fix-38684 -- **PR** `#38627`_: (*cachedout*) Pr 38476 - @ *2017-01-06T22:05:45Z* + * db60bed24c Add NameError to exception in avahi_announce beacon - - **PR** `#38476`_: (*amendlik*) Key fingerprints - | refs: `#38627`_ - * d67f693 Merge pull request `#38627`_ from cachedout/pr-38476 - * 2a423ff Add changes to raetkey +* **PR** `#38729`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-01-13 23:15:33 UTC* - * 55ad9d6 Add hash_type argument to MultiKeyCLI.finger_all function + * 6c14774c04 Merge pull request `#38729`_ from rallytime/merge-2016.11 - * c868126 Add hash_type argument to key module fingerprint functions + * 4e1e45d640 Merge branch '2016.3' into '2016.11' - * d0f4c30 Add hash_type argument to wheel fingerprint functions + * 7b850d472d Merge pull request `#38647`_ from gtmanfred/nova - * e558ddc Add finger_master function to wheel.key module + * 5be9b60851 add documentation about using keystoneauth for v3 -- **PR** `#38610`_: (*yue9944882*) Fix `#38595`_ - Unexpected error log from redis retuner in master's log - @ *2017-01-06T21:47:21Z* + * 7b657ca4ae add the ability to use keystone v2 and v3 - - **ISSUE** `#38595`_: (*yue9944882*) Redis ext job cache occurred error - | refs: `#38610`_ `#38610`_ - * b13cd13 Merge pull request `#38610`_ from yue9944882/2016.11 - * 54325cf Fix `#38595`_ - Unexpected error log from redis retuner in master's log + * 5646ae1b34 add ability to use keystoneauth to authenitcate in nova driver -- **PR** `#38406`_: (*alex-zel*) Fix eauth error with openLDAP/389 directory server groups - @ *2017-01-06T21:40:30Z* + * 383768d838 Merge pull request `#38650`_ from rallytime/remove-ubuntu-ppa-docs - - **ISSUE** `#36148`_: (*alex-zel*) Eauth error with openLDAP groups - | refs: `#38406`_ `#38406`_ - * 179d385 Merge pull request `#38406`_ from alex-zel/fix-eauth-groups-permissions - * 6b9e9d8 Fix eauth error with openLDAP/389 directory server groups + * 30429b2e44 Remove the installation instructions for out-of-date community ppa -- **PR** `#38619`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-01-06T17:51:19Z* + * 7d9f56e3b5 Merge pull request `#38657`_ from DSRCorporation/bugs/38087_syndic_event_format_fix - - **ISSUE** `#37498`_: (*githubcdr*) service.restart salt-minion fails on Ubuntu 14.04.5 LTS - | refs: `#38587`_ - - **PR** `#38601`_: (*terminalmage*) pillar.get: Raise exception when merge=True and default is not a dict - - **PR** `#38600`_: (*terminalmage*) Avoid errors when sudo_user is set (2016.3 branch) - - **PR** `#38598`_: (*terminalmage*) Avoid errors when sudo_user is set - | refs: `#38599`_ `#38600`_ - - **PR** `#38589`_: (*tobithiel*) State Gem: fix incorrect warning about missing rvm/rbenv - - **PR** `#38587`_: (*rallytime*) Change daemontools __virtualname__ from service to daemontools - - **PR** `#38567`_: (*pass-by-value*) Create queue if one doesn't exist - * 82e9b3d Merge pull request `#38619`_ from rallytime/merge-2016.11 - * 0efb2d8 Merge branch '2016.3' into '2016.11' + * 594c33f396 Publish the 'data' field content for Syndic evets - * da676ce Merge pull request `#38601`_ from terminalmage/pillar-get + * 83987511fd Merge pull request `#38649`_ from Ch3LL/test_apply_template - * 8613d72 pillar.get: Raise exception when merge=True and default is not a dict + * 47f8b68e0b fix unit.modules.file_test - * 224fc77 Merge pull request `#38600`_ from terminalmage/issue38459-2016.3 +* **ISSUE** `#38631`_: (`doitian`_) In Orchestration, kwargs are not passed to state.sls in masterless mode (refs: `#38635`_) - * 8a45b13 Avoid errors when sudo_user is set +* **PR** `#38635`_: (`lorengordon`_) Sends pass-through params to state module + @ *2017-01-10 20:01:59 UTC* - * a376970 Merge pull request `#38589`_ from tobithiel/fix_rvm_rbenv_warning + * cfd82d1631 Merge pull request `#38635`_ from lorengordon/issue-38631 - * 9ec470b State Gem: fix incorrect warning about missing rvm/rbenv + * 14666138b9 Sends pass-through params to state module - * 02e6a78 Merge pull request `#38567`_ from pass-by-value/pgjsonb_queue_changes_2016.3 +* **PR** `#38640`_: (`mirceaulinic`_) Import napalm_base instead of napalm + @ *2017-01-10 19:58:01 UTC* - * 67879eb Create queue if one doesn't exist + * 017094a207 Merge pull request `#38640`_ from cloudflare/NAPALM-IMPORTS - * 0889cbd Merge pull request `#38587`_ from rallytime/`fix-37498`_ + * 8f13f63880 Import napalm_base instead of napalm - * 2a58809 Change daemontools __virtualname__ from service to daemontools +* **PR** `#38661`_: (`techhat`_) Add sane cache defaults for minion and cloud + @ *2017-01-10 19:55:15 UTC* -- **PR** `#38612`_: (*sjorge*) network.ifacestartswith throws exception on Solaris-like platforms - @ *2017-01-06T17:20:32Z* + * 79663132dd Merge pull request `#38661`_ from techhat/sanedefault - * f64e003 Merge pull request `#38612`_ from sjorge/2016.11-solaris-ifacestartswith - * 26fae54 network.ifacestartswith throws exception on Solaris-like platforms + * aee40648ec Add a sane cache default for cloud -- **PR** `#38615`_: (*sjorge*) add note related to issue `#37027`_ - @ *2017-01-06T16:38:34Z* + * c9e01a36e7 Add a sane cache default for minions - - **ISSUE** `#37027`_: (*sjorge*) Solaris FQDN/UQDN and documentation/consistancy - | refs: `#38615`_ `#38615`_ - * 5820cee Merge pull request `#38615`_ from sjorge/2016.11-solarisdocs - * fbdd32f add note related to issue `#37027`_ +* **PR** `#38645`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-01-10 19:54:06 UTC* -- **PR** `#38598`_: (*terminalmage*) Avoid errors when sudo_user is set - | refs: `#38599`_ `#38600`_ - @ *2017-01-05T23:16:22Z* + * b0ed91ce2d Merge pull request `#38645`_ from rallytime/merge-2016.11 - * a27fdb4 Merge pull request `#38598`_ from terminalmage/issue38459 - * b37f7ff Avoid errors when sudo_user is set + * 7a668e9749 Merge branch '2016.3' into '2016.11' -- **PR** `#38599`_: (*terminalmage*) archive.extracted: Prevent traceback when state.single cannot be run - @ *2017-01-05T23:16:11Z* + * 74ddc71be3 Merge pull request `#38626`_ from saltstack/revert-37358-2016.3.3_issue37355 - - **PR** `#38598`_: (*terminalmage*) Avoid errors when sudo_user is set - | refs: `#38599`_ `#38600`_ - * d6b7019 Merge pull request `#38599`_ from terminalmage/archive-results-handling - * 9aceb81 archive.extracted: Prevent traceback when state.single cannot be run + * e912ac99c2 Revert "Fix/workaround for issue `#37355`_" -- **PR** `#38520`_: (*basdusee*) Fix issue `#38517`_, added time.sleep(1) at line 227 in slack.py - @ *2017-01-05T20:35:08Z* + * 5e58b32934 Merge pull request `#37358`_ from Firewire2002/2016.3.3_issue37355 - - **ISSUE** `#38517`_: (*basdusee*) Slack.py engine 100% CPU load due to missing time.sleep(1) - | refs: `#38520`_ - * d486b42 Merge pull request `#38520`_ from basdusee/fix-issue-38517 - * e3a883c Small fix on the fix regarding indentation + * 910da18bfd fixed typo - * 8adeae6 Fix issue `#38517`_, added time.sleep(1) at line 227 in slack.py engine. + * 4fbc5ddd06 fixed wrong renamed variable and spaces -- **PR** `#38577`_: (*mirceaulinic*) Fix function headers as per `#38499`_ - @ *2017-01-05T18:41:33Z* + * 92366e646c issue `#37355`_ - - **ISSUE** `#38485`_: (*wasabi222*) bgp.config not working - | refs: `#38499`_ - - **PR** `#38499`_: (*mirceaulinic*) Fix `#38485`_ - | refs: `#38577`_ - * 0706cde Merge pull request `#38577`_ from cloudflare/PREP-2016.11.2 - * 62bee3c Fix function headers as per `#38499`_ + * 7dc87ab7b8 issue `#37355`_ -- **PR** `#38578`_: (*mirceaulinic*) [2016.11] Port 5123f11 from develop into 2016.11.2 - @ *2017-01-05T18:11:12Z* + * 2878180405 issue `#37355`_ - * 55d1747 Merge pull request `#38578`_ from cloudflare/PORT-5123f1 - * dea7866 Update net.load_template doc: 2016.11.2 + * 6c2fe615aa Merge pull request `#35390`_ from alexandr-orlov/2016.3 -- **PR** `#38584`_: (*rallytime*) Allow memusage beacon to load on Windows - @ *2017-01-05T18:08:30Z* + * cd5ae17e8d fxd missed proper grains dictionary - - **ISSUE** `#38462`_: (*g-shockfx*) Can`t add beacon memusage on Windows - | refs: `#38584`_ `#38584`_ - * be69baf Merge pull request `#38584`_ from rallytime/`fix-38462`_ - * 1fe945d Allow memusage beacon to load on Windows + * 2579cfa42d Merge pull request `#38618`_ from rallytime/bp-38579 -- **PR** `#38570`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - | refs: `#38585`_ - @ *2017-01-05T14:28:38Z* + * 2052ecee2c Add copy import - - **ISSUE** `#38353`_: (*Ch3LL*) salt-cloud gce specifying - | refs: `#38542`_ `#38542`_ - - **ISSUE** `#38187`_: (*curiositycasualty*) username/password saved as cleartext when using URIs with user:pass@ format - | refs: `#38541`_ - - **ISSUE** `#30454`_: (*favoretti*) Using yaml serializer inside jinja template results in unicode being prepended by '!!python/unicode' - | refs: `#38554`_ `#38554`_ `#30481`_ - - **PR** `#38562`_: (*rallytime*) Update arch installation docs with correct package name - - **PR** `#38560`_: (*Ch3LL*) fix api logfile - | refs: `#38585`_ - - **PR** `#38554`_: (*multani*) Fix YAML deserialization of unicode - - **PR** `#38542`_: (*Ch3LL*) fix gce image bug - - **PR** `#38541`_: (*techhat*) Strip user:pass from cached URLs - - **PR** `#38536`_: (*UtahDave*) add note about pyVmomi locale workaround - - **PR** `#38531`_: (*rallytime*) Back-port `#33601`_ to 2016.3 - - **PR** `#33601`_: (*mchugh19*) Fix slack engine to run on python2.6 - | refs: `#38531`_ - - **PR** `#30481`_: (*basepi*) Add yaml_safe jinja filter - | refs: `#38554`_ - * 14b643f Merge pull request `#38570`_ from rallytime/merge-2016.11 - * 30f14d1 Merge branch '2016.3' into '2016.11' + * 2c8845aaa0 add test for pillar.get() + default value - * 7b74436 Merge pull request `#38562`_ from rallytime/arch-install-docs + * c2f98d2f04 ticket 38558: add unit test, deepcopy() only if necessary - * 8b1897a Update arch installation docs with correct package name + * 30ae0a1958 added deepcopy of default if merge=True - * 0186070 Merge pull request `#38560`_ from Ch3LL/fix_api_log +* **PR** `#38627`_: (`cachedout`_) Pr 38476 + @ *2017-01-06 22:05:45 UTC* - * 1b45e96 fix api logfile + * **PR** `#38476`_: (`amendlik`_) Key fingerprints (refs: `#38627`_) - * 0056620 Merge pull request `#38531`_ from rallytime/`bp-33601`_ + * d67f6937d7 Merge pull request `#38627`_ from cachedout/pr-38476 - * c36cb39 remove the unnecessary double trigger + * 2a423ffedd Add changes to raetkey - * 3841449 fix spacing lint error + * 55ad9d6c6c Add hash_type argument to MultiKeyCLI.finger_all function - * 8c1defc Remove uncessary type from alias commands. Deduplicate alias handling to autodetect function selection. Add error reporting to slack connectivty problems. Cleanup slack's unicode conversion + * c8681269a4 Add hash_type argument to key module fingerprint functions - * c2f23bc Fix slack engine to run on python2.6 + * d0f4c300b7 Add hash_type argument to wheel fingerprint functions - * 50242c7 Merge pull request `#38541`_ from techhat/issue38187 + * e558ddcb18 Add finger_master function to wheel.key module - * eae3a43 Strip user:pass from cached URLs +* **ISSUE** `#38595`_: (`yue9944882`_) Redis ext job cache occurred error (refs: `#38610`_) - * 325dc56 Merge pull request `#38554`_ from multani/fix/30454 +* **PR** `#38610`_: (`yue9944882`_) Fix `#38595`_ - Unexpected error log from redis retuner in master's log + @ *2017-01-06 21:47:21 UTC* - * 2e7f743 yaml: support unicode serialization/deserialization + * b13cd1370f Merge pull request `#38610`_ from yue9944882/2016.11 - * df76113 jinja: test the "yaml" filter with ordered dicts + * 54325cf293 Fix `#38595`_ - Unexpected error log from redis retuner in master's log - * f7712d4 Revert "Add yaml_safe filter" +* **ISSUE** `#36148`_: (`alex-zel`_) Eauth error with openLDAP groups (refs: `#38406`_) - * 4ddbc2e add note about pyVmomi locale workaround (`#38536`_) +* **PR** `#38406`_: (`alex-zel`_) Fix eauth error with openLDAP/389 directory server groups + @ *2017-01-06 21:40:30 UTC* - * 1c951d1 fix gce image bug (`#38542`_) + * 179d385003 Merge pull request `#38406`_ from alex-zel/fix-eauth-groups-permissions -- **PR** `#38509`_: (*mostafahussein*) Stop request from being processed if bad ip - @ *2017-01-04T20:05:44Z* + * 6b9e9d8f89 Fix eauth error with openLDAP/389 directory server groups - * 9a1550d Merge pull request `#38509`_ from mostafahussein/2016.11 - * 8847289 remove commented code +* **PR** `#38619`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-01-06 17:51:19 UTC* - * 420817a Stop request from being processed if bad ip + * 82e9b3d1a1 Merge pull request `#38619`_ from rallytime/merge-2016.11 -- **PR** `#38522`_: (*kkoppel*) Fix usage of salt.utils.http.query in slack_notify.call_hook - @ *2017-01-04T20:04:57Z* + * 0efb2d844e Merge branch '2016.3' into '2016.11' - - **ISSUE** `#38518`_: (*kkoppel*) slack_notify.call_hook returns tracebacks - | refs: `#38522`_ - * bc07d42 Merge pull request `#38522`_ from kkoppel/fix-issue-38518 - * ff1e7f0 Fix usage of salt.utils.http.query in slack_notify.call_hook + * da676cebd6 Merge pull request `#38601`_ from terminalmage/pillar-get -- **PR** `#38527`_: (*rbjorklin*) salt-api no longer forces the default timeout - | refs: `#38585`_ `#38585`_ `#38585`_ - @ *2017-01-04T17:10:15Z* + * 8613d7254d pillar.get: Raise exception when merge=True and default is not a dict - - **ISSUE** `#38524`_: (*rbjorklin*) salt-api seems to ignore rest_timeout since 2016.11.0 - | refs: `#38527`_ `#38585`_ - * 42fef27 Merge pull request `#38527`_ from rbjorklin/api-timeout-fix - * 0202f68 salt-api no longer forces the default timeout + * 224fc7712a Merge pull request `#38600`_ from terminalmage/issue38459-2016.3 -- **PR** `#38529`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-01-04T17:06:57Z* + * 8a45b13e76 Avoid errors when sudo_user is set - - **ISSUE** `#38472`_: (*jinm*) file.managed Unable to manage file: 'hash_type' (2016.3.4) - | refs: `#38503`_ - - **ISSUE** `#38449`_: (*swalladge*) Parsing issues in `list_tab` (salt/modules/cron.py) - | refs: `#38487`_ - - **ISSUE** `#38438`_: (*jf*) file.line with mode=delete breaks on empty file - | refs: `#38467`_ - - **ISSUE** `#38282`_: (*sash-kan*) file.managed fails when file (which contains utf-characters in the name) exists - | refs: `#38415`_ - - **ISSUE** `#38209`_: (*limited*) Accepting a minion causes tornado to exit - | refs: `#38474`_ - - **ISSUE** `#37684`_: (*thusoy*) State execution duration is timezone-dependent - | refs: `#38491`_ - - **PR** `#38503`_: (*jinm*) Hash type fallback for file management - - **PR** `#38491`_: (*gtmanfred*) Use UTC for timing in case timezone changes - - **PR** `#38487`_: (*gtmanfred*) Fix crontab issues with spaces - - **PR** `#38474`_: (*cachedout*) Allow an existing ioloop to be passed to salt-key - - **PR** `#38467`_: (*gtmanfred*) file.line fail with mode=delete - - **PR** `#38457`_: (*bshelton229*) Stops git.latest checking for local changes in a bare repo - - **PR** `#38434`_: (*slinn0*) Make sysctl.persist fail when failing to set a value into the running kernel - - **PR** `#38421`_: (*rallytime*) Update deprecation notices to the correct version - - **PR** `#38420`_: (*rallytime*) Removed various deprecation notices from salt/modules/* files - | refs: `#38421`_ - - **PR** `#38419`_: (*Ch3LL*) fix scsci docs example - - **PR** `#38415`_: (*terminalmage*) file.managed: Fix failure when filename contains unicode chars - - **PR** `#38385`_: (*dragon788*) Use unambigous long names with double dashes - * 1895eb7 Merge pull request `#38529`_ from rallytime/merge-2016.11 - * 85f4702 Merge branch '2016.3' into '2016.11' + * a376970f88 Merge pull request `#38589`_ from tobithiel/fix_rvm_rbenv_warning - * ec60f9c Merge pull request `#38487`_ from gtmanfred/2016.3 + * 9ec470b4a5 State Gem: fix incorrect warning about missing rvm/rbenv - * 048b9f6 add test + * 02e6a78254 Merge pull request `#38567`_ from pass-by-value/pgjsonb_queue_changes_2016.3 - * c480c11 allow spaces in cron env + * 67879ebe65 Create queue if one doesn't exist - * c529ec8 allow crons to have multiple spaces + * 0889cbdb31 Merge pull request `#38587`_ from rallytime/fix-37498 - * c5ba11b Merge pull request `#38491`_ from gtmanfred/timing + * 2a5880966f Change daemontools __virtualname__ from service to daemontools - * 79368c7 Use UTC for timing in case timezone changes +* **PR** `#38612`_: (`sjorge`_) network.ifacestartswith throws exception on Solaris-like platforms + @ *2017-01-06 17:20:32 UTC* - * 86f0aa0 Merge pull request `#38503`_ from jinm/issue_38472_jinm + * f64e003a69 Merge pull request `#38612`_ from sjorge/2016.11-solaris-ifacestartswith - * 0cd9df2 Hash type fallback for file management + * 26fae54f5b network.ifacestartswith throws exception on Solaris-like platforms - * ed2ba4b Merge pull request `#38457`_ from bshelton229/git-latest-head-bug +* **ISSUE** `#37027`_: (`sjorge`_) Solaris FQDN/UQDN and documentation/consistancy (refs: `#38615`_) - * 558e7a7 Stops git.latest checking for local changes in a bare repo +* **PR** `#38615`_: (`sjorge`_) add note related to issue `#37027`_ + @ *2017-01-06 16:38:34 UTC* - * 36e21b2 Merge pull request `#38385`_ from dragon788/2016.3-double-dash + * 5820ceee16 Merge pull request `#38615`_ from sjorge/2016.11-solarisdocs - * 86c4b56 Newline for lint compat + * fbdd32f46b add note related to issue `#37027`_ - * 9d9b686 Address review comments, consistency of quotes +* **PR** `#38598`_: (`terminalmage`_) Avoid errors when sudo_user is set (refs: `#38600`_, `#38599`_) + @ *2017-01-05 23:16:22 UTC* - * df9bd5e Use unambigous long names with double dashes + * a27fdb46a7 Merge pull request `#38598`_ from terminalmage/issue38459 - * 59f2560 Merge pull request `#38474`_ from cachedout/key_loop + * b37f7ffa38 Avoid errors when sudo_user is set - * de50453 Allow an existing ioloop to be passed to salt-key +* **PR** `#38599`_: (`terminalmage`_) archive.extracted: Prevent traceback when state.single cannot be run + @ *2017-01-05 23:16:11 UTC* - * 3d0c752 Merge pull request `#38467`_ from gtmanfred/2016.3 + * **PR** `#38598`_: (`terminalmage`_) Avoid errors when sudo_user is set (refs: `#38600`_, `#38599`_) - * 7b7c6b3 file.line fail with mode=delete + * d6b7019df6 Merge pull request `#38599`_ from terminalmage/archive-results-handling - * 940025d Merge pull request `#38434`_ from slinn0/issue_38433_fixes + * 9aceb8186d archive.extracted: Prevent traceback when state.single cannot be run - * 22af87a Fixes for https://github.com/saltstack/salt/issues/38433 +* **ISSUE** `#38517`_: (`basdusee`_) Slack.py engine 100% CPU load due to missing time.sleep(1) (refs: `#38520`_) - * e5eb512 Update deprecation notices to the correct version (`#38421`_) +* **PR** `#38520`_: (`basdusee`_) Fix issue `#38517`_, added time.sleep(1) at line 227 in slack.py + @ *2017-01-05 20:35:08 UTC* - * 9ce5331 file.managed: Fix failure when filename contains unicode chars (`#38415`_) + * d486b42ceb Merge pull request `#38520`_ from basdusee/fix-issue-38517 - * 2cdb59d Merge pull request `#38419`_ from Ch3LL/fix_doc_scsi + * e3a883c915 Small fix on the fix regarding indentation - * 234043b fix scsci docs example + * 8adeae6f81 Fix issue `#38517`_, added time.sleep(1) at line 227 in slack.py engine. -- **PR** `#38539`_: (*twangboy*) Fix DSC LCM Config int checks - @ *2017-01-04T16:56:27Z* +* **ISSUE** `#38485`_: (`wasabi222`_) bgp.config not working (refs: `#38499`_) - * ec4f118 Merge pull request `#38539`_ from twangboy/dsc_int_checks - * 5657fd1 Add repr flag for str +* **PR** `#38577`_: (`mirceaulinic`_) Fix function headers as per `#38499`_ + @ *2017-01-05 18:41:33 UTC* - * aea4219 Fix DSC LCM Config int checks + * **PR** `#38499`_: (`mirceaulinic`_) Fix `#38485`_ (refs: `#38577`_) -- **PR** `#38549`_: (*meaksh*) Adding multiple SUBVOLUME support and some fixes to the Snapper module - @ *2017-01-04T15:32:30Z* + * 0706cde626 Merge pull request `#38577`_ from cloudflare/PREP-2016.11.2 - * 53449c8 Merge pull request `#38549`_ from meaksh/2016.11-snapper-multiple-subvolumen-support - * ef26e93 Some fixes and pylint + * 62bee3c793 Fix function headers as per `#38499`_ - * 1e6ba45 Fixes pre/post snapshot order to get the inverse status +* **PR** `#38578`_: (`mirceaulinic`_) [2016.11] Port 5123f11 from develop into 2016.11.2 + @ *2017-01-05 18:11:12 UTC* - * 68d5475 Fixing Snapper unit tests for SUBVOLUME support + * 55d1747792 Merge pull request `#38578`_ from cloudflare/PORT-5123f1 - * e9919a9 Removing possible double '/' from the file paths + * dea7866d57 Update net.load_template doc: 2016.11.2 - * 8b4f87f Updating and fixing the documentation +* **ISSUE** `#38462`_: (`g-shockfx`_) Can`t add beacon memusage on Windows (refs: `#38584`_) - * edea452 Raises "CommandExecutionError" if snapper command fails +* **PR** `#38584`_: (`rallytime`_) Allow memusage beacon to load on Windows + @ *2017-01-05 18:08:30 UTC* - * 3841e11 Only include diff in the state response if `include_diff` is True + * be69bafe6e Merge pull request `#38584`_ from rallytime/fix-38462 - * 7803e77 Adds multiple SUBVOLUME support to the Snapper module + * 1fe945df5e Allow memusage beacon to load on Windows -* d43beab Move boto_vpc.describe_route_table deprecation version to Oxygen (`#38545`_) +* **PR** `#38570`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 (refs: `#38585`_) + @ *2017-01-05 14:28:38 UTC* - - **PR** `#38545`_: (*rallytime*) Move boto_vpc.describe_route_table deprecation version to Oxygen + * 14b643fd48 Merge pull request `#38570`_ from rallytime/merge-2016.11 -- **PR** `#38471`_: (*twangboy*) Fix Problem with win_service module - @ *2017-01-01T20:30:21Z* + * 30f14d15df Merge branch '2016.3' into '2016.11' - * 5e80104 Merge pull request `#38471`_ from twangboy/fix_win_service - * 810471b Fix problem with some services getting access denied + * 7b74436d13 Merge pull request `#38562`_ from rallytime/arch-install-docs -- **PR** `#38499`_: (*mirceaulinic*) Fix `#38485`_ - | refs: `#38577`_ - @ *2017-01-01T17:42:15Z* + * 8b1897ace9 Update arch installation docs with correct package name - - **ISSUE** `#38485`_: (*wasabi222*) bgp.config not working - | refs: `#38499`_ - * 0a09049 Merge pull request `#38499`_ from cloudflare/FIX-38485 - * 1801813 Fix `#38485`_ + * 01860702cb Merge pull request `#38560`_ from Ch3LL/fix_api_log -- **PR** `#38501`_: (*mvdwalle*) Do not assume every object is a server - @ *2017-01-01T17:37:57Z* + * 1b45e9670b fix api logfile - * 13f0b80 Merge pull request `#38501`_ from mvdwalle/fix-gogrid-list-password - * bd7dee9 Do not assume every object is a server + * 0056620a53 Merge pull request `#38531`_ from rallytime/bp-33601 -- **PR** `#38461`_: (*anlutro*) Improvements/fixes to kapacitor task change detection - @ *2016-12-29T17:08:47Z* + * c36cb39825 remove the unnecessary double trigger - * aa0c843 Merge pull request `#38461`_ from alprs/fix-kapacitor_changes - * 52721e9 clean up and fix tests + * 38414493bf fix spacing lint error - * 8648775 if task is not defined, it's not up to date + * 8c1defc710 Remove uncessary type from alias commands. Deduplicate alias handling to autodetect function selection. Add error reporting to slack connectivty problems. Cleanup slack's unicode conversion - * c3ab954 improvements/fixes to kapacitor task change detection + * c2f23bc45e Fix slack engine to run on python2.6 -- **PR** `#38473`_: (*twangboy*) Change OSX/OS X to macOS where possible - @ *2016-12-29T16:35:11Z* + * 50242c7f17 Merge pull request `#38541`_ from techhat/issue38187 - * 2c51eb9 Merge pull request `#38473`_ from twangboy/osx_to_macos - * e96bfe8 Change OSX/OS X to macOS where possible + * eae3a435dd Strip user:pass from cached URLs -- **PR** `#38412`_: (*bbinet*) Update PillarStack stack.py to latest upstream version - @ *2016-12-28T19:28:40Z* + * 325dc56e59 Merge pull request `#38554`_ from multani/fix/30454 - * 2497fb5 Merge pull request `#38412`_ from bbinet/pillarstack-updates - * b66b4bd Fix lint violations in stack.py + * 2e7f743371 yaml: support unicode serialization/deserialization - * 6a30fe6 Update PillarStack stack.py to latest upstream version + * df76113c5c jinja: test the "yaml" filter with ordered dicts -- **PR** `#38456`_: (*twangboy*) Gate Windows Specific Salt Utils - @ *2016-12-28T18:44:33Z* + * f7712d417f Revert "Add yaml_safe filter" - * 5395d32 Merge pull request `#38456`_ from twangboy/gate_win_utils - * d34d110 Fix lint, fix boto module + * 4ddbc2ecaa add note about pyVmomi locale workaround (`#38536`_) - * c201111 Gate Windows Utils + * 1c951d152b fix gce image bug (`#38542`_) -- **PR** `#38428`_: (*gqgunhed*) fixed typo: lq command-line syntax - @ *2016-12-27T15:42:02Z* +* **PR** `#38509`_: (`mostafahussein`_) Stop request from being processed if bad ip + @ *2017-01-04 20:05:44 UTC* - * 7c77991 Merge pull request `#38428`_ from gqgunhed/fix_lq_typo - * d79d682 fixed typo: lq command-line syntax + * 9a1550d336 Merge pull request `#38509`_ from mostafahussein/2016.11 -- **PR** `#38444`_: (*lorengordon*) Adds new import required for `extract_hash` - @ *2016-12-27T15:37:20Z* + * 8847289c3e remove commented code - - **ISSUE** `#38443`_: (*lorengordon*) 2016.11 breaks file.managed on Windows - | refs: `#38444`_ - - **ISSUE** `#34101`_: (*windoverwater*) archive.extracted breakage due to 2016.3.0 upgrade from 2015.8.10 - | refs: `#37368`_ - - **PR** `#37368`_: (*terminalmage*) Overhaul archive.extracted state - | refs: `#38444`_ - * f5984d0 Merge pull request `#38444`_ from lorengordon/issue-38443 - * b2925ad Adds new import required for `extract_hash` + * 420817a963 Stop request from being processed if bad ip -- **PR** `#38167`_: (*cachedout*) Kill pkg_resources for CLI tools [DO NOT MERGE] - @ *2016-12-22T22:11:22Z* +* **ISSUE** `#38518`_: (`kkoppel`_) slack_notify.call_hook returns tracebacks (refs: `#38522`_) - - **ISSUE** `#38071`_: (*luochun-95*) remote execute is very slow - | refs: `#38167`_ - * 4c4f07c Merge pull request `#38167`_ from cachedout/no_pkg_resources - * ec69017 Remove debugging +* **PR** `#38522`_: (`kkoppel`_) Fix usage of salt.utils.http.query in slack_notify.call_hook + @ *2017-01-04 20:04:57 UTC* - * f28e33b Remove from all but salt cli + * bc07d420e9 Merge pull request `#38522`_ from kkoppel/fix-issue-38518 - * bb3af72 Remove from salt-call + * ff1e7f0c71 Fix usage of salt.utils.http.query in slack_notify.call_hook - * c676846 Kill pkg_resources for CLI tools +* **ISSUE** `#38524`_: (`rbjorklin`_) salt-api seems to ignore rest_timeout since 2016.11.0 (refs: `#38585`_, `#38527`_) -- **PR** `#38417`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-12-22T19:00:44Z* +* **PR** `#38527`_: (`rbjorklin`_) salt-api no longer forces the default timeout (refs: `#38585`_) + @ *2017-01-04 17:10:15 UTC* - - **ISSUE** `#38372`_: (*fanirama*) Issue with cron.file. Source: salt://path/to/crontab_file not found - | refs: `#38398`_ - - **PR** `#38407`_: (*terminalmage*) Improve pillar documentation - - **PR** `#38398`_: (*terminalmage*) Fix call to file.get_managed in cron.file state - - **PR** `#38390`_: (*meaksh*) Add "try-restart" to fix autorestarting on SUSE systems - - **PR** `#38382`_: (*heewa*) Fix http.query when result has no text - - **PR** `#38221`_: (*UtahDave*) Fix default returner - * 2fc8c15 Merge pull request `#38417`_ from rallytime/merge-2016.11 - * efb8a8d Merge branch '2016.3' into '2016.11' + * 42fef270ee Merge pull request `#38527`_ from rbjorklin/api-timeout-fix - * 2725352 Improve pillar documentation (`#38407`_) + * 0202f68820 salt-api no longer forces the default timeout - * 423b1fd Merge pull request `#38398`_ from terminalmage/issue38372 +* **PR** `#38529`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-01-04 17:06:57 UTC* - * c80dbaa Fix call to file.get_managed in cron.file state + * 1895eb7533 Merge pull request `#38529`_ from rallytime/merge-2016.11 - * 5a33d1e Fix http.query when result has no text (`#38382`_) + * 85f470207c Merge branch '2016.3' into '2016.11' - * b74b5c7 Merge pull request `#38390`_ from meaksh/2016.3-fix-try-restart-for-autorestarting-on-SUSE-systems + * ec60f9c721 Merge pull request `#38487`_ from gtmanfred/2016.3 - * de6ec05 add try-restart to fix autorestarting on SUSE systems + * 048b9f6b9d add test - * 2c3a397 Merge pull request `#38221`_ from UtahDave/fix_default_returner + * c480c11528 allow spaces in cron env - * 3856407 remove a blank line to satisfy linter + * c529ec8c34 allow crons to have multiple spaces - * 9c248aa validate return opt, remove default. + * c5ba11b5e0 Merge pull request `#38491`_ from gtmanfred/timing - * 8bb37f9 specify allowed types and default for "returner" + * 79368c7528 Use UTC for timing in case timezone changes - * 11863a4 add examples of default minion returners + * 86f0aa0bb3 Merge pull request `#38503`_ from jinm/issue_38472_jinm - * e7c6012 add support for default returners using `return` + * 0cd9df299f Hash type fallback for file management -- **PR** `#38342`_: (*scthi*) Bugfix ext pillar nodegroups - @ *2016-12-22T16:47:42Z* + * ed2ba4bd1b Merge pull request `#38457`_ from bshelton229/git-latest-head-bug - * bbc149c Merge pull request `#38342`_ from scthi/bugfix-ext-pillar-nodegroups - * dba315c ext-pillar nodegroups works for all minions now. + * 558e7a771a Stops git.latest checking for local changes in a bare repo -- **PR** `#38403`_: (*terminalmage*) git_pillar: Document the transition from env to saltenv in the jinja context - @ *2016-12-22T16:34:48Z* + * 36e21b22cb Merge pull request `#38385`_ from dragon788/2016.3-double-dash - * 453476d Merge pull request `#38403`_ from terminalmage/document-saltenv - * 0a72e0f git_pillar: Document the transition from env to saltenv in the jinja context + * 86c4b56f47 Newline for lint compat -- **PR** `#38354`_: (*gmacon*) Use --all when calling pip.py - @ *2016-12-20T20:40:21Z* + * 9d9b686057 Address review comments, consistency of quotes - - **ISSUE** `#38253`_: (*gmacon*) There was no error installing package 'setuptools' although it does not show when calling 'pip.freeze'. - | refs: `#38354`_ - * 12436ef Merge pull request `#38354`_ from gmacon/pip-freeze-all - * dca24b2 Use --all when calling pip.py + * df9bd5e7f9 Use unambigous long names with double dashes -- **PR** `#38348`_: (*rallytime*) Update autodoc topics for new modules added in 2016.11 - @ *2016-12-20T20:36:20Z* + * 59f2560d88 Merge pull request `#38474`_ from cachedout/key_loop - * 68430b1 Merge pull request `#38348`_ from rallytime/mod-docs-2016.11 - * b31c241 Add __iter__ and next options to doc/conf.py + * de504538e1 Allow an existing ioloop to be passed to salt-key - * b8c1609 Revert "Move import/error messaging logic for snapper module into __virtual__()" + * 3d0c752acd Merge pull request `#38467`_ from gtmanfred/2016.3 - * 640db5b Move import/error messaging logic for snapper module into __virtual__() + * 7b7c6b3878 file.line fail with mode=delete - * 366271f Add snapper to state index doc module list + * 940025d5c4 Merge pull request `#38434`_ from slinn0/issue_38433_fixes - * 135d254 Remove netapi autodoc files: they should not be added as their doc structure is different + * 22af87a3fc Fixes for https://github.com/saltstack/salt/issues/38433 - * 0006139 Update autodoc topics for new modules added in 2016.11 + * e5eb51255b Update deprecation notices to the correct version (`#38421`_) -- **PR** `#38377`_: (*DmitryKuzmenko*) Implementation and docs for Consul key-value store plugin for minion data cache. - @ *2016-12-20T20:36:02Z* + * 9ce53318df file.managed: Fix failure when filename contains unicode chars (`#38415`_) - * 6ee7b2b Merge pull request `#38377`_ from DSRCorporation/features/consul_cache - * 6fb4430 Configuration options and documentation for Consul data cache plugin. + * 2cdb59d055 Merge pull request `#38419`_ from Ch3LL/fix_doc_scsi - * dad748f Data cache plugin configuration documentation. + * 234043b8bb fix scsci docs example - * c7209cd Consul data cache plugin. +* **PR** `#38539`_: (`twangboy`_) Fix DSC LCM Config int checks + @ *2017-01-04 16:56:27 UTC* -- **PR** `#38373`_: (*rallytime*) Back-port `#38212`_ to 2016.11 - @ *2016-12-20T20:35:09Z* + * ec4f118ca2 Merge pull request `#38539`_ from twangboy/dsc_int_checks - - **PR** `#38212`_: (*disaster123*) ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog) - | refs: `#38373`_ - * f6d1b55 Merge pull request `#38373`_ from rallytime/`bp-38212`_ - * 52fc6da ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog) + * 5657fd1956 Add repr flag for str -- **PR** `#38374`_: (*mirceaulinic*) NAPALM proxy module: Fix optional_args key issue - @ *2016-12-20T20:34:59Z* + * aea4219502 Fix DSC LCM Config int checks - * 69c3f19 Merge pull request `#38374`_ from cloudflare/FIX-NAPALM-PROXY - * 4416931 Fix optional_args key issue +* **PR** `#38549`_: (`meaksh`_) Adding multiple SUBVOLUME support and some fixes to the Snapper module + @ *2017-01-04 15:32:30 UTC* -- **PR** `#38073`_: (*ezh*) 2016.11 - @ *2016-12-20T14:51:11Z* + * 53449c89a5 Merge pull request `#38549`_ from meaksh/2016.11-snapper-multiple-subvolumen-support - - **ISSUE** `#38048`_: (*ezh*) [2016.11.0] Salt-cloud throws TypeError exception - | refs: `#38073`_ - * 530f495 Merge pull request `#38073`_ from doublescoring/2016.11 - * 42d3d26 [38073] Fix test assertion + * ef26e93bb7 Some fixes and pylint - * 9b37ead Fix broken os.write without string.encode + * 1e6ba45db4 Fixes pre/post snapshot order to get the inverse status -- **PR** `#38344`_: (*bbinet*) Fix influxdb_database.present state - @ *2016-12-20T13:57:45Z* + * 68d5475c1f Fixing Snapper unit tests for SUBVOLUME support - * 67908d5 Merge pull request `#38344`_ from bbinet/fix-influx-createdb - * c6b075d Fix influxdb_database.present state + * e9919a913f Removing posible double '/' from the file paths -- **PR** `#38358`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-12-20T00:11:48Z* + * 8b4f87f226 Updating and fixing the documentation - - **ISSUE** `#12788`_: (*whiteinge*) Comb through docs to replace :doc: roles with :ref: - | refs: `#38320`_ - - **PR** `#38320`_: (*rallytime*) Cleanup doc internal markup references - - **PR** `#38312`_: (*cro*) Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy - - **PR** `#38288`_: (*terminalmage*) archive.extracted: don't try to cache local sources (2016.3 branch) - * 04d6898 Merge pull request `#38358`_ from rallytime/merge-2016.11 - * c6e191a Remove doc markup references from 2016.11 branch + * edea45272a Raises "CommandExecutionError" if snapper command fails - * 5130589 Merge branch '2016.3' into '2016.11' + * 3841e1143b Only include diff in the state response if `include_diff` is True - * 09d9cff Merge pull request `#38288`_ from terminalmage/archive-extracted-local-source-2016.3 + * 7803e7716c Adds multiple SUBVOLUME support to the Snapper module - * 845e3d0 Update tests to reflect change in cache behavior + * **PR** `#38545`_: (`rallytime`_) Move boto_vpc.describe_route_table deprecation version to Oxygen - * 5a08d7c archive.extracted: don't try to cache local sources (2016.3 branch) +* **PR** `#38471`_: (`twangboy`_) Fix Problem with win_service module + @ *2017-01-01 20:30:21 UTC* - * bf37667 Merge pull request `#38312`_ from cro/proxy_config_in_cfg + * 5e80104a70 Merge pull request `#38471`_ from twangboy/fix_win_service - * 2006c40 Typo + * 810471b9cd Fix problem with some services getting access denied - * 689d95b Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy. +* **ISSUE** `#38485`_: (`wasabi222`_) bgp.config not working (refs: `#38499`_) - * c83db5a Merge pull request `#38320`_ from rallytime/cleanup-doc-refs +* **PR** `#38499`_: (`mirceaulinic`_) Fix `#38485`_ (refs: `#38577`_) + @ *2017-01-01 17:42:15 UTC* - * 62978cb Don't check the doc/conf.py file for doc markup refs + * 0a09049a2d Merge pull request `#38499`_ from cloudflare/FIX-38485 - * 770e732 Add a unit test to search for new doc markup refs + * 18018139f3 Fix `#38485`_ - * 5c42a36 Remove ":doc:" references from all doc/topics/installation/* files +* **PR** `#38501`_: (`mvdwalle`_) Do not assume every object is a server + @ *2017-01-01 17:37:57 UTC* - * 23bce1c Remove ":doc:" references from all doc/topics/releases/* files + * 13f0b809df Merge pull request `#38501`_ from mvdwalle/fix-gogrid-list-password - * 4aafa41 Remove ":doc:" references from a bunch of doc/* files + * bd7dee9a10 Do not assume every object is a server - * 02bfe79 Remove more ":doc:" references from doc/* files +* **PR** `#38461`_: (`anlutro`_) Improvements/fixes to kapacitor task change detection + @ *2016-12-29 17:08:47 UTC* - * 6e32267 Remove ":doc:" references in salt/* files + * aa0c843553 Merge pull request `#38461`_ from alprs/fix-kapacitor_changes -* 79231a5 archive.extracted: don't try to cache local sources (`#38285`_) + * 52721e97d6 clean up and fix tests - - **PR** `#38285`_: (*terminalmage*) archive.extracted: don't try to cache local sources + * 8648775c2a if task is not defined, it's not up to date -- **PR** `#37947`_: (*vutny*) Fix `salt-minion` initscript for RHEL5 (SysV) to pick up proper python version - @ *2016-12-19T21:03:50Z* + * c3ab954c6e improvements/fixes to kapacitor task change detection - * 1341494 Merge pull request `#37947`_ from vutny/fix-rhel5-minion-init - * c94e798 SysV init script for rpm: get and show unique PIDs only +* **PR** `#38473`_: (`twangboy`_) Change OSX/OS X to macOS where possible + @ *2016-12-29 16:35:11 UTC* - * 8ff68c4 Fix initscript for RHEL5 (SysV) to pick up proper python version + * 2c51eb9d16 Merge pull request `#38473`_ from twangboy/osx_to_macos -- **PR** `#38106`_: (*techhat*) "test" is not necessarily in opts, for thorium - @ *2016-12-19T14:40:32Z* + * e96bfe8fa2 Change OSX/OS X to macOS where possible - * 4d072ca Merge pull request `#38106`_ from techhat/stateget - * 5edc16f "test" is not necessarily in opts, for thorium +* **PR** `#38412`_: (`bbinet`_) Update PillarStack stack.py to latest upstream version + @ *2016-12-28 19:28:40 UTC* -- **PR** `#38333`_: (*amendlik*) Suppress errors when checking if an alternative exists - @ *2016-12-19T13:40:49Z* + * 2497fb547e Merge pull request `#38412`_ from bbinet/pillarstack-updates - * a01fade Merge pull request `#38333`_ from amendlik/states-alternatives - * 8bfcd5b Adjust alternatives test for updated error message + * b66b4bd060 Fix lint violations in stack.py - * 09dee3c Suppress errors when checking if an alternative exists + * 6a30fe6aeb Update PillarStack stack.py to latest upstream version -- **PR** `#38340`_: (*ewapptus*) Backport PR `#38251`_: Fixed nested orchestrate not respecting failures - @ *2016-12-19T13:31:16Z* +* **PR** `#38456`_: (`twangboy`_) Gate Windows Specific Salt Utils + @ *2016-12-28 18:44:33 UTC* - - **PR** `#38251`_: (*ewapptus*) Fixed nested orchestrate not respecting failures - | refs: `#38340`_ - * 15d3b47 Merge pull request `#38340`_ from ewapptus/`bp-38251`_ - * 266e0a4 Fixed nested orchestrate not respecting failures + * 5395d3210a Merge pull request `#38456`_ from twangboy/gate_win_utils -- **PR** `#38229`_: (*mcalmer*) provide kwargs of sls_build to dockerng.create - @ *2016-12-18T13:13:10Z* + * d34d110a84 Fix lint, fix boto module - * ecd441d Merge pull request `#38229`_ from mcalmer/dockerng-sls_build-kwargs - * e7292fa make it explicit that we want to delete these keys + * c20111142f Gate Windows Utils - * 4c71013 use default values for pop() to prevent KeyError raised +* **PR** `#38428`_: (`gqgunhed`_) fixed typo: lq command-line syntax + @ *2016-12-27 15:42:02 UTC* - * 455c183 provide kwargs to dockerng.create to provide all features to sls_build as well + * 7c7799162b Merge pull request `#38428`_ from gqgunhed/fix_lq_typo -- **PR** `#38309`_: (*ewapptus*) Backport PR `#37333`_: Fixed state.salt.runner() reporting success on exceptions - @ *2016-12-18T12:39:53Z* + * d79d682e8b fixed typo: lq command-line syntax - - **ISSUE** `#36204`_: (*sv852*) Salt-Cloud: salt.runners.cloud.create exits with True on Python process (ec2.py) exception - | refs: `#37333`_ - - **PR** `#37333`_: (*benediktwerner*) Fixed state.salt.runner() reporting success on exceptions - | refs: `#38309`_ - * d2ce9c3 Merge pull request `#38309`_ from ewapptus/`bp-37333`_ - * a2b1259 Fixed display of errors +* **ISSUE** `#38443`_: (`lorengordon`_) 2016.11 breaks file.managed on Windows (refs: `#38444`_) - * 14a39f9 Fixed state.salt.runner return value on exceptions +* **ISSUE** `#34101`_: (`windoverwater`_) archive.extracted breakage due to 2016.3.0 upgrade from 2015.8.10 (refs: `#37368`_) -- **PR** `#38323`_: (*rallytime*) Update the Cloud Provider Specifics links in cloud docs - @ *2016-12-18T12:30:49Z* +* **PR** `#38444`_: (`lorengordon`_) Adds new import required for `extract_hash` + @ *2016-12-27 15:37:20 UTC* - * ebb9f6c Merge pull request `#38323`_ from rallytime/update-cloud-provider-links - * 022caf2 Update the Cloud Provider Specifics links in cloud docs + * **PR** `#37368`_: (`terminalmage`_) Overhaul archive.extracted state (refs: `#38444`_) -- **PR** `#38324`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-12-18T12:30:26Z* + * f5984d0f81 Merge pull request `#38444`_ from lorengordon/issue-38443 - - **ISSUE** `#38290`_: (*dragon788*) Need to use machine automation friendly output - | refs: `#38313`_ - - **ISSUE** `#38174`_: (*NickDubelman*) [syndic] Why can't a syndic node signal when all of it's minions have returned? - | refs: `#38279`_ - - **ISSUE** `#32400`_: (*rallytime*) Document Default Config Values - | refs: `#38279`_ - - **PR** `#38313`_: (*dragon788*) 2016.3 chocolatey fix - - **PR** `#38281`_: (*mikejford*) Add nick to args for create_multi - - **PR** `#38279`_: (*rallytime*) Add docs for syndic_wait setting - * 5bd7471 Merge pull request `#38324`_ from rallytime/merge-2016.11 - * 5940db5 Merge branch '2016.3' into '2016.11' + * b2925ad7b7 Adds new import required for `extract_hash` - * 6367ca7 Add nick to args for create_multi (`#38281`_) +* **ISSUE** `#38071`_: (`luochun-95`_) remote execute is very slow (refs: `#38167`_) - * 235682b Merge pull request `#38313`_ from dragon788/2016.3-chocolatey-fix +* **PR** `#38167`_: (`cachedout`_) Kill pkg_resources for CLI tools [DO NOT MERGE] + @ *2016-12-22 22:11:22 UTC* - * 1f5fc17 Use machine readable output for list + * 4c4f07ca4c Merge pull request `#38167`_ from cachedout/no_pkg_resources - * cdbd2fb Added limit-output to eliminate false packages + * ec6901720a Remove debugging - * 9e78ddc Merge pull request `#38279`_ from rallytime/`fix-38174`_ + * f28e33b9b6 Remove from all but salt cli - * 4a62d01 Add docs for syndic_wait setting + * bb3af72317 Remove from salt-call -- **PR** `#38325`_: (*rallytime*) Back-port `#38247`_ to 2016.11 - @ *2016-12-18T12:28:41Z* + * c676846066 Kill pkg_resources for CLI tools - - **ISSUE** `#38246`_: (*martintamare*) Windows Minion unable to start via nssm - | refs: `#38247`_ - - **PR** `#38247`_: (*martintamare*) fix(win_function): handle other language - | refs: `#38325`_ - * 83523d2 Merge pull request `#38325`_ from rallytime/`bp-38247`_ - * 4b6c543 fix(win_functions): syntax +* **PR** `#38417`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-12-22 19:00:44 UTC* - * e602f17 fix(win_function): handle other language + * 2fc8c154af Merge pull request `#38417`_ from rallytime/merge-2016.11 -- **PR** `#38326`_: (*yopito*) fix runit init support (grain init) in 2016.11 - @ *2016-12-18T12:07:25Z* + * efb8a8ddf5 Merge branch '2016.3' into '2016.11' - - **ISSUE** `#30195`_: (*Vaelatern*) Add Void Linux support in Salt - | refs: `#38326`_ `#31262`_ - - **PR** `#31262`_: (*Vaelatern*) Add support for Void Linux - | refs: `#38326`_ - * 54a2bb9 Merge pull request `#38326`_ from yopito/fix-runit-init-support - * 25b91bb fix detection of runit as init system (grain init) + * 27253522c8 Improve pillar documentation (`#38407`_) -* 9e35f5d Add azurearm module to doc index (`#38322`_) + * 423b1fddff Merge pull request `#38398`_ from terminalmage/issue38372 - - **PR** `#38322`_: (*rallytime*) Add azurearm module to doc index + * c80dbaa914 Fix call to file.get_managed in cron.file state -- **PR** `#38305`_: (*dereckson*) Avoid normalization call for normalized mode value - @ *2016-12-16T17:31:25Z* + * 5a33d1e697 Fix http.query when result has no text (`#38382`_) - * 1e4f299 Merge pull request `#38305`_ from dereckson/fix-mode-extraneous-normalization - * 573ac35 Avoid normalization call for normalized mode value + * b74b5c7d38 Merge pull request `#38390`_ from meaksh/2016.3-fix-try-restart-for-autorestarting-on-SUSE-systems -* 05e423a Improve documentation for archive.extracted in 2016.11 (`#38291`_) + * de6ec05ec0 add try-restart to fix autorestarting on SUSE systems - - **PR** `#38291`_: (*terminalmage*) Improve documentation for archive.extracted in 2016.11 + * 2c3a39760a Merge pull request `#38221`_ from UtahDave/fix_default_returner -- **PR** `#38298`_: (*rallytime*) Back-port `#37967`_ to 2016.11 - @ *2016-12-16T15:20:04Z* + * 385640765b remove a blank line to satisfy linter - - **ISSUE** `#37966`_: (*Cybolic*) salt-cloud EC2 instance can't be initiated - | refs: `#37967`_ - - **PR** `#37967`_: (*Cybolic*) Fixed faulty logic preventing instance initialisation. - | refs: `#38298`_ - * 3cf0135 Merge pull request `#38298`_ from rallytime/`bp-37967`_ - * 42d367f Fixed faulty logic preventing instance initialisation. + * 9c248aa14c validate return opt, remove default. -- **PR** `#38076`_: (*ezh*) Fix decoding of broken string from remote sources - @ *2016-12-15T19:05:25Z* + * 8bb37f9fe7 specify allowed types and default for "returner" - - **ISSUE** `#38070`_: (*ezh*) [2016.11.0] Salt-cloud throws UnicodeDecodeError exception - | refs: `#38076`_ `#38076`_ - - **ISSUE** `#2016`_: (*seanchannel*) status.custom failing on any arguments - * f4f0036 Merge pull request `#38076`_ from doublescoring/`fix-2016`_.11-38070 - * 70c8db5 Fix decoding of broken string from remote sources + * 11863a4bfe add examples of default minion returners -- **PR** `#38278`_: (*rallytime*) Back-port `#38207`_ to 2016.11 - @ *2016-12-15T18:09:27Z* + * e7c6012655 add support for default returners using `return` - - **PR** `#38207`_: (*tsaridas*) remove empty strings from list but not ones with one empty space char - | refs: `#38278`_ - - **PR** `#38188`_: (*tsaridas*) fix for push_dir in different OS - | refs: `#38203`_ `#38207`_ `#38207`_ - * 2ccab22 Merge pull request `#38278`_ from rallytime/`bp-38207`_ - * 5e8bf57 python3 compatibility and fix pylint +* **PR** `#38342`_: (`scthi`_) Bugfix ext pillar nodegroups + @ *2016-12-22 16:47:42 UTC* - * e0df047 remove empty strings from list but not ones with one empty space char + * bbc149c67f Merge pull request `#38342`_ from scthi/bugfix-ext-pillar-nodegroups -- **PR** `#38277`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-12-15T18:09:10Z* + * dba315c4b6 ext-pillar nodegroups works for all minions now. - - **PR** `#38256`_: (*rallytime*) [2016.3] Bump latest release version to 2016.11.1 - - **PR** `#38254`_: (*terminalmage*) Also check if pillarenv is in opts - - **PR** `#38248`_: (*meaksh*) Successfully exit of salt-api child processes when SIGTERM is received - * a748e84 Merge pull request `#38277`_ from rallytime/merge-2016.11 - * 49a3355 Merge branch '2016.3' into '2016.11' +* **PR** `#38403`_: (`terminalmage`_) git_pillar: Document the transition from env to saltenv in the jinja context + @ *2016-12-22 16:34:48 UTC* - * fc9e1df Merge pull request `#38248`_ from meaksh/salt-api-successfully-close-child-processes + * 453476d982 Merge pull request `#38403`_ from terminalmage/document-saltenv - * ee6eae9 Successfully exit of salt-api child processes when SIGTERM. + * 0a72e0f0be git_pillar: Document the transition from env to saltenv in the jinja context - * 3c718ed Merge pull request `#38254`_ from terminalmage/check-pillarenv +* **ISSUE** `#38253`_: (`gmacon`_) There was no error installing package 'setuptools' although it does not show when calling 'pip.freeze'. (refs: `#38354`_) - * fa9ad31 Also check if pillarenv is in opts +* **PR** `#38354`_: (`gmacon`_) Use --all when calling pip.py + @ *2016-12-20 20:40:21 UTC* - * 6b9060c [2016.3] Bump latest release version to 2016.11.1 (`#38256`_) + * 12436efb54 Merge pull request `#38354`_ from gmacon/pip-freeze-all -- **PR** `#38232`_: (*rallytime*) Strip final 'e' in key cmd to correct "deleteed" misspelling - @ *2016-12-15T10:38:49Z* + * dca24b270e Use --all when calling pip.py - - **ISSUE** `#38231`_: (*tjuup*) Typo: salt-key deleteed - | refs: `#38232`_ - * 0af343e Merge pull request `#38232`_ from rallytime/`fix-38231`_ - * 26e1ee3 Strip final 'e' in key cmd to correct "deleteed" misspelling +* **PR** `#38348`_: (`rallytime`_) Update autodoc topics for new modules added in 2016.11 + @ *2016-12-20 20:36:20 UTC* -- **PR** `#38236`_: (*gtmanfred*) SELINUXTYPE should not be changed - @ *2016-12-15T10:37:06Z* + * 68430b1fa6 Merge pull request `#38348`_ from rallytime/mod-docs-2016.11 - - **ISSUE** `#38200`_: (*sebw*) selinux.mode doesn't return any output and doesn't persist - | refs: `#38236`_ - * 6c1ca9d Merge pull request `#38236`_ from gtmanfred/2016.11 - * d1b070c clean up selinux unit test + * b31c2412ca Add __iter__ and next options to doc/conf.py - * 96eabd4 SELINUXTYPE should not be changed + * b8c16094c4 Revert "Move import/error messaging logic for snapper module into __virtual__()" -- **PR** `#38262`_: (*terminalmage*) Fix archive.extracted when --strip or --strip-components is in the options - @ *2016-12-15T08:57:18Z* + * 640db5b5ac Move import/error messaging logic for snapper module into __virtual__() - - **ISSUE** `#38228`_: (*vquiering*) archive.extracted with options and user/group - | refs: `#38262`_ - * fd32dc3 Merge pull request `#38262`_ from terminalmage/issue38228 - * 6442f8a Add tests for --strip/--strip-components + * 366271f459 Add snapper to state index doc module list - * c502e68 Detect --strip/--strip-components in tar options and handle properly + * 135d254c80 Remove netapi autodoc files: they should not be added as their doc structure is different - * e957705 Add strip_components arg to archive.list + * 0006139aca Update autodoc topics for new modules added in 2016.11 -- **PR** `#38264`_: (*mirceaulinic*) Port `#37862`_ into 2016.11 - @ *2016-12-15T08:51:20Z* +* **PR** `#38377`_: (`DmitryKuzmenko`_) Implementation and docs for Consul key-value store plugin for minion data cache. + @ *2016-12-20 20:36:02 UTC* - - **PR** `#37862`_: (*mirceaulinic*) [2016.11.1] Docstring fixes and new features for napalm_network - | refs: `#38264`_ - * b232bd8 Merge pull request `#38264`_ from cloudflare/PORT-37862 - * 28bbb73 Import from napalm_base instead of napalm + * 6ee7b2bae7 Merge pull request `#38377`_ from DSRCorporation/features/consul_cache - * 0a675af Vice-versa docstring + * 6fb4430ae3 Configuration options and documentation for Consul data cache plugin. - * 09c5017 More docfix + * dad748f57a Data cache plugin configuration documentation. - * 215b8f3 Lint cleanup + * c7209cd90c Consul data cache plugin. -* 56a8fa3 Add 2016.11.2 release notes (`#38260`_) +* **PR** `#38373`_: (`rallytime`_) Back-port `#38212`_ to 2016.11 + @ *2016-12-20 20:35:09 UTC* - - **PR** `#38260`_: (*rallytime*) Add 2016.11.2 release notes + * **PR** `#38212`_: (`disaster123`_) ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog) (refs: `#38373`_) -* 702d462 [2016.11] Bump latest release version to 2016.11.1 (`#38257`_) + * f6d1b559bc Merge pull request `#38373`_ from rallytime/bp-38212 - - **PR** `#38257`_: (*rallytime*) [2016.11] Bump latest release version to 2016.11.1 + * 52fc6daac0 ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog) -* 82b1b77 Correct an inaccurate warning when top_file_merging_strategy == merge_all (`#38233`_) +* **PR** `#38374`_: (`mirceaulinic`_) NAPALM proxy module: Fix optional_args key issue + @ *2016-12-20 20:34:59 UTC* - - **PR** `#38233`_: (*terminalmage*) Correct an inaccurate warning when top_file_merging_strategy == merge_all + * 69c3f19fc1 Merge pull request `#38374`_ from cloudflare/FIX-NAPALM-PROXY -- **PR** `#38234`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-12-13T18:28:02Z* + * 44169315d8 Fix optional_args key issue - - **PR** `#38224`_: (*whiteinge*) Allow CORS OPTIONS requests to be unauthenticated - - **PR** `#38223`_: (*whiteinge*) Add root_dir to salt-api file paths - - **PR** `#38213`_: (*rallytime*) Skip test_cert_info tls unit test on pyOpenSSL upstream errors - - **PR** `#38198`_: (*vutny*) Add missing requirements for running unit tests: libcloud and boto3 - - **PR** `#37272`_: (*vutny*) Get default logging level and log file from default opts dict - | refs: `#38223`_ - * ba62fcf Merge pull request `#38234`_ from rallytime/merge-2016.11 - * 6a327d1 Merge branch '2016.3' into '2016.11' +* **ISSUE** `#38048`_: (`ezh`_) [2016.11.0] Salt-cloud throws TypeError exception (refs: `#38073`_) - * 004e46a Merge pull request `#38198`_ from vutny/unit-tests-require-libcloud-boto3 +* **PR** `#38073`_: (`ezh`_) 2016.11 + @ *2016-12-20 14:51:11 UTC* - * a6098ba Remove note about SaltTesting installation, now it is in the requirements + * 530f495955 Merge pull request `#38073`_ from doublescoring/2016.11 - * 004bff1 Add missing requirements for running unit tests: libcloud and boto3 + * 42d3d26f28 [38073] Fix test assertion - * 9d497bc Merge pull request `#38213`_ from rallytime/skip-tls-test + * 9b37ead913 Fix broken os.write without string.encode - * bdb807f Skip test_cert_info tls unit test on pyOpenSSL upstream errors +* **PR** `#38344`_: (`bbinet`_) Fix influxdb_database.present state + @ *2016-12-20 13:57:45 UTC* - * 203109d Merge pull request `#38224`_ from whiteinge/cors-options-unauthed + * 67908d5aba Merge pull request `#38344`_ from bbinet/fix-influx-createdb - * de4d322 Allow CORS OPTIONS requests to be unauthenticated + * c6b075d6f4 Fix influxdb_database.present state - * 721a5fe Merge pull request `#38223`_ from whiteinge/salt-api-root_dirs +* **PR** `#38358`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-12-20 00:11:48 UTC* - * bfbf390 Add root_dir to salt-api file paths + * 04d6898958 Merge pull request `#38358`_ from rallytime/merge-2016.11 -- **PR** `#38205`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2016-12-12T18:13:18Z* + * c6e191ad0d Remove doc markup references from 2016.11 branch - - **ISSUE** `#38162`_: (*747project*) git_pillar does not detect changes to remote repository when told to update - | refs: `#38191`_ - - **PR** `#38194`_: (*vutny*) Document the requirements for running ZeroMQ-based integration tests - - **PR** `#38191`_: (*terminalmage*) Clarify the fact that git_pillar.update does not fast-forward - - **PR** `#38185`_: (*rallytime*) Back-port `#38181`_ to 2016.3 - - **PR** `#38181`_: (*rallytime*) Reset socket default timeout to None (fixes daemons_tests failures) - | refs: `#38185`_ - * 7ead1ed Merge pull request `#38205`_ from rallytime/merge-2016.11 - * e31f97c Merge branch '2016.3' into '2016.11' + * 513058945c Merge branch '2016.3' into '2016.11' - * 70f7d22 Merge pull request `#38191`_ from terminalmage/issue38162 + * 09d9cff992 Merge pull request `#38288`_ from terminalmage/archive-extracted-local-source-2016.3 - * 1ae543a Clarify the fact that git_pillar.update does not fast-forward + * 845e3d0e75 Update tests to reflect change in cache behavior - * 28171cb Merge pull request `#38194`_ from vutny/integration-test-requirements-doc + * 5a08d7c70a archive.extracted: don't try to cache local sources (2016.3 branch) - * e9f419f Document the requirements for running ZeroMQ-based integration tests + * bf37667f8a Merge pull request `#38312`_ from cro/proxy_config_in_cfg - * a4ef037 Merge pull request `#38185`_ from rallytime/`bp-38181`_ + * 2006c4000e Typo - * 609f814 Reset socket default timeout to None (fixes daemons_tests failures) + * 689d95b10f Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy. -- **PR** `#38203`_: (*rallytime*) Back-port `#38188`_ to 2016.11 - @ *2016-12-12T17:48:51Z* + * c83db5a785 Merge pull request `#38320`_ from rallytime/cleanup-doc-refs - - **PR** `#38188`_: (*tsaridas*) fix for push_dir in different OS - | refs: `#38203`_ `#38207`_ `#38207`_ - * 669409d Merge pull request `#38203`_ from rallytime/`bp-38188`_ - * 50d3200 removing not needed join + * 62978cb7a0 Don't check the doc/conf.py file for doc markup refs - * 7af708e fix for push_dir in different OS + * 770e732d76 Add a unit test to search for new doc markup refs + * 5c42a361a0 Remove ":doc:" references from all doc/topics/installation/* files + + * 23bce1c929 Remove ":doc:" references from all doc/topics/releases/* files + + * 4aafa41d22 Remove ":doc:" references from a bunch of doc/* files + + * 02bfe7912c Remove more ":doc:" references from doc/* files + + * 6e32267d0c Remove ":doc:" references in salt/* files + + * **PR** `#38285`_: (`terminalmage`_) archive.extracted: don't try to cache local sources + +* **PR** `#37947`_: (`vutny`_) Fix `salt-minion` initscript for RHEL5 (SysV) to pick up proper python version + @ *2016-12-19 21:03:50 UTC* + + * 13414949e3 Merge pull request `#37947`_ from vutny/fix-rhel5-minion-init + + * c94e798b8a SysV init script for rpm: get and show unique PIDs only + + * 8ff68c4128 Fix initscript for RHEL5 (SysV) to pick up proper python version + +* **PR** `#38106`_: (`techhat`_) "test" is not necessarily in opts, for thorium + @ *2016-12-19 14:40:32 UTC* + + * 4d072ca689 Merge pull request `#38106`_ from techhat/stateget + + * 5edc16f606 "test" is not necessarily in opts, for thorium + +* **PR** `#38333`_: (`amendlik`_) Suppress errors when checking if an alternative exists + @ *2016-12-19 13:40:49 UTC* + + * a01fade604 Merge pull request `#38333`_ from amendlik/states-alternatives + + * 8bfcd5bcd5 Adjust alternatives test for updated error message + + * 09dee3c611 Suppress errors when checking if an alternative exists + +* **PR** `#38340`_: (`ewapptus`_) Backport PR `#38251`_: Fixed nested orchestrate not respecting failures + @ *2016-12-19 13:31:16 UTC* + + * **PR** `#38251`_: (`ewapptus`_) Fixed nested orchestrate not respecting failures (refs: `#38340`_) + + * 15d3b476e9 Merge pull request `#38340`_ from ewapptus/bp-38251 + + * 266e0a465c Fixed nested orchestrate not respecting failures + +* **PR** `#38229`_: (`mcalmer`_) provide kwargs of sls_build to dockerng.create + @ *2016-12-18 13:13:10 UTC* + + * ecd441d090 Merge pull request `#38229`_ from mcalmer/dockerng-sls_build-kwargs + + * e7292fabb7 make it explicit that we want to delete these keys + + * 4c710139b5 use default values for pop() to prevent KeyError raised + + * 455c18325c provide kwargs to dockerng.create to provide all features to sls_build as well + +* **ISSUE** `#36204`_: (`stanvarlamov`_) Salt-Cloud: salt.runners.cloud.create exits with True on Python process (ec2.py) exception (refs: `#37333`_) + +* **PR** `#38309`_: (`ewapptus`_) Backport PR `#37333`_: Fixed state.salt.runner() reporting success on exceptions + @ *2016-12-18 12:39:53 UTC* + + * **PR** `#37333`_: (`benediktwerner`_) Fixed state.salt.runner() reporting success on exceptions (refs: `#38309`_) + + * d2ce9c3e71 Merge pull request `#38309`_ from ewapptus/bp-37333 + + * a2b1259671 Fixed display of errors + + * 14a39f914e Fixed state.salt.runner return value on exceptions + +* **PR** `#38323`_: (`rallytime`_) Update the Cloud Provider Specifics links in cloud docs + @ *2016-12-18 12:30:49 UTC* + + * ebb9f6cbbc Merge pull request `#38323`_ from rallytime/update-cloud-provider-links + + * 022caf23e9 Update the Cloud Provider Specifics links in cloud docs + +* **PR** `#38324`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-12-18 12:30:26 UTC* + + * 5bd7471e30 Merge pull request `#38324`_ from rallytime/merge-2016.11 + + * 5940db5b3f Merge branch '2016.3' into '2016.11' + + * 6367ca7d2a Add nick to args for create_multi (`#38281`_) + + * 235682b1e6 Merge pull request `#38313`_ from dragon788/2016.3-chocolatey-fix + + * 1f5fc17551 Use machine readable output for list + + * cdbd2fbe3c Added limit-output to eliminate false packages + + * 9e78ddc80e Merge pull request `#38279`_ from rallytime/fix-38174 + + * 4a62d01577 Add docs for syndic_wait setting + +* **ISSUE** `#38246`_: (`martintamare`_) Windows Minion unable to start via nssm (refs: `#38247`_) + +* **PR** `#38325`_: (`rallytime`_) Back-port `#38247`_ to 2016.11 + @ *2016-12-18 12:28:41 UTC* + + * **PR** `#38247`_: (`martintamare`_) fix(win_function): handle other language (refs: `#38325`_) + + * 83523d2f73 Merge pull request `#38325`_ from rallytime/bp-38247 + + * 4b6c5438e3 fix(win_functions): syntax + + * e602f17e3d fix(win_function): handle other language + +* **ISSUE** `#30195`_: (`Vaelatern`_) Add Void Linux support in Salt (refs: `#31262`_, `#38326`_) + +* **PR** `#38326`_: (`yopito`_) fix runit init support (grain init) in 2016.11 + @ *2016-12-18 12:07:25 UTC* + + * **PR** `#31262`_: (`Vaelatern`_) Add support for Void Linux (refs: `#38326`_) + + * 54a2bb95de Merge pull request `#38326`_ from yopito/fix-runit-init-support + + * 25b91bb686 fix detection of runit as init system (grain init) + + * **PR** `#38322`_: (`rallytime`_) Add azurearm module to doc index + +* **PR** `#38305`_: (`dereckson`_) Avoid normalization call for normalized mode value + @ *2016-12-16 17:31:25 UTC* + + * 1e4f299e7d Merge pull request `#38305`_ from dereckson/fix-mode-extraneous-normalization + + * 573ac3565e Avoid normalization call for normalized mode value + + * **PR** `#38291`_: (`terminalmage`_) Improve documentation for archive.extracted in 2016.11 + +* **ISSUE** `#37966`_: (`Cybolic`_) salt-cloud EC2 instance can't be initiated (refs: `#37967`_) + +* **PR** `#38298`_: (`rallytime`_) Back-port `#37967`_ to 2016.11 + @ *2016-12-16 15:20:04 UTC* + + * **PR** `#37967`_: (`Cybolic`_) Fixed faulty logic preventing instance initialisation. (refs: `#38298`_) + + * 3cf0135d50 Merge pull request `#38298`_ from rallytime/bp-37967 + + * 42d367f39d Fixed faulty logic preventing instance initialisation. + +* **ISSUE** `#38070`_: (`ezh`_) [2016.11.0] Salt-cloud throws UnicodeDecodeError exception (refs: `#38076`_) + +* **PR** `#38076`_: (`ezh`_) Fix decoding of broken string from remote sources + @ *2016-12-15 19:05:25 UTC* + + * f4f0036f30 Merge pull request `#38076`_ from doublescoring/fix-2016.11-38070 + + * 70c8db5489 Fix decoding of broken string from remote sources + +* **PR** `#38278`_: (`rallytime`_) Back-port `#38207`_ to 2016.11 + @ *2016-12-15 18:09:27 UTC* + + * **PR** `#38207`_: (`tsaridas`_) remove empty strings from list but not ones with one empty space char (refs: `#38278`_) + + * **PR** `#38188`_: (`tsaridas`_) fix for push_dir in different OS (refs: `#38203`_, `#38207`_) + + * 2ccab22c19 Merge pull request `#38278`_ from rallytime/bp-38207 + + * 5e8bf571d8 python3 compatibility and fix pylint + + * e0df047000 remove empty strings from list but not ones with one empty space char + +* **PR** `#38277`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-12-15 18:09:10 UTC* + + * a748e842a8 Merge pull request `#38277`_ from rallytime/merge-2016.11 + + * 49a3355915 Merge branch '2016.3' into '2016.11' + + * fc9e1dff35 Merge pull request `#38248`_ from meaksh/salt-api-successfully-close-child-processes + + * ee6eae9855 Successfully exit of salt-api child processes when SIGTERM. + + * 3c718ed35e Merge pull request `#38254`_ from terminalmage/check-pillarenv + + * fa9ad311c6 Also check if pillarenv is in opts + + * 6b9060c38f [2016.3] Bump latest release version to 2016.11.1 (`#38256`_) + +* **ISSUE** `#38231`_: (`tjuup`_) Typo: salt-key deleteed (refs: `#38232`_) + +* **PR** `#38232`_: (`rallytime`_) Strip final 'e' in key cmd to correct "deleteed" misspelling + @ *2016-12-15 10:38:49 UTC* + + * 0af343e71f Merge pull request `#38232`_ from rallytime/fix-38231 + + * 26e1ee3650 Strip final 'e' in key cmd to correct "deleteed" misspelling + +* **ISSUE** `#38200`_: (`sebw`_) selinux.mode doesn't return any output and doesn't persist (refs: `#38236`_) + +* **PR** `#38236`_: (`gtmanfred`_) SELINUXTYPE should not be changed + @ *2016-12-15 10:37:06 UTC* + + * 6c1ca9dae7 Merge pull request `#38236`_ from gtmanfred/2016.11 + + * d1b070c894 clean up selinux unit test + + * 96eabd4939 SELINUXTYPE should not be changed + +* **ISSUE** `#38228`_: (`vquiering`_) archive.extracted with options and user/group (refs: `#38262`_) + +* **PR** `#38262`_: (`terminalmage`_) Fix archive.extracted when --strip or --strip-components is in the options + @ *2016-12-15 08:57:18 UTC* + + * fd32dc3e9b Merge pull request `#38262`_ from terminalmage/issue38228 + + * 6442f8a7b5 Add tests for --strip/--strip-components + + * c502e68f12 Detect --strip/--strip-components in tar options and handle properly + + * e95770594d Add strip_components arg to archive.list + +* **PR** `#38264`_: (`mirceaulinic`_) Port `#37862`_ into 2016.11 + @ *2016-12-15 08:51:20 UTC* + + * **PR** `#37862`_: (`mirceaulinic`_) [2016.11.1] Docstring fixes and new features for napalm_network (refs: `#38264`_) + + * b232bd8ce8 Merge pull request `#38264`_ from cloudflare/PORT-37862 + + * 28bbb73151 Import from napalm_base instead of napalm + + * 0a675afc40 Vice-versa docstring + + * 09c50176e2 More docfix + + * 215b8f38e2 Lint cleanup + + * **PR** `#38260`_: (`rallytime`_) Add 2016.11.2 release notes + + * **PR** `#38257`_: (`rallytime`_) [2016.11] Bump latest release version to 2016.11.1 + + * **PR** `#38233`_: (`terminalmage`_) Correct an inaccurate warning when top_file_merging_strategy == merge_all + +* **PR** `#38234`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-12-13 18:28:02 UTC* + + * ba62fcf2ec Merge pull request `#38234`_ from rallytime/merge-2016.11 + + * 6a327d1367 Merge branch '2016.3' into '2016.11' + + * 004e46afe7 Merge pull request `#38198`_ from vutny/unit-tests-require-libcloud-boto3 + + * a6098bac1a Remove note about SaltTesting installation, now it is in the requirements + + * 004bff113e Add missing requirements for running unit tests: libcloud and boto3 + + * 9d497bc74c Merge pull request `#38213`_ from rallytime/skip-tls-test + + * bdb807fc7c Skip test_cert_info tls unit test on pyOpenSSL upstream errors + + * 203109dd17 Merge pull request `#38224`_ from whiteinge/cors-options-unauthed + + * de4d3227ab Allow CORS OPTIONS requests to be unauthenticated + + * 721a5feccd Merge pull request `#38223`_ from whiteinge/salt-api-root_dirs + + * bfbf390c0e Add root_dir to salt-api file paths + +* **PR** `#38205`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2016-12-12 18:13:18 UTC* + + * 7ead1ed336 Merge pull request `#38205`_ from rallytime/merge-2016.11 + + * e31f97cf71 Merge branch '2016.3' into '2016.11' + + * 70f7d22ad6 Merge pull request `#38191`_ from terminalmage/issue38162 + + * 1ae543a98a Clarify the fact that git_pillar.update does not fast-forward + + * 28171cbfc5 Merge pull request `#38194`_ from vutny/integration-test-requirements-doc + + * e9f419ff64 Document the requirements for running ZeroMQ-based integration tests + + * a4ef037ab1 Merge pull request `#38185`_ from rallytime/bp-38181 + + * 609f814454 Reset socket default timeout to None (fixes daemons_tests failures) + +* **PR** `#38203`_: (`rallytime`_) Back-port `#38188`_ to 2016.11 + @ *2016-12-12 17:48:51 UTC* + + * **PR** `#38188`_: (`tsaridas`_) fix for push_dir in different OS (refs: `#38203`_, `#38207`_) + + * 669409d681 Merge pull request `#38203`_ from rallytime/bp-38188 + + * 50d3200b12 removing not needed join + + * 7af708e1e7 fix for push_dir in different OS .. _`#10`: https://github.com/saltstack/salt/issues/10 -.. _`#12788`: https://github.com/saltstack/salt/issues/12788 .. _`#19`: https://github.com/saltstack/salt/issues/19 .. _`#20`: https://github.com/saltstack/salt/issues/20 -.. _`#2016`: https://github.com/saltstack/salt/issues/2016 -.. _`#27355`: https://github.com/saltstack/salt/issues/27355 -.. _`#29294`: https://github.com/saltstack/salt/pull/29294 .. _`#30195`: https://github.com/saltstack/salt/issues/30195 -.. _`#30454`: https://github.com/saltstack/salt/issues/30454 -.. _`#30481`: https://github.com/saltstack/salt/pull/30481 .. _`#31262`: https://github.com/saltstack/salt/pull/31262 -.. _`#32400`: https://github.com/saltstack/salt/issues/32400 -.. _`#33601`: https://github.com/saltstack/salt/pull/33601 .. _`#33932`: https://github.com/saltstack/salt/issues/33932 .. _`#33933`: https://github.com/saltstack/salt/pull/33933 .. _`#34101`: https://github.com/saltstack/salt/issues/34101 -.. _`#34504`: https://github.com/saltstack/salt/issues/34504 -.. _`#34600`: https://github.com/saltstack/salt/issues/34600 .. _`#35390`: https://github.com/saltstack/salt/pull/35390 .. _`#36148`: https://github.com/saltstack/salt/issues/36148 .. _`#36204`: https://github.com/saltstack/salt/issues/36204 -.. _`#36548`: https://github.com/saltstack/salt/issues/36548 -.. _`#36598`: https://github.com/saltstack/salt/issues/36598 .. _`#37027`: https://github.com/saltstack/salt/issues/37027 -.. _`#37272`: https://github.com/saltstack/salt/pull/37272 .. _`#37333`: https://github.com/saltstack/salt/pull/37333 .. _`#37355`: https://github.com/saltstack/salt/issues/37355 .. _`#37358`: https://github.com/saltstack/salt/pull/37358 .. _`#37368`: https://github.com/saltstack/salt/pull/37368 -.. _`#37498`: https://github.com/saltstack/salt/issues/37498 -.. _`#37684`: https://github.com/saltstack/salt/issues/37684 .. _`#37862`: https://github.com/saltstack/salt/pull/37862 .. _`#37947`: https://github.com/saltstack/salt/pull/37947 .. _`#37948`: https://github.com/saltstack/salt/issues/37948 @@ -1439,15 +1341,10 @@ Changes: .. _`#38073`: https://github.com/saltstack/salt/pull/38073 .. _`#38076`: https://github.com/saltstack/salt/pull/38076 .. _`#38081`: https://github.com/saltstack/salt/issues/38081 -.. _`#38087`: https://github.com/saltstack/salt/issues/38087 .. _`#38106`: https://github.com/saltstack/salt/pull/38106 -.. _`#38162`: https://github.com/saltstack/salt/issues/38162 .. _`#38167`: https://github.com/saltstack/salt/pull/38167 -.. _`#38174`: https://github.com/saltstack/salt/issues/38174 -.. _`#38181`: https://github.com/saltstack/salt/pull/38181 .. _`#38183`: https://github.com/saltstack/salt/pull/38183 .. _`#38185`: https://github.com/saltstack/salt/pull/38185 -.. _`#38187`: https://github.com/saltstack/salt/issues/38187 .. _`#38188`: https://github.com/saltstack/salt/pull/38188 .. _`#38191`: https://github.com/saltstack/salt/pull/38191 .. _`#38194`: https://github.com/saltstack/salt/pull/38194 @@ -1456,7 +1353,6 @@ Changes: .. _`#38203`: https://github.com/saltstack/salt/pull/38203 .. _`#38205`: https://github.com/saltstack/salt/pull/38205 .. _`#38207`: https://github.com/saltstack/salt/pull/38207 -.. _`#38209`: https://github.com/saltstack/salt/issues/38209 .. _`#38212`: https://github.com/saltstack/salt/pull/38212 .. _`#38213`: https://github.com/saltstack/salt/pull/38213 .. _`#38216`: https://github.com/saltstack/salt/issues/38216 @@ -1485,10 +1381,8 @@ Changes: .. _`#38278`: https://github.com/saltstack/salt/pull/38278 .. _`#38279`: https://github.com/saltstack/salt/pull/38279 .. _`#38281`: https://github.com/saltstack/salt/pull/38281 -.. _`#38282`: https://github.com/saltstack/salt/issues/38282 .. _`#38285`: https://github.com/saltstack/salt/pull/38285 .. _`#38288`: https://github.com/saltstack/salt/pull/38288 -.. _`#38290`: https://github.com/saltstack/salt/issues/38290 .. _`#38291`: https://github.com/saltstack/salt/pull/38291 .. _`#38298`: https://github.com/saltstack/salt/pull/38298 .. _`#38305`: https://github.com/saltstack/salt/pull/38305 @@ -1506,10 +1400,8 @@ Changes: .. _`#38342`: https://github.com/saltstack/salt/pull/38342 .. _`#38344`: https://github.com/saltstack/salt/pull/38344 .. _`#38348`: https://github.com/saltstack/salt/pull/38348 -.. _`#38353`: https://github.com/saltstack/salt/issues/38353 .. _`#38354`: https://github.com/saltstack/salt/pull/38354 .. _`#38358`: https://github.com/saltstack/salt/pull/38358 -.. _`#38372`: https://github.com/saltstack/salt/issues/38372 .. _`#38373`: https://github.com/saltstack/salt/pull/38373 .. _`#38374`: https://github.com/saltstack/salt/pull/38374 .. _`#38377`: https://github.com/saltstack/salt/pull/38377 @@ -1525,25 +1417,20 @@ Changes: .. _`#38415`: https://github.com/saltstack/salt/pull/38415 .. _`#38417`: https://github.com/saltstack/salt/pull/38417 .. _`#38419`: https://github.com/saltstack/salt/pull/38419 -.. _`#38420`: https://github.com/saltstack/salt/pull/38420 .. _`#38421`: https://github.com/saltstack/salt/pull/38421 .. _`#38428`: https://github.com/saltstack/salt/pull/38428 .. _`#38434`: https://github.com/saltstack/salt/pull/38434 -.. _`#38438`: https://github.com/saltstack/salt/issues/38438 .. _`#38443`: https://github.com/saltstack/salt/issues/38443 .. _`#38444`: https://github.com/saltstack/salt/pull/38444 -.. _`#38449`: https://github.com/saltstack/salt/issues/38449 .. _`#38456`: https://github.com/saltstack/salt/pull/38456 .. _`#38457`: https://github.com/saltstack/salt/pull/38457 .. _`#38461`: https://github.com/saltstack/salt/pull/38461 .. _`#38462`: https://github.com/saltstack/salt/issues/38462 .. _`#38467`: https://github.com/saltstack/salt/pull/38467 .. _`#38471`: https://github.com/saltstack/salt/pull/38471 -.. _`#38472`: https://github.com/saltstack/salt/issues/38472 .. _`#38473`: https://github.com/saltstack/salt/pull/38473 .. _`#38474`: https://github.com/saltstack/salt/pull/38474 .. _`#38476`: https://github.com/saltstack/salt/pull/38476 -.. _`#38479`: https://github.com/saltstack/salt/issues/38479 .. _`#38485`: https://github.com/saltstack/salt/issues/38485 .. _`#38487`: https://github.com/saltstack/salt/pull/38487 .. _`#38491`: https://github.com/saltstack/salt/pull/38491 @@ -1568,15 +1455,12 @@ Changes: .. _`#38545`: https://github.com/saltstack/salt/pull/38545 .. _`#38549`: https://github.com/saltstack/salt/pull/38549 .. _`#38554`: https://github.com/saltstack/salt/pull/38554 -.. _`#38558`: https://github.com/saltstack/salt/issues/38558 .. _`#38560`: https://github.com/saltstack/salt/pull/38560 .. _`#38562`: https://github.com/saltstack/salt/pull/38562 .. _`#38567`: https://github.com/saltstack/salt/pull/38567 .. _`#38570`: https://github.com/saltstack/salt/pull/38570 -.. _`#38572`: https://github.com/saltstack/salt/issues/38572 .. _`#38577`: https://github.com/saltstack/salt/pull/38577 .. _`#38578`: https://github.com/saltstack/salt/pull/38578 -.. _`#38579`: https://github.com/saltstack/salt/pull/38579 .. _`#38584`: https://github.com/saltstack/salt/pull/38584 .. _`#38585`: https://github.com/saltstack/salt/pull/38585 .. _`#38587`: https://github.com/saltstack/salt/pull/38587 @@ -1587,22 +1471,18 @@ Changes: .. _`#38600`: https://github.com/saltstack/salt/pull/38600 .. _`#38601`: https://github.com/saltstack/salt/pull/38601 .. _`#38602`: https://github.com/saltstack/salt/pull/38602 -.. _`#38604`: https://github.com/saltstack/salt/issues/38604 .. _`#38610`: https://github.com/saltstack/salt/pull/38610 .. _`#38612`: https://github.com/saltstack/salt/pull/38612 .. _`#38615`: https://github.com/saltstack/salt/pull/38615 .. _`#38618`: https://github.com/saltstack/salt/pull/38618 .. _`#38619`: https://github.com/saltstack/salt/pull/38619 -.. _`#38622`: https://github.com/saltstack/salt/issues/38622 .. _`#38626`: https://github.com/saltstack/salt/pull/38626 .. _`#38627`: https://github.com/saltstack/salt/pull/38627 -.. _`#38629`: https://github.com/saltstack/salt/issues/38629 .. _`#38631`: https://github.com/saltstack/salt/issues/38631 .. _`#38635`: https://github.com/saltstack/salt/pull/38635 .. _`#38640`: https://github.com/saltstack/salt/pull/38640 .. _`#38645`: https://github.com/saltstack/salt/pull/38645 .. _`#38647`: https://github.com/saltstack/salt/pull/38647 -.. _`#38648`: https://github.com/saltstack/salt/issues/38648 .. _`#38649`: https://github.com/saltstack/salt/pull/38649 .. _`#38650`: https://github.com/saltstack/salt/pull/38650 .. _`#38651`: https://github.com/saltstack/salt/pull/38651 @@ -1614,7 +1494,6 @@ Changes: .. _`#38667`: https://github.com/saltstack/salt/pull/38667 .. _`#38668`: https://github.com/saltstack/salt/pull/38668 .. _`#38669`: https://github.com/saltstack/salt/pull/38669 -.. _`#38674`: https://github.com/saltstack/salt/issues/38674 .. _`#38676`: https://github.com/saltstack/salt/pull/38676 .. _`#38677`: https://github.com/saltstack/salt/issues/38677 .. _`#38682`: https://github.com/saltstack/salt/pull/38682 @@ -1654,27 +1533,69 @@ Changes: .. _`#38815`: https://github.com/saltstack/salt/pull/38815 .. _`#38819`: https://github.com/saltstack/salt/pull/38819 .. _`#38832`: https://github.com/saltstack/salt/pull/38832 -.. _`bp-33601`: https://github.com/saltstack/salt/pull/33601 -.. _`bp-37333`: https://github.com/saltstack/salt/pull/37333 -.. _`bp-37967`: https://github.com/saltstack/salt/pull/37967 -.. _`bp-37982`: https://github.com/saltstack/salt/pull/37982 -.. _`bp-38181`: https://github.com/saltstack/salt/pull/38181 -.. _`bp-38188`: https://github.com/saltstack/salt/pull/38188 -.. _`bp-38207`: https://github.com/saltstack/salt/pull/38207 -.. _`bp-38212`: https://github.com/saltstack/salt/pull/38212 -.. _`bp-38247`: https://github.com/saltstack/salt/pull/38247 -.. _`bp-38251`: https://github.com/saltstack/salt/pull/38251 -.. _`bp-38579`: https://github.com/saltstack/salt/pull/38579 -.. _`fix-2016`: https://github.com/saltstack/salt/issues/2016 -.. _`fix-37498`: https://github.com/saltstack/salt/issues/37498 -.. _`fix-37996`: https://github.com/saltstack/salt/issues/37996 -.. _`fix-38174`: https://github.com/saltstack/salt/issues/38174 -.. _`fix-38231`: https://github.com/saltstack/salt/issues/38231 -.. _`fix-38388`: https://github.com/saltstack/salt/issues/38388 -.. _`fix-38462`: https://github.com/saltstack/salt/issues/38462 -.. _`fix-38521`: https://github.com/saltstack/salt/issues/38521 -.. _`fix-38622`: https://github.com/saltstack/salt/issues/38622 -.. _`fix-38629`: https://github.com/saltstack/salt/issues/38629 -.. _`fix-38674`: https://github.com/saltstack/salt/issues/38674 -.. _`fix-38684`: https://github.com/saltstack/salt/issues/38684 -.. _`fix-38775`: https://github.com/saltstack/salt/issues/38775 +.. _`#38848`: https://github.com/saltstack/salt/pull/38848 +.. _`#38850`: https://github.com/saltstack/salt/pull/38850 +.. _`#38859`: https://github.com/saltstack/salt/pull/38859 +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`Cybolic`: https://github.com/Cybolic +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`MorphBonehunter`: https://github.com/MorphBonehunter +.. _`UtahDave`: https://github.com/UtahDave +.. _`Vaelatern`: https://github.com/Vaelatern +.. _`alex-zel`: https://github.com/alex-zel +.. _`alxwr`: https://github.com/alxwr +.. _`amendlik`: https://github.com/amendlik +.. _`anlutro`: https://github.com/anlutro +.. _`aosagie`: https://github.com/aosagie +.. _`basdusee`: https://github.com/basdusee +.. _`bbinet`: https://github.com/bbinet +.. _`benediktwerner`: https://github.com/benediktwerner +.. _`cachedout`: https://github.com/cachedout +.. _`charburns`: https://github.com/charburns +.. _`clinta`: https://github.com/clinta +.. _`cro`: https://github.com/cro +.. _`dereckson`: https://github.com/dereckson +.. _`disaster123`: https://github.com/disaster123 +.. _`djacobs2016`: https://github.com/djacobs2016 +.. _`doitian`: https://github.com/doitian +.. _`ewapptus`: https://github.com/ewapptus +.. _`ezh`: https://github.com/ezh +.. _`folti`: https://github.com/folti +.. _`g-shockfx`: https://github.com/g-shockfx +.. _`gmacon`: https://github.com/gmacon +.. _`gqgunhed`: https://github.com/gqgunhed +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`haraldrudell`: https://github.com/haraldrudell +.. _`kkoppel`: https://github.com/kkoppel +.. _`lorengordon`: https://github.com/lorengordon +.. _`luochun-95`: https://github.com/luochun-95 +.. _`martintamare`: https://github.com/martintamare +.. _`mcalmer`: https://github.com/mcalmer +.. _`meaksh`: https://github.com/meaksh +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`mostafahussein`: https://github.com/mostafahussein +.. _`mvdwalle`: https://github.com/mvdwalle +.. _`pgrishin`: https://github.com/pgrishin +.. _`rallytime`: https://github.com/rallytime +.. _`rbjorklin`: https://github.com/rbjorklin +.. _`rukender`: https://github.com/rukender +.. _`scthi`: https://github.com/scthi +.. _`sebw`: https://github.com/sebw +.. _`sjorge`: https://github.com/sjorge +.. _`stanvarlamov`: https://github.com/stanvarlamov +.. _`stefan-as`: https://github.com/stefan-as +.. _`tazaki`: https://github.com/tazaki +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`tjuup`: https://github.com/tjuup +.. _`tsaridas`: https://github.com/tsaridas +.. _`twangboy`: https://github.com/twangboy +.. _`vladvasiliu`: https://github.com/vladvasiliu +.. _`vquiering`: https://github.com/vquiering +.. _`vutny`: https://github.com/vutny +.. _`wasabi222`: https://github.com/wasabi222 +.. _`windoverwater`: https://github.com/windoverwater +.. _`wolfpackmars2`: https://github.com/wolfpackmars2 +.. _`yhekma`: https://github.com/yhekma +.. _`yopito`: https://github.com/yopito +.. _`yue9944882`: https://github.com/yue9944882 diff --git a/doc/topics/releases/2016.11.3.rst b/doc/topics/releases/2016.11.3.rst index ee25da393f..ccf7a293fd 100644 --- a/doc/topics/releases/2016.11.3.rst +++ b/doc/topics/releases/2016.11.3.rst @@ -5,1408 +5,1263 @@ Salt 2016.11.3 Release Notes Version 2016.11.3 is a bugfix release for :ref:`2016.11.0 `. -Changes for v2016.11.2..v2016.11.3 ----------------------------------- +Statistics +========== -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +- Total Merges: **137** +- Total Issue References: **49** +- Total PR References: **130** -*Generated at: 2017-02-22T23:01:16Z* +- Contributors: **47** (`Ch3LL`_, `DmitryKuzmenko`_, `MTecknology`_, `The-Loeki`_, `UtahDave`_, `anlutro`_, `arthru`_, `axmetishe`_, `bailsman`_, `bobrik`_, `cachedout`_, `clinta`_, `corywright`_, `cro`_, `dmaziuk`_, `dmitrievav`_, `dmurphy18`_, `eliasp`_, `eradman`_, `ezh`_, `gtmanfred`_, `hu-dabao`_, `hujunya`_, `isbm`_, `jak3kaj`_, `janhorstmann`_, `joe-niland`_, `kevinanderson1`_, `kstreee`_, `l2ol33rt`_, `lomeroe`_, `mcalmer`_, `meaksh`_, `mirceaulinic`_, `morganwillcock`_, `nasenbaer13`_, `nicholasmhughes`_, `rallytime`_, `sakateka`_, `sergeizv`_, `sjorge`_, `techhat`_, `terminalmage`_, `thatch45`_, `toanju`_, `twangboy`_, `vutny`_) -Statistics: -- Total Merges: **139** -- Total Issue references: **78** -- Total PR references: **217** +Changelog for v2016.11.2..v2016.11.3 +==================================== -Changes: +*Generated at: 2018-05-27 19:39:56 UTC* +* **PR** `#39536`_: (`twangboy`_) Namespace 'status' functions in 'win_status' + @ *2017-02-21 23:45:31 UTC* -- **PR** `#39536`_: (*twangboy*) Namespace 'status' functions in 'win_status' - @ *2017-02-21T23:45:31Z* + * **PR** `#39005`_: (`cro`_) Ungate the status.py module and raise unsupported errors in functions not executable on Windows. (refs: `#39536`_) - - **PR** `#39005`_: (*cro*) Ungate the status.py module and raise unsupported errors in functions not executable on Windows. - | refs: `#39536`_ - * 40f72db Merge pull request `#39536`_ from twangboy/fix_win_status - * d5453e2 Remove unused import (lint) + * 40f72db53e Merge pull request `#39536`_ from twangboy/fix_win_status - * 837c32e Remove list2cmdline + * d5453e2f9e Remove unused import (lint) - * c258cb3 Streamline wmic command returns for easier parsing + * 837c32e673 Remove list2cmdline - * 6d2cf81 Fix 'ping_master' function + * c258cb3f73 Streamline wmic command returns for easier parsing - * d946d10 Namespace 'status' functions in 'win_status' + * 6d2cf8171e Fix 'ping_master' function -- **PR** `#39534`_: (*rallytime*) Fix breakage in aptpkg and dpkg execution modules - @ *2017-02-21T20:31:15Z* + * d946d10597 Namespace 'status' functions in 'win_status' - - **PR** `#39418`_: (*anlutro*) Allow aptpkg.info_installed on package names that aren't installed - | refs: `#39534`_ - * dc8f578 Merge pull request `#39534`_ from rallytime/fix-pkg-function-specs - * d34a8fe Fix breakage in aptpkg and dpkg execution modules +* **PR** `#39534`_: (`rallytime`_) Fix breakage in aptpkg and dpkg execution modules + @ *2017-02-21 20:31:15 UTC* -* 1d0d7b2 Upgrade SaltTesting to run test suite for 2016.11 and add SaltPyLint (`#39521`_) + * **PR** `#39418`_: (`anlutro`_) Allow aptpkg.info_installed on package names that aren't installed (refs: `#39534`_) - - **ISSUE** `#34712`_: (*richardscollin*) Salt Test Suite Error - develop - | refs: `#37366`_ - - **PR** `#39521`_: (*vutny*) Upgrade SaltTesting to run test suite for 2016.11 and add SaltPyLint - - **PR** `#37366`_: (*eradman*) dev_python*.txt: use current SaltTesting and SaltPyLint modules - | refs: `#39521`_ + * dc8f578447 Merge pull request `#39534`_ from rallytime/fix-pkg-function-specs -- **PR** `#39370`_: (*twangboy*) Gate win_osinfo and winservice - @ *2017-02-17T23:53:58Z* + * d34a8fe9dc Fix breakage in aptpkg and dpkg execution modules - * e4c7168 Merge pull request `#39370`_ from twangboy/gate_win_utils - * 167cdb3 Gate windows specific imports, add __virtual__ +* **ISSUE** `#34712`_: (`richardscollin`_) Salt Test Suite Error - develop (refs: `#37366`_) - * e67387d Add option to return a Non instantiated class + * **PR** `#39521`_: (`vutny`_) Upgrade SaltTesting to run test suite for 2016.11 and add SaltPyLint - * 315b0cc Clarify return value for win_osinfo + * **PR** `#37366`_: (`eradman`_) dev_python*.txt: use current SaltTesting and SaltPyLint modules (refs: `#39521`_) - * 994314e Fix more docs +* **PR** `#39370`_: (`twangboy`_) Gate win_osinfo and winservice + @ *2017-02-17 23:53:58 UTC* - * 2bbe3cb Fix some docs + * e4c71683d9 Merge pull request `#39370`_ from twangboy/gate_win_utils - * 4103563 Merge branch 'gate_win_utils' of https://github.com/twangboy/salt into gate_win_utils + * 167cdb3447 Gate windows specific imports, add __virtual__ - * 24c1bd0 Remove extra newlines + * e67387deb7 Add option to return a Non instantiated class - * 82a86ce Add helper function for winservice + * 315b0cc105 Clarify return value for win_osinfo - * 0051b5a Put the win_osinfo classes in a helper function + * 994314ed3d Fix more docs - * 4e08534 Gate win_osinfo and winservice better + * 2bbe3cbf49 Fix some docs -- **PR** `#39486`_: (*twangboy*) Remove orphaned function list_configurable_policies - @ *2017-02-17T22:21:50Z* + * 4103563ee1 Merge branch 'gate_win_utils' of https://github.com/twangboy/salt into gate_win_utils - * a3e71b6 Merge pull request `#39486`_ from twangboy/win_remove_orphaned - * 1328055 Remove orphaned function list_configurable_policies + * 24c1bd079d Remove extra newlines -- **PR** `#39418`_: (*anlutro*) Allow aptpkg.info_installed on package names that aren't installed - | refs: `#39534`_ - @ *2017-02-17T18:34:19Z* + * 82a86ced55 Add helper function for winservice - * 87b269f Merge pull request `#39418`_ from alprs/fix-aptpkg_info_nonexistent_pkg - * 246bf1e add failhard argument to various apt pkg functions + * 0051b5a5e2 Put the win_osinfo classes in a helper function -- **PR** `#39438`_: (*mirceaulinic*) file.get_managed: refetch source when file hashsum is changed - @ *2017-02-17T17:58:29Z* + * 4e08534877 Gate win_osinfo and winservice better - * e816d6c Merge pull request `#39438`_ from cloudflare/fix_39422 - * 8453800 file.get_managed: refetch cached file when hashsum chnaged +* **PR** `#39486`_: (`twangboy`_) Remove orphaned function list_configurable_policies + @ *2017-02-17 22:21:50 UTC* -- **PR** `#39432`_: (*dmaziuk*) Quick and dirty fix for GECOS fields with more than 3 commas - @ *2017-02-17T17:57:30Z* + * a3e71b6cce Merge pull request `#39486`_ from twangboy/win_remove_orphaned - - **ISSUE** `#39203`_: (*dmaziuk*) salt.users gecos field - | refs: `#39432`_ `#39432`_ - * a5fe8f0 Merge pull request `#39432`_ from dmaziuk/issue39203 - * 41c0463 Remove # + * 1328055c4d Remove orphaned function list_configurable_policies - * 4f877c6 Quick and dirty fix for GECOS fields with more than 3 commas +* **PR** `#39418`_: (`anlutro`_) Allow aptpkg.info_installed on package names that aren't installed (refs: `#39534`_) + @ *2017-02-17 18:34:19 UTC* -- **PR** `#39484`_: (*corywright*) The Reactor docs should use pillar='{}' instead of 'pillar={}' - @ *2017-02-17T17:50:57Z* + * 87b269fc80 Merge pull request `#39418`_ from alprs/fix-aptpkg_info_nonexistent_pkg - * 3665229 Merge pull request `#39484`_ from corywright/fix-reactor-docs-pillar-keyword-args - * cc90d0d The Reactor docs should use pillar='{}' instead of 'pillar={}' + * 246bf1e938 add failhard argument to various apt pkg functions -- **PR** `#39456`_: (*twangboy*) Add salt icon to buildenv directory - @ *2017-02-16T22:47:58Z* +* **PR** `#39438`_: (`mirceaulinic`_) file.get_managed: refetch source when file hashsum is changed + @ *2017-02-17 17:58:29 UTC* - * 2e3a9c5 Merge pull request `#39456`_ from twangboy/win_fix_icon - * 8dd915d Add salt icon to buildenv directory + * e816d6c23e Merge pull request `#39438`_ from cloudflare/fix_39422 -- **PR** `#39462`_: (*twangboy*) Use url_path instead of url_data.path - @ *2017-02-16T22:44:18Z* + * 8453800639 file.get_managed: refetch cached file when hashsum chnaged - * 63adc03 Merge pull request `#39462`_ from twangboy/win_fix_fileclient - * a96bc13 Use url_path instead of url_data.path +* **ISSUE** `#39203`_: (`dmaziuk`_) salt.users gecos field (refs: `#39432`_) -- **PR** `#39458`_: (*rallytime*) Fix more warnings in doc build - @ *2017-02-16T21:45:52Z* +* **PR** `#39432`_: (`dmaziuk`_) Quick and dirty fix for GECOS fields with more than 3 commas + @ *2017-02-17 17:57:30 UTC* - * e9b034f Merge pull request `#39458`_ from rallytime/fixup-more-doc-build-warnings - * e698bc3 Fix more warnings in doc build + * a5fe8f0fa6 Merge pull request `#39432`_ from dmaziuk/issue39203 -- **PR** `#39437`_: (*sakateka*) Fixes about saltfile - @ *2017-02-16T20:32:15Z* + * 41c046308c Remove # - * e4f8c2b Merge pull request `#39437`_ from sakateka/fixes_about_saltfile - * ab68524 less pylint: salt/utils/parsers.py + * 4f877c6b6f Quick and dirty fix for GECOS fields with more than 3 commas - * 9e7d9dc Revert "pylint: salt/utils/parsers.py" +* **PR** `#39484`_: (`corywright`_) The Reactor docs should use pillar='{}' instead of 'pillar={}' + @ *2017-02-17 17:50:57 UTC* - * f3f129c document ~/.salt/Saltfile + * 3665229a5a Merge pull request `#39484`_ from corywright/fix-reactor-docs-pillar-keyword-args - * 33f3614 pylint: salt/utils/parsers.py + * cc90d0d53f The Reactor docs should use pillar='{}' instead of 'pillar={}' - * 0f36e10 expand config_dir and '~/.salt/Saltfile' as last resort +* **PR** `#39456`_: (`twangboy`_) Add salt icon to buildenv directory + @ *2017-02-16 22:47:58 UTC* -* 1acf00d add 2016.11.3 changelog to release notes (`#39451`_) + * 2e3a9c5e58 Merge pull request `#39456`_ from twangboy/win_fix_icon - - **PR** `#39451`_: (*Ch3LL*) add 2016.11.3 changelog to release notes + * 8dd915dae4 Add salt icon to buildenv directory -- **PR** `#39448`_: (*gtmanfred*) Add release notes for cisco proxy minions added in Carbon - @ *2017-02-16T17:29:48Z* +* **PR** `#39462`_: (`twangboy`_) Use url_path instead of url_data.path + @ *2017-02-16 22:44:18 UTC* - - **ISSUE** `#38032`_: (*meggiebot*) Add missing Carbon docs - | refs: `#39448`_ - * 8e2cbd2 Merge pull request `#39448`_ from gtmanfred/2016.11 - * 3172e88 Add release notes for cisco proxy minions added in Carbon + * 63adc03484 Merge pull request `#39462`_ from twangboy/win_fix_fileclient -- **PR** `#39428`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-02-16T00:01:15Z* + * a96bc13133 Use url_path instead of url_data.path - - **PR** `#39409`_: (*terminalmage*) salt.fileserver.roots: Fix regression in symlink_list - - **PR** `#39400`_: (*meaksh*) Prevents 'OSError' exception in case certain job cache path doesn't exist - - **PR** `#39380`_: (*joe-niland*) Quote numeric user names so pwd.getpwnam handles them properly - - **PR** `#39362`_: (*dincamihai*) Add cp.push test - - **PR** `#39339`_: (*cro*) Add link to external pillar documentation for clarification. - - **PR** `#39337`_: (*terminalmage*) Don't re-walk the roots fileserver in symlink_list() - | refs: `#39409`_ - - **PR** `#39316`_: (*terminalmage*) Document the upstream RedHat bug with their pygit2 package - - **PR** `#39300`_: (*terminalmage*) Replace more usage of str.format in the loader - - **PR** `#39227`_: (*terminalmage*) Loader optimzation - | refs: `#39300`_ - * 070904b Merge pull request `#39428`_ from rallytime/merge-2016.11 - * 2acb188 Change ``path`` value from a tuple to a list +* **PR** `#39458`_: (`rallytime`_) Fix more warnings in doc build + @ *2017-02-16 21:45:52 UTC* - * 6d78adb Merge branch '2016.3' into '2016.11' + * e9b034f02f Merge pull request `#39458`_ from rallytime/fixup-more-doc-build-warnings - * 4ff13ac salt.fileserver.roots: Fix regression in symlink_list (`#39409`_) + * e698bc3508 Fix more warnings in doc build - * 8b8ab8e Merge pull request `#39362`_ from dincamihai/cp-push-test-2016.3 +* **PR** `#39437`_: (`sakateka`_) Fixes about saltfile + @ *2017-02-16 20:32:15 UTC* - * 91383c5 Add cp.push test + * e4f8c2bfb0 Merge pull request `#39437`_ from sakateka/fixes_about_saltfile - * 4b726f9 Merge pull request `#39380`_ from joe-niland/quote-numeric-usernames + * ab68524d7a less pylint: salt/utils/parsers.py - * c2edfdd Quote numeric user names so pwd.getpwnam handles them properly + * 9e7d9dcc78 Revert "pylint: salt/utils/parsers.py" - * 1116d32 Merge pull request `#39400`_ from meaksh/2016.3-fix-local-cache-issue + * f3f129c8f1 document ~/.salt/Saltfile - * e7e559e Prevents 'OSError' exception in case path doesn't exist + * 33f3614b1e pylint: salt/utils/parsers.py - * 6c854da Merge pull request `#39300`_ from terminalmage/loader-optimization + * 0f36e10e7d expand config_dir and '~/.salt/Saltfile' as last resort - * d3e5d15 Replace more usage of str.format in the loader + * **PR** `#39451`_: (`Ch3LL`_) add 2016.11.3 changelog to release notes - * 5286b5f Merge pull request `#39337`_ from terminalmage/issue34428 +* **ISSUE** `#38032`_: (`meggiebot`_) Add missing Carbon docs (refs: `#39448`_) - * a7d2135 Don't re-walk the roots fileserver in symlink_list() +* **PR** `#39448`_: (`gtmanfred`_) Add release notes for cisco proxy minions added in Carbon + @ *2017-02-16 17:29:48 UTC* - * ce781de Merge pull request `#39339`_ from cro/pillar_filetree_doc + * 8e2cbd2307 Merge pull request `#39448`_ from gtmanfred/2016.11 - * 410810c Clarification on external pillar usage. + * 3172e88700 Add release notes for cisco proxy minions added in Carbon - * fa30143 Document the upstream RedHat bug with their pygit2 package (`#39316`_) +* **PR** `#39428`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-02-16 00:01:15 UTC* -- **PR** `#39429`_: (*rallytime*) Back-port `#39364`_ to 2016.11 - @ *2017-02-15T21:27:21Z* + * 070904b719 Merge pull request `#39428`_ from rallytime/merge-2016.11 - - **ISSUE** `#39360`_: (*bbinet*) file.symlink should not try to set ownership to root:root - | refs: `#39364`_ - - **PR** `#39364`_: (*gtmanfred*) set default user variable to the user cmd runs as - | refs: `#39429`_ - * 54a572e Merge pull request `#39429`_ from rallytime/`bp-39364`_ - * 157f4dc set default user variable to the user cmd runs as + * 2acb188ac9 Change ``path`` value from a tuple to a list -- **PR** `#39424`_: (*twangboy*) Fix problem with too many connection attempts in Windows - @ *2017-02-15T18:51:35Z* + * 6d78adbf08 Merge branch '2016.3' into '2016.11' - * 881ebf2 Merge pull request `#39424`_ from twangboy/win_fix_dos - * d3f7dd7 Add sleep to eval_master + * 4ff13acf8b salt.fileserver.roots: Fix regression in symlink_list (`#39409`_) -- **PR** `#39419`_: (*The-Loeki*) Backport Salt-SSH IPv6 fixes to 2016.11 - @ *2017-02-15T17:33:13Z* + * 8b8ab8ef8e Merge pull request `#39362`_ from dincamihai/cp-push-test-2016.3 - - **ISSUE** `#30561`_: (*jfindlay*) salt-ssh fails with IPv6 address - | refs: `#39419`_ `#38831`_ - - **ISSUE** `#22984`_: (*tomasfejfar*) salt-ssh problem possibly related to ipv6 - | refs: `#39419`_ `#38831`_ - - **PR** `#38877`_: (*The-Loeki*) Salt-SSH client: Don't overwrite self.host w/IPv6 brackets - | refs: `#39419`_ `#39419`_ - - **PR** `#38831`_: (*The-Loeki*) Salt-SSH deal with raw IPv6 addresses - | refs: `#39419`_ `#39419`_ `#38877`_ - * 4787235 Merge pull request `#39419`_ from The-Loeki/bp-ssh-ipv6 - * 4fc5626 Don't overwrite self.host w/IPv6 brackets + * 91383c5a19 Add cp.push test - * dd12234 Salt-SSH deal with raw IPv6 addresses + * 4b726f955b Merge pull request `#39380`_ from joe-niland/quote-numeric-usernames -- **PR** `#39379`_: (*terminalmage*) win_pkg: remove all installed versions when no explicit version passed - @ *2017-02-14T18:41:28Z* + * c2edfdd464 Quote numeric user names so pwd.getpwnam handles them properly - * 878946d Merge pull request `#39379`_ from terminalmage/issue34821 - * fd9ab8e Remove extra newline + * 1116d32df9 Merge pull request `#39400`_ from meaksh/2016.3-fix-local-cache-issue - * 5871825 win_pkg: remove all installed versions when no explicit version passed + * e7e559ef5c Prevents 'OSError' exception in case path doesn't exist -- **PR** `#39392`_: (*anlutro*) Make sure OrderedDict order is preserved in nested output - @ *2017-02-14T17:50:15Z* + * 6c854da1d4 Merge pull request `#39300`_ from terminalmage/loader-optimization - * caffef8 Merge pull request `#39392`_ from alprs/fix-nested_output_ordered_dict - * 625a770 make sure OrderedDict order is preserved in output + * d3e5d1525e Replace more usage of str.format in the loader -- **PR** `#39378`_: (*dmurphy18*) Update make_repo in debbuild.py execution module to utilize timeout - @ *2017-02-14T17:10:15Z* + * 5286b5ff1b Merge pull request `#39337`_ from terminalmage/issue34428 - * f2459e3 Merge pull request `#39378`_ from dmurphy18/deb_pkg_fix - * 4bd47cc Updated all make_repo loops to use timeout value for retries + * a7d2135dc2 Don't re-walk the roots fileserver in symlink_list() -- **PR** `#39369`_: (*rallytime*) Back-port `#37338`_ to 2016.11 - @ *2017-02-13T21:41:19Z* + * ce781deeb5 Merge pull request `#39339`_ from cro/pillar_filetree_doc - - **ISSUE** `#39358`_: (*Kimamisa*) Backport the RDS fix in Carbon - | refs: `#39369`_ - - **PR** `#37338`_: (*bailsman*) Fix wait_status in boto_rds.create() - | refs: `#39369`_ - * 99554d9 Merge pull request `#39369`_ from rallytime/`bp-37338`_ - * 2e7f6e8 Fix wait_status in boto_rds.create() + * 410810cea2 Clarification on external pillar usage. -- **PR** `#39303`_: (*kstreee*) Removes a redundant test case after removed 'batch' in 'netapi'. - @ *2017-02-13T19:55:46Z* + * fa3014393c Document the upstream RedHat bug with their pygit2 package (`#39316`_) - * 03ab8b1 Merge pull request `#39303`_ from kstreee/fix-testcase-rm-batch-in-netapi - * 51972d0 Removes a redundant test case after removed 'batch' in 'netapi'. +* **ISSUE** `#39360`_: (`bbinet`_) file.symlink should not try to set ownership to root:root (refs: `#39364`_) -- **PR** `#39315`_: (*Ch3LL*) improve salt-run salt.cmd test - @ *2017-02-13T19:00:14Z* +* **PR** `#39429`_: (`rallytime`_) Back-port `#39364`_ to 2016.11 + @ *2017-02-15 21:27:21 UTC* - * 60640f7 Merge pull request `#39315`_ from Ch3LL/fix_run_salt_test - * b3cbc5a improve salt-run salt.cmd test + * **PR** `#39364`_: (`gtmanfred`_) set default user variable to the user cmd runs as (refs: `#39429`_) -- **PR** `#39311`_: (*morganwillcock*) win_system: return False from a skipped reboot - @ *2017-02-13T18:59:11Z* + * 54a572e50c Merge pull request `#39429`_ from rallytime/bp-39364 - - **ISSUE** `#39243`_: (*morganwillcock*) win_system.reboot: can return True without rebooting - | refs: `#39311`_ - * 2ca63a9 Merge pull request `#39311`_ from morganwillcock/skip-reboot - * 0f3abb6 Clarify success for shutdown function + * 157f4dcdf9 set default user variable to the user cmd runs as - * dcb4d05 win_system: return False from a skipped reboot +* **PR** `#39424`_: (`twangboy`_) Fix problem with too many connection attempts in Windows + @ *2017-02-15 18:51:35 UTC* -- **PR** `#39346`_: (*joe-niland*) Ignore non-HTTP IIS bindings - @ *2017-02-13T18:18:36Z* + * 881ebf2e93 Merge pull request `#39424`_ from twangboy/win_fix_dos - * 082105f Merge pull request `#39346`_ from joe-niland/handle-iis-bindings - * 8d5afdb win_iis module: list_sites - when retrieving bindings, ignore bindigs whose protocols do not have host headers + * d3f7dd7f50 Add sleep to eval_master -- **PR** `#39361`_: (*gtmanfred*) make sure both variables are strings. - @ *2017-02-13T17:20:17Z* +* **ISSUE** `#30561`_: (`jfindlay`_) salt-ssh fails with IPv6 address (refs: `#39419`_, `#38831`_) - - **ISSUE** `#39321`_: (*mgresser*) Grain matching failing where grain value is an INT - | refs: `#39361`_ - * a3a9a8e Merge pull request `#39361`_ from gtmanfred/2016.11 - * ee2275a make sure both variables are strings. +* **ISSUE** `#22984`_: (`tomasfejfar`_) salt-ssh problem possibly related to ipv6 (refs: `#39419`_, `#38831`_) -* 2021f5b Add creation/configuration of Salt PKI dirs to hacking docs (`#39341`_) +* **PR** `#39419`_: (`The-Loeki`_) Backport Salt-SSH IPv6 fixes to 2016.11 + @ *2017-02-15 17:33:13 UTC* - - **PR** `#39341`_: (*eliasp*) Add creation/configuration of Salt PKI dirs to hacking docs + * **PR** `#38877`_: (`The-Loeki`_) Salt-SSH client: Don't overwrite self.host w/IPv6 brackets (refs: `#39419`_) -- **PR** `#39317`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-02-10T23:07:32Z* + * **PR** `#38831`_: (`The-Loeki`_) Salt-SSH deal with raw IPv6 addresses (refs: `#39419`_, `#38877`_) - - **ISSUE** `#39220`_: (*lvg01*) state file.line skips leading spaces in content with mode:ensure and indent:False - | refs: `#39221`_ `#39221`_ `#39221`_ `#39221`_ - - **ISSUE** `#38595`_: (*yue9944882*) Redis ext job cache occurred error - | refs: `#38610`_ `#38610`_ - - **ISSUE** `#36913`_: (*terminalmage*) Support custom refspecs in GitFS - | refs: `#39210`_ - - **PR** `#39313`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - - **PR** `#39299`_: (*rallytime*) Back-port `#38610`_ to 2016.3 - - **PR** `#39297`_: (*cro*) Add doc to recommend pgjsonb for master job caches - - **PR** `#39296`_: (*sergeizv*) Whitespace fix in docs Makefile - - **PR** `#39295`_: (*sergeizv*) Fix typo - - **PR** `#39294`_: (*sergeizv*) Fix link in proxyminion guide - - **PR** `#39293`_: (*sergeizv*) Grammar fix - - **PR** `#39286`_: (*terminalmage*) Allow minion/CLI saltenv/pillarenv to override master when compiling pillar - - **PR** `#39280`_: (*terminalmage*) Add warning for Dulwich removal - - **PR** `#39221`_: (*lvg01*) Fix bug 39220 - - **PR** `#39210`_: (*terminalmage*) salt.utils.gitfs: remove dulwich support, make refspecs configurable - | refs: `#39280`_ - - **PR** `#38610`_: (*yue9944882*) Fix `#38595`_ - Unexpected error log from redis retuner in master's log - | refs: `#39299`_ - * ce1f01f Merge pull request `#39317`_ from rallytime/merge-2016.11 - * c1df446 Merge branch '2016.3' into '2016.11' + * 47872355a8 Merge pull request `#39419`_ from The-Loeki/bp-ssh-ipv6 - * 9de559f Merge pull request `#39313`_ from rallytime/merge-2016.3 + * 4fc5626f16 Don't overwrite self.host w/IPv6 brackets - * 0b8dddf Merge branch '2015.8' into '2016.3' + * dd1223468b Salt-SSH deal with raw IPv6 addresses - * fc551bc Merge pull request `#39293`_ from sergeizv/grammar-fix +* **PR** `#39379`_: (`terminalmage`_) win_pkg: remove all installed versions when no explicit version passed + @ *2017-02-14 18:41:28 UTC* - * 70f2b58 Rewrap paragraph + * 878946d0f8 Merge pull request `#39379`_ from terminalmage/issue34821 - * e6ab517 Grammar fix + * fd9ab8e4e3 Remove extra newline - * 8a1b456 Merge pull request `#39295`_ from sergeizv/typo-fix + * 5871825b9e win_pkg: remove all installed versions when no explicit version passed - * 5d9f36d Fix typo +* **PR** `#39392`_: (`anlutro`_) Make sure OrderedDict order is preserved in nested output + @ *2017-02-14 17:50:15 UTC* - * cfaafec Merge pull request `#39296`_ from sergeizv/whitespace-fix + * caffef88cf Merge pull request `#39392`_ from alprs/fix-nested_output_ordered_dict - * 1d4c1dc Whitespace fix in docs Makefile + * 625a770a23 make sure OrderedDict order is preserved in output - * 0b4dcf4 Merge pull request `#39294`_ from sergeizv/fix-link +* **PR** `#39378`_: (`dmurphy18`_) Update make_repo in debbuild.py execution module to utilize timeout + @ *2017-02-14 17:10:15 UTC* - * 04bde6e Fix link in proxyminion guide + * f2459e3ce8 Merge pull request `#39378`_ from dmurphy18/deb_pkg_fix - * dd3ca0e Fix `#38595`_ - Unexpected error log from redis retuner in master's log (`#39299`_) + * 4bd47cc18a Updated all make_repo loops to use timeout value for retries - * f16027d Merge pull request `#39297`_ from cro/pg_returner_docs +* **ISSUE** `#39358`_: (`Kimamisa`_) Backport the RDS fix in Carbon (refs: `#39369`_) - * 28bac64 Typo +* **PR** `#39369`_: (`rallytime`_) Back-port `#37338`_ to 2016.11 + @ *2017-02-13 21:41:19 UTC* - * 19fedcd Add doc to recommend pgjsonb for master job caches + * **PR** `#37338`_: (`bailsman`_) Fix wait_status in boto_rds.create() (refs: `#39369`_) - * 77e50ed Merge pull request `#39286`_ from terminalmage/fix-pillarenv-precedence + * 99554d9d72 Merge pull request `#39369`_ from rallytime/bp-37338 - * 3cb9833 Allow minion/CLI saltenv/pillarenv to override master when compiling pillar + * 2e7f6e8e37 Fix wait_status in boto_rds.create() - * 5244041 Merge pull request `#39221`_ from lvg01/fix-bug-39220 +* **PR** `#39303`_: (`kstreee`_) Removes a redundant test case after removed 'batch' in 'netapi'. + @ *2017-02-13 19:55:46 UTC* - * e8a41d6 Removes to early content stripping (stripping is already done when needed with ident:true), fixes `#39220`_ + * 03ab8b1b5a Merge pull request `#39303`_ from kstreee/fix-testcase-rm-batch-in-netapi - * a4b169e Fixed wrong logic, fixes `#39220`_ + * 51972d0724 Removes a redundant test case after removed 'batch' in 'netapi'. - * 5a27207 Add warning for Dulwich removal (`#39280`_) +* **PR** `#39315`_: (`Ch3LL`_) improve salt-run salt.cmd test + @ *2017-02-13 19:00:14 UTC* -- **PR** `#38464`_: (*ezh*) [38451] Fix file.replace 2016.11 - @ *2017-02-09T23:07:49Z* + * 60640f77d7 Merge pull request `#39315`_ from Ch3LL/fix_run_salt_test - - **ISSUE** `#38451`_: (*ezh*) 2016.11 file.replace has multiple errors under python 3 - | refs: `#38464`_ - - **ISSUE** `#2016`_: (*seanchannel*) status.custom failing on any arguments - * c3c621a Merge pull request `#38464`_ from doublescoring/`fix-2016`_.11-38451 - * 81f0337 [38451] Fix few bugs after review + * b3cbc5a408 improve salt-run salt.cmd test - * 1bdab25 [38451] Fix pylint W1699(incompatible-py3-code) +* **ISSUE** `#39243`_: (`morganwillcock`_) win_system.reboot: can return True without rebooting (refs: `#39311`_) - * 3bfc654 [38451] Fix file.replace to make it suitable to python 3 +* **PR** `#39311`_: (`morganwillcock`_) win_system: return False from a skipped reboot + @ *2017-02-13 18:59:11 UTC* -- **PR** `#39291`_: (*terminalmage*) Add note about using saltenv jinja var in pillar top files - @ *2017-02-09T21:43:50Z* + * 2ca63a93cd Merge pull request `#39311`_ from morganwillcock/skip-reboot - * 6365211 Merge pull request `#39291`_ from terminalmage/pillar-docs - * fbd551e Add note about using saltenv jinja var in pillar top files + * 0f3abb613d Clarify success for shutdown function -- **PR** `#39281`_: (*twangboy*) Require VCRedist on 2008R2 and below instead of 2008 - @ *2017-02-09T17:59:57Z* + * dcb4d05275 win_system: return False from a skipped reboot - * a496ec2 Merge pull request `#39281`_ from twangboy/win_installer - * ef50787 Capitalize the 'r' for 2008R2 +* **PR** `#39346`_: (`joe-niland`_) Ignore non-HTTP IIS bindings + @ *2017-02-13 18:18:36 UTC* - * 1b6bd63 Require VCRedist on 2008R2 and below instead of 2008 + * 082105fa84 Merge pull request `#39346`_ from joe-niland/handle-iis-bindings -- **PR** `#39264`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-02-09T17:10:14Z* + * 8d5afdb0ae win_iis module: list_sites - when retrieving bindings, ignore bindigs whose protocols do not have host headers - - **ISSUE** `#38856`_: (*fhaynes*) salt-cloud throws an exception when ec2 does not return encoding - | refs: `#39228`_ - - **ISSUE** `#38697`_: (*fboismenu*) On Windows, ip.get_all_interfaces returns at most 2 DNS/WINS Servers - | refs: `#38793`_ - - **ISSUE** `#37174`_: (*mikeadamz*) The State execution failed to record the order in which all states were executed spam while running pkg.upgrade from orchestration runner - | refs: `#39206`_ - - **ISSUE** `#33536`_: (*murzick*) pkgrepo.managed does not disable a yum repo with "disabled: True" - | refs: `#35055`_ - - **ISSUE** `#33187`_: (*usbportnoy*) Deploy to jboss TypeError at boss7.py:469 - | refs: `#39170`_ - - **PR** `#39260`_: (*terminalmage*) Update jsonschema tests to reflect change in jsonschema 2.6.0 - - **PR** `#39251`_: (*terminalmage*) Better handling of enabled/disabled arguments in pkgrepo.managed - - **PR** `#39232`_: (*terminalmage*) Avoid recursion in s3/svn ext_pillars - - **PR** `#39231`_: (*terminalmage*) Add clarification for jenkins execution module - - **PR** `#39230`_: (*rallytime*) Fix the win_ip_test failures - - **PR** `#39228`_: (*gtmanfred*) default to utf8 encoding if not specified - - **PR** `#39227`_: (*terminalmage*) Loader optimzation - | refs: `#39300`_ - - **PR** `#39209`_: (*terminalmage*) Sort the return list from the fileserver.envs runner - - **PR** `#39206`_: (*cachedout*) Ignore empty dicts in highstate outputter - - **PR** `#39202`_: (*rallytime*) [2016.3] Pylint fix - - **PR** `#39199`_: (*rallytime*) Back-port `#39170`_ to 2016.3 - - **PR** `#39197`_: (*cachedout*) Pr 38793 - - **PR** `#39170`_: (*grep4linux*) Added missing source_hash_name argument in get_managed function - | refs: `#39199`_ - - **PR** `#38793`_: (*fboismenu*) Fix for `#38697`_ - | refs: `#39197`_ `#39230`_ - - **PR** `#35055`_: (*galet*) `#33536`_ pkgrepo.managed does not disable a yum repo with "disabled: True" - | refs: `#39251`_ - * db6140a Merge pull request `#39264`_ from rallytime/merge-2016.11 - * a9c2c10 Pylint fix +* **ISSUE** `#39321`_: (`mgresser`_) Grain matching failing where grain value is an INT (refs: `#39361`_) - * f6aad99 Merge branch '2016.3' into '2016.11' +* **PR** `#39361`_: (`gtmanfred`_) make sure both variables are strings. + @ *2017-02-13 17:20:17 UTC* - * 1b9217d Update jsonschema tests to reflect change in jsonschema 2.6.0 (`#39260`_) + * a3a9a8e1ed Merge pull request `#39361`_ from gtmanfred/2016.11 - * c1d16cc Better handling of enabled/disabled arguments in pkgrepo.managed (`#39251`_) + * ee2275ad67 make sure both variables are strings. - * 8e88f71 Merge pull request `#39227`_ from terminalmage/loader-optimization + * **PR** `#39341`_: (`eliasp`_) Add creation/configuration of Salt PKI dirs to hacking docs - * c750662 Loader optimzation +* **PR** `#39317`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-02-10 23:07:32 UTC* - * bc89b29 Merge pull request `#39228`_ from gtmanfred/2016.3 + * ce1f01f81a Merge pull request `#39317`_ from rallytime/merge-2016.11 - * afee047 default to utf8 encoding if not specified + * c1df446b7a Merge branch '2016.3' into '2016.11' - * d9b0671 Merge pull request `#39231`_ from terminalmage/clarify-jenkins-depends + * 9de559ff4e Merge pull request `#39313`_ from rallytime/merge-2016.3 - * ad1b125 Add clarification for jenkins execution module + * 0b8dddf12b Merge branch '2015.8' into '2016.3' - * ddcff89 Merge pull request `#39232`_ from terminalmage/issue21342 + * fc551bcf5d Merge pull request `#39293`_ from sergeizv/grammar-fix - * c88896c Avoid recursion in s3/svn ext_pillars + * 70f2b586d3 Rewrap paragraph - * ef4e437 Fix the win_ip_test failures (`#39230`_) + * e6ab5178ea Grammar fix - * df5f934 Merge pull request `#39199`_ from rallytime/`bp-39170`_ + * 8a1b45632a Merge pull request `#39295`_ from sergeizv/typo-fix - * c129905 Added missing source_hash_name argument in get_managed function Additional fix to `#33187`_ Customer was still seeing errors, this should now work. Tested with 2015.8.13 and 2016.11.2 + * 5d9f36d58d Fix typo - * 2621c11 Merge pull request `#39206`_ from cachedout/issue_issue_37174 + * cfaafece34 Merge pull request `#39296`_ from sergeizv/whitespace-fix - * be31e05 Ignore empty dicts in highstate outputter + * 1d4c1dc140 Whitespace fix in docs Makefile - * dd44045 Merge pull request `#39209`_ from terminalmage/sorted-envs + * 0b4dcf4a47 Merge pull request `#39294`_ from sergeizv/fix-link - * e6dda4a Sort the return list from the fileserver.envs runner + * 04bde6eed2 Fix link in proxyminion guide - * 7bed687 [2016.3] Pylint fix (`#39202`_) + * dd3ca0ecb0 Fix `#38595`_ - Unexpected error log from redis retuner in master's log (`#39299`_) - * ab76054 Merge pull request `#39197`_ from cachedout/pr-38793 + * f16027d30e Merge pull request `#39297`_ from cro/pg_returner_docs - * f3d35fb Lint fixes + * 28bac649ae Typo - * 624f25b Fix for `#38697`_ + * 19fedcdd23 Add doc to recommend pgjsonb for master job caches -- **PR** `#39276`_: (*gtmanfred*) _device_mismatch_ignored will never be True - @ *2017-02-09T17:05:28Z* + * 77e50ed8b7 Merge pull request `#39286`_ from terminalmage/fix-pillarenv-precedence - - **ISSUE** `#39269`_: (*alexharrington*) Remount forced with lizardfs fuse filesystem due to device mismatch - | refs: `#39276`_ - - **ISSUE** `#39106`_: (*carsten-AEI*) CVMFS fuse mount gets remounted every time - | refs: `#39276`_ - * 304eb19 Merge pull request `#39276`_ from gtmanfred/2016.11 - * 6635a9f _device_mismatch_ignored will never be True + * 3cb9833e57 Allow minion/CLI saltenv/pillarenv to override master when compiling pillar -- **PR** `#39238`_: (*dmurphy18*) Update disk fstype, inodeusage, percent and mount.active functions for AIX support - @ *2017-02-08T21:53:32Z* + * 52440416ca Merge pull request `#39221`_ from lvg01/fix-bug-39220 - * 7611698 Merge pull request `#39238`_ from dmurphy18/fix_aix_disk_mount - * a8a519c Removed space for pylint + * e8a41d6341 Removes to early content stripping (stripping is allready done when needed with ident:true), fixes `#39220`_ - * 8fa0ffa Updates due to code review comments + * a4b169e0bd Fixed wrong logic, fixes `#39220`_ - * 97c59a8 Updated mount functionality for active on AIX + * 5a27207c57 Add warning for Dulwich removal (`#39280`_) - * 1a32b2c Updated disk functionality for fstype, inodeuage and percent on AIX +* **ISSUE** `#38451`_: (`ezh`_) 2016.11 file.replace has multiple errors under python 3 (refs: `#38464`_) -- **PR** `#39233`_: (*rallytime*) Various doc updates to fix warnings in doc build - @ *2017-02-08T19:29:53Z* +* **PR** `#38464`_: (`ezh`_) [38451] Fix file.replace 2016.11 + @ *2017-02-09 23:07:49 UTC* - * 99bfa7d Merge pull request `#39233`_ from rallytime/fixup-more-doc-build-warnings - * 2f74dcf Various doc updates to fix warnings in doc build + * c3c621aab0 Merge pull request `#38464`_ from doublescoring/fix-2016.11-38451 -- **PR** `#39237`_: (*axmetishe*) fix rds subnet group creation - @ *2017-02-08T19:04:31Z* + * 81f0337338 [38451] Fix few bugs after review - * 59e927b Merge pull request `#39237`_ from axmetishe/2016.11 - * 6f4be8b fix rds subnet group creation + * 1bdab253ad [38451] Fix pylint W1699(incompatible-py3-code) -* 84ff638 [2016.11] Merge forward from 2016.3 to 2016.11 (`#39234`_) + * 3bfc6547da [38451] Fix file.replace to make it suitable to python 3 - - **PR** `#39234`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 +* **PR** `#39291`_: (`terminalmage`_) Add note about using saltenv jinja var in pillar top files + @ *2017-02-09 21:43:50 UTC* -* fd3284f Put legacy git_pillar on a deprecation path for Oxygen (`#39225`_) + * 6365211a6f Merge pull request `#39291`_ from terminalmage/pillar-docs - - **PR** `#39225`_: (*terminalmage*) Put legacy git_pillar on a deprecation path for Oxygen + * fbd551e069 Add note about using saltenv jinja var in pillar top files -- **PR** `#39180`_: (*morganwillcock*) setup.py: Remove global options from install command - @ *2017-02-07T16:20:49Z* +* **PR** `#39281`_: (`twangboy`_) Require VCRedist on 2008R2 and below instead of 2008 + @ *2017-02-09 17:59:57 UTC* - - **ISSUE** `#39078`_: (*morganwillcock*) setup.py: cannot install without setting global options - | refs: `#39180`_ - * 19c3d90 Merge pull request `#39180`_ from morganwillcock/setup - * d7e0509 Remove global options from Install + * a496ec2a16 Merge pull request `#39281`_ from twangboy/win_installer -- **PR** `#38863`_: (*hujunya*) fix django auth not work - @ *2017-02-07T15:43:00Z* + * ef5078729a Capitalize the 'r' for 2008R2 - * a0907bc Merge pull request `#38863`_ from hujunya/fix_django_auth - * 2a99ff4 check if django_auth_path has been in sys.path + * 1b6bd634ac Require VCRedist on 2008R2 and below instead of 2008 - * 933ebf1 fix pylint violations +* **PR** `#39264`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-02-09 17:10:14 UTC* - * 6b5a7f4 fix django auth not work + * db6140aa83 Merge pull request `#39264`_ from rallytime/merge-2016.11 -- **PR** `#39198`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-02-06T21:01:56Z* + * a9c2c106c1 Pylint fix - - **PR** `#39173`_: (*rallytime*) Restore "Salt Community" doc section - - **PR** `#39166`_: (*Ch3LL*) fix boto ec2 module create_image doc - - **PR** `#30770`_: (*jacobhammons*) Doc restructuring, organization, and cleanup - | refs: `#39173`_ - - **PR** `#10792`_: (*cachedout*) Documentation overhaul - | refs: `#39173`_ - * c3e541e Merge pull request `#39198`_ from rallytime/merge-2016.11 - * 7ea5f7f Merge branch '2016.3' into '2016.11' + * f6aad99db2 Merge branch '2016.3' into '2016.11' - * fa45cbc Merge pull request `#39166`_ from Ch3LL/fix_boto_ec2_docs + * 1b9217d636 Update jsonschema tests to reflect change in jsonschema 2.6.0 (`#39260`_) - * 90af696 fix boto ec2 module create_image doc + * c1d16cc3d0 Better handling of enabled/disabled arguments in pkgrepo.managed (`#39251`_) - * a40cb46 Merge pull request `#39173`_ from rallytime/restore-community-docs + * 8e88f71dd9 Merge pull request `#39227`_ from terminalmage/loader-optimization - * 5aeddf4 Restore "Salt Community" doc section + * c750662946 Loader optimzation -- **PR** `#39063`_: (*mirceaulinic*) Avoid KeyError: 'multiprocessing' in the master logs - @ *2017-02-06T19:37:35Z* + * bc89b297f8 Merge pull request `#39228`_ from gtmanfred/2016.3 - - **ISSUE** `#39059`_: (*mirceaulinic*) KeyError: 'multiprocessing' in the master logs (proxy minions) - | refs: `#39063`_ - * 2a85d73 Merge pull request `#39063`_ from cloudflare/ISS-39059 - * 7118eff Avoid KeyError: 'multiprocessing' + * afee047b08 default to utf8 encoding if not specified -- **PR** `#39083`_: (*lomeroe*) Backport `#36336`_ to 2016.11 - @ *2017-02-06T18:50:52Z* + * d9b0671dbd Merge pull request `#39231`_ from terminalmage/clarify-jenkins-depends - - **ISSUE** `#38782`_: (*lomeroe*) win_lgpo unable to find some Administrative Template policies - | refs: `#39083`_ `#39090`_ `#38783`_ - - **ISSUE** `#38761`_: (*DaveOHenry*) Cannot apply state that contains lgpo.set - | refs: `#39083`_ `#39088`_ - - **ISSUE** `#38689`_: (*lomeroe*) win_lgpo state fails to set single policy due to case sensitive check - | refs: `#39083`_ `#39084`_ `#38690`_ - - **ISSUE** `#38100`_: (*skjaro*) Problem with win_lgpo.py in salt 2016.11.0 - | refs: `#38779`_ `#39083`_ `#39089`_ - - **ISSUE** `#21485`_: (*lorengordon*) Feature Request: Manage Windows Local Security Policy Settings - | refs: `#36336`_ - - **PR** `#36336`_: (*lomeroe*) add additional static policies to computer configuration policy class - | refs: `#39083`_ - * 91c25bd Merge pull request `#39083`_ from lomeroe/`bp-36336`_ - * 03e5319 Merge branch '2016.11' into `bp-36336`_ + * ad1b1255f2 Add clarification for jenkins execution module - * 981ec89 update command line example to correct policy name + * ddcff89a84 Merge pull request `#39232`_ from terminalmage/issue21342 - * e2574da Fix/Add documentation, 80 char line lengths + * c88896c277 Avoid recursion in s3/svn ext_pillars - * 5e94a30 add additional static policies to computer configuration policy class duplicate code cleanup/misc code efficiencies + * ef4e437bbc Fix the win_ip_test failures (`#39230`_) -- **PR** `#39153`_: (*nicholasmhughes*) Fix selinux.mode state config file handling - @ *2017-02-06T18:37:34Z* + * df5f934c34 Merge pull request `#39199`_ from rallytime/bp-39170 - * 3045507 Merge pull request `#39153`_ from nicholasmhughes/fix-selinux.mode-config-predictability - * 8d8ba9c added the new getconfig function to the test + * c129905310 Added missing source_hash_name argument in get_managed function Additional fix to `#33187`_ Customer was still seeing errors, this should now work. Tested with 2015.8.13 and 2016.11.2 - * a6a24e1 Addressed edge case when attempting to set the config file to 'Disabled'. The state should only check the file, since the in-memory setting won't disappear until after reboot. + * 2621c119fd Merge pull request `#39206`_ from cachedout/issue_issue_37174 - * 6858658 The selinux.mode state only checked the current status of SELinux in memory (getenforce) when determining if changes needed to be made. The /etc/selinux/config file could have a different value, and it would not be changed. This commit enhances idempotency of the state in regards to both the in-memory and configuration file enforcement of SELinux. + * be31e0559c Ignore empty dicts in highstate outputter -- **PR** `#39159`_: (*clinta*) Csr crl passphrase - @ *2017-02-06T18:36:05Z* + * dd440452ea Merge pull request `#39209`_ from terminalmage/sorted-envs - - **ISSUE** `#38081`_: (*haraldrudell*) x509 state or module cannot generate password protected private keys - | refs: `#39159`_ - * 7b5eb17 Merge pull request `#39159`_ from clinta/csr-crl-passphrase - * cf548ac Remove unnecessary pass + * e6dda4a625 Sort the return list from the fileserver.envs runner - * 4ebf7a3 Remove unnecessary pass statement + * 7bed68743e [2016.3] Pylint fix (`#39202`_) - * 6a80469 fix csr bugs and pep8 + * ab76054127 Merge pull request `#39197`_ from cachedout/pr-38793 - * 36dcf5f only overwrite if overwrite option is specified + * f3d35fb5c6 Lint fixes - * 403000d recreate cert on bad password + * 624f25b78d Fix for `#38697`_ - * 6497094 passphrase for crl +* **ISSUE** `#39269`_: (`alexharrington`_) Remount forced with lizardfs fuse filesystem due to device missmatch (refs: `#39276`_) - * 3ef809f passphrase for csr +* **ISSUE** `#39106`_: (`carsten-AEI`_) CVMFS fuse mount gets remounted every time (refs: `#39276`_) -- **PR** `#39162`_: (*meaksh*) Adding more function to Snapper module - @ *2017-02-06T18:33:53Z* +* **PR** `#39276`_: (`gtmanfred`_) _device_mismatch_ignored will never be True + @ *2017-02-09 17:05:28 UTC* - * b240468 Merge pull request `#39162`_ from meaksh/snapper-module-improvements - * f950732 pylint fixes + * 304eb19b18 Merge pull request `#39276`_ from gtmanfred/2016.11 - * aa2f990 Removing extra spaces + * 6635a9fd3b _device_mismatch_ignored will never be True - * 9d6a33f Adds 'snapper.create_config' unit tests +* **PR** `#39238`_: (`dmurphy18`_) Update disk fstype, inodeusage, percent and mount.active functions for AIX support + @ *2017-02-08 21:53:32 UTC* - * d38ed50 Adds 'snapper.modify_snapshots' unit tests + * 7611698474 Merge pull request `#39238`_ from dmurphy18/fix_aix_disk_mount - * d5496cc Adds 'snapper.delete_snapshots' unit tests + * a8a519c493 Removed space for pylint - * 3eecb60 Snapper: Adding support for creating configurations + * 8fa0ffa427 Updates due to code review comments - * 041e54d Snapper: Adding support for snapshot metadata modification + * 97c59a8d1c Updated mount functionality for active on AIX - * eaf5de9 Snapper: Adding support for deleting snapshots + * 1a32b2cc89 Updated disk functionality for fstype, inodeuage and percent on AIX -- **PR** `#39171`_: (*techhat*) Raise an error for a disk size that is too small - @ *2017-02-06T18:19:46Z* +* **PR** `#39233`_: (`rallytime`_) Various doc updates to fix warnings in doc build + @ *2017-02-08 19:29:53 UTC* - - **ISSUE** `#38370`_: (*tjyang*) Salt-Cloud: There was a query error: Required field "deviceChange" not provided (not @optional) - | refs: `#39171`_ - * 6f9251e Merge pull request `#39171`_ from techhat/issue38370 - * ec57a39 Typo + * 99bfa7dfee Merge pull request `#39233`_ from rallytime/fixup-more-doc-build-warnings - * 2ed2932 Clean up debug logs + * 2f74dcf685 Various doc updates to fix warnings in doc build - * 6712826 Raise an error for a disk size that is too small +* **PR** `#39237`_: (`axmetishe`_) fix rds subnet group creation + @ *2017-02-08 19:04:31 UTC* -- **PR** `#39179`_: (*mcalmer*) fix error parsing - @ *2017-02-06T17:57:00Z* + * 59e927b520 Merge pull request `#39237`_ from axmetishe/2016.11 - * 036f36d Merge pull request `#39179`_ from mcalmer/fix-dockerng-error-parsing - * 6750ccd fix error parsing + * 6f4be8b69c fix rds subnet group creation -- **PR** `#39189`_: (*morganwillcock*) Fix NetBSD sockstat parsing - @ *2017-02-06T17:28:08Z* + * **PR** `#39234`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 - * 30f8315 Merge pull request `#39189`_ from morganwillcock/sockstat - * 344d13e Fix NetBSD sockstat example + * **PR** `#39225`_: (`terminalmage`_) Put legacy git_pillar on a deprecation path for Oxygen - * 64b6931 Fix NetBSD sockstat parsing +* **ISSUE** `#39078`_: (`morganwillcock`_) setup.py: cannot install without setting global options (refs: `#39180`_) -- **PR** `#39141`_: (*UtahDave*) Don't overwrite the minion_ids var that was passed - @ *2017-02-03T20:56:25Z* +* **PR** `#39180`_: (`morganwillcock`_) setup.py: Remove global options from install command + @ *2017-02-07 16:20:49 UTC* - - **ISSUE** `#38003`_: (*morganwillcock*) salt.runners.cache functions seem to ignore minion targeting parameter - | refs: `#39141`_ `#39141`_ - * 6a97041 Merge pull request `#39141`_ from UtahDave/fix_cache_lookup_ZD1187 - * 0340614 return all minions' grains if no tgt + * 19c3d90a32 Merge pull request `#39180`_ from morganwillcock/setup - * f833bf3 Don't overwrite the minion_ids var that was passed + * d7e05091a2 Remove global options from Install -- **PR** `#39164`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-02-03T17:57:07Z* +* **PR** `#38863`_: (`hujunya`_) fix django auth not work + @ *2017-02-07 15:43:00 UTC* - - **ISSUE** `#39118`_: (*bobrik*) Minion ipv6 option is not documented - - **ISSUE** `#38704`_: (*nasenbaer13*) Archive extracted fails when another state run is queued - | refs: `#38705`_ - - **ISSUE** `#2016`_: (*seanchannel*) status.custom failing on any arguments - - **ISSUE** `#3`_: (*thatch45*) libvirt module - - **ISSUE** `#1`_: (*thatch45*) Enable regex on the salt cli - - **PR** `#39146`_: (*gtmanfred*) update vmware getting started doc - - **PR** `#39145`_: (*garethgreenaway*) [2016.3] Fix when targeting via pillar with Salt syndic - - **PR** `#39131`_: (*bobrik*) Clarify ipv6 option for minion and interface for master, closes `#39118`_ - - **PR** `#39116`_: (*terminalmage*) Don't abort pillar.get with merge=True if default is None - - **PR** `#39077`_: (*terminalmage*) Apply fix from `#38705`_ to 2016.3 branch - - **PR** `#38804`_: (*alexbleotu*) Second attempt to fix prepending of root_dir to paths - - **PR** `#38705`_: (*nasenbaer13*) Fix for `#38704`_ archive extracted and dockerio states - | refs: `#39076`_ - * d19cee7 Merge pull request `#39164`_ from rallytime/merge-2016.11 - * 6504bb6 Merge branch '2016.3' into '2016.11' + * a0907bc861 Merge pull request `#38863`_ from hujunya/fix_django_auth - * 9de08af Apply fix from `#38705`_ to 2016.3 branch (`#39077`_) + * 2a99ff46d3 check if django_auth_path has been in sys.path - * da3053e update vmware getting started doc (`#39146`_) + * 933ebf15d7 fix pylint violations - * e78ca0f Fixing a weird edge case when using salt syndics and targetting via pillar. Without this fix the master of masters ends up in an infinite loop since the data returned from the minions is differently structured than if a sync was not in use. (`#39145`_) + * 6b5a7f4b64 fix django auth not work - * cd8077a Merge pull request `#38804`_ from alexbleotu/root_dir_`fix-2016`_.3-gh +* **PR** `#39198`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-02-06 21:01:56 UTC* - * b3bdd3b Add missing whiteline + * c3e541e0a2 Merge pull request `#39198`_ from rallytime/merge-2016.11 - * c7715ac Merge pull request `#3`_ from cro/ab_rootdirfix + * 7ea5f7f82f Merge branch '2016.3' into '2016.11' - * e8cbafa When running testsuite, salt.syspaths.ROOT_DIR is often empty. + * fa45cbc359 Merge pull request `#39166`_ from Ch3LL/fix_boto_ec2_docs - * b12dd44 Merge pull request `#1`_ from cro/ab_rootdirfix + * 90af696331 fix boto ec2 module create_image doc - * bffc537 Remove extra if statements (rstrip will check for the presence anyway). + * a40cb46249 Merge pull request `#39173`_ from rallytime/restore-community-docs - * 97521b3 Second attempt to fix prepending of root_dir to paths + * 5aeddf42a0 Restore "Salt Community" doc section - * 6ffeda3 Clarify ipv6 option for minion and interface for master, closes `#39118`_ (`#39131`_) +* **ISSUE** `#39059`_: (`mirceaulinic`_) KeyError: 'multiprocessing' in the master logs (proxy minions) (refs: `#39063`_) - * 646b9ea Don't abort pillar.get with merge=True if default is None (`#39116`_) +* **PR** `#39063`_: (`mirceaulinic`_) Avoid KeyError: 'multiprocessing' in the master logs + @ *2017-02-06 19:37:35 UTC* -- **PR** `#39152`_: (*twangboy*) Remove files not needed by salt-minion - @ *2017-02-03T17:11:11Z* + * 2a85d73f59 Merge pull request `#39063`_ from cloudflare/ISS-39059 - * ed12512 Merge pull request `#39152`_ from twangboy/win_installer - * 5ff8a14 Fix problem deleting files + * 7118eff034 Avoid KeyError: 'multiprocessing' - * 4524dd4 Remove files not needed by salt-minion +* **ISSUE** `#38782`_: (`lomeroe`_) win_lgpo unable to find some Administrative Template policies (refs: `#38783`_, `#39083`_, `#39090`_) -* 8c0dc91 correct issue when running get with return_not_configured=True (`#39085`_) +* **ISSUE** `#38761`_: (`DaveOHenry`_) Cannot apply state that contains lgpo.set (refs: `#39083`_, `#39088`_) - - **ISSUE** `#38691`_: (*lomeroe*) win_lgpo module throws a key error when run with return_not_configured=True - | refs: `#39085`_ - - **PR** `#39085`_: (*lomeroe*) Backport `#38666`_ to 2016.11 +* **ISSUE** `#38689`_: (`lomeroe`_) win_lgpo state fails to set single policy due to case sensitive check (refs: `#39083`_, `#39084`_, `#38690`_) -* 26eea61 have _in_range_inclusive function attempt to convert a string to an int for the test (allow string based numbers to be verified to be in range). Specifically, this allows the CachedLogonsCount policy to be set (stored in the registry as a REG_SZ and specified as a string number when passed to the module) (`#39086`_) +* **ISSUE** `#38100`_: (`skjaro`_) Problem with win_lgpo.py in salt 2016.11.0 (refs: `#39083`_, `#39089`_, `#38779`_) - - **PR** `#39086`_: (*lomeroe*) Backport `#38165`_ to 2016.11 - - **PR** `#38165`_: (*lomeroe*) have _in_range_inclusive function attempt to convert a string to an i… - | refs: `#39086`_ +* **ISSUE** `#21485`_: (`lorengordon`_) Feature Request: Manage Windows Local Security Policy Settings (refs: `#36336`_) -- **PR** `#38970`_: (*gtmanfred*) when using local_cache we have to pass the list of minions - @ *2017-02-02T19:24:39Z* +* **PR** `#39083`_: (`lomeroe`_) Backport `#36336`_ to 2016.11 + @ *2017-02-06 18:50:52 UTC* - - **ISSUE** `#38241`_: (*frogunder*) mine.get and salt-ssh gives error message - | refs: `#38970`_ - * 4eec641 Merge pull request `#38970`_ from gtmanfred/2016.11 - * ebb9df3 when using local_cache we have to pass the list of minions + * **PR** `#36336`_: (`lomeroe`_) add additional static policies to computer configuration policy class (refs: `#39083`_) -* 75da6f4 Fix archive.list on Windows (`#39128`_) + * 91c25bd651 Merge pull request `#39083`_ from lomeroe/bp-36336 - - **ISSUE** `#39110`_: (*morganwillcock*) archive.extracted: 2016.11.2 returns state failure for some zip formats, if already extracted - | refs: `#39128`_ - - **PR** `#39128`_: (*terminalmage*) Fix archive.list on Windows + * 03e5319124 Merge branch '2016.11' into bp-36336 -* f2c309a Back-port `#36714`_ to 2016.11 (`#39133`_) + * 981ec89a4d update command line example to correct policy name - - **ISSUE** `#36712`_: (*dmitrievav*) s3.put function does not create s3 bucket - | refs: `#36714`_ - - **PR** `#39133`_: (*rallytime*) Back-port `#36714`_ to 2016.11 - - **PR** `#36714`_: (*dmitrievav*) s3.put can't create s3 bucket - | refs: `#39133`_ + * e2574da0b8 Fix/Add documentation, 80 char line lengths -* 8b34fcd correct checking of policy_class to compare with lower() version of the specified string (`#39084`_) + * 5e94a30a34 add additional static policies to computer configuration policy class duplicate code cleanup/misc code efficiencies - - **ISSUE** `#38689`_: (*lomeroe*) win_lgpo state fails to set single policy due to case sensitive check - | refs: `#39083`_ `#39084`_ `#38690`_ - - **PR** `#39084`_: (*lomeroe*) Backport `#38690`_ to 2016.11 - - **PR** `#38690`_: (*lomeroe*) correct checking of policy_class to compare with lower() version of t… - | refs: `#39084`_ +* **PR** `#39153`_: (`nicholasmhughes`_) Fix selinux.mode state config file handling + @ *2017-02-06 18:37:34 UTC* -* 8ce928f Backport `#38779`_ to 2016.11 (`#39089`_) + * 30455079fe Merge pull request `#39153`_ from nicholasmhughes/fix-selinux.mode-config-predictability - - **ISSUE** `#38100`_: (*skjaro*) Problem with win_lgpo.py in salt 2016.11.0 - | refs: `#38779`_ `#39083`_ `#39089`_ - - **PR** `#39089`_: (*lomeroe*) Backport `#38779`_ to 2016.11 - - **PR** `#38779`_: (*lomeroe*) win_lgpo handle errors when 'encoding="unicode"' exists in ADMX file - | refs: `#39089`_ + * 8d8ba9c7d2 added the new getconfig function to the test -* 8a00ecf update adml text search to use 'starts-with' as some policies text has trailing spaces (`#39090`_) + * a6a24e1a1b Addressed edge case when attempting to set the config file to 'Disabled'. The state should only check the file, since the in-memory setting won't disappear until after reboot. - - **ISSUE** `#38782`_: (*lomeroe*) win_lgpo unable to find some Administrative Template policies - | refs: `#39083`_ `#39090`_ `#38783`_ - - **PR** `#39090`_: (*lomeroe*) Backport `#38783`_ to 2016.11 - - **PR** `#38783`_: (*lomeroe*) Perform a "starts-with" search to match ADML text names - | refs: `#39090`_ + * 6858658cc2 The selinux.mode state only checked the current status of SELinux in memory (getenforce) when determining if changes needed to be made. The /etc/selinux/config file could have a different value, and it would not be changed. This commit enhances idempotency of the state in regards to both the in-memory and configuration file enforcement of SELinux. -* 9dccb9f correctly handle scenario when "storeAsText" is True on a decimal/longDecimal element object (`#39088`_) +* **ISSUE** `#38081`_: (`haraldrudell`_) x509 state or module cannot generate password protected private keys (refs: `#39159`_) - - **ISSUE** `#38761`_: (*DaveOHenry*) Cannot apply state that contains lgpo.set - | refs: `#39083`_ `#39088`_ - - **PR** `#39088`_: (*lomeroe*) Backport `#37262`_ to 2016.11 - - **PR** `#37262`_: (*lomeroe*) correct issues in win_lgpo module - | refs: `#39088`_ +* **PR** `#39159`_: (`clinta`_) Csr crl passphrase + @ *2017-02-06 18:36:05 UTC* -- **PR** `#39122`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-02-01T21:41:59Z* + * 7b5eb17cbe Merge pull request `#39159`_ from clinta/csr-crl-passphrase - - **PR** `#39091`_: (*terminalmage*) Run test_valid_docs in batches - - **PR** `#39081`_: (*terminalmage*) Move fileclient tests to tests/integration/fileserver/fileclient_test.py - - **PR** `#39067`_: (*rallytime*) Bump openstack deprecation notice to Oxygen - * 50d72da Merge pull request `#39122`_ from rallytime/merge-2016.11 - * a782b00 Merge branch '2016.3' into '2016.11' + * cf548ac717 Remove unnecessary pass - * cc9b69b Merge pull request `#39091`_ from terminalmage/update-test-valid-docs + * 4ebf7a3df4 Remove unnecessary pass statement - * d76f038 add debug logging for batch vars + * 6a8046970e fix csr bugs and pep8 - * b4afea2 Don't fail test if data is empty + * 36dcf5f3da only overwrite if overwrite option is specified - * b3a5d54 Account for trimmed value in 'salt -d' output + * 403000d375 recreate cert on bad password - * 909916c Run test_valid_docs in batches + * 6497094ba7 passphrase for crl - * bcee3d1 Move fileclient tests to tests/integration/fileserver/fileclient_test.py (`#39081`_) + * 3ef809fb0f passphrase for csr - * 122422b Bump openstack deprecation notice to Oxygen (`#39067`_) +* **PR** `#39162`_: (`meaksh`_) Adding more function to Snapper module + @ *2017-02-06 18:33:53 UTC* -- **PR** `#39087`_: (*lomeroe*) Backport `#37375`_ to 2016.11 - @ *2017-02-01T19:02:58Z* + * b240468525 Merge pull request `#39162`_ from meaksh/snapper-module-improvements - - **PR** `#37375`_: (*lomeroe*) add updating gpt.ini file when ADM template policies are modified (gp… - | refs: `#39087`_ - * f8a6863 Merge pull request `#39087`_ from lomeroe/`bp-37375`_ - * c3aaa53 _in_range_inclusive class method incorrectly called isinstance + * f950732fa0 pylint fixes - * ce263f9 set_computer_policy and set_user_policy call "set" by the original function name (set) instead of the aliased function name ``set_`` + * aa2f9906e0 Removing extra spaces - * ff7d74b correct tool extension guid for user registry policies + * 9d6a33f257 Adds 'snapper.create_config' unit tests - * 08f0078 spelling correction + * d38ed505f8 Adds 'snapper.modify_snapshots' unit tests - * 5fc4048 add updating gpt.ini file when ADM template policies are modified (gpt.ini file must exist with proper data for ADM policies to apply) + * d5496ccc99 Adds 'snapper.delete_snapshots' unit tests -- **PR** `#39094`_: (*rallytime*) Add a bunch of missing doc module references - @ *2017-02-01T18:56:27Z* + * 3eecb6076b Snapper: Adding support for creating configurations - * c4c6e70 Merge pull request `#39094`_ from rallytime/doc-build-warnings - * b866427 Add a bunch of missing doc module references + * 041e54d42a Snapper: Adding support for snapshot metadata modification -- **PR** `#39108`_: (*janhorstmann*) [Bugfix] Fix state x509.crl_managed - @ *2017-02-01T18:32:43Z* + * eaf5de9dce Snapper: Adding support for deleting snapshots - * d302bb7 Merge pull request `#39108`_ from janhorstmann/fix-x509-state - * 9f5c532 [Bugfix] Fix state x509.crl_managed +* **ISSUE** `#38370`_: (`tjyang`_) Salt-Cloud: There was a query error: Required field "deviceChange" not provided (not @optional) (refs: `#39171`_) -- **PR** `#39107`_: (*mirceaulinic*) Check if data['return'] is dict type - @ *2017-02-01T18:21:46Z* +* **PR** `#39171`_: (`techhat`_) Raise an error for a disk size that is too small + @ *2017-02-06 18:19:46 UTC* - - **ISSUE** `#39100`_: (*whytewolf*) salt-run fileserver.update Exception - | refs: `#39107`_ - - **ISSUE** `#39098`_: (*dougofthemoment*) state.event runner fails with TypeError: argument of type 'NoneType' is not iterable - | refs: `#39107`_ - - **ISSUE** `#38638`_: (*mirceaulinic*) `salt.cmd` runner raises TypeError when function returns bool - | refs: `#39107`_ - * bf61ec9 Merge pull request `#39107`_ from cloudflare/FIX-38638 - * 7c34815 Check if data['return'] is dict type + * 6f9251ebed Merge pull request `#39171`_ from techhat/issue38370 -* cac0bec Update primary bonding option in rh_ip.py (`#39069`_) + * ec57a39c00 Typo - - **ISSUE** `#39065`_: (*jak3kaj*) primary bonding option is not applied - | refs: `#39068`_ `#39069`_ - - **PR** `#39069`_: (*jak3kaj*) Update primary bonding option in rh_ip.py + * 2ed2932387 Clean up debug logs -* a0861f0 Update primary bonding option in debian_ip.py (`#39068`_) + * 671282656a Raise an error for a disk size that is too small - - **ISSUE** `#39065`_: (*jak3kaj*) primary bonding option is not applied - | refs: `#39068`_ `#39069`_ - - **PR** `#39068`_: (*jak3kaj*) Update primary bonding option in debian_ip.py +* **PR** `#39179`_: (`mcalmer`_) fix error parsing + @ *2017-02-06 17:57:00 UTC* -- **PR** `#39076`_: (*terminalmage*) Re-submit PR `#38705`_ against 2016.11 branch - @ *2017-01-31T20:11:55Z* + * 036f36dc9b Merge pull request `#39179`_ from mcalmer/fix-dockerng-error-parsing - - **ISSUE** `#38704`_: (*nasenbaer13*) Archive extracted fails when another state run is queued - | refs: `#38705`_ - - **PR** `#38705`_: (*nasenbaer13*) Fix for `#38704`_ archive extracted and dockerio states - | refs: `#39076`_ - * 9836d7d Merge pull request `#39076`_ from terminalmage/pr-38705 - * 15db8d4 Fix for `#38704`_ archive extracted and dockerio states + * 6750ccd78e fix error parsing -- **PR** `#39058`_: (*sergeizv*) Fix salt.modules.linux_lvm.fullversion - @ *2017-01-31T19:01:12Z* +* **PR** `#39189`_: (`morganwillcock`_) Fix NetBSD sockstat parsing + @ *2017-02-06 17:28:08 UTC* - - **ISSUE** `#39057`_: (*sergeizv*) modules.linux_lvm.fullversion provides incomplete info - | refs: `#39058`_ - * 86b4b77 Merge pull request `#39058`_ from sergeizv/fix-lvm-fullversion - * e46c89f Fix salt.modules.linux_lvm.fullversion + * 30f83156cb Merge pull request `#39189`_ from morganwillcock/sockstat - * fb7ef99 Fix mock emulating lvm version + * 344d13eff5 Fix NetBSD sockstat example -- **PR** `#39066`_: (*techhat*) 127.0.0.0/8 is all loopback - @ *2017-01-31T18:43:22Z* + * 64b693195c Fix NetBSD sockstat parsing - - **ISSUE** `#39051`_: (*afletch*) salt.roster.cache / salt.utils.cloud is_public_ip - incorrect public IP address - | refs: `#39066`_ - * 721b245 Merge pull request `#39066`_ from techhat/issue39051 - * ea43bb8 127.0.0.0/8 is all loopback +* **ISSUE** `#38003`_: (`morganwillcock`_) salt.runners.cache functions seem to ignore minion targeting parameter (refs: `#39141`_) -- **PR** `#39071`_: (*sergeizv*) Fix modules.linux_lvm.pvcreate on existing LVM PVs - @ *2017-01-31T18:36:54Z* +* **PR** `#39141`_: (`UtahDave`_) Don't overwrite the minion_ids var that was passed + @ *2017-02-03 20:56:25 UTC* - - **ISSUE** `#39070`_: (*sergeizv*) modules.linux_lvm.pvcreate misbehaves if all submitted devices are already LVM PVs - | refs: `#39071`_ - * c54d9f4 Merge pull request `#39071`_ from sergeizv/fix-lvm-pvcreate - * f1e3e86 Fix modules.linux_lvm.pvcreate on existing LVM PVs + * 6a9704189f Merge pull request `#39141`_ from UtahDave/fix_cache_lookup_ZD1187 - * 0f84ca2 Add test for modules.linux_lvm.pvcreate on existing LVM PVs + * 0340614d15 return all minions' grains if no tgt - * 3967992 Fix test for modules.linux_lvm.pvcreate + * f833bf3a79 Don't overwrite the minion_ids var that was passed -- **PR** `#39048`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-01-31T15:55:49Z* +* **PR** `#39164`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-02-03 17:57:07 UTC* - - **ISSUE** `#38753`_: (*alexbleotu*) `__proxy__` dunder is not injected when invoking the `salt` variable in sls files - | refs: `#38899`_ `#38900`_ `#38829`_ - - **ISSUE** `#38557`_: (*alexbleotu*) Proxy not working on develop - | refs: `#38829`_ - - **ISSUE** `#38265`_: (*mirceaulinic*) `__utils__` object not available in proxy module - | refs: `#38899`_ `#38900`_ `#38829`_ `#38829`_ - - **ISSUE** `#32918`_: (*mirceaulinic*) Proxy minions reconnection - | refs: `#38829`_ - - **PR** `#39047`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - - **PR** `#39046`_: (*rallytime*) Add 2015.8.14 release notes file - - **PR** `#39045`_: (*rallytime*) Add 2016.3.6 release notes file - - **PR** `#39042`_: (*rallytime*) [2016.3] Update release numbers for doc build - - **PR** `#39038`_: (*rallytime*) Update 2016.3.5 release notes - - **PR** `#39037`_: (*rallytime*) Update 2015.8.13 release notes - - **PR** `#39030`_: (*rallytime*) Back-port `#38972`_ to 2016.3 - - **PR** `#39028`_: (*terminalmage*) Clarify delimiter argument - - **PR** `#38972`_: (*rallytime*) Add CLI Example for rest_sample_utils.get_test_string function - | refs: `#39030`_ - - **PR** `#38899`_: (*cro*) Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ for proxies. - | refs: `#38900`_ - - **PR** `#38829`_: (*cro*) MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic - | refs: `#38899`_ `#38900`_ - - **PR** `#37864`_: (*mirceaulinic*) Proxy keepalive feature - | refs: `#38829`_ - * 88b171f Merge pull request `#39048`_ from rallytime/merge-2016.11 - * b2b3989 Merge branch '2016.3' into '2016.11' + * d19cee716f Merge pull request `#39164`_ from rallytime/merge-2016.11 - * a24af5a Merge pull request `#39047`_ from rallytime/merge-2016.3 + * 6504bb6b02 Merge branch '2016.3' into '2016.11' - * b732a1f Merge branch '2015.8' into '2016.3' + * 9de08af950 Apply fix from `#38705`_ to 2016.3 branch (`#39077`_) - * 56ccae6 Add 2015.8.14 release notes file (`#39046`_) + * da3053ea9b update vmware getting started doc (`#39146`_) - * 5943fe6 Update 2015.8.13 release notes (`#39037`_) + * e78ca0f575 Fixing a weird edge case when using salt syndics and targetting via pillar. Without this fix the master of masters ends up in an infinite loop since the data returned from the minions is differently structured than if a sync was not in use. (`#39145`_) - * fef1b11 Add 2016.3.6 release notes file (`#39045`_) + * cd8077ab81 Merge pull request `#38804`_ from alexbleotu/root_dir_fix-2016.3-gh - * 7c43f4a [2016.3] Update release numbers for doc build (`#39042`_) + * b3bdd3b04a Add missing whiteline - * ff32459 Update 2016.3.5 release notes (`#39038`_) + * c7715acd53 Merge pull request `#3`_ from cro/ab_rootdirfix - * 5b09dc4 Merge pull request `#39028`_ from terminalmage/clarify-delimiter-argument + * e8cbafaaf1 When running testsuite, salt.syspaths.ROOT_DIR is often empty. - * f29ef07 Clarify delimiter argument + * b12dd44a26 Merge pull request `#1`_ from cro/ab_rootdirfix - * 1ff359f Add CLI Example for rest_sample_utils.get_test_string function (`#39030`_) + * bffc537aca Remove extra if statements (rstrip will check for the presence anyway). - * f13fb9e Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ availability in proxies. (`#38899`_) + * 97521b3468 Second attempt to fix prepending of root_dir to paths -* 92a542f Add CLI Examples so tests will pass (`#39035`_) + * 6ffeda3ee5 Clarify ipv6 option for minion and inteface for master, closes `#39118`_ (`#39131`_) - - **PR** `#39035`_: (*cro*) Add CLI Examples so tests will pass + * 646b9ea4e5 Don't abort pillar.get with merge=True if default is None (`#39116`_) -* 0943872 Add 2016.11.3 release notes file (`#39044`_) +* **PR** `#39152`_: (`twangboy`_) Remove files not needed by salt-minion + @ *2017-02-03 17:11:11 UTC* - - **PR** `#39044`_: (*rallytime*) Add 2016.11.3 release notes file + * ed12512045 Merge pull request `#39152`_ from twangboy/win_installer -* 27081d6 [2016.11] Update release numbers for doc build (`#39040`_) + * 5ff8a14317 Fix problem deleting files - - **PR** `#39040`_: (*rallytime*) [2016.11] Update release numbers for doc build + * 4524dd49d4 Remove files not needed by salt-minion -* 424e684 Update 2016.11.2 release notes (`#39039`_) +* **ISSUE** `#38691`_: (`lomeroe`_) win_lgpo module throws a key error when run with return_not_configured=True (refs: `#39085`_, `#38666`_) - - **PR** `#39039`_: (*rallytime*) Update 2016.11.2 release notes + * **PR** `#39085`_: (`lomeroe`_) Backport `#38666`_ to 2016.11 -* a7fc02e Ungate the status.py module and raise unsupported errors in functions not executable on Windows. (`#39005`_) + * **PR** `#38666`_: (`lomeroe`_) correct issue when running lgpo.get with return_not_configured=True (refs: `#39085`_) - - **PR** `#39005`_: (*cro*) Ungate the status.py module and raise unsupported errors in functions not executable on Windows. - | refs: `#39536`_ + * **PR** `#39086`_: (`lomeroe`_) Backport `#38165`_ to 2016.11 -- **PR** `#39012`_: (*terminalmage*) Fix "invalid lexer" errors in docs build - @ *2017-01-28T06:47:45Z* + * **PR** `#38165`_: (`lomeroe`_) have _in_range_inclusive function attempt to convert a string to an i… (refs: `#39086`_) - * e70904c Merge pull request `#39012`_ from terminalmage/invalid-lexer - * 868001b Fix "invalid lexer" errors in docs build +* **ISSUE** `#38241`_: (`frogunder`_) mine.get and salt-ssh gives error message (refs: `#38970`_) -- **PR** `#39003`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-01-28T00:09:09Z* +* **PR** `#38970`_: (`gtmanfred`_) when using local_cache we have to pass the list of minions + @ *2017-02-02 19:24:39 UTC* - - **ISSUE** `#37938`_: (*johje349*) Memory leak in Reactor - | refs: `#38951`_ - - **ISSUE** `#34780`_: (*joehoyle*) S3fs broken in 2016.3.1 - | refs: `#38982`_ - - **ISSUE** `#33890`_: (*hvnsweeting*) salt memleak when running state.sls - | refs: `#38951`_ - - **PR** `#39000`_: (*rallytime*) Skip the test_badload test until Jenkins move is complete - - **PR** `#38995`_: (*terminalmage*) Fix pillar.item docstring - - **PR** `#38989`_: (*anlutro*) Documentation: fix SLS in environment variable examples - - **PR** `#38982`_: (*rallytime*) Set response when using "GET" method in s3 utils - - **PR** `#38951`_: (*DmitryKuzmenko*) Keep the only one record per module-function in depends decorator. - * cea0f32 Merge pull request `#39003`_ from rallytime/merge-2016.11 - * 76e9508 Merge branch '2016.3' into '2016.11' + * 4eec641b65 Merge pull request `#38970`_ from gtmanfred/2016.11 - * da96221 Merge pull request `#38951`_ from DSRCorporation/bugs/37938_fix_depends_decorator_memleak + * ebb9df3ec7 when using local_cache we have to pass the list of minions - * 0b18f34 Keep the only one record per module-function in depends decorator. +* **ISSUE** `#39110`_: (`morganwillcock`_) archive.extracted: 2016.11.2 returns state failure for some zip formats, if already extracted (refs: `#39128`_) - * 85165ed Merge pull request `#38982`_ from rallytime/`fix-34780`_ + * **PR** `#39128`_: (`terminalmage`_) Fix archive.list on Windows - * 1583c55 Set response when using "GET" method in s3 utils +* **ISSUE** `saltstack/salt#36712`_: (`dmitrievav`_) s3.put function does not create s3 bucket (refs: `#36714`_) - * cfdbc99 Merge pull request `#38989`_ from alprs/docfix-state_pt3_environ + * **PR** `#39133`_: (`rallytime`_) Back-port `#36714`_ to 2016.11 - * 52a9ad1 fix SLS in environment variable examples + * **PR** `#36714`_: (`dmitrievav`_) s3.put can't create s3 bucket (refs: `#39133`_) - * 55e4d25 Merge pull request `#39000`_ from rallytime/skip-badload-test +* **ISSUE** `#38689`_: (`lomeroe`_) win_lgpo state fails to set single policy due to case sensitive check (refs: `#39083`_, `#39084`_, `#38690`_) - * 4b3ff0f Skip the test_badload test until Jenkins move is complete + * **PR** `#39084`_: (`lomeroe`_) Backport `#38690`_ to 2016.11 - * fe054eb Merge pull request `#38995`_ from terminalmage/fix-pillar.item-docstring + * **PR** `#38690`_: (`lomeroe`_) correct checking of policy_class to compare with lower() version of t… (refs: `#39084`_) - * 06d094d Fix pillar.item docstring +* **ISSUE** `#38100`_: (`skjaro`_) Problem with win_lgpo.py in salt 2016.11.0 (refs: `#39083`_, `#39089`_, `#38779`_) -- **PR** `#38908`_: (*bobrik*) Deprecate show_diff for file.serialize to mimic file.managed, closes `#38853`_ - @ *2017-01-27T17:15:37Z* + * **PR** `#39089`_: (`lomeroe`_) Backport `#38779`_ to 2016.11 - - **ISSUE** `#38853`_: (*bobrik*) file.serialize still expects show_diff instead of show_changes - * 58543d5 Merge pull request `#38908`_ from bobrik/show-changes-for-serialize - * e0af212 Remove unnecessary blank lines + * **PR** `#38779`_: (`lomeroe`_) win_lgpo handle errors when 'encoding="unicode"' exists in ADMX file (refs: `#39089`_) - * a08c1ca Deprecate show_diff for file.serialize to mimic file.managed, closes `#38853`_ +* **ISSUE** `#38782`_: (`lomeroe`_) win_lgpo unable to find some Administrative Template policies (refs: `#38783`_, `#39083`_, `#39090`_) -- **PR** `#38978`_: (*sjorge*) fixes saltstack/salt-bootstrap`#1021`_ - @ *2017-01-27T17:05:10Z* + * **PR** `#39090`_: (`lomeroe`_) Backport `#38783`_ to 2016.11 - - **ISSUE** `#1021`_: (*SEJeff*) Document needing the "RHEL Server Optional" channel for installing on RHEL6 - | refs: `#38978`_ - * 4b75dfa Merge pull request `#38978`_ from sjorge/2016.11-bootstrap - * 26eb35f fixes salt/salt-bootstrap`#1021`_ + * **PR** `#38783`_: (`lomeroe`_) Perform a "starts-with" search to match ADML text names (refs: `#39090`_) -- **PR** `#38991`_: (*isbm*) Isbm zypper state unknown pkg crash - @ *2017-01-27T16:59:38Z* +* **ISSUE** `#38761`_: (`DaveOHenry`_) Cannot apply state that contains lgpo.set (refs: `#39083`_, `#39088`_) - * b40f369 Merge pull request `#38991`_ from isbm/isbm-zypper-state-unknown-pkg-crash - * 35f620e Prevent crash on unknown to the repo package + * **PR** `#39088`_: (`lomeroe`_) Backport `#37262`_ to 2016.11 -- **PR** `#38979`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-01-26T22:56:13Z* + * **PR** `#37262`_: (`lomeroe`_) correct issues in win_lgpo module (refs: `#39088`_) - - **ISSUE** `#38540`_: (*amendlik*) API wheel client throws exception and success=true - | refs: `#38925`_ - - **ISSUE** `#38537`_: (*amendlik*) API client wheel_async always returns status 500 - | refs: `#38925`_ - - **ISSUE** `#35777`_: (*rallytime*) Properly deprecate template context data in Oxygen - | refs: `#38948`_ - - **ISSUE** `#34551`_: (*mbom2004*) salt.engines.logstash not loading - | refs: `#38950`_ - - **PR** `#38973`_: (*rallytime*) Handle changing "is_default" value in moto package for boto test mock - - **PR** `#38952`_: (*terminalmage*) Make the ext_pillars available to pillar.ext tunable - - **PR** `#38950`_: (*mbom2004*) Fixed Logstash Engine in file logstash.py - - **PR** `#38948`_: (*rallytime*) Bump the template context deprecation version to Oxygen - - **PR** `#38946`_: (*rallytime*) Back-port `#37632`_ to 2016.3 - - **PR** `#38926`_: (*gtmanfred*) add note about pysss for pam eauth - - **PR** `#38925`_: (*terminalmage*) Fix two wheel issues in netapi - - **PR** `#38917`_: (*twangboy*) Update Jinja2 to 2.9.4 - - **PR** `#38913`_: (*Adaephon-GH*) Ignore plist files without Label key - - **PR** `#37632`_: (*twangboy*) Fix versions report for Windows Server platforms - | refs: `#38946`_ - * 3e76662 Merge pull request `#38979`_ from rallytime/merge-2016.11 - * fdaa5ac Merge branch '2016.3' into '2016.11' +* **PR** `#39122`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-02-01 21:41:59 UTC* - * b66b6f6 Merge pull request `#38950`_ from mbom2004/2016.3 + * 50d72da3f6 Merge pull request `#39122`_ from rallytime/merge-2016.11 - * c09f39d Remove unused json import + * a782b00ee1 Merge branch '2016.3' into '2016.11' - * 249efa3 Fixed Logstash Engine in file logstash.py + * cc9b69b6bc Merge pull request `#39091`_ from terminalmage/update-test-valid-docs - * a6c6e47 Handle changing "is_default" value in moto package for boto test mock (`#38973`_) + * d76f0380d0 add debug logging for batch vars - * b965b5d Merge pull request `#38952`_ from terminalmage/zd1168 + * b4afea2a25 Don't fail test if data is empty - * 6b014e5 Rename on_demand_pillar to on_demand_ext_pillar + * b3a5d549c1 Account for trimmed value in 'salt -d' output - * d216f90 Document new on_demand_pillar option and add to config template + * 909916c78e Run test_valid_docs in batches - * 426b20f Add documentation for on-demand pillar to pillar.ext docstring + * bcee3d1ef6 Move fileclient tests to tests/integration/fileserver/fileclient_test.py (`#39081`_) - * 7b10274 Make on-demand ext_pillars tunable + * 122422bc08 Bump openstack deprecation notice to Oxygen (`#39067`_) - * d54723c Add on_demand_pillar config option +* **PR** `#39087`_: (`lomeroe`_) Backport `#37375`_ to 2016.11 + @ *2017-02-01 19:02:58 UTC* - * 2c4ad85 Merge pull request `#38948`_ from rallytime/bump-template-context-deprecation + * **PR** `#37375`_: (`lomeroe`_) add updating gpt.ini file when ADM template policies are modified (gp… (refs: `#39087`_) - * 749e003 Bump the template context deprecation version to Oxygen + * f8a6863d98 Merge pull request `#39087`_ from lomeroe/bp-37375 - * e4514ca Merge pull request `#38946`_ from rallytime/`bp-37632`_ + * c3aaa536f3 _in_range_inclusive class method incorrectly called isinstance - * ee37cda Fix some lint + * ce263f9372 set_computer_policy and set_user_policy call "set" by the original function name (set) instead of the aliased function name set\_ - * c08071e Fix versions report for server OSs + * ff7d74bfb0 correct tool extension guid for user registry policies - * 953a203 Merge pull request `#38913`_ from Adaephon-GH/patch-1 + * 08f0078ef3 spelling correction - * e2f4a16 Removing trailing whitespace + * 5fc40485f7 add updating gpt.ini file when ADM template policies are modified (gpt.ini file must exist with proper data for ADM policies to apply) - * 616292c Ignore plist files without Label key +* **PR** `#39094`_: (`rallytime`_) Add a bunch of missing doc module references + @ *2017-02-01 18:56:27 UTC* - * 826dce1 Merge pull request `#38917`_ from twangboy/update_jinja_mac + * c4c6e701af Merge pull request `#39094`_ from rallytime/doc-build-warnings - * 62e608b Update Jinja2 to 2.9.4 + * b866427f59 Add a bunch of missing doc module references - * b27733c Merge pull request `#38925`_ from terminalmage/issue38540 +* **PR** `#39108`_: (`janhorstmann`_) [Bugfix] Fix state x509.crl_managed + @ *2017-02-01 18:32:43 UTC* - * 76392fc Fix traceback when a netapi module uses wheel_async + * d302bb747e Merge pull request `#39108`_ from janhorstmann/fix-x509-state - * bd4474f Fix 'success' value for wheel commands + * 9f5c532510 [Bugfix] Fix state x509.crl_managed - * 618596f Merge pull request `#38926`_ from gtmanfred/2016.3 +* **ISSUE** `#39100`_: (`whytewolf`_) salt-run fileserver.update Exception (refs: `#39107`_) - * 9cae953 add note about pysss for pam eauth +* **ISSUE** `#39098`_: (`FraaJad`_) state.event runner fails with TypeError: argument of type 'NoneType' is not iterable (refs: `#39107`_) -- **PR** `#38937`_: (*arthru*) Fix smtp ret require gnupg - @ *2017-01-26T20:08:16Z* +* **ISSUE** `#38638`_: (`mirceaulinic`_) `salt.cmd` runner raises TypeError when function returns bool (refs: `#39107`_) - * 0660cc3 Merge pull request `#38937`_ from HashBangDev/fix-smtp-ret-require-gnupg - * 399556b Remove trailing whitespace +* **PR** `#39107`_: (`mirceaulinic`_) Check if data['return'] is dict type + @ *2017-02-01 18:21:46 UTC* - * f308d13 log an error on gnupg absence instead of raising an exception + * bf61ec9515 Merge pull request `#39107`_ from cloudflare/FIX-38638 - * 0427879 fails if gpgowner is set in smtp returner config but the installation lacks gnupg module + * 7c34815979 Check if data['return'] is dict type - * 27449c5 smtp returner does not require gnupg to be installed +* **ISSUE** `#39065`_: (`jak3kaj`_) primary bonding option is not applied (refs: `#39068`_, `#39069`_) -- **PR** `#38955`_: (*techhat*) Do a better job at error detection in runners - @ *2017-01-26T20:00:18Z* + * **PR** `#39069`_: (`jak3kaj`_) Update primary bonding option in rh_ip.py - - **ISSUE** `#38816`_: (*grichmond-salt*) Errors in cloud runners are not reliably being captured as failures. - | refs: `#38955`_ - * d947c5c Merge pull request `#38955`_ from techhat/issue38816 - * ea8654f Typo +* **ISSUE** `#39065`_: (`jak3kaj`_) primary bonding option is not applied (refs: `#39068`_, `#39069`_) - * 94050ff Watch out for bools + * **PR** `#39068`_: (`jak3kaj`_) Update primary bonding option in debian_ip.py - * 0142b0b Do a better job at error detection in runners +* **ISSUE** `#38704`_: (`nasenbaer13`_) Archive extracted fails when another state run is queued (refs: `#38705`_) -- **PR** `#38953`_: (*thatch45*) fix an issue where thorium would remove keys of reattaching minions - @ *2017-01-26T19:15:59Z* +* **PR** `#39076`_: (`terminalmage`_) Re-submit PR `#38705`_ against 2016.11 branch + @ *2017-01-31 20:11:55 UTC* - * 04a5b05 Merge pull request `#38953`_ from thatch45/thorium_keyfix - * 68e96b1 This is faster and cleaner + * **PR** `#38705`_: (`nasenbaer13`_) Fix for `#38704`_ archive extracted and dockerio states (refs: `#39077`_, `#39076`_) - * 13d28a3 fix an issue where thorium would remove keys of reattaching minions + * 9836d7dd29 Merge pull request `#39076`_ from terminalmage/pr-38705 -* 6b28a58 Add CLI Example for rest_sample_utils.get_test_string function (`#38972`_) + * 15db8d47ed Fix for `#38704`_ archive extracted and dockerio states - - **PR** `#38972`_: (*rallytime*) Add CLI Example for rest_sample_utils.get_test_string function - | refs: `#39030`_ +* **ISSUE** `#39057`_: (`sergeizv`_) modules.linux_lvm.fullversion provides incomplete info (refs: `#39058`_) -- **PR** `#38957`_: (*mcalmer*) Fix timezone handling for rpm installtime - @ *2017-01-26T18:41:15Z* +* **PR** `#39058`_: (`sergeizv`_) Fix salt.modules.linux_lvm.fullversion + @ *2017-01-31 19:01:12 UTC* - * 27166fa Merge pull request `#38957`_ from mcalmer/fix-rpm-install_date-timezone - * c7da9f8 Fix timezone handling for rpm installtime + * 86b4b77bfe Merge pull request `#39058`_ from sergeizv/fix-lvm-fullversion -- **PR** `#38965`_: (*toanju*) salt-cloud will use list_floating_ips for OpenStack - @ *2017-01-26T16:44:12Z* + * e46c89f9ed Fix salt.modules.linux_lvm.fullversion - - **PR** `#34280`_: (*kevinanderson1*) salt-cloud will use list_floating_ips for Openstack - | refs: `#38965`_ - * ec690a0 Merge pull request `#38965`_ from toanju/2016.11 - * 1253ce9 salt-cloud will use list_floating_ips for OpenStack + * fb7ef99838 Fix mock emulating lvm version -- **PR** `#38949`_: (*clinta*) Use signing passphrase as public passphrase when generating self-sign… - @ *2017-01-25T20:20:58Z* +* **ISSUE** `#39051`_: (`afletch`_) salt.roster.cache / salt.utils.cloud is_public_ip - incorrect public IP address (refs: `#39066`_) - * d906e8f Merge pull request `#38949`_ from clinta/x509-passphrase-bug - * c8697e3 Use signing passphrase as public passphrase when generating self-signed certificates +* **PR** `#39066`_: (`techhat`_) 127.0.0.0/8 is all loopback + @ *2017-01-31 18:43:22 UTC* -- **PR** `#38929`_: (*MTecknology*) Fix psutil regressions in 2016.11 - @ *2017-01-25T20:17:41Z* + * 721b245f90 Merge pull request `#39066`_ from techhat/issue39051 - * de3b2cc Merge pull request `#38929`_ from MTecknology/2016.11 - * 73a8c6d Load core grains only if required. + * ea43bb8101 127.0.0.0/8 is all loopback - * 4966011 Modules might still be needed, even if psutil loads. +* **ISSUE** `#39070`_: (`sergeizv`_) modules.linux_lvm.pvcreate misbehaves if all submitted devices are already LVM PVs (refs: `#39071`_) - * fb0432f Fixes a regression with old versions of python-psutil. +* **PR** `#39071`_: (`sergeizv`_) Fix modules.linux_lvm.pvcreate on existing LVM PVs + @ *2017-01-31 18:36:54 UTC* -- **PR** `#38940`_: (*isbm*) Isbm sanitizers fix and unit test - @ *2017-01-25T20:15:56Z* + * c54d9f4e2a Merge pull request `#39071`_ from sergeizv/fix-lvm-pvcreate - * 3ec806c Merge pull request `#38940`_ from isbm/isbm-sanitizers-fix-and-unit-test - * a112b79 Fix typo + * f1e3e86e6a Fix modules.linux_lvm.pvcreate on existing LVM PVs - * 47a1691 Add unit test + * 0f84ca2487 Add test for modules.linux_lvm.pvcreate on existing LVM PVs - * 046c543 Fix leading dots on sanitized hostname + * 3967992bfd Fix test for modules.linux_lvm.pvcreate -- **PR** `#38944`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-01-25T19:44:42Z* +* **PR** `#39048`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-01-31 15:55:49 UTC* - - **ISSUE** `#38825`_: (*IshMalik*) file.managed multiple sources for redundency failure - | refs: `#38847`_ - - **ISSUE** `#38798`_: (*ripta*) `match.compound` fails to match when pillar data is used - | refs: `#38823`_ - - **ISSUE** `#37413`_: (*Snarfingcode666*) Salt-cloud vmware missing reboot command - | refs: `#38889`_ `#38890`_ - - **ISSUE** `#36121`_: (*Ashald*) TemplateNotFound/Unable to cache file - | refs: `#38875`_ - - **PR** `#38890`_: (*cro*) Backport `#38887`_ to 2016.3: Enable resetting a VM via salt-cloud & VMware driver - - **PR** `#38883`_: (*techhat*) Don't require text_out path to exist - - **PR** `#38875`_: (*terminalmage*) Reactor: fix traceback when salt:// path is nonexistent - - **PR** `#38867`_: (*mchugh19*) Touch deploy.sh before use - | refs: `#38883`_ - - **PR** `#38851`_: (*terminalmage*) Support docker-py 2.0 in dockerng - - **PR** `#38847`_: (*terminalmage*) Catch MinionError in file.source_list - - **PR** `#38844`_: (*cachedout*) Fix memory leak in HTTP client - - **PR** `#38833`_: (*Ch3LL*) add 2016.3.5 changelog to release notes - - **PR** `#38823`_: (*gtmanfred*) pass pillar to compound matcher in match module - - **PR** `#32026`_: (*techhat*) Don't require the decode_out file to already exist - | refs: `#38883`_ - * e420763 Merge pull request `#38944`_ from rallytime/merge-2016.11 - * ee33a53 Merge branch '2016.3' into '2016.11' + * 88b171f863 Merge pull request `#39048`_ from rallytime/merge-2016.11 - * 405d86a Merge pull request `#38847`_ from terminalmage/issue38825 + * b2b3989773 Merge branch '2016.3' into '2016.11' - * 11a4780 Use log.exception() instead + * a24af5ac46 Merge pull request `#39047`_ from rallytime/merge-2016.3 - * e40fac5 Catch MinionError in file.source_list + * b732a1f646 Merge branch '2015.8' into '2016.3' - * b5df104 Merge pull request `#38875`_ from terminalmage/issue36121 + * 56ccae6ff7 Add 2015.8.14 release notes file (`#39046`_) - * fbc4d2a reactor: ensure glob_ref is a string + * 5943fe65d3 Update 2015.8.13 release notes (`#39037`_) - * 2e443d7 cp.cache_file: add note re: return for nonexistent salt:// path + * fef1b1133d Add 2016.3.6 release notes file (`#39045`_) - * e9ebec4 Merge pull request `#38890`_ from cro/vmware_reset_vm_20163 + * 7c43f4ac32 [2016.3] Update release numbers for doc build (`#39042`_) - * 0146562 Call correct function for resetting a VM + * ff324599d5 Update 2016.3.5 release notes (`#39038`_) - * c3fbfcd Merge pull request `#38883`_ from techhat/dontrequire + * 5b09dc4198 Merge pull request `#39028`_ from terminalmage/clarify-delimiter-argument - * 67bc4d6 Don't require text_out path to exist + * f29ef071f3 Clarify delimiter argument - * 6430a45 Merge pull request `#38851`_ from terminalmage/docker-py-2.0 + * 1ff359fa58 Add CLI Example for rest_sample_utils.get_test_string function (`#39030`_) - * 3c061b2 Support docker-py 2.0 in dockerng + * f13fb9ef1e Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ availability in proxies. (`#38899`_) - * ac8008d Merge pull request `#38844`_ from cachedout/http_memory_leak + * **PR** `#39035`_: (`cro`_) Add CLI Examples so tests will pass - * c46bf85 Fix memory leak in HTTP client + * **PR** `#39044`_: (`rallytime`_) Add 2016.11.3 release notes file - * dfe6dfe Merge pull request `#38823`_ from gtmanfred/2016.3 + * **PR** `#39040`_: (`rallytime`_) [2016.11] Update release numbers for doc build - * f0a71e8 pass pillar to compound matcher in match module + * **PR** `#39039`_: (`rallytime`_) Update 2016.11.2 release notes - * a04ab86 Merge pull request `#38833`_ from Ch3LL/add_release_notes_2016.3.5 + * **PR** `#39005`_: (`cro`_) Ungate the status.py module and raise unsupported errors in functions not executable on Windows. (refs: `#39536`_) - * 374dc1a skip 2016.3.5 due to :doc: references +* **PR** `#39012`_: (`terminalmage`_) Fix "invalid lexer" errors in docs build + @ *2017-01-28 06:47:45 UTC* - * 31f324c add 2016.3.5 changelog to release notes + * e70904c480 Merge pull request `#39012`_ from terminalmage/invalid-lexer -- **PR** `#38900`_: (*cro*) Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ for proxies. - @ *2017-01-25T19:36:48Z* + * 868001baac Fix "invalid lexer" errors in docs build - - **ISSUE** `#38753`_: (*alexbleotu*) `__proxy__` dunder is not injected when invoking the `salt` variable in sls files - | refs: `#38899`_ `#38900`_ `#38829`_ - - **ISSUE** `#38557`_: (*alexbleotu*) Proxy not working on develop - | refs: `#38829`_ - - **ISSUE** `#38265`_: (*mirceaulinic*) `__utils__` object not available in proxy module - | refs: `#38899`_ `#38900`_ `#38829`_ `#38829`_ - - **ISSUE** `#32918`_: (*mirceaulinic*) Proxy minions reconnection - | refs: `#38829`_ - - **PR** `#38899`_: (*cro*) Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ for proxies. - | refs: `#38900`_ - - **PR** `#38829`_: (*cro*) MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic - | refs: `#38899`_ `#38900`_ - - **PR** `#37864`_: (*mirceaulinic*) Proxy keepalive feature - | refs: `#38829`_ - * bd4889a Merge pull request `#38900`_ from cro/px_dunder_201611 - * 9a86fdd Remove extra call to salt.loader.utils. +* **PR** `#39003`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-01-28 00:09:09 UTC* - * f4ba897 Resolve merge conflict + * cea0f32936 Merge pull request `#39003`_ from rallytime/merge-2016.11 -- **PR** `#38918`_: (*thatch45*) Thorium typos - @ *2017-01-25T19:00:40Z* + * 76e95087fd Merge branch '2016.3' into '2016.11' - * f94b879 Merge pull request `#38918`_ from thatch45/thorium_typos - * 0b4aca9 fix some minor typos in the thorium docs + * da96221741 Merge pull request `#38951`_ from DSRCorporation/bugs/37938_fix_depends_decorator_memleak - * 58a18e2 Add test= True to the master so that thorium does not stack trace + * 0b18f34678 Keep the only one record per module-function in depends decorator. -- **PR** `#38919`_: (*cachedout*) Correctly pass subset to cmd_subset - @ *2017-01-25T18:59:16Z* + * 85165edb70 Merge pull request `#38982`_ from rallytime/fix-34780 - - **ISSUE** `#38543`_: (*amendlik*) salt --subset returns wrong number of minions - | refs: `#38919`_ - * 32fbb94 Merge pull request `#38919`_ from cachedout/issue_38543 - * a555de7 Correctly pass subset to cmd_subset + * 1583c5579a Set response when using "GET" method in s3 utils -- **PR** `#38922`_: (*twangboy*) Fix 64bit detection, vcredist only on <= 2008 - @ *2017-01-25T18:47:41Z* + * cfdbc99e12 Merge pull request `#38989`_ from alprs/docfix-state_pt3_environ - * 6b3c738 Merge pull request `#38922`_ from twangboy/fix_vcredist - * 214e1cc Fix 64bit detection, vcredist only on <= 2008 + * 52a9ad1c60 fix SLS in environment variable examples -- **PR** `#38923`_: (*DmitryKuzmenko*) Fixed broken __schedule_return handler. - @ *2017-01-25T18:45:30Z* + * 55e4d2572e Merge pull request `#39000`_ from rallytime/skip-badload-test - - **ISSUE** `#38371`_: (*syphernl*) [2016.11.1] Scheduled highstates not returning to master - | refs: `#38923`_ - - **PR** `#36202`_: (*hu-dabao*) for 36049, log current connected master and make status module more useful and efficient - | refs: `#38923`_ `#38923`_ - * 9546585 Merge pull request `#38923`_ from DSRCorporation/bugs/38371_fix_schedule_return - * b18f675 Fixed broken __schedule_return handler. + * 4b3ff0fe0f Skip the test_badload test until Jenkins move is complete -- **PR** `#38927`_: (*l2ol33rt*) Adding explicit install of python-systemd in jessie-backports on Debian Guide - @ *2017-01-25T18:21:18Z* + * fe054eb772 Merge pull request `#38995`_ from terminalmage/fix-pillar.item-docstring - * 828e9bd Merge pull request `#38927`_ from l2ol33rt/debian_doc_fix - * 9cc9c61 Adding explicit call to python-systemd in jessie-backports + * 06d094dd8f Fix pillar.item docstring -- **PR** `#38889`_: (*cro*) Backport `#38887`_ to 2016.11: Call correct function for resetting a VM - @ *2017-01-24T15:20:29Z* +* **ISSUE** `#38853`_: (`bobrik`_) file.serialize still expects show_diff instead of show_changes (refs: `#38908`_) - - **ISSUE** `#37413`_: (*Snarfingcode666*) Salt-cloud vmware missing reboot command - | refs: `#38889`_ `#38890`_ - * 5ff5e97 Merge pull request `#38889`_ from cro/vmware_reset_vm_201611 - * 76a9920 Call correct function for resetting a VM +* **PR** `#38908`_: (`bobrik`_) Deprecate show_diff for file.serialize to mimic file.managed, closes `#38853`_ + @ *2017-01-27 17:15:37 UTC* -- **PR** `#38891`_: (*UtahDave*) Proper function parameter default - @ *2017-01-24T15:06:09Z* + * 58543d5cbf Merge pull request `#38908`_ from bobrik/show-changes-for-serialize - * 53d0aa8 Merge pull request `#38891`_ from UtahDave/fix_cassandra_protocol_version - * c475609 Proper function parameter default + * e0af212c1b Remove unnecessary blank lines -- **PR** `#38904`_: (*terminalmage*) Add top file merging docs to the master config file documentation - @ *2017-01-24T14:59:26Z* + * a08c1ca530 Deprecate show_diff for file.serialize to mimic file.managed, closes `#38853`_ - * c680ee3 Merge pull request `#38904`_ from terminalmage/docs - * 42a3652 Add top file merging docs to the master config file documentation +* **ISSUE** `saltstack/salt-bootstrap#1021`_: (`sjorge`_) salt-bootstrap missing salt-api.xml on smartos (refs: `#38978`_) -- **PR** `#38885`_: (*meaksh*) Increasing timeouts for running integrations tests - @ *2017-01-23T18:59:50Z* +* **PR** `#38978`_: (`sjorge`_) fixes `saltstack/salt-bootstrap#1021`_ + @ *2017-01-27 17:05:10 UTC* - * 41a3055 Merge pull request `#38885`_ from meaksh/2016.11-fix-tests-issues - * 4311b0b Increasing timeouts for running integrations tests + * 4b75dfac95 Merge pull request `#38978`_ from sjorge/2016.11-bootstrap -- **PR** `#38639`_: (*isbm*) Isbm disable custom roster for api 2016.11 - @ *2017-01-23T18:59:11Z* + * 26eb35f99d fixes salt/salt-bootstrap`#1021`_ - * bde6d3e Merge pull request `#38639`_ from isbm/isbm-disable-custom-roster-for-api-2016.11 - * ffbd450 Explain what it is about and how to configure that +* **PR** `#38991`_: (`isbm`_) Isbm zypper state unknown pkg crash + @ *2017-01-27 16:59:38 UTC* -- **PR** `#38859`_: (*alxwr*) fix parsing of sockstat -4 - @ *2017-01-23T16:47:22Z* + * b40f369d98 Merge pull request `#38991`_ from isbm/isbm-zypper-state-unknown-pkg-crash - * ec59ae6 Merge pull request `#38859`_ from alxwr/2016.11 - * 30fe564 fix parsing of sockstat -4 + * 35f620e1c8 Prevent crash on unknown to the repo package -- **PR** `#38850`_: (*techhat*) Strip .p from cache file names - @ *2017-01-23T16:28:46Z* +* **PR** `#38979`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-01-26 22:56:13 UTC* - * 5fe6db6 Merge pull request `#38850`_ from techhat/stripcache - * 109cb62 Remove .p from test + * 3e76662166 Merge pull request `#38979`_ from rallytime/merge-2016.11 - * 534aa3f Strip .p from cache file names + * fdaa5ac1b0 Merge branch '2016.3' into '2016.11' + * b66b6f6423 Merge pull request `#38950`_ from mbom2004/2016.3 + + * c09f39d6c9 Remove unused json import + + * 249efa3068 Fixed Logstash Engine in file logstash.py + + * a6c6e47842 Handle changing "is_default" value in moto package for boto test mock (`#38973`_) + + * b965b5dcc2 Merge pull request `#38952`_ from terminalmage/zd1168 + + * 6b014e53fc Rename on_demand_pillar to on_demand_ext_pillar + + * d216f90c63 Document new on_demand_pillar option and add to config template + + * 426b20f02f Add documentation for on-demand pillar to pillar.ext docstring + + * 7b10274b6b Make on-demand ext_pillars tunable + + * d54723ccae Add on_demand_pillar config option + + * 2c4ad85a78 Merge pull request `#38948`_ from rallytime/bump-template-context-deprecation + + * 749e0031d7 Bump the template context deprecation version to Oxygen + + * e4514ca7d8 Merge pull request `#38946`_ from rallytime/bp-37632 + + * ee37cdace9 Fix some lint + + * c08071e182 Fix versions report for server OSs + + * 953a20350a Merge pull request `#38913`_ from Adaephon-GH/patch-1 + + * e2f4a16fdd Removing trailing whitespace + + * 616292c6b1 Ignore plist files without Label key + + * 826dce1059 Merge pull request `#38917`_ from twangboy/update_jinja_mac + + * 62e608b627 Update Jinja2 to 2.9.4 + + * b27733cc33 Merge pull request `#38925`_ from terminalmage/issue38540 + + * 76392fc6ad Fix traceback when a netapi module uses wheel_async + + * bd4474fa62 Fix 'success' value for wheel commands + + * 618596f0cc Merge pull request `#38926`_ from gtmanfred/2016.3 + + * 9cae953c93 add note about pysss for pam eauth + +* **PR** `#38937`_: (`arthru`_) Fix smtp ret require gnupg + @ *2017-01-26 20:08:16 UTC* + + * 0660cc3cf2 Merge pull request `#38937`_ from HashBangDev/fix-smtp-ret-require-gnupg + + * 399556b9fe Remove trailing whitespace + + * f308d13a17 log an error on gnupg absence instead of raising an exception + + * 0427879d19 fails if gpgowner is set in smtp returner config but the installation lacks gnupg module + + * 27449c5a9b smtp returner does not require gnupg to be installed + +* **ISSUE** `#38816`_: (`grichmond-salt`_) Errors in cloud runners are not reliably being captured as failures. (refs: `#38955`_) + +* **PR** `#38955`_: (`techhat`_) Do a better job at error detection in runners + @ *2017-01-26 20:00:18 UTC* + + * d947c5c449 Merge pull request `#38955`_ from techhat/issue38816 + + * ea8654f400 Typo + + * 94050ff716 Watch out for bools + + * 0142b0bcb3 Do a better job at error detection in runners + +* **PR** `#38953`_: (`thatch45`_) fix an issue where thorium would remove keys of reattaching minions + @ *2017-01-26 19:15:59 UTC* + + * 04a5b05c36 Merge pull request `#38953`_ from thatch45/thorium_keyfix + + * 68e96b11ac This is faster and cleaner + + * 13d28a34a6 fix an issue where thorium would remove keys of reattaching minions + + * **PR** `#38972`_: (`rallytime`_) Add CLI Example for rest_sample_utils.get_test_string function (refs: `#39030`_) + +* **PR** `#38957`_: (`mcalmer`_) Fix timezone handling for rpm installtime + @ *2017-01-26 18:41:15 UTC* + + * 27166fad4e Merge pull request `#38957`_ from mcalmer/fix-rpm-install_date-timezone + + * c7da9f87b6 Fix timezone handling for rpm installtime + +* **PR** `#38965`_: (`toanju`_) salt-cloud will use list_floating_ips for OpenStack + @ *2017-01-26 16:44:12 UTC* + + * **PR** `#34280`_: (`kevinanderson1`_) salt-cloud will use list_floating_ips for Openstack (refs: `#38965`_) + + * ec690a0a12 Merge pull request `#38965`_ from toanju/2016.11 + + * 1253ce9b63 salt-cloud will use list_floating_ips for OpenStack + +* **PR** `#38949`_: (`clinta`_) Use signing passphrase as public passphrase when generating self-sign… + @ *2017-01-25 20:20:58 UTC* + + * d906e8fadb Merge pull request `#38949`_ from clinta/x509-passphrase-bug + + * c8697e38a8 Use signing passphrase as public passphrase when generating self-signed certificates + +* **PR** `#38929`_: (`MTecknology`_) Fix psutil regressions in 2016.11 + @ *2017-01-25 20:17:41 UTC* + + * de3b2cc97b Merge pull request `#38929`_ from MTecknology/2016.11 + + * 73a8c6d121 Load core grains only if required. + + * 4966011cb5 Modules might still be needed, even if psutil loads. + + * fb0432fd21 Fixes a regression with old versions of python-psutil. + +* **PR** `#38940`_: (`isbm`_) Isbm sanitizers fix and unit test + @ *2017-01-25 20:15:56 UTC* + + * 3ec806c003 Merge pull request `#38940`_ from isbm/isbm-sanitizers-fix-and-unit-test + + * a112b790fe Fix typo + + * 47a16916c3 Add unit test + + * 046c5436eb Fix leading dots on sanitized hostname + +* **PR** `#38944`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-01-25 19:44:42 UTC* + + * e420763285 Merge pull request `#38944`_ from rallytime/merge-2016.11 + + * ee33a53a64 Merge branch '2016.3' into '2016.11' + + * 405d86a2ca Merge pull request `#38847`_ from terminalmage/issue38825 + + * 11a47803ce Use log.exception() instead + + * e40fac589a Catch MinionError in file.source_list + + * b5df104fc2 Merge pull request `#38875`_ from terminalmage/issue36121 + + * fbc4d2a2c4 reactor: ensure glob_ref is a string + + * 2e443d79a3 cp.cache_file: add note re: return for nonexistant salt:// path + + * e9ebec4d80 Merge pull request `#38890`_ from cro/vmware_reset_vm_20163 + + * 0146562fb4 Call correct function for resetting a VM + + * c3fbfcd231 Merge pull request `#38883`_ from techhat/dontrequire + + * 67bc4d6687 Don't require text_out path to exist + + * 6430a45196 Merge pull request `#38851`_ from terminalmage/docker-py-2.0 + + * 3c061b21fe Support docker-py 2.0 in dockerng + + * ac8008d843 Merge pull request `#38844`_ from cachedout/http_memory_leak + + * c46bf85518 Fix memory leak in HTTP client + + * dfe6dfe963 Merge pull request `#38823`_ from gtmanfred/2016.3 + + * f0a71e8707 pass pillar to compound matcher in match module + + * a04ab86da1 Merge pull request `#38833`_ from Ch3LL/add_release_notes_2016.3.5 + + * 374dc1ab88 skip 2016.3.5 due to :doc: references + + * 31f324c4ff add 2016.3.5 changelog to release notes + +* **ISSUE** `#38753`_: (`alexbleotu`_) `__proxy__` dunder is not injected when invoking the `salt` variable in sls files (refs: `#38899`_, `#38900`_, `#38829`_) + +* **ISSUE** `#38557`_: (`alexbleotu`_) Proxy not working on develop (refs: `#38829`_) + +* **ISSUE** `#38265`_: (`mirceaulinic`_) `__utils__` object not available in proxy module (refs: `#38899`_, `#38900`_, `#38829`_) + +* **ISSUE** `#32918`_: (`mirceaulinic`_) Proxy minions reconnection (refs: `#38829`_) + +* **PR** `#38900`_: (`cro`_) Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ for proxies. + @ *2017-01-25 19:36:48 UTC* + + * **PR** `#38899`_: (`cro`_) Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ for proxies. (refs: `#38900`_) + + * **PR** `#38829`_: (`cro`_) MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic (refs: `#38899`_, `#38900`_) + + * **PR** `#37864`_: (`mirceaulinic`_) Proxy keepalive feature (refs: `#38829`_) + + * bd4889ac73 Merge pull request `#38900`_ from cro/px_dunder_201611 + + * 9a86fddfa1 Remove extra call to salt.loader.utils. + + * f4ba89735c Resolve merge conflict + +* **PR** `#38918`_: (`thatch45`_) Thorium typos + @ *2017-01-25 19:00:40 UTC* + + * f94b8798b6 Merge pull request `#38918`_ from thatch45/thorium_typos + + * 0b4aca9145 fix some minor typos in the thorium docs + + * 58a18e2b58 Add test= True to the master so that thorium does not stack trace + +* **ISSUE** `#38543`_: (`amendlik`_) salt --subset returns wrong number of minions (refs: `#38919`_) + +* **PR** `#38919`_: (`cachedout`_) Correctly pass subset to cmd_subset + @ *2017-01-25 18:59:16 UTC* + + * 32fbb945b7 Merge pull request `#38919`_ from cachedout/issue_38543 + + * a555de7c56 Correctly pass subset to cmd_subset + +* **PR** `#38922`_: (`twangboy`_) Fix 64bit detection, vcredist only on <= 2008 + @ *2017-01-25 18:47:41 UTC* + + * 6b3c738bfd Merge pull request `#38922`_ from twangboy/fix_vcredist + + * 214e1cc598 Fix 64bit detection, vcredist only on <= 2008 + +* **ISSUE** `#38371`_: (`syphernl`_) [2016.11.1] Scheduled highstates not returning to master (refs: `#38923`_) + +* **PR** `#38923`_: (`DmitryKuzmenko`_) Fixed broken __schedule_return handler. + @ *2017-01-25 18:45:30 UTC* + + * **PR** `#36202`_: (`hu-dabao`_) for 36049, log current connected master and make status module more useful and efficient (refs: `#38923`_) + + * 954658523b Merge pull request `#38923`_ from DSRCorporation/bugs/38371_fix_schedule_return + + * b18f675486 Fixed broken __schedule_return handler. + +* **PR** `#38927`_: (`l2ol33rt`_) Adding explicit install of python-systemd in jessie-backports on Debian Guide + @ *2017-01-25 18:21:18 UTC* + + * 828e9bd8f9 Merge pull request `#38927`_ from l2ol33rt/debian_doc_fix + + * 9cc9c6110d Adding explicit call to python-systemd in jessie-backports + +* **ISSUE** `#37413`_: (`Snarfingcode666`_) Salt-cloud vmware missing reboot command (refs: `#38890`_, `#38887`_, `#38889`_) + +* **PR** `#38889`_: (`cro`_) Backport `#38887`_ to 2016.11: Call correct function for resetting a VM + @ *2017-01-24 15:20:29 UTC* + + * **PR** `#38887`_: (`cro`_) Enable resetting a VM via salt-cloud & VMware driver (refs: `#38890`_, `#38889`_) + + * 5ff5e97598 Merge pull request `#38889`_ from cro/vmware_reset_vm_201611 + + * 76a9920a6b Call correct function for resetting a VM + +* **PR** `#38891`_: (`UtahDave`_) Proper function parameter default + @ *2017-01-24 15:06:09 UTC* + + * 53d0aa8855 Merge pull request `#38891`_ from UtahDave/fix_cassandra_protocol_version + + * c475609683 Proper function parameter default + +* **PR** `#38904`_: (`terminalmage`_) Add top file merging docs to the master config file documentation + @ *2017-01-24 14:59:26 UTC* + + * c680ee3174 Merge pull request `#38904`_ from terminalmage/docs + + * 42a3652620 Add top file merging docs to the master config file documentation + +* **PR** `#38885`_: (`meaksh`_) Increasing timeouts for running integrations tests + @ *2017-01-23 18:59:50 UTC* + + * 41a3055213 Merge pull request `#38885`_ from meaksh/2016.11-fix-tests-issues + + * 4311b0b6de Increasing timeouts for running integrations tests + +* **PR** `#38639`_: (`isbm`_) Isbm disable custom roster for api 2016.11 + @ *2017-01-23 18:59:11 UTC* + + * bde6d3eee7 Merge pull request `#38639`_ from isbm/isbm-disable-custom-roster-for-api-2016.11 + + * ffbd45062e Explain what it is about and how to configure that -.. _`#1`: https://github.com/saltstack/salt/issues/1 .. _`#1021`: https://github.com/saltstack/salt/issues/1021 -.. _`#10792`: https://github.com/saltstack/salt/pull/10792 -.. _`#2016`: https://github.com/saltstack/salt/issues/2016 +.. _`#1`: https://github.com/saltstack/salt/issues/1 .. _`#21485`: https://github.com/saltstack/salt/issues/21485 .. _`#22984`: https://github.com/saltstack/salt/issues/22984 -.. _`#3`: https://github.com/saltstack/salt/issues/3 .. _`#30561`: https://github.com/saltstack/salt/issues/30561 -.. _`#30770`: https://github.com/saltstack/salt/pull/30770 -.. _`#32026`: https://github.com/saltstack/salt/pull/32026 .. _`#32918`: https://github.com/saltstack/salt/issues/32918 .. _`#33187`: https://github.com/saltstack/salt/issues/33187 -.. _`#33536`: https://github.com/saltstack/salt/issues/33536 -.. _`#33890`: https://github.com/saltstack/salt/issues/33890 .. _`#34280`: https://github.com/saltstack/salt/pull/34280 -.. _`#34551`: https://github.com/saltstack/salt/issues/34551 .. _`#34712`: https://github.com/saltstack/salt/issues/34712 -.. _`#34780`: https://github.com/saltstack/salt/issues/34780 -.. _`#35055`: https://github.com/saltstack/salt/pull/35055 -.. _`#35777`: https://github.com/saltstack/salt/issues/35777 -.. _`#36121`: https://github.com/saltstack/salt/issues/36121 .. _`#36202`: https://github.com/saltstack/salt/pull/36202 .. _`#36336`: https://github.com/saltstack/salt/pull/36336 -.. _`#36712`: https://github.com/saltstack/salt/issues/36712 .. _`#36714`: https://github.com/saltstack/salt/pull/36714 -.. _`#36913`: https://github.com/saltstack/salt/issues/36913 -.. _`#37174`: https://github.com/saltstack/salt/issues/37174 .. _`#37262`: https://github.com/saltstack/salt/pull/37262 .. _`#37338`: https://github.com/saltstack/salt/pull/37338 .. _`#37366`: https://github.com/saltstack/salt/pull/37366 .. _`#37375`: https://github.com/saltstack/salt/pull/37375 .. _`#37413`: https://github.com/saltstack/salt/issues/37413 -.. _`#37632`: https://github.com/saltstack/salt/pull/37632 .. _`#37864`: https://github.com/saltstack/salt/pull/37864 -.. _`#37938`: https://github.com/saltstack/salt/issues/37938 .. _`#38003`: https://github.com/saltstack/salt/issues/38003 .. _`#38032`: https://github.com/saltstack/salt/issues/38032 .. _`#38081`: https://github.com/saltstack/salt/issues/38081 @@ -1418,15 +1273,12 @@ Changes: .. _`#38371`: https://github.com/saltstack/salt/issues/38371 .. _`#38451`: https://github.com/saltstack/salt/issues/38451 .. _`#38464`: https://github.com/saltstack/salt/pull/38464 -.. _`#38537`: https://github.com/saltstack/salt/issues/38537 -.. _`#38540`: https://github.com/saltstack/salt/issues/38540 .. _`#38543`: https://github.com/saltstack/salt/issues/38543 .. _`#38557`: https://github.com/saltstack/salt/issues/38557 .. _`#38595`: https://github.com/saltstack/salt/issues/38595 -.. _`#38610`: https://github.com/saltstack/salt/pull/38610 .. _`#38638`: https://github.com/saltstack/salt/issues/38638 .. _`#38639`: https://github.com/saltstack/salt/pull/38639 -.. _`#38666`: https://github.com/saltstack/salt/issues/38666 +.. _`#38666`: https://github.com/saltstack/salt/pull/38666 .. _`#38689`: https://github.com/saltstack/salt/issues/38689 .. _`#38690`: https://github.com/saltstack/salt/pull/38690 .. _`#38691`: https://github.com/saltstack/salt/issues/38691 @@ -1438,29 +1290,22 @@ Changes: .. _`#38779`: https://github.com/saltstack/salt/pull/38779 .. _`#38782`: https://github.com/saltstack/salt/issues/38782 .. _`#38783`: https://github.com/saltstack/salt/pull/38783 -.. _`#38793`: https://github.com/saltstack/salt/pull/38793 -.. _`#38798`: https://github.com/saltstack/salt/issues/38798 .. _`#38804`: https://github.com/saltstack/salt/pull/38804 .. _`#38816`: https://github.com/saltstack/salt/issues/38816 .. _`#38823`: https://github.com/saltstack/salt/pull/38823 -.. _`#38825`: https://github.com/saltstack/salt/issues/38825 .. _`#38829`: https://github.com/saltstack/salt/pull/38829 .. _`#38831`: https://github.com/saltstack/salt/pull/38831 .. _`#38833`: https://github.com/saltstack/salt/pull/38833 .. _`#38844`: https://github.com/saltstack/salt/pull/38844 .. _`#38847`: https://github.com/saltstack/salt/pull/38847 -.. _`#38850`: https://github.com/saltstack/salt/pull/38850 .. _`#38851`: https://github.com/saltstack/salt/pull/38851 .. _`#38853`: https://github.com/saltstack/salt/issues/38853 -.. _`#38856`: https://github.com/saltstack/salt/issues/38856 -.. _`#38859`: https://github.com/saltstack/salt/pull/38859 .. _`#38863`: https://github.com/saltstack/salt/pull/38863 -.. _`#38867`: https://github.com/saltstack/salt/pull/38867 .. _`#38875`: https://github.com/saltstack/salt/pull/38875 .. _`#38877`: https://github.com/saltstack/salt/pull/38877 .. _`#38883`: https://github.com/saltstack/salt/pull/38883 .. _`#38885`: https://github.com/saltstack/salt/pull/38885 -.. _`#38887`: https://github.com/saltstack/salt/issues/38887 +.. _`#38887`: https://github.com/saltstack/salt/pull/38887 .. _`#38889`: https://github.com/saltstack/salt/pull/38889 .. _`#38890`: https://github.com/saltstack/salt/pull/38890 .. _`#38891`: https://github.com/saltstack/salt/pull/38891 @@ -1564,7 +1409,6 @@ Changes: .. _`#39162`: https://github.com/saltstack/salt/pull/39162 .. _`#39164`: https://github.com/saltstack/salt/pull/39164 .. _`#39166`: https://github.com/saltstack/salt/pull/39166 -.. _`#39170`: https://github.com/saltstack/salt/pull/39170 .. _`#39171`: https://github.com/saltstack/salt/pull/39171 .. _`#39173`: https://github.com/saltstack/salt/pull/39173 .. _`#39179`: https://github.com/saltstack/salt/pull/39179 @@ -1577,7 +1421,6 @@ Changes: .. _`#39203`: https://github.com/saltstack/salt/issues/39203 .. _`#39206`: https://github.com/saltstack/salt/pull/39206 .. _`#39209`: https://github.com/saltstack/salt/pull/39209 -.. _`#39210`: https://github.com/saltstack/salt/pull/39210 .. _`#39220`: https://github.com/saltstack/salt/issues/39220 .. _`#39221`: https://github.com/saltstack/salt/pull/39221 .. _`#39225`: https://github.com/saltstack/salt/pull/39225 @@ -1649,11 +1492,76 @@ Changes: .. _`#39521`: https://github.com/saltstack/salt/pull/39521 .. _`#39534`: https://github.com/saltstack/salt/pull/39534 .. _`#39536`: https://github.com/saltstack/salt/pull/39536 -.. _`bp-36336`: https://github.com/saltstack/salt/pull/36336 -.. _`bp-37338`: https://github.com/saltstack/salt/pull/37338 -.. _`bp-37375`: https://github.com/saltstack/salt/pull/37375 -.. _`bp-37632`: https://github.com/saltstack/salt/pull/37632 -.. _`bp-39170`: https://github.com/saltstack/salt/pull/39170 -.. _`bp-39364`: https://github.com/saltstack/salt/pull/39364 -.. _`fix-2016`: https://github.com/saltstack/salt/issues/2016 -.. _`fix-34780`: https://github.com/saltstack/salt/issues/34780 +.. _`#3`: https://github.com/saltstack/salt/issues/3 +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DaveOHenry`: https://github.com/DaveOHenry +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`FraaJad`: https://github.com/FraaJad +.. _`Kimamisa`: https://github.com/Kimamisa +.. _`MTecknology`: https://github.com/MTecknology +.. _`Snarfingcode666`: https://github.com/Snarfingcode666 +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`UtahDave`: https://github.com/UtahDave +.. _`afletch`: https://github.com/afletch +.. _`alexbleotu`: https://github.com/alexbleotu +.. _`alexharrington`: https://github.com/alexharrington +.. _`amendlik`: https://github.com/amendlik +.. _`anlutro`: https://github.com/anlutro +.. _`arthru`: https://github.com/arthru +.. _`axmetishe`: https://github.com/axmetishe +.. _`bailsman`: https://github.com/bailsman +.. _`bbinet`: https://github.com/bbinet +.. _`bobrik`: https://github.com/bobrik +.. _`cachedout`: https://github.com/cachedout +.. _`carsten-AEI`: https://github.com/carsten-AEI +.. _`clinta`: https://github.com/clinta +.. _`corywright`: https://github.com/corywright +.. _`cro`: https://github.com/cro +.. _`dmaziuk`: https://github.com/dmaziuk +.. _`dmitrievav`: https://github.com/dmitrievav +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`eliasp`: https://github.com/eliasp +.. _`eradman`: https://github.com/eradman +.. _`ezh`: https://github.com/ezh +.. _`frogunder`: https://github.com/frogunder +.. _`grichmond-salt`: https://github.com/grichmond-salt +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`haraldrudell`: https://github.com/haraldrudell +.. _`hu-dabao`: https://github.com/hu-dabao +.. _`hujunya`: https://github.com/hujunya +.. _`isbm`: https://github.com/isbm +.. _`jak3kaj`: https://github.com/jak3kaj +.. _`janhorstmann`: https://github.com/janhorstmann +.. _`jfindlay`: https://github.com/jfindlay +.. _`joe-niland`: https://github.com/joe-niland +.. _`kevinanderson1`: https://github.com/kevinanderson1 +.. _`kstreee`: https://github.com/kstreee +.. _`l2ol33rt`: https://github.com/l2ol33rt +.. _`lomeroe`: https://github.com/lomeroe +.. _`lorengordon`: https://github.com/lorengordon +.. _`mcalmer`: https://github.com/mcalmer +.. _`meaksh`: https://github.com/meaksh +.. _`meggiebot`: https://github.com/meggiebot +.. _`mgresser`: https://github.com/mgresser +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`morganwillcock`: https://github.com/morganwillcock +.. _`nasenbaer13`: https://github.com/nasenbaer13 +.. _`nicholasmhughes`: https://github.com/nicholasmhughes +.. _`rallytime`: https://github.com/rallytime +.. _`richardscollin`: https://github.com/richardscollin +.. _`sakateka`: https://github.com/sakateka +.. _`saltstack/salt#36712`: https://github.com/saltstack/salt/issues/36712 +.. _`saltstack/salt-bootstrap#1021`: https://github.com/saltstack/salt-bootstrap/issues/1021 +.. _`sergeizv`: https://github.com/sergeizv +.. _`sjorge`: https://github.com/sjorge +.. _`skjaro`: https://github.com/skjaro +.. _`syphernl`: https://github.com/syphernl +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`tjyang`: https://github.com/tjyang +.. _`toanju`: https://github.com/toanju +.. _`tomasfejfar`: https://github.com/tomasfejfar +.. _`twangboy`: https://github.com/twangboy +.. _`vutny`: https://github.com/vutny +.. _`whytewolf`: https://github.com/whytewolf diff --git a/doc/topics/releases/2016.11.4.rst b/doc/topics/releases/2016.11.4.rst index f29ddea03f..2e0c6a2215 100644 --- a/doc/topics/releases/2016.11.4.rst +++ b/doc/topics/releases/2016.11.4.rst @@ -5,24 +5,41 @@ Salt 2016.11.4 Release Notes Version 2016.11.4 is a bugfix release for :ref:`2016.11.0 `. -AIX Fixes -========= +Statistics +========== -Added module execution support for user and group -Added module execution support for timezone -Added module execution support for network and status -Added module execution support for beacon.status -Added module execution support for disk.iostat +- Total Merges: **276** +- Total Issue References: **63** +- Total PR References: **223** + +- Contributors: **62** (`Ch3LL`_, `DennisHarper`_, `DmitryKuzmenko`_, `L4rS6`_, `MasterNayru`_, `Seb-Solon`_, `The-Loeki`_, `UtahDave`_, `aabognah`_, `alankrita`_, `amontalban`_, `ardakuyumcu`_, `attiasr`_, `bdrung`_, `bewing`_, `cachedout`_, `cro`_, `defanator`_, `discountbin`_, `dmurphy18`_, `drawsmcgraw`_, `eldadru`_, `garethgreenaway`_, `githubcdr`_, `gtmanfred`_, `hkrist`_, `isbm`_, `jbadson`_, `jeanpralo`_, `jettero`_, `jinm`_, `joe-niland`_, `kaszuba`_, `lomeroe`_, `lorengordon`_, `mateiw`_, `mcalmer`_, `mchugh19`_, `meaksh`_, `mirceaulinic`_, `mlalpho`_, `narendraingale2`_, `nmadhok`_, `rallytime`_, `redbaron4`_, `roaldnefs`_, `s0undt3ch`_, `skazi0`_, `skizunov`_, `smarsching`_, `sofixa`_, `sp1r`_, `sthrasher`_, `techhat`_, `terminalmage`_, `thatch45`_, `thor`_, `ticosax`_, `twangboy`_, `vutny`_, `whiteinge`_, `zer0def`_) -Minion Data Cache Fixes -======================= +AIX Support Expanded +==================== + +AIX support has been added for the following execution modules: + +- :mod:`user ` +- :mod:`group ` +- :mod:`network ` +- :mod:`status ` +- :mod:`timezone ` + +Additionally, AIX is now supported in the :py:func:`disk.iostat +` remote-execution function, and the :mod:`status +` beacon is now supported. + +Minion Data Cache Enhancement +============================= + +Memcache is now supported as a data store for the minion data cache. -Added Memcache booster for the minion data cache. Memcache is an additional cache layer that keeps a limited amount of data fetched from the minion data cache for a limited period of time in memory that makes cache operations faster. It doesn't make much sense for the ``localfs`` cache driver but helps for more complex drivers like ``consul``. + For more details see ``memcache_expire_seconds`` and other ``memcache_*`` options in the master config reverence. @@ -83,2271 +100,2235 @@ have had templating support added to bring them to feature parity with the ec2 driver's implementation of the ``userdata_file`` option. -Changes for v2016.11.3..v2016.11.4 ----------------------------------------------------------------- +Changelog for v2016.11.3..v2016.11.4 +==================================== -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +*Generated at: 2018-05-27 19:46:47 UTC* -*Generated at: 2017-04-14T21:14:03Z* +* **PR** `#40708`_: (`Ch3LL`_) Add 2016.11.4 Release Note ChangeLog + @ *2017-04-14 22:12:57 UTC* -Statistics: + * e5cd6086a7 Merge pull request `#40708`_ from Ch3LL/2016.11.4_release -- Total Merges: **275** -- Total Issue references: **98** -- Total PR references: **334** + * d228fb6e02 Add 2016.11.4 Release Note ChangeLog -Changes: +* **PR** `#40685`_: (`Ch3LL`_) Fix errno code for filecache test for other operating systems. + @ *2017-04-14 16:54:25 UTC* + * 77028a6c4e Merge pull request `#40685`_ from Ch3LL/fix_mac_file -- **PR** `#40685`_: (*Ch3LL*) Fix errno code for filecache test for other operating systems. - @ *2017-04-14T16:54:25Z* + * 9ea6e8b456 remove io and change to EROFS - * 77028a6 Merge pull request `#40685`_ from Ch3LL/fix_mac_file - * 9ea6e8b remove io and change to EROFS + * 688791ff60 remove try-except and change errno - * 688791f remove try-except and change errno + * e30afc4c01 add exception type - * e30afc4 add exception type + * acf333df08 change errno code for fileclient test - * acf333d change errno code for fileclient test +* **ISSUE** `#40688`_: (`jbadson`_) Syslog returner does not work with Python 2.6 (refs: `#40689`_) -- **PR** `#40689`_: (*jbadson*) Fixes bug that prevents syslog returner from working under Python 2.6 - @ *2017-04-14T10:45:13Z* +* **PR** `#40689`_: (`jbadson`_) Fixes bug that prevents syslog returner from working under Python 2.6 + @ *2017-04-14 10:45:13 UTC* - - **ISSUE** `#40688`_: (*jbadson*) Syslog returner does not work with Python 2.6 - | refs: `#40689`_ `#40689`_ - * bc70772 Merge pull request `#40689`_ from jbadson/fix-syslog-returner - * e5a3a7d Fixes bug that prevents syslog returner from working under Python 2.6 + * bc70772f9d Merge pull request `#40689`_ from jbadson/fix-syslog-returner -- **PR** `#40690`_: (*thor*) Fixes `#40658`_: even clearer and working(!) Tomcat version handling - @ *2017-04-14T10:44:02Z* + * e5a3a7d217 Fixes bug that prevents syslog returner from working under Python 2.6 - - **ISSUE** `#40658`_: (*sebw*) State tomcat.war_deployed regression when WAR filename contains version - | refs: `#40690`_ - * 983d35a Merge pull request `#40690`_ from thor/2016.11-tomcat - * 09145ea Fixes unindexed strfmt curly braces for python 2.6 +* **ISSUE** `#40658`_: (`sebw`_) State tomcat.war_deployed regression when WAR filename contains version (refs: `#40690`_) - * b78fc46 Fixes `#40658`_: clearer version handling +* **PR** `#40690`_: (`thor`_) Fixes `#40658`_: even clearer and working(!) Tomcat version handling + @ *2017-04-14 10:44:02 UTC* -- **PR** `#40686`_: (*twangboy*) Fix 'salt-minion' service for Win 10 Creators Update 1703 - @ *2017-04-13T20:00:12Z* + * 983d35ad38 Merge pull request `#40690`_ from thor/2016.11-tomcat - * 3cd9a50 Merge pull request `#40686`_ from twangboy/fix_service - * b6ac4aa Fix service for win10 update + * 09145ea1a5 Fixes unindexed strfmt curly braces for python 2.6 -- **PR** `#40675`_: (*gtmanfred*) use loader for getting war version - @ *2017-04-13T19:58:30Z* + * b78fc46b91 Fixes `#40658`_: clearer version handling - * ad4d683 Merge pull request `#40675`_ from gtmanfred/2016.11 - * a61fc82 use loader for war extraction +* **PR** `#40686`_: (`twangboy`_) Fix 'salt-minion' service for Win 10 Creators Update 1703 + @ *2017-04-13 20:00:12 UTC* -- **PR** `#40680`_: (*rallytime*) Back-port `#40598`_ to 2016.11 - @ *2017-04-13T19:58:16Z* + * 3cd9a50b22 Merge pull request `#40686`_ from twangboy/fix_service - - **ISSUE** `#38497`_: (*chrisLeeTW*) local_batch client ignore external auth - | refs: `#40598`_ - - **PR** `#40598`_: (*mchugh19*) Ensure batch uses passed eauth token or credentials - | refs: `#40680`_ - * 7ea526f Merge pull request `#40680`_ from rallytime/`bp-40598`_ - * cc1643e Fix netapi lint + * b6ac4aa86d Fix service for win10 update - * e790930 re-add batch support to cherrypy saltapi +* **PR** `#40675`_: (`gtmanfred`_) use loader for getting war version + @ *2017-04-13 19:58:30 UTC* - * 6eec04b pop out of kwargs + * ad4d6839fd Merge pull request `#40675`_ from gtmanfred/2016.11 - * 260dd84 Create eauth dict for passing into batch class + * a61fc824c4 use loader for war extraction - * 5fb8190 Ensure batch uses passed eauth token or credentials +* **ISSUE** `#38497`_: (`chrisLeeTW`_) local_batch client ignore external auth (refs: `#40598`_) -- **PR** `#40681`_: (*cachedout*) Allow status beacon to run on all operating systems - @ *2017-04-13T19:33:10Z* +* **PR** `#40680`_: (`rallytime`_) Back-port `#40598`_ to 2016.11 + @ *2017-04-13 19:58:16 UTC* - * db68df2 Merge pull request `#40681`_ from cachedout/status_beacon - * ecbb0d1 Allow status beacon to run on all operating systems + * **PR** `#40598`_: (`mchugh19`_) Ensure batch uses passed eauth token or credentials (refs: `#40680`_) -- **PR** `#40678`_: (*Ch3LL*) fix test_fstype test for mac - @ *2017-04-13T19:20:32Z* + * 7ea526f59e Merge pull request `#40680`_ from rallytime/bp-40598 - * 39dd6e2 Merge pull request `#40678`_ from Ch3LL/fix_mac_fstype - * 6072498 fix test_fstype test for mac + * cc1643eb1f Fix netapi lint -- **PR** `#40665`_: (*rallytime*) Back-port `#35665`_ to 2016.11 - @ *2017-04-12T21:06:36Z* + * e790930f5a re-add batch support to cherrypy saltapi - - **PR** `#35665`_: (*sthrasher*) Speed up /jobs for salt-api when run under cherrypy. - | refs: `#40665`_ - * 6df76f6 Merge pull request `#40665`_ from rallytime/`bp-35665`_ - * 0f897b2 Switch from comprehension to logic used in jobs runner. This makes it easier to deal with potential unicode in returns. + * 6eec04b2db pop out of kwargs - * 78dd629 Fix compat issues with /jobs return values. + * 260dd84758 Create eauth dict for passing into batch class - * 4778bc7 Speed up /jobs for salt-api when run under cherrypy. + * 5fb8190d44 Ensure batch uses passed eauth token or credentials -- **PR** `#40666`_: (*gtmanfred*) make sure userdata is always defined in ec2 - @ *2017-04-12T21:06:00Z* +* **PR** `#40681`_: (`cachedout`_) Allow status beacon to run on all operating systems + @ *2017-04-13 19:33:10 UTC* - * 3e41a24 Merge pull request `#40666`_ from gtmanfred/userdata - * 5e92fd0 make sure userdata is always defined in ec2 + * db68df23dd Merge pull request `#40681`_ from cachedout/status_beacon -- **PR** `#40662`_: (*twangboy*) Backport msi-conformant-version function - @ *2017-04-12T18:49:23Z* + * ecbb0d186f Allow status beacon to run on all operating systems - * b245abb Merge pull request `#40662`_ from twangboy/backport_msi_versioning - * 8258328 Backport msi-conformant-version function +* **PR** `#40678`_: (`Ch3LL`_) fix test_fstype test for mac + @ *2017-04-13 19:20:32 UTC* -- **PR** `#40551`_: (*terminalmage*) Fix four issues in archive.extracted state - @ *2017-04-12T18:37:52Z* + * 39dd6e284d Merge pull request `#40678`_ from Ch3LL/fix_mac_fstype - - **ISSUE** `#39868`_: (*amontalban*) archive.extracted issue when source_hash_update=True and extracted files does not exist - | refs: `#40551`_ `#40551`_ - * 92b5f03 Merge pull request `#40551`_ from terminalmage/issue39868 - * a722ca9 archive.extracted: also cleanup fileclient's cached location + * 60724980ec fix test_fstype test for mac - * 5ea1f60 Fix mocking in unit tests +* **PR** `#40665`_: (`rallytime`_) Back-port `#35665`_ to 2016.11 + @ *2017-04-12 21:06:36 UTC* - * 8dfa51f Moar fixes for source_hash_update + * **PR** `#35665`_: (`sthrasher`_) Speed up /jobs for salt-api when run under cherrypy. (refs: `#40665`_) - * 7103707 Remove unnecessary versionadded lines + * 6df76f6687 Merge pull request `#40665`_ from rallytime/bp-35665 - * a717881 Just get a hash for the source archive + * 0f897b2426 Switch from comprehension to logic used in jobs runner. This makes it easier to deal with potential unicode in returns. - * 9da4eb1 Check hash of cached source against source_hash before downloading archive + * 78dd629f09 Fix compat issues with /jobs return values. - * ad24faa Fix three issues in archive.extracted state + * 4778bc7365 Speed up /jobs for salt-api when run under cherrypy. -- **PR** `#40637`_: (*twangboy*) Add unicode_literals import - @ *2017-04-12T16:55:03Z* +* **PR** `#40666`_: (`gtmanfred`_) make sure userdata is always defined in ec2 + @ *2017-04-12 21:06:00 UTC* - * 0638418 Merge pull request `#40637`_ from twangboy/fix_unicode_issues - * 021783d Add unicode_literals import + * 3e41a248a5 Merge pull request `#40666`_ from gtmanfred/userdata -- **PR** `#40651`_: (*twangboy*) Fix status.diskusage for Windows on Py3 - @ *2017-04-12T16:21:29Z* + * 5e92fd0948 make sure userdata is always defined in ec2 - * 491661f Merge pull request `#40651`_ from twangboy/fix_diskusage_py3 - * 7c5079e Correct capitalization problem with api call +* **PR** `#40662`_: (`twangboy`_) Backport msi-conformant-version function + @ *2017-04-12 18:49:23 UTC* -- **PR** `#40631`_: (*gtmanfred*) if grain is defined as None still convert in append - @ *2017-04-12T16:19:16Z* + * b245abbea5 Merge pull request `#40662`_ from twangboy/backport_msi_versioning - - **ISSUE** `#40624`_: (*sumeetisp*) Issue - grains.append - | refs: `#40631`_ - * 3aabd85 Merge pull request `#40631`_ from gtmanfred/grains - * b0bd99c add comment and unit test + * 825832812b Backport msi-conformant-version function - * b21bc75 if grain is defined as None still convert in append +* **ISSUE** `#39868`_: (`amontalban`_) archive.extracted issue when source_hash_update=True and extracted files does not exist (refs: `#40551`_) -- **PR** `#40629`_: (*aabognah*) Fixing issue # 40167 - @ *2017-04-11T22:45:08Z* +* **PR** `#40551`_: (`terminalmage`_) Fix four issues in archive.extracted state + @ *2017-04-12 18:37:52 UTC* - - **ISSUE** `#40167`_: (*alias454*) file.replace diff results output showing additional characters - | refs: `#40629`_ - * 3737289 Merge pull request `#40629`_ from aabognah/fix-bug-40167 - * 28f7744 Fixing issue # 40167 with file.replace where the diff output does not display correctly. + * 92b5f03beb Merge pull request `#40551`_ from terminalmage/issue39868 -- **PR** `#40646`_: (*twangboy*) Keep network.py execution module - @ *2017-04-11T22:03:02Z* + * a722ca9ccf archive.extracted: also cleanup fileclient's cached location - * 2a22bea Merge pull request `#40646`_ from twangboy/fix_win_network - * 0f7a81c Keep network.py execution module + * 5ea1f607b0 Fix mocking in unit tests -- **PR** `#40645`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-04-11T20:59:13Z* + * 8dfa51f31f Moar fixes for source_hash_update - - **ISSUE** `#39778`_: (*Talkless*) pkgrepo.managed state always report changes with test=True on APT system - | refs: `#40571`_ - - **PR** `#40638`_: (*rallytime*) Back-port `#40571`_ to 2016.3 - - **PR** `#40571`_: (*terminalmage*) pkgrepo.managed: properly handle comments for debian - | refs: `#40638`_ - * e1f5a5d Merge pull request `#40645`_ from rallytime/merge-2016.11 - * 8de6497 Merge branch '2016.3' into '2016.11' + * 7103707d49 Remove unnecessary versionadded lines - * 2ae9eaa Merge pull request `#40638`_ from rallytime/`bp-40571`_ + * a717881f53 Just get a hash for the source archive - * 2d1c4be pkgrepo.managed: properly handle comments for debian + * 9da4eb18bf Check hash of cached source against source_hash before downloading archive -- **PR** `#40642`_: (*DmitryKuzmenko*) Correctly resolve relative cache path to absolute. - @ *2017-04-11T20:43:57Z* + * ad24faa59d Fix three issues in archive.extracted state - - **ISSUE** `#40594`_: (*anlutro*) salt-ssh file.recurse adds a lot of unwanted directories - | refs: `#40642`_ `#40642`_ - - **ISSUE** `#38458`_: (*duk3luk3*) salt-ssh uses sudo to create cache dir, later fails to access it - | refs: `#40442`_ - - **PR** `#40442`_: (*gtmanfred*) allow file_client to figure out cachedir - | refs: `#40642`_ `#40642`_ - * 6c4ae3c Merge pull request `#40642`_ from DSRCorporation/bugs/40594_ssh_cachedir - * 055256c Correctly resolve relative cache path to absolute. +* **PR** `#40637`_: (`twangboy`_) Add unicode_literals import + @ *2017-04-12 16:55:03 UTC* -- **PR** `#40609`_: (*gtmanfred*) stat_file when keep is set, instead of mirroring all file permissions - @ *2017-04-11T18:48:47Z* + * 0638418d22 Merge pull request `#40637`_ from twangboy/fix_unicode_issues - - **ISSUE** `#40075`_: (*afletch*) salt-ssh temporary files - insecure permissions - | refs: `#40609`_ - * 8492cef Merge pull request `#40609`_ from gtmanfred/2016.11 - * 6e34c2b stat file when placing it on server instead of caching + * 021783dbae Add unicode_literals import -- **PR** `#40620`_: (*mateiw*) SUSE specific changes to salt-api.service - @ *2017-04-11T14:45:00Z* +* **PR** `#40651`_: (`twangboy`_) Fix status.diskusage for Windows on Py3 + @ *2017-04-12 16:21:29 UTC* - * 05ac613 Merge pull request `#40620`_ from mateiw/2016.11-suse-saltapi-service - * ee911a7 suse specific changes to salt-api.service + * 491661f323 Merge pull request `#40651`_ from twangboy/fix_diskusage_py3 -- **PR** `#40614`_: (*gtmanfred*) add retries on authentications of the salt minion reconnecting - @ *2017-04-10T22:42:16Z* + * 7c5079ec91 Correct capitalization problem with api call - - **ISSUE** `#39463`_: (*githubcdr*) Transport TCP minions don't reconnect/recover - | refs: `#40614`_ - * b0a2414 Merge pull request `#40614`_ from gtmanfred/tcp - * a86b101 add retries on authentications of the salt minion reconnecting +* **ISSUE** `#40624`_: (`sumeetisp`_) Issue - grains.append (refs: `#40631`_) -- **PR** `#40606`_: (*kaszuba*) Use correct exec_driver in dockerng.sls module - @ *2017-04-10T22:25:31Z* +* **PR** `#40631`_: (`gtmanfred`_) if grain is defined as None still convert in append + @ *2017-04-12 16:19:16 UTC* - * f7e121a Merge pull request `#40606`_ from kaszuba/fix-dockerng-sls - * 3a0d61f Use correct exec_driver in dockerng.sls module + * 3aabd85e53 Merge pull request `#40631`_ from gtmanfred/grains -- **PR** `#40615`_: (*rallytime*) Call out to _pki_minions() once, rather than in a loop in _check_list_minions() - @ *2017-04-10T22:22:18Z* + * b0bd99c26d add comment and unit test - - **ISSUE** `#39863`_: (*daswathn*) Salt-Master not responding when the list of minions are high after upgrade to 2016.11.2 - | refs: `#40615`_ - - **PR** `#34920`_: (*cachedout*) Key cache - | refs: `#40615`_ - * b6cf948 Merge pull request `#40615`_ from rallytime/`fix-39863`_ - * 1a9f03a Call out to _pki_minions() once, rather than in a loop in _check_list_minions() + * b21bc7528f if grain is defined as None still convert in append -- **PR** `#40588`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-04-07T19:30:14Z* +* **ISSUE** `#40167`_: (`alias454`_) file.replace diff results output showing additional characters (refs: `#40629`_) - - **PR** `#40567`_: (*terminalmage*) Allow pillar.get to merge list as well as dictionaries - - **PR** `#40562`_: (*terminalmage*) Fix dockerng _get_client() regression - | refs: `#40563`_ `#40563`_ - - **PR** `#40552`_: (*terminalmage*) Don't use __opts__.get() for hash_type - - **PR** `#40548`_: (*Ch3LL*) Fix vultrpy - - **PR** `#40481`_: (*terminalmage*) Backport auth and custom registry fixes from `#40480`_ to 2016.3 branch - | refs: `#40562`_ `#40563`_ - * 4fa58be Merge pull request `#40588`_ from rallytime/merge-2016.11 - * 5a419b8 Merge branch '2016.3' into '2016.11' +* **PR** `#40629`_: (`aabognah`_) Fixing issue # 40167 + @ *2017-04-11 22:45:08 UTC* - * 83f6d3d Merge pull request `#40567`_ from terminalmage/fix-pillar-get-merge-lists + * 3737289bee Merge pull request `#40629`_ from aabognah/fix-bug-40167 - * cb4db56 Allow pillar.get to merge list as well as dictionaries + * 28f7744cb6 Fixing issue # 40167 with file.replace where the diff output does not display correctly. - * a8304cd Merge pull request `#40552`_ from terminalmage/fix-hash-type-refs +* **PR** `#40646`_: (`twangboy`_) Keep network.py execution module + @ *2017-04-11 22:03:02 UTC* - * 8c61f33 Don't use __opts__.get() for hash_type + * 2a22bea290 Merge pull request `#40646`_ from twangboy/fix_win_network - * 705e1d8 Merge pull request `#40562`_ from terminalmage/fix-get-client + * 0f7a81cd34 Keep network.py execution module - * 7f1ef72 Fix dockerng _get_client() regression +* **PR** `#40645`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-04-11 20:59:13 UTC* - * 00f8ef0 Merge pull request `#40548`_ from Ch3LL/fix_vultrpy + * e1f5a5dfc3 Merge pull request `#40645`_ from rallytime/merge-2016.11 - * 7710355 check for salt install fail on vultur test + * 8de6497933 Merge branch '2016.3' into '2016.11' - * aae3d14 fix vultr cloud race condition to match on 0* + * 2ae9eaa176 Merge pull request `#40638`_ from rallytime/bp-40571 -- **PR** `#40575`_: (*rallytime*) Back-port `#40559`_ to 2016.11 - @ *2017-04-07T15:42:26Z* + * 2d1c4be2df pkgrepo.managed: properly handle comments for debian - - **PR** `#40559`_: (*jinm*) Fix v3 for https://github.com/saltstack/salt/issues/38472 - | refs: `#40575`_ - * 3d07f63 Merge pull request `#40575`_ from rallytime/`bp-40559`_ - * 8280e52 Fix v3 for https://github.com/saltstack/salt/issues/38472 +* **ISSUE** `#40594`_: (`anlutro`_) salt-ssh file.recurse adds a lot of unwanted directories (refs: `#40642`_) -- **PR** `#40576`_: (*rallytime*) Back-port `#40573`_ to 2016.11 - @ *2017-04-07T15:20:11Z* +* **ISSUE** `#38458`_: (`duk3luk3`_) salt-ssh uses sudo to create cache dir, later fails to access it (refs: `#40442`_) - - **PR** `#40573`_: (*ardakuyumcu*) Fix typo in IAM state for managed policies - | refs: `#40576`_ - * 9041ca2 Merge pull request `#40576`_ from rallytime/`bp-40573`_ - * 1218080 Fix typo in IAM state for managed policies +* **PR** `#40642`_: (`DmitryKuzmenko`_) Correctly resolve relative cache path to absolute. + @ *2017-04-11 20:43:57 UTC* -- **PR** `#40563`_: (*terminalmage*) Merge-forward 2016.3 -> 2016.11 - @ *2017-04-07T15:08:20Z* + * **PR** `#40442`_: (`gtmanfred`_) allow file_client to figure out cachedir (refs: `#40642`_) - - **ISSUE** `#40279`_: (*pstengel*) Salt fails to enable/disable services using systemd - | refs: `#40306`_ - - **ISSUE** `#39892`_: (*The-Loeki*) Salt-SSH reflects certain minion's opts as master opts for rendering - | refs: `#40534`_ - - **ISSUE** `#31363`_: (*eykd*) git.latest with force_clone fails when it can't create a target directory that already exists - - **PR** `#40562`_: (*terminalmage*) Fix dockerng _get_client() regression - | refs: `#40563`_ `#40563`_ - - **PR** `#40534`_: (*terminalmage*) Check master's ssh_minion_opts for fileserver/pillar values and ignore them - - **PR** `#40505`_: (*gtmanfred*) update docs for logging handlers - - **PR** `#40481`_: (*terminalmage*) Backport auth and custom registry fixes from `#40480`_ to 2016.3 branch - | refs: `#40562`_ `#40563`_ - - **PR** `#40480`_: (*terminalmage*) Improved Docker auth handling and other misc. Docker improvements - - **PR** `#40306`_: (*terminalmage*) Don't use context caching for gathering systemd services - * f8bc423 Merge pull request `#40563`_ from terminalmage/merge-2016.3-2016.11 - * 0c608d7 Add client_args_mock back to test + * 6c4ae3c914 Merge pull request `#40642`_ from DSRCorporation/bugs/40594_ssh_cachedir - * a7a78da remove unused imports + * 055256c518 Correctly resolve relative cache path to absolute. - * a6d68f5 Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11 +* **ISSUE** `#40075`_: (`afletch`_) salt-ssh temporary files - insecure permissions (refs: `#40609`_) - * 0918311 Don't mark files that already were deleted as errors +* **PR** `#40609`_: (`gtmanfred`_) stat_file when keep is set, instead of mirroring all file permissions + @ *2017-04-11 18:48:47 UTC* - * 51d88a1 Merge branch 'zer0def-`fix-31363`_' into 2016.3 + * 8492cef7a5 Merge pull request `#40609`_ from gtmanfred/2016.11 - * 7f3cbd5 Merge branch '`fix-31363`_' of https://github.com/zer0def/salt into zer0def-`fix-31363`_ + * 6e34c2b5e5 stat file when placing it on server instead of caching - * 3c750c2 Changed rm_rf's argument to actually remove intended file. (refs `#31363`_) +* **PR** `#40620`_: (`mateiw`_) SUSE specific changes to salt-api.service + @ *2017-04-11 14:45:00 UTC* - * 9ed85f3 Remove directory content instead of directory itself when using `force_clone` in `git.latest` state. (refs `#31363`_) + * 05ac613ecf Merge pull request `#40620`_ from mateiw/2016.11-suse-saltapi-service - * cfba4cb Merge pull request `#40534`_ from terminalmage/issue39892 + * ee911a74b4 suse specific changes to salt-api.service - * ad88c58 Check master's ssh_minion_opts for fileserver/pillar values and ignore them +* **ISSUE** `#39463`_: (`githubcdr`_) Transport TCP minions don't reconnect/recover (refs: `#40614`_) - * 8da27c9 Merge pull request `#40306`_ from terminalmage/issue40279 +* **PR** `#40614`_: (`gtmanfred`_) add retries on authentications of the salt minion reconnecting + @ *2017-04-10 22:42:16 UTC* - * 57ace1f Merge branch 'issue40279' of https://github.com/terminalmage/salt into issue40279 + * b0a2414d68 Merge pull request `#40614`_ from gtmanfred/tcp - * 8bcdf1a Remove unused import for lint + * a86b101ae6 add retries on authentications of the salt minion reconnecting - * 808ad76 systemd.py: when getting all services, don't repeat gathering of systemd services +* **PR** `#40606`_: (`kaszuba`_) Use correct exec_driver in dockerng.sls module + @ *2017-04-10 22:25:31 UTC* - * 2d219af Don't use context caching for gathering systemd services + * f7e121a9ee Merge pull request `#40606`_ from kaszuba/fix-dockerng-sls - * 97caac4 Merge pull request `#40481`_ from terminalmage/docker-auth-handling-2016.3 + * 3a0d61f108 Use correct exec_driver in dockerng.sls module - * dcef1e0 Make sure we keep the cached client when clearing context +* **ISSUE** `#39863`_: (`daswathn`_) Salt-Master not responding when the list of minions are high after upgrade to 2016.11.2 (refs: `#40615`_) - * 1e2a04c Backport auth and custom registry fixes from `#40480`_ to 2016.3 branch +* **PR** `#40615`_: (`rallytime`_) Call out to _pki_minions() once, rather than in a loop in _check_list_minions() + @ *2017-04-10 22:22:18 UTC* - * e62603d Merge pull request `#40505`_ from gtmanfred/2016.3 + * **PR** `#34920`_: (`cachedout`_) Key cache (refs: `#40615`_) - * 6e2f908 update docs for logging handlers + * b6cf948afe Merge pull request `#40615`_ from rallytime/fix-39863 -- **PR** `#40571`_: (*terminalmage*) pkgrepo.managed: properly handle comments for debian - | refs: `#40638`_ - @ *2017-04-06T21:55:46Z* + * 1a9f03ab92 Call out to _pki_minions() once, rather than in a loop in _check_list_minions() - - **ISSUE** `#39778`_: (*Talkless*) pkgrepo.managed state always report changes with test=True on APT system - | refs: `#40571`_ - * fd757ff Merge pull request `#40571`_ from terminalmage/issue39778 - * 1916104 pkgrepo.managed: properly handle comments for debian +* **PR** `#40588`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-04-07 19:30:14 UTC* -- **PR** `#40572`_: (*rallytime*) Clean out kwargs dict in cloud.action before calling cloud driver function - @ *2017-04-06T21:53:40Z* + * 4fa58be222 Merge pull request `#40588`_ from rallytime/merge-2016.11 - - **ISSUE** `#40278`_: (*UtahDave*) cloud.action giving errors on 2016.11.1 - | refs: `#40572`_ - * b1698e8 Merge pull request `#40572`_ from rallytime/`fix-40278`_ - * c978486 Clean out kwargs dict in cloud.action before calling cloud driver function + * 5a419b8aae Merge branch '2016.3' into '2016.11' -- **PR** `#39882`_: (*smarsching*) Fix handling of trailing newlines on Windows - @ *2017-04-06T21:12:24Z* + * 83f6d3d3bb Merge pull request `#40567`_ from terminalmage/fix-pillar-get-merge-lists - - **ISSUE** `#39842`_: (*smarsching*) File module removes trailing newline on Windows - | refs: `#39882`_ - * 62d8ad2 Merge pull request `#39882`_ from smarsching/issue-39842 - * d485d1a Fix context for _splitlines_preserving_trailing_newline. + * cb4db56eb5 Allow pillar.get to merge list as well as dictionaries - * 76cb7bf Fix trailing newlines on Windows (`#39842`_). + * a8304cd5a1 Merge pull request `#40552`_ from terminalmage/fix-hash-type-refs -- **PR** `#40451`_: (*isbm*) Fileclient testcase (2016.11) - @ *2017-04-06T19:53:31Z* + * 8c61f333ae Don't use __opts__.get() for hash_type - * ae13de6 Merge pull request `#40451`_ from isbm/isbm-fileclient-testcase-2016.11 - * 74c6555 Add space before in-lint comment for lint + * 705e1d8a08 Merge pull request `#40562`_ from terminalmage/fix-get-client - * 35fcb8b Fix race condition on cache directory creation + * 7f1ef72f83 Fix dockerng _get_client() regression - * aba9449 Lintfix (Py3 code compat) + * 00f8ef0c55 Merge pull request `#40548`_ from Ch3LL/fix_vultrpy - * 9f9dc6e Add unit test case for fileclient + * 7710355e3a check for salt install fail on vultur test -- **PR** `#40564`_: (*techhat*) Update Azure ARM docs - @ *2017-04-06T18:17:32Z* + * aae3d14ea4 fix vultr cloud race condition to match on 0* - - **ISSUE** `#40084`_: (*podstava*) profile fields in azurearm salt-cloud need to be actualized to sources - | refs: `#40564`_ - * 74366c5 Merge pull request `#40564`_ from techhat/azuredocs - * 08d071b Update Azure ARM docs +* **PR** `#40575`_: (`rallytime`_) Back-port `#40559`_ to 2016.11 + @ *2017-04-07 15:42:26 UTC* -- **PR** `#40543`_: (*rallytime*) Add the "fingerprint_hash_type" option to ssh state and module - @ *2017-04-05T21:21:16Z* + * **PR** `#40559`_: (`jinm`_) Fix v3 for https://github.com/saltstack/salt/issues/38472 (refs: `#40575`_) - - **ISSUE** `#40005`_: (*vutny*) `ssh_known_hosts.present` does not support SHA256 key fingerprints - | refs: `#40543`_ - * cb9dcb1 Merge pull request `#40543`_ from rallytime/`fix-40005`_ - * 1ef81e6 Add the "fingerprint_hash_type" option to ssh state and module + * 3d07f637ca Merge pull request `#40575`_ from rallytime/bp-40559 -- **PR** `#40540`_: (*DmitryKuzmenko*) A quick fix for Cache has no 'list' attribute. - @ *2017-04-05T18:50:18Z* + * 8280e5256e Fix v3 for https://github.com/saltstack/salt/issues/38472 - - **PR** `#40494`_: (*rallytime*) [develop] Merge forward from 2016.11 to develop - | refs: `#40540`_ `#40540`_ - * 3f06955 Merge pull request `#40540`_ from DSRCorporation/bugs/40494_merge_forward_cache_list_fix - * c0fd563 A quick fix for Cache has no 'list' attribute. +* **PR** `#40576`_: (`rallytime`_) Back-port `#40573`_ to 2016.11 + @ *2017-04-07 15:20:11 UTC* -- **PR** `#40464`_: (*terminalmage*) salt-cloud: Do not pass userdata_file through yaml renderer - @ *2017-04-05T17:32:07Z* + * **PR** `#40573`_: (`ardakuyumcu`_) Fix typo in IAM state for managed policies (refs: `#40576`_) - - **ISSUE** `#32662`_: (*anlutro*) salt-cloud: allow templating of EC2 userdata, similar to deploy script - | refs: `#32698`_ - - **PR** `#32698`_: (*techhat*) Allow EC2 userdata to be templated - | refs: `#40464`_ - * 28fc048 Merge pull request `#40464`_ from terminalmage/userdata-renderer - * 84ee693 Nova and openstack don't accept base64-encoded userdata + * 9041ca2ba5 Merge pull request `#40576`_ from rallytime/bp-40573 - * 73f4c43 Allow for userdata_template to be disabled in a cloud_profile + * 12180808ee Fix typo in IAM state for managed policies - * 78b4798 Update compile_template test to use StringIO +* **PR** `#40563`_: (`terminalmage`_) Merge-forward 2016.3 -> 2016.11 + @ *2017-04-07 15:08:20 UTC* - * 5f7c561 Properly handle renderers which return StringIO objects + * **PR** `#40562`_: (`terminalmage`_) Fix dockerng _get_client() regression (refs: `#40563`_) - * d551b0d Bring in salt.utils.stringio from develop branch + * **PR** `#40481`_: (`terminalmage`_) Backport auth and custom registry fixes from `#40480`_ to 2016.3 branch (refs: `#40563`_, `#40562`_) - * 6a6ef0a Move userdata templating to salt.utils.cloud + * **PR** `#40480`_: (`terminalmage`_) Improved Docker auth handling and other misc. Docker improvements (refs: `#40481`_) - * b440d0c Update 2016.11.4 release notes for userdata_renderer -> userdata_template + * f8bc423ef9 Merge pull request `#40563`_ from terminalmage/merge-2016.3-2016.11 - * a6183d9 Preserve windows newlines in salt.template.compile_template() + * 0c608d7417 Add client_args_mock back to test - * 04f02df Try to read compiled template as StringIO + * a7a78da984 remove unused imports - * 79cc253b Only template the userdata_file if explicitly configured to do so + * a6d68f50fe Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11 - * b580654 Update cloud docs to reflect userdata_renderer -> userdata_template + * 0918311330 Don't mark files that already were deleted as errors - * a6064fb Rename userdata_renderer -> userdata_template in master config docs + * 51d88a16c8 Merge branch 'zer0def-fix-31363' into 2016.3 - * 50f2b28 Remove userdata_renderer value + * 7f3cbd5cf9 Merge branch 'fix-31363' of https://github.com/zer0def/salt into zer0def-fix-31363 - * cc2186f Add templating support for other cloud drivers that support userdata_file + * 3c750c2b24 Changed rm_rf's argument to actually remove intended file. (refs `#31363`_) - * be8d34c ec2: Add support for using userdata_renderer to template userdata_file + * 9ed85f3c59 Remove directory content instead of directory itself when using `force_clone` in `git.latest` state. (refs `#31363`_) - * eddbd41 Openstack did not have templating support for userdata_file before 2016.11.4 + * cfba4cb422 Merge pull request `#40534`_ from terminalmage/issue39892 - * a85a416 Add userdata_renderer fix info to 2016.11.4 release notes + * ad88c58a09 Check master's ssh_minion_opts for fileserver/pillar values and ignore them - * 1111887 Add documentation for userdata_renderer + * 8da27c9e1d Merge pull request `#40306`_ from terminalmage/issue40279 - * 9ee2dcf Add userdata_renderer master config param + * 57ace1f336 Merge branch 'issue40279' of https://github.com/terminalmage/salt into issue40279 -- **PR** `#40530`_: (*dmurphy18*) Update release information for 2016.11.4 for additional AIX support - @ *2017-04-05T16:20:22Z* + * 8bcdf1a761 Remove unused import for lint - * 990bde4 Merge pull request `#40530`_ from dmurphy18/aix_docupd - * fd93caf Added further support for functionality on AIX for 2016.11.4 + * 808ad76419 systemd.py: when getting all services, don't repeat gathering of systemd services - * 17b5891 Update release information for new AIX support + * 2d219af67a Don't use context caching for gathering systemd services -- **PR** `#40528`_: (*dmurphy18*) Allow for nightly build designations in Salt versions - @ *2017-04-04T20:34:26Z* + * 97caac4c0a Merge pull request `#40481`_ from terminalmage/docker-auth-handling-2016.3 - * 4d93269 Merge pull request `#40528`_ from dmurphy18/salt_nightlybuild - * d62a119 Allow for nightly build designations in Salt versions + * dcef1e0d4b Make sure we keep the cached client when clearing context -- **PR** `#40465`_: (*rallytime*) Artifactory Execution & State Module: Fixup Error Handling - @ *2017-04-04T20:12:21Z* + * 1e2a04cfc5 Backport auth and custom registry fixes from `#40480`_ to 2016.3 branch - - **ISSUE** `#37699`_: (*gstachowiak*) Artifactory state. Incorrect timeout error reporting. - | refs: `#40465`_ - * 0ed3852 Merge pull request `#40465`_ from rallytime/`fix-37699`_ - * 8f084f7 Update unit test to look for actual string comment + * e62603d5eb Merge pull request `#40505`_ from gtmanfred/2016.3 - * ef664b4 Artifactory State: Only wrap main function call to module in try/except and wrap exc comment in str() + * 6e2f9080ca update docs for logging handlers - * f1015e3 Artifactory Module: catch URLErrors as well as HTTPErrors +* **ISSUE** `#39778`_: (`Talkless`_) pkgrepo.managed state always report changes with test=True on APT system (refs: `#40571`_) -- **PR** `#40497`_: (*DmitryKuzmenko*) Memcache documentation and minor updates. - @ *2017-04-04T19:55:18Z* +* **PR** `#40571`_: (`terminalmage`_) pkgrepo.managed: properly handle comments for debian (refs: `#40638`_) + @ *2017-04-06 21:55:46 UTC* - - **ISSUE** `#39275`_: (*yhekma*) Cache backend gets hit a *lot* - | refs: `#40429`_ `#40497`_ - - **PR** `#40429`_: (*DmitryKuzmenko*) MemCache - a minion data cache booster. - | refs: `#40468`_ `#40468`_ `#40497`_ - * 7a04ed2 Merge pull request `#40497`_ from DSRCorporation/features/39275_memcache - * 82c45b1 Memcache documentation and minor updates. + * fd757fffa3 Merge pull request `#40571`_ from terminalmage/issue39778 -- **PR** `#40504`_: (*rallytime*) Group checks for failhard setting in () in state.check_failhard function - @ *2017-04-04T19:53:48Z* + * 191610482d pkgrepo.managed: properly handle comments for debian - - **ISSUE** `#38683`_: (*gstachowiak*) require/order/failhard combination error - | refs: `#40504`_ - * d654de5 Merge pull request `#40504`_ from rallytime/`fix-38683`_ - * ede4c28 Group checks for failhard setting in () in state.check_failhard function +* **ISSUE** `#40278`_: (`UtahDave`_) cloud.action giving errors on 2016.11.1 (refs: `#40572`_) -- **PR** `#40503`_: (*thatch45*) first pass at adding support for pycryptodome installed as - @ *2017-04-04T19:39:02Z* +* **PR** `#40572`_: (`rallytime`_) Clean out kwargs dict in cloud.action before calling cloud driver function + @ *2017-04-06 21:53:40 UTC* - * 4d5d7d9 Merge pull request `#40503`_ from thatch45/2016.11 - * e21fd54 fix lint on the lint ignores... + * b1698e830e Merge pull request `#40572`_ from rallytime/fix-40278 - * 6011324 pycryptodome adds RSA to the key header which the openssl + * c978486452 Clean out kwargs dict in cloud.action before calling cloud driver function - * 206dec6 fix the cryptodome version lookup for the versions report +* **ISSUE** `#39842`_: (`smarsching`_) File module removes trailing newline on Windows (refs: `#39882`_) - * d3b7709 good catch +* **PR** `#39882`_: (`smarsching`_) Fix handling of trailing newlines on Windows + @ *2017-04-06 21:12:24 UTC* - * 31c6a10 first pass at adding support for pycryptodome installed as + * 62d8ad2b4b Merge pull request `#39882`_ from smarsching/issue-39842 -- **PR** `#40525`_: (*dmurphy18*) Add support for disk.iostat on AIX - @ *2017-04-04T19:31:41Z* + * d485d1af44 Fix context for _splitlines_preserving_trailing_newline. - * 0dd92c6 Merge pull request `#40525`_ from dmurphy18/aix_dskiostat - * 7125372 Added support on AIX for disk.iostat + * 76cb7bf612 Fix trailing newlines on Windows (`#39842`_). -- **PR** `#40496`_: (*rallytime*) Back-port `#40415`_ to 2016.11 - @ *2017-04-04T17:19:39Z* +* **PR** `#40451`_: (`isbm`_) Fileclient testcase (2016.11) + @ *2017-04-06 19:53:31 UTC* - - **PR** `#40415`_: (*defanator*) Fix boto_vpc.create_route() to work with interface_id - | refs: `#40496`_ - * a6291b1 Merge pull request `#40496`_ from rallytime/`bp-40415`_ - * f8b3006 Fix boto_vpc.create_route() to work with interface_id + * ae13de622a Merge pull request `#40451`_ from isbm/isbm-fileclient-testcase-2016.11 -- **PR** `#40468`_: (*techhat*) Add __func_alias__ back in - @ *2017-04-04T17:02:43Z* + * 74c65557dd Add space before in-lint comment for lint - - **ISSUE** `#39275`_: (*yhekma*) Cache backend gets hit a *lot* - | refs: `#40429`_ `#40497`_ - - **PR** `#40429`_: (*DmitryKuzmenko*) MemCache - a minion data cache booster. - | refs: `#40468`_ `#40468`_ `#40497`_ - * 3eb8e0b Merge pull request `#40468`_ from techhat/cachealias - * 6ec0baa Swap around aliases + * 35fcb8b52d Fix race condition on cache directory creation - * 76e54a2 Add __func_alias__ back in + * aba94495a5 Lintfix (Py3 code compat) -- **PR** `#39109`_: (*bdrung*) Fix top_file_merging_strategy warning if env_order is set - @ *2017-04-04T14:20:56Z* + * 9f9dc6e4e7 Add unit test case for fileclient - - **ISSUE** `#29104`_: (*adithep*) Merging Order warning - | refs: `#39109`_ - * 8c0befa Merge pull request `#39109`_ from bdrung/fix-merge-order-warning - * fbf8fcf Simplify _get_envs() by using list comprehensions +* **ISSUE** `#40084`_: (`podstava`_) profile fields in azurearm salt-cloud need to be actualized to sources (refs: `#40564`_) - * 74a3b06 Fix top_file_merging_strategy warning if env_order is set +* **PR** `#40564`_: (`techhat`_) Update Azure ARM docs + @ *2017-04-06 18:17:32 UTC* - * ec219b5 Remove duplicate client_envs variable definitions + * 74366c57a4 Merge pull request `#40564`_ from techhat/azuredocs -* 85b9bb4 Fix label for RST link + * 08d071bc68 Update Azure ARM docs +* **ISSUE** `#40005`_: (`vutny`_) `ssh_known_hosts.present` does not support SHA256 key fingerprints (refs: `#40543`_) -* 16e19ea Merge branch 'thatch45-rand_m_doc' into 2016.11 +* **PR** `#40543`_: (`rallytime`_) Add the "fingerprint_hash_type" option to ssh state and module + @ *2017-04-05 21:21:16 UTC* + * cb9dcb1e1b Merge pull request `#40543`_ from rallytime/fix-40005 - * 6279f7c fix do to pre correct on python randome function + * 1ef81e6a55 Add the "fingerprint_hash_type" option to ssh state and module - * 66b9515 Fix up the doc for failover clarity +* **PR** `#40540`_: (`DmitryKuzmenko`_) A quick fix for Cache has no 'list' attribute. + @ *2017-04-05 18:50:18 UTC* -- **PR** `#40495`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-04-03T18:36:16Z* + * **PR** `#40494`_: (`rallytime`_) [develop] Merge forward from 2016.11 to develop (refs: `#40540`_) - - **ISSUE** `#37322`_: (*kiemlicz*) master_tops generating improper top file - | refs: `#40427`_ - - **PR** `#40427`_: (*terminalmage*) Clarify the master_tops documentation - * 02a1f64 Merge pull request `#40495`_ from rallytime/merge-2016.11 - * 8111909 Merge branch '2016.3' into '2016.11' + * 3f0695575a Merge pull request `#40540`_ from DSRCorporation/bugs/40494_merge_forward_cache_list_fix - * 3d45a00 Merge pull request `#40427`_ from terminalmage/clarify-master-tops-docs + * c0fd5634cf A quick fix for Cache has no 'list' attribute. - * bda781d Grammar fix +* **ISSUE** `#32662`_: (`anlutro`_) salt-cloud: allow templating of EC2 userdata, similar to deploy script (refs: `#32698`_) - * 0d7b0c4 Improve the master_tops documentation +* **PR** `#40464`_: (`terminalmage`_) salt-cloud: Do not pass userdata_file through yaml renderer + @ *2017-04-05 17:32:07 UTC* - * d27340a Add saltutil.sync_tops runner func + * **PR** `#32698`_: (`techhat`_) Allow EC2 userdata to be templated (refs: `#40464`_) -- **PR** `#40466`_: (*dmurphy18*) Support for execution module status on AIX - @ *2017-04-01T00:28:51Z* + * 28fc048030 Merge pull request `#40464`_ from terminalmage/userdata-renderer - * ac82972 Merge pull request `#40466`_ from dmurphy18/aix_status - * 7c0b30d Support for AIX + * 84ee693006 Nova and openstack don't accept base64-encoded userdata -- **PR** `#40429`_: (*DmitryKuzmenko*) MemCache - a minion data cache booster. - | refs: `#40468`_ `#40468`_ `#40497`_ - @ *2017-03-31T20:21:00Z* + * 73f4c43e2a Allow for userdata_template to be disabled in a cloud_profile - - **ISSUE** `#39275`_: (*yhekma*) Cache backend gets hit a *lot* - | refs: `#40429`_ `#40497`_ - * fdb0250 Merge pull request `#40429`_ from DSRCorporation/features/39275_memcache - * 4475d17 In-memory minion data cache. + * 78b4798b1b Update compile_template test to use StringIO -- **PR** `#40442`_: (*gtmanfred*) allow file_client to figure out cachedir - | refs: `#40642`_ `#40642`_ - @ *2017-03-31T20:14:27Z* + * 5f7c5613ce Properly handle renderers which return StringIO objects - - **ISSUE** `#38458`_: (*duk3luk3*) salt-ssh uses sudo to create cache dir, later fails to access it - | refs: `#40442`_ - * 31d4e69 Merge pull request `#40442`_ from gtmanfred/salt-ssh - * 8367735 allow file_client to figure out cachedir + * d551b0d857 Bring in salt.utils.stringio from develop branch -- **PR** `#40456`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-31T17:51:11Z* + * 6a6ef0adf8 Move userdata templating to salt.utils.cloud - - **ISSUE** `#39854`_: (*Foxlik*) quoted space in authorized_keys confuses ssh.py - | refs: `#39855`_ - - **PR** `#40379`_: (*rallytime*) Create a unit test for the _replace_auth_key function in the ssh module - - **PR** `#40371`_: (*terminalmage*) Fix path handling for masterless gitfs on Windows - - **PR** `#39855`_: (*Foxlik*) Use regular expression instead of split when replacing authorized_keys - | refs: `#40379`_ - * 0cfcd18 Merge pull request `#40456`_ from rallytime/merge-2016.11 - * 0da4c46 Merge branch '2016.3' into '2016.11' + * b440d0c679 Update 2016.11.4 release notes for userdata_renderer -> userdata_template - * c26f4cc Merge pull request `#40371`_ from terminalmage/pr-40344 + * a6183d93d3 Preserve windows newlines in salt.template.compile_template() - * a8bcaa7 Force use of posixpath when joining salt fileserver paths in gitfs + * 04f02df5fe Try to read compiled template as StringIO - * cafa08d Add ability for salt.utils.path_join to force the use of posixpath + * 79cc253bbf Only template the userdata_file if explicitly configured to do so - * df9df82 Merge pull request `#40379`_ from rallytime/tests-for-39855 + * b580654f85 Update cloud docs to reflect userdata_renderer -> userdata_template - * 96259d6 Lint fix + * a6064fb2e4 Rename userdata_renderer -> userdata_template in master config docs - * 4f7ac14 Create a unit test for the _replace_auth_key function in the ssh module + * 50f2b2831f Remove userdata_renderer value -- **PR** `#40443`_: (*gtmanfred*) prepend ssh_log_file with root_dir - @ *2017-03-31T09:23:46Z* + * cc2186f35a Add templating support for other cloud drivers that support userdata_file - * 8617be9 Merge pull request `#40443`_ from gtmanfred/sshlog - * 7f6046d prepend ssh_log_file with root_dir + * be8d34c59b ec2: Add support for using userdata_renderer to template userdata_file -- **PR** `#40376`_: (*nmadhok*) Backporting changes in vmware cloud driver from develop branch to 2016.11 branch - @ *2017-03-30T22:35:13Z* + * eddbd41265 Openstack did not have templating support for userdata_file before 2016.11.4 - * 132d8b7 Merge pull request `#40376`_ from nmadhok/2016.11 - * dd62310 Adding unit tests for vmware_test + * a85a416c72 Add userdata_renderer fix info to 2016.11.4 release notes - * 36edf0a Add additional VMware related exceptions + * 111188742a Add documentation for userdata_renderer - * 034ef30 Remove old vmware unit tests + * 9ee2dcfc2d Add userdata_renderer master config param - * 7c14488 Backporting changes in vmware cloud driver from develop branch to 2016.11 branch +* **PR** `#40530`_: (`dmurphy18`_) Update release information for 2016.11.4 for additional AIX support + @ *2017-04-05 16:20:22 UTC* -- **PR** `#40387`_: (*redbaron4*) More complete fix for 39692 - @ *2017-03-30T22:29:05Z* + * 990bde4c07 Merge pull request `#40530`_ from dmurphy18/aix_docupd - - **ISSUE** `#39692`_: (*djsly*) tuned module and state are broken on 7.3 families. - | refs: `#39719`_ `#39768`_ `#40387`_ `#40387`_ - * dfaa670 Merge pull request `#40387`_ from redbaron4/`fix-39692`_ - * 77a40a0 Lint fixes + * fd93caf206 Added further support for functionality on AIX for 2016.11.4 - * 8c1adfa More complete fix for 39692 + * 17b58917f2 Update release information for new AIX support -- **PR** `#40404`_: (*roaldnefs*) Fix for fixtures in the djangomod module - @ *2017-03-30T22:26:09Z* +* **PR** `#40528`_: (`dmurphy18`_) Allow for nightly build designations in Salt versions + @ *2017-04-04 20:34:26 UTC* - - **ISSUE** `#7287`_: (*dragozov*) django.loaddata treats fixture list as arguments and prepends "--" for each - | refs: `#40404`_ `#40404`_ - * 313d216 Merge pull request `#40404`_ from roaldnefs/fix-djangomod-loaddata - * 92285cb Fix for fixtures in the djangomod module + * 4d932691f1 Merge pull request `#40528`_ from dmurphy18/salt_nightlybuild -- **PR** `#40416`_: (*lorengordon*) Adds some missing file functions on Windows - @ *2017-03-30T22:22:44Z* + * d62a119fc1 Allow for nightly build designations in Salt versions - * 5379899 Merge pull request `#40416`_ from lorengordon/win-file-funcs - * 8edaf25 Adds some missing file functions on Windows +* **ISSUE** `#37699`_: (`gstachowiak`_) Artifactory state. Incorrect timeout error reporting. (refs: `#40465`_) -- **PR** `#40418`_: (*lorengordon*) Closes handle to temporary file before returning the path - @ *2017-03-30T22:22:03Z* +* **PR** `#40465`_: (`rallytime`_) Artifactory Execution & State Module: Fixup Error Handling + @ *2017-04-04 20:12:21 UTC* - - **ISSUE** `#40417`_: (*lorengordon*) `temp.file` does not close the file handle - | refs: `#40418`_ - * 1f5d6b8 Merge pull request `#40418`_ from lorengordon/close-temp-file - * 7baf280 Closes handle to temporary file before returning the path + * 0ed385210f Merge pull request `#40465`_ from rallytime/fix-37699 -- **PR** `#40430`_: (*twangboy*) Fix logic for __virtual__ in win_dsc and win_psget - @ *2017-03-30T22:06:16Z* + * 8f084f7056 Update unit test to look for actual string comment - * 5c78d55 Merge pull request `#40430`_ from twangboy/fix_virtual - * 08e95ce Add logging on __virtual__ failures + * ef664b46ae Artifactory State: Only wrap main function call to module in try/except and wrap exc comment in str() - * 43ecb1a Fix logic for __virtual__ + * f1015e3900 Artifactory Module: catch URLErrors as well as HTTPErrors -- **PR** `#40431`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-30T21:37:39Z* +* **ISSUE** `#39275`_: (`yhekma`_) Cache backend gets hit a *lot* (refs: `#40497`_, `#40429`_) - - **ISSUE** `#40396`_: (*aesdana*) rabbitmq module fails on version comparison if version contains debian_revision - | refs: `#40407`_ - - **PR** `#40424`_: (*terminalmage*) Fix open filehandles - - **PR** `#40407`_: (*aesdana*) Added split to cut off debian_revision from rabbitmq-server version - - **PR** `#40399`_: (*terminalmage*) Add docker-py version to the versions report - - **PR** `#40391`_: (*Ch3LL*) initial commit of the 2016.3.7 release notes - - **PR** `#40368`_: (*Ch3LL*) [2016.3] Bump previous version to 2016.3.6 - * b855f29 Merge pull request `#40431`_ from rallytime/merge-2016.11 - * d5576d7 Merge branch '2016.3' into '2016.11' +* **PR** `#40497`_: (`DmitryKuzmenko`_) Memcache documentation and minor updates. + @ *2017-04-04 19:55:18 UTC* - * b6770fd Merge pull request `#40407`_ from aesdana/fix_rabbitmq_version_check + * **PR** `#40429`_: (`DmitryKuzmenko`_) MemCache - a minion data cache booster. (refs: `#40497`_, `#40468`_) - * 4c0763f Added split to cut off debian_revision from rabbitmq-server version Fixes `#40396`_ + * 7a04ed2439 Merge pull request `#40497`_ from DSRCorporation/features/39275_memcache - * d4fb45d Merge pull request `#40424`_ from terminalmage/fix-open-filehandle + * 82c45b1a52 Memcache documentation and minor updates. - * 6625126 Fix open filehandles +* **ISSUE** `#38683`_: (`gstachowiak`_) require/order/failhard combination error (refs: `#40504`_) - * 8708096 Merge pull request `#40399`_ from terminalmage/docker-py_version +* **PR** `#40504`_: (`rallytime`_) Group checks for failhard setting in () in state.check_failhard function + @ *2017-04-04 19:53:48 UTC* - * 14c6575 Add docker-py version to the versions report + * d654de52ed Merge pull request `#40504`_ from rallytime/fix-38683 - * ff1266b Merge pull request `#40391`_ from Ch3LL/2016.3.7_release_notes + * ede4c28887 Group checks for failhard setting in () in state.check_failhard function - * f532ec5 initial 2016.3.7 release notes +* **PR** `#40503`_: (`thatch45`_) first pass at adding support for pycryptodome installed as + @ *2017-04-04 19:39:02 UTC* - * 96bf942 Merge pull request `#40368`_ from Ch3LL/bump_version_3 + * 4d5d7d9712 Merge pull request `#40503`_ from thatch45/2016.11 - * a02fa7d [2016.3] Bump previous version to 2016.3.6 + * e21fd54d1b fix lint on the lint ignores... -- **PR** `#40401`_: (*roaldnefs*) fix Ubuntu notation in docs/faq.rst - @ *2017-03-29T20:28:31Z* + * 60113248b1 pycryptodome adds RSA to the key header which the openssl - * 7d900d3 Merge pull request `#40401`_ from roaldnefs/fix-doc-faq - * 21f161f fix Ubuntu notation in docs/faq.rst + * 206dec63ff fix the cryptodome version lookup for the versions report -- **PR** `#40390`_: (*rallytime*) Back-port `#37795`_ to 2016.11 - @ *2017-03-29T19:05:12Z* + * d3b77092b5 good catch - - **ISSUE** `#29028`_: (*kevins9*) state.sls fails to render state with pillar data: Jinja variable 'dict object' has no attribute - | refs: `#37795`_ - - **PR** `#37795`_: (*jettero*) please tell me where is the “error: 'dict' object has no …” - | refs: `#40390`_ - * 70a3f96 Merge pull request `#40390`_ from rallytime/`bp-37795`_ - * 1ba1557 Pylint fix + * 31c6a10d1b first pass at adding support for pycryptodome installed as - * ec65924 please tell me where is the "error: 'dict' object has no attribute 'seek'" ?? +* **PR** `#40525`_: (`dmurphy18`_) Add support for disk.iostat on AIX + @ *2017-04-04 19:31:41 UTC* -- **PR** `#40395`_: (*rallytime*) Handle AttributeError for dockerng_mod.docker attempt fails and docker is installed - @ *2017-03-29T17:47:11Z* + * 0dd92c63ea Merge pull request `#40525`_ from dmurphy18/aix_dskiostat - * f8fbfff Merge pull request `#40395`_ from rallytime/catch-attribute-error-docker-test - * 99c8dcc Handle AttributeError for dockerng_mod.docker attempt fails and docker is installed + * 712537272b Added support on AIX for disk.iostat -- **PR** `#40362`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-28T22:50:32Z* +* **PR** `#40496`_: (`rallytime`_) Back-port `#40415`_ to 2016.11 + @ *2017-04-04 17:19:39 UTC* - - **PR** `#40264`_: (*meaksh*) Makes sure "gather_job_timeout" is an Integer - * d7d3d68 Merge pull request `#40362`_ from rallytime/merge-2016.11 - * 4f1543c Merge branch '2016.3' into '2016.11' + * **PR** `#40415`_: (`defanator`_) Fix boto_vpc.create_route() to work with interface_id (refs: `#40496`_) - * 1381f97 Merge pull request `#40264`_ from meaksh/2016.3-gather_job_timeout-fix + * a6291b17c1 Merge pull request `#40496`_ from rallytime/bp-40415 - * 68dccae Makes sure "gather_job_timeout" is an integer + * f8b3006898 Fix boto_vpc.create_route() to work with interface_id -- **PR** `#40372`_: (*zer0def*) Fixes related to cache directory argument changes in pip>=6. - @ *2017-03-28T22:48:41Z* +* **ISSUE** `#39275`_: (`yhekma`_) Cache backend gets hit a *lot* (refs: `#40497`_, `#40429`_) - * 2febd05 Merge pull request `#40372`_ from zer0def/pip-cache-fixes - * d68067f Merge remote-tracking branch 'main/2016.11' into pip-cache-fixes +* **PR** `#40468`_: (`techhat`_) Add __func_alias__ back in + @ *2017-04-04 17:02:43 UTC* - * 4f23a23 Fixed the `test_install_download_cache_argument_in_resulting_command` to accommodate introduced cache directory argument fixes and renamed it to `test_install_download_cache_dir_arguments_in_resulting_command`. + * **PR** `#40429`_: (`DmitryKuzmenko`_) MemCache - a minion data cache booster. (refs: `#40497`_, `#40468`_) - * 9d0f94e Fixed unnecessary API changes introduced with suggested changes. + * 3eb8e0baf1 Merge pull request `#40468`_ from techhat/cachealias -- **PR** `#40369`_: (*Ch3LL*) [2016.11] Bump previous version to 2016.3.6 - @ *2017-03-28T18:50:39Z* + * 6ec0baa9a0 Swap around aliases - * 6162698 Merge pull request `#40369`_ from Ch3LL/bump_version_11 - * 7597d96 [2016.11] Bump previous version to 2016.3.6 + * 76e54a2900 Add __func_alias__ back in -- **PR** `#40333`_: (*gtmanfred*) fix some test=True comments - @ *2017-03-28T16:11:01Z* +* **ISSUE** `#29104`_: (`adithep`_) Merging Order warning (refs: `#39109`_) - - **ISSUE** `#40322`_: (*Whissi*) ssh_auth.absent: Wrong comment when test=True - | refs: `#40333`_ - - **ISSUE** `#40321`_: (*Whissi*) state.alternatives: Wrong comment when test=True - | refs: `#40333`_ - * 2d2cb5b Merge pull request `#40333`_ from gtmanfred/2016.11 - * 5596620 fix some test=True comments +* **PR** `#39109`_: (`bdrung`_) Fix top_file_merging_strategy warning if env_order is set + @ *2017-04-04 14:20:56 UTC* -- **PR** `#40347`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-28T02:39:31Z* + * 8c0befaa8b Merge pull request `#39109`_ from bdrung/fix-merge-order-warning - - **PR** `#40345`_: (*twangboy*) Fix osx build - - **PR** `#40338`_: (*UtahDave*) Upstream cherrypy moved to Github from Bitbucket - * bb37f13 Merge pull request `#40347`_ from rallytime/merge-2016.11 - * e77e86d Merge branch '2016.3' into '2016.11' + * fbf8fcfa98 Simplify _get_envs() by using list comprehensions - * 17ab1da Merge pull request `#40345`_ from twangboy/fix_osx_build + * 74a3b066ea Fix top_file_merging_strategy warning if env_order is set - * 3207d67 Fix osx build + * ec219b5f42 Remove duplicate client_envs variable definitions - * 7ab1049 Merge pull request `#40338`_ from UtahDave/fix_cherrypy_ssl_error_link + * 6279f7c120 fix do to pre correct on python randome function - * 280b501 Upstream cherrypy moved to Github from Bitbucket + * 66b9515af7 Fix up the doc for failover clarity -- **PR** `#40346`_: (*cachedout*) Revert "Fixes related to cache directory argument changes in pip>=6." - @ *2017-03-27T23:17:29Z* +* **PR** `#40495`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-04-03 18:36:16 UTC* - - **PR** `#40332`_: (*zer0def*) Fixes related to cache directory argument changes in pip>=6. - | refs: `#40346`_ - * a572b46 Merge pull request `#40346`_ from saltstack/revert-40332-pip-cache-fixes - * b4753d1 Revert "Fixes related to cache directory argument changes in pip>=6." + * 02a1f642ab Merge pull request `#40495`_ from rallytime/merge-2016.11 -- **PR** `#40326`_: (*L4rS6*) Update mount state documentation (Fixes: `#40296`_) - @ *2017-03-27T23:15:53Z* + * 8111909bb1 Merge branch '2016.3' into '2016.11' - - **ISSUE** `#40296`_: (*L4rS6*) Wrong documentation in mount.mounted - | refs: `#40326`_ - * a91bab8 Merge pull request `#40326`_ from L4rS6/update-mount-state-doc - * a717c52 Update mount state documentation (Fixes: `#40296`_) + * 3d45a004b0 Merge pull request `#40427`_ from terminalmage/clarify-master-tops-docs -- **PR** `#40328`_: (*L4rS6*) Fixes wrong compared extra_mount_ignore_fs_keys key. - @ *2017-03-27T23:14:22Z* + * bda781d8f9 Grammar fix - * ca2980c Merge pull request `#40328`_ from L4rS6/fix-mount-state-extra-ignore-fs-key - * f0f68b9 Fixes wrong compared extra_mount_ignore_fs_keys key. + * 0d7b0c4ef0 Improve the master_tops documentation -- **PR** `#40329`_: (*isbm*) Merge tops (backport) - @ *2017-03-27T23:13:47Z* + * d27340a9f2 Add saltutil.sync_tops runner func - * 3a6c5d0 Merge pull request `#40329`_ from isbm/isbm-merge-tops-201611 - * a762c9e Merge output from master_tops +* **PR** `#40466`_: (`dmurphy18`_) Support for execution module status on AIX + @ *2017-04-01 00:28:51 UTC* -- **PR** `#40285`_: (*rallytime*) Dockerng unit tests fixes: isolate global variables - @ *2017-03-27T23:05:03Z* + * ac82972cb3 Merge pull request `#40466`_ from dmurphy18/aix_status - * 2b7b2f1 Merge pull request `#40285`_ from rallytime/docker-test-fixes - * 0f263a5 Mock out the get_client_args mocks in the dockerng module tests more aggressively + * 7c0b30d9a4 Support for AIX - * f1352fe Add one more dockerng.version mock that was missed previously +* **ISSUE** `#39275`_: (`yhekma`_) Cache backend gets hit a *lot* (refs: `#40497`_, `#40429`_) - * 0d31d2c Add a couple more patches for docker.version information +* **PR** `#40429`_: (`DmitryKuzmenko`_) MemCache - a minion data cache booster. (refs: `#40497`_, `#40468`_) + @ *2017-03-31 20:21:00 UTC* - * a9c5eeb Clean up dockerng unit tests to avoid global variables and fixup some patching + * fdb0250c95 Merge pull request `#40429`_ from DSRCorporation/features/39275_memcache -- **PR** `#40341`_: (*twangboy*) Fix service.create, fix docs - @ *2017-03-27T21:46:19Z* + * 4475d1757d In-memory minion data cache. - * 01efc84 Merge pull request `#40341`_ from twangboy/fix_win_service - * 6736457 Docs for create +* **ISSUE** `#38458`_: (`duk3luk3`_) salt-ssh uses sudo to create cache dir, later fails to access it (refs: `#40442`_) - * 652cf08 Fix service.create, fix docs +* **PR** `#40442`_: (`gtmanfred`_) allow file_client to figure out cachedir (refs: `#40642`_) + @ *2017-03-31 20:14:27 UTC* -- **PR** `#40332`_: (*zer0def*) Fixes related to cache directory argument changes in pip>=6. - | refs: `#40346`_ - @ *2017-03-27T21:01:15Z* + * 31d4e6949c Merge pull request `#40442`_ from gtmanfred/salt-ssh - * 8eabcca Merge pull request `#40332`_ from zer0def/pip-cache-fixes - * 7976840 Fixes related to cache directory changes in pip>=6. + * 8367735063 allow file_client to figure out cachedir -- **PR** `#40337`_: (*Ch3LL*) Add archive.extracted with use_cmd_unzip argument - @ *2017-03-27T21:00:23Z* +* **PR** `#40456`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-31 17:51:11 UTC* - * ceba1b9 Merge pull request `#40337`_ from Ch3LL/add_unzip_test - * 8b21b4c add use_cmd_unzip test + * 0cfcd188a9 Merge pull request `#40456`_ from rallytime/merge-2016.11 -- **PR** `#40312`_: (*rallytime*) Update minion data cache documentation - @ *2017-03-27T20:56:55Z* + * 0da4c46b68 Merge branch '2016.3' into '2016.11' - * a192597 Merge pull request `#40312`_ from rallytime/cache-docs - * 5363e0b Update minion data cache documentation + * c26f4cc76c Merge pull request `#40371`_ from terminalmage/pr-40344 -- **PR** `#40315`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-27T15:11:25Z* + * a8bcaa73d7 Force use of posixpath when joining salt fileserver paths in gitfs - - **PR** `#40300`_: (*meaksh*) Fixes 'timeout' and 'gather_job_timeout' kwargs parameters for 'local_batch' client - * 7f16754 Merge pull request `#40315`_ from rallytime/merge-2016.11 - * c65d602 Merge branch '2016.3' into '2016.11' + * cafa08d8e0 Add ability for salt.utils.path_join to force the use of posixpath - * 7c21153 Merge pull request `#40300`_ from meaksh/2016.3-adding-timeouts-parameters-to-cmd_batch + * df9df82959 Merge pull request `#40379`_ from rallytime/tests-for-39855 - * 9174e6f Fixes testing opts dict for batch unit tests + * 96259d6c63 Lint fix - * b1de79a Adds custom 'timeout' and 'gather_job_timeout' to 'local_batch' client + * 4f7ac1431e Create a unit test for the _replace_auth_key function in the ssh module -- **PR** `#40313`_: (*techhat*) Add minimum and maximum to calls to calc - @ *2017-03-27T14:54:15Z* +* **PR** `#40443`_: (`gtmanfred`_) prepend ssh_log_file with root_dir + @ *2017-03-31 09:23:46 UTC* - * a9a73bf Merge pull request `#40313`_ from techhat/calcref - * 7106a86 Use named kwargs + * 8617be9c6d Merge pull request `#40443`_ from gtmanfred/sshlog - * 822f3b8 Add minimum and maximum to calls to calc + * 7f6046deec prepend ssh_log_file with root_dir -- **PR** `#40277`_: (*eldadru*) Fixing boto_rds.py delete() wait_for_deletion, if statement was inco… - @ *2017-03-24T22:29:25Z* +* **PR** `#40376`_: (`nmadhok`_) Backporting changes in vmware cloud driver from develop branch to 2016.11 branch + @ *2017-03-30 22:35:13 UTC* - - **ISSUE** `#40247`_: (*eldadru*) boto_rds.delete wait_for_deletion checks rds status incorrectly and always loop until timeout - | refs: `#40277`_ - * 9d0762d Merge pull request `#40277`_ from eldadru/Fix-40247-boto_rds-delete-wait-for-deletion-failure - * 3c15a32 Fixing boto_rds.py delete() wait_for_deletion, if statement was incorrectly checking the return value of boto_rds.py exists() method. + * 132d8b7b88 Merge pull request `#40376`_ from nmadhok/2016.11 -- **PR** `#40280`_: (*bewing*) Clean up temporary file in net.load_template - @ *2017-03-24T22:27:04Z* + * dd62310941 Adding unit tests for vmware_test - - **PR** `#40273`_: (*bewing*) Clean up temporary file in net.load_template - | refs: `#40280`_ - * 6c29c81 Merge pull request `#40280`_ from bewing/bp_40273 - * f028e93 Clean up temporary file in net.load_template + * 36edf0af64 Add additional VMware related exceptions -- **PR** `#40310`_: (*gtmanfred*) add warning when no host/dns record is found for fqdn_ip - @ *2017-03-24T21:55:20Z* + * 034ef30f7c Remove old vmware unit tests - - **ISSUE** `#37972`_: (*ebauman*) salt-run execution for master with no AAAA record adds significant execution time - | refs: `#40310`_ - * 839b620 Merge pull request `#40310`_ from gtmanfred/2016.11 - * cff027d add warning when no host/dns record is found for fqdn + * 7c144888da Backporting changes in vmware cloud driver from develop branch to 2016.11 branch -- **PR** `#40288`_: (*dmurphy18*) Execution module network support for AIX - @ *2017-03-24T20:10:36Z* +* **ISSUE** `#39692`_: (`djsly`_) tuned module and state are broken on 7.3 families. (refs: `#40387`_, `#39719`_, `#39768`_) - * eb86d55 Merge pull request `#40288`_ from dmurphy18/aix_network - * b53a95d Further update to us in similar to review comments +* **PR** `#40387`_: (`redbaron4`_) More complete fix for 39692 + @ *2017-03-30 22:29:05 UTC* - * 59c0bdc Updated for review comments + * dfaa670b66 Merge pull request `#40387`_ from redbaron4/fix-39692 - * 031c945 Execution module network support for AIX + * 77a40a0c44 Lint fixes -- **PR** `#40308`_: (*rallytime*) Back-port `#38835`_ to 2016.11 - @ *2017-03-24T19:00:46Z* + * 8c1adfafd5 More complete fix for 39692 - - **PR** `#38835`_: (*UtahDave*) Cache docs - | refs: `#40308`_ - * 4928026 Merge pull request `#40308`_ from rallytime/`bp-38835`_ - * 3ba50d3 add info about what is cached +* **ISSUE** `#7287`_: (`dragozov`_) django.loaddata treats fixture list as arguments and prepends "--" for each (refs: `#40404`_) - * 77e8f6a fix config example +* **PR** `#40404`_: (`roaldnefs`_) Fix for fixtures in the djangomod module + @ *2017-03-30 22:26:09 UTC* - * 61f2fa9 Add documentation for the Minion data cache + * 313d21626f Merge pull request `#40404`_ from roaldnefs/fix-djangomod-loaddata -- **PR** `#40287`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-24T16:50:23Z* + * 92285cb045 Fix for fixtures in the djangomod module - - **ISSUE** `#40251`_: (*sergeizv*) Cloud roster doesn't work - | refs: `#40201`_ - - **ISSUE** `#40219`_: (*Azidburn*) Broken pkg.installed with sources - | refs: `#40265`_ - - **ISSUE** `#31005`_: (*jfindlay*) cloud roster not working - | refs: `#40201`_ - - **PR** `#40275`_: (*UtahDave*) remove reference to auth_minion. - - **PR** `#40265`_: (*terminalmage*) Fix two mod_aggregate bugs in pkg states - - **PR** `#40260`_: (*lubyou*) Use win32api.FormatMessage to cover more system codes - - **PR** `#40201`_: (*sergeizv*) Cloud roster fixes - * 12a9fc4 Merge pull request `#40287`_ from rallytime/merge-2016.11 - * 7741536 Merge branch '2016.3' into '2016.11' +* **PR** `#40416`_: (`lorengordon`_) Adds some missing file functions on Windows + @ *2017-03-30 22:22:44 UTC* - * 0e2d52c Merge pull request `#40260`_ from lubyou/fix-join_domain + * 5379899442 Merge pull request `#40416`_ from lorengordon/win-file-funcs - * 1cb15d1 use win32api.FormatMessage() to get the error message for the system code + * 8edaf25e10 Adds some missing file functions on Windows - * 0c62bb3 Merge pull request `#40275`_ from UtahDave/2016.3local +* **ISSUE** `#40417`_: (`lorengordon`_) `temp.file` does not close the file handle (refs: `#40418`_) - * 9f0c980 remove reference to auth_minion. +* **PR** `#40418`_: (`lorengordon`_) Closes handle to temporary file before returning the path + @ *2017-03-30 22:22:03 UTC* - * 57ce474 Merge pull request `#40265`_ from terminalmage/issue40219 + * 1f5d6b88f9 Merge pull request `#40418`_ from lorengordon/close-temp-file - * 1a731e0 Pop off the version when aggregating pkg states + * 7baf2809cf Closes handle to temporary file before returning the path - * 0055fda Properly aggregate version when passed with name +* **PR** `#40430`_: (`twangboy`_) Fix logic for __virtual__ in win_dsc and win_psget + @ *2017-03-30 22:06:16 UTC* - * 62d76f5 Don't aggregate both name/pkgs and sources in pkg states + * 5c78d55eab Merge pull request `#40430`_ from twangboy/fix_virtual - * b208630 Merge pull request `#40201`_ from sergeizv/cloud-roster-fixes-2016.3 + * 08e95ce4f0 Add logging on __virtual__ failures - * d87b377 cloud roster: Don't stop if minion wasn't found in cloud cache index + * 43ecb1a597 Fix logic for __virtual__ - * a6865e0 cloud roster: Check whether show_instance succeeded on node +* **PR** `#40431`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-30 21:37:39 UTC* - * 1b45c8e cloud roster: Check provider and profile configs for ssh_username + * b855f29928 Merge pull request `#40431`_ from rallytime/merge-2016.11 - * a18250b cloud roster: Return proper target name + * d5576d75e7 Merge branch '2016.3' into '2016.11' - * 637930b cloud roster: Fix extracting instance's info + * b6770fd81f Merge pull request `#40407`_ from aesdana/fix_rabbitmq_version_check - * dd1d3aa cloud roster: Work with custom conf dir + * 4c0763fa2f Added split to cut off debian_revision from rabbitmq-server version Fixes `#40396`_ -- **PR** `#40250`_: (*techhat*) Add wait_for_fun() to set_tags() - @ *2017-03-23T16:42:13Z* + * d4fb45d9f8 Merge pull request `#40424`_ from terminalmage/fix-open-filehandle - - **PR** `#40225`_: (*techhat*) Add wait_for_fun() to set_tags() - | refs: `#40239`_ `#40250`_ - * b7f9100 Merge pull request `#40250`_ from techhat/settags - * baff7a0 Add wait_for_fun() to set_tags() + * 66251263cf Fix open filehandles -- **PR** `#40255`_: (*lomeroe*) backport `#40253`_ - @ *2017-03-23T16:36:44Z* + * 8708096365 Merge pull request `#40399`_ from terminalmage/docker-py_version - - **ISSUE** `#39976`_: (*peterhirn*) win_lgpo missing policies, eg. `Prevent the usage of OneDrive for file storage` - | refs: `#40253`_ `#40255`_ - - **PR** `#40253`_: (*lomeroe*) correct method of getting 'text' of the XML object to compare to the … - | refs: `#40255`_ - * 904e144 Merge pull request `#40255`_ from lomeroe/fix_39976_2016.11 - * 0e9f582 backport `#40253`_ + * 14c6575655 Add docker-py version to the versions report -- **PR** `#40240`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-23T14:14:11Z* + * ff1266b3a6 Merge pull request `#40391`_ from Ch3LL/2016.3.7_release_notes - - **ISSUE** `#40203`_: (*frogunder*) 2016.3.6. Minion don't connect to older master. - | refs: `#40206`_ - - **ISSUE** `#40149`_: (*jettero*) Error 2 encountered trying to check sysvinit scripts: No such file or directory - | refs: `#40226`_ - - **ISSUE** `#39854`_: (*Foxlik*) quoted space in authorized_keys confuses ssh.py - | refs: `#39855`_ - - **PR** `#40237`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - | refs: `#40240`_ - - **PR** `#40232`_: (*rallytime*) Update release notes for 2016.3.6 - - **PR** `#40226`_: (*terminalmage*) Fix wrong errno in systemd.py - - **PR** `#40221`_: (*rallytime*) Back-port `#39179`_ to 2016.3 - - **PR** `#40206`_: (*cro*) Leave sign_pub_messages off by default. - - **PR** `#40196`_: (*twangboy*) Update dependencies for PyOpenSSL - - **PR** `#40193`_: (*rallytime*) Back-port `#40117`_ to 2016.3 - - **PR** `#40184`_: (*terminalmage*) Link to minion start reactor example from FAQ. - - **PR** `#40117`_: (*narendraingale2*) Fix force remove - | refs: `#40193`_ - - **PR** `#39855`_: (*Foxlik*) Use regular expression instead of split when replacing authorized_keys - | refs: `#40379`_ - - **PR** `#39179`_: (*mcalmer*) fix error parsing - | refs: `#40221`_ - * 720a362 Merge pull request `#40240`_ from rallytime/merge-2016.11 - * 5c5b74b Merge branch '2016.3' into '2016.11' + * f532ec5288 initial 2016.3.7 release notes - * 35ced60 Merge pull request `#40226`_ from terminalmage/issue40149 + * 96bf9427b0 Merge pull request `#40368`_ from Ch3LL/bump_version_3 - * 2a8df93 Fix wrong errno in systemd.py + * a02fa7dd1f [2016.3] Bump previous version to 2016.3.6 - * 24c4ae9 Merge pull request `#40232`_ from rallytime/update-release-notes +* **PR** `#40401`_: (`roaldnefs`_) fix Ubuntu notation in docs/faq.rst + @ *2017-03-29 20:28:31 UTC* - * 2ead188 Update release notes for 2016.3.6 + * 7d900d31ea Merge pull request `#40401`_ from roaldnefs/fix-doc-faq - * c59ae9a Merge pull request `#39855`_ from Foxlik/use_regex_to_compare_authorized_keys + * 21f161fecc fix Ubuntu notation in docs/faq.rst - * d46845a Add newline at end of file +* **ISSUE** `#29028`_: (`kevins9`_) state.sls fails to render state with pillar data: Jinja variable 'dict object' has no attribute (refs: `#37795`_) - * d4a3c8a Use regular expression instead of split when replacing authorized_keys +* **PR** `#40390`_: (`rallytime`_) Back-port `#37795`_ to 2016.11 + @ *2017-03-29 19:05:12 UTC* - * fd10430 Merge pull request `#40221`_ from rallytime/`bp-39179`_ + * **PR** `#37795`_: (`jettero`_) please tell me where is the “error: 'dict' object has no …” (refs: `#40390`_) - * 07dc2de fix error parsing + * 70a3f963ec Merge pull request `#40390`_ from rallytime/bp-37795 - * a27a2cc Merge pull request `#40206`_ from cro/sign_pub_take2 + * 1ba15577bd Pylint fix - * 01048de leave sign_pub_messages off on minion by default. + * ec65924659 please tell me where is the "error: 'dict' object has no attribute 'seek'" ?? - * a82b005 Leave sign_pub_messages off by default. +* **PR** `#40395`_: (`rallytime`_) Handle AttributeError for dockerng_mod.docker attempt fails and docker is installed + @ *2017-03-29 17:47:11 UTC* - * d1abb4c Merge pull request `#40193`_ from rallytime/`bp-40117`_ + * f8fbfff7dc Merge pull request `#40395`_ from rallytime/catch-attribute-error-docker-test - * cf18579 More optimization. + * 99c8dcc18e Handle AttributeError for dockerng_mod.docker attempt fails and docker is installed - * 5a08266 Removed debug statemnt +* **PR** `#40362`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-28 22:50:32 UTC* - * f557f7c Added fix for issue 39393 + * d7d3d68035 Merge pull request `#40362`_ from rallytime/merge-2016.11 - * bb62278 Reverting changes. + * 4f1543c2a1 Merge branch '2016.3' into '2016.11' - * a9107cd Added if condition for broken link. + * 1381f97292 Merge pull request `#40264`_ from meaksh/2016.3-gather_job_timeout-fix - * 0f1ff4d Merge pull request `#40196`_ from twangboy/win_fix_deps + * 68dccae5b4 Makes sure "gather_job_timeout" is an integer - * 6761527 Update dependencies for PyOpenSSL +* **PR** `#40372`_: (`zer0def`_) Fixes related to cache directory argument changes in pip>=6. + @ *2017-03-28 22:48:41 UTC* - * b050151 Merge pull request `#40184`_ from terminalmage/link-reactor-example + * 2febd05896 Merge pull request `#40372`_ from zer0def/pip-cache-fixes - * a42be82 Link to minion start reactor example from FAQ. + * d68067f1d7 Merge remote-tracking branch 'main/2016.11' into pip-cache-fixes -- **PR** `#40231`_: (*rallytime*) Back-port `#40030`_ to 2016.11 - @ *2017-03-22T23:14:40Z* + * 4f23a23ca8 Fixed the `test_install_download_cache_argument_in_resulting_command` to accomodate introduced cache directory argument fixes and renamed it to `test_install_download_cache_dir_arguments_in_resulting_command`. - - **ISSUE** `#39445`_: (*systemtrap*) state file.copy for directories does not set ownership recursively - | refs: `#40030`_ - - **PR** `#40030`_: (*narendraingale2*) Added changes for fix_39445 - | refs: `#40231`_ - * c403762 Merge pull request `#40231`_ from rallytime/`bp-40030`_ - * 4d1c687 Using lchown insted of chown. + * 9d0f94eeba Fixed unnecessary API changes introduced with suggested changes. - * 52b3d98 Added changes for fix_39445 +* **PR** `#40369`_: (`Ch3LL`_) [2016.11] Bump previous version to 2016.3.6 + @ *2017-03-28 18:50:39 UTC* -- **PR** `#40239`_: (*cachedout*) Revert "Add wait_for_fun() to set_tags()" - @ *2017-03-22T22:59:16Z* + * 6162698c87 Merge pull request `#40369`_ from Ch3LL/bump_version_11 - - **PR** `#40225`_: (*techhat*) Add wait_for_fun() to set_tags() - | refs: `#40239`_ `#40250`_ - * e39f5cb Merge pull request `#40239`_ from saltstack/revert-40225-waitforfun - * 95bdab8 Revert "Add wait_for_fun() to set_tags()" + * 7597d96edb [2016.11] Bump previous version to 2016.3.6 -- **PR** `#40225`_: (*techhat*) Add wait_for_fun() to set_tags() - | refs: `#40239`_ `#40250`_ - @ *2017-03-22T18:15:35Z* +* **ISSUE** `#40322`_: (`Whissi`_) ssh_auth.absent: Wrong comment when test=True (refs: `#40333`_) - * 11d2f5a Merge pull request `#40225`_ from techhat/waitforfun - * 89b5010 Add wait_for_fun() to set_tags() +* **ISSUE** `#40321`_: (`Whissi`_) state.alternatives: Wrong comment when test=True (refs: `#40333`_) -- **PR** `#40172`_: (*dmurphy18*) Fix solaris network - @ *2017-03-22T17:41:56Z* +* **PR** `#40333`_: (`gtmanfred`_) fix some test=True comments + @ *2017-03-28 16:11:01 UTC* - * c8cfbb7 Merge pull request `#40172`_ from dmurphy18/fix_solaris_network - * a6218b9 Updated use of tail on Solaris and Sun-like OS + * 2d2cb5b837 Merge pull request `#40333`_ from gtmanfred/2016.11 - * 90e6a1d Further update to support correct tail in network for Solaris + * 5596620dfb fix some test=True comments - * 5b6d33d Fix use of correct tail on Solaris for active_tcp +* **PR** `#40347`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-28 02:39:31 UTC* -- **PR** `#40210`_: (*rallytime*) Skip flaky test for now - @ *2017-03-22T16:34:41Z* + * bb37f133fc Merge pull request `#40347`_ from rallytime/merge-2016.11 - * e9a4e85 Merge pull request `#40210`_ from rallytime/test-skip - * 0ba773d Skip flaky test for now + * e77e86db3a Merge branch '2016.3' into '2016.11' -- **PR** `#40209`_: (*sofixa*) change InfluxDB get_version to expect status code 204 - @ *2017-03-21T21:42:26Z* + * 17ab1da0ab Merge pull request `#40345`_ from twangboy/fix_osx_build - - **ISSUE** `#40204`_: (*sofixa*) InfluxDB returner present on salt-minion(installed via salt-bootstrap and updated via apt-get) has a bug - | refs: `#40209`_ - * 0b00489 Merge pull request `#40209`_ from sofixa/2016.11 - * e1cc723 change InfluxDB get_version to expect status code 204 + * 3207d670c5 Fix osx build -- **PR** `#40202`_: (*cro*) Revert "Add special token to insert the minion id into the default_include path" - @ *2017-03-21T21:37:33Z* + * 7ab10491ab Merge pull request `#40338`_ from UtahDave/fix_cherrypy_ssl_error_link - - **ISSUE** `#39775`_: (*mirceaulinic*) Proxy `mine_interval` config ignored - | refs: `#39776`_ `#39935`_ - - **PR** `#39935`_: (*cro*) Add special token to insert the minion id into the default_include path - | refs: `#40202`_ - * 66bc680 Merge pull request `#40202`_ from saltstack/revert-39935-namespace_proxy_cfg - * bb71710 Revert "Add special token to insert the minion id into the default_include path" + * 280b501950 Upstream cherrypy moved to Github from Bitbucket -- **PR** `#40199`_: (*whiteinge*) Ponysay emergency hotfix - @ *2017-03-21T21:10:21Z* + * **PR** `saltstack/salt#40332`_: (`zer0def`_) Fixes related to cache directory argument changes in pip>=6. (refs: `#40346`_) - * d8f0b79 Merge pull request `#40199`_ from whiteinge/ponysay-emergency-hotfix - * 85ea61b Add depends note +* **PR** `#40346`_: (`cachedout`_) Revert "Fixes related to cache directory argument changes in pip>=6." + @ *2017-03-27 23:17:29 UTC* - * 5a271ac Fix ponysay outputter hardcoded path + * a572b46183 Merge pull request `#40346`_ from saltstack/revert-40332-pip-cache-fixes -- **PR** `#40194`_: (*terminalmage*) Change imports for dockerng tests - @ *2017-03-21T19:34:55Z* + * b4753d1a5a Revert "Fixes related to cache directory argument changes in pip>=6." - * 82cee58 Merge pull request `#40194`_ from terminalmage/fix-docker-test-imports - * 6caedb0 Change imports for dockerng tests +* **ISSUE** `#40296`_: (`L4rS6`_) Wrong documentation in mount.mounted (refs: `#40326`_) -- **PR** `#40189`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-21T18:02:51Z* +* **PR** `#40326`_: (`L4rS6`_) Update mount state documentation (Fixes: `#40296`_) + @ *2017-03-27 23:15:53 UTC* - - **PR** `#40182`_: (*terminalmage*) Add support for "stopped" state to dockerng's mod_watch - - **PR** `#40171`_: (*Ch3LL*) additional PRs/issues for 2016.3.6 release notes - - **PR** `#40159`_: (*cro*) Turn on sign_pub_messages by default. - - **PR** `#40122`_: (*meaksh*) Adding "pkg.install downloadonly=True" support to yum/dnf execution module - - **PR** `#40120`_: (*sergeizv*) gce: Exclude GCENodeDriver objects from _expand_node result - * 0b512f9 Merge pull request `#40189`_ from rallytime/merge-2016.11 - * a55c413 Merge branch '2016.3' into '2016.11' + * a91bab867e Merge pull request `#40326`_ from L4rS6/update-mount-state-doc - * d4e6c58 Merge pull request `#40182`_ from terminalmage/dockerng-mod_watch-stopped + * a717c527a1 Update mount state documentation (Fixes: `#40296`_) - * 4629a26 Add support for "stopped" state to dockerng's mod_watch +* **PR** `#40328`_: (`L4rS6`_) Fixes wrong compared extra_mount_ignore_fs_keys key. + @ *2017-03-27 23:14:22 UTC* - * a0b4082 Merge pull request `#40171`_ from Ch3LL/2016.3.6_release + * ca2980cfb0 Merge pull request `#40328`_ from L4rS6/fix-mount-state-extra-ignore-fs-key - * 9c6d8d8 additional PRs/issues for 2016.3.6 release notes + * f0f68b9033 Fixes wrong compared extra_mount_ignore_fs_keys key. - * 33ba782 Merge pull request `#40120`_ from sergeizv/gce-expand-node-fix +* **PR** `#40329`_: (`isbm`_) Merge tops (backport) + @ *2017-03-27 23:13:47 UTC* - * 9d0fbe7 gce: Exclude GCENodeDriver objects from _expand_node result + * 3a6c5d0297 Merge pull request `#40329`_ from isbm/isbm-merge-tops-201611 - * 4884397 Merge pull request `#40122`_ from meaksh/2016.3-yum-downloadonly-support + * a762c9edda Merge output from master_tops - * 067f3f7 Adding downloadonly support to yum/dnf module +* **PR** `#40285`_: (`rallytime`_) Dockerng unit tests fixes: isolate global variables + @ *2017-03-27 23:05:03 UTC* - * 60e1d4e Merge pull request `#40159`_ from cro/sign_pub + * 2b7b2f1cb4 Merge pull request `#40285`_ from rallytime/docker-test-fixes - * e663b76 Fix small syntax error + * 0f263a52e0 Mock out the get_client_args mocks in the dockerng module tests more aggressively - * 0a0f46f Turn on sign_pub_messages by default. Make sure messages with no 'sig' are dropped with error when sign_pub_messages is True. + * f1352fe253 Add one more dockerng.version mock that was missed previously -- **PR** `#40034`_: (*sp1r*) Disallow modification of jobs from pillar with schedule execution module - @ *2017-03-21T16:36:34Z* + * 0d31d2c4d1 Add a couple more patches for docker.version information - - **ISSUE** `#39779`_: (*sp1r*) Pillar scheduling is broken - | refs: `#40034`_ - - **ISSUE** `#38523`_: (*MorphBonehunter*) schedule not changed on pillar update after minion restart - | refs: `#40034`_ - - **ISSUE** `#36134`_: (*Ch3LL*) carbon: multi-master with failover does not failover when master goes down - | refs: `#36437`_ - - **PR** `#36437`_: (*DmitryKuzmenko*) Keep the schedule jobs in ONE place. - | refs: `#40034`_ `#40034`_ - * d9cb222 Merge pull request `#40034`_ from sp1r/fix-pillar-scheduling - * 595f786 fix evaluating jobs when "pillar" is missing in opts + * a9c5eebaf0 Clean up dockerng unit tests to avoid global variables and fixup some patching - * 9d5db19 fix initial data structure for schedule tests +* **PR** `#40341`_: (`twangboy`_) Fix service.create, fix docs + @ *2017-03-27 21:46:19 UTC* - * d3a2489 schedule tests to ensure pillar jobs are not modified + * 01efc842c1 Merge pull request `#40341`_ from twangboy/fix_win_service - * 27385ff added a check ensuring schedule is a dict before merging + * 6736457ec8 Docs for create - * 14d7191 Fixes `#39779`_ + * 652cf08f8a Fix service.create, fix docs -- **PR** `#40160`_: (*eldadru*) Fix this issue: https://github.com/saltstack/salt/issues/40073, descr… - @ *2017-03-20T21:37:43Z* +* **PR** `#40332`_: (`zer0def`_) Fixes related to cache directory argument changes in pip>=6. + @ *2017-03-27 21:01:15 UTC* - * 257c862 Merge pull request `#40160`_ from eldadru/fix-issue-40073-boto-rds-describe-empty-dict - * 954c871 Fix this issue: https://github.com/saltstack/salt/issues/40073, describe return dictionary returned empty , probably as result of incorrect past merge (see discussion on issue) + * 8eabcca6dc Merge pull request `#40332`_ from zer0def/pip-cache-fixes -- **PR** `#40162`_: (*rallytime*) Make sure the tornado web server is stopped at the end of the test class - @ *2017-03-20T20:35:21Z* + * 7976840100 Fixes related to cache directory changes in pip>=6. - * aec5041 Merge pull request `#40162`_ from rallytime/archive-integration-test-fixes - * dd193cc Make sure the tornado web server is stopped at the end of the test class +* **PR** `#40337`_: (`Ch3LL`_) Add archive.extracted with use_cmd_unzip argument + @ *2017-03-27 21:00:23 UTC* -- **PR** `#40158`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-20T20:34:23Z* + * ceba1b9bc6 Merge pull request `#40337`_ from Ch3LL/add_unzip_test - - **ISSUE** `#39995`_: (*frogunder*) Head of Develop - Multimaster error - | refs: `#40141`_ - - **ISSUE** `#39118`_: (*bobrik*) Minion ipv6 option is not documented - | refs: `#39289`_ - - **PR** `#40141`_: (*bobrik*) Use the first address if cannot connect to any - - **PR** `#40123`_: (*twangboy*) Adds support for inet_pton in Windows to network util - - **PR** `#39289`_: (*bobrik*) Autodetect IPv6 connectivity from minion to master - | refs: `#39766`_ `#40141`_ - * 461e15f Merge pull request `#40158`_ from rallytime/merge-2016.11 - * 88f3ebd Remove extra "connect" kwarg caught by linter + * 8b21b4c8bb add use_cmd_unzip test - * f4d4768 Merge branch '2016.3' into '2016.11' +* **PR** `#40312`_: (`rallytime`_) Update minion data cache documentation + @ *2017-03-27 20:56:55 UTC* - * 28e4fc1 Merge pull request `#40123`_ from twangboy/win_fix_network + * a192597ec2 Merge pull request `#40312`_ from rallytime/cache-docs - * 06dfd55 Adds support for inet_pton in Windows to network util + * 5363e0b58b Update minion data cache documentation - * 35ddb79 Merge pull request `#40141`_ from bobrik/fallback-resolve +* **PR** `#40315`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-27 15:11:25 UTC* - * af1545d Use the first address if cannot connect to any + * 7f16754619 Merge pull request `#40315`_ from rallytime/merge-2016.11 -- **PR** `#40165`_: (*rallytime*) Don't try to run the dockerng unit tests if docker-py is missing - @ *2017-03-20T20:33:19Z* + * c65d602f60 Merge branch '2016.3' into '2016.11' - * b235f09 Merge pull request `#40165`_ from rallytime/gate-docker-unit-tests - * f32d8a8 Don't try to run the dockerng unit tests if docker-py is missing + * 7c21153d3a Merge pull request `#40300`_ from meaksh/2016.3-adding-timeouts-parameters-to-cmd_batch -- **PR** `#40085`_: (*mirceaulinic*) VRF arg and better doc for ping and traceroute - @ *2017-03-20T19:48:57Z* + * 9174e6f281 Fixes testing opts dict for batch unit tests - * db9fb58 Merge pull request `#40085`_ from cloudflare/fix-ping-tr - * 6cbdd61 Strip trailing whitespaces + * b1de79abcf Adds custom 'timeout' and 'gather_job_timeout' to 'local_batch' client - * 897a2a3 VRF arg and better doc for ping and traceroute +* **PR** `#40313`_: (`techhat`_) Add minimum and maximum to calls to calc + @ *2017-03-27 14:54:15 UTC* -- **PR** `#40095`_: (*skizunov*) dns_check should not try to connect when connect=False - @ *2017-03-17T17:31:42Z* + * a9a73bf8dc Merge pull request `#40313`_ from techhat/calcref - * 3bac06f Merge pull request `#40095`_ from skizunov/develop2 - * 880790f dns_check should not try to connect when connect=False + * 7106a86258 Use named kwargs -- **PR** `#40096`_: (*skizunov*) When building up the 'master_uri_list', do not try to connect - @ *2017-03-17T17:13:41Z* + * 822f3b81c3 Add minimum and maximum to calls to calc - * 31da90e Merge pull request `#40096`_ from skizunov/develop3 - * eb9a0a6 When building up the 'master_uri_list', do not try to connect +* **ISSUE** `#40247`_: (`eldadru`_) boto_rds.delete wait_for_deletion checks rds status incorrectly and always loop until timeout (refs: `#40277`_) -- **PR** `#40111`_: (*eldadru*) Fixing simple issue 40081 - the key parameter of the method create ov… - @ *2017-03-17T17:00:03Z* +* **PR** `#40277`_: (`eldadru`_) Fixing boto_rds.py delete() wait_for_deletion, if statement was inco… + @ *2017-03-24 22:29:25 UTC* - * 5303386 Merge pull request `#40111`_ from eldadru/fix-issue-40081-boto-rds-create-overwritten-key-parameter - * 78b5d11 Fixing simple issue 40081 - the key parameter of the method create overwritten by internal loop. + * 9d0762deca Merge pull request `#40277`_ from eldadru/Fix-40247-boto_rds-delete-wait-for-deletion-failure -- **PR** `#40118`_: (*rallytime*) Add CLI Example for dockerng.get_client_args - @ *2017-03-17T16:34:13Z* + * 3c15a32764 Fixing boto_rds.py delete() wait_for_deletion, if statement was incorrectly checking the return value of boto_rds.py exists() method. - * d2e376e Merge pull request `#40118`_ from rallytime/cli-example - * bb496bb Add CLI Example for dockerng.get_client_args +* **PR** `#40280`_: (`bewing`_) Clean up temporary file in net.load_template + @ *2017-03-24 22:27:04 UTC* -- **PR** `#40097`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-17T15:17:08Z* + * **PR** `#40273`_: (`bewing`_) Clean up temporary file in net.load_template (refs: `#40280`_) - - **PR** `#40090`_: (*rallytime*) Back-port `#40056`_ to 2016.3 - - **PR** `#40059`_: (*terminalmage*) Fix traceback when virtualenv.managed is invoked with nonexistent user - - **PR** `#40057`_: (*cachedout*) More mentionbot blacklists - - **PR** `#40056`_: (*thatch45*) update mention bot blacklist - | refs: `#40090`_ - * baef500 Merge pull request `#40097`_ from rallytime/merge-2016.11 - * ef1ff38 Merge branch '2016.3' into '2016.11' + * 6c29c81d01 Merge pull request `#40280`_ from bewing/bp_40273 - * 116201f Merge pull request `#40059`_ from terminalmage/fix-virtualenv-traceback + * f028e939f5 Clean up temporary file in net.load_template - * e3cfd29 Fix traceback when virtualenv.managed is invoked with nonexistent user +* **ISSUE** `#37972`_: (`ebauman`_) salt-run execution for master with no AAAA record adds significant execution time (refs: `#40310`_) - * a01b52b Merge pull request `#40090`_ from rallytime/`bp-40056`_ +* **PR** `#40310`_: (`gtmanfred`_) add warning when no host/dns record is found for fqdn_ip + @ *2017-03-24 21:55:20 UTC* - * ae012db update mention bot blacklist + * 839b620f32 Merge pull request `#40310`_ from gtmanfred/2016.11 - * d1570bb Merge pull request `#40057`_ from cachedout/ollie_blacklist + * cff027ddc6 add warning when no host/dns record is found for fqdn - * 0ac2e83 Merge branch '2016.3' into ollie_blacklist +* **PR** `#40288`_: (`dmurphy18`_) Execution module network support for AIX + @ *2017-03-24 20:10:36 UTC* - * 5592c68 More mentionbot blacklists + * eb86d55478 Merge pull request `#40288`_ from dmurphy18/aix_network -- **PR** `#40077`_: (*mirceaulinic*) Fix `#39771`_ (Empty __proxy__ dunder inside scheduler) - @ *2017-03-16T20:56:02Z* + * b53a95dab1 Further update to us in similar to review comments - - **ISSUE** `#39771`_: (*mirceaulinic*) Empty __proxy__ dunder inside scheduler - * 9ef3e07 Merge pull request `#40077`_ from cloudflare/`fix-39771`_ - * cd319e7 Add proxy kwarg to scheduler + * 59c0bdc14d Updated for review comments - * c6e6dd1 ProxyMinion: correctly build the scheduler + * 031c9457ba Execution module network support for AIX -- **PR** `#40088`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-16T19:58:44Z* +* **PR** `#40308`_: (`rallytime`_) Back-port `#38835`_ to 2016.11 + @ *2017-03-24 19:00:46 UTC* - - **ISSUE** `#40036`_: (*oogali*) UnboundLocalError: local variable 'ifcfg' referenced before assignment - | refs: `#40053`_ - - **ISSUE** `#40011`_: (*tsaridas*) salt-minion does not shutdown properly 2016.11.3 rh6 - | refs: `#40041`_ - - **PR** `#40070`_: (*Ch3LL*) update 2016.3.6 release notes with additional PR's - - **PR** `#40053`_: (*gtmanfred*) Update rh_ip.py - - **PR** `#40041`_: (*terminalmage*) Fix transposed lines in salt.utils.process - - **PR** `#40038`_: (*velom*) correctly parse "pkg_name===version" from pip freeze - - **PR** `#40018`_: (*meaksh*) Allow overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call - | refs: `#40072`_ - * b12720a Merge pull request `#40088`_ from rallytime/merge-2016.11 - * 626bd03 Merge branch '2016.3' into '2016.11' + * **PR** `#38835`_: (`UtahDave`_) Cache docs (refs: `#40308`_) - * d36bdb1 Merge pull request `#40070`_ from Ch3LL/2016.3.6_release + * 4928026253 Merge pull request `#40308`_ from rallytime/bp-38835 - * a1f8b49 update 2016.3.6 release notes with additional PR's + * 3ba50d3c52 add info about what is cached - * 8dcffc7 Merge pull request `#40018`_ from meaksh/2016.3-handling-timeouts-for-manage.up-runner + * 77e8f6aff9 fix config example - * 9f5c3b7 Allow setting custom timeouts for 'manage.up' and 'manage.status' + * 61f2fa9339 Add documentation for the Minion data cache - * 2102d9c Allow setting 'timeout' and 'gather_job_timeout' via kwargs +* **PR** `#40287`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-24 16:50:23 UTC* - * 22fc529 Merge pull request `#40038`_ from velom/fix-pip-freeze-parsing + * 12a9fc43c9 Merge pull request `#40287`_ from rallytime/merge-2016.11 - * 3fae91d correctly parse "pkg_name===version" from pip freeze + * 77415369cc Merge branch '2016.3' into '2016.11' - * 3584f93 Merge pull request `#40053`_ from saltstack/rh_ip_patch + * 0e2d52c3ea Merge pull request `#40260`_ from lubyou/fix-join_domain - * 219947a Update rh_ip.py + * 1cb15d1ea8 use win32api.FormatMessage() to get the error message for the system code - * 837432d Merge pull request `#40041`_ from terminalmage/issue40011 + * 0c62bb37d3 Merge pull request `#40275`_ from UtahDave/2016.3local - * 5b5d1b3 Fix transposed lines in salt.utils.process + * 9f0c9802c2 remove reference to auth_minion. -- **PR** `#40055`_: (*rallytime*) Update "yaml" code-block references with "jinja" where needed - @ *2017-03-16T16:30:38Z* + * 57ce474d73 Merge pull request `#40265`_ from terminalmage/issue40219 - * 703ab23 Merge pull request `#40055`_ from rallytime/doc-build-warnings - * 72d16c9 Update "yaml" code-block references with "jinja" where needed + * 1a731e0216 Pop off the version when aggregating pkg states -- **PR** `#40072`_: (*meaksh*) [2016.11] Allow overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call - @ *2017-03-16T15:31:46Z* + * 0055fda3e9 Properly aggregate version when passed with name - - **PR** `#40018`_: (*meaksh*) Allow overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call - | refs: `#40072`_ - * e73a1d0 Merge pull request `#40072`_ from meaksh/2016.11-handling-timeouts-for-manage.up-runner - * 40246d3 Allow setting custom timeouts for 'manage.up' and 'manage.status' + * 62d76f50fc Don't aggregate both name/pkgs and sources in pkg states - * ad232fd Allow setting 'timeout' and 'gather_job_timeout' via kwargs + * b208630d85 Merge pull request `#40201`_ from sergeizv/cloud-roster-fixes-2016.3 -- **PR** `#40045`_: (*terminalmage*) Fix error when chhome is invoked by user.present state in Windows - @ *2017-03-15T19:00:41Z* + * d87b377ad2 cloud roster: Don't stop if minion wasn't found in cloud cache index - * 2f28ec2 Merge pull request `#40045`_ from terminalmage/fix-windows-user-present - * 359af3b Fix error when chhome is invoked by user.present state in Windows + * a6865e0283 cloud roster: Check whether show_instance succeeded on node -- **PR** `#40047`_: (*rallytime*) Back-port `#40000`_ to 2016.11 - @ *2017-03-15T17:47:37Z* + * 1b45c8e8c2 cloud roster: Check provider and profile configs for ssh_username - - **PR** `#40000`_: (*skizunov*) Fix exception in salt-call when master_type is 'disable' - | refs: `#40047`_ - * 4067625 Merge pull request `#40047`_ from rallytime/`bp-40000`_ - * 11766c7 Fix exception in salt-call when master_type is 'disable' + * a18250b2e4 cloud roster: Return proper target name -- **PR** `#40023`_: (*jeanpralo*) We need to match on .p not just strip '.p' otherwise it will remove a… - @ *2017-03-14T23:14:56Z* + * 637930b2b3 cloud roster: Fix extracting instance's info - * 86f7195 Merge pull request `#40023`_ from jeanpralo/fix-minions-cant-finish-by-char-p - * d7b0c8a We need to match on .p not just strip '.p' otherwise it will remove any p from the string even if we have no dot + * dd1d3aac74 cloud roster: Work with custom conf dir -- **PR** `#40025`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-14T23:14:33Z* +* **PR** `#40250`_: (`techhat`_) Add wait_for_fun() to set_tags() + @ *2017-03-23 16:42:13 UTC* - - **ISSUE** `#39942`_: (*Foxlik*) Web Documentation not in sync with release 2016.11.3 - | refs: `#39994`_ - - **PR** `#40021`_: (*Ch3LL*) 2016.3.6 release notes with change log - - **PR** `#40016`_: (*terminalmage*) Attempt to fix failing grains tests in 2016.3 - - **PR** `#39994`_: (*rallytime*) Add a versionadded tag for dockerng ulimits addition - - **PR** `#39988`_: (*terminalmage*) Add comment explaining change from `#39973`_ - - **PR** `#39980`_: (*vutny*) [2016.3] Allow using `bg` kwarg for `cmd.run` state function - - **PR** `#39973`_: (*terminalmage*) Don't use docker.Client instance from context if missing attributes - * 277bd17 Merge pull request `#40025`_ from rallytime/merge-2016.11 - * 029f28b Merge branch '2016.3' into '2016.11' + * **PR** `#40225`_: (`techhat`_) Add wait_for_fun() to set_tags() (refs: `#40250`_) - * ee7f3b1 Merge pull request `#40021`_ from Ch3LL/2016.3.6_release + * b7f9100e6d Merge pull request `#40250`_ from techhat/settags - * f3e7e4f Add 2016.3.6 Release Notes + * baff7a046d Add wait_for_fun() to set_tags() - * 26895b7 Merge pull request `#40016`_ from terminalmage/fix-grains-test +* **ISSUE** `#39976`_: (`peterhirn`_) win_lgpo missing policies, eg. `Prevent the usage of OneDrive for file storage` (refs: `#40255`_, `#40253`_) - * 0ec81a4 Fixup a syntax error +* **PR** `#40255`_: (`lomeroe`_) backport `#40253`_ + @ *2017-03-23 16:36:44 UTC* - * 5d84b40 Attempt to fix failing grains tests in 2016.3 + * **PR** `#40253`_: (`lomeroe`_) correct method of getting 'text' of the XML object to compare to the … (refs: `#40255`_) - * 0c61d06 Merge pull request `#39980`_ from vutny/cmd-run-state-bg + * 904e144ae4 Merge pull request `#40255`_ from lomeroe/fix_39976_2016.11 - * a81dc9d [2016.3] Allow using `bg` kwarg for `cmd.run` state function + * 0e9f5820cc backport `#40253`_ - * b042484 Merge pull request `#39994`_ from rallytime/ulimits-dockerng-version +* **PR** `#40240`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-23 14:14:11 UTC* - * 37bd800 Add a versionadded tag for dockerng ulimits addition + * **PR** `#40237`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 (refs: `#40240`_) - * e125c94 Merge pull request `#39988`_ from terminalmage/dockerng-timeout + * 720a362c7a Merge pull request `#40240`_ from rallytime/merge-2016.11 - * bd2519e Add comment explaining change from `#39973`_ + * 5c5b74b09a Merge branch '2016.3' into '2016.11' -- **PR** `#40020`_: (*dmurphy18*) Full support for execution module timezone on AIX - @ *2017-03-14T21:05:31Z* + * 35ced607dd Merge pull request `#40226`_ from terminalmage/issue40149 - * 8db74fb Merge pull request `#40020`_ from dmurphy18/aix_timezone - * aabbbff Full support to execution module timezone on AIX + * 2a8df9384c Fix wrong errno in systemd.py - * 16d5c7c WIP: timezone support for AIX + * 24c4ae9c21 Merge pull request `#40232`_ from rallytime/update-release-notes -- **PR** `#39924`_: (*dmurphy18*) Add AIX support for user and group execution modules - @ *2017-03-14T21:04:02Z* + * 2ead188b4f Update release notes for 2016.3.6 - * 60066da Merge pull request `#39924`_ from dmurphy18/salt_aix_fixMar - * 5077c98 Updated changes file for added AIX support + * c59ae9a82c Merge pull request `#39855`_ from Foxlik/use_regex_to_compare_authorized_keys - * 8e107bd WIP: support for useradd on AIX + * d46845a5b6 Add newline at end of file - * 2f87d72 WIP: group support for AIX + * d4a3c8a66a Use regular expression instead of split when replacing authorized_keys -- **PR** `#40010`_: (*jettero*) S3 bucket path broken - @ *2017-03-14T19:01:01Z* + * fd10430018 Merge pull request `#40221`_ from rallytime/bp-39179 - * cd73eaf Merge pull request `#40010`_ from jettero/s3-bucket-path-broken - * acee5bf clarify this, because it messes people up in the mailing lists, and myself briefly before I thought about it + * 07dc2de084 fix error parsing - * 8102ac8 same here + * a27a2cc3bb Merge pull request `#40206`_ from cro/sign_pub_take2 - * 21b79e0 In order for the heredoc to be correct, bucket and path have to default to '', not None + * 01048de83f leave sign_pub_messages off on minion by default. -- **PR** `#39991`_: (*terminalmage*) Document the fact that the checksum type can be omitted in file.managed states - @ *2017-03-14T15:58:11Z* + * a82b005507 Leave sign_pub_messages off by default. - * 61f1fb0 Merge pull request `#39991`_ from terminalmage/source_hash-docs - * 537fc36 Document the fact that the checksum type can be omitted in file.managed states + * d1abb4cbaa Merge pull request `#40193`_ from rallytime/bp-40117 -- **PR** `#39984`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-13T18:30:16Z* + * cf1857904b More optimization. - - **PR** `#39973`_: (*terminalmage*) Don't use docker.Client instance from context if missing attributes - * 53d14d8 Merge pull request `#39984`_ from rallytime/merge-2016.11 - * ef6f4b1 Merge branch '2016.3' into '2016.11' + * 5a08266814 Removed debug statemnt - * cd0336e Merge pull request `#39973`_ from terminalmage/dockerng-timeout + * f557f7c6bb Added fix for issue 39393 - * 869416e Don't use docker.Client instance from context if missing attributes + * bb62278b73 Reverting changes. -- **PR** `#39967`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-10T23:45:33Z* + * a9107cde44 Added if condition for broken link. - - **PR** `#39962`_: (*cachedout*) Disable mention bot delay on 2016.3 - - **PR** `#39937`_: (*cachedout*) Fix --non-gpg-checks in zypper module - * 31c0074 Merge pull request `#39967`_ from rallytime/merge-2016.11 - * 3022466 Merge branch '2016.3' into '2016.11' + * 0f1ff4d4a8 Merge pull request `#40196`_ from twangboy/win_fix_deps - * 282c607 Merge pull request `#39962`_ from cachedout/disable_mentionbot_delay_3 + * 6761527793 Update dependencies for PyOpenSSL - * 7a638f2 Disable mention bot delay on 2016.3 + * b0501515cb Merge pull request `#40184`_ from terminalmage/link-reactor-example - * 1e0c88a Merge pull request `#39937`_ from cachedout/gpg_zypper + * a42be82993 Link to minion start reactor example from FAQ. - * 13ed0d1 Fix --non-gpg-checks in zypper module +* **ISSUE** `#39445`_: (`systemtrap`_) state file.copy for directories does not set ownership recursively (refs: `#40030`_) -- **PR** `#39963`_: (*cachedout*) Mention bot delay disable for 2016.11 - @ *2017-03-10T20:25:25Z* +* **PR** `#40231`_: (`rallytime`_) Back-port `#40030`_ to 2016.11 + @ *2017-03-22 23:14:40 UTC* - * 269a2fd Merge pull request `#39963`_ from cachedout/disable_mentionbot_delay_11 - * 5fcea05 Mention bot delay disable for 2016.11 + * **PR** `#40030`_: (`narendraingale2`_) Added changes for fix_39445 (refs: `#40231`_) -- **PR** `#39952`_: (*vutny*) Fix `#7997`_: describe how to upgrade Salt Minion in a proper way - @ *2017-03-10T18:41:57Z* + * c40376250f Merge pull request `#40231`_ from rallytime/bp-40030 - - **ISSUE** `#7997`_: (*shantanub*) Proper way to upgrade salt-minions / salt-master packages without losing minion connectivity - | refs: `#39952`_ - * 6350b07 Merge pull request `#39952`_ from vutny/doc-faq-minion-upgrade-restart - * d989d74 Fix `#7997`_: describe how to upgrade Salt Minion in a proper way + * 4d1c687cbd Using lchown insted of chown. -- **PR** `#39935`_: (*cro*) Add special token to insert the minion id into the default_include path - | refs: `#40202`_ - @ *2017-03-10T17:51:55Z* + * 52b3d986b5 Added changes for fix_39445 - - **ISSUE** `#39775`_: (*mirceaulinic*) Proxy `mine_interval` config ignored - | refs: `#39776`_ `#39935`_ - * dc7d4f4 Merge pull request `#39935`_ from cro/namespace_proxy_cfg - * e4aef54 Add special token to insert the minion id into the default_include path + * **PR** `saltstack/salt#40225`_: (`techhat`_) Add wait_for_fun() to set_tags() (refs: `#40239`_) -- **PR** `#39936`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-10T17:05:04Z* +* **PR** `#40239`_: (`cachedout`_) Revert "Add wait_for_fun() to set_tags()" + @ *2017-03-22 22:59:16 UTC* - - **ISSUE** `#39782`_: (*sergeizv*) salt-cloud show_instance action fails on EC2 instances - | refs: `#39784`_ - - **ISSUE** `#39622`_: (*drawsmcgraw*) boto_vpc.create_subnet does not properly assign tags - | refs: `#39624`_ - - **ISSUE** `#39336`_: (*GevatterGaul*) salt-minion fails with IPv6 - | refs: `#39766`_ - - **ISSUE** `#39333`_: (*jagguli*) Not Available error - Scheduling custom runner functions - | refs: `#39791`_ - - **ISSUE** `#39119`_: (*frogunder*) Head of 2016.3 - Salt-Master uses 90 seconds to restart - | refs: `#39796`_ - - **ISSUE** `#39118`_: (*bobrik*) Minion ipv6 option is not documented - | refs: `#39289`_ - - **ISSUE** `#38514`_: (*githubcdr*) Unable to schedule runners - | refs: `#39791`_ - - **ISSUE** `#33162`_: (*jfindlay*) Key error with salt.utils.cloud.cache_node and EC2 - | refs: `#33164`_ `#39784`_ - - **ISSUE** `#22080`_: (*The-Loeki*) CIDR matching for IPv6 / improve IPv6 support in utils.network - | refs: `#39919`_ - - **PR** `#39929`_: (*terminalmage*) Scrap event-based approach for refreshing grains (2016.3 branch) - - **PR** `#39919`_: (*The-Loeki*) CIDR matching supports IPv6, update docs - - **PR** `#39899`_: (*techhat*) Update cleanup function for azure - - **PR** `#39871`_: (*terminalmage*) Squelch warning for pygit2 import - - **PR** `#39826`_: (*cachedout*) Add group func to yubikey auth - - **PR** `#39820`_: (*ni3mm4nd*) Add missing apostrophe in Beacons topic documentation - - **PR** `#39819`_: (*terminalmage*) Improve the Top File matching docs - - **PR** `#39796`_: (*cachedout*) Stop the process manager when it no longer has processes to manage - - **PR** `#39794`_: (*cachedout*) Clean up errors which might be thrown when the monitor socket shuts down - - **PR** `#39791`_: (*gtmanfred*) load runners if role is master - - **PR** `#39784`_: (*sergeizv*) Fix 39782 - - **PR** `#39766`_: (*rallytime*) Restore ipv6 connectivity and "master: :" support - - **PR** `#39624`_: (*drawsmcgraw*) Address issue 39622 - - **PR** `#39289`_: (*bobrik*) Autodetect IPv6 connectivity from minion to master - | refs: `#39766`_ `#40141`_ - - **PR** `#33164`_: (*jfindlay*) cloud.clouds.ec2: cache each named node - | refs: `#39784`_ `#39784`_ - - **PR** `#25021`_: (*GideonRed*) Introduce ip:port minion config - | refs: `#39766`_ - * 9503a1d Merge pull request `#39936`_ from rallytime/merge-2016.11 - * c8b5d39 Merge branch '2016.3' into '2016.11' + * e39f5cbf40 Merge pull request `#40239`_ from saltstack/revert-40225-waitforfun - * 4526fc6 Merge pull request `#39929`_ from terminalmage/pr-39770-2016.3 + * 95bdab87b4 Revert "Add wait_for_fun() to set_tags()" - * cf0100d Scrap event-based approach for refreshing grains +* **PR** `#40225`_: (`techhat`_) Add wait_for_fun() to set_tags() (refs: `#40250`_) + @ *2017-03-22 18:15:35 UTC* - * 111110c Merge pull request `#39919`_ from The-Loeki/patch-1 + * 11d2f5abec Merge pull request `#40225`_ from techhat/waitforfun - * 170cbad CIDR matching supports IPv6, update docs + * 89b5010883 Add wait_for_fun() to set_tags() - * caf10e9 Merge pull request `#39899`_ from techhat/cleanupdisks +* **PR** `#40172`_: (`dmurphy18`_) Fix solaris network + @ *2017-03-22 17:41:56 UTC* - * baf4579 Update cleanup function for azure + * c8cfbb7df6 Merge pull request `#40172`_ from dmurphy18/fix_solaris_network - * fcf95f3 Merge pull request `#39871`_ from terminalmage/squelch-import-warning + * a6218b9484 Updated use of tail on Solaris and Sun-like OS - * 2b2ec69 Squelch warning for pygit2 import + * 90e6a1d8f6 Further update to support correct tail in network for Solaris - * f223fa8 Merge pull request `#39794`_ from cachedout/clean_monitor_socket_shutdown + * 5b6d33dd70 Fix use of correct tail on Solaris for active_tcp - * 2e683e7 Clean up errors which might be thrown when the monitor socket shuts down +* **PR** `#40210`_: (`rallytime`_) Skip flaky test for now + @ *2017-03-22 16:34:41 UTC* - * 4002dc1 Merge pull request `#39819`_ from terminalmage/top-file-matching-docs + * e9a4e8548b Merge pull request `#40210`_ from rallytime/test-skip - * 7178e77 Improve the Top File matching docs + * 0ba773d86b Skip flaky test for now - * c08aaeb Merge pull request `#39820`_ from ni3mm4nd/beacons_topic_doc_typo +* **ISSUE** `#40204`_: (`sofixa`_) InfluxDB returner present on salt-minion(installed via salt-bootstrap and updated via apt-get) has a bug (refs: `#40209`_) - * 804b120 Add missing apostrophe +* **PR** `#40209`_: (`sofixa`_) change InfluxDB get_version to expect status code 204 + @ *2017-03-21 21:42:26 UTC* - * cbd2a4e Merge pull request `#39826`_ from cachedout/yubikey_fix + * 0b00489eb2 Merge pull request `#40209`_ from sofixa/2016.11 - * 6125eff Add group func to yubikey auth + * e1cc7234ff change InfluxDB get_version to expect status code 204 - * f575ef4 Merge pull request `#39624`_ from drawsmcgraw/39622 +* **ISSUE** `#39775`_: (`mirceaulinic`_) Proxy `mine_interval` config ignored (refs: `#39935`_, #saltstack/salt`#39935`_, `#39776`_) - * 13da50b Fix indention lint errors + * **PR** `saltstack/salt#39935`_: (`cro`_) Add special token to insert the minion id into the default_include path (refs: `#40202`_) - * 5450263 Address issue 39622 +* **PR** `#40202`_: (`cro`_) Revert "Add special token to insert the minion id into the default_include path" + @ *2017-03-21 21:37:33 UTC* - * 1f3619c Merge pull request `#39796`_ from cachedout/master_shutdown + * 66bc680d0a Merge pull request `#40202`_ from saltstack/revert-39935-namespace_proxy_cfg - * e31d46c Stop the process manager when it no longer has processes to manage + * bb71710747 Revert "Add special token to insert the minion id into the default_include path" - * 53341cf Merge pull request `#39791`_ from gtmanfred/2016.3 +* **PR** `#40199`_: (`whiteinge`_) Ponysay emergency hotfix + @ *2017-03-21 21:10:21 UTC* - * 3ab4f84 load runners if role is master + * d8f0b79997 Merge pull request `#40199`_ from whiteinge/ponysay-emergency-hotfix - * c234c25 Merge pull request `#39784`_ from sergeizv/`fix-39782`_ + * 85ea61b544 Add depends note - * b71c3fe Revert "cloud.clouds.ec2: cache each named node (`#33164`_)" + * 5a271acfdc Fix ponysay outputter hardcoded path - * 4ee59be Merge pull request `#39766`_ from rallytime/fix-ipv6-connection +* **PR** `#40194`_: (`terminalmage`_) Change imports for dockerng tests + @ *2017-03-21 19:34:55 UTC* - * 65b2396 Restore ipv6 connectivity and "master: :" support + * 82cee58e72 Merge pull request `#40194`_ from terminalmage/fix-docker-test-imports -- **PR** `#39932`_: (*rallytime*) Cherry-pick the beacon fixes made in `#39930`_ to 2016.11 - @ *2017-03-10T00:21:09Z* + * 6caedb0de8 Change imports for dockerng tests - - **ISSUE** `#38121`_: (*Da-Juan*) Beacon configuration doesn't work as a list - | refs: `#39932`_ `#39930`_ - - **PR** `#39930`_: (*s0undt3ch*) Moar Py3 and a fix for `#38121`_ - | refs: `#39932`_ - * 899e037 Merge pull request `#39932`_ from rallytime/cp-beacon-fixes - * 4a52cca Pylint fixes +* **PR** `#40189`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-21 18:02:51 UTC* - * 4627c4e Code cleanup and make sure the beacons config file is deleted after testing + * 0b512f9ffb Merge pull request `#40189`_ from rallytime/merge-2016.11 - * c7fc09f Support the new list configuration format. + * a55c4138a8 Merge branch '2016.3' into '2016.11' - * be06df9 Remove `*args, **kwargs`. Not needed, not useful. + * d4e6c58526 Merge pull request `#40182`_ from terminalmage/dockerng-mod_watch-stopped - * 4a24282 These tests aren't even using mock! + * 4629a26fb7 Add support for "stopped" state to dockerng's mod_watch - * 6408b12 These tests are not destructive + * a0b4082484 Merge pull request `#40171`_ from Ch3LL/2016.3.6_release - * 50e51b5 The beacons configuration is now a list. Handle it! + * 9c6d8d892f additional PRs/issues for 2016.3.6 release notes -- **PR** `#39933`_: (*hkrist*) Fixed rawfile_json returner output format. - @ *2017-03-10T00:20:52Z* + * 33ba7821f7 Merge pull request `#40120`_ from sergeizv/gce-expand-node-fix - * 2e68ede Merge pull request `#39933`_ from hkrist/fix-rawfile_json_returner-format - * 4d0ddcd Fixed rawfile_json returner output format. It outputted python object instead of standard json. + * 9d0fbe7e01 gce: Exclude GCENodeDriver objects from _expand_node result -- **PR** `#39934`_: (*dmurphy18*) Correct comment lines output from execution module's host.list_hosts - @ *2017-03-10T00:20:14Z* + * 48843977c3 Merge pull request `#40122`_ from meaksh/2016.3-yum-downloadonly-support - * fb0dc33 Merge pull request `#39934`_ from dmurphy18/fix_host_list - * e7b9a45 Correct comment lines output got list_hosts + * 067f3f77c2 Adding downloadonly support to yum/dnf module -- **PR** `#39900`_: (*twangboy*) Namespace the line function properly in win_file - @ *2017-03-09T22:19:12Z* + * 60e1d4e2f3 Merge pull request `#40159`_ from cro/sign_pub - * a6f88d0 Merge pull request `#39900`_ from twangboy/win_fix_line - * 462bdec Namespace the line function properly in win_file + * e663b761fb Fix small syntax error -- **PR** `#39910`_: (*rallytime*) Back-port `#37743`_ to 2016.11 - @ *2017-03-09T22:16:58Z* + * 0a0f46fb14 Turn on sign_pub_messages by default. Make sure messages with no 'sig' are dropped with error when sign_pub_messages is True. - - **ISSUE** `#37741`_: (*discountbin*) Check in file.replace state for ignore_if_missing - | refs: `#37743`_ `#39910`_ - - **PR** `#37743`_: (*discountbin*) Adding check for ignore_if_missing param when calling _check_file. - | refs: `#39910`_ - * 77ecff4 Merge pull request `#39910`_ from rallytime/`bp-37743`_ - * ca306c0 Replace pass with updated comment for return +* **ISSUE** `#39779`_: (`sp1r`_) Pillar scheduling is broken (refs: `#40034`_) - * 1a78878 Adding check for ignore_if_missing param when calling _check_file. +* **ISSUE** `#38523`_: (`MorphBonehunter`_) schedule not changed on pillar update after minion restart (refs: `#40034`_) -- **PR** `#39770`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-03-09T22:00:17Z* +* **ISSUE** `#36134`_: (`Ch3LL`_) carbon: multi-master with failover does not failover when master goes down (refs: `#36437`_) - - **ISSUE** `#33187`_: (*usbportnoy*) Deploy to jboss TypeError at boss7.py:469 - | refs: `#39761`_ - - **PR** `#39761`_: (*cachedout*) Properly display error in jboss7 state - - **PR** `#39728`_: (*rallytime*) [2016.3] Bump latest release version to 2016.11.3 - - **PR** `#39619`_: (*terminalmage*) Add a function to simply refresh the grains - * c2d4d17 Merge pull request `#39770`_ from rallytime/merge-2016.11 - * dbaea3d Remove extra refresh reference that snuck in +* **PR** `#40034`_: (`sp1r`_) Disallow modification of jobs from pillar with schedule execution module + @ *2017-03-21 16:36:34 UTC* - * d9f48ac Don't shadow refresh_pillar + * **PR** `#36437`_: (`DmitryKuzmenko`_) Keep the schedule jobs in ONE place. (refs: `#40034`_) - * d86b03d Remove manual refresh code from minion.py + * d9cb222aa8 Merge pull request `#40034`_ from sp1r/fix-pillar-scheduling - * a7e419e Scrap event-based approach for refreshing grains + * 595f786327 fix evaluating jobs when "pillar" is missing in opts - * 776a943 Merge branch '2016.3' into '2016.11' + * 9d5db1910c fix initial data structure for schedule tests - * a24da31 Merge pull request `#39761`_ from cachedout/issue_33187 + * d3a2489c9c schedule tests to ensure pillar jobs are not modified - * c2df29e Properly display error in jboss7 state + * 27385ff49c added a check ensuring schedule is a dict before merging - * 0888bc3 Merge pull request `#39728`_ from rallytime/update-release-ver-2016.3 + * 14d71918b2 Fixes `#39779`_ - * c9bc8af [2016.3] Bump latest release version to 2016.11.3 +* **PR** `#40160`_: (`eldadru`_) Fix this issue: https://github.com/saltstack/salt/issues/40073, descr… + @ *2017-03-20 21:37:43 UTC* - * b52dbee Merge pull request `#39619`_ from terminalmage/zd1207 + * 257c862c52 Merge pull request `#40160`_ from eldadru/fix-issue-40073-boto-rds-describe-empty-dict - * c7dfb49 Fix mocking for grains refresh + * 954c871332 Fix this issue: https://github.com/saltstack/salt/issues/40073, describe return dictionary returned empty , probably as result of incorrect past merge (see discussion on issue) - * 7e0ced3 Properly hand proxy minions +* **PR** `#40162`_: (`rallytime`_) Make sure the tornado web server is stopped at the end of the test class + @ *2017-03-20 20:35:21 UTC* - * 692c456 Add a function to simply refresh the grains + * aec504173a Merge pull request `#40162`_ from rallytime/archive-integration-test-fixes -- **PR** `#39872`_: (*techhat*) Add installation tips for azurearm driver - @ *2017-03-07T23:18:04Z* + * dd193cc740 Make sure the tornado web server is stopped at the end of the test class - * 801ff28 Merge pull request `#39872`_ from techhat/fixdocs - * 35440c5 Add installation tips for azure +* **PR** `#40158`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-20 20:34:23 UTC* - * 2a1ae0b Change example master in azure docs + * 461e15f0f4 Merge pull request `#40158`_ from rallytime/merge-2016.11 -- **PR** `#39837`_: (*terminalmage*) Fix regression in archive.extracted when it runs file.directory - @ *2017-03-07T04:09:51Z* + * 88f3ebd7e9 Remove extra "connect" kwarg caught by linter - * 6d0f15c Merge pull request `#39837`_ from terminalmage/more-issue39751 - * 0285ff3 Fix regression in archive.extracted when it runs file.directory + * f4d4768a6d Merge branch '2016.3' into '2016.11' -- **PR** `#39858`_: (*techhat*) Reorder keys that were being declared in the wrong place - @ *2017-03-07T03:51:56Z* + * 28e4fc17b6 Merge pull request `#40123`_ from twangboy/win_fix_network - * 68752a2 Merge pull request `#39858`_ from techhat/statuskey - * 507a4f7 Reorder keys that were being declared in the wrong place + * 06dfd55ef9 Adds support for inet_pton in Windows to network util -- **PR** `#39862`_: (*rallytime*) Back-port `#38943`_ to 2016.11 - @ *2017-03-07T03:34:40Z* + * 35ddb79f59 Merge pull request `#40141`_ from bobrik/fallback-resolve - - **ISSUE** `#38830`_: (*danielmotaleite*) salt-ssh: vault fails to use config - | refs: `#38943`_ - - **PR** `#38943`_: (*thatch45*) When we generate the pillar we should send in the master opts - | refs: `#39862`_ - * 49c8faa Merge pull request `#39862`_ from rallytime/`bp-38943`_ - * e21b16c try it with a different init sequence + * af1545deed Use the first address if cannot connect to any - * 92cac0f make it a deepcopy +* **PR** `#40165`_: (`rallytime`_) Don't try to run the dockerng unit tests if docker-py is missing + @ *2017-03-20 20:33:19 UTC* - * 58cb8cd make sure to copy the top dict reference since we are moding it + * b235f0953f Merge pull request `#40165`_ from rallytime/gate-docker-unit-tests - * a0b671e When we generate the pillar we should send in the master opts + * f32d8a8683 Don't try to run the dockerng unit tests if docker-py is missing -- **PR** `#39852`_: (*rallytime*) Back-port `#39651`_ to 2016.11 - @ *2017-03-06T21:18:34Z* +* **PR** `#40085`_: (`mirceaulinic`_) VRF arg and better doc for ping and traceroute + @ *2017-03-20 19:48:57 UTC* - - **PR** `#39651`_: (*DennisHarper*) Checking Instance when calling a function that can return None - | refs: `#39852`_ - * 8ecc719 Merge pull request `#39852`_ from rallytime/`bp-39651`_ - * bb5ddbe Checking instance exists in master._get_cached_minion_data when cache.fetch returns None + * db9fb58b82 Merge pull request `#40085`_ from cloudflare/fix-ping-tr - * 79f2a7c Update __init__.py + * 6cbdd61b54 Strip trailing whitespaces - * e2a2329 Checking instance exists in master._get_cached_minion_data when cache.fetch returns None + * 897a2a37c3 VRF arg and better doc for ping and traceroute - * 8387742 Update __init__.py +* **PR** `#40095`_: (`skizunov`_) dns_check should not try to connect when connect=False + @ *2017-03-17 17:31:42 UTC* - * ff6f63e Checking instance exists in master._get_cached_minion_data when cache.fetch returns None + * 3bac06f099 Merge pull request `#40095`_ from skizunov/develop2 - * 855f875 Checking instance exists in master._get_cached_minion_data when cache.fetch returns None + * 880790f743 dns_check should not try to connect when connect=False -- **PR** `#39851`_: (*rallytime*) Back-port `#39104`_ to 2016.11 - @ *2017-03-06T21:17:43Z* +* **PR** `#40096`_: (`skizunov`_) When building up the 'master_uri_list', do not try to connect + @ *2017-03-17 17:13:41 UTC* - - **ISSUE** `#39052`_: (*githubcdr*) Minion restart very slow since 2016.11.2 - | refs: `#39104`_ - - **PR** `#39104`_: (*githubcdr*) Do not use name resolving for --notrim check - | refs: `#39851`_ - * 897275a Merge pull request `#39851`_ from rallytime/`bp-39104`_ - * 6539dbd Do not use name resolving for --notrim check + * 31da90edd9 Merge pull request `#40096`_ from skizunov/develop3 -- **PR** `#39799`_: (*Ch3LL*) Fix deleteed message when key is deleted - @ *2017-03-03T05:17:43Z* + * eb9a0a6fd1 When building up the 'master_uri_list', do not try to connect - - **ISSUE** `#38231`_: (*tjuup*) Typo: salt-key deleteed - | refs: `#39799`_ - * d0440e2 Merge pull request `#39799`_ from Ch3LL/fix_salt_key_msg - * 8346682 Fix deleteed message when key is deleted +* **PR** `#40111`_: (`eldadru`_) Fixing simple issue 40081 - the key parameter of the method create ov… + @ *2017-03-17 17:00:03 UTC* -- **PR** `#39472`_: (*whiteinge*) Update _reformat_low to not run kwarg dicts through parse_input - @ *2017-03-02T17:46:20Z* + * 5303386d93 Merge pull request `#40111`_ from eldadru/fix-issue-40081-boto-rds-create-overwritten-key-parameter - - **ISSUE** `#38962`_: (*gstachowiak*) Broken /jobs in salt-api in salt 2016.11.1 (Carbon) - | refs: `#39472`_ - - **PR** `#32005`_: (*Ashald*) Bugfix: `RunnerClient` keyword argument values processing - * 9f70ad7 Merge pull request `#39472`_ from whiteinge/_reformat_low-update - * d11f538 Add RunnerClient test for old/new-style arg/kwarg parsing + * 78b5d112d7 Fixing simple issue 40081 - the key parameter of the method create overwritten by internal loop. - * ec377ab Re-enable skipped RunnerClient tests +* **PR** `#40118`_: (`rallytime`_) Add CLI Example for dockerng.get_client_args + @ *2017-03-17 16:34:13 UTC* - * 27f7fd9 Update _reformat_low to run arg through parse_input + * d2e376e8f2 Merge pull request `#40118`_ from rallytime/cli-example - * 5177153 Revert parse_input change from `#32005`_ + * bb496bb7f4 Add CLI Example for dockerng.get_client_args -- **PR** `#39727`_: (*terminalmage*) salt.modules.state: check gathered pillar for errors instead of in-memory pillar - @ *2017-03-02T17:06:43Z* +* **PR** `#40097`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-17 15:17:08 UTC* - * 7dfc4b5 Merge pull request `#39727`_ from terminalmage/issue39627 - * 3bb0ebd Update tests for PR 39727 + * baef5009aa Merge pull request `#40097`_ from rallytime/merge-2016.11 - * c334b59 salt.modules.state: check gathered pillar for errors instead of in-memory pillar + * ef1ff38f8d Merge branch '2016.3' into '2016.11' - * 97dd8a1 Ensure that ext_pillar begins with pillar_override if ext_pillar_first is True + * 116201f345 Merge pull request `#40059`_ from terminalmage/fix-virtualenv-traceback - * f951266 Add log message for successful makostack processing + * e3cfd29d6b Fix traceback when virtualenv.managed is invoked with nonexistant user -- **PR** `#39776`_: (*mirceaulinic*) WIP: Save _schedule.conf under dir - @ *2017-03-02T16:27:45Z* + * a01b52b9a3 Merge pull request `#40090`_ from rallytime/bp-40056 - - **ISSUE** `#39775`_: (*mirceaulinic*) Proxy `mine_interval` config ignored - | refs: `#39776`_ `#39935`_ - * 965f474 Merge pull request `#39776`_ from cloudflare/proxy-schedule - * 35b8b8f Save _schedule.conf under dir + * ae012db87a update mention bot blacklist -- **PR** `#39788`_: (*cachedout*) Disable one API test that is flaky - @ *2017-03-02T16:17:31Z* + * d1570bba4c Merge pull request `#40057`_ from cachedout/ollie_blacklist - * 555f147 Merge pull request `#39788`_ from cachedout/disable_api_test - * 523e377 Disable one API test that is flaky + * 0ac2e83d37 Merge branch '2016.3' into ollie_blacklist -- **PR** `#39762`_: (*terminalmage*) Fix regression in file.get_managed - @ *2017-03-02T02:59:34Z* + * 5592c680b5 More mentionbot blacklists - * 793979c Merge pull request `#39762`_ from terminalmage/issue39751 - * 64db0b8 Add integration tests for remote file sources +* **ISSUE** `#39771`_: (`mirceaulinic`_) Empty __proxy__ dunder inside scheduler (refs: `#40077`_) - * f9f894d Fix regression in file.get_managed when skip_verify=True +* **PR** `#40077`_: (`mirceaulinic`_) Fix `#39771`_ (Empty __proxy__ dunder inside scheduler) + @ *2017-03-16 20:56:02 UTC* - * 28651a6 Remove next(iter()) extraction + * 9ef3e070c2 Merge pull request `#40077`_ from cloudflare/fix-39771 -- **PR** `#39767`_: (*rallytime*) Back-port `#38316`_ to 2016.11 - @ *2017-03-02T02:54:57Z* + * cd319e7e39 Add proxy kwarg to scheduler - - **ISSUE** `#35088`_: (*Modulus*) salt/cloud/ec2.py encoding problems. - | refs: `#37912`_ - - **PR** `#38316`_: (*mlalpho*) salt utils aws encoding fix - | refs: `#39767`_ - - **PR** `#37912`_: (*attiasr*) fix encoding problem aws responses - | refs: `#38316`_ `#38316`_ - * 91a9337 Merge pull request `#39767`_ from rallytime/`bp-38316`_ - * 1dcf018 requests api says Response.encoding can sometimes be None http://docs.python-requests.org/en/master/api/#requests.Response.encoding and result.text.encode() doesn't accept None and expects a string. + * c6e6dd1a04 ProxyMinion: correctly build the scheduler -- **PR** `#39768`_: (*rallytime*) Back-port `#39719`_ to 2016.11 - @ *2017-03-02T02:54:40Z* +* **PR** `#40088`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-16 19:58:44 UTC* - - **ISSUE** `#39692`_: (*djsly*) tuned module and state are broken on 7.3 families. - | refs: `#39719`_ `#39768`_ `#40387`_ `#40387`_ - - **PR** `#39719`_: (*Seb-Solon*) Support new version of tuned-adm binary - | refs: `#39768`_ - * 4a01bd6 Merge pull request `#39768`_ from rallytime/`bp-39719`_ - * d7cb70f Enh: Support new version of tuned-adm binary + * b12720a56f Merge pull request `#40088`_ from rallytime/merge-2016.11 -- **PR** `#39760`_: (*Ch3LL*) Initial 2016.11.4 Release Notes Doc - @ *2017-03-01T18:43:39Z* + * 626bd03885 Merge branch '2016.3' into '2016.11' - * 780457f Merge pull request `#39760`_ from Ch3LL/2016.11.4_notes - * 1853c99 add initial 2016.11.4 release notes + * d36bdb1a6e Merge pull request `#40070`_ from Ch3LL/2016.3.6_release -- **PR** `#39731`_: (*twangboy*) Add docs for Kwargs in pkg.refresh_db - @ *2017-02-28T22:02:59Z* + * a1f8b49bd1 update 2016.3.6 release notes with additional PR's - * 0147f78 Merge pull request `#39731`_ from twangboy/win_pkg_docs - * 423e6f7 Add docs for Kwargs in pkg.refresh_db + * 8dcffc7751 Merge pull request `#40018`_ from meaksh/2016.3-handling-timeouts-for-manage.up-runner -- **PR** `#39734`_: (*garethgreenaway*) Missing parameter in the schedule.add function - @ *2017-02-28T20:43:08Z* + * 9f5c3b7dcd Allows to set custom timeouts for 'manage.up' and 'manage.status' - - **ISSUE** `#39710`_: (*huangfupeng*) schedule.add parameter can not use “after“ - | refs: `#39734`_ - * fce2d18 Merge pull request `#39734`_ from garethgreenaway/39710_missing_schedule_add_parameter - * 63eb610 Per `#39710`_, missing parameter in the schedule.add function + * 2102d9c75c Allows to set 'timeout' and 'gather_job_timeout' via kwargs -- **PR** `#39729`_: (*rallytime*) [2016.11] Bump latest release version to 2016.11.3 - @ *2017-02-28T18:08:25Z* + * 22fc5299a2 Merge pull request `#40038`_ from velom/fix-pip-freeze-parsing - * 7b4865c Merge pull request `#39729`_ from rallytime/update-release-ver-2016.11 - * b5a7111 [2016.11] Bump latest release version to 2016.11.3 + * 3fae91d879 correctly parse "pkg_name===version" from pip freeze -- **PR** `#39721`_: (*vutny*) DOCS: add 2nd level header for advanced targeting methods - @ *2017-02-28T17:57:46Z* + * 3584f935fa Merge pull request `#40053`_ from saltstack/rh_ip_patch - * 47e494f Merge pull request `#39721`_ from vutny/doc-targeting - * 1d86cf1 DOCS: add 2nd level header for advanced targeting methods + * 219947acdb Update rh_ip.py -- **PR** `#39711`_: (*alankrita*) Fix error in Saltstack's rest auth "Authentication module threw 'status' " - @ *2017-02-28T15:56:09Z* + * 837432d3d2 Merge pull request `#40041`_ from terminalmage/issue40011 - - **ISSUE** `#39683`_: (*alankrita*) Error in Saltstack's rest auth "Authentication module threw 'status' " - | refs: `#39711`_ - * d39b679 Merge pull request `#39711`_ from alankrita/fix-rest-eauth - * ee42656 Fix error in Saltstack's rest auth "Authentication module threw 'status' " + * 5b5d1b375c Fix transposed lines in salt.utils.process -- **PR** `#39699`_: (*techhat*) Strip shabang line from rendered HTTP data - @ *2017-02-28T00:05:01Z* +* **PR** `#40055`_: (`rallytime`_) Update "yaml" code-block references with "jinja" where needed + @ *2017-03-16 16:30:38 UTC* - * 3940321 Merge pull request `#39699`_ from techhat/httpshabang - * 559eb93 Strip shabang line from rendered HTTP data + * 703ab23953 Merge pull request `#40055`_ from rallytime/doc-build-warnings -- **PR** `#39694`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-02-27T22:13:49Z* + * 72d16c9fa9 Update "yaml" code-block references with "jinja" where needed - - **ISSUE** `#39482`_: (*bobrik*) file.managed and file mode don't mention default mode - | refs: `#39487`_ - - **ISSUE** `#39169`_: (*blueyed*) Using batch-mode with `salt.state` in orchestration runner considers all minions to have failed - | refs: `#39641`_ `#39641`_ - - **PR** `#39641`_: (*smarsching*) Return runner return code in a way compatible with check_state_result - - **PR** `#39633`_: (*terminalmage*) Fix misspelled argument in salt.modules.systemd.disable() - - **PR** `#39613`_: (*terminalmage*) Fix inaccurate documentation - - **PR** `#39487`_: (*bobrik*) Document default permission modes for file module - * 00f121e Merge pull request `#39694`_ from rallytime/merge-2016.11 - * 756f1de Merge branch '2016.3' into '2016.11' +* **PR** `#40072`_: (`meaksh`_) [2016.11] Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call + @ *2017-03-16 15:31:46 UTC* - * 3f8b5e6 Merge pull request `#39487`_ from bobrik/mode-docs + * **PR** `#40018`_: (`meaksh`_) Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call (refs: `#40072`_) - * 41ef69b Document default permission modes for file module + * e73a1d0e54 Merge pull request `#40072`_ from meaksh/2016.11-handling-timeouts-for-manage.up-runner - * f7389bf Merge pull request `#39641`_ from smarsching/issue-39169-2016.3 + * 40246d3723 Allows to set custom timeouts for 'manage.up' and 'manage.status' - * 88c2d9a Fix return data structure for runner (issue `#39169`_). + * ad232fdc01 Allows to set 'timeout' and 'gather_job_timeout' via kwargs - * fc970b6 Merge pull request `#39633`_ from terminalmage/fix-systemd-typo +* **PR** `#40045`_: (`terminalmage`_) Fix error when chhome is invoked by user.present state in Windows + @ *2017-03-15 19:00:41 UTC* - * ca54541 Add missing unit test for disable func + * 2f28ec26ee Merge pull request `#40045`_ from terminalmage/fix-windows-user-present - * 17109e1 Fix misspelled argument in salt.modules.systemd.disable() + * 359af3bb2b Fix error when chhome is invoked by user.present state in Windows - * 53e78d6 Merge pull request `#39613`_ from terminalmage/fix-docs +* **PR** `#40047`_: (`rallytime`_) Back-port `#40000`_ to 2016.11 + @ *2017-03-15 17:47:37 UTC* - * 9342eda Fix inaccurate documentation + * **PR** `#40000`_: (`skizunov`_) Fix exception in salt-call when master_type is 'disable' (refs: `#40047`_) -- **PR** `#39643`_: (*drawsmcgraw*) issue 39642 - boto_vpc.nat_gateway_present should accept parameter al… - @ *2017-02-27T20:19:09Z* + * 4067625676 Merge pull request `#40047`_ from rallytime/bp-40000 - - **ISSUE** `#39642`_: (*drawsmcgraw*) boto_vpc.nat_gateway_present does not honor the allocation_id parameter like the module does - | refs: `#39643`_ `#39643`_ - * 2c919e3 Merge pull request `#39643`_ from drawsmcgraw/39642 - * 56d9adf issue 39642 - boto_vpc.nat_gateway_present should accept parameter allocation_id. + * 11766c7259 Fix exception in salt-call when master_type is 'disable' -- **PR** `#39666`_: (*terminalmage*) Rewrite the test_valid_docs test - @ *2017-02-26T20:14:33Z* +* **PR** `#40023`_: (`jeanpralo`_) We need to match on .p not just strip '.p' otherwise it will remove a… + @ *2017-03-14 23:14:56 UTC* - * df013c5 Merge pull request `#39666`_ from terminalmage/test_valid_docs - * 5a3c099 Rewrite the tests_valid_docs test + * 86f7195e0e Merge pull request `#40023`_ from jeanpralo/fix-minions-cant-finish-by-char-p -- **PR** `#39662`_: (*The-Loeki*) Py3 compat: Force minions to be a list for local serialized caches - @ *2017-02-26T02:36:46Z* + * d7b0c8ae88 We need to match on .p not just strip '.p' otherwise it will remove any p from the string even if we have no dot - * a29a7be Merge pull request `#39662`_ from The-Loeki/py3cachefix - * b02ef98 Add comment +* **PR** `#40025`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-14 23:14:33 UTC* - * 0fe5c90 Py3 compat: Force minions to be a list for local serialized caches + * 277bd17ff2 Merge pull request `#40025`_ from rallytime/merge-2016.11 -- **PR** `#39644`_: (*vutny*) Improve and align dockerng execution module docs - @ *2017-02-25T04:16:28Z* + * 029f28bbd5 Merge branch '2016.3' into '2016.11' - * bd6efd1 Merge pull request `#39644`_ from vutny/dockerng-docs - * c4988e8 Improve and align dockerng execution module docs + * ee7f3b1200 Merge pull request `#40021`_ from Ch3LL/2016.3.6_release -- **PR** `#39516`_: (*jettero*) Prevent spurious "Template does not exist" error - @ *2017-02-24T23:41:36Z* + * f3e7e4fb2a Add 2016.3.6 Release Notes - * fffab54 Merge pull request `#39516`_ from jettero/give-pillarenv-tops-similar-treatment - * 8fe48fa prevent billions of inexplicable lines of this: + * 26895b7be2 Merge pull request `#40016`_ from terminalmage/fix-grains-test -- **PR** `#39654`_: (*skizunov*) Fix issue where compile_pillar failure causes minion to exit - @ *2017-02-24T22:47:52Z* + * 0ec81a4cde Fixup a syntax error - * be9629b Merge pull request `#39654`_ from skizunov/develop2 - * 9f80bbc Fix issue where compile_pillar failure causes minion to exit + * 5d84b40bfd Attempt to fix failing grains tests in 2016.3 -- **PR** `#39653`_: (*cachedout*) Use salt's ordereddict for comparison - @ *2017-02-24T22:46:24Z* + * 0c61d064ad Merge pull request `#39980`_ from vutny/cmd-run-state-bg - * e63cbba Merge pull request `#39653`_ from cachedout/26_odict - * 91eb721 Use salt's ordereddict for comparison + * a81dc9dfc1 [2016.3] Allow to use `bg` kwarg for `cmd.run` state function -- **PR** `#39609`_: (*gtmanfred*) initialize the Client stuff in FSClient - @ *2017-02-24T18:50:55Z* + * b042484455 Merge pull request `#39994`_ from rallytime/ulimits-dockerng-version - - **ISSUE** `#38836`_: (*toanctruong*) file.managed with S3 Source errors out with obscure message - | refs: `#39589`_ `#39609`_ - * 0bc6027 Merge pull request `#39609`_ from gtmanfred/2016.11 - * 0820620 initialize the Client stuff in FSClient + * 37bd800fac Add a versionadded tag for dockerng ulimits addition -- **PR** `#39615`_: (*skizunov*) Bonjour/Avahi beacons: Make sure TXT record length is valid - @ *2017-02-24T18:47:05Z* + * e125c94ba5 Merge pull request `#39988`_ from terminalmage/dockerng-timeout - * 28035c0 Merge pull request `#39615`_ from skizunov/develop2 - * b1c7e9b Bonjour/Avahi beacons: Make sure TXT record length is valid + * bd2519ed1b Add comment explaining change from `#39973`_ -- **PR** `#39617`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-02-24T16:07:55Z* +* **PR** `#40020`_: (`dmurphy18`_) Full support for execution module timezone on AIX + @ *2017-03-14 21:05:31 UTC* - - **PR** `#39600`_: (*vutny*) state.file: drop non-relevant examples for `source_hash` parameter - - **PR** `#39584`_: (*cachedout*) A note in the docs about mentionbot - - **PR** `#39583`_: (*cachedout*) Add empty blacklist to mention bot - * e9410fb Merge pull request `#39617`_ from rallytime/merge-2016.11 - * 1362289 Merge branch '2016.3' into '2016.11' + * 8db74fb275 Merge pull request `#40020`_ from dmurphy18/aix_timezone - * 4e2b852 Merge pull request `#39600`_ from vutny/state-file-docs + * aabbbffd45 Full support to execution module timezone on AIX - * 9b0427c state.file: drop non-relevant examples for `source_hash` parameter + * 16d5c7ce4a WIP: timezone support for AIX - * ed83420 Merge pull request `#39584`_ from cachedout/mentionbot_docs +* **PR** `#39924`_: (`dmurphy18`_) Add AIX support for user and group execution modules + @ *2017-03-14 21:04:02 UTC* - * 652044b A note in the docs about mentionbot + * 60066da614 Merge pull request `#39924`_ from dmurphy18/salt_aix_fixMar - * d3e50b4 Merge pull request `#39583`_ from cachedout/mentionbot_blacklist + * 5077c989bb Updated changes file for added AIX support - * 62491c9 Add empty blacklist to mention bot + * 8e107bd43e WIP: support for useradd on AIX -- **PR** `#39505`_: (*cachedout*) Threadsafety option for context dictionaries - @ *2017-02-23T19:38:13Z* + * 2f87d727d6 WIP: group support for AIX - - **ISSUE** `#38758`_: (*bobrik*) Remote state execution is much slower on 2016.11.1 compared to 2016.3.4 - | refs: `#39505`_ - - **ISSUE** `#33575`_: (*anlutro*) File states seem slower in 2016.3, especially on first cache retrieval - | refs: `#33896`_ - - **ISSUE** `#29643`_: (*matthayes*) Can't get batch mode and --failhard to work as expected - | refs: `#31164`_ - - **ISSUE** `#28569`_: (*andrejohansson*) Reactor alert on highstate fail - | refs: `#31164`_ - - **PR** `#37378`_: (*skizunov*) Fix `__context__` to properly sandbox - | refs: `#39505`_ - - **PR** `#33896`_: (*DmitryKuzmenko*) Don't deep copy context dict values. - | refs: `#39505`_ - - **PR** `#31164`_: (*DmitryKuzmenko*) Issues/29643 fix invalid retcode - | refs: `#33896`_ - * 0d31201 Merge pull request `#39505`_ from cachedout/issue_38758 - * 1dba2f9 Add warning in docs +* **PR** `#40010`_: (`jettero`_) S3 bucket path broken + @ *2017-03-14 19:01:01 UTC* - * 9cf654b Threadsafety option for context dictionaries + * cd73eafec8 Merge pull request `#40010`_ from jettero/s3-bucket-path-broken -- **PR** `#39507`_: (*joe-niland*) Detect IIS version and vary certificate association command depending on version - @ *2017-02-23T19:15:40Z* + * acee5bf7c8 clarify this, because it messes people up in the mailing lists, and myself briefly before I thought about it - * c0d4357 Merge pull request `#39507`_ from joe-niland/iis-7-cert-binding - * c94f0b8 Fix additional issue whereby existing certificate bindings were not found in IIS 7.5, due to the fact that IIS earlier than 8 doesn't support SNI + * 8102ac8e3c same here - * 18effe0 Detect IIS version and vary certificate association command depending on version + * 21b79e00be In order for the heredoc to be correct, bucket and path have to default to '', not None -- **PR** `#39565`_: (*terminalmage*) states.file.patch/modules.file.check_hash: use hash length to determine type - @ *2017-02-23T19:14:28Z* +* **PR** `#39991`_: (`terminalmage`_) Document the fact that the checksum type can be omitted in file.managed states + @ *2017-03-14 15:58:11 UTC* - * e6f5e8a Merge pull request `#39565`_ from terminalmage/issue39512 - * cbdf905 Update test to reflect new state comment + * 61f1fb04c5 Merge pull request `#39991`_ from terminalmage/source_hash-docs - * 650dbac states.file.patch/modules.file.check_hash: use hash length to determine type + * 537fc36029 Document the fact that the checksum type can be omitted in file.managed states -- **PR** `#39591`_: (*mcalmer*) fix case in os_family for Suse - @ *2017-02-23T19:07:17Z* +* **PR** `#39984`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-13 18:30:16 UTC* - * 53e22b8 Merge pull request `#39591`_ from mcalmer/fix-case-in-os_family - * 81bd96e fix case in os_family for Suse + * 53d14d8ad9 Merge pull request `#39984`_ from rallytime/merge-2016.11 -- **PR** `#39592`_: (*skazi0*) Ensure user/group/file_mode after line edit - @ *2017-02-23T18:40:05Z* + * ef6f4b15ca Merge branch '2016.3' into '2016.11' - - **ISSUE** `#38452`_: (*jf*) file.line with mode=delete does not preserve ownership of a file - | refs: `#39592`_ - * aee43f7 Merge pull request `#39592`_ from skazi0/line-user-fix - * baf84b4 Ensure user/group/file_mode after line edit + * cd0336e868 Merge pull request `#39973`_ from terminalmage/dockerng-timeout -- **PR** `#39596`_: (*ticosax*) Reduce scope of try except StopIteration wrapping - @ *2017-02-23T18:16:17Z* + * 869416e7db Don't use docker.Client instance from context if missing attributes - * 6ab4151 Merge pull request `#39596`_ from ticosax/reduce-scope-catehed-exception - * 54cdacb Reduce scope of try except StopIteration wrapping +* **PR** `#39967`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-10 23:45:33 UTC* -- **PR** `#39610`_: (*rallytime*) Back-port `#39589`_ to 2016.11 - @ *2017-02-23T17:48:03Z* + * 31c00740e7 Merge pull request `#39967`_ from rallytime/merge-2016.11 - - **ISSUE** `#38836`_: (*toanctruong*) file.managed with S3 Source errors out with obscure message - | refs: `#39589`_ `#39609`_ - - **PR** `#39589`_: (*MasterNayru*) Allow masterless minions to pull files from S3 - | refs: `#39610`_ - * b1c3b84 Merge pull request `#39610`_ from rallytime/`bp-39589`_ - * 83ec174 Set utils property explicitly for FSClient + * 3022466615 Merge branch '2016.3' into '2016.11' - * 3889006 Allow masterless minions to pull files from S3 + * 282c607d26 Merge pull request `#39962`_ from cachedout/disable_mentionbot_delay_3 -- **PR** `#39606`_: (*rallytime*) [2016.11] Pylint: add missing import - @ *2017-02-23T16:39:55Z* + * 7a638f204b Disable mention bot delay on 2016.3 - * fe15ed9 Merge pull request `#39606`_ from rallytime/lint-2016.11 - * 7116434 [2016.11] Pylint: add missing import + * 1e0c88ae08 Merge pull request `#39937`_ from cachedout/gpg_zypper -- **PR** `#39573`_: (*thatch45*) Added a few more comments to the ssl docs - @ *2017-02-23T02:17:13Z* + * 13ed0d1209 Fix --non-gpg-checks in zypper module - - **PR** `#39554`_: (*DmitryKuzmenko*) Cosmetic: support bool value for 'ssl' config option. - | refs: `#39573`_ - - **PR** `#39528`_: (*thatch45*) Add better ssl option docs - | refs: `#39554`_ - * 5987c4e Merge pull request `#39573`_ from thatch45/ssl_docs - * b230c35 This should be good to go now +* **PR** `#39963`_: (`cachedout`_) Mention bot delay disable for 2016.11 + @ *2017-03-10 20:25:25 UTC* -- **PR** `#39577`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-02-23T02:10:12Z* + * 269a2fd739 Merge pull request `#39963`_ from cachedout/disable_mentionbot_delay_11 - - **ISSUE** `#39118`_: (*bobrik*) Minion ipv6 option is not documented - | refs: `#39289`_ - - **ISSUE** `#30802`_: (*kjelle*) Missing ulimits on docker.running / dockerng.running - | refs: `#39562`_ - - **PR** `#39579`_: (*rallytime*) [2016.3] Pylint: Remove unused import - - **PR** `#39578`_: (*cachedout*) Add mention-bot configuration - - **PR** `#39569`_: (*s0undt3ch*) Don't use our own six dictionary fixes in this branch - - **PR** `#39562`_: (*terminalmage*) Add ulimits to dockerng state/exec module - - **PR** `#39544`_: (*terminalmage*) dockerng.get_client_args: Fix path for endpoint config for some versions of docker-py - - **PR** `#39542`_: (*twangboy*) Gate ssh_known_hosts state against Windows - - **PR** `#39508`_: (*dincamihai*) Openscap - - **PR** `#39289`_: (*bobrik*) Autodetect IPv6 connectivity from minion to master - | refs: `#39766`_ `#40141`_ - * b8e321c Merge pull request `#39577`_ from rallytime/merge-2016.11 - * 397c756 Merge branch '2016.3' into '2016.11' + * 5fcea05691 Mention bot delay disable for 2016.11 - * 8352e6b Merge pull request `#39579`_ from rallytime/fix-lint +* **ISSUE** `#7997`_: (`shantanub`_) Proper way to upgrade salt-minions / salt-master packages without losing minion connectivity (refs: `#39952`_) - * 65889e1 [2016.3] Pylint: Remove unused import +* **PR** `#39952`_: (`vutny`_) Fix `#7997`_: describe how to upgrade Salt Minion in a proper way + @ *2017-03-10 18:41:57 UTC* - * 43dba32 Merge pull request `#39578`_ from cachedout/2016.3 + * 6350b07384 Merge pull request `#39952`_ from vutny/doc-faq-minion-upgrade-restart - * 344499e Add mention-bot configuration + * d989d749d6 Fix `#7997`_: describe how to upgrade Salt Minion in a proper way - * c52cecd Fix syntax error leftover from incomplete merge-conflict resolution +* **ISSUE** `#39775`_: (`mirceaulinic`_) Proxy `mine_interval` config ignored (refs: `#39935`_, #saltstack/salt`#39935`_, `#39776`_) - * 7b9b3f7 Merge branch '2016.3' into '2016.11' +* **PR** `#39935`_: (`cro`_) Add special token to insert the minion id into the default_include path + @ *2017-03-10 17:51:55 UTC* - * 8f7a0f9 Merge pull request `#39542`_ from twangboy/gate_ssh_known_hosts + * dc7d4f4224 Merge pull request `#39935`_ from cro/namespace_proxy_cfg - * c90a52e Remove expensive check + * e4aef54c73 Add special token to insert the minion id into the default_include path - * 6d645ca Add __virtual__ function +* **PR** `#39936`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-10 17:05:04 UTC* - * c109658 Merge pull request `#39289`_ from bobrik/autodetect-ipv6 + * 9503a1d0c6 Merge pull request `#39936`_ from rallytime/merge-2016.11 - * 2761a1b Move new kwargs to the end of argument list + * c8b5d390b5 Merge branch '2016.3' into '2016.11' - * 0df6b92 Narrow down connection exception to socket.error + * 4526fc6e08 Merge pull request `#39929`_ from terminalmage/pr-39770-2016.3 - * e8a2cc0 Do no try to connect to salt master in syndic config test + * cf0100dabe Scrap event-based approach for refreshing grains - * af95786 Properly log address that failed to resolve or pass connection check + * 111110caf8 Merge pull request `#39919`_ from The-Loeki/patch-1 - * 9a34fbe Actually connect to master instead of checking route availability + * 170cbadc54 CIDR matching supports IPv6, update docs - * c494839 Avoid bare exceptions in dns_check + * caf10e9988 Merge pull request `#39899`_ from techhat/cleanupdisks - * 29f3766 Rewrite dns_check to try to connect to address + * baf4579e63 Update cleanup function for azure - * 55965ce Autodetect IPv6 connectivity from minion to master + * fcf95f3654 Merge pull request `#39871`_ from terminalmage/squelch-import-warning - * 3fb928b Merge pull request `#39569`_ from s0undt3ch/2016.3 + * 2b2ec69d04 Squelch warning for pygit2 import - * 49da135 Don't use our own six dictionary fixes in this branch + * f223fa8906 Merge pull request `#39794`_ from cachedout/clean_monitor_socket_shutdown - * 91e3319 Merge pull request `#39508`_ from dincamihai/openscap + * 2e683e788b Clean up errors which might be thrown when the monitor socket shuts down - * 9fedb84 Always return oscap's stderr + * 4002dc1947 Merge pull request `#39819`_ from terminalmage/top-file-matching-docs - * 0ecde2c Include oscap returncode in response + * 7178e77eee Improve the Top File matching docs - * fbe2194 Merge pull request `#39562`_ from terminalmage/issue30802 + * c08aaeb7fd Merge pull request `#39820`_ from ni3mm4nd/beacons_topic_doc_typo - * c503740 Add ulimits to dockerng state/exec module + * 804b12048c Add missing apostrophe - * da42040 Try the docker-py 2.0 client name first + * cbd2a4e3cc Merge pull request `#39826`_ from cachedout/yubikey_fix - * 01d4a84 dockerng.get_client_args: Fix path for endpoint config for some versions of docker-py (`#39544`_) + * 6125eff02d Add group func to yubikey auth -- **PR** `#39574`_: (*Ch3LL*) Update 2016.11.3 release notes - @ *2017-02-23T00:10:23Z* + * f575ef459f Merge pull request `#39624`_ from drawsmcgraw/39622 - * cff9334 Merge pull request `#39574`_ from Ch3LL/update_release_notes - * c0f8c35 fix reference to set in docs + * 13da50be33 Fix indention lint errors - * 663f6f1 add additional PRs to 2016.11.3 release notes + * 545026352f Address issue 39622 -- **PR** `#39528`_: (*thatch45*) Add better ssl option docs - | refs: `#39554`_ - @ *2017-02-22T18:29:47Z* + * 1f3619c1e5 Merge pull request `#39796`_ from cachedout/master_shutdown - * b492f70 Merge pull request `#39528`_ from thatch45/ssl_docs - * c357e37 Add minion config + * e31d46c1b8 Stop the process manager when it no longer has processes to manage - * 539bb2a Add better ssl option docs + * 53341cf152 Merge pull request `#39791`_ from gtmanfred/2016.3 -- **PR** `#39532`_: (*amontalban*) Fix case when /etc/localtime is a file and it is not updated - @ *2017-02-22T18:28:54Z* + * 3ab4f843bf load runners if role is master - - **ISSUE** `#35869`_: (*amontalban*) timezone.system state fails on FreeBSD when /etc/localtime does not exists - | refs: `#39532`_ - * 0dad49c Merge pull request `#39532`_ from amontalban/corner_case_35869 - * f0d3c16 Fix case when /etc/localtime is a file and it is not updated + * c234c25092 Merge pull request `#39784`_ from sergeizv/fix-39782 -- **PR** `#39540`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-02-22T18:24:01Z* + * b71c3fe13c Revert "cloud.clouds.ec2: cache each named node (`#33164`_)" - - **ISSUE** `#39444`_: (*clem-compilatio*) salt-cloud - IPv6 and IPv4 private_ips - preferred_ip sends False to is_public_ip - | refs: `#39464`_ - - **ISSUE** `#39304`_: (*Auha*) boto_s3_bucket documentation dependency clarification - | refs: `#39405`_ - - **ISSUE** `#38762`_: (*oz123*) Configuration information for custom returners - | refs: `#39411`_ - - **PR** `#39498`_: (*terminalmage*) Resubmit PR `#39483`_ against 2016.3 branch - - **PR** `#39497`_: (*terminalmage*) Two dockerng compatibility fixes - - **PR** `#39464`_: (*gtmanfred*) skip false values from preferred_ip - - **PR** `#39460`_: (*cachedout*) Fix mocks in win_disim tests - - **PR** `#39431`_: (*UtahDave*) Fix grains.setval performance - - **PR** `#39426`_: (*morganwillcock*) win_dism: Return failure when package path does not exist - - **PR** `#39423`_: (*dincamihai*) Openscap module - - **PR** `#39421`_: (*terminalmage*) Update docs on upstream EPEL7 pygit2/libgit2 issues - - **PR** `#39411`_: (*rallytime*) Update external_cache docs with other configuration options - - **PR** `#39405`_: (*rallytime*) Update :depends: docs for boto states and modules - * 9cfaf3b Merge pull request `#39540`_ from rallytime/merge-2016.11 - * 49fe4e8 Merge branch '2016.11' into '2016.11' + * 4ee59be22c Merge pull request `#39766`_ from rallytime/fix-ipv6-connection - * c613d19 Merge branch '2016.3' into '2016.11' + * 65b239664e Restore ipv6 connectivity and "master: :" support - * dff35b5 Merge pull request `#39498`_ from terminalmage/pr-39483 +* **ISSUE** `#38121`_: (`Da-Juan`_) Beacon configuration doesn't work as a list (refs: `#39932`_, `#39930`_) - * 20b097a dockerng: compare sets instead of lists of security_opt +* **PR** `#39932`_: (`rallytime`_) Cherry-pick the beacon fixes made in `#39930`_ to 2016.11 + @ *2017-03-10 00:21:09 UTC* - * 6418e72 Merge pull request `#39497`_ from terminalmage/docker-compat-fixes + * **PR** `#39930`_: (`s0undt3ch`_) Moar Py3 and a fix for `#38121`_ (refs: `#39932`_) - * cbd0270 docker: make docker-exec the default execution driver + * 899e037f0a Merge pull request `#39932`_ from rallytime/cp-beacon-fixes - * a6a17d5 Handle docker-py 2.0's new host_config path + * 4a52cca926 Pylint fixes - * 9c4292f Merge pull request `#39423`_ from dincamihai/openscap + * 4627c4ea6d Code cleanup and make sure the beacons config file is deleted after testing - * 9d13422 OpenSCAP module + * c7fc09f97d Support the new list configuration format. - * 7dd2502 Merge pull request `#39464`_ from gtmanfred/2016.3 + * be06df9b64 Remove `*args, **kwargs`. Not needed, not useful. - * f829d6f skip false values from preferred_ip + * 4a242829ee These tests aren't even using mock! - * db359ff Merge pull request `#39460`_ from cachedout/win_dism_test_fix + * 6408b123e7 These tests are not destructive - * e652a45 Fix mocks in win_disim tests + * 50e51b5b9d The beacons configuration is now a list. Handle it! - * 9dbfba9 Merge pull request `#39426`_ from morganwillcock/dism +* **PR** `#39933`_: (`hkrist`_) Fixed rawfile_json returner output format. + @ *2017-03-10 00:20:52 UTC* - * a7d5118 Return failure when package path does not exist + * 2e68edee4a Merge pull request `#39933`_ from hkrist/fix-rawfile_json_returner-format - * 5616270 Merge pull request `#39431`_ from UtahDave/fix_grains.setval_performance + * 4d0ddcd110 Fixed rawfile_json returner output format. It outputted python object instead of standard json. - * 391bbec add docs +* **PR** `#39934`_: (`dmurphy18`_) Correct comment lines output from execution module's host.list_hosts + @ *2017-03-10 00:20:14 UTC* - * 709c197 allow sync_grains to be disabled on grains.setval + * fb0dc33c42 Merge pull request `#39934`_ from dmurphy18/fix_host_list - * 239e16e Merge pull request `#39405`_ from rallytime/`fix-39304`_ + * e7b9a45079 Correct comment lines output got list_hosts - * bd1fe03 Update :depends: docs for boto states and modules +* **PR** `#39900`_: (`twangboy`_) Namespace the line function properly in win_file + @ *2017-03-09 22:19:12 UTC* - * 415102f Merge pull request `#39411`_ from rallytime/`fix-38762`_ + * a6f88d03df Merge pull request `#39900`_ from twangboy/win_fix_line - * e13febe Update external_cache docs with other configuration options + * 462bdecd33 Namespace the line function properly in win_file - * 7e1803b Update docs on upstream EPEL7 pygit2/libgit2 issues (`#39421`_) +* **ISSUE** `#37741`_: (`discountbin`_) Check in file.replace state for ignore_if_missing (refs: `#37743`_, `#39910`_) -- **PR** `#39554`_: (*DmitryKuzmenko*) Cosmetic: support bool value for 'ssl' config option. - | refs: `#39573`_ - @ *2017-02-22T16:59:03Z* +* **PR** `#39910`_: (`rallytime`_) Back-port `#37743`_ to 2016.11 + @ *2017-03-09 22:16:58 UTC* - - **PR** `#39528`_: (*thatch45*) Add better ssl option docs - | refs: `#39554`_ - * 56fe2f1 Merge pull request `#39554`_ from DSRCorporation/bugs/ssl_bool - * 7a6fc11 Cosmetic: support bool value for 'ssl' config option. + * **PR** `#37743`_: (`discountbin`_) Adding check for ignore_if_missing param when calling _check_file. (refs: `#39910`_) -- **PR** `#39560`_: (*vutny*) [CLOUD] Log error when private/public IP was not detected - @ *2017-02-22T16:49:46Z* + * 77ecff4e02 Merge pull request `#39910`_ from rallytime/bp-37743 - * cf37f83 Merge pull request `#39560`_ from vutny/cloud-detect-ips - * 567bb50 [CLOUD] Log error when private/public IP was not detected + * ca306c0860 Replace pass with updated comment for return + * 1a78878b47 Adding check for ignore_if_missing param when calling _check_file. + +* **PR** `#39770`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-03-09 22:00:17 UTC* + + * c2d4d17589 Merge pull request `#39770`_ from rallytime/merge-2016.11 + + * dbaea3de73 Remove extra refresh reference that snuck in + + * d9f48ac6ea Don't shadow refresh_pillar + + * d86b03dc90 Remove manual refresh code from minion.py + + * a7e419e35f Scrap event-based approach for refreshing grains + + * 776a9431b9 Merge branch '2016.3' into '2016.11' + + * a24da31131 Merge pull request `#39761`_ from cachedout/issue_33187 + + * c2df29edb2 Properly display error in jboss7 state + + * 0888bc32ef Merge pull request `#39728`_ from rallytime/update-release-ver-2016.3 + + * c9bc8af8f2 [2016.3] Bump latest release version to 2016.11.3 + + * b52dbeec68 Merge pull request `#39619`_ from terminalmage/zd1207 + + * c7dfb494a6 Fix mocking for grains refresh + + * 7e0ced3b45 Properly hand proxy minions + + * 692c456da3 Add a function to simply refresh the grains + +* **PR** `#39872`_: (`techhat`_) Add installation tips for azurearm driver + @ *2017-03-07 23:18:04 UTC* + + * 801ff28053 Merge pull request `#39872`_ from techhat/fixdocs + + * 35440c5936 Add installation tips for azure + + * 2a1ae0bf2e Change example master in azure docs + +* **PR** `#39837`_: (`terminalmage`_) Fix regression in archive.extracted when it runs file.directory + @ *2017-03-07 04:09:51 UTC* + + * 6d0f15c31a Merge pull request `#39837`_ from terminalmage/more-issue39751 + + * 0285ff3c7d Fix regression in archive.extracted when it runs file.directory + +* **PR** `#39858`_: (`techhat`_) Reorder keys that were being declared in the wrong place + @ *2017-03-07 03:51:56 UTC* + + * 68752a2a18 Merge pull request `#39858`_ from techhat/statuskey + + * 507a4f7f93 Reorder keys that were being declared in the wrong place + +* **ISSUE** `#38830`_: (`danielmotaleite`_) salt-ssh: vault fails to use config (refs: `#38943`_) + +* **PR** `#39862`_: (`rallytime`_) Back-port `#38943`_ to 2016.11 + @ *2017-03-07 03:34:40 UTC* + + * **PR** `#38943`_: (`thatch45`_) When we generate the pillar we should send in the master opts (refs: `#39862`_) + + * 49c8faa141 Merge pull request `#39862`_ from rallytime/bp-38943 + + * e21b16c002 try it with a different init sequence + + * 92cac0ff8b make it a deepcopy + + * 58cb8cd4f5 make sure to copy the top dict reference since we are moding it + + * a0b671ea43 When we generate the pillar we should send in the master opts + +* **PR** `#39852`_: (`rallytime`_) Back-port `#39651`_ to 2016.11 + @ *2017-03-06 21:18:34 UTC* + + * **PR** `#39651`_: (`DennisHarper`_) Checking Instance when calling a function that can return None (refs: `#39852`_) + + * 8ecc719f90 Merge pull request `#39852`_ from rallytime/bp-39651 + + * bb5ddbe18c Checking instance exists in master._get_cached_minion_data when cache.fetch returns None + + * 79f2a7cbb7 Update __init__.py + + * e2a232921d Checking instance exists in master._get_cached_minion_data when cache.fetch returns None + + * 838774291d Update __init__.py + + * ff6f63e9dd Checking instance exists in master._get_cached_minion_data when cache.fetch returns None + + * 855f87554c Checking instance exists in master._get_cached_minion_data when cache.fetch returns None + +* **ISSUE** `#39052`_: (`githubcdr`_) Minion restart very slow since 2016.11.2 (refs: `#39104`_) + +* **PR** `#39851`_: (`rallytime`_) Back-port `#39104`_ to 2016.11 + @ *2017-03-06 21:17:43 UTC* + + * **PR** `#39104`_: (`githubcdr`_) Do not use name resolving for --notrim check (refs: `#39851`_) + + * 897275ae5f Merge pull request `#39851`_ from rallytime/bp-39104 + + * 6539dbdbca Do not use name resolving for --notrim check + +* **ISSUE** `#38231`_: (`tjuup`_) Typo: salt-key deleteed (refs: `#39799`_) + +* **PR** `#39799`_: (`Ch3LL`_) Fix deleteed message when key is deleted + @ *2017-03-03 05:17:43 UTC* + + * d0440e2a2a Merge pull request `#39799`_ from Ch3LL/fix_salt_key_msg + + * 8346682cf7 Fix deleteed message when key is deleted + +* **ISSUE** `#38962`_: (`gstachowiak`_) Broken /jobs in salt-api in salt 2016.11.1 (Carbon) (refs: `#39472`_) + +* **PR** `#39472`_: (`whiteinge`_) Update _reformat_low to not run kwarg dicts through parse_input + @ *2017-03-02 17:46:20 UTC* + + * 9f70ad7164 Merge pull request `#39472`_ from whiteinge/_reformat_low-update + + * d11f5381a4 Add RunnerClient test for old/new-style arg/kwarg parsing + + * ec377ab379 Reenable skipped RunnerClient tests + + * 27f7fd9ad4 Update _reformat_low to run arg through parse_input + + * 5177153459 Revert parse_input change from `#32005`_ + +* **PR** `#39727`_: (`terminalmage`_) salt.modules.state: check gathered pillar for errors instead of in-memory pillar + @ *2017-03-02 17:06:43 UTC* + + * 7dfc4b572a Merge pull request `#39727`_ from terminalmage/issue39627 + + * 3bb0ebd872 Update tests for PR 39727 + + * c334b59c96 salt.modules.state: check gathered pillar for errors instead of in-memory pillar + + * 97dd8a13d9 Ensure that ext_pillar begins with pillar_override if ext_pillar_first is True + + * f951266944 Add log message for successful makostack processing + +* **ISSUE** `#39775`_: (`mirceaulinic`_) Proxy `mine_interval` config ignored (refs: `#39935`_, #saltstack/salt`#39935`_, `#39776`_) + +* **PR** `#39776`_: (`mirceaulinic`_) WIP: Save _schedule.conf under dir + @ *2017-03-02 16:27:45 UTC* + + * 965f474316 Merge pull request `#39776`_ from cloudflare/proxy-schedule + + * 35b8b8fd64 Save _schedule.conf under dir + +* **PR** `#39788`_: (`cachedout`_) Disable one API test that is flaky + @ *2017-03-02 16:17:31 UTC* + + * 555f1473f6 Merge pull request `#39788`_ from cachedout/disable_api_test + + * 523e377b33 Disable one API test that is flaky + +* **PR** `#39762`_: (`terminalmage`_) Fix regression in file.get_managed + @ *2017-03-02 02:59:34 UTC* + + * 793979cbe6 Merge pull request `#39762`_ from terminalmage/issue39751 + + * 64db0b8563 Add integration tests for remote file sources + + * f9f894d981 Fix regression in file.get_managed when skip_verify=True + + * 28651a6699 Remove next(iter()) extraction + +* **ISSUE** `#35088`_: (`Modulus`_) salt/cloud/ec2.py encoding problems. (refs: `#37912`_) + +* **PR** `#39767`_: (`rallytime`_) Back-port `#38316`_ to 2016.11 + @ *2017-03-02 02:54:57 UTC* + + * **PR** `#38316`_: (`mlalpho`_) salt utils aws encoding fix (refs: `#39767`_) + + * **PR** `#37912`_: (`attiasr`_) fix encoding problem aws responses (refs: `#38316`_) + + * 91a9337ab3 Merge pull request `#39767`_ from rallytime/bp-38316 + + * 1dcf018df7 requests api says Response.encoding can sometimes be None http://docs.python-requests.org/en/master/api/#requests.Response.encoding and result.text.encode() doesn't accept None and expects a string. + +* **ISSUE** `#39692`_: (`djsly`_) tuned module and state are broken on 7.3 families. (refs: `#40387`_, `#39719`_, `#39768`_) + +* **PR** `#39768`_: (`rallytime`_) Back-port `#39719`_ to 2016.11 + @ *2017-03-02 02:54:40 UTC* + + * **PR** `#39719`_: (`Seb-Solon`_) Support new version of tuned-adm binary (refs: `#39768`_) + + * 4a01bd64ea Merge pull request `#39768`_ from rallytime/bp-39719 + + * d7cb70f203 Enh: Support new version of tuned-adm binary + +* **PR** `#39760`_: (`Ch3LL`_) Initial 2016.11.4 Release Notes Doc + @ *2017-03-01 18:43:39 UTC* + + * 780457f934 Merge pull request `#39760`_ from Ch3LL/2016.11.4_notes + + * 1853c998c4 add initial 2016.11.4 release notes + +* **PR** `#39731`_: (`twangboy`_) Add docs for Kwargs in pkg.refresh_db + @ *2017-02-28 22:02:59 UTC* + + * 0147f78ab5 Merge pull request `#39731`_ from twangboy/win_pkg_docs + + * 423e6f7448 Add docs for Kwargs in pkg.refresh_db + +* **ISSUE** `#39710`_: (`huangfupeng`_) schedule.add parameter can not use “after“ (refs: `#39734`_) + +* **PR** `#39734`_: (`garethgreenaway`_) Missing parameter in the schedule.add function + @ *2017-02-28 20:43:08 UTC* + + * fce2d184f3 Merge pull request `#39734`_ from garethgreenaway/39710_missing_schedule_add_parameter + + * 63eb610245 Per `#39710`_, missing parameter in the schedule.add function + +* **PR** `#39729`_: (`rallytime`_) [2016.11] Bump latest release version to 2016.11.3 + @ *2017-02-28 18:08:25 UTC* + + * 7b4865c058 Merge pull request `#39729`_ from rallytime/update-release-ver-2016.11 + + * b5a7111ad9 [2016.11] Bump latest release version to 2016.11.3 + +* **PR** `#39721`_: (`vutny`_) DOCS: add 2nd level header for advanced targeting methods + @ *2017-02-28 17:57:46 UTC* + + * 47e494fe07 Merge pull request `#39721`_ from vutny/doc-targeting + + * 1d86cf1161 DOCS: add 2nd level header for advanced targeting methods + +* **ISSUE** `#39683`_: (`alankrita`_) Error in Saltstack's rest auth "Authentication module threw 'status' " (refs: `#39711`_) + +* **PR** `#39711`_: (`alankrita`_) Fix error in Saltstack's rest auth "Authentication module threw 'status' " + @ *2017-02-28 15:56:09 UTC* + + * d39b679d82 Merge pull request `#39711`_ from alankrita/fix-rest-eauth + + * ee426562a7 Fix error in Saltstack's rest auth "Authentication module threw 'status' " + +* **PR** `#39699`_: (`techhat`_) Strip shabang line from rendered HTTP data + @ *2017-02-28 00:05:01 UTC* + + * 3940321462 Merge pull request `#39699`_ from techhat/httpshabang + + * 559eb93576 Strip shabang line from rendered HTTP data + +* **PR** `#39694`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-02-27 22:13:49 UTC* + + * 00f121eade Merge pull request `#39694`_ from rallytime/merge-2016.11 + + * 756f1de2d2 Merge branch '2016.3' into '2016.11' + + * 3f8b5e6733 Merge pull request `#39487`_ from bobrik/mode-docs + + * 41ef69b3ca Document default permission modes for file module + + * f7389bf1f5 Merge pull request `#39641`_ from smarsching/issue-39169-2016.3 + + * 88c2d9a540 Fix return data structure for runner (issue `#39169`_). + + * fc970b6a16 Merge pull request `#39633`_ from terminalmage/fix-systemd-typo + + * ca54541abe Add missing unit test for disable func + + * 17109e1522 Fix misspelled argument in salt.modules.systemd.disable() + + * 53e78d67f6 Merge pull request `#39613`_ from terminalmage/fix-docs + + * 9342eda377 Fix inaccurate documentation + +* **ISSUE** `#39642`_: (`drawsmcgraw`_) boto_vpc.nat_gateway_present does not honor the allocation_id parameter like the module does (refs: `#39643`_) + +* **PR** `#39643`_: (`drawsmcgraw`_) issue 39642 - boto_vpc.nat_gateway_present should accept parameter al… + @ *2017-02-27 20:19:09 UTC* + + * 2c919e31d6 Merge pull request `#39643`_ from drawsmcgraw/39642 + + * 56d9adfbf6 issue 39642 - boto_vpc.nat_gateway_present should accept parameter allocation_id. + +* **PR** `#39666`_: (`terminalmage`_) Rewrite the test_valid_docs test + @ *2017-02-26 20:14:33 UTC* + + * df013c5f31 Merge pull request `#39666`_ from terminalmage/test_valid_docs + + * 5a3c099e4f Rewrite the tests_valid_docs test + +* **PR** `#39662`_: (`The-Loeki`_) Py3 compat: Force minions to be a list for local serialized caches + @ *2017-02-26 02:36:46 UTC* + + * a29a7be7f8 Merge pull request `#39662`_ from The-Loeki/py3cachefix + + * b02ef984f7 Add comment + + * 0fe5c90a05 Py3 compat: Force minions to be a list for local serialized caches + +* **PR** `#39644`_: (`vutny`_) Improve and align dockerng execution module docs + @ *2017-02-25 04:16:28 UTC* + + * bd6efd18b1 Merge pull request `#39644`_ from vutny/dockerng-docs + + * c4988e874e Improve and align dockerng execution module docs + +* **PR** `#39516`_: (`jettero`_) Prevent spurious "Template does not exist" error + @ *2017-02-24 23:41:36 UTC* + + * fffab54078 Merge pull request `#39516`_ from jettero/give-pillarenv-tops-similar-treatment + + * 8fe48fa5c4 prevent billions of inexplicable lines of this: + +* **PR** `#39654`_: (`skizunov`_) Fix issue where compile_pillar failure causes minion to exit + @ *2017-02-24 22:47:52 UTC* + + * be9629b180 Merge pull request `#39654`_ from skizunov/develop2 + + * 9f80bbce07 Fix issue where compile_pillar failure causes minion to exit + +* **PR** `#39653`_: (`cachedout`_) Use salt's ordereddict for comparison + @ *2017-02-24 22:46:24 UTC* + + * e63cbbaab9 Merge pull request `#39653`_ from cachedout/26_odict + + * 91eb7210bb Use salt's ordereddict for comparison + +* **ISSUE** `#38836`_: (`toanctruong`_) file.managed with S3 Source errors out with obscure message (refs: `#39609`_, `#39589`_) + +* **PR** `#39609`_: (`gtmanfred`_) intialize the Client stuff in FSClient + @ *2017-02-24 18:50:55 UTC* + + * 0bc6027e68 Merge pull request `#39609`_ from gtmanfred/2016.11 + + * 0820620ef8 intialize the Client stuff in FSClient + +* **PR** `#39615`_: (`skizunov`_) Bonjour/Avahi beacons: Make sure TXT record length is valid + @ *2017-02-24 18:47:05 UTC* + + * 28035c07b3 Merge pull request `#39615`_ from skizunov/develop2 + + * b1c7e9b505 Bonjour/Avahi beacons: Make sure TXT record length is valid + +* **PR** `#39617`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-02-24 16:07:55 UTC* + + * e9410fb669 Merge pull request `#39617`_ from rallytime/merge-2016.11 + + * 13622899d2 Merge branch '2016.3' into '2016.11' + + * 4e2b852f83 Merge pull request `#39600`_ from vutny/state-file-docs + + * 9b0427c27a state.file: drop non-relevant examples for `source_hash` parameter + + * ed83420417 Merge pull request `#39584`_ from cachedout/mentionbot_docs + + * 652044b18f A note in the docs about mentionbot + + * d3e50b4f2f Merge pull request `#39583`_ from cachedout/mentionbot_blacklist + + * 62491c900d Add empty blacklist to mention bot + +* **ISSUE** `#38758`_: (`bobrik`_) Remote state execution is much slower on 2016.11.1 compared to 2016.3.4 (refs: `#39505`_) + +* **ISSUE** `#33575`_: (`anlutro`_) File states seem slower in 2016.3, especially on first cache retrieval (refs: `#33896`_) + +* **ISSUE** `#29643`_: (`matthayes`_) Can't get batch mode and --failhard to work as expected (refs: `#31164`_) + +* **ISSUE** `#28569`_: (`andrejohansson`_) Reactor alert on highstate fail (refs: `#31164`_) + +* **PR** `#39505`_: (`cachedout`_) Threadsafety option for context dictionaries + @ *2017-02-23 19:38:13 UTC* + + * **PR** `#37378`_: (`skizunov`_) Fix `__context__` to properly sandbox (refs: `#39505`_) + + * **PR** `#33896`_: (`DmitryKuzmenko`_) Don't deep copy context dict values. (refs: `#39505`_) + + * **PR** `#31164`_: (`DmitryKuzmenko`_) Issues/29643 fix invalid retcode (refs: `#33896`_) + + * 0d31201e08 Merge pull request `#39505`_ from cachedout/issue_38758 + + * 1dba2f9cb0 Add warning in docs + + * 9cf654b72c Threadsafety option for context dictionaries + +* **PR** `#39507`_: (`joe-niland`_) Detect IIS version and vary certificate association command depending on version + @ *2017-02-23 19:15:40 UTC* + + * c0d4357f46 Merge pull request `#39507`_ from joe-niland/iis-7-cert-binding + + * c94f0b8c62 Fix additional issue whereby existing certificate bindings were not found in IIS 7.5, due to the fact that IIS earlier than 8 doesn't support SNI + + * 18effe0103 Detect IIS version and vary certificate association command depending on version + +* **PR** `#39565`_: (`terminalmage`_) states.file.patch/modules.file.check_hash: use hash length to determine type + @ *2017-02-23 19:14:28 UTC* + + * e6f5e8a474 Merge pull request `#39565`_ from terminalmage/issue39512 + + * cbdf905b9f Update test to reflect new state comment + + * 650dbaca4e states.file.patch/modules.file.check_hash: use hash length to determine type + +* **PR** `#39591`_: (`mcalmer`_) fix case in os_family for Suse + @ *2017-02-23 19:07:17 UTC* + + * 53e22b8f15 Merge pull request `#39591`_ from mcalmer/fix-case-in-os_family + + * 81bd96e32d fix case in os_family for Suse + +* **ISSUE** `#38452`_: (`jf`_) file.line with mode=delete does not preserve ownership of a file (refs: `#39592`_) + +* **PR** `#39592`_: (`skazi0`_) Ensure user/group/file_mode after line edit + @ *2017-02-23 18:40:05 UTC* + + * aee43f7fa4 Merge pull request `#39592`_ from skazi0/line-user-fix + + * baf84b4430 Ensure user/group/file_mode after line edit + +* **PR** `#39596`_: (`ticosax`_) Reduce scope of try except StopIteration wrapping + @ *2017-02-23 18:16:17 UTC* + + * 6ab4151213 Merge pull request `#39596`_ from ticosax/reduce-scope-catehed-exception + + * 54cdacb680 Reduce scope of try except StopIteration wrapping + +* **ISSUE** `#38836`_: (`toanctruong`_) file.managed with S3 Source errors out with obscure message (refs: `#39609`_, `#39589`_) + +* **PR** `#39610`_: (`rallytime`_) Back-port `#39589`_ to 2016.11 + @ *2017-02-23 17:48:03 UTC* + + * **PR** `#39589`_: (`MasterNayru`_) Allow masterless minions to pull files from S3 (refs: `#39610`_) + + * b1c3b84862 Merge pull request `#39610`_ from rallytime/bp-39589 + + * 83ec174d44 Set utils property explicitly for FSClient + + * 3889006149 Allow masterless minions to pull files from S3 + +* **PR** `#39606`_: (`rallytime`_) [2016.11] Pylint: add missing import + @ *2017-02-23 16:39:55 UTC* + + * fe15ed9b92 Merge pull request `#39606`_ from rallytime/lint-2016.11 + + * 71164348e7 [2016.11] Pylint: add missing import + +* **PR** `#39573`_: (`thatch45`_) Added a few more comments to the ssl docs + @ *2017-02-23 02:17:13 UTC* + + * **PR** `#39554`_: (`DmitryKuzmenko`_) Cosmetic: support bool value for 'ssl' config option. (refs: `#39573`_) + + * **PR** `#39528`_: (`thatch45`_) Add better ssl option docs (refs: `#39554`_) + + * 5987c4e30e Merge pull request `#39573`_ from thatch45/ssl_docs + + * b230c35eac This should be good to go now + +* **PR** `#39577`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-02-23 02:10:12 UTC* + + * b8e321cbec Merge pull request `#39577`_ from rallytime/merge-2016.11 + + * 397c756a01 Merge branch '2016.3' into '2016.11' + + * 8352e6b44b Merge pull request `#39579`_ from rallytime/fix-lint + + * 65889e1f30 [2016.3] Pylint: Remove unused import + + * 43dba3254c Merge pull request `#39578`_ from cachedout/2016.3 + + * 344499eef7 Add mention-bot configuration + + * c52cecd856 Fix syntax error leftover from incomplete merge-conflict resolution + + * 7b9b3f700d Merge branch '2016.3' into '2016.11' + + * 8f7a0f9d96 Merge pull request `#39542`_ from twangboy/gate_ssh_known_hosts + + * c90a52ef27 Remove expensive check + + * 6d645cae0e Add __virtual__ function + + * c10965833a Merge pull request `#39289`_ from bobrik/autodetect-ipv6 + + * 2761a1b244 Move new kwargs to the end of argument list + + * 0df6b922e7 Narrow down connection exception to socket.error + + * e8a2cc0488 Do no try to connect to salt master in syndic config test + + * af9578631e Properly log address that failed to resolve or pass connection check + + * 9a34fbeba9 Actually connect to master instead of checking route availability + + * c494839c65 Avoid bare exceptions in dns_check + + * 29f376676d Rewrite dns_check to try to connect to address + + * 55965ce505 Autodetect IPv6 connectivity from minion to master + + * 3fb928b63a Merge pull request `#39569`_ from s0undt3ch/2016.3 + + * 49da135abd Don't use our own six dictionary fixes in this branch + + * 91e3319df8 Merge pull request `#39508`_ from dincamihai/openscap + + * 9fedb84607 Always return oscap's stderr + + * 0ecde2cd02 Include oscap returncode in response + + * fbe2194a93 Merge pull request `#39562`_ from terminalmage/issue30802 + + * c50374041d Add ulimits to dockerng state/exec module + + * da42040c1a Try the docker-py 2.0 client name first + + * 01d4a84a2f dockerng.get_client_args: Fix path for endpoint config for some versions of docker-py (`#39544`_) + +* **PR** `#39574`_: (`Ch3LL`_) Update 2016.11.3 release notes + @ *2017-02-23 00:10:23 UTC* + + * cff9334929 Merge pull request `#39574`_ from Ch3LL/update_release_notes + + * c0f8c35df7 fix reference to set in docs + + * 663f6f159d add additional PRs to 2016.11.3 release notes + +* **PR** `#39528`_: (`thatch45`_) Add better ssl option docs (refs: `#39554`_) + @ *2017-02-22 18:29:47 UTC* + + * b492f7094c Merge pull request `#39528`_ from thatch45/ssl_docs + + * c357e37831 Add minion config + + * 539bb2aa80 Add better ssl option docs + +* **ISSUE** `saltstack/salt#35869`_: (`amontalban`_) timezone.system state fails on FreeBSD when /etc/localtime does not exists (refs: `#39532`_) + +* **PR** `#39532`_: (`amontalban`_) Fix case when /etc/localtime is a file and it is not updated + @ *2017-02-22 18:28:54 UTC* + + * 0dad49cdff Merge pull request `#39532`_ from amontalban/corner_case_35869 + + * f0d3c16547 Fix case when /etc/localtime is a file and it is not updated + +* **PR** `#39540`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-02-22 18:24:01 UTC* + + * 9cfaf3b599 Merge pull request `#39540`_ from rallytime/merge-2016.11 + + * 49fe4e891e Merge branch '2016.11' into '2016.11' + + * c613d19e76 Merge branch '2016.3' into '2016.11' + + * dff35b58f8 Merge pull request `#39498`_ from terminalmage/pr-39483 + + * 20b097a745 dockerng: compare sets instead of lists of security_opt + + * 6418e725ed Merge pull request `#39497`_ from terminalmage/docker-compat-fixes + + * cbd0270bac docker: make docker-exec the default execution driver + + * a6a17d58aa Handle docker-py 2.0's new host_config path + + * 9c4292fb4e Merge pull request `#39423`_ from dincamihai/openscap + + * 9d13422ac1 OpenSCAP module + + * 7dd2502360 Merge pull request `#39464`_ from gtmanfred/2016.3 + + * f829d6f9fc skip false values from preferred_ip + + * db359ff2c3 Merge pull request `#39460`_ from cachedout/win_dism_test_fix + + * e652a45592 Fix mocks in win_disim tests + + * 9dbfba9b57 Merge pull request `#39426`_ from morganwillcock/dism + + * a7d5118262 Return failure when package path does not exist + + * 56162706e3 Merge pull request `#39431`_ from UtahDave/fix_grains.setval_performance + + * 391bbecd90 add docs + + * 709c197f84 allow sync_grains to be disabled on grains.setval + + * 239e16e612 Merge pull request `#39405`_ from rallytime/fix-39304 + + * bd1fe03ce7 Update :depends: docs for boto states and modules + + * 415102f346 Merge pull request `#39411`_ from rallytime/fix-38762 + + * e13febe58d Update external_cache docs with other configuration options + + * 7e1803b617 Update docs on upstream EPEL7 pygit2/libgit2 issues (`#39421`_) + +* **PR** `#39554`_: (`DmitryKuzmenko`_) Cosmetic: support bool value for 'ssl' config option. (refs: `#39573`_) + @ *2017-02-22 16:59:03 UTC* + + * **PR** `#39528`_: (`thatch45`_) Add better ssl option docs (refs: `#39554`_) + + * 56fe2f198e Merge pull request `#39554`_ from DSRCorporation/bugs/ssl_bool + + * 7a6fc11291 Cosmetic: support bool value for 'ssl' config option. + +* **PR** `#39560`_: (`vutny`_) [CLOUD] Log error when private/public IP was not detected + @ *2017-02-22 16:49:46 UTC* + + * cf37f83565 Merge pull request `#39560`_ from vutny/cloud-detect-ips + + * 567bb50884 [CLOUD] Log error when private/public IP was not detected -.. _`#22080`: https://github.com/saltstack/salt/issues/22080 -.. _`#25021`: https://github.com/saltstack/salt/pull/25021 .. _`#28569`: https://github.com/saltstack/salt/issues/28569 .. _`#29028`: https://github.com/saltstack/salt/issues/29028 .. _`#29104`: https://github.com/saltstack/salt/issues/29104 .. _`#29643`: https://github.com/saltstack/salt/issues/29643 -.. _`#30802`: https://github.com/saltstack/salt/issues/30802 -.. _`#31005`: https://github.com/saltstack/salt/issues/31005 .. _`#31164`: https://github.com/saltstack/salt/pull/31164 .. _`#31363`: https://github.com/saltstack/salt/issues/31363 .. _`#32005`: https://github.com/saltstack/salt/pull/32005 .. _`#32662`: https://github.com/saltstack/salt/issues/32662 .. _`#32698`: https://github.com/saltstack/salt/pull/32698 -.. _`#33162`: https://github.com/saltstack/salt/issues/33162 .. _`#33164`: https://github.com/saltstack/salt/pull/33164 -.. _`#33187`: https://github.com/saltstack/salt/issues/33187 .. _`#33575`: https://github.com/saltstack/salt/issues/33575 .. _`#33896`: https://github.com/saltstack/salt/pull/33896 .. _`#34920`: https://github.com/saltstack/salt/pull/34920 .. _`#35088`: https://github.com/saltstack/salt/issues/35088 .. _`#35665`: https://github.com/saltstack/salt/pull/35665 -.. _`#35869`: https://github.com/saltstack/salt/issues/35869 .. _`#36134`: https://github.com/saltstack/salt/issues/36134 .. _`#36437`: https://github.com/saltstack/salt/pull/36437 -.. _`#37322`: https://github.com/saltstack/salt/issues/37322 .. _`#37378`: https://github.com/saltstack/salt/pull/37378 .. _`#37699`: https://github.com/saltstack/salt/issues/37699 .. _`#37741`: https://github.com/saltstack/salt/issues/37741 @@ -2361,11 +2342,9 @@ Changes: .. _`#38452`: https://github.com/saltstack/salt/issues/38452 .. _`#38458`: https://github.com/saltstack/salt/issues/38458 .. _`#38497`: https://github.com/saltstack/salt/issues/38497 -.. _`#38514`: https://github.com/saltstack/salt/issues/38514 .. _`#38523`: https://github.com/saltstack/salt/issues/38523 .. _`#38683`: https://github.com/saltstack/salt/issues/38683 .. _`#38758`: https://github.com/saltstack/salt/issues/38758 -.. _`#38762`: https://github.com/saltstack/salt/issues/38762 .. _`#38830`: https://github.com/saltstack/salt/issues/38830 .. _`#38835`: https://github.com/saltstack/salt/pull/38835 .. _`#38836`: https://github.com/saltstack/salt/issues/38836 @@ -2374,29 +2353,20 @@ Changes: .. _`#39052`: https://github.com/saltstack/salt/issues/39052 .. _`#39104`: https://github.com/saltstack/salt/pull/39104 .. _`#39109`: https://github.com/saltstack/salt/pull/39109 -.. _`#39118`: https://github.com/saltstack/salt/issues/39118 -.. _`#39119`: https://github.com/saltstack/salt/issues/39119 .. _`#39169`: https://github.com/saltstack/salt/issues/39169 -.. _`#39179`: https://github.com/saltstack/salt/pull/39179 .. _`#39275`: https://github.com/saltstack/salt/issues/39275 .. _`#39289`: https://github.com/saltstack/salt/pull/39289 -.. _`#39304`: https://github.com/saltstack/salt/issues/39304 -.. _`#39333`: https://github.com/saltstack/salt/issues/39333 -.. _`#39336`: https://github.com/saltstack/salt/issues/39336 .. _`#39405`: https://github.com/saltstack/salt/pull/39405 .. _`#39411`: https://github.com/saltstack/salt/pull/39411 .. _`#39421`: https://github.com/saltstack/salt/pull/39421 .. _`#39423`: https://github.com/saltstack/salt/pull/39423 .. _`#39426`: https://github.com/saltstack/salt/pull/39426 .. _`#39431`: https://github.com/saltstack/salt/pull/39431 -.. _`#39444`: https://github.com/saltstack/salt/issues/39444 .. _`#39445`: https://github.com/saltstack/salt/issues/39445 .. _`#39460`: https://github.com/saltstack/salt/pull/39460 .. _`#39463`: https://github.com/saltstack/salt/issues/39463 .. _`#39464`: https://github.com/saltstack/salt/pull/39464 .. _`#39472`: https://github.com/saltstack/salt/pull/39472 -.. _`#39482`: https://github.com/saltstack/salt/issues/39482 -.. _`#39483`: https://github.com/saltstack/salt/issues/39483 .. _`#39487`: https://github.com/saltstack/salt/pull/39487 .. _`#39497`: https://github.com/saltstack/salt/pull/39497 .. _`#39498`: https://github.com/saltstack/salt/pull/39498 @@ -2433,7 +2403,6 @@ Changes: .. _`#39615`: https://github.com/saltstack/salt/pull/39615 .. _`#39617`: https://github.com/saltstack/salt/pull/39617 .. _`#39619`: https://github.com/saltstack/salt/pull/39619 -.. _`#39622`: https://github.com/saltstack/salt/issues/39622 .. _`#39624`: https://github.com/saltstack/salt/pull/39624 .. _`#39633`: https://github.com/saltstack/salt/pull/39633 .. _`#39641`: https://github.com/saltstack/salt/pull/39641 @@ -2470,7 +2439,6 @@ Changes: .. _`#39776`: https://github.com/saltstack/salt/pull/39776 .. _`#39778`: https://github.com/saltstack/salt/issues/39778 .. _`#39779`: https://github.com/saltstack/salt/issues/39779 -.. _`#39782`: https://github.com/saltstack/salt/issues/39782 .. _`#39784`: https://github.com/saltstack/salt/pull/39784 .. _`#39788`: https://github.com/saltstack/salt/pull/39788 .. _`#39791`: https://github.com/saltstack/salt/pull/39791 @@ -2484,7 +2452,6 @@ Changes: .. _`#39842`: https://github.com/saltstack/salt/issues/39842 .. _`#39851`: https://github.com/saltstack/salt/pull/39851 .. _`#39852`: https://github.com/saltstack/salt/pull/39852 -.. _`#39854`: https://github.com/saltstack/salt/issues/39854 .. _`#39855`: https://github.com/saltstack/salt/pull/39855 .. _`#39858`: https://github.com/saltstack/salt/pull/39858 .. _`#39862`: https://github.com/saltstack/salt/pull/39862 @@ -2493,7 +2460,6 @@ Changes: .. _`#39871`: https://github.com/saltstack/salt/pull/39871 .. _`#39872`: https://github.com/saltstack/salt/pull/39872 .. _`#39882`: https://github.com/saltstack/salt/pull/39882 -.. _`#39892`: https://github.com/saltstack/salt/issues/39892 .. _`#39899`: https://github.com/saltstack/salt/pull/39899 .. _`#39900`: https://github.com/saltstack/salt/pull/39900 .. _`#39910`: https://github.com/saltstack/salt/pull/39910 @@ -2507,7 +2473,6 @@ Changes: .. _`#39935`: https://github.com/saltstack/salt/pull/39935 .. _`#39936`: https://github.com/saltstack/salt/pull/39936 .. _`#39937`: https://github.com/saltstack/salt/pull/39937 -.. _`#39942`: https://github.com/saltstack/salt/issues/39942 .. _`#39952`: https://github.com/saltstack/salt/pull/39952 .. _`#39962`: https://github.com/saltstack/salt/pull/39962 .. _`#39963`: https://github.com/saltstack/salt/pull/39963 @@ -2519,11 +2484,9 @@ Changes: .. _`#39988`: https://github.com/saltstack/salt/pull/39988 .. _`#39991`: https://github.com/saltstack/salt/pull/39991 .. _`#39994`: https://github.com/saltstack/salt/pull/39994 -.. _`#39995`: https://github.com/saltstack/salt/issues/39995 .. _`#40000`: https://github.com/saltstack/salt/pull/40000 .. _`#40005`: https://github.com/saltstack/salt/issues/40005 .. _`#40010`: https://github.com/saltstack/salt/pull/40010 -.. _`#40011`: https://github.com/saltstack/salt/issues/40011 .. _`#40016`: https://github.com/saltstack/salt/pull/40016 .. _`#40018`: https://github.com/saltstack/salt/pull/40018 .. _`#40020`: https://github.com/saltstack/salt/pull/40020 @@ -2532,14 +2495,12 @@ Changes: .. _`#40025`: https://github.com/saltstack/salt/pull/40025 .. _`#40030`: https://github.com/saltstack/salt/pull/40030 .. _`#40034`: https://github.com/saltstack/salt/pull/40034 -.. _`#40036`: https://github.com/saltstack/salt/issues/40036 .. _`#40038`: https://github.com/saltstack/salt/pull/40038 .. _`#40041`: https://github.com/saltstack/salt/pull/40041 .. _`#40045`: https://github.com/saltstack/salt/pull/40045 .. _`#40047`: https://github.com/saltstack/salt/pull/40047 .. _`#40053`: https://github.com/saltstack/salt/pull/40053 .. _`#40055`: https://github.com/saltstack/salt/pull/40055 -.. _`#40056`: https://github.com/saltstack/salt/pull/40056 .. _`#40057`: https://github.com/saltstack/salt/pull/40057 .. _`#40059`: https://github.com/saltstack/salt/pull/40059 .. _`#40070`: https://github.com/saltstack/salt/pull/40070 @@ -2554,13 +2515,11 @@ Changes: .. _`#40096`: https://github.com/saltstack/salt/pull/40096 .. _`#40097`: https://github.com/saltstack/salt/pull/40097 .. _`#40111`: https://github.com/saltstack/salt/pull/40111 -.. _`#40117`: https://github.com/saltstack/salt/pull/40117 .. _`#40118`: https://github.com/saltstack/salt/pull/40118 .. _`#40120`: https://github.com/saltstack/salt/pull/40120 .. _`#40122`: https://github.com/saltstack/salt/pull/40122 .. _`#40123`: https://github.com/saltstack/salt/pull/40123 .. _`#40141`: https://github.com/saltstack/salt/pull/40141 -.. _`#40149`: https://github.com/saltstack/salt/issues/40149 .. _`#40158`: https://github.com/saltstack/salt/pull/40158 .. _`#40159`: https://github.com/saltstack/salt/pull/40159 .. _`#40160`: https://github.com/saltstack/salt/pull/40160 @@ -2578,12 +2537,10 @@ Changes: .. _`#40199`: https://github.com/saltstack/salt/pull/40199 .. _`#40201`: https://github.com/saltstack/salt/pull/40201 .. _`#40202`: https://github.com/saltstack/salt/pull/40202 -.. _`#40203`: https://github.com/saltstack/salt/issues/40203 .. _`#40204`: https://github.com/saltstack/salt/issues/40204 .. _`#40206`: https://github.com/saltstack/salt/pull/40206 .. _`#40209`: https://github.com/saltstack/salt/pull/40209 .. _`#40210`: https://github.com/saltstack/salt/pull/40210 -.. _`#40219`: https://github.com/saltstack/salt/issues/40219 .. _`#40221`: https://github.com/saltstack/salt/pull/40221 .. _`#40225`: https://github.com/saltstack/salt/pull/40225 .. _`#40226`: https://github.com/saltstack/salt/pull/40226 @@ -2594,7 +2551,6 @@ Changes: .. _`#40240`: https://github.com/saltstack/salt/pull/40240 .. _`#40247`: https://github.com/saltstack/salt/issues/40247 .. _`#40250`: https://github.com/saltstack/salt/pull/40250 -.. _`#40251`: https://github.com/saltstack/salt/issues/40251 .. _`#40253`: https://github.com/saltstack/salt/pull/40253 .. _`#40255`: https://github.com/saltstack/salt/pull/40255 .. _`#40260`: https://github.com/saltstack/salt/pull/40260 @@ -2604,7 +2560,6 @@ Changes: .. _`#40275`: https://github.com/saltstack/salt/pull/40275 .. _`#40277`: https://github.com/saltstack/salt/pull/40277 .. _`#40278`: https://github.com/saltstack/salt/issues/40278 -.. _`#40279`: https://github.com/saltstack/salt/issues/40279 .. _`#40280`: https://github.com/saltstack/salt/pull/40280 .. _`#40285`: https://github.com/saltstack/salt/pull/40285 .. _`#40287`: https://github.com/saltstack/salt/pull/40287 @@ -2721,36 +2676,104 @@ Changes: .. _`#40688`: https://github.com/saltstack/salt/issues/40688 .. _`#40689`: https://github.com/saltstack/salt/pull/40689 .. _`#40690`: https://github.com/saltstack/salt/pull/40690 +.. _`#40708`: https://github.com/saltstack/salt/pull/40708 .. _`#7287`: https://github.com/saltstack/salt/issues/7287 .. _`#7997`: https://github.com/saltstack/salt/issues/7997 -.. _`bp-35665`: https://github.com/saltstack/salt/pull/35665 -.. _`bp-37743`: https://github.com/saltstack/salt/pull/37743 -.. _`bp-37795`: https://github.com/saltstack/salt/pull/37795 -.. _`bp-38316`: https://github.com/saltstack/salt/pull/38316 -.. _`bp-38835`: https://github.com/saltstack/salt/pull/38835 -.. _`bp-38943`: https://github.com/saltstack/salt/pull/38943 -.. _`bp-39104`: https://github.com/saltstack/salt/pull/39104 -.. _`bp-39179`: https://github.com/saltstack/salt/pull/39179 -.. _`bp-39589`: https://github.com/saltstack/salt/pull/39589 -.. _`bp-39651`: https://github.com/saltstack/salt/pull/39651 -.. _`bp-39719`: https://github.com/saltstack/salt/pull/39719 -.. _`bp-40000`: https://github.com/saltstack/salt/pull/40000 -.. _`bp-40030`: https://github.com/saltstack/salt/pull/40030 -.. _`bp-40056`: https://github.com/saltstack/salt/pull/40056 -.. _`bp-40117`: https://github.com/saltstack/salt/pull/40117 -.. _`bp-40415`: https://github.com/saltstack/salt/pull/40415 -.. _`bp-40559`: https://github.com/saltstack/salt/pull/40559 -.. _`bp-40571`: https://github.com/saltstack/salt/pull/40571 -.. _`bp-40573`: https://github.com/saltstack/salt/pull/40573 -.. _`bp-40598`: https://github.com/saltstack/salt/pull/40598 -.. _`fix-31363`: https://github.com/saltstack/salt/issues/31363 -.. _`fix-37699`: https://github.com/saltstack/salt/issues/37699 -.. _`fix-38683`: https://github.com/saltstack/salt/issues/38683 -.. _`fix-38762`: https://github.com/saltstack/salt/issues/38762 -.. _`fix-39304`: https://github.com/saltstack/salt/issues/39304 -.. _`fix-39692`: https://github.com/saltstack/salt/issues/39692 -.. _`fix-39771`: https://github.com/saltstack/salt/issues/39771 -.. _`fix-39782`: https://github.com/saltstack/salt/issues/39782 -.. _`fix-39863`: https://github.com/saltstack/salt/issues/39863 -.. _`fix-40005`: https://github.com/saltstack/salt/issues/40005 -.. _`fix-40278`: https://github.com/saltstack/salt/issues/40278 +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`Da-Juan`: https://github.com/Da-Juan +.. _`DennisHarper`: https://github.com/DennisHarper +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`L4rS6`: https://github.com/L4rS6 +.. _`MasterNayru`: https://github.com/MasterNayru +.. _`Modulus`: https://github.com/Modulus +.. _`MorphBonehunter`: https://github.com/MorphBonehunter +.. _`Seb-Solon`: https://github.com/Seb-Solon +.. _`Talkless`: https://github.com/Talkless +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`UtahDave`: https://github.com/UtahDave +.. _`Whissi`: https://github.com/Whissi +.. _`aabognah`: https://github.com/aabognah +.. _`adithep`: https://github.com/adithep +.. _`afletch`: https://github.com/afletch +.. _`alankrita`: https://github.com/alankrita +.. _`alias454`: https://github.com/alias454 +.. _`amontalban`: https://github.com/amontalban +.. _`andrejohansson`: https://github.com/andrejohansson +.. _`anlutro`: https://github.com/anlutro +.. _`ardakuyumcu`: https://github.com/ardakuyumcu +.. _`attiasr`: https://github.com/attiasr +.. _`bdrung`: https://github.com/bdrung +.. _`bewing`: https://github.com/bewing +.. _`bobrik`: https://github.com/bobrik +.. _`cachedout`: https://github.com/cachedout +.. _`chrisLeeTW`: https://github.com/chrisLeeTW +.. _`cro`: https://github.com/cro +.. _`danielmotaleite`: https://github.com/danielmotaleite +.. _`daswathn`: https://github.com/daswathn +.. _`defanator`: https://github.com/defanator +.. _`discountbin`: https://github.com/discountbin +.. _`djsly`: https://github.com/djsly +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`dragozov`: https://github.com/dragozov +.. _`drawsmcgraw`: https://github.com/drawsmcgraw +.. _`duk3luk3`: https://github.com/duk3luk3 +.. _`ebauman`: https://github.com/ebauman +.. _`eldadru`: https://github.com/eldadru +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`githubcdr`: https://github.com/githubcdr +.. _`gstachowiak`: https://github.com/gstachowiak +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`hkrist`: https://github.com/hkrist +.. _`huangfupeng`: https://github.com/huangfupeng +.. _`isbm`: https://github.com/isbm +.. _`jbadson`: https://github.com/jbadson +.. _`jeanpralo`: https://github.com/jeanpralo +.. _`jettero`: https://github.com/jettero +.. _`jf`: https://github.com/jf +.. _`jinm`: https://github.com/jinm +.. _`joe-niland`: https://github.com/joe-niland +.. _`kaszuba`: https://github.com/kaszuba +.. _`kevins9`: https://github.com/kevins9 +.. _`lomeroe`: https://github.com/lomeroe +.. _`lorengordon`: https://github.com/lorengordon +.. _`mateiw`: https://github.com/mateiw +.. _`matthayes`: https://github.com/matthayes +.. _`mcalmer`: https://github.com/mcalmer +.. _`mchugh19`: https://github.com/mchugh19 +.. _`meaksh`: https://github.com/meaksh +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`mlalpho`: https://github.com/mlalpho +.. _`narendraingale2`: https://github.com/narendraingale2 +.. _`nmadhok`: https://github.com/nmadhok +.. _`peterhirn`: https://github.com/peterhirn +.. _`podstava`: https://github.com/podstava +.. _`rallytime`: https://github.com/rallytime +.. _`redbaron4`: https://github.com/redbaron4 +.. _`roaldnefs`: https://github.com/roaldnefs +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack/salt#35869`: https://github.com/saltstack/salt/issues/35869 +.. _`saltstack/salt#39935`: https://github.com/saltstack/salt/pull/39935 +.. _`saltstack/salt#40225`: https://github.com/saltstack/salt/pull/40225 +.. _`saltstack/salt#40332`: https://github.com/saltstack/salt/pull/40332 +.. _`sebw`: https://github.com/sebw +.. _`shantanub`: https://github.com/shantanub +.. _`skazi0`: https://github.com/skazi0 +.. _`skizunov`: https://github.com/skizunov +.. _`smarsching`: https://github.com/smarsching +.. _`sofixa`: https://github.com/sofixa +.. _`sp1r`: https://github.com/sp1r +.. _`sthrasher`: https://github.com/sthrasher +.. _`sumeetisp`: https://github.com/sumeetisp +.. _`systemtrap`: https://github.com/systemtrap +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`thor`: https://github.com/thor +.. _`ticosax`: https://github.com/ticosax +.. _`tjuup`: https://github.com/tjuup +.. _`toanctruong`: https://github.com/toanctruong +.. _`twangboy`: https://github.com/twangboy +.. _`vutny`: https://github.com/vutny +.. _`whiteinge`: https://github.com/whiteinge +.. _`yhekma`: https://github.com/yhekma +.. _`zer0def`: https://github.com/zer0def diff --git a/doc/topics/releases/2016.11.5.rst b/doc/topics/releases/2016.11.5.rst index 5909fd090d..41bc9540d2 100644 --- a/doc/topics/releases/2016.11.5.rst +++ b/doc/topics/releases/2016.11.5.rst @@ -4,746 +4,744 @@ Salt 2016.11.5 Release Notes Version 2016.11.5 is a bugfix release for :ref:`2016.11.0 `. -Changes for v2016.11.4..v2016.11.5 ----------------------------------------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Statistics +========== -*Generated at: 2017-05-09T21:00:57Z* +- Total Merges: **82** +- Total Issue References: **23** +- Total PR References: **80** -Statistics: +- Contributors: **32** (`BenoitKnecht`_, `Ch3LL`_, `DmitryKuzmenko`_, `Enquier`_, `SolarisYan`_, `UtahDave`_, `alexproca`_, `benediktwerner`_, `bobrik`_, `brd`_, `cachedout`_, `clinta`_, `corywright`_, `cro`_, `danlsgiga`_, `drawsmcgraw`_, `ezh`_, `gtmanfred`_, `isbm`_, `jf`_, `jleproust`_, `lorengordon`_, `nevins-b`_, `oeuftete`_, `peter-funktionIT`_, `rallytime`_, `rkgrunt`_, `senthilkumar-e`_, `sjorge`_, `skizunov`_, `terminalmage`_, `twangboy`_) -- Total Merges: **83** -- Total Issue references: **31** -- Total PR references: **99** - -Changes: Patched Packages ----------------- -Due to the critical nature of issue `#41230`_ we have decided to patch the 2016.11.5 packages with PR `#41244`_. This issue affects all calls to a salt-minion if there is an ipv6 nameserver set on the minion's host. The patched packages on repo.saltstack.com will divert from the v2016.11.5 tag and pypi packages due to the additional PR applied to the packages. +================ -- **PR** `#41244`_: (*cachedout*) Fix ipv6 nameserver grains - @ *2017-05-15T17:55:39Z* +Due to the critical nature of issue :issue:`41230` we have decided to patch the +2016.11.5 packages with :pull:`41244`. This issue affects all calls to a +salt-minion if there is an ipv6 nameserver set on the minion's host. The +patched packages on repo.saltstack.com will divert from the v2016.11.5 tag and +pypi packages due to the patches applied to the packages. - - **ISSUE** `#41230`_: (*RealKelsar*) 2016.11.5 IPv6 nameserver in resolv.conf leads to minion exception - | refs: `#41244`_ `#41244`_ - - **ISSUE** `#40912`_: (*razed11*) IPV6 Warning when ipv6 set to False - | refs: `#40934`_ - - **PR** `#40934`_: (*gtmanfred*) Only display IPvX warning if role is master - | refs: `#41244`_ `#41244`_ - * 53d5b3e Merge pull request `#41244`_ from cachedout/fix_ipv6_nameserver_grains - * f745db1 Lint - * 6e1ab69 Partial revert of `#40934`_ +Changelog for v2016.11.4..v2016.11.5 +==================================== - * 88f49f9 Revert "Only display IPvX warning if role is master" +*Generated at: 2018-05-27 20:12:47 UTC* -- **PR** `#41173`_: (*twangboy*) Add silent action to MsgBox for Path Actions - @ *2017-05-10T17:22:18Z* +* **PR** `#41134`_: (`twangboy`_) Fix `pkg.install` on Windows on 2016.11 + @ *2017-05-09 15:10:19 UTC* - - **ISSUE** `#41099`_: (*lomeroe*) Windows 2016.11.4 minion installer silent mode issue - | refs: `#41173`_ - * 96918dc Add silent action to MsgBox for Path Actions + * a10f0146a4 Merge pull request `#41134`_ from twangboy/fix_get_msiexec -- **PR** `#41134`_: (*twangboy*) Fix `pkg.install` on Windows on 2016.11 - @ *2017-05-09T15:10:19Z* + * d808a60129 Remove redundant if statement - * a10f014 Merge pull request `#41134`_ from twangboy/fix_get_msiexec - * d808a60 Remove redundant if statement + * b4d6d5a927 Fix for version_num of None and Latest - * b4d6d5a Fix for version_num of None and Latest + * 0f31822a83 Fix problem when use_msiexec is a bool - * 0f31822 Fix problem when use_msiexec is a bool +* **ISSUE** `#41100`_: (`frogunder`_) Exception occurred in runner jobs.list_jobs (refs: `#41102`_) -- **PR** `#41102`_: (*gtmanfred*) don't pass jid to list_jobs - @ *2017-05-08T17:45:40Z* +* **PR** `#41102`_: (`gtmanfred`_) don't pass jid to list_jobs + @ *2017-05-08 17:45:40 UTC* - - **ISSUE** `#41100`_: (*frogunder*) Exception occurred in runner jobs.list_jobs - | refs: `#41102`_ - * 4ecab68 Merge pull request `#41102`_ from gtmanfred/2016.11 - * 83057d0 don't pass jid to list_jobs + * 4ecab68bb9 Merge pull request `#41102`_ from gtmanfred/2016.11 -* ffe4bc3 update unit test to reflect new behavior + * 83057d0f0f don't pass jid to list_jobs + * 505cb45722 Merge branch 'fix-file-blockreplace-diff-in-test-mode' of https://github.com/L4rS6/salt into L4rS6-fix-file-blockreplace-diff-in-test-mode -* 482a5e3 Merge branch 'L4rS6-fix-file-blockreplace-diff-in-test-mode' into 2016.11 + * de9f66b448 show chanages in file.blockreplace function in testing mode. also used same programming style as in file.managed function: (ret['changes']['diff'] = ret['pchanges']['diff']) +* **PR** `#41103`_: (`lorengordon`_) Adds a get_route() function to win_network.py + @ *2017-05-06 06:19:42 UTC* - * 505cb45 Merge branch 'fix-file-blockreplace-diff-in-test-mode' of https://github.com/L4rS6/salt into L4rS6-fix-file-blockreplace-diff-in-test-mode + * 2af89beb53 Merge pull request `#41103`_ from lorengordon/win.get_route - * de9f66b show chanages in file.blockreplace function in testing mode. also used same programming style as in file.managed function: (ret['changes']['diff'] = ret['pchanges']['diff']) + * 93ce5644ea Adds test for win_network.get_route -- **PR** `#41103`_: (*lorengordon*) Adds a get_route() function to win_network.py - @ *2017-05-06T06:19:42Z* + * b9cbbc0290 Adds a get_route() function to win_network.py - * 2af89be Merge pull request `#41103`_ from lorengordon/win.get_route - * 93ce564 Adds test for win_network.get_route +* **PR** `#41098`_: (`rallytime`_) Back-port `#41088`_ to 2016.11 + @ *2017-05-05 19:04:03 UTC* - * b9cbbc0 Adds a get_route() function to win_network.py + * **PR** `#41088`_: (`sjorge`_) Fix docs for zfs state module (refs: `#41098`_) -- **PR** `#41098`_: (*rallytime*) Back-port `#41088`_ to 2016.11 - @ *2017-05-05T19:04:03Z* + * 2f9b5a4074 Merge pull request `#41098`_ from rallytime/bp-41088 - - **PR** `#41088`_: (*sjorge*) Fix docs for zfs state module - | refs: `#41098`_ - * 2f9b5a4 Merge pull request `#41098`_ from rallytime/`bp-41088`_ - * dc6cd2e Fix docs for zfs state module + * dc6cd2ea45 Fix docs for zfs state module -- **PR** `#41097`_: (*rallytime*) Back-port `#41079`_ to 2016.11 - @ *2017-05-05T19:03:43Z* +* **PR** `#41097`_: (`rallytime`_) Back-port `#41079`_ to 2016.11 + @ *2017-05-05 19:03:43 UTC* - - **PR** `#41079`_: (*brd*) Remove an extra colon that is causing rendering issues - | refs: `#41097`_ - * 2123001 Merge pull request `#41097`_ from rallytime/`bp-41079`_ - * 845b49c Remove and extra colon that is causing rendering issues + * **PR** `#41079`_: (`brd`_) Remove an extra colon that is causing rendering issues (refs: `#41097`_) -- **PR** `#41093`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-05-05T17:22:09Z* + * 2123001f32 Merge pull request `#41097`_ from rallytime/bp-41079 - - **PR** `#41083`_: (*rallytime*) Git state: head_ref should be head_rev in "latest" function - * ff6fa2b Merge pull request `#41093`_ from rallytime/merge-2016.11 - * a670eaa Merge branch '2016.3' into '2016.11' + * 845b49c304 Remove and extra colon that is causing rendering issues - * 247400c Merge pull request `#41083`_ from rallytime/git-state-fix +* **PR** `#41093`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-05-05 17:22:09 UTC* - * b85ee48 Git state: head_ref should be head_rev in "latest" function + * ff6fa2b120 Merge pull request `#41093`_ from rallytime/merge-2016.11 -- **PR** `#41084`_: (*rallytime*) Skip the test_salt_documentation_arguments_not_assumed test for Arch - @ *2017-05-04T21:56:29Z* + * a670eaa1db Merge branch '2016.3' into '2016.11' - - **PR** `#41074`_: (*rallytime*) Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch - | refs: `#41084`_ - * 4c2e636 Merge pull request `#41084`_ from rallytime/disable-matcher-test-arch - * da811fe Skip the correct test for the matcher tests in Arch + * 247400c44e Merge pull request `#41083`_ from rallytime/git-state-fix - * b9d1ce9 Revert "Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch" + * b85ee48ff4 Git state: head_ref should be head_rev in "latest" function -- **PR** `#41069`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-05-04T20:34:58Z* +* **PR** `#41084`_: (`rallytime`_) Skip the test_salt_documentation_arguments_not_assumed test for Arch + @ *2017-05-04 21:56:29 UTC* - - **ISSUE** `#40835`_: (*willkil*) non-root: module.mac_system.__virtual__() is wrongly returning `None` - | refs: `#41048`_ - - **PR** `#41070`_: (*rallytime*) Pylint: remove extra line in mac_system module - - **PR** `#41048`_: (*willkil*) mac_system: return False for non-root user - | refs: `#41070`_ - * 1179720 Merge pull request `#41069`_ from rallytime/merge-2016.11 - * 08c5891 Merge branch '2016.3' into '2016.11' + * **PR** `#41074`_: (`rallytime`_) Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch (refs: `#41084`_) - * 6941809 Merge pull request `#41070`_ from rallytime/lint-2016.3 + * 4c2e636cd1 Merge pull request `#41084`_ from rallytime/disable-matcher-test-arch - * 486e2ba Pylint: remove extra line in mac_system module + * da811fe505 Skip the correct test for the matcher tests in Arch - * db70b2d Pylint: remove extra line in mac_system module + * b9d1ce9aed Revert "Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch" - * 855d157 Merge branch '2016.3' into '2016.11' +* **PR** `#41069`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-05-04 20:34:58 UTC* - * 3101694 Merge pull request `#41048`_ from willkil/mac_system_non_root + * 1179720327 Merge pull request `#41069`_ from rallytime/merge-2016.11 - * b65b82a mac_system: return False for non-root user + * 08c58919cb Merge branch '2016.3' into '2016.11' -- **PR** `#41074`_: (*rallytime*) Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch - | refs: `#41084`_ - @ *2017-05-04T19:26:16Z* + * 69418092bd Merge pull request `#41070`_ from rallytime/lint-2016.3 - * 9d638ab Merge pull request `#41074`_ from rallytime/disable-matcher-test-arch - * 9eb482d Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch + * 486e2ba62e Pylint: remove extra line in mac_system module -- **PR** `#41078`_: (*Ch3LL*) Add 2016.11.5 release notes and change log - @ *2017-05-04T19:00:58Z* + * db70b2d42e Pylint: remove extra line in mac_system module - * 72c854d Merge pull request `#41078`_ from Ch3LL/add_2016.11.5_release - * 96ed815 Add 2016.11.5 release notes and change log + * 855d157aa6 Merge branch '2016.3' into '2016.11' -- **PR** `#40879`_: (*peter-funktionIT*) Update win_pki.py - @ *2017-05-04T16:12:00Z* + * 3101694d71 Merge pull request `#41048`_ from willkil/mac_system_non_root - * eac8401 Merge pull request `#40879`_ from peter-funktionIT/2016.11 - * 80fa9e5 Update win_pki.py + * b65b82a750 mac_system: return False for non-root user - * a48b05f Update win_pki.py +* **PR** `#41074`_: (`rallytime`_) Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch (refs: `#41084`_) + @ *2017-05-04 19:26:16 UTC* - * 3a4e6d9 Update win_pki.py + * 9d638abc62 Merge pull request `#41074`_ from rallytime/disable-matcher-test-arch -- **PR** `#41036`_: (*terminalmage*) Do not force effective saltenv when running states via orchestration - @ *2017-05-04T15:44:14Z* + * 9eb482d5c7 Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch - - **ISSUE** `#40928`_: (*sokratisg*) Orchestration runner, highstate and environment question - | refs: `#41036`_ - * 547a973 Merge pull request `#41036`_ from terminalmage/issue40928 - * 72ef34c Do not force effective saltenv when running states via orchestration +* **PR** `#41078`_: (`Ch3LL`_) Add 2016.11.5 release notes and change log + @ *2017-05-04 19:00:58 UTC* -- **PR** `#41039`_: (*terminalmage*) Look for currently-running python's pip first - @ *2017-05-04T15:43:52Z* + * 72c854d9ac Merge pull request `#41078`_ from Ch3LL/add_2016.11.5_release - * 6e2458e Merge pull request `#41039`_ from terminalmage/improve-pip-bin - * effe8b9 Look for currently-running python's pip first + * 96ed815687 Add 2016.11.5 release notes and change log -- **PR** `#41049`_: (*Ch3LL*) fix integration wheel test_gen test - @ *2017-05-04T15:33:59Z* +* **PR** `#40879`_: (`peter-funktionIT`_) Update win_pki.py + @ *2017-05-04 16:12:00 UTC* - * ff39613 Merge pull request `#41049`_ from Ch3LL/fix_wheel_test - * ba22382 fix integration wheel test_gen test + * eac8401e90 Merge pull request `#40879`_ from peter-funktionIT/2016.11 -- **PR** `#41054`_: (*terminalmage*) Update package targets for Arch pkg tests - @ *2017-05-04T14:59:42Z* + * 80fa9e5b76 Update win_pki.py - * 4e4b351 Merge pull request `#41054`_ from terminalmage/salt-jenkins-315 - * ee493ba Update package targets for Arch pkg tests + * a48b05f158 Update win_pki.py -- **PR** `#41046`_: (*twangboy*) Fix pkg.remove - @ *2017-05-04T14:58:57Z* + * 3a4e6d9d91 Update win_pki.py - * 62dff52 Merge pull request `#41046`_ from twangboy/fix_pkg_remove - * 2af38e5 Use target instead of version_num +* **ISSUE** `#40928`_: (`sokratisg`_) Orchestration runner, highstate and environment question (refs: `#41036`_) -- **PR** `#41045`_: (*terminalmage*) Clarify gitfs docs - @ *2017-05-03T22:24:55Z* +* **PR** `#41036`_: (`terminalmage`_) Do not force effective saltenv when running states via orchestration + @ *2017-05-04 15:44:14 UTC* - * 2b47b7b Merge pull request `#41045`_ from terminalmage/clarify-gitfs-docs - * c757eda Clarify gitfs docs + * 547a9738db Merge pull request `#41036`_ from terminalmage/issue40928 -- **PR** `#41032`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-05-03T19:31:58Z* + * 72ef34c420 Do not force effective saltenv when running states via orchestration - - **PR** `#41011`_: (*terminalmage*) Use proposed docker-py reload_config() function - * 819007c Merge pull request `#41032`_ from rallytime/merge-2016.11 - * d26fd0b Merge branch '2016.3' into '2016.11' +* **PR** `#41039`_: (`terminalmage`_) Look for currently-running python's pip first + @ *2017-05-04 15:43:52 UTC* - * b00acb0 Merge pull request `#41011`_ from terminalmage/docker-refresh-credentials + * 6e2458e171 Merge pull request `#41039`_ from terminalmage/improve-pip-bin - * b8d1dcc Use proposed docker-py reload_config() func + * effe8b9432 Look for currently-running python's pip first -- **PR** `#41007`_: (*jleproust*) Recognize LVM2 pv with empty vg as orphan - @ *2017-05-03T18:24:51Z* +* **PR** `#41049`_: (`Ch3LL`_) fix integration wheel test_gen test + @ *2017-05-04 15:33:59 UTC* - - **ISSUE** `#35699`_: (*jleproust*) LVM state fails to add new device, volume group name is empty string - | refs: `#41007`_ - * d7fbd38 Merge pull request `#41007`_ from jleproust/fix_lvm_empty_vg - * 3b9a845 Recognize LVM2 pv with empty vg as orphan + * ff39613a53 Merge pull request `#41049`_ from Ch3LL/fix_wheel_test -- **PR** `#41029`_: (*rallytime*) Back-port `#38565`_ to 2016.11 - @ *2017-05-03T17:05:10Z* + * ba223827b9 fix integration wheel test_gen test - - **PR** `#38565`_: (*drawsmcgraw*) Update management of ip addresses for salt cloud azurearm module - | refs: `#41029`_ - * 4eab962 Merge pull request `#41029`_ from rallytime/`bp-38565`_ - * 2df93ae Update management of ip addresses. - Assign static, private IP addresses. - Ability to not assign a public IP to a VM. +* **PR** `#41054`_: (`terminalmage`_) Update package targets for Arch pkg tests + @ *2017-05-04 14:59:42 UTC* -- **PR** `#41012`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-05-02T22:06:40Z* + * 4e4b3514b4 Merge pull request `#41054`_ from terminalmage/salt-jenkins-315 - - **PR** `#40952`_: (*terminalmage*) Fix documentation for docker login function in pre-nitrogen release branches - - **PR** `#40724`_: (*cro*) Minion key revoke cfg - * 97500f0 Merge pull request `#41012`_ from rallytime/merge-2016.11 - * fc756c5 Merge branch '2016.3' into '2016.11' + * ee493bae47 Update package targets for Arch pkg tests - * 19894f6 Merge pull request `#40724`_ from cro/minion_key_revoke_cfg +* **PR** `#41046`_: (`twangboy`_) Fix pkg.remove + @ *2017-05-04 14:58:57 UTC* - * cbc7019 Change message level when minion requests key revoke and feature is turned off. + * 62dff52820 Merge pull request `#41046`_ from twangboy/fix_pkg_remove - * 65ea899 Add allow_minion_key_revoke config option + * 2af38e5564 Use target instead of version_num - * 8920495 Add config option to prevent minions from revoking their own keys. +* **PR** `#41045`_: (`terminalmage`_) Clarify gitfs docs + @ *2017-05-03 22:24:55 UTC* - * 129859f Merge pull request `#40952`_ from terminalmage/fix-dockerng.login-docs + * 2b47b7bec6 Merge pull request `#41045`_ from terminalmage/clarify-gitfs-docs - * dfbbeb5 Fix documentation for docker login function in pre-nitrogen release branches + * c757eda331 Clarify gitfs docs -- **PR** `#40726`_: (*benediktwerner*) Fixed minion keys remaining pending after auto signing and fixed typo (Resubmitted to 2016.3) - @ *2017-05-02T16:57:34Z* +* **PR** `#41032`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-05-03 19:31:58 UTC* - * e210eae Merge pull request `#40726`_ from benediktwerner/fix-minions-remain-pending-after-autosign-and-typo - * 82c144e Fixed minion keys remaining pending after auto signing and fixed typo + * 819007cd00 Merge pull request `#41032`_ from rallytime/merge-2016.11 -- **PR** `#40960`_: (*danlsgiga*) Fix consul module "AttributeError: 'dict' object has no attribute 'json'" - @ *2017-05-02T16:16:57Z* + * d26fd0bbf4 Merge branch '2016.3' into '2016.11' - * 4f342e2 Merge pull request `#40960`_ from danlsgiga/2016.11 - * 6e4cc6d Fix consul module "AttributeError: 'dict' object has no attribute 'json'" + * b00acb0034 Merge pull request `#41011`_ from terminalmage/docker-refresh-credentials -- **PR** `#40963`_: (*twangboy*) Fix fullname parameter for add function - @ *2017-05-02T16:08:59Z* + * b8d1dcc307 Use proposed docker-py reload_config() func - * c3b329b Merge pull request `#40963`_ from twangboy/fix_win_useradd - * 5371b6b Fix fullname parameter for add function +* **ISSUE** `#35699`_: (`jleproust`_) LVM state fails to add new device, volume group name is empty string (refs: `#41007`_) -- **PR** `#40995`_: (*twangboy*) Remove unused code fragments - @ *2017-05-02T15:31:58Z* +* **PR** `#41007`_: (`jleproust`_) Recognize LVM2 pv with empty vg as orphan + @ *2017-05-03 18:24:51 UTC* - * d79c033 Merge pull request `#40995`_ from twangboy/remove_utils - * 8c01aac Remove unused code fragments + * d7fbd38474 Merge pull request `#41007`_ from jleproust/fix_lvm_empty_vg -- **PR** `#40991`_: (*rallytime*) Back-port `#40982`_ to 2016.11 - @ *2017-05-01T22:31:30Z* + * 3b9a845145 Recognize LVM2 pv with empty vg as orphan - - **ISSUE** `#40981`_: (*ezh*) docker-events engine is broken with modern docker - | refs: `#40982`_ - - **PR** `#40982`_: (*ezh*) Fix docker_events field handling - | refs: `#40991`_ - * c616287 Merge pull request `#40991`_ from rallytime/`bp-40982`_ - * 8fcb720 Fix docker_events field handling +* **PR** `#41029`_: (`rallytime`_) Back-port `#38565`_ to 2016.11 + @ *2017-05-03 17:05:10 UTC* -- **PR** `#40987`_: (*gtmanfred*) get sudo_password correctly - @ *2017-05-01T19:39:55Z* + * **PR** `#38565`_: (`drawsmcgraw`_) Update management of ip addresses for salt cloud azurearm module (refs: `#41029`_) - - **ISSUE** `#40965`_: (*weirdbricks*) salt-cloud sudo failing - | refs: `#40987`_ - * 3fb2492 Merge pull request `#40987`_ from gtmanfred/2016.11 - * 2ed694c get sudo_password correctly + * 4eab962e9e Merge pull request `#41029`_ from rallytime/bp-38565 -- **PR** `#40992`_: (*gtmanfred*) fix bug in status.netdev - @ *2017-05-01T19:38:35Z* + * 2df93ae3ab Update management of ip addresses. - Assign static, private IP addresses. - Ability to not assign a public IP to a VM. - - **ISSUE** `#40988`_: (*santzi*) status.netdev tx_bytes is always zero - | refs: `#40992`_ - * ecbac13 Merge pull request `#40992`_ from gtmanfred/netdev - * a9eed7f fix bug in status.netdev +* **PR** `#41012`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-05-02 22:06:40 UTC* -- **PR** `#40993`_: (*gtmanfred*) smtp state can use profile or sender - @ *2017-05-01T19:35:47Z* + * 97500f078d Merge pull request `#41012`_ from rallytime/merge-2016.11 - - **ISSUE** `#40976`_: (*sjorge*) smtp.send_msg state oddities - | refs: `#40993`_ - * d852320 Merge pull request `#40993`_ from gtmanfred/smtp - * 068ebfd smtp state can use profile or sender + * fc756c595c Merge branch '2016.3' into '2016.11' -- **PR** `#40958`_: (*rallytime*) Back-port `#40939`_ to 2016.11 - @ *2017-04-28T18:01:17Z* + * 19894f68ca Merge pull request `#40724`_ from cro/minion_key_revoke_cfg - - **PR** `#40939`_: (*Ch3LL*) Allow vmware to query deploy arg from opts - | refs: `#40958`_ - * fc26fb8 Merge pull request `#40958`_ from rallytime/`bp-40939`_ - * 3e93948 allow vmware to query deploy arg from opts + * cbc70195c0 Change message level when minion requests key revoke and feature is turned off. -- **PR** `#40957`_: (*rallytime*) Back-port `#38115`_ to 2016.11 - @ *2017-04-28T18:01:02Z* + * 65ea8997b7 Add allow_minion_key_revoke config option - - **ISSUE** `#34640`_: (*nevins-b*) utils.shlex_split removing quotes which are required for augeas - | refs: `#34643`_ - - **PR** `#38115`_: (*cro*) Revert "fix augeas module so shlex doesn't strip quotes" - | refs: `#40957`_ - - **PR** `#34643`_: (*nevins-b*) fix augeas module so shlex doesn't strip quotes - | refs: `#38115`_ - * a586e12 Merge pull request `#40957`_ from rallytime/`bp-38115`_ - * eb88917 Revert "fix augeas module so shlex doesn't strip quotes" + * 8920495943 Add config option to prevent minions from revoking their own keys. -- **PR** `#40905`_: (*rkgrunt*) Fixed issue with parsing of master minion returns when batching is en… - @ *2017-04-28T17:52:32Z* + * 129859f79b Merge pull request `#40952`_ from terminalmage/fix-dockerng.login-docs - - **ISSUE** `#40635`_: (*promorphus*) Orchestrate + Batches returns false failed information - | refs: `#40905`_ `#40905`_ - * 00a15eb Merge pull request `#40905`_ from rkgrunt/40635 - * 4f9c92a Fixed issue with parsing of master minion returns when batching is enabled. + * dfbbeb5946 Fix documentation for docker login function in pre-nitrogen release branches -- **PR** `#40954`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-04-28T16:41:49Z* +* **PR** `#40726`_: (`benediktwerner`_) Fixed minion keys remaining pending after auto signing and fixed typo (Resubmitted to 2016.3) + @ *2017-05-02 16:57:34 UTC* - - **ISSUE** `#36644`_: (*b1naryth1ef*) env_vars not properly validated/casted to strings w/ virtualenv.manage/pip.install - | refs: `#36706`_ - - **PR** `#40930`_: (*rallytime*) Back-port `#40811`_ to 2016.3 - - **PR** `#40927`_: (*terminalmage*) Add documentation for PyYAML's loading of time expressions - - **PR** `#40891`_: (*terminalmage*) Fix two issues with pip.install - - **PR** `#40811`_: (*UtahDave*) get config_dir based off conf_file if __opts__['config_dir'] doesn't exist - | refs: `#40930`_ - - **PR** `#36706`_: (*siccrusher*) Add basic sanity checks for env_vars in pip.install function - | refs: `#40891`_ `#40891`_ - * bb50d4f Merge pull request `#40954`_ from rallytime/merge-2016.11 - * 7f31e41 Merge branch '2016.3' into '2016.11' + * e210eaead4 Merge pull request `#40726`_ from benediktwerner/fix-minions-remain-pending-after-autosign-and-typo - * 55a3995 Merge pull request `#40930`_ from rallytime/`bp-40811`_ + * 82c144e960 Fixed minion keys remaining pending after auto signing and fixed typo - * 3ccb553 get config_dir based off conf_file +* **PR** `#40960`_: (`danlsgiga`_) Fix consul module "AttributeError: 'dict' object has no attribute 'json'" + @ *2017-05-02 16:16:57 UTC* - * 7bc01be Merge pull request `#40927`_ from terminalmage/docs + * 4f342e2fe5 Merge pull request `#40960`_ from danlsgiga/2016.11 - * 8c078f1 Add additional note about quoting within load_yaml + * 6e4cc6db47 Fix consul module "AttributeError: 'dict' object has no attribute 'json'" - * 123b5cd Add documentation for PyYAML's loading of time expressions +* **PR** `#40963`_: (`twangboy`_) Fix fullname parameter for add function + @ *2017-05-02 16:08:59 UTC* - * 7eab9c6 Merge pull request `#40891`_ from terminalmage/pip-installed + * c3b329b398 Merge pull request `#40963`_ from twangboy/fix_win_useradd - * 75e6bc0 Fix two issues with pip.install + * 5371b6b85e Fix fullname parameter for add function -- **PR** `#40751`_: (*rallytime*) Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump - @ *2017-04-28T12:56:06Z* +* **PR** `#40995`_: (`twangboy`_) Remove unused code fragments + @ *2017-05-02 15:31:58 UTC* - - **ISSUE** `#39531`_: (*ypid*) Use yaml.safe_* instaed of yaml.load / yaml.dump / … - | refs: `#40751`_ - * 909d519 Merge pull request `#40751`_ from rallytime/`fix-39531`_ - * 85dc416 Don't change the salt.utils.jinja yaml Dumper class + * d79c033239 Merge pull request `#40995`_ from twangboy/remove_utils - * 4fe6ac9 Add extra line for lint + * 8c01aacd9b Remove unused code fragments - * 55cfa12 Use salt.utils.yamldumper with SafeOderedDumper as the Dumper in yaml.dump +* **ISSUE** `#40981`_: (`ezh`_) docker-events engine is broken with modern docker (refs: `#40982`_) - * 62c4d37 Use salt.utils.yamlloader with SaltYamlSafeLoader as the Loader with yaml.load +* **PR** `#40991`_: (`rallytime`_) Back-port `#40982`_ to 2016.11 + @ *2017-05-01 22:31:30 UTC* -- **PR** `#40861`_: (*DmitryKuzmenko*) Don't run status.master while minion is failing-over. - @ *2017-04-28T12:14:56Z* + * **PR** `#40982`_: (`ezh`_) Fix docker_events field handling (refs: `#40991`_) - - **ISSUE** `#37307`_: (*szjur*) Minions run every job twice and open 2 connections to the same syndic - apparently after reconnection between masters - | refs: `#40861`_ - * 18fdd8c Merge pull request `#40861`_ from DSRCorporation/bugs/37307_minion_run_jobs_twice - * f0d46d0 Don't run status.master while minion is failing-over. + * c6162876d6 Merge pull request `#40991`_ from rallytime/bp-40982 -- **PR** `#40923`_: (*terminalmage*) aptpkg: fix temp pkg unhold when version is specified - @ *2017-04-28T11:59:54Z* + * 8fcb7205db Fix docker_events field handling - * 62cb7b1 Merge pull request `#40923`_ from terminalmage/aptpkg-install-fix-unhold - * 6dda4f2 aptpkg: fix temp pkg unhold when version is specified +* **ISSUE** `#40965`_: (`weirdbricks`_) salt-cloud sudo failing (refs: `#40987`_) -- **PR** `#40933`_: (*gtmanfred*) allow master_port to be a string - @ *2017-04-28T11:54:58Z* +* **PR** `#40987`_: (`gtmanfred`_) get sudo_password correctly + @ *2017-05-01 19:39:55 UTC* - - **ISSUE** `#40908`_: (*nicksloan*) If master_port is a string the minion cannot connect and prints an unhelpful error message - | refs: `#40933`_ - - **ISSUE** `#39118`_: (*bobrik*) Minion ipv6 option is not documented - | refs: `#39289`_ - - **PR** `#39289`_: (*bobrik*) Autodetect IPv6 connectivity from minion to master - | refs: `#40933`_ - * 9d92ba7 Merge pull request `#40933`_ from gtmanfred/2016.11 - * 194423c allow master_port to be a string + * 3fb24929c6 Merge pull request `#40987`_ from gtmanfred/2016.11 -- **PR** `#40934`_: (*gtmanfred*) Only display IPvX warning if role is master - @ *2017-04-28T11:53:50Z* + * 2ed694cac6 get sudo_password correctly - - **ISSUE** `#40912`_: (*razed11*) IPV6 Warning when ipv6 set to False - | refs: `#40934`_ - * d5e0b8b Merge pull request `#40934`_ from gtmanfred/ipv6 - * 7855cd6 Only display IPvX warning if role is master +* **ISSUE** `#40988`_: (`santzi`_) status.netdev tx_bytes is always zero (refs: `#40992`_) -- **PR** `#40935`_: (*gtmanfred*) Attempt to connect to public ip address in softlayer - @ *2017-04-28T11:43:57Z* +* **PR** `#40992`_: (`gtmanfred`_) fix bug in status.netdev + @ *2017-05-01 19:38:35 UTC* - - **ISSUE** `#40881`_: (*stamak*) 2016.11 SoftLayer salt-cloud driver connects on private IP instead of public IP - | refs: `#40935`_ - * 8fdfe4e Merge pull request `#40935`_ from gtmanfred/softlayer - * d6eb114 Attempt to connect to public ip address in softlayer + * ecbac138d1 Merge pull request `#40992`_ from gtmanfred/netdev -- **PR** `#40936`_: (*terminalmage*) Add dockerng fixes to 2016.11.4 release notes - @ *2017-04-27T19:54:16Z* + * a9eed7f1c9 fix bug in status.netdev - * 7404309 Merge pull request `#40936`_ from terminalmage/release_notes - * e494ae4 Add dockerng fixes to 2016.11.4 release notes +* **ISSUE** `#40976`_: (`sjorge`_) smtp.send_msg state oddities (refs: `#40993`_) -- **PR** `#40929`_: (*rallytime*) Back-port `#37696`_ to 2016.11 - @ *2017-04-27T17:43:26Z* +* **PR** `#40993`_: (`gtmanfred`_) smtp state can use profile or sender + @ *2017-05-01 19:35:47 UTC* - - **ISSUE** `#33093`_: (*gtmanfred*) [salt-cloud][nova] race condition when assigning floating ips to cloud servers - | refs: `#37696`_ - - **PR** `#37696`_: (*SolarisYan*) if vm state is not ACTIVE, it will fail - | refs: `#40929`_ - * a622518 Merge pull request `#40929`_ from rallytime/`bp-37696`_ - * 1a28722 Pylint fix + * d852320d34 Merge pull request `#40993`_ from gtmanfred/smtp - * 8e0a986 if vm state is not ACTIVE, associate floating ip to it will fail.So we should wait for state of vm is ACTIVE,then associate the assigned floating ip to it + * 068ebfd9ec smtp state can use profile or sender -- **PR** `#40921`_: (*corywright*) Make salt.auth.rest heading consistent with all other salt.auth documentation - @ *2017-04-27T17:36:47Z* +* **PR** `#40958`_: (`rallytime`_) Back-port `#40939`_ to 2016.11 + @ *2017-04-28 18:01:17 UTC* - * f88ce8e Merge pull request `#40921`_ from corywright/consistent-salt-auth-headings - * 2995a05 Make salt.auth.rest heading consistent with all other salt.auth documentation + * **PR** `#40939`_: (`Ch3LL`_) Allow vmware to query deploy arg from opts (refs: `#40958`_) -- **PR** `#40752`_: (*Enquier*) Add ability to specify a custom SSL certificate or disable SSL verification in KeystoneAuth v3 - @ *2017-04-27T17:29:09Z* + * fc26fb8a05 Merge pull request `#40958`_ from rallytime/bp-40939 - - **ISSUE** `#37824`_: (*dxiri*) SSLError Trying to use v3 API of Openstack Newton as provider. - | refs: `#40752`_ - - **ISSUE** `#5`_: (*thatch45*) cmd module - * 26be306 Merge pull request `#40752`_ from Enquier/nova_ssl_2 - * 817f492 fixing lint errors in keystone auth error + * 3e9394862f allow vmware to query deploy arg from opts - * f683636 fix trailing whitespace +* **ISSUE** `saltstack/salt#34640`_: (`nevins-b`_) utils.shlex_split removing quotes which are required for augeas (refs: #`saltstack/salt#34643`_) - * 4a70b8c fixing minor error in security_groups security groups parser had incorrect split action which caused errors + * **PR** `saltstack/salt#34643`_: (`nevins-b`_) fix augeas module so shlex doesn't strip quotes (refs: `#38115`_) - * c9d6f8e adding note in documentation +* **PR** `#40957`_: (`rallytime`_) Back-port `#38115`_ to 2016.11 + @ *2017-04-28 18:01:02 UTC* - * c24dfe3 adding support for cacert verification + * **PR** `#38115`_: (`cro`_) Revert "fix augeas module so shlex doesn't strip quotes" (refs: `#40957`_) - * bfaf5e3 Merge pull request `#5`_ from saltstack/2016.11 + * a586e12180 Merge pull request `#40957`_ from rallytime/bp-38115 -- **PR** `#40894`_: (*senthilkumar-e*) Fix for broken /jobs/ in 2016.11.4 - @ *2017-04-27T11:33:00Z* + * eb889173b0 Revert "fix augeas module so shlex doesn't strip quotes" - - **ISSUE** `#40845`_: (*e-senthilkumar*) /jobs call is broken in 2016.11.4 - | refs: `#40894`_ - * 0f2ec1e Merge pull request `#40894`_ from senthilkumar-e/broken_jobs_api_fix - * 2f55b26 Fixing the pylint issue +* **ISSUE** `#40635`_: (`promorphus`_) Orchestrate + Batches returns false failed information (refs: `#40905`_) - * fb607ba Fix for broken /jobs/ in 2016.11.4 +* **PR** `#40905`_: (`rkgrunt`_) Fixed issue with parsing of master minion returns when batching is en… + @ *2017-04-28 17:52:32 UTC* -- **PR** `#40876`_: (*BenoitKnecht*) states: sqlite3: fix table_present with multi-line schema - @ *2017-04-26T15:21:19Z* + * 00a15eba60 Merge pull request `#40905`_ from rkgrunt/40635 - * ea55c15 Merge pull request `#40876`_ from BenoitKnecht/fix-sqlite3-table-present-with-multiline-schema - * 2ca627d states: sqlite3: fix table_present with multi-line schema + * 4f9c92a012 Fixed issue with parsing of master minion returns when batching is enabled. -- **PR** `#40742`_: (*clinta*) Fix `#40741`_ - @ *2017-04-25T22:52:06Z* +* **PR** `#40954`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-04-28 16:41:49 UTC* - - **ISSUE** `#40741`_: (*clinta*) Regression in 2016.11.3. File.managed downloads every time. - | refs: `#40742`_ - * e09bafd Merge pull request `#40742`_ from clinta/40741 - * 72bf5af Set sfn if cached_sum == source_sum + * bb50d4f646 Merge pull request `#40954`_ from rallytime/merge-2016.11 -- **PR** `#40859`_: (*skizunov*) Fix TCP Transport to work with Tornado 4.5 - @ *2017-04-25T04:29:00Z* + * 7f31e41aa6 Merge branch '2016.3' into '2016.11' - * 5249496 Merge pull request `#40859`_ from skizunov/develop2 - * 958ecda Fix TCP Transport to work with Tornado 4.5 + * 55a399583e Merge pull request `#40930`_ from rallytime/bp-40811 -- **PR** `#40862`_: (*gtmanfred*) status should be an int - @ *2017-04-24T23:11:31Z* + * 3ccb553f9f get config_dir based off conf_file - * ca80f28 Merge pull request `#40862`_ from gtmanfred/2016.11 - * 87ec1da status should be an int + * 7bc01be859 Merge pull request `#40927`_ from terminalmage/docs -- **PR** `#40865`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-04-24T23:06:28Z* + * 8c078f144c Add additional note about quoting within load_yaml - - **PR** `#40854`_: (*Ch3LL*) [2016.3] Bump latest release version to 2016.11.4 - - **PR** `#40822`_: (*lordcirth*) rsync.py: Don't return changes when clean - * c953419 Merge pull request `#40865`_ from rallytime/merge-2016.11 - * 53ad315 Merge branch '2016.3' into '2016.11' + * 123b5cdc11 Add documentation for PyYAML's loading of time expressions - * 2a71dc3 Merge pull request `#40854`_ from Ch3LL/11.4_release_2016.3 + * 7eab9c6cf4 Merge pull request `#40891`_ from terminalmage/pip-installed - * 889540a [2016.3] Bump latest release version to 2016.11.4 + * 75e6bc0aa3 Fix two issues with pip.install - * b5f67f0 Merge pull request `#40822`_ from lordcirth/fix-rsync-changes +* **ISSUE** `#39531`_: (`ypid`_) Use yaml.safe_* instaed of yaml.load / yaml.dump / … (refs: `#40751`_) - * 1b304bb Extra space before inline comment +* **PR** `#40751`_: (`rallytime`_) Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump + @ *2017-04-28 12:56:06 UTC* - * ea4592d rsync.py: Don't return changes when clean + * 909d519ddb Merge pull request `#40751`_ from rallytime/fix-39531 -- **PR** `#40855`_: (*Ch3LL*) [2016.11] Bump latest release version to 2016.11.4 - @ *2017-04-24T17:37:47Z* + * 85dc4164f5 Don't change the salt.utils.jinja yaml Dumper class - * 7861f12 Merge pull request `#40855`_ from Ch3LL/11.4_release_2016.11 - * e7b6043 [2016.11] Bump latest release version to 2016.11.4 + * 4fe6ac93c6 Add extra line for lint -- **PR** `#40817`_: (*isbm*) Some UT for cloud - @ *2017-04-23T10:01:40Z* + * 55cfa12975 Use salt.utils.yamldumper with SafeOderedDumper as the Dumper in yaml.dump - * 25b62ae Merge pull request `#40817`_ from isbm/isbm-skip-false-values-from-preferred-ip-201611 - * 7c5714b Describe debug information + * 62c4d37c2f Use salt.utils.yamlloader with SaltYamlSafeLoader as the Loader with yaml.load - * e0210ff Reformat idents, fix typos +* **ISSUE** `#37307`_: (`szjur`_) Minions run every job twice and open 2 connections to the same syndic - apparently after reconnection between masters (refs: `#40861`_) - * fb777e3 PEP8: fix unused variable +* **PR** `#40861`_: (`DmitryKuzmenko`_) Don't run status.master while minion is failing-over. + @ *2017-04-28 12:14:56 UTC* - * b2e85de Fix lint, typos and readability + * 18fdd8cc34 Merge pull request `#40861`_ from DSRCorporation/bugs/37307_minion_run_jobs_twice - * 116c96a Fix UT parameter changes + * f0d46d04af Don't run status.master while minion is failing-over. - * 61558f0 Lintfix E0602 +* **PR** `#40923`_: (`terminalmage`_) aptpkg: fix temp pkg unhold when version is specified + @ *2017-04-28 11:59:54 UTC* - * ed84420 Add unit test for node ip filtering + * 62cb7b1ae6 Merge pull request `#40923`_ from terminalmage/aptpkg-install-fix-unhold - * 82582cf Skip test, if libcloud is not around + * 6dda4f2bc3 aptpkg: fix temp pkg unhold when version is specified - * f005d53 Fix name error exception +* **ISSUE** `#40908`_: (`nicksloan`_) If master_port is a string the minion cannot connect and prints an unhelpful error message (refs: `#40933`_) - * b668e60 Move out nested function for testing purposes +* **ISSUE** `#39118`_: (`bobrik`_) Minion ipv6 option is not documented (refs: `#39289`_) - * 5e574a2 Add unit test for nova connector +* **PR** `#40933`_: (`gtmanfred`_) allow master_port to be a string + @ *2017-04-28 11:54:58 UTC* - * 181d078 Lintfix + * **PR** `#39289`_: (`bobrik`_) Autodetect IPv6 connectivity from minion to master (refs: `#40933`_) - * 8e9ce1a Move out nested function to be unit-testable + * 9d92ba7878 Merge pull request `#40933`_ from gtmanfred/2016.11 - * cd43805 Add initial unit test for openstack cloud module + * 194423c08e allow master_port to be a string - * 177f314 Add fake preferred IP function for testing +* **ISSUE** `#40912`_: (`razed11`_) IPV6 Warning when ipv6 set to False (refs: `#40934`_) - * d1aeb13 Move out openstack's nested function to be testable +* **PR** `#40934`_: (`gtmanfred`_) Only display IPvX warning if role is master + @ *2017-04-28 11:53:50 UTC* -- **PR** `#40824`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-04-21T20:03:10Z* + * d5e0b8b655 Merge pull request `#40934`_ from gtmanfred/ipv6 - - **ISSUE** `#38914`_: (*hgfischer*) Uppercase checksums are not accepted by archive.extracted - | refs: `#40754`_ - - **PR** `#40754`_: (*lordcirth*) file.manage_file: uppercase checksums now work - * 50ddf21 Merge pull request `#40824`_ from rallytime/merge-2016.11 - * f31f951 Merge branch '2016.3' into '2016.11' + * 7855cd6ce6 Only display IPvX warning if role is master - * 3b9ebeb Merge pull request `#40754`_ from lordcirth/fix-uppercase-checksums +* **ISSUE** `#40881`_: (`stamak`_) 2016.11 SoftLayer salt-cloud driver connects on private IP instead of public IP (refs: `#40935`_) - * c80c792 remove too many newlines for lint +* **PR** `#40935`_: (`gtmanfred`_) Attempt to connect to public ip address in softlayer + @ *2017-04-28 11:43:57 UTC* - * a7d8f37 file.manage_file: uppercase checksums now work + * 8fdfe4ece6 Merge pull request `#40935`_ from gtmanfred/softlayer -- **PR** `#40811`_: (*UtahDave*) get config_dir based off conf_file if __opts__['config_dir'] doesn't exist - | refs: `#40930`_ - @ *2017-04-21T17:44:42Z* + * d6eb11410f Attempt to connect to public ip address in softlayer - * d6e26d1 Merge pull request `#40811`_ from UtahDave/2016.11local - * 9f6e2e9 get config_dir based off conf_file +* **PR** `#40936`_: (`terminalmage`_) Add dockerng fixes to 2016.11.4 release notes + @ *2017-04-27 19:54:16 UTC* -- **PR** `#40820`_: (*gtmanfred*) remove deprecated firstgen rackspace cloud driver - @ *2017-04-21T17:42:19Z* + * 7404309bec Merge pull request `#40936`_ from terminalmage/release_notes - * ddedf05 Merge pull request `#40820`_ from gtmanfred/2016.11 - * b60a8d0 remove rackspace from index + * e494ae43e5 Add dockerng fixes to 2016.11.4 release notes - * 559aa1d remove deprecated firstgen rackspace cloud driver +* **ISSUE** `#33093`_: (`gtmanfred`_) [salt-cloud][nova] race condition when assigning floating ips to cloud servers (refs: `#37696`_) -- **PR** `#40797`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-04-20T19:42:04Z* +* **PR** `#40929`_: (`rallytime`_) Back-port `#37696`_ to 2016.11 + @ *2017-04-27 17:43:26 UTC* - - **ISSUE** `#40790`_: (*a-powell*) s3.query util buffering objects to memory - | refs: `#40791`_ - - **PR** `#40791`_: (*a-powell*) S3 util get memory fix - * 2ab4248 Merge pull request `#40797`_ from rallytime/merge-2016.11 - * 22500a7 Merge branch '2016.3' into '2016.11' + * **PR** `#37696`_: (`SolarisYan`_) if vm state is not ACTIVE, it will fail (refs: `#40929`_) - * 623e2eb Merge pull request `#40791`_ from a-powell/s3-util-get-memory-fix + * a622518ad2 Merge pull request `#40929`_ from rallytime/bp-37696 - * 36f6521 Merge remote-tracking branch 'upstream/2016.3' into s3-util-get-memory-fix + * 1a28722c5a Pylint fix - * 04637cd Fixing objects being loaded into memory when performing a GET request with a local file specified. + * 8e0a9864c5 if vm state is not ACTIVE, associate floating ip to it will fail.So we should wait for state of vm is ACTIVE,then associate the assigned floating ip to it -- **PR** `#40800`_: (*rallytime*) Back-port `#40720`_ to 2016.11 - @ *2017-04-20T19:41:41Z* +* **PR** `#40921`_: (`corywright`_) Make salt.auth.rest heading consistent with all other salt.auth documentation + @ *2017-04-27 17:36:47 UTC* - - **PR** `#40720`_: (*oeuftete*) Call tornado.httputil.url_concat compatibly - | refs: `#40800`_ - * ced839f Merge pull request `#40800`_ from rallytime/`bp-40720`_ - * 6c0124a Call tornado.httputil.url_concat compatibly + * f88ce8e4de Merge pull request `#40921`_ from corywright/consistent-salt-auth-headings -- **PR** `#40785`_: (*alexproca*) win_pkg: backport 2016.11 add msiexec override to enable selection of 32 or 64 msiexec.exe - @ *2017-04-20T16:45:14Z* + * 2995a05c2b Make salt.auth.rest heading consistent with all other salt.auth documentation - - **ISSUE** `#19137`_: (*jeffclay*) MSI installer(s) for windows minion - | refs: `#40716`_ - - **PR** `#40716`_: (*alexproca*) win_pkg: add msiexec override to enable selection of 32 or 64 msiexec.exe - | refs: `#40785`_ - * 5388ffa Merge pull request `#40785`_ from alexproca/backport-winexec-selection - * 91cafd5 Add option to select 32 or 64 version of msiexec +* **ISSUE** `#37824`_: (`dxiri`_) SSLError Trying to use v3 API of Openstack Newton as provider. (refs: `#40752`_) -- **PR** `#40796`_: (*terminalmage*) Fix inaccurate nodegroup docs - @ *2017-04-20T16:08:22Z* +* **PR** `#40752`_: (`Enquier`_) Add ability to specify a custom SSL certificate or disable SSL verification in KeystoneAuth v3 + @ *2017-04-27 17:29:09 UTC* - * f0f135c Merge pull request `#40796`_ from terminalmage/fix-nodegroup-docs - * f99259a Fix inaccurate nodegroup docs + * 26be306b5c Merge pull request `#40752`_ from Enquier/nova_ssl_2 -- **PR** `#40769`_: (*rallytime*) Back-port `#40760`_ to 2016.11 - @ *2017-04-19T20:23:22Z* + * 817f49296e fixing lint errors in keystone auth error - - **ISSUE** `#40737`_: (*jf*) Fix consul_pillar documentation: 'root=' canNOT start with a slash - | refs: `#40760`_ - - **PR** `#40760`_: (*jf*) Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'! - | refs: `#40769`_ - * d8f7855 Merge pull request `#40769`_ from rallytime/`bp-40760`_ - * 71ac15f Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'! + * f683636c61 fix trailing whitespace -- **PR** `#40756`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-04-19T17:47:51Z* + * 4a70b8c0cc fixing minor error in security_groups security groups parser had incorrect split action which caused errors - - **ISSUE** `#40712`_: (*idokaplan*) user.update - account_disabled - | refs: `#40721`_ - - **PR** `#40721`_: (*gtmanfred*) unset the bitwise instead of toggle - * 61f8de4 Merge pull request `#40756`_ from rallytime/merge-2016.11 - * 0e08732 Merge branch '2016.3' into '2016.11' + * c9d6f8e5ed adding note in documentation - * f4f3ee6 Merge pull request `#40721`_ from gtmanfred/2016.3 + * c24dfe3fba adding support for cacert verification - * 58b8885 unset the bitwise instead of toggle + * bfaf5e322d Merge pull request `#5`_ from saltstack/2016.11 -- **PR** `#40735`_: (*rallytime*) Handle stacktraces in cloud.action function in module and runner - @ *2017-04-18T20:05:06Z* +* **ISSUE** `#40845`_: (`e-senthilkumar`_) /jobs call is broken in 2016.11.4 (refs: `#40894`_) - - **ISSUE** `#29602`_: (*multani*) cloud.action start raises "got an unexpected keyword argument 'kwargs'" - | refs: `#40735`_ - * 3557b51 Merge pull request `#40735`_ from rallytime/handle-cloud-traces - * 87154a9 Use `log.error` instead of `log.err` +* **PR** `#40894`_: (`senthilkumar-e`_) Fix for broken /jobs/ in 2016.11.4 + @ *2017-04-27 11:33:00 UTC* - * b35bf91 Handle stacktraces in cloud.action function in module and runner + * 0f2ec1e1db Merge pull request `#40894`_ from senthilkumar-e/broken_jobs_api_fix -- **PR** `#40745`_: (*cro*) Backport `Add support for specifying a datastore for new disks.` PR `#36457`_ - @ *2017-04-18T20:00:51Z* + * 2f55b26e08 Fixing the pylint issue - * e700d81 Merge pull request `#40745`_ from cro/vmware_disk_datastore_bp - * 1460f82 Remove leftover conflict markers (oops! :-/ ) + * fb607bab75 Fix for broken /jobs/ in 2016.11.4 - * b26be65 Remove leftover conflict markers (oops! :-/ ) +* **PR** `#40876`_: (`BenoitKnecht`_) states: sqlite3: fix table_present with multi-line schema + @ *2017-04-26 15:21:19 UTC* - * 096f063 Remove leftover conflict markers (oops! :-/ ) + * ea55c15367 Merge pull request `#40876`_ from BenoitKnecht/fix-sqlite3-table-present-with-multiline-schema - * d24078d Add docs for "datastore" param for disks + * 2ca627d02d states: sqlite3: fix table_present with multi-line schema - * 500d6b2 Document validity of a datastore key inside a disk definition. +* **ISSUE** `#40741`_: (`clinta`_) Regression in 2016.11.3. File.managed downloads every time. (refs: `#40742`_) - * 7608b10 Add support for specifying a datastore for new disks. +* **PR** `#40742`_: (`clinta`_) Fix `#40741`_ + @ *2017-04-25 22:52:06 UTC* -- **PR** `#40740`_: (*cro*) Backport pr `#39802`_ to add random_startup_delay - @ *2017-04-18T19:47:55Z* + * e09bafdceb Merge pull request `#40742`_ from clinta/40741 - - **PR** `#39802`_: (*cachedout*) A random startup delay option for minions - | refs: `#40740`_ - * 78dbab0 Merge pull request `#40740`_ from cro/minion_delay_start - * 2ab95b7 Set minion test to use default opts + * 72bf5af9e6 Set sfn if cached_sum == source_sum - * 785e606 Add requested docs +* **PR** `#40859`_: (`skizunov`_) Fix TCP Transport to work with Tornado 4.5 + @ *2017-04-25 04:29:00 UTC* - * 8ab321f A random startup delay option for minions + * 5249496f74 Merge pull request `#40859`_ from skizunov/develop2 -- **PR** `#40728`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-04-17T21:13:15Z* + * 958ecdace8 Fix TCP Transport to work with Tornado 4.5 - - **ISSUE** `#37787`_: (*elyulka*) user.present state fails to change loginclass on FreeBSD - | refs: `#40714`_ - - **PR** `#40719`_: (*rallytime*) Back-port `#40714`_ to 2016.3 - - **PR** `#40718`_: (*terminalmage*) Fix copypasta in the pw_user docstring - - **PR** `#40714`_: (*woodsb02*) Make salt.modules.pw_user.get_loginclass return string rather than dict - | refs: `#40719`_ - * a48ecc4 Merge pull request `#40728`_ from rallytime/merge-2016.11 - * 0a5e05a Merge branch '2016.3' into '2016.11' +* **PR** `#40862`_: (`gtmanfred`_) status should be an int + @ *2017-04-24 23:11:31 UTC* - * bf8bb0f Merge pull request `#40719`_ from rallytime/`bp-40714`_ + * ca80f287af Merge pull request `#40862`_ from gtmanfred/2016.11 - * d6c4362 Make salt.modules.pw_user.get_loginclass return string rather than dict + * 87ec1da771 status should be an int - * 4145d33 Merge pull request `#40718`_ from terminalmage/fix-docstring +* **PR** `#40865`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-04-24 23:06:28 UTC* - * 14e8b85 Fix copypasta in the pw_user docstring + * c95341959d Merge pull request `#40865`_ from rallytime/merge-2016.11 -- **PR** `#40707`_: (*gtmanfred*) Use markers when s3 bucket list is truncated - @ *2017-04-17T16:45:21Z* + * 53ad3159cc Merge branch '2016.3' into '2016.11' - - **ISSUE** `#36967`_: (*gmykhailiuta*) S3fs objects list gets truncated - | refs: `#40707`_ - * c5cbfc2 Merge pull request `#40707`_ from gtmanfred/2016.11 - * 1932f72 Use markers when s3 bucket list is truncated + * 2a71dc3552 Merge pull request `#40854`_ from Ch3LL/11.4_release_2016.3 + * 889540a313 [2016.3] Bump latest release version to 2016.11.4 + + * b5f67f0750 Merge pull request `#40822`_ from lordcirth/fix-rsync-changes + + * 1b304bb476 Extra space before inline comment + + * ea4592de91 rsync.py: Don't return changes when clean + +* **PR** `#40855`_: (`Ch3LL`_) [2016.11] Bump latest release version to 2016.11.4 + @ *2017-04-24 17:37:47 UTC* + + * 7861f12df8 Merge pull request `#40855`_ from Ch3LL/11.4_release_2016.11 + + * e7b604339d [2016.11] Bump latest release version to 2016.11.4 + +* **PR** `#40817`_: (`isbm`_) Some UT for cloud + @ *2017-04-23 10:01:40 UTC* + + * 25b62aee47 Merge pull request `#40817`_ from isbm/isbm-skip-false-values-from-preferred-ip-201611 + + * 7c5714b90b Describe debug information + + * e0210ff8cb Reformat idents, fix typos + + * fb777e3f3e PEP8: fix unused variable + + * b2e85de85d Fix lint, typos and readability + + * 116c96a4b7 Fix UT parameter changes + + * 61558f08e7 Lintfix E0602 + + * ed84420df0 Add unit test for node ip filtering + + * 82582cff77 Skip test, if libcloud is not around + + * f005d53c56 Fix name error exception + + * b668e60b4c Move out nested function for testing purposes + + * 5e574a24d9 Add unit test for nova connector + + * 181d0780d0 Lintfix + + * 8e9ce1a68d Move out nested function to be unit-testable + + * cd43805770 Add initial unit test for openstack cloud module + + * 177f31446d Add fake preferred IP function for testing + + * d1aeb13ac7 Move out openstack's nested function to be testable + +* **PR** `#40824`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-04-21 20:03:10 UTC* + + * 50ddf219a6 Merge pull request `#40824`_ from rallytime/merge-2016.11 + + * f31f9512b8 Merge branch '2016.3' into '2016.11' + + * 3b9ebeb98f Merge pull request `#40754`_ from lordcirth/fix-uppercase-checksums + + * c80c792704 remove too many newlines for lint + + * a7d8f375e8 file.manage_file: uppercase checksums now work + +* **PR** `#40811`_: (`UtahDave`_) get config_dir based off conf_file if __opts__['config_dir'] doesn't exist (refs: `#40930`_) + @ *2017-04-21 17:44:42 UTC* + + * d6e26d18cb Merge pull request `#40811`_ from UtahDave/2016.11local + + * 9f6e2e9c92 get config_dir based off conf_file + +* **PR** `#40820`_: (`gtmanfred`_) remove deprecated firstgen rackspace cloud driver + @ *2017-04-21 17:42:19 UTC* + + * ddedf05b7d Merge pull request `#40820`_ from gtmanfred/2016.11 + + * b60a8d013a remove rackspace from index + + * 559aa1d8b6 remove deprecated firstgen rackspace cloud driver + +* **PR** `#40797`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-04-20 19:42:04 UTC* + + * 2ab42489df Merge pull request `#40797`_ from rallytime/merge-2016.11 + + * 22500a7261 Merge branch '2016.3' into '2016.11' + + * 623e2eb61f Merge pull request `#40791`_ from a-powell/s3-util-get-memory-fix + + * 36f6521014 Merge remote-tracking branch 'upstream/2016.3' into s3-util-get-memory-fix + + * 04637cd4eb Fixing objects being loaded into memory when performing a GET request with a local file specified. + +* **PR** `#40800`_: (`rallytime`_) Back-port `#40720`_ to 2016.11 + @ *2017-04-20 19:41:41 UTC* + + * **PR** `#40720`_: (`oeuftete`_) Call tornado.httputil.url_concat compatibly (refs: `#40800`_) + + * ced839f841 Merge pull request `#40800`_ from rallytime/bp-40720 + + * 6c0124ae21 Call tornado.httputil.url_concat compatibly + +* **ISSUE** `#19137`_: (`jeffclay`_) MSI installer(s) for windows minion (refs: `#40716`_) + +* **PR** `#40785`_: (`alexproca`_) win_pkg: backport 2016.11 add msiexec override to enable selection of 32 or 64 msiexec.exe + @ *2017-04-20 16:45:14 UTC* + + * **PR** `#40716`_: (`alexproca`_) win_pkg: add msiexec override to enable selection of 32 or 64 msiexec.exe (refs: `#40785`_) + + * 5388ffa7a2 Merge pull request `#40785`_ from alexproca/backport-winexec-selection + + * 91cafd5094 Add option to select 32 or 64 version of msiexec + +* **PR** `#40796`_: (`terminalmage`_) Fix inaccurate nodegroup docs + @ *2017-04-20 16:08:22 UTC* + + * f0f135c71d Merge pull request `#40796`_ from terminalmage/fix-nodegroup-docs + + * f99259a6eb Fix inaccurate nodegroup docs + +* **ISSUE** `#40737`_: (`jf`_) Fix consul_pillar documentation: 'root=' canNOT start with a slash (refs: `#40760`_) + +* **PR** `#40769`_: (`rallytime`_) Back-port `#40760`_ to 2016.11 + @ *2017-04-19 20:23:22 UTC* + + * **PR** `#40760`_: (`jf`_) Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'! (refs: `#40769`_) + + * d8f78550d9 Merge pull request `#40769`_ from rallytime/bp-40760 + + * 71ac15fc4c Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'! + +* **PR** `#40756`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-04-19 17:47:51 UTC* + + * 61f8de43df Merge pull request `#40756`_ from rallytime/merge-2016.11 + + * 0e087323f1 Merge branch '2016.3' into '2016.11' + + * f4f3ee69ba Merge pull request `#40721`_ from gtmanfred/2016.3 + + * 58b88859b3 unset the bitwise instead of toggle + +* **ISSUE** `#29602`_: (`multani`_) cloud.action start raises "got an unexpected keyword argument 'kwargs'" (refs: `#40735`_) + +* **PR** `#40735`_: (`rallytime`_) Handle stacktraces in cloud.action function in module and runner + @ *2017-04-18 20:05:06 UTC* + + * 3557b5140e Merge pull request `#40735`_ from rallytime/handle-cloud-traces + + * 87154a95a4 Use `log.error` instead of `log.err` + + * b35bf919a3 Handle stacktraces in cloud.action function in module and runner + +* **PR** `#40745`_: (`cro`_) Backport `Add support for specifying a datastore for new disks.` PR `#36457`_ + @ *2017-04-18 20:00:51 UTC* + + * **PR** `#36457`_: (`cro`_) Add support for specifying a datastore for new disks. (refs: `#40745`_) + + * e700d8183b Merge pull request `#40745`_ from cro/vmware_disk_datastore_bp + + * 1460f82ce4 Remove leftover conflict markers (oops! :-/ ) + + * b26be652dd Remove leftover conflict markers (oops! :-/ ) + + * 096f063464 Remove leftover conflict markers (oops! :-/ ) + + * d24078d1a0 Add docs for "datastore" param for disks + + * 500d6b281d Document validity of a datastore key inside a disk definition. + + * 7608b10225 Add support for specifying a datastore for new disks. + +* **PR** `#40740`_: (`cro`_) Backport pr `#39802`_ to add random_startup_delay + @ *2017-04-18 19:47:55 UTC* + + * **PR** `#39802`_: (`cachedout`_) A random startup delay option for minions (refs: `#40740`_) + + * 78dbab01dc Merge pull request `#40740`_ from cro/minion_delay_start + + * 2ab95b7dd5 Set minion test to use default opts + + * 785e6060a9 Add requested docs + + * 8ab321f934 A random startup delay option for minions + +* **PR** `#40728`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-04-17 21:13:15 UTC* + + * a48ecc4a5c Merge pull request `#40728`_ from rallytime/merge-2016.11 + + * 0a5e05a6e5 Merge branch '2016.3' into '2016.11' + + * bf8bb0fde6 Merge pull request `#40719`_ from rallytime/bp-40714 + + * d6c436246b Make salt.modules.pw_user.get_loginclass return string rather than dict + + * 4145d33e46 Merge pull request `#40718`_ from terminalmage/fix-docstring + + * 14e8b85da5 Fix copypasta in the pw_user docstring + +* **ISSUE** `#36967`_: (`gmykhailiuta`_) S3fs objects list gets truncated (refs: `#40707`_) + +* **PR** `#40707`_: (`gtmanfred`_) Use markers when s3 bucket list is truncated + @ *2017-04-17 16:45:21 UTC* + + * c5cbfc2e63 Merge pull request `#40707`_ from gtmanfred/2016.11 + + * 1932f7265d Use markers when s3 bucket list is truncated .. _`#19137`: https://github.com/saltstack/salt/issues/19137 .. _`#29602`: https://github.com/saltstack/salt/issues/29602 .. _`#33093`: https://github.com/saltstack/salt/issues/33093 -.. _`#34640`: https://github.com/saltstack/salt/issues/34640 -.. _`#34643`: https://github.com/saltstack/salt/pull/34643 .. _`#35699`: https://github.com/saltstack/salt/issues/35699 -.. _`#36457`: https://github.com/saltstack/salt/issues/36457 -.. _`#36644`: https://github.com/saltstack/salt/issues/36644 -.. _`#36706`: https://github.com/saltstack/salt/pull/36706 +.. _`#36457`: https://github.com/saltstack/salt/pull/36457 .. _`#36967`: https://github.com/saltstack/salt/issues/36967 .. _`#37307`: https://github.com/saltstack/salt/issues/37307 .. _`#37696`: https://github.com/saltstack/salt/pull/37696 -.. _`#37787`: https://github.com/saltstack/salt/issues/37787 .. _`#37824`: https://github.com/saltstack/salt/issues/37824 .. _`#38115`: https://github.com/saltstack/salt/pull/38115 .. _`#38565`: https://github.com/saltstack/salt/pull/38565 -.. _`#38914`: https://github.com/saltstack/salt/issues/38914 .. _`#39118`: https://github.com/saltstack/salt/issues/39118 .. _`#39289`: https://github.com/saltstack/salt/pull/39289 .. _`#39531`: https://github.com/saltstack/salt/issues/39531 .. _`#39802`: https://github.com/saltstack/salt/pull/39802 .. _`#40635`: https://github.com/saltstack/salt/issues/40635 .. _`#40707`: https://github.com/saltstack/salt/pull/40707 -.. _`#40712`: https://github.com/saltstack/salt/issues/40712 -.. _`#40714`: https://github.com/saltstack/salt/pull/40714 .. _`#40716`: https://github.com/saltstack/salt/pull/40716 .. _`#40718`: https://github.com/saltstack/salt/pull/40718 .. _`#40719`: https://github.com/saltstack/salt/pull/40719 @@ -765,7 +763,6 @@ Due to the critical nature of issue `#41230`_ we have decided to patch the 2016. .. _`#40760`: https://github.com/saltstack/salt/pull/40760 .. _`#40769`: https://github.com/saltstack/salt/pull/40769 .. _`#40785`: https://github.com/saltstack/salt/pull/40785 -.. _`#40790`: https://github.com/saltstack/salt/issues/40790 .. _`#40791`: https://github.com/saltstack/salt/pull/40791 .. _`#40796`: https://github.com/saltstack/salt/pull/40796 .. _`#40797`: https://github.com/saltstack/salt/pull/40797 @@ -775,7 +772,6 @@ Due to the critical nature of issue `#41230`_ we have decided to patch the 2016. .. _`#40820`: https://github.com/saltstack/salt/pull/40820 .. _`#40822`: https://github.com/saltstack/salt/pull/40822 .. _`#40824`: https://github.com/saltstack/salt/pull/40824 -.. _`#40835`: https://github.com/saltstack/salt/issues/40835 .. _`#40845`: https://github.com/saltstack/salt/issues/40845 .. _`#40854`: https://github.com/saltstack/salt/pull/40854 .. _`#40855`: https://github.com/saltstack/salt/pull/40855 @@ -799,8 +795,6 @@ Due to the critical nature of issue `#41230`_ we have decided to patch the 2016. .. _`#40930`: https://github.com/saltstack/salt/pull/40930 .. _`#40933`: https://github.com/saltstack/salt/pull/40933 .. _`#40934`: https://github.com/saltstack/salt/pull/40934 -.. _`#41230`: https://github.com/saltstack/salt/issues/41230 -.. _`#41244`: https://github.com/saltstack/salt/pull/41244 .. _`#40935`: https://github.com/saltstack/salt/pull/40935 .. _`#40936`: https://github.com/saltstack/salt/pull/40936 .. _`#40939`: https://github.com/saltstack/salt/pull/40939 @@ -843,22 +837,57 @@ Due to the critical nature of issue `#41230`_ we have decided to patch the 2016. .. _`#41093`: https://github.com/saltstack/salt/pull/41093 .. _`#41097`: https://github.com/saltstack/salt/pull/41097 .. _`#41098`: https://github.com/saltstack/salt/pull/41098 -.. _`#41099`: https://github.com/saltstack/salt/pull/41099 .. _`#41100`: https://github.com/saltstack/salt/issues/41100 .. _`#41102`: https://github.com/saltstack/salt/pull/41102 .. _`#41103`: https://github.com/saltstack/salt/pull/41103 .. _`#41134`: https://github.com/saltstack/salt/pull/41134 -.. _`#41173`: https://github.com/saltstack/salt/pull/41173 .. _`#5`: https://github.com/saltstack/salt/issues/5 -.. _`bp-37696`: https://github.com/saltstack/salt/pull/37696 -.. _`bp-38115`: https://github.com/saltstack/salt/pull/38115 -.. _`bp-38565`: https://github.com/saltstack/salt/pull/38565 -.. _`bp-40714`: https://github.com/saltstack/salt/pull/40714 -.. _`bp-40720`: https://github.com/saltstack/salt/pull/40720 -.. _`bp-40760`: https://github.com/saltstack/salt/pull/40760 -.. _`bp-40811`: https://github.com/saltstack/salt/pull/40811 -.. _`bp-40939`: https://github.com/saltstack/salt/pull/40939 -.. _`bp-40982`: https://github.com/saltstack/salt/pull/40982 -.. _`bp-41079`: https://github.com/saltstack/salt/pull/41079 -.. _`bp-41088`: https://github.com/saltstack/salt/pull/41088 -.. _`fix-39531`: https://github.com/saltstack/salt/issues/39531 +.. _`BenoitKnecht`: https://github.com/BenoitKnecht +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`Enquier`: https://github.com/Enquier +.. _`SolarisYan`: https://github.com/SolarisYan +.. _`UtahDave`: https://github.com/UtahDave +.. _`alexproca`: https://github.com/alexproca +.. _`benediktwerner`: https://github.com/benediktwerner +.. _`bobrik`: https://github.com/bobrik +.. _`brd`: https://github.com/brd +.. _`cachedout`: https://github.com/cachedout +.. _`clinta`: https://github.com/clinta +.. _`corywright`: https://github.com/corywright +.. _`cro`: https://github.com/cro +.. _`danlsgiga`: https://github.com/danlsgiga +.. _`drawsmcgraw`: https://github.com/drawsmcgraw +.. _`dxiri`: https://github.com/dxiri +.. _`e-senthilkumar`: https://github.com/e-senthilkumar +.. _`ezh`: https://github.com/ezh +.. _`frogunder`: https://github.com/frogunder +.. _`gmykhailiuta`: https://github.com/gmykhailiuta +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`isbm`: https://github.com/isbm +.. _`jeffclay`: https://github.com/jeffclay +.. _`jf`: https://github.com/jf +.. _`jleproust`: https://github.com/jleproust +.. _`lorengordon`: https://github.com/lorengordon +.. _`multani`: https://github.com/multani +.. _`nevins-b`: https://github.com/nevins-b +.. _`nicksloan`: https://github.com/nicksloan +.. _`oeuftete`: https://github.com/oeuftete +.. _`peter-funktionIT`: https://github.com/peter-funktionIT +.. _`promorphus`: https://github.com/promorphus +.. _`rallytime`: https://github.com/rallytime +.. _`razed11`: https://github.com/razed11 +.. _`rkgrunt`: https://github.com/rkgrunt +.. _`saltstack/salt#34640`: https://github.com/saltstack/salt/issues/34640 +.. _`saltstack/salt#34643`: https://github.com/saltstack/salt/pull/34643 +.. _`santzi`: https://github.com/santzi +.. _`senthilkumar-e`: https://github.com/senthilkumar-e +.. _`sjorge`: https://github.com/sjorge +.. _`skizunov`: https://github.com/skizunov +.. _`sokratisg`: https://github.com/sokratisg +.. _`stamak`: https://github.com/stamak +.. _`szjur`: https://github.com/szjur +.. _`terminalmage`: https://github.com/terminalmage +.. _`twangboy`: https://github.com/twangboy +.. _`weirdbricks`: https://github.com/weirdbricks +.. _`ypid`: https://github.com/ypid diff --git a/doc/topics/releases/2016.11.6.rst b/doc/topics/releases/2016.11.6.rst index b48286f4a7..413a99673b 100644 --- a/doc/topics/releases/2016.11.6.rst +++ b/doc/topics/releases/2016.11.6.rst @@ -4,162 +4,177 @@ Salt 2016.11.6 Release Notes Version 2016.11.6 is a bugfix release for :ref:`2016.11.0 `. -Changes for v2016.11.5..v2016.11.6 ----------------------------------------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): - -*Generated at: 2017-06-21T21:12:22Z* - -Statistics: +Statistics +========== - Total Merges: **137** -- Total Issue references: **65** -- Total PR references: **167** +- Total Issue References: **58** +- Total PR References: **153** -Changes: +- Contributors: **49** (`BenoitKnecht`_, `Ch3LL`_, `Enquier`_, `F30`_, `Foxlik`_, `The-Loeki`_, `UtahDave`_, `abednarik`_, `alex-zel`_, `arif-ali`_, `automate-solutions`_, `axmetishe`_, `bdrung`_, `cachedout`_, `cro`_, `darenjacobs`_, `dmurphy18`_, `dschaller`_, `epcim`_, `garethgreenaway`_, `github-abcde`_, `gtmanfred`_, `isbm`_, `jettero`_, `jmarinaro`_, `kiorky`_, `lomeroe`_, `lordcirth`_, `lorengordon`_, `lubyou`_, `mcalmer`_, `moio`_, `onlyanegg`_, `peter-funktionIT`_, `pkazmierczak`_, `pprkut`_, `rallytime`_, `ricohouse`_, `seanjnkns`_, `sebw`_, `skizunov`_, `svinota`_, `t0fik`_, `terminalmage`_, `tmeneau`_, `tonybaloney`_, `twangboy`_, `whiteinge`_, `yannj-fr`_) -- **PR** `#41861`_: (*twangboy*) Fix problems with get_rule and delete_rule - @ *2017-06-20T20:37:23Z* +Changelog for v2016.11.5..v2016.11.6 +==================================== + +*Generated at: 2018-05-27 20:18:17 UTC* + +* **PR** `#41861`_: (`twangboy`_) Fix problems with get_rule and delete_rule + @ *2017-06-20 20:37:23 UTC* * afc61ffe63 Merge pull request `#41861`_ from twangboy/fix_win_firewall + * 78892074f5 Fix problems with get_rule and delete_rule -- **PR** `#41787`_: (*skizunov*) Fix `#41778`_ - @ *2017-06-20T20:11:23Z* +* **ISSUE** `#41778`_: (`frogunder`_) 2016.11.6 - TCP Transport gives Exception (refs: `#41787`_) + +* **PR** `#41787`_: (`skizunov`_) Fix `#41778`_ + @ *2017-06-20 20:11:23 UTC* + + * **PR** `#41436`_: (`skizunov`_) TCP transport: Fix occasional errors when using salt command (refs: `#41787`_) - - **ISSUE** `#41778`_: (*frogunder*) 2016.11.6 - TCP Transport gives Exception - | refs: `#41787`_ `#41787`_ - - **PR** `#41436`_: (*skizunov*) TCP transport: Fix occasional errors when using salt command - | refs: `#41787`_ `#41787`_ `#41787`_ * 938d4fddf1 Merge pull request `#41787`_ from skizunov/develop3 + * 2ffd20cede Fix `#41778`_ -- **PR** `#41812`_: (*skizunov*) TCP: Fix salt-master in bad state if remote side closed connection - @ *2017-06-20T19:46:53Z* +* **PR** `#41812`_: (`skizunov`_) TCP: Fix salt-master in bad state if remote side closed connection + @ *2017-06-20 19:46:53 UTC* * 03b6ae5ea8 Merge pull request `#41812`_ from skizunov/develop4 + * 736420eb83 TCP: Fix salt-master in bad state if remote side closed connection -- **PR** `#41857`_: (*dmurphy18*) Modified support for deprecated netstat being removed by utilizing ss - @ *2017-06-20T18:46:27Z* +* **PR** `#41857`_: (`dmurphy18`_) Modified support for deprecated netstat being removed by utilizing ss + @ *2017-06-20 18:46:27 UTC* * cf2252bcea Merge pull request `#41857`_ from dmurphy18/netstat_fix + * 017fbdbc53 Modified support for deprecated netstat being removed by utilizing ss -- **PR** `#41837`_: (*rallytime*) Add fingerpint_hash_type option to ssh_auth state and related functions - @ *2017-06-20T18:14:53Z* +* **ISSUE** `#40878`_: (`joewreschnig`_) SSH modules spam warning about MD5 fingerprints when there aren't any (refs: `#41837`_) + +* **ISSUE** `#40005`_: (`vutny`_) `ssh_known_hosts.present` does not support SHA256 key fingerprints (refs: `#40543`_) + +* **PR** `#41837`_: (`rallytime`_) Add fingerpint_hash_type option to ssh_auth state and related functions + @ *2017-06-20 18:14:53 UTC* + + * **PR** `#40543`_: (`rallytime`_) Add the "fingerprint_hash_type" option to ssh state and module (refs: `#41837`_) + + * 12ec5f9f23 Merge pull request `#41837`_ from rallytime/fix-40878 - - **ISSUE** `#40878`_: (*joewreschnig*) SSH modules spam warning about MD5 fingerprints when there aren't any - | refs: `#41837`_ `#41837`_ - - **ISSUE** `#40005`_: (*vutny*) `ssh_known_hosts.present` does not support SHA256 key fingerprints - | refs: `#40543`_ - - **PR** `#40543`_: (*rallytime*) Add the "fingerprint_hash_type" option to ssh state and module - | refs: `#41837`_ - * 12ec5f9f23 Merge pull request `#41837`_ from rallytime/`fix-40878`_ * 48ff5d2a62 Add fingerpint_hash_type option to ssh_auth state and related functions -- **PR** `#41839`_: (*cro*) Extend proxy to jinja - @ *2017-06-19T23:03:00Z* +* **PR** `#41839`_: (`cro`_) Extend proxy to jinja + @ *2017-06-19 23:03:00 UTC* * e7fc30f482 Merge pull request `#41839`_ from cro/extend_proxy_to_jinja + * 172d3520ea Merge branch 'extend_proxy_to_jinja' of github.com:cro/salt into extend_proxy_to_jinja * 2e4a0633da Extend __proxy__ to jinja as `proxy` (like __salt__->salt) * 2ffad2af35 Extend __proxy__ to jinja as `proxy` (like __salt__->salt) -- **PR** `#41786`_: (*whiteinge*) Runner arg parsing regressions - @ *2017-06-19T23:00:07Z* +* **ISSUE** `#41733`_: (`sumeetisp`_) Salt Rest Api call (refs: `#41786`_) + +* **ISSUE** `#40845`_: (`e-senthilkumar`_) /jobs call is broken in 2016.11.4 (refs: `#41786`_) + +* **ISSUE** `#38962`_: (`gstachowiak`_) Broken /jobs in salt-api in salt 2016.11.1 (Carbon) (refs: `#39472`_) + +* **PR** `#41786`_: (`whiteinge`_) Runner arg parsing regressions + @ *2017-06-19 23:00:07 UTC* + + * **PR** `#39472`_: (`whiteinge`_) Update _reformat_low to not run kwarg dicts through parse_input (refs: `#41786`_) - - **ISSUE** `#41733`_: (*sumeetisp*) Salt Rest Api call - | refs: `#41786`_ - - **ISSUE** `#40845`_: (*e-senthilkumar*) /jobs call is broken in 2016.11.4 - | refs: `#41786`_ - - **ISSUE** `#38962`_: (*gstachowiak*) Broken /jobs in salt-api in salt 2016.11.1 (Carbon) - | refs: `#39472`_ - - **PR** `#39472`_: (*whiteinge*) Update _reformat_low to not run kwarg dicts through parse_input - | refs: `#41786`_ * 58387b127a Merge pull request `#41786`_ from whiteinge/runner-arg-parsing-regressions + * bf15c0bb5f Restore sending __current_eauth_* through to the function * 6be975da2c Fix regressions from not calling load_args_and_kwargs * 9d1cc1a176 Add test to check that runners ignore invalid kwargs -- **PR** `#41776`_: (*gtmanfred*) npm 5.0.0 added a second line after fsevents - @ *2017-06-19T16:53:43Z* +* **PR** `#41776`_: (`gtmanfred`_) npm 5.0.0 added a second line after fsevents + @ *2017-06-19 16:53:43 UTC* * be0e9abedb Merge pull request `#41776`_ from gtmanfred/2016.11 + * 733a2279ca npm 5.0.0 added a second line after fsevents -- **PR** `#41783`_: (*rallytime*) Add a bunch of config options to the various master/minion files that are missing - @ *2017-06-19T16:42:54Z* +* **ISSUE** `#32400`_: (`rallytime`_) Document Default Config Values (refs: `#41783`_) + +* **PR** `#41783`_: (`rallytime`_) Add a bunch of config options to the various master/minion files that are missing + @ *2017-06-19 16:42:54 UTC* - - **ISSUE** `#32400`_: (*rallytime*) Document Default Config Values - | refs: `#41783`_ * d94d4e4d19 Merge pull request `#41783`_ from rallytime/config-doc-updates + * c828ad803a Add a bunch of config options to the various master/minion files that are missing -- **PR** `#41816`_: (*twangboy*) Upgrade psutil to version 5.2.2 - @ *2017-06-17T01:51:29Z* +* **PR** `#41816`_: (`twangboy`_) Upgrade psutil to version 5.2.2 + @ *2017-06-17 01:51:29 UTC* * 2c681887d3 Merge pull request `#41816`_ from twangboy/update_psutil_req + * 8b4e3ad77d Upgrade psutil to version 5.2.2 -- **PR** `#41803`_: (*terminalmage*) Don't log an error when no top.sls is found - @ *2017-06-16T22:49:08Z* +* **ISSUE** `#41785`_: (`UtahDave`_) Using master tops without a top.sls file causes extra errors in minion log (refs: `#41803`_) + +* **PR** `#41803`_: (`terminalmage`_) Don't log an error when no top.sls is found + @ *2017-06-16 22:49:08 UTC* - - **ISSUE** `#41785`_: (*UtahDave*) Using master tops without a top.sls file causes extra errors in minion log - | refs: `#41803`_ * 3e5fe7ca4b Merge pull request `#41803`_ from terminalmage/issue41785 + * f9f4d49f05 Don't log an error when no top.sls is found -- **PR** `#41801`_: (*terminalmage*) Don't take hostname from name param when creating docker container (2016.11 branch) - @ *2017-06-16T17:02:02Z* +* **PR** `#41801`_: (`terminalmage`_) Don't take hostname from name param when creating docker container (2016.11 branch) + @ *2017-06-16 17:02:02 UTC* * d12bc4ee68 Merge pull request `#41801`_ from terminalmage/issue41781-2016.11 + * 8236d3e1c3 Don't take hostname from name param when creating docker container (2016.11 branch) -- **PR** `#41768`_: (*rallytime*) Manually back-port the changes in PR `#41615`_ - @ *2017-06-15T20:41:45Z* +* **PR** `#41768`_: (`rallytime`_) Manually back-port the changes in PR `#41615`_ + @ *2017-06-15 20:41:45 UTC* + + * **PR** `#41615`_: (`Ch3LL`_) Fix get_hwclock_aix test on MacOSX (refs: `#41768`_) + + * 87e2e72d94 Merge pull request `#41768`_ from rallytime/bp-41615 - - **PR** `#41615`_: (*Ch3LL*) Fix get_hwclock_aix test on MacOSX - | refs: `#41768`_ - * 87e2e72d94 Merge pull request `#41768`_ from rallytime/`bp-41615`_ * b6cc0b6bf0 Manually backport the changes in PR `#41615`_ -- **PR** `#41740`_: (*terminalmage*) Fix spurious error when glob/regex used in publisher_acl - @ *2017-06-15T15:14:56Z* +* **PR** `#41740`_: (`terminalmage`_) Fix spurious error when glob/regex used in publisher_acl + @ *2017-06-15 15:14:56 UTC* * 36cb223ab2 Merge pull request `#41740`_ from terminalmage/zd1532 + * e5f3d08751 Fix spurious error when glob/regex used in publisher_acl -- **PR** `#41749`_: (*terminalmage*) Fix bug in pkg_resource.parse_targets when version passed - @ *2017-06-15T15:05:52Z* +* **PR** `#41749`_: (`terminalmage`_) Fix bug in pkg_resource.parse_targets when version passed + @ *2017-06-15 15:05:52 UTC* * 126a36747b Merge pull request `#41749`_ from terminalmage/parse_targets + * 698806fb09 No need to manually create pkg_params dict when name and version passed * 7484bcc6c6 parse_targets: include version in packed return data -- **PR** `#41753`_: (*rallytime*) Back-port `#41449`_ to 2016.11 - @ *2017-06-14T22:16:10Z* +* **PR** `#41753`_: (`rallytime`_) Back-port `#41449`_ to 2016.11 + @ *2017-06-14 22:16:10 UTC* + + * **PR** `#41449`_: (`sebw`_) Fix state "svn.latest" diff output in test mode (refs: `#41753`_) + + * 2c24012ded Merge pull request `#41753`_ from rallytime/bp-41449 - - **PR** `#41449`_: (*sebw*) Fix state "svn.latest" diff output in test mode - | refs: `#41753`_ - * 2c24012ded Merge pull request `#41753`_ from rallytime/`bp-41449`_ * fae41c2875 Adjusting SVN unit test * eac6b151eb Improved SVN output in test mode -- **PR** `#41750`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-06-14T22:15:41Z* +* **PR** `#41750`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-06-14 22:15:41 UTC* - - **PR** `#41695`_: (*xiaoanyunfei*) fix max RecursionError, Ellipsis - - **PR** `#41585`_: (*cro*) Sign_minion_messages support * e685858269 Merge pull request `#41750`_ from rallytime/merge-2016.11 + * 89834e49c2 Merge branch '2016.3' into '2016.11' * c5a79a1ea6 Merge pull request `#41695`_ from xiaoanyunfei/fixRecursion @@ -186,26 +201,29 @@ Changes: * 3b9326fda7 Sign_minion_messages support -- **PR** `#41756`_: (*Ch3LL*) Add Change Log to 2016.11.6 Release Notes - @ *2017-06-14T20:57:08Z* +* **PR** `#41756`_: (`Ch3LL`_) Add Change Log to 2016.11.6 Release Notes + @ *2017-06-14 20:57:08 UTC* * 36cc8f1e35 Merge pull request `#41756`_ from Ch3LL/2016.11.6_release + * fa368f21ac Add Change Log to 2016.11.6 Release Notes -- **PR** `#41692`_: (*rallytime*) Add boto and boto3 version dependencies to boto_vpc state docs - @ *2017-06-14T19:05:07Z* +* **ISSUE** `#40155`_: (`grichmond-salt`_) State module boto_vpc not working with boto 2 (refs: `#41692`_) + +* **PR** `#41692`_: (`rallytime`_) Add boto and boto3 version dependencies to boto_vpc state docs + @ *2017-06-14 19:05:07 UTC* + + * edcafc6a26 Merge pull request `#41692`_ from rallytime/fix-40155 - - **ISSUE** `#40155`_: (*grichmond-salt*) State module boto_vpc not working with boto 2 - | refs: `#41692`_ - * edcafc6a26 Merge pull request `#41692`_ from rallytime/`fix-40155`_ * 539c1b0692 Add boto and boto3 version dependencies to boto_vpc state docs -- **PR** `#40902`_: (*lorengordon*) Removes duplicates when merging pillar lists and adds pillar.get override for pillar_merge_lists - @ *2017-06-14T18:39:09Z* +* **ISSUE** `#39918`_: (`kivoli`_) Enabling list merging leads to multiplying of unique list items (refs: `#40902`_) + +* **PR** `#40902`_: (`lorengordon`_) Removes duplicates when merging pillar lists and adds pillar.get override for pillar_merge_lists + @ *2017-06-14 18:39:09 UTC* - - **ISSUE** `#39918`_: (*kivoli*) Enabling list merging leads to multiplying of unique list items - | refs: `#40902`_ * bdaeb55a77 Merge pull request `#40902`_ from lorengordon/pillar-get-merge-lists + * 6e35673fe3 Preserves order when removing duplicates * 18eda7084c Updates list merge tests to check for sorted, unique lists @@ -216,24 +234,26 @@ Changes: * ed04bae94c Removes duplicate values when merging lists -- **PR** `#41723`_: (*rallytime*) Support apache-libcloud work-around for issue `#32743`_ for versions older than 2.0.0 - @ *2017-06-14T17:13:38Z* +* **ISSUE** `#32743`_: (`tonybaloney`_) Issue with salt-cloud on OpenSUSE (refs: `#41723`_) + +* **PR** `#41723`_: (`rallytime`_) Support apache-libcloud work-around for issue `#32743`_ for versions older than 2.0.0 + @ *2017-06-14 17:13:38 UTC* + + * **PR** `#40837`_: (`tonybaloney`_) Upgrade apache-libcloud package dependency for 2.0 (refs: `#41723`_) - - **ISSUE** `#32743`_: (*tonybaloney*) Issue with salt-cloud on OpenSUSE - | refs: `#41723`_ `#41723`_ - - **PR** `#40837`_: (*tonybaloney*) Upgrade apache-libcloud package dependency for 2.0 - | refs: `#41723`_ `#41723`_ * 203ec6730f Merge pull request `#41723`_ from rallytime/libcloud-support + * 1e9a06000b Bump version check down to 1.4.0 and use distutils.version lib * a30f654b04 Support apache-libcloud work-around for issue `#32743`_ for versions older than 2.0.0 -- **PR** `#41655`_: (*Enquier*) Allow Nova cloud module to set a specific floating ip address - @ *2017-06-14T16:44:05Z* +* **ISSUE** `#41654`_: (`Enquier`_) Nova Cloud module doesn't work for python-novaclient 8.0.0+ (refs: `#41655`_) + +* **PR** `#41655`_: (`Enquier`_) Allow Nova cloud module to set a specific floating ip address + @ *2017-06-14 16:44:05 UTC* - - **ISSUE** `#41654`_: (*Enquier*) Nova Cloud module doesn't work for python-novaclient 8.0.0+ - | refs: `#41655`_ * 62dbf5083c Merge pull request `#41655`_ from Enquier/nova-cloud-set_ip_address + * 293bc64158 Removed empty debug log * 3d9871fe11 Cleaning up, removing debugging tests @@ -256,280 +276,308 @@ Changes: * 58459adbe8 Adding ability to set a Floating IP by a specific IP address -- **PR** `#41731`_: (*terminalmage*) Clarify that archive_format is required pre-2016.11.0 - @ *2017-06-14T15:05:21Z* +* **PR** `#41731`_: (`terminalmage`_) Clarify that archive_format is required pre-2016.11.0 + @ *2017-06-14 15:05:21 UTC* * 82eab84883 Merge pull request `#41731`_ from terminalmage/docs + * d3f4ea1a84 Clarify that archive_format is required pre-2016.11.0 -- **PR** `#41663`_: (*skizunov*) Don't invoke lspci if enable_lspci is False - @ *2017-06-13T21:19:42Z* +* **PR** `#41663`_: (`skizunov`_) Don't invoke lspci if enable_lspci is False + @ *2017-06-13 21:19:42 UTC* * b6d27beac2 Merge pull request `#41663`_ from skizunov/develop3 + * 154d6ce59e Don't invoke lspci if enable_lspci is False -- **PR** `#41693`_: (*rallytime*) Document available kwargs for ec2.create_volume function - @ *2017-06-13T19:51:10Z* +* **ISSUE** `#40446`_: (`sumeetisp`_) [Documentation] include list of kwargs for ec2.create_volume in cloud driver (refs: `#41693`_) + +* **PR** `#41693`_: (`rallytime`_) Document available kwargs for ec2.create_volume function + @ *2017-06-13 19:51:10 UTC* + + * 46b8d5dc4b Merge pull request `#41693`_ from rallytime/fix-40446 - - **ISSUE** `#40446`_: (*sumeetisp*) [Documentation] include list of kwargs for ec2.create_volume in cloud driver - | refs: `#41693`_ - * 46b8d5dc4b Merge pull request `#41693`_ from rallytime/`fix-40446`_ * 569eb2bf7e Document available kwargs for ec2.create_volume function -- **PR** `#41696`_: (*terminalmage*) Handle a few edge/corner cases with non-string input to cmd.run - @ *2017-06-13T18:48:56Z* +* **ISSUE** `#41691`_: (`jdonofrio728`_) Can't pass integers as cmd.run environment variables (refs: `#41696`_) + +* **PR** `#41696`_: (`terminalmage`_) Handle a few edge/corner cases with non-string input to cmd.run + @ *2017-06-13 18:48:56 UTC* - - **ISSUE** `#41691`_: (*jdonofrio728*) Can't pass integers as cmd.run environment variables - | refs: `#41696`_ * aab55d304a Merge pull request `#41696`_ from terminalmage/issue41691 + * 0623e40d33 Apparently some funcs are passing tuples to cmd.run_* * cdbfb94cfe Handle a few edge/corner cases with non-string input to cmd.run -- **PR** `#41697`_: (*terminalmage*) Resubmit `#41545`_ against 2016.11 branch - @ *2017-06-13T16:10:37Z* +* **PR** `#41697`_: (`terminalmage`_) Resubmit `#41545`_ against 2016.11 branch + @ *2017-06-13 16:10:37 UTC* + + * **PR** `#41545`_: (`kiorky`_) Make print_cli resilient on slow systems (refs: `#41697`_) * 97897d7a7a Merge pull request `#41697`_ from terminalmage/pr-41545 + * faaacf88bf Use error name instead of error number * 7eacda5cbf Make print_cli resilient on slow systems -- **PR** `#41711`_: (*rallytime*) Update deprecated version info in manage.bootstrap func for root_user - @ *2017-06-13T16:04:32Z* +* **ISSUE** `#40605`_: (`sumeetisp`_) Salt-run manage.bootstrap (refs: `#41711`_) + +* **PR** `#41711`_: (`rallytime`_) Update deprecated version info in manage.bootstrap func for root_user + @ *2017-06-13 16:04:32 UTC* + + * 09260d7c08 Merge pull request `#41711`_ from rallytime/fix-40605 - - **ISSUE** `#40605`_: (*sumeetisp*) Salt-run manage.bootstrap - | refs: `#41711`_ - * 09260d7c08 Merge pull request `#41711`_ from rallytime/`fix-40605`_ * 903c2ffca5 Update deprecated version info in manage.bootstrap fucn for root_user -- **PR** `#41658`_: (*garethgreenaway*) Fixes to the salt scheduler - @ *2017-06-13T16:00:57Z* +* **ISSUE** `#39668`_: (`mirceaulinic`_) Master scheduled job not recorded on the event bus (refs: `#41658`_) + +* **PR** `#41658`_: (`garethgreenaway`_) Fixes to the salt scheduler + @ *2017-06-13 16:00:57 UTC* - - **ISSUE** `#39668`_: (*mirceaulinic*) Master scheduled job not recorded on the event bus - | refs: `#41658`_ * d563b3e345 Merge pull request `#41658`_ from garethgreenaway/39668_schedule_runners_fire_events + * d688a1cd88 Enable jobs scheduled on the master to fire their return data to the event bus -- **PR** `#41706`_: (*twangboy*) Add missing batch files - @ *2017-06-13T15:32:53Z* +* **PR** `#41706`_: (`twangboy`_) Add missing batch files + @ *2017-06-13 15:32:53 UTC* * 3c3b9343b7 Merge pull request `#41706`_ from twangboy/batch_files + * 0d4be0220b Add batch files for master -- **PR** `#41710`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-06-13T15:11:38Z* +* **PR** `#41710`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-06-13 15:11:38 UTC* - - **ISSUE** `#41688`_: (*yannj-fr*) Parted module command "mkfs" fails creating swap - | refs: `#41689`_ - - **ISSUE** `#37322`_: (*kiemlicz*) master_tops generating improper top file - | refs: `#41707`_ - - **PR** `#41707`_: (*terminalmage*) Update version in master-tops docs - - **PR** `#41689`_: (*yannj-fr*) Fix `#41688`_ : fix mkfs command linux-swap support * 1afc4adc5a Merge pull request `#41710`_ from rallytime/merge-2016.11 + * 5150916556 Merge branch '2016.3' into '2016.11' * 5058b0de1f Merge pull request `#41707`_ from terminalmage/master-tops-docs * 6ec9dfb7f3 Update version in master-tops docs - * 1c1964d807 Merge pull request `#41689`_ from yannj-fr/`fix-41688`_ + * 1c1964d807 Merge pull request `#41689`_ from yannj-fr/fix-41688 * a47eddccd2 Fix `#41688`_ : fix mkfs command linux-swap support -- **PR** `#41702`_: (*gtmanfred*) npm 5 and greater requires --force for cache clean - @ *2017-06-12T23:21:56Z* +* **PR** `#41702`_: (`gtmanfred`_) npm 5 and greater requires --force for cache clean + @ *2017-06-12 23:21:56 UTC* * 5d763b9b7f Merge pull request `#41702`_ from gtmanfred/2016.11 + * 8bd19fcc17 fix version number * 0fa380f75c npm 5 and greater requires --force for cache clean -- **PR** `#41704`_: (*rallytime*) Back-port `#41670`_ to 2016.11 - @ *2017-06-12T23:20:31Z* +* **ISSUE** `#41668`_: (`yannj-fr`_) Parted modules mkfs command does not work with NTFS (refs: `#41670`_) + +* **PR** `#41704`_: (`rallytime`_) Back-port `#41670`_ to 2016.11 + @ *2017-06-12 23:20:31 UTC* + + * **PR** `#41670`_: (`yannj-fr`_) fixes `#41668`_ ntfs case problem in parted module (refs: `#41704`_) + + * f6519e7f80 Merge pull request `#41704`_ from rallytime/bp-41670 - - **ISSUE** `#41668`_: (*yannj-fr*) Parted modules mkfs command does not work with NTFS - | refs: `#41670`_ - - **PR** `#41670`_: (*yannj-fr*) fixes `#41668`_ ntfs case problem in parted module - | refs: `#41704`_ - * f6519e7f80 Merge pull request `#41704`_ from rallytime/`bp-41670`_ * 8afc8792d1 fixes `#41668`_ ntfs case problem in parted module -- **PR** `#41700`_: (*terminalmage*) roots: return actual link destination when listing symlinks - @ *2017-06-12T22:07:03Z* +* **ISSUE** `#39939`_: (`martinschipper`_) Relative symlinks are changed with file.recurse 2016.11.3 (refs: `#41700`_) + +* **PR** `#41700`_: (`terminalmage`_) roots: return actual link destination when listing symlinks + @ *2017-06-12 22:07:03 UTC* - - **ISSUE** `#39939`_: (*martinschipper*) Relative symlinks are changed with file.recurse 2016.11.3 - | refs: `#41700`_ * 0b89377dce Merge pull request `#41700`_ from terminalmage/issue39939 + * bdbb265a0b roots: return actual link destination when listing symlinks -- **PR** `#41699`_: (*rallytime*) Remove note about version incompatibility with salt-cloud - @ *2017-06-12T19:44:28Z* +* **PR** `#41699`_: (`rallytime`_) Remove note about version incompatibility with salt-cloud + @ *2017-06-12 19:44:28 UTC* * 7cf47f9651 Merge pull request `#41699`_ from rallytime/troubleshooting-doc-update + * c91ca5f809 Remove note about version incompatibility with salt-cloud -- **PR** `#41694`_: (*rallytime*) Add ipcidr options to "Allowed Values" list in LocalClient expr_form docs - @ *2017-06-12T19:06:16Z* +* **ISSUE** `#40410`_: (`DarrenDai`_) Targeting Minions by IP Range via restful API doesn't work (refs: `#41694`_) + +* **PR** `#41694`_: (`rallytime`_) Add ipcidr options to "Allowed Values" list in LocalClient expr_form docs + @ *2017-06-12 19:06:16 UTC* + + * d68a6316b8 Merge pull request `#41694`_ from rallytime/fix-40410 - - **ISSUE** `#40410`_: (*DarrenDai*) Targeting Minions by IP Range via restful API doesn't work - | refs: `#41694`_ - * d68a6316b8 Merge pull request `#41694`_ from rallytime/`fix-40410`_ * 6de9da1d5d Add ipcidr options to "Allowed Values" list in LocalClient expr_form docs -- **PR** `#41659`_: (*lubyou*) Use re.escape to escape paths before handing them to re.match - @ *2017-06-12T18:10:53Z* +* **ISSUE** `#41365`_: (`lubyou`_) file.managed chokes on windows paths when source_hash is set to the URI of a file that contains source hash strings (refs: `#41659`_) + +* **PR** `#41659`_: (`lubyou`_) Use re.escape to escape paths before handing them to re.match + @ *2017-06-12 18:10:53 UTC* - - **ISSUE** `#41365`_: (*lubyou*) file.managed chokes on windows paths when source_hash is set to the URI of a file that contains source hash strings - | refs: `#41659`_ * 80d4a3ab98 Merge pull request `#41659`_ from lubyou/41365-fix-file-managed + * d49a1579b0 Use re.escape to escape paths, before handing them to re.match * ac240facca use correct variable * c777eba2c1 Use re.escape to escape paths, before handing them to re.match -- **PR** `#41661`_: (*whiteinge*) Add note about avoiding the `-i` flag for the /keys endpoint - @ *2017-06-09T15:03:40Z* +* **PR** `#41661`_: (`whiteinge`_) Add note about avoiding the `-i` flag for the /keys endpoint + @ *2017-06-09 15:03:40 UTC* * 564d5fd9d3 Merge pull request `#41661`_ from whiteinge/rest_cherrypy-keys-headers + * a66ffc9d3e Add note about avoiding the `-i` flag for the /keys endpoint -- **PR** `#41660`_: (*garethgreenaway*) Fix to modules/aptpkg.py for unheld - @ *2017-06-09T14:53:23Z* +* **ISSUE** `#41651`_: (`Sakorah`_) pkg.installed fails when unholding and test=true (refs: `#41660`_) + +* **PR** `#41660`_: (`garethgreenaway`_) Fix to modules/aptpkg.py for unheld + @ *2017-06-09 14:53:23 UTC* - - **ISSUE** `#41651`_: (*Sakorah*) pkg.installed fails when unholding and test=true - | refs: `#41660`_ * 38424f3e3e Merge pull request `#41660`_ from garethgreenaway/41651_fixing_aptpkg_held_unheld_with_test + * 30da2370a4 Fix when test=True and packages were being set to unheld. -- **PR** `#41656`_: (*rallytime*) Back-port `#41575`_ to 2016.11 - @ *2017-06-08T22:43:23Z* +* **PR** `#41656`_: (`rallytime`_) Back-port `#41575`_ to 2016.11 + @ *2017-06-08 22:43:23 UTC* + + * **PR** `#41575`_: (`dschaller`_) Fix 41562 (refs: `#41656`_) + + * a308b960d8 Merge pull request `#41656`_ from rallytime/bp-41575 - - **PR** `#41575`_: (*dschaller*) Fix 41562 - | refs: `#41656`_ - * a308b960d8 Merge pull request `#41656`_ from rallytime/`bp-41575`_ * 4374e6b034 Replace "tbd" with release version information * 81413896d1 Lint: Add index numbers to format {} calls * 384570384e only list top level npm modules during {un)install -- **PR** `#41456`_: (*bdrung*) Fix pkgrepo.managed always return changes for test=true - @ *2017-06-08T18:21:05Z* +* **PR** `#41456`_: (`bdrung`_) Fix pkgrepo.managed always return changes for test=true + @ *2017-06-08 18:21:05 UTC* * e6d37b5f3e Merge pull request `#41456`_ from bdrung/fix-pkgrepo.managed-changes-check + * d3ce7bf05f Fix pkgrepo.managed always return changes for test=true * 1592687294 Document aptpkg architectures parameter -- **PR** `#41530`_: (*gtmanfred*) Set default for consul_pillar to None - @ *2017-06-08T18:13:15Z* +* **ISSUE** `#41478`_: (`jf`_) security / information leak with consul pillar when subsitution values are not present (refs: `#41530`_) + +* **PR** `#41530`_: (`gtmanfred`_) Set default for consul_pillar to None + @ *2017-06-08 18:13:15 UTC* - - **ISSUE** `#41478`_: (*jf*) security / information leak with consul pillar when subsitution values are not present - | refs: `#41530`_ * 721e5b6cb9 Merge pull request `#41530`_ from gtmanfred/2016.11 + * 2a4633ce16 Set default for consul_pillar to None -- **PR** `#41638`_: (*gtmanfred*) don't overwrite args if they are passed to the script - @ *2017-06-08T17:48:48Z* +* **ISSUE** `#41629`_: (`lubyou`_) salt.states.cmd.script: Parameter "args" is overwritten if "name/id" contains spaces (refs: `#41638`_) + +* **PR** `#41638`_: (`gtmanfred`_) don't overwrite args if they are passed to the script + @ *2017-06-08 17:48:48 UTC* - - **ISSUE** `#41629`_: (*lubyou*) salt.states.cmd.script: Parameter "args" is overwritten if "name/id" contains spaces - | refs: `#41638`_ * 8926d1c731 Merge pull request `#41638`_ from gtmanfred/cmdscript + * 6c7d68b97d don't overwrite args if they are passed to the script -- **PR** `#41639`_: (*dmurphy18*) Update notrim check, netstat takes minutes if large number connections - @ *2017-06-07T23:03:24Z* +* **PR** `#41639`_: (`dmurphy18`_) Update notrim check, netstat takes minutes if large number connections + @ *2017-06-07 23:03:24 UTC* * ecb09b8694 Merge pull request `#41639`_ from dmurphy18/minion_netstat_check + * 7ab3319090 Update notrim check, netstat takes minutes if large number connections - 260K -- **PR** `#41611`_: (*garethgreenaway*) Additional fixes to states/saltmod.py - @ *2017-06-07T22:58:24Z* +* **ISSUE** `#38894`_: (`amendlik`_) salt.runner and salt.wheel ignore test=True (refs: `#41309`_, `#41611`_) + +* **PR** `#41611`_: (`garethgreenaway`_) Additional fixes to states/saltmod.py + @ *2017-06-07 22:58:24 UTC* - - **ISSUE** `#38894`_: (*amendlik*) salt.runner and salt.wheel ignore test=True - | refs: `#41309`_ `#41611`_ * 2913a33b27 Merge pull request `#41611`_ from garethgreenaway/41309_right_return_res + * fda41ede76 Updating result values to be None for test cases. * 003f2d9323 Following the documentation, when passed the test=True argument the runner and wheel functions should return a result value of False. -- **PR** `#41637`_: (*gtmanfred*) never run bg for onlyif or unless cmd states - @ *2017-06-07T17:37:47Z* +* **ISSUE** `#41626`_: (`ruiaylin`_) When onlyif and bg are used together the (refs: `#41637`_) + +* **PR** `#41637`_: (`gtmanfred`_) never run bg for onlyif or unless cmd states + @ *2017-06-07 17:37:47 UTC* - - **ISSUE** `#41626`_: (*ruiaylin*) When onlyif and bg are used together the - | refs: `#41637`_ * 334a5fc2a0 Merge pull request `#41637`_ from gtmanfred/cmd + * 40fb6c6249 never run bg for onlyif or unless cmd states -- **PR** `#41255`_: (*lordcirth*) linux_syctl.default_config(): only return path, don't create it - @ *2017-06-07T14:13:07Z* +* **PR** `#41255`_: (`lordcirth`_) linux_syctl.default_config(): only return path, don't create it + @ *2017-06-07 14:13:07 UTC* * 34dd9ea862 Merge pull request `#41255`_ from lordcirth/fix-sysctl-test-11 + * 0089be4440 linux_sysctl: use dirname() as suggested * 262d95e41d linux_syctl.default_config(): only return path, don't create it * 277232b3ac linux_sysctl.persist(): create config dir if needed -- **PR** `#41616`_: (*rallytime*) Back-port `#41551`_ to 2016.11 - @ *2017-06-06T22:44:09Z* +* **ISSUE** `#35481`_: (`giany`_) global_identifier does not work when using Softlayer driver (refs: `#41551`_) + +* **PR** `#41616`_: (`rallytime`_) Back-port `#41551`_ to 2016.11 + @ *2017-06-06 22:44:09 UTC* + + * **PR** `#41551`_: (`darenjacobs`_) Update __init__.py (refs: `#41616`_) + + * 4cf577771b Merge pull request `#41616`_ from rallytime/bp-41551 - - **ISSUE** `#35481`_: (*giany*) global_identifier does not work when using Softlayer driver - | refs: `#41551`_ `#41551`_ - - **PR** `#41551`_: (*darenjacobs*) Update __init__.py - | refs: `#41616`_ - * 4cf577771b Merge pull request `#41616`_ from rallytime/`bp-41551`_ * 53bca96328 Update __init__.py -- **PR** `#41552`_: (*Enquier*) Adding logic so that update_floatingip can dissassociate floatingip's - @ *2017-06-06T18:25:56Z* +* **PR** `#41552`_: (`Enquier`_) Adding logic so that update_floatingip can dissassociate floatingip's + @ *2017-06-06 18:25:56 UTC* * 846ca54688 Merge pull request `#41552`_ from Enquier/neutron-floatingip-remove + * aeed51c1e3 Adding port=None default and documentation * fcce05e1e4 Adding logic so that update_floatingip can dissassociate floatingip's Previously update_floatingip would cause an error if port is set to None. -- **PR** `#41569`_: (*gtmanfred*) Check all entries in result - @ *2017-06-06T18:18:17Z* +* **PR** `#41569`_: (`gtmanfred`_) Check all entries in result + @ *2017-06-06 18:18:17 UTC* * b720ecb732 Merge pull request `#41569`_ from gtmanfred/fix_test_result_check + * 19ea5481b6 remove test that never passed * e2a4d5e1e2 Check all entries in result -- **PR** `#41599`_: (*garethgreenaway*) Fixes to modules/archive.py - @ *2017-06-06T18:02:14Z* +* **ISSUE** `#41540`_: (`UtahDave`_) archive.extracted fails on second run (refs: `#41599`_) + +* **PR** `#41599`_: (`garethgreenaway`_) Fixes to modules/archive.py + @ *2017-06-06 18:02:14 UTC* - - **ISSUE** `#41540`_: (*UtahDave*) archive.extracted fails on second run - | refs: `#41599`_ `#41599`_ * d9546c6283 Merge pull request `#41599`_ from garethgreenaway/41540_fixes_to_archive_module + * 66a136e6d8 Fixing issues raised in `#41540`_ when a zip file is created on a Windows system. The issue has two parts, first directories that end up in the archive end up in the results of aarchive.list twice as they show up as both files and directories because of the logic to handle the fact that Windows doesn't mark them as directories. This issue shows up when an extraction is run a second time since the module verified the file types and the subdirectory is not a file. The second issue is related to permissions, if Salt is told to extract permissions (which is the default) then the directory and files end up being unreadable since the permissions are not available. This change sets the permissions to what the default umask for the user running Salt is. -- **PR** `#41453`_: (*peter-funktionIT*) Update win_pki.py - @ *2017-06-06T17:15:55Z* +* **ISSUE** `#40950`_: (`idokaplan`_) Import certificate (refs: `#41453`_, `#41383`_) + +* **PR** `#41453`_: (`peter-funktionIT`_) Update win_pki.py + @ *2017-06-06 17:15:55 UTC* + + * **PR** `#41383`_: (`peter-funktionIT`_) Update win_pki.py (refs: `#41453`_) - - **ISSUE** `#40950`_: (*idokaplan*) Import certificate - | refs: `#41383`_ `#41453`_ - - **PR** `#41383`_: (*peter-funktionIT*) Update win_pki.py - | refs: `#41453`_ * 10ac80ee96 Merge pull request `#41453`_ from peter-funktionIT/fix_win_pki_state_import_cert + * d146fd029c Update win_pki.py * ef8e3ef569 Update win_pki.py -- **PR** `#41557`_: (*dmurphy18*) Add symbolic link for salt-proxy service similar to other service files - @ *2017-06-06T17:13:52Z* +* **PR** `#41557`_: (`dmurphy18`_) Add symbolic link for salt-proxy service similar to other serivce files + @ *2017-06-06 17:13:52 UTC* * 3335fcbc7d Merge pull request `#41557`_ from dmurphy18/fix-proxy-service + * ffe492d6a9 Add symbolic link salt-proxy service similar to other service files -- **PR** `#41597`_: (*rallytime*) Back-port `#41533`_ to 2016.11 - @ *2017-06-06T15:15:09Z* +* **PR** `#41597`_: (`rallytime`_) Back-port `#41533`_ to 2016.11 + @ *2017-06-06 15:15:09 UTC* + + * **PR** `#41533`_: (`svinota`_) unit tests: add pyroute2 interface dict test (refs: `#41597`_) + + * 65ed230f45 Merge pull request `#41597`_ from rallytime/bp-41533 - - **PR** `#41533`_: (*svinota*) unit tests: add pyroute2 interface dict test - | refs: `#41597`_ - * 65ed230f45 Merge pull request `#41597`_ from rallytime/`bp-41533`_ * 535b8e8d8e Update new pyroute2 unit test to conform with 2016.11 branch standards * 5c86dee73c unit tests: test_pyroute2 -- add skipIf @@ -540,159 +588,165 @@ Changes: * 1f507cfa7a unit tests: add pyroute2 interface dict test -- **PR** `#41596`_: (*rallytime*) Back-port `#41487`_ to 2016.11 - @ *2017-06-06T02:44:17Z* +* **PR** `#41596`_: (`rallytime`_) Back-port `#41487`_ to 2016.11 + @ *2017-06-06 02:44:17 UTC* + + * **PR** `#41487`_: (`svinota`_) clean up `change` attribute from interface dict (refs: `#41596`_) + + * bf8aed153d Merge pull request `#41596`_ from rallytime/bp-41487 - - **PR** `#41487`_: (*svinota*) clean up `change` attribute from interface dict - | refs: `#41596`_ - * bf8aed153d Merge pull request `#41596`_ from rallytime/`bp-41487`_ * 7b497d9ec6 clean up `change` attribute from interface dict -- **PR** `#41509`_: (*seanjnkns*) Add keystone V3 API support for keystone.endpoint_present|absent - @ *2017-06-03T03:01:05Z* +* **ISSUE** `#41435`_: (`seanjnkns`_) 2016.11: Keystone.endpoint_present overwrites all interfaces (refs: `#41509`_) + +* **PR** `#41509`_: (`seanjnkns`_) Add keystone V3 API support for keystone.endpoint_present|absent + @ *2017-06-03 03:01:05 UTC* - - **ISSUE** `#41435`_: (*seanjnkns*) 2016.11: Keystone.endpoint_present overwrites all interfaces - | refs: `#41509`_ * cc6c98a8d8 Merge pull request `#41509`_ from seanjnkns/fix-keystone-v3-endpoint_present + * 095e5949a3 Fix unit tests for PR `#41509`_ * eb7ef3c856 Add keystone V3 API support for keystone.endpoint_present|get, endpoint_absent|delete. -- **PR** `#41539`_: (*gtmanfred*) allow digest to be empty in create_crl - @ *2017-06-02T17:00:04Z* +* **ISSUE** `#38061`_: (`Ch3LL`_) x509.crl_managed ValueError when digest is not specified in the module (refs: `#41539`_) + +* **PR** `#41539`_: (`gtmanfred`_) allow digest to be empty in create_crl + @ *2017-06-02 17:00:04 UTC* - - **ISSUE** `#38061`_: (*Ch3LL*) x509.crl_managed ValueError when digest is not specified in the module - | refs: `#41539`_ * 0a08649637 Merge pull request `#41539`_ from gtmanfred/x509 + * 0989be8919 allow digest to be empty in create_crl -- **PR** `#41561`_: (*terminalmage*) Redact HTTP basic authentication in archive.extracted - @ *2017-06-02T15:33:14Z* +* **ISSUE** `#41154`_: (`mephi42`_) archive.extracted outputs password embedded in archive URL (refs: `#41561`_) + +* **PR** `#41561`_: (`terminalmage`_) Redact HTTP basic authentication in archive.extracted + @ *2017-06-02 15:33:14 UTC* - - **ISSUE** `#41154`_: (*mephi42*) archive.extracted outputs password embedded in archive URL - | refs: `#41561`_ * 3ae8336895 Merge pull request `#41561`_ from terminalmage/issue41154 + * cbf8acbafc Redact HTTP basic authentication in archive.extracted -- **PR** `#41436`_: (*skizunov*) TCP transport: Fix occasional errors when using salt command - | refs: `#41787`_ `#41787`_ `#41787`_ - @ *2017-06-01T16:37:43Z* +* **PR** `#41436`_: (`skizunov`_) TCP transport: Fix occasional errors when using salt command (refs: `#41787`_) + @ *2017-06-01 16:37:43 UTC* * 39840bfe4e Merge pull request `#41436`_ from skizunov/develop2 + * 07d5862773 unit.transport.tcp_test: Clean up channel after use * 4b6aec7154 Preserve original IO Loop on cleanup * 892c6d4d24 TCP transport: Fix occasional errors when using salt command -- **PR** `#41337`_: (*Foxlik*) Fix `#41335`_ - list index out of range on empty line in authorized_keys - @ *2017-05-31T19:59:17Z* +* **ISSUE** `#41335`_: (`syphernl`_) [2016.11.5] ssh_auth.present: IndexError: list index out of range (refs: `#41337`_) + +* **PR** `#41337`_: (`Foxlik`_) Fix `#41335`_ - list index out of range on empty line in authorized_keys + @ *2017-05-31 19:59:17 UTC* - - **ISSUE** `#41335`_: (*syphernl*) [2016.11.5] ssh_auth.present: IndexError: list index out of range - | refs: `#41337`_ * 06ed4f077b Merge pull request `#41337`_ from Foxlik/2016.11 + * 916fecb64f modify ssh_test.py, to check empty lines and comments in authorized_keys `#41335`_ * 011d6d65e7 Fix `#41335`_ - list index out of range on empty line in authorized_keys -- **PR** `#41512`_: (*twangboy*) Use psutil where possible in win_status.py - @ *2017-05-31T19:56:00Z* +* **PR** `#41512`_: (`twangboy`_) Use psutil where possible in win_status.py + @ *2017-05-31 19:56:00 UTC* * 1ace72d871 Merge pull request `#41512`_ from twangboy/fix_win_status + * 582d09b484 Get psutil import * fd88bb277f Remove unused imports (lint) * 41a39dff00 Use psutil where possible -- **PR** `#41490`_: (*t0fik*) Backport of SELinux module installation and removal - @ *2017-05-31T19:38:00Z* +* **PR** `#41490`_: (`t0fik`_) Backport of SELinux module installation and removal + @ *2017-05-31 19:38:00 UTC* * 683cc5f414 Merge pull request `#41490`_ from jdsieci/2016.11_selinux + * e2fbada1c1 Backport of SELinux module installation and removal -- **PR** `#41522`_: (*jettero*) Sadly, you can't have '.'s and '$'s in dict keys in a mongodb doc. - @ *2017-05-31T15:55:24Z* +* **PR** `#41522`_: (`jettero`_) Sadly, you can't have '.'s and '$'s in dict keys in a mongodb doc. + @ *2017-05-31 15:55:24 UTC* * 2e7e84b8f2 Merge pull request `#41522`_ from jettero/mongodb-keys-are-stupid + * 12648f5439 dang, thought I already got that. Apparently only got the bottom one. This should do it. * 7c4a763518 ugh, forgot about this lint too. This one looks especially terrible. - * c973988d8d forgot about the linter pass … fixed + * c973988d8d forgot about the linter pass … fixed * da0d9e4045 Sadly, you can't have '.'s and '$'s in dict keys in a mongodb doc. -- **PR** `#41506`_: (*gtmanfred*) check for integer types - @ *2017-05-31T00:48:21Z* +* **ISSUE** `#41504`_: (`mtkennerly`_) Can't set REG_DWORD registry value larger than 0x7FFFFFFF (refs: `#41506`_) + +* **PR** `#41506`_: (`gtmanfred`_) check for integer types + @ *2017-05-31 00:48:21 UTC* - - **ISSUE** `#41504`_: (*mtkennerly*) Can't set REG_DWORD registry value larger than 0x7FFFFFFF - | refs: `#41506`_ * 30ad4fd9a0 Merge pull request `#41506`_ from gtmanfred/2016.11 + * 5fe2e9bbf5 check for integer types -- **PR** `#41469`_: (*Ch3LL*) Fix keep_jobs keyerror in redis returner - @ *2017-05-30T18:37:42Z* +* **PR** `#41469`_: (`Ch3LL`_) Fix keep_jobs keyerror in redis returner + @ *2017-05-30 18:37:42 UTC* * 06ef17dec3 Merge pull request `#41469`_ from Ch3LL/fix_redis_error + * 8ee1251a3a Fix keep_jobs keyerror in redis returner -- **PR** `#41473`_: (*twangboy*) Fix win_firewall execution and state modules - @ *2017-05-30T18:35:24Z* +* **PR** `#41473`_: (`twangboy`_) Fix win_firewall execution and state modules + @ *2017-05-30 18:35:24 UTC* * 7a09b2b678 Merge pull request `#41473`_ from twangboy/fix_win_firewall + * e503b455c3 Fix lint error * d3f0f8bcd2 Fix win_firewall execution and state modules -- **PR** `#41499`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-05-30T18:06:03Z* +* **PR** `#41499`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-05-30 18:06:03 UTC* - - **PR** `#41439`_: (*terminalmage*) base64 encode binary data sent using salt-cp * f635cb11c4 Merge pull request `#41499`_ from rallytime/merge-2016.11 + * 20d893d397 Merge branch '2016.3' into '2016.11' * 964b1ee027 Merge pull request `#41439`_ from terminalmage/salt-cp-base64 * ebf6cc78c7 base64 encode binary data sent using salt-cp -- **PR** `#41464`_: (*rallytime*) Back-port `#39850`_ to 2016.11 - @ *2017-05-26T21:22:44Z* +* **PR** `#41464`_: (`rallytime`_) Back-port `#39850`_ to 2016.11 + @ *2017-05-26 21:22:44 UTC* + + * **PR** `#39850`_: (`epcim`_) Fix endpoint handling per region (refs: `#41464`_) + + * 83f1e48241 Merge pull request `#41464`_ from rallytime/bp-39850 - - **ISSUE** `#35874`_: (*epcim*) keystone.endpoint_present deletes RegionOne endpoints - - **PR** `#39850`_: (*epcim*) Fix endpoint handling per region - | refs: `#41464`_ - * 83f1e48241 Merge pull request `#41464`_ from rallytime/`bp-39850`_ * 9b84b751b2 Pylint fixes * 6db8915021 Endpoint handling per region, fixes `#35874`_ - extend tests for multiple regions - region arg by default set to None - print verbose changes to be exec. -- **PR** `#41443`_: (*UtahDave*) use proper arg number - @ *2017-05-26T20:36:37Z* +* **PR** `#41443`_: (`UtahDave`_) use proper arg number + @ *2017-05-26 20:36:37 UTC* * 960c5767fa Merge pull request `#41443`_ from UtahDave/fix_args_masterpy + * dfbdc275ca use proper arg number -- **PR** `#41350`_: (*lorengordon*) Supports quoted values in /etc/sysconfig/network - @ *2017-05-26T16:22:03Z* +* **ISSUE** `#41341`_: (`lorengordon`_) TypeError traceback in network.system with retain_settings=True (refs: `#41350`_) + +* **PR** `#41350`_: (`lorengordon`_) Supports quoted values in /etc/sysconfig/network + @ *2017-05-26 16:22:03 UTC* - - **ISSUE** `#41341`_: (*lorengordon*) TypeError traceback in network.system with retain_settings=True - | refs: `#41350`_ * 88c28c18c3 Merge pull request `#41350`_ from lorengordon/issue-41341 + * f2f6da7039 Supports quoted values in /etc/sysconfig/network -- **PR** `#41398`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-05-26T15:17:49Z* +* **PR** `#41398`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-05-26 15:17:49 UTC* - - **ISSUE** `#41234`_: (*non7top*) rpm fails to detect already installed packages - | refs: `#41265`_ - - **ISSUE** `#16592`_: (*spo0nman*) salt-cp fails with large files, cp.get_file succeeds - | refs: `#41216`_ - - **ISSUE** `#22`_: (*thatch45*) Make as many modules as we can think of - - **PR** `#41316`_: (*Ch3LL*) [2016.3] Bump latest release version to 2016.11.5 - - **PR** `#41265`_: (*terminalmage*) yumpkg: fix latest_version() when showdupesfromrepos=1 set in /etc/yum.conf - - **PR** `#41216`_: (*terminalmage*) Make salt-cp work with larger files * 824f2d3b69 Merge pull request `#41398`_ from rallytime/merge-2016.11 + * 2941e9c923 Merge pull request `#22`_ from terminalmage/merge-2016.11 * 087a958afc base64 encode binary data sent using salt-cp @@ -721,24 +775,26 @@ Changes: * fc401c9eb4 Add generator functions for reading files -- **PR** `#41442`_: (*UtahDave*) use proper arg number - @ *2017-05-26T13:42:50Z* +* **PR** `#41442`_: (`UtahDave`_) use proper arg number + @ *2017-05-26 13:42:50 UTC* * ec08064b99 Merge pull request `#41442`_ from UtahDave/fix_args + * 0324833c9e use proper arg number -- **PR** `#41397`_: (*Enquier*) Updating Nova/Neutron modules to support KeystoneAuth and SSLVerify - @ *2017-05-25T21:16:14Z* +* **ISSUE** `#37824`_: (`dxiri`_) SSLError Trying to use v3 API of Openstack Newton as provider. (refs: `#41397`_, `#40752`_) + +* **ISSUE** `#36548`_: (`abonillasuse`_) openstack auth with nova driver (refs: `#38647`_) + +* **PR** `#41397`_: (`Enquier`_) Updating Nova/Neutron modules to support KeystoneAuth and SSLVerify + @ *2017-05-25 21:16:14 UTC* + + * **PR** `#40752`_: (`Enquier`_) Add ability to specify a custom SSL certificate or disable SSL verification in KeystoneAuth v3 (refs: `#41397`_) + + * **PR** `#38647`_: (`gtmanfred`_) Allow novaclient to use keystoneauth1 sessions for authentication (refs: `#41397`_) - - **ISSUE** `#37824`_: (*dxiri*) SSLError Trying to use v3 API of Openstack Newton as provider. - | refs: `#41397`_ `#40752`_ - - **ISSUE** `#36548`_: (*abonillasuse*) openstack auth with nova driver - | refs: `#38647`_ - - **PR** `#40752`_: (*Enquier*) Add ability to specify a custom SSL certificate or disable SSL verification in KeystoneAuth v3 - | refs: `#41397`_ - - **PR** `#38647`_: (*gtmanfred*) Allow novaclient to use keystoneauth1 sessions for authentication - | refs: `#41397`_ * 22096d9213 Merge pull request `#41397`_ from Enquier/neutron-ssl-verify + * d25dcf61d5 Small error in nova that was preventing execution * 0e7a1009ed Updated module docs to include changes made @@ -753,14 +809,15 @@ Changes: * 66ab1e5184 Re-adding neutron dependency check - * cce07eefc2 Updating Neutron module to support KeystoneAuth + * cce07eefc2 Updating Neutron module to suport KeystoneAuth -- **PR** `#41409`_: (*garethgreenaway*) Fixes to ipc transport - @ *2017-05-25T21:06:27Z* +* **ISSUE** `#34460`_: (`Ch3LL`_) Receive an error when using salt-api to call a runner (refs: `#41409`_) + +* **PR** `#41409`_: (`garethgreenaway`_) Fixes to ipc transport + @ *2017-05-25 21:06:27 UTC* - - **ISSUE** `#34460`_: (*Ch3LL*) Receive an error when using salt-api to call a runner - | refs: `#41409`_ * 14a58cf536 Merge pull request `#41409`_ from garethgreenaway/34460_fixes_ipc_transport + * 5613b72dfe Updating the exception variable to be more in line with the rest of the exception code * 41eee8b333 Fixing a potential lint issue @@ -773,102 +830,115 @@ Changes: * f3a6531a69 On occasion an exception will occur which results in the event not returning properly, even though the wire_bytes is correctly populated. In this situation, we log to trace and continue. `#34460`_ -- **PR** `#41421`_: (*UtahDave*) Correct doc to actually blacklist a module - @ *2017-05-25T21:01:46Z* +* **PR** `#41421`_: (`UtahDave`_) Correct doc to actually blacklist a module + @ *2017-05-25 21:01:46 UTC* * 824428700d Merge pull request `#41421`_ from UtahDave/fix_blacklist_docs + * 5eb27571a0 Correct doc to actually blacklist a module -- **PR** `#41431`_: (*terminalmage*) Fix regression in state orchestration - @ *2017-05-25T18:44:53Z* +* **ISSUE** `#41353`_: (`rmarchei`_) Orchestrate runner needs saltenv on 2016.11.5 (refs: `#41431`_) + +* **PR** `#41431`_: (`terminalmage`_) Fix regression in state orchestration + @ *2017-05-25 18:44:53 UTC* - - **ISSUE** `#41353`_: (*rmarchei*) Orchestrate runner needs saltenv on 2016.11.5 - | refs: `#41431`_ * b98d5e00d4 Merge pull request `#41431`_ from terminalmage/issue41353 + * 16eae64cca Fix regression in state orchestration -- **PR** `#41429`_: (*ricohouse*) Issue `#41338`_: Return false when compare config fails - @ *2017-05-25T17:18:02Z* +* **ISSUE** `#41338`_: (`ricohouse`_) Exception not raised when running config compare and the device (Juniper) returns error (refs: `#41429`_) + +* **PR** `#41429`_: (`ricohouse`_) Issue `#41338`_: Return false when compare config fails + @ *2017-05-25 17:18:02 UTC* - - **ISSUE** `#41338`_: (*ricohouse*) Exception not raised when running config compare and the device (Juniper) returns error - | refs: `#41429`_ * eeff3dd7fb Merge pull request `#41429`_ from ricohouse/fix-compare-bug + * 9b61665c4c Issue `#41338`_: Return false when compare config fails -- **PR** `#41414`_: (*Ch3LL*) Update bootstrap script verstion to latest release(v2017.05.24) - @ *2017-05-24T19:51:49Z* +* **PR** `#41414`_: (`Ch3LL`_) Update bootstrap script verstion to latest release(v2017.05.24) + @ *2017-05-24 19:51:49 UTC* * 561a416cf3 Merge pull request `#41414`_ from Ch3LL/update_bootstrap + * d8c03eef60 Update bootstrap script verstion to latest release(v2017.05.24) -- **PR** `#41336`_: (*mcalmer*) fix setting and getting locale on SUSE systems - @ *2017-05-24T17:46:08Z* +* **PR** `#41336`_: (`mcalmer`_) fix setting and getting locale on SUSE systems + @ *2017-05-24 17:46:08 UTC* * 88fd3c0ed9 Merge pull request `#41336`_ from mcalmer/fix-locale-on-SUSE + * f30f5c8a25 fix unit tests * 428baa9bce fix setting and getting locale on SUSE systems -- **PR** `#41393`_: (*rallytime*) Back-port `#41235`_ to 2016.11 - @ *2017-05-24T16:08:56Z* +* **PR** `#41393`_: (`rallytime`_) Back-port `#41235`_ to 2016.11 + @ *2017-05-24 16:08:56 UTC* + + * **PR** `#41235`_: (`moio`_) rest_cherrypy: remove sleep call (refs: `#41393`_) + + * 4265959647 Merge pull request `#41393`_ from rallytime/bp-41235 - - **PR** `#41235`_: (*moio*) rest_cherrypy: remove sleep call - | refs: `#41393`_ - * 4265959647 Merge pull request `#41393`_ from rallytime/`bp-41235`_ * c79c0e3f43 rest_cherrypy: remove sleep call -- **PR** `#41394`_: (*rallytime*) Back-port `#41243`_ to 2016.11 - @ *2017-05-24T16:00:17Z* +* **PR** `#41394`_: (`rallytime`_) Back-port `#41243`_ to 2016.11 + @ *2017-05-24 16:00:17 UTC* + + * **PR** `#41243`_: (`arif-ali`_) Remove the keys that don't exist in the new change (refs: `#41394`_) + + * 83f54694f9 Merge pull request `#41394`_ from rallytime/bp-41243 - - **PR** `#41243`_: (*arif-ali*) Remove the keys that don't exist in the new change - | refs: `#41394`_ - * 83f54694f9 Merge pull request `#41394`_ from rallytime/`bp-41243`_ * a5351302af Lint fix * 05fadc0af3 Remove the keys that don't exist in the new change -- **PR** `#41401`_: (*bdrung*) Add documentation key to systemd service files - @ *2017-05-24T15:49:54Z* +* **PR** `#41401`_: (`bdrung`_) Add documentation key to systemd service files + @ *2017-05-24 15:49:54 UTC* * 3a45ac30f0 Merge pull request `#41401`_ from bdrung/systemd-service-documentation-key + * 3f7f30895d Add documentation key to systemd service files -- **PR** `#41404`_: (*bdrung*) Fix typos - @ *2017-05-24T14:42:44Z* +* **PR** `#41404`_: (`bdrung`_) Fix typos + @ *2017-05-24 14:42:44 UTC* * d34333c30b Merge pull request `#41404`_ from bdrung/fix-typos + * 33a7f8b2ec Fix typos -- **PR** `#41388`_: (*bdrung*) Do not require sphinx-build for cleaning docs - @ *2017-05-23T19:32:41Z* +* **PR** `#41388`_: (`bdrung`_) Do not require sphinx-build for cleaning docs + @ *2017-05-23 19:32:41 UTC* * 3083764195 Merge pull request `#41388`_ from bdrung/clean-doc-without-sphinx + * 5b79a0a9f8 Do not require sphinx-build for cleaning docs -- **PR** `#41364`_: (*automate-solutions*) Fix issue `#41362`_ invalid parameter used: KeyName.1 instead of KeyName - @ *2017-05-23T17:32:10Z* +* **ISSUE** `#41362`_: (`automate-solutions`_) On AWS EC2: salt-cloud -f delete_keypair ec2 keyname=mykeypair doesn't delete the keypair (refs: `#41364`_) + +* **PR** `#41364`_: (`automate-solutions`_) Fix issue `#41362`_ invalid parameter used: KeyName.1 instead of KeyName + @ *2017-05-23 17:32:10 UTC* - - **ISSUE** `#41362`_: (*automate-solutions*) On AWS EC2: salt-cloud -f delete_keypair ec2 keyname=mykeypair doesn't delete the keypair * 842875e590 Merge pull request `#41364`_ from automate-solutions/fix-issue-41362 + * cfd8eb7a87 Set DescribeKeyPairs back to KeyName.1 according to documentation * 6a82ddc6fc Fix issue `#41362`_ invalid parameter used: KeyName.1 instead of KeyName -- **PR** `#41383`_: (*peter-funktionIT*) Update win_pki.py - | refs: `#41453`_ - @ *2017-05-23T17:26:43Z* +* **ISSUE** `#40950`_: (`idokaplan`_) Import certificate (refs: `#41453`_, `#41383`_) + +* **PR** `#41383`_: (`peter-funktionIT`_) Update win_pki.py (refs: `#41453`_) + @ *2017-05-23 17:26:43 UTC* - - **ISSUE** `#40950`_: (*idokaplan*) Import certificate - | refs: `#41383`_ `#41453`_ * 92f94e66bc Merge pull request `#41383`_ from peter-funktionIT/fix-win_pki-get_cert_file + * 4d9bd06176 Update win_pki.py -- **PR** `#41113`_: (*cro*) Rescue proxy_auto_tests PR from git rebase hell - @ *2017-05-22T17:05:07Z* +* **PR** `#41113`_: (`cro`_) Rescue proxy_auto_tests PR from git rebase hell + @ *2017-05-22 17:05:07 UTC* + + * **PR** `#39575`_: (`cro`_) WIP: Proxy auto test, feedback appreciated (refs: `#41113`_) - - **PR** `#39575`_: (*cro*) WIP: Proxy auto test, feedback appreciated - | refs: `#41113`_ * 1ba95684a9 Merge pull request `#41113`_ from cro/proxy_auto_test2 + * 19db038b99 Fix test--use proxy_config instead of minion_config * 7749ceadb6 Change default proxy minion opts so only the proxy-specific ones are listed, and the rest are taken from DEFAULT_MINION_OPTS. @@ -877,18 +947,20 @@ Changes: * 3be90cc9f4 Rescue proxy_auto_tests PR from git rebase hell -- **PR** `#41360`_: (*cro*) Sysrc on FreeBSD, YAML overeager to coerce to bool and int - @ *2017-05-22T15:54:31Z* +* **PR** `#41360`_: (`cro`_) Sysrc on FreeBSD, YAML overeager to coerce to bool and int + @ *2017-05-22 15:54:31 UTC* * 375892d910 Merge pull request `#41360`_ from cro/sysrc_fix + * 6db31ce52a Fix problem with sysrc on FreeBSD, YAML overeager to coerce to bool and int. -- **PR** `#41372`_: (*terminalmage*) Don't use intermediate file when listing contents of tar.xz file - @ *2017-05-22T15:36:45Z* +* **ISSUE** `#41190`_: (`jheidbrink`_) Cannot extract tar.xz archive when it exceeds size of /tmp (refs: `#41372`_) + +* **PR** `#41372`_: (`terminalmage`_) Don't use intermediate file when listing contents of tar.xz file + @ *2017-05-22 15:36:45 UTC* - - **ISSUE** `#41190`_: (*jheidbrink*) Cannot extract tar.xz archive when it exceeds size of /tmp - | refs: `#41372`_ * 01b71c75c1 Merge pull request `#41372`_ from terminalmage/issue41190 + * 1f08936d9c Remove unused import * 68cb897520 Replace reference to fileobj @@ -897,64 +969,72 @@ Changes: * 3d4b833627 Don't use intermediate file when listing contents of tar.xz file -- **PR** `#41373`_: (*alex-zel*) Allow HTTP authentication to ES. - @ *2017-05-22T15:32:09Z* +* **PR** `#41373`_: (`alex-zel`_) Allow HTTP authentication to ES. + @ *2017-05-22 15:32:09 UTC* * 5edfcf972c Merge pull request `#41373`_ from alex-zel/patch-3 + * 3192eab128 Allow HTTP authentication to ES. -- **PR** `#41287`_: (*garethgreenaway*) Fix to consul cache - @ *2017-05-19T18:32:56Z* +* **ISSUE** `#40748`_: (`djhaskin987`_) Consul backend minion cache does not work (refs: `#41287`_) + +* **PR** `#41287`_: (`garethgreenaway`_) Fix to consul cache + @ *2017-05-19 18:32:56 UTC* - - **ISSUE** `#40748`_: (*djhaskin987*) Consul backend minion cache does not work - | refs: `#41287`_ * 29bd7f48b7 Merge pull request `#41287`_ from garethgreenaway/40748_2016_11_consul + * 5039fe12fb Removing chdir as it is no needed with this change * 4550c3ce49 Updating the code that is pulling in the list of cached minions to use self.cache.list instead of relying on checking the local file system, which only works for the localfs cache method. `#40748`_ -- **PR** `#41309`_: (*garethgreenaway*) Adding test argument for runners & wheel orchestration modules - @ *2017-05-19T18:26:09Z* +* **ISSUE** `#38894`_: (`amendlik`_) salt.runner and salt.wheel ignore test=True (refs: `#41309`_, `#41611`_) + +* **PR** `#41309`_: (`garethgreenaway`_) Adding test argument for runners & wheel orchestration modules + @ *2017-05-19 18:26:09 UTC* - - **ISSUE** `#38894`_: (*amendlik*) salt.runner and salt.wheel ignore test=True - | refs: `#41309`_ `#41611`_ * 672aaa88d3 Merge pull request `#41309`_ from garethgreenaway/38894_allowing_test_argument + * e1a88e8bf7 Allowing test=True to be passed for salt.runner and salt.wheel when used with orchestration -- **PR** `#41319`_: (*lomeroe*) backport `#41307`_ to 2016.11, properly pack version numbers into single - @ *2017-05-19T18:25:00Z* +* **ISSUE** `#41306`_: (`lomeroe`_) win_lgpo does not properly pack group policy version number in gpt.ini (refs: `#41319`_, `#41307`_) + +* **PR** `#41319`_: (`lomeroe`_) backport `#41307`_ to 2016.11, properly pack version numbers into single + @ *2017-05-19 18:25:00 UTC* + + * **PR** `#41307`_: (`lomeroe`_) properly pack/unpack the verison numbers into a number (refs: `#41319`_) - - **ISSUE** `#41306`_: (*lomeroe*) win_lgpo does not properly pack group policy version number in gpt.ini - | refs: `#41319`_ `#41307`_ - - **PR** `#41307`_: (*lomeroe*) properly pack/unpack the version numbers into a number - | refs: `#41319`_ * 140b0427e1 Merge pull request `#41319`_ from lomeroe/bp_41307 + * 4f0aa577a5 backport 41307 to 2016.11, properly pack version numbers into single number -- **PR** `#41327`_: (*Ch3LL*) Add 2016.11.6 Release Notes - @ *2017-05-19T18:05:09Z* +* **PR** `#41327`_: (`Ch3LL`_) Add 2016.11.6 Release Notes + @ *2017-05-19 18:05:09 UTC* * 6bdb7cca7d Merge pull request `#41327`_ from Ch3LL/add_2016.11.6_release + * e5fc0aeb9c Add 2016.11.6 Release Notes -- **PR** `#41329`_: (*lorengordon*) Corrects versionadded for win_network.get_route - @ *2017-05-19T17:47:57Z* +* **PR** `#41329`_: (`lorengordon`_) Corrects versionadded for win_network.get_route + @ *2017-05-19 17:47:57 UTC* * 1faffd3932 Merge pull request `#41329`_ from lorengordon/doc-fix + * 3c471247f0 Corrects versionadded for win_network.get_route -- **PR** `#41322`_: (*Ch3LL*) Add patched packages warning to 2016.11.5 release notes - @ *2017-05-18T21:53:26Z* +* **PR** `#41322`_: (`Ch3LL`_) Add patched packages warning to 2016.11.5 release notes + @ *2017-05-18 21:53:26 UTC* * 6ca65592da Merge pull request `#41322`_ from Ch3LL/fix_release_2016.11.5_notes + * 9a1bf4205f fix url refs in rst * cde008ff77 Add patched packages warning to 2016.11.5 release notes -- **PR** `#41208`_: (*pkazmierczak*) Fix: zypper handling of multiple version packages - @ *2017-05-18T15:44:26Z* +* **PR** `#41208`_: (`pkazmierczak`_) Fix: zypper handling of multiple version packages + @ *2017-05-18 15:44:26 UTC* * 9f359d841f Merge pull request `#41208`_ from pkazmierczak/pkazmierczak-zypper-multiple-ver-pkgs + * d411a91676 Reverted back to cascading with statements for python 2.6 compat * 7204013653 Compacted with statements in the unit test. @@ -963,28 +1043,32 @@ Changes: * 5f952007f6 Fix: zypper handling of multiple version packages -- **PR** `#41317`_: (*Ch3LL*) [2016.11] Bump latest release version to 2016.11.5 - @ *2017-05-18T15:34:13Z* +* **PR** `#41317`_: (`Ch3LL`_) [2016.11] Bump latest release version to 2016.11.5 + @ *2017-05-18 15:34:13 UTC* * bcef99adb6 Merge pull request `#41317`_ from Ch3LL/update_latest_2016.11 + * cdb072c207 [2016.11] Bump latest release version to 2016.11.5 -- **PR** `#41232`_: (*axmetishe*) Add basic auth for SPM - @ *2017-05-17T19:08:56Z* +* **PR** `#41232`_: (`axmetishe`_) Add basic auth for SPM + @ *2017-05-17 19:08:56 UTC* * b8ddd7ee08 Merge pull request `#41232`_ from axmetishe/2016.11 + * 76104f23b4 Add basic auth for SPM -- **PR** `#41236`_: (*BenoitKnecht*) states: cron: show correct changes when using `special` - @ *2017-05-17T18:51:58Z* +* **PR** `#41236`_: (`BenoitKnecht`_) states: cron: show correct changes when using `special` + @ *2017-05-17 18:51:58 UTC* * 7bdb66d969 Merge pull request `#41236`_ from BenoitKnecht/2016.11 + * 33211d032e states: cron: show correct changes when using `special` -- **PR** `#41269`_: (*isbm*) Bugfix: Unable to use "127" as hostname for the Minion ID - @ *2017-05-17T18:31:15Z* +* **PR** `#41269`_: (`isbm`_) Bugfix: Unable to use "127" as hostname for the Minion ID + @ *2017-05-17 18:31:15 UTC* * 1c1e092f56 Merge pull request `#41269`_ from isbm/isbm-minion-id-127-name + * 5168ef8959 Add unit test for hostname can be started from 127 * 0d0354198b Harden to 127. IP part @@ -993,51 +1077,57 @@ Changes: * 65b03c667b Bugfix: unable to use 127 as hostname -- **PR** `#41289`_: (*garethgreenaway*) Fixing consul cache - @ *2017-05-17T16:54:12Z* +* **PR** `#41289`_: (`garethgreenaway`_) Fixing consul cache + @ *2017-05-17 16:54:12 UTC* * d0fa31d4ca Merge pull request `#41289`_ from garethgreenaway/2016_11_5_fix_consul_cache_ls + * 780a28c9a0 Swapping the order in the func_alias so the ls function is available. -- **PR** `#41303`_: (*lomeroe*) backport `#41301`_ -- properly convert packed string to decimal values - @ *2017-05-17T16:32:22Z* +* **ISSUE** `#41291`_: (`lomeroe`_) win_lgpo does not properly convert large decimal values in regpol data (refs: `#41301`_, `#41303`_) + +* **PR** `#41303`_: (`lomeroe`_) backport `#41301`_ -- properly convert packed string to decimal values + @ *2017-05-17 16:32:22 UTC* + + * **PR** `#41301`_: (`lomeroe`_) properly convert packed string to decimal values (refs: `#41303`_) + + * 6566648948 Merge pull request `#41303`_ from lomeroe/bp-41301 - - **ISSUE** `#41291`_: (*lomeroe*) win_lgpo does not properly convert large decimal values in regpol data - | refs: `#41301`_ `#41303`_ - - **PR** `#41301`_: (*lomeroe*) properly convert packed string to decimal values - | refs: `#41303`_ - * 6566648948 Merge pull request `#41303`_ from lomeroe/`bp-41301`_ * f4b93f9d9a properly convert packed string to decimal values -- **PR** `#41283`_: (*terminalmage*) Backport `#41251`_ to 2016.11 - @ *2017-05-16T18:01:17Z* +* **ISSUE** `#41231`_: (`kaihowl`_) PR `#30777`_ misses an update to the documentation for pkg.installed and hold:true (refs: `#41251`_) + +* **ISSUE** `#30733`_: (`ealphonse`_) version-controlled packages with hold: True can no longer be upgraded by salt (refs: `#30777`_) + +* **PR** `#41283`_: (`terminalmage`_) Backport `#41251`_ to 2016.11 + @ *2017-05-16 18:01:17 UTC* + + * **PR** `#41251`_: (`abednarik`_) Update apt module regarding upgrade against hold packages. (refs: `#41283`_) + + * **PR** `#30777`_: (`abednarik`_) Fix update apt hold pkgs (refs: `#41251`_) + + * 44598617be Merge pull request `#41283`_ from terminalmage/bp-41251 - - **ISSUE** `#41231`_: (*kaihowl*) PR `#30777`_ misses an update to the documentation for pkg.installed and hold:true - | refs: `#41251`_ - - **ISSUE** `#30733`_: (*ealphonse*) version-controlled packages with hold: True can no longer be upgraded by salt - | refs: `#30777`_ - - **PR** `#41251`_: (*abednarik*) Update apt module regarding upgrade against hold packages. - - **PR** `#30777`_: (*abednarik*) Fix update apt hold pkgs - | refs: `#41251`_ - * 44598617be Merge pull request `#41283`_ from terminalmage/`bp-41251`_ * ed03ca534f Update apt module regarding upgrade against hold packages. -- **PR** `#41181`_: (*gtmanfred*) add resolving extra flags to yum upgrade - @ *2017-05-16T04:07:47Z* +* **PR** `#41181`_: (`gtmanfred`_) add resolving extra flags to yum upgrade + @ *2017-05-16 04:07:47 UTC* * d8e9676fcf Merge pull request `#41181`_ from gtmanfred/2016.11 + * 2ca71713b1 use six and clean_kwargs * c9bf09a5a1 add resolving extra flags to yum upgrade -- **PR** `#41220`_: (*rallytime*) Back-port `#40246`_ to 2016.11 - @ *2017-05-15T17:59:38Z* +* **ISSUE** `#40177`_: (`eldadru`_) libcloud_dns state "global name '__salt__' is not defined" in salt.cmd runner (refs: `#40246`_) + +* **PR** `#41220`_: (`rallytime`_) Back-port `#40246`_ to 2016.11 + @ *2017-05-15 17:59:38 UTC* + + * **PR** `#40246`_: (`tonybaloney`_) Fix libcloud_dns state module bug (refs: `#41220`_) + + * 75942235f0 Merge pull request `#41220`_ from rallytime/bp-40246 - - **ISSUE** `#40177`_: (*eldadru*) libcloud_dns state "global name '__salt__' is not defined" in salt.cmd runner - | refs: `#40246`_ `#40246`_ - - **PR** `#40246`_: (*tonybaloney*) Fix libcloud_dns state module bug - | refs: `#41220`_ - * 75942235f0 Merge pull request `#41220`_ from rallytime/`bp-40246`_ * 79f1bb2bba Remove unused/duplicate imports leftover from merge-conflict resolution * 2f610680e5 remove unused imports @@ -1052,121 +1142,131 @@ Changes: * b3822e03fc add fixes for incorrectly importing modules directly instead of using __salt__ -- **PR** `#41244`_: (*cachedout*) Fix ipv6 nameserver grains - @ *2017-05-15T17:55:39Z* +* **ISSUE** `#41230`_: (`RealKelsar`_) 2016.11.5 IPv6 nameserver in resolv.conf leads to minion exception (refs: `#41244`_) + +* **ISSUE** `#40912`_: (`razed11`_) IPV6 Warning when ipv6 set to False (refs: `#40934`_) + +* **PR** `#41244`_: (`cachedout`_) Fix ipv6 nameserver grains + @ *2017-05-15 17:55:39 UTC* + + * **PR** `#40934`_: (`gtmanfred`_) Only display IPvX warning if role is master (refs: `#41244`_) - - **ISSUE** `#41230`_: (*RealKelsar*) 2016.11.5 IPv6 nameserver in resolv.conf leads to minion exception - | refs: `#41244`_ `#41244`_ - - **ISSUE** `#40912`_: (*razed11*) IPV6 Warning when ipv6 set to False - | refs: `#40934`_ - - **PR** `#40934`_: (*gtmanfred*) Only display IPvX warning if role is master - | refs: `#41244`_ `#41244`_ * 53d5b3e816 Merge pull request `#41244`_ from cachedout/fix_ipv6_nameserver_grains + * f745db1a43 Lint * 6e1ab69710 Partial revert of `#40934`_ * 88f49f9146 Revert "Only display IPvX warning if role is master" -- **PR** `#41242`_: (*pprkut*) Fix changing a mysql user to unix socket authentication. - @ *2017-05-15T17:00:06Z* +* **PR** `#41242`_: (`pprkut`_) Fix changing a mysql user to unix socket authentication. + @ *2017-05-15 17:00:06 UTC* * 895fe582eb Merge pull request `#41242`_ from M2Mobi/mysql_socket_auth + * 7d8359766d Fix changing a mysql user to unix socket authentication. -- **PR** `#41101`_: (*terminalmage*) Fix "latest" keyword for version specification when used with aggregation - @ *2017-05-15T16:52:35Z* +* **ISSUE** `#40940`_: (`djhaskin987`_) When `state_aggregate` is set to `True`, the `latest` keyword doesn't work with pkg.installed (refs: `#41101`_) + +* **PR** `#41101`_: (`terminalmage`_) Fix "latest" keyword for version specification when used with aggregation + @ *2017-05-15 16:52:35 UTC* - - **ISSUE** `#40940`_: (*djhaskin987*) When `state_aggregate` is set to `True`, the `latest` keyword doesn't work with pkg.installed - | refs: `#41101`_ * 50d8fde123 Merge pull request `#41101`_ from terminalmage/issue40940 + * 7fe64219ae Add rtag check to integration test for pkg.refresh_db * 88a08aa3bf Add comments to explain what removing the rtag file actually does * 92011dbe5f Fix "latest" keyword for version specification when used with aggregation -- **PR** `#41146`_: (*terminalmage*) gitfs: Backport performance fixes for getting tree objects - @ *2017-05-12T17:35:47Z* +* **ISSUE** `#34775`_: (`babilen`_) Please allow users to disable branch environment mapping in GitFS (refs: `#41144`_) + +* **PR** `#41146`_: (`terminalmage`_) gitfs: Backport performance fixes for getting tree objects + @ *2017-05-12 17:35:47 UTC* + + * **PR** `#41144`_: (`terminalmage`_) gitfs: Add two new options to affect saltenv mapping (refs: `#41146`_) - - **ISSUE** `#34775`_: (*babilen*) Please allow users to disable branch environment mapping in GitFS - | refs: `#41144`_ - - **PR** `#41144`_: (*terminalmage*) gitfs: Add two new options to affect saltenv mapping - | refs: `#41146`_ * 049712ba53 Merge pull request `#41146`_ from terminalmage/backport-get_tree-performance-improvement + * f9d6734afe gitfs: Backport performance fixes for getting tree objects -- **PR** `#41161`_: (*The-Loeki*) gpg renderer: fix gpg_keydir always reverting to default - @ *2017-05-12T17:19:07Z* +* **ISSUE** `#41135`_: (`shallot`_) gpg renderer doesn't seem to work with salt-ssh, tries to execute gpg on the minion? (refs: `#41161`_) + +* **PR** `#41161`_: (`The-Loeki`_) gpg renderer: fix gpg_keydir always reverting to default + @ *2017-05-12 17:19:07 UTC* - - **ISSUE** `#41135`_: (*shallot*) gpg renderer doesn't seem to work with salt-ssh, tries to execute gpg on the minion? - | refs: `#41161`_ * 4215a0b99d Merge pull request `#41161`_ from The-Loeki/2016.11 + * 24946fef18 gpg renderer: fix gpg_keydir always reverting to default -- **PR** `#41163`_: (*onlyanegg*) Elasticsearch - pass hosts and profile to index_exists() - @ *2017-05-12T17:18:06Z* +* **ISSUE** `#41162`_: (`onlyanegg`_) Elasticsearch module functions should pass hosts and profile to index_exists() (refs: `#41163`_) + +* **PR** `#41163`_: (`onlyanegg`_) Elasticsearch - pass hosts and profile to index_exists() + @ *2017-05-12 17:18:06 UTC* - - **ISSUE** `#41162`_: (*onlyanegg*) Elasticsearch module functions should pass hosts and profile to index_exists() - | refs: `#41163`_ * 5b10fc58ba Merge pull request `#41163`_ from onlyanegg/elasticsearch-pass_profile_to_index_exists + * 7f512c701b Pass hosts and profile to index_exists() method -- **PR** `#41186`_: (*jmarinaro*) Fix package name collisions in chocolatey state - @ *2017-05-12T17:01:31Z* +* **ISSUE** `#41185`_: (`jmarinaro`_) package name collisions in chocolatey state (refs: `#41186`_) + +* **PR** `#41186`_: (`jmarinaro`_) Fix package name collisions in chocolatey state + @ *2017-05-12 17:01:31 UTC* - - **ISSUE** `#41185`_: (*jmarinaro*) package name collisions in chocolatey state - | refs: `#41186`_ * d433cf850d Merge pull request `#41186`_ from jmarinaro/fix-chocolatey-package-collision + * 229f3bf9f3 apply changes to uninstalled function * ffd4c7ef04 Fix package name collisions in chocolatey state -- **PR** `#41189`_: (*github-abcde*) utils/minions.py: Fixed case where data is an empty dict resulting in… - @ *2017-05-12T16:32:25Z* +* **PR** `#41189`_: (`github-abcde`_) utils/minions.py: Fixed case where data is an empty dict resulting in… + @ *2017-05-12 16:32:25 UTC* * bb5ef41ce0 Merge pull request `#41189`_ from github-abcde/utils-minions-fix + * 853dc5406c utils/minions.py: Fixed case where data is an empty dict resulting in errors. -- **PR** `#41104`_: (*Ch3LL*) Add test to query results of /jobs call in api - @ *2017-05-10T20:11:08Z* +* **PR** `#41104`_: (`Ch3LL`_) Add test to query results of /jobs call in api + @ *2017-05-10 20:11:08 UTC* * b136b15330 Merge pull request `#41104`_ from Ch3LL/add_jobs_test + * dac16583b7 add test to query results of /jobs call in api -- **PR** `#41170`_: (*lomeroe*) Backport `#41081`_ to 2016.11 - @ *2017-05-10T19:58:52Z* +* **PR** `#41170`_: (`lomeroe`_) Backport `#41081`_ to 2016.11 + @ *2017-05-10 19:58:52 UTC* + + * **PR** `#41081`_: (`lomeroe`_) Update win_dns_client to use reg.read_value and set_value (refs: `#41170`_) + + * ca18b4df93 Merge pull request `#41170`_ from lomeroe/bp-41081 - - **PR** `#41081`_: (*lomeroe*) Update win_dns_client to use reg.read_value and set_value - | refs: `#41170`_ - * ca18b4df93 Merge pull request `#41170`_ from lomeroe/`bp-41081`_ * 2af89f2165 update mock data * b7fa115a59 update win_dns_client tests with correct module names * 4d05a22675 Update win_dns_client to use reg.read_value and set_value -- **PR** `#41173`_: (*twangboy*) Add silent action to MsgBox for Path Actions - @ *2017-05-10T19:57:06Z* +* **PR** `#41173`_: (`twangboy`_) Add silent action to MsgBox for Path Actions + @ *2017-05-10 19:57:06 UTC* * d7ec37b003 Merge pull request `#41173`_ from twangboy/fix_installer + * 24b11ffdc2 Add release notes * 96918dcfa6 Add silent action to MsgBox for Path Actions -- **PR** `#41158`_: (*Ch3LL*) 2016.11.5 release notes: add additional commits - @ *2017-05-09T22:41:40Z* +* **PR** `#41158`_: (`Ch3LL`_) 2016.11.5 release notes: add additional commits + @ *2017-05-09 22:41:40 UTC* * 88e93b7fe5 Merge pull request `#41158`_ from Ch3LL/update_2016.11.5 + * 28371aa035 2016.11.5 release notes: add additional commits -- **PR** `#41148`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-05-09T20:23:28Z* +* **PR** `#41148`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-05-09 20:23:28 UTC* - - **PR** `#41123`_: (*terminalmage*) Add note on lack of support for VSTS in older libssh2 releases. - - **PR** `#41122`_: (*terminalmage*) gitfs: refresh env cache during update in masterless - - **PR** `#41090`_: (*bbinet*) rdurations should be floats so that they can be summed when profiling * d2ae7deff2 Merge pull request `#41148`_ from rallytime/merge-2016.11 + * aba35e20dd Merge branch '2016.3' into '2016.11' * 2969153097 Merge pull request `#41122`_ from terminalmage/masterless-env_cache-fix @@ -1181,19 +1281,20 @@ Changes: * fd48a63653 rdurations should be floats so that they can be summed when profiling -- **PR** `#41147`_: (*rallytime*) Back-port `#39676`_ to 2016.11 - @ *2017-05-09T18:40:44Z* +* **PR** `#41147`_: (`rallytime`_) Back-port `#39676`_ to 2016.11 + @ *2017-05-09 18:40:44 UTC* + + * **PR** `#39676`_: (`F30`_) Fix comments about the "hash_type" option (refs: `#41147`_) + + * 2156395b2e Merge pull request `#41147`_ from rallytime/bp-39676 - - **PR** `#39676`_: (*F30*) Fix comments about the "hash_type" option - | refs: `#41147`_ - * 2156395b2e Merge pull request `#41147`_ from rallytime/`bp-39676`_ * 5b55fb2452 Fix comments about the "hash_type" option -- **PR** `#40852`_: (*isbm*) Isbm fix coregrains constants bsc`#1032931`_ - @ *2017-05-09T18:35:46Z* +* **PR** `#40852`_: (`isbm`_) Isbm fix coregrains constants bsc#1032931 + @ *2017-05-09 18:35:46 UTC* + + * a2f359fa13 Merge pull request `#40852`_ from isbm/isbm-fix-coregrains-constants-bsc#1032931 - - **ISSUE** `#1032931`_: (**) - * a2f359fa13 Merge pull request `#40852`_ from isbm/isbm-fix-coregrains-constants-bsc`#1032931`_ * f3b12a3f5b Do not use multiple variables in "with" statement as of lint issues * 35a8d99934 Disable the test for a while @@ -1266,41 +1367,42 @@ Changes: * 7a0e4be4f8 Add unit test for get_zone and various platforms -- **PR** `#41111`_: (*terminalmage*) Allow "ssl_verify: False" to work with pygit2 - @ *2017-05-09T17:56:12Z* +* **ISSUE** `#41105`_: (`terminalmage`_) ssl_verify gitfs/git_pillar option does not work with pygit2 (refs: `#41111`_) + +* **PR** `#41111`_: (`terminalmage`_) Allow "ssl_verify: False" to work with pygit2 + @ *2017-05-09 17:56:12 UTC* - - **ISSUE** `#41105`_: (*terminalmage*) ssl_verify gitfs/git_pillar option does not work with pygit2 - | refs: `#41111`_ * 6fa41dc89d Merge pull request `#41111`_ from terminalmage/issue41105 + * 8c6410e3cd Add notices about ssl_verify only working in 0.23.2 and newer * 98ce829729 Support ssl_verify in pygit2 * f73c4b7167 Add http(s) auth config docs for GitPython -- **PR** `#41008`_: (*cro*) Look in /opt/*/lib instead of just /opt/local/lib on Illumos distros. - @ *2017-05-09T16:56:00Z* +* **PR** `#41008`_: (`cro`_) Look in /opt/*/lib instead of just /opt/local/lib on Illumos distros. + @ *2017-05-09 16:56:00 UTC* * 81add1b944 Merge pull request `#41008`_ from cro/rsax_smos + * a4f7aa145e Look for libcrypto in both /opt/tools and /opt/local on Illumos-based distros. -- **PR** `#41124`_: (*gtmanfred*) add user_data to digitalocean - @ *2017-05-09T16:47:42Z* +* **PR** `#41124`_: (`gtmanfred`_) add user_data to digitalocean + @ *2017-05-09 16:47:42 UTC* * c649725e9b Merge pull request `#41124`_ from gtmanfred/do + * 2370d9316b add user_data to digital ocean -- **PR** `#41127`_: (*tmeneau*) Fix incorrect service.running state response when enable=None and init script returns 0 - @ *2017-05-09T16:43:35Z* +* **ISSUE** `#41125`_: (`tmeneau`_) service.running returns True if enable=None and init script returns 0 (refs: `#41127`_) + +* **PR** `#41127`_: (`tmeneau`_) Fix incorrect service.running state response when enable=None and init script returns 0 + @ *2017-05-09 16:43:35 UTC* + + * d0a3fcf33a Merge pull request `#41127`_ from xetus-oss/fix-41125-service-running - - **ISSUE** `#41125`_: (*tmeneau*) service.running returns True if enable=None and init script returns 0 - | refs: `#41127`_ - * d0a3fcf33a Merge pull request `#41127`_ from xetus-oss/`fix-41125`_-service-running * d8766562c9 fix incorrect service.running success response - -.. _`#1032931`: https://github.com/saltstack/salt/issues/1032931 -.. _`#16592`: https://github.com/saltstack/salt/issues/16592 .. _`#22`: https://github.com/saltstack/salt/issues/22 .. _`#30733`: https://github.com/saltstack/salt/issues/30733 .. _`#30777`: https://github.com/saltstack/salt/pull/30777 @@ -1311,7 +1413,6 @@ Changes: .. _`#35481`: https://github.com/saltstack/salt/issues/35481 .. _`#35874`: https://github.com/saltstack/salt/issues/35874 .. _`#36548`: https://github.com/saltstack/salt/issues/36548 -.. _`#37322`: https://github.com/saltstack/salt/issues/37322 .. _`#37824`: https://github.com/saltstack/salt/issues/37824 .. _`#38061`: https://github.com/saltstack/salt/issues/38061 .. _`#38647`: https://github.com/saltstack/salt/pull/38647 @@ -1379,7 +1480,6 @@ Changes: .. _`#41230`: https://github.com/saltstack/salt/issues/41230 .. _`#41231`: https://github.com/saltstack/salt/issues/41231 .. _`#41232`: https://github.com/saltstack/salt/pull/41232 -.. _`#41234`: https://github.com/saltstack/salt/issues/41234 .. _`#41235`: https://github.com/saltstack/salt/pull/41235 .. _`#41236`: https://github.com/saltstack/salt/pull/41236 .. _`#41242`: https://github.com/saltstack/salt/pull/41242 @@ -1454,7 +1554,7 @@ Changes: .. _`#41533`: https://github.com/saltstack/salt/pull/41533 .. _`#41539`: https://github.com/saltstack/salt/pull/41539 .. _`#41540`: https://github.com/saltstack/salt/issues/41540 -.. _`#41545`: https://github.com/saltstack/salt/issues/41545 +.. _`#41545`: https://github.com/saltstack/salt/pull/41545 .. _`#41551`: https://github.com/saltstack/salt/pull/41551 .. _`#41552`: https://github.com/saltstack/salt/pull/41552 .. _`#41557`: https://github.com/saltstack/salt/pull/41557 @@ -1524,25 +1624,85 @@ Changes: .. _`#41839`: https://github.com/saltstack/salt/pull/41839 .. _`#41857`: https://github.com/saltstack/salt/pull/41857 .. _`#41861`: https://github.com/saltstack/salt/pull/41861 -.. _`bp-39676`: https://github.com/saltstack/salt/pull/39676 -.. _`bp-39850`: https://github.com/saltstack/salt/pull/39850 -.. _`bp-40246`: https://github.com/saltstack/salt/pull/40246 -.. _`bp-41081`: https://github.com/saltstack/salt/pull/41081 -.. _`bp-41235`: https://github.com/saltstack/salt/pull/41235 -.. _`bp-41243`: https://github.com/saltstack/salt/pull/41243 -.. _`bp-41251`: https://github.com/saltstack/salt/pull/41251 -.. _`bp-41301`: https://github.com/saltstack/salt/pull/41301 -.. _`bp-41449`: https://github.com/saltstack/salt/pull/41449 -.. _`bp-41487`: https://github.com/saltstack/salt/pull/41487 -.. _`bp-41533`: https://github.com/saltstack/salt/pull/41533 -.. _`bp-41551`: https://github.com/saltstack/salt/pull/41551 -.. _`bp-41575`: https://github.com/saltstack/salt/pull/41575 -.. _`bp-41615`: https://github.com/saltstack/salt/pull/41615 -.. _`bp-41670`: https://github.com/saltstack/salt/pull/41670 -.. _`fix-40155`: https://github.com/saltstack/salt/issues/40155 -.. _`fix-40410`: https://github.com/saltstack/salt/issues/40410 -.. _`fix-40446`: https://github.com/saltstack/salt/issues/40446 -.. _`fix-40605`: https://github.com/saltstack/salt/issues/40605 -.. _`fix-40878`: https://github.com/saltstack/salt/issues/40878 -.. _`fix-41125`: https://github.com/saltstack/salt/issues/41125 -.. _`fix-41688`: https://github.com/saltstack/salt/issues/41688 +.. _`BenoitKnecht`: https://github.com/BenoitKnecht +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DarrenDai`: https://github.com/DarrenDai +.. _`Enquier`: https://github.com/Enquier +.. _`F30`: https://github.com/F30 +.. _`Foxlik`: https://github.com/Foxlik +.. _`RealKelsar`: https://github.com/RealKelsar +.. _`Sakorah`: https://github.com/Sakorah +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`UtahDave`: https://github.com/UtahDave +.. _`abednarik`: https://github.com/abednarik +.. _`abonillasuse`: https://github.com/abonillasuse +.. _`alex-zel`: https://github.com/alex-zel +.. _`amendlik`: https://github.com/amendlik +.. _`arif-ali`: https://github.com/arif-ali +.. _`automate-solutions`: https://github.com/automate-solutions +.. _`axmetishe`: https://github.com/axmetishe +.. _`babilen`: https://github.com/babilen +.. _`bdrung`: https://github.com/bdrung +.. _`cachedout`: https://github.com/cachedout +.. _`cro`: https://github.com/cro +.. _`darenjacobs`: https://github.com/darenjacobs +.. _`djhaskin987`: https://github.com/djhaskin987 +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`dschaller`: https://github.com/dschaller +.. _`dxiri`: https://github.com/dxiri +.. _`e-senthilkumar`: https://github.com/e-senthilkumar +.. _`ealphonse`: https://github.com/ealphonse +.. _`eldadru`: https://github.com/eldadru +.. _`epcim`: https://github.com/epcim +.. _`frogunder`: https://github.com/frogunder +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`giany`: https://github.com/giany +.. _`github-abcde`: https://github.com/github-abcde +.. _`grichmond-salt`: https://github.com/grichmond-salt +.. _`gstachowiak`: https://github.com/gstachowiak +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`idokaplan`: https://github.com/idokaplan +.. _`isbm`: https://github.com/isbm +.. _`jdonofrio728`: https://github.com/jdonofrio728 +.. _`jettero`: https://github.com/jettero +.. _`jf`: https://github.com/jf +.. _`jheidbrink`: https://github.com/jheidbrink +.. _`jmarinaro`: https://github.com/jmarinaro +.. _`joewreschnig`: https://github.com/joewreschnig +.. _`kaihowl`: https://github.com/kaihowl +.. _`kiorky`: https://github.com/kiorky +.. _`kivoli`: https://github.com/kivoli +.. _`lomeroe`: https://github.com/lomeroe +.. _`lordcirth`: https://github.com/lordcirth +.. _`lorengordon`: https://github.com/lorengordon +.. _`lubyou`: https://github.com/lubyou +.. _`martinschipper`: https://github.com/martinschipper +.. _`mcalmer`: https://github.com/mcalmer +.. _`mephi42`: https://github.com/mephi42 +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`moio`: https://github.com/moio +.. _`mtkennerly`: https://github.com/mtkennerly +.. _`onlyanegg`: https://github.com/onlyanegg +.. _`peter-funktionIT`: https://github.com/peter-funktionIT +.. _`pkazmierczak`: https://github.com/pkazmierczak +.. _`pprkut`: https://github.com/pprkut +.. _`rallytime`: https://github.com/rallytime +.. _`razed11`: https://github.com/razed11 +.. _`ricohouse`: https://github.com/ricohouse +.. _`rmarchei`: https://github.com/rmarchei +.. _`ruiaylin`: https://github.com/ruiaylin +.. _`seanjnkns`: https://github.com/seanjnkns +.. _`sebw`: https://github.com/sebw +.. _`shallot`: https://github.com/shallot +.. _`skizunov`: https://github.com/skizunov +.. _`sumeetisp`: https://github.com/sumeetisp +.. _`svinota`: https://github.com/svinota +.. _`syphernl`: https://github.com/syphernl +.. _`t0fik`: https://github.com/t0fik +.. _`terminalmage`: https://github.com/terminalmage +.. _`tmeneau`: https://github.com/tmeneau +.. _`tonybaloney`: https://github.com/tonybaloney +.. _`twangboy`: https://github.com/twangboy +.. _`vutny`: https://github.com/vutny +.. _`whiteinge`: https://github.com/whiteinge +.. _`yannj-fr`: https://github.com/yannj-fr diff --git a/doc/topics/releases/2016.11.7.rst b/doc/topics/releases/2016.11.7.rst index 2ad821ff22..7917846f65 100644 --- a/doc/topics/releases/2016.11.7.rst +++ b/doc/topics/releases/2016.11.7.rst @@ -4,12 +4,14 @@ Salt 2016.11.7 Release Notes Version 2016.11.7 is a bugfix release for :ref:`2016.11.0 `. -Changes for v2016.11.6..v2016.11.7 ----------------------------------- - Security Fix ============ -CVE-2017-12791 Maliciously crafted minion IDs can cause unwanted directory traversals on the Salt-master +**CVE-2017-12791** Maliciously crafted minion IDs can cause unwanted directory +traversals on the Salt-master -Correct a flaw in minion id validation which could allow certain minions to authenticate to a master despite not having the correct credentials. To exploit the vulnerability, an attacker must create a salt-minion with an ID containing characters that will cause a directory traversal. Credit for discovering the security flaw goes to: Vernhk@qq.com +This release corrects a flaw in minion ID validation which could allow certain +minions to authenticate to a master despite not having the correct credentials. +To exploit the vulnerability, an attacker must create a salt-minion with an ID +containing characters that will cause a directory traversal. Credit for +discovering the security flaw goes to: Vernhk@qq.com diff --git a/doc/topics/releases/2016.11.8.rst b/doc/topics/releases/2016.11.8.rst index bfcf75e040..40d3d9e91d 100644 --- a/doc/topics/releases/2016.11.8.rst +++ b/doc/topics/releases/2016.11.8.rst @@ -2,1438 +2,1616 @@ Salt 2016.11.8 Release Notes ============================ -Version 2016.11.8 is a bugfix release for :ref:`2016.11.0 `.] +Version 2016.11.8 is a bugfix release for :ref:`2016.11.0 `. -Anonymous Binds and LDAP/Active Directory ------------------------------------------ -When auth.ldap.anonymous is set to False, the bind password can no longer be empty. +Statistics +========== + +- Total Merges: **171** +- Total Issue References: **68** +- Total PR References: **202** + +- Contributors: **61** (`AFriemann`_, `Ch3LL`_, `CorvinM`_, `Da-Juan`_, `DmitryKuzmenko`_, `UtahDave`_, `abulford`_, `amalleo25`_, `amendlik`_, `aneeshusa`_, `aogier`_, `arount`_, `arthurlogilab`_, `astronouth7303`_, `binocvlar`_, `blarghmatey`_, `cachedout`_, `clem-compilatio`_, `corywright`_, `cri-epita`_, `damon-atkins`_, `davidjb`_, `dglloyd`_, `dmurphy18`_, `ferringb`_, `garethgreenaway`_, `gdubroeucq`_, `gilbsgilbs`_, `goten4`_, `gtmanfred`_, `isbm`_, `jagguli`_, `kevinanderson1`_, `kojiromike`_, `kstreee`_, `leeclemens`_, `lomeroe`_, `lorengordon`_, `lubyou`_, `mcarlton00`_, `meaksh`_, `morganwillcock`_, `nhavens`_, `pabloh007`_, `rallytime`_, `remijouannet`_, `renner`_, `root360-AndreasUlm`_, `s-sebastian`_, `sarcasticadmin`_, `sbojarski`_, `shengis`_, `tdutrion`_, `terminalmage`_, `toanju`_, `twangboy`_, `ushmodin`_, `viktorkrivak`_, `vutny`_, `whiteinge`_, `xiaoanyunfei`_) -Changes for v2016.11.7..v2016.11.8 ----------------------------------- Security Fix ============ -CVE-2017-14695 Directory traversal vulnerability in minion id validation in SaltStack. Allows remote minions with incorrect credentials to authenticate to a master via a crafted minion ID. Credit for discovering the security flaw goes to: Julian Brost (julian@0x4a42.net) +**CVE-2017-14695** Directory traversal vulnerability in minion id validation in +SaltStack. Allows remote minions with incorrect credentials to authenticate to +a master via a crafted minion ID. Credit for discovering the security flaw goes +to: Julian Brost (julian@0x4a42.net) -CVE-2017-14696 Remote Denial of Service with a specially crafted authentication request. Credit for discovering the security flaw goes to: Julian Brost (julian@0x4a42.net) +**CVE-2017-14696** Remote Denial of Service with a specially crafted +authentication request. Credit for discovering the security flaw goes to: +Julian Brost (julian@0x4a42.net) -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Anonymous Binds and LDAP/Active Directory +========================================= -*Generated at: 2017-09-11T14:52:27Z* +When ``auth.ldap.anonymous`` is set to ``False``, the bind password can no +longer be empty. -Statistics: -- Total Merges: **169** -- Total Issue references: **70** -- Total PR references: **206** +Changelog for v2016.11.7..v2016.11.8 +==================================== -Changes: +*Generated at: 2018-05-27 20:23:07 UTC* +* **PR** `#43508`_: (`rallytime`_) Back-port `#43333`_ to 2016.11.8 + @ *2017-09-14 21:40:19 UTC* -- **PR** `#43271`_: (*twangboy*) Fix minor formatting issue - @ *2017-08-30T18:35:12Z* + * **PR** `#43333`_: (`damon-atkins`_) Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug (refs: `#43508`_) - * cf21f91 Merge pull request `#43271`_ from twangboy/win_fix_pkg.install - * 91b062f Fix formatting issue, spaces surrounding + + * a648f75949 Merge pull request `#43508`_ from rallytime/bp-43333 -- **PR** `#43228`_: (*twangboy*) Win fix pkg.install - @ *2017-08-30T14:26:21Z* + * d4981a2717 Update doco - * 3a0b02f Merge pull request `#43228`_ from twangboy/win_fix_pkg.install - * 13dfabb Fix regex statement, add `.` + * a7c8b9e048 Update win_pkg.py - * 31ff69f Add underscore to regex search + * 1d6dc6fb72 Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed on the cli (`#2`_) - * 3cf2b65 Fix spelling +* **PR** `#43434`_: (`rallytime`_) Add 2016.11.8 release notes + @ *2017-09-11 17:06:29 UTC* - * ed030a3 Use regex to detect salt-minion install + * e7009877bc Merge pull request `#43434`_ from rallytime/2016.11.8-release-notes - * e5daff4 Fix pkg.install + * 68f529ee5e Add 2016.11.8 release notes -- **PR** `#43191`_: (*viktorkrivak*) Fix apache.config with multiple statement - @ *2017-08-28T18:13:44Z* +* **PR** `#43271`_: (`twangboy`_) Fix minor formatting issue + @ *2017-08-30 18:35:12 UTC* - * b4c689d Merge pull request `#43191`_ from viktorkrivak/fix-apache-config-multi-entity - * c15bcbe Merge remote-tracking branch 'upstream/2016.11' into fix-apache-config-multi-entity + * cf21f91fb2 Merge pull request `#43271`_ from twangboy/win_fix_pkg.install - * 4164047 Fix apache.config with multiple statement At this moment when you post more than one statement in config only last is used. Also file is rewrited multiple times until last statement is written. Example: salt '*' apache.config /etc/httpd/conf.d/ports.conf config="[{'Listen': '8080'}, {'Proxy': "Something"}]" Ends only with Proxy Something and ignore Listen 8080, This patch fix this issue. + * 91b062f564 Fix formatting issue, spaces surrounding + -- **PR** `#43154`_: (*lomeroe*) Backport `#43116`_ to 2016.11 - @ *2017-08-28T16:40:41Z* +* **PR** `#43228`_: (`twangboy`_) Win fix pkg.install + @ *2017-08-30 14:26:21 UTC* - - **ISSUE** `#42279`_: (*dafyddj*) win_lgpo matches multiple policies due to startswith() - | refs: `#43116`_ `#43116`_ `#43154`_ - - **PR** `#43116`_: (*lomeroe*) Fix 42279 in develop - | refs: `#43154`_ - * b90e59e Merge pull request `#43154`_ from lomeroe/`bp-43116`_-2016.11 - * 8f593b0 verify that files exist before trying to remove them, win_file.remove raises an exception if the file does not exist + * 3a0b02f3ae Merge pull request `#43228`_ from twangboy/win_fix_pkg.install - * 33a30ba correcting bad format statement in search for policy to be disabled + * 13dfabb1ce Fix regex statement, add `.` - * acc3d7a correct fopen calls from salt.utils for 2016.11's utils function + * 31ff69f0ad Add underscore to regex search - * 2da1cdd lint fix + * 3cf2b6575c Fix spelling - * 61bd12c track xml namespace to ensure policies w/duplicate IDs or Names do not conflict + * ed030a35a5 Use regex to detect salt-minion install - * f232bed add additional checks for ADM policies that have the same ADMX policy ID (`#42279`_) + * e5daff495a Fix pkg.install -- **PR** `#43202`_: (*garethgreenaway*) Reverting previous augeas module changes - @ *2017-08-28T13:14:27Z* +* **PR** `#43191`_: (`viktorkrivak`_) Fix apache.config with multiple statement + @ *2017-08-28 18:13:44 UTC* - - **ISSUE** `#42642`_: (*githubcdr*) state.augeas - | refs: `#42669`_ `#43202`_ - * 5308c27 Merge pull request `#43202`_ from garethgreenaway/42642_2016_11_augeas_module_revert_fix - * ef7e93e Reverting this change due to it breaking other uses. + * b4c689dff5 Merge pull request `#43191`_ from viktorkrivak/fix-apache-config-multi-entity -- **PR** `#43103`_: (*aogier*) genesis.bootstrap deboostrap fix - @ *2017-08-25T20:48:23Z* + * c15bcbe1cc Merge remote-tracking branch 'upstream/2016.11' into fix-apache-config-multi-entity - - **ISSUE** `#43101`_: (*aogier*) genesis.bootstrap fails if no pkg AND exclude_pkgs (which can't be a string) - | refs: `#43103`_ - * f16b724 Merge pull request `#43103`_ from aogier/43101-genesis-bootstrap - * db94f3b better formatting + * 4164047951 Fix apache.config with multiple statement At this moment when you post more than one statement in config only last is used. Also file is rewrited multiple times until last statement is written. Example: salt '*' apache.config /etc/httpd/conf.d/ports.conf config="[{'Listen': '8080'}, {'Proxy': "Something"}]" Ends only with Proxy Something and ignore Listen 8080, This patch fix this issue. - * e5cc667 tests: fix a leftover and simplify some parts +* **ISSUE** `#42279`_: (`dafyddj`_) win_lgpo matches multiple policies due to startswith() (refs: `#43154`_, `#43116`_) - * 13e5997 lint +* **PR** `#43154`_: (`lomeroe`_) Backport `#43116`_ to 2016.11 + @ *2017-08-28 16:40:41 UTC* - * 216ced6 allow comma-separated pkgs lists, quote args, test deb behaviour + * **PR** `#43116`_: (`lomeroe`_) Fix 42279 in develop (refs: `#43154`_) - * d8612ae fix debootstrap and enhance packages selection/deletion via cmdline + * b90e59ede9 Merge pull request `#43154`_ from lomeroe/bp-43116-2016.11 -- **PR** `#42663`_: (*jagguli*) Check remote tags before deciding to do a fetch `#42329`_ - @ *2017-08-25T20:14:32Z* + * 8f593b0b02 verify that files exist before trying to remove them, win_file.remove raises an exception if the file does not exist - - **ISSUE** `#42329`_: (*jagguli*) State git.latest does not pull latest tags - | refs: `#42663`_ - * 4863771 Merge pull request `#42663`_ from StreetHawkInc/fix_git_tag_check - * 2b5af5b Remove refs/tags prefix from remote tags + * 33a30bac06 correcting bad format statement in search for policy to be disabled - * 3f2e96e Convert set to list for serializer + * acc3d7ac82 correct fopen calls from salt.utils for 2016.11's utils function - * 2728e5d Only include new tags in changes + * 2da1cdd109 lint fix - * 4b1df2f Exclude annotated tags from checks + * 61bd12c0de track xml namespace to ensure policies w/duplicate IDs or Names do not conflict - * 389c037 Check remote tags before deciding to do a fetch `#42329`_ + * f232bed9f9 add additional checks for ADM policies that have the same ADMX policy ID (`#42279`_) -- **PR** `#43199`_: (*corywright*) Add `disk.format` alias for `disk.format_` - @ *2017-08-25T19:21:07Z* +* **ISSUE** `#42642`_: (`githubcdr`_) state.augeas (refs: `#42669`_, `#43202`_) - - **ISSUE** `#43198`_: (*corywright*) disk.format_ needs to be aliased to disk.format - | refs: `#43199`_ - * 4193e7f Merge pull request `#43199`_ from corywright/disk-format-alias - * f00d3a9 Add `disk.format` alias for `disk.format_` +* **PR** `#43202`_: (`garethgreenaway`_) Reverting previous augeas module changes + @ *2017-08-28 13:14:27 UTC* -- **PR** `#43196`_: (*gtmanfred*) Pin request install to version for npm tests - @ *2017-08-25T18:43:06Z* + * 5308c27f9f Merge pull request `#43202`_ from garethgreenaway/42642_2016_11_augeas_module_revert_fix - - **ISSUE** `#495`_: (*syphernl*) mysql.* without having MySQL installed/configured gives traceback - | refs: `#43196`_ - * 5471f9f Merge pull request `#43196`_ from gtmanfred/2016.11 - * ccd2241 Pin request install to version + * ef7e93eb3f Reverting this change due to it breaking other uses. -- **PR** `#43178`_: (*terminalmage*) git.detached: Fix traceback when rev is a SHA and is not present locally - @ *2017-08-25T13:58:37Z* +* **ISSUE** `#43101`_: (`aogier`_) genesis.bootstrap fails if no pkg AND exclude_pkgs (which can't be a string) (refs: `#43103`_) - - **ISSUE** `#43143`_: (*abulford*) git.detached does not fetch if rev is missing from local - | refs: `#43178`_ - * ace2715 Merge pull request `#43178`_ from terminalmage/issue43143 - * 2640833 git.detached: Fix traceback when rev is a SHA and is not present locally +* **PR** `#43103`_: (`aogier`_) genesis.bootstrap deboostrap fix + @ *2017-08-25 20:48:23 UTC* -- **PR** `#43179`_: (*terminalmage*) Fix missed deprecation - @ *2017-08-24T22:52:34Z* + * f16b7246e4 Merge pull request `#43103`_ from aogier/43101-genesis-bootstrap - * 12e9507 Merge pull request `#43179`_ from terminalmage/old-deprecation - * 3adf8ad Fix missed deprecation + * db94f3bb1c better formatting -- **PR** `#43171`_: (*terminalmage*) Add warning about adding new functions to salt/utils/__init__.py - @ *2017-08-24T19:10:23Z* + * e5cc667762 tests: fix a leftover and simplify some parts - * b595440 Merge pull request `#43171`_ from terminalmage/salt-utils-warning - * 7b5943a Add warning about adding new functions to salt/utils/__init__.py + * 13e5997457 lint -- **PR** `#43173`_: (*Ch3LL*) Add New Release Branch Strategy to Contribution Docs - @ *2017-08-24T19:04:56Z* + * 216ced69e5 allow comma-separated pkgs lists, quote args, test deb behaviour - * 4f273ca Merge pull request `#43173`_ from Ch3LL/add_branch_docs - * 1b24244 Add New Release Branch Strategy to Contribution Docs + * d8612ae006 fix debootstrap and enhance packages selection/deletion via cmdline -- **PR** `#43151`_: (*ushmodin*) state.sls hangs on file.recurse with clean: True on windows - @ *2017-08-23T17:25:33Z* +* **ISSUE** `#42329`_: (`jagguli`_) State git.latest does not pull latest tags (refs: `#42663`_) - - **PR** `#42969`_: (*ushmodin*) state.sls hangs on file.recurse with clean: True on windows - | refs: `#43151`_ - * 669b376 Merge pull request `#43151`_ from ushmodin/2016.11 - * c5841e2 state.sls hangs on file.recurse with clean: True on windows +* **PR** `#42663`_: (`jagguli`_) Check remote tags before deciding to do a fetch `#42329`_ + @ *2017-08-25 20:14:32 UTC* -- **PR** `#42986`_: (*renner*) Notify systemd synchronously (via NOTIFY_SOCKET) - @ *2017-08-22T16:52:56Z* + * 4863771428 Merge pull request `#42663`_ from StreetHawkInc/fix_git_tag_check - * ae9d2b7 Merge pull request `#42986`_ from renner/systemd-notify - * 79c53f3 Fallback to systemd_notify_call() in case of socket.error + * 2b5af5b59d Remove refs/tags prefix from remote tags - * f176547 Notify systemd synchronously (via NOTIFY_SOCKET) + * 3f2e96e561 Convert set to list for serializer -- **PR** `#43037`_: (*mcarlton00*) Issue `#43036`_ Bhyve virtual grain in Linux VMs - @ *2017-08-22T16:43:40Z* + * 2728e5d977 Only include new tags in changes - - **ISSUE** `#43036`_: (*mcarlton00*) Linux VMs in Bhyve aren't displayed properly in grains - | refs: `#43037`_ - * b420fbe Merge pull request `#43037`_ from mcarlton00/fix-bhyve-grains - * 73315f0 Issue `#43036`_ Bhyve virtual grain in Linux VMs + * 4b1df2f223 Exclude annotated tags from checks -- **PR** `#43100`_: (*vutny*) [DOCS] Add missing `utils` sub-dir listed for `extension_modules` - @ *2017-08-22T15:40:09Z* + * 389c037285 Check remote tags before deciding to do a fetch `#42329`_ - * 0a86f2d Merge pull request `#43100`_ from vutny/doc-add-missing-utils-ext - * af743ff [DOCS] Add missing `utils` sub-dir listed for `extension_modules` +* **ISSUE** `#43198`_: (`corywright`_) disk.format\_ needs to be aliased to disk.format (refs: `#43199`_) -- **PR** `#42985`_: (*DmitryKuzmenko*) Properly handle `prereq` having lost requisites. - @ *2017-08-21T22:49:39Z* +* **PR** `#43199`_: (`corywright`_) Add `disk.format` alias for `disk.format_` + @ *2017-08-25 19:21:07 UTC* - - **ISSUE** `#15171`_: (*JensRantil*) Maximum recursion limit hit related to requisites - | refs: `#42985`_ - * e2bf2f4 Merge pull request `#42985`_ from DSRCorporation/bugs/15171_recursion_limit - * 651b1ba Properly handle `prereq` having lost requisites. + * 4193e7f0a2 Merge pull request `#43199`_ from corywright/disk-format-alias -- **PR** `#43092`_: (*blarghmatey*) Fixed issue with silently passing all tests in Testinfra module - @ *2017-08-21T20:22:08Z* + * f00d3a9ddc Add `disk.format` alias for `disk.format_` - * e513333 Merge pull request `#43092`_ from mitodl/2016.11 - * d4b113a Fixed issue with silently passing all tests in Testinfra module +* **ISSUE** `saltstack/salt-jenkins#495`_: (`Ch3LL`_) npm tests failing (refs: `#43196`_) -- **PR** `#43060`_: (*twangboy*) Osx update pkg scripts - @ *2017-08-21T20:06:12Z* +* **PR** `#43196`_: (`gtmanfred`_) Pin request install to version for npm tests + @ *2017-08-25 18:43:06 UTC* - * 77a443c Merge pull request `#43060`_ from twangboy/osx_update_pkg_scripts - * ef8a14c Remove /opt/salt instead of /opt/salt/bin + * 5471f9fe0c Merge pull request `#43196`_ from gtmanfred/2016.11 - * 2dd62aa Add more information to the description + * ccd2241777 Pin request install to version - * f44f5b7 Only stop services if they are running +* **ISSUE** `#43143`_: (`abulford`_) git.detached does not fetch if rev is missing from local (refs: `#43178`_) - * 3b62bf9 Remove salt from the path +* **PR** `#43178`_: (`terminalmage`_) git.detached: Fix traceback when rev is a SHA and is not present locally + @ *2017-08-25 13:58:37 UTC* - * ebdca3a Update pkg-scripts + * ace2715c60 Merge pull request `#43178`_ from terminalmage/issue43143 -- **PR** `#43064`_: (*terminalmage*) Fix race condition in git.latest - @ *2017-08-21T14:29:52Z* + * 2640833400 git.detached: Fix traceback when rev is a SHA and is not present locally - - **ISSUE** `#42869`_: (*abednarik*) Git Module : Failed to update repository - | refs: `#43064`_ - * 1b1b6da Merge pull request `#43064`_ from terminalmage/issue42869 - * 093c0c2 Fix race condition in git.latest +* **PR** `#43179`_: (`terminalmage`_) Fix missed deprecation + @ *2017-08-24 22:52:34 UTC* -- **PR** `#43054`_: (*lorengordon*) Uses ConfigParser to read yum config files - @ *2017-08-18T20:49:44Z* + * 12e9507b9e Merge pull request `#43179`_ from terminalmage/old-deprecation - - **ISSUE** `#42041`_: (*lorengordon*) pkg.list_repo_pkgs fails to find pkgs with spaces around yum repo enabled value - | refs: `#43054`_ - - **PR** `#42045`_: (*arount*) Fix: salt.modules.yumpkg: ConfigParser to read ini like files. - | refs: `#43054`_ - * 96e8e83 Merge pull request `#43054`_ from lorengordon/fix/yumpkg/config-parser - * 3b2cb81 fix typo in salt.modules.yumpkg + * 3adf8ad04b Fix missed deprecation - * 38add0e break if leading comments are all fetched +* **PR** `#43171`_: (`terminalmage`_) Add warning about adding new functions to salt/utils/__init__.py + @ *2017-08-24 19:10:23 UTC* - * d7f65dc fix configparser import & log if error was raised + * b595440d90 Merge pull request `#43171`_ from terminalmage/salt-utils-warning - * ca1b1bb use configparser to parse yum repo file + * 7b5943a31a Add warning about adding new functions to salt/utils/__init__.py -- **PR** `#43048`_: (*rallytime*) Back-port `#43031`_ to 2016.11 - @ *2017-08-18T12:56:04Z* +* **PR** `#43173`_: (`Ch3LL`_) Add New Release Branch Strategy to Contribution Docs + @ *2017-08-24 19:04:56 UTC* - - **PR** `#43031`_: (*gtmanfred*) use a ruby gem that doesn't have dependencies - | refs: `#43048`_ - * 43aa46f Merge pull request `#43048`_ from rallytime/`bp-43031`_ - * 35e4504 use a ruby gem that doesn't have dependencies + * 4f273cac4f Merge pull request `#43173`_ from Ch3LL/add_branch_docs -- **PR** `#43023`_: (*terminalmage*) Fixes/improvements to Jenkins state/module - @ *2017-08-18T01:33:10Z* + * 1b24244bd3 Add New Release Branch Strategy to Contribution Docs - * ad89ff3 Merge pull request `#43023`_ from terminalmage/fix-jenkins-xml-caching - * 33fd8ff Update jenkins.py +* **PR** `#43151`_: (`ushmodin`_) state.sls hangs on file.recurse with clean: True on windows + @ *2017-08-23 17:25:33 UTC* - * fc306fc Add missing colon in `if` statement + * **PR** `#42969`_: (`ushmodin`_) state.sls hangs on file.recurse with clean: True on windows (refs: `#43151`_) - * 822eabc Catch exceptions raised when making changes to jenkins + * 669b376abf Merge pull request `#43151`_ from ushmodin/2016.11 - * 91b583b Improve and correct execption raising + * c5841e2ade state.sls hangs on file.recurse with clean: True on windows - * f096917 Raise an exception if we fail to cache the config xml +* **PR** `#42986`_: (`renner`_) Notify systemd synchronously (via NOTIFY_SOCKET) + @ *2017-08-22 16:52:56 UTC* -- **PR** `#43026`_: (*rallytime*) Back-port `#43020`_ to 2016.11 - @ *2017-08-17T23:19:46Z* + * ae9d2b7985 Merge pull request `#42986`_ from renner/systemd-notify - - **PR** `#43020`_: (*gtmanfred*) test with gem that appears to be abandoned - | refs: `#43026`_ - * 2957467 Merge pull request `#43026`_ from rallytime/`bp-43020`_ - * 0eb15a1 test with gem that appears to be abandoned + * 79c53f3f81 Fallback to systemd_notify_call() in case of socket.error -- **PR** `#43033`_: (*rallytime*) Back-port `#42760`_ to 2016.11 - @ *2017-08-17T22:24:43Z* + * f1765472dd Notify systemd synchronously (via NOTIFY_SOCKET) - - **ISSUE** `#40490`_: (*alxwr*) saltstack x509 incompatible to m2crypto 0.26.0 - | refs: `#42760`_ - - **PR** `#42760`_: (*AFriemann*) Catch TypeError thrown by m2crypto when parsing missing subjects in c… - | refs: `#43033`_ - * 4150b09 Merge pull request `#43033`_ from rallytime/`bp-42760`_ - * 3e3f7f5 Catch TypeError thrown by m2crypto when parsing missing subjects in certificate files. +* **ISSUE** `#43036`_: (`mcarlton00`_) Linux VMs in Bhyve aren't displayed properly in grains (refs: `#43037`_) -- **PR** `#43032`_: (*rallytime*) Back-port `#42547`_ to 2016.11 - @ *2017-08-17T21:53:50Z* +* **PR** `#43037`_: (`mcarlton00`_) Issue `#43036`_ Bhyve virtual grain in Linux VMs + @ *2017-08-22 16:43:40 UTC* - - **PR** `#42547`_: (*blarghmatey*) Updated testinfra modules to work with more recent versions - | refs: `#43032`_ - * b124d36 Merge pull request `#43032`_ from rallytime/`bp-42547`_ - * ea4d7f4 Updated testinfra modules to work with more recent versions + * b420fbe618 Merge pull request `#43037`_ from mcarlton00/fix-bhyve-grains -- **PR** `#43027`_: (*pabloh007*) Fixes ignore push flag for docker.push module issue `#42992`_ - @ *2017-08-17T19:55:37Z* + * 73315f0cf0 Issue `#43036`_ Bhyve virtual grain in Linux VMs - - **ISSUE** `#42992`_: (*pabloh007*) docker.save flag push does is ignored - * a88386a Merge pull request `#43027`_ from pabloh007/fix-docker-save-push-2016-11 - * d0fd949 Fixes ignore push flag for docker.push module issue `#42992`_ +* **PR** `#43100`_: (`vutny`_) [DOCS] Add missing `utils` sub-dir listed for `extension_modules` + @ *2017-08-22 15:40:09 UTC* -- **PR** `#42890`_: (*DmitryKuzmenko*) Make chunked mode in salt-cp optional - @ *2017-08-17T18:37:44Z* + * 0a86f2d884 Merge pull request `#43100`_ from vutny/doc-add-missing-utils-ext - - **ISSUE** `#42627`_: (*taigrrr8*) salt-cp no longer works. Was working a few months back. - | refs: `#42890`_ - * 51d1684 Merge pull request `#42890`_ from DSRCorporation/bugs/42627_salt-cp - * cfddbf1 Apply code review: update the doc + * af743ff6c3 [DOCS] Add missing `utils` sub-dir listed for `extension_modules` - * afedd3b Typos and version fixes in the doc. +* **ISSUE** `#15171`_: (`JensRantil`_) Maximum recursion limit hit related to requisites (refs: `#42985`_) - * 9fedf60 Fixed 'test_valid_docs' test. +* **PR** `#42985`_: (`DmitryKuzmenko`_) Properly handle `prereq` having lost requisites. + @ *2017-08-21 22:49:39 UTC* - * 9993886 Make chunked mode in salt-cp optional (disabled by default). + * e2bf2f448e Merge pull request `#42985`_ from DSRCorporation/bugs/15171_recursion_limit -- **PR** `#43009`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-08-17T18:00:09Z* + * 651b1bab09 Properly handle `prereq` having lost requisites. - - **PR** `#42954`_: (*Ch3LL*) [2016.3] Bump latest and previous versions - - **PR** `#42949`_: (*Ch3LL*) Add Security Notice to 2016.3.7 Release Notes - - **PR** `#42942`_: (*Ch3LL*) [2016.3] Add clean_id function to salt.utils.verify.py - * b3c253c Merge pull request `#43009`_ from rallytime/merge-2016.11 - * 566ba4f Merge branch '2016.3' into '2016.11' +* **PR** `#43092`_: (`blarghmatey`_) Fixed issue with silently passing all tests in Testinfra module + @ *2017-08-21 20:22:08 UTC* - * 13b8637 Merge pull request `#42942`_ from Ch3LL/2016.3.6_follow_up + * e51333306c Merge pull request `#43092`_ from mitodl/2016.11 - * f281e17 move additional minion config options to 2016.3.8 release notes + * d4b113acdf Fixed issue with silently passing all tests in Testinfra module - * 168604b remove merge conflict +* **PR** `#43060`_: (`twangboy`_) Osx update pkg scripts + @ *2017-08-21 20:06:12 UTC* - * 8a07d95 update release notes with cve number + * 77a443ce8e Merge pull request `#43060`_ from twangboy/osx_update_pkg_scripts - * 149633f Add release notes for 2016.3.7 release + * ef8a14cdf9 Remove /opt/salt instead of /opt/salt/bin - * 7a4cddc Add clean_id function to salt.utils.verify.py + * 2dd62aa1da Add more information to the description - * bbb1b29 Merge pull request `#42954`_ from Ch3LL/latest_2016.3 + * f44f5b70dc Only stop services if they are running - * b551e66 [2016.3] Bump latest and previous versions + * 3b62bf953c Remove salt from the path - * 5d5edc5 Merge pull request `#42949`_ from Ch3LL/2016.3.7_docs + * ebdca3a0f5 Update pkg-scripts - * d75d374 Add Security Notice to 2016.3.7 Release Notes +* **ISSUE** `#42869`_: (`abednarik`_) Git Module : Failed to update repository (refs: `#43064`_) -- **PR** `#43021`_: (*terminalmage*) Use socket.AF_INET6 to get the correct value instead of doing an OS check - @ *2017-08-17T17:57:09Z* +* **PR** `#43064`_: (`terminalmage`_) Fix race condition in git.latest + @ *2017-08-21 14:29:52 UTC* - - **PR** `#43014`_: (*Ch3LL*) Change AF_INET6 family for mac in test_host_to_ips - | refs: `#43021`_ - * 37c63e7 Merge pull request `#43021`_ from terminalmage/fix-network-test - * 4089b7b Use socket.AF_INET6 to get the correct value instead of doing an OS check + * 1b1b6da803 Merge pull request `#43064`_ from terminalmage/issue42869 -- **PR** `#43019`_: (*rallytime*) Update bootstrap script to latest stable: v2017.08.17 - @ *2017-08-17T17:56:41Z* + * 093c0c2f77 Fix race condition in git.latest - * 8f64232 Merge pull request `#43019`_ from rallytime/bootstrap_2017.08.17 - * 2f762b3 Update bootstrap script to latest stable: v2017.08.17 +* **ISSUE** `#42041`_: (`lorengordon`_) pkg.list_repo_pkgs fails to find pkgs with spaces around yum repo enabled value (refs: `#43054`_) -- **PR** `#43014`_: (*Ch3LL*) Change AF_INET6 family for mac in test_host_to_ips - | refs: `#43021`_ - @ *2017-08-17T16:17:51Z* +* **PR** `#43054`_: (`lorengordon`_) Uses ConfigParser to read yum config files + @ *2017-08-18 20:49:44 UTC* - * ff1caeee Merge pull request `#43014`_ from Ch3LL/fix_network_mac - * b8eee44 Change AF_INET6 family for mac in test_host_to_ips + * **PR** `#42045`_: (`arount`_) Fix: salt.modules.yumpkg: ConfigParser to read ini like files. (refs: `#43054`_) -- **PR** `#42968`_: (*vutny*) [DOCS] Fix link to Salt Cloud Feature Matrix - @ *2017-08-16T13:16:16Z* + * 96e8e836d1 Merge pull request `#43054`_ from lorengordon/fix/yumpkg/config-parser - * 1ee9499 Merge pull request `#42968`_ from vutny/doc-salt-cloud-ref - * 44ed53b [DOCS] Fix link to Salt Cloud Feature Matrix + * 3b2cb81a72 fix typo in salt.modules.yumpkg -- **PR** `#42291`_: (*vutny*) Fix `#38839`_: remove `state` from Reactor runner kwags - @ *2017-08-15T23:01:08Z* + * 38add0e4a2 break if leading comments are all fetched - - **ISSUE** `#38839`_: (*DaveOHenry*) Invoking runner.cloud.action via reactor sls fails - | refs: `#42291`_ - * 923f974 Merge pull request `#42291`_ from vutny/`fix-38839`_ - * 5f8f98a Fix `#38839`_: remove `state` from Reactor runner kwags + * d7f65dc7a7 fix configparser import & log if error was raised -- **PR** `#42940`_: (*gtmanfred*) create new ip address before checking list of allocated ips - @ *2017-08-15T21:47:18Z* + * ca1b1bb633 use configparser to parse yum repo file - - **ISSUE** `#42644`_: (*stamak*) nova salt-cloud -P Private IPs returned, but not public. Checking for misidentified IPs - | refs: `#42940`_ - * c20bc7d Merge pull request `#42940`_ from gtmanfred/2016.11 - * 253e216 fix IP address spelling +* **PR** `#43048`_: (`rallytime`_) Back-port `#43031`_ to 2016.11 + @ *2017-08-18 12:56:04 UTC* - * bd63074 create new ip address before checking list of allocated ips + * **PR** `#43031`_: (`gtmanfred`_) use a ruby gem that doesn't have dependencies (refs: `#43048`_) -- **PR** `#42959`_: (*rallytime*) Back-port `#42883`_ to 2016.11 - @ *2017-08-15T21:25:48Z* + * 43aa46f512 Merge pull request `#43048`_ from rallytime/bp-43031 - - **PR** `#42883`_: (*rallytime*) Fix failing boto tests - | refs: `#42959`_ - * d6496ec Merge pull request `#42959`_ from rallytime/`bp-42883`_ - * c6b9ca4 Lint fix: add missing space + * 35e45049e2 use a ruby gem that doesn't have dependencies - * 5597b1a Skip 2 failing tests in Python 3 due to upstream bugs +* **PR** `#43023`_: (`terminalmage`_) Fixes/improvements to Jenkins state/module + @ *2017-08-18 01:33:10 UTC* - * a0b19bd Update account id value in boto_secgroup module unit test + * ad89ff3104 Merge pull request `#43023`_ from terminalmage/fix-jenkins-xml-caching - * 60b406e @mock_elb needs to be changed to @mock_elb_deprecated as well + * 33fd8ff939 Update jenkins.py - * 6ae1111 Replace @mock_ec2 calls with @mock_ec2_deprecated calls + * fc306fc8c3 Add missing colon in `if` statement -- **PR** `#42944`_: (*Ch3LL*) [2016.11] Add clean_id function to salt.utils.verify.py - @ *2017-08-15T18:06:12Z* + * 822eabcc81 Catch exceptions raised when making changes to jenkins - * 6366e05 Merge pull request `#42944`_ from Ch3LL/2016.11.6_follow_up - * 7e0a20a Add release notes for 2016.11.7 release + * 91b583b493 Improve and correct exception raising - * 63823f8 Add clean_id function to salt.utils.verify.py + * f096917a0e Raise an exception if we fail to cache the config xml -- **PR** `#42952`_: (*Ch3LL*) [2016.11] Bump latest and previous versions - @ *2017-08-15T17:23:02Z* +* **PR** `#43026`_: (`rallytime`_) Back-port `#43020`_ to 2016.11 + @ *2017-08-17 23:19:46 UTC* - * 49d339c Merge pull request `#42952`_ from Ch3LL/latest_2016.11 - * 74e7055 [2016.11] Bump latest and previous versions + * **PR** `#43020`_: (`gtmanfred`_) test with gem that appears to be abandoned (refs: `#43026`_) -- **PR** `#42950`_: (*Ch3LL*) Add Security Notice to 2016.11.7 Release Notes - @ *2017-08-15T16:50:23Z* + * 2957467ed7 Merge pull request `#43026`_ from rallytime/bp-43020 - * b0d2e05 Merge pull request `#42950`_ from Ch3LL/2016.11.7_docs - * a6f902d Add Security Notice to 2016.11.77 Release Notes + * 0eb15a1f67 test with gem that appears to be abandoned -- **PR** `#42836`_: (*aneeshusa*) Backport salt.utils.versions from develop to 2016.11 - @ *2017-08-14T20:56:54Z* +* **ISSUE** `#40490`_: (`alxwr`_) saltstack x509 incompatible to m2crypto 0.26.0 (refs: `#42760`_) - - **PR** `#42835`_: (*aneeshusa*) Fix typo in utils/versions.py module - | refs: `#42836`_ - * c0ff69f Merge pull request `#42836`_ from lyft/backport-utils.versions-to-2016.11 - * 86ce700 Backport salt.utils.versions from develop to 2016.11 +* **PR** `#43033`_: (`rallytime`_) Back-port `#42760`_ to 2016.11 + @ *2017-08-17 22:24:43 UTC* -- **PR** `#42919`_: (*rallytime*) Back-port `#42871`_ to 2016.11 - @ *2017-08-14T20:44:00Z* + * **PR** `#42760`_: (`AFriemann`_) Catch TypeError thrown by m2crypto when parsing missing subjects in c… (refs: `#43033`_) - - **PR** `#42871`_: (*amalleo25*) Update joyent.rst - | refs: `#42919`_ - * 64a79dd Merge pull request `#42919`_ from rallytime/`bp-42871`_ - * 4e46c96 Update joyent.rst + * 4150b094fe Merge pull request `#43033`_ from rallytime/bp-42760 -- **PR** `#42918`_: (*rallytime*) Back-port `#42848`_ to 2016.11 - @ *2017-08-14T20:43:43Z* + * 3e3f7f5d8e Catch TypeError thrown by m2crypto when parsing missing subjects in certificate files. - - **ISSUE** `#42803`_: (*gmcwhistler*) master_type: str, not working as expected, parent salt-minion process dies. - | refs: `#42848`_ - - **ISSUE** `#42753`_: (*grichmond-salt*) SaltReqTimeout Error on Some Minions when One Master in a Multi-Master Configuration is Unavailable - | refs: `#42848`_ - - **PR** `#42848`_: (*DmitryKuzmenko*) Execute fire_master asynchronously in the main minion thread. - | refs: `#42918`_ - * bea8ec1 Merge pull request `#42918`_ from rallytime/`bp-42848`_ - * cdb4812 Make lint happier. +* **PR** `#43032`_: (`rallytime`_) Back-port `#42547`_ to 2016.11 + @ *2017-08-17 21:53:50 UTC* - * 62eca9b Execute fire_master asynchronously in the main minion thread. + * **PR** `#42547`_: (`blarghmatey`_) Updated testinfra modules to work with more recent versions (refs: `#43032`_) -- **PR** `#42861`_: (*twangboy*) Fix pkg.install salt-minion using salt-call - @ *2017-08-14T19:07:22Z* + * b124d3667e Merge pull request `#43032`_ from rallytime/bp-42547 - * 52bce32 Merge pull request `#42861`_ from twangboy/win_pkg_install_salt - * 0d3789f Fix pkg.install salt-minion using salt-call + * ea4d7f4176 Updated testinfra modules to work with more recent versions -- **PR** `#42798`_: (*s-sebastian*) Update return data before calling returners - @ *2017-08-14T15:51:30Z* +* **ISSUE** `#42992`_: (`pabloh007`_) docker.save flag push does is ignored (refs: `#43027`_) - * b9f4f87 Merge pull request `#42798`_ from s-sebastian/2016.11 - * 1cc8659 Update return data before calling returners +* **PR** `#43027`_: (`pabloh007`_) Fixes ignore push flag for docker.push module issue `#42992`_ + @ *2017-08-17 19:55:37 UTC* -- **PR** `#41977`_: (*abulford*) Fix dockerng.network_* ignoring of tests=True - @ *2017-08-11T18:37:20Z* + * a88386ad44 Merge pull request `#43027`_ from pabloh007/fix-docker-save-push-2016-11 - - **ISSUE** `#41976`_: (*abulford*) dockerng network states do not respect test=True - | refs: `#41977`_ `#41977`_ - * c15d003 Merge pull request `#41977`_ from redmatter/fix-dockerng-network-ignores-test - * 1cc2aa5 Fix dockerng.network_* ignoring of tests=True + * d0fd949f85 Fixes ignore push flag for docker.push module issue `#42992`_ -- **PR** `#42886`_: (*sarcasticadmin*) Adding missing output flags to salt cli docs - @ *2017-08-11T18:35:19Z* +* **ISSUE** `#42627`_: (`taigrrr8`_) salt-cp no longer works. Was working a few months back. (refs: `#42890`_) - * 3b9c3c5 Merge pull request `#42886`_ from sarcasticadmin/adding_docs_salt_outputs - * 744bf95 Adding missing output flags to salt cli +* **PR** `#42890`_: (`DmitryKuzmenko`_) Make chunked mode in salt-cp optional + @ *2017-08-17 18:37:44 UTC* -- **PR** `#42882`_: (*gtmanfred*) make sure cmd is not run when npm isn't installed - @ *2017-08-11T17:53:14Z* + * 51d16840bb Merge pull request `#42890`_ from DSRCorporation/bugs/42627_salt-cp - * e5b98c8 Merge pull request `#42882`_ from gtmanfred/2016.11 - * da3402a make sure cmd is not run when npm isn't installed + * cfddbf1c75 Apply code review: update the doc -- **PR** `#42788`_: (*amendlik*) Remove waits and retries from Saltify deployment - @ *2017-08-11T15:38:05Z* + * afedd3b654 Typos and version fixes in the doc. - * 5962c95 Merge pull request `#42788`_ from amendlik/saltify-timeout - * 928b523 Remove waits and retries from Saltify deployment + * 9fedf6012e Fixed 'test_valid_docs' test. -- **PR** `#42877`_: (*terminalmage*) Add virtual func for cron state module - @ *2017-08-11T15:33:09Z* + * 999388680c Make chunked mode in salt-cp optional (disabled by default). - * 227ecdd Merge pull request `#42877`_ from terminalmage/add-cron-state-virtual - * f1de196 Add virtual func for cron state module +* **PR** `#43009`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-08-17 18:00:09 UTC* -- **PR** `#42859`_: (*terminalmage*) Add note about git CLI requirement for GitPython to GitFS tutorial - @ *2017-08-11T14:53:03Z* + * b3c253cdfa Merge pull request `#43009`_ from rallytime/merge-2016.11 - * ab9f6ce Merge pull request `#42859`_ from terminalmage/gitpython-git-cli-note - * 35e05c9 Add note about git CLI requirement for GitPython to GitFS tutorial + * 566ba4fe76 Merge branch '2016.3' into '2016.11' -- **PR** `#42856`_: (*gtmanfred*) skip cache_clean test if npm version is >= 5.0.0 - @ *2017-08-11T13:39:20Z* + * 13b8637d53 Merge pull request `#42942`_ from Ch3LL/2016.3.6_follow_up - - **ISSUE** `#41770`_: (*Ch3LL*) NPM v5 incompatible with salt.modules.cache_list - | refs: `#42856`_ - - **ISSUE** `#475`_: (*thatch45*) Change yaml to use C bindings - | refs: `#42856`_ - * 682b4a8 Merge pull request `#42856`_ from gtmanfred/2016.11 - * b458b89 skip cache_clean test if npm version is >= 5.0.0 + * f281e1795f move additional minion config options to 2016.3.8 release notes -- **PR** `#42864`_: (*whiteinge*) Make syndic_log_file respect root_dir setting - @ *2017-08-11T13:28:21Z* + * 168604ba6b remove merge conflict - * 01ea854 Merge pull request `#42864`_ from whiteinge/syndic-log-root_dir - * 4b1f55d Make syndic_log_file respect root_dir setting + * 8a07d95212 update release notes with cve number -- **PR** `#42851`_: (*terminalmage*) Backport `#42651`_ to 2016.11 - @ *2017-08-10T18:02:39Z* + * 149633fdca Add release notes for 2016.3.7 release - - **PR** `#42651`_: (*gtmanfred*) python2- prefix for fedora 26 packages - * 2dde1f7 Merge pull request `#42851`_ from terminalmage/`bp-42651`_ - * a3da86e fix syntax + * 7a4cddcd95 Add clean_id function to salt.utils.verify.py - * 6ecdbce make sure names are correct + * bbb1b29ccb Merge pull request `#42954`_ from Ch3LL/latest_2016.3 - * f83b553 add py3 for versionlock + * b551e66744 [2016.3] Bump latest and previous versions - * 21934f6 python2- prefix for fedora 26 packages + * 5d5edc54b7 Merge pull request `#42949`_ from Ch3LL/2016.3.7_docs -- **PR** `#42806`_: (*rallytime*) Update doc references in glusterfs.volume_present - @ *2017-08-10T14:10:16Z* + * d75d3741f8 Add Security Notice to 2016.3.7 Release Notes - - **ISSUE** `#42683`_: (*rgcosma*) Gluster module broken in 2017.7 - | refs: `#42806`_ - * c746f79 Merge pull request `#42806`_ from rallytime/`fix-42683`_ - * 8c8640d Update doc references in glusterfs.volume_present +* **PR** `#43021`_: (`terminalmage`_) Use socket.AF_INET6 to get the correct value instead of doing an OS check + @ *2017-08-17 17:57:09 UTC* -- **PR** `#42829`_: (*twangboy*) Fix passing version in pkgs as shown in docs - @ *2017-08-10T14:07:24Z* + * **PR** `#43014`_: (`Ch3LL`_) Change AF_INET6 family for mac in test_host_to_ips (refs: `#43021`_) - * 27a8a26 Merge pull request `#42829`_ from twangboy/win_pkg_fix_install - * 83b9b23 Add winrepo to docs about supporting versions in pkgs + * 37c63e7cf2 Merge pull request `#43021`_ from terminalmage/fix-network-test - * 81fefa6 Add ability to pass version in pkgs list + * 4089b7b1bc Use socket.AF_INET6 to get the correct value instead of doing an OS check -- **PR** `#42838`_: (*twangboy*) Document requirements for win_pki - @ *2017-08-10T13:59:46Z* +* **PR** `#43019`_: (`rallytime`_) Update bootstrap script to latest stable: v2017.08.17 + @ *2017-08-17 17:56:41 UTC* - * 3c3ac6a Merge pull request `#42838`_ from twangboy/win_doc_pki - * f0a1d06 Standardize PKI Client + * 8f6423247c Merge pull request `#43019`_ from rallytime/bootstrap_2017.08.17 - * 7de687a Document requirements for win_pki + * 2f762b3a17 Update bootstrap script to latest stable: v2017.08.17 -- **PR** `#42805`_: (*rallytime*) Back-port `#42552`_ to 2016.11 - @ *2017-08-09T22:37:56Z* +* **PR** `#43014`_: (`Ch3LL`_) Change AF_INET6 family for mac in test_host_to_ips (refs: `#43021`_) + @ *2017-08-17 16:17:51 UTC* - - **PR** `#42552`_: (*remijouannet*) update consul module following this documentation https://www.consul.… - | refs: `#42805`_ - * b3e2ae3 Merge pull request `#42805`_ from rallytime/`bp-42552`_ - * 5a91c1f update consul module following this documentation https://www.consul.io/api/acl.html + * ff1caeee68 Merge pull request `#43014`_ from Ch3LL/fix_network_mac -- **PR** `#42804`_: (*rallytime*) Back-port `#42784`_ to 2016.11 - @ *2017-08-09T22:37:40Z* + * b8eee4401e Change AF_INET6 family for mac in test_host_to_ips - - **ISSUE** `#42731`_: (*infoveinx*) http.query template_data render exception - | refs: `#42804`_ - - **PR** `#42784`_: (*gtmanfred*) only read file if ret is not a string in http.query - | refs: `#42804`_ - * d2ee793 Merge pull request `#42804`_ from rallytime/`bp-42784`_ - * dbd29e4 only read file if it is not a string +* **PR** `#42968`_: (`vutny`_) [DOCS] Fix link to Salt Cloud Feature Matrix + @ *2017-08-16 13:16:16 UTC* -- **PR** `#42826`_: (*terminalmage*) Fix misspelling of "versions" - @ *2017-08-09T19:39:43Z* + * 1ee9499d28 Merge pull request `#42968`_ from vutny/doc-salt-cloud-ref - * 4cbf805 Merge pull request `#42826`_ from terminalmage/fix-spelling - * 00f9314 Fix misspelling of "versions" + * 44ed53b1df [DOCS] Fix link to Salt Cloud Feature Matrix -- **PR** `#42786`_: (*Ch3LL*) Fix typo for template_dict in http docs - @ *2017-08-08T18:14:50Z* +* **ISSUE** `#38839`_: (`DaveOHenry`_) Invoking runner.cloud.action via reactor sls fails (refs: `#42291`_) - * de997ed Merge pull request `#42786`_ from Ch3LL/fix_typo - * 90a2fb6 Fix typo for template_dict in http docs +* **PR** `#42291`_: (`vutny`_) Fix `#38839`_: remove `state` from Reactor runner kwags + @ *2017-08-15 23:01:08 UTC* -- **PR** `#42795`_: (*lomeroe*) backport `#42744`_ to 2016.11 - @ *2017-08-08T17:17:15Z* + * 923f9741fe Merge pull request `#42291`_ from vutny/fix-38839 - - **ISSUE** `#42600`_: (*twangboy*) Unable to set 'Not Configured' using win_lgpo execution module - | refs: `#42744`_ `#42795`_ - - **PR** `#42744`_: (*lomeroe*) fix `#42600`_ in develop - | refs: `#42795`_ - * bf6153e Merge pull request `#42795`_ from lomeroe/`bp-42744`__201611 - * 695f8c1 fix `#42600`_ in develop + * 5f8f98a01f Fix `#38839`_: remove `state` from Reactor runner kwags -- **PR** `#42748`_: (*whiteinge*) Workaround Orchestrate problem that highstate outputter mutates data - @ *2017-08-07T21:11:33Z* +* **ISSUE** `#42644`_: (`stamak`_) nova salt-cloud -P Private IPs returned, but not public. Checking for misidentified IPs (refs: `#42940`_) - - **ISSUE** `#42747`_: (*whiteinge*) Outputters mutate data which can be a problem for Runners and perhaps other things - | refs: `#42748`_ - * 61fad97 Merge pull request `#42748`_ from whiteinge/save-before-output - * de60b77 Workaround Orchestrate problem that highstate outputter mutates data +* **PR** `#42940`_: (`gtmanfred`_) create new ip address before checking list of allocated ips + @ *2017-08-15 21:47:18 UTC* -- **PR** `#42764`_: (*amendlik*) Fix infinite loop with salt-cloud and Windows nodes - @ *2017-08-07T20:47:07Z* + * c20bc7d515 Merge pull request `#42940`_ from gtmanfred/2016.11 - * a4e3e7e Merge pull request `#42764`_ from amendlik/cloud-win-loop - * f3dcfca Fix infinite loops on failed Windows deployments + * 253e216a8d fix IP address spelling -- **PR** `#42694`_: (*gtmanfred*) allow adding extra remotes to a repository - @ *2017-08-07T18:08:11Z* + * bd63074e7a create new ip address before checking list of allocated ips - - **ISSUE** `#42690`_: (*ChristianBeer*) git.latest state with remote set fails on first try - | refs: `#42694`_ - * da85326 Merge pull request `#42694`_ from gtmanfred/2016.11 - * 1a0457a allow adding extra remotes to a repository +* **PR** `#42959`_: (`rallytime`_) Back-port `#42883`_ to 2016.11 + @ *2017-08-15 21:25:48 UTC* -- **PR** `#42669`_: (*garethgreenaway*) [2016.11] Fixes to augeas module - @ *2017-08-06T17:58:03Z* + * **PR** `#42883`_: (`rallytime`_) Fix failing boto tests (refs: `#42959`_) - - **ISSUE** `#42642`_: (*githubcdr*) state.augeas - | refs: `#42669`_ `#43202`_ - * 7b2119f Merge pull request `#42669`_ from garethgreenaway/42642_2016_11_augeas_module_fix - * 2441308 Updating the call to shlex_split to pass the posix=False argument so that quotes are preserved. + * d6496eca72 Merge pull request `#42959`_ from rallytime/bp-42883 -- **PR** `#42629`_: (*xiaoanyunfei*) tornado api - @ *2017-08-03T22:21:20Z* + * c6b9ca4b9e Lint fix: add missing space - * 3072576 Merge pull request `#42629`_ from xiaoanyunfei/tornadoapi - * 1e13383 tornado api + * 5597b1a30e Skip 2 failing tests in Python 3 due to upstream bugs -- **PR** `#42655`_: (*whiteinge*) Re-enable cpstats for rest_cherrypy - @ *2017-08-03T20:44:10Z* + * a0b19bdc27 Update account id value in boto_secgroup module unit test - - **PR** `#33806`_: (*cachedout*) Work around upstream cherrypy bug - | refs: `#42655`_ - * f0f00fc Merge pull request `#42655`_ from whiteinge/rest_cherrypy-reenable-stats - * deb6316 Fix lint errors + * 60b406e088 @mock_elb needs to be changed to @mock_elb_deprecated as well - * 6bd91c8 Re-enable cpstats for rest_cherrypy + * 6ae1111295 Replace @mock_ec2 calls with @mock_ec2_deprecated calls -- **PR** `#42693`_: (*gilbsgilbs*) Fix RabbitMQ tags not properly set. - @ *2017-08-03T20:23:08Z* +* **PR** `#42944`_: (`Ch3LL`_) [2016.11] Add clean_id function to salt.utils.verify.py + @ *2017-08-15 18:06:12 UTC* - - **ISSUE** `#42686`_: (*gilbsgilbs*) Unable to set multiple RabbitMQ tags - | refs: `#42693`_ `#42693`_ - * 21cf15f Merge pull request `#42693`_ from gilbsgilbs/fix-rabbitmq-tags - * 78fccdc Cast to list in case tags is a tuple. + * 6366e05d0d Merge pull request `#42944`_ from Ch3LL/2016.11.6_follow_up - * 287b57b Fix RabbitMQ tags not properly set. + * 7e0a20afca Add release notes for 2016.11.7 release -- **PR** `#42574`_: (*sbojarski*) Fixed error reporting in "boto_cfn.present" function. - @ *2017-08-01T17:55:29Z* + * 63823f8c3e Add clean_id function to salt.utils.verify.py - - **ISSUE** `#41433`_: (*sbojarski*) boto_cfn.present fails when reporting error for failed state - | refs: `#42574`_ - * f2b0c9b Merge pull request `#42574`_ from sbojarski/boto-cfn-error-reporting - * 5c945f1 Fix debug message in "boto_cfn._validate" function. +* **PR** `#42952`_: (`Ch3LL`_) [2016.11] Bump latest and previous versions + @ *2017-08-15 17:23:02 UTC* - * 181a1be Fixed error reporting in "boto_cfn.present" function. + * 49d339c976 Merge pull request `#42952`_ from Ch3LL/latest_2016.11 -- **PR** `#42623`_: (*terminalmage*) Fix unicode constructor in custom YAML loader - @ *2017-07-31T19:25:18Z* + * 74e7055d54 [2016.11] Bump latest and previous versions - * bc1effc Merge pull request `#42623`_ from terminalmage/fix-unicode-constructor - * fcf4588 Fix unicode constructor in custom YAML loader +* **PR** `#42950`_: (`Ch3LL`_) Add Security Notice to 2016.11.7 Release Notes + @ *2017-08-15 16:50:23 UTC* -- **PR** `#42515`_: (*gtmanfred*) Allow not interpreting backslashes in the repl - @ *2017-07-28T16:00:09Z* + * b0d2e05a79 Merge pull request `#42950`_ from Ch3LL/2016.11.7_docs - * cbf752c Merge pull request `#42515`_ from gtmanfred/backslash - * cc4e456 Allow not interpreting backslashes in the repl + * a6f902db40 Add Security Notice to 2016.11.77 Release Notes -- **PR** `#42586`_: (*gdubroeucq*) [Fix] yumpkg.py: add option to the command "check-update" - @ *2017-07-27T23:52:00Z* +* **PR** `#42836`_: (`aneeshusa`_) Backport salt.utils.versions from develop to 2016.11 + @ *2017-08-14 20:56:54 UTC* - - **ISSUE** `#42456`_: (*gdubroeucq*) Use yum lib - | refs: `#42586`_ - * 5494958 Merge pull request `#42586`_ from gdubroeucq/2016.11 - * 9c0b5cc Remove extra newline + * **PR** `#42835`_: (`aneeshusa`_) Fix typo in utils/versions.py module (refs: `#42836`_) - * d2ef448 yumpkg.py: clean + * c0ff69f88c Merge pull request `#42836`_ from lyft/backport-utils.versions-to-2016.11 - * a96f7c0 yumpkg.py: add option to the command "check-update" + * 86ce7004a2 Backport salt.utils.versions from develop to 2016.11 -- **PR** `#41988`_: (*abulford*) Fix dockerng.network_* name matching - @ *2017-07-27T21:25:06Z* +* **PR** `#42919`_: (`rallytime`_) Back-port `#42871`_ to 2016.11 + @ *2017-08-14 20:44:00 UTC* - - **ISSUE** `#41982`_: (*abulford*) dockerng.network_* matches too easily - | refs: `#41988`_ `#41988`_ - * 6b45deb Merge pull request `#41988`_ from redmatter/fix-dockerng-network-matching - * 9eea796 Add regression tests for `#41982`_ + * **PR** `#42871`_: (`amalleo25`_) Update joyent.rst (refs: `#42919`_) - * 3369f00 Fix broken unit test test_network_absent + * 64a79dd5ac Merge pull request `#42919`_ from rallytime/bp-42871 - * 0ef6cf6 Add trace logging of dockerng.networks result + * 4e46c968e6 Update joyent.rst - * 515c612 Fix dockerng.network_* name matching +* **ISSUE** `#42803`_: (`gmcwhistler`_) master_type: str, not working as expected, parent salt-minion process dies. (refs: `#42848`_) -- **PR** `#42339`_: (*isbm*) Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc`#1036125`_) - @ *2017-07-27T19:05:51Z* +* **ISSUE** `#42753`_: (`grichmond-salt`_) SaltReqTimeout Error on Some Minions when One Master in a Multi-Master Configuration is Unavailable (refs: `#42848`_) - - **ISSUE** `#1036125`_: (**) - * 4b16109 Merge pull request `#42339`_ from isbm/isbm-jobs-scheduled-in-a-future-bsc1036125 - * bbba84c Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc`#1036125`_) +* **PR** `#42918`_: (`rallytime`_) Back-port `#42848`_ to 2016.11 + @ *2017-08-14 20:43:43 UTC* -- **PR** `#42077`_: (*vutny*) Fix scheduled job run on Master if `when` parameter is a list - @ *2017-07-27T19:04:23Z* + * **PR** `#42848`_: (`DmitryKuzmenko`_) Execute fire_master asynchronously in the main minion thread. (refs: `#42918`_) - - **ISSUE** `#23516`_: (*dkiser*) BUG: cron job scheduler sporadically works - | refs: `#42077`_ - - **PR** `#41973`_: (*vutny*) Fix Master/Minion scheduled jobs based on Cron expressions - | refs: `#42077`_ - * 6c5a7c6 Merge pull request `#42077`_ from vutny/fix-jobs-scheduled-with-whens - * b1960ce Fix scheduled job run on Master if `when` parameter is a list + * bea8ec1098 Merge pull request `#42918`_ from rallytime/bp-42848 -- **PR** `#42414`_: (*vutny*) DOCS: unify hash sum with hash type format - @ *2017-07-27T18:48:40Z* + * cdb48126f7 Make lint happier. - * f9cb536 Merge pull request `#42414`_ from vutny/unify-hash-params-format - * d1f2a93 DOCS: unify hash sum with hash type format + * 62eca9b00b Execute fire_master asynchronously in the main minion thread. -- **PR** `#42523`_: (*rallytime*) Add a mention of the True/False returns with __virtual__() - @ *2017-07-27T18:13:07Z* +* **PR** `#42861`_: (`twangboy`_) Fix pkg.install salt-minion using salt-call + @ *2017-08-14 19:07:22 UTC* - - **ISSUE** `#42375`_: (*dragonpaw*) salt.modules.*.__virtualname__ doens't work as documented. - | refs: `#42523`_ - * 535c922 Merge pull request `#42523`_ from rallytime/`fix-42375`_ - * 685c2cc Add information about returning a tuple with an error message + * 52bce329cb Merge pull request `#42861`_ from twangboy/win_pkg_install_salt - * fa46651 Add a mention of the True/False returns with __virtual__() + * 0d3789f0c6 Fix pkg.install salt-minion using salt-call -- **PR** `#42527`_: (*twangboy*) Document changes to Windows Update in Windows 10/Server 2016 - @ *2017-07-27T17:45:38Z* +* **PR** `#42798`_: (`s-sebastian`_) Update return data before calling returners + @ *2017-08-14 15:51:30 UTC* - * 0df0e7e Merge pull request `#42527`_ from twangboy/win_wua - * 0373791 Correct capatlization + * b9f4f87aa5 Merge pull request `#42798`_ from s-sebastian/2016.11 - * af3bcc9 Document changes to Windows Update in 10/2016 + * 1cc86592ed Update return data before calling returners -- **PR** `#42551`_: (*binocvlar*) Remove '-s' (--script) argument to parted within align_check function - @ *2017-07-27T17:35:31Z* +* **ISSUE** `#41976`_: (`abulford`_) dockerng network states do not respect test=True (refs: `#41977`_) - * 69b0658 Merge pull request `#42551`_ from binocvlar/fix-lack-of-align-check-output - * c4fabaa Remove '-s' (--script) argument to parted within align_check function +* **PR** `#41977`_: (`abulford`_) Fix dockerng.network_* ignoring of tests=True + @ *2017-08-11 18:37:20 UTC* -- **PR** `#42573`_: (*rallytime*) Back-port `#42433`_ to 2016.11 - @ *2017-07-27T13:51:21Z* + * c15d0034fe Merge pull request `#41977`_ from redmatter/fix-dockerng-network-ignores-test - - **ISSUE** `#42403`_: (*astronouth7303*) [2017.7] Pillar empty when state is applied from orchestrate - | refs: `#42433`_ - - **PR** `#42433`_: (*terminalmage*) Only force saltenv/pillarenv to be a string when not None - | refs: `#42573`_ - * 9e0b4e9 Merge pull request `#42573`_ from rallytime/`bp-42433`_ - * 0293429 Only force saltenv/pillarenv to be a string when not None + * 1cc2aa503a Fix dockerng.network_* ignoring of tests=True -- **PR** `#42571`_: (*twangboy*) Avoid loading system PYTHON* environment vars - @ *2017-07-26T22:48:55Z* +* **PR** `#42886`_: (`sarcasticadmin`_) Adding missing output flags to salt cli docs + @ *2017-08-11 18:35:19 UTC* - * e931ed2 Merge pull request `#42571`_ from twangboy/win_add_pythonpath - * d55a44d Avoid loading user site packages + * 3b9c3c5671 Merge pull request `#42886`_ from sarcasticadmin/adding_docs_salt_outputs - * 9af1eb2 Ignore any PYTHON* environment vars already on the system + * 744bf954ff Adding missing output flags to salt cli - * 4e2fb03 Add pythonpath to batch files and service +* **PR** `#42882`_: (`gtmanfred`_) make sure cmd is not run when npm isn't installed + @ *2017-08-11 17:53:14 UTC* -- **PR** `#42387`_: (*DmitryKuzmenko*) Fix race condition in usage of weakvaluedict - @ *2017-07-25T20:57:42Z* + * e5b98c8a88 Merge pull request `#42882`_ from gtmanfred/2016.11 - - **ISSUE** `#42371`_: (*tsaridas*) Minion unresponsive after trying to failover - | refs: `#42387`_ - * de2f397 Merge pull request `#42387`_ from DSRCorporation/bugs/42371_KeyError_WeakValueDict - * e721c7e Don't use `key in weakvaluedict` because it could lie. + * da3402a53d make sure cmd is not run when npm isn't installed -- **PR** `#41968`_: (*root360-AndreasUlm*) Fix rabbitmqctl output sanitizer for version 3.6.10 - @ *2017-07-25T19:12:36Z* +* **PR** `#42788`_: (`amendlik`_) Remove waits and retries from Saltify deployment + @ *2017-08-11 15:38:05 UTC* - - **ISSUE** `#41955`_: (*root360-AndreasUlm*) rabbitmq 3.6.10 changed output => rabbitmq-module broken - | refs: `#41968`_ - * 641a9d7 Merge pull request `#41968`_ from root360-AndreasUlm/fix-rabbitmqctl-output-handler - * 76fd941 added tests for rabbitmq 3.6.10 output handler + * 5962c9588b Merge pull request `#42788`_ from amendlik/saltify-timeout - * 3602af1 Fix rabbitmqctl output handler for 3.6.10 + * 928b523797 Remove waits and retries from Saltify deployment -- **PR** `#42479`_: (*gtmanfred*) validate ssh_interface for ec2 - @ *2017-07-25T18:37:18Z* +* **PR** `#42877`_: (`terminalmage`_) Add virtual func for cron state module + @ *2017-08-11 15:33:09 UTC* - - **ISSUE** `#42477`_: (*aikar*) Invalid ssh_interface value prevents salt-cloud provisioning without reason of why - | refs: `#42479`_ - * 66fede3 Merge pull request `#42479`_ from gtmanfred/interface - * c32c1b2 fix pylint + * 227ecddd13 Merge pull request `#42877`_ from terminalmage/add-cron-state-virtual - * 99ec634 validate ssh_interface for ec2 + * f1de196740 Add virtual func for cron state module -- **PR** `#42516`_: (*rallytime*) Add info about top file to pillar walk-through example to include edit.vim - @ *2017-07-25T17:01:12Z* +* **PR** `#42859`_: (`terminalmage`_) Add note about git CLI requirement for GitPython to GitFS tutorial + @ *2017-08-11 14:53:03 UTC* - - **ISSUE** `#42405`_: (*felrivero*) The documentation is incorrectly compiled (PILLAR section) - | refs: `#42516`_ - * a925c70 Merge pull request `#42516`_ from rallytime/`fix-42405`_ - * e3a6717 Add info about top file to pillar walk-through example to include edit.vim + * ab9f6cef33 Merge pull request `#42859`_ from terminalmage/gitpython-git-cli-note -- **PR** `#42509`_: (*clem-compilatio*) Fix _assign_floating_ips in openstack.py - @ *2017-07-24T17:14:13Z* + * 35e05c9515 Add note about git CLI requirement for GitPython to GitFS tutorial - - **ISSUE** `#42417`_: (*clem-compilatio*) salt-cloud - openstack - "no more floating IP addresses" error - but public_ip in node - | refs: `#42509`_ - * 1bd5bbc Merge pull request `#42509`_ from clem-compilatio/`fix-42417`_ - * 72924b0 Fix _assign_floating_ips in openstack.py +* **ISSUE** `saltstack/salt-jenkins#475`_: (`rallytime`_) Arch is failing npm cache test (refs: `#42856`_) -- **PR** `#42464`_: (*garethgreenaway*) [2016.11] Small fix to modules/git.py - @ *2017-07-21T21:28:57Z* +* **ISSUE** `#41770`_: (`Ch3LL`_) NPM v5 incompatible with salt.modules.cache_list (refs: `#42856`_) - * 4bf35a7 Merge pull request `#42464`_ from garethgreenaway/2016_11_remove_tmp_identity_file - * ff24102 Uncomment the line that removes the temporary identity file. +* **PR** `#42856`_: (`gtmanfred`_) skip cache_clean test if npm version is >= 5.0.0 + @ *2017-08-11 13:39:20 UTC* -- **PR** `#42443`_: (*garethgreenaway*) [2016.11] Fix to slack engine - @ *2017-07-21T15:48:57Z* + * 682b4a8d14 Merge pull request `#42856`_ from gtmanfred/2016.11 - - **ISSUE** `#42357`_: (*Giandom*) Salt pillarenv problem with slack engine - | refs: `#42443`_ - * e2120db Merge pull request `#42443`_ from garethgreenaway/42357_pass_args_kwargs_correctly - * 635810b Updating the slack engine in 2016.11 to pass the args and kwrags correctly to LocalClient + * b458b89fb8 skip cache_clean test if npm version is >= 5.0.0 -- **PR** `#42200`_: (*shengis*) Fix `#42198`_ - @ *2017-07-21T14:47:29Z* +* **PR** `#42864`_: (`whiteinge`_) Make syndic_log_file respect root_dir setting + @ *2017-08-11 13:28:21 UTC* - - **ISSUE** `#42198`_: (*shengis*) state sqlite3.row_absent fail with "parameters are of unsupported type" - | refs: `#42200`_ - * 8262cc9 Merge pull request `#42200`_ from shengis/sqlite3_fix_row_absent_2016.11 - * 407b8f4 Fix `#42198`_ If where_args is not set, not using it in the delete request. + * 01ea854029 Merge pull request `#42864`_ from whiteinge/syndic-log-root_dir -- **PR** `#42424`_: (*goten4*) Fix error message when tornado or pycurl is not installed - @ *2017-07-20T21:53:40Z* + * 4b1f55da9c Make syndic_log_file respect root_dir setting - - **ISSUE** `#42413`_: (*goten4*) Invalid error message when proxy_host is set and tornado not installed - | refs: `#42424`_ - * d9df97e Merge pull request `#42424`_ from goten4/2016.11 - * 1c0574d Fix error message when tornado or pycurl is not installed +* **PR** `#42851`_: (`terminalmage`_) Backport `#42651`_ to 2016.11 + @ *2017-08-10 18:02:39 UTC* -- **PR** `#42350`_: (*twangboy*) Fixes problem with Version and OS Release related grains on certain versions of Python (2016.11) - @ *2017-07-19T17:07:26Z* + * **PR** `#42651`_: (`gtmanfred`_) python2- prefix for fedora 26 packages (refs: `#42851`_) - * 42bb1a6 Merge pull request `#42350`_ from twangboy/win_fix_ver_grains_2016.11 - * 8c04840 Detect Server OS with a desktop release name + * 2dde1f77e9 Merge pull request `#42851`_ from terminalmage/bp-42651 -- **PR** `#42356`_: (*meaksh*) Allow checking whether a function is available on the AliasesLoader wrapper - @ *2017-07-19T16:56:41Z* + * a3da86eea8 fix syntax - * 0a72e56 Merge pull request `#42356`_ from meaksh/2016.11-AliasesLoader-wrapper-fix - * 915d942 Allow checking whether a function is available on the AliasesLoader wrapper + * 6ecdbcec1d make sure names are correct -- **PR** `#42368`_: (*twangboy*) Remove build and dist directories before install (2016.11) - @ *2017-07-19T16:47:28Z* + * f83b553d6e add py3 for versionlock - * 10eb7b7 Merge pull request `#42368`_ from twangboy/win_fix_build_2016.11 - * a7c910c Remove build and dist directories before install + * 21934f61bb python2- prefix for fedora 26 packages -- **PR** `#42370`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-07-18T22:39:41Z* +* **ISSUE** `#42683`_: (`rgcosma`_) Gluster module broken in 2017.7 (refs: `#42806`_) - - **PR** `#42359`_: (*Ch3LL*) [2016.3] Update version numbers in doc config for 2017.7.0 release - * 016189f Merge pull request `#42370`_ from rallytime/merge-2016.11 - * 0aa5dde Merge branch '2016.3' into '2016.11' +* **PR** `#42806`_: (`rallytime`_) Update doc references in glusterfs.volume_present + @ *2017-08-10 14:10:16 UTC* - * e9b0f20 Merge pull request `#42359`_ from Ch3LL/doc-update-2016.3 + * c746f79a3a Merge pull request `#42806`_ from rallytime/fix-42683 - * dc85b5e [2016.3] Update version numbers in doc config for 2017.7.0 release + * 8c8640d6b8 Update doc references in glusterfs.volume_present -- **PR** `#42360`_: (*Ch3LL*) [2016.11] Update version numbers in doc config for 2017.7.0 release - @ *2017-07-18T19:23:30Z* +* **PR** `#42829`_: (`twangboy`_) Fix passing version in pkgs as shown in docs + @ *2017-08-10 14:07:24 UTC* - * f06a6f1 Merge pull request `#42360`_ from Ch3LL/doc-update-2016.11 - * b90b7a7 [2016.11] Update version numbers in doc config for 2017.7.0 release + * 27a8a2695a Merge pull request `#42829`_ from twangboy/win_pkg_fix_install -- **PR** `#42319`_: (*rallytime*) Add more documentation for config options that are missing from master/minion docs - @ *2017-07-18T18:02:32Z* + * 83b9b230cd Add winrepo to docs about supporting versions in pkgs - - **ISSUE** `#32400`_: (*rallytime*) Document Default Config Values - | refs: `#42319`_ - * e0595b0 Merge pull request `#42319`_ from rallytime/config-docs - * b40f980 Add more documentation for config options that are missing from master/minion docs + * 81fefa6e67 Add ability to pass version in pkgs list -- **PR** `#42352`_: (*CorvinM*) Multiple documentation fixes - @ *2017-07-18T15:10:37Z* +* **PR** `#42838`_: (`twangboy`_) Document requirements for win_pki + @ *2017-08-10 13:59:46 UTC* - - **ISSUE** `#42333`_: (*b3hni4*) Getting "invalid type of dict, a list is required" when trying to configure engines in master config file - | refs: `#42352`_ - * 7894040 Merge pull request `#42352`_ from CorvinM/issue42333 - * 526b6ee Multiple documentation fixes + * 3c3ac6aeb2 Merge pull request `#42838`_ from twangboy/win_doc_pki -- **PR** `#42353`_: (*terminalmage*) is_windows is a function, not a propery/attribute - @ *2017-07-18T14:38:51Z* + * f0a1d06b46 Standardize PKI Client - * b256001 Merge pull request `#42353`_ from terminalmage/fix-git-test - * 14cf6ce is_windows is a function, not a propery/attribute + * 7de687aa57 Document requirements for win_pki -- **PR** `#42264`_: (*rallytime*) Update minion restart section in FAQ doc for windows - @ *2017-07-17T17:40:40Z* +* **PR** `#42805`_: (`rallytime`_) Back-port `#42552`_ to 2016.11 + @ *2017-08-09 22:37:56 UTC* - - **ISSUE** `#41116`_: (*hrumph*) FAQ has wrong instructions for upgrading Windows minion. - | refs: `#42264`_ - * 866a1fe Merge pull request `#42264`_ from rallytime/`fix-41116`_ - * bd63888 Add mono-spacing to salt-minion reference for consistency + * **PR** `#42552`_: (`remijouannet`_) update consul module following this documentation https://www.consul.… (refs: `#42805`_) - * 30d62f4 Update minion restart section in FAQ doc for windows + * b3e2ae3c58 Merge pull request `#42805`_ from rallytime/bp-42552 -- **PR** `#42275`_: (*terminalmage*) pkg.installed: pack name/version into pkgs argument - @ *2017-07-17T17:38:39Z* + * 5a91c1f2d1 update consul module following this documentation https://www.consul.io/api/acl.html - - **ISSUE** `#42194`_: (*jryberg*) pkg version: latest are now broken, appending -latest to filename - | refs: `#42275`_ - * 9a70708 Merge pull request `#42275`_ from terminalmage/issue42194 - * 6638749 pkg.installed: pack name/version into pkgs argument +* **ISSUE** `#42731`_: (`infoveinx`_) http.query template_data render exception (refs: `#42804`_) -- **PR** `#42269`_: (*rallytime*) Add some clarity to "multiple quotes" section of yaml docs - @ *2017-07-17T17:38:18Z* +* **PR** `#42804`_: (`rallytime`_) Back-port `#42784`_ to 2016.11 + @ *2017-08-09 22:37:40 UTC* - - **ISSUE** `#41721`_: (*sazaro*) state.sysrc broken when setting the value to YES or NO - | refs: `#42269`_ - * e588f23 Merge pull request `#42269`_ from rallytime/`fix-41721`_ - * f2250d4 Add a note about using different styles of quotes. + * **PR** `#42784`_: (`gtmanfred`_) only read file if ret is not a string in http.query (refs: `#42804`_) - * 38d9b3d Add some clarity to "multiple quotes" section of yaml docs + * d2ee7934ed Merge pull request `#42804`_ from rallytime/bp-42784 -- **PR** `#42282`_: (*rallytime*) Handle libcloud objects that throw RepresenterErrors with --out=yaml - @ *2017-07-17T17:36:35Z* + * dbd29e4aaa only read file if it is not a string - - **ISSUE** `#42152`_: (*dubb-b*) salt-cloud errors on Rackspace driver using -out=yaml - | refs: `#42282`_ - * 5aaa214 Merge pull request `#42282`_ from rallytime/`fix-42152`_ - * f032223 Handle libcloud objects that throw RepresenterErrors with --out=yaml +* **PR** `#42826`_: (`terminalmage`_) Fix misspelling of "versions" + @ *2017-08-09 19:39:43 UTC* -- **PR** `#42308`_: (*lubyou*) Force file removal on Windows. Fixes `#42295`_ - @ *2017-07-17T17:12:13Z* + * 4cbf8057b3 Merge pull request `#42826`_ from terminalmage/fix-spelling - - **ISSUE** `#42295`_: (*lubyou*) file.absent fails on windows if the file to be removed has the "readonly" attribute set - | refs: `#42308`_ - * fb5697a Merge pull request `#42308`_ from lubyou/42295-fix-file-absent-windows - * 026ccf4 Force file removal on Windows. Fixes `#42295`_ + * 00f93142e4 Fix misspelling of "versions" -- **PR** `#42314`_: (*rallytime*) Add clarification to salt ssh docs about key auto-generation. - @ *2017-07-17T14:07:49Z* +* **PR** `#42786`_: (`Ch3LL`_) Fix typo for template_dict in http docs + @ *2017-08-08 18:14:50 UTC* - - **ISSUE** `#42267`_: (*gzcwnk*) salt-ssh not creating ssh keys automatically as per documentation - | refs: `#42314`_ - * da2a8a5 Merge pull request `#42314`_ from rallytime/`fix-42267`_ - * c406046 Add clarification to salt ssh docs about key auto-generation. + * de997edd90 Merge pull request `#42786`_ from Ch3LL/fix_typo -- **PR** `#41945`_: (*garethgreenaway*) Fixes to modules/git.py - @ *2017-07-14T17:46:10Z* + * 90a2fb66a2 Fix typo for template_dict in http docs - - **ISSUE** `#41936`_: (*michaelkarrer81*) git.latest identity does not set the correct user for the private key file on the minion - | refs: `#41945`_ - - **ISSUE** `#1`_: (*thatch45*) Enable regex on the salt cli - * acadd54 Merge pull request `#41945`_ from garethgreenaway/41936_allow_identity_files_with_user - * 44841e5 Moving the call to cp.get_file inside the with block to ensure the umask is preserved when we grab the file. +* **ISSUE** `#42600`_: (`twangboy`_) Unable to set 'Not Configured' using win_lgpo execution module (refs: `#42795`_, `#42744`_) - * f9ba60e Merge pull request `#1`_ from terminalmage/pr-41945 +* **PR** `#42795`_: (`lomeroe`_) backport `#42744`_ to 2016.11 + @ *2017-08-08 17:17:15 UTC* - * 1b60261 Restrict set_umask to mkstemp call only + * **PR** `#42744`_: (`lomeroe`_) fix `#42600`_ in develop (refs: `#42795`_) - * 68549f3 Fixing umask to we can set files as executable. + * bf6153ebe5 Merge pull request `#42795`_ from lomeroe/bp-42744_201611 - * 4949bf3 Updating to swap on the new salt.utils.files.set_umask context_manager + * 695f8c1ae4 fix `#42600`_ in develop - * 8faa9f6 Updating PR with requested changes. +* **ISSUE** `#42747`_: (`whiteinge`_) Outputters mutate data which can be a problem for Runners and perhaps other things (refs: `#42748`_) - * 494765e Updating the git module to allow an identity file to be used when passing the user parameter +* **PR** `#42748`_: (`whiteinge`_) Workaround Orchestrate problem that highstate outputter mutates data + @ *2017-08-07 21:11:33 UTC* -- **PR** `#42289`_: (*CorvinM*) Multiple empty_password fixes for state.user - @ *2017-07-14T16:14:02Z* + * 61fad97286 Merge pull request `#42748`_ from whiteinge/save-before-output - - **ISSUE** `#42240`_: (*casselt*) empty_password in user.present always changes password, even with test=True - | refs: `#42289`_ - - **PR** `#41543`_: (*cri-epita*) Fix user creation with empty password - | refs: `#42289`_ `#42289`_ - * f90e04a Merge pull request `#42289`_ from CorvinM/`bp-41543`_ - * 357dc22 Fix user creation with empty password + * de60b77c82 Workaround Orchestrate problem that highstate outputter mutates data -- **PR** `#42123`_: (*vutny*) DOCS: describe importing custom util classes - @ *2017-07-12T15:53:24Z* +* **PR** `#42764`_: (`amendlik`_) Fix infinite loop with salt-cloud and Windows nodes + @ *2017-08-07 20:47:07 UTC* - * a91a3f8 Merge pull request `#42123`_ from vutny/fix-master-utils-import - * 6bb8b8f Add missing doc for ``utils_dirs`` Minion config option + * a4e3e7e786 Merge pull request `#42764`_ from amendlik/cloud-win-loop - * f1bc58f Utils: add example of module import + * f3dcfca4e0 Fix infinite loops on failed Windows deployments -- **PR** `#42261`_: (*rallytime*) Some minor doc fixes for dnsutil module so they'll render correctly - @ *2017-07-11T23:14:53Z* +* **ISSUE** `#42690`_: (`ChristianBeer`_) git.latest state with remote set fails on first try (refs: `#42694`_) - * e2aa511 Merge pull request `#42261`_ from rallytime/minor-doc-fix - * 8c76bbb Some minor doc fixes for dnsutil module so they'll render correctly +* **PR** `#42694`_: (`gtmanfred`_) allow adding extra remotes to a repository + @ *2017-08-07 18:08:11 UTC* -- **PR** `#42262`_: (*rallytime*) Back-port `#42224`_ to 2016.11 - @ *2017-07-11T23:14:25Z* + * da85326ad4 Merge pull request `#42694`_ from gtmanfred/2016.11 - - **PR** `#42224`_: (*tdutrion*) Remove duplicate instruction in Openstack Rackspace config example - | refs: `#42262`_ - * 3e9dfbc Merge pull request `#42262`_ from rallytime/`bp-42224`_ - * c31ded3 Remove duplicate instruction in Openstack Rackspace config example + * 1a0457af51 allow adding extra remotes to a repository -- **PR** `#42181`_: (*garethgreenaway*) fixes to state.py for names parameter - @ *2017-07-11T21:21:32Z* +* **ISSUE** `#42642`_: (`githubcdr`_) state.augeas (refs: `#42669`_, `#43202`_) - - **ISSUE** `#42137`_: (*kiemlicz*) cmd.run with multiple commands - random order of execution - | refs: `#42181`_ - * 7780579 Merge pull request `#42181`_ from garethgreenaway/42137_backport_fix_from_2017_7 - * a34970b Back porting the fix for 2017.7 that ensures the order of the names parameter. +* **PR** `#42669`_: (`garethgreenaway`_) [2016.11] Fixes to augeas module + @ *2017-08-06 17:58:03 UTC* -- **PR** `#42253`_: (*gtmanfred*) Only use unassociated ips when unable to allocate - @ *2017-07-11T20:53:51Z* + * 7b2119feee Merge pull request `#42669`_ from garethgreenaway/42642_2016_11_augeas_module_fix - - **PR** `#38965`_: (*toanju*) salt-cloud will use list_floating_ips for OpenStack - | refs: `#42253`_ - - **PR** `#34280`_: (*kevinanderson1*) salt-cloud will use list_floating_ips for Openstack - | refs: `#38965`_ - * 7253786 Merge pull request `#42253`_ from gtmanfred/2016.11 - * 53e2576 Only use unassociated ips when unable to allocate + * 24413084e2 Updating the call to shlex_split to pass the posix=False argument so that quotes are preserved. -- **PR** `#42252`_: (*UtahDave*) simple docstring updates - @ *2017-07-11T20:48:33Z* +* **PR** `#42629`_: (`xiaoanyunfei`_) tornado api + @ *2017-08-03 22:21:20 UTC* - * b2a4698 Merge pull request `#42252`_ from UtahDave/2016.11local - * e6a9563 simple doc updates + * 30725769ed Merge pull request `#42629`_ from xiaoanyunfei/tornadoapi -- **PR** `#42235`_: (*astronouth7303*) Abolish references to `dig` in examples. - @ *2017-07-10T20:06:11Z* + * 1e13383b95 tornado api - - **ISSUE** `#42232`_: (*astronouth7303*) Half of dnsutil refers to dig - | refs: `#42235`_ - * 781fe13 Merge pull request `#42235`_ from astronouth7303/patch-1-2016.3 - * 4cb51bd Make note of dig partial requirement. +* **PR** `#42655`_: (`whiteinge`_) Reenable cpstats for rest_cherrypy + @ *2017-08-03 20:44:10 UTC* - * 08e7d83 Abolish references to `dig` in examples. + * **PR** `#33806`_: (`cachedout`_) Work around upstream cherrypy bug (refs: `#42655`_) -- **PR** `#42215`_: (*twangboy*) Add missing config to example - @ *2017-07-07T20:18:44Z* + * f0f00fcee1 Merge pull request `#42655`_ from whiteinge/rest_cherrypy-reenable-stats - * 83cbd76 Merge pull request `#42215`_ from twangboy/win_iis_docs - * c07e220 Add missing config to example + * deb6316d67 Fix lint errors -- **PR** `#42211`_: (*terminalmage*) Only pass a saltenv in orchestration if one was explicitly passed (2016.11) - @ *2017-07-07T20:16:35Z* + * 6bd91c8b03 Reenable cpstats for rest_cherrypy - * 274946a Merge pull request `#42211`_ from terminalmage/issue40928 - * 22a18fa Only pass a saltenv in orchestration if one was explicitly passed (2016.11) +* **ISSUE** `#42686`_: (`gilbsgilbs`_) Unable to set multiple RabbitMQ tags (refs: `#42693`_) -- **PR** `#42173`_: (*rallytime*) Back-port `#37424`_ to 2016.11 - @ *2017-07-07T16:39:59Z* +* **PR** `#42693`_: (`gilbsgilbs`_) Fix RabbitMQ tags not properly set. + @ *2017-08-03 20:23:08 UTC* - - **PR** `#37424`_: (*kojiromike*) Avoid Early Convert ret['comment'] to String - | refs: `#42173`_ - * 89261cf Merge pull request `#42173`_ from rallytime/`bp-37424`_ - * 01addb6 Avoid Early Convert ret['comment'] to String + * 21cf15f9c3 Merge pull request `#42693`_ from gilbsgilbs/fix-rabbitmq-tags -- **PR** `#42175`_: (*rallytime*) Back-port `#39366`_ to 2016.11 - @ *2017-07-06T19:51:47Z* + * 78fccdc7e2 Cast to list in case tags is a tuple. - - **ISSUE** `#39365`_: (*dglloyd*) service.running fails if sysv script has no status command and enable: True - | refs: `#39366`_ - - **PR** `#39366`_: (*dglloyd*) Pass sig to service.status in after_toggle - | refs: `#42175`_ - * 3b17fb7 Merge pull request `#42175`_ from rallytime/`bp-39366`_ - * 53f7b98 Pass sig to service.status in after_toggle + * 287b57b5c5 Fix RabbitMQ tags not properly set. -- **PR** `#42172`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-07-06T18:16:29Z* +* **ISSUE** `#41433`_: (`sbojarski`_) boto_cfn.present fails when reporting error for failed state (refs: `#42574`_) - - **PR** `#42155`_: (*phsteve*) Fix docs for puppet.plugin_sync - * ea16f47 Merge pull request `#42172`_ from rallytime/merge-2016.11 - * b1fa332 Merge branch '2016.3' into '2016.11' +* **PR** `#42574`_: (`sbojarski`_) Fixed error reporting in "boto_cfn.present" function. + @ *2017-08-01 17:55:29 UTC* - * 8fa1fa5 Merge pull request `#42155`_ from phsteve/doc-fix-puppet + * f2b0c9b4fa Merge pull request `#42574`_ from sbojarski/boto-cfn-error-reporting - * fb2cb78 Fix docs for puppet.plugin_sync so code-block renders properly and sync is spelled consistently + * 5c945f10c2 Fix debug message in "boto_cfn._validate" function. -- **PR** `#42176`_: (*rallytime*) Back-port `#42109`_ to 2016.11 - @ *2017-07-06T18:15:35Z* + * 181a1beecc Fixed error reporting in "boto_cfn.present" function. - - **PR** `#42109`_: (*arthurlogilab*) [doc] Update aws.rst - add Debian default username - | refs: `#42176`_ - * 6307b98 Merge pull request `#42176`_ from rallytime/`bp-42109`_ - * 686926d Update aws.rst - add Debian default username +* **PR** `#42623`_: (`terminalmage`_) Fix unicode constructor in custom YAML loader + @ *2017-07-31 19:25:18 UTC* -- **PR** `#42095`_: (*terminalmage*) Add debug logging to dockerng.login - @ *2017-07-06T17:13:05Z* + * bc1effc4f2 Merge pull request `#42623`_ from terminalmage/fix-unicode-constructor - * 28c4e4c Merge pull request `#42095`_ from terminalmage/docker-login-debugging - * bd27870 Add debug logging to dockerng.login + * fcf45889dd Fix unicode constructor in custom YAML loader -- **PR** `#42119`_: (*terminalmage*) Fix regression in CLI pillar override for salt-call - @ *2017-07-06T17:02:52Z* +* **PR** `#42515`_: (`gtmanfred`_) Allow not interpreting backslashes in the repl + @ *2017-07-28 16:00:09 UTC* - - **ISSUE** `#42116`_: (*terminalmage*) CLI pillar override regression in 2017.7.0rc1 - | refs: `#42119`_ - * 2b754bc Merge pull request `#42119`_ from terminalmage/issue42116 - * 9a26894 Add integration test for 42116 + * cbf752cd73 Merge pull request `#42515`_ from gtmanfred/backslash - * 1bb42bb Fix regression when CLI pillar override is used with salt-call + * cc4e45656d Allow not interpreting backslashes in the repl -- **PR** `#42121`_: (*terminalmage*) Fix pillar.get when saltenv is passed - @ *2017-07-06T16:52:34Z* +* **ISSUE** `#42456`_: (`gdubroeucq`_) Use yum lib (refs: `#42586`_) - - **ISSUE** `#42114`_: (*clallen*) saltenv bug in pillar.get execution module function - | refs: `#42121`_ - * 8c0a83c Merge pull request `#42121`_ from terminalmage/issue42114 - * d142912 Fix pillar.get when saltenv is passed +* **PR** `#42586`_: (`gdubroeucq`_) [Fix] yumpkg.py: add option to the command "check-update" + @ *2017-07-27 23:52:00 UTC* -- **PR** `#42094`_: (*terminalmage*) Prevent command from showing in exception when output_loglevel=quiet - @ *2017-07-06T16:18:09Z* + * 549495831f Merge pull request `#42586`_ from gdubroeucq/2016.11 - * 687992c Merge pull request `#42094`_ from terminalmage/quiet-exception - * 47d61f4 Prevent command from showing in exception when output_loglevel=quiet + * 9c0b5cc1d6 Remove extra newline -- **PR** `#42163`_: (*vutny*) Fix `#42115`_: parse libcloud "rc" version correctly - @ *2017-07-06T16:15:07Z* + * d2ef4483e4 yumpkg.py: clean - - **ISSUE** `#42115`_: (*nomeelnoj*) Installing EPEL repo breaks salt-cloud - | refs: `#42163`_ - * dad2551 Merge pull request `#42163`_ from vutny/`fix-42115`_ - * b27b1e3 Fix `#42115`_: parse libcloud "rc" version correctly + * a96f7c09e0 yumpkg.py: add option to the command "check-update" -- **PR** `#42164`_: (*Ch3LL*) Fix kerberos create_keytab doc - @ *2017-07-06T15:55:33Z* +* **ISSUE** `#41982`_: (`abulford`_) dockerng.network_* matches too easily (refs: `#41988`_) - * 2a8ae2b Merge pull request `#42164`_ from Ch3LL/fix_kerb_doc - * 7c0fb24 Fix kerberos create_keytab doc +* **PR** `#41988`_: (`abulford`_) Fix dockerng.network_* name matching + @ *2017-07-27 21:25:06 UTC* -- **PR** `#42141`_: (*rallytime*) Back-port `#42098`_ to 2016.11 - @ *2017-07-06T15:11:49Z* + * 6b45debf28 Merge pull request `#41988`_ from redmatter/fix-dockerng-network-matching - - **PR** `#42098`_: (*twangboy*) Change repo_ng to repo-ng - | refs: `#42141`_ - * 678d4d4 Merge pull request `#42141`_ from rallytime/`bp-42098`_ - * bd80243 Change repo_ng to repo-ng + * 9eea796da8 Add regression tests for `#41982`_ -- **PR** `#42140`_: (*rallytime*) Back-port `#42097`_ to 2016.11 - @ *2017-07-06T15:11:29Z* + * 3369f0072f Fix broken unit test test_network_absent - - **PR** `#42097`_: (*gtmanfred*) require large timediff for ipv6 warning - | refs: `#42140`_ - * c8afd7a Merge pull request `#42140`_ from rallytime/`bp-42097`_ - * 9c4e132 Import datetime + * 0ef6cf634c Add trace logging of dockerng.networks result - * 1435bf1 require large timediff for ipv6 warning + * 515c612808 Fix dockerng.network_* name matching -- **PR** `#42142`_: (*Ch3LL*) Update builds available for rc1 - @ *2017-07-05T21:11:56Z* +* **PR** `#42339`_: (`isbm`_) Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc#1036125) + @ *2017-07-27 19:05:51 UTC* - * c239664 Merge pull request `#42142`_ from Ch3LL/change_builds - * e1694af Update builds available for rc1 + * 4b16109122 Merge pull request `#42339`_ from isbm/isbm-jobs-scheduled-in-a-future-bsc1036125 -- **PR** `#42078`_: (*damon-atkins*) pkg.install and pkg.remove fix version number input. - @ *2017-07-05T06:04:57Z* + * bbba84ce2d Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc#1036125) - * 4780d78 Merge pull request `#42078`_ from damon-atkins/fix_convert_flt_str_version_on_cmd_line - * 09d37dd Fix comment typo +* **ISSUE** `#23516`_: (`dkiser`_) BUG: cron job scheduler sporadically works (refs: `#42077`_) - * 7167549 Handle version=None when converted to a string it becomes 'None' parm should default to empty string rather than None, it would fix better with existing code. +* **PR** `#42077`_: (`vutny`_) Fix scheduled job run on Master if `when` parameter is a list + @ *2017-07-27 19:04:23 UTC* - * 4fb2bb1 Fix typo + * **PR** `#41973`_: (`vutny`_) Fix Master/Minion scheduled jobs based on Cron expressions (refs: `#42077`_) - * cf55c33 pkg.install and pkg.remove on the command line take number version numbers, store them within a float. However version is a string, to support versions numbers like 1.3.4 + * 6c5a7c604a Merge pull request `#42077`_ from vutny/fix-jobs-scheduled-with-whens -- **PR** `#42105`_: (*Ch3LL*) Update releasecanddiate doc with new 2017.7.0rc1 Release - @ *2017-07-04T03:14:42Z* + * b1960cea44 Fix scheduled job run on Master if `when` parameter is a list - * 46d575a Merge pull request `#42105`_ from Ch3LL/update_rc - * d4e7b91 Update releasecanddiate doc with new 2017.7.0rc1 Release +* **PR** `#42414`_: (`vutny`_) DOCS: unify hash sum with hash type format + @ *2017-07-27 18:48:40 UTC* -- **PR** `#42099`_: (*rallytime*) Remove references in docs to pip install salt-cloud - @ *2017-07-03T22:13:44Z* + * f9cb536589 Merge pull request `#42414`_ from vutny/unify-hash-params-format - - **ISSUE** `#41885`_: (*astronouth7303*) Recommended pip installation outdated? - | refs: `#42099`_ - * d38548b Merge pull request `#42099`_ from rallytime/`fix-41885`_ - * c2822e0 Remove references in docs to pip install salt-cloud + * d1f2a93368 DOCS: unify hash sum with hash type format -- **PR** `#42086`_: (*abulford*) Make result=true if Docker volume already exists - @ *2017-07-03T15:48:33Z* +* **ISSUE** `#42375`_: (`dragonpaw`_) salt.modules.*.__virtualname__ doens't work as documented. (refs: `#42523`_) - - **ISSUE** `#42076`_: (*abulford*) dockerng.volume_present test looks as though it would cause a change - | refs: `#42086`_ `#42086`_ - * 81d606a Merge pull request `#42086`_ from redmatter/fix-dockerng-volume-present-result - * 8d54968 Make result=true if Docker volume already exists +* **PR** `#42523`_: (`rallytime`_) Add a mention of the True/False returns with __virtual__() + @ *2017-07-27 18:13:07 UTC* -- **PR** `#42021`_: (*gtmanfred*) Set concurrent to True when running states with sudo - @ *2017-06-30T21:02:15Z* + * 535c922511 Merge pull request `#42523`_ from rallytime/fix-42375 - - **ISSUE** `#25842`_: (*shikhartanwar*) Running salt-minion as non-root user to execute sudo commands always returns an error - | refs: `#42021`_ - * 7160697 Merge pull request `#42021`_ from gtmanfred/2016.11 - * 26beb18 Set concurrent to True when running states with sudo + * 685c2cced6 Add information about returning a tuple with an error message -- **PR** `#42029`_: (*terminalmage*) Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips - @ *2017-06-30T20:58:56Z* + * fa466519c4 Add a mention of the True/False returns with __virtual__() - * b784fbb Merge pull request `#42029`_ from terminalmage/host_to_ips - * 26f848e Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips +* **PR** `#42527`_: (`twangboy`_) Document changes to Windows Update in Windows 10/Server 2016 + @ *2017-07-27 17:45:38 UTC* -- **PR** `#42055`_: (*dmurphy18*) Upgrade support for gnupg v2.1 and higher - @ *2017-06-30T20:54:02Z* + * 0df0e7e749 Merge pull request `#42527`_ from twangboy/win_wua - * e067020 Merge pull request `#42055`_ from dmurphy18/handle_gnupgv21 - * e20cea6 Upgrade support for gnupg v2.1 and higher + * 0373791f2a Correct capatlization -- **PR** `#42048`_: (*Ch3LL*) Add initial 2016.11.7 Release Notes - @ *2017-06-30T16:00:05Z* + * af3bcc927b Document changes to Windows Update in 10/2016 - * 74ba2ab Merge pull request `#42048`_ from Ch3LL/add_11.7 - * 1de5e00 Add initial 2016.11.7 Release Notes +* **PR** `#42551`_: (`binocvlar`_) Remove '-s' (--script) argument to parted within align_check function + @ *2017-07-27 17:35:31 UTC* -- **PR** `#42024`_: (*leeclemens*) doc: Specify versionadded for SELinux policy install/uninstall - @ *2017-06-29T23:29:50Z* + * 69b06586da Merge pull request `#42551`_ from binocvlar/fix-lack-of-align-check-output - * ca4e619 Merge pull request `#42024`_ from leeclemens/doc/selinux - * b63a3c0 doc: Specify versionadded for SELinux policy install/uninstall + * c4fabaa192 Remove '-s' (--script) argument to parted within align_check function -- **PR** `#42030`_: (*whiteinge*) Re-add msgpack to mocked imports - @ *2017-06-29T20:47:59Z* +* **ISSUE** `#42403`_: (`astronouth7303`_) [2017.7] Pillar empty when state is applied from orchestrate (refs: `#42433`_) - - **PR** `#42028`_: (*whiteinge*) Revert "Allow docs to be built under Python 3" - | refs: `#42030`_ - - **PR** `#41961`_: (*cachedout*) Allow docs to be built under Python 3 - | refs: `#42028`_ - * 50856d0 Merge pull request `#42030`_ from whiteinge/revert-py3-doc-chagnes-pt-2 - * 18dfa98 Re-add msgpack to mocked imports +* **PR** `#42573`_: (`rallytime`_) Back-port `#42433`_ to 2016.11 + @ *2017-07-27 13:51:21 UTC* -- **PR** `#42028`_: (*whiteinge*) Revert "Allow docs to be built under Python 3" - | refs: `#42030`_ - @ *2017-06-29T19:47:46Z* + * **PR** `#42433`_: (`terminalmage`_) Only force saltenv/pillarenv to be a string when not None (refs: `#42573`_) - - **PR** `#41961`_: (*cachedout*) Allow docs to be built under Python 3 - | refs: `#42028`_ - * 53031d2 Merge pull request `#42028`_ from saltstack/revert-41961-py3_doc - * 5592e6e Revert "Allow docs to be built under Python 3" + * 9e0b4e9faf Merge pull request `#42573`_ from rallytime/bp-42433 -- **PR** `#42017`_: (*lorengordon*) Fixes typo "nozerconf" -> "nozeroconf" - @ *2017-06-29T17:30:48Z* + * 0293429e24 Only force saltenv/pillarenv to be a string when not None - - **ISSUE** `#42013`_: (*dusto*) Misspelled nozeroconf in salt/modules/rh_ip.py - | refs: `#42017`_ - * 1416bf7 Merge pull request `#42017`_ from lorengordon/issue-42013 - * b6cf5f2 Fixes typo nozerconf -> nozeroconf +* **PR** `#42571`_: (`twangboy`_) Avoid loading system PYTHON* environment vars + @ *2017-07-26 22:48:55 UTC* -- **PR** `#41906`_: (*terminalmage*) Better support for numeric saltenvs - @ *2017-06-29T17:19:33Z* + * e931ed2517 Merge pull request `#42571`_ from twangboy/win_add_pythonpath - * 0ebb50b Merge pull request `#41906`_ from terminalmage/numeric-saltenv - * 2d798de Better support for numeric saltenvs + * d55a44dd1a Avoid loading user site packages -- **PR** `#41995`_: (*terminalmage*) Temporarily set the umask before writing an auth token - @ *2017-06-29T01:09:48Z* + * 9af1eb2741 Ignore any PYTHON* environment vars already on the system - * 6a3c03c Merge pull request `#41995`_ from terminalmage/token-umask - * 4f54b00 Temporarily set the umask before writing an auth token + * 4e2fb03a95 Add pythonpath to batch files and service -- **PR** `#41999`_: (*terminalmage*) Update IP address for unit.utils.network_test.NetworkTestCase.test_host_to_ips - @ *2017-06-29T01:01:31Z* +* **ISSUE** `#42371`_: (`tsaridas`_) Minion unresponsive after trying to failover (refs: `#42387`_) - * e3801b0 Merge pull request `#41999`_ from terminalmage/fix-network-test - * fb6a933 Update IP address for unit.utils.network_test.NetworkTestCase.test_host_to_ips +* **PR** `#42387`_: (`DmitryKuzmenko`_) Fix race condition in usage of weakvaluedict + @ *2017-07-25 20:57:42 UTC* -- **PR** `#41991`_: (*Da-Juan*) Accept a list for state_aggregate global setting - @ *2017-06-29T00:58:59Z* + * de2f397041 Merge pull request `#42387`_ from DSRCorporation/bugs/42371_KeyError_WeakValueDict - - **ISSUE** `#18659`_: (*whiteinge*) mod_aggregate not working for list-form configuration - | refs: `#41991`_ - * a7f3892 Merge pull request `#41991`_ from Da-Juan/fix-state_aggregate-list - * c9075b8 Accept a list for state_aggregate setting + * e721c7eee2 Don't use `key in weakvaluedict` because it could lie. -- **PR** `#41993`_: (*UtahDave*) change out salt support link to SaltConf link - @ *2017-06-29T00:55:20Z* +* **ISSUE** `#41955`_: (`root360-AndreasUlm`_) rabbitmq 3.6.10 changed output => rabbitmq-module broken (refs: `#41968`_) - * 7424f87 Merge pull request `#41993`_ from UtahDave/2016.11local - * bff050a change out salt support link to SaltConf link +* **PR** `#41968`_: (`root360-AndreasUlm`_) Fix rabbitmqctl output sanitizer for version 3.6.10 + @ *2017-07-25 19:12:36 UTC* -- **PR** `#41987`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-06-28T20:19:11Z* + * 641a9d7efd Merge pull request `#41968`_ from root360-AndreasUlm/fix-rabbitmqctl-output-handler - - **PR** `#41981`_: (*Ch3LL*) [2016.3] Bump latest release version to 2016.11.6 - * 3b9ccf0 Merge pull request `#41987`_ from rallytime/merge-2016.11 - * 48867c4 Merge branch '2016.3' into '2016.11' + * 76fd941d91 added tests for rabbitmq 3.6.10 output handler - * c589eae Merge pull request `#41981`_ from Ch3LL/11.6_3 + * 3602af1e1b Fix rabbitmqctl output handler for 3.6.10 - * 2516ae1 [2016.3] Bump latest release version to 2016.11.6 +* **ISSUE** `#42477`_: (`aikar`_) Invalid ssh_interface value prevents salt-cloud provisioning without reason of why (refs: `#42479`_) -- **PR** `#41985`_: (*rallytime*) Back-port `#41780`_ to 2016.11 - @ *2017-06-28T20:18:57Z* +* **PR** `#42479`_: (`gtmanfred`_) validate ssh_interface for ec2 + @ *2017-07-25 18:37:18 UTC* - - **PR** `#41780`_: (*ferringb*) Fix salt.util.render_jinja_tmpl usage for when not used in an environmnet - | refs: `#41985`_ - * 768339d Merge pull request `#41985`_ from rallytime/`bp-41780`_ - * 8f8d3a4 Fix salt.util.render_jinja_tmpl usage for when not used in an environment. + * 66fede378a Merge pull request `#42479`_ from gtmanfred/interface -- **PR** `#41986`_: (*rallytime*) Back-port `#41820`_ to 2016.11 - @ *2017-06-28T20:18:43Z* + * c32c1b2803 fix pylint - - **ISSUE** `#34963`_: (*craigafinch*) Incorrect behavior or documentation for comments in salt.states.pkgrepo.managed - | refs: `#41820`_ - - **PR** `#41820`_: (*nhavens*) Fix yum repo file comments to work as documented in pkgrepo.managed - | refs: `#41986`_ - * bd9090c Merge pull request `#41986`_ from rallytime/`bp-41820`_ - * 72320e3 Fix yum repo file comments to work as documented in pkgrepo.managed + * 99ec634c6b validate ssh_interface for ec2 -- **PR** `#41973`_: (*vutny*) Fix Master/Minion scheduled jobs based on Cron expressions - | refs: `#42077`_ - @ *2017-06-28T16:39:02Z* +* **ISSUE** `#42405`_: (`felrivero`_) The documentation is incorrectly compiled (PILLAR section) (refs: `#42516`_) - * a31da52 Merge pull request `#41973`_ from vutny/fix-croniter-scheduled-jobs - * 148788e Fix Master/Minion scheduled jobs based on Cron expressions +* **PR** `#42516`_: (`rallytime`_) Add info about top file to pillar walk-through example to include edit.vim + @ *2017-07-25 17:01:12 UTC* -- **PR** `#41980`_: (*Ch3LL*) [2016.11] Bump latest release version to 2016.11.6 - @ *2017-06-28T15:35:11Z* + * a925c7029a Merge pull request `#42516`_ from rallytime/fix-42405 - * 689ff93 Merge pull request `#41980`_ from Ch3LL/11.6_11 - * fe4f571 [2016.11] Bump latest release version to 2016.11.6 + * e3a6717efa Add info about top file to pillar walk-through example to include edit.vim -- **PR** `#41961`_: (*cachedout*) Allow docs to be built under Python 3 - | refs: `#42028`_ - @ *2017-06-27T21:11:54Z* +* **ISSUE** `#42417`_: (`clem-compilatio`_) salt-cloud - openstack - "no more floating IP addresses" error - but public_ip in node (refs: `#42509`_) - * 82b1eb2 Merge pull request `#41961`_ from cachedout/py3_doc - * 7aacddf Allow docs to be built under Python 3 +* **PR** `#42509`_: (`clem-compilatio`_) Fix _assign_floating_ips in openstack.py + @ *2017-07-24 17:14:13 UTC* -- **PR** `#41948`_: (*davidjb*) Fix Composer state's `name` docs; formatting - @ *2017-06-27T17:51:29Z* + * 1bd5bbccc2 Merge pull request `#42509`_ from clem-compilatio/fix-42417 - - **PR** `#41933`_: (*davidjb*) Fix Composer state's `name` docs and improve formatting - | refs: `#41948`_ - * f0eb51d Merge pull request `#41948`_ from davidjb/patch-9 - * 0e4b3d9 Fix Composer state's `name` docs; formatting + * 72924b06b8 Fix _assign_floating_ips in openstack.py -- **PR** `#41914`_: (*vutny*) archive.extracted: fix hash sum verification for local archives - @ *2017-06-26T17:59:27Z* +* **PR** `#42464`_: (`garethgreenaway`_) [2016.11] Small fix to modules/git.py + @ *2017-07-21 21:28:57 UTC* - * e28e10d Merge pull request `#41914`_ from vutny/fix-archive-extracted-local-file-hash - * 54910fe archive.extracted: fix hash sum verification for local archives + * 4bf35a74de Merge pull request `#42464`_ from garethgreenaway/2016_11_remove_tmp_identity_file -- **PR** `#41912`_: (*Ch3LL*) Allow pacman module to run on Manjaro - @ *2017-06-26T15:35:20Z* + * ff24102d51 Uncomment the line that removes the temporary identity file. - * 76ad6ff Merge pull request `#41912`_ from Ch3LL/fix_manjaro - * e4dd72a Update os_name_map in core grains for new manjaro systems +* **ISSUE** `#42357`_: (`Giandom`_) Salt pillarenv problem with slack engine (refs: `#42443`_) - * aa7c839 Allow pacman module to run on Manjaro +* **PR** `#42443`_: (`garethgreenaway`_) [2016.11] Fix to slack engine + @ *2017-07-21 15:48:57 UTC* -- **PR** `#41516`_: (*kstreee*) Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications. - @ *2017-06-26T14:41:38Z* + * e2120dbd0e Merge pull request `#42443`_ from garethgreenaway/42357_pass_args_kwargs_correctly - - **ISSUE** `#38093`_: (*DmitryKuzmenko*) Make threads avoid blocking waiting while communicating using TCP transport. - | refs: `#41516`_ `#41516`_ - - **PR** `#37878`_: (*kstreee*) Makes threads avoid blocking waiting while communicating using Zeromq. - | refs: `#41516`_ `#41516`_ - * ff67d47 Merge pull request `#41516`_ from kstreee/fix-blocking-waiting-tcp-connection - * df96969 Removes redundant closing statements. + * 635810b3e3 Updating the slack engine in 2016.11 to pass the args and kwrags correctly to LocalClient - * 94b9ea5 Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications. +* **ISSUE** `#42198`_: (`shengis`_) state sqlite3.row_absent fail with "parameters are of unsupported type" (refs: `#42200`_) -- **PR** `#41888`_: (*Ch3LL*) Add additional commits to 2016.11.6 release notes - @ *2017-06-22T16:19:00Z* +* **PR** `#42200`_: (`shengis`_) Fix `#42198`_ + @ *2017-07-21 14:47:29 UTC* - * c90cb67 Merge pull request `#41888`_ from Ch3LL/change_release - * 4e1239d Add additional commits to 2016.11.6 release notes + * 8262cc9054 Merge pull request `#42200`_ from shengis/sqlite3_fix_row_absent_2016.11 -- **PR** `#41882`_: (*Ch3LL*) Add pycryptodome to crypt_test - @ *2017-06-21T19:51:10Z* + * 407b8f4bb3 Fix `#42198`_ If where_args is not set, not using it in the delete request. - * 4a32644 Merge pull request `#41882`_ from Ch3LL/fix_crypt_test - * 6f70dbd Add pycryptodome to crypt_test +* **ISSUE** `#42413`_: (`goten4`_) Invalid error message when proxy_host is set and tornado not installed (refs: `#42424`_) -- **PR** `#41877`_: (*Ch3LL*) Fix netstat and routes test - @ *2017-06-21T16:16:58Z* +* **PR** `#42424`_: (`goten4`_) Fix error message when tornado or pycurl is not installed + @ *2017-07-20 21:53:40 UTC* - * 13df29e Merge pull request `#41877`_ from Ch3LL/fix_netstat_test - * d2076a6 Patch salt.utils.which for test_route test + * d9df97e5a3 Merge pull request `#42424`_ from goten4/2016.11 - * 51f7e10 Patch salt.utils.which for test_netstat test + * 1c0574d05e Fix error message when tornado or pycurl is not installed -- **PR** `#41566`_: (*morganwillcock*) win_certutil: workaround for reading serial numbers with non-English languages - @ *2017-06-21T15:40:29Z* +* **PR** `#42350`_: (`twangboy`_) Fixes problem with Version and OS Release related grains on certain versions of Python (2016.11) + @ *2017-07-19 17:07:26 UTC* - - **ISSUE** `#41367`_: (*lubyou*) certutil.add_store does not work on non english windows versions or on Windows 10 (localised or English) - | refs: `#41566`_ - * 66f8c83 Merge pull request `#41566`_ from morganwillcock/certutil - * c337d52 Fix test data for test_get_serial, and a typo + * 42bb1a64ca Merge pull request `#42350`_ from twangboy/win_fix_ver_grains_2016.11 - * 7f69613 test and lint fixes + * 8c048403d7 Detect Server OS with a desktop release name - * 8ee4843 Suppress output of crypt context and be more specific with whitespace vs. serial +* **PR** `#42356`_: (`meaksh`_) Allow to check whether a function is available on the AliasesLoader wrapper + @ *2017-07-19 16:56:41 UTC* - * 61f817d Match serials based on output position (fix for non-English languages) + * 0a72e56f6b Merge pull request `#42356`_ from meaksh/2016.11-AliasesLoader-wrapper-fix -- **PR** `#41679`_: (*terminalmage*) Prevent unnecessary duplicate pillar compilation - @ *2017-06-21T15:32:42Z* + * 915d94219e Allow to check whether a function is available on the AliasesLoader wrapper - * 4d0f5c4 Merge pull request `#41679`_ from terminalmage/get-top-file-envs - * a916e8d Improve normalization of saltenv/pillarenv usage for states +* **PR** `#42368`_: (`twangboy`_) Remove build and dist directories before install (2016.11) + @ *2017-07-19 16:47:28 UTC* - * 02f293a Update state unit tests to reflect recent changes + * 10eb7b7a79 Merge pull request `#42368`_ from twangboy/win_fix_build_2016.11 - * b7e5c11 Don't compile pillar data when getting top file envs + * a7c910c31e Remove build and dist directories before install - * 8d6fdb7 Don't compile pillar twice for salt-call +* **PR** `#42370`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-07-18 22:39:41 UTC* - * d2abfbf Add initial_pillar argument to salt.state + * 016189f62f Merge pull request `#42370`_ from rallytime/merge-2016.11 - * 70186de salt.pillar: rename the "pillar" argument to "pillar_override" + * 0aa5dde1de Merge branch '2016.3' into '2016.11' -- **PR** `#41853`_: (*vutny*) Fix master side scheduled jobs to return events - @ *2017-06-20T22:06:29Z* + * e9b0f20f8a Merge pull request `#42359`_ from Ch3LL/doc-update-2016.3 - - **ISSUE** `#39668`_: (*mirceaulinic*) Master scheduled job not recorded on the event bus - | refs: `#41658`_ - - **ISSUE** `#12653`_: (*pengyao*) salt schedule doesn't return jobs result info to master - | refs: `#41853`_ - - **PR** `#41695`_: (*xiaoanyunfei*) fix max RecursionError, Ellipsis - | refs: `#41853`_ - - **PR** `#41658`_: (*garethgreenaway*) Fixes to the salt scheduler - | refs: `#41853`_ - * 29b0acc Merge pull request `#41853`_ from vutny/fix-master-schedule-event - * e206c38 Fix master side scheduled jobs to return events + * dc85b5edbe [2016.3] Update version numbers in doc config for 2017.7.0 release +* **PR** `#42360`_: (`Ch3LL`_) [2016.11] Update version numbers in doc config for 2017.7.0 release + @ *2017-07-18 19:23:30 UTC* + + * f06a6f1796 Merge pull request `#42360`_ from Ch3LL/doc-update-2016.11 + + * b90b7a7506 [2016.11] Update version numbers in doc config for 2017.7.0 release + +* **ISSUE** `#32400`_: (`rallytime`_) Document Default Config Values (refs: `#42319`_) + +* **PR** `#42319`_: (`rallytime`_) Add more documentation for config options that are missing from master/minion docs + @ *2017-07-18 18:02:32 UTC* + + * e0595b0a0f Merge pull request `#42319`_ from rallytime/config-docs + + * b40f980632 Add more documentation for config options that are missing from master/minion docs + +* **ISSUE** `#42333`_: (`b3hni4`_) Getting "invalid type of dict, a list is required" when trying to configure engines in master config file (refs: `#42352`_) + +* **PR** `#42352`_: (`CorvinM`_) Multiple documentation fixes + @ *2017-07-18 15:10:37 UTC* + + * 78940400e3 Merge pull request `#42352`_ from CorvinM/issue42333 + + * 526b6ee14d Multiple documentation fixes + +* **PR** `#42353`_: (`terminalmage`_) is_windows is a function, not a propery/attribute + @ *2017-07-18 14:38:51 UTC* + + * b256001760 Merge pull request `#42353`_ from terminalmage/fix-git-test + + * 14cf6ce322 is_windows is a function, not a propery/attribute + +* **ISSUE** `#41116`_: (`hrumph`_) FAQ has wrong instructions for upgrading Windows minion. (refs: `#42264`_) + +* **PR** `#42264`_: (`rallytime`_) Update minion restart section in FAQ doc for windows + @ *2017-07-17 17:40:40 UTC* + + * 866a1febb4 Merge pull request `#42264`_ from rallytime/fix-41116 + + * bd638880e3 Add mono-spacing to salt-minion reference for consistency + + * 30d62f43da Update minion restart section in FAQ doc for windows + +* **ISSUE** `#42194`_: (`jryberg`_) pkg version: latest are now broken, appending -latest to filename (refs: `#42275`_) + +* **PR** `#42275`_: (`terminalmage`_) pkg.installed: pack name/version into pkgs argument + @ *2017-07-17 17:38:39 UTC* + + * 9a707088ad Merge pull request `#42275`_ from terminalmage/issue42194 + + * 663874908a pkg.installed: pack name/version into pkgs argument + +* **ISSUE** `#41721`_: (`sazaro`_) state.sysrc broken when setting the value to YES or NO (refs: `#42269`_) + +* **PR** `#42269`_: (`rallytime`_) Add some clarity to "multiple quotes" section of yaml docs + @ *2017-07-17 17:38:18 UTC* + + * e588f235e0 Merge pull request `#42269`_ from rallytime/fix-41721 + + * f2250d474a Add a note about using different styles of quotes. + + * 38d9b3d553 Add some clarity to "multiple quotes" section of yaml docs + +* **ISSUE** `#42152`_: (`dubb-b`_) salt-cloud errors on Rackspace driver using -out=yaml (refs: `#42282`_) + +* **PR** `#42282`_: (`rallytime`_) Handle libcloud objects that throw RepresenterErrors with --out=yaml + @ *2017-07-17 17:36:35 UTC* + + * 5aaa214a75 Merge pull request `#42282`_ from rallytime/fix-42152 + + * f032223843 Handle libcloud objects that throw RepresenterErrors with --out=yaml + +* **ISSUE** `#42295`_: (`lubyou`_) file.absent fails on windows if the file to be removed has the "readonly" attribute set (refs: `#42308`_) + +* **PR** `#42308`_: (`lubyou`_) Force file removal on Windows. Fixes `#42295`_ + @ *2017-07-17 17:12:13 UTC* + + * fb5697a4bc Merge pull request `#42308`_ from lubyou/42295-fix-file-absent-windows + + * 026ccf401a Force file removal on Windows. Fixes `#42295`_ + +* **ISSUE** `#42267`_: (`gzcwnk`_) salt-ssh not creating ssh keys automatically as per documentation (refs: `#42314`_) + +* **PR** `#42314`_: (`rallytime`_) Add clarification to salt ssh docs about key auto-generation. + @ *2017-07-17 14:07:49 UTC* + + * da2a8a518f Merge pull request `#42314`_ from rallytime/fix-42267 + + * c406046940 Add clarification to salt ssh docs about key auto-generation. + +* **ISSUE** `#41936`_: (`michaelkarrer81`_) git.latest identity does not set the correct user for the private key file on the minion (refs: `#41945`_) + +* **PR** `#41945`_: (`garethgreenaway`_) Fixes to modules/git.py + @ *2017-07-14 17:46:10 UTC* + + * acadd54013 Merge pull request `#41945`_ from garethgreenaway/41936_allow_identity_files_with_user + + * 44841e5626 Moving the call to cp.get_file inside the with block to ensure the umask is preserved when we grab the file. + + * f9ba60eed8 Merge pull request `#1`_ from terminalmage/pr-41945 + + * 1b6026177c Restrict set_umask to mkstemp call only + + * 68549f3496 Fixing umask to we can set files as executable. + + * 4949bf3ff3 Updating to swap on the new salt.utils.files.set_umask context_manager + + * 8faa9f6d92 Updating PR with requested changes. + + * 494765e939 Updating the git module to allow an identity file to be used when passing the user parameter + +* **ISSUE** `#42240`_: (`casselt`_) empty_password in user.present always changes password, even with test=True (refs: `#42289`_) + +* **PR** `#42289`_: (`CorvinM`_) Multiple empty_password fixes for state.user + @ *2017-07-14 16:14:02 UTC* + + * **PR** `#41543`_: (`cri-epita`_) Fix user creation with empty password (refs: `#42289`_) + + * f90e04a2bc Merge pull request `#42289`_ from CorvinM/bp-41543 + + * 357dc22f05 Fix user creation with empty password + +* **PR** `#42123`_: (`vutny`_) DOCS: describe importing custom util classes + @ *2017-07-12 15:53:24 UTC* + + * a91a3f81b1 Merge pull request `#42123`_ from vutny/fix-master-utils-import + + * 6bb8b8f98c Add missing doc for ``utils_dirs`` Minion config option + + * f1bc58f6d5 Utils: add example of module import + +* **PR** `#42261`_: (`rallytime`_) Some minor doc fixes for dnsutil module so they'll render correctly + @ *2017-07-11 23:14:53 UTC* + + * e2aa5114e4 Merge pull request `#42261`_ from rallytime/minor-doc-fix + + * 8c76bbb53d Some minor doc fixes for dnsutil module so they'll render correctly + +* **PR** `#42262`_: (`rallytime`_) Back-port `#42224`_ to 2016.11 + @ *2017-07-11 23:14:25 UTC* + + * **PR** `#42224`_: (`tdutrion`_) Remove duplicate instruction in Openstack Rackspace config example (refs: `#42262`_) + + * 3e9dfbc9cc Merge pull request `#42262`_ from rallytime/bp-42224 + + * c31ded341c Remove duplicate instruction in Openstack Rackspace config example + +* **ISSUE** `#42137`_: (`kiemlicz`_) cmd.run with multiple commands - random order of execution (refs: `#42181`_) + +* **PR** `#42181`_: (`garethgreenaway`_) fixes to state.py for names parameter + @ *2017-07-11 21:21:32 UTC* + + * 7780579c36 Merge pull request `#42181`_ from garethgreenaway/42137_backport_fix_from_2017_7 + + * a34970b45b Back porting the fix for 2017.7 that ensures the order of the names parameter. + +* **PR** `#42253`_: (`gtmanfred`_) Only use unassociated ips when unable to allocate + @ *2017-07-11 20:53:51 UTC* + + * **PR** `#38965`_: (`toanju`_) salt-cloud will use list_floating_ips for OpenStack (refs: `#42253`_) + + * **PR** `#34280`_: (`kevinanderson1`_) salt-cloud will use list_floating_ips for Openstack (refs: `#38965`_) + + * 72537868a6 Merge pull request `#42253`_ from gtmanfred/2016.11 + + * 53e25760be Only use unassociated ips when unable to allocate + +* **PR** `#42252`_: (`UtahDave`_) simple docstring updates + @ *2017-07-11 20:48:33 UTC* + + * b2a4698b5d Merge pull request `#42252`_ from UtahDave/2016.11local + + * e6a9563d47 simple doc updates + +* **ISSUE** `#42232`_: (`astronouth7303`_) Half of dnsutil refers to dig (refs: `#42235`_) + +* **PR** `#42235`_: (`astronouth7303`_) Abolish references to `dig` in examples. + @ *2017-07-10 20:06:11 UTC* + + * 781fe13be7 Merge pull request `#42235`_ from astronouth7303/patch-1-2016.3 + + * 4cb51bd03a Make note of dig partial requirement. + + * 08e7d8351a Abolish references to `dig` in examples. + +* **PR** `#42215`_: (`twangboy`_) Add missing config to example + @ *2017-07-07 20:18:44 UTC* + + * 83cbd76f16 Merge pull request `#42215`_ from twangboy/win_iis_docs + + * c07e22041a Add missing config to example + +* **PR** `#42211`_: (`terminalmage`_) Only pass a saltenv in orchestration if one was explicitly passed (2016.11) + @ *2017-07-07 20:16:35 UTC* + + * 274946ab00 Merge pull request `#42211`_ from terminalmage/issue40928 + + * 22a18fa2ed Only pass a saltenv in orchestration if one was explicitly passed (2016.11) + +* **PR** `#42173`_: (`rallytime`_) Back-port `#37424`_ to 2016.11 + @ *2017-07-07 16:39:59 UTC* + + * **PR** `#37424`_: (`kojiromike`_) Avoid Early Convert ret['comment'] to String (refs: `#42173`_) + + * 89261cf06c Merge pull request `#42173`_ from rallytime/bp-37424 + + * 01addb6053 Avoid Early Convert ret['comment'] to String + +* **ISSUE** `#39365`_: (`dglloyd`_) service.running fails if sysv script has no status command and enable: True (refs: `#39366`_) + +* **PR** `#42175`_: (`rallytime`_) Back-port `#39366`_ to 2016.11 + @ *2017-07-06 19:51:47 UTC* + + * **PR** `#39366`_: (`dglloyd`_) Pass sig to service.status in after_toggle (refs: `#42175`_) + + * 3b17fb7f83 Merge pull request `#42175`_ from rallytime/bp-39366 + + * 53f7b987e8 Pass sig to service.status in after_toggle + +* **PR** `#42172`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-07-06 18:16:29 UTC* + + * ea16f47f0a Merge pull request `#42172`_ from rallytime/merge-2016.11 + + * b1fa332a11 Merge branch '2016.3' into '2016.11' + + * 8fa1fa5bb1 Merge pull request `#42155`_ from phsteve/doc-fix-puppet + + * fb2cb78a31 Fix docs for puppet.plugin_sync so code-block renders properly and sync is spelled consistently + +* **PR** `#42176`_: (`rallytime`_) Back-port `#42109`_ to 2016.11 + @ *2017-07-06 18:15:35 UTC* + + * **PR** `#42109`_: (`arthurlogilab`_) [doc] Update aws.rst - add Debian default username (refs: `#42176`_) + + * 6307b9873f Merge pull request `#42176`_ from rallytime/bp-42109 + + * 686926daf7 Update aws.rst - add Debian default username + +* **PR** `#42095`_: (`terminalmage`_) Add debug logging to dockerng.login + @ *2017-07-06 17:13:05 UTC* + + * 28c4e4c3b7 Merge pull request `#42095`_ from terminalmage/docker-login-debugging + + * bd27870a71 Add debug logging to dockerng.login + +* **ISSUE** `#42116`_: (`terminalmage`_) CLI pillar override regression in 2017.7.0rc1 (refs: `#42119`_) + +* **PR** `#42119`_: (`terminalmage`_) Fix regression in CLI pillar override for salt-call + @ *2017-07-06 17:02:52 UTC* + + * 2b754bc5af Merge pull request `#42119`_ from terminalmage/issue42116 + + * 9a268949e3 Add integration test for 42116 + + * 1bb42bb609 Fix regression when CLI pillar override is used with salt-call + +* **ISSUE** `#42114`_: (`clallen`_) saltenv bug in pillar.get execution module function (refs: `#42121`_) + +* **PR** `#42121`_: (`terminalmage`_) Fix pillar.get when saltenv is passed + @ *2017-07-06 16:52:34 UTC* + + * 8c0a83cbb5 Merge pull request `#42121`_ from terminalmage/issue42114 + + * d14291267f Fix pillar.get when saltenv is passed + +* **PR** `#42094`_: (`terminalmage`_) Prevent command from showing in exception when output_loglevel=quiet + @ *2017-07-06 16:18:09 UTC* + + * 687992c240 Merge pull request `#42094`_ from terminalmage/quiet-exception + + * 47d61f4edf Prevent command from showing in exception when output_loglevel=quiet + +* **ISSUE** `#42115`_: (`nomeelnoj`_) Installing EPEL repo breaks salt-cloud (refs: `#42163`_) + +* **PR** `#42163`_: (`vutny`_) Fix `#42115`_: parse libcloud "rc" version correctly + @ *2017-07-06 16:15:07 UTC* + + * dad255160c Merge pull request `#42163`_ from vutny/fix-42115 + + * b27b1e340a Fix `#42115`_: parse libcloud "rc" version correctly + +* **PR** `#42164`_: (`Ch3LL`_) Fix kerberos create_keytab doc + @ *2017-07-06 15:55:33 UTC* + + * 2a8ae2b3b6 Merge pull request `#42164`_ from Ch3LL/fix_kerb_doc + + * 7c0fb248ec Fix kerberos create_keytab doc + +* **PR** `#42141`_: (`rallytime`_) Back-port `#42098`_ to 2016.11 + @ *2017-07-06 15:11:49 UTC* + + * **PR** `#42098`_: (`twangboy`_) Change repo_ng to repo-ng (refs: `#42141`_) + + * 678d4d4098 Merge pull request `#42141`_ from rallytime/bp-42098 + + * bd80243233 Change repo_ng to repo-ng + +* **PR** `#42140`_: (`rallytime`_) Back-port `#42097`_ to 2016.11 + @ *2017-07-06 15:11:29 UTC* + + * **PR** `#42097`_: (`gtmanfred`_) require large timediff for ipv6 warning (refs: `#42140`_) + + * c8afd7a3c9 Merge pull request `#42140`_ from rallytime/bp-42097 + + * 9c4e132540 Import datetime + + * 1435bf177e require large timediff for ipv6 warning + +* **PR** `#42142`_: (`Ch3LL`_) Update builds available for rc1 + @ *2017-07-05 21:11:56 UTC* + + * c239664c8b Merge pull request `#42142`_ from Ch3LL/change_builds + + * e1694af39c Update builds available for rc1 + +* **PR** `#42078`_: (`damon-atkins`_) pkg.install and pkg.remove fix version number input. + @ *2017-07-05 06:04:57 UTC* + + * 4780d7830a Merge pull request `#42078`_ from damon-atkins/fix_convert_flt_str_version_on_cmd_line + + * 09d37dd892 Fix comment typo + + * 7167549425 Handle version=None when converted to a string it becomes 'None' parm should default to empty string rather than None, it would fix better with existing code. + + * 4fb2bb1856 Fix typo + + * cf55c3361c pkg.install and pkg.remove on the command line take number version numbers, store them within a float. However version is a string, to support versions numbers like 1.3.4 + +* **PR** `#42105`_: (`Ch3LL`_) Update releasecanddiate doc with new 2017.7.0rc1 Release + @ *2017-07-04 03:14:42 UTC* + + * 46d575acbc Merge pull request `#42105`_ from Ch3LL/update_rc + + * d4e7b91608 Update releasecanddiate doc with new 2017.7.0rc1 Release + +* **ISSUE** `#41885`_: (`astronouth7303`_) Recommended pip installation outdated? (refs: `#42099`_) + +* **PR** `#42099`_: (`rallytime`_) Remove references in docs to pip install salt-cloud + @ *2017-07-03 22:13:44 UTC* + + * d38548bbbd Merge pull request `#42099`_ from rallytime/fix-41885 + + * c2822e05ad Remove references in docs to pip install salt-cloud + +* **ISSUE** `#42076`_: (`abulford`_) dockerng.volume_present test looks as though it would cause a change (refs: `#42086`_) + +* **PR** `#42086`_: (`abulford`_) Make result=true if Docker volume already exists + @ *2017-07-03 15:48:33 UTC* + + * 81d606a8cb Merge pull request `#42086`_ from redmatter/fix-dockerng-volume-present-result + + * 8d549685a7 Make result=true if Docker volume already exists + +* **ISSUE** `#25842`_: (`shikhartanwar`_) Running salt-minion as non-root user to execute sudo commands always returns an error (refs: `#42021`_) + +* **PR** `#42021`_: (`gtmanfred`_) Set concurrent to True when running states with sudo + @ *2017-06-30 21:02:15 UTC* + + * 7160697123 Merge pull request `#42021`_ from gtmanfred/2016.11 + + * 26beb18aa5 Set concurrent to True when running states with sudo + +* **PR** `#42029`_: (`terminalmage`_) Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips + @ *2017-06-30 20:58:56 UTC* + + * b784fbbdf8 Merge pull request `#42029`_ from terminalmage/host_to_ips + + * 26f848e111 Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips + +* **PR** `#42055`_: (`dmurphy18`_) Upgrade support for gnupg v2.1 and higher + @ *2017-06-30 20:54:02 UTC* + + * e067020b9b Merge pull request `#42055`_ from dmurphy18/handle_gnupgv21 + + * e20cea6350 Upgrade support for gnupg v2.1 and higher + +* **PR** `#42048`_: (`Ch3LL`_) Add initial 2016.11.7 Release Notes + @ *2017-06-30 16:00:05 UTC* + + * 74ba2abc48 Merge pull request `#42048`_ from Ch3LL/add_11.7 + + * 1de5e008a0 Add initial 2016.11.7 Release Notes + +* **PR** `#42024`_: (`leeclemens`_) doc: Specify versionadded for SELinux policy install/uninstall + @ *2017-06-29 23:29:50 UTC* + + * ca4e619edb Merge pull request `#42024`_ from leeclemens/doc/selinux + + * b63a3c0fae doc: Specify versionadded for SELinux policy install/uninstall + + * **PR** `saltstack/salt#41961`_: (`cachedout`_) Allow docs to be built under Python 3 (refs: `#42028`_) + +* **PR** `#42030`_: (`whiteinge`_) Re-add msgpack to mocked imports + @ *2017-06-29 20:47:59 UTC* + + * **PR** `#42028`_: (`whiteinge`_) Revert "Allow docs to be built under Python 3" (refs: `#42030`_) + + * 50856d0e28 Merge pull request `#42030`_ from whiteinge/revert-py3-doc-chagnes-pt-2 + + * 18dfa9893c Re-add msgpack to mocked imports + + * **PR** `saltstack/salt#41961`_: (`cachedout`_) Allow docs to be built under Python 3 (refs: `#42028`_) + +* **PR** `#42028`_: (`whiteinge`_) Revert "Allow docs to be built under Python 3" (refs: `#42030`_) + @ *2017-06-29 19:47:46 UTC* + + * 53031d2f55 Merge pull request `#42028`_ from saltstack/revert-41961-py3_doc + + * 5592e6e5d4 Revert "Allow docs to be built under Python 3" + +* **ISSUE** `#42013`_: (`dusto`_) Misspelled nozeroconf in salt/modules/rh_ip.py (refs: `#42017`_) + +* **PR** `#42017`_: (`lorengordon`_) Fixes typo "nozerconf" -> "nozeroconf" + @ *2017-06-29 17:30:48 UTC* + + * 1416bf70b9 Merge pull request `#42017`_ from lorengordon/issue-42013 + + * b6cf5f2528 Fixes typo nozerconf -> nozeroconf + +* **PR** `#41906`_: (`terminalmage`_) Better support for numeric saltenvs + @ *2017-06-29 17:19:33 UTC* + + * 0ebb50b601 Merge pull request `#41906`_ from terminalmage/numeric-saltenv + + * 2d798de982 Better support for numeric saltenvs + +* **PR** `#41995`_: (`terminalmage`_) Temporarily set the umask before writing an auth token + @ *2017-06-29 01:09:48 UTC* + + * 6a3c03c2d5 Merge pull request `#41995`_ from terminalmage/token-umask + + * 4f54b0069f Temporarily set the umask before writing an auth token + +* **PR** `#41999`_: (`terminalmage`_) Update IP address for unit.utils.network_test.NetworkTestCase.test_host_to_ips + @ *2017-06-29 01:01:31 UTC* + + * e3801b0e78 Merge pull request `#41999`_ from terminalmage/fix-network-test + + * fb6a93314f Update IP address for unit.utils.network_test.NetworkTestCase.test_host_to_ips + +* **ISSUE** `#18659`_: (`whiteinge`_) mod_aggregate not working for list-form configuration (refs: `#41991`_) + +* **PR** `#41991`_: (`Da-Juan`_) Accept a list for state_aggregate global setting + @ *2017-06-29 00:58:59 UTC* + + * a7f38929cb Merge pull request `#41991`_ from Da-Juan/fix-state_aggregate-list + + * c9075b8f84 Accept a list for state_aggregate setting + +* **PR** `#41993`_: (`UtahDave`_) change out salt support link to SaltConf link + @ *2017-06-29 00:55:20 UTC* + + * 7424f879a3 Merge pull request `#41993`_ from UtahDave/2016.11local + + * bff050ad52 change out salt support link to SaltConf link + +* **PR** `#41987`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-06-28 20:19:11 UTC* + + * 3b9ccf09d7 Merge pull request `#41987`_ from rallytime/merge-2016.11 + + * 48867c4a82 Merge branch '2016.3' into '2016.11' + + * c589eae03f Merge pull request `#41981`_ from Ch3LL/11.6_3 + + * 2516ae1349 [2016.3] Bump latest release version to 2016.11.6 + +* **PR** `#41985`_: (`rallytime`_) Back-port `#41780`_ to 2016.11 + @ *2017-06-28 20:18:57 UTC* + + * **PR** `#41780`_: (`ferringb`_) Fix salt.util.render_jinja_tmpl usage for when not used in an environmnet (refs: `#41985`_) + + * 768339d734 Merge pull request `#41985`_ from rallytime/bp-41780 + + * 8f8d3a473a Fix salt.util.render_jinja_tmpl usage for when not used in an environment. + +* **ISSUE** `#34963`_: (`craigafinch`_) Incorrect behavior or documentation for comments in salt.states.pkgrepo.managed (refs: `#41820`_) + +* **PR** `#41986`_: (`rallytime`_) Back-port `#41820`_ to 2016.11 + @ *2017-06-28 20:18:43 UTC* + + * **PR** `#41820`_: (`nhavens`_) Fix yum repo file comments to work as documented in pkgrepo.managed (refs: `#41986`_) + + * bd9090c0bf Merge pull request `#41986`_ from rallytime/bp-41820 + + * 72320e35b9 Fix yum repo file comments to work as documented in pkgrepo.managed + +* **PR** `#41973`_: (`vutny`_) Fix Master/Minion scheduled jobs based on Cron expressions (refs: `#42077`_) + @ *2017-06-28 16:39:02 UTC* + + * a31da52635 Merge pull request `#41973`_ from vutny/fix-croniter-scheduled-jobs + + * 148788e652 Fix Master/Minion scheduled jobs based on Cron expressions + +* **PR** `#41980`_: (`Ch3LL`_) [2016.11] Bump latest release version to 2016.11.6 + @ *2017-06-28 15:35:11 UTC* + + * 689ff93349 Merge pull request `#41980`_ from Ch3LL/11.6_11 + + * fe4f5711d5 [2016.11] Bump latest release version to 2016.11.6 + +* **PR** `#41961`_: (`cachedout`_) Allow docs to be built under Python 3 + @ *2017-06-27 21:11:54 UTC* + + * 82b1eb28ab Merge pull request `#41961`_ from cachedout/py3_doc + + * 7aacddf6ef Allow docs to be built under Python 3 + +* **PR** `#41948`_: (`davidjb`_) Fix Composer state's `name` docs; formatting + @ *2017-06-27 17:51:29 UTC* + + * **PR** `#41933`_: (`davidjb`_) Fix Composer state's `name` docs and improve formatting (refs: `#41948`_) + + * f0eb51df17 Merge pull request `#41948`_ from davidjb/patch-9 + + * 0e4b3d9a42 Fix Composer state's `name` docs; formatting + +* **PR** `#41914`_: (`vutny`_) archive.extracted: fix hash sum verification for local archives + @ *2017-06-26 17:59:27 UTC* + + * e28e10ded2 Merge pull request `#41914`_ from vutny/fix-archive-extracted-local-file-hash + + * 54910fe55f archive.extracted: fix hash sum verification for local archives + +* **PR** `#41912`_: (`Ch3LL`_) Allow pacman module to run on Manjaro + @ *2017-06-26 15:35:20 UTC* + + * 76ad6ff064 Merge pull request `#41912`_ from Ch3LL/fix_manjaro + + * e4dd72a3e7 Update os_name_map in core grains for new manjaro systems + + * aa7c839fc5 Allow pacman module to run on Manjaro + +* **ISSUE** `#38093`_: (`DmitryKuzmenko`_) Make threads avoid blocking waiting while communicating using TCP transport. (refs: `#41516`_) + +* **PR** `#41516`_: (`kstreee`_) Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications. + @ *2017-06-26 14:41:38 UTC* + + * **PR** `#37878`_: (`kstreee`_) Makes threads avoid blocking waiting while communicating using Zeromq. (refs: `#41516`_) + + * ff67d47a2e Merge pull request `#41516`_ from kstreee/fix-blocking-waiting-tcp-connection + + * df96969959 Removes redundant closing statements. + + * 94b9ea51eb Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications. + +* **PR** `#41888`_: (`Ch3LL`_) Add additional commits to 2016.11.6 release notes + @ *2017-06-22 16:19:00 UTC* + + * c90cb6798a Merge pull request `#41888`_ from Ch3LL/change_release + + * 4e1239d980 Add additional commits to 2016.11.6 release notes + +* **PR** `#41882`_: (`Ch3LL`_) Add pycryptodome to crypt_test + @ *2017-06-21 19:51:10 UTC* + + * 4a326444fe Merge pull request `#41882`_ from Ch3LL/fix_crypt_test + + * 6f70dbd0e1 Add pycryptodome to crypt_test + +* **PR** `#41877`_: (`Ch3LL`_) Fix netstat and routes test + @ *2017-06-21 16:16:58 UTC* + + * 13df29ed9b Merge pull request `#41877`_ from Ch3LL/fix_netstat_test + + * d2076a6c93 Patch salt.utils.which for test_route test + + * 51f7e107dc Patch salt.utils.which for test_netstat test + +* **ISSUE** `#41367`_: (`lubyou`_) certutil.add_store does not work on non english windows versions or on Windows 10 (localised or English) (refs: `#41566`_) + +* **PR** `#41566`_: (`morganwillcock`_) win_certutil: workaround for reading serial numbers with non-English languages + @ *2017-06-21 15:40:29 UTC* + + * 66f8c83c93 Merge pull request `#41566`_ from morganwillcock/certutil + + * c337d52d0c Fix test data for test_get_serial, and a typo + + * 7f6961378e test and lint fixes + + * 8ee48432f4 Suppress output of crypt context and be more specifc with whitespace vs. serial + + * 61f817d172 Match serials based on output position (fix for non-English languages) + +* **PR** `#41679`_: (`terminalmage`_) Prevent unnecessary duplicate pillar compilation + @ *2017-06-21 15:32:42 UTC* + + * 4d0f5c433d Merge pull request `#41679`_ from terminalmage/get-top-file-envs + + * a916e8da49 Improve normalization of saltenv/pillarenv usage for states + + * 02f293a19c Update state unit tests to reflect recent changes + + * b7e5c11165 Don't compile pillar data when getting top file envs + + * 8d6fdb7c9a Don't compile pillar twice for salt-call + + * d2abfbf4ed Add initial_pillar argument to salt.state + + * 70186de532 salt.pillar: rename the "pillar" argument to "pillar_override" + +* **ISSUE** `#39668`_: (`mirceaulinic`_) Master scheduled job not recorded on the event bus (refs: `#41658`_) + +* **ISSUE** `#12653`_: (`pengyao`_) salt schedule doesn't return jobs result info to master (refs: `#41853`_) + +* **PR** `#41853`_: (`vutny`_) Fix master side scheduled jobs to return events + @ *2017-06-20 22:06:29 UTC* + + * **PR** `#41695`_: (`xiaoanyunfei`_) fix max RecursionError, Ellipsis (refs: `#41853`_) + + * **PR** `#41658`_: (`garethgreenaway`_) Fixes to the salt scheduler (refs: `#41853`_) + + * 29b0acc3a2 Merge pull request `#41853`_ from vutny/fix-master-schedule-event + + * e206c381c6 Fix master side scheduled jobs to return events -.. _`#1`: https://github.com/saltstack/salt/issues/1 -.. _`#1036125`: https://github.com/saltstack/salt/issues/1036125 .. _`#12653`: https://github.com/saltstack/salt/issues/12653 .. _`#15171`: https://github.com/saltstack/salt/issues/15171 .. _`#18659`: https://github.com/saltstack/salt/issues/18659 +.. _`#1`: https://github.com/saltstack/salt/issues/1 .. _`#23516`: https://github.com/saltstack/salt/issues/23516 .. _`#25842`: https://github.com/saltstack/salt/issues/25842 +.. _`#2`: https://github.com/saltstack/salt/issues/2 .. _`#32400`: https://github.com/saltstack/salt/issues/32400 .. _`#33806`: https://github.com/saltstack/salt/pull/33806 .. _`#34280`: https://github.com/saltstack/salt/pull/34280 @@ -1694,38 +1872,105 @@ Changes: .. _`#43202`: https://github.com/saltstack/salt/pull/43202 .. _`#43228`: https://github.com/saltstack/salt/pull/43228 .. _`#43271`: https://github.com/saltstack/salt/pull/43271 -.. _`#475`: https://github.com/saltstack/salt/issues/475 -.. _`#495`: https://github.com/saltstack/salt/issues/495 -.. _`bp-37424`: https://github.com/saltstack/salt/pull/37424 -.. _`bp-39366`: https://github.com/saltstack/salt/pull/39366 -.. _`bp-41543`: https://github.com/saltstack/salt/pull/41543 -.. _`bp-41780`: https://github.com/saltstack/salt/pull/41780 -.. _`bp-41820`: https://github.com/saltstack/salt/pull/41820 -.. _`bp-42097`: https://github.com/saltstack/salt/pull/42097 -.. _`bp-42098`: https://github.com/saltstack/salt/pull/42098 -.. _`bp-42109`: https://github.com/saltstack/salt/pull/42109 -.. _`bp-42224`: https://github.com/saltstack/salt/pull/42224 -.. _`bp-42433`: https://github.com/saltstack/salt/pull/42433 -.. _`bp-42547`: https://github.com/saltstack/salt/pull/42547 -.. _`bp-42552`: https://github.com/saltstack/salt/pull/42552 -.. _`bp-42651`: https://github.com/saltstack/salt/pull/42651 -.. _`bp-42744`: https://github.com/saltstack/salt/pull/42744 -.. _`bp-42760`: https://github.com/saltstack/salt/pull/42760 -.. _`bp-42784`: https://github.com/saltstack/salt/pull/42784 -.. _`bp-42848`: https://github.com/saltstack/salt/pull/42848 -.. _`bp-42871`: https://github.com/saltstack/salt/pull/42871 -.. _`bp-42883`: https://github.com/saltstack/salt/pull/42883 -.. _`bp-43020`: https://github.com/saltstack/salt/pull/43020 -.. _`bp-43031`: https://github.com/saltstack/salt/pull/43031 -.. _`bp-43116`: https://github.com/saltstack/salt/pull/43116 -.. _`fix-38839`: https://github.com/saltstack/salt/issues/38839 -.. _`fix-41116`: https://github.com/saltstack/salt/issues/41116 -.. _`fix-41721`: https://github.com/saltstack/salt/issues/41721 -.. _`fix-41885`: https://github.com/saltstack/salt/issues/41885 -.. _`fix-42115`: https://github.com/saltstack/salt/issues/42115 -.. _`fix-42152`: https://github.com/saltstack/salt/issues/42152 -.. _`fix-42267`: https://github.com/saltstack/salt/issues/42267 -.. _`fix-42375`: https://github.com/saltstack/salt/issues/42375 -.. _`fix-42405`: https://github.com/saltstack/salt/issues/42405 -.. _`fix-42417`: https://github.com/saltstack/salt/issues/42417 -.. _`fix-42683`: https://github.com/saltstack/salt/issues/42683 +.. _`#43333`: https://github.com/saltstack/salt/pull/43333 +.. _`#43434`: https://github.com/saltstack/salt/pull/43434 +.. _`#43508`: https://github.com/saltstack/salt/pull/43508 +.. _`AFriemann`: https://github.com/AFriemann +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`ChristianBeer`: https://github.com/ChristianBeer +.. _`CorvinM`: https://github.com/CorvinM +.. _`Da-Juan`: https://github.com/Da-Juan +.. _`DaveOHenry`: https://github.com/DaveOHenry +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`Giandom`: https://github.com/Giandom +.. _`JensRantil`: https://github.com/JensRantil +.. _`UtahDave`: https://github.com/UtahDave +.. _`abednarik`: https://github.com/abednarik +.. _`abulford`: https://github.com/abulford +.. _`aikar`: https://github.com/aikar +.. _`alxwr`: https://github.com/alxwr +.. _`amalleo25`: https://github.com/amalleo25 +.. _`amendlik`: https://github.com/amendlik +.. _`aneeshusa`: https://github.com/aneeshusa +.. _`aogier`: https://github.com/aogier +.. _`arount`: https://github.com/arount +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`astronouth7303`: https://github.com/astronouth7303 +.. _`b3hni4`: https://github.com/b3hni4 +.. _`binocvlar`: https://github.com/binocvlar +.. _`blarghmatey`: https://github.com/blarghmatey +.. _`cachedout`: https://github.com/cachedout +.. _`casselt`: https://github.com/casselt +.. _`clallen`: https://github.com/clallen +.. _`clem-compilatio`: https://github.com/clem-compilatio +.. _`corywright`: https://github.com/corywright +.. _`craigafinch`: https://github.com/craigafinch +.. _`cri-epita`: https://github.com/cri-epita +.. _`dafyddj`: https://github.com/dafyddj +.. _`damon-atkins`: https://github.com/damon-atkins +.. _`davidjb`: https://github.com/davidjb +.. _`dglloyd`: https://github.com/dglloyd +.. _`dkiser`: https://github.com/dkiser +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`dragonpaw`: https://github.com/dragonpaw +.. _`dubb-b`: https://github.com/dubb-b +.. _`dusto`: https://github.com/dusto +.. _`felrivero`: https://github.com/felrivero +.. _`ferringb`: https://github.com/ferringb +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gdubroeucq`: https://github.com/gdubroeucq +.. _`gilbsgilbs`: https://github.com/gilbsgilbs +.. _`githubcdr`: https://github.com/githubcdr +.. _`gmcwhistler`: https://github.com/gmcwhistler +.. _`goten4`: https://github.com/goten4 +.. _`grichmond-salt`: https://github.com/grichmond-salt +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`gzcwnk`: https://github.com/gzcwnk +.. _`hrumph`: https://github.com/hrumph +.. _`infoveinx`: https://github.com/infoveinx +.. _`isbm`: https://github.com/isbm +.. _`jagguli`: https://github.com/jagguli +.. _`jryberg`: https://github.com/jryberg +.. _`kevinanderson1`: https://github.com/kevinanderson1 +.. _`kiemlicz`: https://github.com/kiemlicz +.. _`kojiromike`: https://github.com/kojiromike +.. _`kstreee`: https://github.com/kstreee +.. _`leeclemens`: https://github.com/leeclemens +.. _`lomeroe`: https://github.com/lomeroe +.. _`lorengordon`: https://github.com/lorengordon +.. _`lubyou`: https://github.com/lubyou +.. _`mcarlton00`: https://github.com/mcarlton00 +.. _`meaksh`: https://github.com/meaksh +.. _`michaelkarrer81`: https://github.com/michaelkarrer81 +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`morganwillcock`: https://github.com/morganwillcock +.. _`nhavens`: https://github.com/nhavens +.. _`nomeelnoj`: https://github.com/nomeelnoj +.. _`pabloh007`: https://github.com/pabloh007 +.. _`pengyao`: https://github.com/pengyao +.. _`rallytime`: https://github.com/rallytime +.. _`remijouannet`: https://github.com/remijouannet +.. _`renner`: https://github.com/renner +.. _`rgcosma`: https://github.com/rgcosma +.. _`root360-AndreasUlm`: https://github.com/root360-AndreasUlm +.. _`s-sebastian`: https://github.com/s-sebastian +.. _`saltstack/salt#41961`: https://github.com/saltstack/salt/pull/41961 +.. _`saltstack/salt-jenkins#475`: https://github.com/saltstack/salt-jenkins/issues/475 +.. _`saltstack/salt-jenkins#495`: https://github.com/saltstack/salt-jenkins/issues/495 +.. _`sarcasticadmin`: https://github.com/sarcasticadmin +.. _`sazaro`: https://github.com/sazaro +.. _`sbojarski`: https://github.com/sbojarski +.. _`shengis`: https://github.com/shengis +.. _`shikhartanwar`: https://github.com/shikhartanwar +.. _`stamak`: https://github.com/stamak +.. _`taigrrr8`: https://github.com/taigrrr8 +.. _`tdutrion`: https://github.com/tdutrion +.. _`terminalmage`: https://github.com/terminalmage +.. _`toanju`: https://github.com/toanju +.. _`tsaridas`: https://github.com/tsaridas +.. _`twangboy`: https://github.com/twangboy +.. _`ushmodin`: https://github.com/ushmodin +.. _`viktorkrivak`: https://github.com/viktorkrivak +.. _`vutny`: https://github.com/vutny +.. _`whiteinge`: https://github.com/whiteinge +.. _`xiaoanyunfei`: https://github.com/xiaoanyunfei diff --git a/doc/topics/releases/2016.11.9.rst b/doc/topics/releases/2016.11.9.rst index 08480b4c25..3a37892c2c 100644 --- a/doc/topics/releases/2016.11.9.rst +++ b/doc/topics/releases/2016.11.9.rst @@ -4,132 +4,175 @@ Salt 2016.11.9 Release Notes Version 2016.11.9 is a bugfix release for :ref:`2016.11.0 `. -Changes for v2016.11.8..v2016.11.9 ----------------------------------------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): - -*Generated at: 2018-01-24T21:13:27Z* - -Statistics: +Statistics +========== - Total Merges: **143** -- Total Issue references: **65** -- Total PR references: **175** +- Total Issue References: **60** +- Total PR References: **167** -Changes: +- Contributors: **54** (`Ch3LL`_, `UtahDave`_, `VertigoRay`_, `akissa`_, `aogier`_, `arthtux`_, `austinpapp`_, `basepi`_, `benediktwerner`_, `bobrik`_, `brejoc`_, `cachedout`_, `cetanu`_, `corywright`_, `creideiki`_, `cro`_, `cruscio`_, `damon-atkins`_, `dayid`_, `defanator`_, `dereckson`_, `dijit`_, `doesitblend`_, `garethgreenaway`_, `gtmanfred`_, `gurubert`_, `gvengel`_, `jfindlay`_, `johnj`_, `jubrad`_, `junovitch`_, `lomeroe`_, `lordcirth`_, `lorengordon`_, `mattLLVW`_, `meaksh`_, `moio`_, `msummers42`_, `mtkennerly`_, `nicholasmhughes`_, `oeuftete`_, `rallytime`_, `rasathus`_, `roaldnefs`_, `rossengeorgiev`_, `seanjnkns`_, `senthilkumar-e`_, `techhat`_, `terminalmage`_, `twangboy`_, `vernondcole`_, `vutny`_, `whiteinge`_, `whytewolf`_) -Windows -======= -Execution module pkg --------------------- -Significate changes (PR #43708 & #45390, damon-atkins) have been made to the pkg execution module. Users should test this release against their existing package sls definition files. -- ``pkg.list_available`` no longer defaults to refreshing the winrepo meta database. -- ``pkg.install`` without a ``version`` parameter no longer upgrades software if the software is already installed. Use ``pkg.install version=latest`` or in a state use ``pkg.latest`` to get the old behavior. -- ``pkg.list_pkgs`` now returns multiple versions if software installed more than once. -- ``pkg.list_pkgs`` now returns 'Not Found' when the version is not found instead of '(value not set)' which matches the contents of the sls definitions. -- ``pkg.remove()`` will wait up to 3 seconds (normally about a second) to detect changes in the registry after removing software, improving reporting of version changes. -- ``pkg.remove()`` can remove ``latest`` software, if ``latest`` is defined in sls definition. -- Documentation was update for the execution module to match the style in new versions, some corrections as well. -- All install/remove commands are prefix with cmd.exe shell and cmdmod is called with a command line string instead of a list. Some sls files in saltstack/salt-winrepo-ng expected the commands to be prefixed with cmd.exe (i.e. the use of ``&``). -- Some execution module functions results, now behavour more like their Unix/Linux versions. -Execution module cmdmod --------------------- -Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don't list-ify string commands on Windows" PR #43807. Linux/Unix OS command & arguments requires a list. Windows was being treated the same. Windows requires commands & arguments to be a string, which this PR fixes. +Windows Changes +=============== -- **PR** `#45638`_: (*twangboy*) Win fix shell info - @ *2018-01-23T22:38:22Z* +:mod:`pkg ` Execution Module` +--------------------------------------------------- + +Significate changes (PR #43708 & #45390, damon-atkins) have been made to the +pkg execution module. Users should test this release against their existing +package sls definition files. + +- :py:func:`pkg.list_available ` no longer + defaults to refreshing the winrepo meta database. +- :py:func:`pkg.install ` without a ``version`` + parameter no longer upgrades software if the software is already installed. + Use ``pkg.install version=latest`` (or simply use a :py:func:`pkg.latest + ` state to get the old behavior. +- :py:func:`pkg.list_pkgs ` now returns + multiple versions if software installed more than once. +- :py:func:`pkg.list_pkgs ` now returns ``Not + Found`` when the version is not found instead of ``(value not set)`` which + matches the contents of the sls definitions. +- :py:func:`pkg.remove ` will wait up to 3 seconds + (normally about a second) to detect changes in the registry after removing + software, improving reporting of version changes. +- :py:func:`pkg.remove ` can remove ``latest`` + software, if ``latest`` is defined in sls definition. +- Documentation was update for the execution module to match the style in new + versions, some corrections as well. +- All install/remove commands are prefix with cmd.exe shell and cmdmod is + called with a command line string instead of a list. Some sls files in + saltstack/salt-winrepo-ng expected the commands to be prefixed with cmd.exe + (i.e. the use of ``&``). +- Some execution module functions results, now behave more like their + Unix/Linux versions. + +:mod:`cmd ` Execution Module +------------------------------------------------- + +Due to a difference in how Python's ``subprocess.Popen()`` spawns processes on +Windows, passing the command as a list of arguments can result in problems. +This is because Windows' *CreateProcess* requires the command to be passed as a +single string. Therefore, ``subprocess`` will attempt to re-assemble the list +of arguments into as string. Some escaped characters and quotes can cause the +resulting string to be incorrectly-assembled, resulting in a failure to execute +the command. + +Salt now deals with these cases by joining the list of arguments correctly and +ensuring that the command is passed to ``subprocess.Popen()`` as a string. + + +Changelog for v2016.11.8..v2016.11.9 +==================================== + +*Generated at: 2018-05-27 20:28:05 UTC* + +* **PR** `#45638`_: (`twangboy`_) Win fix shell info + @ *2018-01-23 22:38:22 UTC* * 10812969f0 Merge pull request `#45638`_ from twangboy/win_fix_shell_info + * 872da3ffba Only convert text types in the list_values function * 0e41535cdb Fix reg.py to only convert text types to unicode * 3579534ea5 Fix issue with detecting powershell -- **PR** `#45564`_: (*Ch3LL*) Add PR changes to 2016.11.9 Release Notes - @ *2018-01-19T21:36:05Z* +* **PR** `#45564`_: (`Ch3LL`_) Add PR changes to 2016.11.9 Release Notes + @ *2018-01-19 21:36:05 UTC* * 2d1dd1186e Merge pull request `#45564`_ from Ch3LL/r-notes-2016 + * 325f4cbcda Add PR changes to 2016.11.9 Release Notes -- **PR** `#45563`_: (*Ch3LL*) Update man pages for 2016.11.9 - @ *2018-01-19T21:19:00Z* +* **PR** `#45563`_: (`Ch3LL`_) Update man pages for 2016.11.9 + @ *2018-01-19 21:19:00 UTC* * 28e4398150 Merge pull request `#45563`_ from Ch3LL/man_2016 + * 529bc0c680 update release number for salt-call man page 2016.11.9 * 11b7222148 Update man pages for 2016.11.9 -- **PR** `#45532`_: (*gtmanfred*) fix mock for opensuse - @ *2018-01-18T22:48:30Z* +* **PR** `#45532`_: (`gtmanfred`_) fix mock for opensuse + @ *2018-01-18 22:48:30 UTC* * 654df0f526 Merge pull request `#45532`_ from gtmanfred/2016.11.9 + * 6c26025664 fix mock for opensuse -- **PR** `#45518`_: (*gtmanfred*) fix last 2016.11.9 failing tests - @ *2018-01-18T12:03:50Z* +* **PR** `#45518`_: (`gtmanfred`_) fix last 2016.11.9 failing tests + @ *2018-01-18 12:03:50 UTC* * 571c33aa39 Merge pull request `#45518`_ from gtmanfred/2016.11.9 + * 5455d2dee6 fix centos 6 pip test * 40255194b0 fix fedora pkg test -- **PR** `#45443`_: (*rallytime*) Back-port `#45399`_ to 2016.11.9 - @ *2018-01-17T14:53:58Z* +* **ISSUE** `#45394`_: (`dmurphy18`_) git.latest fails when "depth" is used with a non-default branch (refs: `#45399`_) + +* **PR** `#45443`_: (`rallytime`_) Back-port `#45399`_ to 2016.11.9 + @ *2018-01-17 14:53:58 UTC* + + * **PR** `#45399`_: (`terminalmage`_) Fix git.latest failure when rev is not the default branch (refs: `#45443`_) + + * 4e0a0eec1f Merge pull request `#45443`_ from rallytime/bp-45399-2016.11.9 - - **ISSUE** `#45394`_: (*dmurphy18*) git.latest fails when "depth" is used with a non-default branch - | refs: `#45399`_ - - **PR** `#45399`_: (*terminalmage*) Fix git.latest failure when rev is not the default branch - | refs: `#45443`_ - * 4e0a0eec1f Merge pull request `#45443`_ from rallytime/`bp-45399`_-2016.11.9 * 919e92c911 Fix git.latest failure when rev is not the default branch -- **PR** `#45493`_: (*damon-atkins*) win_pkg: pkg.refresh_db report an issue if a sls pkg definition does not contain a dict instead of aborting - @ *2018-01-17T14:52:03Z* +* **ISSUE** `#45432`_: (`TheBigBear`_) winrepo-ng fault pkg.refresh_db doesn't work - it processes ANY stray .git metadata \*.sls files present on minion (refs: `#45493`_) + +* **PR** `#45493`_: (`damon-atkins`_) win_pkg: pkg.refresh_db report an issue if a sls pkg definition does not contain a dict instead of aborting + @ *2018-01-17 14:52:03 UTC* - - **ISSUE** `#45432`_: (*TheBigBear*) winrepo-ng fault pkg.refresh_db doesn't work - it processes ANY stray .git metadata *.sls files present on minion - | refs: `#45493`_ * ebd4db66b8 Merge pull request `#45493`_ from damon-atkins/2016.11_fix_sls_defintion_wrong_type + * af108440df win_pkg lint space after , * c6e922a236 win_pkg lint issues - * f4627d7a80 fix quote i.e. change \\` to \\' + * f4627d7a80 fix quote i.e. change \` to \' * 6938a4c099 pkg.refresh_db report an issue if a sls pkg definition id not a dict instead of aborting. -- **PR** `#45446`_: (*rallytime*) Back-port `#45390`_ to 2016.11.9 - @ *2018-01-16T20:08:38Z* +* **PR** `#45446`_: (`rallytime`_) Back-port `#45390`_ to 2016.11.9 + @ *2018-01-16 20:08:38 UTC* + + * **PR** `#45390`_: (`damon-atkins`_) win_pkg: fix pkg.remove, pkg.list_pkgs (refs: `#45446`_) + + * 7322efba92 Merge pull request `#45446`_ from rallytime/bp-45390 - - **PR** `#45390`_: (*damon-atkins*) win_pkg: fix pkg.remove, pkg.list_pkgs - | refs: `#45446`_ - * 7322efba92 Merge pull request `#45446`_ from rallytime/`bp-45390`_ * 69f045ea24 lint too-many-blank-lines * 10a7501ede Update release notes * 6f2affe01c fix pkg.remove, pkg.list_pkgs -- **PR** `#45424`_: (*twangboy*) Fix some issues with reg.py - @ *2018-01-13T19:34:47Z* +* **PR** `#45424`_: (`twangboy`_) Fix some issues with reg.py + @ *2018-01-13 19:34:47 UTC* * b0ece9f4d4 Merge pull request `#45424`_ from twangboy/win_reg + * 30f06205f7 Fix some issues with reg.py -- **PR** `#45327`_: (*lomeroe*) Backport `#44861`_ to 2016.11 - @ *2018-01-08T21:10:41Z* +* **PR** `#45327`_: (`lomeroe`_) Backport `#44861`_ to 2016.11 + @ *2018-01-08 21:10:41 UTC* + + * **PR** `#44861`_: (`twangboy`_) Fix win_lgpo for unknown values (refs: `#45327`_) + + * 0959ae4ea3 Merge pull request `#45327`_ from lomeroe/bp-44861_2016.11 - - **PR** `#44861`_: (*twangboy*) Fix win_lgpo for unknown values - | refs: `#45327`_ - * 0959ae4ea3 Merge pull request `#45327`_ from lomeroe/`bp-44861`__2016.11 * 784139f734 Check for values other than 0 or 1 -- **PR** `#45268`_: (*damon-atkins*) Fix pkg.install packagename version=latest i.e. if on an old version is installed - @ *2018-01-08T17:34:15Z* +* **PR** `#45268`_: (`damon-atkins`_) Fix pkg.install packagename version=latest i.e. if on an old version is installed + @ *2018-01-08 17:34:15 UTC* * a6db5f95f0 Merge pull request `#45268`_ from damon-atkins/2016.11_win_pkg_pkg_install_latest + * 325a9f0f66 Update 2016.11.9.rst * 4da9200b9c Update 2016.11.9.rst @@ -140,48 +183,53 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * a0d89882b8 Fix pkg.install packagename version=latest i.e. if on an old version upgrade to the latest -- **PR** `#45256`_: (*rallytime*) Back-port `#45034`_ to 2016.11 - @ *2018-01-04T14:25:42Z* +* **PR** `#45256`_: (`rallytime`_) Back-port `#45034`_ to 2016.11 + @ *2018-01-04 14:25:42 UTC* + + * **PR** `#45034`_: (`brejoc`_) Fix for pidfile removal logging (refs: `#45256`_) + + * 1c5e905b61 Merge pull request `#45256`_ from rallytime/bp-45034 - - **PR** `#45034`_: (*brejoc*) Fix for pidfile removal logging - | refs: `#45256`_ - * 1c5e905b61 Merge pull request `#45256`_ from rallytime/`bp-45034`_ * 68f971b38f Apply test fixes from `#45034`_ to parsers_test.py * 9454236694 Fix for pidfile removal logging -- **PR** `#45235`_: (*rallytime*) Back-port `#45209`_ to 2016.11 - @ *2018-01-02T20:20:15Z* +* **ISSUE** `saltstack/salt-jenkins#598`_: (`rallytime`_) [oxygen] CentOS 7 is failing ~ 20 tests in the integration.ssh.test_state.SSHStateTest (refs: `#45209`_) + +* **PR** `#45235`_: (`rallytime`_) Back-port `#45209`_ to 2016.11 + @ *2018-01-02 20:20:15 UTC* + + * **PR** `#45209`_: (`gtmanfred`_) enable UsePAM for ssh tests (refs: `#45235`_) + + * b75f50afe3 Merge pull request `#45235`_ from rallytime/bp-45209 - - **ISSUE** `#598`_: (*syphernl*) Explanation on how to execute interactive installs - | refs: `#45209`_ - - **PR** `#45209`_: (*gtmanfred*) enable UsePAM for ssh tests - | refs: `#45235`_ - * b75f50afe3 Merge pull request `#45235`_ from rallytime/`bp-45209`_ * 2d0a9bbf7e enable UsePAM for ssh tests -- **PR** `#44965`_: (*gtmanfred*) check if VALUE is a string_type - @ *2018-01-02T16:42:39Z* +* **PR** `#44965`_: (`gtmanfred`_) check if VALUE is a string_type + @ *2018-01-02 16:42:39 UTC* * 3ab962b01a Merge pull request `#44965`_ from gtmanfred/2016.11 + * a5d8a6340e check if VALUE is a string_type -- **PR** `#45232`_: (*rasathus*) Backport `#27160`_ to 2016.11 - @ *2018-01-02T15:48:22Z* +* **ISSUE** `#27160`_: (`martinadolfi`_) salt.states.mount persistence error using spaces in route (refs: `#45232`_) + +* **PR** `#45232`_: (`rasathus`_) Backport `#27160`_ to 2016.11 + @ *2018-01-02 15:48:22 UTC* - - **ISSUE** `#27160`_: (*martinadolfi*) salt.states.mount persistence error using spaces in route - | refs: `#45232`_ `#45232`_ * 40fb30f63f Merge pull request `#45232`_ from rasathus/2016.11 + * 7a2bd8f49b Merge branch '2016.11' into 2016.11 -- **PR** `#45161`_: (*lomeroe*) Backport `#44944`_ to 2016.11 - @ *2017-12-30T13:19:35Z* +* **ISSUE** `#44516`_: (`doesitblend`_) Windows PY3 Minion Returns UTF16 UnicodeError (refs: `#44944`_, `#45161`_) + +* **PR** `#45161`_: (`lomeroe`_) Backport `#44944`_ to 2016.11 + @ *2017-12-30 13:19:35 UTC* + + * **PR** `#44944`_: (`lomeroe`_) win_lgpo registry.pol encoding updates (refs: `#45161`_) + + * 707ef55175 Merge pull request `#45161`_ from lomeroe/bp-44944_2016.11 - - **ISSUE** `#44516`_: (*doesitblend*) Windows PY3 Minion Returns UTF16 UnicodeError - | refs: `#44944`_ `#45161`_ - - **PR** `#44944`_: (*lomeroe*) win_lgpo registry.pol encoding updates - | refs: `#45161`_ - * 707ef55175 Merge pull request `#45161`_ from lomeroe/`bp-44944`__2016.11 * 0a4c6b5a83 remove references to six.unichr * f3196d795d lint fixes for static regexes @@ -190,147 +238,161 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * c14d6282ad do not decode registry.pol file wholesale, but instead decode individual elements of the file -- **PR** `#45199`_: (*gtmanfred*) status.pid returns pid ids not process names - @ *2017-12-28T19:06:11Z* +* **ISSUE** `#45188`_: (`jak3kaj`_) salt state status.process always returns false (refs: `#45199`_) + +* **PR** `#45199`_: (`gtmanfred`_) status.pid returns pid ids not process names + @ *2017-12-28 19:06:11 UTC* - - **ISSUE** `#45188`_: (*jak3kaj*) salt state status.process always returns false - | refs: `#45199`_ * 6f52034e08 Merge pull request `#45199`_ from gtmanfred/status + * fb07f9ea7d status.pid returns pid ids not process names -- **PR** `#45118`_: (*garethgreenaway*) [2016.11] Fix to allow nodegroups to include sequences - @ *2017-12-27T18:49:10Z* +* **ISSUE** `#44728`_: (`casselt`_) Nodegroups can not be defined by glob with ? or seq (refs: `#45118`_) + +* **PR** `#45118`_: (`garethgreenaway`_) [2016.11] Fix to allow nodegroups to include sequences + @ *2017-12-27 18:49:10 UTC* - - **ISSUE** `#44728`_: (*casselt*) Nodegroups can not be defined by glob with ? or seq - | refs: `#45118`_ * d3381e27d0 Merge pull request `#45118`_ from garethgreenaway/44728_nodegroups_seq + * 0ff811de70 Swapping import to be the old path for 2016.11 * b3e2f388f5 Fix to allow nodegroups to include sequences -- **PR** `#45127`_: (*twangboy*) Fix issue with 1641 return code - @ *2017-12-22T15:18:28Z* +* **PR** `#45127`_: (`twangboy`_) Fix issue with 1641 return code + @ *2017-12-22 15:18:28 UTC* * f969aca3a3 Merge pull request `#45127`_ from twangboy/win_fix_pkg + * 14639739f2 Fix issue with 1641 return code -- **PR** `#45137`_: (*twangboy*) Catch correct error type in list_keys and list_values - @ *2017-12-22T14:45:22Z* +* **PR** `#45137`_: (`twangboy`_) Catch correct error type in list_keys and list_values + @ *2017-12-22 14:45:22 UTC* * dc357b39f0 Merge pull request `#45137`_ from twangboy/win_fix_reg_tests + * b6f4ef8d73 Catch correct error type in list_keys and list_values -- **PR** `#45130`_: (*rallytime*) Resolve groups for salt api - @ *2017-12-21T20:38:32Z* +* **PR** `#45130`_: (`rallytime`_) Resolve groups for salt api + @ *2017-12-21 20:38:32 UTC* * 0aa1662731 Merge pull request `#45130`_ from rallytime/api-groups + * 2dcc8df845 Resolve groups for salt api -- **PR** `#45114`_: (*twangboy*) Move pam library load to try/except block - @ *2017-12-21T14:37:17Z* +* **PR** `#45114`_: (`twangboy`_) Move pam library load to try/except block + @ *2017-12-21 14:37:17 UTC* * 7dc3cc4641 Merge pull request `#45114`_ from twangboy/win_fix_pam + * cf5eae1f77 Move pam library load to try/except block -- **PR** `#45100`_: (*rallytime*) Back-port `#45070`_ to 2016.11 - @ *2017-12-20T14:55:01Z* +* **ISSUE** `#45049`_: (`vernondcole`_) salt cloud module documentation is missing from the index. (refs: `#45070`_) + +* **PR** `#45100`_: (`rallytime`_) Back-port `#45070`_ to 2016.11 + @ *2017-12-20 14:55:01 UTC* + + * **PR** `#45070`_: (`vernondcole`_) insert clouds modules in index (refs: `#45100`_) + + * 7e128e8f15 Merge pull request `#45100`_ from rallytime/bp-45070 - - **ISSUE** `#45049`_: (*vernondcole*) salt cloud module documentation is missing from the index. - | refs: `#45070`_ - - **PR** `#45070`_: (*vernondcole*) insert clouds modules in index - | refs: `#45100`_ - * 7e128e8f15 Merge pull request `#45100`_ from rallytime/`bp-45070`_ * 0bdb46dab9 add clouds modules to index -- **PR** `#45098`_: (*rallytime*) Back-port `#45092`_ to 2016.11 - @ *2017-12-20T14:40:51Z* +* **PR** `#45098`_: (`rallytime`_) Back-port `#45092`_ to 2016.11 + @ *2017-12-20 14:40:51 UTC* + + * **PR** `#45092`_: (`terminalmage`_) Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install (refs: `#45098`_) + + * bdf93f339d Merge pull request `#45098`_ from rallytime/bp-45092 - - **PR** `#45092`_: (*terminalmage*) Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install - | refs: `#45098`_ - * bdf93f339d Merge pull request `#45098`_ from rallytime/`bp-45092`_ * 80b6bd6813 Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install -- **PR** `#44078`_: (*rossengeorgiev*) user.present: allow date param to be 0 - @ *2017-12-19T15:59:29Z* +* **ISSUE** `#41044`_: (`pirxthepilot`_) user.present 'date' parameter is not applying (refs: `#44078`_) + +* **PR** `#44078`_: (`rossengeorgiev`_) user.present: allow date param to be 0 + @ *2017-12-19 15:59:29 UTC* + + * 324b7d4058 Merge pull request `#44078`_ from rossengeorgiev/fix-41044 - - **ISSUE** `#41044`_: (*pirxthepilot*) user.present 'date' parameter is not applying - | refs: `#44078`_ - * 324b7d4058 Merge pull request `#44078`_ from rossengeorgiev/`fix-41044`_ * a81a6fe23c fix `#41044`_; allow for date param to be 0 -- **PR** `#44970`_: (*rallytime*) Update bootstrap script to latest release: 2017.12.13 - @ *2017-12-19T15:49:05Z* +* **PR** `#44970`_: (`rallytime`_) Update bootstrap script to latest release: 2017.12.13 + @ *2017-12-19 15:49:05 UTC* * 48a59761df Merge pull request `#44970`_ from rallytime/update-bootstrap-script + * b2c8057427 Update bootstrap script to latest release: 2017.12.13 -- **PR** `#45069`_: (*rallytime*) Back-port `#45040`_ to 2016.11 - @ *2017-12-19T14:25:57Z* +* **ISSUE** `#45036`_: (`dijit`_) Quiet installation of packaged minions fails due to redistributable not being quietly installed [py3] [Windows] (refs: `#45040`_) + +* **PR** `#45069`_: (`rallytime`_) Back-port `#45040`_ to 2016.11 + @ *2017-12-19 14:25:57 UTC* + + * **PR** `#45040`_: (`dijit`_) Installation Fails on headless machines. (refs: `#45069`_) + + * 637fdaed58 Merge pull request `#45069`_ from rallytime/bp-45040 - - **ISSUE** `#45036`_: (*dijit*) Quiet installation of packaged minions fails due to redistributable not being quietly installed [py3] [Windows] - | refs: `#45040`_ `#45040`_ - - **ISSUE** `#27160`_: (*martinadolfi*) salt.states.mount persistence error using spaces in route - | refs: `#45232`_ `#45232`_ - - **PR** `#45040`_: (*dijit*) Installation Fails on headless machines. - | refs: `#45069`_ - * 637fdaed58 Merge pull request `#45069`_ from rallytime/`bp-45040`_ * aa438e1605 Installation Fails on headless machines. * de53c45c29 Backport `#27160`_ to 2016.11 -- **PR** `#44969`_: (*rallytime*) Back-port `#41305`_ to 2016.11 - @ *2017-12-15T17:22:18Z* +* **ISSUE** `#41286`_: (`arthtux`_) boto_vpc.accept_vpc_peering_connection wait a object (refs: `#41305`_) + +* **PR** `#44969`_: (`rallytime`_) Back-port `#41305`_ to 2016.11 + @ *2017-12-15 17:22:18 UTC* + + * **PR** `#41305`_: (`arthtux`_) correct accept_vpc_peering_connection (refs: `#44969`_) + + * 4d6d640381 Merge pull request `#44969`_ from rallytime/bp-41305 - - **ISSUE** `#41286`_: (*arthtux*) boto_vpc.accept_vpc_peering_connection wait a object - | refs: `#41305`_ - - **PR** `#41305`_: (*arthtux*) correct accept_vpc_peering_connection - | refs: `#44969`_ - * 4d6d640381 Merge pull request `#44969`_ from rallytime/`bp-41305`_ * 5c4bee43dc correct accept_vpc_peering_connection -- **PR** `#45031`_: (*terminalmage*) Fix invalid exception class in mysql returner - @ *2017-12-15T15:00:15Z* +* **PR** `#45031`_: (`terminalmage`_) Fix invalid exception class in mysql returner + @ *2017-12-15 15:00:15 UTC* * 10de468f13 Merge pull request `#45031`_ from terminalmage/fix-mysql-returner + * f3bd12c27c Fix invalid exception class in mysql returner -- **PR** `#44972`_: (*terminalmage*) Backport `#44958`_ to 2016.11 branch - @ *2017-12-14T16:56:02Z* +* **ISSUE** `#44820`_: (`msteed`_) Custom returner breaks manage runner (refs: `#44958`_) + +* **PR** `#44972`_: (`terminalmage`_) Backport `#44958`_ to 2016.11 branch + @ *2017-12-14 16:56:02 UTC* + + * **PR** `#44958`_: (`terminalmage`_) Fix a race condition in manage runner (refs: `#44972`_) + + * 9a7406207f Merge pull request `#44972`_ from terminalmage/bp-44958 - - **ISSUE** `#44820`_: (*msteed*) Custom returner breaks manage runner - | refs: `#44958`_ - - **PR** `#44958`_: (*terminalmage*) Fix a race condition in manage runner - | refs: `#44972`_ - * 9a7406207f Merge pull request `#44972`_ from terminalmage/`bp-44958`_ * a416bf0112 No need to manually do connect_pub, use listen=True in run_job * 3ec004bd2e Fix a race condition in manage runner -- **PR** `#44385`_: (*gtmanfred*) schedule should be a dict in opts - @ *2017-12-12T20:44:02Z* +* **ISSUE** `#44378`_: (`llua`_) minion: infinite loop during start when schedule key is null (refs: `#44385`_) + +* **PR** `#44385`_: (`gtmanfred`_) schedule should be a dict in opts + @ *2017-12-12 20:44:02 UTC* - - **ISSUE** `#44378`_: (*llua*) minion: infinite loop during start when schedule key is null - | refs: `#44385`_ * 1032ca3290 Merge pull request `#44385`_ from gtmanfred/schedule + * 9e15c38da2 add comma * 855d933cb7 schedule should be a dict -- **PR** `#44770`_: (*cruscio*) Fix minion ping_interval documentation - @ *2017-12-11T19:50:19Z* +* **ISSUE** `#44734`_: (`cruscio`_) Documentation inconsistency for minion ping_interval timing (refs: `#44770`_) + +* **PR** `#44770`_: (`cruscio`_) Fix minion ping_interval documentation + @ *2017-12-11 19:50:19 UTC* - - **ISSUE** `#44734`_: (*cruscio*) Documentation inconsistency for minion ping_interval timing - | refs: `#44770`_ * 68d901b12c Merge pull request `#44770`_ from cruscio/2016.11 + * e2682bf441 Fix minion ping_interval documentation -- **PR** `#44335`_: (*gtmanfred*) add docker-ce to docker subtype grains check - @ *2017-12-10T17:17:49Z* +* **ISSUE** `#44292`_: (`andrew-regan`_) grains['virtual_subtype'] assignment for Docker broken on Mac (refs: `#44335`_) + +* **PR** `#44335`_: (`gtmanfred`_) add docker-ce to docker subtype grains check + @ *2017-12-10 17:17:49 UTC* - - **ISSUE** `#44292`_: (*andrew-regan*) grains['virtual_subtype'] assignment for Docker broken on Mac - | refs: `#44335`_ - - **ISSUE** `#4`_: (*thatch45*) pacman module * d4ab55ec47 Merge pull request `#44335`_ from gtmanfred/2016.11 + * 3f1268d67f fix patching for python 2.6 * 1d0bd5bb32 Merge branch '2016.11' into 2016.11 @@ -341,80 +403,89 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * a30af3252e add docker-ce to docker subtype grains check -- **PR** `#44579`_: (*roaldnefs*) Fix bug in cron module and state - Fixes `#44530`_ - @ *2017-12-07T20:18:27Z* +* **ISSUE** `#44530`_: (`roaldnefs`_) Identifier not working in salt.states.cron when special is used (refs: `#44579`_) + +* **PR** `#44579`_: (`roaldnefs`_) Fix bug in cron module and state - Fixes `#44530`_ + @ *2017-12-07 20:18:27 UTC* - - **ISSUE** `#44530`_: (*roaldnefs*) Identifier not working in salt.states.cron when special is used - | refs: `#44579`_ * bb1f8dceaf Merge pull request `#44579`_ from roaldnefs/fix-cron-identifier + * df73a4c051 Merge branch '2016.11' into fix-cron-identifier -- **PR** `#44852`_: (*damon-atkins*) win_pkg fix spelling typos and minion option 2016.11 - @ *2017-12-06T16:49:17Z* +* **PR** `#44852`_: (`damon-atkins`_) win_pkg fix spelling typos and minion option 2016.11 + @ *2017-12-06 16:49:17 UTC* * af0131fa1f Merge pull request `#44852`_ from damon-atkins/2016.11_win_pkg_typo_n_fix + * 0e7c19084f Lint: Remove extra whitespace * 7c7e21f94d Fix spelling typo, and fix backwards campatible minion option for repo location -- **PR** `#44794`_: (*terminalmage*) Fix regression in file.managed when source_hash used with local file - @ *2017-12-04T14:23:29Z* +* **ISSUE** `#44365`_: (`icycle77`_) file.managed appears to ignore source_hash check (refs: `#44794`_) + +* **PR** `#44794`_: (`terminalmage`_) Fix regression in file.managed when source_hash used with local file + @ *2017-12-04 14:23:29 UTC* - - **ISSUE** `#44365`_: (*icycle77*) file.managed appears to ignore source_hash check - | refs: `#44794`_ * 88c0d66b4e Merge pull request `#44794`_ from terminalmage/issue44365 + * 3b8b6f25e6 Remove debugging line * 153bf45b03 Fix regression in file.managed when source_hash used with local file -- **PR** `#44738`_: (*rallytime*) Bump some deprecation warnings from Oxygen to Fluorine - @ *2017-12-01T23:10:08Z* +* **ISSUE** `#35777`_: (`rallytime`_) Properly deprecate template context data in Fluorine (refs: `#44738`_) + +* **ISSUE** `#35523`_: (`rallytime`_) Come up with a reasonable alternative for lxc.edited_conf (refs: `#44738`_) + +* **PR** `#44738`_: (`rallytime`_) Bump some deprecation warnings from Oxygen to Fluorine + @ *2017-12-01 23:10:08 UTC* - - **ISSUE** `#35777`_: (*rallytime*) Properly deprecate template context data in Fluorine - | refs: `#44738`_ - - **ISSUE** `#35523`_: (*rallytime*) Come up with a reasonable alternative for lxc.edited_conf - | refs: `#44738`_ * c8bb9dfbbb Merge pull request `#44738`_ from rallytime/bump-oxygen-warnings + * ead3c569e1 Bump deprecation warnings from Oxygen to Fluorine -- **PR** `#44741`_: (*gtmanfred*) if gateway is not specified use iface - @ *2017-12-01T23:09:03Z* +* **ISSUE** `#44730`_: (`msciciel`_) State network.routes could not add route without gateway on centos7 (refs: `#44741`_) + +* **PR** `#44741`_: (`gtmanfred`_) if gateway is not specified use iface + @ *2017-12-01 23:09:03 UTC* - - **ISSUE** `#44730`_: (*msciciel*) State network.routes could not add route without gateway on centos7 - | refs: `#44741`_ * 88e3aab00d Merge pull request `#44741`_ from gtmanfred/rhip + * 439dc8dce6 if gateway is not specified use iface -- **PR** `#44699`_: (*jfindlay*) utils/files.py remove temp file upon move failure - @ *2017-12-01T15:03:54Z* +* **ISSUE** `#31405`_: (`SEJeff`_) Salt leaves tmp file when file.managed dest file is immutable (refs: `#44699`_) + +* **PR** `#44699`_: (`jfindlay`_) utils/files.py remove temp file upon move failure + @ *2017-12-01 15:03:54 UTC* - - **ISSUE** `#31405`_: (*SEJeff*) Salt leaves tmp file when file.managed dest file is immutable - | refs: `#44699`_ * 97e0cf569c Merge pull request `#44699`_ from jfindlay/attr_file + * 9e5a40ea7c Merge branch '2016.11' into attr_file * 5c34607f6c utils/files remove temp file upon move failure -- **PR** `#44714`_: (*rallytime*) Allow --static option to display state runs with highstate output - @ *2017-12-01T14:31:19Z* +* **ISSUE** `#44556`_: (`doesitblend`_) --static option doesn't return highstate output (refs: `#44714`_) + +* **PR** `#44714`_: (`rallytime`_) Allow --static option to display state runs with highstate output + @ *2017-12-01 14:31:19 UTC* + + * 7434e0afdf Merge pull request `#44714`_ from rallytime/fix-44556 - - **ISSUE** `#44556`_: (*doesitblend*) --static option doesn't return highstate output - | refs: `#44714`_ - * 7434e0afdf Merge pull request `#44714`_ from rallytime/`fix-44556`_ * 1bbe1abeb2 Allow --static option to display state runs with highstate output -- **PR** `#44517`_: (*whytewolf*) Publish port doc missing - @ *2017-11-28T21:50:19Z* +* **PR** `#44517`_: (`whytewolf`_) Publish port doc missing + @ *2017-11-28 21:50:19 UTC* * 998d714ee7 Merge pull request `#44517`_ from whytewolf/publish_port_doc_missing - * 4b5855283a missed one place where i didn't change master_port from my copy to publish_port + + * 4b5855283a missed one place where i didnt chanbge master_port from my copy to publish_port * e4610baea5 update doc to have publish port -- **PR** `#41279`_: (*Ch3LL*) Add fqdn and dns core grain tests - @ *2017-11-27T21:28:10Z* +* **PR** `#41279`_: (`Ch3LL`_) Add fqdn and dns core grain tests + @ *2017-11-27 21:28:10 UTC* * 6169b52749 Merge pull request `#41279`_ from Ch3LL/add_grain_tests + * 1b64f15692 Merge branch '2016.11' into add_grain_tests * 095f1b7d7a Merge branch '2016.11' into add_grain_tests @@ -429,26 +500,29 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 3ec4329307 Merge branch '2016.11' into fix-cron-identifier -- **PR** `#44563`_: (*creideiki*) Send Unix timestamps to database in pgjsonb returner - @ *2017-11-21T17:44:32Z* +* **ISSUE** `#44544`_: (`creideiki`_) pgjsonb returner sets wrong timezone on timestamps in database when using Python 2 (refs: `#44563`_) + +* **PR** `#44563`_: (`creideiki`_) Send Unix timestamps to database in pgjsonb returner + @ *2017-11-21 17:44:32 UTC* - - **ISSUE** `#44544`_: (*creideiki*) pgjsonb returner sets wrong timezone on timestamps in database when using Python 2 - | refs: `#44563`_ * dc6de050a9 Merge pull request `#44563`_ from creideiki/pgjsonb-timestamps-44544 + * 231e412ca4 Merge branch '2016.11' into pgjsonb-timestamps-44544 -- **PR** `#44602`_: (*rallytime*) Handle timeout_monitor attribute error for new versions of CherryPy - @ *2017-11-20T21:38:40Z* +* **ISSUE** `#44601`_: (`rallytime`_) CherryPy 12.0 removed support for "engine.timeout_monitor.on" config option (refs: `#44602`_) + +* **PR** `#44602`_: (`rallytime`_) Handle timeout_monitor attribute error for new versions of CherryPy + @ *2017-11-20 21:38:40 UTC* + + * 4369df020b Merge pull request `#44602`_ from rallytime/fix-44601 - - **ISSUE** `#44601`_: (*rallytime*) CherryPy 12.0 removed support for "engine.timeout_monitor.on" config option - | refs: `#44602`_ - * 4369df020b Merge pull request `#44602`_ from rallytime/`fix-44601`_ * ff303fd060 Handle timeout_monitor/TimeoutError issues for new versions of CherryPy -- **PR** `#44604`_: (*lorengordon*) Documents the exclude argument in state execution module - @ *2017-11-20T18:19:18Z* +* **PR** `#44604`_: (`lorengordon`_) Documents the exclude argument in state execution module + @ *2017-11-20 18:19:18 UTC* * 4a4756fc37 Merge pull request `#44604`_ from lorengordon/doc-exclude + * c4a6c40eb3 Documents the exclude argument in state execution module * 15c445e6b9 Send Unix timestamps to database in pgjsonb @@ -457,10 +531,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 97328faeac Fix for bug in cron module -- **PR** `#44434`_: (*whytewolf*) add a note that describes grain rebuilding on restart and refresh - @ *2017-11-14T11:21:54Z* +* **PR** `#44434`_: (`whytewolf`_) add a note that describes grain rebuilding on restart and refresh + @ *2017-11-14 11:21:54 UTC* * 91d46d4cfc Merge pull request `#44434`_ from whytewolf/1837 + * d148e39dda change from md to rst for code reference * 955e305bda fix bad english, as requested by cachedout @@ -471,12 +546,13 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * aca0405b26 add a note that describes grain rebuilding on restart and refresh -- **PR** `#44321`_: (*gvengel*) Fix file.line diff formatting. - @ *2017-11-13T19:36:39Z* +* **ISSUE** `#41474`_: (`dmaziuk`_) state.file.* line endings (refs: `#44321`_) + +* **PR** `#44321`_: (`gvengel`_) Fix file.line diff formatting. + @ *2017-11-13 19:36:39 UTC* - - **ISSUE** `#41474`_: (*dmaziuk*) state.file.* line endings - | refs: `#44321`_ * a3bd99317f Merge pull request `#44321`_ from gvengel/fix-file-line-diff-output + * 69a50204a6 Add newline for lint. * ef7b6bbb81 Fixed issue with file.line on Windows running Python 2. @@ -491,12 +567,13 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 24d7315f1a Fix file.line diff formatting. -- **PR** `#43708`_: (*damon-atkins*) Merge Ready : Backport develop win_pkg to 2016.11 with additional bug fixes - @ *2017-11-13T19:33:41Z* +* **ISSUE** `#43417`_: (`damon-atkins`_) win_pkg: pkg.install and pkg.remove general issues (refs: `#43708`_) + +* **PR** `#43708`_: (`damon-atkins`_) Merge Ready : Backport develop win_pkg to 2016.11 with additional bug fixes + @ *2017-11-13 19:33:41 UTC* - - **ISSUE** `#43417`_: (*damon-atkins*) win_pkg: pkg.install and pkg.remove general issues - | refs: `#43708`_ * 9ca563718d Merge pull request `#43708`_ from damon-atkins/2016.11_43417_Backport_and_Fixes + * 04d03ea6b8 Updated comment * 1dd565e585 Merge remote branch 'upstream/2016.11' into 2016.11_43417_Backport_and_Fixes @@ -521,34 +598,38 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * b314549a32 Backport of devlop to 2016.11 with additional bug fixes -- **PR** `#44477`_: (*rallytime*) Back-port `#44424`_ to 2016.11 - @ *2017-11-13T17:33:29Z* +* **ISSUE** `#44423`_: (`mtkennerly`_) The win_path.exists state cannot prepend to the very start of the PATH (refs: `#44424`_) + +* **PR** `#44477`_: (`rallytime`_) Back-port `#44424`_ to 2016.11 + @ *2017-11-13 17:33:29 UTC* + + * **PR** `#44424`_: (`mtkennerly`_) Fix `#44423`_: Handle index=None and index=0 distinctly in the win_path.exists state (refs: `#44477`_) + + * 68ea22188e Merge pull request `#44477`_ from rallytime/bp-44424 - - **ISSUE** `#44423`_: (*mtkennerly*) The win_path.exists state cannot prepend to the very start of the PATH - | refs: `#44424`_ - - **PR** `#44424`_: (*mtkennerly*) Fix `#44423`_: Handle index=None and index=0 distinctly in the win_path.exists state - | refs: `#44477`_ - * 68ea22188e Merge pull request `#44477`_ from rallytime/`bp-44424`_ * 4a9f8dcc96 Fix `#44423`_: Handle index=None and index=0 distinctly -- **PR** `#44483`_: (*terminalmage*) salt-call: account for instances where __pillar__ is empty - @ *2017-11-13T17:30:36Z* +* **ISSUE** `#44034`_: (`seanjnkns`_) salt-call pillar overrides broken in 2016.11.8 and 2017.7.2 (refs: `#44483`_) + +* **PR** `#44483`_: (`terminalmage`_) salt-call: account for instances where __pillar__ is empty + @ *2017-11-13 17:30:36 UTC* - - **ISSUE** `#44034`_: (*seanjnkns*) salt-call pillar overrides broken in 2016.11.8 and 2017.7.2 - | refs: `#44483`_ * 2c89050a24 Merge pull request `#44483`_ from terminalmage/issue44034 + * a9db8becea salt-call: account for instances where __pillar__ is empty -- **PR** `#44489`_: (*whytewolf*) update log-granular-levels to describe what they are filtering on - @ *2017-11-13T17:27:37Z* +* **PR** `#44489`_: (`whytewolf`_) update log-granular-levels to describe what they are filtering on + @ *2017-11-13 17:27:37 UTC* * b5c2028680 Merge pull request `#44489`_ from whytewolf/1956_log-granular-levels + * 9cdeb4e903 update log-granular-levels to describe what they are filtering on -- **PR** `#44193`_: (*twangboy*) Fix reg.py for use with LGPO module - @ *2017-11-10T19:01:17Z* +* **PR** `#44193`_: (`twangboy`_) Fix reg.py for use with LGPO module + @ *2017-11-10 19:01:17 UTC* * ea07f9c54c Merge pull request `#44193`_ from twangboy/win_fix_reg + * 44d6d9f46d Remove unused import (lint) * f7502436bd Fix various issues @@ -563,21 +644,22 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 03fa37b445 Cast vdata to it's proper type -- **PR** `#43863`_: (*nicholasmhughes*) Atomicfile only copies mode and not user/group perms - @ *2017-11-10T18:47:55Z* +* **PR** `#43863`_: (`nicholasmhughes`_) Atomicfile only copies mode and not user/group perms + @ *2017-11-10 18:47:55 UTC* - - **ISSUE** `#38452`_: (*jf*) file.line with mode=delete does not preserve ownership of a file * ed8da2450b Merge pull request `#43863`_ from nicholasmhughes/fix-atomicfile-permission-copy + * ea852ec5d3 remove index use with stat module attributes * dbeeb0e917 fixes `#38452`_ atomicfile only copies mode and not user/group perms -- **PR** `#44260`_: (*seanjnkns*) Fixes `#39901`_ for RH/CentOS 7 - @ *2017-11-07T23:14:59Z* +* **ISSUE** `#39901`_: (`seanjnkns`_) network.managed ipaddrs ignored (refs: `#44260`_) + +* **PR** `#44260`_: (`seanjnkns`_) Fixes `#39901`_ for RH/CentOS 7 + @ *2017-11-07 23:14:59 UTC* - - **ISSUE** `#39901`_: (*seanjnkns*) network.managed ipaddrs ignored - | refs: `#44260`_ * a66cd67d15 Merge pull request `#44260`_ from seanjnkns/issue-39901 + * ed8cccf457 `#39901`_: Fix pylint * 43c81dfdee `#39901`_: Add unit tests @@ -588,74 +670,84 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 6818f3631d Fixes `#39901`_ for RH/CentOS 7 -- **PR** `#44383`_: (*gtmanfred*) switch salt-jenkins over to saltstack for kitchen-salt tests - @ *2017-11-03T19:56:48Z* +* **PR** `#44383`_: (`gtmanfred`_) switch salt-jenkins over to saltstack for kitchen-salt tests + @ *2017-11-03 19:56:48 UTC* * 5e289f42ba Merge pull request `#44383`_ from gtmanfred/2016kitchen + * b65f4ea4ea switch salt-jenkins over to saltstack -- **PR** `#44173`_: (*twangboy*) Use google style docstrings in win_system.py - @ *2017-10-31T17:56:34Z* +* **PR** `#44173`_: (`twangboy`_) Use google style docstrings in win_system.py + @ *2017-10-31 17:56:34 UTC* * cab54e34b5 Merge pull request `#44173`_ from twangboy/win_system_docs - * 8e111b413d Fix some of the wording and grammar errors + + * 8e111b413d Fix some of the wording and grammer errors * a12bc5ae41 Use google style docstrings -- **PR** `#44304`_: (*jfindlay*) states.cron identifier defaults to name - @ *2017-10-31T16:39:47Z* +* **PR** `#44304`_: (`jfindlay`_) states.cron identifier defaults to name + @ *2017-10-31 16:39:47 UTC* * 7aaea1d179 Merge pull request `#44304`_ from jfindlay/cron_id + * cc038c5bec states.cron identifier defaults to name -- **PR** `#44322`_: (*rossengeorgiev*) updated CLI docs for salt-ssh - @ *2017-10-30T21:39:23Z* +* **ISSUE** `#44313`_: (`rossengeorgiev`_) salt-ssh: --user option missing from the cli documentation (refs: `#44322`_) + +* **PR** `#44322`_: (`rossengeorgiev`_) updated CLI docs for salt-ssh + @ *2017-10-30 21:39:23 UTC* - - **ISSUE** `#44313`_: (*rossengeorgiev*) salt-ssh: --user option missing from the cli documentation - | refs: `#44322`_ * e4dbbde734 Merge pull request `#44322`_ from rossengeorgiev/saltssh-docs-update + * b18f2e5a6d fix program name and description for --static * 5b10918f02 updated CLI docs for salt-ssh -- **PR** `#44345`_: (*gtmanfred*) remove binding from erb template rendering - @ *2017-10-30T20:57:43Z* +* **PR** `#44345`_: (`gtmanfred`_) remove binding from erb template rendering + @ *2017-10-30 20:57:43 UTC* * 4e6f09e3eb Merge pull request `#44345`_ from gtmanfred/2016kitchen + * 79b8b2d0bf remove binding -- **PR** `#44342`_: (*gtmanfred*) render template files platforms.yml and driver.yml - @ *2017-10-30T20:04:00Z* +* **PR** `#44342`_: (`gtmanfred`_) render template files platforms.yml and driver.yml + @ *2017-10-30 20:04:00 UTC* * 209847c8c2 Merge pull request `#44342`_ from gtmanfred/2016kitchen + * c50508f0b7 render template files platforms.yml and driver.yml -- **PR** `#44339`_: (*corywright*) Remove leading dash from options in archive.tar docs (2016.11) - @ *2017-10-30T19:00:34Z* +* **ISSUE** `#44336`_: (`corywright`_) Docs for archive.tar should not use leading dash for tar options (refs: `#44339`_) + +* **PR** `#44339`_: (`corywright`_) Remove leading dash from options in archive.tar docs (2016.11) + @ *2017-10-30 19:00:34 UTC* - - **ISSUE** `#44336`_: (*corywright*) Docs for archive.tar should not use leading dash for tar options - | refs: `#44339`_ * 1be65224cb Merge pull request `#44339`_ from corywright/issue-44336-fix-archive-tar-docs-2016-11 + * 9c1c35a59f Remove leading dash (-) from options in archive.tar documentation -- **PR** `#44295`_: (*gurubert*) fixes issue `#44272`_ - @ *2017-10-27T14:28:57Z* +* **ISSUE** `#44272`_: (`gurubert`_) [patch] win_service.stop() fails (refs: `#44295`_) + +* **PR** `#44295`_: (`gurubert`_) fixes issue `#44272`_ + @ *2017-10-27 14:28:57 UTC* - - **ISSUE** `#44272`_: (*gurubert*) [patch] win_service.stop() fails - | refs: `#44295`_ * bebc33daf5 Merge pull request `#44295`_ from HeinleinSupport/issue44272 + * f972715a45 fixes issue `#44272`_ -- **PR** `#44286`_: (*gtmanfred*) use our git repo for kitchen-salt - @ *2017-10-25T19:27:32Z* +* **PR** `#44286`_: (`gtmanfred`_) use our git repo for kitchen-salt + @ *2017-10-25 19:27:32 UTC* * e7ca9f8407 Merge pull request `#44286`_ from gtmanfred/2016.11 + * 193e715e37 use our git repo for kitchen-salt -- **PR** `#44259`_: (*gtmanfred*) begin switching in kitchen-salt for running the test suite - @ *2017-10-25T13:30:35Z* +* **PR** `#44259`_: (`gtmanfred`_) begin switching in kitchen-salt for running the test suite + @ *2017-10-25 13:30:35 UTC* * 8a1ea165af Merge pull request `#44259`_ from gtmanfred/2016.11 + * 56a3ad8f68 fix pylint comments * 4add666db1 add comment to Gemfile and move copyartifacts @@ -680,144 +772,158 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 255118cfd7 run tests with kitchen -- **PR** `#44268`_: (*twangboy*) Fix typo - @ *2017-10-25T13:01:35Z* +* **PR** `#44268`_: (`twangboy`_) Fix typo + @ *2017-10-25 13:01:35 UTC* * 9d6bc8509b Merge pull request `#44268`_ from twangboy/win_fix_lgpo_typo + * a6a4c10a77 Fix typo -- **PR** `#44269`_: (*terminalmage*) Fix log message in salt.utils.gitfs - @ *2017-10-25T13:00:58Z* +* **PR** `#44269`_: (`terminalmage`_) Fix log message in salt.utils.gitfs + @ *2017-10-25 13:00:58 UTC* * 0beb65a283 Merge pull request `#44269`_ from terminalmage/fix-log-message + * bc9cd65496 Fix log message in salt.utils.gitfs -- **PR** `#44160`_: (*gtmanfred*) add changes to test return - @ *2017-10-23T14:35:21Z* +* **ISSUE** `#44155`_: (`rhoths`_) file.directory with clean not triggering listener in test mode (refs: `#44160`_) + +* **PR** `#44160`_: (`gtmanfred`_) add changes to test return + @ *2017-10-23 14:35:21 UTC* - - **ISSUE** `#44155`_: (*rhoths*) file.directory with clean not triggering listener in test mode - | refs: `#44160`_ * 304dd2529d Merge pull request `#44160`_ from gtmanfred/directory + * a7d3d668f4 missed removing changes in the next test * ac0b5ec440 fix test * d3d00c3e62 add changes to test return -- **PR** `#44205`_: (*rallytime*) Back-port `#44177`_ to 2016.11 - @ *2017-10-23T14:09:07Z* +* **PR** `#44205`_: (`rallytime`_) Back-port `#44177`_ to 2016.11 + @ *2017-10-23 14:09:07 UTC* + + * **PR** `#44177`_: (`senthilkumar-e`_) Fixing default redis.host in documentation (refs: `#44205`_) + + * e10395483d Merge pull request `#44205`_ from rallytime/bp-44177 - - **PR** `#44177`_: (*senthilkumar-e*) Fixing default redis.host in documentation - | refs: `#44205`_ - * e10395483d Merge pull request `#44205`_ from rallytime/`bp-44177`_ * b9940f8521 Fixing default redis.host in documentation -- **PR** `#44167`_: (*garethgreenaway*) Fixes to modules/debian_ip - @ *2017-10-20T14:25:39Z* +* **ISSUE** `#44140`_: (`vtolstov`_) incorrect network interfaces settings with network.managed under debian jessie (refs: `#44167`_) + +* **PR** `#44167`_: (`garethgreenaway`_) Fixes to modules/debian_ip + @ *2017-10-20 14:25:39 UTC* - - **ISSUE** `#44140`_: (*vtolstov*) incorrect network interfaces settings with network.managed under debian jessie - | refs: `#44167`_ * 09ddfd0c08 Merge pull request `#44167`_ from garethgreenaway/44140_debian_ip_fixes + * 5f7555846f When looping through the various pre, post, up and down commands put them into the interface dict using the right internet family variable. -- **PR** `#43830`_: (*rallytime*) Back-port `#43644`_ to 2016.11 - @ *2017-10-19T22:57:51Z* +* **PR** `#43830`_: (`rallytime`_) Back-port `#43644`_ to 2016.11 + @ *2017-10-19 22:57:51 UTC* + + * **PR** `#43644`_: (`defanator`_) Several fixes for RDS DB parameter group management (refs: `#43830`_) + + * 9f9e936b52 Merge pull request `#43830`_ from rallytime/bp-43644 - - **PR** `#43644`_: (*defanator*) Several fixes for RDS DB parameter group management - | refs: `#43830`_ - * 9f9e936b52 Merge pull request `#43830`_ from rallytime/`bp-43644`_ * 12845ae802 Several fixes for RDS DB parameter group management -- **PR** `#43994`_: (*oeuftete*) Fix manage.present to show lost minions - @ *2017-10-19T22:27:59Z* +* **ISSUE** `#43936`_: (`oeuftete`_) manage.present still reports `lost` minion (refs: `#43994`_) + +* **ISSUE** `#38367`_: (`tyeapple`_) logic error in connected_ids function of salt/utils/minions.py when using include_localhost=True (refs: `#43994`_) + +* **PR** `#43994`_: (`oeuftete`_) Fix manage.present to show lost minions + @ *2017-10-19 22:27:59 UTC* - - **ISSUE** `#43936`_: (*oeuftete*) manage.present still reports `lost` minion - | refs: `#43994`_ - - **ISSUE** `#38367`_: (*tyeapple*) logic error in connected_ids function of salt/utils/minions.py when using include_localhost=True - | refs: `#43994`_ * 07db6a3d8b Merge pull request `#43994`_ from oeuftete/fix-manage-runner-presence + * f3980d7d83 Fix manage.present to show lost minions -- **PR** `#44188`_: (*terminalmage*) yumpkg: Check pkgname instead of name to see if it is a kernel pkg - @ *2017-10-19T22:20:35Z* +* **ISSUE** `#44150`_: (`rossengeorgiev`_) version param in pkg.installed broken in 2016.11.8/2017.7.2 in EL6-7 (refs: `#44188`_) + +* **PR** `#44188`_: (`terminalmage`_) yumpkg: Check pkgname instead of name to see if it is a kernel pkg + @ *2017-10-19 22:20:35 UTC* - - **ISSUE** `#44150`_: (*rossengeorgiev*) version param in pkg.installed broken in 2016.11.8/2017.7.2 in EL6-7 - | refs: `#44188`_ * a07537e258 Merge pull request `#44188`_ from terminalmage/issue44150 + * 0692f442db yumpkg: Check pkgname instead of name to see if it is a kernel pkg -- **PR** `#44158`_: (*rallytime*) Back-port `#44089`_ to 2016.11 - @ *2017-10-19T20:38:15Z* +* **ISSUE** `#43427`_: (`tylerjones4508`_) Salt-Cloud There was a profile error: invalid literal for int() with base 10: (refs: `#44089`_) + +* **PR** `#44158`_: (`rallytime`_) Back-port `#44089`_ to 2016.11 + @ *2017-10-19 20:38:15 UTC* + + * **PR** `#44089`_: (`cetanu`_) Catch on empty Virtualbox network addr `#43427`_ (refs: `#44158`_) + + * 715edc0cea Merge pull request `#44158`_ from rallytime/bp-44089 - - **ISSUE** `#43427`_: (*tylerjones4508*) Salt-Cloud There was a profile error: invalid literal for int() with base 10: - | refs: `#44089`_ - - **PR** `#44089`_: (*cetanu*) Catch on empty Virtualbox network addr `#43427`_ - | refs: `#44158`_ - * 715edc0cea Merge pull request `#44158`_ from rallytime/`bp-44089`_ * 534faf0b7a Catch on empty Virtualbox network addr `#43427`_ -- **PR** `#44131`_: (*rallytime*) Back-port `#44029`_ to 2016.11 - @ *2017-10-17T15:05:39Z* +* **ISSUE** `#43307`_: (`marek-knappe`_) Filesystem creation is failing on newly created LV (refs: `#44029`_) - - **ISSUE** `#43307`_: (*marek-knappe*) Filesystem creation is failing on newly created LV - - **PR** `#44029`_: (*msummers42*) addresses issue `#43307`_, disk.format_ to disk.format - | refs: `#44131`_ - * 0cd493b691 Merge pull request `#44131`_ from rallytime/`bp-44029`_ - * bebf301976 fixed test addressing issue `#43307`_, disk.format_ to disk.format +* **PR** `#44131`_: (`rallytime`_) Back-port `#44029`_ to 2016.11 + @ *2017-10-17 15:05:39 UTC* - * b4ba7ae2fc addresses issue `#43307`_, disk.format_ to disk.format + * **PR** `#44029`_: (`msummers42`_) addresses issue `#43307`_, disk.format\_ to disk.format (refs: `#44131`_) -- **PR** `#44093`_: (*gtmanfred*) don't filter if return is not a dict - @ *2017-10-16T19:13:19Z* + * 0cd493b691 Merge pull request `#44131`_ from rallytime/bp-44029 + + * bebf301976 fixed test addressing issue `#43307`_, disk.format\_ to disk.format + + * b4ba7ae2fc addresses issue `#43307`_, disk.format\_ to disk.format + +* **ISSUE** `#44087`_: (`mfussenegger`_) Using state.highstate with `terse=true` prevents useful error output (refs: `#44093`_) + +* **PR** `#44093`_: (`gtmanfred`_) don't filter if return is not a dict + @ *2017-10-16 19:13:19 UTC* + + * 3a68e356f8 Merge pull request `#44093`_ from gtmanfred/fix-44087 - - **ISSUE** `#44087`_: (*mfussenegger*) Using state.highstate with `terse=true` prevents useful error output - | refs: `#44093`_ - * 3a68e356f8 Merge pull request `#44093`_ from gtmanfred/`fix-44087`_ * 5455c5053b fix pylint * f749cafa25 don't filter if return is not a dict -- **PR** `#44122`_: (*cachedout*) Add note about GPG signing to PR template - @ *2017-10-16T19:09:38Z* +* **PR** `#44122`_: (`cachedout`_) Add note about GPG signing to PR template + @ *2017-10-16 19:09:38 UTC* * c785d7a847 Merge pull request `#44122`_ from cachedout/gpg_pr_template + * e41e3d76be Typo fix * 37c7980880 Add note about GPG signing to PR template -- **PR** `#44124`_: (*rallytime*) [2016.11] Merge forward from 2016.11.8 to 2016.11 - @ *2017-10-16T19:07:14Z* +* **PR** `#44124`_: (`rallytime`_) [2016.11] Merge forward from 2016.11.8 to 2016.11 + @ *2017-10-16 19:07:14 UTC* - - **PR** `#44028`_: (*rallytime*) Back-port `#44011`_ to 2016.11.8 - - **PR** `#44011`_: (*Ch3LL*) Security Fixes for 2016.11.8 - | refs: `#44028`_ * bf90ea1f51 Merge pull request `#44124`_ from rallytime/merge-2016.11 + * 59861291c8 Merge branch '2016.11.8' into '2016.11' - * 57623e2abe Merge pull request `#44028`_ from rallytime/`bp-44011`_ + * 57623e2abe Merge pull request `#44028`_ from rallytime/bp-44011 * 89e084bda3 Do not allow IDs with null bytes in decoded payloads * 206ae23f15 Don't allow path separators in minion ID -- **PR** `#44097`_: (*gtmanfred*) OpenNebula does not require the template_id to be specified - @ *2017-10-16T18:36:17Z* +* **PR** `#44097`_: (`gtmanfred`_) OpenNebula does not require the template_id to be specified + @ *2017-10-16 18:36:17 UTC* * 13f3ffa83a Merge pull request `#44097`_ from gtmanfred/openneb + * c29655b2c2 Merge branch '2016.11' into openneb * bd2490b149 OpenNebula does not require the template_id to be specified -- **PR** `#44110`_: (*roaldnefs*) Format fix code example local returner doc - @ *2017-10-16T15:57:50Z* +* **PR** `#44110`_: (`roaldnefs`_) Format fix code example local returner doc + @ *2017-10-16 15:57:50 UTC* * ac3e4df964 Merge pull request `#44110`_ from roaldnefs/fix-doc-local-returner + * efd58f7594 Merge branch '2016.11' into fix-doc-local-returner -- **PR** `#44092`_: (*techhat*) Made sure that unicoded data is sent to sha256() - @ *2017-10-13T21:20:12Z* +* **PR** `#44092`_: (`techhat`_) Made sure that unicoded data is sent to sha256() + @ *2017-10-13 21:20:12 UTC* * c960ca32c2 Merge pull request `#44092`_ from techhat/awsunicode + * bbd9db4d00 One more encoding * 0e8b325667 Apparently __salt_system_encoding__ is a thing @@ -826,32 +932,33 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 1af21bbe5e Made sure that unicoded data is sent to sha256() -- **PR** `#44021`_: (*whiteinge*) Also catch cpstats AttributeError for bad CherryPy release ~5.6.0 - @ *2017-10-12T18:11:41Z* +* **ISSUE** `#43581`_: (`jcourington`_) cherrypy stats issue (refs: `#44021`_) + +* **PR** `#44021`_: (`whiteinge`_) Also catch cpstats AttributeError for bad CherryPy release ~5.6.0 + @ *2017-10-12 18:11:41 UTC* + + * **PR** `#42655`_: (`whiteinge`_) Reenable cpstats for rest_cherrypy (refs: `#44021`_) + + * **PR** `#33806`_: (`cachedout`_) Work around upstream cherrypy bug (refs: `#42655`_) - - **ISSUE** `#43581`_: (*jcourington*) cherrypy stats issue - | refs: `#44021`_ - - **PR** `#42655`_: (*whiteinge*) Re-enable cpstats for rest_cherrypy - | refs: `#44021`_ - - **PR** `#33806`_: (*cachedout*) Work around upstream cherrypy bug - | refs: `#42655`_ * d89c317d96 Merge pull request `#44021`_ from whiteinge/cpstats-attribute-error + * bf14e5f578 Also catch cpstats AttributeError for bad CherryPy release ~5.6.0 -- **PR** `#44025`_: (*dayid*) Typo correction of lover to lower - @ *2017-10-11T17:31:45Z* +* **PR** `#44025`_: (`dayid`_) Typo correction of lover to lower + @ *2017-10-11 17:31:45 UTC* * bbdabe242a Merge pull request `#44025`_ from dayid/lover_typo + * 385980c21a Merge branch '2016.11' of https://github.com/saltstack/salt into lover_typo * 266dc00a23 Typo correction of lover to lower -- **PR** `#44030`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - @ *2017-10-11T13:01:42Z* +* **PR** `#44030`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 + @ *2017-10-11 13:01:42 UTC* - - **PR** `#44010`_: (*Ch3LL*) Security Fixes for 2016.3.8 - - **PR** `#43977`_: (*Ch3LL*) Add Security Notes to 2016.3.8 Release Notes * d8f3891a5e Merge pull request `#44030`_ from rallytime/merge-2016.11 + * 53eaf0d75c Merge branch '2016.3' into '2016.11' * 64fd839377 Merge pull request `#44010`_ from Ch3LL/2016.3.7_follow_up @@ -868,119 +975,134 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 5fb3f5f6b1 Add Security Notes to 2016.3.8 Release Notes -- **PR** `#44011`_: (*Ch3LL*) Security Fixes for 2016.11.8 - | refs: `#44028`_ - @ *2017-10-10T20:04:36Z* +* **PR** `#44011`_: (`Ch3LL`_) Security Fixes for 2016.11.8 (refs: `#44028`_) + @ *2017-10-10 20:04:36 UTC* * 0dbf41e79e Merge pull request `#44011`_ from Ch3LL/2016.11.7_follow_up + * c0149101c0 Do not allow IDs with null bytes in decoded payloads * 19481423dd Don't allow path separators in minion ID -- **PR** `#44023`_: (*Ch3LL*) Add 2016.11.9 Release Note File - @ *2017-10-10T20:03:03Z* +* **PR** `#44023`_: (`Ch3LL`_) Add 2016.11.9 Release Note File + @ *2017-10-10 20:03:03 UTC* * d61300df20 Merge pull request `#44023`_ from Ch3LL/11.9rn + * 7f9015eb41 Add 2016.11.9 Release Note File -- **PR** `#44019`_: (*benediktwerner*) Added missing docs to the tutorial index and fixed spelling mistake - @ *2017-10-10T19:57:06Z* +* **PR** `#44019`_: (`benediktwerner`_) Added missing docs to the tutorial index and fixed spelling mistake + @ *2017-10-10 19:57:06 UTC* * 9ff53bf63a Merge pull request `#44019`_ from benediktwerner/2016.11 + * bc53598027 Fixed spelling mistake in salt_bootstrap tutorial * 6c30344824 Added missing tutorial docs to the tutorial index -- **PR** `#43955`_: (*meaksh*) Enable a new '--with-salt-version' parameter for the "setup.py" script - @ *2017-10-10T17:36:52Z* +* **PR** `#43955`_: (`meaksh`_) Enable a new '--with-salt-version' parameter for the "setup.py" script + @ *2017-10-10 17:36:52 UTC* - - **ISSUE** `#2291`_: (*scott-w*) Extend pkg to install from file - * 364523f5f8 Merge pull request `#43955`_ from meaksh/2016.11-`fix-2291`_ - * a81b78381b Merge branch '2016.11' into 2016.11-`fix-2291`_ + * 364523f5f8 Merge pull request `#43955`_ from meaksh/2016.11-fix-2291 + + * a81b78381b Merge branch '2016.11' into 2016.11-fix-2291 * 44bc91bb98 Enable '--with-salt-version' parameter for setup.py script -- **PR** `#43962`_: (*bobrik*) Report built-in modiles in kmod.available, fixes `#43945`_ - @ *2017-10-10T16:31:39Z* +* **ISSUE** `#43945`_: (`bobrik`_) kmod.present doesn't work with compiled-in modules (refs: `#43962`_) + +* **PR** `#43962`_: (`bobrik`_) Report built-in modiles in kmod.available, fixes `#43945`_ + @ *2017-10-10 16:31:39 UTC* - - **ISSUE** `#43945`_: (*bobrik*) kmod.present doesn't work with compiled-in modules * fec714b91d Merge pull request `#43962`_ from bobrik/kmod-built-in + * 95ab901553 Report built-in modiles in kmod.available, fixes `#43945`_ -- **PR** `#43960`_: (*cro*) Require that bindpw be non-empty when auth.ldap.anonymous is False - @ *2017-10-09T23:09:02Z* +* **PR** `#43960`_: (`cro`_) Require that bindpw be non-empty when auth.ldap.anonymous is False + @ *2017-10-09 23:09:02 UTC* * e434c39c4e Merge pull request `#43960`_ from cro/ldap_nopw_bind2 + * 962a20cf4b Require that bindpw be non-empty if auth.ldap.anonymous=False * 9df3d91d8f Release notes blurb for change to bindpw requirements -- **PR** `#43991`_: (*Ch3LL*) Add Security Notes to 2016.3.8 Release Notes - @ *2017-10-09T22:00:25Z* +* **PR** `#43991`_: (`Ch3LL`_) Add Security Notes to 2016.3.8 Release Notes + @ *2017-10-09 22:00:25 UTC* * e9dfda2177 Merge pull request `#43991`_ from Ch3LL/3.8_sec_2 + * 1977df8462 Add Security Notes to 2016.3.8 Release Notes -- **PR** `#43968`_: (*rossengeorgiev*) fix zenoss state module not respecting test=true - @ *2017-10-09T21:27:31Z* +* **ISSUE** `#42947`_: (`rossengeorgiev`_) Zenoss state changes production state even when test=true (refs: `#43968`_) + +* **PR** `#43968`_: (`rossengeorgiev`_) fix zenoss state module not respecting test=true + @ *2017-10-09 21:27:31 UTC* - - **ISSUE** `#42947`_: (*rossengeorgiev*) Zenoss state changes production state even when test=true - | refs: `#43968`_ * 2346d2691e Merge pull request `#43968`_ from rossengeorgiev/fix-zenoss-prod_state + * e6d31c1ea6 fix zenoss state module not respecting test=true -- **PR** `#43776`_: (*Ch3LL*) [2016.11] Bump latest and previous versions - @ *2017-10-09T17:22:15Z* +* **PR** `#43776`_: (`Ch3LL`_) [2016.11] Bump latest and previous versions + @ *2017-10-09 17:22:15 UTC* * 8d56a5ac45 Merge pull request `#43776`_ from Ch3LL/2016.11.8_docs + * f72bc00000 [2016.11] Bump latest and previous versions -- **PR** `#43976`_: (*Ch3LL*) Add Security Notes to 2016.11.8 Release Notes - @ *2017-10-09T17:20:54Z* +* **PR** `#43976`_: (`Ch3LL`_) Add Security Notes to 2016.11.8 Release Notes + @ *2017-10-09 17:20:54 UTC* * 21bf71c3f5 Merge pull request `#43976`_ from Ch3LL/11.8_sec + * f0c3184288 Add Security Notes to 2016.11.8 Release Notes -- **PR** `#43973`_: (*terminalmage*) Fix grains.has_value when value is False - @ *2017-10-09T14:59:20Z* +* **PR** `#43973`_: (`terminalmage`_) Fix grains.has_value when value is False + @ *2017-10-09 14:59:20 UTC* * 1d5397ab5b Merge pull request `#43973`_ from terminalmage/fix-grains.has_value + * bf45ae6e6a Fix grains.has_value when value is False -- **PR** `#43888`_: (*rallytime*) Back-port `#43841`_ to 2016.11 - @ *2017-10-05T20:09:58Z* +* **PR** `#43888`_: (`rallytime`_) Back-port `#43841`_ to 2016.11 + @ *2017-10-05 20:09:58 UTC* + + * **PR** `#43841`_: (`austinpapp`_) add -n with netstat so we don't resolve IPs (refs: `#43888`_) + + * 9ac3f2ea7b Merge pull request `#43888`_ from rallytime/bp-43841 - - **PR** `#43841`_: (*austinpapp*) add -n with netstat so we don't resolve IPs - | refs: `#43888`_ - * 9ac3f2ea7b Merge pull request `#43888`_ from rallytime/`bp-43841`_ * 87d676f08a add -n with netstat so we don't resolve -- **PR** `#43916`_: (*dereckson*) Fix typo in salt-cloud scaleway documentation - @ *2017-10-05T18:58:00Z* +* **PR** `#43916`_: (`dereckson`_) Fix typo in salt-cloud scaleway documentation + @ *2017-10-05 18:58:00 UTC* * f880ac4c08 Merge pull request `#43916`_ from dereckson/fix-typo-cloud-scaleway + * 15b8b8a9f4 Fix typo in salt-cloud scaleway documentation -- **PR** `#43884`_: (*UtahDave*) Update SaltConf banner per Rhett's request - @ *2017-10-04T13:08:30Z* +* **PR** `#43884`_: (`UtahDave`_) Update SaltConf banner per Rhett's request + @ *2017-10-04 13:08:30 UTC* * 2ab7549d48 Merge pull request `#43884`_ from UtahDave/2016.11local + * e3b2857285 Merge branch '2016.11' into 2016.11local -- **PR** `#43869`_: (*terminalmage*) Only join cmd if it's not a string - @ *2017-10-03T16:25:07Z* +* **PR** `#43869`_: (`terminalmage`_) Only join cmd if it's not a string + @ *2017-10-03 16:25:07 UTC* * 4b882d4272 Merge pull request `#43869`_ from terminalmage/issue43522 + * fe28b0d4fb Only join cmd if it's not a string * 8c671fd0c1 Update SaltConf banner per Rhett's request -- **PR** `#43707`_: (*terminalmage*) Add missing support for use/use_in requisites to state.sls_id - @ *2017-10-01T14:07:53Z* +* **ISSUE** `#43373`_: (`rgcosma`_) use keyword breaks sls_id (refs: `#43707`_) + +* **PR** `#43707`_: (`terminalmage`_) Add missing support for use/use_in requisites to state.sls_id + @ *2017-10-01 14:07:53 UTC* - - **ISSUE** `#43373`_: (*rgcosma*) use keyword breaks sls_id - | refs: `#43707`_ * a2161efda3 Merge pull request `#43707`_ from terminalmage/issue43373 + * 3ebde1895f Merge branch '2016.11' into issue43373 * e580ed4caa Merge branch '2016.11' into issue43373 @@ -989,232 +1111,257 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * f73764481b Add missing support for use/use_in requisites to state.sls_id -- **PR** `#43807`_: (*terminalmage*) cmdmod: Don't list-ify string commands on Windows - @ *2017-09-29T02:48:36Z* +* **PR** `#43807`_: (`terminalmage`_) cmdmod: Don't list-ify string commands on Windows + @ *2017-09-29 02:48:36 UTC* * 85b3aa332a Merge pull request `#43807`_ from terminalmage/issue43522 + * d8708bf698 cmdmod: Don't list-ify string commands on Windows -- **PR** `#43768`_: (*vutny*) Fix Pylint deprecated option warnings - @ *2017-09-28T12:27:36Z* +* **PR** `#43768`_: (`vutny`_) Fix Pylint deprecated option warnings + @ *2017-09-28 12:27:36 UTC* * ea8d273c2b Merge pull request `#43768`_ from vutny/fix-pylint-deprecation-warnings + * f8b3fa9da1 Merge branch '2016.11' into fix-pylint-deprecation-warnings -- **PR** `#43772`_: (*gtmanfred*) don't print Minion not responding with quiet - @ *2017-09-27T15:39:18Z* +* **ISSUE** `#40311`_: (`cralston0`_) --hide-timeout used with --output json --static produces unparseable JSON (refs: `#43772`_) + +* **PR** `#43772`_: (`gtmanfred`_) dont print Minion not responding with quiet + @ *2017-09-27 15:39:18 UTC* - - **ISSUE** `#40311`_: (*cralston0*) --hide-timeout used with --output json --static produces unparseable JSON - | refs: `#43772`_ * 1a8cc60bb4 Merge pull request `#43772`_ from gtmanfred/2016.11 - * 0194c60960 don't print Minion not responding with quiet -- **PR** `#43747`_: (*rallytime*) Add GPG Verification section to Contributing Docs - @ *2017-09-26T21:25:37Z* + * 0194c60960 dont print Minion not responding with quiet + +* **PR** `#43747`_: (`rallytime`_) Add GPG Verification section to Contributing Docs + @ *2017-09-26 21:25:37 UTC* * 9dee896fb9 Merge pull request `#43747`_ from rallytime/gpg-verification + * 7a70de19f4 Merge branch '2016.11' into gpg-verification -- **PR** `#43733`_: (*terminalmage*) Allow docker_events engine to work with newer docker-py - @ *2017-09-26T16:47:40Z* +* **ISSUE** `#43729`_: (`The-Loeki`_) Docker events engine broken on newer docker.py (refs: `#43733`_) + +* **PR** `#43733`_: (`terminalmage`_) Allow docker_events engine to work with newer docker-py + @ *2017-09-26 16:47:40 UTC* - - **ISSUE** `#43729`_: (*The-Loeki*) Docker events engine broken on newer docker.py - | refs: `#43733`_ * 1cc3ad1c8d Merge pull request `#43733`_ from terminalmage/issue43729 + * 6e5c99bda0 Allow docker_events engine to work with newer docker-py -- **PR** `#43458`_: (*terminalmage*) Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner - @ *2017-09-26T14:39:01Z* +* **ISSUE** `#42082`_: (`stamak`_) [salt.utils.gitfs ][CRITICAL] Invalid gitfs configuration parameter 'saltenv' in remote git+ssh://git@ourgitserver/ourgitrepo.git. (refs: `#43458`_) + +* **PR** `#43458`_: (`terminalmage`_) Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner + @ *2017-09-26 14:39:01 UTC* - - **ISSUE** `#42082`_: (*stamak*) [salt.utils.gitfs ][CRITICAL] Invalid gitfs configuration parameter 'saltenv' in remote git+ssh://git@ourgitserver/ourgitrepo.git. - | refs: `#43458`_ * 5d38be4ff7 Merge pull request `#43458`_ from terminalmage/issue42082 + * 5f90812b12 Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner * 23bb4a5dde Add GPG Verification section to Contributing Docs -- **PR** `#43727`_: (*rallytime*) Revise "Contributing" docs: merge-forwards/release branches explained! - @ *2017-09-26T12:43:16Z* +* **ISSUE** `#43650`_: (`rallytime`_) Review contributing documentation and the merge-forward process (refs: `#43727`_) + +* **ISSUE** `#42706`_: (`blarghmatey`_) Parallel Cache Failure (refs: `#43018`_) + +* **PR** `#43727`_: (`rallytime`_) Revise "Contributing" docs: merge-forwards/release branches explained! + @ *2017-09-26 12:43:16 UTC* + + * **PR** `#43018`_: (`jubrad`_) Update state.py (refs: `#43727`_) + + * 023a563657 Merge pull request `#43727`_ from rallytime/fix-43650 - - **ISSUE** `#43650`_: (*rallytime*) Review contributing documentation and the merge-forward process - | refs: `#43727`_ - - **ISSUE** `#42706`_: (*blarghmatey*) Parallel Cache Failure - | refs: `#43018`_ - - **PR** `#43018`_: (*jubrad*) Update state.py - | refs: `#43727`_ - * 023a563657 Merge pull request `#43727`_ from rallytime/`fix-43650`_ * babad12d83 Revise "Contributing" docs: merge-forwards/release branches explained! -- **PR** `#43648`_: (*rallytime*) Handle VPC/Subnet ID not found errors in boto_vpc module - @ *2017-09-22T17:40:43Z* +* **PR** `#43648`_: (`rallytime`_) Handle VPC/Subnet ID not found errors in boto_vpc module + @ *2017-09-22 17:40:43 UTC* * f46c858f25 Merge pull request `#43648`_ from rallytime/handle-boto-vpc-errors + * 54842b5012 Handle VPC/Subnet ID not found errors in boto_vpc module * 651ed16ad3 Fix Pylint deprecated option warnings -- **PR** `#43575`_: (*akissa*) Fix CSR not recreated if key changes - @ *2017-09-21T17:52:01Z* +* **PR** `#43575`_: (`akissa`_) Fix CSR not recreated if key changes + @ *2017-09-21 17:52:01 UTC* * 9dba34aa06 Merge pull request `#43575`_ from akissa/fix-csr-not-recreated-if-key-changes + * b1b4dafd39 Fix CSR not recreated if key changes -- **PR** `#43672`_: (*rallytime*) Back-port `#43415`_ to 2016.11 - @ *2017-09-21T16:38:56Z* +* **ISSUE** `#42165`_: (`arount`_) top_file_merging_strategy: merge does not works (refs: `#43415`_) + +* **PR** `#43672`_: (`rallytime`_) Back-port `#43415`_ to 2016.11 + @ *2017-09-21 16:38:56 UTC* + + * **PR** `#43415`_: (`mattLLVW`_) Fix env_order in state.py (refs: `#43672`_) + + * 1d4fa48209 Merge pull request `#43672`_ from rallytime/bp-43415 - - **ISSUE** `#42165`_: (*arount*) top_file_merging_strategy: merge does not works - | refs: `#43415`_ - - **PR** `#43415`_: (*mattLLVW*) Fix env_order in state.py - | refs: `#43672`_ - * 1d4fa48209 Merge pull request `#43672`_ from rallytime/`bp-43415`_ * 3fb42bc238 Fix env_order in state.py -- **PR** `#43673`_: (*rallytime*) Back-port `#43652`_ to 2016.11 - @ *2017-09-21T16:37:36Z* +* **PR** `#43673`_: (`rallytime`_) Back-port `#43652`_ to 2016.11 + @ *2017-09-21 16:37:36 UTC* + + * **PR** `#43652`_: (`VertigoRay`_) Salt Repo has Deb 9 and 8 (refs: `#43673`_) + + * ff832ee607 Merge pull request `#43673`_ from rallytime/bp-43652 - - **PR** `#43652`_: (*VertigoRay*) Salt Repo has Deb 9 and 8 - | refs: `#43673`_ - * ff832ee607 Merge pull request `#43673`_ from rallytime/`bp-43652`_ * d91c47c6f0 Salt Repo has Deb 9 and 8 -- **PR** `#43677`_: (*terminalmage*) Fix RST headers for runners (2016.11 branch) - @ *2017-09-21T16:35:57Z* +* **PR** `#43677`_: (`terminalmage`_) Fix RST headers for runners (2016.11 branch) + @ *2017-09-21 16:35:57 UTC* * 365cb9fba8 Merge pull request `#43677`_ from terminalmage/runners-docs-2016.11 + * 2fd88e94fa Fix RST headers for runners (2016.11 branch) -- **PR** `#43534`_: (*twangboy*) Fixes removal of double-quotes by shlex_split in winrepo for 2016.11 - @ *2017-09-21T14:39:42Z* +* **PR** `#43534`_: (`twangboy`_) Fixes removal of double-quotes by shlex_split in winrepo for 2016.11 + @ *2017-09-21 14:39:42 UTC* * be38239e5d Merge pull request `#43534`_ from twangboy/win_fix_pkg.install_2016.11 + * 1546c1ca04 Add posix=False to call to salt.utils.shlex_split -- **PR** `#43661`_: (*moio*) multiprocessing minion option: documentation fixes (2016.11) - @ *2017-09-21T13:02:27Z* + * **PR** `#43663`_: (`moio`_) multiprocessing minion option: documentation fixes (develop) (refs: `#43661`_) + +* **PR** `#43661`_: (`moio`_) multiprocessing minion option: documentation fixes (2016.11) + @ *2017-09-21 13:02:27 UTC* - - **PR** `#43663`_: (*moio*) multiprocessing minion option: documentation fixes (develop) - | refs: `#43661`_ * 0d3fd3d374 Merge pull request `#43661`_ from moio/2016.11-multiprocessing-doc-fix + * 625eabb83f multiprocessing minion option: documentation fixes -- **PR** `#43646`_: (*brejoc*) Added tests for pid-file deletion in DaemonMixIn - @ *2017-09-20T19:21:54Z* +* **PR** `#43646`_: (`brejoc`_) Added tests for pid-file deletion in DaemonMixIn + @ *2017-09-20 19:21:54 UTC* * 6b4516c025 Merge pull request `#43646`_ from brejoc/2016.11.4-pidfile-tests + * 96f39a420b Fixed linting * 08fba98735 Fixed several issues with the test * 3a089e450f Added tests for pid-file deletion in DaemonMixIn -- **PR** `#43591`_: (*rallytime*) [2016.11] Merge forward from 2016.11.8 to 2016.11 - @ *2017-09-19T16:18:34Z* +* **PR** `#43591`_: (`rallytime`_) [2016.11] Merge forward from 2016.11.8 to 2016.11 + @ *2017-09-19 16:18:34 UTC* - - **PR** `#43550`_: (*twangboy*) Fix preinstall script on OSX for 2016.11.8 * cfb1625741 Merge pull request `#43591`_ from rallytime/merge-2016.11 + * 57b9d642c2 Merge branch '2016.11.8' into '2016.11' * e83421694f Merge pull request `#43550`_ from twangboy/osx_fix_preinstall_2016.11.8 * 1b0a4d39d2 Fix logic in `/etc/paths.d/salt` detection -- **PR** `#43572`_: (*vutny*) cloud.action: list_nodes_min returns all EC2 instances - @ *2017-09-18T20:36:44Z* +* **PR** `#43572`_: (`vutny`_) cloud.action: list_nodes_min returns all EC2 instances + @ *2017-09-18 20:36:44 UTC* * 8671b91f62 Merge pull request `#43572`_ from vutny/fix-salt-cloud-list-min-instance-set + * 21966e7ce8 cloud.action: list_nodes_min returns all instances -- **PR** `#43461`_: (*twangboy*) Add `/norestart` switch to vcredist install - @ *2017-09-12T20:33:46Z* +* **PR** `#43461`_: (`twangboy`_) Add `/norestart` switch to vcredist install + @ *2017-09-12 20:33:46 UTC* * f2b86fa2db Merge pull request `#43461`_ from twangboy/win_norestart + * 2d269d1a76 Change all comment markers to '#' * d80aea16cb Handle ErrorCodes returned by VCRedist installer * fb31e9a530 Add /norestart switch to vcredist install -- **PR** `#43366`_: (*brejoc*) Catching error when PIDfile cannot be deleted - @ *2017-09-12T15:31:16Z* +* **ISSUE** `#43267`_: (`brejoc`_) OSError - Can't delete PIDfile when not root (refs: `#43366`_) + +* **PR** `#43366`_: (`brejoc`_) Catching error when PIDfile cannot be deleted + @ *2017-09-12 15:31:16 UTC* - - **ISSUE** `#43267`_: (*brejoc*) OSError - Can't delete PIDfile when not root - | refs: `#43366`_ * 90e8ca9c36 Merge pull request `#43366`_ from brejoc/2016.11.pidfile-fix + * 6e3eb76c79 Removed unused format argument * daf4948b3d Catching error when PIDfile cannot be deleted -- **PR** `#43442`_: (*garethgreenaway*) [2016.11] Fixes to scheduler __pub values in kwargs - @ *2017-09-12T15:16:20Z* +* **ISSUE** `#43386`_: (`rajvidhimar`_) Scheduler's job_kwargs not working as expected. (refs: `#43442`_) + +* **PR** `#43442`_: (`garethgreenaway`_) [2016.11] Fixes to scheduler __pub values in kwargs + @ *2017-09-12 15:16:20 UTC* - - **ISSUE** `#43386`_: (*rajvidhimar*) Scheduler's job_kwargs not working as expected. - | refs: `#43442`_ * a6c458607a Merge pull request `#43442`_ from garethgreenaway/43386_2016_11_schedule_kwargs_pub + * e637ecbe86 Merge branch '2016.11' into 43386_2016_11_schedule_kwargs_pub * 6114df8dc3 Adding a small check to ensure we do not continue to populate kwargs with __pub_ items from the kwargs item. -- **PR** `#43456`_: (*rallytime*) Add Neon to version list - @ *2017-09-12T15:00:27Z* +* **ISSUE** `#43223`_: (`rallytime`_) Properly deprecate describe_route_table function in boto_vpc module (refs: `#43445`_) + +* **PR** `#43456`_: (`rallytime`_) Add Neon to version list + @ *2017-09-12 15:00:27 UTC* + + * **PR** `#43445`_: (`rallytime`_) Bump deprecation warning for boto_vpc.describe_route_table (refs: `#43456`_) - - **ISSUE** `#43223`_: (*rallytime*) Properly deprecate describe_route_table function in boto_vpc module - | refs: `#43445`_ - - **PR** `#43445`_: (*rallytime*) Bump deprecation warning for boto_vpc.describe_route_table - | refs: `#43456`_ `#43456`_ * 3c429299f9 Merge pull request `#43456`_ from rallytime/43445_follow_up + * 35c1d8898d Add Neon to version list -- **PR** `#43441`_: (*meaksh*) Use $HOME to get the user home directory instead using '~' char - @ *2017-09-11T21:25:20Z* +* **PR** `#43441`_: (`meaksh`_) Use $HOME to get the user home directory instead using '~' char + @ *2017-09-11 21:25:20 UTC* * 6db7a721c0 Merge pull request `#43441`_ from meaksh/2016.11-salt-bash-completion-fix + * be4f26ab21 Use $HOME to get the user home directory instead using '~' char -- **PR** `#43445`_: (*rallytime*) Bump deprecation warning for boto_vpc.describe_route_table - | refs: `#43456`_ `#43456`_ - @ *2017-09-11T21:23:28Z* +* **ISSUE** `#43223`_: (`rallytime`_) Properly deprecate describe_route_table function in boto_vpc module (refs: `#43445`_) + +* **PR** `#43445`_: (`rallytime`_) Bump deprecation warning for boto_vpc.describe_route_table (refs: `#43456`_) + @ *2017-09-11 21:23:28 UTC* - - **ISSUE** `#43223`_: (*rallytime*) Properly deprecate describe_route_table function in boto_vpc module - | refs: `#43445`_ * 05fff44a50 Merge pull request `#43445`_ from rallytime/bump-deprecation-warning + * c91cd1c6d9 Bump deprecation warning for boto_vpc.describe_route_table -- **PR** `#43432`_: (*rallytime*) Back-port `#43419`_ to 2016.11 - @ *2017-09-11T17:36:37Z* +* **PR** `#43432`_: (`rallytime`_) Back-port `#43419`_ to 2016.11 + @ *2017-09-11 17:36:37 UTC* + + * **PR** `#43419`_: (`gtmanfred`_) make cache dirs when spm starts (refs: `#43432`_) + + * c57dc5f0e3 Merge pull request `#43432`_ from rallytime/bp-43419 - - **PR** `#43419`_: (*gtmanfred*) make cache dirs when spm starts - | refs: `#43432`_ - * c57dc5f0e3 Merge pull request `#43432`_ from rallytime/`bp-43419`_ * c471a29527 make cache dirs when spm starts -- **PR** `#43390`_: (*aogier*) better qemu_static parameter mangle in deboostrap management, tests - @ *2017-09-11T13:18:30Z* +* **ISSUE** `#43387`_: (`aogier`_) genesis.bootstrap debootstrap fails if no qemu specified (refs: `#43390`_) + +* **PR** `#43390`_: (`aogier`_) better qemu_static parameter mangle in deboostrap management, tests + @ *2017-09-11 13:18:30 UTC* - - **ISSUE** `#43387`_: (*aogier*) genesis.bootstrap debootstrap fails if no qemu specified - | refs: `#43390`_ * 57cccd75d0 Merge pull request `#43390`_ from aogier/43387-genesis-qemu + * 496f14a7e7 forgot to mock the proper one * 51c7a1ba00 only check if static_qemu is_executable() * 70642e495d better qemu_static parameter mangle in deboostrap management, tests -- **PR** `#43356`_: (*gtmanfred*) never-download got readded - @ *2017-09-07T17:46:05Z* +* **ISSUE** `#43338`_: (`LEMNX`_) virtualenv never-download (refs: `#43356`_) + +* **PR** `#43356`_: (`gtmanfred`_) never-download got readded + @ *2017-09-07 17:46:05 UTC* - - **ISSUE** `#43338`_: (*LEMNX*) virtualenv never-download - | refs: `#43356`_ * 6106aec696 Merge pull request `#43356`_ from gtmanfred/2016.11 + * 3f19b247f3 Add handler.messages back in for test comparison * 9911b04208 fix test * 3c6ae99a77 never-download got readded -- **PR** `#43325`_: (*doesitblend*) mine_interval option is minutes not seconds - @ *2017-09-07T16:58:11Z* +* **PR** `#43325`_: (`doesitblend`_) mine_interval option is minutes not seconds + @ *2017-09-07 16:58:11 UTC* * e638fac54e Merge pull request `#43325`_ from doesitblend/salt-mine-doc-fix + * 1e94d0ac3a Lint: Remove trailing whitespace * 51af8f8757 Fix mine_interval phrasing in default file @@ -1223,19 +1370,20 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 9ff03c2d43 Update Salt Mine documentation to show that the mine_interval option is configured in minutes. -- **PR** `#43105`_: (*aogier*) groupadd module: string does not have attribute 'extend', plus homogeneous `cmd` parm building - @ *2017-09-06T15:49:44Z* +* **ISSUE** `#43086`_: (`aogier`_) pylint: Instance of 'tuple' has no 'extend' member (no-member) (refs: `#43105`_) + +* **PR** `#43105`_: (`aogier`_) groupadd module: string does not have attribute 'extend', plus homogeneous `cmd` parm building + @ *2017-09-06 15:49:44 UTC* - - **ISSUE** `#43086`_: (*aogier*) pylint: Instance of 'tuple' has no 'extend' member (no-member) - | refs: `#43105`_ * fc587f784a Merge pull request `#43105`_ from aogier/43086-no-member + * 5111cf8bad Merge branch '2016.11' into 43086-no-member -- **PR** `#43333`_: (*damon-atkins*) Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug - @ *2017-09-06T14:21:35Z* +* **PR** `#43333`_: (`damon-atkins`_) Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug + @ *2017-09-06 14:21:35 UTC* - - **ISSUE** `#2`_: (*thatch45*) salt job queries * d97a680372 Merge pull request `#43333`_ from damon-atkins/2016.11 + * 92de2bb498 Update doco * fc9c61d12e Update win_pkg.py @@ -1244,100 +1392,108 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * cb3af2bbbd Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed on the cli (`#2`_) -- **PR** `#43361`_: (*rallytime*) Back-port `#43329`_ to 2016.11 - @ *2017-09-05T23:23:01Z* +* **ISSUE** `#43295`_: (`V3XATI0N`_) salt.cache.redis_cache does not actually work. (refs: `#43329`_) + +* **PR** `#43361`_: (`rallytime`_) Back-port `#43329`_ to 2016.11 + @ *2017-09-05 23:23:01 UTC* + + * **PR** `#43329`_: (`johnj`_) Fix `#43295`_, better handling of consul initialization (refs: `#43361`_) + + * 0c986f5eba Merge pull request `#43361`_ from rallytime/bp-43329 - - **ISSUE** `#43295`_: (*V3XATI0N*) salt.cache.redis_cache does not actually work. - | refs: `#43329`_ - - **PR** `#43329`_: (*johnj*) Fix `#43295`_, better handling of consul initialization - | refs: `#43361`_ - * 0c986f5eba Merge pull request `#43361`_ from rallytime/`bp-43329`_ * b09e5b4379 Fix `#43295`_, better handling of consul initialization issues -- **PR** `#42903`_: (*junovitch*) Fix 'preserve_minion_cache: True' functionality (fixes `#35840`_) - @ *2017-09-05T22:57:14Z* +* **ISSUE** `#35840`_: (`junovitch`_) preserve_minion_cache is broken in 2016.3+ (refs: `#42903`_) + +* **PR** `#42903`_: (`junovitch`_) Fix 'preserve_minion_cache: True' functionality (fixes `#35840`_) + @ *2017-09-05 22:57:14 UTC* - - **ISSUE** `#35840`_: (*junovitch*) preserve_minion_cache is broken in 2016.3+ - | refs: `#42903`_ `#42903`_ * 22287439e6 Merge pull request `#42903`_ from junovitch/issue-35840-fix-preserve-minion-cache-2016.11 + * c9d4fdbd45 Merge branch '2016.11' into issue-35840-fix-preserve-minion-cache-2016.11 * 93a68e32a5 Merge branch '2016.11' into issue-35840-fix-preserve-minion-cache-2016.11 * 079f097985 Fix 'preserve_minion_cache: True' functionality (fixes `#35840`_) -- **PR** `#43360`_: (*terminalmage*) Fix failing tests in Fedora - @ *2017-09-05T22:23:13Z* +* **PR** `#43360`_: (`terminalmage`_) Fix failing tests in Fedora + @ *2017-09-05 22:23:13 UTC* * 4860e10757 Merge pull request `#43360`_ from terminalmage/sj-496 + * 433bca14b1 Fix KeyError in yumpkg configparser code on Python 3 * f6c16935d8 Move --showduplicates before repository-packages -- **PR** `#43244`_: (*rallytime*) Update release branch section with a few more details - @ *2017-09-05T20:27:59Z* +* **PR** `#43244`_: (`rallytime`_) Update release branch section with a few more details + @ *2017-09-05 20:27:59 UTC* * 4ba2dbe41e Merge pull request `#43244`_ from rallytime/release-branch-clarifications + * 0d5a46dbaa Update release branch section with a few more details -- **PR** `#43359`_: (*gtmanfred*) ipaddr_start ipaddr_end for el7 - @ *2017-09-05T19:44:24Z* +* **ISSUE** `#43348`_: (`9maf4you`_) network.managed doesn't work on CentOS 7 (refs: `#43359`_) + +* **PR** `#43359`_: (`gtmanfred`_) ipaddr_start ipaddr_end for el7 + @ *2017-09-05 19:44:24 UTC* - - **ISSUE** `#43348`_: (*9maf4you*) network.managed doesn't work on CentOS 7 - | refs: `#43359`_ * 1a012eb3d7 Merge pull request `#43359`_ from gtmanfred/ipaddr + * 23d9abb560 ipaddr_start ipaddr_end for el7 -- **PR** `#43247`_: (*rallytime*) Back-port various mention bot settings to 2016.11 - @ *2017-09-05T18:17:54Z* +* **PR** `#43247`_: (`rallytime`_) Back-port various mention bot settings to 2016.11 + @ *2017-09-05 18:17:54 UTC* + + * **PR** `#43206`_: (`rallytime`_) Always notify tkwilliams when changes occur on boto files (refs: `#43247`_) + + * **PR** `#43183`_: (`basepi`_) Add basepi to userBlacklist for mention bot (refs: `#43247`_) + + * **PR** `#42923`_: (`rallytime`_) Always notify ryan-lane when changes occur on boto files (refs: `#43247`_) - - **PR** `#43206`_: (*rallytime*) Always notify tkwilliams when changes occur on boto files - | refs: `#43247`_ - - **PR** `#43183`_: (*basepi*) Add basepi to userBlacklist for mention bot - | refs: `#43247`_ - - **PR** `#42923`_: (*rallytime*) Always notify ryan-lane when changes occur on boto files - | refs: `#43247`_ * 8f88111be8 Merge pull request `#43247`_ from rallytime/mentionbot-backports + * 2b85757d73 Always notify tkwilliams when changes occur on boto files * 40b5a29f90 Add basepi to userBlacklist for mention bot * bad8f56969 Always notify ryan-lane when changes occur on boto files -- **PR** `#43277`_: (*rallytime*) Add CODEOWNERS file - @ *2017-09-01T16:56:53Z* +* **PR** `#43277`_: (`rallytime`_) Add CODEOWNERS file + @ *2017-09-01 16:56:53 UTC* * 02867fdcd2 Merge pull request `#43277`_ from rallytime/owners-file + * 2b4da0f0e7 Add CODEOWNERS file -- **PR** `#43312`_: (*lordcirth*) cron docs: Remind user to use quotes for special strings - @ *2017-09-01T16:24:15Z* +* **PR** `#43312`_: (`lordcirth`_) cron docs: Remind user to use quotes for special strings + @ *2017-09-01 16:24:15 UTC* * 1c1c484479 Merge pull request `#43312`_ from lordcirth/fix-cron-docs + * ec94a13750 cron docs: Remind user to use quotes for special strings -- **PR** `#43290`_: (*lordcirth*) Clarify file.py docs - @ *2017-09-01T14:30:04Z* +* **PR** `#43290`_: (`lordcirth`_) Clarify file.py docs + @ *2017-09-01 14:30:04 UTC* * 0d1ed4b750 Merge pull request `#43290`_ from lordcirth/fix-file-path-docs + * 14a4591854 file.py docs: correct group and mode * d4214ca283 file.py docs: specify absolute paths -- **PR** `#43274`_: (*terminalmage*) Use six.integer_types instead of int - @ *2017-08-30T21:32:42Z* +* **PR** `#43274`_: (`terminalmage`_) Use six.integer_types instead of int + @ *2017-08-30 21:32:42 UTC* * 26ff89539e Merge pull request `#43274`_ from terminalmage/fix-int-types + * d533877743 Use six.integer_types instead of int * 42a118ff56 fixed cmd composition and unified his making across module * 881f1822f2 Format fix code example local returner doc - -.. _`#2`: https://github.com/saltstack/salt/issues/2 -.. _`#2291`: https://github.com/saltstack/salt/issues/2291 .. _`#27160`: https://github.com/saltstack/salt/issues/27160 +.. _`#2`: https://github.com/saltstack/salt/issues/2 .. _`#31405`: https://github.com/saltstack/salt/issues/31405 .. _`#33806`: https://github.com/saltstack/salt/pull/33806 .. _`#35523`: https://github.com/saltstack/salt/issues/35523 @@ -1346,7 +1502,6 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#38367`: https://github.com/saltstack/salt/issues/38367 .. _`#38452`: https://github.com/saltstack/salt/issues/38452 .. _`#39901`: https://github.com/saltstack/salt/issues/39901 -.. _`#4`: https://github.com/saltstack/salt/issues/4 .. _`#40311`: https://github.com/saltstack/salt/issues/40311 .. _`#41044`: https://github.com/saltstack/salt/issues/41044 .. _`#41279`: https://github.com/saltstack/salt/pull/41279 @@ -1567,32 +1722,89 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#45563`: https://github.com/saltstack/salt/pull/45563 .. _`#45564`: https://github.com/saltstack/salt/pull/45564 .. _`#45638`: https://github.com/saltstack/salt/pull/45638 -.. _`#598`: https://github.com/saltstack/salt/issues/598 -.. _`bp-41305`: https://github.com/saltstack/salt/pull/41305 -.. _`bp-43329`: https://github.com/saltstack/salt/pull/43329 -.. _`bp-43415`: https://github.com/saltstack/salt/pull/43415 -.. _`bp-43419`: https://github.com/saltstack/salt/pull/43419 -.. _`bp-43644`: https://github.com/saltstack/salt/pull/43644 -.. _`bp-43652`: https://github.com/saltstack/salt/pull/43652 -.. _`bp-43841`: https://github.com/saltstack/salt/pull/43841 -.. _`bp-44011`: https://github.com/saltstack/salt/pull/44011 -.. _`bp-44029`: https://github.com/saltstack/salt/pull/44029 -.. _`bp-44089`: https://github.com/saltstack/salt/pull/44089 -.. _`bp-44177`: https://github.com/saltstack/salt/pull/44177 -.. _`bp-44424`: https://github.com/saltstack/salt/pull/44424 -.. _`bp-44861`: https://github.com/saltstack/salt/pull/44861 -.. _`bp-44944`: https://github.com/saltstack/salt/pull/44944 -.. _`bp-44958`: https://github.com/saltstack/salt/pull/44958 -.. _`bp-45034`: https://github.com/saltstack/salt/pull/45034 -.. _`bp-45040`: https://github.com/saltstack/salt/pull/45040 -.. _`bp-45070`: https://github.com/saltstack/salt/pull/45070 -.. _`bp-45092`: https://github.com/saltstack/salt/pull/45092 -.. _`bp-45209`: https://github.com/saltstack/salt/pull/45209 -.. _`bp-45390`: https://github.com/saltstack/salt/pull/45390 -.. _`bp-45399`: https://github.com/saltstack/salt/pull/45399 -.. _`fix-2291`: https://github.com/saltstack/salt/issues/2291 -.. _`fix-41044`: https://github.com/saltstack/salt/issues/41044 -.. _`fix-43650`: https://github.com/saltstack/salt/issues/43650 -.. _`fix-44087`: https://github.com/saltstack/salt/issues/44087 -.. _`fix-44556`: https://github.com/saltstack/salt/issues/44556 -.. _`fix-44601`: https://github.com/saltstack/salt/issues/44601 +.. _`#4`: https://github.com/saltstack/salt/issues/4 +.. _`9maf4you`: https://github.com/9maf4you +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`LEMNX`: https://github.com/LEMNX +.. _`SEJeff`: https://github.com/SEJeff +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`TheBigBear`: https://github.com/TheBigBear +.. _`UtahDave`: https://github.com/UtahDave +.. _`V3XATI0N`: https://github.com/V3XATI0N +.. _`VertigoRay`: https://github.com/VertigoRay +.. _`akissa`: https://github.com/akissa +.. _`andrew-regan`: https://github.com/andrew-regan +.. _`aogier`: https://github.com/aogier +.. _`arount`: https://github.com/arount +.. _`arthtux`: https://github.com/arthtux +.. _`austinpapp`: https://github.com/austinpapp +.. _`basepi`: https://github.com/basepi +.. _`benediktwerner`: https://github.com/benediktwerner +.. _`blarghmatey`: https://github.com/blarghmatey +.. _`bobrik`: https://github.com/bobrik +.. _`brejoc`: https://github.com/brejoc +.. _`cachedout`: https://github.com/cachedout +.. _`casselt`: https://github.com/casselt +.. _`cetanu`: https://github.com/cetanu +.. _`corywright`: https://github.com/corywright +.. _`cralston0`: https://github.com/cralston0 +.. _`creideiki`: https://github.com/creideiki +.. _`cro`: https://github.com/cro +.. _`cruscio`: https://github.com/cruscio +.. _`damon-atkins`: https://github.com/damon-atkins +.. _`dayid`: https://github.com/dayid +.. _`defanator`: https://github.com/defanator +.. _`dereckson`: https://github.com/dereckson +.. _`dijit`: https://github.com/dijit +.. _`dmaziuk`: https://github.com/dmaziuk +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`doesitblend`: https://github.com/doesitblend +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`gurubert`: https://github.com/gurubert +.. _`gvengel`: https://github.com/gvengel +.. _`icycle77`: https://github.com/icycle77 +.. _`jak3kaj`: https://github.com/jak3kaj +.. _`jcourington`: https://github.com/jcourington +.. _`jfindlay`: https://github.com/jfindlay +.. _`johnj`: https://github.com/johnj +.. _`jubrad`: https://github.com/jubrad +.. _`junovitch`: https://github.com/junovitch +.. _`llua`: https://github.com/llua +.. _`lomeroe`: https://github.com/lomeroe +.. _`lordcirth`: https://github.com/lordcirth +.. _`lorengordon`: https://github.com/lorengordon +.. _`marek-knappe`: https://github.com/marek-knappe +.. _`martinadolfi`: https://github.com/martinadolfi +.. _`mattLLVW`: https://github.com/mattLLVW +.. _`meaksh`: https://github.com/meaksh +.. _`mfussenegger`: https://github.com/mfussenegger +.. _`moio`: https://github.com/moio +.. _`msciciel`: https://github.com/msciciel +.. _`msteed`: https://github.com/msteed +.. _`msummers42`: https://github.com/msummers42 +.. _`mtkennerly`: https://github.com/mtkennerly +.. _`nicholasmhughes`: https://github.com/nicholasmhughes +.. _`oeuftete`: https://github.com/oeuftete +.. _`pirxthepilot`: https://github.com/pirxthepilot +.. _`rajvidhimar`: https://github.com/rajvidhimar +.. _`rallytime`: https://github.com/rallytime +.. _`rasathus`: https://github.com/rasathus +.. _`rgcosma`: https://github.com/rgcosma +.. _`rhoths`: https://github.com/rhoths +.. _`roaldnefs`: https://github.com/roaldnefs +.. _`rossengeorgiev`: https://github.com/rossengeorgiev +.. _`saltstack/salt-jenkins#598`: https://github.com/saltstack/salt-jenkins/issues/598 +.. _`seanjnkns`: https://github.com/seanjnkns +.. _`senthilkumar-e`: https://github.com/senthilkumar-e +.. _`stamak`: https://github.com/stamak +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`twangboy`: https://github.com/twangboy +.. _`tyeapple`: https://github.com/tyeapple +.. _`tylerjones4508`: https://github.com/tylerjones4508 +.. _`vernondcole`: https://github.com/vernondcole +.. _`vtolstov`: https://github.com/vtolstov +.. _`vutny`: https://github.com/vutny +.. _`whiteinge`: https://github.com/whiteinge +.. _`whytewolf`: https://github.com/whytewolf diff --git a/doc/topics/releases/2016.3.0.rst b/doc/topics/releases/2016.3.0.rst index b28fed2c66..4d75363142 100644 --- a/doc/topics/releases/2016.3.0.rst +++ b/doc/topics/releases/2016.3.0.rst @@ -12,8 +12,8 @@ Known Issues prevent a possible crash** An issue exists that prevents the Salt master from cleaning the default job - cache. This issue can cause an overconsumption of resources resulting in - a crash. 2016.3.0 Salt masters should apply the patch in :PR:`33555`. This + cache. This issue can cause an overconsumption of resources resulting in a + crash. 2016.3.0 Salt masters should apply the patch in :pull:`33555`. This issue will be addressed in 2016.3.1. - :issue:`33516`: When upgrading from 2015.8.10 to 2016.3.0 on centos7/redhat7 @@ -110,18 +110,11 @@ Platform Changes - Renamed modules related to macOS. The following module filenames were changed. The virtual name remained unchanged. -- **PR** `#30558`_: renamed osxdesktop.py to mac_desktop.py -- **PR** `#30557`_: renamed macports.py to mac_ports.py -- **PR** `#30556`_: renamed darwin_sysctl.py to mac_sysctl.py -- **PR** `#30555`_: renamed brew.py to mac_brew.py -- **PR** `#30552`_: renamed darwin_pkgutil.py to mac_pkgutil.py - -.. _`#30558`: https://github.com/saltstack/salt/pull/30558 -.. _`#30557`: https://github.com/saltstack/salt/pull/30557 -.. _`#30556`: https://github.com/saltstack/salt/pull/30556 -.. _`#30555`: https://github.com/saltstack/salt/pull/30555 -.. _`#30552`: https://github.com/saltstack/salt/pull/30552 - +- :pull:`#30558`: renamed osxdesktop.py to mac_desktop.py +- :pull:`#30557`: renamed macports.py to mac_ports.py +- :pull:`#30556`: renamed darwin_sysctl.py to mac_sysctl.py +- :pull:`#30555`: renamed brew.py to mac_brew.py +- :pull:`#30552`: renamed darwin_pkgutil.py to mac_pkgutil.py Package Support =============== diff --git a/doc/topics/releases/2016.3.1.rst b/doc/topics/releases/2016.3.1.rst index 509c9ad854..a544598715 100644 --- a/doc/topics/releases/2016.3.1.rst +++ b/doc/topics/releases/2016.3.1.rst @@ -4,121 +4,807 @@ Salt 2016.3.1 Release Notes Version 2016.3.1 is a bugfix release for :ref:`2016.3.0 `. -**Final Release of Debian 7 Packages** -Regular security support for Debian 7 ended on April 25th 2016. As a result, -2016.3.1 and 2015.8.10 will be the last Salt releases for which Debian -7 packages are created. +Statistics +========== -Changes for v2016.3.0..v2016.3.1 --------------------------------- +- Total Merges: **87** +- Total Issue References: **23** +- Total PR References: **58** -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +- Contributors: **25** (`abednarik`_, `amontalban`_, `anlutro`_, `babilen`_, `cachedout`_, `clburlison`_, `danslimmon`_, `eliasp`_, `glomium`_, `jacobhammons`_, `jfindlay`_, `kev009`_, `lomeroe`_, `michalsuba`_, `neil-williamson`_, `onorua`_, `opdude`_, `rallytime`_, `sjorge`_, `terminalmage`_, `thatch45`_, `ticosax`_, `tomlaredo`_, `twangboy`_, `zigarn`_) -*Generated at: 2016-06-08T22:43:50Z* -Total Merges: **87** +Final Release of Debian 7 Packages +================================== -Changes: +Regular security support for Debian 7 ended on April 25th, 2016. As a result, +2016.3.1 and 2015.8.10 will be the last Salt releases for which Debian 7 +packages are created. -- **PR** `#33866`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#33860`_: (*cachedout*) Allow socket closes when the socket is disconnected +Changelog for v2016.3.0..v2016.3.1 +================================== -* b183a36 Set master and cloud to log level warning (`#33861`_) +*Generated at: 2018-05-27 04:31:54 UTC* -- **PR** `#33698`_: (*opdude*) Vsphere fixes + * **PR** `#33883`_: (`jfindlay`_) add 2016.3.1 release notes -- **PR** `#33771`_: (*twangboy*) Additional functionality to win_dism.py +* **PR** `#33866`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-08 19:49:56 UTC* -- **PR** `#33851`_: (*ticosax*) [dockerng] Add support for edge case when `Cmd` and `Entrypoint` can't be blanked + * be20ce1bbf Merge pull request `#33866`_ from rallytime/merge-2016.3 -- **PR** `#33821`_: (*cachedout*) Restore default log level to warning + * 595d4f2ac3 Fixup new groupadd tests for syntax change in 2016.3 -- **PR** `#33767`_: (*amontalban*) Fix `#33604`_ implementation when 'geom disk list' does not output rotat… + * c5b4ec0b0f Merge branch '2015.8' into '2016.3' -- **PR** `#33806`_: (*cachedout*) Work around upstream cherrypy bug + * ec09095c45 Merge pull request `#33827`_ from cachedout/issue_33810 -- **PR** `#33776`_: (*danslimmon*) Fixed ACL user comparison. Resolves `#33754`_. + * 9d36f1e474 Fix broken locate.locate function -- **PR** `#33763`_: (*abednarik*) Insert --no-refresh before install in Zypper. + * f7b3d0eda0 Merge pull request `#33839`_ from cachedout/fix_pkgresource_test_stacktrace -- **PR** `#33764`_: (*terminalmage*) Merge instead of update pillar overrides + * 435547a747 Fix another unit test stacktrace in pkg_resource -- **PR** `#33772`_: (*danslimmon*) Fixed spelling of "through" + * 5f081ef31c Merge pull request `#33840`_ from cachedout/remove_matcher_unit_tests -- **PR** `#33651`_: (*cachedout*) Restore grains context to renderers + * 6297448377 Remove matcher tests -- **PR** `#33757`_: (*cachedout*) Reminder not to return non-serializable data from states + * cda032dab2 Merge pull request `#33836`_ from cachedout/fix_winserver_manager_test -- **PR** `#33670`_: (*rallytime*) Handle non-ascii package names in state.format_log + * 453fb1ac91 Fixing more stupid unit tests -- **PR** `#33723`_: (*rallytime*) Back-port `#33641`_ to 2016.3 + * 1db559afe9 Merge pull request `#33805`_ from jfindlay/pkg_tests -- **PR** `#33748`_: (*ticosax*) HostConfig has been introduced by docker api version 1.15 + * 0c069ddc95 states.pkg int tests: skip if pkg mgr unavailable -- **PR** `#33745`_: (*eliasp*) Typo (`privilages` → `privileges`) + * 3984b65486 Merge pull request `#33808`_ from jfindlay/gem_tests -- **PR** `#33562`_: (*jfindlay*) states.apache_*: readd and deprecate enable and disable + * f7c19a1a58 modules.gem int tests: relax version checks -- **PR** `#33659`_: (*danslimmon*) Added test mode to states.dockerng. Resolves `#33632`_. + * 6af47d2ba7 modules.gem int tests: remove pkgs before testing install -- **PR** `#33696`_: (*clburlison*) Update mac native package for upcoming release + * c30d8a8c61 Merge pull request `#33770`_ from jfindlay/service_tests -- **PR** `#33710`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * f13f914755 states.service: add integration tests -* e87c310 backport `#33599`_ to 2016.3 (`#33682`_) + * 90aee79c39 states.service.mod_watch: update unit test -* 377556a Undo __repr__() and __str__() parts of d5a7dcc (`#33688`_) + * d210a92f09 states.service.mod_watch: update sfun and force docs -* 778b290 Remove explicit PW column default from mysql_user (`#33690`_) + * 7fdfbe9a28 Merge pull request `#33691`_ from jtand/gem_integration_test -- **PR** `#33680`_: (*rallytime*) Back-port `#32942`_ to 2016.3 + * ff2dae103d ubuntu doesn't install default gems when ruby is installed -- **PR** `#33677`_: (*twangboy*) Pass kwargs to cmd.run + * 504df9a65a Fixed lint error -- **PR** `#33648`_: (*terminalmage*) salt.modules.pkgng: Fix incorrect usage of _pkg() + * 0cb1bfa0d3 Removed extra : -- **PR** `#33646`_: (*jfindlay*) Fix more tmp paths on MacOS + * 86f59b3e80 Made more pythonic -- **PR** `#33656`_: (*cachedout*) Fix indentation error in minion.py + * 2f36f34981 Fixed salt.util import. Added status check to make sure external resource is available -- **PR** `#33637`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 400a71ec33 Removed redundancies -* b7230bd Back-port `#33613`_ to 2016.3 (`#33638`_) + * 91db411bea A couple lint fixes -- **PR** `#33606`_: (*danslimmon*) Fixed ini.options_absent. Resolves `#33590`_. + * c97f3319b9 Add check for gem binary -- **PR** `#33604`_: (*kev009*) Fix `#33578`_ disks grain + * 210aceb402 Refactored tests to not use return messages -* 259529e Use correct state name in libvirt formula doc (`#33631`_) + * 9d437bd45d Removed artifact from testing -- **PR** `#33603`_: (*sjorge*) allow esky packages to be build on base64 2015Q4 + * 134e1fa888 Fixed typos, and added destructiveTest decorator -- **PR** `#33576`_: (*tomlaredo*) Fix `#33565`_ (typo causes invalid syntax) + * 37bc3ad8fd Fixed typo, uninstalled to uninstall -- **PR** `#33549`_: (*thatch45*) Fix for `#33530`_ + * 5b23b91ac6 Integration test for gem module -- **PR** `#33538`_: (*anlutro*) Fix a KeyError if group is provided but not user in cmd states + * bb4194bb79 Merge pull request `#33777`_ from sodium-chloride/2015.8-2016-0604-1939 -- **PR** `#33550`_: (*jacobhammons*) Fixes display of thorium docs + * c1fd830a1a Fix minor docstring issue of arg being missing -- **PR** `#33509`_: (*twangboy*) Detect System Architecture for Mac Build + * c749aea409 Merge pull request `#33759`_ from cachedout/issue_31219 -- **PR** `#33522`_: (*jfindlay*) rework modules.mac_brew.latest_version to work around brew version inconsistency + * 15a39f8646 Catch no minions exception in batch mode -- **PR** `#33519`_: (*jacobhammons*) New doc site layout, 2016.3.0 release note known issue additions + * 47d668e071 Merge pull request `#33719`_ from cachedout/fixup_33653 -- **PR** `#33508`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 635efa248b Change to just surround the mkdir -- **PR** `#33505`_: (*twangboy*) Fix build script where pip didn't work + * 21b7123a60 Catch oserror for race condition -- **PR** `#33076`_: (*cachedout*) Avoid second grains load on windows multiprocessing + * 11e39e7203 Merge pull request `#33712`_ from meaksh/fix-for-groupadd-module-failures-in-SLE11-2015.8 + * ab738416ba pylint fix + + * bf27e5d36e test_members cleanup + + * ba815dbf76 improvements on groupadd unit tests + + * 3bbc5ae0d9 one line is better + + * a53dc192c9 fix groupadd module for sles11 systems + + * 2c450a7494 Merge pull request `#33718`_ from rallytime/bp-33700 + + * a6a446121a Fix speed issue + + * a41146730a Fix incorrect args passed to timezone.set_hwclock + + * b07701f0a0 Merge pull request `#33727`_ from terminalmage/issue33725 + + * d8ba7ed5a5 Fix git_pillar edge case for remote repos without a master branch + + * 015e50cec8 Merge pull request `#33728`_ from jfindlay/test_state_test + + * 87e018af2a states.test.configurable_test_state: add unit tests + + * c2d0679c4b states.test.configurable_test_state: refactor change_data + + * f06ff1af1f states.test.configurable_test_state test mode + + * 1cf8fe3f1d Merge pull request `#33729`_ from twangboy/fix_win_servermanager + + * 2de91d166f Fix docstring + + * 9870479d99 Add exclude option to state + + * 50bd76e206 Add exclude option + + * 6c150d840d Merge pull request `#33743`_ from vutny/drop-debian-community-repo-doc + + * 8621f5be54 Debian installation docs: drop section about community-maintained repository + + * 56c0a42e12 Create missing jid dir if it doesn't exist (`#33653`_) + + * 8a566ff4b9 Merge pull request `#33654`_ from twangboy/fix_win_servermanager + + * 6c7b21676a Fix lint and tests + + * 4775e6bdf0 Add additional params to state + + * b0af32346d Add additional params to install and remove + + * 996ff56dd4 Merge pull request `#33679`_ from terminalmage/issue33424 + + * 9da40c4437 Append empty dictionaries for saltenvs with no top file + + * 5eb1b3ca62 Only compile the template contents if they evaluate to True + +* **ISSUE** `#33843`_: (`richardscollin`_) 2016.3 Test Suite TCP Error (refs: `#33860`_) + +* **PR** `#33860`_: (`cachedout`_) Allow socket closes when the socket is disconnected + @ *2016-06-08 18:26:16 UTC* + + * 669aa92d59 Merge pull request `#33860`_ from cachedout/issue_33843 + + * 2c88e22c07 Use errno + + * e7de99dd0e Correct silly mistake + + * 7a46360a13 Allow socket closes when the socket is disconnected + +* **ISSUE** `#33818`_: (`saltuser`_) 2016.3.0 minion default log level INFO (refs: `#33821`_, `#33861`_) + + * **PR** `#33861`_: (`cachedout`_) Set master and cloud to log level warning + + * **PR** `#33821`_: (`cachedout`_) Restore deafault log level to warning (refs: `#33861`_) + +* **PR** `#33698`_: (`opdude`_) Vsphere fixes + @ *2016-06-08 14:12:17 UTC* + + * a3202f1ad6 Merge pull request `#33698`_ from Unity-Technologies/vsphere-fixes + + * 8ff5906fad Revert "Fix a bug when creating a new VM and changing the network info" + + * 636f4c00f0 Make sure we only use GetConnection if we are using a proxy salt minion + + * 64e9334d56 Fix a bug with self signed certificates and creating a new VM + + * 7834aeda7d Fix a bug when creating a new VM and changing the network info + +* **PR** `#33771`_: (`twangboy`_) Additional functionality to win_dism.py + @ *2016-06-08 13:58:20 UTC* + + * 01aaf3e2a9 Merge pull request `#33771`_ from twangboy/win_dism + + * 9be45fe37a Fix some more lint + + * 421dc97957 Fix/add unit tests for state + + * 8d66fac74c Add missing unit tests + + * 60f856f73d Fix unit tests for module + + * b574947afe Fix some lint errors + + * a32774c07d Add salt.utils.compare_lists + + * 7ff7050705 Fix incorrect parameters in the state + + * b8ee89f18e Fix typos + + * 10458d8a70 Remove multiple lookups, faster + + * d9b848c0d9 Change to dict instead of error + + * 6510e0a5b0 Add restart option + + * da8562dbc8 Add quiet and norestart options + + * 946371bf1f Handle errors, ensure add/remove + + * 7e6382a8b2 Use list instead of string for cmd + + * fbdd28f144 Add state functions + + * 90a4ee3d96 Merge branch '2016.3' of https://github.com/saltstack/salt into win_dism + + * 00c24abe1f Add get functions + + * c6621053fd Add additional functions + + * 36507845b6 Update documentation + +* **ISSUE** `#33649`_: (`tyhunt99`_) 2016.3.0 dockerng state fails comparing cmd configuration (refs: `#33851`_) + +* **PR** `#33851`_: (`ticosax`_) [dockerng] Add support for edge case when `Cmd` and `Entrypoint` can't be blanked + @ *2016-06-08 13:52:40 UTC* + + * f546e47552 Merge pull request `#33851`_ from ticosax/fix-entrypoint-support + + * 0d40e1c4f3 Add support for edge case when Cmd and Entrypoint can't be blanked + +* **ISSUE** `#33818`_: (`saltuser`_) 2016.3.0 minion default log level INFO (refs: `#33821`_, `#33861`_) + +* **PR** `#33821`_: (`cachedout`_) Restore deafault log level to warning (refs: `#33861`_) + @ *2016-06-07 16:51:46 UTC* + + * 3f6d06a060 Merge pull request `#33821`_ from cachedout/issue_33818 + + * 52f1f77a38 Restore deafault log level to warning + +* **ISSUE** `#33578`_: (`ohauer`_) 2016.3.0 FreeBSD Failed to load grains defined in grain file disks.disks in function , error: (refs: `#33604`_, `#33767`_) + +* **PR** `#33767`_: (`amontalban`_) Fix `#33604`_ implementation when 'geom disk list' does not output rotat… + @ *2016-06-07 14:41:56 UTC* + + * **PR** `#33604`_: (`kev009`_) Fix `#33578`_ disks grain (refs: `#33767`_) + + * 3e48b701e3 Merge pull request `#33767`_ from amontalban/2016.3 + + * b8c0dd5b4c Fix `#33604`_ implementation when 'geom disk list' does not output rotationrate. `#33578`_ + +* **PR** `#33806`_: (`cachedout`_) Work around upstream cherrypy bug + @ *2016-06-07 14:39:57 UTC* + + * a84588c788 Merge pull request `#33806`_ from cachedout/cherrypy_1444 + + * 1b537d41b6 Work around upstream cherrypy bug + +* **ISSUE** `#33754`_: (`zerthimon`_) boto_s3_bucket.present is not idempotent (refs: `#33776`_) + +* **PR** `#33776`_: (`danslimmon`_) Fixed ACL user comparison. Resolves `#33754`_. + @ *2016-06-06 11:11:15 UTC* + + * 94f98b4ab8 Merge pull request `#33776`_ from danslimmon/s3-bucket-idempotency-33754 + + * 35b84f1877 Fixed bug where _prep_acl_for_compare() would edit but not return + + * f87bc347fd Fixed ACL user comparison. Resolves `#33754`_. + +* **ISSUE** `#33741`_: (`jopohl`_) pkg.install: ERROR: Zypper command failure: Unknown option '--no-refresh' (refs: `#33763`_) + +* **PR** `#33763`_: (`abednarik`_) Insert --no-refresh before install in Zypper. + @ *2016-06-06 10:53:27 UTC* + + * a92e155a04 Merge pull request `#33763`_ from abednarik/abednarik_zypper_no_refresh_fix + + * 7c909a1d7f Insert --no-refresh before install in Zypper. + +* **ISSUE** `#33647`_: (`closepin`_) Pillars passed from command-line override pillar subtrees instead of merging (refs: `#33764`_) + +* **PR** `#33764`_: (`terminalmage`_) Merge instead of update pillar overrides + @ *2016-06-06 10:52:22 UTC* + + * 306848a2d7 Merge pull request `#33764`_ from terminalmage/issue33647 + + * 914003c995 Merge instead of update pillar overrides + +* **PR** `#33772`_: (`danslimmon`_) Fixed spelling of "through" + @ *2016-06-06 10:50:54 UTC* + + * b37a862b70 Merge pull request `#33772`_ from danslimmon/trough-through + + * ea3498aedc Fixed spelling of "through" + +* **ISSUE** `#33614`_: (`knuta`_) grains.has_key() always returns false in 2016.3.0 (refs: `#33651`_) + +* **PR** `#33651`_: (`cachedout`_) Restore grains context to renderers + @ *2016-06-03 20:48:44 UTC* + + * a8d9221631 Merge pull request `#33651`_ from cachedout/issue_33614 + + * 5518e1dd14 Fix whitespace + + * 7b50e1766e Better fix + + * 4e18ff7000 Restore grains context to renderers + +* **PR** `#33757`_: (`cachedout`_) Reminder not to return non-serializable data from states + @ *2016-06-03 19:23:54 UTC* + + * daf462e430 Merge pull request `#33757`_ from cachedout/state_set_doc + + * 500d4ccec2 Reminder not to return non-serializable data from states + +* **ISSUE** `#33605`_: (`morganwillcock`_) win_pkg: UnicodeEncodeError where DisplayName includes "Español" (refs: `#33670`_) + +* **PR** `#33670`_: (`rallytime`_) Handle non-ascii package names in state.format_log + @ *2016-06-03 16:16:53 UTC* + + * a5684ed123 Merge pull request `#33670`_ from rallytime/fix-33605 + + * 59bd51f4c8 Update test to correct iteration + + * a580d1c6e0 Add unit test for format_log change + + * e68097445c Revert "Track down more unicode instances and add a test" + + * 9729aed262 Track down more unicode instances and add a test + + * ae332d1f88 Handle non-ascii package names in state.format_log + +* **ISSUE** `#33588`_: (`whytewolf`_) rabbitmq_user.present error (refs: `#33641`_) + +* **PR** `#33723`_: (`rallytime`_) Back-port `#33641`_ to 2016.3 + @ *2016-06-03 16:07:53 UTC* + + * **PR** `#33641`_: (`glomium`_) check rabbitmq version and use different api to validate a users pass… (refs: `#33723`_) + + * 56eab363ff Merge pull request `#33723`_ from rallytime/bp-33641 + + * 77a51a00a3 pylint W0141, W0702 + + * f8518939a7 check rabbitmq version and use different api to validate a users password + +* **ISSUE** `#32059`_: (`fuzzy-id`_) dockerng fails with: create_container() got an unexpected keyword argument 'binds' (refs: `#33748`_) + +* **PR** `#33748`_: (`ticosax`_) HostConfig has been introduced by docker api version 1.15 + @ *2016-06-03 15:28:40 UTC* + + * c2b970789c Merge pull request `#33748`_ from ticosax/adjust-api-version-host-config + + * 134e4a9abf HostConfig has been intoriduced by docker api version 1.15 + +* **PR** `#33745`_: (`eliasp`_) Typo (`privilages` → `privileges`) + @ *2016-06-03 15:14:37 UTC* + + * e08c685a6c Merge pull request `#33745`_ from eliasp/2016.3-typo-privilages-privileges + + * 646bc426c6 Typo (`privilages` → `privileges`) + +* **ISSUE** `#33537`_: (`anlutro`_) apache_module state functions changed names with no deprecation warning or backward compatibility (refs: `#33562`_) + +* **PR** `#33562`_: (`jfindlay`_) states.apache_*: readd and deprecate enable and disable + @ *2016-06-02 19:51:37 UTC* + + * **PR** `#29651`_: (`zigarn`_) Deb apache fixes (refs: `#33562`_) + + * 5f4c6902aa Merge pull request `#33562`_ from jfindlay/apache_funcs + + * 9b0eb858a6 add note and workaround to release notes + + * 17306bfc69 states.apache_*: readd and deprecate enable and disable + +* **ISSUE** `#33632`_: (`rbjorklin`_) dockerng.volume_present: Dryrun isn't dry (refs: `#33659`_) + +* **PR** `#33659`_: (`danslimmon`_) Added test mode to states.dockerng. Resolves `#33632`_. + @ *2016-06-02 17:45:49 UTC* + + * d3253effe9 Merge pull request `#33659`_ from danslimmon/dockerng-dryrun-33632 + + * ef885c1b7e Added test mode to dockerng.volume_present. Resolves `#33632`_. + +* **PR** `#33696`_: (`clburlison`_) Update mac native package for upcoming release + @ *2016-06-02 17:44:01 UTC* + + * 1d6582b659 Merge pull request `#33696`_ from clburlison/2016.3-pkg-fix + + * b483d1d8a6 Update mac native package for upcoming release + +* **PR** `#33710`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-02 16:19:00 UTC* + + * 78966f5f30 Merge pull request `#33710`_ from rallytime/merge-2016.3 + + * b7accb0b3b Merge branch '2015.8' into '2016.3' + + * c8dc70b96a Merge pull request `#33685`_ from jfindlay/get_url_test + + * 2b5035fdc0 modules.cp.get_url: add test for https:// + + * 5e022ff29c Merge pull request `#33581`_ from dincamihai/2015.8 + + * 788730ea72 DRY test + + * 1d3769ccfa Improve zypper_patcher_config looks + + * 42d8d4195c Assert only gpgautoimport: True works + + * ced75e8e62 Reverse if conditions and rename variable + + * 80bfbe5c52 Reduce dicts and lists to one line where possible + + * 1d5d6d7d60 Update test method names to pass pylint + + * c7ae5907ee Call zypper refresh after adding/modifying a repository + + * 069ee15b7c Merge pull request `#33681`_ from rallytime/bp-33599 + + * 45143a599b use requests streaming for uploads/downloads to file (return_bin unchanged) allows downloading files larger than amount of memory (non-stream reads into memory before writing to disk or uploading) + + * 4a9b23f03f first go at having requests use streaming for get/put requests + + * 13537c4891 Merge pull request `#33396`_ from babilen/issue-33393 + + * 57e0475cd4 Make pip InstallationError import more robust + + * 291a3e21fa Remove duplicated code. + + * 7bce4ece1a Merge pull request `#33652`_ from terminalmage/zh723 + + * 411841603a Lower the log level for failed auths + + * 504989388a Merge pull request `#33615`_ from danslimmon/mysql-traceback-33582 + + * 180099ae9f Wrote test for broken server connection + + * c6c3ff02e3 Added some error checking to resolve `#33582`_. + +* **ISSUE** `#32916`_: (`giannello`_) file.managed memory usage with s3 sources (refs: `#33599`_, `#33682`_) + + * **PR** `#33682`_: (`lomeroe`_) backport `#33599`_ to 2016.3 + + * **PR** `#33599`_: (`lomeroe`_) Fix s3 large file download (refs: `#33681`_, `#33682`_) + +* **ISSUE** `#33532`_: (`Routhinator`_) 2016.3 breaks existing formulas that work on 2015.8 (refs: `#33688`_) + + * **PR** `#33688`_: (`terminalmage`_) Undo __repr__() and __str__() parts of d5a7dcc + +* **ISSUE** `#29265`_: (`mbochenk`_) mysql_user.present does not work with MySQL 5.7 (refs: `#33690`_, `#32440`_, `#30603`_) + + * **PR** `#33690`_: (`neil-williamson`_) Remove explicit PW column default from mysql_user + + * **PR** `#32440`_: (`neil-williamson`_) Automatically detect correct MySQL password column for 5.7 and fix setting passwords (refs: `#33690`_) + + * **PR** `#30603`_: (`michalsuba`_) addressing `#29265`_ (refs: `#32440`_) + +* **PR** `#33680`_: (`rallytime`_) Back-port `#32942`_ to 2016.3 + @ *2016-06-01 22:14:20 UTC* + + * **PR** `#32942`_: (`onorua`_) Make tornado raise error configurable (refs: `#33680`_) + + * c725854596 Merge pull request `#33680`_ from rallytime/bp-32942 + + * 09751ecb04 Make tornado raise error configurable (`#32942`_) + +* **PR** `#33677`_: (`twangboy`_) Pass kwargs to cmd.run + @ *2016-06-01 20:20:08 UTC* + + * 9571dad678 Merge pull request `#33677`_ from twangboy/fix_runas + + * 4272afe0d5 Pass kwargs to cmd.run + +* **ISSUE** `#33529`_: (`djneades`_) pkg.latest completely broken on FreeBSD in salt-ssh 2016.3 (refs: `#33648`_) + +* **PR** `#33648`_: (`terminalmage`_) salt.modules.pkgng: Fix incorrect usage of _pkg() + @ *2016-06-01 16:37:46 UTC* + + * d566ec4b31 Merge pull request `#33648`_ from terminalmage/issue33529 + + * 4ad80d29b6 salt.modules.pkgng: Fix incorrect usage of _pkg() + +* **PR** `#33646`_: (`jfindlay`_) Fix more tmp paths on MacOS + @ *2016-06-01 16:36:33 UTC* + + * e92d6e214f Merge pull request `#33646`_ from jfindlay/mac_tests + + * c53a727c18 tests.runtests: use globally-determined tempdir + + * 8295b48459 test.integration: use hard /tmp on MacOS + +* **PR** `#33656`_: (`cachedout`_) Fix indentation error in minion.py + @ *2016-06-01 16:23:20 UTC* + + * **PR** `#33076`_: (`cachedout`_) Avoid second grains load on windows multiprocessing (refs: `#33656`_) + + * 9603cd3c0d Merge pull request `#33656`_ from cachedout/fix_33076 + + * 8259d4091f Fix indentation error in minion.py + +* **PR** `#33637`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-05-31 18:43:17 UTC* + + * b379dc57fd Merge pull request `#33637`_ from rallytime/merge-2016.3 + + * cd05d2bed1 Fix zypper test + + * 74a7b78e00 Merge branch '2015.8' into '2016.3' + + * b47182e47c Merge pull request `#33558`_ from twangboy/fix_win_servermanager + + * 62a6bde0ea Fix comment when already installed + + * 79bc7195dc Fix unit tests + + * 56a6f6bb83 Fix changes + + * 8ebe99ec5e Fix restart_needed + + * 6e478cbda0 Add restart needed + + * 72ebf26616 Add missing import + + * 193583be96 Use dictionary compare for changes in remove + + * 1ae7dd76c1 Use dictionary compare for changes + + * 58d89d66e3 Merge pull request `#33555`_ from cachedout/issue_33544 + + * fe7ee7a470 Fix crashing Maintenence process + + * d052908729 Merge pull request `#33501`_ from meaksh/zypper-download-check-signature-2015.8 + + * eaaef25c79 lint issue fixed + + * 6b6febb211 unit tests for rpm.checksum() and zypper.download() + + * e2d0c4abb1 Merge pull request `#33513`_ from rallytime/fix-33319 + + * 81c1471209 Add a section to the jinja docs about escaping jinja + + * fabc15e616 Merge pull request `#33520`_ from jacobhammons/release-notes.8 + + * 42e358af7d Updated version numbers in the docs for the 2016.3.0 release + + * **PR** `#33638`_: (`rallytime`_) Back-port `#33613`_ to 2016.3 + + * **PR** `#33613`_: (`abednarik`_) Updated apache_module for backward compatible. (refs: `#33638`_) + +* **ISSUE** `#33590`_: (`morganwillcock`_) ini_manage.options_absent: only works in test mode (TypeError: unhashable type: 'list') (refs: `#33606`_) + +* **PR** `#33606`_: (`danslimmon`_) Fixed ini.options_absent. Resolves `#33590`_. + @ *2016-05-31 15:51:35 UTC* + + * 23506f8279 Merge pull request `#33606`_ from danslimmon/ini-optionsabsent-33590 + + * fb13852102 Fixed ini.options_absent. Resolves `#33590`_. + +* **ISSUE** `#33578`_: (`ohauer`_) 2016.3.0 FreeBSD Failed to load grains defined in grain file disks.disks in function , error: (refs: `#33604`_, `#33767`_) + +* **PR** `#33604`_: (`kev009`_) Fix `#33578`_ disks grain (refs: `#33767`_) + @ *2016-05-31 15:17:37 UTC* + + * 44e8c9e720 Merge pull request `#33604`_ from kev009/fix-33578 + + * e452ec514e Ignore cdroms in disks grain + + * 8bf0290024 Make disks grain datatyper more resilient + + * **PR** `#33631`_: (`babilen`_) Fix 'virt' state names in cloud controller tutorial + +* **PR** `#33603`_: (`sjorge`_) allow esky packages to be build on base64 2015Q4 + @ *2016-05-29 00:36:02 UTC* + + * e9a0c9304a Merge pull request `#33603`_ from sjorge/2016.3-smartos-esky + + * 1064102394 add no-wheel, instructions were failing for someone testing due to wheel being used nog producing an egg + + * c85e03ecf7 allow for newer pyzmq in esky packages + + * 1620b8c0fa allow esky packages to be build on base64 2015Q4 + +* **ISSUE** `#33565`_: (`jamesp9`_) Typo in states/virtualenv_mod.py (refs: `#33576`_) + +* **PR** `#33576`_: (`tomlaredo`_) Fix `#33565`_ (typo causes invalid syntax) + @ *2016-05-27 16:46:35 UTC* + + * afd3c1b9bd Merge pull request `#33576`_ from rodacom/2016.3 + + * 9f7d81e0cc Fix `#33565`_ + +* **ISSUE** `#33530`_: (`kluoto`_) Centos7 pkg.upgrade failure on 2016.3 (refs: `#33549`_) + +* **PR** `#33549`_: (`thatch45`_) Fix for `#33530`_ + @ *2016-05-26 19:26:01 UTC* + + * 71145ddda7 Merge pull request `#33549`_ from thatch45/33530 + + * b906859fce Fix for `#33530`_ + +* **PR** `#33538`_: (`anlutro`_) Fix a KeyError if group is provided but not user in cmd states + @ *2016-05-26 17:58:05 UTC* + + * 4831c6a353 Merge pull request `#33538`_ from alprs/fix-cmd_user_runas_deprecation_bug + + * c738a0de76 fix a KeyError if group is provided but not user + +* **ISSUE** `#33543`_: (`arthurlogilab`_) Thorium documentation is incorrectly formated and appears partially on docs.saltstack.com (refs: `#33550`_) + +* **PR** `#33550`_: (`jacobhammons`_) Fixes display of thorium docs + @ *2016-05-26 17:57:05 UTC* + + * 5287a1b8c8 Merge pull request `#33550`_ from saltstack/jacobhammons-patch-1 + + * 65df3a6fa2 Refs `#33543`_ + +* **PR** `#33509`_: (`twangboy`_) Detect System Architecture for Mac Build + @ *2016-05-26 14:40:54 UTC* + + * 3a95f8a977 Merge pull request `#33509`_ from twangboy/fix_arch + + * 7844059dcf Handle system architecture + +* **PR** `#33522`_: (`jfindlay`_) rework modules.mac_brew.latest_version to work around brew version inconsistency + @ *2016-05-26 14:19:25 UTC* + + * 0bc881b4da Merge pull request `#33522`_ from jfindlay/mac_pkg + + * 2781377b17 modules.mac_brew: update unit tests + + * 0ed3598fc9 modules.mac_brew int tests: add latest_version test + + * 8789c2d06d modules.mac_brew int tests: add list_upgrades,info_installed + + * be381e0fc9 modules.mac_brew int tests: move decorators to class + + * fa3ec8a2bf modules.mac_brew.latest_version: refactor to use standard methods + + * 58492c29cf modules.mac_brew: add info_installed function + + * 9abf8f4832 modules.mac_brew.list_upgrades: use brew's json output + + * 77a4f5b01e modules.mac_brew: move retcode check to _call_brew + +* **PR** `#33519`_: (`jacobhammons`_) New doc site layout, 2016.3.0 release note known issue additions + @ *2016-05-26 13:53:21 UTC* + + * 518713f5e5 Merge pull request `#33519`_ from jacobhammons/2016.3.0rel + + * a424c38f5d New doc site layout, 2016.3.0 release note known issue additions + +* **PR** `#33508`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-05-25 20:34:49 UTC* + + * 9199101ef2 Merge pull request `#33508`_ from rallytime/merge-2016.3 + + * a5e0141eda Merge branch '2015.8' into '2106.3' + + * 5a6b037cbd Merge pull request `#33507`_ from rallytime/merge-2015.8 + + * 03b0c97520 Merge branch '2015.5' into '2015.8' + + * 6f7fda0354 Merge pull request `#33486`_ from jtand/2015.5 + + * d1e210fff8 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 + + * ee2ae0ea8a Added docstring examples to glance.image_schema and schema_get + + * 59e90064e6 modules.swift.head does not have a body. Should not be checked for a docstring right now. + + * f72ec1479b Merge pull request `#33482`_ from rallytime/pillar-opts-docs + + * 087564528d Add pillar_opts docs to master.rst + + * dc644b145d Merge pull request `#33488`_ from rallytime/fix-18752 + + * b0a9f4181f Add docs for the syndic_finger config + + * a4e84aa7d2 Merge pull request `#33454`_ from scubahub/2015.5 + + * df3c0b8e78 Correct (and make consistent) determination of the test flag. + + * 3a52ace673 manage account information for pam (`#33473`_) + + * ee76be3b0b Merge pull request `#33503`_ from rallytime/fix-15252 + + * cfc07f7641 Add docs about minion config file in standalone minion docs + + * e9b648e461 Merge pull request `#33474`_ from cachedout/issue_29451 + + * aa2bac3a0d Remove debugging + + * 68d8050cb8 Fix diskusage beacon + + * 3bfb6bf719 Merge pull request `#33465`_ from meaksh/check-if-job-returns-successfully-2015.8 + + * 9deb70fd8e jobs.exit_success() now works parsing the results of jobs.lookup_id() + + * 7ba40c4f31 jobs.exit_success allow to check if a job has executed and exit successfully + + * 70eb7b66f3 Merge pull request `#33487`_ from jtand/glance_doc_fixes + + * 0b1cae05d9 Added docstring examples to glance methods and nova.list + + * ebf1256545 Don't need to check swift.head due to it having no body + + * 56ea979916 Merge pull request `#33481`_ from rallytime/fix-33423 + + * 7fd3e8f361 Fix docs about etcd config options and add pillar_opts doc + + * 2394cdc4bf Merge pull request `#33490`_ from rallytime/fix-16319 + + * 0c5548f9d1 Document the postgres.psql_query function + + * ede232f0f1 Merge pull request `#33480`_ from jfindlay/service_doc + + * 29c00a1b1b states.service: clarify function description language + + * 6a9ae09e79 states.service.__virtual__: add load fail reason + + * 4f96cc1f54 Return full pending computer name (`#33483`_) + + * a89be5e9d4 Use six.string_types in jobs runner (`#33499`_) + + * 2e24a04565 Merge pull request `#33491`_ from BlaineAtAffirm/2015.8 + + * 7599b18995 fix jobs.list_jobs failing with search_target + + * 1861af427e Merge pull request `#33478`_ from rallytime/bp-32484 + + * 042f17efa4 Only unsub if we have a jid + + * b8154b678e Merge pull request `#33457`_ from rallytime/doc-formatting + + * 82f8f3efff Make doc formatting consistent and use correct versionadded + + * 1dfa95651c Don't allow a "repo" kwarg for pkgrepo.managed (`#33477`_) + + * b4071b07f1 Allow for config entry to be a list in a dict for beacons (`#33476`_) + + * 9f56ab4c45 Merge pull request `#33469`_ from meaksh/zypper-download-check-signature-2015.8 + + * a65071a6d1 simpler rpm.checksum function + + * 80fe303e38 Renamed check_sig to checksum and some refactoring + + * d56e3f4258 bugfix: showing errors when a package download fails using zypper pkg.download + + * 8a21b9149e check the signature of downloaded RPM files + + * 00f9090928 Add docs about PyYAML's 1024 character limitations for simple keys (`#33459`_) + + * 3b12f396b4 Prevent several minion processes on the same machine (`#33464`_) + + * c8b4f338d8 Make --gpg-auto-import-keys a global param when calling zypper (`#33432`_) + + * 0c4e38ced4 Fix the saltutil.wheel function and add integration tests (`#33414`_) + +* **PR** `#33505`_: (`twangboy`_) Fix build script where pip didn't work + @ *2016-05-25 18:15:27 UTC* + + * a43ffadcb7 Merge pull request `#33505`_ from twangboy/fix_build_script + + * 7d78e5d612 Fix build script where pip wouldn't work + +* **PR** `#33076`_: (`cachedout`_) Avoid second grains load on windows multiprocessing (refs: `#33656`_) + @ *2016-05-25 17:10:06 UTC* + + * 4cf40da7d7 Merge pull request `#33076`_ from cachedout/win_grains + + * dab9825c88 Fix indentation error + + * b14e2cce9e Avoid second grains load on windows multiprocessing + +.. _`#29265`: https://github.com/saltstack/salt/issues/29265 .. _`#29651`: https://github.com/saltstack/salt/pull/29651 .. _`#30603`: https://github.com/saltstack/salt/pull/30603 +.. _`#32059`: https://github.com/saltstack/salt/issues/32059 .. _`#32440`: https://github.com/saltstack/salt/pull/32440 -.. _`#32484`: https://github.com/saltstack/salt/pull/32484 +.. _`#32916`: https://github.com/saltstack/salt/issues/32916 .. _`#32942`: https://github.com/saltstack/salt/pull/32942 .. _`#33076`: https://github.com/saltstack/salt/pull/33076 .. _`#33396`: https://github.com/saltstack/salt/pull/33396 @@ -155,8 +841,12 @@ Changes: .. _`#33519`: https://github.com/saltstack/salt/pull/33519 .. _`#33520`: https://github.com/saltstack/salt/pull/33520 .. _`#33522`: https://github.com/saltstack/salt/pull/33522 +.. _`#33529`: https://github.com/saltstack/salt/issues/33529 .. _`#33530`: https://github.com/saltstack/salt/issues/33530 +.. _`#33532`: https://github.com/saltstack/salt/issues/33532 +.. _`#33537`: https://github.com/saltstack/salt/issues/33537 .. _`#33538`: https://github.com/saltstack/salt/pull/33538 +.. _`#33543`: https://github.com/saltstack/salt/issues/33543 .. _`#33549`: https://github.com/saltstack/salt/pull/33549 .. _`#33550`: https://github.com/saltstack/salt/pull/33550 .. _`#33555`: https://github.com/saltstack/salt/pull/33555 @@ -166,12 +856,16 @@ Changes: .. _`#33576`: https://github.com/saltstack/salt/pull/33576 .. _`#33578`: https://github.com/saltstack/salt/issues/33578 .. _`#33581`: https://github.com/saltstack/salt/pull/33581 +.. _`#33582`: https://github.com/saltstack/salt/issues/33582 +.. _`#33588`: https://github.com/saltstack/salt/issues/33588 .. _`#33590`: https://github.com/saltstack/salt/issues/33590 .. _`#33599`: https://github.com/saltstack/salt/pull/33599 .. _`#33603`: https://github.com/saltstack/salt/pull/33603 .. _`#33604`: https://github.com/saltstack/salt/pull/33604 +.. _`#33605`: https://github.com/saltstack/salt/issues/33605 .. _`#33606`: https://github.com/saltstack/salt/pull/33606 .. _`#33613`: https://github.com/saltstack/salt/pull/33613 +.. _`#33614`: https://github.com/saltstack/salt/issues/33614 .. _`#33615`: https://github.com/saltstack/salt/pull/33615 .. _`#33631`: https://github.com/saltstack/salt/pull/33631 .. _`#33632`: https://github.com/saltstack/salt/issues/33632 @@ -179,7 +873,9 @@ Changes: .. _`#33638`: https://github.com/saltstack/salt/pull/33638 .. _`#33641`: https://github.com/saltstack/salt/pull/33641 .. _`#33646`: https://github.com/saltstack/salt/pull/33646 +.. _`#33647`: https://github.com/saltstack/salt/issues/33647 .. _`#33648`: https://github.com/saltstack/salt/pull/33648 +.. _`#33649`: https://github.com/saltstack/salt/issues/33649 .. _`#33651`: https://github.com/saltstack/salt/pull/33651 .. _`#33652`: https://github.com/saltstack/salt/pull/33652 .. _`#33653`: https://github.com/saltstack/salt/pull/33653 @@ -198,7 +894,6 @@ Changes: .. _`#33691`: https://github.com/saltstack/salt/pull/33691 .. _`#33696`: https://github.com/saltstack/salt/pull/33696 .. _`#33698`: https://github.com/saltstack/salt/pull/33698 -.. _`#33700`: https://github.com/saltstack/salt/pull/33700 .. _`#33710`: https://github.com/saltstack/salt/pull/33710 .. _`#33712`: https://github.com/saltstack/salt/pull/33712 .. _`#33718`: https://github.com/saltstack/salt/pull/33718 @@ -207,6 +902,7 @@ Changes: .. _`#33727`: https://github.com/saltstack/salt/pull/33727 .. _`#33728`: https://github.com/saltstack/salt/pull/33728 .. _`#33729`: https://github.com/saltstack/salt/pull/33729 +.. _`#33741`: https://github.com/saltstack/salt/issues/33741 .. _`#33743`: https://github.com/saltstack/salt/pull/33743 .. _`#33745`: https://github.com/saltstack/salt/pull/33745 .. _`#33748`: https://github.com/saltstack/salt/pull/33748 @@ -224,12 +920,59 @@ Changes: .. _`#33805`: https://github.com/saltstack/salt/pull/33805 .. _`#33806`: https://github.com/saltstack/salt/pull/33806 .. _`#33808`: https://github.com/saltstack/salt/pull/33808 +.. _`#33818`: https://github.com/saltstack/salt/issues/33818 .. _`#33821`: https://github.com/saltstack/salt/pull/33821 .. _`#33827`: https://github.com/saltstack/salt/pull/33827 .. _`#33836`: https://github.com/saltstack/salt/pull/33836 .. _`#33839`: https://github.com/saltstack/salt/pull/33839 .. _`#33840`: https://github.com/saltstack/salt/pull/33840 +.. _`#33843`: https://github.com/saltstack/salt/issues/33843 .. _`#33851`: https://github.com/saltstack/salt/pull/33851 .. _`#33860`: https://github.com/saltstack/salt/pull/33860 .. _`#33861`: https://github.com/saltstack/salt/pull/33861 .. _`#33866`: https://github.com/saltstack/salt/pull/33866 +.. _`#33883`: https://github.com/saltstack/salt/pull/33883 +.. _`Routhinator`: https://github.com/Routhinator +.. _`abednarik`: https://github.com/abednarik +.. _`amontalban`: https://github.com/amontalban +.. _`anlutro`: https://github.com/anlutro +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`babilen`: https://github.com/babilen +.. _`cachedout`: https://github.com/cachedout +.. _`clburlison`: https://github.com/clburlison +.. _`closepin`: https://github.com/closepin +.. _`danslimmon`: https://github.com/danslimmon +.. _`djneades`: https://github.com/djneades +.. _`eliasp`: https://github.com/eliasp +.. _`fuzzy-id`: https://github.com/fuzzy-id +.. _`giannello`: https://github.com/giannello +.. _`glomium`: https://github.com/glomium +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jamesp9`: https://github.com/jamesp9 +.. _`jfindlay`: https://github.com/jfindlay +.. _`jopohl`: https://github.com/jopohl +.. _`kev009`: https://github.com/kev009 +.. _`kluoto`: https://github.com/kluoto +.. _`knuta`: https://github.com/knuta +.. _`lomeroe`: https://github.com/lomeroe +.. _`mbochenk`: https://github.com/mbochenk +.. _`michalsuba`: https://github.com/michalsuba +.. _`morganwillcock`: https://github.com/morganwillcock +.. _`neil-williamson`: https://github.com/neil-williamson +.. _`ohauer`: https://github.com/ohauer +.. _`onorua`: https://github.com/onorua +.. _`opdude`: https://github.com/opdude +.. _`rallytime`: https://github.com/rallytime +.. _`rbjorklin`: https://github.com/rbjorklin +.. _`richardscollin`: https://github.com/richardscollin +.. _`saltuser`: https://github.com/saltuser +.. _`sjorge`: https://github.com/sjorge +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`ticosax`: https://github.com/ticosax +.. _`tomlaredo`: https://github.com/tomlaredo +.. _`twangboy`: https://github.com/twangboy +.. _`tyhunt99`: https://github.com/tyhunt99 +.. _`whytewolf`: https://github.com/whytewolf +.. _`zerthimon`: https://github.com/zerthimon +.. _`zigarn`: https://github.com/zigarn diff --git a/doc/topics/releases/2016.3.2.rst b/doc/topics/releases/2016.3.2.rst index cf033ab7ba..74d0c00490 100644 --- a/doc/topics/releases/2016.3.2.rst +++ b/doc/topics/releases/2016.3.2.rst @@ -4,812 +4,1897 @@ Salt 2016.3.2 Release Notes Version 2016.3.2 is a bugfix release for :ref:`2016.3.0 `. + +Statistics +========== + +- Total Merges: **200** +- Total Issue References: **66** +- Total PR References: **177** + +- Contributors: **52** (`Ch3LL`_, `DarkKnightCZ`_, `DmitryKuzmenko`_, `Inveracity`_, `abalashov`_, `abednarik`_, `adelcast`_, `ajacoutot`_, `amendlik`_, `anlutro`_, `aphor`_, `artxki`_, `bbinet`_, `bensherman`_, `cachedout`_, `christoe`_, `clinta`_, `cro`_, `dmurphy18`_, `dongweiming`_, `eliasp`_, `eradman`_, `farcaller`_, `garethgreenaway`_, `glomium`_, `gtmanfred`_, `isbm`_, `jacobhammons`_, `jacobweinstock`_, `jfindlay`_, `jmacfar`_, `jnhmcknight`_, `justinta`_, `l2ol33rt`_, `lomeroe`_, `meaksh`_, `nulfox`_, `opdude`_, `peterdemin`_, `rallytime`_, `s0undt3ch`_, `secumod`_, `sjmh`_, `sjorge`_, `terminalmage`_, `thatch45`_, `themalkolm`_, `ticosax`_, `tmehlinger`_, `twangboy`_, `vutny`_, `whiteinge`_) + + Returner Changes ================ - - Any returner which implements a ``save_load`` function is now required to - accept a ``minions`` keyword argument. All returners which ship with Salt - have been modified to do so. +- Any returner which implements a ``save_load`` function is now required to + accept a ``minions`` keyword argument. All returners which ship with Salt + have been modified to do so. -Changes for v2016.3.1..2016.3.2 -------------------------------- +Changelog for v2016.3.1..v2016.3.2 +================================== -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +*Generated at: 2018-05-27 04:37:58 UTC* -*Generated at: 2016-07-27T15:47:45Z* +* **PR** `#34988`_: (`rallytime`_) Update release notes with new changes + @ *2016-07-27 15:54:16 UTC* -Statistics: + * 721e6dcce8 Merge pull request `#34988`_ from rallytime/release-notes-update -- Total Merges: **198** + * a2aae987a6 Update release notes with new changes -Changes: +* **PR** `#34946`_: (`anlutro`_) Fix virtualenv behavior when requirements files are in subdirectories + @ *2016-07-27 14:43:27 UTC* -- **PR** `#34946`_: (*anlutro*) Fix virtualenv behavior when requirements files are in subdirectories + * d63ac1671c Merge pull request `#34946`_ from alprs/fix-venv_reqs_subdir -- **PR** `#34957`_: (*sjmh*) Don't fall through to checking auth entries + * f773d63cbb normalize requirements path to be absolute -- **PR** `#34971`_: (*cachedout*) Increase timeout for grains test + * bdec73bb03 remove unnecessary os.path.basename logic -- **PR** `#34951`_: (*vutny*) Fix `#34873`_ +* **PR** `#34957`_: (`sjmh`_) Don't fall through to checking auth entries + @ *2016-07-26 22:16:17 UTC* -- **PR** `#34935`_: (*rallytime*) Avoid UnboundLocalError in beacons module + * f765faa3aa Merge pull request `#34957`_ from sjmh/2016.3 -- **PR** `#34956`_: (*cachedout*) Increase all run_script timeouts to 30s + * 0095dbe530 Don't fall through to checking auth entries -- **PR** `#34933`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 +* **PR** `#34971`_: (`cachedout`_) Increase timeout for grains test + @ *2016-07-26 22:11:29 UTC* -- **PR** `#34916`_: (*cachedout*) Master performance improvement + * 2d3b95dec9 Merge pull request `#34971`_ from cachedout/increase_timeout_grains_test -- **PR** `#34911`_: (*cachedout*) Backport `#34906`_ + * 82d271b43a Increase timeout for grains test -- **PR** `#34906`_: (*cachedout*) Set timeout for run_salt in test suite +* **ISSUE** `saltstack/salt#34873`_: (`Cashwini`_) Scheduler on master does not recognize the date strings supported by python dateutil (refs: `#34951`_) -- **PR** `#34898`_: (*hrumph*) Stop multiple refreshes during call to pkg.list_upgrades +* **ISSUE** `#34873`_: (`Cashwini`_) Scheduler on master does not recognize the date strings supported by python dateutil (refs: `#34951`_) -- **PR** `#34915`_: (*abednarik*) Update service_rh provider to exclude XenServer >= 7. +* **PR** `#34951`_: (`vutny`_) Fix `#34873`_ + @ *2016-07-26 17:07:48 UTC* -- **PR** `#34926`_: (*rallytime*) Lint `#34923`_ + * f23e8c525e Merge pull request `#34951`_ from vutny/fix-schedule-dateutil -- **PR** `#34923`_: (*eliasp*) Handle exception when no Slack API key was provided + * 0faa490991 Fix job scheduling using ``when`` parameter (by ``python-dateutil``) -- **PR** `#34910`_: (*cachedout*) Fix grains error on proxy minions +* **PR** `#34935`_: (`rallytime`_) Avoid UnboundLocalError in beacons module + @ *2016-07-26 17:01:23 UTC* -- **PR** `#34864`_: (*jmacfar*) Check for version in list of installed versions + * **PR** `#34894`_: (`rallytime`_) [develop] Merge forward from 2016.3 to develop (refs: `#34935`_) -- **PR** `#34902`_: (*rallytime*) Back-port `#34878`_ to 2016.3 + * deb1331601 Merge pull request `#34935`_ from rallytime/beacons-mod-cleanup -- **PR** `#34878`_: (*abednarik*) Add VirtuozzoLinux is yumpkg enable list. + * 97a36ef367 Avoid UnboundLocalError in beacons module -- **PR** `#34901`_: (*rallytime*) Add VirtuozzoLinux to the list of enabled distros for rpm.py + * **PR** `#34956`_: (`cachedout`_) Increase all run_script timeouts to 30s -- **PR** `#34900`_: (*rallytime*) Add VirtuozzoLinux to enabled platforms list in rh_service.py +* **PR** `#34933`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-25 22:09:05 UTC* -- **PR** `#34887`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 5d194f2d17 Merge pull request `#34933`_ from rallytime/merge-2016.3 -- **PR** `#34869`_: (*terminalmage*) Fail git.latest states with uncommitted changes when force_reset=False + * 8b295fe4ea Merge branch '2015.8' into '2016.3' -- **PR** `#34862`_: (*thatch45*) Fix salt-ssh cacheing issue + * ec8fc058d4 Master performance improvement (`#34916`_) -- **PR** `#34859`_: (*cachedout*) Fix wheel test + * 34dc2fd792 Merge pull request `#34911`_ from cachedout/backport_34906 -- **PR** `#34632`_: (*eliasp*) Try to create the log directory when not present yet + * 8becec2f4f Backport `#34906`_ -- **PR** `#34854`_: (*rallytime*) Remove string_types import from state compiler + * 6ccc27f697 Merge pull request `#34898`_ from hrumph/list_upgrades_refresh -- **PR** `#34865`_: (*thatch45*) This needs discussion, since this breaks SUSE + * acd4b1a23b Fixes `#33620`_ -- **PR** `#34858`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 5c13ee0e72 Merge pull request `#34606`_ from isbm/isbm-config-reading-exit-2015.8 -- **PR** `#34847`_: (*cachedout*) Add an option to skip the verification of client_acl users + * 5f5b802c0c Add option to master config reader on ignoring system exit for wrong configuration -- **PR** `#34833`_: (*rallytime*) Back-port `#28521`_ to 2015.8 + * 6fc677f177 Ignore minion config errors everywhere but the minion itself -- **PR** `#34828`_: (*thatch45*) Fix `#34648`_ + * 8699194647 Remove deprecation: BaseException.message deprecated as of 2.6 -- **PR** `#34827`_: (*thatch45*) fix beacon list to include all beacons being processed + * 0e65cfec91 Fix lint: E8302 -- **PR** `#34823`_: (*rallytime*) Back-port `#25276`_ to 2015.8 + * 67faa56bf1 Use Salt default exit codes instead of hard-coded values -- **PR** `#34822`_: (*thatch45*) Fix salt-ssh state.high and state.low + * a84556e596 Exit immediately on configuration error -- **PR** `#28521`_: (*gongled*) SPM: packaging doesn't work in Python 2.6. Fixed. + * 43d965907c Raise an exception on any found wrong configuration file -- **PR** `#25276`_: (*jacobhammons*) copy spm.1 man page during setup + * 30ed728d05 Cover exception handling in the utils.parsers -- **PR** `#34852`_: (*rallytime*) Skip GCE unit tests - causes test suite to hang + * 5e8c0c6bdb Introduce configuration error exception -- **PR** `#34844`_: (*vutny*) Fix getting total available memory without `psutil` installed +* **ISSUE** `#34760`_: (`nate-byrnes`_) XenServer 7 needs correct provider setup for services. (refs: `#34915`_) -- **PR** `#34837`_: (*thatch45*) Fix `#34345`_ + * **PR** `#34915`_: (`abednarik`_) Update service_rh provider to exclude XenServer >= 7. -- **PR** `#34838`_: (*thatch45*) Check if a valid value is passed to unlyif/unless +* **PR** `#34926`_: (`rallytime`_) Lint `#34923`_ + @ *2016-07-25 14:53:42 UTC* -- **PR** `#34840`_: (*thatch45*) update the state wrapper to include show_low_sls + * **PR** `#34923`_: (`eliasp`_) Handle exception when no Slack API key was provided (refs: `#34926`_) -- **PR** `#34842`_: (*sjorge*) 2016.3 zpool cleanup and fixes + * a7e7ec6d25 Merge pull request `#34926`_ from rallytime/lint-34923 -- **PR** `#34770`_: (*aphor*) zpool state module needs support for disk vdev `#34762`_ + * b3514abf1b Lint fixes for `#34923`_ -- **PR** `#34825`_: (*thatch45*) keep this beacon from stack tracing at the loader + * 69afcc4060 Handle exception when no Slack API key was provided -- **PR** `#34824`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 +* **ISSUE** `saltstack/salt#34908`_: (`Ch3LL`_) Cannot start proxy minion due to keyerror in grains (refs: `#34910`_) -- **PR** `#34818`_: (*jtand*) Skip mysql state test if mysqladmin is not available +* **PR** `#34910`_: (`cachedout`_) Fix grains error on proxy minions + @ *2016-07-22 23:05:46 UTC* -- **PR** `#34803`_: (*junovitch*) salt/state.py: set `chunk['order'] = 0' with `order: first'; fixes `#24744`_ + * c663c8bb5b Merge pull request `#34910`_ from cachedout/proxy_grains -- **PR** `#34642`_: (*jtand*) Check that mysqladmin exists before running mysql integration tests + * 0970ebace8 Fix grains error on proxy minions -- **PR** `#34670`_: (*isbm*) Add "osmajorrelease" grain (2016.3) + * **PR** `#34864`_: (`jmacfar`_) Check for version in list of installed versions -- **PR** `#34683`_: (*cachedout*) Fix publisher leak +* **ISSUE** `saltstack/salt#34816`_: (`msdogado`_) VirtuozzoLinux not realized as RedHat by pkg (refs: #`saltstack/salt`#34878`_`_, `#34878`_) -- **PR** `#34791`_: (*sjorge*) salt.state.zpool tweaks + * **PR** `saltstack/salt#34878`_: (`abednarik`_) Add VirtuozzoLinux is yumpkg enable list. (refs: `#34902`_) -- **PR** `#34784`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * **PR** `#34902`_: (`rallytime`_) Back-port `#34878`_ to 2016.3 -- **PR** `#34773`_: (*randomed*) Bugfix: Startup states on minions are not being written to mysql returner + * **PR** `#34878`_: (`abednarik`_) Add VirtuozzoLinux is yumpkg enable list. (refs: `#34902`_) -- **PR** `#34754`_: (*cachedout*) Disable test +* **ISSUE** `saltstack/salt#34893`_: (`msdogado`_) rpm VirtuozzoLinux not working (refs: `#34901`_) -- **PR** `#34751`_: (*cachedout*) Remove unnedeed config test +* **PR** `#34901`_: (`rallytime`_) Add VirtuozzoLinux to the list of enabled distros for rpm.py + @ *2016-07-22 22:23:48 UTC* -- **PR** `#34741`_: (*rallytime*) Back-port `#34726`_ to 2015.8 + * ad640cc046 Merge pull request `#34901`_ from rallytime/fix-34893 -- **PR** `#34726`_: (*martinhoefling*) Always loop over updated keys in non recursive update + * 45e2ce10a4 Add VirtuozzoLinux to the list of enabled distros for rpm.py -- **PR** `#34606`_: (*isbm*) Bugfix: Exit on configuration read (backport) +* **ISSUE** `saltstack/salt#34890`_: (`msdogado`_) VirtuozzoLinux enabling services not working (refs: `#34900`_) -- **PR** `#34756`_: (*jacobhammons*) Rebuild man pages +* **PR** `#34900`_: (`rallytime`_) Add VirtuozzoLinux to enabled platforms list in rh_service.py + @ *2016-07-22 22:21:20 UTC* -- **PR** `#34746`_: (*rallytime*) Update azure lib dep to match the one in cloud.clouds.msazure + * 5aa532f98b Merge pull request `#34900`_ from rallytime/fix-34890 -- **PR** `#34744`_: (*jtand*) Test valid docs fix + * 12824487cc Add VirtuozzoLinux to enabled platforms list in rh_service.py -- **PR** `#34740`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 +* **PR** `#34887`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-22 18:04:47 UTC* -- **PR** `#34721`_: (*rallytime*) Add output_file option to master config docs + * ebebfa647f Merge pull request `#34887`_ from rallytime/merge-2016.3 -- **PR** `#34607`_: (*isbm*) Bugfix: Exit on configuration read (backport) + * 109b368d19 Merge branch '2015.8' into '2016.3' -- **PR** `#34739`_: (*cachedout*) Remove unnedeed config test + * fb223e1bd4 Invalidate the target cache very quickly (`#34862`_) -- **PR** `#34607`_: (*isbm*) Bugfix: Exit on configuration read (backport) + * 1ca1367289 Fail git.latest states with uncommitted changes when force_reset=False (`#34869`_) -- **PR** `#34722`_: (*rallytime*) Various spelling fixes + * 4f4381e5b9 Merge pull request `#34859`_ from cachedout/fix_wheel_test -- **PR** `#34714`_: (*sjmh*) Fix ldap auth for function matches + * b4be66dedf Fix wheel test -- **PR** `#34720`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 +* **PR** `#34632`_: (`eliasp`_) Try to create the log directory when not present yet + @ *2016-07-22 17:34:31 UTC* -- **PR** `#34695`_: (*isbm*) Bugfix: Zypper `pkg.list_products` returns False on some empty values (2015.8) + * eba34f7f4c Merge pull request `#34632`_ from eliasp/2016.3-create-logdir-when-needed -- **PR** `#34689`_: (*Azidburn*) fix second run problems with pkg.installed using sources + * 9c89470661 Try to create the log directory when not present yet -- **PR** `#34682`_: (*jfindlay*) update 2015.8.11 release notes +* **PR** `#34854`_: (`rallytime`_) Remove string_types import from state compiler + @ *2016-07-22 17:20:15 UTC* -- **PR** `#34707`_: (*rallytime*) Add versionadded to "special" option in cron.present state + * 965f517889 Merge pull request `#34854`_ from rallytime/cleanup-state-imports -- **PR** `#34696`_: (*isbm*) Bugfix: Zypper `pkg.list_products` returns False on some empty values (2016.3) + * 73d3075ce9 Remove string_types import from state compiler -- **PR** `#34702`_: (*farcaller*) Fixed dockerng.list_tags +* **ISSUE** `saltstack/salt#26171`_: (`HG00`_) salt-ssh from python2.6 master to python2.7 minion fails on "from _elementtree import \*" (refs: `#34865`_) -- **PR** `#34681`_: (*rallytime*) Back-port `#34549`_ to 2016.3 +* **PR** `#34865`_: (`thatch45`_) This needs discussion, since this breaks SUSE + @ *2016-07-22 17:19:34 UTC* -- **PR** `#34549`_: (*Inveracity*) fixes multiple values in mof configuration + * 584d7606d4 Merge pull request `#34865`_ from thatch45/break_suse -- **PR** `#34679`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 6c5f363921 This needs discussion, since this breaks SUSE -- **PR** `#34676`_: (*cachedout*) Revert "Modify lodaer global test to use populated dunders" +* **PR** `#34858`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-21 21:01:17 UTC* -- **PR** `#34651`_: (*rallytime*) Lint 34644 + * aaede31f66 Merge pull request `#34858`_ from rallytime/merge-2016.3 -- **PR** `#34647`_: (*cachedout*) Adjust the mine test a little bit to give it a better chance of success + * 9227c3dd26 Merge branch '2015.8' into '2016.3' -- **PR** `#34644`_: (*cachedout*) Cleanup loader errors + * acc9e31c02 Merge pull request `#34822`_ from thatch45/ssh_fixes -- **PR** `#34642`_: (*jtand*) Check that mysqladmin exists before running mysql integration tests + * b5de492143 fix `#34798`_ -- **PR** `#34618`_: (*jtand*) Network state integration test test=True + * 5ad6bd7307 fix `#34796`_ -- **PR** `#34601`_: (*lorengordon*) Clarifies the proper way to reference states + * 5d91139bc9 Merge pull request `#34847`_ from cachedout/pwall -- **PR** `#34605`_: (*gtmanfred*) catch error if no dns domains exist + * 2c8298dc6e Profile logging -- **PR** `#34557`_: (*jacobweinstock*) handle jboss cli expression type in the parsing of output + * 3affafa2e9 Add an option to skip the verification of client_acl users -- **PR** `#34652`_: (*rallytime*) Spelling fixes found in sqlite3 pillar docs + * 07d1d36653 Merge pull request `#34827`_ from thatch45/34691 -- **PR** `#34565`_: (*Ch3LL*) add num_cpus grain to freebsd + * 1ccf35eca4 fix beacon list to include all beacons being processed -- **PR** `#34621`_: (*jtand*) Suse Leap doesn't have 'man' + * b375720251 Merge pull request `#34833`_ from rallytime/bp-28521 -- **PR** `#34619`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * e50a6783ce SPM: packaging doesn't work in Python 2.6. Fixed. -- **PR** `#34617`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 042646582f Merge pull request `#34823`_ from rallytime/bp-25276 -- **PR** `#34593`_: (*rallytime*) Back-port `#33851`_ to 2015.8 + * a028796eff copy spm.1 man page during setup Refs `#25213`_ -- **PR** `#34592`_: (*jtand*) Update github IP for ssh state integration tests + * 6c35d88268 Fix `#34648`_ (`#34828`_) -- **PR** `#34591`_: (*jtand*) Gate docker unit test to check for docker +* **PR** `#34852`_: (`rallytime`_) Skip GCE unit tests - causes test suite to hang + @ *2016-07-21 17:52:31 UTC* -- **PR** `#34590`_: (*oeuftete*) [2015.8] dockerng: When sorting list actual_data, make it a list + * b3d8143d36 Merge pull request `#34852`_ from rallytime/skip-gce-tests -- **PR** `#34584`_: (*rallytime*) [2015.5] Avoid circular imports when calling salt.utils functions + * 15b4f5a8b3 Skip GCE unit tests - causes test suite to hang -- **PR** `#34560`_: (*terminalmage*) Add a bunch of documentation on getting files from other environments + * **PR** `#34850`_: (`rallytime`_) Update 2016.3.2 release notes -- **PR** `#34545`_: (*terminalmage*) Handle cases where Docker Remote API returns an empty ExecutionDriver +* **ISSUE** `#34215`_: (`rvora`_) salt-master crashes every few days (refs: `#34683`_) -- **PR** `#34531`_: (*terminalmage*) Support ignore_epoch argument in version comparisons +* **PR** `#34844`_: (`vutny`_) Fix getting total available memory without `psutil` installed + @ *2016-07-21 17:12:38 UTC* -- **PR** `#33851`_: (*ticosax*) [dockerng] Add support for edge case when `Cmd` and `Entrypoint` can't be blanked + * **PR** `#34683`_: (`cachedout`_) Fix publisher leak (refs: `#34844`_) -- **PR** `#34585`_: (*rallytime*) [2016.3] Avoid salt.utils circular imports when using "from" + * 650674d14a Merge pull request `#34844`_ from vutny/fix-grains-load-in-config-init -- **PR** `#34616`_: (*jacobhammons*) Adds a mock required for the network settings beacon + * 4dc7827020 Fix comment in master config, prevents the service from starting -- **PR** `#34553`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * b4cfebb107 Fix Salt failure after merge of `#34683`_ -- **PR** `#34546`_: (*rallytime*) Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test + * **PR** `#34848`_: (`rallytime`_) Update release notes for 2016.3.2 -- **PR** `#34537`_: (*rallytime*) Rename tests.unit.simple to tests.unit.simple_test +* **ISSUE** `saltstack/salt#34345`_: (`edgan`_) Salt master mode's and salt-ssh mode's top.sls processing aren't the same (refs: `#34837`_) -- **PR** `#34527`_: (*rallytime*) [2015.8] Update bootstrap script to latest stable +* **ISSUE** `#34345`_: (`edgan`_) Salt master mode's and salt-ssh mode's top.sls processing aren't the same (refs: `#34837`_) -- **PR** `#34521`_: (*cachedout*) Prevent many errors in the test suite in loader tests +* **PR** `#34837`_: (`thatch45`_) Fix `#34345`_ + @ *2016-07-21 14:36:15 UTC* -- **PR** `#34518`_: (*terminalmage*) Fix pkg.latest integration test for non-LTS ubuntu + * 52a95b2ea3 Merge pull request `#34837`_ from thatch45/34345 -- **PR** `#34507`_: (*AAbouZaid*) Fix wrong order of retention_policy_exists. + * 1e8c585cd3 Fix `#34345`_ -- **PR** `#34569`_: (*eliasp*) Minor doc fixes for PostgreSQL states +* **ISSUE** `saltstack/salt#32591`_: (`AndrewPashkin`_) "RuntimeError: maximum recursion depth exceeded" in salt/utils/lazy.py, using Salt-SSH (refs: `#34838`_) -- **PR** `#34524`_: (*terminalmage*) yumpkg: Avoid spurious logging in pkg.upgrade +* **PR** `#34838`_: (`thatch45`_) Check if a valid value is passed to unlyif/unless + @ *2016-07-21 14:34:29 UTC* -- **PR** `#34490`_: (*cachedout*) Fix master crash on ctl-c for long-running job + * 96450ac74d Merge pull request `#34838`_ from thatch45/unless_valid -- **PR** `#34520`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 1f34299a84 Check if a valid value is passed to unlyif/unless -- **PR** `#34513`_: (*cachedout*) Lower the log level for modules which cannot be loaded to trace +* **ISSUE** `saltstack/salt#32525`_: (`anlutro`_) state.show_low_sls not working in salt-ssh (refs: `#34840`_) -- **PR** `#34505`_: (*terminalmage*) Improve top file merging documentation +* **PR** `#34840`_: (`thatch45`_) update the state wrapper to include show_low_sls + @ *2016-07-21 14:34:02 UTC* -- **PR** `#34503`_: (*rallytime*) Rename some unit test files by adding _test + * 3a5ef86d58 Merge pull request `#34840`_ from thatch45/state_update_ssh -- **PR** `#34498`_: (*rallytime*) Use -O in the wget example in the bootstrap tutorial for the develop branch + * 77dce3920c update the state wrapper to include show_low_sls -- **PR** `#34492`_: (*zer0def*) Gracefully handle non-XML output in GlusterFS execution module. +* **ISSUE** `#34762`_: (`aphor`_) zpool state module needs support for disk vdev (refs: `#34791`_, `#34770`_) -- **PR** `#34489`_: (*jtand*) Use skipTest for network state integration test +* **PR** `#34842`_: (`sjorge`_) 2016.3 zpool cleanup and fixes + @ *2016-07-21 14:32:56 UTC* -- **PR** `#34488`_: (*rallytime*) Update dnsmasq.get_config docs to use correct config_file param. + * **PR** `#34770`_: (`aphor`_) zpool state module needs support for disk vdev `#34762`_ (refs: `#34842`_) -- **PR** `#34499`_: (*gtmanfred*) remove unnecessary block parsing ip addrs for nova + * 5f67318fd7 Merge pull request `#34842`_ from sjorge/2016.3-zpool-simplifaction -- **PR** `#34468`_: (*twangboy*) Use Python 2.7.12 for Windows Build + * a7ff9524b0 drop parsing of vdevs, error passthrough from zpool cli -- **PR** `#34493`_: (*twangboy*) Use Python 2.7.12 for Mac Build + * 25d6c8139b eliminate hardcoded vdev type from zpool state -- **PR** `#34486`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 47b8dc946c salt.states.zpool - work with updates exec module -- **PR** `#34467`_: (*rallytime*) Back-port `#34457`_ to 2015.8 + * a5a98845c7 salt.module.zpool - fix bug with properties on/off being parsed as true/false -- **PR** `#34462`_: (*terminalmage*) Use --always when available to git describe + * dd64494a19 salt.modules.zpool - drop vdev types to make it more future proof, fallback to zpool cli error messages -- **PR** `#34457`_: (*ryan-lane*) Only access key metadata if we found key metadata + * **PR** `#34825`_: (`thatch45`_) keep this beacon from stack tracing at the loader -- **PR** `#34455`_: (*cro*) Forgot reference to inotify +* **PR** `#34824`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-20 20:54:35 UTC* -- **PR** `#34432`_: (*twangboy*) Fix file.append + * b9db0b0036 Merge pull request `#34824`_ from rallytime/merge-2016.3 -- **PR** `#34429`_: (*terminalmage*) Skip version checking for targeted packages in pkg.latest state + * 094731f4b6 Merge branch '2015.8' into '2016.3' -- **PR** `#34459`_: (*terminalmage*) Ignore retcode when formatting highstate output + * 98fa4a404e Merge pull request `#34818`_ from jtand/mysql_state_integration_test_cleanup -- **PR** `#34463`_: (*terminalmage*) states/git: pass required cwd parameter to git.describe. + * 9abb6f91bb Skip mysql state test if mysqladmin is not available -- **PR** `#34466`_: (*rallytime*) Back-port `#34436`_ to 2016.3 + * 6636f2b449 Merge pull request `#34803`_ from junovitch/issue_24744 -- **PR** `#34436`_: (*artxki*) Fix `#34395`_ Nonfunctional default_password in states.postgres_user.present + * 64c850410f salt/state.py: set 'chunk['order'] = 0' with 'order: first'; fixes `#24744`_ -- **PR** `#34453`_: (*jtand*) Arch linux does not have osrelease or osmajorrelease grains +* **PR** `#34670`_: (`isbm`_) Add "osmajorrelease" grain (2016.3) + @ *2016-07-20 14:39:38 UTC* -- **PR** `#34456`_: (*thatch45*) Be more careful when making the SMinion + * 62ef8fdb35 Merge pull request `#34670`_ from isbm/isbm-osmajorrelease-grain-suse -- **PR** `#34452`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * a6bcbd615f Lintfix PEP8: E262 -- **PR** `#34451`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 110a422d5a Keep osmajorrelease as a string type for 2016.3 release -- **PR** `#34435`_: (*cachedout*) Backport change to integraiton test suite + * 208fd33b48 Add unit test for osmajorrelease grain -- **PR** `#34426`_: (*cro*) Document that inotify is Linux only + * 9a6b2175c6 Implement "osmajorrelease" by killing spaghetti -- **PR** `#34401`_: (*terminalmage*) Use rpmdev-vercmp as a fallback for version comparison on RHEL5 +* **ISSUE** `#34215`_: (`rvora`_) salt-master crashes every few days (refs: `#34683`_) -- **PR** `#34366`_: (*steverweber*) Update service.py +* **PR** `#34683`_: (`cachedout`_) Fix publisher leak (refs: `#34844`_) + @ *2016-07-20 13:57:10 UTC* -- **PR** `#34427`_: (*twangboy*) Automated signing fixes for Ubuntu 16.04, 14.04, 12.04 (for dmurphy) + * 6ca9ffa7c7 Merge pull request `#34683`_ from cachedout/issue_34215 -- **PR** `#34400`_: (*cachedout*) Fix uninitialized value + * ccd53e9214 Lint -- **PR** `#34404`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 76eb46fb08 Document master setting -- **PR** `#34392`_: (*cro*) Clarify that salt-cloud doesn't get installed by bootstrap + * 0dfe3aaf31 Set up dynamic config -- **PR** `#34377`_: (*terminalmage*) Optimize pkg integration tests and add a couple new tests + * 3cfb82cdd4 Fix silly error -- **PR** `#34373`_: (*jtand*) Network state integration test + * 35a845fff5 Only set IPC with write buffer if set -- **PR** `#34292`_: (*twangboy*) Fix runas function for System Account + * b2d636017d Add IPC to minion opts -- **PR** `#34388`_: (*rallytime*) Back-port `#34378`_ to 2016.3 + * 2c1c92c48e Lint -- **PR** `#34378`_: (*adelcast*) network_settings.py: fix documentation + * c4395ae84e Dial down default buffer and apply to just write buffer -- **PR** `#34352`_: (*cro*) Esxi dvs + * 3e3e2a997e Typo -- **PR** `#34386`_: (*rallytime*) Beacon network docs + * 78f6251c09 Correct issues with config -- **PR** `#34376`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * c138cc03e3 Configuration settings for IPC buffers -- **PR** `#34368`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **ISSUE** `#34762`_: (`aphor`_) zpool state module needs support for disk vdev (refs: `#34791`_, `#34770`_) -- **PR** `#34344`_: (*rallytime*) Back-port `#34324`_ to 2015.8 +* **PR** `#34791`_: (`sjorge`_) salt.state.zpool tweaks + @ *2016-07-19 20:56:47 UTC* -- **PR** `#34342`_: (*rallytime*) Back-port `#34316`_ to 2015.8 + * 49ab3fd2b5 Merge pull request `#34791`_ from sjorge/zpool-state-tweaks -- **PR** `#34324`_: (*cachedout*) Test custom grains matcher + * d48c6d2dcb accomidate use of "fake" vdev type disk, this behavior may be broken later if a disk vdev ever gets added to the cli tools. improve documentation explaining how to create a striped pool without the "fake" vdev type -- **PR** `#34316`_: (*edgan*) Making salt-ssh pass proper return codes for jinja rendering errors +* **PR** `#34784`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-19 16:30:18 UTC* -- **PR** `#34252`_: (*gtmanfred*) return list of nodes for lxc driver when called directly + * 1617a7058a Merge pull request `#34784`_ from rallytime/merge-2016.3 -- **PR** `#34365`_: (*sjorge*) fixes computenode_* grains on SmartOS compute nodes + * 3e032dc397 Merge branch '2015.8' into '2016.3' -- **PR** `#34353`_: (*cro*) Remove proxy check and additional GetConnection--this makes the proxy… + * 58021035a9 Merge pull request `#34773`_ from randomed/mysql-returner-startup/2015.8 -- **PR** `#34348`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 0cd55eb7d7 Add jid=req handling for mysql returner. It should also store the return jid into the jid list table. -- **PR** `#34339`_: (*terminalmage*) Revert py3modernize lint changes + * 10a1af9949 Remove unnedeed config test (`#34751`_) -- **PR** `#34335`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * f19caac8e4 Merge pull request `#34754`_ from cachedout/disable_mid_test -- **PR** `#34325`_: (*terminalmage*) Remove unnecessarily-disabled sanity check + * 46901c6e65 Disable test -- **PR** `#34323`_: (*jacobhammons*) Doc clarifications to file modules, addition of new `profile` log lev… + * 81f29006f2 Merge pull request `#34741`_ from rallytime/bp-34726 -- **PR** `#34319`_: (*rallytime*) Back-port `#34244`_ to 2015.8 + * d949110993 Loop over updated keys in non recursive update -- **PR** `#34313`_: (*rallytime*) [2015.5] Update to latest bootstrap script v2016.06.27 +* **ISSUE** `saltstack/salt#34630`_: (`bdrung`_) Spelling errors (refs: `#34756`_, `#34722`_) -- **PR** `#34312`_: (*rallytime*) [2015.8] Update to latest bootstrap script v2016.06.27 +* **ISSUE** `saltstack/salt#33923`_: (`pavankumar2203`_) Salt module certutil install doesnt work (refs: `#34756`_) -- **PR** `#34307`_: (*rallytime*) Fix test example in integration testing docs + * **PR** `#34756`_: (`jacobhammons`_) Rebuild man pages -- **PR** `#34306`_: (*ghedo*) Fix iptables.flush state: Do not force 'filter' table when flushing +* **ISSUE** `saltstack/salt#27980`_: (`rayba`_) salt-cloud 2015.5.0 azure provider could not be loaded (refs: `#34746`_) -- **PR** `#34244`_: (*the-glu*) Typo in dockerio doc +* **PR** `#34746`_: (`rallytime`_) Update azure lib dep to match the one in cloud.clouds.msazure + @ *2016-07-18 18:54:40 UTC* -- **PR** `#34343`_: (*rallytime*) Back-port `#34256`_ to 2016.3 + * 2a9738f00d Merge pull request `#34746`_ from rallytime/azure-version -- **PR** `#34256`_: (*tmehlinger*) detect running from master in State.event method + * ead3eb1606 Update azure lib dep to match the one in cloud.clouds.msazure -- **PR** `#34338`_: (*themalkolm*) Add listen/listen_in support to stateconf.py +* **PR** `#34744`_: (`justinta`_) Test valid docs fix + @ *2016-07-18 18:22:47 UTC* -- **PR** `#34283`_: (*sjorge*) 2016.3 mount vfstab support + * c0e2657c8e Merge pull request `#34744`_ from jtand/test_valid_docs_fix -- **PR** `#34322`_: (*Ch3LL*) add osmajorrelease grain for raspbian + * 4fe33a7695 add directives example to ldap3.modify -- **PR** `#34337`_: (*clinta*) Change merge-if-exists logic to properly report changes + * 6fa40a0d46 Add cli examples for ldap3 module -- **PR** `#34300`_: (*vutny*) Make apache.configfile state handle the Options list correctly + * b94e0dd95a ipset.long_range doesn't need a docstring -- **PR** `#34333`_: (*rallytime*) Back-port `#33734`_ to 2016.3 +* **PR** `#34740`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-18 16:28:56 UTC* -- **PR** `#34304`_: (*rallytime*) Back-port `#33734`_ to 2016.3 + * d4adf98b85 Merge pull request `#34740`_ from rallytime/merge-2016.3 -- **PR** `#33734`_: (*glomium*) modules/rabbitmq.py version checking had a logical error + * 7d106c78f0 Merge branch '2015.8' into '2016.3' -- **PR** `#34330`_: (*clinta*) fix `#34329`_ + * e9e5bbe38b Merge pull request `#34721`_ from rallytime/fix-34703 -- **PR** `#34318`_: (*rallytime*) Back-port `#32182`_ to 2016.3 + * 9c803d05a5 Add output_file option to master config docs -- **PR** `#32182`_: (*dongweiming*) Fix psutil.cpu_times unpack error +* **PR** `#34607`_: (`isbm`_) Bugfix: Exit on configuration read (backport) + @ *2016-07-18 15:15:21 UTC* -- **PR** `#34311`_: (*rallytime*) [2016.3] Update to latest bootstrap script v2016.06.27 + * efc7599f85 Merge pull request `#34607`_ from isbm/isbm-config-reading-exit-2016.3 -- **PR** `#34284`_: (*rallytime*) Don't require 'domain' to be present before checking fqdn_ip* grains + * fb7542f920 Add option to master config reader on ignoring system exit for wrong configuration -- **PR** `#34296`_: (*sjorge*) 2016.3 status module now works on Solaris like platforms + * abd10b5782 Ignore minion config errors everywhere but the minion itself -- **PR** `#34281`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * e5f43e6711 Remove deprecation: BaseException.message deprecated as of 2.6 -- **PR** `#34274`_: (*clinta*) Don't escape source before calling managed + * 23d1031a09 Fix lint: E8302 -- **PR** `#34258`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 6b660678fa Use Salt default exit codes instead of hard-coded values -- **PR** `#34257`_: (*rallytime*) Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer + * 0c2d3511c9 Exit immediately on configuration error -- **PR** `#34233`_: (*thegoodduke*) ipset: fix the comment containing blank + * c5de6c8c4a Raise an exception on any found wrong configuration file -- **PR** `#34232`_: (*thegoodduke*) ipset: fix commont containing blank + * 575767022b Cover exception handling in the utils.parsers -- **PR** `#34225`_: (*richardscollin*) Fix win_system.set_system_date_time + * 2cf696671f Introduce configuration error exception -- **PR** `#34271`_: (*opdude*) Fixed symlinks on windows where the slashes don't match + * **PR** `saltstack/salt#34607`_: (`isbm`_) Bugfix: Exit on configuration read (backport) (refs: `#34739`_) -- **PR** `#34254`_: (*sjorge*) Fix for `#14915`_ +* **PR** `#34739`_: (`cachedout`_) Remove unnedeed config test + @ *2016-07-18 15:15:15 UTC* -- **PR** `#34259`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * d0e0c0186b Merge pull request `#34739`_ from cachedout/remove_config_test -- **PR** `#34136`_: (*meaksh*) Fixed behavior for SUSE OS grains in 2015.8 + * 4625ee65b8 Remove unnedeed config test -- **PR** `#34134`_: (*meaksh*) Fixed behavior for SUSE OS grains in 2016.3 +* **ISSUE** `saltstack/salt#34630`_: (`bdrung`_) Spelling errors (refs: `#34756`_, `#34722`_) -- **PR** `#34093`_: (*terminalmage*) Catch CommandExecutionError in pkg states +* **PR** `#34722`_: (`rallytime`_) Various spelling fixes + @ *2016-07-16 19:49:54 UTC* -- **PR** `#33903`_: (*meaksh*) Fetching grains['os'] from /etc/os-release on SUSE systems if it is possible + * abf5b976ed Merge pull request `#34722`_ from rallytime/fix-34630 -- **PR** `#34134`_: (*meaksh*) Fixed behavior for SUSE OS grains in 2016.3 + * cca9446c37 Various spelling fixes -- **PR** `#33903`_: (*meaksh*) Fetching grains['os'] from /etc/os-release on SUSE systems if it is possible +* **PR** `#34714`_: (`sjmh`_) Fix ldap auth for function matches + @ *2016-07-16 19:49:12 UTC* -- **PR** `#34159`_: (*christoe*) Fixes to the win_task module + * 922cc5a8a7 Merge pull request `#34714`_ from sjmh/fix/ldap_auth -- **PR** `#34223`_: (*peterdemin*) Fixed typo in filtering LDAP's potential_ous + * d4144039bc Fix ldap auth for function matches -- **PR** `#34239`_: (*vutny*) file.find module: fix handling of broken symlinks +* **PR** `#34720`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-16 19:22:28 UTC* -- **PR** `#34229`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 40626d786a Merge pull request `#34720`_ from rallytime/merge-2016.3 -- **PR** `#34218`_: (*terminalmage*) Fix a pair of gitfs bugs + * c2130d5a04 Merge branch '2015.8' into '2016.3' -- **PR** `#34208`_: (*lomeroe*) fix regression from `#33681`_ which causes pulling a list of s3 objects … + * 08d00f3a61 Merge pull request `#34689`_ from Azidburn/fix_pkg_sources -- **PR** `#34206`_: (*terminalmage*) Change target for dockerng assuming default status to Nitrogen release + * 2c0fc919b3 fix second run problems with pkg.installed using sources -- **PR** `#34188`_: (*terminalmage*) Clarify pkg.list_repo_pkgs docstring for held packages + * 4cb1ded520 Merge pull request `#34695`_ from isbm/isbm-zypper-product-boolean-values -- **PR** `#34182`_: (*rallytime*) Handle child PIDs differently depending on the availability of psutils + * 5ed5142fbc Update test data for 'registerrelease' and 'productline' fields -- **PR** `#33942`_: (*cachedout*) ZD 762 + * 21444ee240 Bugfix: return boolean only for 'isbase' and 'installed' attributes -- **PR** `#33681`_: (*rallytime*) Back-port `#33599`_ to 2015.8 + * aaa6f7d80a update 2015.8.11 release notes (`#34682`_) -- **PR** `#33599`_: (*lomeroe*) Fix s3 large file download +* **ISSUE** `#34661`_: (`chrimi`_) Cron State documentation lacks information of "New in" for special parameter in cron.present (refs: `#34707`_) -- **PR** `#34214`_: (*rallytime*) Update saltutil.wheel docs to specify remote vs local minion behavior + * **PR** `#34707`_: (`rallytime`_) Add versionadded to "special" option in cron.present state -- **PR** `#34209`_: (*lomeroe*) fix regression in s3.query from `#33682`_ +* **PR** `#34696`_: (`isbm`_) Bugfix: Zypper `pkg.list_products` returns False on some empty values (2016.3) + @ *2016-07-15 21:18:21 UTC* -- **PR** `#33682`_: (*lomeroe*) backport `#33599`_ to 2016.3 + * 51fce770a5 Merge pull request `#34696`_ from isbm/isbm-zypper-product-boolean-values-2016.3 -- **PR** `#33599`_: (*lomeroe*) Fix s3 large file download + * 96021e257c Update test data for 'registerrelease' and 'productline' fields -- **PR** `#34222`_: (*cachedout*) Lint 34200 + * 337eee33ac Bugfix: return boolean only for 'isbase' and 'installed' attributes -- **PR** `#34200`_: (*secumod*) Fix parted module set CLI example +* **PR** `#34702`_: (`farcaller`_) Fixed dockerng.list_tags + @ *2016-07-15 20:50:35 UTC* -- **PR** `#34197`_: (*eliasp*) Make `module.ssh.recv_known_host()` more resilient against hosts not returning a key + * 45045f6900 Merge pull request `#34702`_ from farcaller/fixtags -- **PR** `#34201`_: (*DarkKnightCZ*) Suffix temp file with .sr1 and add mandatory argument when executing PowerShell script + * 032e35a28e Fixed dockerng.list_tags -- **PR** `#34198`_: (*DarkKnightCZ*) Don't use binary mode for cmdmod.exec_code +* **ISSUE** `saltstack/salt#34548`_: (`Inveracity`_) win_dsc.set_lcm_config does not set multiple values, missing semicolon (refs: `#34549`_, #saltstack/salt`#34549`_) -- **PR** `#34198`_: (*DarkKnightCZ*) Don't use binary mode for cmdmod.exec_code + * **PR** `saltstack/salt#34549`_: (`Inveracity`_) fixes multiple values in mof configuration (refs: `#34681`_) -- **PR** `#34172`_: (*dmurphy18*) Support for building with local packages on Debian and Ubuntu + * **PR** `#34681`_: (`rallytime`_) Back-port `#34549`_ to 2016.3 -- **PR** `#34194`_: (*vutny*) Correct the docstrings formatting in pkgbuild modules and state + * **PR** `#34549`_: (`Inveracity`_) fixes multiple values in mof configuration (refs: `#34681`_) -- **PR** `#34056`_: (*vutny*) Make rpmbuild module work on non-RPM based GNU/Linux systems +* **PR** `#34679`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-14 20:59:45 UTC* -- **PR** `#34186`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * d57507dde8 Merge pull request `#34679`_ from rallytime/merge-2016.3 -- **PR** `#34184`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * 0c566dce89 Merge branch '2015.8' into '2016.3' -- **PR** `#34179`_: (*terminalmage*) Raise the correct exception when gitfs lockfile is empty + * 3192e1674b Merge pull request `#34676`_ from cachedout/partial_revert_34644 -- **PR** `#34178`_: (*terminalmage*) Remove unnecesssary comment + * 64a154826a Revert "Modify lodaer global test to use populated dunders" -- **PR** `#34176`_: (*rallytime*) Back-port `#34103`_ to 2015.8 + * 3b6f1089b2 Merge pull request `#34601`_ from lorengordon/clarify-doc -- **PR** `#34175`_: (*rallytime*) Back-port `#34128`_ to 2015.8 + * bfe0dd0b8a Clarifies the proper way to reference states -- **PR** `#34174`_: (*rallytime*) Back-port `#34066`_ to 2015.8 + * bc63f25a6f Lint 34644 (`#34651`_) -- **PR** `#34165`_: (*mcalmer*) fix salt --summary to count not responding minions correctly + * 50360263c5 Adjust the mine test a little bit to give it a better chance of success (`#34647`_) -- **PR** `#34141`_: (*jtand*) Fixed boto_vpc_test failure + * 8a0209101e Merge pull request `#34642`_ from jtand/mysql_integration_cleanup -- **PR** `#34128`_: (*bebehei*) doc: add missing dot + * dd1559a599 Check that mysqladmin exists before running mysql integration tests. -- **PR** `#34103`_: (*morganwillcock*) Fix diskusage beacon + * 3e612c3794 Merge pull request `#34618`_ from jtand/network_integration_fix -- **PR** `#34077`_: (*rallytime*) Add some grains targeting tests + * 34bcf9ccfc Changed network state test to use test=True -- **PR** `#34066`_: (*complexsplit*) Typo fix + * b2616833b0 Some small changes -- **PR** `#33474`_: (*cachedout*) Fix diskusage beacon + * ed59113e94 Change network state integration test to use test=True -- **PR** `#34173`_: (*rallytime*) Update docs to match log_level default +* **ISSUE** `saltstack/salt#33452`_: (`Ch3LL`_) Digital Ocean does not return anything on deletion (refs: `#34605`_) -- **PR** `#34095`_: (*rallytime*) Back-port `#32396`_ to 2016.3 +* **PR** `#34605`_: (`gtmanfred`_) catch error if no dns domains exist + @ *2016-07-14 15:20:46 UTC* -- **PR** `#32396`_: (*eradman*) Unbreak cron.file + * b88c39e1d2 Merge pull request `#34605`_ from gtmanfred/2016.3 -- **PR** `#34108`_: (*l2ol33rt*) Make dockerng.absent state honor test=true + * 37b0943539 catch error if no dns domains exist -- **PR** `#34133`_: (*rallytime*) Back-port `#34057`_ to 2016.3 +* **PR** `#34557`_: (`jacobweinstock`_) handle jboss cli expression type in the parsing of output + @ *2016-07-14 15:09:49 UTC* -- **PR** `#34057`_: (*ajacoutot*) _active_mounts_openbsd: unbreak output for special filesystems + * b3dc6031fe Merge pull request `#34557`_ from jacobweinstock/jboss7_cli-handle-expression-type -- **PR** `#34156`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 1945153399 handle jboss cli expression type in the parsing of the output -- **PR** `#34142`_: (*isbm*) Move log message from INFO to DEBUG. + * **PR** `#34652`_: (`rallytime`_) Spelling fixes found in sqlite3 pillar docs -- **PR** `#34100`_: (*terminalmage*) Update documentation on "refresh" behavior in pkg states +* **ISSUE** `saltstack/salt#34382`_: (`amontalban`_) Exception: unsupported operand type(s) for -: 'str' and 'int' (refs: `#34565`_) -- **PR** `#34072`_: (*jfindlay*) modules.pkg int tests: skip refresh_db upon error +* **ISSUE** `#34554`_: (`stjack99`_) num_cpus grain missing with Salt 2016.3.1 on FreeBSD 10.x (refs: `#34565`_) -- **PR** `#34110`_: (*garethgreenaway*) Fixes to git module & state module related to identity file + * **PR** `#34565`_: (`Ch3LL`_) add num_cpus grain to freebsd -- **PR** `#34138`_: (*rallytime*) Update package dep note to systemd-python for RHEL7 install + * **PR** `#34621`_: (`justinta`_) Suse Leap doesn't have 'man' -- **PR** `#34166`_: (*vutny*) Fix YAML indentation in Apache state docstrings +* **PR** `#34619`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-12 21:52:01 UTC* -- **PR** `#34098`_: (*terminalmage*) Restore old refresh logic + * 61f5045a0d Merge pull request `#34619`_ from rallytime/merge-2016.3 -- **PR** `#34087`_: (*bbinet*) Encourage to report issues to upstream PillarStack project + * f734afd0b0 Merge branch '2015.8' into '2016.3' -- **PR** `#34075`_: (*jfindlay*) modules.inspectlib.kiwiproc: import gate lxml + * 9f123543e5 Merge pull request `#34617`_ from rallytime/merge-2015.8 -- **PR** `#34056`_: (*vutny*) Make rpmbuild module work on non-RPM based GNU/Linux systems + * 3026df346f Merge branch '2015.5' into '2015.8' -- **PR** `#34073`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 57df38e685 Update github IP for ssh state integration tests (`#34592`_) -- **PR** `#34069`_: (*rallytime*) Add a test to check for disconnected minion messaging + * 2e1007254b Avoid circular imports when calling salt.utils functions (`#34584`_) -- **PR** `#34051`_: (*tegbert*) Fixed a bug in the consul.py module that was preventing services + * b90ae407f9 Add support for edge case when Cmd and Entrypoint can't be blanked (`#34593`_) -- **PR** `#34048`_: (*terminalmage*) RFC: proposed fix for multiple fileserver updates in masterless runs + * 12b579c4e3 When sorting list actual_data, make it a list (`#34590`_) -- **PR** `#34045`_: (*jacobhammons*) Updated latest release version + * 7dd8035c62 Gate docker unit test to check for docker (`#34591`_) -- **PR** `#34030`_: (*vutny*) More YAML indentation fixes in state module examples + * ae38c874da Add a bunch of documentation on getting files from other environments (`#34560`_) -- **PR** `#34020`_: (*twangboy*) Always make changes to minion config if set (2015.8) + * 91e0656d44 Merge pull request `#34531`_ from terminalmage/issue34397 -- **PR** `#34018`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 + * d0fec1b8f6 salt/modules/zypper.py: accept ignore_epoch argument -- **PR** `#34011`_: (*rallytime*) Back-port `#33948`_ and `#34009`_ to 2015.8 + * 5ae9463c1f salt/modules/yumpkg.py: accept ignore_epoch argument -- **PR** `#34009`_: (*rallytime*) Back-port `#33948`_ to 2016.3 + add log message + * c2791117af salt/modules/rpm.py: accept ignore_epoch argument -- **PR** `#34005`_: (*rallytime*) Lint fix for `#34000`_ + * c5de8b880d salt/modules/ebuild.py: accept ignore_epoch argument -- **PR** `#34003`_: (*vutny*) states.file: fix indentation in YAML examples + * 4ee8e8f037 salt/modules/aptpkg.py: accept ignore_epoch argument -- **PR** `#34002`_: (*lorengordon*) Remove loader test for pam module + * 5b123b403c Pass ignore_epoch to salt.utils.compare_versions() -- **PR** `#34000`_: (*cachedout*) Fix incorrectly written test + * 07368fac40 Accept ignore_epoch argument for salt.utils.compare_versions() -- **PR** `#33990`_: (*jacobhammons*) Adds links to several current Salt-related projects + * e99befad47 Merge pull request `#34545`_ from terminalmage/docker-exec-driver -- **PR** `#33985`_: (*rallytime*) Write some more simple batch command tests + * dd5838e242 Handle cases where Docker Remote API returns an empty ExecutionDriver -- **PR** `#33984`_: (*jfindlay*) Add docs and tests to disk state + * **PR** `#34585`_: (`rallytime`_) [2016.3] Avoid salt.utils circular imports when using "from" -- **PR** `#33983`_: (*twangboy*) Clarify the `account_exists` parameter +* **PR** `#34616`_: (`jacobhammons`_) Adds a mock required for the network settings beacon + @ *2016-07-12 19:09:30 UTC* -- **PR** `#33953`_: (*whiteinge*) Add loader.utils() example to calling minion_mods + * c8bdfb272d Merge pull request `#34616`_ from jacobhammons/network-settings-mock -- **PR** `#33951`_: (*jfindlay*) modules.gem int tests: more fixes + * 5e2ddb5eb0 Adds a mock required for the network settings beacon -- **PR** `#33948`_: (*cachedout*) Save an entire minion cache traversal on each master pub +* **PR** `#34553`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-11 19:36:26 UTC* -- **PR** `#33904`_: (*rallytime*) Back-port `#33806`_ to 2015.5 + * d8c8b4ac6f Merge pull request `#34553`_ from rallytime/merge-2016.3 -- **PR** `#33880`_: (*terminalmage*) pkg.uptodate: Pass kwargs to pkg.list_upgrades + * 815c8b38d5 Merge branch '2015.8' into '2016.3' -- **PR** `#33806`_: (*cachedout*) Work around upstream cherrypy bug + * 7120d43df0 Merge pull request `#34546`_ from rallytime/rename-boto-secgroup-test -- **PR** `#33684`_: (*jfindlay*) add acl unit tests + * f8a3622be7 Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test -- **PR** `#34010`_: (*terminalmage*) Do not cache remote files if they are already cached + * ca92061821 Merge pull request `#34537`_ from rallytime/rename-simple-test -- **PR** `#34009`_: (*rallytime*) Back-port `#33948`_ to 2016.3 + add log message + * ceefb6e34c Rename tests.unit.simple to tests.unit.simple_test -- **PR** `#33948`_: (*cachedout*) Save an entire minion cache traversal on each master pub + * fbab2f8c2b [2015.8] Update bootstrap script to latest stable (`#34527`_) -- **PR** `#33941`_: (*cachedout*) Don't call os.getppid() on Windows + * 6b8c76af83 Prevent many errors in the test suite in loader tests (`#34521`_) -- **PR** `#34067`_: (*jacobhammons*) Fixes doc refresh bug on chrome mobile. + * c2f296c95b Fix wrong order of retention_policy_exists (`#34507`_) -- **PR** `#34050`_: (*rallytime*) Back-port `#34026`_ to 2016.3 + * 685df80929 Merge pull request `#34518`_ from terminalmage/fix-pkg.latest-test -- **PR** `#34026`_: (*bensherman*) removed method that doesn't exist + * 4aef44ecdf Fix pkg.latest integration test for non-LTS ubuntu -- **PR** `#33987`_: (*isbm*) inspectlib cleanup +* **PR** `#34569`_: (`eliasp`_) Minor doc fixes for PostgreSQL states + @ *2016-07-11 14:02:13 UTC* -- **PR** `#34042`_: (*sjorge*) fix `#34038`_ + * 5b002e11b4 Merge pull request `#34569`_ from eliasp/2016.3-postgres-doc -- **PR** `#34025`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 221da29ef5 Typo (`defaul` → `default`) -- **PR** `#34044`_: (*jacobhammons*) Updated latest release to 2016.3.1 + * ba3d7c624b Add code formatting -- **PR** `#34014`_: (*jnhmcknight*) fix launch config creation params + * b3409c97a2 Fix typo (`seens` → `seen`) -- **PR** `#34021`_: (*twangboy*) Always make changes to minion config if set (2016.3) +* **PR** `#34524`_: (`terminalmage`_) yumpkg: Avoid spurious logging in pkg.upgrade + @ *2016-07-07 22:06:01 UTC* -- **PR** `#34031`_: (*eliasp*) `states.postgres_privileges` expects a real list, not a comma-separated string + * 7e1abd77ba Merge pull request `#34524`_ from terminalmage/yumpkg-upgrade-logging -- **PR** `#33995`_: (*jacobhammons*) Understanding Jinja topic, Jinja doc issues. + * 40992f0790 yumpkg: Avoid spurious logging in pkg.upgrade -- **PR** `#33900`_: (*amendlik*) Document sudo policy for gitfs post-recieve hook +* **ISSUE** `#34439`_: (`edgan`_) Fast memory leak on ctrl-c out of salt '*' state.highstate (refs: `#34490`_) -- **PR** `#33980`_: (*twangboy*) Use full path to python.exe + * **PR** `#34490`_: (`cachedout`_) Fix master crash on ctl-c for long-running job -- **PR** `#33993`_: (*s0undt3ch*) Call `sys.exit()` instead of `exit()` +* **PR** `#34520`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-07 19:22:40 UTC* -- **PR** `#33976`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * b9e87620f5 Merge pull request `#34520`_ from rallytime/merge-2016.3 -- **PR** `#33962`_: (*jacobhammons*) Adds a "Generated on " line to the html footer + * 27988dde48 Merge branch '2015.8' into '2016.3' -- **PR** `#33952`_: (*rallytime*) Add base argument to salt-ssh grains wrapper for filter_by func + * a516f116d1 Merge pull request `#34513`_ from cachedout/lower_loader_log -- **PR** `#33946`_: (*rallytime*) Back-port `#33698`_ to 2015.8 + * 733c5d00c0 Lower the log level for modules which cannot be loaded to trace -- **PR** `#33942`_: (*cachedout*) ZD 762 + * 63f0451041 Merge pull request `#34498`_ from rallytime/bootstrap-tutorial-doc-fix -- **PR** `#33698`_: (*opdude*) Vsphere fixes + * 23c5739c3b Use -O in wget develop example in bootstrap tutorial -- **PR** `#33912`_: (*abalashov*) utils/schedule.py:handle_func() - Fix for accessing returner configur… + * 3ebba020b6 Rename some unit test files by adding _test (`#34503`_) -- **PR** `#33945`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 8722257b82 Improve top file merging documentation (`#34505`_) -- **PR** `#33936`_: (*rallytime*) Add connecting_settings to boto_elb state attributes list + * 6ce7cb9616 Gracefully handle non-XML output in GlusterFS execution module. (`#34492`_) -- **PR** `#33917`_: (*techhat*) Wait for up to a minute for sync_after_install + * 75299456be Use skipTest for network state integration test (`#34489`_) -- **PR** `#33888`_: (*jfindlay*) random.org checks + * 0f3f87fbc5 Update dnsmasq.get_config docs to use correct config_file param. (`#34488`_) -- **PR** `#33877`_: (*rallytime*) [2015.8] Merge forward from 2015.5 to 2015.8 +* **ISSUE** `#34224`_: (`tehsu`_) salt-cloud to rackspace uses public ip instead of private (refs: `#34499`_) -- **PR** `#33833`_: (*terminalmage*) Support syncing pillar modules to masterless minions +* **PR** `#34499`_: (`gtmanfred`_) remove unnecessary block parsing ip addrs for nova + @ *2016-07-07 16:23:46 UTC* -- **PR** `#33829`_: (*terminalmage*) Update versionchanged directive + * 58f46eae15 Merge pull request `#34499`_ from gtmanfred/2016.3 -- **PR** `#33814`_: (*terminalmage*) Support extraction of XZ archives in archive.extracted state + * 019671d4c2 remove unnecessary block parsing ip addrs for nova -- **PR** `#33778`_: (*sodium-chloride*) Fix minor docstring issues + * **PR** `#34468`_: (`twangboy`_) Use Python 2.7.12 for Windows Build -- **PR** `#33765`_: (*cachedout*) Correct issue with ping on rotate with minion cache + * **PR** `#34493`_: (`twangboy`_) Use Python 2.7.12 for Mac Build -- **PR** `#33726`_: (*jtand*) glance.warn_until shouldn't be checked for a doc string +* **PR** `#34486`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-06 17:28:31 UTC* -- **PR** `#33611`_: (*rolffokkens*) 2015.5 + * 95094c73ff Merge pull request `#34486`_ from rallytime/merge-2016.3 -- **PR** `#33960`_: (*mecarus*) Fix mongo get_load to return full mongo record instead of non-existant 'load' key + * 2b307b7ea1 Merge branch '2015.8' into '2016.3' -- **PR** `#33961`_: (*jacobhammons*) 2016.3.0 known issues update + * e2f576e847 Merge pull request `#34462`_ from terminalmage/git-describe-always -- **PR** `#33908`_: (*ticosax*) [boto_lambda] handle omitted Permissions parameter + * 6ef7ee198e Restrict use of --always to git 1.5.6 and newer -- **PR** `#33896`_: (*DmitryKuzmenko*) Don't deep copy context dict values. + * c554b22fc8 modules/git: added --always parameter for git.describe(). -- **PR** `#33905`_: (*rallytime*) Back-port `#33847`_ to 2016.3 + * 85f1f18239 Merge pull request `#34467`_ from rallytime/bp-34457 -- **PR** `#33910`_: (*cachedout*) Ensure tht pillar have freshest grains + * 746883741f Only access key metadata if we found key metadata -- **PR** `#33870`_: (*rallytime*) Add note about Xenial packages to 2016.3.0 release notes + * 9e15337b74 Merge pull request `#34432`_ from twangboy/fix_file.append -- **PR** `#33847`_: (*whiteinge*) Add docs for arg/kwarg eauth matching + * 13f11fddce Remove refactoring code -- **PR** `#33076`_: (*cachedout*) Avoid second grains load on windows multiprocessing + * 78f7c530bb Remove unit tests, integration tests written -- **PR** `#29153`_: (*DmitryKuzmenko*) ACL limit args + * b83392edea Remove len() in favor of boolean test + + * 4373408163 Fix line error + + * 2479b53e2f Fix erroneous report on newline code + + * 75b6ed1fd5 Change back to binary read + + * 65753cff6d Use os.linesep instead of \n + + * a55d63f086 Fix object names + + * 3e2fe12e5e Add new line if missing + + * 0b7821c8db Fix file.append state + + * 91e095bb41 Merge pull request `#34429`_ from terminalmage/pkg-latest-versioncheck + + * 667f31a72a Skip version checking for targeted packages in pkg.latest state + + * 0a264597ca Forgot reference to inotify (`#34455`_) + +* **ISSUE** `#33915`_: (`mattglv`_) Orchestration runner output on Success vs Failures in 2016.3.0 (refs: `#34459`_) + +* **PR** `#34459`_: (`terminalmage`_) Ignore retcode when formatting highstate output + @ *2016-07-06 03:59:23 UTC* + + * 7867d49193 Merge pull request `#34459`_ from terminalmage/issue33915 + + * 82a70e015f Ignore retcode when formatting highstate output + +* **ISSUE** `#34371`_: (`erikgrinaker`_) git.detached does not work with commit ID as ref (refs: `#34463`_) + +* **PR** `#34463`_: (`terminalmage`_) states/git: pass required cwd parameter to git.describe. + @ *2016-07-06 03:59:05 UTC* + + * ae6902290a Merge pull request `#34463`_ from terminalmage/issue34371 + + * f981a5646a states/git: pass required cwd parameter to git.describe. + +* **ISSUE** `#34395`_: (`artxki`_) Nonfunctioning default_password in states.postgres_user.present (refs: `#34436`_) + +* **PR** `#34466`_: (`rallytime`_) Back-port `#34436`_ to 2016.3 + @ *2016-07-06 03:57:15 UTC* + + * **PR** `#34436`_: (`artxki`_) Fix `#34395`_ Nonfunctional default_password in states.postgres_user.present (refs: `#34466`_) + + * 8f8a6d2f68 Merge pull request `#34466`_ from rallytime/bp-34436 + + * e97c00b018 Fix `#34395`_ Nonfunctional default_password in states.postgres_user.present + + * **PR** `#34453`_: (`justinta`_) Arch linux does not have osrelease or osmajorrelease grains + +* **ISSUE** `#33697`_: (`asloboda-cisco`_) Client clash with Tornado IOLoop (refs: `#34456`_) + +* **PR** `#34456`_: (`thatch45`_) Be more careful when making the SMinion + @ *2016-07-05 18:41:57 UTC* + + * fc67a4e216 Merge pull request `#34456`_ from thatch45/2016.3 + + * edd6b95c60 we need to be more careful when making the SMinion + +* **PR** `#34452`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-05 17:49:19 UTC* + + * 72b4d6b52c Merge pull request `#34452`_ from rallytime/merge-2016.3 + + * 91120dba01 Merge branch '2015.8' into '2016.3' + + * 7bb0868c66 Merge pull request `#34451`_ from rallytime/merge-2015.8 + + * 55a91e22be Merge branch '2015.5' into '2015.8' + + * 8c72ee56e4 Merge pull request `#34435`_ from cachedout/backport_config_dir_integration + + * 0e2c71a537 Backport change to integraiton test suite + + * e65d1ae374 Merge pull request `#34401`_ from terminalmage/rpm-version_cmp + + * 7cefd4182d Use rpmdev-vercmp as a fallback for version comparison on RHEL5 + + * 5ddf417432 Merge pull request `#34366`_ from steverweber/fix_servicerestart + + * 7847c39024 Update service.py + + * 485454febb Merge pull request `#34426`_ from cro/inotify-linux-only + + * 54a02f25ba Document that inotify is Linux only + +* **PR** `#34427`_: (`twangboy`_) Automated signing fixes for Ubuntu 16.04, 14.04, 12.04 (for dmurphy) + @ *2016-07-05 15:18:46 UTC* + + * 7508d291d2 Merge pull request `#34427`_ from twangboy/sign_fx + + * c804480982 Add changes suggested by @cachedout + + * 494deda074 Automated signing fixes for Ubuntu 16.04, 14.04, 12.04 + +* **ISSUE** `#34379`_: (`UtahDave`_) variable referenced before assignment (refs: `#34400`_) + +* **PR** `#34400`_: (`cachedout`_) Fix uninitialized value + @ *2016-07-01 17:42:55 UTC* + + * b3875f397d Merge pull request `#34400`_ from cachedout/issue_34379 + + * b413f05a4f Fix uninitialized value + +* **PR** `#34404`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-01 15:02:09 UTC* + + * d1cd36ab2b Merge pull request `#34404`_ from rallytime/merge-2016.3 + + * 8398de0baf Merge branch '2015.8' into '2016.3' + + * fe18bbb527 Merge pull request `#34392`_ from cro/salt-cloud-doc-clarify + + * 6cce575d40 Clarify that salt-cloud doesn't get installed by bootstrap + + * 45b8fb10d7 Merge pull request `#34373`_ from jtand/network_state_integration_test + + * 1d24053e36 network.system sls file + + * 4a9e6af542 network.routes sls file + + * 76c90b2ef6 network.managed sls file + + * 84a36369fa Added network state integration test + + * d6af1de0b7 Optimize pkg integration tests and add a couple new tests (`#34377`_) + +* **PR** `#34292`_: (`twangboy`_) Fix runas function for System Account + @ *2016-06-30 18:25:09 UTC* + + * ad63b1d3d3 Merge pull request `#34292`_ from twangboy/fix_runas + + * 433f300eba Enable all privileges + + * 5584cc2c6f Handle users that aren't admin + + * e9d2402c0b Fix runas function for System Account + +* **PR** `#34388`_: (`rallytime`_) Back-port `#34378`_ to 2016.3 + @ *2016-06-30 17:50:48 UTC* + + * **PR** `#34378`_: (`adelcast`_) network_settings.py: fix documentation (refs: `#34388`_) + + * be9a831ef6 Merge pull request `#34388`_ from rallytime/bp-34378 + + * 2040dbeca5 network_settings.py: fix documentation + + * **PR** `#34352`_: (`cro`_) Esxi dvs + + * **PR** `#34386`_: (`rallytime`_) Beacon network docs + +* **PR** `#34376`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-30 14:31:28 UTC* + + * 5a44b077a0 Merge pull request `#34376`_ from rallytime/merge-2016.3 + + * 3149da1bcc Merge branch '2015.8' into '2016.3' + + * af8ef1e461 Merge pull request `#34368`_ from rallytime/merge-2015.8 + + * 3bce0cb510 Merge branch '2015.5' into '2015.8' + + * 970aaa46d4 Merge pull request `#34252`_ from gtmanfred/2015.5 + + * 82183f1572 return list of nodes for lxc driver when called directly + + * 94e094652c Back-port `#34324`_ to 2015.8 (`#34344`_) + + * 11dc0203b0 Making salt-ssh pass proper return codes for jinja rendering errors (`#34342`_) + +* **PR** `#34365`_: (`sjorge`_) fixes computenode_* grains on SmartOS compute nodes + @ *2016-06-29 17:55:24 UTC* + + * 3808d849fe Merge pull request `#34365`_ from sjorge/2016.3-fix-broken-smartos-grains + + * 3ff895cacf fixes computenode_* grains on SmartOS compute nodes + +* **PR** `#34353`_: (`cro`_) Remove proxy check and additional GetConnection--this makes the proxy… + @ *2016-06-29 14:54:47 UTC* + + * 65efb55917 Merge pull request `#34353`_ from cro/pyvmomi-ssl-fail + + * 14ea29f446 Remove proxy check and additional GetConnection--this makes the proxy fail to start. Need to check to see if proxy memory leak is back. + +* **PR** `#34348`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-28 23:28:45 UTC* + + * c89d1ad27f Merge pull request `#34348`_ from rallytime/merge-2016.3 + + * c87a108a12 Don't forget the pylint disables for range + + * 359e8ca2ce Pylint fixes + + * f9ab8ba46d Merge branch '2015.8' into '2016.3' + + * f6bd1ad47e Revert py3modernize lint changes (`#34339`_) + + * 046bdaa9f2 Merge pull request `#34306`_ from ghedo/iptables_flush_table + + * 882c6c9c86 Do not force 'filter' table when flushing + + * 0c60feac02 Doc clarifications to file modules, addition of new `profile` log level to docs, fixed example in dnsmasq (`#34323`_) + + * b793426c23 Remove unnecessarily-disabled sanity check (`#34325`_) + + * c5890a0eca Merge pull request `#34335`_ from rallytime/merge-2015.8 + + * 2296587536 Merge branch '2015.5' into '2015.8' + + * 6cce545d92 Merge pull request `#34313`_ from rallytime/bootstrap-2015.5 + + * c7db73be92 [2015.5] Update to latest bootstrap script v2016.06.27 + + * a6d3cc637b Typo in dockerio doc (`#34319`_) + + * dd4c937009 Merge pull request `#34312`_ from rallytime/bootstrap-2015.8 + + * 944a393f89 [2015.8] Update to latest bootstrap script v2016.06.27 + + * 91703d2dc4 Merge pull request `#34307`_ from rallytime/fix-test-example + + * f44a0543fe Fix test example in integration testing docs + +* **ISSUE** `#34255`_: (`tmehlinger`_) fire_event requisite does not work in orchestration states (refs: `#34256`_, `#34343`_) + + * **PR** `#34343`_: (`rallytime`_) Back-port `#34256`_ to 2016.3 + + * **PR** `#34256`_: (`tmehlinger`_) detect running from master in State.event method (refs: `#34343`_) + +* **PR** `#34338`_: (`themalkolm`_) Add listen/listen_in support to stateconf.py + @ *2016-06-28 21:50:14 UTC* + + * 0b9cb602fe Merge pull request `#34338`_ from themalkolm/patch-2 + + * cd63541325 Add listen/listen_in support to stateconf.py + +* **PR** `#34283`_: (`sjorge`_) 2016.3 mount vfstab support + @ *2016-06-28 19:23:39 UTC* + + * 80a659bb51 Merge pull request `#34283`_ from sjorge/2016.3-mount-fstab + + * b8c6948cd5 fixes broken rm_fstab test due to missing __grain__.kernel + + * d633e774ea actually do the cleanup, oops + + * 987c240850 minor cleanup + + * c3667203bf add test for vfstab + + * 80e9d1d278 set __grains__ for fstab unit test + + * f0f5d449c3 mount.vfstab implemented on Solaris like platforms + + * 4398e8841b undo some changes to mount.fstab and mount.rm_fstab, create mount.vfstab and mount.rm_vfstab + + * 133d3bb2bb mount.set_fstab errors out on Solaris like platforms + + * c0863fb024 mount.rm_fstab works with Solaris like platforms + + * 151799ea74 initial vfstab support (Solaris like platforms) + +* **ISSUE** `#34321`_: (`Ch3LL`_) Raspberry Pi salt-minion missing osmajorrelease grain (refs: `#34322`_) + +* **PR** `#34322`_: (`Ch3LL`_) add osmajorrelease grain for raspbian + @ *2016-06-28 19:08:39 UTC* + + * 75aad073a9 Merge pull request `#34322`_ from Ch3LL/add_grains_majorrelease_test + + * 693cc61aa4 add osmajorrelease to ubuntu and fix pylint + + * 2fc3e8a54b add osmajorrelease grain for raspbian + +* **PR** `#34337`_: (`clinta`_) Change merge-if-exists logic to properly report changes + @ *2016-06-28 18:41:56 UTC* + + * 81547f413d Merge pull request `#34337`_ from clinta/serialize-merge + + * ebe7def2fb Change merge-if-exists logic to properly report changes + +* **PR** `#34300`_: (`vutny`_) Make apache.configfile state handle the Options list correctly + @ *2016-06-28 18:34:45 UTC* + + * affc65dc79 Merge pull request `#34300`_ from vutny/fix-apache-vhost-options + + * 52001afdde Fix apache.configfile state example + + * 64a9442e38 apache.config: correctly output a list of the Options + +* **ISSUE** `#33588`_: (`whytewolf`_) rabbitmq_user.present error (refs: `#34333`_) + + * **PR** `#34333`_: (`rallytime`_) Back-port `#33734`_ to 2016.3 + + * **PR** `#34304`_: (`rallytime`_) Back-port `#33734`_ to 2016.3 (refs: `#34333`_) + + * **PR** `#33734`_: (`glomium`_) modules/rabbitmq.py version checking had a logical error (refs: `#34333`_, `#34304`_) + +* **ISSUE** `#34329`_: (`clinta`_) file.serialize merge_if_exists fails: 'function' object has no attribute 'deserialize' (refs: `#34330`_) + + * **PR** `#34330`_: (`clinta`_) fix `#34329`_ + +* **ISSUE** `#34170`_: (`rodoyle`_) ps.top raises ValueError "too many values to unpack" when psutil > 4.1.0 (refs: `#34318`_) + + * **PR** `#34318`_: (`rallytime`_) Back-port `#32182`_ to 2016.3 + + * **PR** `#32182`_: (`dongweiming`_) Fix psutil.cpu_times unpack error (refs: `#34318`_) + +* **PR** `#34311`_: (`rallytime`_) [2016.3] Update to latest bootstrap script v2016.06.27 + @ *2016-06-27 18:59:27 UTC* + + * 1398b1c51e Merge pull request `#34311`_ from rallytime/bootstrap-2016.3 + + * 75aa7047bc [2016.3] Update to latest bootstrap script v2016.06.27 + +* **ISSUE** `#34129`_: (`onorua`_) fqdn_ip4 and fqdn_ip6 are empty on 2016.3+ (refs: `#34284`_) + +* **PR** `#34284`_: (`rallytime`_) Don't require 'domain' to be present before checking fqdn_ip* grains + @ *2016-06-27 17:06:17 UTC* + + * dc8462451d Merge pull request `#34284`_ from rallytime/fix-34129 + + * 5f45a8ff73 Don't require 'domain' to be present before checking fqdn_ip* grains + +* **ISSUE** `#30493`_: (`sjorge`_) salt.modules.status mostly broken on solaris like operating systems. (refs: `#34296`_) + +* **PR** `#34296`_: (`sjorge`_) 2016.3 status module now works on Solaris like platforms + @ *2016-06-27 16:49:41 UTC* + + * 259935d6d2 Merge pull request `#34296`_ from sjorge/2016.3-module.status + + * a26340c555 make status.all_status work on Solaris like platforms + + * 33e24fa697 make status.cpustats work on Solaris like platforms + + * d214e9c776 correctly cast to int for status.netdevs on Solaris like platforms + + * b74761b52d make status.cpuinfo support Solaris like platforms and OpenBSD + + * 2cd76d5ab5 make status.diskstats work on Solaris like platforms + + * 3211538830 make status.diskusage work on Solaris like platforms + + * a12b311a62 make status.netdev compatible with Solaris like platforms + + * 3bc01458aa make status.netstats compatible with Solaris like platforms + + * 25678901fa avoid KeyError in ping_master + + * 81d7fc98d8 make status.vmstats work on Solaris like platforms and OpenBSD + +* **PR** `#34281`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-24 21:51:43 UTC* + + * 376bec0455 Merge pull request `#34281`_ from rallytime/merge-2016.3 + + * ae8ad9329c Merge branch '2015.8' into '2016.3' + + * d235b1245b Merge pull request `#34233`_ from thegoodduke/for_2015.8_ipset + + * 4da5e35bf4 ipset: fix the comment containing blank + + * 65c5675a3f Merge pull request `#34257`_ from rallytime/fix-34037 + + * d7a5e9b10e Remove test that doesn't actually test anything + + * c4c037d600 Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer + + * 203870f147 Merge pull request `#34274`_ from clinta/2015.8 + + * 6572454918 Don't escape source before calling managed + + * a59dc85a15 Merge pull request `#34258`_ from rallytime/merge-2015.8 + + * ea914b67cd Merge branch '2015.5' into '2015.8' + + * 8d5ed91980 Merge pull request `#34225`_ from richardscollin/fix-win-set-datetime + + * 6286771ef7 Fix win_system.set_system_date_time + + * cb1e8bf082 Merge pull request `#34232`_ from thegoodduke/for_2015.5_ipset + + * 344eb60762 ipset: fix commont containing blank + +* **PR** `#34271`_: (`opdude`_) Fixed symlinks on windows where the slashes don't match + @ *2016-06-24 17:05:25 UTC* + + * 805171c949 Merge pull request `#34271`_ from Unity-Technologies/hotfix/windows_symlinks + + * e0a1a55431 Fixed symlinks on windows where the slashes don't match + +* **ISSUE** `#14915`_: (`johngrasty`_) SmartOS/OmniOS - mount module fails. (refs: `#34254`_) + + * **PR** `#34254`_: (`sjorge`_) Fix for `#14915`_ + +* **PR** `#34259`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-24 14:27:30 UTC* + + * 39579ce5f6 Merge pull request `#34259`_ from rallytime/merge-2016.3 + + * eeaf3cc1e7 Merge branch '2015.8' into '2016.3' + + * 92962957c8 Merge pull request `#34093`_ from terminalmage/issue33873 + + * 5edb45d746 win_pkg: refresh pkg database if refresh=True passed to version() or list_pkgs() + + * 0078adee35 Catch CommandExecutionError in pkg states + + * cb5399787c Merge pull request `#34136`_ from meaksh/salt-suse-os-detection-2015.8 + + * 97f1958863 some cleanup and renaming + + * 72c8e5d78f better way to check for openSUSE Leap + + * 548971bdc9 Fix for SUSE OS grains in 2015.8 + +* **PR** `#34134`_: (`meaksh`_) Fixed behavior for SUSE OS grains in 2016.3 (refs: `#34136`_) + @ *2016-06-23 20:24:51 UTC* + + * **PR** `#33903`_: (`meaksh`_) Fetching grains['os'] from /etc/os-release on SUSE systems if it is possible (refs: `#34134`_) + + * 3acda896f2 Merge pull request `#34134`_ from meaksh/salt-suse-os-detection + + * 23ce0b431b some cleanup and renaming + + * 516bbc454d better way to check for openSUSE Leap + + * 44eda2ad9f Fix for openSUSE Tumbleweed + + * 0d4a710d86 fixes for fopen mock and some os_release_map for SLES11SP3 + + * d6410a03b8 unit tests for SUSE os grains detection + + * 47ecb7013b Normalization of osfullname grain for openSUSE + + * 9c81f434fa one clause to set OS grain from CPE_NAME + + * d78d57b717 Test fixed: get OS grain from /etc/os-release if possible + + * d80e0532ff fix: osarch_mock + + * db00ec756d osarch mock for unit test + + * dabc5cab7e lint fix + + * 9ac514724b testing if SUSE os grain is set from /etc/os-release + + * bc671336a7 Getting the 'os' grain from CPE_NAME inside /etc/os-release for SUSE and openSUSE + + * 64af4d4145 Adding SLES_SAP to OS_FAMILY_MAP + +* **ISSUE** `#34137`_: (`christoe`_) Win_task info function broken (refs: `#34159`_) + +* **ISSUE** `#34135`_: (`christoe`_) Arguments to Windows task creation module are not used (refs: `#34159`_) + +* **PR** `#34159`_: (`christoe`_) Fixes to the win_task module + @ *2016-06-23 17:54:53 UTC* + + * 5f42fd4486 Merge pull request `#34159`_ from christoe/2016.3 + + * f4143669db Fixes `#34135`_, Fixes `#34137`_ + +* **PR** `#34223`_: (`peterdemin`_) Fixed typo in filtering LDAP's potential_ous + @ *2016-06-23 17:26:31 UTC* + + * 0a0267149f Merge pull request `#34223`_ from peterdemin/bugfix-eauth-ldap-expanding + + * 8bb03ec109 Fixed typo in filtering LDAP's potential_ous + +* **PR** `#34239`_: (`vutny`_) file.find module: fix handling of broken symlinks + @ *2016-06-23 17:25:17 UTC* + + * f74f176bd5 Merge pull request `#34239`_ from vutny/file-find-broken-symlinks + + * 7e164c4f86 file.find module: fix handling of broken symlinks + +* **PR** `#34229`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-22 22:57:00 UTC* + + * 4157f6fd39 Merge pull request `#34229`_ from rallytime/merge-2016.3 + + * 940ac86d4e Merge branch '2015.8' into '2016.3' + + * 56c7267631 fix regression from `#33681`_ which causes pulling a list of s3 objects via s3.query to fail (`#34208`_) + + * 02eb331494 Fix a pair of gitfs bugs (`#34218`_) + + * 6d643cd528 Merge pull request `#34182`_ from rallytime/fix-34043 + + * b7d49c5052 Handle child PIDs differently depending on the availability of psutils + + * 5d3ec31564 Clarify pkg.list_repo_pkgs docstring for held packages (`#34188`_) + + * 5bca5c42f1 Change target for dockerng assuming default status to Nitrogen release (`#34206`_) + +* **ISSUE** `#33879`_: (`Ch3LL`_) saltutil.wheel minions.connected does not return anything with remote minions (refs: `#34214`_) + +* **PR** `#34214`_: (`rallytime`_) Update saltutil.wheel docs to specify remote vs local minion behavior + @ *2016-06-22 19:22:30 UTC* + + * b5ea1495af Merge pull request `#34214`_ from rallytime/fix-33879 + + * 1be05f6a87 Update saltutil.wheel docs to specify remote vs local minion behavior + +* **ISSUE** `#34074`_: (`fooka03`_) Unable to use S3 file backend with 2016.3.1 on Ubuntu 14.04 or 16.04 (refs: `#34209`_, `#34208`_) + +* **ISSUE** `#32916`_: (`giannello`_) file.managed memory usage with s3 sources (refs: `#33599`_, `#33682`_) + +* **PR** `#34209`_: (`lomeroe`_) fix regression in s3.query from `#33682`_ + @ *2016-06-22 18:50:19 UTC* + + * **PR** `#33682`_: (`lomeroe`_) backport `#33599`_ to 2016.3 (refs: `#34209`_) + + * **PR** `#33599`_: (`lomeroe`_) Fix s3 large file download (refs: `#33681`_, `#33682`_) + + * 4205fd605c Merge pull request `#34209`_ from lomeroe/fix_s3_utils_regression_33682 + + * a2b99703b1 fix regression in s3.query from `#33682`_ + +* **PR** `#34222`_: (`cachedout`_) Lint 34200 + @ *2016-06-22 18:48:54 UTC* + + * **PR** `#34200`_: (`secumod`_) Fix parted module set CLI example (refs: `#34222`_) + + * 05a4785c8c Merge pull request `#34222`_ from cachedout/lint_34200 + + * eadf80a56f Linted `#34200`_ + + * 2cd0433f8d Fix parted module set CLI example + +* **PR** `#34197`_: (`eliasp`_) Make `module.ssh.recv_known_host()` more resilient against hosts not returning a key + @ *2016-06-22 17:26:02 UTC* + + * 0cbdb73fc5 Merge pull request `#34197`_ from eliasp/2016.3-salt.modules.ssh.recv_known_host-empty_results + + * 82c4b1229e Make `module.ssh.recv_known_host()` more resilient against hosts not returning a key + +* **ISSUE** `#34199`_: (`DarkKnightCZ`_) cmdmod.exec_all doesn't work with Windows PowerShell (refs: `#34201`_) + +* **ISSUE** `#34196`_: (`DarkKnightCZ`_) Salt call cmdmod.exec_code_all fails on Windows minion due to invalid file mode (refs: `#34198`_) + +* **PR** `#34201`_: (`DarkKnightCZ`_) Suffix temp file with .sr1 and add mandatory argument when executing PowerShell script + @ *2016-06-22 17:21:24 UTC* + + * **PR** `#34198`_: (`DarkKnightCZ`_) Don't use binary mode for cmdmod.exec_code (refs: `#34201`_) + + * 606ae3c886 Merge pull request `#34201`_ from DarkKnightCZ/cmdmod-34199 + + * 05748743bc Suffix temp file with .sr1 and add -File argument when executing PowerShell code via cmdmod.exec_code + +* **ISSUE** `#34196`_: (`DarkKnightCZ`_) Salt call cmdmod.exec_code_all fails on Windows minion due to invalid file mode (refs: `#34198`_) + +* **PR** `#34198`_: (`DarkKnightCZ`_) Don't use binary mode for cmdmod.exec_code (refs: `#34201`_) + @ *2016-06-22 17:14:06 UTC* + + * cb704b780b Merge pull request `#34198`_ from DarkKnightCZ/cmdmod-34196 + + * 04553cd3de Don't use binary mode for cmdmod.exec_code + +* **PR** `#34172`_: (`dmurphy18`_) Support for building with local packages on Debian and Ubuntu + @ *2016-06-22 16:36:44 UTC* + + * 0578a2f87d Merge pull request `#34172`_ from dmurphy18/debbuild_deps + + * f7f8a5d33f Fixed pylint issues + + * 82fa276141 Support for building with local packages on Debian and Ubuntu + + * **PR** `#34194`_: (`vutny`_) Correct the docstrings formatting in pkgbuild modules and state + + * **PR** `#34056`_: (`vutny`_) Make rpmbuild module work on non-RPM based GNU/Linux systems (refs: `#34194`_) + +* **PR** `#34186`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-21 23:26:34 UTC* + + * a8429c2595 Merge pull request `#34186`_ from rallytime/merge-2016.3 + + * 318c2ed6a1 Merge branch '2015.8' into '2016.3' + + * 1c4369d093 Merge pull request `#34184`_ from rallytime/merge-2015.8 + + * 8e36e90966 Merge branch '2015.5' into '2015.8' + + * 5411ebb3b4 Merge pull request `#34141`_ from jtand/boto_vpc_test_fix + + * b7ac6c735a Moved imports to top, out of _get_moto_version function + + * 02f9ba99ba Updated version check. Moved check into it's own function + + * d445026c56 Updated test to work with new moto version. Changed strings to unicode + + * c059d6c08c Merge pull request `#34176`_ from rallytime/bp-34103 + + * 2e5e7ed03c Fix diskusage beacon + + * 5cbaaed167 Merge pull request `#34179`_ from terminalmage/issue34114 + + * 86d1b8e864 Raise the correct exception when gitfs lockfile is empty + + * 67deded119 Merge pull request `#34178`_ from terminalmage/remove-comment + + * 4965be72b1 Remove unnecesssary comment + + * 6387d1636e fix salt --summary to count not responding minions correctly (`#34165`_) + + * e5949ea6f1 doc: add missing dot (`#34175`_) + + * 47595d6795 Typo fix (`#34174`_) + + * 3669048654 Merge pull request `#34077`_ from rallytime/grains-tests + + * 2199bb8a78 Add integration tests for grains.append + + * 37cfe70724 Add some grains targeting tests + +* **ISSUE** `#34162`_: (`ryanwalder`_) salt-call default loglevel regression (refs: `#34173`_) + +* **PR** `#34173`_: (`rallytime`_) Update docs to match log_level default + @ *2016-06-21 17:15:53 UTC* + + * 3413c494bd Merge pull request `#34173`_ from rallytime/fix-34162 + + * f577681f0b Update docs to match log_level warning default + +* **ISSUE** `#34094`_: (`avandendorpe`_) cron.file is broken (refs: `#34095`_) + +* **PR** `#34095`_: (`rallytime`_) Back-port `#32396`_ to 2016.3 + @ *2016-06-21 16:12:39 UTC* + + * **PR** `#32396`_: (`eradman`_) Unbreak cron.file (refs: `#34095`_) + + * c596bf5744 Merge pull request `#34095`_ from rallytime/bp-32396 + + * 074b6ab5c2 Correct pylint error + + * 20ff5c879a Unbreak cron.file + +* **PR** `#34108`_: (`l2ol33rt`_) Make dockerng.absent state honor test=true + @ *2016-06-21 15:55:29 UTC* + + * b98687875f Merge pull request `#34108`_ from l2ol33rt/docker_absent_dryrun + + * 5598cb4a21 Make docker.absent honor test=true + +* **ISSUE** `#34012`_: (`viq`_) States mount.* fail on OpenBSD's tmpfs (refs: `#34133`_) + +* **PR** `#34133`_: (`rallytime`_) Back-port `#34057`_ to 2016.3 + @ *2016-06-21 15:53:46 UTC* + + * **PR** `#34057`_: (`ajacoutot`_) _active_mounts_openbsd: unbreak output for special filesystems (refs: `#34133`_) + + * a75386a669 Merge pull request `#34133`_ from rallytime/bp-34057 + + * f7be5e182b _active_mounts_openbsd: unbreak output for special filesystems + +* **PR** `#34156`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-21 15:52:59 UTC* + + * dd989dac78 Merge pull request `#34156`_ from rallytime/merge-2016.3 + + * b061b86946 Merge branch '2015.8' into '2016.3' + + * 65fba5b4d7 Merge pull request `#34142`_ from isbm/isbm-getid-loglevel-shift + + * 236a67b702 Move log message from INFO to DEBUG. + + * 79a719b719 Update documentation on "refresh" behavior in pkg states (`#34100`_) + + * 6d0d52fa86 modules.pkg int tests: skip refresh_db upon error (`#34072`_) + +* **PR** `#34110`_: (`garethgreenaway`_) Fixes to git module & state module related to identity file + @ *2016-06-21 15:52:17 UTC* + + * b302cb03ef Merge pull request `#34110`_ from garethgreenaway/git_needs_saltenv_for_identity + + * 68092cdc8c When specifying the SSH identity to use with Git as a salt URL, eg. salt://files/identity, if that file exists outside of the default base environment the file won't be accessible so we need to include the saltenv. + +* **ISSUE** `#34120`_: (`rmohta`_) Correct package name to systemd-python for RHEL 7 in docs.saltstack.com (refs: `#34138`_) + +* **ISSUE** `#31402`_: (`vutny`_) [repo] systemd-python required package is missing from RHEL7 archive (refs: `#34138`_) + +* **PR** `#34138`_: (`rallytime`_) Update package dep note to systemd-python for RHEL7 install + @ *2016-06-21 15:51:24 UTC* + + * 6c3405755a Merge pull request `#34138`_ from rallytime/fix-34120 + + * 73f3e12ce6 Update package dep note to systemd-python for RHEL7 install + + * **PR** `#34166`_: (`vutny`_) Fix YAML indentation in Apache state docstrings + + * **PR** `#34098`_: (`terminalmage`_) Restore old refresh logic + + * **PR** `#34087`_: (`bbinet`_) Encourage to report issues to upstream PillarStack project + +* **PR** `#34075`_: (`jfindlay`_) modules.inspectlib.kiwiproc: import gate lxml + @ *2016-06-17 15:36:08 UTC* + + * 9da592a297 Merge pull request `#34075`_ from jfindlay/import_xml + + * f882a72348 modules.inspectlib.kiwiproc: import gate lxml + +* **PR** `#34056`_: (`vutny`_) Make rpmbuild module work on non-RPM based GNU/Linux systems (refs: `#34194`_) + @ *2016-06-17 15:14:51 UTC* + + * 52b852216a Merge pull request `#34056`_ from vutny/rpmbuild-support-debian + + * 8ff36d4f2b Expose virtual pkgbuild module as rpmbuild on non-RPM based systems if all required utilities are in place + + * 758f5cd77c Make rpmbuild module work on Debian GNU/Linux and derivatives + +* **PR** `#34073`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-16 23:02:32 UTC* + + * f2a2c2bf53 Merge pull request `#34073`_ from rallytime/merge-2016.3 + + * f6bfaede21 Merge branch '2015.8' into '2016.3' + + * 1b76de1557 Merge pull request `#34069`_ from rallytime/test-minion-return-message + + * 60561ac6fc Add a test to check for disconnected minion messaging + + * 3119693dac Merge pull request `#34048`_ from terminalmage/issue30100 + + * 715e7af8a4 Ensure only one fileserver update in a masterless run + + * dd03024931 Merge pull request `#34011`_ from rallytime/bp-33948-2015.8 + + * a4660d1ff7 Warn when custom returners don't have minions kwarg in save_load + + * 78befde62f Add note to release notes about returner minions kwarg change + + * 4e7f35fa36 Fix loop over cache in auth checking! + + * 06963e0505 Save an entire minion cache traversal on each master pub + + * bca437128e Fixed a bug in the consul.py module that was preventing services (`#34051`_) + + * 8ba117c7f6 Merge pull request `#34045`_ from jacobhammons/release-prev + + * 43b4a12aa2 Updated latest release version + + * f9bfcde61f Always make changes to minion config if set (`#34020`_) + + * e25dba49e2 More YAML indentation fixes in state module examples (`#34030`_) + + * 5b5eae4ca9 Merge pull request `#34018`_ from rallytime/merge-2015.8 + + * 77f44f3087 Merge branch '2015.5' into '2015.8' + + * 871f7966ce Lint fix for `#34000`_ (`#34005`_) + + * f758e42172 Fix incorrectly written test (`#34000`_) + + * cf6281b4cf Add loader.utils() example to calling minion_mods (`#33953`_) + + * 6b98e8a9ea Merge pull request `#33880`_ from terminalmage/zh744 + + * ea726d11c8 pkg.uptodate: Pass kwargs to pkg.list_upgrades + + * de90b35d2b salt/modules/zypper.py: add fromrepo support to list_upgrades + + * 35fbb06df5 salt/modules/win_pkg.py: add kwargs to list_upgrades + + * bf5505f425 salt/modules/solarisips.py: add kwargs to list_upgrades + + * 6e89a8be98 salt/modules/pkgutil.py: add kwargs to list_upgrades + + * 5179dbcec4 salt/modules/pacman.py: add kwargs to list_upgrades + + * 46e5a52784 salt/modules/macports.py: add kwargs to list_upgrades + + * 76143b76ca salt/modules/ebuild.py: add kwargs to list_upgrades + + * b40fc9bc62 salt/modules/brew.py: add kwargs to list_upgrades + + * 4f11c16d86 salt/modules/aptpkg.py: add fromrepo support to list_upgrades + + * cb88960ed1 Merge pull request `#33904`_ from rallytime/bp-33806 + + * 638ccf501d Work around upstream cherrypy bug + + * 7d940aed1f states.file: fix indentation in YAML examples (`#34003`_) + + * 4c7fac0aaa Remove loader test for pam module (`#34002`_) + + * c4dab6a074 Merge pull request `#33990`_ from jacobhammons/community-projects + + * b20213fd79 Adds links to several current Salt-related projects Removes the salt_projects.rst file which hasn't been updated in a long time, this is replaced by the updated topics/projects/index.rst file Adds a note about Salt Pack to the installation doc + + * 444c15792c Merge pull request `#33983`_ from twangboy/fix_docs_join_domain + + * b057be04b4 Fix typo, more documentation + + * d8c2f3e57a Clarify the `account_exists` parameter + + * 9bd2317992 Merge pull request `#33951`_ from jfindlay/gem_tests + + * 2eb633ccad modules.gem int tests: only check known installed gems + + * 9f3e18b037 modules.gem int tests: (un)install a non-core gem + + * 53baae6eb1 Merge pull request `#33984`_ from jfindlay/disk_capacity + + * 6cbe31e6c2 states.disk: rewrite unit tests + + * 82c77b533f states.disk.status: validate percent values + + * aedc4e15e5 states.disk: add documentation + + * fa5efb6a69 Merge pull request `#33985`_ from rallytime/more-batch-tests + + * 3e7ab8c7b3 Write some more simple batch command tests + + * 6080846cce acl.ClientACL: add unit tests (`#33684`_) + +* **ISSUE** `#33831`_: (`astehlik`_) file.managed state should not download a file if the checksum did not change (refs: `#34010`_) + +* **PR** `#34010`_: (`terminalmage`_) Do not cache remote files if they are already cached + @ *2016-06-16 21:03:47 UTC* + + * 790384f413 Merge pull request `#34010`_ from terminalmage/issue33831 + + * 636d081ae0 Do not cache remote files if they are already cached + +* **PR** `#34009`_: (`rallytime`_) Back-port `#33948`_ to 2016.3 + add log message (refs: `#34011`_) + @ *2016-06-16 21:01:09 UTC* + + * **PR** `#33948`_: (`cachedout`_) Save an entire minion cache traversal on each master pub (refs: `#34011`_, `#34009`_) + + * dd26d6fd74 Merge pull request `#34009`_ from rallytime/bp-33948 + + * 239af9ae5e Warn when custom returners don't have minions kwarg in save_load + + * c776d2d795 Add note to release notes about returner minions kwarg change + + * 5f696082e3 Fix loop over cache in auth checking! + + * 180c312715 Save an entire minion cache traversal on each master pub + +* **ISSUE** `#33927`_: (`phil123456`_) Salt - windows minion cannot do anything (refs: `#33941`_) + +* **PR** `#33941`_: (`cachedout`_) Don't call os.getppid() on Windows + @ *2016-06-16 20:56:17 UTC* + + * 5f4ef46d2f Merge pull request `#33941`_ from cachedout/issue_33927 + + * 5fe889c7f1 Don't call os.getppid() on Windows + +* **PR** `#34067`_: (`jacobhammons`_) Fixes doc refresh bug on chrome mobile. + @ *2016-06-16 18:44:12 UTC* + + * fa253aa62b Merge pull request `#34067`_ from jacobhammons/mobile-fix + + * ce027fd769 Fixes doc refresh bug on chrome mobile. + + * **PR** `#34050`_: (`rallytime`_) Back-port `#34026`_ to 2016.3 + + * **PR** `#34026`_: (`bensherman`_) removed method that doesn't exist (refs: `#34050`_) + +* **PR** `#33987`_: (`isbm`_) inspectlib cleanup + @ *2016-06-15 22:09:31 UTC* + + * 73ff11585e Merge pull request `#33987`_ from isbm/isbm-inspectlib-cleanup + + * e36821510f Fix documentation: add an example how to export system to the Kiwi + + * fe300ccf73 Lintfix + + * 96423076b1 Add unit test for file tree + + * 8975036b27 Add get_unmanaged_files test + + * be5f12fcaf Add initial unit test for inspectlib.collector.Inspector + + * 652c96d7e7 Stop build (not implemented yet) + + * 58e85ea0ab Refactor class caller + + * 878f67674a Sort package names + + * c31818b4aa Fix lint: PEP8 multiplication of 4. + + * c87fff3680 Add root-only warning when exporting system with Kiwi + + * 9bd80f02fc Implement users Kiwi export + + * e191f338c7 Cleanup code + + * 80f45defae Implement packages and patterns gathering + + * ad45a265f5 Add Debian support for the repo generator + + * 6280ad137e Semifix: sometimes SQLite3 is locked. TODO: a proper handling required. + + * 51567ab61d Implement SUSE repositories export + + * e4ac113927 Add Kiwi support to the collector/inspector + + * eceeb4ecf2 Add ability to specify an additional PID file + + * f522a91ac6 Add ISO/image build (stub) and export to the Kiwi + + * bb19684606 Add Kiwi processor exception + + * 805e2ce204 Add Kiwi exported (initial) + + * a52f9f7107 Add default configuration + +* **ISSUE** `#34038`_: (`Ch3LL`_) user.list_users does not work on smartos (refs: `#34042`_) + + * **PR** `#34042`_: (`sjorge`_) fix `#34038`_ + +* **PR** `#34025`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-15 19:41:00 UTC* + + * f546a00dc9 Merge pull request `#34025`_ from rallytime/merge-2016.3 + +* **PR** `#34044`_: (`jacobhammons`_) Updated latest release to 2016.3.1 + @ *2016-06-15 19:20:28 UTC* + + * 3035520594 Merge pull request `#34044`_ from jacobhammons/3.1 + + * a4b67fd1e9 Updated latest release to 2016.3.1 Clean up installation instructions code-block type updates Add link to jinja tutorial + + * **PR** `#34014`_: (`jnhmcknight`_) fix launch config creation params + + * **PR** `#34021`_: (`twangboy`_) Always make changes to minion config if set (2016.3) + +* **PR** `#34031`_: (`eliasp`_) `states.postgres_privileges` expects a real list, not a comma-separated string + @ *2016-06-15 16:34:04 UTC* + + * 5f90717fd3 Merge pull request `#34031`_ from eliasp/2016.3-salt.states.postgres_privileges-doc-priv-list + + * d3198ea538 `states.postgres_privileges` expects a real list, not a comma-separated string for `privileges` + +* **ISSUE** `#33023`_: (`cmclaughlin`_) rest_cherrypy eauth can't handle some characters (refs: `#33995`_) + +* **ISSUE** `#23522`_: (`nbirnel`_) Update the best practices documentation to include simpler examples of of jinja dictionaries (refs: `#33995`_) + +* **ISSUE** `#12470`_: (`whiteinge`_) Document how to (and not NOT to) use Jinja in states (refs: `#33995`_) + +* **ISSUE** `#10480`_: (`gravyboat`_) Create documentation that talks about using Jinja specifically for Salt. (refs: `#33995`_) + +* **ISSUE** `#10206`_: (`rabits`_) Jinja import: Jinja variable 'salt' is undefined (refs: `#33995`_) + +* **PR** `#33995`_: (`jacobhammons`_) Understanding Jinja topic, Jinja doc issues. + @ *2016-06-14 02:00:29 UTC* + + * 1132bc5d0b Merge pull request `#33995`_ from jacobhammons/doc-fixes + + * 887a415138 Adds new Understanding Jinja topic, and fixes several Jinja doc issues. Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability. + +* **PR** `#33900`_: (`amendlik`_) Document sudo policy for gitfs post-recieve hook + @ *2016-06-14 01:04:35 UTC* + + * a400f6a6c3 Merge pull request `#33900`_ from amendlik/gitfs-hook-doc + + * b4a28e2684 Add clarifying documentation about the need for sudo in the git hook + + * 1046279cb7 Document sudo policy for gitfs post-recieve hook + +* **PR** `#33980`_: (`twangboy`_) Use full path to python.exe + @ *2016-06-14 00:46:14 UTC* + + * 28c886edd0 Merge pull request `#33980`_ from twangboy/fix_build + + * dd7d55afb9 Use full path to python.exe + +* **PR** `#33993`_: (`s0undt3ch`_) Call `sys.exit()` instead of `exit()` + @ *2016-06-14 00:30:46 UTC* + + * 26fee377ec Merge pull request `#33993`_ from s0undt3ch/2016.3 + + * 34f7d90d9f Call `sys.exit()` instead of `exit()` + +* **PR** `#33976`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-13 19:29:40 UTC* + + * 2e934cffef Merge pull request `#33976`_ from rallytime/merge-2016.3 + + * 19d49d94f2 Merge branch '2015.8' into '2016.3' + + * a74f1b8077 ZD 762 (`#33942`_) + + * 0281d491c6 Merge pull request `#33946`_ from rallytime/bp-33698 + + * 5fdfed1cb9 Make sure we only use GetConnection if we are using a proxy salt minion + + * 1505c5724b Fix a bug with self signed certificates and creating a new VM + + * dff3f51955 Merge pull request `#33952`_ from rallytime/fix-33911 + + * 03b7cbbd2c Add base argument to salt-ssh grains wrapper for filter_by func + + * 4a8064918a Adds a "Generated on " line to the footer of each doc html page in the doc (`#33962`_) + +* **ISSUE** `#33868`_: (`abalashov`_) Returner configuration override options don't work for scheduled jobs (schedule module) (refs: `#33912`_) + +* **PR** `#33912`_: (`abalashov`_) utils/schedule.py:handle_func() - Fix for accessing returner configur… + @ *2016-06-13 17:18:04 UTC* + + * 8d8ed59b85 Merge pull request `#33912`_ from abalashov/abalashov/fix-schedule-returner-config + + * b5a4f8b313 utils/schedule.py:handle_func() - Fix for accessing returner configuration attributes 'return_config' and 'return_kwargs'. + +* **PR** `#33945`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-06-13 15:44:30 UTC* + + * 81e16bb93f Merge pull request `#33945`_ from rallytime/merge-2016.3 + + * b4ab322ce1 Merge branch '2015.8' into '2016.3' + + * b3ec39d644 Correct issue with ping on rotate with minion cache (`#33765`_) + + * 378dd7ca06 Merge pull request `#33888`_ from jfindlay/random_check + + * 6acee3cc30 modules.random_org._query: only return text if present + + * 82f95429db modules.random_org unit tests: skip if random.org down + + * 1f9422e0cd utils.http.query: also except gaierror with tornado + + * 2dc1914e7c Add connecting_settings to boto_elb state attributes list (`#33936`_) + + * 91a2184f2d Wait for up to a minute for sync_after_install (`#33917`_) + + * ef6da0be5d Merge pull request `#33877`_ from rallytime/merge-2015.8 + + * 398534a9e7 Fix ret return from merge-conflict resolution + + * b8e4706074 Merge branch '2015.5' into '2015.8' + + * cdda593c50 Merge pull request `#33829`_ from terminalmage/update-versionchanged + + * f7028eb1c6 Update versionchanged directive + + * b8e6c144d8 Merge pull request `#33833`_ from terminalmage/issue33645 + + * 91745c2a67 Support syncing pillar modules to masterless minions + + * e061788e81 Merge pull request `#33814`_ from terminalmage/archive-extracted-xz + + * 897a716df2 Support extraction of XZ archives in archive.extracted state + + * fa983e91cf Merge pull request `#33778`_ from sodium-chloride/2015.5-2016-0604-1938 + + * a5fb6d7a69 Fix minor docstring issues + + * b9133326c8 Merge pull request `#33726`_ from jtand/sysmod_skip_valid_docs_glance + + * ebee8a89af glance.warn_until shouldn't be checked for a doc string + + * 137f0b19f3 Merge pull request `#33611`_ from TargetHolding/2015.5 + + * 1dd15a603b solve' TypeError: expected string or buffer' in json/decoder.py + + * eaf42ca892 solve AttributeError: 'module' object has no attribute 'exception' + +* **PR** `#33960`_: (`nulfox`_) Fix mongo get_load to return full mongo record instead of non-existant 'load' key + @ *2016-06-13 15:37:46 UTC* + + * 68d261fe5b Merge pull request `#33960`_ from mecarus/2016.3 + + * d622133a49 The jid load comes in directly, not as 'load' key. Should return the mongo record directly without accessing keys + +* **PR** `#33961`_: (`jacobhammons`_) 2016.3.0 known issues update + @ *2016-06-13 02:59:21 UTC* + + * 8f56406507 Merge pull request `#33961`_ from jacobhammons/release + + * 2cf787d4ba 2016.3.0 known issues update + + * **PR** `#33908`_: (`ticosax`_) [boto_lambda] handle ommitted Permissions parameter + +* **ISSUE** `#33575`_: (`anlutro`_) File states seem slower in 2016.3, especially on first cache retrieval (refs: `#33896`_) + +* **ISSUE** `#29643`_: (`matthayes`_) Can't get batch mode and --failhard to work as expected (refs: `#31164`_) + +* **ISSUE** `#28569`_: (`andrejohansson`_) Reactor alert on highstate fail (refs: `#31164`_) + +* **PR** `#33896`_: (`DmitryKuzmenko`_) Don't deep copy context dict values. + @ *2016-06-10 15:32:54 UTC* + + * **PR** `#31164`_: (`DmitryKuzmenko`_) Issues/29643 fix invalid retcode (refs: `#33896`_) + + * 16b5e9dcc1 Merge pull request `#33896`_ from DSRCompany/issues/33575_do_not_deep_copy_context + + * 8e34d0a9c3 Don't deep copy context dict values. + +* **ISSUE** `#3077`_: (`torhve`_) Client ACL and external auth system should have support for limiting functions to certain arguments (refs: `#29153`_) + +* **PR** `#33905`_: (`rallytime`_) Back-port `#33847`_ to 2016.3 + @ *2016-06-10 15:22:34 UTC* + + * **PR** `#33847`_: (`whiteinge`_) Add docs for arg/kwarg eauth matching (refs: `#33905`_) + + * **PR** `#29153`_: (`DmitryKuzmenko`_) ACL limit args (refs: `#33847`_) + + * 01323322b0 Merge pull request `#33905`_ from rallytime/bp-33847 + + * b6ebd7b6ef Add docs for arg/kwarg eauth matching + + * 261baeb5b5 Ensure tht pillar have freshest grains (`#33910`_) + + * 00e016ecfc Add note about Xenial packages to 2016.3.0 release notes (`#33870`_) -.. _`#25213`: https://github.com/saltstack/salt/issues/25213 -.. _`#25276`: https://github.com/saltstack/salt/pull/25276 -.. _`#26171`: https://github.com/saltstack/salt/issues/26171 -.. _`#27783`: https://github.com/saltstack/salt/issues/27783 -.. _`#28521`: https://github.com/saltstack/salt/pull/28521 -.. _`#33620`: https://github.com/saltstack/salt/issues/33620 -.. _`#34632`: https://github.com/saltstack/salt/pull/34632 -.. _`#34648`: https://github.com/saltstack/salt/issues/34648 -.. _`#34691`: https://github.com/saltstack/salt/issues/34691 -.. _`#34725`: https://github.com/saltstack/salt/issues/34725 -.. _`#34760`: https://github.com/saltstack/salt/issues/34760 -.. _`#34796`: https://github.com/saltstack/salt/issues/34796 -.. _`#34798`: https://github.com/saltstack/salt/issues/34798 -.. _`#34816`: https://github.com/saltstack/salt/issues/34816 -.. _`#34822`: https://github.com/saltstack/salt/pull/34822 -.. _`#34823`: https://github.com/saltstack/salt/pull/34823 -.. _`#34827`: https://github.com/saltstack/salt/pull/34827 -.. _`#34828`: https://github.com/saltstack/salt/pull/34828 -.. _`#34833`: https://github.com/saltstack/salt/pull/34833 -.. _`#34847`: https://github.com/saltstack/salt/pull/34847 -.. _`#34852`: https://github.com/saltstack/salt/pull/34852 -.. _`#34854`: https://github.com/saltstack/salt/pull/34854 -.. _`#34858`: https://github.com/saltstack/salt/pull/34858 -.. _`#34859`: https://github.com/saltstack/salt/pull/34859 -.. _`#34862`: https://github.com/saltstack/salt/pull/34862 -.. _`#34864`: https://github.com/saltstack/salt/pull/34864 -.. _`#34865`: https://github.com/saltstack/salt/pull/34865 -.. _`#34869`: https://github.com/saltstack/salt/pull/34869 -.. _`#34873`: https://github.com/saltstack/salt/issues/34873 -.. _`#34878`: https://github.com/saltstack/salt/pull/34878 -.. _`#34887`: https://github.com/saltstack/salt/pull/34887 -.. _`#34890`: https://github.com/saltstack/salt/issues/34890 -.. _`#34893`: https://github.com/saltstack/salt/issues/34893 -.. _`#34894`: https://github.com/saltstack/salt/pull/34894 -.. _`#34898`: https://github.com/saltstack/salt/pull/34898 -.. _`#34900`: https://github.com/saltstack/salt/pull/34900 -.. _`#34901`: https://github.com/saltstack/salt/pull/34901 -.. _`#34902`: https://github.com/saltstack/salt/pull/34902 -.. _`#34906`: https://github.com/saltstack/salt/pull/34906 -.. _`#34908`: https://github.com/saltstack/salt/issues/34908 -.. _`#34910`: https://github.com/saltstack/salt/pull/34910 -.. _`#34911`: https://github.com/saltstack/salt/pull/34911 -.. _`#34915`: https://github.com/saltstack/salt/pull/34915 -.. _`#34916`: https://github.com/saltstack/salt/pull/34916 -.. _`#34923`: https://github.com/saltstack/salt/pull/34923 -.. _`#34926`: https://github.com/saltstack/salt/pull/34926 -.. _`#34933`: https://github.com/saltstack/salt/pull/34933 -.. _`#34935`: https://github.com/saltstack/salt/pull/34935 -.. _`#34946`: https://github.com/saltstack/salt/pull/34946 -.. _`#34951`: https://github.com/saltstack/salt/pull/34951 -.. _`#34956`: https://github.com/saltstack/salt/pull/34956 -.. _`#34957`: https://github.com/saltstack/salt/pull/34957 -.. _`#34971`: https://github.com/saltstack/salt/pull/34971 -.. _`bp-25276`: https://github.com/saltstack/salt/pull/25276 -.. _`bp-28521`: https://github.com/saltstack/salt/pull/28521 -.. _`fix-34890`: https://github.com/saltstack/salt/issues/34890 -.. _`fix-34893`: https://github.com/saltstack/salt/issues/34893 .. _`#10206`: https://github.com/saltstack/salt/issues/10206 .. _`#10480`: https://github.com/saltstack/salt/issues/10480 .. _`#12470`: https://github.com/saltstack/salt/issues/12470 .. _`#14915`: https://github.com/saltstack/salt/issues/14915 -.. _`#20809`: https://github.com/saltstack/salt/issues/20809 .. _`#23522`: https://github.com/saltstack/salt/issues/23522 .. _`#24744`: https://github.com/saltstack/salt/issues/24744 -.. _`#26278`: https://github.com/saltstack/salt/issues/26278 -.. _`#27980`: https://github.com/saltstack/salt/issues/27980 -.. _`#28300`: https://github.com/saltstack/salt/issues/28300 +.. _`#25213`: https://github.com/saltstack/salt/issues/25213 .. _`#28569`: https://github.com/saltstack/salt/issues/28569 .. _`#29153`: https://github.com/saltstack/salt/pull/29153 -.. _`#29249`: https://github.com/saltstack/salt/issues/29249 -.. _`#29525`: https://github.com/saltstack/salt/issues/29525 .. _`#29643`: https://github.com/saltstack/salt/issues/29643 -.. _`#30100`: https://github.com/saltstack/salt/issues/30100 .. _`#30493`: https://github.com/saltstack/salt/issues/30493 .. _`#3077`: https://github.com/saltstack/salt/issues/3077 .. _`#31164`: https://github.com/saltstack/salt/pull/31164 .. _`#31402`: https://github.com/saltstack/salt/issues/31402 -.. _`#31499`: https://github.com/saltstack/salt/issues/31499 .. _`#32182`: https://github.com/saltstack/salt/pull/32182 -.. _`#32276`: https://github.com/saltstack/salt/issues/32276 .. _`#32396`: https://github.com/saltstack/salt/pull/32396 -.. _`#32525`: https://github.com/saltstack/salt/issues/32525 -.. _`#32591`: https://github.com/saltstack/salt/issues/32591 -.. _`#32761`: https://github.com/saltstack/salt/issues/32761 .. _`#32916`: https://github.com/saltstack/salt/issues/32916 .. _`#33023`: https://github.com/saltstack/salt/issues/33023 -.. _`#33076`: https://github.com/saltstack/salt/pull/33076 -.. _`#33452`: https://github.com/saltstack/salt/issues/33452 -.. _`#33474`: https://github.com/saltstack/salt/pull/33474 .. _`#33575`: https://github.com/saltstack/salt/issues/33575 .. _`#33588`: https://github.com/saltstack/salt/issues/33588 .. _`#33599`: https://github.com/saltstack/salt/pull/33599 .. _`#33611`: https://github.com/saltstack/salt/pull/33611 -.. _`#33633`: https://github.com/saltstack/salt/issues/33633 -.. _`#33645`: https://github.com/saltstack/salt/issues/33645 -.. _`#33649`: https://github.com/saltstack/salt/issues/33649 -.. _`#33674`: https://github.com/saltstack/salt/issues/33674 +.. _`#33620`: https://github.com/saltstack/salt/issues/33620 .. _`#33681`: https://github.com/saltstack/salt/pull/33681 .. _`#33682`: https://github.com/saltstack/salt/pull/33682 .. _`#33684`: https://github.com/saltstack/salt/pull/33684 -.. _`#33694`: https://github.com/saltstack/salt/issues/33694 .. _`#33697`: https://github.com/saltstack/salt/issues/33697 -.. _`#33698`: https://github.com/saltstack/salt/pull/33698 .. _`#33726`: https://github.com/saltstack/salt/pull/33726 .. _`#33734`: https://github.com/saltstack/salt/pull/33734 .. _`#33765`: https://github.com/saltstack/salt/pull/33765 .. _`#33778`: https://github.com/saltstack/salt/pull/33778 -.. _`#33806`: https://github.com/saltstack/salt/pull/33806 .. _`#33814`: https://github.com/saltstack/salt/pull/33814 .. _`#33829`: https://github.com/saltstack/salt/pull/33829 .. _`#33831`: https://github.com/saltstack/salt/issues/33831 .. _`#33833`: https://github.com/saltstack/salt/pull/33833 .. _`#33847`: https://github.com/saltstack/salt/pull/33847 -.. _`#33851`: https://github.com/saltstack/salt/pull/33851 .. _`#33868`: https://github.com/saltstack/salt/issues/33868 .. _`#33870`: https://github.com/saltstack/salt/pull/33870 -.. _`#33873`: https://github.com/saltstack/salt/issues/33873 .. _`#33877`: https://github.com/saltstack/salt/pull/33877 .. _`#33879`: https://github.com/saltstack/salt/issues/33879 .. _`#33880`: https://github.com/saltstack/salt/pull/33880 @@ -821,11 +1906,9 @@ Changes: .. _`#33905`: https://github.com/saltstack/salt/pull/33905 .. _`#33908`: https://github.com/saltstack/salt/pull/33908 .. _`#33910`: https://github.com/saltstack/salt/pull/33910 -.. _`#33911`: https://github.com/saltstack/salt/issues/33911 .. _`#33912`: https://github.com/saltstack/salt/pull/33912 .. _`#33915`: https://github.com/saltstack/salt/issues/33915 .. _`#33917`: https://github.com/saltstack/salt/pull/33917 -.. _`#33923`: https://github.com/saltstack/salt/issues/33923 .. _`#33927`: https://github.com/saltstack/salt/issues/33927 .. _`#33936`: https://github.com/saltstack/salt/pull/33936 .. _`#33941`: https://github.com/saltstack/salt/pull/33941 @@ -839,7 +1922,6 @@ Changes: .. _`#33960`: https://github.com/saltstack/salt/pull/33960 .. _`#33961`: https://github.com/saltstack/salt/pull/33961 .. _`#33962`: https://github.com/saltstack/salt/pull/33962 -.. _`#33972`: https://github.com/saltstack/salt/issues/33972 .. _`#33976`: https://github.com/saltstack/salt/pull/33976 .. _`#33980`: https://github.com/saltstack/salt/pull/33980 .. _`#33983`: https://github.com/saltstack/salt/pull/33983 @@ -865,10 +1947,8 @@ Changes: .. _`#34026`: https://github.com/saltstack/salt/pull/34026 .. _`#34030`: https://github.com/saltstack/salt/pull/34030 .. _`#34031`: https://github.com/saltstack/salt/pull/34031 -.. _`#34037`: https://github.com/saltstack/salt/issues/34037 .. _`#34038`: https://github.com/saltstack/salt/issues/34038 .. _`#34042`: https://github.com/saltstack/salt/pull/34042 -.. _`#34043`: https://github.com/saltstack/salt/issues/34043 .. _`#34044`: https://github.com/saltstack/salt/pull/34044 .. _`#34045`: https://github.com/saltstack/salt/pull/34045 .. _`#34048`: https://github.com/saltstack/salt/pull/34048 @@ -876,7 +1956,6 @@ Changes: .. _`#34051`: https://github.com/saltstack/salt/pull/34051 .. _`#34056`: https://github.com/saltstack/salt/pull/34056 .. _`#34057`: https://github.com/saltstack/salt/pull/34057 -.. _`#34066`: https://github.com/saltstack/salt/pull/34066 .. _`#34067`: https://github.com/saltstack/salt/pull/34067 .. _`#34069`: https://github.com/saltstack/salt/pull/34069 .. _`#34072`: https://github.com/saltstack/salt/pull/34072 @@ -890,12 +1969,9 @@ Changes: .. _`#34095`: https://github.com/saltstack/salt/pull/34095 .. _`#34098`: https://github.com/saltstack/salt/pull/34098 .. _`#34100`: https://github.com/saltstack/salt/pull/34100 -.. _`#34103`: https://github.com/saltstack/salt/pull/34103 .. _`#34108`: https://github.com/saltstack/salt/pull/34108 .. _`#34110`: https://github.com/saltstack/salt/pull/34110 -.. _`#34114`: https://github.com/saltstack/salt/issues/34114 .. _`#34120`: https://github.com/saltstack/salt/issues/34120 -.. _`#34128`: https://github.com/saltstack/salt/pull/34128 .. _`#34129`: https://github.com/saltstack/salt/issues/34129 .. _`#34133`: https://github.com/saltstack/salt/pull/34133 .. _`#34134`: https://github.com/saltstack/salt/pull/34134 @@ -932,8 +2008,6 @@ Changes: .. _`#34206`: https://github.com/saltstack/salt/pull/34206 .. _`#34208`: https://github.com/saltstack/salt/pull/34208 .. _`#34209`: https://github.com/saltstack/salt/pull/34209 -.. _`#34212`: https://github.com/saltstack/salt/issues/34212 -.. _`#34213`: https://github.com/saltstack/salt/issues/34213 .. _`#34214`: https://github.com/saltstack/salt/pull/34214 .. _`#34215`: https://github.com/saltstack/salt/issues/34215 .. _`#34218`: https://github.com/saltstack/salt/pull/34218 @@ -945,9 +2019,6 @@ Changes: .. _`#34232`: https://github.com/saltstack/salt/pull/34232 .. _`#34233`: https://github.com/saltstack/salt/pull/34233 .. _`#34239`: https://github.com/saltstack/salt/pull/34239 -.. _`#34244`: https://github.com/saltstack/salt/pull/34244 -.. _`#34247`: https://github.com/saltstack/salt/issues/34247 -.. _`#34249`: https://github.com/saltstack/salt/issues/34249 .. _`#34252`: https://github.com/saltstack/salt/pull/34252 .. _`#34254`: https://github.com/saltstack/salt/pull/34254 .. _`#34255`: https://github.com/saltstack/salt/issues/34255 @@ -955,9 +2026,7 @@ Changes: .. _`#34257`: https://github.com/saltstack/salt/pull/34257 .. _`#34258`: https://github.com/saltstack/salt/pull/34258 .. _`#34259`: https://github.com/saltstack/salt/pull/34259 -.. _`#34261`: https://github.com/saltstack/salt/issues/34261 .. _`#34271`: https://github.com/saltstack/salt/pull/34271 -.. _`#34273`: https://github.com/saltstack/salt/issues/34273 .. _`#34274`: https://github.com/saltstack/salt/pull/34274 .. _`#34281`: https://github.com/saltstack/salt/pull/34281 .. _`#34283`: https://github.com/saltstack/salt/pull/34283 @@ -965,14 +2034,12 @@ Changes: .. _`#34292`: https://github.com/saltstack/salt/pull/34292 .. _`#34296`: https://github.com/saltstack/salt/pull/34296 .. _`#34300`: https://github.com/saltstack/salt/pull/34300 -.. _`#34302`: https://github.com/saltstack/salt/issues/34302 .. _`#34304`: https://github.com/saltstack/salt/pull/34304 .. _`#34306`: https://github.com/saltstack/salt/pull/34306 .. _`#34307`: https://github.com/saltstack/salt/pull/34307 .. _`#34311`: https://github.com/saltstack/salt/pull/34311 .. _`#34312`: https://github.com/saltstack/salt/pull/34312 .. _`#34313`: https://github.com/saltstack/salt/pull/34313 -.. _`#34316`: https://github.com/saltstack/salt/pull/34316 .. _`#34318`: https://github.com/saltstack/salt/pull/34318 .. _`#34319`: https://github.com/saltstack/salt/pull/34319 .. _`#34321`: https://github.com/saltstack/salt/issues/34321 @@ -1003,13 +2070,10 @@ Changes: .. _`#34377`: https://github.com/saltstack/salt/pull/34377 .. _`#34378`: https://github.com/saltstack/salt/pull/34378 .. _`#34379`: https://github.com/saltstack/salt/issues/34379 -.. _`#34382`: https://github.com/saltstack/salt/issues/34382 .. _`#34386`: https://github.com/saltstack/salt/pull/34386 .. _`#34388`: https://github.com/saltstack/salt/pull/34388 -.. _`#34390`: https://github.com/saltstack/salt/issues/34390 .. _`#34392`: https://github.com/saltstack/salt/pull/34392 .. _`#34395`: https://github.com/saltstack/salt/issues/34395 -.. _`#34397`: https://github.com/saltstack/salt/issues/34397 .. _`#34400`: https://github.com/saltstack/salt/pull/34400 .. _`#34401`: https://github.com/saltstack/salt/pull/34401 .. _`#34404`: https://github.com/saltstack/salt/pull/34404 @@ -1025,7 +2089,6 @@ Changes: .. _`#34453`: https://github.com/saltstack/salt/pull/34453 .. _`#34455`: https://github.com/saltstack/salt/pull/34455 .. _`#34456`: https://github.com/saltstack/salt/pull/34456 -.. _`#34457`: https://github.com/saltstack/salt/pull/34457 .. _`#34459`: https://github.com/saltstack/salt/pull/34459 .. _`#34462`: https://github.com/saltstack/salt/pull/34462 .. _`#34463`: https://github.com/saltstack/salt/pull/34463 @@ -1053,7 +2116,6 @@ Changes: .. _`#34537`: https://github.com/saltstack/salt/pull/34537 .. _`#34545`: https://github.com/saltstack/salt/pull/34545 .. _`#34546`: https://github.com/saltstack/salt/pull/34546 -.. _`#34548`: https://github.com/saltstack/salt/issues/34548 .. _`#34549`: https://github.com/saltstack/salt/pull/34549 .. _`#34553`: https://github.com/saltstack/salt/pull/34553 .. _`#34554`: https://github.com/saltstack/salt/issues/34554 @@ -1076,16 +2138,15 @@ Changes: .. _`#34618`: https://github.com/saltstack/salt/pull/34618 .. _`#34619`: https://github.com/saltstack/salt/pull/34619 .. _`#34621`: https://github.com/saltstack/salt/pull/34621 -.. _`#34630`: https://github.com/saltstack/salt/issues/34630 +.. _`#34632`: https://github.com/saltstack/salt/pull/34632 .. _`#34642`: https://github.com/saltstack/salt/pull/34642 -.. _`#34644`: https://github.com/saltstack/salt/pull/34644 .. _`#34647`: https://github.com/saltstack/salt/pull/34647 +.. _`#34648`: https://github.com/saltstack/salt/issues/34648 .. _`#34651`: https://github.com/saltstack/salt/pull/34651 .. _`#34652`: https://github.com/saltstack/salt/pull/34652 .. _`#34661`: https://github.com/saltstack/salt/issues/34661 .. _`#34670`: https://github.com/saltstack/salt/pull/34670 .. _`#34676`: https://github.com/saltstack/salt/pull/34676 -.. _`#34678`: https://github.com/saltstack/salt/issues/34678 .. _`#34679`: https://github.com/saltstack/salt/pull/34679 .. _`#34681`: https://github.com/saltstack/salt/pull/34681 .. _`#34682`: https://github.com/saltstack/salt/pull/34682 @@ -1094,13 +2155,11 @@ Changes: .. _`#34695`: https://github.com/saltstack/salt/pull/34695 .. _`#34696`: https://github.com/saltstack/salt/pull/34696 .. _`#34702`: https://github.com/saltstack/salt/pull/34702 -.. _`#34703`: https://github.com/saltstack/salt/issues/34703 .. _`#34707`: https://github.com/saltstack/salt/pull/34707 .. _`#34714`: https://github.com/saltstack/salt/pull/34714 .. _`#34720`: https://github.com/saltstack/salt/pull/34720 .. _`#34721`: https://github.com/saltstack/salt/pull/34721 .. _`#34722`: https://github.com/saltstack/salt/pull/34722 -.. _`#34726`: https://github.com/saltstack/salt/pull/34726 .. _`#34739`: https://github.com/saltstack/salt/pull/34739 .. _`#34740`: https://github.com/saltstack/salt/pull/34740 .. _`#34741`: https://github.com/saltstack/salt/pull/34741 @@ -1109,37 +2168,166 @@ Changes: .. _`#34751`: https://github.com/saltstack/salt/pull/34751 .. _`#34754`: https://github.com/saltstack/salt/pull/34754 .. _`#34756`: https://github.com/saltstack/salt/pull/34756 +.. _`#34760`: https://github.com/saltstack/salt/issues/34760 .. _`#34762`: https://github.com/saltstack/salt/issues/34762 .. _`#34770`: https://github.com/saltstack/salt/pull/34770 .. _`#34773`: https://github.com/saltstack/salt/pull/34773 .. _`#34784`: https://github.com/saltstack/salt/pull/34784 .. _`#34791`: https://github.com/saltstack/salt/pull/34791 +.. _`#34796`: https://github.com/saltstack/salt/issues/34796 +.. _`#34798`: https://github.com/saltstack/salt/issues/34798 .. _`#34803`: https://github.com/saltstack/salt/pull/34803 .. _`#34818`: https://github.com/saltstack/salt/pull/34818 +.. _`#34822`: https://github.com/saltstack/salt/pull/34822 +.. _`#34823`: https://github.com/saltstack/salt/pull/34823 .. _`#34824`: https://github.com/saltstack/salt/pull/34824 .. _`#34825`: https://github.com/saltstack/salt/pull/34825 +.. _`#34827`: https://github.com/saltstack/salt/pull/34827 +.. _`#34828`: https://github.com/saltstack/salt/pull/34828 +.. _`#34833`: https://github.com/saltstack/salt/pull/34833 .. _`#34837`: https://github.com/saltstack/salt/pull/34837 .. _`#34838`: https://github.com/saltstack/salt/pull/34838 .. _`#34840`: https://github.com/saltstack/salt/pull/34840 .. _`#34842`: https://github.com/saltstack/salt/pull/34842 .. _`#34844`: https://github.com/saltstack/salt/pull/34844 -.. _`bp-32396`: https://github.com/saltstack/salt/pull/32396 -.. _`bp-33698`: https://github.com/saltstack/salt/pull/33698 -.. _`bp-33806`: https://github.com/saltstack/salt/pull/33806 -.. _`bp-33847`: https://github.com/saltstack/salt/pull/33847 -.. _`bp-33948`: https://github.com/saltstack/salt/pull/33948 -.. _`bp-34057`: https://github.com/saltstack/salt/pull/34057 -.. _`bp-34103`: https://github.com/saltstack/salt/pull/34103 -.. _`bp-34378`: https://github.com/saltstack/salt/pull/34378 -.. _`bp-34436`: https://github.com/saltstack/salt/pull/34436 -.. _`bp-34457`: https://github.com/saltstack/salt/pull/34457 -.. _`bp-34726`: https://github.com/saltstack/salt/pull/34726 -.. _`fix-33879`: https://github.com/saltstack/salt/issues/33879 -.. _`fix-33911`: https://github.com/saltstack/salt/issues/33911 -.. _`fix-34037`: https://github.com/saltstack/salt/issues/34037 -.. _`fix-34043`: https://github.com/saltstack/salt/issues/34043 -.. _`fix-34120`: https://github.com/saltstack/salt/issues/34120 -.. _`fix-34129`: https://github.com/saltstack/salt/issues/34129 -.. _`fix-34162`: https://github.com/saltstack/salt/issues/34162 -.. _`fix-34630`: https://github.com/saltstack/salt/issues/34630 -.. _`fix-34703`: https://github.com/saltstack/salt/issues/34703 +.. _`#34847`: https://github.com/saltstack/salt/pull/34847 +.. _`#34848`: https://github.com/saltstack/salt/pull/34848 +.. _`#34850`: https://github.com/saltstack/salt/pull/34850 +.. _`#34852`: https://github.com/saltstack/salt/pull/34852 +.. _`#34854`: https://github.com/saltstack/salt/pull/34854 +.. _`#34858`: https://github.com/saltstack/salt/pull/34858 +.. _`#34859`: https://github.com/saltstack/salt/pull/34859 +.. _`#34862`: https://github.com/saltstack/salt/pull/34862 +.. _`#34864`: https://github.com/saltstack/salt/pull/34864 +.. _`#34865`: https://github.com/saltstack/salt/pull/34865 +.. _`#34869`: https://github.com/saltstack/salt/pull/34869 +.. _`#34873`: https://github.com/saltstack/salt/issues/34873 +.. _`#34878`: https://github.com/saltstack/salt/pull/34878 +.. _`#34887`: https://github.com/saltstack/salt/pull/34887 +.. _`#34894`: https://github.com/saltstack/salt/pull/34894 +.. _`#34898`: https://github.com/saltstack/salt/pull/34898 +.. _`#34900`: https://github.com/saltstack/salt/pull/34900 +.. _`#34901`: https://github.com/saltstack/salt/pull/34901 +.. _`#34902`: https://github.com/saltstack/salt/pull/34902 +.. _`#34906`: https://github.com/saltstack/salt/pull/34906 +.. _`#34910`: https://github.com/saltstack/salt/pull/34910 +.. _`#34911`: https://github.com/saltstack/salt/pull/34911 +.. _`#34915`: https://github.com/saltstack/salt/pull/34915 +.. _`#34916`: https://github.com/saltstack/salt/pull/34916 +.. _`#34923`: https://github.com/saltstack/salt/pull/34923 +.. _`#34926`: https://github.com/saltstack/salt/pull/34926 +.. _`#34933`: https://github.com/saltstack/salt/pull/34933 +.. _`#34935`: https://github.com/saltstack/salt/pull/34935 +.. _`#34946`: https://github.com/saltstack/salt/pull/34946 +.. _`#34951`: https://github.com/saltstack/salt/pull/34951 +.. _`#34956`: https://github.com/saltstack/salt/pull/34956 +.. _`#34957`: https://github.com/saltstack/salt/pull/34957 +.. _`#34971`: https://github.com/saltstack/salt/pull/34971 +.. _`#34988`: https://github.com/saltstack/salt/pull/34988 +.. _`AndrewPashkin`: https://github.com/AndrewPashkin +.. _`Cashwini`: https://github.com/Cashwini +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DarkKnightCZ`: https://github.com/DarkKnightCZ +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`HG00`: https://github.com/HG00 +.. _`Inveracity`: https://github.com/Inveracity +.. _`UtahDave`: https://github.com/UtahDave +.. _`abalashov`: https://github.com/abalashov +.. _`abednarik`: https://github.com/abednarik +.. _`adelcast`: https://github.com/adelcast +.. _`ajacoutot`: https://github.com/ajacoutot +.. _`amendlik`: https://github.com/amendlik +.. _`amontalban`: https://github.com/amontalban +.. _`andrejohansson`: https://github.com/andrejohansson +.. _`anlutro`: https://github.com/anlutro +.. _`aphor`: https://github.com/aphor +.. _`artxki`: https://github.com/artxki +.. _`asloboda-cisco`: https://github.com/asloboda-cisco +.. _`astehlik`: https://github.com/astehlik +.. _`avandendorpe`: https://github.com/avandendorpe +.. _`bbinet`: https://github.com/bbinet +.. _`bdrung`: https://github.com/bdrung +.. _`bensherman`: https://github.com/bensherman +.. _`cachedout`: https://github.com/cachedout +.. _`chrimi`: https://github.com/chrimi +.. _`christoe`: https://github.com/christoe +.. _`clinta`: https://github.com/clinta +.. _`cmclaughlin`: https://github.com/cmclaughlin +.. _`cro`: https://github.com/cro +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`dongweiming`: https://github.com/dongweiming +.. _`edgan`: https://github.com/edgan +.. _`eliasp`: https://github.com/eliasp +.. _`eradman`: https://github.com/eradman +.. _`erikgrinaker`: https://github.com/erikgrinaker +.. _`farcaller`: https://github.com/farcaller +.. _`fooka03`: https://github.com/fooka03 +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`giannello`: https://github.com/giannello +.. _`glomium`: https://github.com/glomium +.. _`gravyboat`: https://github.com/gravyboat +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`isbm`: https://github.com/isbm +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jacobweinstock`: https://github.com/jacobweinstock +.. _`jfindlay`: https://github.com/jfindlay +.. _`jmacfar`: https://github.com/jmacfar +.. _`jnhmcknight`: https://github.com/jnhmcknight +.. _`johngrasty`: https://github.com/johngrasty +.. _`justinta`: https://github.com/justinta +.. _`l2ol33rt`: https://github.com/l2ol33rt +.. _`lomeroe`: https://github.com/lomeroe +.. _`mattglv`: https://github.com/mattglv +.. _`matthayes`: https://github.com/matthayes +.. _`meaksh`: https://github.com/meaksh +.. _`msdogado`: https://github.com/msdogado +.. _`nate-byrnes`: https://github.com/nate-byrnes +.. _`nbirnel`: https://github.com/nbirnel +.. _`nulfox`: https://github.com/nulfox +.. _`onorua`: https://github.com/onorua +.. _`opdude`: https://github.com/opdude +.. _`pavankumar2203`: https://github.com/pavankumar2203 +.. _`peterdemin`: https://github.com/peterdemin +.. _`phil123456`: https://github.com/phil123456 +.. _`rabits`: https://github.com/rabits +.. _`rallytime`: https://github.com/rallytime +.. _`rayba`: https://github.com/rayba +.. _`rmohta`: https://github.com/rmohta +.. _`rodoyle`: https://github.com/rodoyle +.. _`rvora`: https://github.com/rvora +.. _`ryanwalder`: https://github.com/ryanwalder +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack/salt#26171`: https://github.com/saltstack/salt/issues/26171 +.. _`saltstack/salt#27980`: https://github.com/saltstack/salt/issues/27980 +.. _`saltstack/salt#32525`: https://github.com/saltstack/salt/issues/32525 +.. _`saltstack/salt#32591`: https://github.com/saltstack/salt/issues/32591 +.. _`saltstack/salt#33452`: https://github.com/saltstack/salt/issues/33452 +.. _`saltstack/salt#33923`: https://github.com/saltstack/salt/issues/33923 +.. _`saltstack/salt#34345`: https://github.com/saltstack/salt/issues/34345 +.. _`saltstack/salt#34382`: https://github.com/saltstack/salt/issues/34382 +.. _`saltstack/salt#34548`: https://github.com/saltstack/salt/issues/34548 +.. _`saltstack/salt#34549`: https://github.com/saltstack/salt/pull/34549 +.. _`saltstack/salt#34607`: https://github.com/saltstack/salt/pull/34607 +.. _`saltstack/salt#34630`: https://github.com/saltstack/salt/issues/34630 +.. _`saltstack/salt#34816`: https://github.com/saltstack/salt/issues/34816 +.. _`saltstack/salt#34873`: https://github.com/saltstack/salt/issues/34873 +.. _`saltstack/salt#34878`: https://github.com/saltstack/salt/pull/34878 +.. _`saltstack/salt#34890`: https://github.com/saltstack/salt/issues/34890 +.. _`saltstack/salt#34893`: https://github.com/saltstack/salt/issues/34893 +.. _`saltstack/salt#34908`: https://github.com/saltstack/salt/issues/34908 +.. _`secumod`: https://github.com/secumod +.. _`sjmh`: https://github.com/sjmh +.. _`sjorge`: https://github.com/sjorge +.. _`stjack99`: https://github.com/stjack99 +.. _`tehsu`: https://github.com/tehsu +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`themalkolm`: https://github.com/themalkolm +.. _`ticosax`: https://github.com/ticosax +.. _`tmehlinger`: https://github.com/tmehlinger +.. _`torhve`: https://github.com/torhve +.. _`twangboy`: https://github.com/twangboy +.. _`viq`: https://github.com/viq +.. _`vutny`: https://github.com/vutny +.. _`whiteinge`: https://github.com/whiteinge +.. _`whytewolf`: https://github.com/whytewolf diff --git a/doc/topics/releases/2016.3.3.rst b/doc/topics/releases/2016.3.3.rst index 8cd53aa3f0..ab288a289d 100644 --- a/doc/topics/releases/2016.3.3.rst +++ b/doc/topics/releases/2016.3.3.rst @@ -4,355 +4,1054 @@ Salt 2016.3.3 Release Notes Version 2016.3.3 is a bugfix release for :ref:`2016.3.0 `. + +Statistics +========== + +- Total Merges: **108** +- Total Issue References: **26** +- Total PR References: **115** + +- Contributors: **36** (`The-Loeki`_, `abednarik`_, `cachedout`_, `cro`_, `deniszh`_, `dkruger`_, `dmurphy18`_, `eliasp`_, `farcaller`_, `galet`_, `gtmanfred`_, `hu-dabao`_, `isbm`_, `jacobhammons`_, `jacobweinstock`_, `jfindlay`_, `justinta`_, `kstreee`_, `lubyou`_, `markuskramerIgitt`_, `meaksh`_, `miihael`_, `mzupan`_, `nishigori`_, `rallytime`_, `s0undt3ch`_, `skizunov`_, `tankywoo`_, `terminalmage`_, `thatch45`_, `theredcat`_, `ticosax`_, `tonybaloney`_, `twangboy`_, `vutny`_, `whiteinge`_) + + Known Issues ------------- +============ :issue:`36055`: Salt Cloud events (``salt/cloud``) are not generated on the master event bus when provisioning cloud systems. -`Bootstrap Issue #973`_: ``python-futures`` is not installed when installing from a git tag -on RedHat-based distributions. ``Python futures`` is needed when running Salt with the TCP -transport. This is fixed on the ``develop`` branch of the `salt-bootstrap repo`_ and the fix -will be included in the upcoming release of salt-bootstrap, but is a bug in the bootstrap -release that ships with this version of Salt. Please see the `salt-bootstrap repo`_ -for more information on how to update your bootstrap version. +`Bootstrap Issue #973`_: ``python-futures`` is not installed when installing +from a git tag on RedHat-based distributions. ``Python futures`` is needed when + +running Salt with the TCP transport. This is fixed on the ``develop`` branch of +the `salt-bootstrap repo`_ and the fix will be included in the upcoming release +of salt-bootstrap, but is a bug in the bootstrap release that ships with this +version of Salt. Please see the `salt-bootstrap repo`_ for more information on +how to update your bootstrap version. .. _`Bootstrap Issue #973`: https://github.com/saltstack/salt-bootstrap/issues/973 .. _`salt-bootstrap repo`: https://github.com/saltstack/salt-bootstrap -Changes for v2016.3.2..2016.3.3 -------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Changelog for v2016.3.2..v2016.3.3 +================================== -*Generated at: 2016-08-19T16:17:34Z* +*Generated at: 2018-05-27 04:47:36 UTC* -Total Merges: **134** +* **PR** `#35603`_: (`rallytime`_) Make sure version label is correct in header -Changes: +* **PR** `#35602`_: (`rallytime`_) Update release notes for 2016.3.3 -- **PR** `#35580`_: (*twangboy*) Fix mac_service attempts to parse non-plist files -- **PR** `#35586`_: (*hu-dabao*) Fix 35420, add run_on_start in build_schedule_item -- **PR** `#35583`_: (*terminalmage*) Fix localemod tests -- **PR** `#35579`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35577`_: (*terminalmage*) Unit file changes for 2015.8.12, 2016.3.3 -- **PR** `#35571`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35566`_: (*rallytime*) Back-port `#35545`_ to 2015.8 -- **PR** `#35546`_: (*whiteinge*) Salt api eauth fail gracefully -- **PR** `#35545`_: (*hu-dabao*) `fix-35384`_, fix cmd.run unless -- **PR** `#35540`_: (*rallytime*) Whitespace fix for 2015.8 -- **PR** `#35525`_: (*UtahDave*) add missing glob import -- **PR** `#35510`_: (*terminalmage*) Better systemd integration -- **PR** `#35492`_: (*terminalmage*) Clarify config.get docstring -- **PR** `#35483`_: (*gtmanfred*) use __utils__ in salt.cloud -- **PR** `#35573`_: (*rallytime*) Back-port `#33337`_ to 2016.3 -- **PR** `#33337`_: (*mzupan*) adding the () to make changes work -- **PR** `#35572`_: (*terminalmage*) Fix poor formatting in pkg state docs -- **PR** `#35545`_: (*hu-dabao*) `fix-35384`_, fix cmd.run unless -- **PR** `#35489`_: (*rallytime*) Back-port `#35463`_ to 2016.3 -- **PR** `#35463`_: (*skizunov*) Make `auth_timeout` user configurable again -- **PR** `#35538`_: (*thatch45*) Treat python XML as an optdep -- **PR** `#35526`_: (*thatch45*) Always deploy the thin to /var/tmp -- **PR** `#35522`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35513`_: (*cachedout*) Might be a good idea to be able to download the software we make -- **PR** `#35512`_: (*cachedout*) Fixup 35419 -- **PR** `#35508`_: (*terminalmage*) Add Carbon to versionadded for git.diff -- **PR** `#35497`_: (*deepakhj*) Fixes spacing in requirements files -- **PR** `#35302`_: (*Ch3LL*) Add job cache test -- **PR** `#35516`_: (*rallytime*) Back-port `#34441`_ to 2016.3 -- **PR** `#34441`_: (*markuskramerIgitt*) Copy and delete silently, do not list each file -- **PR** `#35517`_: (*rallytime*) Back-port `#34502`_ to 2016.3 -- **PR** `#34502`_: (*markuskramerIgitt*) Windows installer build scripts will exit on error -- **PR** `#35429`_: (*tankywoo*) Fix iptables target options with no arguments -- **PR** `#35495`_: (*rallytime*) Use correct deprecated notation instead of a warning for apache_module.enable state function. -- **PR** `#35498`_: (*rallytime*) Add supported templates list to all template doc references in file state -- **PR** `#35406`_: (*rallytime*) Provide links to the renderers in the template docs -- **PR** `#35360`_: (*rallytime*) Add all template registery templates to file.managed docs -- **PR** `#35487`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35486`_: (*rallytime*) Update bootstrap script to latest stable (2016.08.16) -- **PR** `#35476`_: (*cachedout*) Fixup SSH bug where sudo without sudo user would break -- **PR** `#35471`_: (*terminalmage*) win_pkg: Fix traceback when package is not installed -- **PR** `#35460`_: (*rallytime*) [2015.8] Update bootstrap script to latest stable (2016.08.15) -- **PR** `#35459`_: (*thatch45*) Ensure that output for salt-ssh gets back -- **PR** `#35453`_: (*theothergraham*) fixes `#34279`_ - disk cache ttl expiry -- **PR** `#35451`_: (*isbm*) Bugfix: zypper mod repo unchanged -- **PR** `#35448`_: (*isbm*) Add ignore_repo_failure option to suppress zypper's exit code 106 on … -- **PR** `#35413`_: (*cachedout*) Resolve path issues with cp.push -- **PR** `#35446`_: (*cachedout*) Make salt-client aware of edge-case where saltutil might be broken -- **PR** `#35449`_: (*dkruger*) aptpkg will specify --install-recommends if enabled by the SLS -- **PR** `#35467`_: (*rallytime*) Back-port `#33518`_ to 2016.3 -- **PR** `#35235`_: (*rallytime*) Back-port `#33518`_ to 2016.3 -- **PR** `#33518`_: (*tonybaloney*) Fix libcloud bug `#33367`_ -- **PR** `#35461`_: (*rallytime*) [2016.3] Update bootstrap script to latest stable (2016.08.15) -- **PR** `#35456`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35442`_: (*cachedout*) Fix cp.push_dir pushing empty dirs -- **PR** `#35436`_: (*cachedout*) Minor doc fixup -- **PR** `#35132`_: (*sjorge*) fixes , causing lots of mayham (onchange) with 2016.3.2 for me -- **PR** `#35447`_: (*ticosax*) [dockerng] RepoTags can be also be None with docker 1.12 -- **PR** `#35308`_: (*farcaller*) Actually fixed dockerng.list_tags -- **PR** `#34702`_: (*farcaller*) Fixed dockerng.list_tags -- **PR** `#35427`_: (*cachedout*) Correct errant call to argspec from master. Fix ext_job_cache. -- **PR** `#35428`_: (*cachedout*) Resolve stacktrace logged by highstate outputter if sls cannot be found -- **PR** `#35412`_: (*s0undt3ch*) Only allow one sync read to happen at a time. -- **PR** `#35406`_: (*rallytime*) Provide links to the renderers in the template docs -- **PR** `#35360`_: (*rallytime*) Add all template registery templates to file.managed docs -- **PR** `#35393`_: (*deniszh*) No need to run ddns update every time -- **PR** `#35407`_: (*hu-dabao*) [Fix-35094] None will not be added to grains which generate [none] -- **PR** `#35411`_: (*eliasp*) modules.event.send(): Prevent backtrace for masterless Minions -- **PR** `#35395`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35394`_: (*rallytime*) Back-port `#34573`_ to 2015.8 -- **PR** `#35359`_: (*terminalmage*) Clean up open filehandles -- **PR** `#35357`_: (*twangboy*) Fix file.recurse with clean: True on Windows (2015.8) -- **PR** `#35339`_: (*isbm*) Bugfix: Prevent continuous restart, if a dependency wasn't installed -- **PR** `#34573`_: (*cedwards*) Update freebsd.rst -- **PR** `#35373`_: (*cachedout*) Raise SaltRenderError on bad requisite -- **PR** `#35352`_: (*twangboy*) Fix file.recurse with clean: True on Windows (2016.3) -- **PR** `#35356`_: (*jfindlay*) document log levels and warn on all logging below info -- **PR** `#35358`_: (*twangboy*) Update libsodium deps -- **PR** `#35360`_: (*rallytime*) Add all template registery templates to file.managed docs -- **PR** `#35362`_: (*rallytime*) Correct deprecation version tags -- **PR** `#35361`_: (*rallytime*) Blockdev deprecations -- **PR** `#25267`_: (*jfindlay*) Disk module improvements -- **PR** `#24893`_: (*The-Loeki*) Contribution: Disk module improvements -- **PR** `#35347`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35325`_: (*kev009*) Fix freebsd netstat route on fbsd 10+ -- **PR** `#35323`_: (*thatch45*) Fix issue with bad error check in salt-vt -- **PR** `#35309`_: (*terminalmage*) file.recurse: Do not convert octal mode string to int -- **PR** `#35301`_: (*bobrik*) Pass port to ssh.check_known_host, closes `#35264`_ -- **PR** `#35334`_: (*cachedout*) Restore random_master functionality -- **PR** `#35331`_: (*hu-dabao*) fix 35165, salt-run jobs.exit_success jid is broken -- **PR** `#35318`_: (*rallytime*) Remove legacy compat docs in mysql pillar since the code was removed already -- **PR** `#30913`_: (*jtand*) Deprecated code removed. -- **PR** `#35329`_: (*hu-dabao*) sys.doc will skip all not connected minions -- **PR** `#35306`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35290`_: (*terminalmage*) Resolve a couple bugs in orchestration output -- **PR** `#35229`_: (*lubyou*) Ignore import error for pwd module in mac_shadow -- **PR** `#35227`_: (*isbm*) Isbm osfinger ubuntu fix -- **PR** `#35286`_: (*hu-dabao*) fix 34425, a bug that sys.doc cannot output format -- **PR** `#35275`_: (*rallytime*) Back-port `#35213`_ to 2016.3 -- **PR** `#35213`_: (*gtmanfred*) add identity v3 support to openstack driver -- **PR** `#35278`_: (*dmurphy18*) Increase timeout for siging to 10 seconds when signing rpm packages -- **PR** `#35276`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35271`_: (*bobrik*) Default state_output_profile to True everywhere, closes `#35166`_ -- **PR** `#35249`_: (*terminalmage*) Fix regression in git.latest -- **PR** `#35245`_: (*rallytime*) Back-port `#35039`_ to 2015.8 -- **PR** `#35241`_: (*terminalmage*) Ensure max recursion in gitfs results in no blob object being returned. -- **PR** `#35240`_: (*derekmaciel*) Backport `#35225`_ to 2015.8 -- **PR** `#35236`_: (*rallytime*) Back-port `#35119`_ to 2015.8 -- **PR** `#35233`_: (*terminalmage*) Do not attempt to get fqdn_ip{4,6} grains when ipv{4,6} grains are empty -- **PR** `#35225`_: (*derekmaciel*) Add missing documentation for pkg.installed -- **PR** `#35211`_: (*cachedout*) Alternative sudo users for salt-ssh -- **PR** `#35202`_: (*multani*) doc: fix broken links in the test documentation page -- **PR** `#35119`_: (*derekmaciel*) Assume two EVRs are equal if E and V are equal but one R is missing. -- **PR** `#35039`_: (*whiteinge*) Add saltenv support to module.run -- **PR** `#35274`_: (*rallytime*) Lint fixes for 2016.3 branch -- **PR** `#35232`_: (*theredcat*) fix rabbitmq version detection using a package-agnostic version -- **PR** `#35269`_: (*meaksh*) Checksum validation for zypper pkg.download in 2016.3 and develop -- **PR** `#35197`_: (*vutny*) Make `pkgbuild.repo` state recognize `createrepo` command return code -- **PR** `#35178`_: (*cro*) Add append_minionid_config_dirs option -- **PR** `#35259`_: (*cachedout*) Fixup 35253 -- **PR** `#35253`_: (*abednarik*) Fix disk.wipe missing option. -- **PR** `#35253`_: (*abednarik*) Fix disk.wipe missing option. -- **PR** `#35206`_: (*hu-dabao*) Make the log level back to warning for unclassified exc -- **PR** `#35196`_: (*isbm*) Deprecate status.uptime one version later -- **PR** `#35207`_: (*eliasp*) Handle exceptions in `_get_virtual()` and in `_get_virtual()` consumers -- **PR** `#35232`_: (*theredcat*) fix rabbitmq version detection using a package-agnostic version -- **PR** `#35244`_: (*rallytime*) Back-port `#31677`_ to 2016.3 -- **PR** `#31677`_: (*miihael*) Return correct value for services that must be enabled in Systemd -- **PR** `#35182`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35174`_: (*rallytime*) Back-port `#35146`_ to 2015.8 -- **PR** `#35173`_: (*rallytime*) Back-port `#35135`_ to 2015.8 -- **PR** `#35146`_: (*cachedout*) Don't discard running beacons config when listing becaons -- **PR** `#35145`_: (*jacobhammons*) doc version update to 2015.8.11, updates to release notes -- **PR** `#35135`_: (*rallytime*) Add missing CLI Examples to aws_sqs module funcs -- **PR** `#34827`_: (*thatch45*) fix beacon list to include all beacons being processed -- **PR** `#35150`_: (*rallytime*) Start release notes for 2016.3.3 -- **PR** `#35157`_: (*hu-dabao*) master returned from func should be a string as designed so far -- **PR** `#35147`_: (*jacobhammons*) doc version updated to 2016.3.2 -- **PR** `#35136`_: (*s0undt3ch*) Don't restart processes if the manager is not set to restart them -- **PR** `#35133`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35114`_: (*terminalmage*) Add clarification docs on a common git_pillar misconfiguration -- **PR** `#35043`_: (*rallytime*) Start release notes file for 2015.8.12 -- **PR** `#34768`_: (*hrumph*) Fixes `#34767`_ -- **PR** `#35120`_: (*kstreee*) The '_handle_event_socket_recv' function in Salt Api is missing first data of stream. -- **PR** `#35131`_: (*rallytime*) Back-port `#35011`_ to 2016.3 -- **PR** `#35011`_: (*nishigori*) Fix docstring for code-block of rst -- **PR** `#35110`_: (*hu-dabao*) Do not return job status back to master for master_alive and master_failback schedules -- **PR** `#35104`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35066`_: (*jfindlay*) returners.postgres_local_cache: do not log in __virtual__ -- **PR** `#35050`_: (*terminalmage*) [orchestration] Properly handle runner/wheel funcs which accept a 'saltdev' argument -- **PR** `#35026`_: (*cachedout*) Expressly deny a minion if a key cannot be found -- **PR** `#35024`_: (*bobrik*) Cache systemd unit update check per unit, closes `#34927`_ -- **PR** `#35105`_: (*rallytime*) Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability -- **PR** `#33870`_: (*rallytime*) Add note about Xenial packages to 2016.3.0 release notes -- **PR** `#35059`_: (*vutny*) Add `fun_args` field to events generated by execution of Master modules -- **PR** `#34955`_: (*lubyou*) force dism to always output english text -- **PR** `#35078`_: (*jacobweinstock*) added missing non-keyword argument skip_verify to __get_artifact func… -- **PR** `#35008`_: (*hu-dabao*) Fix multimaster failover on more than two masters and failback behaviour -- **PR** `#35055`_: (*galet*) `#33536`_ pkgrepo.managed does not disable a yum repo with "disabled: True" -- **PR** `#35039`_: (*whiteinge*) Add saltenv support to module.run -- **PR** `#35046`_: (*eliasp*) Prevent backtrace in `salt.states.network` -- **PR** `#35054`_: (*lubyou*) Only fail user lookup is the user parameter is required -- **PR** `#35029`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35000`_: (*rallytime*) Back-port `#33875`_ and `#34999`_ to 2015.8 -- **PR** `#34994`_: (*rallytime*) Back-port `#34835`_ to 2015.8 -- **PR** `#34835`_: (*thatch45*) Make the mine and publish combine minion and master opts in salt-ssh -- **PR** `#33875`_: (*jmesquita*) Fix naive fileserver map diff algorithm -- **PR** `#35021`_: (*terminalmage*) Don't add '.' to strerror when passed string ends in ? or ! -- **PR** `#34983`_: (*eliasp*) modules.slack.post_message: Allow sending messages to direct-message … -- **PR** `#34996`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#34991`_: (*cachedout*) SSH timeout -- **PR** `#34976`_: (*cachedout*) Refine errors in client -- **PR** `#34831`_: (*thatch45*) If the thin does not match, then redeploy, don't error -- **PR** `#34987`_: (*eliasp*) salt.states.slack: check correct result attribute -- **PR** `#34835`_: (*thatch45*) Make the mine and publish combine minion and master opts in salt-ssh -- **PR** `#34988`_: (*rallytime*) Update release notes with new changes -- **PR** `#34946`_: (*anlutro*) Fix virtualenv behavior when requirements files are in subdirectories -- **PR** `#34957`_: (*sjmh*) Don't fall through to checking auth entries -- **PR** `#34971`_: (*cachedout*) Increase timeout for grains test -- **PR** `#34951`_: (*vutny*) Fix `#34873`_ -- **PR** `#34935`_: (*rallytime*) Avoid UnboundLocalError in beacons module -- **PR** `#34894`_: (*rallytime*) [develop] Merge forward from 2016.3 to develop -- **PR** `#34956`_: (*cachedout*) Increase all run_script timeouts to 30s -- **PR** `#34933`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#34916`_: (*cachedout*) Master performance improvement -- **PR** `#34911`_: (*cachedout*) Backport `#34906`_ -- **PR** `#34906`_: (*cachedout*) Set timeout for run_salt in test suite -- **PR** `#34898`_: (*hrumph*) Stop multiple refreshes during call to pkg.list_upgrades -- **PR** `#34606`_: (*isbm*) Bugfix: Exit on configuration read (backport) -- **PR** `#34915`_: (*abednarik*) Update service_rh provider to exclude XenServer >= 7. -- **PR** `#34926`_: (*rallytime*) Lint `#34923`_ -- **PR** `#34923`_: (*eliasp*) Handle exception when no Slack API key was provided -- **PR** `#34910`_: (*cachedout*) Fix grains error on proxy minions -- **PR** `#34864`_: (*jmacfar*) Check for version in list of installed versions -- **PR** `#34902`_: (*rallytime*) Back-port `#34878`_ to 2016.3 -- **PR** `#34878`_: (*abednarik*) Add VirtuozzoLinux is yumpkg enable list. -- **PR** `#34901`_: (*rallytime*) Add VirtuozzoLinux to the list of enabled distros for rpm.py -- **PR** `#34900`_: (*rallytime*) Add VirtuozzoLinux to enabled platforms list in rh_service.py -- **PR** `#34887`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#34869`_: (*terminalmage*) Fail git.latest states with uncommitted changes when force_reset=False -- **PR** `#34862`_: (*thatch45*) Fix salt-ssh cacheing issue -- **PR** `#34859`_: (*cachedout*) Fix wheel test -- **PR** `#34632`_: (*eliasp*) Try to create the log directory when not present yet -- **PR** `#34854`_: (*rallytime*) Remove string_types import from state compiler -- **PR** `#34865`_: (*thatch45*) This needs discussion, since this breaks SUSE -- **PR** `#34858`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#34847`_: (*cachedout*) Add an option to skip the verification of client_acl users -- **PR** `#34833`_: (*rallytime*) Back-port `#28521`_ to 2015.8 -- **PR** `#34828`_: (*thatch45*) Fix `#34648`_ -- **PR** `#34827`_: (*thatch45*) fix beacon list to include all beacons being processed -- **PR** `#34823`_: (*rallytime*) Back-port `#25276`_ to 2015.8 -- **PR** `#34822`_: (*thatch45*) Fix salt-ssh state.high and state.low -- **PR** `#28521`_: (*gongled*) SPM: packaging doesn't work in Python 2.6. Fixed. -- **PR** `#25276`_: (*jacobhammons*) copy spm.1 man page during setup -- **PR** `#34852`_: (*rallytime*) Skip GCE unit tests - causes test suite to hang +* **ISSUE** `#35102`_: (`TheBigBear`_) Exception raised when processing __virtual__ function for mac_system - (mac os x installation relies on un-installed 'mac_service_helper.sh') (refs: `#35580`_) + +* **PR** `#35580`_: (`twangboy`_) Fix mac_service attempts to parse non-plist files + @ *2016-08-19 09:24:38 UTC* + + * 9683bb3c58 Merge pull request `#35580`_ from twangboy/fix_35102 + + * 4122e66ed5 Handle malformed plist files + + * 52feff9309 Fix mac_service attempts to parse non-plist files + +* **PR** `#35586`_: (`hu-dabao`_) Fix 35420, add run_on_start in build_schedule_item + @ *2016-08-19 09:23:32 UTC* + + * c4ec94d6e8 Merge pull request `#35586`_ from hu-dabao/fix-35420 + + * 2d3a882cc2 fix 35420, add run_on_start in build_schedule_item, remove redundancy of enabled + + * **PR** `#35583`_: (`terminalmage`_) Fix localemod tests + +* **PR** `#35579`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-18 22:00:41 UTC* + + * d1339fd9f5 Merge pull request `#35579`_ from rallytime/merge-2016.3 + + * 00dff9dcbd Merge branch '2015.8' into '2016.3' + + * 26a7f7d9f7 Merge pull request `#35577`_ from terminalmage/unit-file-changes + + * 6cb0fb47f3 pkg/salt-syndic.service: change Type to notify + + * 175ba99e0e pkg/salt-minion.service: remove KillMode, change Type to notify + + * 540ec28954 pkg/salt-master.service: remove KillMode + + * 69fad464ab pkg/salt-api.service: change Type to notify + +* **PR** `#35571`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-18 19:50:03 UTC* + + * f7a18234db Merge pull request `#35571`_ from rallytime/merge-2016.3 + + * 2930df924e Update localemod_test systemd.sd_booted mock to use salt.utils.systemd.booted + + * e61b04a707 Merge branch '2015.8' into '2016.3' + + * 2a5d1a0eee fix-35384, fix the logic caused by wrong indent (`#35566`_) + + * feb852f8c0 Clarify config.get docstring (`#35492`_) + + * 205d8e2e7b Merge pull request `#35483`_ from gtmanfred/2015.8 + + * 2d8ec1e9db use __opts__ in salt.utils.cloud for cache functions + + * 70fa2d0901 Merge pull request `#35546`_ from whiteinge/salt-api-eauth-fail-gracefully + + * eb3574adae Don't fail hard if the user's permissions cannot be found + + * ec597bd54c Change groups check in token to look for truthy values + + * 61fec6caa9 add missing glob import (`#35525`_) + + * 0e3f2fc6cb Whitespace fix for 2015.8 (`#35540`_) + + * fd3274c800 Merge pull request `#35510`_ from terminalmage/issue33516 + + * 5b5f19d269 Update zypper unit test to reflect call to config.get + + * 2730edb516 Add note about systemd-run usage in package states + + * e2d9e87e10 salt/modules/systemd.py: Use systemd-run --scope where needed + + * 22919a25bc Notify systemd on salt-api start + + * a40b3f8a08 Notify systemd on syndic start + + * e847d3af30 Notify systemd on minion start + + * d648887afc salt/modules/zypper.py: Use systemd-run --scope where needed + + * 2e17976722 salt/modules/yumpkg.py: Use systemd-run --scope where needed + + * 86b59c1e74 salt/modules/pacman.py: Use systemd-run --scope where needed + + * e32d92c6d5 salt/modules/ebuild.py: Use systemd-run --scope where needed + + * c7d21d3ae3 salt/modules/aptpkg.py: Use systemd-run --scope where needed + + * f83e0ef242 Add unit tests for salt.utils.systemd + + * 5b12f030c6 Add func to salt.utils.systemd to tell if scopes are available + + * **PR** `#35573`_: (`rallytime`_) Back-port `#33337`_ to 2016.3 + + * **PR** `#33337`_: (`mzupan`_) adding the () to make changes work (refs: `#35573`_) + +* **PR** `#35572`_: (`terminalmage`_) Fix poor formatting in pkg state docs + @ *2016-08-18 18:15:52 UTC* + + * 73b549ed00 Merge pull request `#35572`_ from terminalmage/docs + + * 7d7a7de9e6 Fix poor formatting in pkg state docs + + * **PR** `#35545`_: (`hu-dabao`_) fix-35384, fix cmd.run unless (refs: `#35566`_) + + * **PR** `saltstack/salt#35463`_: (`skizunov`_) Make `auth_timeout` user configurable again (refs: `#35489`_) + +* **PR** `#35489`_: (`rallytime`_) Back-port `#35463`_ to 2016.3 + @ *2016-08-18 07:16:03 UTC* + + * **PR** `#35463`_: (`skizunov`_) Make `auth_timeout` user configurable again (refs: `#35489`_) + + * f2eb3dc105 Merge pull request `#35489`_ from rallytime/bp-35463 + + * bbf7ce121b Remove final self.MINION_CONNECT_TIMEOUT ref + + * cf2e2daab9 Make `auth_timeout` user configurable again + + * **PR** `#35538`_: (`thatch45`_) Treat python XML as an optdep + +* **PR** `#35526`_: (`thatch45`_) Always deploy the thin to /var/tmp + @ *2016-08-17 19:44:26 UTC* + + * e2bd575461 Merge pull request `#35526`_ from thatch45/ssh_W_tmp + + * a381f02cfe Always deploy the thin to /var/tmp + +* **PR** `#35522`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-17 18:07:16 UTC* + + * 8b770869e4 Merge pull request `#35522`_ from rallytime/merge-2016.3 + + * ff212d8976 Whitespace fix + + * c305d8d99b Merge branch '2015.8' into '2016.3' + + * b3b28cb760 Might be a good idea to be able to download the software we make (`#35513`_) + + * 9f87081cef Merge pull request `#35302`_ from Ch3LL/add_job_cache_test + + * ccb2a5cadf remove unused imports + + * 512ae81dfd remove TMP and add integration.TMP + + * c9b7c3cf80 need to add returners option in other places + + * 7316df7a02 fix pylint + + * 50a4f0fe6a fix comment + + * 6837acf742 add job cache integration tests + + * 1c82c6bee5 Merge pull request `#35512`_ from cachedout/fixup_35419 + + * 253662541a Fix import + + * f16a30786b Fixes consul.agent_service_register which was broken for registering service checks. + + * e1a373fa4c Merge pull request `#35497`_ from deepakhj/2015.8 + + * 685db4ab88 Fix spacing + + * 4048255ed6 Merge pull request `#35508`_ from terminalmage/update-docstring + + * 67c945fce0 Add Carbon to versionadded for git.diff + +* **PR** `#35516`_: (`rallytime`_) Back-port `#34441`_ to 2016.3 + @ *2016-08-17 15:47:23 UTC* + + * **PR** `#34441`_: (`markuskramerIgitt`_) Copy and delete silently, do not list each file (refs: `#35516`_) + + * e86a39a115 Merge pull request `#35516`_ from rallytime/bp-34441 + + * e47c661cb0 Copy and delete silently, do not list each file + + * **PR** `saltstack/salt#34502`_: (`markuskramerIgitt`_) Windows installer build scripts will exit on error (refs: `#35517`_) + +* **PR** `#35517`_: (`rallytime`_) Back-port `#34502`_ to 2016.3 + @ *2016-08-17 15:47:10 UTC* + + * **PR** `#34502`_: (`markuskramerIgitt`_) Windows installer build scripts will exit on error (refs: `#35517`_) + + * 45080d9860 Merge pull request `#35517`_ from rallytime/bp-34502 + + * 32da48df08 setup.py will not print each individual file + + * 698a076a39 Completely remove Python and verify + + * 7406bd22a6 Errors will stop the scripts + +* **PR** `#35429`_: (`tankywoo`_) Fix iptables target options with no arguments + @ *2016-08-17 10:05:17 UTC* + + * c1deb945d7 Merge pull request `#35429`_ from tankywoo/fix-iptables-target-options + + * 914eb60d51 Fix iptables target options with no arguments + +* **ISSUE** `#35458`_: (`iggy`_) SALT.STATES.APACHE_MODULE needs version annotations (refs: `#35495`_) + +* **PR** `#35495`_: (`rallytime`_) Use correct deprecated notation instead of a warning for apache_module.enable state function. + @ *2016-08-17 09:36:40 UTC* + + * 678759ba6c Merge pull request `#35495`_ from rallytime/fix-35458 + + * 9bae3d09a6 Use correct deprecated notation instead of a warning. + +* **ISSUE** `#35336`_: (`Sylvain303`_) documentation state.file.managed parameter template not reflecting TEMPLATE_REGISTRY (refs: `#35360`_, `#35498`_, `#35406`_, #saltstack/salt`#35360`_) + + * **PR** `saltstack/salt#35360`_: (`rallytime`_) Add all template registery templates to file.managed docs (refs: `#35406`_) + +* **PR** `#35498`_: (`rallytime`_) Add supported templates list to all template doc references in file state + @ *2016-08-17 09:33:36 UTC* + + * **PR** `#35406`_: (`rallytime`_) Provide links to the renderers in the template docs (refs: `#35498`_) + + * **PR** `#35360`_: (`rallytime`_) Add all template registery templates to file.managed docs (refs: `#35498`_) + + * 5bd44b10a7 Merge pull request `#35498`_ from rallytime/file-state-docs + + * 6190b2d738 Add supported templates list to all template doc references in file state + +* **PR** `#35487`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-16 18:36:21 UTC* + + * 6df4648765 Merge pull request `#35487`_ from rallytime/merge-2016.3 + + * c6c82be1de Merge branch '2015.8' into '2016.3' + + * bfe7107a87 Update bootstrap script to latest stable (2016.08.16) (`#35486`_) + + * 240fc12863 Merge pull request `#35413`_ from cachedout/issue_35296 + + * fb8a12d677 Fix silly error + + * 3646cf1afa Additional checks on master and integration test + + * 09efde7634 Splat the list into os.path.join + + * fc0d5878bc Set file_recv on test master + + * 81c4d136c5 Transition file push paths to lists + + * c3319b2a8b Merge pull request `#35476`_ from cachedout/issue_35380 + + * c05fcf33d1 Fixup SSH bug where sudo without sudo user would break + + * 004778c966 Merge pull request `#35471`_ from terminalmage/issue34479 + + * e243c63e43 win_pkg: Fix traceback when package is not installed + + * 5c9428c32d Merge pull request `#35448`_ from isbm/isbm-zypper-106-fix + + * dd82e6a848 Add ignore_repo_failure option to suppress zypper's exit code 106 on unavailable repos + + * 1473474b04 Merge pull request `#35451`_ from isbm/isbm-zypper-mod_repo-unchanged + + * 8790197d86 Fix Unit test for suppressing the exception removal on non-modified repos + + * 3f00c6997a Remove zypper's raise exception if mod_repo has no arguments and/or no changes + + * a8c4f17f50 Merge pull request `#35453`_ from theothergraham/fix_CacheDisk + + * ae5b233d51 fixes `#34279`_ + + * d8c35b5260 Merge pull request `#35459`_ from thatch45/shim_fix + + * 10037b00cb Some environments refuse to return the command output + + * 38b60a32e5 [2015.8] Update bootstrap script to latest stable (2016.08.15) (`#35460`_) + +* **ISSUE** `#34161`_: (`bobrik`_) Salt command can hang forever because of one broken minion (refs: `#35446`_) + + * **PR** `#35446`_: (`cachedout`_) Make salt-client aware of edge-case where saltutil might be broken + +* **ISSUE** `#35422`_: (`ViaviSolutions`_) aptpkg.py: install_recommends: True does not force "--install-recommends" (refs: `#35449`_) + +* **PR** `#35449`_: (`dkruger`_) aptpkg will specify --install-recommends if enabled by the SLS + @ *2016-08-16 01:38:56 UTC* + + * f90ecbb15e Merge pull request `#35449`_ from dkruger/fix-35422 + + * f54bf445b5 aptpkg will specify --install-recommends if enabled by the SLS + +* **ISSUE** `#33367`_: (`supertom`_) [salt-cloud] libcloud >= 1.0.0 incompatible regarding node_state (refs: `#33518`_) + +* **PR** `#35467`_: (`rallytime`_) Back-port `#33518`_ to 2016.3 + @ *2016-08-16 01:17:01 UTC* + + * **PR** `#35235`_: (`rallytime`_) Back-port `#33518`_ to 2016.3 (refs: `#35467`_) + + * **PR** `#33518`_: (`tonybaloney`_) Fix libcloud bug `#33367`_ (refs: `#35235`_, `#35467`_) + + * d2dd78e25b Merge pull request `#35467`_ from rallytime/bp-33518 + + * e427815caf fix clrf + + * be41a400fa commit fix + + * 06530b5461 add a test to check existing functionality is broken + + * **PR** `#35461`_: (`rallytime`_) [2016.3] Update bootstrap script to latest stable (2016.08.15) + +* **PR** `#35456`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-15 19:16:23 UTC* + + * 9b2c075611 Merge pull request `#35456`_ from rallytime/merge-2016.3 + + * 6a86a12294 Merge branch '2015.8' into '2016.3' + + * d75005c519 Fix cp.push_dir pushing empty dirs (`#35442`_) + + * 09925ba353 Minor doc fixup (`#35436`_) + + * a0b128a85a Merge pull request `#35132`_ from sjorge/2015.8-35121 + + * 5cb38c8ae0 switch to fpread().splitlines(), as per @lorengordon suggestion + + * 634f1dded5 fixes `#35121`_, causing lots of mayham (onchange) with 2016.3.2 for me + + * **PR** `saltstack/salt#35308`_: (`farcaller`_) Actually fixed dockerng.list_tags (refs: `#35447`_) + + * **PR** `saltstack/salt#34702`_: (`farcaller`_) Fixed dockerng.list_tags (refs: `#35447`_) + + * **PR** `#35447`_: (`ticosax`_) [dockerng] RepoTags can be also be None with docker 1.12 + + * **PR** `#34702`_: (`farcaller`_) Fixed dockerng.list_tags (refs: #`saltstack/salt#35308`_) + +* **ISSUE** `saltstack/salt#35403`_: (`randomed`_) Setting ext_job_cache breaks on salt-master (refs: `#35427`_) + + * **PR** `#35427`_: (`cachedout`_) Correct errant call to argspec from master. Fix ext_job_cache. + +* **ISSUE** `#35423`_: (`Ch3LL`_) Stacktrace when running state.sls against an sls does not exist (refs: `#35428`_) + + * **PR** `#35428`_: (`cachedout`_) Resolve stacktrace logged by highstate outputter if sls cannot be found + +* **PR** `#35412`_: (`s0undt3ch`_) Only allow one sync read to happen at a time. + @ *2016-08-12 23:57:29 UTC* + + * 607169a01b Merge pull request `#35412`_ from s0undt3ch/2016.3 + + * f54b3cc514 Only allow one sync read to happen at a time. + +* **ISSUE** `#35336`_: (`Sylvain303`_) documentation state.file.managed parameter template not reflecting TEMPLATE_REGISTRY (refs: `#35360`_, `#35498`_, `#35406`_, #saltstack/salt`#35360`_) + + * **PR** `saltstack/salt#35360`_: (`rallytime`_) Add all template registery templates to file.managed docs (refs: `#35406`_) + + * **PR** `#35406`_: (`rallytime`_) Provide links to the renderers in the template docs (refs: `#35498`_) + +* **PR** `#35393`_: (`deniszh`_) No need to run ddns update every time + @ *2016-08-12 12:40:36 UTC* + + * b3e9e98b40 Merge pull request `#35393`_ from deniszh/2016.3_fix35350 + + * 6f2f080f4a No need to run dns update every time + +* **PR** `#35407`_: (`hu-dabao`_) [Fix-35094] None will not be added to grains which generate [none] + @ *2016-08-12 12:34:05 UTC* + + * a5fe05b7f9 Merge pull request `#35407`_ from hu-dabao/fix-35094 + + * a23108f795 None will not be added to grains which generate [none] + +* **PR** `#35411`_: (`eliasp`_) modules.event.send(): Prevent backtrace for masterless Minions + @ *2016-08-12 12:29:02 UTC* + + * 4dc776ffbf Merge pull request `#35411`_ from eliasp/2016.3-modules.event-handle-file_client-opt + + * 8d7244bdd9 modules.event.send(): Also check for `file_client` and `use_master_when_local` opts + +* **PR** `#35395`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-11 20:59:37 UTC* + + * c032506e6b Merge pull request `#35395`_ from rallytime/merge-2016.3 + + * 0d1aa630f1 Lint fix + + * cf038ee3fe Merge branch '2015.8' into '2016.3' + + * d9c20c0456 Update freebsd.rst (`#35394`_) + + * a375dd7e1f Clean up open filehandles (`#35359`_) + + * 9ea7a34c30 Merge pull request `#35339`_ from isbm/isbm-2015.8-minion-importerror-fix + + * 12af60b7be Fix continuous minion restart if a dependency wasn't installed + + * fd9b05ace4 Merge pull request `#35357`_ from twangboy/file.recurse.clean.2015.8 + + * d328ec0157 Fix file.recurse with clean: True + +* **ISSUE** `#35226`_: (`mathieubouchard`_) Do not throw an exception when an invalid requisite is set (refs: `#35373`_) + + * **PR** `#35373`_: (`cachedout`_) Raise SaltRenderError on bad requisite + +* **PR** `#35352`_: (`twangboy`_) Fix file.recurse with clean: True on Windows (2016.3) + @ *2016-08-11 00:46:11 UTC* + + * 72f3548671 Merge pull request `#35352`_ from twangboy/file.recurse.clean + + * ecad616d08 Fix file.recurse with clean: True + +* **PR** `#35356`_: (`jfindlay`_) document log levels and warn on all logging below info + @ *2016-08-11 00:45:56 UTC* + + * 0fcfc70cc8 Merge pull request `#35356`_ from jfindlay/log_levels + + * 2fc3a55338 utils.verify.verify_log: warn at all levels less than info + + * 72a3f18a2e log.setup: minor optimization + + * 66332510c6 doc.ref.configuration.logging: document log levels + + * 93616eff3e doc.ref.configuration.logging: fix formatting + + * 472a2d31de doc.ref.configuration.logging: cleanup formatting + +* **PR** `#35358`_: (`twangboy`_) Update libsodium deps + @ *2016-08-11 00:36:30 UTC* + + * 2f7be03053 Merge pull request `#35358`_ from twangboy/update_libsodium_deps + + * d120a8906f Add vcredist 14 dlls + +* **ISSUE** `#35336`_: (`Sylvain303`_) documentation state.file.managed parameter template not reflecting TEMPLATE_REGISTRY (refs: `#35360`_, `#35498`_, `#35406`_, #saltstack/salt`#35360`_) + +* **PR** `#35360`_: (`rallytime`_) Add all template registery templates to file.managed docs (refs: `#35498`_) + @ *2016-08-11 00:35:20 UTC* + + * f9e03b9c59 Merge pull request `#35360`_ from rallytime/fix-35336 + + * 30badb5402 Add all template registery templates to file.managed docs + +* **ISSUE** `#24745`_: (`The-Loeki`_) RFC: disk versus blockdev (refs: `#24893`_) + + * **PR** `saltstack/salt#25267`_: (`jfindlay`_) Disk module improvements (refs: `#35361`_) + +* **PR** `#35362`_: (`rallytime`_) Correct deprecation version tags + @ *2016-08-11 00:34:38 UTC* + + * **PR** `#35361`_: (`rallytime`_) Blockdev deprecations (refs: `#35362`_) + + * **PR** `#25267`_: (`jfindlay`_) Disk module improvements (refs: `#35362`_) + + * **PR** `#24893`_: (`The-Loeki`_) Contribution: Disk module improvements (refs: #`saltstack/salt`#25267`_`_, `#25267`_) + + * 3c628d3cbc Merge pull request `#35362`_ from rallytime/correct-deprecated-tag + + * 507827a014 Correct deprecation version tags + +* **PR** `#35347`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-10 20:07:42 UTC* + + * 87e29188c0 Merge pull request `#35347`_ from rallytime/merge-2016.3 + + * a651962e95 Merge branch '2015.8' into '2016.3' + + * 4618b433e9 Merge pull request `#35323`_ from thatch45/ssh_crazy + + * 8a5b47b5d7 Collect all error data from the wfuncs call + + * 11864c31b7 supress a stack trace to show clean ssh error + + * 9fbfa282fa wow this solves an issue! + + * cfae862972 Merge pull request `#35325`_ from kev009/fbsd-netstat-route + + * 0d49dd3c29 Fix fbsd netstat route on fbsd 10+ + + * 244c3bd495 Pass port to ssh.check_known_host, closes `#35264`_ (`#35301`_) + + * 243909f39d file.recurse: Do not convert octal mode string to int (`#35309`_) + + * **PR** `#35334`_: (`cachedout`_) Restore random_master functionality + +* **PR** `#35331`_: (`hu-dabao`_) fix 35165, salt-run jobs.exit_success jid is broken + @ *2016-08-10 11:50:10 UTC* + + * 78dfd18ec6 Merge pull request `#35331`_ from hu-dabao/fix-35165 + + * 4dcce18d01 fix 35165, salt-run jobs.exit_success jid is broken + +* **PR** `#35318`_: (`rallytime`_) Remove legacy compat docs in mysql pillar since the code was removed already + @ *2016-08-10 11:34:48 UTC* + + * **PR** `#30913`_: (`justinta`_) Deprecated code removed. (refs: `#35318`_) + + * fcca0b9333 Merge pull request `#35318`_ from rallytime/remove-deprecation-docs + + * 75f205e485 Remove legacy compat docs in mysql pillar since the code was removed already + +* **PR** `#35329`_: (`hu-dabao`_) sys.doc will skip all not connected minions + @ *2016-08-10 11:18:22 UTC* + + * 3446dc9ec6 Merge pull request `#35329`_ from hu-dabao/fix-tiny-salt-cli + + * 4b806a70ea sys.doc will skip all not connected minions + +* **PR** `#35306`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-09 18:50:44 UTC* + + * 31f7d307a7 Merge pull request `#35306`_ from rallytime/merge-2016.3 + + * 2d3eadfe49 Merge branch '2015.8' into '2016.3' + + * 2efc1b333b Merge pull request `#35290`_ from terminalmage/issue35051 + + * d621aa7b61 Update runner/wheel unit tests to reflect new key in ret dict + + * 90c12a9c7b Add __orchestration__ key to orch returns for runner/wheel funcs + + * 7b8c3b86e7 Suppress error about invalid changes data for orchestration jobs + + * 54a1704d6c Suppress event for wheel/runner funcs executed from orchestration + + * f409f62bf2 Accept print_event option in WheelClient.cmd() + + * b42b25ccce Add cmd func for RunnerClient + + * 480065fe00 Add print_event option to client mixins + +* **PR** `#35229`_: (`lubyou`_) Ignore import error for pwd module in mac_shadow + @ *2016-08-09 15:48:16 UTC* + + * 94529d0578 Merge pull request `#35229`_ from lubyou/fix-mac_shadow + + * b45039c240 Do not blindly ignore import failures + + * c1d5670b79 Ignore import error for pwd module + +* **PR** `#35227`_: (`isbm`_) Isbm osfinger ubuntu fix + @ *2016-08-09 15:38:31 UTC* + + * ce7aeb6ca4 Merge pull request `#35227`_ from isbm/isbm-osfinger-ubuntu-fix + + * fe5da97283 Lintfix: E8303 + + * 6eea62d4ec Add a deprecation warning + + * 4dc45f2509 Add grains unit test for Ubuntu systems + + * 3904e4b81c Bugfix: Ubuntu osfinger should contain also minor version + + * a69f97f9ad Bugfix: use oscodename if lsb_distrib_codename key exists empty. + +* **PR** `#35286`_: (`hu-dabao`_) fix 34425, a bug that sys.doc cannot output format + @ *2016-08-09 09:50:12 UTC* + + * 47e328f755 Merge pull request `#35286`_ from hu-dabao/fix-34425 + + * 86fb359f58 fix 34425, a bug that sys.doc cannot output format + +* **ISSUE** `#27294`_: (`stenstad`_) salt-cloud should support Openstack Identitiy v3 for authentication (refs: `#35213`_) + +* **PR** `#35275`_: (`rallytime`_) Back-port `#35213`_ to 2016.3 + @ *2016-08-09 00:02:43 UTC* + + * **PR** `#35213`_: (`gtmanfred`_) add identity v3 support to openstack driver (refs: `#35275`_) + + * d79cb1b4ec Merge pull request `#35275`_ from rallytime/bp-35213 + + * 9b9fc508cc add identity v3 support to openstack driver + + * **PR** `#35278`_: (`dmurphy18`_) Increase timeout for siging to 10 seconds when signing rpm packages + +* **PR** `#35276`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-08 18:20:29 UTC* + + * 959a00e4b7 Merge pull request `#35276`_ from rallytime/merge-2016.3 + + * 2b4c156df1 Merge branch '2015.8' into '2016.3' + + * f8158124d5 Merge pull request `#35211`_ from cachedout/issue_31074 + + * 6f53232e6d Better error handling and a workaround for group mismatch. + + * 5b56a4acf7 Docs + + * ae04e7aaeb Initial POC + + * 3e4eb13daa Merge pull request `#35271`_ from bobrik/default-output-profile + + * 6cdee21036 Default state_output_profile to True everywhere, closes `#35166`_ + + * 673e1aa1aa Merge pull request `#35233`_ from terminalmage/issue32719 + + * 730a077041 Do not attempt to get fqdn_ip{4,6} grains when ipv{4,6} grains are empty + + * cdf3c0fe73 Merge pull request `#35202`_ from multani/fix/test-doc + + * 1642dba5d1 doc: fix broken links in the test documentation page + + * e1331cd2a3 Merge pull request `#35236`_ from rallytime/bp-35119 + + * 9ade78de7b Revise unnecessary code duplication + + * 7c15f5b20a Fix formatting + + * 64f93f8938 Assume two EVRs are equal if E and V are equal but one R is missing. + + * 4f2b8aa5b6 Merge pull request `#35240`_ from derekmaciel/bp-35225 + + * 9ed47f713a Add missing documentation for pkg.installed + + * 4bcfaa97d0 Merge pull request `#35241`_ from terminalmage/gitfs-fixes + + * e05648cc2d Break from loop when file is found + + * 6764a88601 Ensure that failed recursion results in no blob object being returned + + * f6d7360e0b Merge pull request `#35245`_ from rallytime/bp-35039 + + * 51ab9cd6d4 Add saltenv support to module.run + + * d65a5c7134 Merge pull request `#35249`_ from terminalmage/issue35214 + + * bcd5129e9f Fix regression in git.latest when update is fast-forward + + * e2e8bbbfde Add integration test for `#35214`_ + +* **ISSUE** `#35003`_: (`edgan`_) rabbitmq_user.present broken on Ubuntu 16.04 Xenial (refs: `#35232`_) + +* **ISSUE** `#34481`_: (`L4rS6`_) rabbitmq_user.present with password keyword throws exception (refs: `#35232`_) + +* **ISSUE** `#33588`_: (`whytewolf`_) rabbitmq_user.present error (refs: `#35232`_) + +* **PR** `#35274`_: (`rallytime`_) Lint fixes for 2016.3 branch + @ *2016-08-08 16:45:41 UTC* + + * **PR** `#35232`_: (`theredcat`_) fix rabbitmq version detection using a package-agnostic version (refs: `#35274`_) + + * 157939d5b0 Merge pull request `#35274`_ from rallytime/lint-2016.3 + + * 0d3d711e9c Lint fixes for 2016.3 branch + +* **PR** `#35269`_: (`meaksh`_) Checksum validation for zypper pkg.download in 2016.3 and develop + @ *2016-08-08 14:45:16 UTC* + + * c58bb18624 Merge pull request `#35269`_ from meaksh/checksum-during-zypper-pkg-download-for-2016.3-and-develop + + * 18700e821e unit tests for rpm.checksum() and zypper.download() + + * c3f29ab205 checksum validation during zypper pkg.download + +* **PR** `#35197`_: (`vutny`_) Make `pkgbuild.repo` state recognize `createrepo` command return code + @ *2016-08-06 23:20:47 UTC* + + * d3f2ce2a1a Merge pull request `#35197`_ from vutny/pkgbuild-repo-failure-detection + + * a5f6630e97 Make `pkgbuild.repo` state recognize `createrepo` command return code + +* **ISSUE** `#34446`_: (`mirceaulinic`_) Proxy minions & straight minion using the same caching directory (refs: `#35178`_) + +* **PR** `#35178`_: (`cro`_) Add append_minionid_config_dirs option + @ *2016-08-06 22:21:14 UTC* + + * f004b831d2 Merge pull request `#35178`_ from cro/proxy_cache_fix2 + + * 84cc7d67c0 Add documentation for append_minionid_config_dirs. + + * f0961e741e Merge with 2016.3 + +* **ISSUE** `#35234`_: (`Sylvain303`_) Bug: module disk.wipe dont wipe the filesystem information (refs: `#35253`_) + +* **PR** `#35259`_: (`cachedout`_) Fixup 35253 + @ *2016-08-06 21:59:48 UTC* + + * **PR** `#35253`_: (`abednarik`_) Fix disk.wipe missing option. (refs: `#35259`_) + + * 6eb1c48469 Merge pull request `#35259`_ from cachedout/fixup_35253 + + * 104116f464 Add release notes and include entry about disk.wipe fix + + * 6714e8f386 Fix mock call in disk wipe test + +* **ISSUE** `#35234`_: (`Sylvain303`_) Bug: module disk.wipe dont wipe the filesystem information (refs: `#35253`_) + +* **PR** `#35253`_: (`abednarik`_) Fix disk.wipe missing option. (refs: `#35259`_) + @ *2016-08-06 21:55:01 UTC* + + * 4e7d7f8e4c Merge pull request `#35253`_ from abednarik/disk_wipe_fix + + * ff33df4ba1 Fix disk.wipe missing option. + +* **PR** `#35206`_: (`hu-dabao`_) Make the log level back to warning for unclassified exc + @ *2016-08-06 21:40:38 UTC* + + * eeede82109 Merge pull request `#35206`_ from hu-dabao/fix-exc-log + + * 676be7d711 Make the log level back to warning for unclassified exc + +* **PR** `#35196`_: (`isbm`_) Deprecate status.uptime one version later + @ *2016-08-06 08:39:40 UTC* + + * 21808e27d5 Merge pull request `#35196`_ from isbm/isbm-too-fast-uptime-deprecation + + * 6f3a32dace Deprecate status.uptime one version later + +* **PR** `#35207`_: (`eliasp`_) Handle exceptions in `_get_virtual()` and in `_get_virtual()` consumers + @ *2016-08-06 08:29:08 UTC* + + * 100645e557 Merge pull request `#35207`_ from eliasp/2016.3-modules.aptpkg-handle-exceptions + + * 2f11df98ca Handle exceptions in `_get_virtual()` and in `_get_virtual()` consumers + +* **ISSUE** `#35003`_: (`edgan`_) rabbitmq_user.present broken on Ubuntu 16.04 Xenial (refs: `#35232`_) + +* **ISSUE** `#34481`_: (`L4rS6`_) rabbitmq_user.present with password keyword throws exception (refs: `#35232`_) + +* **ISSUE** `#33588`_: (`whytewolf`_) rabbitmq_user.present error (refs: `#35232`_) + +* **PR** `#35232`_: (`theredcat`_) fix rabbitmq version detection using a package-agnostic version (refs: `#35274`_) + @ *2016-08-06 08:13:02 UTC* + + * 7302a8a6e5 Merge pull request `#35232`_ from theredcat/fix-rabbitmq-version-detection + + * f75eb2ecc7 Fix runas in code order and make the check_password work with the new >3.5.7 version + + * 4d8119b88b fix rabbitmq version detection using a package-agnostic version + +* **PR** `#35244`_: (`rallytime`_) Back-port `#31677`_ to 2016.3 + @ *2016-08-06 07:53:28 UTC* + + * **PR** `#31677`_: (`miihael`_) Return correct value for services that must be enabled in Systemd (refs: `#35244`_) + + * 2e9fa3799c Merge pull request `#35244`_ from rallytime/bp-31677 + + * 45d563d5ac Return correct value for services that must be enabled in Systemd, not in SysV + +* **PR** `#35182`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-03 20:57:29 UTC* + + * bd0496eef5 Merge pull request `#35182`_ from rallytime/merge-2016.3 + + * c35974f78f Merge branch '2015.8' into '2016.3' + + * 67d8dd0fd0 Don't discard running beacons config when listing becaons (`#35174`_) + + * 3754550dd2 Add missing CLI Examples to aws_sqs module funcs (`#35173`_) + + * 4967ed275f doc version update to 2015.8.11, updates to release notes (`#35145`_) + +* **PR** `#35150`_: (`rallytime`_) Start release notes for 2016.3.3 + @ *2016-08-03 13:46:31 UTC* + + * f9f92ad326 Merge pull request `#35150`_ from rallytime/2016.3.3-release-notes + + * a64026fc99 Start release notes for 2016.3.3 + +* **PR** `#35157`_: (`hu-dabao`_) master returned from func should be a string as designed so far + @ *2016-08-03 13:29:16 UTC* + + * 518ecf897a Merge pull request `#35157`_ from hu-dabao/func-return-string + + * a7506af4c9 master returned from func should be a string as designed so far + + * **PR** `#35147`_: (`jacobhammons`_) doc version updated to 2016.3.2 + +* **PR** `#35136`_: (`s0undt3ch`_) Don't restart processes if the manager is not set to restart them + @ *2016-08-02 18:40:05 UTC* + + * dc7d7db3d5 Merge pull request `#35136`_ from s0undt3ch/2016.3 + + * 7b8bf2d2b4 Don't restart processes if the manager is not set to restart them + +* **PR** `#35133`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-02 18:06:18 UTC* + + * bf04bd3316 Merge pull request `#35133`_ from rallytime/merge-2016.3 + + * 0d5f0b6016 Merge branch '2015.8' into '2016.3' + + * 81845ee31d Merge pull request `#35114`_ from terminalmage/git_pillar-env-remap-docs + + * 5951554e9f Add clarification docs on a common git_pillar misconfiguration + + * 88a9fb1b31 Merge pull request `#34768`_ from hrumph/bad-installed-state + + * e1fcb8311d Put pkg.latest_version in try/except structure Move refreshed or refresh to different spot (just for code tidyness) + + * e0b6261659 changed name of varibale 'refreshed' to 'was_refreshed' + + * 340110b4b4 Move check for rtag to outermost-nesting in function + + * ac67c6b493 Lint fix + + * 0435a1375e Get rid of repetition in code by using new "refreshed" variable instead + + * 3b1dc978e2 Lint fix + + * a9bd1b92b9 lint fixes + + * 71d69343ef Fixes `#34767`_ + + * 343576408f Merge pull request `#35043`_ from rallytime/new-release-notes + + * bdcc81a384 Start release notes file for 2015.8.12 + +* **PR** `#35120`_: (`kstreee`_) The '_handle_event_socket_recv' function in Salt Api is missing first data of stream. + @ *2016-08-02 16:22:50 UTC* + + * dd91006ed7 Merge pull request `#35120`_ from kstreee/fix-missing-first-stream-data + + * 28f793caac Fix missing first data in stream when subscribing stream using a function 'read_async'. + + * **PR** `saltstack/salt#35011`_: (`nishigori`_) Fix docstring for code-block of rst (refs: `#35131`_) + + * **PR** `#35131`_: (`rallytime`_) Back-port `#35011`_ to 2016.3 + + * **PR** `#35011`_: (`nishigori`_) Fix docstring for code-block of rst (refs: `#35131`_) + +* **PR** `#35110`_: (`hu-dabao`_) Do not return job status back to master for master_alive and master_failback schedules + @ *2016-08-02 07:49:46 UTC* + + * 77b1f43b0d Merge pull request `#35110`_ from hu-dabao/master-check-lighter + + * 3a3b66e27d dont return job status back to master for master_alive and master_failback schedules + +* **PR** `#35104`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-01 18:56:43 UTC* + + * 94a983f129 Merge pull request `#35104`_ from rallytime/merge-2016.3 + + * dda2c32325 Merge branch '2015.8' into '2016.3' + + * 848bf0272f Merge pull request `#35050`_ from terminalmage/fix-saltdev-arg + + * 40cfa7cf17 Avoid needlessly running 2 argspecs in salt.utils.format_call() + + * fd186b7e4c Pass environment as 'saltdev' if runner/wheel func accepts a saltdev argument + + * 951b52ab93 Pass __env__ from saltmod orch states to to saltutil.{runner,wheel} + + * 2144178ae0 Merge pull request `#35066`_ from jfindlay/postgres_log + + * c2c442234f returners.postgres_local_cache: do not log in __virtual__ + + * 7121618142 Merge pull request `#35024`_ from bobrik/daemon-reload-fix + + * c300615e9d Cache systemd unit update check per unit, closes `#34927`_ + + * 865c29f126 Expressly deny a minion if a key cannot be found instead of raising stacktrace (`#35026`_) + +* **ISSUE** `#32761`_: (`notpeter`_) Ubuntu 16.04 Xenial Xerus Support (refs: #`saltstack/salt#33870`_) + + * **PR** `saltstack/salt#33870`_: (`rallytime`_) Add note about Xenial packages to 2016.3.0 release notes (refs: `#35105`_) + +* **PR** `#35105`_: (`rallytime`_) Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability + @ *2016-08-01 17:26:55 UTC* + + * 6c056a829e Merge pull request `#35105`_ from rallytime/update-2016.3.0-release-notes + + * fbaff3e98e Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability + +* **PR** `#35059`_: (`vutny`_) Add `fun_args` field to events generated by execution of Master modules + @ *2016-08-01 13:01:42 UTC* + + * 1f8a0fd1e7 Merge pull request `#35059`_ from vutny/event-function-args + + * 19d080445b Add `fun_args` field to events generated by execution of Master modules + +* **PR** `#34955`_: (`lubyou`_) force dism to always output english text + @ *2016-08-01 12:54:03 UTC* + + * d137c4b986 Merge pull request `#34955`_ from lubyou/fix-dism-on-non-english-systems + + * 63c974a3d0 add missing comma + + * 775ea73578 fix unit tests + + * 51869807f1 force dism to always output english text + +* **PR** `#35078`_: (`jacobweinstock`_) added missing non-keyword argument skip_verify to __get_artifact func… + @ *2016-08-01 12:22:47 UTC* + + * ff7ddf0b68 Merge pull request `#35078`_ from jacobweinstock/fix-missing-non-keyword-argument + + * c40314ba80 added missing non-keyword argument skip_verify to __get_artifact function + +* **PR** `#35008`_: (`hu-dabao`_) Fix multimaster failover on more than two masters and failback behaviour + @ *2016-07-29 16:34:37 UTC* + + * 878e200cd9 Merge pull request `#35008`_ from hu-dabao/fix-multimaster + + * 12da890910 Fix multimaster failover on more than two masters and failback behaviour + +* **ISSUE** `saltstack/salt#33536`_: (`murzick`_) pkgrepo.managed does not disable a yum repo with "disabled: True" (refs: `#35055`_) + +* **ISSUE** `#33536`_: (`murzick`_) pkgrepo.managed does not disable a yum repo with "disabled: True" (refs: `#35055`_) + +* **PR** `#35055`_: (`galet`_) `#33536`_ pkgrepo.managed does not disable a yum repo with "disabled: True" + @ *2016-07-29 15:40:15 UTC* + + * 11ed147448 Merge pull request `#35055`_ from galet/2016.3 + + * d70796bbfe `#33536`_ pkgrepo.managed does not disable a yum repo with "disabled: True" + +* **PR** `#35039`_: (`whiteinge`_) Add saltenv support to module.run (refs: `#35245`_) + @ *2016-07-29 14:01:03 UTC* + + * ebaee39b2b Merge pull request `#35039`_ from whiteinge/module-run-saltenv + + * 7ef287e09e Add saltenv support to module.run + +* **PR** `#35046`_: (`eliasp`_) Prevent backtrace in `salt.states.network` + @ *2016-07-29 13:59:09 UTC* + + * 32ed78a399 Merge pull request `#35046`_ from eliasp/2016.3-salt.states.network-prevent-backtrace + + * 1542cd5124 Prevent backtrace in `salt.states.network` + +* **PR** `#35054`_: (`lubyou`_) Only fail user lookup is the user parameter is required + @ *2016-07-29 13:58:41 UTC* + + * f34bb7a8de Merge pull request `#35054`_ from lubyou/fix-win_dacl-disable_inheritance + + * 1e4e856fb2 Only fail user lookup is the user parameter is required + +* **PR** `#35029`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-28 18:01:35 UTC* + + * bee303db51 Merge pull request `#35029`_ from rallytime/merge-2016.3 + + * 65f9365ee0 Merge branch '2015.8' into '2016.3' + + * 2b511f3013 Merge pull request `#35000`_ from rallytime/bp-33875 + + * 35696ad637 Pylint fix + + * f9fd6ddd8a Fixup `#33875`_ + + * 56b1f6c651 Fix naive fileserver map diff algorithm + + * 837bc6ba7d Merge pull request `#34994`_ from rallytime/bp-34835 + + * 9268a793de same thing for the mine in salt-ssh + + * 3e11e19714 Fix the mine in salt ssh + + * **PR** `#35021`_: (`terminalmage`_) Don't add '.' to strerror when passed string ends in ? or ! + + * **PR** `#34983`_: (`eliasp`_) modules.slack.post_message: Allow sending messages to direct-message … + +* **PR** `#34996`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-07-27 19:03:04 UTC* + + * 05cfb1cefc Merge pull request `#34996`_ from rallytime/merge-2016.3 + + * a7d4f93697 Merge branch '2015.8' into '2016.3' + + * b58c663d8d Merge pull request `#34991`_ from cachedout/ssh_timeout + + * 39cd8da399 Lint diff against salt-testing + + * 443e5cdde2 Add timeout to ssh tests + + * 5f8370ae8d Refine errors in client (`#34976`_) + + * a83cdf9339 Merge pull request `#34831`_ from thatch45/recoverssh + + * fa73041a49 If the thin does not match, then redeploy, don't error + + * **PR** `#34987`_: (`eliasp`_) salt.states.slack: check correct result attribute + +* **ISSUE** `saltstack/salt#34526`_: (`danielmotaleite`_) salt-ssh + mine = weird error (refs: `#34835`_, #saltstack/salt`#34835`_) + +* **PR** `#34835`_: (`thatch45`_) Make the mine and publish combine minion and master opts in salt-ssh (refs: `#34994`_) + @ *2016-07-27 17:25:26 UTC* + + * edeb0eda36 Merge pull request `#34835`_ from thatch45/34526\_ + + * 1d2477df05 same thing for the mine in salt-ssh + + * 6b6c5ff278 Fix the mine in salt ssh -.. _`#18419`: https://github.com/saltstack/salt/issues/18419 .. _`#24745`: https://github.com/saltstack/salt/issues/24745 .. _`#24893`: https://github.com/saltstack/salt/pull/24893 -.. _`#25213`: https://github.com/saltstack/salt/issues/25213 .. _`#25267`: https://github.com/saltstack/salt/pull/25267 -.. _`#25276`: https://github.com/saltstack/salt/pull/25276 -.. _`#26171`: https://github.com/saltstack/salt/issues/26171 .. _`#27294`: https://github.com/saltstack/salt/issues/27294 -.. _`#27783`: https://github.com/saltstack/salt/issues/27783 -.. _`#28521`: https://github.com/saltstack/salt/pull/28521 -.. _`#29785`: https://github.com/saltstack/salt/issues/29785 .. _`#30913`: https://github.com/saltstack/salt/pull/30913 -.. _`#31074`: https://github.com/saltstack/salt/issues/31074 .. _`#31677`: https://github.com/saltstack/salt/pull/31677 -.. _`#32719`: https://github.com/saltstack/salt/issues/32719 .. _`#32761`: https://github.com/saltstack/salt/issues/32761 .. _`#33337`: https://github.com/saltstack/salt/pull/33337 .. _`#33367`: https://github.com/saltstack/salt/issues/33367 -.. _`#33516`: https://github.com/saltstack/salt/issues/33516 .. _`#33518`: https://github.com/saltstack/salt/pull/33518 .. _`#33536`: https://github.com/saltstack/salt/issues/33536 .. _`#33588`: https://github.com/saltstack/salt/issues/33588 -.. _`#33620`: https://github.com/saltstack/salt/issues/33620 -.. _`#33803`: https://github.com/saltstack/salt/issues/33803 -.. _`#33870`: https://github.com/saltstack/salt/pull/33870 .. _`#33875`: https://github.com/saltstack/salt/pull/33875 .. _`#34161`: https://github.com/saltstack/salt/issues/34161 .. _`#34279`: https://github.com/saltstack/salt/issues/34279 -.. _`#34425`: https://github.com/saltstack/salt/issues/34425 .. _`#34441`: https://github.com/saltstack/salt/pull/34441 .. _`#34446`: https://github.com/saltstack/salt/issues/34446 .. _`#34481`: https://github.com/saltstack/salt/issues/34481 .. _`#34502`: https://github.com/saltstack/salt/pull/34502 -.. _`#34509`: https://github.com/saltstack/salt/issues/34509 -.. _`#34526`: https://github.com/saltstack/salt/issues/34526 -.. _`#34573`: https://github.com/saltstack/salt/pull/34573 -.. _`#34606`: https://github.com/saltstack/salt/pull/34606 -.. _`#34632`: https://github.com/saltstack/salt/pull/34632 -.. _`#34648`: https://github.com/saltstack/salt/issues/34648 -.. _`#34691`: https://github.com/saltstack/salt/issues/34691 .. _`#34702`: https://github.com/saltstack/salt/pull/34702 -.. _`#34725`: https://github.com/saltstack/salt/issues/34725 -.. _`#34760`: https://github.com/saltstack/salt/issues/34760 .. _`#34767`: https://github.com/saltstack/salt/issues/34767 .. _`#34768`: https://github.com/saltstack/salt/pull/34768 -.. _`#34796`: https://github.com/saltstack/salt/issues/34796 -.. _`#34798`: https://github.com/saltstack/salt/issues/34798 -.. _`#34806`: https://github.com/saltstack/salt/issues/34806 -.. _`#34816`: https://github.com/saltstack/salt/issues/34816 -.. _`#34822`: https://github.com/saltstack/salt/pull/34822 -.. _`#34823`: https://github.com/saltstack/salt/pull/34823 -.. _`#34827`: https://github.com/saltstack/salt/pull/34827 -.. _`#34828`: https://github.com/saltstack/salt/pull/34828 .. _`#34831`: https://github.com/saltstack/salt/pull/34831 -.. _`#34833`: https://github.com/saltstack/salt/pull/34833 .. _`#34835`: https://github.com/saltstack/salt/pull/34835 -.. _`#34847`: https://github.com/saltstack/salt/pull/34847 -.. _`#34852`: https://github.com/saltstack/salt/pull/34852 -.. _`#34854`: https://github.com/saltstack/salt/pull/34854 -.. _`#34858`: https://github.com/saltstack/salt/pull/34858 -.. _`#34859`: https://github.com/saltstack/salt/pull/34859 -.. _`#34861`: https://github.com/saltstack/salt/issues/34861 -.. _`#34862`: https://github.com/saltstack/salt/pull/34862 -.. _`#34864`: https://github.com/saltstack/salt/pull/34864 -.. _`#34865`: https://github.com/saltstack/salt/pull/34865 -.. _`#34869`: https://github.com/saltstack/salt/pull/34869 -.. _`#34873`: https://github.com/saltstack/salt/issues/34873 -.. _`#34878`: https://github.com/saltstack/salt/pull/34878 -.. _`#34887`: https://github.com/saltstack/salt/pull/34887 -.. _`#34890`: https://github.com/saltstack/salt/issues/34890 -.. _`#34893`: https://github.com/saltstack/salt/issues/34893 -.. _`#34894`: https://github.com/saltstack/salt/pull/34894 -.. _`#34898`: https://github.com/saltstack/salt/pull/34898 -.. _`#34900`: https://github.com/saltstack/salt/pull/34900 -.. _`#34901`: https://github.com/saltstack/salt/pull/34901 -.. _`#34902`: https://github.com/saltstack/salt/pull/34902 -.. _`#34906`: https://github.com/saltstack/salt/pull/34906 -.. _`#34908`: https://github.com/saltstack/salt/issues/34908 -.. _`#34910`: https://github.com/saltstack/salt/pull/34910 -.. _`#34911`: https://github.com/saltstack/salt/pull/34911 -.. _`#34915`: https://github.com/saltstack/salt/pull/34915 -.. _`#34916`: https://github.com/saltstack/salt/pull/34916 -.. _`#34923`: https://github.com/saltstack/salt/pull/34923 -.. _`#34926`: https://github.com/saltstack/salt/pull/34926 .. _`#34927`: https://github.com/saltstack/salt/issues/34927 -.. _`#34933`: https://github.com/saltstack/salt/pull/34933 -.. _`#34935`: https://github.com/saltstack/salt/pull/34935 -.. _`#34945`: https://github.com/saltstack/salt/issues/34945 -.. _`#34946`: https://github.com/saltstack/salt/pull/34946 -.. _`#34951`: https://github.com/saltstack/salt/pull/34951 .. _`#34955`: https://github.com/saltstack/salt/pull/34955 -.. _`#34956`: https://github.com/saltstack/salt/pull/34956 -.. _`#34957`: https://github.com/saltstack/salt/pull/34957 -.. _`#34971`: https://github.com/saltstack/salt/pull/34971 .. _`#34976`: https://github.com/saltstack/salt/pull/34976 .. _`#34983`: https://github.com/saltstack/salt/pull/34983 .. _`#34987`: https://github.com/saltstack/salt/pull/34987 -.. _`#34988`: https://github.com/saltstack/salt/pull/34988 .. _`#34991`: https://github.com/saltstack/salt/pull/34991 .. _`#34994`: https://github.com/saltstack/salt/pull/34994 .. _`#34996`: https://github.com/saltstack/salt/pull/34996 -.. _`#34999`: https://github.com/saltstack/salt/issues/34999 .. _`#35000`: https://github.com/saltstack/salt/pull/35000 .. _`#35003`: https://github.com/saltstack/salt/issues/35003 .. _`#35008`: https://github.com/saltstack/salt/pull/35008 -.. _`#35010`: https://github.com/saltstack/salt/issues/35010 .. _`#35011`: https://github.com/saltstack/salt/pull/35011 .. _`#35021`: https://github.com/saltstack/salt/pull/35021 .. _`#35024`: https://github.com/saltstack/salt/pull/35024 @@ -362,32 +1061,26 @@ Changes: .. _`#35043`: https://github.com/saltstack/salt/pull/35043 .. _`#35046`: https://github.com/saltstack/salt/pull/35046 .. _`#35050`: https://github.com/saltstack/salt/pull/35050 -.. _`#35051`: https://github.com/saltstack/salt/issues/35051 .. _`#35054`: https://github.com/saltstack/salt/pull/35054 .. _`#35055`: https://github.com/saltstack/salt/pull/35055 .. _`#35059`: https://github.com/saltstack/salt/pull/35059 .. _`#35066`: https://github.com/saltstack/salt/pull/35066 .. _`#35078`: https://github.com/saltstack/salt/pull/35078 -.. _`#35094`: https://github.com/saltstack/salt/issues/35094 .. _`#35102`: https://github.com/saltstack/salt/issues/35102 .. _`#35104`: https://github.com/saltstack/salt/pull/35104 .. _`#35105`: https://github.com/saltstack/salt/pull/35105 .. _`#35110`: https://github.com/saltstack/salt/pull/35110 .. _`#35114`: https://github.com/saltstack/salt/pull/35114 -.. _`#35119`: https://github.com/saltstack/salt/pull/35119 .. _`#35120`: https://github.com/saltstack/salt/pull/35120 .. _`#35121`: https://github.com/saltstack/salt/issues/35121 .. _`#35131`: https://github.com/saltstack/salt/pull/35131 .. _`#35132`: https://github.com/saltstack/salt/pull/35132 .. _`#35133`: https://github.com/saltstack/salt/pull/35133 -.. _`#35135`: https://github.com/saltstack/salt/pull/35135 .. _`#35136`: https://github.com/saltstack/salt/pull/35136 .. _`#35145`: https://github.com/saltstack/salt/pull/35145 -.. _`#35146`: https://github.com/saltstack/salt/pull/35146 .. _`#35147`: https://github.com/saltstack/salt/pull/35147 .. _`#35150`: https://github.com/saltstack/salt/pull/35150 .. _`#35157`: https://github.com/saltstack/salt/pull/35157 -.. _`#35165`: https://github.com/saltstack/salt/issues/35165 .. _`#35166`: https://github.com/saltstack/salt/issues/35166 .. _`#35173`: https://github.com/saltstack/salt/pull/35173 .. _`#35174`: https://github.com/saltstack/salt/pull/35174 @@ -401,7 +1094,6 @@ Changes: .. _`#35211`: https://github.com/saltstack/salt/pull/35211 .. _`#35213`: https://github.com/saltstack/salt/pull/35213 .. _`#35214`: https://github.com/saltstack/salt/issues/35214 -.. _`#35225`: https://github.com/saltstack/salt/pull/35225 .. _`#35226`: https://github.com/saltstack/salt/issues/35226 .. _`#35227`: https://github.com/saltstack/salt/pull/35227 .. _`#35229`: https://github.com/saltstack/salt/pull/35229 @@ -426,11 +1118,9 @@ Changes: .. _`#35278`: https://github.com/saltstack/salt/pull/35278 .. _`#35286`: https://github.com/saltstack/salt/pull/35286 .. _`#35290`: https://github.com/saltstack/salt/pull/35290 -.. _`#35296`: https://github.com/saltstack/salt/issues/35296 .. _`#35301`: https://github.com/saltstack/salt/pull/35301 .. _`#35302`: https://github.com/saltstack/salt/pull/35302 .. _`#35306`: https://github.com/saltstack/salt/pull/35306 -.. _`#35308`: https://github.com/saltstack/salt/pull/35308 .. _`#35309`: https://github.com/saltstack/salt/pull/35309 .. _`#35318`: https://github.com/saltstack/salt/pull/35318 .. _`#35323`: https://github.com/saltstack/salt/pull/35323 @@ -450,19 +1140,14 @@ Changes: .. _`#35361`: https://github.com/saltstack/salt/pull/35361 .. _`#35362`: https://github.com/saltstack/salt/pull/35362 .. _`#35373`: https://github.com/saltstack/salt/pull/35373 -.. _`#35380`: https://github.com/saltstack/salt/issues/35380 -.. _`#35384`: https://github.com/saltstack/salt/issues/35384 -.. _`#35387`: https://github.com/saltstack/salt/issues/35387 .. _`#35393`: https://github.com/saltstack/salt/pull/35393 .. _`#35394`: https://github.com/saltstack/salt/pull/35394 .. _`#35395`: https://github.com/saltstack/salt/pull/35395 -.. _`#35403`: https://github.com/saltstack/salt/issues/35403 .. _`#35406`: https://github.com/saltstack/salt/pull/35406 .. _`#35407`: https://github.com/saltstack/salt/pull/35407 .. _`#35411`: https://github.com/saltstack/salt/pull/35411 .. _`#35412`: https://github.com/saltstack/salt/pull/35412 .. _`#35413`: https://github.com/saltstack/salt/pull/35413 -.. _`#35420`: https://github.com/saltstack/salt/issues/35420 .. _`#35422`: https://github.com/saltstack/salt/issues/35422 .. _`#35423`: https://github.com/saltstack/salt/issues/35423 .. _`#35427`: https://github.com/saltstack/salt/pull/35427 @@ -515,26 +1200,70 @@ Changes: .. _`#35580`: https://github.com/saltstack/salt/pull/35580 .. _`#35583`: https://github.com/saltstack/salt/pull/35583 .. _`#35586`: https://github.com/saltstack/salt/pull/35586 -.. _`bp-25276`: https://github.com/saltstack/salt/pull/25276 -.. _`bp-28521`: https://github.com/saltstack/salt/pull/28521 -.. _`bp-31677`: https://github.com/saltstack/salt/pull/31677 -.. _`bp-33518`: https://github.com/saltstack/salt/pull/33518 -.. _`bp-33875`: https://github.com/saltstack/salt/pull/33875 -.. _`bp-34441`: https://github.com/saltstack/salt/pull/34441 -.. _`bp-34502`: https://github.com/saltstack/salt/pull/34502 -.. _`bp-34835`: https://github.com/saltstack/salt/pull/34835 -.. _`bp-35039`: https://github.com/saltstack/salt/pull/35039 -.. _`bp-35119`: https://github.com/saltstack/salt/pull/35119 -.. _`bp-35213`: https://github.com/saltstack/salt/pull/35213 -.. _`bp-35225`: https://github.com/saltstack/salt/pull/35225 -.. _`bp-35463`: https://github.com/saltstack/salt/pull/35463 -.. _`fix-34425`: https://github.com/saltstack/salt/issues/34425 -.. _`fix-34890`: https://github.com/saltstack/salt/issues/34890 -.. _`fix-34893`: https://github.com/saltstack/salt/issues/34893 -.. _`fix-35094`: https://github.com/saltstack/salt/issues/35094 -.. _`fix-35165`: https://github.com/saltstack/salt/issues/35165 -.. _`fix-35336`: https://github.com/saltstack/salt/issues/35336 -.. _`fix-35384`: https://github.com/saltstack/salt/issues/35384 -.. _`fix-35420`: https://github.com/saltstack/salt/issues/35420 -.. _`fix-35422`: https://github.com/saltstack/salt/issues/35422 -.. _`fix-35458`: https://github.com/saltstack/salt/issues/35458 +.. _`#35602`: https://github.com/saltstack/salt/pull/35602 +.. _`#35603`: https://github.com/saltstack/salt/pull/35603 +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`L4rS6`: https://github.com/L4rS6 +.. _`Sylvain303`: https://github.com/Sylvain303 +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`TheBigBear`: https://github.com/TheBigBear +.. _`ViaviSolutions`: https://github.com/ViaviSolutions +.. _`abednarik`: https://github.com/abednarik +.. _`bobrik`: https://github.com/bobrik +.. _`cachedout`: https://github.com/cachedout +.. _`cro`: https://github.com/cro +.. _`danielmotaleite`: https://github.com/danielmotaleite +.. _`deniszh`: https://github.com/deniszh +.. _`dkruger`: https://github.com/dkruger +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`edgan`: https://github.com/edgan +.. _`eliasp`: https://github.com/eliasp +.. _`farcaller`: https://github.com/farcaller +.. _`galet`: https://github.com/galet +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`hu-dabao`: https://github.com/hu-dabao +.. _`iggy`: https://github.com/iggy +.. _`isbm`: https://github.com/isbm +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jacobweinstock`: https://github.com/jacobweinstock +.. _`jfindlay`: https://github.com/jfindlay +.. _`justinta`: https://github.com/justinta +.. _`kstreee`: https://github.com/kstreee +.. _`lubyou`: https://github.com/lubyou +.. _`markuskramerIgitt`: https://github.com/markuskramerIgitt +.. _`mathieubouchard`: https://github.com/mathieubouchard +.. _`meaksh`: https://github.com/meaksh +.. _`miihael`: https://github.com/miihael +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`murzick`: https://github.com/murzick +.. _`mzupan`: https://github.com/mzupan +.. _`nishigori`: https://github.com/nishigori +.. _`notpeter`: https://github.com/notpeter +.. _`rallytime`: https://github.com/rallytime +.. _`randomed`: https://github.com/randomed +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack/salt#25267`: https://github.com/saltstack/salt/pull/25267 +.. _`saltstack/salt#33536`: https://github.com/saltstack/salt/issues/33536 +.. _`saltstack/salt#33870`: https://github.com/saltstack/salt/pull/33870 +.. _`saltstack/salt#34502`: https://github.com/saltstack/salt/pull/34502 +.. _`saltstack/salt#34526`: https://github.com/saltstack/salt/issues/34526 +.. _`saltstack/salt#34702`: https://github.com/saltstack/salt/pull/34702 +.. _`saltstack/salt#34835`: https://github.com/saltstack/salt/pull/34835 +.. _`saltstack/salt#35011`: https://github.com/saltstack/salt/pull/35011 +.. _`saltstack/salt#35308`: https://github.com/saltstack/salt/pull/35308 +.. _`saltstack/salt#35360`: https://github.com/saltstack/salt/pull/35360 +.. _`saltstack/salt#35403`: https://github.com/saltstack/salt/issues/35403 +.. _`saltstack/salt#35463`: https://github.com/saltstack/salt/pull/35463 +.. _`skizunov`: https://github.com/skizunov +.. _`stenstad`: https://github.com/stenstad +.. _`supertom`: https://github.com/supertom +.. _`tankywoo`: https://github.com/tankywoo +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`theredcat`: https://github.com/theredcat +.. _`ticosax`: https://github.com/ticosax +.. _`tonybaloney`: https://github.com/tonybaloney +.. _`twangboy`: https://github.com/twangboy +.. _`vutny`: https://github.com/vutny +.. _`whiteinge`: https://github.com/whiteinge +.. _`whytewolf`: https://github.com/whytewolf diff --git a/doc/topics/releases/2016.3.4.rst b/doc/topics/releases/2016.3.4.rst index b6b27e52e1..c8a23d8bf8 100644 --- a/doc/topics/releases/2016.3.4.rst +++ b/doc/topics/releases/2016.3.4.rst @@ -4,329 +4,2879 @@ Salt 2016.3.4 Release Notes Version 2016.3.4 is a bugfix release for :ref:`2016.3.0 `. + +Statistics +========== + +- Total Merges: **275** +- Total Issue References: **119** +- Total PR References: **374** + +- Contributors: **80** (`BenoitKnecht`_, `Ch3LL`_, `DavidWittman`_, `DmitryKuzmenko`_, `Jlin317`_, `Kimamisa`_, `UtahDave`_, `aaronm-cloudtek`_, `abednarik`_, `ahammond`_, `alertedsnake`_, `alexander-bauer`_, `amontalban`_, `basepi`_, `bl4ckcontact`_, `bx2`_, `cachedout`_, `clarkperkins`_, `clinta`_, `cro`_, `damon-atkins`_, `danlsgiga`_, `darkalia`_, `dmurphy18`_, `do3meli`_, `edhgoose`_, `efficks`_, `eliasp`_, `eradman`_, `fix7`_, `galet`_, `goestin`_, `gtmanfred`_, `hrumph`_, `hu-dabao`_, `isbm`_, `jackywu`_, `jacobhammons`_, `jbonachera`_, `jf`_, `jfindlay`_, `jizhilong`_, `justinta`_, `kstreee`_, `l2ol33rt`_, `lomeroe`_, `lorengordon`_, `maximeguillet`_, `meaksh`_, `mikeadamz`_, `mirceaulinic`_, `morganwillcock`_, `mrproper`_, `multani`_, `nvtkaszpir`_, `oba11`_, `onorua`_, `opdude`_, `orymate`_, `oz123`_, `pass-by-value`_, `pbdeuchler`_, `rallytime`_, `roosri`_, `silenius`_, `skizunov`_, `slinn0`_, `stanislavb`_, `swiftgist`_, `techhat`_, `terminalmage`_, `thatch45`_, `theredcat`_, `ticosax`_, `twangboy`_, `vutny`_, `whiteinge`_, `xbglowx`_, `xiaoanyunfei`_, `yhekma`_) + + Known Issues ------------- +============ -The Salt Minion does not clean up files in ``/tmp`` when rendering templates. This potentially -results in either running out of disk space or running out of inodes. Please see `Issue #37541`_ -for more information. This bug was fixed with `Pull Request #37540`_, which will be available in -the ``2016.3.5`` release of Salt. +The Salt Minion does not clean up files in ``/tmp`` when rendering templates. +This potentially results in either running out of disk space or running out of +inodes. Please see :issue:`37541` for more information. This bug was fixed with +:pull:`37540`, which will be available in the ``2016.3.5`` release of +Salt. -The release of the `bootstrap-salt.sh` script that is included with 2016.3.4 release has a bug -in it that fails to install salt correctly for git installs using tags in the 2015.5 branch. -This bug has not been fixed in the `salt-bootstrap repository`_ yet, but the -`previous bootstrap release`_ (v2016.08.16) does not contain this bug. +The release of the ``bootstrap-salt.sh`` script that is included with 2016.3.4 +release has a bug in it that fails to install salt correctly for git installs +using tags in the 2015.5 branch. This bug has not been fixed in the +`salt-bootstrap repository`_ yet, but the `previous bootstrap release`_ +(v2016.08.16) does not contain this bug. -.. _`Issue #37541`: https://github.com/saltstack/salt/issues/37541 -.. _`Pull Request #37540`: https://github.com/saltstack/salt/pull/37540 .. _`previous bootstrap release`: https://raw.githubusercontent.com/saltstack/salt-bootstrap/v2016.08.16/bootstrap-salt.sh .. _`salt-bootstrap repository`: https://github.com/saltstack/salt-bootstrap Changes -------- +======= - The `disk.wipe` execution module function has been modified so that it correctly wipes a disk. - Add ability to clone from a snapshot to the VMWare salt-cloud driver. - Add ability to specify disk backing mode in the VMWare salt cloud profile. -Changes for v2016.3.3..v2016.3.4 --------------------------------- +Changelog for v2016.3.3..v2016.3.4 +================================== -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +*Generated at: 2018-05-27 04:56:54 UTC* -*Generated at: 2016-10-27T16:10:53Z* +* **PR** `#37285`_: (`rallytime`_) Update 2016.3.4 release notes -Total Merges: **274** +* **ISSUE** `#37281`_: (`frogunder`_) 2016.3.4: Raet Transport not working (refs: `#37282`_) -Changes: +* **PR** `#37282`_: (`thatch45`_) add cpub to raet event for compat + @ *2016-10-27 21:33:48 UTC* -- **PR** `#37282`_: (*thatch45*) add cpub to raet event for compat -- **PR** `#37278`_: (*jfindlay*) update 2016.3.4 release notes -- **PR** `#37252`_: (*vutny*) Set logging level to 'info' for message about init system detection -- 47290d8 Update man pages for the 2016.3 branch (`#37259`_) -- **PR** `#37257`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#37254`_: (*DmitryKuzmenko*) Bugs/37191 minion hangs -- **PR** `#37218`_: (*darkalia*) Issue `#37187`_ Do not parse first /proc/1/cmdline binary if it's not *b… -- **PR** `#37239`_: (*Ch3LL*) Fix cloud tests timeout -- **PR** `#37244`_: (*rallytime*) Update bootstrap release to 2016.10.25 -- **PR** `#37245`_: (*rallytime*) Back-port `#36334`_ to 2016.3 -- **PR** `#37233`_: (*rallytime*) Back-port `#37154`_ to 2016.3 -- **PR** `#37232`_: (*rallytime*) Back-port `#37153`_ to 2016.3 -- **PR** `#37228`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#37213`_: (*cachedout*) More salttesting fixes -- **PR** `#37207`_: (*cachedout*) Correct documentation for mine_functions -- **PR** `#37208`_: (*cachedout*) Give multimion a process manager and its own destroy method -- **PR** `#37206`_: (*cachedout*) Address transport test hang -- **PR** `#37179`_: (*isbm*) Fix Salt-API ssh crash (2016.3) -- **PR** `#37183`_: (*gtmanfred*) load tags should reference the actual load tags -- **PR** `#37188`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- d7e28d2 Pylint fix for 2016.3 (`#37186`_) -- **PR** `#37175`_: (*cachedout*) Fix test hang -- **PR** `#37144`_: (*DmitryKuzmenko*) Bugs/36866 salt minion communication broken 2016.3 -- **PR** `#37158`_: (*jfindlay*) add mock for `status.uptime` unit test -- **PR** `#37161`_: (*rallytime*) Back-port `#37098`_ to 2016.3 -- **PR** `#37159`_: (*rallytime*) Back-port `#37107`_ to 2016.3 -- **PR** `#37163`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- 2bc5ded Allow the minion test daemons a couple of tries to connect to the master (`#37150`_) -- ec7ad9e Add note about salt-bootstrap known issue for 2016.3.4 (`#37152`_) -- **PR** `#37135`_: (*AaronM-Cloudtek*) Fix example signing policy in salt.states.x509 docs -- **PR** `#37140`_: (*vutny*) pkgbuild.repo: fix GPG signing with `use_passphrase=False` -- **PR** `#37071`_: (*vutny*) pkgbuild.repo: add `timeout` parameter for waiting passphrase prompt -- **PR** `#37115`_: (*DmitryKuzmenko*) Backport/36720 fix race condition -- **PR** `#37119`_: (*jfindlay*) log.setup: only assign user if defined -- f22c686 fix digital ocean image name in profile (`#37126`_) -- 4263849 add 2016.3.4 release notes (`#37125`_) -- **PR** `#37120`_: (*rallytime*) Back-port `#36246`_ to 2016.3 -- **PR** `#37103`_: (*cachedout*) Remove unnecessary sleep from unit.utils.process_test.TestProcessMana… -- **PR** `#36823`_: (*terminalmage*) Update debian systemd unit files to use default KillMode, Type=notify -- **PR** `#37030`_: (*isbm*) Fix status.uptime for Solaris 9, 10 and 11. -- **PR** `#37101`_: (*rallytime*) [2016.3] Merge forward from 2016.3 to carbon -- **PR** `#36958`_: (*twangboy*) Fix bug where cmd.powershell fails to return -- **PR** `#37086`_: (*cachedout*) Make salt-call a first-class citizen for multi-master -- **PR** `#36898`_: (*clinta*) X509 fixes -- **PR** `#37025`_: (*cro*) Make salt.utils.minion._check_cmdline work on OSes without /proc. -- **PR** `#37050`_: (*twangboy*) Fix service state for Windows (DO NOT MERGE FORWARD) -- **PR** `#37076`_: (*jfindlay*) Document proxy settings -- **PR** `#37081`_: (*terminalmage*) Fix archive.extracted remote source_hash verification -- **PR** `#37064`_: (*cachedout*) Unify job check in scheduler -- **PR** `#37072`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#37049`_: (*terminalmage*) Further clarification on new grains docs from `#37028`_ -- **PR** `#37057`_: (*rallytime*) [2016.3] Update salt.utils.cloud references to __utils__ for cache funcs -- **PR** `#36977`_: (*twangboy*) Remove whitespace from string commands -- **PR** `#37048`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#37028`_: (*damon-atkins*) Update topics/grains doco, about considerations before adding a Grain -- **PR** `#37012`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- 519e1dc opkg: Support ignore_epoch argument in version comparisons (`#37007`_) -- **PR** `#36808`_: (*gtmanfred*) allow for closing stuff in beacons -- a02868b Make helper funcs private (`#36993`_) -- **PR** `#36986`_: (*jfindlay*) modules.archive.unzip: zipfile is stdlib -- **PR** `#36981`_: (*rallytime*) Skip pkg.upgrades test on distros other that Suse in 2016.3 -- **PR** `#36755`_: (*terminalmage*) systemd.py: check retcode for service availability in systemd >= 231 -- **PR** `#36750`_: (*terminalmage*) Add the CLI client and pub_data as class attributes -- **PR** `#36241`_: (*hrumph*) Fixes `#36240`_ -- **PR** `#36950`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36948`_: (*rallytime*) Back-port `#36943`_ to 2016.3 -- **PR** `#36946`_: (*rallytime*) Back-port `#36892`_ to 2016.3 -- **PR** `#36945`_: (*rallytime*) Back-port `#35199`_ to 2016.3 -- 7565ed6 Fix versionadded (`#36949`_) -- 4d8fb03 return opennebula errors to user (`#36930`_) -- **PR** `#36929`_: (*rallytime*) [yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades -- 288f437 [2016.3] Remove "Targeting with Executions" section from docs (`#36926`_) -- **PR** `#36915`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- 0ebf7a4 modules: debian_ip: override params early to fix diff (`#36820`_) -- a23ce84 states.schedule: splay is not ordereddict (`#36894`_) -- **PR** `#36885`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- 1c0ba80 salt-ssh: Try "command -v" before falling back to "which" (`#36889`_) -- 85eea4d fileclient: Change queryarg comparison from None to simple boolean check (`#36830`_) -- **PR** `#36853`_: (*rallytime*) Back-port `#33939`_ to 2016.3 -- **PR** `#36852`_: (*rallytime*) Back-port `#36743`_ to 2016.3 -- **PR** `#36844`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36835`_: (*jfindlay*) unify and expand beacon documentation -- **PR** `#36789`_: (*maximeguillet*) Fix behavior of psql -c option with postgresql 9.6 -- **PR** `#36797`_: (*cachedout*) Error on reaction with missing SLS file -- **PR** `#36803`_: (*gtmanfred*) do not load libvirt pillar if certtool is unavailable -- **PR** `#36815`_: (*BenoitKnecht*) Fix glance.image_present state -- **PR** `#36754`_: (*terminalmage*) Base rpmdev-vercmp comparison result on retcode -- **PR** `#36785`_: (*cachedout*) Fixup merge forward `#36728`_ -- **PR** `#36768`_: (*gtmanfred*) add __utils__ to vultr cloud provider -- **PR** `#36764`_: (*cachedout*) Another bit of detection for failed pip tests -- **PR** `#36747`_: (*jfindlay*) modules.archive integration tests: check for gzip, rar -- **PR** `#36744`_: (*cachedout*) Fix issue where test suite could hang on shutdown -- **PR** `#36696`_: (*cro*) pass __proxy__ in state.sls_id -- **PR** `#36716`_: (*vutny*) salt.modules.ini_manage: fix creating options in empty file -- **PR** `#36724`_: (*rallytime*) Back-port `#36628`_ to 2016.3 -- **PR** `#36725`_: (*rallytime*) Back-port `#36643`_ to 2016.3 -- **PR** `#36726`_: (*rallytime*) Back-port `#36722`_ to 2016.3 -- 48d2b01 fix python26 archive zip module (`#36719`_) -- **PR** `#36699`_: (*cachedout*) Fix error in test -- **PR** `#36670`_: (*jackywu*) fix bug for including loopback addr -- **PR** `#36694`_: (*lorengordon*) Exposes `ignore_if_missing` to file.replace state module -- **PR** `#36686`_: (*jfindlay*) log levels doc: try long form table -- **PR** `#36690`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36680`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36659`_: (*terminalmage*) Support dynamic env in new-style git_pillar -- **PR** `#36538`_: (*clinta*) daemon-reload on call to service.available -- **PR** `#36616`_: (*cro*) Zypper fix test -- **PR** `#36621`_: (*terminalmage*) Fix shadowed builtins -- **PR** `#36636`_: (*rallytime*) Back-port `#36618`_ to 2016.3 -- **PR** `#36648`_: (*jfindlay*) Integration tests for archive execution module -- **PR** `#36650`_: (*rallytime*) Revert "Pr 36386" -- **PR** `#36646`_: (*rallytime*) Provide an error message when invalid transport is set -- **PR** `#36635`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36620`_: (*rallytime*) Don't allow mercurial states to return True with errors -- **PR** `#36622`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36520`_: (*twangboy*) Fix cmd.script runas for Windows -- **PR** `#36564`_: (*DmitryKuzmenko*) Improve and fix `_check_cache_minions` -- **PR** `#36606`_: (*danlsgiga*) Add support for ACL Tokens in consul_pillar with the option consul.token -- **PR** `#36613`_: (*slinn0*) Remove file.check_managed_changes when not needed (backport of PR `#36589`_ to 2016.3) -- **PR** `#36609`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36595`_: (*cachedout*) Remove tests which no longer apply -- **PR** `#36594`_: (*cachedout*) Update boostrap docs to recent versions of Ubuntu -- **PR** `#36585`_: (*twangboy*) Add pyOpenSSL to req file for Windows -- f205d5f Fix salt.utils.rm_rf to delete files too (`#36572`_) -- **PR** `#36495`_: (*cro*) Fix pkg.upgrade for zypper -- **PR** `#36539`_: (*jfindlay*) Prefer archive.cmd_unzip -- **PR** `#36546`_: (*rallytime*) Mercurial Module: Pass the identity_path portion as own arg -- **PR** `#36555`_: (*DmitryKuzmenko*) Bugs/35480 master shutdown -- **PR** `#36542`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- 5548ed7 Back-port `#36435`_ to 2016.3 (`#36532`_) -- fe377b3 Be explicit about the salt.utils.templates import (`#36535`_) -- fcc50c9 Wrap the entire GrainsAppendTestCase class with destructiveTest (`#36537`_) -- **PR** `#36529`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36483`_: (*dmurphy18*) Isolate sun IPv6 fix to Sun OS only -- **PR** `#36280`_: (*alertedsnake*) Feature/2016.3 better postgresql grants -- **PR** `#36508`_: (*twangboy*) Fix chocolatey -- **PR** `#36519`_: (*terminalmage*) Rewrite minionfs walkthrough -- **PR** `#36505`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36496`_: (*cachedout*) Add repr to namespacedict -- **PR** `#36474`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36478`_: (*rallytime*) Add the "bash" option to the "code-block"directive. -- **PR** `#36484`_: (*terminalmage*) Fix for temp files being left over by salt-cloud execution -- **PR** `#36486`_: (*terminalmage*) Improve the rebase docs in contributing guidelines -- **PR** `#36455`_: (*twangboy*) Update docs for Windows -- **PR** `#36459`_: (*cachedout*) Pr 36426 -- **PR** `#36442`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36310`_: (*thatch45*) Fix bug where the client will destroy the loop -- **PR** `#36394`_: (*oba11*) fix accound_id in boto_iam and get_region in boto_sns -- **PR** `#36424`_: (*jfindlay*) skip some mac_timezone tests -- **PR** `#36428`_: (*terminalmage*) A couple fixes for Antergos Linux -- **PR** `#36425`_: (*whiteinge*) Check for dictionary explicitly since we're accessing it as one -- **PR** `#36199`_: (*thatch45*) skip all failhards if test=True -- **PR** `#36418`_: (*rallytime*) Back-port `#36246`_ to 2016.3 -- **PR** `#36419`_: (*rallytime*) Back-port `#36329`_ to 2016.3 -- **PR** `#36420`_: (*rallytime*) Back-port `#36365`_ to 2016.3 -- **PR** `#36413`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36305`_: (*gtmanfred*) cache query args with url as well -- **PR** `#36389`_: (*cachedout*) Pr 36386 -- 5737b1c Update versionadded and release notes (`#36352`_) -- **PR** `#36369`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- fbbe9ec Quote postgres privilege target names (`#36249`_) -- 9451141 set __virtualname__ to 'service' (`#36330`_) -- fee3be4 Use infoblox_* values if present in arguments (`#36339`_) -- 19eb848 remove help message from glance module (`#36345`_) -- a4bbd5e Add resize2fs unit test from blockdev_test to disk_test (`#36346`_) -- **PR** `#36350`_: (*terminalmage*) Add note about yumpkg.check_db removal in Boron -- **PR** `#36344`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- 3a37fe5 merge error overwrites correct ssh_host with stale data in ip_address (`#36312`_) -- **PR** `#36299`_: (*rallytime*) Gate the pkg.group_installed state test: not all pkg modules have group_install -- b3aac0e Back-port `#36273`_ to 2016.3 (`#36295`_) -- 7296179 Back-port `#36124`_ to 2016.3 (`#36296`_) -- **PR** `#36297`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- 7684ebd Filter out pub kwargs from cloud runner (`#36178`_) -- **PR** `#36238`_: (*pass-by-value*) Add ability to clone from a snapshot to salt-cloud vmware driver -- a0bbb0f Integration tests fixes for 2016.3 (`#36263`_) -- **PR** `#36264`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35688`_: (*cachedout*) Splat serializer default configs into the serializer kwargs -- **PR** `#36025`_: (*mirceaulinic*) Potential fix for `#36021`_ -- 449c298 Fix timezones states on OS X (`#36183`_) -- **PR** `#36235`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36137`_: (*cachedout*) Allow highstate outputter to show all results -- 1b12940 Docs clarification for module sync and state.apply (`#36217`_) -- **PR** `#36184`_: (*DmitryKuzmenko*) Disable signal handling while handling signal -- **PR** `#36203`_: (*xiaoanyunfei*) fix owner of MultiprocessingLoggingQueue -- b586ed7 if the backend stack traces when it should return an empty string (`#36193`_) -- **PR** `#36188`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35907`_: (*rallytime*) Catch CommandExecutionError when the group in group_installed doesn't exist -- **PR** `#36068`_: (*rallytime*) Remove grains type deprecation warning from 2016.3 -- **PR** `#36152`_: (*cachedout*) Remove unnecessary unpack -- **PR** `#36158`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- 3445a33 Remove unclosed backticks in walkthrough doc (`#36170`_) -- **PR** `#36161`_: (*jacobhammons*) Adds `#36055`_ to release notes -- **PR** `#36139`_: (*meaksh*) Fixing unit tests for 2016.3 -- **PR** `#36143`_: (*multani*) doc: fix doc formatting for salt.states.mount -- **PR** `#36070`_: (*rallytime*) Use __utils__ instead of salt.utils.cloud in opennebula driver -- **PR** `#36089`_: (*terminalmage*) Support running git states / remote exec funcs as a different user in Windows -- **PR** `#35923`_: (*kstreee*) Fixes a bug that Ctrl-c not working on Salt CLI. -- **PR** `#36078`_: (*thatch45*) Failhard test=True fix -- **PR** `#34529`_: (*Ch3LL*) Add skip_verify for archive.extracted -- **PR** `#36073`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- a86e36c Add docs for new kwargs added to the wheel key module (`#36040`_) -- 2934fc1 Doc cherrypy deemphasize urlencoded (`#36047`_) -- **PR** `#36039`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- 1d90c42 Back-port `#35824`_ to 2016.3 (`#36038`_) -- 65b6734 catch unicode encoding errors in json outputter (`#36033`_) -- 822481e modules.service: Do not default to OpenRC on Gentoo, also allow systemd (`#36010`_) -- b68d293 fix redis_return's clean_old_jobs. (`#36014`_) -- 95591c2 Add documentation about salt_interface to EC2 docs (`#36015`_) -- **PR** `#36019`_: (*meaksh*) Back-port `#36000`_ to 2016.3 -- b9fc51a Fix error when profiling is turned on and minions don't return (`#36028`_) -- 20a361d Add include_* kwargs to the *_dict key functions (`#36030`_) -- **PR** `#36024`_: (*DmitryKuzmenko*) Don't subscribe to events if not sure it would read them. -- **PR** `#36023`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#36004`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35952`_: (*twangboy*) Load UserProfile when using RunAs (2016.3) -- **PR** `#35959`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35955`_: (*jacobhammons*) Version docs to 2016.3.3 -- 9910b9c Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates (`#35865`_) -- 24f9d33 Speed up FreeBSD pkg install process for pkg.latest since pkg command by default tries to update repository DB on each search: (`#35904`_) -- b87e4f1 Salt Cloud: add `centos` default user for official CentOS AMIs (`#35931`_) -- 580e0d4 Mention that docker image names must be given with repository (`#35926`_) -- **PR** `#35868`_: (*rallytime*) Add more helpful return messages for drac runner -- **PR** `#35903`_: (*rallytime*) [2016.3] Merge forward from 2015.8 into 2016.3 -- **PR** `#35855`_: (*vutny*) [REGRESSION] salt-cloud: fix path to Salt Master socket dir -- **PR** `#35881`_: (*whiteinge*) Add fail-safe in case Salt gives us data we can't serialize -- 9679266 Add engines to list of extension module options in master config docs (`#35864`_) -- 40bcb7d Fix IAM roles statement to be boto version specific in sqs_events (`#35861`_) -- ee45a88 Fix doc formatting for sqs_events engine example config (`#35860`_) -- **PR** `#35859`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35849`_: (*theredcat*) Fix potential infinite loop with no error when using recursive makedirs -- **PR** `#35682`_: (*vutny*) [BACKPORT] Fix empty `fun_agrs` field in Reactor generated events -- **PR** `#35792`_: (*DmitryKuzmenko*) Reconnect syndic to event bus if master disappeared. -- **PR** `#35817`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- b89f455 fix 34241, webutil.useradd_all is deprecated (`#35788`_) -- 2be5daf Bump the deprecation warning in pkgrepo state to Nitrogen (`#35810`_) -- 083d836 Fix misuse of HTTP credentials in modjk execution module (`#35796`_) -- 0247867 Adds mock for tornado.locks (`#35807`_) -- e4dfc21 Trivial documentation spelling fix (`#35800`_) -- **PR** `#35763`_: (*isbm*) Sphinx crash: documentation config fix -- cd90052 Documentation spelling fixes (`#35773`_) -- **PR** `#35767`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35753`_: (*rallytime*) Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from `#35720`_ -- dab8428 Add versionadded for enabled function in apache_module state (`#35732`_) -- **PR** `#35737`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35729`_: (*cachedout*) Remove docs mocks for msgpack and psutils -- **PR** `#35628`_: (*jf*) Fix user.present state reporting for groups when remove_groups=false -- **PR** `#35696`_: (*xiaoanyunfei*) fix maximum recursion depth bug -- **PR** `#35720`_: (*hu-dabao*) fix 20575, make subset really return random subset -- **PR** `#35700`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- **PR** `#35634`_: (*hu-dabao*) fix 34922, StopIteration should not throw exception out -- **PR** `#35679`_: (*twangboy*) Revert to vcredist 12 (2013) -- **PR** `#35662`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 -- 64974c8 Backport `#35627`_ to 2016.3 (`#35661`_) -- **PR** `#35615`_: (*hu-dabao*) fix 35591, verify the acl file exist before proceed -- **PR** `#35485`_: (*cro*) Cassandra returner bugfixes and documentation. -- **PR** `#35520`_: (*morganwillcock*) Check for all success return codes in win_dism state -- **PR** `#35616`_: (*xbglowx*) Remove duplicate auth_tries in minion docs -- **PR** `#35552`_: (*DmitryKuzmenko*) Syndic fix: don't strip 'retcode' and 'success' from events. -- **PR** `#35559`_: (*Jlin317*) Fix highstate outputter when it's given multiple results -- **PR** `#35605`_: (*rallytime*) Back-port `#32739`_ to 2016.3 -- **PR** `#35606`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 + * 3b62a89e45 Merge pull request `#37282`_ from thatch45/raet_cpub + * 90f778dbc1 Add func for compat with main event system + + * 8e52f425e4 add cpub to raet event for compat + + * **PR** `#37278`_: (`jfindlay`_) update 2016.3.4 release notes + +* **PR** `#37252`_: (`vutny`_) Set logging level to 'info' for message about init system detection + @ *2016-10-27 06:15:01 UTC* + + * d0ce3de50c Merge pull request `#37252`_ from vutny/suppress-init-grain-error + + * 3f20cc01ed Set logging level to 'info' for message about init system detection + + * **PR** `#37259`_: (`rallytime`_) [2016.3] Update man pages for the 2016.3 branch + +* **PR** `#37257`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-10-26 17:32:36 UTC* + + * 2087cfce90 Merge pull request `#37257`_ from rallytime/merge-2016.3 + + * 2066f10d7b Merge branch '2015.8' into '2016.3' + + * f49ccdf30f Merge pull request `#37234`_ from rallytime/bp-37167 + + * a7dbb5bfc9 fixes pkgrepo for fedora>22 `saltstack/salt#31240`_ + +* **ISSUE** `#37238`_: (`cmclaughlin`_) Restarting master causes minion to hang (refs: `#37254`_) + +* **ISSUE** `#37192`_: (`Ch3LL`_) 2016.3.4: Windows minion does not kill process running in foreground (refs: `#37254`_) + +* **ISSUE** `#37191`_: (`Ch3LL`_) 2016.3.4: Multi-Master Failover minion hangs when masters not running (refs: `#37254`_) + +* **ISSUE** `#35480`_: (`jelenak`_) 200 processes of salt-master (2016.3.2) (refs: `#36184`_, `#36555`_, `#37254`_) + +* **PR** `#37254`_: (`DmitryKuzmenko`_) Bugs/37191 minion hangs + @ *2016-10-26 16:28:41 UTC* + + * ea6155c3f4 Merge pull request `#37254`_ from DSRCorporation/bugs/37191_minion_hangs + + * 9ee24b2d70 Revert "Don't set the `daemon` flag for LoggingQueue process." + +* **ISSUE** `#37187`_: (`darkalia`_) Supervisord is considered as "systemd" in grains (refs: `#37218`_) + +* **PR** `#37218`_: (`darkalia`_) Issue `#37187`_ Do not parse first /proc/1/cmdline binary if it's not *b… + @ *2016-10-26 01:41:03 UTC* + + * d1a6bb72ac Merge pull request `#37218`_ from darkalia/37187_supervisor_2016.3 + + * a8dfc6bb96 Issue `#37187`_ Do not parse first /proc/1/cmdline binary if it's not \*bin/init and set supervisord + +* **PR** `#37239`_: (`Ch3LL`_) Fix cloud tests timeout + @ *2016-10-26 01:11:52 UTC* + + * 760ed9f56d Merge pull request `#37239`_ from Ch3LL/fix_cloud_timeout + + * 394fccf556 fix run_cloud timeout + + * 23947c5944 change timeout for cloud tests + +* **PR** `#37244`_: (`rallytime`_) Update bootstrap release to 2016.10.25 + @ *2016-10-26 00:46:29 UTC* + + * 6c5f619398 Merge pull request `#37244`_ from rallytime/update-bootstrap + + * f728a5bc7b Update bootstrap release to 2016.10.25 + + * **PR** `saltstack/salt#36334`_: (`pass-by-value`_) Add ability to specify disk backing mode for VMware cloud profile (refs: `#37245`_) + +* **PR** `#37245`_: (`rallytime`_) Back-port `#36334`_ to 2016.3 + @ *2016-10-26 00:41:00 UTC* + + * **PR** `#36334`_: (`pass-by-value`_) Add ability to specify disk backing mode for VMware cloud profile (refs: `#37245`_) + + * bb7caf8c42 Merge pull request `#37245`_ from rallytime/bp-36334 + + * f64ca3c442 Update release notes and version added + + * 0a3d266d6b Add ability to specify disk backing mode for VMware cloud profile + +* **ISSUE** `#37132`_: (`bl4ckcontact`_) Incorrect flag defined for disabling AD computer account in win_system.py (refs: `#37154`_) + +* **PR** `#37233`_: (`rallytime`_) Back-port `#37154`_ to 2016.3 + @ *2016-10-25 18:32:56 UTC* + + * **PR** `#37154`_: (`bl4ckcontact`_) modules.win_system.py: Fix flag disabling AD Computer objects (refs: `#37233`_) + + * 3c94315d35 Merge pull request `#37233`_ from rallytime/bp-37154 + + * 849af162f1 modules.win_system.py: Fix flag disabling AD Computer objects + +* **PR** `#37232`_: (`rallytime`_) Back-port `#37153`_ to 2016.3 + @ *2016-10-25 18:32:41 UTC* + + * **PR** `#37153`_: (`eradman`_) Update configuration examples for Joyent (refs: `#37232`_) + + * 94852f2eb1 Merge pull request `#37232`_ from rallytime/bp-37153 + + * 3829b7592f Update configuration examples for Joyent + +* **PR** `#37228`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-10-25 18:22:57 UTC* + + * a913eed92a Merge pull request `#37228`_ from rallytime/merge-2016.3 + + * b99d6733b6 Merge branch '2015.8' into '2016.3' + + * d608465d77 Merge pull request `#37178`_ from isbm/isbm-fix-saltapi-ssh-crash + + * 44da411c3a Do not prematurily raise an exception, let the main loop take care of it instead + + * ee48deeded Do not restart the whole thing if roster is not around + + * b8f4e46920 Fix PEP8 + +* **PR** `#37213`_: (`cachedout`_) More salttesting fixes + @ *2016-10-25 07:53:33 UTC* + + * 6aaf6bf399 Merge pull request `#37213`_ from cachedout/more_salttesting_fixes + + * 0bbf06bd86 Lint fix + + * f609917760 Workaround for utils + + * a6a24c2b3b Workaround for tornado test startup error + + * 88bcfa2c0a Fix TCP test + +* **ISSUE** `#37194`_: (`sjorge`_) function_cache in modules.mine docs? (refs: `#37207`_) + +* **PR** `#37207`_: (`cachedout`_) Correct documentation for mine_functions + @ *2016-10-25 07:25:09 UTC* + + * b448455c31 Merge pull request `#37207`_ from cachedout/issue_37194 + + * 9fcdf6da94 Correct documentation for mine_functions + +* **ISSUE** `#37182`_: (`Ch3LL`_) 2016.3.4: multi-master minion stack trace when killed with ctrl+c (refs: `#37208`_) + +* **PR** `#37208`_: (`cachedout`_) Give multimion a process manager and its own destroy method + @ *2016-10-25 07:24:52 UTC* + + * a5e1c041cc Merge pull request `#37208`_ from cachedout/issue_37182 + + * 1449770b0b Give multimion a process manager and its own destroy method + +* **PR** `#37206`_: (`cachedout`_) Address transport test hang + @ *2016-10-25 05:25:55 UTC* + + * e19ee88b6b Merge pull request `#37206`_ from cachedout/transport_test_hang + + * c4393d5e9e Address transport test hang + +* **PR** `#37179`_: (`isbm`_) Fix Salt-API ssh crash (2016.3) + @ *2016-10-25 04:52:19 UTC* + + * 6737fd3ad9 Merge pull request `#37179`_ from isbm/isbm-fix-saltapi-ssh-crash-2016-3 + + * 28edda457e Do not prematurily raise an exception, let the main loop take care of it instead + + * 372f2bbd93 Do not restart the whole thing if roster is not around + + * 8d1450cc47 Fix PEP8 + +* **ISSUE** `saltstack/salt#37176`_: (`guettli`_) docs for "load tags" explains "import_yaml" (refs: `#37183`_) + +* **PR** `#37183`_: (`gtmanfred`_) load tags should reference the actual load tags + @ *2016-10-25 04:38:00 UTC* + + * 815dfd1c04 Merge pull request `#37183`_ from gtmanfred/2016.3 + + * 1b7b4b1a0c load tags should reference the actual load tags + +* **PR** `#37188`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-10-25 04:37:26 UTC* + + * ca63376c97 Merge pull request `#37188`_ from rallytime/merge-2016.3 + + * ccb664050d Merge branch '2015.8' into '2016.3' + + * b3e79dcd51 Merge pull request `#37139`_ from awerner/fix-spm-download-remote-download + + * a606a42575 Minor style change + + * e3916813bb Download spm package from remote repository and save it to cache directory + + * 35b4494157 Merge pull request `#37162`_ from rallytime/bp-36823 + + * 3032a542d9 Use NotifyAccess=all in all unit files + + * 4826995973 Remove EnvironmentFile and Restart lines from unit files + + * 3be15694d2 Use Type=notify for debian systemd units + + * d58fda6f67 Use control-group default for killmode + + * **PR** `#37186`_: (`rallytime`_) Pylint fix for 2016.3 + + * **PR** `#37175`_: (`cachedout`_) Fix test hang (refs: `#37186`_) + +* **PR** `#37175`_: (`cachedout`_) Fix test hang (refs: `#37186`_) + @ *2016-10-24 09:55:37 UTC* + + * 0d7af935e5 Merge pull request `#37175`_ from cachedout/fix_test_hange + + * 0fecb5ff2e Remove sleep. Thanks @s0undt3ch + + * cedc609503 Fix test suite hang on salt testing + +* **ISSUE** `#36866`_: (`sjorge`_) [2016.11.0rc1] salt-master <> salt-minion communication borken due to master_alive_interval (refs: `#37144`_, `#37117`_, `#37142`_) + +* **PR** `#37144`_: (`DmitryKuzmenko`_) Bugs/36866 salt minion communication broken 2016.3 + @ *2016-10-24 03:19:06 UTC* + + * **PR** `#37142`_: (`DmitryKuzmenko`_) status.master: don't fail if host_to_ips returns None (refs: `#37144`_) + + * **PR** `#37117`_: (`DmitryKuzmenko`_) Updated host_to_ip to return all the IPs instead of the first one. (refs: `#37144`_, `#37142`_) + + * 334313ec64 Merge pull request `#37144`_ from DSRCorporation/bugs/36866_salt-minion_communication_broken_2016.3 + + * 87c2e93e40 Don't fail if host_to_ips returns None. + + * f625e6d3a9 Updated host_to_ip to return all the IPs instead of the first one. + +* **PR** `#37158`_: (`jfindlay`_) add mock for `status.uptime` unit test (refs: `#37157`_) + @ *2016-10-24 03:13:53 UTC* + + * **PR** `#37157`_: (`jfindlay`_) Implement `status.uptime` on macOS (refs: `#37158`_) + + * c5d81a8ade Merge pull request `#37158`_ from jfindlay/mac_skip_uptime + + * 094eac06eb modules.status.uptime unit test: mock on linux + +* **ISSUE** `#37037`_: (`mikeadamz`_) schedule state always reports changed when running in highstate (refs: `#37098`_) + +* **PR** `#37161`_: (`rallytime`_) Back-port `#37098`_ to 2016.3 + @ *2016-10-24 03:13:14 UTC* + + * **PR** `#37098`_: (`mikeadamz`_) Add run_on_start to SCHEDULE_CONF (refs: `#37161`_) + + * e51f90b459 Merge pull request `#37161`_ from rallytime/bp-37098 + + * 36bc2a1ded Add run_on_start to SCHEDULE_CONF + +* **PR** `#37159`_: (`rallytime`_) Back-port `#37107`_ to 2016.3 + @ *2016-10-22 13:55:47 UTC* + + * **PR** `#37107`_: (`do3meli`_) use versionadded and deprecated warnings in apache_module (refs: `#37159`_) + + * b5025c044e Merge pull request `#37159`_ from rallytime/bp-37107 + + * c63126a2f0 removed trailing whitespaces in apache_module.py + + * a812cbfea7 use versionadded and deprecated warnings in apache_module + +* **PR** `#37163`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-10-22 13:52:37 UTC* + + * 1e520b3f48 Merge pull request `#37163`_ from rallytime/merge-2016.3 + + * 8fff95b3b4 Merge branch '2015.8' into '2016.3' + + * a5335a2f15 Merge pull request `#37137`_ from awerner/fix-spm-msgpack + + * 52d47cece9 SPM-METADATA are now loaded as yaml from remote URLs + + * 8c46d69251 Merge pull request `#37109`_ from meaksh/zypper-distupgrade-support-2015.8 + + * 330f830c9b Disables 'novendorchange' for old SLEs versions + + * 01b0a6917c Minor pylint fixes + + * 7dbb0bd252 Unit tests fixes + + * e89982b6d2 Improves 'dryrun' outputting. Setting 'novendorchange' as not supported for SLE11 + + * c5a34cbadf Adds multiple repositories support to 'fromrepo' parameter + + * 38fdd28962 Merge pull request `#37087`_ from vutny/gpg-fix-short-keyid + + * c589cba8a9 salt.modules.gpg: allow getting keys by short key ID + + * 3a37a22366 Merge pull request `#37088`_ from meaksh/zypper-distupgrade-support-2015.8 + + * c0641a4027 Fix in log message + + * a092a974da Refactor: Cleanup and pylint fixes + + * 1331ae5c72 Unit tests for zypper upgrade and dist-upgrade + + * 4bcfef2ba2 Adding 'dist-upgrade' support to zypper module + + * 2f29e9e956 Merge pull request `#37090`_ from zer0def/silence-prereq-supervisord-warnings + + * 6a4bfbb485 Silence warnings about "__prerequired__" being an invalid kwarg when using `prereq`. (no refs) + + * **PR** `#37150`_: (`rallytime`_) Allow the minion test daemons a couple of tries to connect to the master + + * **PR** `#37152`_: (`rallytime`_) Add note about salt-bootstrap known issue for 2016.3.4 + +* **PR** `#37135`_: (`aaronm-cloudtek`_) Fix example signing policy in salt.states.x509 docs + @ *2016-10-21 11:45:24 UTC* + + * 8de7b39b5e Merge pull request `#37135`_ from Cloudtek/x509-docs-fix + + * ce87f7311b Fix example signing policy in salt.states.x509 docs + +* **PR** `#37140`_: (`vutny`_) pkgbuild.repo: fix GPG signing with `use_passphrase=False` + @ *2016-10-21 09:37:54 UTC* + + * 41ae90d3c3 Merge pull request `#37140`_ from vutny/pkgbuild-repo-sign-with-no-passphrase + + * 409a3100a7 pkgbuild.repo: fix GPG signing with `use_passphrase=False` + +* **PR** `#37071`_: (`vutny`_) pkgbuild.repo: add `timeout` parameter for waiting passphrase prompt + @ *2016-10-21 05:20:26 UTC* + + * 96a1292a7e Merge pull request `#37071`_ from vutny/pkgbuild-repo-gpg-sign-timeout + + * cfc3a0ed92 pkgbuild.repo: add `timeout` parameter for waiting passphrase prompt + +* **ISSUE** `saltstack/salt#31454`_: (`johje349`_) Salt Mine memory leak (refs: `#36024`_) + +* **ISSUE** `#37018`_: (`tsaridas`_) get events from python (refs: `#37115`_) + +* **ISSUE** `#31454`_: (`johje349`_) Salt Mine memory leak (refs: `#36720`_) + +* **PR** `#37115`_: (`DmitryKuzmenko`_) Backport/36720 fix race condition + @ *2016-10-21 05:16:15 UTC* + + * **PR** `#36720`_: (`skizunov`_) Fix race condition when returning events from commands (refs: `#37115`_) + + * **PR** `#36024`_: (`DmitryKuzmenko`_) Don't subscribe to events if not sure it would read them. (refs: `#36720`_) + + * 274120300d Merge pull request `#37115`_ from DSRCorporation/backport/36720_fix_race_condition + + * d7e3209e13 For IPCClient, remove entry from instance map on close + + * 82e27634a7 Fix race condition when returning events from commands + +* **PR** `#37119`_: (`jfindlay`_) log.setup: only assign user if defined + @ *2016-10-21 05:14:55 UTC* + + * **PR** `#36203`_: (`xiaoanyunfei`_) fix owner of MultiprocessingLoggingQueue (refs: `#37119`_) + + * 169a82e62b Merge pull request `#37119`_ from jfindlay/log_proc_user + + * 8c29949a0e log.setup: only assign user if defined + + * 1d503f032c tests.integration: pass opts as a dict + + * **PR** `#37126`_: (`Ch3LL`_) fix digital ocean image name in profile + + * **PR** `#37125`_: (`jfindlay`_) add 2016.3.4 release notes + +* **PR** `#37120`_: (`rallytime`_) Back-port `#36246`_ to 2016.3 + @ *2016-10-20 19:38:32 UTC* + + * **PR** `#36418`_: (`rallytime`_) Back-port `#36246`_ to 2016.3 (refs: `#37120`_) + + * **PR** `#36246`_: (`twangboy`_) Fix test_issue_6833_pip_upgrade_pip test on OS X (refs: `#36418`_, `#37120`_) + + * 2a35f57be8 Merge pull request `#37120`_ from rallytime/bp-36246 + + * f1c8d98119 Skip weird_install test on Mac OS X + + * 90de794290 Fix test_issue_6833_pip_upgrade_pip test on OSX + +* **PR** `#37103`_: (`cachedout`_) Remove unnecessary sleep from unit.utils.process_test.TestProcessMana… + @ *2016-10-20 08:45:07 UTC* + + * 0b87e7890a Merge pull request `#37103`_ from cachedout/fix_proc_test + + * d7aebd1877 Remove unnecessary sleep from unit.utils.process_test.TestProcessManager.test_restarting + +* **PR** `#36823`_: (`terminalmage`_) Update debian systemd unit files to use default KillMode, Type=notify (refs: `#37162`_) + @ *2016-10-20 05:54:42 UTC* + + * **PR** `#36806`_: (`l2ol33rt`_) Deb systemd should use control-group default for killmode (refs: `#36823`_) + + * 326bbd5e30 Merge pull request `#36823`_ from terminalmage/pr-36806 + + * fb6e545f78 Use NotifyAccess=all in all unit files + + * 0ccf789172 Remove EnvironmentFile and Restart lines from unit files + + * ddd44e9b13 Use Type=notify for debian systemd units + + * 036d73f31b Use control-group default for killmode + +* **PR** `#37030`_: (`isbm`_) Fix status.uptime for Solaris 9, 10 and 11. + @ *2016-10-20 05:52:53 UTC* + + * 0c40e71e17 Merge pull request `#37030`_ from isbm/isbm-solaris-status-fix + + * 7d7b5ef9a9 Lintfix: E8303 too many blank lines + + * c11940d14c Fix status.uptime for Solaris 9, 10 and 11. + +* **PR** `#37101`_: (`rallytime`_) [2016.3] Merge forward from 2016.3 to carbon + @ *2016-10-20 05:39:24 UTC* + + * eb88c73222 Merge pull request `#37101`_ from rallytime/merge-2016.3 + + * b445a5e579 Merge branch '2015.8' into '2016.3' + + * 68eeb29783 Add warning about GitPython 2.0.9 incompatibility with Python 2.6 (`#37099`_) + + * 39d59ab0df Merge pull request `#36880`_ from vutny/cp-get-salt-url + + * d1ab98b459 cp.get_url: update usage doc and add tests for `file://` URL with `dest=None` + + * c7cf79e959 cp.get_url: add note and test for https:// URL with ``dest=None`` + + * ff55f77179 cp.get_url: write more verbose docstring + + * 94a34a08ba cp.get_url: add integration tests + + * 983f82fcf4 cp.get_url: fix variable type check + + * b33f4d7b93 cp.get_url: log error message if no file could be fetched from `salt://` URL + + * 99cf3038cc cp.get_url: fix `dest=None` behaviour with `salt://` URL + +* **PR** `#36958`_: (`twangboy`_) Fix bug where cmd.powershell fails to return + @ *2016-10-19 16:03:58 UTC* + + * 8d44efed78 Merge pull request `#36958`_ from twangboy/fix_cmd_powershell + + * 427be7b422 Add versionadded + + * d8e0e0e482 Fix missing comma + + * 7b46d04a84 Add note about increased completion times + + * 9365581a36 Clarify docs, add depth option + +* **PR** `#37086`_: (`cachedout`_) Make salt-call a first-class citizen for multi-master + @ *2016-10-19 15:19:09 UTC* + + * beb54b3ffa Merge pull request `#37086`_ from cachedout/mm_req + + * 7dc15c1a48 Lint utils + + * 9bbe3c998b Lint error in publish + + * e22a3d2be6 Add multi-master support to publish.publish + + * 7f141ba38c Add function to search for substr in list + + * 007eef84d7 Extend support to event.fire_master + + * 8171c73b00 Multi-master support for salt-call + +* **ISSUE** `#36814`_: (`martin-helmich`_) x509.create_csr creates invalid CSR (refs: `#36898`_) + +* **PR** `#36898`_: (`clinta`_) X509 fixes + @ *2016-10-19 03:03:43 UTC* + + * 6b94153ea6 Merge pull request `#36898`_ from clinta/x509-fixes + + * e732fe7725 fix docs on CSR state + + * 9b6f1a336c fix quotes and remove dependency on pkg_resources + + * eb4433d1ae return early if there are no requested extensions in the csr + + * d00cf8ef87 allow specifying digest for crl + + * dd50705e58 fix `#36814`_ + +* **ISSUE** `#34872`_: (`cbuechler`_) "Minion did not return" executing state with long running command, 2016.3 regression (refs: `#37025`_) + +* **PR** `#37025`_: (`cro`_) Make salt.utils.minion._check_cmdline work on OSes without /proc. + @ *2016-10-19 03:00:10 UTC* + + * a32b8cd741 Merge pull request `#37025`_ from cro/freebsd_no_proc + + * 1ac87e0efd Make salt.utils.minion._check_cmdline work on OSes without /proc. + +* **PR** `#37050`_: (`twangboy`_) Fix service state for Windows (DO NOT MERGE FORWARD) + @ *2016-10-19 02:46:27 UTC* + + * **PR** `#36923`_: (`twangboy`_) Fix service state for Windows (refs: `#37050`_) + + * e09d9f85c5 Merge pull request `#37050`_ from twangboy/fix_win_service_state + + * b3b688e298 Fix tests + + * 1e1ee786c9 Set service to manual if disabled on start + + * **PR** `saltstack/salt#29322`_: (`mrproper`_) add http proxy support for tornado (refs: `#37076`_) + +* **PR** `#37076`_: (`jfindlay`_) Document proxy settings + @ *2016-10-19 02:30:27 UTC* + + * 5e998638a4 Merge pull request `#37076`_ from jfindlay/proxy_doc + + * 7328df68f5 doc.topic.tutorials.http.query: add proxy section + + * 331072b35d doc.topic.tutorials.http.query: add subheadings + + * 478def4923 doc.ref.configuration.minion: add proxy vars + +* **ISSUE** `#37001`_: (`phil123456`_) URGENT : archive.extracted does not work anymore (refs: `#37081`_) + +* **PR** `#37081`_: (`terminalmage`_) Fix archive.extracted remote source_hash verification + @ *2016-10-19 02:22:22 UTC* + + * 9ec366833e Merge pull request `#37081`_ from terminalmage/issue37001 + + * a3c4deeb82 Fix archive.extracted remote source_hash verification + +* **ISSUE** `#35097`_: (`jwhite530`_) Minions die with "un-handled exception from the multiprocessing process" (refs: `#37064`_) + +* **PR** `#37064`_: (`cachedout`_) Unify job check in scheduler + @ *2016-10-19 02:08:06 UTC* + + * 67faee1f94 Merge pull request `#37064`_ from cachedout/issue_35097 + + * 980ba892c9 Unify job check in scheduler + +* **PR** `#37072`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-10-18 15:23:17 UTC* + + * 7ef10f6de6 Merge pull request `#37072`_ from rallytime/merge-2016.3 + + * 78a144f19a Merge branch '2015.8' into '2016.3' + + * 7dd91c2880 Merge pull request `#37053`_ from rallytime/update-fedora-install-docs + + * 24e0f5e024 Update the Fedora installation docs + + * 4eb0a89b7c remove options from pylint (`#37054`_) + +* **PR** `#37049`_: (`terminalmage`_) Further clarification on new grains docs from `#37028`_ + @ *2016-10-18 01:47:57 UTC* + + * **PR** `#37028`_: (`damon-atkins`_) Update topics/grains doco, about considerations before adding a Grain (refs: `#37049`_) + + * 71fd01ab8d Merge pull request `#37049`_ from terminalmage/grains-docs + + * 854586c6a4 Add one more paragraph + + * a0502a7b90 Restructure grain writing docs + + * 4e419e90ac Further clarification on new grains docs from `#37028`_ + +* **ISSUE** `saltstack/salt#18419`_: (`jasonrm`_) salt-cloud fails to run as non-root user (refs: `#35483`_) + +* **ISSUE** `#34806`_: (`jerrykan`_) salt-cloud ignores sock_dir when firing event (refs: `#35483`_) + +* **PR** `#37057`_: (`rallytime`_) [2016.3] Update salt.utils.cloud references to __utils__ for cache funcs + @ *2016-10-18 01:31:43 UTC* + + * **PR** `#35483`_: (`gtmanfred`_) use __utils__ in salt.cloud (refs: `#35855`_, `#37057`_, `#36070`_) + + * 9a6671ce69 Merge pull request `#37057`_ from rallytime/cloud-utils-cleanup + + * d0dc7d4e55 [2016.3] Update salt.utils.cloud references to __utils__ for cache funcs + +* **PR** `#36977`_: (`twangboy`_) Remove whitespace from string commands + @ *2016-10-17 22:32:03 UTC* + + * f8cd7b7b28 Merge pull request `#36977`_ from twangboy/fix_cmd_run + + * 6586050736 Move strip to powershell block, add -NoProfile + +* **PR** `#37048`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-10-17 16:05:48 UTC* + + * 9378b22d80 Merge pull request `#37048`_ from rallytime/merge-2016.3 + + * 5efd6d3df9 Merge branch '2015.8' into '2016.3' + + * 7f5aced50e Merge pull request `#36972`_ from zer0def/supervisor-state-fixes + + * 53801c6e80 Mitigates failure reports when making sure an existing supervisor process group is running, despite success. + + * 4e2ad07b0f Prevent source files in /tmp from being deleted by file.managed states (`#37023`_) + + * 4e9824a65e args does not always exist (`#37019`_) + +* **PR** `#37028`_: (`damon-atkins`_) Update topics/grains doco, about considerations before adding a Grain (refs: `#37049`_) + @ *2016-10-17 09:54:21 UTC* + + * 104a153a1f Merge pull request `#37028`_ from damon-atkins/update_topics_grains_doco + + * 01e83a715e doc/topics/grains Update doco on when a grain should be created + + * a0e1fcc951 Add information to consider before adding a Grain to doco's for Grains + +* **PR** `#37012`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-10-14 18:07:03 UTC* + + * c30656814d Merge pull request `#37012`_ from rallytime/merge-2016.3 + + * a7c9a72104 Merge branch '2015.8' into '2016.3' + + * c6254d59fd Merge pull request `#36807`_ from terminalmage/issue36723 + + * 7d60e73308 Fix pillar merging when ext_pillar_first is enabled + + * e2bc94b029 cp.get_file_str: do not fail if file not found (`#36936`_) + +* **ISSUE** `#34397`_: (`jaredhanson11`_) ignore_epoch needs to be passed through to version_cmp functions (refs: `#34531`_) + + * **PR** `#37007`_: (`skizunov`_) opkg: Support ignore_epoch argument in version comparisons + + * **PR** `#34531`_: (`terminalmage`_) Support ignore_epoch argument in version comparisons (refs: `#37007`_) + +* **PR** `#36808`_: (`gtmanfred`_) allow for closing stuff in beacons (refs: `#36835`_) + @ *2016-10-14 15:50:09 UTC* + + * 8b3e65448d Merge pull request `#36808`_ from gtmanfred/beacons + + * 727d4f309a allow for closing stuff in beacons + + * **PR** `#36993`_: (`terminalmage`_) Make helper funcs private + +* **ISSUE** `#27316`_: (`efficks`_) Extracted state with zip format failed on Windows (refs: `#27317`_) + +* **ISSUE** `#27207`_: (`PredatorVI`_) archive.extracted state not preserving file permissions (refs: `#33906`_) + +* **ISSUE** `#26569`_: (`ssgward`_) Add support for password-protected zip files in archive.extracted on Windows (refs: `#31116`_) + +* **ISSUE** `#23822`_: (`sidcarter`_) Zip file extracted permissions are incorrect (refs: `#25128`_) + + * **PR** `saltstack/salt#36539`_: (`jfindlay`_) Prefer archive.cmd_unzip (refs: #`saltstack/salt`#36648`_`_, `#36648`_) + +* **PR** `#36986`_: (`jfindlay`_) modules.archive.unzip: zipfile is stdlib + @ *2016-10-13 21:38:00 UTC* + + * **PR** `#36648`_: (`jfindlay`_) Integration tests for archive execution module (refs: `#36986`_) + + * **PR** `#33906`_: (`lomeroe`_) Archive unzip permissions (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#31116`_: (`UtahDave`_) Add password support for zip files in archive module and state (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#27764`_: (`basepi`_) Merge forward from 2015.8 to develop (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#27317`_: (`efficks`_) State unzip should use unzip command instead of unzip_cmd. (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#25128`_: (`stanislavb`_) Use cmd_unzip to preserve permissions (refs: `#36539`_, #saltstack/salt`#36539`_) + + * a75761de87 Merge pull request `#36986`_ from jfindlay/arch_test + + * 2ec2684860 modules.archive.unzip: zipfile is stdlib + +* **ISSUE** `#36422`_: (`rippiedoos`_) No error Reporting for (yum)pkg.upgrade (refs: #`saltstack/salt#36450`_) + + * **PR** `saltstack/salt#36980`_: (`rallytime`_) Skip pkg.upgrade test if pkg install/upgrade has problems (refs: `#36981`_) + + * **PR** `saltstack/salt#36450`_: (`terminalmage`_) Normalize pkg.upgrade and raise CommandExecutionError on failure (refs: `#36981`_, #`saltstack/salt#36980`_) + +* **PR** `#36981`_: (`rallytime`_) Skip pkg.upgrades test on distros other that Suse in 2016.3 + @ *2016-10-13 21:29:36 UTC* + + * c7595b84a7 Merge pull request `#36981`_ from rallytime/upgrades-test-fix + + * a5ae737057 Skip pkg.upgrades test on distros other that Suse in 2016.3 + +* **ISSUE** `#36671`_: (`wrigtim`_) systemd.py available() breaks on latest LSB-compliant versions of systemd (refs: `#36755`_) + +* **PR** `#36755`_: (`terminalmage`_) systemd.py: check retcode for service availability in systemd >= 231 + @ *2016-10-13 19:41:50 UTC* + + * 6b782c15e1 Merge pull request `#36755`_ from terminalmage/issue36671 + + * d916c2b49c Handle cases where retcode/output feature is backported + + * b3364646ad Update systemd module unit tests + + * a2439acbc9 systemd.py: check retcode for service availability in systemd >= 231 + +* **ISSUE** `#36746`_: (`Ch3LL`_) Carbon: When killing a job jid output missing (refs: `#36750`_) + +* **PR** `#36750`_: (`terminalmage`_) Add the CLI client and pub_data as class attributes + @ *2016-10-13 19:38:33 UTC* + + * 10d255c511 Merge pull request `#36750`_ from terminalmage/issue36746 + + * 0e7c600e02 Only display Ctrl-c message on SIGINT + + * 9025be48c5 Include the jid (when available) in SystemExit message on Ctrl-c + + * 9c9f1f620b Add the CLI client and pub_data as class attributes + +* **ISSUE** `#36240`_: (`hrumph`_) win_certutil add_store state not installing certificates (refs: `#36241`_) + +* **PR** `#36241`_: (`hrumph`_) Fixes `#36240`_ + @ *2016-10-12 23:28:35 UTC* + + * 3ac9ced202 Merge pull request `#36241`_ from hrumph/cert_problem + + * 51230fc263 Merge pull request `#1`_ from rallytime/pr-36241 + + * 32846794c8 Update mocks for failing tests in win_certutil_test + + * b26578d1ac Fixes `#36240`_ + +* **PR** `#36950`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-10-12 20:57:41 UTC* + + * c1f84388d6 Merge pull request `#36950`_ from rallytime/merge-2016.3 + + * 1d3ce45ac0 Merge branch '2015.8' into '2016.3' + + * 2ccc44f314 Merge pull request `#36914`_ from rallytime/suse_show_link + + * b8ffd9f53f Allow alternatives.show_link function to work on Suse distros + + * 5362e5183e Merge branch '2015.8' into '2016.3' + + * fe2f094838 salt.modules.gpg: initialize GnuPG home dir with correct ownership (`#36824`_) + + * 4b21cca909 Fix race condition in which files were removed during a file.directory (`#36928`_) + + * 7838d8d3f9 Remove "Targeting with Executions" section from docs (`#36925`_) + + * a56bf8bd2d Update references to future default value change that was reverted (`#36924`_) + +* **PR** `#36948`_: (`rallytime`_) Back-port `#36943`_ to 2016.3 + @ *2016-10-12 18:33:02 UTC* + + * **PR** `#36943`_: (`orymate`_) doc: document what the argument of salt --subset means (refs: `#36948`_) + + * 7e2128c05d Merge pull request `#36948`_ from rallytime/bp-36943 + + * d2f8f18430 doc: document what the argument of salt --subset means + +* **PR** `#36946`_: (`rallytime`_) Back-port `#36892`_ to 2016.3 + @ *2016-10-12 18:32:35 UTC* + + * **PR** `#36892`_: (`nvtkaszpir`_) Update tutorial.rst (refs: `#36946`_) + + * f43a10252d Merge pull request `#36946`_ from rallytime/bp-36892 + + * 94c97ee726 Update tutorial.rst + +* **ISSUE** `#35198`_: (`goestin`_) beacons modules: service fails (refs: `#35199`_) + +* **PR** `#36945`_: (`rallytime`_) Back-port `#35199`_ to 2016.3 + @ *2016-10-12 18:31:16 UTC* + + * **PR** `#35199`_: (`goestin`_) fix for issue `#35198`_ (refs: `#36945`_) + + * 5c70669ac0 Merge pull request `#36945`_ from rallytime/bp-35199 + + * 390b906c2f adhere pep8 e713 + + * 79c9905fc5 Re-added accidentally removed line 85 + + * 8bba13896a Fixed issue `#35198`_ now without deprecated code. + + * 1241d87f1d fix for issue `#35198`_ + + * **PR** `#36949`_: (`terminalmage`_) Fix versionadded + + * **PR** `#36930`_: (`jfindlay`_) return opennebula errors to user + +* **PR** `#36929`_: (`rallytime`_) [yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades + @ *2016-10-11 22:55:49 UTC* + + * 6ea1f59058 Merge pull request `#36929`_ from rallytime/fix-pending-upgrade-test + + * 32829b9474 [yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades + +* **ISSUE** `#36906`_: (`sjorge`_) [docs] comments about targetting execution still correct? (refs: `#36926`_, #`saltstack/salt`#36925`_`_, `#36925`_) + + * **PR** `saltstack/salt#36925`_: (`rallytime`_) Remove "Targeting with Executions" section from docs (refs: `#36926`_) + + * **PR** `#36926`_: (`rallytime`_) [2016.3] Remove "Targeting with Executions" section from docs + +* **PR** `#36915`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-10-11 19:49:42 UTC* + + * b7f87e0aed Merge pull request `#36915`_ from rallytime/merge-2016.3 + + * 971c27cba2 Merge branch '2015.8' into '2016.3' + + * f3443fb992 Properly handle "shared" arg in git.init when it is a bool (`#36912`_) + + * bdbf1619cb Check for test=True in salt.wait_for_event orchestration events (`#36897`_) + + * **PR** `#36820`_: (`BenoitKnecht`_) Fix diff output of test runs for Debian slave interfaces + +* **ISSUE** `#36855`_: (`edwardsdanielj`_) Issue with setting up schedule job via state.apply (refs: `#36894`_) + + * **PR** `#36894`_: (`jfindlay`_) states.schedule: splay is not ordereddict + +* **PR** `#36885`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-10-10 19:30:25 UTC* + + * 86ac8bd680 Merge pull request `#36885`_ from rallytime/merge-2016.3 + + * c09b9d6e6a Merge branch '2015.8' into '2016.3' + + * 3ce4897b97 Merge pull request `#36857`_ from terminalmage/systemd-unit-tests + + * 7c78d6f419 Add unit tests for systemd scope usage + + * **PR** `#36889`_: (`terminalmage`_) salt-ssh: Try "command -v" before falling back to "which" + +* **ISSUE** `#36804`_: (`Ch3LL`_) CARBON: error when using pkg.installed with url source (refs: `#36830`_) + + * **PR** `#36830`_: (`terminalmage`_) fileclient: Change queryarg comparison from None to simple boolean check + +* **PR** `#36853`_: (`rallytime`_) Back-port `#33939`_ to 2016.3 + @ *2016-10-07 21:44:33 UTC* + + * **PR** `#33939`_: (`bx2`_) Removed `!`-password check for salt-cloud vultr provider (refs: `#36853`_) + + * 6a6bdf3e3f Merge pull request `#36853`_ from rallytime/bp-33939 + + * efbc09c1a6 Removed `!`-password check + +* **PR** `#36852`_: (`rallytime`_) Back-port `#36743`_ to 2016.3 + @ *2016-10-07 21:35:43 UTC* + + * **PR** `#36743`_: (`do3meli`_) corrected OS Name in openbsd_sysctl module load error message (refs: `#36852`_) + + * 01348bde18 Merge pull request `#36852`_ from rallytime/bp-36743 + + * 899130d11f corrected OS Name in module load error message + +* **PR** `#36844`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-10-07 19:20:31 UTC* + + * 0b7661244d Merge pull request `#36844`_ from rallytime/merge-2016.3 + + * 1c3a9a3ee9 Merge branch '2015.8' into '2016.3' + + * 3e6b16de2b Merge pull request `#36786`_ from cachedout/fixup_36676 + + * 3c93134e57 Typo + + * 13eb463bd9 Fixup alterernatives module + + * c126f2e132 Merge pull request `#36757`_ from cachedout/issue_33841 + + * 4bce452500 Resolve issue with minion failing to restart on failure + + * 89f9fc8c0d Merge pull request `#36749`_ from jacobhammons/file-dict + + * 71f91b3a50 Fixes the cli examples to reference the correct function + + * 804a2a1ab0 Merge pull request `#36730`_ from rallytime/bp-36028 + + * 4be4f900ee Back-port `#36028`_ to 2015.8 + +* **PR** `#36835`_: (`jfindlay`_) unify and expand beacon documentation + @ *2016-10-07 15:59:34 UTC* + + * **PR** `#36808`_: (`gtmanfred`_) allow for closing stuff in beacons (refs: `#36835`_) + + * dc5d821be6 Merge pull request `#36835`_ from jfindlay/beacon_doc + + * b2eccdefd5 doc.topics.beacons: reflow text at 80 chars + + * b181f9890d doc.topics.{reactor|beacons}: unify examples, many minor edits + + * 28b4e30009 doc.glossary: use parenthesis + + * 82cf39db00 doc.glossary: add JID + + * cc071b75cb doc.glossary: add idempotent + +* **ISSUE** `#36787`_: (`maximeguillet`_) postgres.* calls fail with postgresql 9.6 and .psqlrc custom file (refs: `#36789`_) + +* **PR** `#36789`_: (`maximeguillet`_) Fix behavior of psql -c option with postgresql 9.6 + @ *2016-10-06 11:24:51 UTC* + + * 1284de27fc Merge pull request `#36789`_ from maximeguillet/fix-psqlrc-pg9.6 + + * b59c23bef1 Fix one remaining postgresql tests linked to `#36787`_. + + * 8b92ae2061 Fix postgresql tests using position in the argument list of psql. + + * 21f2a17a07 Fix postgresql tests by adding --no-psqlrc option introduced by `#36787`_. + + * 574e30e915 Fix behavior of psql -c option with postgresql 9.6 + +* **ISSUE** `#36579`_: (`scubahub`_) No error generated when reactor file does not exist. (refs: `#36797`_) + +* **PR** `#36797`_: (`cachedout`_) Error on reaction with missing SLS file + @ *2016-10-06 11:19:27 UTC* + + * a1d59f4d2f Merge pull request `#36797`_ from cachedout/issue_36579 + + * 6ce4653fa3 Error on reaction with missing SLS file + +* **ISSUE** `saltstack/salt#36788`_: (`damon-atkins`_) pillar/libvirt.py assume certtool is available and works everytime (refs: `#36803`_) + +* **PR** `#36803`_: (`gtmanfred`_) do not load libvirt pillar if certtool is unavailable + @ *2016-10-06 11:15:14 UTC* + + * b75130be2d Merge pull request `#36803`_ from gtmanfred/2016.3 + + * 2183737085 do not load libvirt pillar if certtool is unavailable + +* **PR** `#36815`_: (`BenoitKnecht`_) Fix glance.image_present state + @ *2016-10-06 10:29:44 UTC* + + * 39148dc711 Merge pull request `#36815`_ from BenoitKnecht/fix-glance-image-present-state-2016.3 + + * 342eee444d states: glance: handle image list instead of dict + + * 02b91ecf15 states: glance: import keystone exceptions from new location + +* **ISSUE** `#36738`_: (`edhgoose`_) rpmdev-vercmp throws lots of warnings on Amazon Linux (refs: `#36739`_) + +* **PR** `#36754`_: (`terminalmage`_) Base rpmdev-vercmp comparison result on retcode + @ *2016-10-05 12:50:23 UTC* + + * **PR** `#36739`_: (`edhgoose`_) Add support for rpmdevtools returning < / > / == (refs: `#36754`_) + + * 81c935f210 Merge pull request `#36754`_ from terminalmage/issue36738 + + * 928c99d2f7 Base rpmdev-vercmp comparison result on retcode + + * **PR** `saltstack/salt#36728`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 (refs: `#36785`_) + +* **PR** `#36785`_: (`cachedout`_) Fixup merge forward `#36728`_ + @ *2016-10-05 11:02:16 UTC* + + * **PR** `#36728`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 (refs: `#36785`_) + + * 4bdb997dae Merge pull request `#36785`_ from cachedout/pr-36728 + + * 118ba8a772 Update alternatives module to strip newline chars + + * 24b8bba145 Merge branch '2015.8' into '2016.3' + + * a01a68d4be Merge pull request `#36676`_ from vutny/redhat-alternatives-detect-fail + + * bba9d0d105 `alternatives.install` state: detect `alternatives` command failed + + * eab4fd563a Merge pull request `#36700`_ from terminalmage/update-faq + + * 3d15eedfe0 Add additional information about onchanges/onchanges_in + + * 57ecbe6c53 Update minion restart example to use onchanges instead of cmd.wait + +* **ISSUE** `#36766`_: (`bx2`_) salt-cloud (vultr) throws NameError: global name '__opts__' is not defined (refs: `#36768`_) + +* **PR** `#36768`_: (`gtmanfred`_) add __utils__ to vultr cloud provider + @ *2016-10-05 06:59:27 UTC* + + * 90cca6b135 Merge pull request `#36768`_ from gtmanfred/2016.3 + + * 9df2fd11dd add __utils__ to vultr cloud provider + +* **PR** `#36764`_: (`cachedout`_) Another bit of detection for failed pip tests + @ *2016-10-04 13:05:29 UTC* + + * 8ff69bf0c7 Merge pull request `#36764`_ from cachedout/more_pip_test_fixing + + * b9f5343449 Another bit of detection for failed pip tests + +* **ISSUE** `#27316`_: (`efficks`_) Extracted state with zip format failed on Windows (refs: `#27317`_) + +* **ISSUE** `#27207`_: (`PredatorVI`_) archive.extracted state not preserving file permissions (refs: `#33906`_) + +* **ISSUE** `#26569`_: (`ssgward`_) Add support for password-protected zip files in archive.extracted on Windows (refs: `#31116`_) + +* **ISSUE** `#23822`_: (`sidcarter`_) Zip file extracted permissions are incorrect (refs: `#25128`_) + + * **PR** `saltstack/salt#36722`_: (`rallytime`_) Skip cmd_unzip test if salt.utils.which('zip') isn't available (refs: `#36747`_) + + * **PR** `saltstack/salt#36648`_: (`jfindlay`_) Integration tests for archive execution module (refs: `#36747`_) + + * **PR** `saltstack/salt#36539`_: (`jfindlay`_) Prefer archive.cmd_unzip (refs: #`saltstack/salt`#36648`_`_, `#36648`_) + +* **PR** `#36747`_: (`jfindlay`_) modules.archive integration tests: check for gzip, rar + @ *2016-10-04 11:47:32 UTC* + + * **PR** `#33906`_: (`lomeroe`_) Archive unzip permissions (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#31116`_: (`UtahDave`_) Add password support for zip files in archive module and state (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#27764`_: (`basepi`_) Merge forward from 2015.8 to develop (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#27317`_: (`efficks`_) State unzip should use unzip command instead of unzip_cmd. (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#25128`_: (`stanislavb`_) Use cmd_unzip to preserve permissions (refs: `#36539`_, #saltstack/salt`#36539`_) + + * 5c0cbfc4c6 Merge pull request `#36747`_ from jfindlay/arch_test + + * b5fcca9983 modules.archive int tests: check for gzip, rar + +* **PR** `#36744`_: (`cachedout`_) Fix issue where test suite could hang on shutdown + @ *2016-10-03 15:37:00 UTC* + + * 93f1daa4ce Merge pull request `#36744`_ from cachedout/fix_test_shutdown + + * cdf2a56564 Fix issue where test suite could hang on shutdown + +* **ISSUE** `saltstack/salt#32490`_: (`davegiles`_) __proxy__ not available when called from state.sls_id, fine from state.highstate (refs: `#36696`_) + +* **PR** `#36696`_: (`cro`_) pass __proxy__ in state.sls_id + @ *2016-10-01 09:37:50 UTC* + + * 6fa9ec36d2 Merge pull request `#36696`_ from cro/proxy_in_sls_id + + * 891004f3be try/except for when __proxy__ is not injected. + + * e8e53d60be pass __proxy__ in state.sls_id + +* **PR** `#36716`_: (`vutny`_) salt.modules.ini_manage: fix creating options in empty file + @ *2016-10-01 09:35:11 UTC* + + * e0b288feb3 Merge pull request `#36716`_ from vutny/fix-ini-manage + + * 73eb773fb0 salt.modules.ini_manage: fix creating options in empty file + +* **ISSUE** `#29421`_: (`scbunn`_) pillar data leaks through environments (refs: `#36435`_, #saltstack/salt`#36435`_) + + * **PR** `saltstack/salt#36628`_: (`yhekma`_) Update doc to reflect the version where 'none' was added as a pillar\_… (refs: `#36724`_) + + * **PR** `saltstack/salt#36435`_: (`yhekma`_) Add "none" as a pillar merging strategy (refs: #`saltstack/salt`#36628`_`_, `#36628`_) + +* **PR** `#36724`_: (`rallytime`_) Back-port `#36628`_ to 2016.3 + @ *2016-10-01 09:33:43 UTC* + + * **PR** `#36628`_: (`yhekma`_) Update doc to reflect the version where 'none' was added as a pillar\_… (refs: `#36724`_) + + * 97713b09f5 Merge pull request `#36724`_ from rallytime/bp-36628 + + * 3bb2cb6379 Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy + + * **PR** `saltstack/salt#36643`_: (`roosri`_) a small, and unfortunate error (refs: `#36725`_) + +* **PR** `#36725`_: (`rallytime`_) Back-port `#36643`_ to 2016.3 + @ *2016-10-01 09:33:13 UTC* + + * **PR** `#36643`_: (`roosri`_) a small, and unfortunate error (refs: `#36725`_) + + * 8e7529764b Merge pull request `#36725`_ from rallytime/bp-36643 + + * c5b8e442f9 a small, and unfortunate error + +* **PR** `#36726`_: (`rallytime`_) Back-port `#36722`_ to 2016.3 + @ *2016-10-01 09:32:53 UTC* + + * **PR** `#36722`_: (`rallytime`_) Skip cmd_unzip test if salt.utils.which('zip') isn't available (refs: `#36726`_) + + * cf32c59b6a Merge pull request `#36726`_ from rallytime/bp-36722 + + * 5904cc04c6 Skip cmd_unzip test if salt.utils.which('zip') isn't available + +* **ISSUE** `saltstack/salt#36718`_: (`Ch3LL`_) Error when using archive.zip on python2.6 (refs: `#36719`_) + + * **PR** `#36719`_: (`Ch3LL`_) fix python26 archive zip module + + * **PR** `saltstack/salt#36616`_: (`cro`_) Zypper fix test (refs: `#36699`_) + +* **PR** `#36699`_: (`cachedout`_) Fix error in test + @ *2016-09-30 11:28:18 UTC* + + * 7d022a3f39 Merge pull request `#36699`_ from cachedout/fixup_36616 + + * 16f5bb70ec Remove line that checks against unordered keys + + * 0e9148293a Fix error in test + +* **ISSUE** `#36669`_: (`jackywu`_) fix bug of including loopback addr will never work (refs: `#36670`_) + +* **PR** `#36670`_: (`jackywu`_) fix bug for including loopback addr + @ *2016-09-30 10:21:53 UTC* + + * 0aa35596c0 Merge pull request `#36670`_ from jackywu/2016.3 + + * 48d2d512d8 fix bug for including loopback addr + +* **ISSUE** `#36692`_: (`lorengordon`_) Expose `ignore_if_missing` param to the file.replace state (refs: `#36694`_) + +* **PR** `#36694`_: (`lorengordon`_) Exposes `ignore_if_missing` to file.replace state module + @ *2016-09-30 10:12:27 UTC* + + * 0e8c9abe8d Merge pull request `#36694`_ from lorengordon/issue-36692 + + * 35f3bb3a8a Exposes `ignore_if_missing` to file.replace state module + + * **PR** `saltstack/salt#35356`_: (`jfindlay`_) document log levels and warn on all logging below info (refs: `#36686`_) + +* **PR** `#36686`_: (`jfindlay`_) log levels doc: try long form table + @ *2016-09-29 18:21:47 UTC* + + * c089ac6c67 Merge pull request `#36686`_ from jfindlay/log_levels + + * 4dd4fc94dc log levels doc: try long form table + +* **PR** `#36690`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-29 17:46:24 UTC* + + * e0a851b2f1 Merge pull request `#36690`_ from rallytime/merge-2016.3 + + * 7fc38c9aca Merge branch '2015.8' into '2016.3' + + * 7d1972bd5c Merge pull request `#36684`_ from rallytime/merge-2015.8 + + * 838722d225 Merge branch '2015.5' into '2015.8' + + * 8f1ba2fa26 Merge pull request `#36678`_ from rallytime/merge-2015.5 + + * 51240ecb13 Merge branch '2014.7' into '2015.5' + + * 86dc3dc9f7 Merge pull request `#36641`_ from fuzzy-id/fix-lvm-thin-argument + + * 740516aace fix thin argument for 'lvm.lv_create' + +* **PR** `#36680`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-29 16:49:16 UTC* + + * f95dd696e5 Merge pull request `#36680`_ from rallytime/merge-2016.3 + + * 3e4ac617d3 Merge branch '2015.8' into '2016.3' + + * e4c5d0bfd6 Merge pull request `#36664`_ from cachedout/remove_useless_size_check + + * 3d098c64ef Remove possible race between grains dumps in test + + * 8cfe371a5a Merge pull request `#36663`_ from cachedout/skip_pip_tests_on_download_fail + + * 0c7fb91dc5 Fix error + + * e3f8618982 Merge pull request `#36662`_ from cachedout/skip_pip_tests_on_download_fail + + * 0bbc60ccd7 Skip over tests where upstream pip isn't there + + * 3249a11e71 Merge pull request `#36661`_ from cachedout/fix_grain_test_race + + * 2dcb92134d Fix race between minion job timeout and cli test timeout + + * b0190f248e Merge pull request `#36660`_ from cachedout/fix_2068_issue_test + + * f4906fe771 Fix test not to rely on external resources + +* **ISSUE** `#28125`_: (`peter-slovak`_) [2015.8] support for __env__ in Git external pillar (refs: `#36659`_) + +* **PR** `#36659`_: (`terminalmage`_) Support dynamic env in new-style git_pillar + @ *2016-09-29 05:04:38 UTC* + + * eab1680f3f Merge pull request `#36659`_ from terminalmage/issue28125 + + * 45352b36bd Support dynamic env in new-style git_pillar + +* **ISSUE** `#34927`_: (`bobrik`_) Salt does not run "systemd daemon-reload" on unit override (refs: `#36538`_) + +* **PR** `#36538`_: (`clinta`_) daemon-reload on call to service.avaliable + @ *2016-09-29 02:28:00 UTC* + + * 0c2bd4b66b Merge pull request `#36538`_ from clinta/daemon-reload + + * 833beb9b36 Merge pull request `#1`_ from terminalmage/pr-36538 + + * c4060ba2c1 Move check for service availability to a helper function + + * 20c2c91bba daemon-reload on call to service.avaliable + +* **PR** `#36616`_: (`cro`_) Zypper fix test + @ *2016-09-29 02:26:22 UTC* + + * d8a61eb9f6 Merge pull request `#36616`_ from cro/zypper_fix_test + + * b618a5c07d Remove debugging + + * 3870589462 Test for pkg.upgrade. Most robust on Suse but better than nothing elsewhere + + * 867638ff48 Test for pkg.upgrade. Most robust on Suse but better than nothing elsewhere + +* **PR** `#36621`_: (`terminalmage`_) Fix shadowed builtins + @ *2016-09-29 02:25:54 UTC* + + * ccd92d22d2 Merge pull request `#36621`_ from terminalmage/fix-shadowed-builtins + + * 62729eff8d Update tests to include fix for renamed function + + * 283aca8f2a Update test to reflect new function signature + + * 0f158b5edd Fix shadowed builtins + + * **PR** `saltstack/salt#36618`_: (`onorua`_) Fix memory leak for 0mq transport in case of TCP DDOS (refs: `#36636`_) + +* **PR** `#36636`_: (`rallytime`_) Back-port `#36618`_ to 2016.3 + @ *2016-09-29 02:23:09 UTC* + + * **PR** `#36618`_: (`onorua`_) Fix memory leak for 0mq transport in case of TCP DDOS (refs: `#36636`_) + + * 24f82b2809 Merge pull request `#36636`_ from rallytime/bp-36618 + + * 275845c3d2 Fix memory leak for 0mq transport + +* **ISSUE** `#27316`_: (`efficks`_) Extracted state with zip format failed on Windows (refs: `#27317`_) + +* **ISSUE** `#27207`_: (`PredatorVI`_) archive.extracted state not preserving file permissions (refs: `#33906`_) + +* **ISSUE** `#26569`_: (`ssgward`_) Add support for password-protected zip files in archive.extracted on Windows (refs: `#31116`_) + +* **ISSUE** `#23822`_: (`sidcarter`_) Zip file extracted permissions are incorrect (refs: `#25128`_) + + * **PR** `saltstack/salt#36539`_: (`jfindlay`_) Prefer archive.cmd_unzip (refs: #`saltstack/salt`#36648`_`_, `#36648`_) + +* **PR** `#36648`_: (`jfindlay`_) Integration tests for archive execution module (refs: `#36986`_) + @ *2016-09-29 02:16:54 UTC* + + * **PR** `#33906`_: (`lomeroe`_) Archive unzip permissions (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#31116`_: (`UtahDave`_) Add password support for zip files in archive module and state (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#27764`_: (`basepi`_) Merge forward from 2015.8 to develop (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#27317`_: (`efficks`_) State unzip should use unzip command instead of unzip_cmd. (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#25128`_: (`stanislavb`_) Use cmd_unzip to preserve permissions (refs: `#36539`_, #saltstack/salt`#36539`_) + + * 750ff8220c Merge pull request `#36648`_ from jfindlay/arch_test + + * cc4d958557 modules.archive: add integration tests + + * 99bf89447b modules.archive: add opts arg to g(un)zip + + * c1219e68c5 modules.archive.unzip: depend on zipfile module + + * 315b031de9 modules.archive: use less redundant message + + * **PR** `saltstack/salt#36389`_: (`cachedout`_) Pr 36386 (refs: `#36650`_) + +* **PR** `#36650`_: (`rallytime`_) Revert "Pr 36386" + @ *2016-09-29 02:11:15 UTC* + + * **PR** `#36386`_: (`xiaoanyunfei`_) fix salt-api's default opts were covered by salt-master `#35734`_ (refs: `#36389`_, `#36650`_, #saltstack/salt`#36389`_) + + * **PR** `#35734`_: (`xiaoanyunfei`_) fix salt-api's default opts were covered by salt-master (refs: `#36386`_) + + * 91aa464d5d Merge pull request `#36650`_ from saltstack/revert-36389-pr-36386 + + * 33ef5bffe6 Revert "Pr 36386" + +* **ISSUE** `#36304`_: (`Ch3LL`_) stack trace when transport is not a currently supported transport (refs: `#36646`_) + +* **PR** `#36646`_: (`rallytime`_) Provide an error message when invalid transport is set + @ *2016-09-28 22:52:11 UTC* + + * ab5c0e9e65 Merge pull request `#36646`_ from rallytime/fix-36304 + + * ae021d6dec Provide an error message when invalid transport is set + +* **PR** `#36635`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-28 21:10:25 UTC* + + * 6d9b28506c Merge pull request `#36635`_ from rallytime/merge-2016.3 + + * 787c1f557e Pylint fix + + * da574e5b03 Merge branch '2015.8' into '2016.3' + + * f0d561a229 Merge pull request `#36632`_ from isbm/isbm-thin-modules-config-15.8 + + * 975f8bb27d Add extra-mods options to the Salt-Thin via SSH CLI + + * a441b35588 Add documentation about Salt Thin configuration + + * 3bfb17ee62 Add a description of the thin/min parameters to the master config + + * 3d878f9da5 Get the thin Salt with configured extra modules on SSH + + * 2be9330be6 Add thin options to the master config. + + * 58577d342e Generate thin with configured extrta modules + +* **ISSUE** `#36553`_: (`nilliams`_) states.hg.latest claims to succeed despite errors (refs: `#36620`_) + +* **PR** `#36620`_: (`rallytime`_) Don't allow mercurial states to return True with errors + @ *2016-09-28 05:50:50 UTC* + + * 83da81cdfd Merge pull request `#36620`_ from rallytime/fix-36553 + + * a828bdd0b8 Update test mocks for cmd.run_all dicts + + * 3904dfc5a8 Don't allow mercurial states to return True with errors + +* **PR** `#36622`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-28 05:39:43 UTC* + + * 1c001d0ee1 Merge pull request `#36622`_ from rallytime/merge-2016.3 + + * 90c66ef756 Merge branch '2015.8' into '2016.3' + + * 9b9e167b47 Merge pull request `#36562`_ from kiorky/s2015.8 + + * 47c3d03035 Fix pkg.latest_version using localized output + + * 4ab52ae0f6 Merge pull request `#36607`_ from vutny/detect-service-fail + + * c4f899b3b3 `salt.states.service`: detect that service failed to start/stop + + * 5de036b56c Merge pull request `#36611`_ from multani/2015.8 + + * 79fdc12395 jinja: fix YAML terminator removal in Jinja's "yaml" filter + + * 6e36191fc4 Fix trust key 2015.8 (`#36540`_) + +* **PR** `#36520`_: (`twangboy`_) Fix cmd.script runas for Windows + @ *2016-09-28 04:07:00 UTC* + + * e7def534b1 Merge pull request `#36520`_ from twangboy/fix_cmd.script_runas + + * 377ced5c24 Remove directory in Windows with runas + + * 25d52efeac Fix mkdir + + * 18d41f7711 Add mkdir + + * 9d55bff914 Use cachedir for Windows + +* **ISSUE** `saltstack/salt#32368`_: (`vitaliyf`_) Low timeout values causes duplicate commands to execute (refs: `#36564`_) + +* **PR** `#36564`_: (`DmitryKuzmenko`_) Improve and fix `_check_cache_minions` + @ *2016-09-28 02:50:54 UTC* + + * 798bf3086b Merge pull request `#36564`_ from DSRCorporation/bugs/32368_grains_match_bug + + * be61f97db3 Minor: syntax error fixes. + + * 29660ed672 Improve and fix `_check_cache_minions` + +* **PR** `#36606`_: (`danlsgiga`_) Add support for ACL Tokens in consul_pillar with the option consul.token + @ *2016-09-28 02:46:03 UTC* + + * 133705d567 Merge pull request `#36606`_ from danlsgiga/consul_pillar_token + + * a5907c9c89 Add support for ACL Tokens in consul_pillar with the option consul.token + +* **PR** `#36613`_: (`slinn0`_) Remove file.check_managed_changes when not needed (backport of PR `#36589`_ to 2016.3) + @ *2016-09-28 02:35:56 UTC* + + * **PR** `#36589`_: (`slinn0`_) Do not generate pchanges in file.managed unless test=True (refs: `#36613`_) + + * b365f1e34d Merge pull request `#36613`_ from slinn0/2016.3_36588_fixes + + * d9da5cb2d4 Backport of PR `#36589`_ / Issue `#36588`_ to 2016.3 branch. + +* **PR** `#36609`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-27 18:34:22 UTC* + + * e23af98d97 Merge pull request `#36609`_ from rallytime/merge-2016.3 + + * f15d4a38bd Merge branch '2015.8' into '2016.3' + + * 57ec792f6b Merge pull request `#36550`_ from rickyninja/2015.8 + + * f9ef30aabe Add version_cmp for FreeBSD pkg. + +* **PR** `#36595`_: (`cachedout`_) Remove tests which no longer apply + @ *2016-09-27 07:38:15 UTC* + + * 25fa754d94 Merge pull request `#36595`_ from cachedout/issue_7754_fix + + * 3a83b0bd16 Remove tests which no longer apply + +* **ISSUE** `#36586`_: (`gehzumteufel`_) Documentation update (refs: `#36594`_) + +* **PR** `#36594`_: (`cachedout`_) Update boostrap docs to recent versions of Ubuntu + @ *2016-09-27 06:18:49 UTC* + + * aed98f47de Merge pull request `#36594`_ from cachedout/issue_36586 + + * 1e6a60ab01 Update boostrap docs to recent versions of Ubuntu + +* **PR** `#36585`_: (`twangboy`_) Add pyOpenSSL to req file for Windows + @ *2016-09-27 05:49:42 UTC* + + * c79f525863 Merge pull request `#36585`_ from twangboy/add_pyopenssl + + * 5fc63a1054 Add pyOpenSSL to req file for Windows + +* **ISSUE** `#36568`_: (`lkx007`_) cp.push remove_source problem (refs: `#36572`_) + + * **PR** `#36572`_: (`cachedout`_) Fix salt.utils.rm_rf to delete files too + +* **ISSUE** `#36491`_: (`cro`_) pkg.upgrade does not upgrade on Leap 42.1 or Tumbleweed (refs: `#36495`_) + +* **PR** `#36495`_: (`cro`_) Fix pkg.upgrade for zypper + @ *2016-09-26 10:02:39 UTC* + + * d0dd92b037 Merge pull request `#36495`_ from cro/zypper_fix + + * 6c5807c4be Fix pkg.upgrade for zypper + +* **ISSUE** `#27316`_: (`efficks`_) Extracted state with zip format failed on Windows (refs: `#27317`_) + +* **ISSUE** `#27207`_: (`PredatorVI`_) archive.extracted state not preserving file permissions (refs: `#33906`_) + +* **ISSUE** `#26569`_: (`ssgward`_) Add support for password-protected zip files in archive.extracted on Windows (refs: `#31116`_) + +* **ISSUE** `#23822`_: (`sidcarter`_) Zip file extracted permissions are incorrect (refs: `#25128`_) + +* **PR** `#36539`_: (`jfindlay`_) Prefer archive.cmd_unzip + @ *2016-09-26 10:02:11 UTC* + + * **PR** `#33906`_: (`lomeroe`_) Archive unzip permissions (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#31116`_: (`UtahDave`_) Add password support for zip files in archive module and state (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#27764`_: (`basepi`_) Merge forward from 2015.8 to develop (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#27317`_: (`efficks`_) State unzip should use unzip command instead of unzip_cmd. (refs: `#36539`_, #saltstack/salt`#36539`_) + + * **PR** `#25128`_: (`stanislavb`_) Use cmd_unzip to preserve permissions (refs: `#36539`_, #saltstack/salt`#36539`_) + + * 4bca246a27 Merge pull request `#36539`_ from jfindlay/arch_perms + + * d64ae48783 states.archive: use archive.cmd_unzip when possible + + * 928a7891b4 modules.archive.unzip: log a warning about perms + +* **ISSUE** `#36514`_: (`nilliams`_) salt.stages.hg errors when -identity option is used (refs: `#36546`_) + +* **PR** `#36546`_: (`rallytime`_) Mercurial Module: Pass the identity_path portion as own arg + @ *2016-09-26 09:44:30 UTC* + + * ab50cde391 Merge pull request `#36546`_ from rallytime/fix-36514 + + * 9afe76759e Mercurial Module: Pass the identity_path portion as own arg + +* **ISSUE** `#35480`_: (`jelenak`_) 200 processes of salt-master (2016.3.2) (refs: `#36184`_, `#36555`_, `#37254`_) + +* **PR** `#36555`_: (`DmitryKuzmenko`_) Bugs/35480 master shutdown + @ *2016-09-26 09:25:43 UTC* + + * aea55fce61 Merge pull request `#36555`_ from DSRCorporation/bugs/35480_master_shutdown + + * 6ad2998715 Wait for kill in ProcessManager should be greater in main process than in subprocess. + + * c9c45a5d79 Don't set the `daemon` flag for LoggingQueue process. + +* **PR** `#36542`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-23 22:47:26 UTC* + + * a1e0afe1c7 Merge pull request `#36542`_ from rallytime/merge-2016.3 + + * 861a001749 Merge branch '2015.8' into '2016.3' + + * 07c9d040c0 Fixup the rabbitmq_user state test failure (`#36541`_) + +* **ISSUE** `#29421`_: (`scbunn`_) pillar data leaks through environments (refs: `#36435`_, `saltstack/salt#36435`_) + + * **PR** `#36532`_: (`rallytime`_) Back-port `#36435`_ to 2016.3 + + * **PR** `#36435`_: (`yhekma`_) Add "none" as a pillar merging strategy (refs: `#36532`_) + + * **PR** `#36535`_: (`rallytime`_) Be explicit about the salt.utils.templates import + + * **PR** `#36537`_: (`rallytime`_) Wrap the entire GrainsAppendTestCase class with destructiveTest + +* **PR** `#36529`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-23 16:42:42 UTC* + + * 55cf4d6a04 Merge pull request `#36529`_ from rallytime/merge-2016.3 + + * 52cf40db8c Merge branch '2015.8' into '2016.3' + + * 1c3758544c Merge pull request `#36441`_ from twangboy/update_setup + + * fc4a03a75d Check for existing library on Windows + +* **PR** `#36483`_: (`dmurphy18`_) Isolate sun IPv6 fix to Sun OS only + @ *2016-09-23 09:24:54 UTC* + + * 03491634ff Merge pull request `#36483`_ from dmurphy18/aix_fix_ipv6 + + * b68f982c6a Updated check as per code review + + * cbcdb472fe Isolate SUN IPv6 fix to Sun Os only + +* **ISSUE** `#36279`_: (`alertedsnake`_) state.postgres_privileges should allow grants to ALL tables/sequences. (refs: `#36280`_) + +* **PR** `#36280`_: (`alertedsnake`_) Feature/2016.3 better postgresql grants + @ *2016-09-23 07:55:32 UTC* + + * **PR** `#36249`_: (`alertedsnake`_) Quote postgres privilege target names (refs: `#36280`_) + + * 654fa8d770 Merge pull request `#36280`_ from jwplayer/feature/2016.3-better-postgresql-grants + + * e7a597da00 Bugfix: don't concatenate when not needed + + * ba60b7972a Additional documentation. + + * 8b877f014d 'All' grants for PostgreSQL. + +* **PR** `#36508`_: (`twangboy`_) Fix chocolatey + @ *2016-09-23 07:36:03 UTC* + + * 8104d5c92a Merge pull request `#36508`_ from twangboy/fix_chocolatey + + * a7c858d9ab Fix retcodes + + * feadd827a7 Add additional functionality to upgrade + + * fb5eb4dc03 Fix retcodes, add upgrade function + +* **PR** `#36519`_: (`terminalmage`_) Rewrite minionfs walkthrough + @ *2016-09-23 05:19:59 UTC* + + * 364f74dfc9 Merge pull request `#36519`_ from terminalmage/docs + + * 2df51ce3e9 Rewrite minionfs walkthrough + + * cc9d41fb0e Change items in minionfs blacklist/whitelist example + +* **PR** `#36505`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-22 17:37:33 UTC* + + * 6f54e16cdf Merge pull request `#36505`_ from rallytime/merge-2016.3 + + * 5bd4d6430b Merge branch '2015.8' into '2016.3' + + * bf6195b9a6 `postgres_extension` state: small corrections in docstrings (`#36500`_) + + * b021ea5d40 Merge pull request `#36464`_ from vutny/postgres-tablespace-options + + * 580aed87b9 Fix `options` parameter processing in `postgres_tablespace.present` + +* **ISSUE** `#35813`_: (`UtahCampusD`_) Empty dictionary returned from grains.items command within local client (refs: `#36496`_) + +* **PR** `#36496`_: (`cachedout`_) Add repr to namespacedict + @ *2016-09-22 04:34:11 UTC* + + * 464c4305f9 Merge pull request `#36496`_ from cachedout/namespace_repr + + * 333842c319 Add repr to namespacedict + +* **PR** `#36474`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-22 04:16:58 UTC* + + * a0f838af36 Merge pull request `#36474`_ from rallytime/merge-2016.3 + + * 8805b57a1e Merge branch '2015.8' into '2016.3' + + * 41d3c09857 Merge pull request `#35433`_ from terminalmage/issue34790 + + * 71b51f49ba Add integration tests for PR `#35433`_ + + * 82515eccde Add an additional hint for cases where rev == 'HEAD' + + * 4b7e2f9475 git.latest: Add a hint for possible rev changes resulting in non-fast-forward failures + + * 87263b9387 Merge pull request `#36445`_ from notpeter/salt_cloud_iam_role + + * 469d1a61fe Remove (required). + + * 98449e66f5 Better docs for use-instance-role-credentials. + +* **ISSUE** `#36475`_: (`amendlik`_) GitFS online documentation is missing a section present in the code (refs: `#36478`_) + +* **PR** `#36478`_: (`rallytime`_) Add the "bash" option to the "code-block"directive. + @ *2016-09-22 04:15:14 UTC* + + * ec4f4f49ca Merge pull request `#36478`_ from rallytime/fix-36475 + + * 7be7d5832f Add the "bash" option to the "code-block"directive. + +* **PR** `#36484`_: (`terminalmage`_) Fix for temp files being left over by salt-cloud execution + @ *2016-09-22 04:11:58 UTC* + + * **PR** `#36482`_: (`clarkperkins`_) Have salt-cloud clean up tmp files (refs: `#36484`_) + + * 4c6e7bf873 Merge pull request `#36484`_ from terminalmage/salt-cloud-tmp-files + + * 0bf520e089 Ensure temp file is actually removed + + * 072fd823f7 Use os.write() on file descriptor instead of opening a filehandle + + * f61e8d6366 Fix for temp files being left over by salt-cloud execution + +* **PR** `#36486`_: (`terminalmage`_) Improve the rebase docs in contributing guidelines + @ *2016-09-21 19:21:10 UTC* + + * 9005a87635 Merge pull request `#36486`_ from terminalmage/rebase-docs + + * 4839c325ae Improve the rebase docs in contributing guidelines + +* **PR** `#36455`_: (`twangboy`_) Update docs for Windows + @ *2016-09-21 14:28:28 UTC* + + * bc5ac9adae Merge pull request `#36455`_ from twangboy/windows_installation_docs + + * ec67a9bb2f Add cachedout's recommendations + + * 26a40dadbe Update docs for Windows + +* **PR** `#36459`_: (`cachedout`_) Pr 36426 + @ *2016-09-21 06:34:29 UTC* + + * 3d23371ca2 Merge pull request `#36459`_ from cachedout/pr-36426 + + * bb5c01ae9d Lint + + * 85d2068326 Refactor for testing and adding related engine tests + + * 266adae2fd Make sqs_events engine support owner_acct_id + +* **PR** `#36442`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-20 23:16:30 UTC* + + * c8e15dcdca Merge pull request `#36442`_ from rallytime/merge-2016.3 + + * 2740fb7bfd Merge branch '2015.8' into '2016.3' + + * 266dd7c00a Merge pull request `#36379`_ from twangboy/windows_grains + + * 6138390da7 Fix typo + + * cf045e5c03 Remove comment + + * ddb6e11bcb Remove refactoring + + * 45dc920db0 Clarify comments + + * 211fd3b47e Improve version checking + + * 88be5a3761 Check for Python 2.7.12 and 3.5.2 + + * 6f80f0062a Add osservicepack grain + + * 04c4ec4f81 Fix lint + + * 5789ea99cf Force string + + * 6c5bd7664b Fix join syntax + + * ac8610d523 Add ServicePack to osrelease + + * 92034936c1 Fix windows grains for os + + * 5625827ee2 Merge pull request `#36378`_ from terminalmage/issue36321 + + * 7b1f621206 Fix git.latest test with local changes to reflect changes in state + + * 0364fedb76 Use a single conditional + + * 0dd1e7b53e git.latest Treat an up-to-date checkout with local changes as up-to-date + +* **PR** `#36310`_: (`thatch45`_) Fix bug where the client will destroy the loop + @ *2016-09-20 13:14:23 UTC* + + * d0a495f08b Merge pull request `#36310`_ from thatch45/keep_loop + + * a3c0d4a0ab Add docstring + + * 083f1d998a Fix bug where the client will destroy the loop + +* **PR** `#36394`_: (`oba11`_) fix accound_id in boto_iam and get_region in boto_sns + @ *2016-09-20 13:11:28 UTC* + + * 6e16ca46ed Merge pull request `#36394`_ from oba11/module-fixes + + * 966685020c fix accound_id in boto_iam and get_region in boto_sns + +* **PR** `#36424`_: (`jfindlay`_) skip some mac_timezone tests + @ *2016-09-20 06:43:47 UTC* + + * **PR** `#36194`_: (`jfindlay`_) skip some mac_timezone tests (refs: `#36424`_) + + * ae1fc430c2 Merge pull request `#36424`_ from jfindlay/bp-36194 + + * a20a2148bf skip some mac_timezone tests + +* **ISSUE** `#36388`_: (`qurczak`_) pkg.list_upgrades return debug information rather than packages list (refs: `#36428`_) + +* **PR** `#36428`_: (`terminalmage`_) A couple fixes for Antergos Linux + @ *2016-09-20 06:42:16 UTC* + + * 6319e3419a Merge pull request `#36428`_ from terminalmage/issue36388 + + * b0069ad0d8 pacman.py: use os_family grain to assign as pkg virtual module + + * 5d632dbfca Properly set os grain for Antergos + + * 0ae8dca2d0 pkg.list_upgrades: Ignore "downloading" lines in pacman output + +* **ISSUE** `#36373`_: (`frioux`_) Salt-API does not validate input properly (refs: `#36425`_) + +* **PR** `#36425`_: (`whiteinge`_) Check for dictionary explicitly since we're accessing it as one + @ *2016-09-20 06:41:40 UTC* + + * 155bd14b5e Merge pull request `#36425`_ from whiteinge/salt-api-dict-payload + + * 0b63ed258f Check for dictionary explicitly since we're accessing it as one + +* **ISSUE** `saltstack/salt#18341`_: (`falzm`_) Dry-running state.highstate only returns the first change (refs: `#36199`_) + +* **PR** `#36199`_: (`thatch45`_) skip all failhards if test=True + @ *2016-09-20 05:38:32 UTC* + + * 420be364ee Merge pull request `#36199`_ from thatch45/fix_18341 + + * e13d61f06a skip all failhards if test=True + +* **PR** `#36418`_: (`rallytime`_) Back-port `#36246`_ to 2016.3 (refs: `#37120`_) + @ *2016-09-19 21:56:52 UTC* + + * **PR** `#36246`_: (`twangboy`_) Fix test_issue_6833_pip_upgrade_pip test on OS X (refs: `#36418`_, `#37120`_) + + * b2365f553e Merge pull request `#36418`_ from rallytime/bp-36246 + + * aab02f28b4 Ensure we have a test venv created using virtualenv < 13.0 + +* **PR** `#36419`_: (`rallytime`_) Back-port `#36329`_ to 2016.3 + @ *2016-09-19 21:56:33 UTC* + + * **PR** `#36329`_: (`oz123`_) Fix a minor typo in docs (refs: `#36419`_) + + * bc703e2062 Merge pull request `#36419`_ from rallytime/bp-36329 + + * ffdebf7a25 Fix a minor typo in docs + +* **PR** `#36420`_: (`rallytime`_) Back-port `#36365`_ to 2016.3 + @ *2016-09-19 21:56:17 UTC* + + * **PR** `#36365`_: (`Kimamisa`_) Fix a minor typo in docs (refs: `#36420`_) + + * fbfa0657fc Merge pull request `#36420`_ from rallytime/bp-36365 + + * 864e513fca Fix a minor typo in docs + +* **PR** `#36413`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-19 18:59:31 UTC* + + * 3dd2590e28 Merge pull request `#36413`_ from rallytime/merge-2016.3 + + * c64e489f6f Merge branch '2015.8' into '2016.3' + + * 9bc4eeb71e Fix typo (`#36409`_) + + * ac5c812e4b Fix OS identification for CloudLinux (`#36408`_) + + * bb4d69f58a git.latest: fail gracefully for misconfigured remote repo (`#36391`_) + + * ad7045ad3b Merge pull request `#36315`_ from puneetk/patch-6 + + * 3ac308ac76 Update aptpkg.py + + * 892cc4cd48 Update aptpkg.py + + * cbe98d97a3 Fix pylint whitespace errors + + * e5371ac720 No force_yes parameter to pkg.upgrade `#21248`_ + + * 2aa6df859a Merge pull request `#36381`_ from twangboy/fix_win_service + + * 04edea5c59 Add '/y' switch to the net stop and start commands + + * 373c5db180 Merge pull request `#36384`_ from twangboy/update_setup_req + + * a817aef1c2 Add windows requirements file + +* **ISSUE** `#36371`_: (`nasenbaer13`_) _extern_path in fileclient is broken (refs: `#36305`_) + +* **PR** `#36305`_: (`gtmanfred`_) cache query args with url as well + @ *2016-09-19 18:30:51 UTC* + + * a8a3a9f021 Merge pull request `#36305`_ from gtmanfred/2016.3 + + * 70e7f6d58b cache query args with url as well + +* **PR** `#36389`_: (`cachedout`_) Pr 36386 + @ *2016-09-17 11:54:37 UTC* + + * **PR** `#36386`_: (`xiaoanyunfei`_) fix salt-api's default opts were covered by salt-master `#35734`_ (refs: `#36389`_, `#36650`_, #saltstack/salt`#36389`_) + + * **PR** `#35734`_: (`xiaoanyunfei`_) fix salt-api's default opts were covered by salt-master (refs: `#36386`_) + + * 602bd2d1ef Merge pull request `#36389`_ from cachedout/pr-36386 + + * f5d63d93cc Lint + + * 93269cfb65 fix salt-api log and pid + + * **PR** `#36352`_: (`pass-by-value`_) Update versionadded and release notes + +* **PR** `#36369`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-16 16:31:14 UTC* + + * 495d365e54 Merge pull request `#36369`_ from rallytime/merge-2016.3 + + * 37aea4188a Merge branch '2015.8' into '2016.3' + + * 40b2e3d189 Merge pull request `#36353`_ from rallytime/refresh-db-cleanup + + * 275319193a Check for Ign/Hit membership instead of == in aptpkg.refresh_db + + * df9d9b3624 Merge pull request `#36355`_ from rallytime/bp-36288 + + * 70ffdafbf0 Schema test requires jsonschema 2.5.0 or above + + * 3f308d7694 postgres_extension: report changes when an extension was installed (`#36335`_) + + * d2a583bc22 Merge pull request `#36337`_ from cachedout/conduct + + * 2fb61b9c9f SaltStack's code of conduct + + * ef128ad0b0 Return None when find_file identifies the path as a directory (`#36342`_) + + * **PR** `#36249`_: (`alertedsnake`_) Quote postgres privilege target names (refs: `#36280`_) + + * **PR** `#36330`_: (`silenius`_) set __virtualname__ to 'service' + +* **ISSUE** `#36338`_: (`jbonachera`_) infoblox.present state does not use "infoblox_server", "infoblox_user" or "infoblox_password" arguments (refs: `#36339`_) + + * **PR** `#36339`_: (`jbonachera`_) Use infoblox_* values if present in arguments + + * **PR** `#36345`_: (`gtmanfred`_) remove help message from glance module + + * **PR** `#36346`_: (`rallytime`_) Add resize2fs unit test from blockdev_test to disk_test + + * **PR** `#36344`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 (refs: `#36346`_) + +* **ISSUE** `#36292`_: (`lorengordon`_) pkg.check_db is not available in salt 2016.3? (refs: `#36350`_) + +* **PR** `#36350`_: (`terminalmage`_) Add note about yumpkg.check_db removal in Boron + @ *2016-09-15 20:32:32 UTC* + + * f09c3e499f Merge pull request `#36350`_ from terminalmage/docs + + * b815c98577 Add note about yumpkg.check_db removal in Boron + +* **PR** `#36344`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 (refs: `#36346`_) + @ *2016-09-15 17:38:57 UTC* + + * a33da842c0 Merge pull request `#36344`_ from rallytime/merge-2016.3 + + * d1f560147d Merge branch '2015.8' into '2016.3' + + * dc518c5340 Skip test_resize2fs if resize2fs does not exists (`#36325`_) + +* **ISSUE** `#36308`_: (`ahammond`_) salt-cloud defaults to IPv6 rather than IPv6 (refs: `#36312`_) + + * **PR** `#36312`_: (`ahammond`_) merge error overwrites correct ssh_host with stale data in ip_address + +* **ISSUE** `#35819`_: (`cable2999`_) pkg.group_installed doesn't handle missing package group (refs: #`saltstack/salt`#35907`_`_, `#35907`_) + + * **PR** `saltstack/salt#35907`_: (`rallytime`_) Catch CommandExecutionError when the group in group_installed doesn't exist (refs: `#36299`_) + +* **PR** `#36299`_: (`rallytime`_) Gate the pkg.group_installed state test: not all pkg modules have group_install + @ *2016-09-14 19:04:26 UTC* + + * 6a3019bbf1 Merge pull request `#36299`_ from rallytime/gate-pkg-group-installed-test + + * 9e15df9b23 Switch the order of the decorator + + * ee997be6d8 Fix pkg group test by passing a list instead of str + + * c7d8867096 Gate the pkg.group_installed state test: not all pkg modules have group_install + +* **ISSUE** `#33686`_: (`BretFisher`_) blockreplace marker_end isn't applied with newline (refs: #`saltstack/salt`#36273`_`_, `#36273`_) + + * **PR** `saltstack/salt#36273`_: (`techhat`_) Add append_newline flag for `#33686`_ (refs: `#36295`_) + + * **PR** `#36295`_: (`rallytime`_) Back-port `#36273`_ to 2016.3 + + * **PR** `#36273`_: (`techhat`_) Add append_newline flag for `#33686`_ (refs: `#36295`_) + + * **PR** `#36296`_: (`rallytime`_) Back-port `#36124`_ to 2016.3 + + * **PR** `#36124`_: (`twangboy`_) Skip test on all OS's but linux (refs: `#36296`_) + +* **PR** `#36297`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-14 16:07:30 UTC* + + * a8a72c985f Merge pull request `#36297`_ from rallytime/merge-2016.3 + + * e2f1cf6025 Merge branch '2015.8' into '2016.3' + + * b9b8e45362 Merge pull request `#36272`_ from terminalmage/improved-gitfs-logging + + * 223a20e987 Improved gitfs/git_pillar error logging + + * abb6aacb4b Merge pull request `#36277`_ from terminalmage/gitfs-check-key-path + + * 4fee18c820 salt.utils.gitfs: Check for existence of ssh keys + + * ed2d2bd331 Integration tests fixes for 2015.8 (`#36262`_) + + * 297a12c387 Fix misspelling of "occurred" in log messages/exceptions (`#36270`_) + + * **PR** `#36178`_: (`cachedout`_) Filter out pub kwargs from cloud runner + +* **PR** `#36238`_: (`pass-by-value`_) Add ability to clone from a snapshot to salt-cloud vmware driver + @ *2016-09-14 05:31:51 UTC* + + * fc7a1d536f Merge pull request `#36238`_ from pass-by-value/vmware_clone_from_snapshot + + * dd670bd18f Fix lint error and add try except + + * d96981639b Add ability to clone from a snapshot to salt-cloud vmware driver + + * **PR** `#36263`_: (`meaksh`_) Integration tests fixes for 2016.3 + +* **PR** `#36264`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-13 18:25:41 UTC* + + * d634fd8628 Merge pull request `#36264`_ from rallytime/merge-2016.3 + + * f603757b55 Merge branch '2015.8' into '2016.3' + + * 931486ba35 Merge pull request `#36096`_ from twangboy/update_setup + + * dc1988add5 fix download when requests not present + + * b4479bff5f Add additional required dll's + + * b0dd6ff5c8 Merge pull request `#36244`_ from terminalmage/gen-back-bug + + * 363b21fd9b salt.fileserver.Fileserver: Don't try to split a list in _gen_back + + * dcc9380996 Merge pull request `#36245`_ from terminalmage/roots-bug + + * 75d4997b70 roots backend: Don't include '.' or '..' in empty_dirs + + * fdf40907b7 Some unit tests fixes (`#36227`_) + +* **ISSUE** `#33525`_: (`anlutro`_) file.serialize no longer indents/pretty-prints in 2016.3 (refs: `#35688`_) + +* **PR** `#35688`_: (`cachedout`_) Splat serializer default configs into the serializer kwargs + @ *2016-09-13 09:21:46 UTC* + + * de06116075 Merge pull request `#35688`_ from cachedout/issue_33525 + + * 4910e8191c Provide fallback for serializers without opts + + * a238666aba Add serializer test + + * 345fd2a9e5 Splat serializer default configs into the serializer kwargs + +* **ISSUE** `#36021`_: (`mirceaulinic`_) Scheduled runners not executed (for proxy minions, at least) (refs: `#36025`_) + +* **PR** `#36025`_: (`mirceaulinic`_) Potential fix for `#36021`_ + @ *2016-09-13 07:46:41 UTC* + + * d9d477ed45 Merge pull request `#36025`_ from cloudflare/CF-FIX-36021 + + * 03007be6b1 Potential fix for `#36021`_ + + * **PR** `#36183`_: (`opdude`_) Fix timezones states on OS X + +* **PR** `#36235`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-12 17:40:42 UTC* + + * fcbebb40c3 Merge pull request `#36235`_ from rallytime/merge-2016.3 + + * 99dcf84b62 Merge branch '2015.8' into '2016.3' + + * 4e9490eebe Merge pull request `#36214`_ from vutny/postgres-extension-doc + + * 5fe548f043 `postgres_extension` state module: fix docstrings + + * 5b7b96c0b7 Merge pull request `#36205`_ from vutny/postgres-tablespace-doc + + * 78296b90d8 Add missing `maintenance_db` kwarg to `postgres_tablespace.present` docstring + + * 6a5f7cb346 Ignore states that do not have a numeric jid, i.e. 'req' (`#36185`_) + +* **ISSUE** `#35423`_: (`Ch3LL`_) Stacktrace when running state.sls against an sls does not exist (refs: `#36137`_) + +* **ISSUE** `#33915`_: (`mattglv`_) Orchestration runner output on Success vs Failures in 2016.3.0 (refs: `#36137`_) + +* **ISSUE** `#25664`_: (`sdm24`_) 2015.5.2 MySQL Returner: salt-run jobs.lookup_jid doesn't return full result for highstate output (refs: `#35559`_) + +* **PR** `#36137`_: (`cachedout`_) Allow highstate outputter to show all results + @ *2016-09-12 16:37:49 UTC* + + * **PR** `#35559`_: (`Jlin317`_) Fix highstate outputter when it's given multiple results (refs: `#36137`_) + + * 7b96197c5e Merge pull request `#36137`_ from cachedout/issue_35423 + + * 1e8431f2b8 Allow highstate outputter to show all results + +* **ISSUE** `#35340`_: (`dqminh`_) Custom modules are only resynced to minions at highstate (refs: `#36217`_) + + * **PR** `#36217`_: (`cachedout`_) Docs clarification for module sync and state.apply + +* **ISSUE** `#35480`_: (`jelenak`_) 200 processes of salt-master (2016.3.2) (refs: `#36184`_, `#36555`_, `#37254`_) + +* **PR** `#36184`_: (`DmitryKuzmenko`_) Disable signal handling while handling signal + @ *2016-09-11 22:59:08 UTC* + + * 6ebe655e17 Merge pull request `#36184`_ from DSRCorporation/bugs/35480_master_shutdown + + * 229504efef Removed unused import. + + * ca8eb7e076 Don't run the same signal handler twice. Catch os.kill errors. + +* **PR** `#36203`_: (`xiaoanyunfei`_) fix owner of MultiprocessingLoggingQueue (refs: `#37119`_) + @ *2016-09-11 09:15:15 UTC* + + * f11f093f8c Merge pull request `#36203`_ from xiaoanyunfei/logowner + + * 74dc90c7bb cancle pr last + + * 90e4a25dd0 Merge branch 'logowner' of https://github.com/xiaoanyunfei/salt into logowner + + * bd61b88fc8 fix log owner + + * 58160ed6c0 Merge branch '2016.3' of github.com:saltstack/salt into 2016.3 + + * f2de71782b move back + + * b8214824fd add simplify code + + * aec9385c6b Merge branch '2016.3' of github.com:saltstack/salt into 2016.3 + + * 1074b3355d Merge branch '2016.3' of github.com:saltstack/salt into 2016.3 + + * ea0d74cd27 fix salt-api opts + + * ffd87b2f2f fix logqueue owner + + * **PR** `#36193`_: (`thatch45`_) Fix stack trace in salt-ssh gitfs + +* **PR** `#36188`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-09 18:59:20 UTC* + + * f035121291 Merge pull request `#36188`_ from rallytime/merge-2016.3 + + * 521a7b2470 Merge branch '2015.8' into '2016.3' + + * d4628f3c6b Allow additional kwargs in states.dockerng.image_present (`#36156`_) + + * 24b0387b92 Back-port `#36070`_ to 2015.8 (`#36169`_) + + * 116d7ac3e5 If windows pkg db hasn't been created yet, refresh the db instead of stacktracing (`#36008`_) + +* **ISSUE** `#35819`_: (`cable2999`_) pkg.group_installed doesn't handle missing package group (refs: #`saltstack/salt`#35907`_`_, `#35907`_) + +* **PR** `#35907`_: (`rallytime`_) Catch CommandExecutionError when the group in group_installed doesn't exist + @ *2016-09-09 10:14:16 UTC* + + * 1d5f97d36b Merge pull request `#35907`_ from rallytime/fix-35819 + + * d7380d83be requires_system_grains decorator needs a grains=None kwarg + + * b20f6b9384 Catch CommandExecutionError when group_installed doesn't exist + +* **ISSUE** `saltstack/salt#35972`_: (`tjyang`_) DeprecationWarning: The "osmajorrelease" will be a type of an integer. (refs: `#36068`_) + + * **PR** `saltstack/salt#35637`_: (`cachedout`_) Add Nitrogen release notes (refs: `#36068`_) + +* **PR** `#36068`_: (`rallytime`_) Remove grains type deprecation warning from 2016.3 + @ *2016-09-09 10:00:50 UTC* + + * 40127b6bf3 Merge pull request `#36068`_ from rallytime/fix-35972 + + * 2b7679c9f6 Remove grains type deprecation warning from 2016.3 + +* **ISSUE** `#36094`_: (`UtahDave`_) Windows stacktraces on msgpack on Carbon (refs: `#36152`_) + +* **PR** `#36152`_: (`cachedout`_) Remove unnecessary unpack + @ *2016-09-09 09:13:47 UTC* + + * 24bd03734d Merge pull request `#36152`_ from cachedout/issue_36094 + + * 95eb95a0f8 Remove unnecessary unpack + +* **PR** `#36158`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-08 21:53:50 UTC* + + * dc3a68ed8c Merge pull request `#36158`_ from rallytime/merge-2016.3 + + * 7f955bda0a Merge branch '2015.8' into '2016.3' + + * 6242702288 Fix issue with cp.push (`#36136`_) + + * 0e13118f6e Document `owner` kwarg for `postgres_schema.present` state function (`#36147`_) + + * 4cc8ea9577 Merge pull request `#36146`_ from meaksh/tests-fixes-for-2015.8 + + * 9f9aa4779c rename darwin_sysctl.py to mac_sysctl.py + + * 2cf6f36d89 modules.darwin_sysctl: __virtual__ return err msg. + + * f74ca15f50 Remove test for file dir behavior + + * c65aefee20 Fix tests that assert CommandExecutionError (`#32485`_) + + * f8c0b439b8 Fixed more lint + + * 63ff731009 Fixed tests + + * 04b1a4a9ca Fixed use of assert_has_calls in tests. + + * 46e4bb58e5 Fixed LoadAuthTestCase + + * 4e9733ad6d Rename dockerio.py unit tests to dockerio_test.py + + * ec0cc943e0 Make sure spm tests are picked up by runtests. + + * 2605f34849 Fix missing first data in stream when subscribing stream using a function 'read_async'. + + * 305bab8be0 Fixed _interfaces_ifconfig output for SunOS test + + * b5ca02c867 Fix tests that assert CommandExecutionError (`#32485`_) + + * 1fb6340fef Fix tests (`#35693`_) + + * 5977f1f54c Skip utils_test if timelib is not installed (`#32699`_) + + * d1b9a4061e Fixing skipped boto tests to prevent errors if boto3 does not exists. + + * c4ddfe3887 Merge pull request `#35954`_ from morganwillcock/upgrade-on-batteries + + * 108f9470f2 win_pkg: report failure for failed launch of Scheduled Task + + * e0978220f7 win_pkg: allow minion upgrade when using batteries + + * 94b7659304 Merge pull request `#36129`_ from terminalmage/pygit2-ssl_verify + + * 640f0c17c6 pygit2: Prevent traceback on initial gitfs setup + + * 7cdbc546f1 Back-port `#36062`_ to 2015.8 (`#36118`_) + + * **PR** `#36170`_: (`rallytime`_) Back-port `#36154`_ to 2016.3 + + * **PR** `#36154`_: (`DavidWittman`_) Remove unclosed backticks in walkthrough doc (refs: `#36170`_) + +* **ISSUE** `#36055`_: (`gladiatr72`_) 2016.3.3 -- missing salt-cloud events on the master event bus (refs: `#36161`_) + +* **PR** `#36161`_: (`jacobhammons`_) Adds `#36055`_ to release notes + @ *2016-09-08 17:11:36 UTC* + + * 4ccf8a841f Merge pull request `#36161`_ from jacobhammons/relnotes + + * ecb0979be7 Adds `#36055`_ to release notes + +* **PR** `#36139`_: (`meaksh`_) Fixing unit tests for 2016.3 + @ *2016-09-08 13:20:21 UTC* + + * 1f909038f0 Merge pull request `#36139`_ from meaksh/tests-fixes-for-2016.3 + + * 52a7ed605e Fixed _interfaces_ifconfig output for SunOS test + + * 158bcbff65 Fix tests that assert CommandExecutionError (`#32485`_) + + * 8b480167e1 Fix tests (`#35693`_) + + * 29814f9d43 Skip utils_test if timelib is not installed (`#32699`_) + + * d1d806f893 Fix PortageConfigTestCase in case of portage is not present + + * 1c260e4bd0 Fix tests to prevent errors when libcloud is not present + + * 71ebf2c8cd Fixing skipped boto tests to prevent errors if boto3 does not exists. + +* **PR** `#36143`_: (`multani`_) doc: fix doc formatting for salt.states.mount + @ *2016-09-08 13:11:03 UTC* + + * 3eb3df55ad Merge pull request `#36143`_ from multani/fix-doc-state-mount + + * 035a212a9b doc: fix doc formatting for salt.states.mount + +* **ISSUE** `saltstack/salt#18419`_: (`jasonrm`_) salt-cloud fails to run as non-root user (refs: `#35483`_) + +* **ISSUE** `#36057`_: (`Inveracity`_) Regression in opennebula cloud provider (refs: `#36070`_) + +* **ISSUE** `#34806`_: (`jerrykan`_) salt-cloud ignores sock_dir when firing event (refs: `#35483`_) + +* **PR** `#36070`_: (`rallytime`_) Use __utils__ instead of salt.utils.cloud in opennebula driver (refs: `#36169`_) + @ *2016-09-08 01:18:45 UTC* + + * **PR** `#35483`_: (`gtmanfred`_) use __utils__ in salt.cloud (refs: `#35855`_, `#37057`_, `#36070`_) + + * 70da628018 Merge pull request `#36070`_ from rallytime/fix-36057 + + * de4f77cb68 Fixup failing test: need to mock __utils__ instead of salt.utils.cloud call + + * 25e3f2b4b8 Use __utils__ instead of salt.utils.cloud in opennebula driver + +* **PR** `#36089`_: (`terminalmage`_) Support running git states / remote exec funcs as a different user in Windows + @ *2016-09-08 01:17:23 UTC* + + * b7556a2aeb Merge pull request `#36089`_ from terminalmage/issue35565 + + * 796156c5f5 Add attribution + + * 2e56527ead Move command logging to before win_runas + + * 91eafddda6 Pass the "password" param to git module functions + + * 7871065d32 Use "user" instead of "runas" in _git_run() helper + + * 5943b4662c Add "password" param to funcs which support the user parameter + + * 5c7b9f0341 Make "password" an explicit argument, not a kwarg + +* **PR** `#35923`_: (`kstreee`_) Fixes a bug that Ctrl-c not working on Salt CLI. + @ *2016-09-07 11:47:50 UTC* + + * 45ba2e806b Merge pull request `#35923`_ from kstreee/fix-cli-stalling + + * 6569267afc Fixes a bug that Ctrl-c not working on Salt CLI. + +* **ISSUE** `#18341`_: (`falzm`_) Dry-running state.highstate only returns the first change (refs: `#36078`_) + +* **PR** `#36078`_: (`thatch45`_) Failhard test=True fix + @ *2016-09-07 05:10:35 UTC* + + * 48dc5ad4ee Merge pull request `#36078`_ from thatch45/failhard_test + + * 9b36904149 Fix failhard causing test=True to failhard too soon + +* **ISSUE** `#34515`_: (`vernondcole`_) Please actually implement skip_verify for archive.extracted (refs: `#34529`_) + +* **PR** `#34529`_: (`Ch3LL`_) Add skip_verify for archive.extracted + @ *2016-09-06 21:05:31 UTC* + + * 40081176af Merge pull request `#34529`_ from Ch3LL/add_skip_verify_archive + + * 38203e3d2c add tornado web app to serve up static file for test + + * 617f5680e4 add windows path and add custom tar + + * c5035118bf add skip_verify option to archive.extracted + +* **PR** `#36073`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-06 19:45:48 UTC* + + * fc41c744a0 Merge pull request `#36073`_ from rallytime/merge-2016.3 + + * e9c634685b Merge branch '2015.8' into '2016.3' + + * fa09050150 consul: fix formatting of consul.agent_join (`#36061`_) + + * **PR** `saltstack/salt#36030`_: (`whiteinge`_) Add include_* kwargs to the \*_dict key functions (refs: `#36040`_) + + * **PR** `#36040`_: (`rallytime`_) Add docs for new kwargs added to the wheel key module + + * **PR** `#36047`_: (`whiteinge`_) Doc cherrypy deemphasize urlencoded + +* **PR** `#36039`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-02 21:50:47 UTC* + + * 74143999d3 Merge pull request `#36039`_ from rallytime/merge-2016.3 + + * 5f499cfd41 Merge branch '2015.8' into '2016.3' + + * 1b39c7ed48 Merge pull request `#35978`_ from DSRCorporation/bugs/28462_update_auth_data_on_reauth + + * 778ae9a9ff Update auth data on reauth. + + * b652271ddc Fix type error in networkfbsd osmajorrelease compare (`#36016`_) + + * bc81818075 Merge pull request `#36018`_ from meaksh/bp-36000-to-2015.8 + + * 8c05d2aac5 Lint for `#35916`_ + + * b5fe6100ee Check for single quote before splitting on single quote + +* **ISSUE** `saltstack/salt#35683`_: (`JensRantil`_) Salt wheel key documentation improvements (refs: `#35824`_, #saltstack/salt`#35824`_) + + * **PR** `saltstack/salt#35824`_: (`rallytime`_) Add more documentation to the wheel key module (refs: `#36038`_) + + * **PR** `#36038`_: (`rallytime`_) Back-port `#35824`_ to 2016.3 + + * **PR** `#35824`_: (`rallytime`_) Add more documentation to the wheel key module (refs: `#36038`_) + + * **PR** `#36033`_: (`gtmanfred`_) catch unicode encoding errors in json outputter + + * **PR** `#36010`_: (`eliasp`_) modules.service: Do not default to OpenRC on Gentoo, also allow systemd + +* **ISSUE** `#33969`_: (`Inveracity`_) Redis returner stacktrace in clean_old_jobs 2016.3.0 (refs: `#33998`_) + + * **PR** `#36014`_: (`rallytime`_) Back-port `#33998`_ to 2016.3 + + * **PR** `#33998`_: (`jizhilong`_) fix redis_return's clean_old_jobs. (refs: `#36014`_) + +* **ISSUE** `#35618`_: (`komljen`_) [salt-cloud] With 'make_master: True' minions are configured with the masters public IP address on AWS (refs: `#35919`_, #saltstack/salt`#35919`_) + + * **PR** `saltstack/salt#35919`_: (`rallytime`_) Add documentation about salt_interface to EC2 docs (refs: `#36015`_) + + * **PR** `#36015`_: (`rallytime`_) Back-port `#35919`_ to 2016.3 + + * **PR** `#35919`_: (`rallytime`_) Add documentation about salt_interface to EC2 docs (refs: `#36015`_) + + * **PR** `saltstack/salt#36000`_: (`rallytime`_) Lint `#35916`_ (refs: `#36019`_, `#36018`_) + + * **PR** `saltstack/salt#35916`_: (`swiftgist`_) Check for single quote before splitting on single quote (refs: `#36019`_, `#36018`_) + +* **PR** `#36019`_: (`meaksh`_) Back-port `#36000`_ to 2016.3 + @ *2016-09-02 20:34:30 UTC* + + * **PR** `#36000`_: (`rallytime`_) Lint `#35916`_ (refs: `#36019`_, `#36018`_) + + * **PR** `#35916`_: (`swiftgist`_) Check for single quote before splitting on single quote (refs: #`saltstack/salt`#36000`_`_, `#36000`_) + + * e88df5845d Merge pull request `#36019`_ from meaksh/bp-36000-to-2016.3 + + * 1b2abeabd1 Lint for `#35916`_ + + * 8b4f46fbd0 Check for single quote before splitting on single quote + + * **PR** `#36028`_: (`thatch45`_) Fix error when profiling is turned on and minions don't return (refs: `#36730`_) + + * **PR** `#36030`_: (`whiteinge`_) Add include_* kwargs to the \*_dict key functions + +* **ISSUE** `saltstack/salt#31454`_: (`johje349`_) Salt Mine memory leak (refs: `#36024`_) + +* **PR** `#36024`_: (`DmitryKuzmenko`_) Don't subscribe to events if not sure it would read them. (refs: `#36720`_) + @ *2016-09-02 15:41:01 UTC* + + * cd60ec5d57 Merge pull request `#36024`_ from DSRCorporation/bugs/31454_local_client_memleak + + * 01911c530e Don't subscribe to events if not sure it would read them. + +* **PR** `#36023`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-02 15:37:59 UTC* + + * 32d5f896d4 Merge pull request `#36023`_ from rallytime/merge-2016.3 + + * a63c9dfc6a Merge branch '2015.8' into '2016.3' + + * e6b93c2380 Merge pull request `#36022`_ from saltstack/revert-33770-service_tests + + * 6cf56843d4 Revert "service state integration tests" + +* **PR** `#36004`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-09-01 21:11:06 UTC* + + * d248ab0120 Merge pull request `#36004`_ from rallytime/merge-2016.3 + + * 318bffed1d Merge branch '2015.8' into '2016.3' + + * 678f10cf8b Avoid traceback in mac_user.py when user.chhome is invoked from a user state (`#35901`_) + + * 2da501071e Merge pull request `#35967`_ from twangboy/improve_show_sls_2015.8 + + * 2ed9a82ef8 Allow full path to be passed to show_sls + + * d86fba15b3 Merge pull request `#35981`_ from cachedout/cptestcase_license + + * dd562dd200 Update Salt's licensing information to include cptestcase + +* **PR** `#35952`_: (`twangboy`_) Load UserProfile when using RunAs (2016.3) + @ *2016-09-01 15:18:15 UTC* + + * f7b85cb70b Merge pull request `#35952`_ from twangboy/fix_win_runas_2016.3 + + * 3721a09ea3 Load UserProfile on RunAs + +* **PR** `#35959`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-31 22:14:54 UTC* + + * b8ca3f5e4d Merge pull request `#35959`_ from rallytime/merge-2016.3 + + * bb4605ffee Merge branch '2015.8' into '2016.3' + + * 0f0f15d048 Merge pull request `#35956`_ from jacobhammons/dot12 + + * 3e21e35933 Version docs to 2015.8.12 + + * d2db4ea7a2 cachedir should be /cloud not /master (`#35897`_) + + * f4cdcc0d66 Better logging when file_recv_max_size is exceeded (`#35914`_) + +* **PR** `#35955`_: (`jacobhammons`_) Version docs to 2016.3.3 + @ *2016-08-31 20:35:55 UTC* + + * a87b91a8ea Merge pull request `#35955`_ from jacobhammons/dot3 + + * ac8fe6ff9e Version docs to 2016.3.3 + +* **ISSUE** `#875`_: (`dhoffutt`_) state pkg won't install package nscd (refs: `#35865`_) + + * **PR** `#35865`_: (`jacobhammons`_) Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates + +* **ISSUE** `#35829`_: (`amontalban`_) FreeBSD pkg.latest speed improvement (refs: `#35904`_) + + * **PR** `#35904`_: (`amontalban`_) Fixes `#35829`_ for branch 2016.3 + + * **PR** `#35931`_: (`vutny`_) Salt Cloud: add `centos` default user for official CentOS AMIs + + * **PR** `saltstack/salt#35892`_: (`cachedout`_) Fixup Docker test (refs: `#35926`_) + + * **PR** `saltstack/salt#35581`_: (`pbdeuchler`_) Correctly check if image is in current tags (refs: `#35926`_) + + * **PR** `#35926`_: (`ticosax`_) [dockerng] Mention that docker image names must be given with repository + + * **PR** `#35581`_: (`pbdeuchler`_) Correctly check if image is in current tags (refs: `#35926`_) + +* **ISSUE** `#35825`_: (`tjyang`_) "'drac' __virtual__ returned False" from salt-run drac.version host (refs: `#35868`_) + +* **PR** `#35868`_: (`rallytime`_) Add more helpful return messages for drac runner + @ *2016-08-31 01:33:27 UTC* + + * ca06c62900 Merge pull request `#35868`_ from rallytime/fix-35825 + + * 00ae17248e Update error message to be more helpful and fix doc formatting + + * 30a422bfe0 Add more helpful return messages for drac runner + +* **PR** `#35903`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 into 2016.3 + @ *2016-08-30 17:15:36 UTC* + + * 95b89dbce9 Merge pull request `#35903`_ from rallytime/merge-2016.3 + + * 9e55bee5d5 Merge branch '2015.8' into '2016.3' + + * 08e10f69eb Clarifies how to create aliased functions (`#35891`_) + + * 6dd5f68a08 Merge pull request `#35856`_ from vutny/2015.8 + + * eceedadfa5 salt-cloud: fix path to Salt Master socket dir + + * 336d1a700d Merge pull request `#35880`_ from terminalmage/issue35747 + + * 123a611066 pacman.py: Fix incorrect return in pkg.latest_version + + * 6383451c99 Merge pull request `#35884`_ from terminalmage/clarify-pkg-latest-logic + + * b0b419d1d8 Fix condition for Gentoo USE flag update + + * 1542fd4716 Add clarifying comments to the pkg.latest state + +* **ISSUE** `saltstack/salt#18419`_: (`jasonrm`_) salt-cloud fails to run as non-root user (refs: `#35483`_) + +* **ISSUE** `#34806`_: (`jerrykan`_) salt-cloud ignores sock_dir when firing event (refs: `#35483`_) + +* **PR** `#35855`_: (`vutny`_) [REGRESSION] salt-cloud: fix path to Salt Master socket dir (refs: `#35856`_) + @ *2016-08-30 07:09:04 UTC* + + * **PR** `#35483`_: (`gtmanfred`_) use __utils__ in salt.cloud (refs: `#35855`_, `#37057`_, `#36070`_) + + * cf8f081401 Merge pull request `#35855`_ from vutny/salt-cloud-fix-sock_dir + + * a662ea5337 salt-cloud: fix path to Salt Master socket dir + +* **PR** `#35881`_: (`whiteinge`_) Add fail-safe in case Salt gives us data we can't serialize + @ *2016-08-30 06:43:11 UTC* + + * f0987cf27a Merge pull request `#35881`_ from whiteinge/salt-api-catch-serializer-error + + * 6e27fad21f Add fail-safe in case Salt gives us data we can't serialize + +* **ISSUE** `#35837`_: (`JensRantil`_) Doc improvement: Mention engine under extension modules (refs: `#35864`_) + + * **PR** `#35864`_: (`rallytime`_) Add engines to list of extension module options in master config docs + +* **ISSUE** `#35835`_: (`JensRantil`_) Incorrect SQS config documentation statement (refs: `#35861`_) + + * **PR** `#35861`_: (`rallytime`_) Fix IAM roles statement to be boto version specific in sqs_events + +* **ISSUE** `#35834`_: (`JensRantil`_) Incorrect SQS engine config (refs: `#35860`_) + + * **PR** `#35860`_: (`rallytime`_) Fix doc formatting for sqs_events engine example config + +* **PR** `#35859`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-29 18:21:04 UTC* + + * 96747bc3bb Merge pull request `#35859`_ from rallytime/merge-2016.3 + + * 5f93d682aa Merge branch '2015.8' into '2016.3' + + * eda2ae0add Merge pull request `#35781`_ from thatch45/ssh_deploy_more + + * 2558dcc100 follow up on the re-deploy if there is a checksum missmatch + + * 165237412c Merge pull request `#35815`_ from gtmanfred/2015.8 + + * 805d43598e list_nodes_min should return a minimum dictionary + + * b12c6577d2 Merge pull request `#35833`_ from terminalmage/2015.8-top-file-merging-docs + + * c534d88280 More clarification/correction in minion docs + + * e9e6ea8485 One more tweak to top file merging docs + +* **ISSUE** `#34478`_: (`hujunya`_) makedir bug in the file module (refs: `#35849`_) + +* **PR** `#35849`_: (`theredcat`_) Fix potential infinite loop with no error when using recursive makedirs + @ *2016-08-29 11:37:19 UTC* + + * dc705ff675 Merge pull request `#35849`_ from theredcat/fix_file_makedirs_infinite_loop + + * 86d5398b28 Fix potential infinite loop with no error when using recursive makedirs + +* **PR** `#35682`_: (`vutny`_) [BACKPORT] Fix empty `fun_agrs` field in Reactor generated events + @ *2016-08-29 04:11:06 UTC* + + * **PR** `#35659`_: (`vutny`_) Fix empty `fun_agrs` field in Reactor generated events (refs: `#35682`_) + + * **PR** `#35059`_: (`vutny`_) Add `fun_args` field to events generated by execution of Master modules (refs: `#35659`_, `#35682`_) + + * 433743f609 Merge pull request `#35682`_ from vutny/backport-35659 + + * 78d16a8057 [BACKPORT] Fix empty `fun_agrs` field in Reactor generated events + +* **ISSUE** `#34973`_: (`szjur`_) Syndic stops forwarding job results if the local salt-master is restarted (refs: `#35792`_) + +* **PR** `#35792`_: (`DmitryKuzmenko`_) Reconnect syndic to event bus if master disappeared. + @ *2016-08-29 02:13:19 UTC* + + * 30c2db7b09 Merge pull request `#35792`_ from DSRCorporation/bugs/34973_syndic_reconnect_master_2016.3 + + * 9afdbb0e97 Reconnect syndic to master event bus if master disappears. + + * ab1afd002e Fixed syndic event bus connection. + + * ea8e1385c1 Fixed syndic unhandled future exception if master is stopped. + +* **PR** `#35817`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-26 20:44:18 UTC* + + * 43c08ae431 Merge pull request `#35817`_ from rallytime/merge-2016.3 + + * e8e73b55ac Merge branch '2015.8' into '2016.3' + + * d285fe64b7 Merge pull request `#35811`_ from rallytime/bp-35576 + + * 04c063b315 Updated user.py to redact password when test=true + + * e212c55b7a Schedule documentation update (`#35745`_) + + * eb4d2f299b Better unicode handling in gitfs (`#35802`_) + + * 0ee237a9cb Remove extra "to" in top.rst docs (`#35808`_) + + * 2fc61763d8 Correct the top_file_merging_strategy documentation (`#35774`_) + + * **PR** `#35788`_: (`hu-dabao`_) fix 34241, webutil.useradd_all is deprecated + +* **ISSUE** `saltstack/salt#33536`_: (`murzick`_) pkgrepo.managed does not disable a yum repo with "disabled: True" (refs: `#35055`_) + +* **ISSUE** `#33536`_: (`murzick`_) pkgrepo.managed does not disable a yum repo with "disabled: True" (refs: `#35055`_, `#35806`_) + + * **PR** `#35810`_: (`rallytime`_) Back-port `#35806`_ to 2016.3 + + * **PR** `#35806`_: (`rallytime`_) Bump the deprecation warning in pkgrepo state to Nitrogen (refs: `#35810`_) + + * **PR** `#35055`_: (`galet`_) `#33536`_ pkgrepo.managed does not disable a yum repo with "disabled: True" (refs: `#35806`_) + +* **ISSUE** `#35741`_: (`fix7`_) modjk: use of auth credentials to access jk-status broken (refs: `#35796`_) + + * **PR** `#35796`_: (`fix7`_) Fix `#35741`_ + + * **PR** `#35807`_: (`jacobhammons`_) Adds mock for tornado.locks + + * **PR** `#35800`_: (`alexander-bauer`_) Trivial documentation spelling fix + +* **PR** `#35763`_: (`isbm`_) Sphinx crash: documentation config fix + @ *2016-08-25 21:12:39 UTC* + + * 9b5ee2155e Merge pull request `#35763`_ from isbm/isbm-doc-conf-sphinx-crashfix + + * a56ae4e8f5 Configure importing Mock to handle 'total' method from psutils properly + + * 9c057d0266 Return psutil back to the list of mocked imports + + * 3d7758461e Improve Mock to be flexible and able to mock methods from the mocked modules + +* **ISSUE** `#35771`_: (`bdrung`_) Spelling errors in salt 2016.3.2 (refs: `#35773`_) + + * **PR** `#35773`_: (`rallytime`_) Documentation spelling fixes + +* **PR** `#35767`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-25 16:09:37 UTC* + + * e355c1cf90 Merge pull request `#35767`_ from rallytime/merge-2016.3 + + * 8ad6a12c80 Merge branch '2015.8' into '2016.3' + + * 2a12795bac Fixes Windows download paths (`#35742`_) + +* **ISSUE** `#20575`_: (`starchy`_) "salt --subset=n" appears to always choose the same nodes (refs: `#35753`_) + +* **PR** `#35753`_: (`rallytime`_) Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from `#35720`_ + @ *2016-08-25 15:55:23 UTC* + + * **PR** `#35720`_: (`hu-dabao`_) fix 20575, make subset really return random subset (refs: `#35753`_) + + * b3f6367621 Merge pull request `#35753`_ from rallytime/fix-client-unit-test + + * 92f8c836e8 Add cmd_mock back in to function spec + + * a671f0a092 Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from `#35720`_ + +* **ISSUE** `#35458`_: (`iggy`_) SALT.STATES.APACHE_MODULE needs version annotations (refs: `#35732`_) + + * **PR** `#35732`_: (`rallytime`_) Add versionadded for enabled function in apache_module state + +* **PR** `#35737`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-24 19:48:45 UTC* + + * bab0e3d449 Merge pull request `#35737`_ from rallytime/merge-2016.3 + + * 61e37d5956 Merge branch '2015.8' into '2106.3' + + * 06a75be8bd Merge pull request `#35701`_ from gtmanfred/2015.8 + + * 2d2bc1ffea use aws.get_location in s3 modules + + * 79bc01b88c Make test runs behave better (`#35708`_) + +* **PR** `#35729`_: (`cachedout`_) Remove docs mocks for msgpack and psutils + @ *2016-08-24 14:42:06 UTC* + + * 7877ff1d5e Merge pull request `#35729`_ from cachedout/fix_docs_build + + * fdbf01d5ad Remove docs mocks for msgpack and psutils + +* **PR** `#35628`_: (`jf`_) Fix user.present state reporting for groups when remove_groups=false + @ *2016-08-24 08:15:31 UTC* + + * 962e493304 Merge pull request `#35628`_ from jf/fix_user.present_reporting_when_remove_groups=false + + * 1f818c832e Fix user.present state reporting for groups when remove_groups=false + +* **PR** `#35696`_: (`xiaoanyunfei`_) fix maximum recursion depth bug + @ *2016-08-24 08:01:16 UTC* + + * 02d86c6550 Merge pull request `#35696`_ from xiaoanyunfei/2016.3 + + * 5db9255926 fix maximum recursion depth + +* **PR** `#35720`_: (`hu-dabao`_) fix 20575, make subset really return random subset (refs: `#35753`_) + @ *2016-08-24 07:03:58 UTC* + + * 79d10aea2d Merge pull request `#35720`_ from hu-dabao/fix-20575 + + * 70af980c01 fix 20575, make subset really return random subset + +* **PR** `#35700`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-23 17:23:40 UTC* + + * 5d0b9a248e Merge pull request `#35700`_ from rallytime/merge-2016.3 + + * 9e9923c3f4 Merge branch '2015.8' into '2016.3' + + * aee5b62542 Merge pull request `#35680`_ from terminalmage/issue35630 + + * d76659a63a Don't use six.text_type() in salt.utils.gitfs + + * 74678923b8 Fixup doc formatting for the sqs_events engine (`#35663`_) + +* **PR** `#35634`_: (`hu-dabao`_) fix 34922, StopIteration should not throw exception out + @ *2016-08-23 08:13:08 UTC* + + * f305389172 Merge pull request `#35634`_ from hu-dabao/fix-34922 + + * fe338ff41f fix 34922, StopIteration should not throw exception out + +* **PR** `#35679`_: (`twangboy`_) Revert to vcredist 12 (2013) + @ *2016-08-23 08:05:40 UTC* + + * e45aa55d79 Merge pull request `#35679`_ from twangboy/change.vcredist.version.2016.3 + + * 3d6d473d48 Revert to vcredist 12 (2013) + +* **PR** `#35662`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-22 19:03:43 UTC* + + * 9fe0972761 Merge pull request `#35662`_ from rallytime/merge-2016.3 + + * 1d819d7cc2 Merge branch '2015.8' into '2016.3' + + * 399e9f57cc Update release notes for 2015.8.12 (`#35614`_) + + * f7f8221169 Everything in the sample master config file should be commented out (`#35611`_) + + * c9070c212f Merge pull request `#35569`_ from rallytime/test-for-35384 + + * 30f42d5352 Write test for multiple unless commands where 1st cmd passes and 2nd fails + + * **PR** `#35661`_: (`justinta`_) Backport `#35627`_ to 2016.3 + + * **PR** `#35627`_: (`cachedout`_) Comment boto lambda test (refs: `#35661`_) + +* **PR** `#35615`_: (`hu-dabao`_) fix 35591, verify the acl file exist before proceed + @ *2016-08-21 04:41:32 UTC* + + * 67692f868c Merge pull request `#35615`_ from hu-dabao/fix-35591 + + * 402b83e4d3 change file verification to exist + + * 7355eb4ecd move python lib import after absolute_import + + * 69a2427670 fix 35591, verify the acl file exist before proceed + +* **PR** `#35485`_: (`cro`_) Cassandra returner bugfixes and documentation. + @ *2016-08-20 02:42:28 UTC* + + * de6fca3909 Merge pull request `#35485`_ from cro/jpmc_cass_return + + * 0b01a7a266 Six import for range. + + * 7e87d4170d Fix Py3 lint? + + * d4336d011c [1,2,3] -> range(1,4) + + * cec7f6a7ec remove unneeded import + + * e31555345f Add timeout documentation. + + * 901ab8b74c Remove unnecessary log statements + + * 1954c1a3f3 Update cassandra returner for JPMC + +* **ISSUE** `#35519`_: (`morganwillcock`_) win_dism state doesn't handle all success return codes (refs: `#35520`_) + +* **PR** `#35520`_: (`morganwillcock`_) Check for all success return codes in win_dism state + @ *2016-08-20 02:35:01 UTC* + + * edefff51d4 Merge pull request `#35520`_ from morganwillcock/dism-return-codes + + * 0b95b85e69 Check for all success return codes in dism state + +* **PR** `#35616`_: (`xbglowx`_) Remove duplicate auth_tries in minion docs + @ *2016-08-20 02:32:50 UTC* + + * 27211dbd64 Merge pull request `#35616`_ from xbglowx/2016.3 + + * 2801f0fdcc Remove duplicate auth_tries in minion docs + +* **ISSUE** `#34992`_: (`szjur`_) Syndic strips vital parts of events (such as 'retcode' and 'success') (refs: `#35552`_) + +* **PR** `#35552`_: (`DmitryKuzmenko`_) Syndic fix: don't strip 'retcode' and 'success' from events. + @ *2016-08-20 02:00:40 UTC* + + * 25ac9bacc6 Merge pull request `#35552`_ from DSRCorporation/bugs/34992_syndic_strip_retcode + + * d036299f6f Syndic fix: don't strip 'retcode' and 'success' from events. + +* **ISSUE** `#25664`_: (`sdm24`_) 2015.5.2 MySQL Returner: salt-run jobs.lookup_jid doesn't return full result for highstate output (refs: `#35559`_) + +* **PR** `#35559`_: (`Jlin317`_) Fix highstate outputter when it's given multiple results (refs: `#36137`_) + @ *2016-08-20 01:56:25 UTC* + + * bec8322e13 Merge pull request `#35559`_ from Jlin317/fix_highstate_outputter + + * 27aa038cc6 Fix highstate outputter when it's given multiple results + +* **ISSUE** `#32478`_: (`oliver-dungey`_) rsync.synchronized - user/group options required (refs: `#32739`_) + +* **PR** `#35605`_: (`rallytime`_) Back-port `#32739`_ to 2016.3 + @ *2016-08-20 01:39:38 UTC* + + * **PR** `#32739`_: (`abednarik`_) Rsync synchronized updates. (refs: `#35605`_) + + * 4153aeba29 Merge pull request `#35605`_ from rallytime/bp-32739 + + * 36d8b4a409 Rsync synchronized updates. + +* **PR** `#35606`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-08-19 22:19:05 UTC* + + * 6eabe6356f Merge pull request `#35606`_ from rallytime/merge-2016.3 + + * f2eb625778 Merge branch '2015.8' into '2016.3' + + * 0c7aa802f5 Update release notes for 2015.8.12 (`#35600`_) + + * dd12b48239 Update release notes for 2015.8.12 (`#35599`_) + + * beb6ca8ef9 Update linux_sysctl tests to reflect new context key (`#35584`_) + + * fd08d33597 Add warning about AWS flagging of nmap usage (`#35575`_) + +.. _`#18341`: https://github.com/saltstack/salt/issues/18341 +.. _`#1`: https://github.com/saltstack/salt/issues/1 +.. _`#20575`: https://github.com/saltstack/salt/issues/20575 +.. _`#21248`: https://github.com/saltstack/salt/issues/21248 +.. _`#23822`: https://github.com/saltstack/salt/issues/23822 +.. _`#25128`: https://github.com/saltstack/salt/pull/25128 +.. _`#25664`: https://github.com/saltstack/salt/issues/25664 +.. _`#26569`: https://github.com/saltstack/salt/issues/26569 +.. _`#27207`: https://github.com/saltstack/salt/issues/27207 +.. _`#27316`: https://github.com/saltstack/salt/issues/27316 +.. _`#27317`: https://github.com/saltstack/salt/pull/27317 +.. _`#27764`: https://github.com/saltstack/salt/pull/27764 +.. _`#28125`: https://github.com/saltstack/salt/issues/28125 +.. _`#29421`: https://github.com/saltstack/salt/issues/29421 +.. _`#31116`: https://github.com/saltstack/salt/pull/31116 +.. _`#31454`: https://github.com/saltstack/salt/issues/31454 +.. _`#32478`: https://github.com/saltstack/salt/issues/32478 +.. _`#32485`: https://github.com/saltstack/salt/pull/32485 +.. _`#32699`: https://github.com/saltstack/salt/pull/32699 .. _`#32739`: https://github.com/saltstack/salt/pull/32739 -.. _`#33770`: https://github.com/saltstack/salt/pull/33770 +.. _`#33525`: https://github.com/saltstack/salt/issues/33525 +.. _`#33536`: https://github.com/saltstack/salt/issues/33536 +.. _`#33686`: https://github.com/saltstack/salt/issues/33686 .. _`#33906`: https://github.com/saltstack/salt/pull/33906 +.. _`#33915`: https://github.com/saltstack/salt/issues/33915 .. _`#33939`: https://github.com/saltstack/salt/pull/33939 +.. _`#33969`: https://github.com/saltstack/salt/issues/33969 .. _`#33998`: https://github.com/saltstack/salt/pull/33998 +.. _`#34397`: https://github.com/saltstack/salt/issues/34397 +.. _`#34478`: https://github.com/saltstack/salt/issues/34478 +.. _`#34515`: https://github.com/saltstack/salt/issues/34515 .. _`#34529`: https://github.com/saltstack/salt/pull/34529 .. _`#34531`: https://github.com/saltstack/salt/pull/34531 -.. _`#34831`: https://github.com/saltstack/salt/pull/34831 +.. _`#34806`: https://github.com/saltstack/salt/issues/34806 +.. _`#34872`: https://github.com/saltstack/salt/issues/34872 +.. _`#34927`: https://github.com/saltstack/salt/issues/34927 +.. _`#34973`: https://github.com/saltstack/salt/issues/34973 +.. _`#34992`: https://github.com/saltstack/salt/issues/34992 .. _`#35055`: https://github.com/saltstack/salt/pull/35055 .. _`#35059`: https://github.com/saltstack/salt/pull/35059 +.. _`#35097`: https://github.com/saltstack/salt/issues/35097 +.. _`#35198`: https://github.com/saltstack/salt/issues/35198 .. _`#35199`: https://github.com/saltstack/salt/pull/35199 -.. _`#35325`: https://github.com/saltstack/salt/pull/35325 -.. _`#35356`: https://github.com/saltstack/salt/pull/35356 +.. _`#35340`: https://github.com/saltstack/salt/issues/35340 +.. _`#35423`: https://github.com/saltstack/salt/issues/35423 .. _`#35433`: https://github.com/saltstack/salt/pull/35433 +.. _`#35458`: https://github.com/saltstack/salt/issues/35458 +.. _`#35480`: https://github.com/saltstack/salt/issues/35480 .. _`#35483`: https://github.com/saltstack/salt/pull/35483 .. _`#35485`: https://github.com/saltstack/salt/pull/35485 +.. _`#35519`: https://github.com/saltstack/salt/issues/35519 .. _`#35520`: https://github.com/saltstack/salt/pull/35520 -.. _`#35545`: https://github.com/saltstack/salt/pull/35545 .. _`#35552`: https://github.com/saltstack/salt/pull/35552 .. _`#35559`: https://github.com/saltstack/salt/pull/35559 -.. _`#35566`: https://github.com/saltstack/salt/pull/35566 .. _`#35569`: https://github.com/saltstack/salt/pull/35569 .. _`#35575`: https://github.com/saltstack/salt/pull/35575 -.. _`#35576`: https://github.com/saltstack/salt/pull/35576 .. _`#35581`: https://github.com/saltstack/salt/pull/35581 .. _`#35584`: https://github.com/saltstack/salt/pull/35584 .. _`#35599`: https://github.com/saltstack/salt/pull/35599 @@ -337,10 +2887,10 @@ Changes: .. _`#35614`: https://github.com/saltstack/salt/pull/35614 .. _`#35615`: https://github.com/saltstack/salt/pull/35615 .. _`#35616`: https://github.com/saltstack/salt/pull/35616 +.. _`#35618`: https://github.com/saltstack/salt/issues/35618 .. _`#35627`: https://github.com/saltstack/salt/pull/35627 .. _`#35628`: https://github.com/saltstack/salt/pull/35628 .. _`#35634`: https://github.com/saltstack/salt/pull/35634 -.. _`#35637`: https://github.com/saltstack/salt/pull/35637 .. _`#35659`: https://github.com/saltstack/salt/pull/35659 .. _`#35661`: https://github.com/saltstack/salt/pull/35661 .. _`#35662`: https://github.com/saltstack/salt/pull/35662 @@ -357,12 +2907,15 @@ Changes: .. _`#35720`: https://github.com/saltstack/salt/pull/35720 .. _`#35729`: https://github.com/saltstack/salt/pull/35729 .. _`#35732`: https://github.com/saltstack/salt/pull/35732 +.. _`#35734`: https://github.com/saltstack/salt/pull/35734 .. _`#35737`: https://github.com/saltstack/salt/pull/35737 +.. _`#35741`: https://github.com/saltstack/salt/issues/35741 .. _`#35742`: https://github.com/saltstack/salt/pull/35742 .. _`#35745`: https://github.com/saltstack/salt/pull/35745 .. _`#35753`: https://github.com/saltstack/salt/pull/35753 .. _`#35763`: https://github.com/saltstack/salt/pull/35763 .. _`#35767`: https://github.com/saltstack/salt/pull/35767 +.. _`#35771`: https://github.com/saltstack/salt/issues/35771 .. _`#35773`: https://github.com/saltstack/salt/pull/35773 .. _`#35774`: https://github.com/saltstack/salt/pull/35774 .. _`#35781`: https://github.com/saltstack/salt/pull/35781 @@ -376,10 +2929,17 @@ Changes: .. _`#35808`: https://github.com/saltstack/salt/pull/35808 .. _`#35810`: https://github.com/saltstack/salt/pull/35810 .. _`#35811`: https://github.com/saltstack/salt/pull/35811 +.. _`#35813`: https://github.com/saltstack/salt/issues/35813 .. _`#35815`: https://github.com/saltstack/salt/pull/35815 .. _`#35817`: https://github.com/saltstack/salt/pull/35817 +.. _`#35819`: https://github.com/saltstack/salt/issues/35819 .. _`#35824`: https://github.com/saltstack/salt/pull/35824 +.. _`#35825`: https://github.com/saltstack/salt/issues/35825 +.. _`#35829`: https://github.com/saltstack/salt/issues/35829 .. _`#35833`: https://github.com/saltstack/salt/pull/35833 +.. _`#35834`: https://github.com/saltstack/salt/issues/35834 +.. _`#35835`: https://github.com/saltstack/salt/issues/35835 +.. _`#35837`: https://github.com/saltstack/salt/issues/35837 .. _`#35849`: https://github.com/saltstack/salt/pull/35849 .. _`#35855`: https://github.com/saltstack/salt/pull/35855 .. _`#35856`: https://github.com/saltstack/salt/pull/35856 @@ -393,7 +2953,6 @@ Changes: .. _`#35881`: https://github.com/saltstack/salt/pull/35881 .. _`#35884`: https://github.com/saltstack/salt/pull/35884 .. _`#35891`: https://github.com/saltstack/salt/pull/35891 -.. _`#35892`: https://github.com/saltstack/salt/pull/35892 .. _`#35897`: https://github.com/saltstack/salt/pull/35897 .. _`#35901`: https://github.com/saltstack/salt/pull/35901 .. _`#35903`: https://github.com/saltstack/salt/pull/35903 @@ -411,7 +2970,6 @@ Changes: .. _`#35956`: https://github.com/saltstack/salt/pull/35956 .. _`#35959`: https://github.com/saltstack/salt/pull/35959 .. _`#35967`: https://github.com/saltstack/salt/pull/35967 -.. _`#35975`: https://github.com/saltstack/salt/pull/35975 .. _`#35978`: https://github.com/saltstack/salt/pull/35978 .. _`#35981`: https://github.com/saltstack/salt/pull/35981 .. _`#36000`: https://github.com/saltstack/salt/pull/36000 @@ -436,6 +2994,7 @@ Changes: .. _`#36040`: https://github.com/saltstack/salt/pull/36040 .. _`#36047`: https://github.com/saltstack/salt/pull/36047 .. _`#36055`: https://github.com/saltstack/salt/issues/36055 +.. _`#36057`: https://github.com/saltstack/salt/issues/36057 .. _`#36061`: https://github.com/saltstack/salt/pull/36061 .. _`#36062`: https://github.com/saltstack/salt/pull/36062 .. _`#36068`: https://github.com/saltstack/salt/pull/36068 @@ -443,6 +3002,7 @@ Changes: .. _`#36073`: https://github.com/saltstack/salt/pull/36073 .. _`#36078`: https://github.com/saltstack/salt/pull/36078 .. _`#36089`: https://github.com/saltstack/salt/pull/36089 +.. _`#36094`: https://github.com/saltstack/salt/issues/36094 .. _`#36096`: https://github.com/saltstack/salt/pull/36096 .. _`#36118`: https://github.com/saltstack/salt/pull/36118 .. _`#36124`: https://github.com/saltstack/salt/pull/36124 @@ -453,7 +3013,6 @@ Changes: .. _`#36143`: https://github.com/saltstack/salt/pull/36143 .. _`#36146`: https://github.com/saltstack/salt/pull/36146 .. _`#36147`: https://github.com/saltstack/salt/pull/36147 -.. _`#36151`: https://github.com/saltstack/salt/pull/36151 .. _`#36152`: https://github.com/saltstack/salt/pull/36152 .. _`#36154`: https://github.com/saltstack/salt/pull/36154 .. _`#36156`: https://github.com/saltstack/salt/pull/36156 @@ -489,13 +3048,16 @@ Changes: .. _`#36272`: https://github.com/saltstack/salt/pull/36272 .. _`#36273`: https://github.com/saltstack/salt/pull/36273 .. _`#36277`: https://github.com/saltstack/salt/pull/36277 +.. _`#36279`: https://github.com/saltstack/salt/issues/36279 .. _`#36280`: https://github.com/saltstack/salt/pull/36280 -.. _`#36288`: https://github.com/saltstack/salt/pull/36288 +.. _`#36292`: https://github.com/saltstack/salt/issues/36292 .. _`#36295`: https://github.com/saltstack/salt/pull/36295 .. _`#36296`: https://github.com/saltstack/salt/pull/36296 .. _`#36297`: https://github.com/saltstack/salt/pull/36297 .. _`#36299`: https://github.com/saltstack/salt/pull/36299 +.. _`#36304`: https://github.com/saltstack/salt/issues/36304 .. _`#36305`: https://github.com/saltstack/salt/pull/36305 +.. _`#36308`: https://github.com/saltstack/salt/issues/36308 .. _`#36310`: https://github.com/saltstack/salt/pull/36310 .. _`#36312`: https://github.com/saltstack/salt/pull/36312 .. _`#36315`: https://github.com/saltstack/salt/pull/36315 @@ -505,6 +3067,7 @@ Changes: .. _`#36334`: https://github.com/saltstack/salt/pull/36334 .. _`#36335`: https://github.com/saltstack/salt/pull/36335 .. _`#36337`: https://github.com/saltstack/salt/pull/36337 +.. _`#36338`: https://github.com/saltstack/salt/issues/36338 .. _`#36339`: https://github.com/saltstack/salt/pull/36339 .. _`#36342`: https://github.com/saltstack/salt/pull/36342 .. _`#36344`: https://github.com/saltstack/salt/pull/36344 @@ -516,11 +3079,14 @@ Changes: .. _`#36355`: https://github.com/saltstack/salt/pull/36355 .. _`#36365`: https://github.com/saltstack/salt/pull/36365 .. _`#36369`: https://github.com/saltstack/salt/pull/36369 +.. _`#36371`: https://github.com/saltstack/salt/issues/36371 +.. _`#36373`: https://github.com/saltstack/salt/issues/36373 .. _`#36378`: https://github.com/saltstack/salt/pull/36378 .. _`#36379`: https://github.com/saltstack/salt/pull/36379 .. _`#36381`: https://github.com/saltstack/salt/pull/36381 .. _`#36384`: https://github.com/saltstack/salt/pull/36384 .. _`#36386`: https://github.com/saltstack/salt/pull/36386 +.. _`#36388`: https://github.com/saltstack/salt/issues/36388 .. _`#36389`: https://github.com/saltstack/salt/pull/36389 .. _`#36391`: https://github.com/saltstack/salt/pull/36391 .. _`#36394`: https://github.com/saltstack/salt/pull/36394 @@ -530,6 +3096,7 @@ Changes: .. _`#36418`: https://github.com/saltstack/salt/pull/36418 .. _`#36419`: https://github.com/saltstack/salt/pull/36419 .. _`#36420`: https://github.com/saltstack/salt/pull/36420 +.. _`#36422`: https://github.com/saltstack/salt/issues/36422 .. _`#36424`: https://github.com/saltstack/salt/pull/36424 .. _`#36425`: https://github.com/saltstack/salt/pull/36425 .. _`#36428`: https://github.com/saltstack/salt/pull/36428 @@ -537,21 +3104,23 @@ Changes: .. _`#36441`: https://github.com/saltstack/salt/pull/36441 .. _`#36442`: https://github.com/saltstack/salt/pull/36442 .. _`#36445`: https://github.com/saltstack/salt/pull/36445 -.. _`#36450`: https://github.com/saltstack/salt/pull/36450 .. _`#36455`: https://github.com/saltstack/salt/pull/36455 .. _`#36459`: https://github.com/saltstack/salt/pull/36459 .. _`#36464`: https://github.com/saltstack/salt/pull/36464 .. _`#36474`: https://github.com/saltstack/salt/pull/36474 +.. _`#36475`: https://github.com/saltstack/salt/issues/36475 .. _`#36478`: https://github.com/saltstack/salt/pull/36478 .. _`#36482`: https://github.com/saltstack/salt/pull/36482 .. _`#36483`: https://github.com/saltstack/salt/pull/36483 .. _`#36484`: https://github.com/saltstack/salt/pull/36484 .. _`#36486`: https://github.com/saltstack/salt/pull/36486 +.. _`#36491`: https://github.com/saltstack/salt/issues/36491 .. _`#36495`: https://github.com/saltstack/salt/pull/36495 .. _`#36496`: https://github.com/saltstack/salt/pull/36496 .. _`#36500`: https://github.com/saltstack/salt/pull/36500 .. _`#36505`: https://github.com/saltstack/salt/pull/36505 .. _`#36508`: https://github.com/saltstack/salt/pull/36508 +.. _`#36514`: https://github.com/saltstack/salt/issues/36514 .. _`#36519`: https://github.com/saltstack/salt/pull/36519 .. _`#36520`: https://github.com/saltstack/salt/pull/36520 .. _`#36529`: https://github.com/saltstack/salt/pull/36529 @@ -565,11 +3134,16 @@ Changes: .. _`#36542`: https://github.com/saltstack/salt/pull/36542 .. _`#36546`: https://github.com/saltstack/salt/pull/36546 .. _`#36550`: https://github.com/saltstack/salt/pull/36550 +.. _`#36553`: https://github.com/saltstack/salt/issues/36553 .. _`#36555`: https://github.com/saltstack/salt/pull/36555 .. _`#36562`: https://github.com/saltstack/salt/pull/36562 .. _`#36564`: https://github.com/saltstack/salt/pull/36564 +.. _`#36568`: https://github.com/saltstack/salt/issues/36568 .. _`#36572`: https://github.com/saltstack/salt/pull/36572 +.. _`#36579`: https://github.com/saltstack/salt/issues/36579 .. _`#36585`: https://github.com/saltstack/salt/pull/36585 +.. _`#36586`: https://github.com/saltstack/salt/issues/36586 +.. _`#36588`: https://github.com/saltstack/salt/issues/36588 .. _`#36589`: https://github.com/saltstack/salt/pull/36589 .. _`#36594`: https://github.com/saltstack/salt/pull/36594 .. _`#36595`: https://github.com/saltstack/salt/pull/36595 @@ -598,13 +3172,16 @@ Changes: .. _`#36662`: https://github.com/saltstack/salt/pull/36662 .. _`#36663`: https://github.com/saltstack/salt/pull/36663 .. _`#36664`: https://github.com/saltstack/salt/pull/36664 +.. _`#36669`: https://github.com/saltstack/salt/issues/36669 .. _`#36670`: https://github.com/saltstack/salt/pull/36670 +.. _`#36671`: https://github.com/saltstack/salt/issues/36671 .. _`#36676`: https://github.com/saltstack/salt/pull/36676 .. _`#36678`: https://github.com/saltstack/salt/pull/36678 .. _`#36680`: https://github.com/saltstack/salt/pull/36680 .. _`#36684`: https://github.com/saltstack/salt/pull/36684 .. _`#36686`: https://github.com/saltstack/salt/pull/36686 .. _`#36690`: https://github.com/saltstack/salt/pull/36690 +.. _`#36692`: https://github.com/saltstack/salt/issues/36692 .. _`#36694`: https://github.com/saltstack/salt/pull/36694 .. _`#36696`: https://github.com/saltstack/salt/pull/36696 .. _`#36699`: https://github.com/saltstack/salt/pull/36699 @@ -618,9 +3195,11 @@ Changes: .. _`#36726`: https://github.com/saltstack/salt/pull/36726 .. _`#36728`: https://github.com/saltstack/salt/pull/36728 .. _`#36730`: https://github.com/saltstack/salt/pull/36730 +.. _`#36738`: https://github.com/saltstack/salt/issues/36738 .. _`#36739`: https://github.com/saltstack/salt/pull/36739 .. _`#36743`: https://github.com/saltstack/salt/pull/36743 .. _`#36744`: https://github.com/saltstack/salt/pull/36744 +.. _`#36746`: https://github.com/saltstack/salt/issues/36746 .. _`#36747`: https://github.com/saltstack/salt/pull/36747 .. _`#36749`: https://github.com/saltstack/salt/pull/36749 .. _`#36750`: https://github.com/saltstack/salt/pull/36750 @@ -628,15 +3207,19 @@ Changes: .. _`#36755`: https://github.com/saltstack/salt/pull/36755 .. _`#36757`: https://github.com/saltstack/salt/pull/36757 .. _`#36764`: https://github.com/saltstack/salt/pull/36764 +.. _`#36766`: https://github.com/saltstack/salt/issues/36766 .. _`#36768`: https://github.com/saltstack/salt/pull/36768 .. _`#36785`: https://github.com/saltstack/salt/pull/36785 .. _`#36786`: https://github.com/saltstack/salt/pull/36786 +.. _`#36787`: https://github.com/saltstack/salt/issues/36787 .. _`#36789`: https://github.com/saltstack/salt/pull/36789 .. _`#36797`: https://github.com/saltstack/salt/pull/36797 .. _`#36803`: https://github.com/saltstack/salt/pull/36803 +.. _`#36804`: https://github.com/saltstack/salt/issues/36804 .. _`#36806`: https://github.com/saltstack/salt/pull/36806 .. _`#36807`: https://github.com/saltstack/salt/pull/36807 .. _`#36808`: https://github.com/saltstack/salt/pull/36808 +.. _`#36814`: https://github.com/saltstack/salt/issues/36814 .. _`#36815`: https://github.com/saltstack/salt/pull/36815 .. _`#36820`: https://github.com/saltstack/salt/pull/36820 .. _`#36823`: https://github.com/saltstack/salt/pull/36823 @@ -646,7 +3229,9 @@ Changes: .. _`#36844`: https://github.com/saltstack/salt/pull/36844 .. _`#36852`: https://github.com/saltstack/salt/pull/36852 .. _`#36853`: https://github.com/saltstack/salt/pull/36853 +.. _`#36855`: https://github.com/saltstack/salt/issues/36855 .. _`#36857`: https://github.com/saltstack/salt/pull/36857 +.. _`#36866`: https://github.com/saltstack/salt/issues/36866 .. _`#36880`: https://github.com/saltstack/salt/pull/36880 .. _`#36885`: https://github.com/saltstack/salt/pull/36885 .. _`#36889`: https://github.com/saltstack/salt/pull/36889 @@ -654,6 +3239,7 @@ Changes: .. _`#36894`: https://github.com/saltstack/salt/pull/36894 .. _`#36897`: https://github.com/saltstack/salt/pull/36897 .. _`#36898`: https://github.com/saltstack/salt/pull/36898 +.. _`#36906`: https://github.com/saltstack/salt/issues/36906 .. _`#36912`: https://github.com/saltstack/salt/pull/36912 .. _`#36914`: https://github.com/saltstack/salt/pull/36914 .. _`#36915`: https://github.com/saltstack/salt/pull/36915 @@ -674,17 +3260,19 @@ Changes: .. _`#36958`: https://github.com/saltstack/salt/pull/36958 .. _`#36972`: https://github.com/saltstack/salt/pull/36972 .. _`#36977`: https://github.com/saltstack/salt/pull/36977 -.. _`#36980`: https://github.com/saltstack/salt/pull/36980 .. _`#36981`: https://github.com/saltstack/salt/pull/36981 .. _`#36986`: https://github.com/saltstack/salt/pull/36986 .. _`#36993`: https://github.com/saltstack/salt/pull/36993 +.. _`#37001`: https://github.com/saltstack/salt/issues/37001 .. _`#37007`: https://github.com/saltstack/salt/pull/37007 .. _`#37012`: https://github.com/saltstack/salt/pull/37012 +.. _`#37018`: https://github.com/saltstack/salt/issues/37018 .. _`#37019`: https://github.com/saltstack/salt/pull/37019 .. _`#37023`: https://github.com/saltstack/salt/pull/37023 .. _`#37025`: https://github.com/saltstack/salt/pull/37025 .. _`#37028`: https://github.com/saltstack/salt/pull/37028 .. _`#37030`: https://github.com/saltstack/salt/pull/37030 +.. _`#37037`: https://github.com/saltstack/salt/issues/37037 .. _`#37048`: https://github.com/saltstack/salt/pull/37048 .. _`#37049`: https://github.com/saltstack/salt/pull/37049 .. _`#37050`: https://github.com/saltstack/salt/pull/37050 @@ -712,6 +3300,7 @@ Changes: .. _`#37120`: https://github.com/saltstack/salt/pull/37120 .. _`#37125`: https://github.com/saltstack/salt/pull/37125 .. _`#37126`: https://github.com/saltstack/salt/pull/37126 +.. _`#37132`: https://github.com/saltstack/salt/issues/37132 .. _`#37135`: https://github.com/saltstack/salt/pull/37135 .. _`#37137`: https://github.com/saltstack/salt/pull/37137 .. _`#37139`: https://github.com/saltstack/salt/pull/37139 @@ -728,14 +3317,17 @@ Changes: .. _`#37161`: https://github.com/saltstack/salt/pull/37161 .. _`#37162`: https://github.com/saltstack/salt/pull/37162 .. _`#37163`: https://github.com/saltstack/salt/pull/37163 -.. _`#37167`: https://github.com/saltstack/salt/pull/37167 .. _`#37175`: https://github.com/saltstack/salt/pull/37175 .. _`#37178`: https://github.com/saltstack/salt/pull/37178 .. _`#37179`: https://github.com/saltstack/salt/pull/37179 +.. _`#37182`: https://github.com/saltstack/salt/issues/37182 .. _`#37183`: https://github.com/saltstack/salt/pull/37183 .. _`#37186`: https://github.com/saltstack/salt/pull/37186 .. _`#37187`: https://github.com/saltstack/salt/issues/37187 .. _`#37188`: https://github.com/saltstack/salt/pull/37188 +.. _`#37191`: https://github.com/saltstack/salt/issues/37191 +.. _`#37192`: https://github.com/saltstack/salt/issues/37192 +.. _`#37194`: https://github.com/saltstack/salt/issues/37194 .. _`#37206`: https://github.com/saltstack/salt/pull/37206 .. _`#37207`: https://github.com/saltstack/salt/pull/37207 .. _`#37208`: https://github.com/saltstack/salt/pull/37208 @@ -745,6 +3337,7 @@ Changes: .. _`#37232`: https://github.com/saltstack/salt/pull/37232 .. _`#37233`: https://github.com/saltstack/salt/pull/37233 .. _`#37234`: https://github.com/saltstack/salt/pull/37234 +.. _`#37238`: https://github.com/saltstack/salt/issues/37238 .. _`#37239`: https://github.com/saltstack/salt/pull/37239 .. _`#37244`: https://github.com/saltstack/salt/pull/37244 .. _`#37245`: https://github.com/saltstack/salt/pull/37245 @@ -753,4 +3346,180 @@ Changes: .. _`#37257`: https://github.com/saltstack/salt/pull/37257 .. _`#37259`: https://github.com/saltstack/salt/pull/37259 .. _`#37278`: https://github.com/saltstack/salt/pull/37278 +.. _`#37281`: https://github.com/saltstack/salt/issues/37281 .. _`#37282`: https://github.com/saltstack/salt/pull/37282 +.. _`#37285`: https://github.com/saltstack/salt/pull/37285 +.. _`#875`: https://github.com/saltstack/salt/issues/875 +.. _`BenoitKnecht`: https://github.com/BenoitKnecht +.. _`BretFisher`: https://github.com/BretFisher +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DavidWittman`: https://github.com/DavidWittman +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`Inveracity`: https://github.com/Inveracity +.. _`JensRantil`: https://github.com/JensRantil +.. _`Jlin317`: https://github.com/Jlin317 +.. _`Kimamisa`: https://github.com/Kimamisa +.. _`PredatorVI`: https://github.com/PredatorVI +.. _`UtahCampusD`: https://github.com/UtahCampusD +.. _`UtahDave`: https://github.com/UtahDave +.. _`aaronm-cloudtek`: https://github.com/aaronm-cloudtek +.. _`abednarik`: https://github.com/abednarik +.. _`ahammond`: https://github.com/ahammond +.. _`alertedsnake`: https://github.com/alertedsnake +.. _`alexander-bauer`: https://github.com/alexander-bauer +.. _`amendlik`: https://github.com/amendlik +.. _`amontalban`: https://github.com/amontalban +.. _`anlutro`: https://github.com/anlutro +.. _`basepi`: https://github.com/basepi +.. _`bdrung`: https://github.com/bdrung +.. _`bl4ckcontact`: https://github.com/bl4ckcontact +.. _`bobrik`: https://github.com/bobrik +.. _`bx2`: https://github.com/bx2 +.. _`cable2999`: https://github.com/cable2999 +.. _`cachedout`: https://github.com/cachedout +.. _`cbuechler`: https://github.com/cbuechler +.. _`clarkperkins`: https://github.com/clarkperkins +.. _`clinta`: https://github.com/clinta +.. _`cmclaughlin`: https://github.com/cmclaughlin +.. _`cro`: https://github.com/cro +.. _`damon-atkins`: https://github.com/damon-atkins +.. _`danlsgiga`: https://github.com/danlsgiga +.. _`darkalia`: https://github.com/darkalia +.. _`davegiles`: https://github.com/davegiles +.. _`dhoffutt`: https://github.com/dhoffutt +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`do3meli`: https://github.com/do3meli +.. _`dqminh`: https://github.com/dqminh +.. _`edhgoose`: https://github.com/edhgoose +.. _`edwardsdanielj`: https://github.com/edwardsdanielj +.. _`efficks`: https://github.com/efficks +.. _`eliasp`: https://github.com/eliasp +.. _`eradman`: https://github.com/eradman +.. _`falzm`: https://github.com/falzm +.. _`fix7`: https://github.com/fix7 +.. _`frioux`: https://github.com/frioux +.. _`frogunder`: https://github.com/frogunder +.. _`galet`: https://github.com/galet +.. _`gehzumteufel`: https://github.com/gehzumteufel +.. _`gladiatr72`: https://github.com/gladiatr72 +.. _`goestin`: https://github.com/goestin +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`guettli`: https://github.com/guettli +.. _`hrumph`: https://github.com/hrumph +.. _`hu-dabao`: https://github.com/hu-dabao +.. _`hujunya`: https://github.com/hujunya +.. _`iggy`: https://github.com/iggy +.. _`isbm`: https://github.com/isbm +.. _`jackywu`: https://github.com/jackywu +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jaredhanson11`: https://github.com/jaredhanson11 +.. _`jasonrm`: https://github.com/jasonrm +.. _`jbonachera`: https://github.com/jbonachera +.. _`jelenak`: https://github.com/jelenak +.. _`jerrykan`: https://github.com/jerrykan +.. _`jf`: https://github.com/jf +.. _`jfindlay`: https://github.com/jfindlay +.. _`jizhilong`: https://github.com/jizhilong +.. _`johje349`: https://github.com/johje349 +.. _`justinta`: https://github.com/justinta +.. _`jwhite530`: https://github.com/jwhite530 +.. _`komljen`: https://github.com/komljen +.. _`kstreee`: https://github.com/kstreee +.. _`l2ol33rt`: https://github.com/l2ol33rt +.. _`lkx007`: https://github.com/lkx007 +.. _`lomeroe`: https://github.com/lomeroe +.. _`lorengordon`: https://github.com/lorengordon +.. _`martin-helmich`: https://github.com/martin-helmich +.. _`mattglv`: https://github.com/mattglv +.. _`maximeguillet`: https://github.com/maximeguillet +.. _`meaksh`: https://github.com/meaksh +.. _`mikeadamz`: https://github.com/mikeadamz +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`morganwillcock`: https://github.com/morganwillcock +.. _`mrproper`: https://github.com/mrproper +.. _`multani`: https://github.com/multani +.. _`murzick`: https://github.com/murzick +.. _`nasenbaer13`: https://github.com/nasenbaer13 +.. _`nilliams`: https://github.com/nilliams +.. _`nvtkaszpir`: https://github.com/nvtkaszpir +.. _`oba11`: https://github.com/oba11 +.. _`oliver-dungey`: https://github.com/oliver-dungey +.. _`onorua`: https://github.com/onorua +.. _`opdude`: https://github.com/opdude +.. _`orymate`: https://github.com/orymate +.. _`oz123`: https://github.com/oz123 +.. _`pass-by-value`: https://github.com/pass-by-value +.. _`pbdeuchler`: https://github.com/pbdeuchler +.. _`peter-slovak`: https://github.com/peter-slovak +.. _`phil123456`: https://github.com/phil123456 +.. _`qurczak`: https://github.com/qurczak +.. _`rallytime`: https://github.com/rallytime +.. _`rippiedoos`: https://github.com/rippiedoos +.. _`roosri`: https://github.com/roosri +.. _`saltstack/salt#18341`: https://github.com/saltstack/salt/issues/18341 +.. _`saltstack/salt#18419`: https://github.com/saltstack/salt/issues/18419 +.. _`saltstack/salt#29322`: https://github.com/saltstack/salt/pull/29322 +.. _`saltstack/salt#31240`: https://github.com/saltstack/salt/issues/31240 +.. _`saltstack/salt#31454`: https://github.com/saltstack/salt/issues/31454 +.. _`saltstack/salt#32368`: https://github.com/saltstack/salt/issues/32368 +.. _`saltstack/salt#32490`: https://github.com/saltstack/salt/issues/32490 +.. _`saltstack/salt#33536`: https://github.com/saltstack/salt/issues/33536 +.. _`saltstack/salt#35356`: https://github.com/saltstack/salt/pull/35356 +.. _`saltstack/salt#35581`: https://github.com/saltstack/salt/pull/35581 +.. _`saltstack/salt#35637`: https://github.com/saltstack/salt/pull/35637 +.. _`saltstack/salt#35683`: https://github.com/saltstack/salt/issues/35683 +.. _`saltstack/salt#35824`: https://github.com/saltstack/salt/pull/35824 +.. _`saltstack/salt#35892`: https://github.com/saltstack/salt/pull/35892 +.. _`saltstack/salt#35907`: https://github.com/saltstack/salt/pull/35907 +.. _`saltstack/salt#35916`: https://github.com/saltstack/salt/pull/35916 +.. _`saltstack/salt#35919`: https://github.com/saltstack/salt/pull/35919 +.. _`saltstack/salt#35972`: https://github.com/saltstack/salt/issues/35972 +.. _`saltstack/salt#36000`: https://github.com/saltstack/salt/pull/36000 +.. _`saltstack/salt#36030`: https://github.com/saltstack/salt/pull/36030 +.. _`saltstack/salt#36273`: https://github.com/saltstack/salt/pull/36273 +.. _`saltstack/salt#36334`: https://github.com/saltstack/salt/pull/36334 +.. _`saltstack/salt#36389`: https://github.com/saltstack/salt/pull/36389 +.. _`saltstack/salt#36435`: https://github.com/saltstack/salt/pull/36435 +.. _`saltstack/salt#36450`: https://github.com/saltstack/salt/pull/36450 +.. _`saltstack/salt#36539`: https://github.com/saltstack/salt/pull/36539 +.. _`saltstack/salt#36616`: https://github.com/saltstack/salt/pull/36616 +.. _`saltstack/salt#36618`: https://github.com/saltstack/salt/pull/36618 +.. _`saltstack/salt#36628`: https://github.com/saltstack/salt/pull/36628 +.. _`saltstack/salt#36643`: https://github.com/saltstack/salt/pull/36643 +.. _`saltstack/salt#36648`: https://github.com/saltstack/salt/pull/36648 +.. _`saltstack/salt#36718`: https://github.com/saltstack/salt/issues/36718 +.. _`saltstack/salt#36722`: https://github.com/saltstack/salt/pull/36722 +.. _`saltstack/salt#36728`: https://github.com/saltstack/salt/pull/36728 +.. _`saltstack/salt#36788`: https://github.com/saltstack/salt/issues/36788 +.. _`saltstack/salt#36925`: https://github.com/saltstack/salt/pull/36925 +.. _`saltstack/salt#36980`: https://github.com/saltstack/salt/pull/36980 +.. _`saltstack/salt#37176`: https://github.com/saltstack/salt/issues/37176 +.. _`scbunn`: https://github.com/scbunn +.. _`scubahub`: https://github.com/scubahub +.. _`sdm24`: https://github.com/sdm24 +.. _`sidcarter`: https://github.com/sidcarter +.. _`silenius`: https://github.com/silenius +.. _`sjorge`: https://github.com/sjorge +.. _`skizunov`: https://github.com/skizunov +.. _`slinn0`: https://github.com/slinn0 +.. _`ssgward`: https://github.com/ssgward +.. _`stanislavb`: https://github.com/stanislavb +.. _`starchy`: https://github.com/starchy +.. _`swiftgist`: https://github.com/swiftgist +.. _`szjur`: https://github.com/szjur +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`theredcat`: https://github.com/theredcat +.. _`ticosax`: https://github.com/ticosax +.. _`tjyang`: https://github.com/tjyang +.. _`tsaridas`: https://github.com/tsaridas +.. _`twangboy`: https://github.com/twangboy +.. _`vernondcole`: https://github.com/vernondcole +.. _`vitaliyf`: https://github.com/vitaliyf +.. _`vutny`: https://github.com/vutny +.. _`whiteinge`: https://github.com/whiteinge +.. _`wrigtim`: https://github.com/wrigtim +.. _`xbglowx`: https://github.com/xbglowx +.. _`xiaoanyunfei`: https://github.com/xiaoanyunfei +.. _`yhekma`: https://github.com/yhekma diff --git a/doc/topics/releases/2016.3.5.rst b/doc/topics/releases/2016.3.5.rst index d77a3a65e1..f2b4f7cbbe 100644 --- a/doc/topics/releases/2016.3.5.rst +++ b/doc/topics/releases/2016.3.5.rst @@ -5,17 +5,27 @@ Salt 2016.3.5 Release Notes Version 2016.3.5 is a bugfix release for :ref:`2016.3.0 `. +Statistics +========== + +- Total Merges: **190** +- Total Issue References: **112** +- Total PR References: **281** + +- Contributors: **74** (`Ch3LL`_, `DmitryKuzmenko`_, `Firewire2002`_, `Mrten`_, `Talkless`_, `TronPaul`_, `UtahDave`_, `aaronm-cloudtek`_, `alex-zel`_, `alexandr-orlov`_, `alexbleotu`_, `attiasr`_, `basepi`_, `bdrung`_, `bshelton229`_, `cachedout`_, `calve`_, `clan`_, `clinta`_, `cro`_, `dere`_, `dereckson`_, `dhaines`_, `dincamihai`_, `do3meli`_, `dragon788`_, `edgan`_, `fedusia`_, `fj40crawler`_, `genuss`_, `gtmanfred`_, `haeac`_, `heewa`_, `hu-dabao`_, `jeanpralo`_, `jfindlay`_, `jinm`_, `kevinquinnyo`_, `kontrolld`_, `laleocen`_, `lorengordon`_, `m03`_, `mcalmer`_, `mchugh19`_, `meaksh`_, `mikejford`_, `moio`_, `multani`_, `nevins-b`_, `pass-by-value`_, `rallytime`_, `rbjorklin`_, `siccrusher`_, `silenius`_, `sjmh`_, `sjorge`_, `skizunov`_, `slinn0`_, `sofixa`_, `techhat`_, `tedski`_, `terminalmage`_, `thatch45`_, `thusoy`_, `toanju`_, `tobithiel`_, `twangboy`_, `tyhunt99`_, `vutny`_, `wanparo`_, `whiteinge`_, `xiaoanyunfei`_, `yhekma`_, `zwo-bot`_) + + Security Fixes ============== -CVE-2017-5192: local_batch client external authentication not respected +**CVE-2017-5192** local_batch client external authentication not respected The ``LocalClient.cmd_batch()`` method client does not accept ``external_auth`` credentials and so access to it from salt-api has been removed for now. This vulnerability allows code execution for already-authenticated users and is only in effect when running salt-api as the ``root`` user. -CVE-2017-5200: Salt-api allows arbitrary command execution on a salt-master via +**CVE-2017-5200** Salt-api allows arbitrary command execution on a salt-master via Salt's ssh_client Users of Salt-API and salt-ssh could execute a command on the salt master via a @@ -26,7 +36,7 @@ as possible. Improved Checksum Handling in :py:func:`file.managed `, :py:func:`archive.extracted ` States ------------------------------------------------------------------------------------------------------------------------------------------------------ +===================================================================================================================================================== When the ``source_hash`` argument for these states refers to a file containing checksums, Salt now looks for checksums matching the name of the source URI, as @@ -40,1936 +50,1997 @@ A more detailed explanation of this functionality can be found in the :py:func:`file.managed ` documentation, in the section for the new ``source_hash_name`` argument. -Changes for v2016.3.4..v2016.3.5 --------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Changelog for v2016.3.4..v2016.3.5 +================================== -*Generated at: 2017-01-19T22:38:51Z* +*Generated at: 2018-05-27 05:09:33 UTC* -Statistics: +* **PR** `#38833`_: (`Ch3LL`_) add 2016.3.5 changelog to release notes + @ *2017-01-19 23:27:26 UTC* -- Total Merges: **189** -- Total Issue references: **119** -- Total PR references: **288** + * a04ab86da1 Merge pull request `#38833`_ from Ch3LL/add_release_notes_2016.3.5 -Changes: + * 374dc1ab88 skip 2016.3.5 due to :doc: references + * 31f324c4ff add 2016.3.5 changelog to release notes -- **PR** `#38812`_: (*rallytime*) Update pyobjects test to be a list - @ *2017-01-18T21:06:01Z* +* **PR** `#38812`_: (`rallytime`_) Update pyobjects test to be a list + @ *2017-01-18 21:06:01 UTC* - * d14f0c6 Merge pull request `#38812`_ from rallytime/pyobjects-test - * f3e84c1 Update pyobjects test to be a list + * d14f0c64eb Merge pull request `#38812`_ from rallytime/pyobjects-test -- **PR** `#38813`_: (*gtmanfred*) catch SIGPIPE in vmware connection - @ *2017-01-18T21:05:42Z* + * f3e84c1ab7 Update pyobjects test to be a list - - **ISSUE** `#36598`_: (*ikkaro*) CloudClient vmware driver reusing SI bug - | refs: `#38813`_ - * 50f03f8 Merge pull request `#38813`_ from gtmanfred/2016.3 - * ce3472c catch SIGPIPE in vmware connection +* **ISSUE** `#36598`_: (`ikkaro`_) CloudClient vmware driver reusing SI bug (refs: `#38813`_) -- **PR** `#38809`_: (*twangboy*) Fix get_hostname to handle longer computer names - @ *2017-01-18T19:32:00Z* +* **PR** `#38813`_: (`gtmanfred`_) catch SIGPIPE in vmware connection + @ *2017-01-18 21:05:42 UTC* - * 23b8b47 Merge pull request `#38809`_ from twangboy/fix_hostname_2016.3 - * d57a51f Fix tests for get_hostname + * 50f03f8057 Merge pull request `#38813`_ from gtmanfred/2016.3 - * 7ca3fd7 Fix get_hostname to handle longer computer names + * ce3472cec2 catch SIGPIPE in vmware connection -- **PR** `#38808`_: (*vutny*) Fix `#38388`_ - @ *2017-01-18T18:19:36Z* +* **PR** `#38809`_: (`twangboy`_) Fix get_hostname to handle longer computer names + @ *2017-01-18 19:32:00 UTC* - - **ISSUE** `#38388`_: (*johje349*) No INFO logs in minion log file - | refs: `#38808`_ - * 1033bbd Merge pull request `#38808`_ from vutny/`fix-38388`_ - * 9bd203f Fix `#38388`_ + * 23b8b47258 Merge pull request `#38809`_ from twangboy/fix_hostname_2016.3 -- **PR** `#38668`_: (*terminalmage*) Fix proposal for `#38604`_ - @ *2017-01-18T17:53:09Z* + * d57a51f9f9 Fix tests for get_hostname - - **ISSUE** `#10`_: (*thatch45*) list jobs option - * f3ae3cd Merge pull request `#38668`_ from terminalmage/issue38604 - * 0ea97cd Merge pull request `#10`_ from cachedout/pr-38668 + * 7ca3fd7484 Fix get_hostname to handle longer computer names - * db81afc Munge retcode into return data for batching +* **ISSUE** `#38388`_: (`johje349`_) No INFO logs in minion log file (refs: `#38808`_) - * a642a99 Return the ret data from batch execution instead of raw data +* **PR** `#38808`_: (`vutny`_) Fix `#38388`_ + @ *2017-01-18 18:19:36 UTC* -- **PR** `#38789`_: (*rallytime*) Update some saltenv refs to environment in salt.modules.state docs - @ *2017-01-18T15:39:22Z* + * 1033bbdde8 Merge pull request `#38808`_ from vutny/fix-38388 - - **ISSUE** `#38622`_: (*mikejford*) Incorrect saltenv argument documentation in salt.modules.state - | refs: `#38789`_ - * c6a19a9 Merge pull request `#38789`_ from rallytime/`fix-38622`_ - * af41fe0 Update some saltenv refs to environment in salt.modules.state docs + * 9bd203ffcc Fix `#38388`_ -- **PR** `#38790`_: (*cachedout*) Fix typo in pyobjects test - @ *2017-01-18T15:38:57Z* +* **ISSUE** `#38604`_: (`jsandas`_) Using "batch" with saltmod errors with "ValueError: need more than 2 values to unpack" (refs: `#38668`_) - * e0bf700 Merge pull request `#38790`_ from cachedout/fix_pyobjects_test_typo - * a66afb5 Fix typo in pyobjects test +* **PR** `#38668`_: (`terminalmage`_) Fix proposal for `#38604`_ + @ *2017-01-18 17:53:09 UTC* -- **PR** `#38792`_: (*rallytime*) Update pillar tutorial lanuage regarding pillar_opts settings - @ *2017-01-18T15:38:19Z* + * f3ae3cd5c8 Merge pull request `#38668`_ from terminalmage/issue38604 - - **ISSUE** `#38629`_: (*Arabus*) Conflicting documentation about default value of pillar_opts - | refs: `#38792`_ - * 6e9785e Merge pull request `#38792`_ from rallytime/`fix-38629`_ - * 1e125e2 Update pillar tutorial lanuage regarding pillar_opts settings + * 0ea97cdad9 Merge pull request `#10`_ from cachedout/pr-38668 -- **PR** `#38796`_: (*cachedout*) Revert "Fixed prepending of root_dir override to the other paths" - @ *2017-01-17T23:18:18Z* + * db81afc035 Munge retcode into return data for batching - - **PR** `#38707`_: (*alexbleotu*) Fixed prepending of root_dir override to the other paths - | refs: `#38796`_ - * 3417adc Merge pull request `#38796`_ from saltstack/revert-38707-root_dir_fix-gh - * cb080f3 Revert "Fixed prepending of root_dir override to the other paths" + * a642a995dc Return the ret data from batch execution instead of raw data -- **PR** `#38585`_: (*rallytime*) Follow up to PR `#38527`_ - @ *2017-01-17T18:40:01Z* +* **ISSUE** `#38622`_: (`mikejford`_) Incorrect saltenv argument documentation in salt.modules.state (refs: `#38789`_) - - **ISSUE** `#38524`_: (*rbjorklin*) salt-api seems to ignore rest_timeout since 2016.11.0 - | refs: `#38585`_ `#38527`_ - - **ISSUE** `#38479`_: (*tyeapple*) api_logfile setting takes no effect - | refs: `#38585`_ - - **PR** `#38570`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - | refs: `#38585`_ - - **PR** `#38560`_: (*Ch3LL*) fix api logfile - | refs: `#38585`_ - - **PR** `#38527`_: (*rbjorklin*) salt-api no longer forces the default timeout - | refs: `#38585`_ `#38585`_ `#38585`_ - * bab3479 Merge pull request `#38585`_ from rallytime/follow-up-38527 - * 0558720 Pylint fix: add line at end of file +* **PR** `#38789`_: (`rallytime`_) Update some saltenv refs to environment in salt.modules.state docs + @ *2017-01-18 15:39:22 UTC* - * fa01367 Keep a copy of the DEFAULT_API_OPTS and restore them after the test run + * c6a19a9e5a Merge pull request `#38789`_ from rallytime/fix-38622 - * 2ad0763 Test clean up + * af41fe0c6e Update some saltenv refs to environment in salt.modules.state docs - * fd2ee7d Add some simple unit tests for salt.config.api_config function +* **PR** `#38790`_: (`cachedout`_) Fix typo in pyobjects test + @ *2017-01-18 15:38:57 UTC* - * 3d2fefc Make sure the pidfile and log_file values are overridden by api opts + * e0bf700020 Merge pull request `#38790`_ from cachedout/fix_pyobjects_test_typo - * 1f6b540 Make sure the pidfile and log_file values are overridden by api opts + * a66afb5f0f Fix typo in pyobjects test - * 04d307f salt-api no longer forces the default timeout +* **ISSUE** `#38629`_: (`Arabus`_) Conflicting documentation about default value of pillar_opts (refs: `#38792`_) -- **PR** `#38707`_: (*alexbleotu*) Fixed prepending of root_dir override to the other paths - | refs: `#38796`_ - @ *2017-01-17T15:40:13Z* +* **PR** `#38792`_: (`rallytime`_) Update pillar tutorial lanuage regarding pillar_opts settings + @ *2017-01-18 15:38:19 UTC* - * 0fb6bb7 Merge pull request `#38707`_ from alexbleotu/root_dir_fix-gh - * 0bac8c8 Fixed prepending of root_dir override to the other paths + * 6e9785edea Merge pull request `#38792`_ from rallytime/fix-38629 -- **PR** `#38774`_: (*vutny*) DOCS: add C++ compiler installation on RHEL required for bundled 0mq - @ *2017-01-17T15:21:00Z* + * 1e125e2844 Update pillar tutorial lanuage regarding pillar_opts settings - * 96c9dc1 Merge pull request `#38774`_ from vutny/dev-test-docs - * 4620dc4 DOCS: add C++ compiler installation on RHEL required for bundled 0mq + * **PR** `saltstack/salt#38707`_: (`alexbleotu`_) Fixed prepending of root_dir override to the other paths (refs: `#38796`_) -- **PR** `#38749`_: (*vutny*) pkg build modules throw better exception message if keyid wasn't found - @ *2017-01-17T02:13:08Z* +* **PR** `#38796`_: (`cachedout`_) Revert "Fixed prepending of root_dir override to the other paths" + @ *2017-01-17 23:18:18 UTC* - * aedfbb7 Merge pull request `#38749`_ from vutny/pkg-build-better-exception-msg - * 53f2be5 pkg build modules throw better exception message if keyid wasn't found + * 3417adc617 Merge pull request `#38796`_ from saltstack/revert-38707-root_dir_fix-gh -- **PR** `#38743`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - @ *2017-01-17T01:46:01Z* + * cb080f3bbe Revert "Fixed prepending of root_dir override to the other paths" - - **ISSUE** `#20`_: (*thatch45*) Sort sys.doc output - - **ISSUE** `#19`_: (*thatch45*) Sending a faulty command kills all the minions! - - **PR** `#38731`_: (*rallytime*) Various follow up fixes - - **PR** `#38602`_: (*terminalmage*) Fix failing unit.states.boto_vpc_test.BotoVpcRouteTableTestCase.test_present_with_routes - * 8466b34 Merge pull request `#38743`_ from rallytime/merge-2016.3 - * d24776f Merge branch '2015.8' into '2016.3' +* **ISSUE** `#38524`_: (`rbjorklin`_) salt-api seems to ignore rest_timeout since 2016.11.0 (refs: `#38585`_, `#38527`_) - * 6869621 Merge pull request `#38731`_ from rallytime/merge-2015.8 +* **ISSUE** `#38479`_: (`tyeapple`_) api_logfile setting takes no effect (refs: `#38585`_) - * 9eb191b Pylint fix +* **PR** `#38585`_: (`rallytime`_) Follow up to PR `#38527`_ + @ *2017-01-17 18:40:01 UTC* - * b910499 Various follow up fixes + * **PR** `#38570`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 (refs: `#38585`_) - * e8309a6 Add release notes for 2015.8.13 + * **PR** `#38560`_: (`Ch3LL`_) fix api logfile (refs: `#38585`_) - * f881f36 Merge pull request `#20`_ from rallytime/2015.8.12_follow_up-batch-tests + * **PR** `#38527`_: (`rbjorklin`_) salt-api no longer forces the default timeout (refs: `#38585`_) - * 3428232 Clean up tests and docs for batch execution + * bab3479a3c Merge pull request `#38585`_ from rallytime/follow-up-38527 - * c80b20b Merge pull request `#19`_ from whiteinge/batchclient + * 05587201b6 Pylint fix: add line at end of file - * 3d8f3d1 Remove batch execution from NetapiClient and Saltnado + * fa01367599 Keep a copy of the DEFAULT_API_OPTS and restore them after the test run - * 97b0f64 Lintfix + * 2ad07634d9 Test clean up - * d151666 Add explanation comment + * fd2ee7db30 Add some simple unit tests for salt.config.api_config function - * 62f2c87 Add docstring + * 3d2fefc83b Make sure the pidfile and log_file values are overriden by api opts - * 9b0a786 Explain what it is about and how to configure that + * 1f6b540e46 Make sure the pidfile and log_file values are overriden by api opts - * 5ea3579 Pick up a specified roster file from the configured locations + * 04d307f917 salt-api no longer forces the default timeout - * 3a8614c Disable custom rosters in API +* **PR** `#38707`_: (`alexbleotu`_) Fixed prepending of root_dir override to the other paths + @ *2017-01-17 15:40:13 UTC* - * c0e5a11 Add roster disable flag + * 0fb6bb7b77 Merge pull request `#38707`_ from alexbleotu/root_dir_fix-gh - * e9c59e9 Merge pull request `#38602`_ from terminalmage/fix-boto-test + * 0bac8c8be3 Fixed prepending of root_dir override to the other paths - * 3424a10 Fix failing unit.states.boto_vpc_test.BotoVpcRouteTableTestCase.test_present_with_routes +* **PR** `#38774`_: (`vutny`_) DOCS: add C++ compiler installation on RHEL required for bundled 0mq + @ *2017-01-17 15:21:00 UTC* -- **PR** `#38723`_: (*rallytime*) Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py - @ *2017-01-15T18:36:14Z* + * 96c9dc10f7 Merge pull request `#38774`_ from vutny/dev-test-docs - - **ISSUE** `#38674`_: (*jackywu*) There is no code to use parameter 'event_publisher_pub_hwm' in saltstack-2016.3 - | refs: `#38723`_ - - **PR** `#29294`_: (*skizunov*) ZeroMQ no longer required when transport is TCP - | refs: `#38723`_ `#38723`_ - * a642cde Merge pull request `#38723`_ from rallytime/`fix-38674`_ - * 706c885 Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py + * 4620dc4afa DOCS: add C++ compiler installation on RHEL required for bundled 0mq -- **PR** `#38669`_: (*rallytime*) Update bootstrap script verstion to latest release - @ *2017-01-15T18:03:27Z* +* **PR** `#38749`_: (`vutny`_) pkg build modules throw better exception message if keyid wasn't found + @ *2017-01-17 02:13:08 UTC* - * fc545af Merge pull request `#38669`_ from rallytime/update-bootstrap-script - * 78ba76e Update bootstrap script verstion to latest release + * aedfbb7a43 Merge pull request `#38749`_ from vutny/pkg-build-better-exception-msg -- **PR** `#38693`_: (*twangboy*) Update jinja2 to 2.9.4 - @ *2017-01-15T14:40:46Z* + * 53f2be5b21 pkg build modules throw better exception message if keyid wasn't found - * 50d417f Merge pull request `#38693`_ from twangboy/update_jinja - * e0c7e55 Update jinja2 to 2.9.4 +* **PR** `#38743`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2017-01-17 01:46:01 UTC* -- **PR** `#38739`_: (*vutny*) DOCS: correct examples of running test suite - @ *2017-01-15T14:35:47Z* + * 8466b34e82 Merge pull request `#38743`_ from rallytime/merge-2016.3 - * f4233bb Merge pull request `#38739`_ from vutny/fix-runtests-doc - * b872bb6 DOCS: correct examples of running test suite + * d24776f5e9 Merge branch '2015.8' into '2016.3' -* 51d4707 DOCS: add links to File State Backups page where necessary (`#38735`_) + * 6869621ed1 Merge pull request `#38731`_ from rallytime/merge-2015.8 - - **PR** `#38735`_: (*vutny*) DOCS: add links to File State Backups page where necessary + * 9eb191b6ac Pylint fix -* 6d3717b Proofread jinja_to_execution_module tutorial (`#38720`_) + * b910499dbe Various follow up fixes - - **PR** `#38720`_: (*dereckson*) Proofread jinja_to_execution_module tutorial + * e8309a6bbf Add release notes for 2015.8.13 -- **PR** `#38647`_: (*gtmanfred*) Allow novaclient to use keystoneauth1 sessions for authentication - @ *2017-01-10T17:48:26Z* + * f881f366b7 Merge pull request `#20`_ from rallytime/2015.8.12_follow_up-batch-tests - - **ISSUE** `#36548`_: (*abonillasuse*) openstack auth with nova driver - | refs: `#38647`_ - * 7b850d4 Merge pull request `#38647`_ from gtmanfred/nova - * 5be9b60 add documentation about using keystoneauth for v3 + * 34282322c0 Clean up tests and docs for batch execution - * 7b657ca add the ability to use keystone v2 and v3 + * c80b20b957 Merge pull request `#19`_ from whiteinge/batchclient - * 5646ae1 add ability to use keystoneauth to authenitcate in nova driver + * 3d8f3d18f6 Remove batch execution from NetapiClient and Saltnado -- **PR** `#38650`_: (*rallytime*) Remove the installation instructions for out-of-date community ppa - @ *2017-01-10T17:47:45Z* + * 97b0f64923 Lintfix - - **ISSUE** `#38648`_: (*ericuldall*) No release file error from PPA on Ubuntu - | refs: `#38650`_ - - **ISSUE** `#38572`_: (*COLABORATI*) ppa:saltstack/salt failure - | refs: `#38650`_ - - **ISSUE** `#34504`_: (*AvinashDeluxeVR*) Installation documentation for Ubuntu server and Windows minion leads the user to use different salt versions. - | refs: `#38650`_ - * 383768d Merge pull request `#38650`_ from rallytime/remove-ubuntu-ppa-docs - * 30429b2 Remove the installation instructions for out-of-date community ppa + * d1516664f7 Add explanation comment -- **PR** `#38657`_: (*DmitryKuzmenko*) Publish the 'data' field content for Syndic evets - @ *2017-01-10T16:59:33Z* + * 62f2c87080 Add docstring - - **ISSUE** `#38087`_: (*UtahDave*) The 'data' field in the return from a minion below a syndic is wrapped in an extra 'data' field. - | refs: `#38657`_ - * 7d9f56e Merge pull request `#38657`_ from DSRCorporation/bugs/38087_syndic_event_format_fix - * 594c33f Publish the 'data' field content for Syndic evets + * 9b0a786aeb Explain what it is about and how to configure that -- **PR** `#38649`_: (*Ch3LL*) fix unit.modules.file_test - @ *2017-01-10T16:44:45Z* + * 5ea3579e10 Pick up a specified roster file from the configured locations - * 8398751 Merge pull request `#38649`_ from Ch3LL/test_apply_template - * 47f8b68 fix unit.modules.file_test + * 3a8614c5df Disable custom rosters in API -- **PR** `#38626`_: (*cachedout*) Revert "Fix/workaround for issue `#37355`_" - @ *2017-01-06T21:28:09Z* + * c0e5a1171d Add roster disable flag - - **ISSUE** `#37355`_: (*Firewire2002*) salt-ssh - ImportError: No module named backports.ssl_match_hostname - | refs: `#37358`_ - - **ISSUE** `#34600`_: (*davidpsv17*) Error trying a salt-ssh test.ping - | refs: `#37358`_ - - **ISSUE** `#27355`_: (*jerob*) salt ssh error with debian 7 on target - | refs: `#37358`_ - - **PR** `#37358`_: (*Firewire2002*) Fix/workaround for issue `#37355`_ - | refs: `#38626`_ - * 74ddc71 Merge pull request `#38626`_ from saltstack/revert-37358-2016.3.3_issue37355 - * e912ac9 Revert "Fix/workaround for issue `#37355`_" + * e9c59e9b8f Merge pull request `#38602`_ from terminalmage/fix-boto-test -- **PR** `#37358`_: (*Firewire2002*) Fix/workaround for issue `#37355`_ - | refs: `#38626`_ - @ *2017-01-06T18:58:47Z* + * 3424a108ac Fix failing unit.states.boto_vpc_test.BotoVpcRouteTableTestCase.test_present_with_routes - - **ISSUE** `#37355`_: (*Firewire2002*) salt-ssh - ImportError: No module named backports.ssl_match_hostname - | refs: `#37358`_ - - **ISSUE** `#34600`_: (*davidpsv17*) Error trying a salt-ssh test.ping - | refs: `#37358`_ - - **ISSUE** `#27355`_: (*jerob*) salt ssh error with debian 7 on target - | refs: `#37358`_ - * 5e58b32 Merge pull request `#37358`_ from Firewire2002/2016.3.3_issue37355 - * 910da18 fixed typo +* **ISSUE** `#38674`_: (`jackywu`_) There is no code to use parameter 'event_publisher_pub_hwm' in saltstack-2016.3 (refs: `#38723`_) - * 4fbc5dd fixed wrong renamed variable and spaces +* **PR** `#38723`_: (`rallytime`_) Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py + @ *2017-01-15 18:36:14 UTC* - * 92366e6 issue `#37355`_ + * **PR** `#29294`_: (`skizunov`_) ZeroMQ no longer required when transport is TCP (refs: `#38723`_) - * 7dc87ab issue `#37355`_ + * a642cdef79 Merge pull request `#38723`_ from rallytime/fix-38674 - * 2878180 issue `#37355`_ + * 706c885f55 Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py -- **PR** `#35390`_: (*alexandr-orlov*) Returns back missed proper grains dictionary for file module - @ *2017-01-06T18:02:13Z* +* **PR** `#38669`_: (`rallytime`_) Update bootstrap script verstion to latest release + @ *2017-01-15 18:03:27 UTC* - * 6c2fe61 Merge pull request `#35390`_ from alexandr-orlov/2016.3 - * cd5ae17 fxd missed proper grains dictionary + * fc545af10b Merge pull request `#38669`_ from rallytime/update-bootstrap-script -- **PR** `#38618`_: (*rallytime*) Back-port `#38579`_ to 2016.3 - @ *2017-01-06T17:37:56Z* + * 78ba76e34c Update bootstrap script verstion to latest release - - **ISSUE** `#38558`_: (*multani*) pillar.get("...", default=var, merge=true) updates default value - | refs: `#38579`_ `#38579`_ - - **PR** `#38579`_: (*zwo-bot*) Fix `#38558`_ - pillar.get with default= ...,merge=true influence subsequent calls of pillar.get - | refs: `#38618`_ - * 2579cfa Merge pull request `#38618`_ from rallytime/`bp-38579`_ - * 2052ece Add copy import +* **PR** `#38693`_: (`twangboy`_) Update jinja2 to 2.9.4 + @ *2017-01-15 14:40:46 UTC* - * 2c8845a add test for pillar.get() + default value + * 50d417f267 Merge pull request `#38693`_ from twangboy/update_jinja - * c2f98d2 ticket 38558: add unit test, deepcopy() only if necessary + * e0c7e5549b Update jinja2 to 2.9.4 - * 30ae0a1 added deepcopy of default if merge=True +* **PR** `#38739`_: (`vutny`_) DOCS: correct examples of running test suite + @ *2017-01-15 14:35:47 UTC* -- **PR** `#38601`_: (*terminalmage*) pillar.get: Raise exception when merge=True and default is not a dict - @ *2017-01-05T23:15:51Z* + * f4233bb18d Merge pull request `#38739`_ from vutny/fix-runtests-doc - * da676ce Merge pull request `#38601`_ from terminalmage/pillar-get - * 8613d72 pillar.get: Raise exception when merge=True and default is not a dict + * b872bb63f6 DOCS: correct examples of running test suite -- **PR** `#38600`_: (*terminalmage*) Avoid errors when sudo_user is set (2016.3 branch) - @ *2017-01-05T20:57:09Z* + * **PR** `#38735`_: (`vutny`_) DOCS: add links to File State Backups page where necessary - - **PR** `#38598`_: (*terminalmage*) Avoid errors when sudo_user is set - | refs: `#38600`_ - * 224fc77 Merge pull request `#38600`_ from terminalmage/issue38459-2016.3 - * 8a45b13 Avoid errors when sudo_user is set + * **PR** `#38720`_: (`dereckson`_) Proofread jinja_to_execution_module tutorial -- **PR** `#38589`_: (*tobithiel*) State Gem: fix incorrect warning about missing rvm/rbenv - @ *2017-01-05T20:12:15Z* +* **ISSUE** `#36548`_: (`abonillasuse`_) openstack auth with nova driver (refs: `#38647`_) - * a376970 Merge pull request `#38589`_ from tobithiel/fix_rvm_rbenv_warning - * 9ec470b State Gem: fix incorrect warning about missing rvm/rbenv +* **PR** `#38647`_: (`gtmanfred`_) Allow novaclient to use keystoneauth1 sessions for authentication + @ *2017-01-10 17:48:26 UTC* -- **PR** `#38567`_: (*pass-by-value*) Create queue if one doesn't exist - @ *2017-01-05T18:46:11Z* + * 7b850d472d Merge pull request `#38647`_ from gtmanfred/nova - * 02e6a78 Merge pull request `#38567`_ from pass-by-value/pgjsonb_queue_changes_2016.3 - * 67879eb Create queue if one doesn't exist + * 5be9b60851 add documentation about using keystoneauth for v3 -- **PR** `#38587`_: (*rallytime*) Change daemontools __virtualname__ from service to daemontools - @ *2017-01-05T18:06:01Z* + * 7b657ca4ae add the ability to use keystone v2 and v3 - - **ISSUE** `#37498`_: (*githubcdr*) service.restart salt-minion fails on Ubuntu 14.04.5 LTS - | refs: `#37748`_ `#38587`_ - * 0889cbd Merge pull request `#38587`_ from rallytime/`fix-37498`_ - * 2a58809 Change daemontools __virtualname__ from service to daemontools + * 5646ae1b34 add ability to use keystoneauth to authenitcate in nova driver -- **PR** `#38562`_: (*rallytime*) Update arch installation docs with correct package name - @ *2017-01-04T20:04:28Z* +* **ISSUE** `#38648`_: (`ericuldall`_) No release file error from PPA on Ubuntu (refs: `#38650`_) - * 7b74436 Merge pull request `#38562`_ from rallytime/arch-install-docs - * 8b1897a Update arch installation docs with correct package name +* **ISSUE** `#38572`_: (`COLABORATI`_) ppa:saltstack/salt failure (refs: `#38650`_) -- **PR** `#38560`_: (*Ch3LL*) fix api logfile - | refs: `#38585`_ - @ *2017-01-04T19:03:17Z* +* **ISSUE** `#34504`_: (`AvinashDeluxeVR`_) Installation documentation for Ubuntu server and Windows minion leads the user to use different salt versions. (refs: `#38650`_) - * 0186070 Merge pull request `#38560`_ from Ch3LL/fix_api_log - * 1b45e96 fix api logfile +* **PR** `#38650`_: (`rallytime`_) Remove the installation instructions for out-of-date community ppa + @ *2017-01-10 17:47:45 UTC* -- **PR** `#38531`_: (*rallytime*) Back-port `#33601`_ to 2016.3 - @ *2017-01-04T16:56:53Z* + * 383768d838 Merge pull request `#38650`_ from rallytime/remove-ubuntu-ppa-docs - - **PR** `#33601`_: (*mchugh19*) Fix slack engine to run on python2.6 - | refs: `#38531`_ - * 0056620 Merge pull request `#38531`_ from rallytime/`bp-33601`_ - * c36cb39 remove the unnecessary double trigger + * 30429b2e44 Remove the installation instructions for out-of-date community ppa - * 3841449 fix spacing lint error +* **ISSUE** `#38087`_: (`UtahDave`_) The 'data' field in the return from a minion below a syndic is wrapped in an extra 'data' field. (refs: `#38657`_) - * 8c1defc Remove uncessary type from alias commands. Deduplicate alias handling to autodetect function selection. Add error reporting to slack connectivty problems. Cleanup slack's unicode conversion +* **PR** `#38657`_: (`DmitryKuzmenko`_) Publish the 'data' field content for Syndic evets + @ *2017-01-10 16:59:33 UTC* - * c2f23bc Fix slack engine to run on python2.6 + * 7d9f56e3b5 Merge pull request `#38657`_ from DSRCorporation/bugs/38087_syndic_event_format_fix -- **PR** `#38541`_: (*techhat*) Strip user:pass from cached URLs - @ *2017-01-04T15:39:57Z* + * 594c33f396 Publish the 'data' field content for Syndic evets - - **ISSUE** `#38187`_: (*curiositycasualty*) username/password saved as cleartext when using URIs with user:pass@ format - | refs: `#38541`_ - * 50242c7 Merge pull request `#38541`_ from techhat/issue38187 - * eae3a43 Strip user:pass from cached URLs +* **PR** `#38649`_: (`Ch3LL`_) fix unit.modules.file_test + @ *2017-01-10 16:44:45 UTC* -- **PR** `#38554`_: (*multani*) Fix YAML deserialization of unicode - @ *2017-01-04T15:31:16Z* + * 83987511fd Merge pull request `#38649`_ from Ch3LL/test_apply_template - - **ISSUE** `#30454`_: (*favoretti*) Using yaml serializer inside jinja template results in unicode being prepended by '!!python/unicode' - | refs: `#38554`_ `#38554`_ `#30481`_ - - **PR** `#30481`_: (*basepi*) Add yaml_safe jinja filter - | refs: `#38554`_ - * 325dc56 Merge pull request `#38554`_ from multani/fix/30454 - * 2e7f743 yaml: support unicode serialization/deserialization + * 47f8b68e0b fix unit.modules.file_test - * df76113 jinja: test the "yaml" filter with ordered dicts +* **ISSUE** `#37355`_: (`Firewire2002`_) salt-ssh - ImportError: No module named backports.ssl_match_hostname (refs: `#38626`_, #`saltstack/salt`#37358`_`_, `#37358`_) - * f7712d4 Revert "Add yaml_safe filter" +* **ISSUE** `#34600`_: (`davidpsv17`_) Error trying a salt-ssh test.ping (refs: #`saltstack/salt`#37358`_`_, `#37358`_) -* 4ddbc2e add note about pyVmomi locale workaround (`#38536`_) +* **ISSUE** `#27355`_: (`jerob`_) salt ssh error with debian 7 on target (refs: #`saltstack/salt`#37358`_`_, `#37358`_) - - **PR** `#38536`_: (*UtahDave*) add note about pyVmomi locale workaround + * **PR** `saltstack/salt#37358`_: (`Firewire2002`_) Fix/workaround for issue `#37355`_ (refs: `#38626`_) -* 1c951d1 fix gce image bug (`#38542`_) +* **PR** `#38626`_: (`cachedout`_) Revert "Fix/workaround for issue `#37355`_" + @ *2017-01-06 21:28:09 UTC* - - **ISSUE** `#38353`_: (*Ch3LL*) salt-cloud gce specifying - | refs: `#38542`_ `#38542`_ - - **PR** `#38542`_: (*Ch3LL*) fix gce image bug + * 74ddc71be3 Merge pull request `#38626`_ from saltstack/revert-37358-2016.3.3_issue37355 -- **PR** `#38487`_: (*gtmanfred*) Fix crontab issues with spaces - @ *2017-01-01T20:33:29Z* + * e912ac99c2 Revert "Fix/workaround for issue `#37355`_" - - **ISSUE** `#38449`_: (*swalladge*) Parsing issues in `list_tab` (salt/modules/cron.py) - | refs: `#38487`_ - * ec60f9c Merge pull request `#38487`_ from gtmanfred/2016.3 - * 048b9f6 add test +* **ISSUE** `#37355`_: (`Firewire2002`_) salt-ssh - ImportError: No module named backports.ssl_match_hostname (refs: `#38626`_, #`saltstack/salt`#37358`_`_, `#37358`_) - * c480c11 allow spaces in cron env +* **ISSUE** `#34600`_: (`davidpsv17`_) Error trying a salt-ssh test.ping (refs: #`saltstack/salt`#37358`_`_, `#37358`_) - * c529ec8 allow crons to have multiple spaces +* **ISSUE** `#27355`_: (`jerob`_) salt ssh error with debian 7 on target (refs: #`saltstack/salt`#37358`_`_, `#37358`_) -- **PR** `#38491`_: (*gtmanfred*) Use UTC for timing in case timezone changes - @ *2017-01-01T20:30:57Z* +* **PR** `#37358`_: (`Firewire2002`_) Fix/workaround for issue `#37355`_ + @ *2017-01-06 18:58:47 UTC* - - **ISSUE** `#37684`_: (*thusoy*) State execution duration is timezone-dependent - | refs: `#38491`_ - * c5ba11b Merge pull request `#38491`_ from gtmanfred/timing - * 79368c7 Use UTC for timing in case timezone changes + * 5e58b32934 Merge pull request `#37358`_ from Firewire2002/2016.3.3_issue37355 -- **PR** `#38503`_: (*jinm*) Hash type fallback for file management - @ *2017-01-01T17:36:51Z* + * 910da18bfd fixed typo - - **ISSUE** `#38472`_: (*jinm*) file.managed Unable to manage file: 'hash_type' (2016.3.4) - | refs: `#38503`_ - * 86f0aa0 Merge pull request `#38503`_ from jinm/issue_38472_jinm - * 0cd9df2 Hash type fallback for file management + * 4fbc5ddd06 fixed wrong renamed variable and spaces -- **PR** `#38457`_: (*bshelton229*) Stops git.latest checking for local changes in a bare repo - @ *2016-12-30T14:28:47Z* + * 92366e646c issue `#37355`_ - * ed2ba4b Merge pull request `#38457`_ from bshelton229/git-latest-head-bug - * 558e7a7 Stops git.latest checking for local changes in a bare repo + * 7dc87ab7b8 issue `#37355`_ -- **PR** `#38385`_: (*dragon788*) Use unambigous long names with double dashes - @ *2016-12-29T17:10:48Z* + * 2878180405 issue `#37355`_ - * 36e21b2 Merge pull request `#38385`_ from dragon788/2016.3-double-dash - * 86c4b56 Newline for lint compat +* **PR** `#35390`_: (`alexandr-orlov`_) Returns back missed proper grains dictionary for file module + @ *2017-01-06 18:02:13 UTC* - * 9d9b686 Address review comments, consistency of quotes + * 6c2fe615aa Merge pull request `#35390`_ from alexandr-orlov/2016.3 - * df9bd5e Use unambigous long names with double dashes + * cd5ae17e8d fxd missed proper grains dictionary -- **PR** `#38474`_: (*cachedout*) Allow an existing ioloop to be passed to salt-key - @ *2016-12-29T16:28:51Z* +* **ISSUE** `#38558`_: (`multani`_) pillar.get("...", default=var, merge=true) updates default value (refs: `#38579`_) - - **ISSUE** `#38209`_: (*limited*) Accepting a minion causes tornado to exit - | refs: `#38474`_ - * 59f2560 Merge pull request `#38474`_ from cachedout/key_loop - * de50453 Allow an existing ioloop to be passed to salt-key +* **PR** `#38618`_: (`rallytime`_) Back-port `#38579`_ to 2016.3 + @ *2017-01-06 17:37:56 UTC* -- **PR** `#38467`_: (*gtmanfred*) file.line fail with mode=delete - @ *2016-12-28T20:00:33Z* + * **PR** `#38579`_: (`zwo-bot`_) Fix `#38558`_ - pillar.get with default= ...,merge=true influence subsequent calls of pillar.get (refs: `#38618`_) - - **ISSUE** `#38438`_: (*jf*) file.line with mode=delete breaks on empty file - | refs: `#38467`_ - * 3d0c752 Merge pull request `#38467`_ from gtmanfred/2016.3 - * 7b7c6b3 file.line fail with mode=delete + * 2579cfa42d Merge pull request `#38618`_ from rallytime/bp-38579 -- **PR** `#38434`_: (*slinn0*) Make sysctl.persist fail when failing to set a value into the running kernel - @ *2016-12-27T15:37:53Z* + * 2052ecee2c Add copy import - * 940025d Merge pull request `#38434`_ from slinn0/issue_38433_fixes - * 22af87a Fixes for https://github.com/saltstack/salt/issues/38433 + * 2c8845aaa0 add test for pillar.get() + default value -* e5eb512 Update deprecation notices to the correct version (`#38421`_) + * c2f98d2f04 ticket 38558: add unit test, deepcopy() only if necessary - - **PR** `#38421`_: (*rallytime*) Update deprecation notices to the correct version - - **PR** `#38420`_: (*rallytime*) Removed various deprecation notices from salt/modules/* files - | refs: `#38421`_ + * 30ae0a1958 added deepcopy of default if merge=True -* 9ce5331 file.managed: Fix failure when filename contains unicode chars (`#38415`_) +* **PR** `#38601`_: (`terminalmage`_) pillar.get: Raise exception when merge=True and default is not a dict + @ *2017-01-05 23:15:51 UTC* - - **ISSUE** `#38282`_: (*sash-kan*) file.managed fails when file (which contains utf-characters in the name) exists - | refs: `#38415`_ - - **PR** `#38415`_: (*terminalmage*) file.managed: Fix failure when filename contains unicode chars + * da676cebd6 Merge pull request `#38601`_ from terminalmage/pillar-get -- **PR** `#38419`_: (*Ch3LL*) fix scsci docs example - @ *2016-12-22T18:57:51Z* + * 8613d7254d pillar.get: Raise exception when merge=True and default is not a dict - * 2cdb59d Merge pull request `#38419`_ from Ch3LL/fix_doc_scsi - * 234043b fix scsci docs example +* **PR** `#38600`_: (`terminalmage`_) Avoid errors when sudo_user is set (2016.3 branch) + @ *2017-01-05 20:57:09 UTC* -* 2725352 Improve pillar documentation (`#38407`_) + * **PR** `#38598`_: (`terminalmage`_) Avoid errors when sudo_user is set (refs: `#38600`_) - - **PR** `#38407`_: (*terminalmage*) Improve pillar documentation + * 224fc7712a Merge pull request `#38600`_ from terminalmage/issue38459-2016.3 -- **PR** `#38398`_: (*terminalmage*) Fix call to file.get_managed in cron.file state - @ *2016-12-22T16:46:14Z* + * 8a45b13e76 Avoid errors when sudo_user is set - - **ISSUE** `#38372`_: (*fanirama*) Issue with cron.file. Source: salt://path/to/crontab_file not found - | refs: `#38398`_ - * 423b1fd Merge pull request `#38398`_ from terminalmage/issue38372 - * c80dbaa Fix call to file.get_managed in cron.file state +* **PR** `#38589`_: (`tobithiel`_) State Gem: fix incorrect warning about missing rvm/rbenv + @ *2017-01-05 20:12:15 UTC* -* 5a33d1e Fix http.query when result has no text (`#38382`_) + * a376970f88 Merge pull request `#38589`_ from tobithiel/fix_rvm_rbenv_warning - - **PR** `#38382`_: (*heewa*) Fix http.query when result has no text + * 9ec470b4a5 State Gem: fix incorrect warning about missing rvm/rbenv -- **PR** `#38390`_: (*meaksh*) Add "try-restart" to fix autorestarting on SUSE systems - @ *2016-12-21T16:06:24Z* +* **PR** `#38567`_: (`pass-by-value`_) Create queue if one doesn't exist + @ *2017-01-05 18:46:11 UTC* - * b74b5c7 Merge pull request `#38390`_ from meaksh/2016.3-fix-try-restart-for-autorestarting-on-SUSE-systems - * de6ec05 add try-restart to fix autorestarting on SUSE systems + * 02e6a78254 Merge pull request `#38567`_ from pass-by-value/pgjsonb_queue_changes_2016.3 -- **PR** `#38221`_: (*UtahDave*) Fix default returner - @ *2016-12-20T20:34:36Z* + * 67879ebe65 Create queue if one doesn't exist - * 2c3a397 Merge pull request `#38221`_ from UtahDave/fix_default_returner - * 3856407 remove a blank line to satisfy linter +* **ISSUE** `#37498`_: (`githubcdr`_) service.restart salt-minion fails on Ubuntu 14.04.5 LTS (refs: `#37748`_, `#38587`_) - * 9c248aa validate return opt, remove default. +* **PR** `#38587`_: (`rallytime`_) Change daemontools __virtualname__ from service to daemontools + @ *2017-01-05 18:06:01 UTC* - * 8bb37f9 specify allowed types and default for "returner" + * 0889cbdb31 Merge pull request `#38587`_ from rallytime/fix-37498 - * 11863a4 add examples of default minion returners + * 2a5880966f Change daemontools __virtualname__ from service to daemontools - * e7c6012 add support for default returners using `return` +* **PR** `#38562`_: (`rallytime`_) Update arch installation docs with correct package name + @ *2017-01-04 20:04:28 UTC* -- **PR** `#38288`_: (*terminalmage*) archive.extracted: don't try to cache local sources (2016.3 branch) - @ *2016-12-18T13:07:11Z* + * 7b74436d13 Merge pull request `#38562`_ from rallytime/arch-install-docs - * 09d9cff Merge pull request `#38288`_ from terminalmage/archive-extracted-local-source-2016.3 - * 845e3d0 Update tests to reflect change in cache behavior + * 8b1897ace9 Update arch installation docs with correct package name - * 5a08d7c archive.extracted: don't try to cache local sources (2016.3 branch) +* **PR** `#38560`_: (`Ch3LL`_) fix api logfile (refs: `#38585`_) + @ *2017-01-04 19:03:17 UTC* -- **PR** `#38312`_: (*cro*) Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy - @ *2016-12-18T12:39:01Z* + * 01860702cb Merge pull request `#38560`_ from Ch3LL/fix_api_log - * bf37667 Merge pull request `#38312`_ from cro/proxy_config_in_cfg - * 2006c40 Typo + * 1b45e9670b fix api logfile - * 689d95b Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy. +* **PR** `#38531`_: (`rallytime`_) Back-port `#33601`_ to 2016.3 + @ *2017-01-04 16:56:53 UTC* -- **PR** `#38320`_: (*rallytime*) Cleanup doc internal markup references - @ *2016-12-18T12:31:28Z* + * **PR** `#33601`_: (`mchugh19`_) Fix slack engine to run on python2.6 (refs: `#38531`_) - - **ISSUE** `#12788`_: (*whiteinge*) Comb through docs to replace :doc: roles with :ref: - | refs: `#38320`_ - * c83db5a Merge pull request `#38320`_ from rallytime/cleanup-doc-refs - * 62978cb Don't check the doc/conf.py file for doc markup refs + * 0056620a53 Merge pull request `#38531`_ from rallytime/bp-33601 - * 770e732 Add a unit test to search for new doc markup refs + * c36cb39825 remove the unnecessary double trigger - * 5c42a36 Remove ":doc:" references from all doc/topics/installation/* files + * 38414493bf fix spacing lint error - * 23bce1c Remove ":doc:" references from all doc/topics/releases/* files + * 8c1defc710 Remove uncessary type from alias commands. Deduplicate alias handling to autodetect function selection. Add error reporting to slack connectivty problems. Cleanup slack's unicode conversion - * 4aafa41 Remove ":doc:" references from a bunch of doc/* files + * c2f23bc45e Fix slack engine to run on python2.6 - * 02bfe79 Remove more ":doc:" references from doc/* files +* **ISSUE** `#38187`_: (`curiositycasualty`_) username/password saved as cleartext when using URIs with user:pass@ format (refs: `#38541`_) - * 6e32267 Remove ":doc:" references in salt/* files +* **PR** `#38541`_: (`techhat`_) Strip user:pass from cached URLs + @ *2017-01-04 15:39:57 UTC* -* 6367ca7 Add nick to args for create_multi (`#38281`_) + * 50242c7f17 Merge pull request `#38541`_ from techhat/issue38187 - - **PR** `#38281`_: (*mikejford*) Add nick to args for create_multi + * eae3a435dd Strip user:pass from cached URLs -- **PR** `#38313`_: (*dragon788*) 2016.3 chocolatey fix - @ *2016-12-16T17:20:39Z* +* **ISSUE** `#30454`_: (`favoretti`_) Using yaml serializer inside jinja template results in unicode being prepended by '!!python/unicode' (refs: `#30481`_, `#38554`_) - - **ISSUE** `#38290`_: (*dragon788*) Need to use machine automation friendly output - | refs: `#38313`_ - * 235682b Merge pull request `#38313`_ from dragon788/2016.3-chocolatey-fix - * 1f5fc17 Use machine readable output for list +* **PR** `#38554`_: (`multani`_) Fix YAML deserialization of unicode + @ *2017-01-04 15:31:16 UTC* - * cdbd2fb Added limit-output to eliminate false packages + * **PR** `#30481`_: (`basepi`_) Add yaml_safe jinja filter (refs: `#38554`_) -- **PR** `#38279`_: (*rallytime*) Add docs for syndic_wait setting - @ *2016-12-15T18:30:31Z* + * 325dc56e59 Merge pull request `#38554`_ from multani/fix/30454 - - **ISSUE** `#38174`_: (*NickDubelman*) [syndic] Why can't a syndic node signal when all of it's minions have returned? - | refs: `#38279`_ - - **ISSUE** `#32400`_: (*rallytime*) Document Default Config Values - | refs: `#38279`_ - * 9e78ddc Merge pull request `#38279`_ from rallytime/`fix-38174`_ - * 4a62d01 Add docs for syndic_wait setting + * 2e7f743371 yaml: support unicode serialization/deserialization -- **PR** `#38248`_: (*meaksh*) Successfully exit of salt-api child processes when SIGTERM is received - @ *2016-12-15T09:16:27Z* + * df76113c5c jinja: test the "yaml" filter with ordered dicts - * fc9e1df Merge pull request `#38248`_ from meaksh/salt-api-successfully-close-child-processes - * ee6eae9 Successfully exit of salt-api child processes when SIGTERM. + * f7712d417f Revert "Add yaml_safe filter" -- **PR** `#38254`_: (*terminalmage*) Also check if pillarenv is in opts - @ *2016-12-15T09:10:24Z* + * **PR** `#38536`_: (`UtahDave`_) add note about pyVmomi locale workaround - * 3c718ed Merge pull request `#38254`_ from terminalmage/check-pillarenv - * fa9ad31 Also check if pillarenv is in opts +* **ISSUE** `#38353`_: (`Ch3LL`_) salt-cloud gce specifying (refs: `#38542`_) -* 6b9060c [2016.3] Bump latest release version to 2016.11.1 (`#38256`_) + * **PR** `#38542`_: (`Ch3LL`_) fix gce image bug - - **PR** `#38256`_: (*rallytime*) [2016.3] Bump latest release version to 2016.11.1 +* **ISSUE** `#38449`_: (`swalladge`_) Parsing issues in `list_tab` (salt/modules/cron.py) (refs: `#38487`_) -- **PR** `#38198`_: (*vutny*) Add missing requirements for running unit tests: libcloud and boto3 - @ *2016-12-13T14:12:20Z* +* **PR** `#38487`_: (`gtmanfred`_) Fix crontab issues with spaces + @ *2017-01-01 20:33:29 UTC* - * 004e46a Merge pull request `#38198`_ from vutny/unit-tests-require-libcloud-boto3 - * a6098ba Remove note about SaltTesting installation, now it is in the requirements + * ec60f9c721 Merge pull request `#38487`_ from gtmanfred/2016.3 - * 004bff1 Add missing requirements for running unit tests: libcloud and boto3 + * 048b9f6b9d add test -- **PR** `#38213`_: (*rallytime*) Skip test_cert_info tls unit test on pyOpenSSL upstream errors - @ *2016-12-13T12:05:01Z* + * c480c11528 allow spaces in cron env - * 9d497bc Merge pull request `#38213`_ from rallytime/skip-tls-test - * bdb807f Skip test_cert_info tls unit test on pyOpenSSL upstream errors + * c529ec8c34 allow crons to have multiple spaces -- **PR** `#38224`_: (*whiteinge*) Allow CORS OPTIONS requests to be unauthenticated - @ *2016-12-13T12:02:30Z* +* **ISSUE** `#37684`_: (`thusoy`_) State execution duration is timezone-dependent (refs: `#38491`_) - * 203109d Merge pull request `#38224`_ from whiteinge/cors-options-unauthed - * de4d322 Allow CORS OPTIONS requests to be unauthenticated +* **PR** `#38491`_: (`gtmanfred`_) Use UTC for timing in case timezone changes + @ *2017-01-01 20:30:57 UTC* -- **PR** `#38223`_: (*whiteinge*) Add root_dir to salt-api file paths - @ *2016-12-13T07:44:19Z* + * c5ba11b5e0 Merge pull request `#38491`_ from gtmanfred/timing - - **PR** `#37272`_: (*vutny*) Get default logging level and log file from default opts dict - | refs: `#38223`_ - * 721a5fe Merge pull request `#38223`_ from whiteinge/salt-api-root_dirs - * bfbf390 Add root_dir to salt-api file paths + * 79368c7528 Use UTC for timing in case timezone changes -- **PR** `#38191`_: (*terminalmage*) Clarify the fact that git_pillar.update does not fast-forward - @ *2016-12-12T09:45:48Z* +* **ISSUE** `#38472`_: (`jinm`_) file.managed Unable to manage file: 'hash_type' (2016.3.4) (refs: `#38503`_) - - **ISSUE** `#38162`_: (*747project*) git_pillar does not detect changes to remote repository when told to update - | refs: `#38191`_ - * 70f7d22 Merge pull request `#38191`_ from terminalmage/issue38162 - * 1ae543a Clarify the fact that git_pillar.update does not fast-forward +* **PR** `#38503`_: (`jinm`_) Hash type fallback for file management + @ *2017-01-01 17:36:51 UTC* -- **PR** `#38194`_: (*vutny*) Document the requirements for running ZeroMQ-based integration tests - @ *2016-12-12T09:42:11Z* + * 86f0aa0bb3 Merge pull request `#38503`_ from jinm/issue_38472_jinm - * 28171cb Merge pull request `#38194`_ from vutny/integration-test-requirements-doc - * e9f419f Document the requirements for running ZeroMQ-based integration tests + * 0cd9df299f Hash type fallback for file management -- **PR** `#38185`_: (*rallytime*) Back-port `#38181`_ to 2016.3 - @ *2016-12-09T22:27:44Z* +* **PR** `#38457`_: (`bshelton229`_) Stops git.latest checking for local changes in a bare repo + @ *2016-12-30 14:28:47 UTC* - - **PR** `#38181`_: (*rallytime*) Reset socket default timeout to None (fixes daemons_tests failures) - | refs: `#38185`_ - * a4ef037 Merge pull request `#38185`_ from rallytime/`bp-38181`_ - * 609f814 Reset socket default timeout to None (fixes daemons_tests failures) + * ed2ba4bd1b Merge pull request `#38457`_ from bshelton229/git-latest-head-bug -- **PR** `#38163`_: (*Ch3LL*) enabled ec2 cloud tests - @ *2016-12-09T18:01:57Z* + * 558e7a771a Stops git.latest checking for local changes in a bare repo - * 65b2ad7 Merge pull request `#38163`_ from Ch3LL/enabled_ec2_cloud - * be74c45 enabled ec2 cloud tests +* **PR** `#38385`_: (`dragon788`_) Use unambigous long names with double dashes + @ *2016-12-29 17:10:48 UTC* -- **PR** `#38177`_: (*vutny*) Correct `cp.get_file_str` docstring and add integration tests - @ *2016-12-09T16:55:35Z* + * 36e21b22cb Merge pull request `#38385`_ from dragon788/2016.3-double-dash - * b63f74e Merge pull request `#38177`_ from vutny/fix-cp-get-file-str - * a449980 Correct `cp.get_file_str` docstring and add integration tests + * 86c4b56f47 Newline for lint compat -- **PR** `#38153`_: (*vutny*) Master config includes may contain errors and be safely skipped - @ *2016-12-08T17:43:34Z* + * 9d9b686057 Address review comments, consistency of quotes - * 7596313 Merge pull request `#38153`_ from vutny/master-includes-error-tolerance - * cd0154e Master config includes may contain errors and be safely skipped + * df9bd5e7f9 Use unambigous long names with double dashes -* 86091db Skip daemon unit tests when running on Python 2.6 (`#38134`_) +* **ISSUE** `#38209`_: (`limited`_) Accepting a minion causes tornado to exit (refs: `#38474`_) - - **PR** `#38134`_: (*rallytime*) Skip daemon unit tests when running on Python 2.6 +* **PR** `#38474`_: (`cachedout`_) Allow an existing ioloop to be passed to salt-key + @ *2016-12-29 16:28:51 UTC* -- **PR** `#38102`_: (*rallytime*) Add False + msg tuple return if requests is missing for zenoss module - @ *2016-12-07T13:24:37Z* + * 59f2560d88 Merge pull request `#38474`_ from cachedout/key_loop - - **ISSUE** `#38091`_: (*tjyang*) [WARNING ] salt.loaded.int.module.zenoss.__virtual__() is wrongly returning `None`. - | refs: `#38102`_ - * d3d98fd4 Merge pull request `#38102`_ from rallytime/`fix-38091`_ - * 4f79d5a Add False + msg tuple return if requests is missing for zenoss module + * de504538e1 Allow an existing ioloop to be passed to salt-key -- **PR** `#38104`_: (*rallytime*) Back-port `#36794`_ to 2016.3 - @ *2016-12-07T13:23:48Z* +* **ISSUE** `#38438`_: (`jf`_) file.line with mode=delete breaks on empty file (refs: `#38467`_) - - **ISSUE** `#36707`_: (*do3meli*) slow FreeBSD sysctl module with test=true - | refs: `#36794`_ - - **PR** `#36794`_: (*do3meli*) FreeBSD sysctl module now handels config_file parameter in show method - | refs: `#38104`_ - * 8c8cbc2 Merge pull request `#38104`_ from rallytime/`bp-36794`_ - * c906c8a Pylint fixes +* **PR** `#38467`_: (`gtmanfred`_) file.line fail with mode=delete + @ *2016-12-28 20:00:33 UTC* - * da3ebf8 FreeBSD sysctl module now handels config_file parameter in show method + * 3d0c752acd Merge pull request `#38467`_ from gtmanfred/2016.3 -- **PR** `#38083`_: (*twangboy*) Only delete .sls files from winrepo-ng [DO NOT MERGE FORWARD] - @ *2016-12-06T14:13:35Z* + * 7b7c6b3878 file.line fail with mode=delete - - **ISSUE** `#35342`_: (*morganwillcock*) win_pkg: refresh_db doesn't remove cached items which have been renamed or removed - | refs: `#38083`_ - * fbc8776 Merge pull request `#38083`_ from twangboy/fix_refresh_db - * 978af6d Remove only .sls files from the cached winrepo-ng +* **PR** `#38434`_: (`slinn0`_) Make sysctl.persist fail when failing to set a value into the running kernel + @ *2016-12-27 15:37:53 UTC* -- **PR** `#38059`_: (*rallytime*) Call exec_test for the Syndic daemon in tests.unit.daemons_test.py - @ *2016-12-04T04:18:41Z* + * 940025d5c4 Merge pull request `#38434`_ from slinn0/issue_38433_fixes - - **PR** `#38057`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - | refs: `#38059`_ - - **PR** `#38034`_: (*cachedout*) Modify daemons test to use multiprocessing - | refs: `#38059`_ - * 9dcfdee Merge pull request `#38059`_ from rallytime/daemons-test-fix - * eb372b2 Add missing "not" statement: The last syndic test should assertFalse() + * 22af87a3fc Fixes for https://github.com/saltstack/salt/issues/38433 - * 4e10f8e Call exec_test for the Syndic daemon in tests.unit.daemons_test.py + * **PR** `#38421`_: (`rallytime`_) Update deprecation notices to the correct version -- **PR** `#38039`_: (*rallytime*) Check to see if a line is already commented before moving on - @ *2016-12-02T20:08:35Z* + * **PR** `#38420`_: (`rallytime`_) Removed various deprecation notices from salt/modules/* files (refs: `#38421`_) - - **ISSUE** `#37939`_: (*Talkless*) file.comment always report changes in test=True mode - | refs: `#38039`_ - * 9cd42b9 Merge pull request `#38039`_ from rallytime/`fix-37939`_ - * 1da7aac Update unit tests to account for additional file.search call +* **ISSUE** `#38282`_: (`sash-kan`_) file.managed fails when file (which contains utf-characters in the name) exists (refs: `#38415`_) - * 8a685b1 Check to see if a line is already commented before moving on + * **PR** `#38415`_: (`terminalmage`_) file.managed: Fix failure when filename contains unicode chars - * f2c0455 Write an integration test demonstrating the issue +* **PR** `#38419`_: (`Ch3LL`_) fix scsci docs example + @ *2016-12-22 18:57:51 UTC* -- **PR** `#38045`_: (*terminalmage*) yumpkg.py: don't include non-upgrade versions found by "yum list available" - @ *2016-12-02T20:07:38Z* + * 2cdb59d055 Merge pull request `#38419`_ from Ch3LL/fix_doc_scsi - - **ISSUE** `#38037`_: (*dmurphy18*) pkg.latest and yumpkg.latest_version return incorrect package versions 2016.3 and 2016.11 - | refs: `#38045`_ - * a34a763 Merge pull request `#38045`_ from terminalmage/issue38037 - * 6528950 Simplify logic for matching desired pkg arch with actual pkg arch + * 234043b8bb fix scsci docs example - * 3babbcd yumpkg.py: don't include non-upgrade versions found by "yum list available" + * **PR** `#38407`_: (`terminalmage`_) Improve pillar documentation -* 6724fe4 Modify daemons test to use multiprocessing (`#38034`_) +* **ISSUE** `#38372`_: (`fanirama`_) Issue with cron.file. Source: salt://path/to/crontab_file not found (refs: `#38398`_) - - **PR** `#38034`_: (*cachedout*) Modify daemons test to use multiprocessing - | refs: `#38059`_ +* **PR** `#38398`_: (`terminalmage`_) Fix call to file.get_managed in cron.file state + @ *2016-12-22 16:46:14 UTC* -- **PR** `#37995`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - @ *2016-11-30T20:12:55Z* + * 423b1fddff Merge pull request `#38398`_ from terminalmage/issue38372 - - **PR** `#37978`_: (*terminalmage*) Add clarifying language to ext_pillar_first docs - * 6942d5d Merge pull request `#37995`_ from rallytime/merge-2016.3 - * b44e179 Merge branch '2015.8' into '2016.3' + * c80dbaa914 Fix call to file.get_managed in cron.file state - * 7a7e367 Merge pull request `#37978`_ from terminalmage/ext_pillar_first-docs + * **PR** `#38382`_: (`heewa`_) Fix http.query when result has no text - * 61ed9a8 Add clarifying language to ext_pillar_first docs +* **PR** `#38390`_: (`meaksh`_) Add "try-restart" to fix autorestarting on SUSE systems + @ *2016-12-21 16:06:24 UTC* -* cd66c17 fix broken yaml code block (`#38002`_) + * b74b5c7d38 Merge pull request `#38390`_ from meaksh/2016.3-fix-try-restart-for-autorestarting-on-SUSE-systems - - **PR** `#38002`_: (*laleocen*) fix broken yaml code block + * de6ec05ec0 add try-restart to fix autorestarting on SUSE systems -- **PR** `#37912`_: (*attiasr*) fix encoding problem aws responses - @ *2016-11-30T18:10:30Z* +* **PR** `#38221`_: (`UtahDave`_) Fix default returner + @ *2016-12-20 20:34:36 UTC* - - **ISSUE** `#35088`_: (*Modulus*) salt/cloud/ec2.py encoding problems. - | refs: `#37912`_ - * 3dd45fb Merge pull request `#37912`_ from attiasr/fix_aws_response_encoding - * ba4ec4e use Requests result encoding to encode the text + * 2c3a39760a Merge pull request `#38221`_ from UtahDave/fix_default_returner - * abe4eb3 fix encoding problem aws responses + * 385640765b remove a blank line to satisfy linter -- **PR** `#37950`_: (*vutny*) Set default Salt Master address for a Syndic (like for a Minion) - @ *2016-11-30T18:09:04Z* + * 9c248aa14c validate return opt, remove default. - * 69a74a4 Merge pull request `#37950`_ from vutny/fix-starting-up-syndic - * 7d9bc9a syndic_master: correct default value, documentation and example config + * 8bb37f9fe7 specify allowed types and default for "returner" - * 92a7c7e Set default Salt Master address for a Syndic (like for a Minion) + * 11863a4bfe add examples of default minion returners -* 7f269bc Add clarification on expr_form usage and future deprecation (`#37964`_) + * e7c6012655 add support for default returners using `return` - - **PR** `#37964`_: (*terminalmage*) Add clarification on expr_form usage and future deprecation +* **PR** `#38288`_: (`terminalmage`_) archive.extracted: don't try to cache local sources (2016.3 branch) + @ *2016-12-18 13:07:11 UTC* -* 1001987 Catch possible exception from lsb_release (`#37962`_) + * 09d9cff992 Merge pull request `#38288`_ from terminalmage/archive-extracted-local-source-2016.3 - - **ISSUE** `#37867`_: (*tobiasBora*) Bug into lsb_release that crash salt - | refs: `#37962`_ - - **PR** `#37962`_: (*cachedout*) Catch possible exception from lsb_release + * 845e3d0e75 Update tests to reflect change in cache behavior -* 330021c Handle empty tokens safely (`#37961`_) + * 5a08d7c70a archive.extracted: don't try to cache local sources (2016.3 branch) - - **ISSUE** `#37945`_: (*gstachowiak*) Missing exception handling in salt.master.Maintenance. Process never completes. - | refs: `#37961`_ - - **PR** `#37961`_: (*cachedout*) Handle empty tokens safely +* **PR** `#38312`_: (`cro`_) Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy + @ *2016-12-18 12:39:01 UTC* -- **PR** `#37272`_: (*vutny*) Get default logging level and log file from default opts dict - | refs: `#38223`_ - @ *2016-11-28T23:04:20Z* + * bf37667f8a Merge pull request `#38312`_ from cro/proxy_config_in_cfg - * ea46639 Merge pull request `#37272`_ from vutny/fix-getting-default-logging-opts - * e5ce523 Fix description in the Salt Syndic usage info + * 2006c4000e Typo - * 518a3dd Add unit tests for Salt parsers processing logging options + * 689d95b10f Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy. - * 83d6a44 Add `ssh_log_file` option to master config and documentation +* **ISSUE** `#12788`_: (`whiteinge`_) Comb through docs to replace :doc: roles with :ref: (refs: `#38320`_) - * c8a0915 Fix configuration example and documentation for `syndic_log_file` option +* **PR** `#38320`_: (`rallytime`_) Cleanup doc internal markup references + @ *2016-12-18 12:31:28 UTC* - * e64dd3e Correct default attributes for various parser classes + * c83db5a785 Merge pull request `#38320`_ from rallytime/cleanup-doc-refs - * 82a2e21 Fix default usage string for Salt command line programs + * 62978cb7a0 Don't check the doc/conf.py file for doc markup refs - * 45dffa2 Fix readding and updating logfile and pidfile config options for Salt API + * 770e732d76 Add a unit test to search for new doc markup refs - * f47253c Fix reading and applying Salt Cloud default configuration + * 5c42a361a0 Remove ":doc:" references from all doc/topics/installation/* files - * fad5bec Work with a copy of default opts dictionaries + * 23bce1c929 Remove ":doc:" references from all doc/topics/releases/* files - * b7c2481 Fix `log_level_logfile` config value type + * 4aafa41d22 Remove ":doc:" references from a bunch of doc/* files - * 1bd76a1 Fix setting temporary log level if CLI option omitted + * 02bfe7912c Remove more ":doc:" references from doc/* files - * 121848c Fix obtaining `log_granular_levels` config setting + * 6e32267d0c Remove ":doc:" references in salt/* files - * 44cf07f Make CLI options take precedence for setting up logfile_logger + * **PR** `#38281`_: (`mikejford`_) Add nick to args for create_multi - * 61afaf1 Fix setting option attributes when processing `log_level` and `log_file` +* **ISSUE** `#38290`_: (`dragon788`_) Need to use machine automation friendly output (refs: `#38313`_) - * 3c60e23 Fix processing of `log_level_logfile` config setting +* **PR** `#38313`_: (`dragon788`_) 2016.3 chocolatey fix + @ *2016-12-16 17:20:39 UTC* - * 55a0af5 Use attribute functions for getting/setting options and config values + * 235682b1e6 Merge pull request `#38313`_ from dragon788/2016.3-chocolatey-fix - * c25f2d0 Fix getting Salt API default logfile option + * 1f5fc17551 Use machine readable output for list - * f242237 Remove processing of unused and undocumented `cli_*_log_*` config options + * cdbd2fbe3c Added limit-output to eliminate false packages - * 2065e83 Get default logging level and file from default opts dict +* **ISSUE** `#38174`_: (`NickDubelman`_) [syndic] Why can't a syndic node signal when all of it's minions have returned? (refs: `#38279`_) -- **PR** `#37925`_: (*kontrolld*) Fix missing ipv6 options centos network - @ *2016-11-28T22:38:43Z* +* **ISSUE** `#32400`_: (`rallytime`_) Document Default Config Values (refs: `#38279`_) - * f2f957d Merge pull request `#37925`_ from kontrolld/add-ipv6-centos-network - * ac2b477 Adding IPv6 functionality for CentOS /etc/sysconfig/network +* **PR** `#38279`_: (`rallytime`_) Add docs for syndic_wait setting + @ *2016-12-15 18:30:31 UTC* -- **PR** `#37899`_: (*DmitryKuzmenko*) Clear functions context in schedule tasks for ZeroMQ. - @ *2016-11-28T22:23:45Z* + * 9e78ddc80e Merge pull request `#38279`_ from rallytime/fix-38174 - - **ISSUE** `#37059`_: (*basepi*) Beacon fileserver operations cause scheduled jobs with fileserver operations to hang - | refs: `#37899`_ - * c07ad11 Merge pull request `#37899`_ from DSRCorporation/bugs/37059_schedule_task_hang - * 9497748 Clear functions context in schedule tasks for ZeroMQ. + * 4a62d01577 Add docs for syndic_wait setting -- **PR** `#37928`_: (*techhat*) Don't modify self.opts directly - @ *2016-11-28T21:07:40Z* +* **PR** `#38248`_: (`meaksh`_) Successfully exit of salt-api child processes when SIGTERM is received + @ *2016-12-15 09:16:27 UTC* - - **ISSUE** `#37737`_: (*b-harper*) python client api CloudClient multiple calls needed - | refs: `#37928`_ - * a55519d Merge pull request `#37928`_ from techhat/issue37737 - * a09a60e Don't modify self.opts directly + * fc9e1dff35 Merge pull request `#38248`_ from meaksh/salt-api-successfully-close-child-processes -- **PR** `#37929`_: (*gtmanfred*) add list_nodes_min to nova driver - @ *2016-11-28T21:05:40Z* + * ee6eae9855 Successfully exit of salt-api child processes when SIGTERM. - * 9d17f1c Merge pull request `#37929`_ from gtmanfred/2016.3 - * c7d2c73 add list_nodes_min to nova driver +* **PR** `#38254`_: (`terminalmage`_) Also check if pillarenv is in opts + @ *2016-12-15 09:10:24 UTC* -- **PR** `#37926`_: (*kontrolld*) Fixes no IPv6 functionality in /etc/sysconfig/network - @ *2016-11-28T20:40:00Z* + * 3c718ed35e Merge pull request `#38254`_ from terminalmage/check-pillarenv - * 3bb743b Merge pull request `#37926`_ from kontrolld/fix-ipv6-centos-network - * 3ed42e5 updated + * fa9ad311c6 Also check if pillarenv is in opts - * 3b3bc4f Fixes no IPv6 functionality in /etc/sysconfig/network + * **PR** `#38256`_: (`rallytime`_) [2016.3] Bump latest release version to 2016.11.1 -- **PR** `#37921`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - @ *2016-11-28T19:54:40Z* +* **PR** `#38198`_: (`vutny`_) Add missing requirements for running unit tests: libcloud and boto3 + @ *2016-12-13 14:12:20 UTC* - - **PR** `#37918`_: (*rallytime*) [2015.8] Update version numbers in doc config for 2016.11.0 release - - **PR** `#37914`_: (*terminalmage*) Update earlier release channels' docs with Carbon release notes - * 271170a Merge pull request `#37921`_ from rallytime/merge-2016.3 - * 523a67c Merge branch '2015.8' into '2016.3' + * 004e46afe7 Merge pull request `#38198`_ from vutny/unit-tests-require-libcloud-boto3 - * 4cdc6cf Update earlier release channels' docs with Carbon release notes (`#37914`_) + * a6098bac1a Remove note about SaltTesting installation, now it is in the requirements - * d31491a [2015.8] Update version numbers in doc config for 2016.11.0 release (`#37918`_) + * 004bff113e Add missing requirements for running unit tests: libcloud and boto3 -- **PR** `#37924`_: (*cachedout*) Update test for new gem ver - @ *2016-11-28T18:17:53Z* +* **PR** `#38213`_: (`rallytime`_) Skip test_cert_info tls unit test on pyOpenSSL upstream errors + @ *2016-12-13 12:05:01 UTC* - * 6cd6429 Merge pull request `#37924`_ from cachedout/fix_gem_states - * 894cca3 Update test for new gem ver + * 9d497bc74c Merge pull request `#38213`_ from rallytime/skip-tls-test -- **PR** `#37916`_: (*rallytime*) [2016.3] Update version numbers in doc config for 2016.11.0 release - @ *2016-11-28T17:09:08Z* + * bdb807fc7c Skip test_cert_info tls unit test on pyOpenSSL upstream errors - * c35ba1f Merge pull request `#37916`_ from rallytime/doc-update-2016.3 - * bd40592 [2016.3] Update version numbers in doc config for 2016.11.0 release +* **PR** `#38224`_: (`whiteinge`_) Allow CORS OPTIONS requests to be unauthenticated + @ *2016-12-13 12:02:30 UTC* -- **PR** `#37785`_: (*AaronM-Cloudtek*) respect trailing dot in ddns name parameter - @ *2016-11-28T14:02:10Z* + * 203109dd17 Merge pull request `#38224`_ from whiteinge/cors-options-unauthed - - **ISSUE** `#37287`_: (*AaronM-Cloudtek*) salt.states.ddns.present: 'NS' record type always returns as changed - | refs: `#37785`_ - * e13a248 Merge pull request `#37785`_ from Cloudtek/ddns-respect-trailing-dot - * 262e3b3 respect trailing dot in ddns name parameter + * de4d3227ab Allow CORS OPTIONS requests to be unauthenticated -- **PR** `#37895`_: (*fj40crawler*) Change return value for salt/states/augeas.py to be True instead of N… - @ *2016-11-28T13:49:27Z* +* **PR** `#38223`_: (`whiteinge`_) Add root_dir to salt-api file paths + @ *2016-12-13 07:44:19 UTC* - - **ISSUE** `#37870`_: (*fj40crawler*) salt.states.augeas.change returns None when test=True - | refs: `#37895`_ - * c03b389 Merge pull request `#37895`_ from fj40crawler/fix-augeas-return-for-test - * ddc238d Fixed augeas_test.py to match True v.s. None for test_change_in_test_mode + * **PR** `#37272`_: (`vutny`_) Get default logging level and log file from default opts dict (refs: `#38223`_) - * ef75c45 Merge branch '2016.3' of github.com:saltstack/salt into fix-augeas-return-for-test + * 721a5feccd Merge pull request `#38223`_ from whiteinge/salt-api-root_dirs - * b0fe0cd Change return value for salt/states/augeas.py to be True instead of None for cases where salt is run with test=True. Fixes `#37870`_ + * bfbf390c0e Add root_dir to salt-api file paths -- **PR** `#37907`_: (*Talkless*) Fix server trust in test run of svn.latest - @ *2016-11-28T13:47:39Z* +* **ISSUE** `#38162`_: (`747project`_) git_pillar does not detect changes to remote repository when told to update (refs: `#38191`_) - * fdbc31e Merge pull request `#37907`_ from Talkless/patch-2 - * 072a319 Fix server trust in test run of svn.latest +* **PR** `#38191`_: (`terminalmage`_) Clarify the fact that git_pillar.update does not fast-forward + @ *2016-12-12 09:45:48 UTC* -- **PR** `#37896`_: (*toanju*) rh networking: add missing values - @ *2016-11-27T10:30:35Z* + * 70f7d22ad6 Merge pull request `#38191`_ from terminalmage/issue38162 - * f39fdf4 Merge pull request `#37896`_ from toanju/2016.3 - * c953041 rh networking: add missing values + * 1ae543a98a Clarify the fact that git_pillar.update does not fast-forward -- **PR** `#37886`_: (*bdrung*) Fix various spelling mistakes - @ *2016-11-25T02:59:36Z* +* **PR** `#38194`_: (`vutny`_) Document the requirements for running ZeroMQ-based integration tests + @ *2016-12-12 09:42:11 UTC* - * ea935c5 Merge pull request `#37886`_ from bdrung/fix-typos - * 9a51ba5 Fix various spelling mistakes + * 28171cbfc5 Merge pull request `#38194`_ from vutny/integration-test-requirements-doc -- **PR** `#37736`_: (*dhaines*) handle semodule version >=2.4 (`#37732`_) and fix typo - @ *2016-11-24T01:44:20Z* + * e9f419ff64 Document the requirements for running ZeroMQ-based integration tests - - **ISSUE** `#37732`_: (*dhaines*) list_semod() (from modules/selinux.py) incompatible with policycoreutils-2.5 (RHEL 7.3) - | refs: `#37736`_ - * 371b0a8 Merge pull request `#37736`_ from dhaines/issue-37732 - * 7ef590a Update selinux.py +* **PR** `#38185`_: (`rallytime`_) Back-port `#38181`_ to 2016.3 + @ *2016-12-09 22:27:44 UTC* - * 516a67e fix indexing error + * **PR** `#38181`_: (`rallytime`_) Reset socket default timeout to None (fixes daemons_tests failures) (refs: `#38185`_) - * 4e49c1e fix typo + * a4ef037ab1 Merge pull request `#38185`_ from rallytime/bp-38181 - * b16f2d8 handle semodule version >=2.4 (`#37732`_) and fix typo + * 609f814454 Reset socket default timeout to None (fixes daemons_tests failures) -- **PR** `#37797`_: (*clan*) check count of columns after split - @ *2016-11-24T01:28:59Z* +* **PR** `#38163`_: (`Ch3LL`_) enabled ec2 cloud tests + @ *2016-12-09 18:01:57 UTC* - * 87aeb66 Merge pull request `#37797`_ from clan/extfs - * acf0f96 check count of columns after split + * 65b2ad7b14 Merge pull request `#38163`_ from Ch3LL/enabled_ec2_cloud -- **PR** `#37762`_: (*twangboy*) Add pre_versions to chocolatey.installed - @ *2016-11-24T01:27:29Z* + * be74c45463 enabled ec2 cloud tests - * f7c7109 Merge pull request `#37762`_ from twangboy/fix_chocolatey_state - * 9696b6d Use keyword args instead of relying on ordering +* **PR** `#38177`_: (`vutny`_) Correct `cp.get_file_str` docstring and add integration tests + @ *2016-12-09 16:55:35 UTC* - * 398eaa0 Add pre_versions to the available arguments + * b63f74e034 Merge pull request `#38177`_ from vutny/fix-cp-get-file-str -- **PR** `#37866`_: (*meaksh*) Backport `#37149`_ `#36938`_ and `#36784`_ to 2016.3 - @ *2016-11-23T21:54:17Z* + * a449980672 Correct `cp.get_file_str` docstring and add integration tests - - **PR** `#37857`_: (*meaksh*) Backport `#37149`_ and `#36938`_ to 2015.8 - | refs: `#37866`_ - - **PR** `#37856`_: (*meaksh*) Backport `#36784`_ to 2015.8 - | refs: `#37866`_ - - **PR** `#37149`_: (*dincamihai*) Fix pkg.latest_version when latest already installed - | refs: `#37866`_ `#37857`_ - - **PR** `#36938`_: (*wanparo*) acl.delfacl: fix position of -X option to setfacl - | refs: `#37866`_ `#37857`_ - - **PR** `#36784`_: (*moio*) OS grains for SLES Expanded Support - | refs: `#37866`_ `#37856`_ - * 56baa92 Merge pull request `#37866`_ from meaksh/2016.3-`bp-37149`_-36938-36784 - * 9d8d578 Fix pkg.latest_version when latest already installed +* **PR** `#38153`_: (`vutny`_) Master config includes may contain errors and be safely skipped + @ *2016-12-08 17:43:34 UTC* - * ffca0d4 - acl.delfacl: fix position of -X option to setfacl + * 7596313be0 Merge pull request `#38153`_ from vutny/master-includes-error-tolerance - * 3dfed6b Adjust linux_acl unit test argument ordering + * cd0154ee93 Master config includes may contain errors and be safely skipped - * f185ecd core.py: quote style fixed + * **PR** `#38134`_: (`rallytime`_) Skip daemon unit tests when running on Python 2.6 - * 8404d13 Setting up OS grains for SLES Expanded Support (SUSE's Red Hat compatible platform) +* **ISSUE** `#38091`_: (`tjyang`_) [WARNING ] salt.loaded.int.module.zenoss.__virtual__() is wrongly returning `None`. (refs: `#38102`_) -- **PR** `#37863`_: (*rallytime*) Back-port `#36893`_ to 2016.3 - @ *2016-11-23T17:09:09Z* +* **PR** `#38102`_: (`rallytime`_) Add False + msg tuple return if requests is missing for zenoss module + @ *2016-12-07 13:24:37 UTC* - - **ISSUE** `#32829`_: (*tyhunt99*) Dockerng appears to not be using docker registries pillar data - | refs: `#36893`_ `#36893`_ - - **PR** `#36893`_: (*tyhunt99*) add option to force a reauth for a docker registry - | refs: `#37863`_ - * d0cc7f0 Merge pull request `#37863`_ from rallytime/`bp-36893`_ - * 4c70534 Add versionadded to reauth option in dockerng module + * d3d98fd4eb Merge pull request `#38102`_ from rallytime/fix-38091 - * 5ca2c38 added documentation for the new reuth option in docker registry configuration + * 4f79d5a0d1 Add False + msg tuple return if requests is missing for zenoss module - * 5b0c11a add option to force a reauth for a docker registry +* **ISSUE** `#36707`_: (`do3meli`_) slow FreeBSD sysctl module with test=true (refs: `#36794`_) -* b17a118 add multiline encryption documentation to nacl (`#37847`_) +* **PR** `#38104`_: (`rallytime`_) Back-port `#36794`_ to 2016.3 + @ *2016-12-07 13:23:48 UTC* - - **PR** `#37847`_: (*laleocen*) add multiline encryption documentation to nacl + * **PR** `#36794`_: (`do3meli`_) FreeBSD sysctl module now handels config_file parameter in show method (refs: `#38104`_) -* aa37487 add missing chloginclass (`#37827`_) + * 8c8cbc2734 Merge pull request `#38104`_ from rallytime/bp-36794 - - **ISSUE** `#37787`_: (*elyulka*) user.present state fails to change loginclass on FreeBSD - | refs: `#37827`_ - - **PR** `#37827`_: (*silenius*) add missing chloginclass + * c906c8a0d5 Pylint fixes -* 0e74bad Update branch refs to more relevant branch (`#37826`_) + * da3ebf83e6 FreeBSD sysctl module now handels config_file parameter in show method - - **PR** `#37826`_: (*rallytime*) Update branch refs to more relevant branch - - **PR** `#37822`_: (*laleocen*) add documentation for multiline encryption using nacl - | refs: `#37826`_ +* **ISSUE** `#35342`_: (`morganwillcock`_) win_pkg: refresh_db doesn't remove cached items which have been renamed or removed (refs: `#38083`_) -* 6a9b49c Add "names" option to file state docs: point users to highstate doc examples (`#37823`_) +* **PR** `#38083`_: (`twangboy`_) Only delete .sls files from winrepo-ng [DO NOT MERGE FORWARD] + @ *2016-12-06 14:13:35 UTC* - - **ISSUE** `#19269`_: (*markuskramerIgitt*) Undocumented feature `names:` of `file.directory` - | refs: `#37823`_ - - **PR** `#37823`_: (*rallytime*) Add "names" option to file state docs: point users to highstate doc examples + * fbc87769b9 Merge pull request `#38083`_ from twangboy/fix_refresh_db -* aaf587d Clarify keystone.user_present password state docs with default behavior (`#37821`_) + * 978af6d83c Remove only .sls files from the cached winrepo-ng - - **ISSUE** `#15697`_: (*arthurlogilab*) keystone.user_present should not re-set the password when user exists - | refs: `#37821`_ - - **PR** `#37821`_: (*rallytime*) Clarify keystone.user_present password state docs with default behavior +* **PR** `#38059`_: (`rallytime`_) Call exec_test for the Syndic daemon in tests.unit.daemons_test.py + @ *2016-12-04 04:18:41 UTC* -* c300863 Add some dependency documentation to libvirt docs (`#37820`_) + * **PR** `#38057`_: (`rallytime`_) [2016.11] Merge forward from 2016.3 to 2016.11 (refs: `#38059`_) - - **ISSUE** `#5999`_: (*pille*) libvirt.keys does not work - | refs: `#37820`_ - - **PR** `#37820`_: (*rallytime*) Add some dependency documentation to libvirt docs + * **PR** `#38034`_: (`cachedout`_) Modify daemons test to use multiprocessing (refs: `#38059`_) -- **PR** `#37772`_: (*bdrung*) Support initializing OpenSSL 1.1 - @ *2016-11-21T20:28:51Z* + * 9dcfdeef6b Merge pull request `#38059`_ from rallytime/daemons-test-fix - * 485270f Merge pull request `#37772`_ from bdrung/openssl1.1 - * 819c965 Support initializing OpenSSL 1.1 + * eb372b27d8 Add missing "not" statement: The last syndic test should assertFalse() -* 4910912 Update orchestrate runner file.copy doc example (`#37817`_) + * 4e10f8e018 Call exec_test for the Syndic daemon in tests.unit.daemons_test.py - - **ISSUE** `#37383`_: (*edwardsdanielj*) Orchestration arguments (kwarg) not being interperted / How I learned to stop worrying about documentation and love experimenting - | refs: `#37817`_ - - **PR** `#37817`_: (*rallytime*) Update orchestrate runner file.copy doc example +* **ISSUE** `#37939`_: (`Talkless`_) file.comment always report changes in test=True mode (refs: `#38039`_) -- **PR** `#37816`_: (*rallytime*) Back-port `#32157`_ to 2016.3 - @ *2016-11-21T20:22:27Z* +* **PR** `#38039`_: (`rallytime`_) Check to see if a line is already commented before moving on + @ *2016-12-02 20:08:35 UTC* - - **ISSUE** `#37653`_: (*gravyboat*) Salt.cron docs don't wrap @hourly and @daily correctly in quotes for the examples - | refs: `#37816`_ - - **ISSUE** `#31953`_: (*sjorge*) Documentation for salt.states.cron is incorrect - | refs: `#32157`_ - - **PR** `#32157`_: (*cachedout*) Add quotes to cron doc - | refs: `#37816`_ - * c5d3d8b Merge pull request `#37816`_ from rallytime/`bp-32157`_ - * d9c2971 Add quotes to cron doc + * 9cd42b9b3f Merge pull request `#38039`_ from rallytime/fix-37939 -- **PR** `#37812`_: (*rallytime*) Back-port `#37790`_ to 2016.3 - @ *2016-11-21T18:46:40Z* + * 1da7aacfbe Update unit tests to account for additional file.search call - - **PR** `#37790`_: (*sofixa*) Update cloud/proxmox.rst with more options and LXC - | refs: `#37812`_ - * 97e6b6a Merge pull request `#37812`_ from rallytime/`bp-37790`_ - * ca3b6e7 Update proxmox.rst with more options and LXC + * 8a685b1820 Check to see if a line is already commented before moving on -- **PR** `#37811`_: (*rallytime*) Back-port `#37789`_ to 2016.3 - @ *2016-11-21T18:46:21Z* + * f2c045520d Write an integration test demonstrating the issue - - **ISSUE** `#37751`_: (*freach*) Documentation salt.states.dockerng.running: "privileged" property undocumented - | refs: `#37789`_ - - **PR** `#37789`_: (*fedusia*) issue: 37751 - | refs: `#37811`_ - * 27703c5 Merge pull request `#37811`_ from rallytime/`bp-37789`_ - * ba3fef4 fix comment +* **ISSUE** `#38037`_: (`dmurphy18`_) pkg.latest and yumpkg.latest_version return incorrect package versions 2016.3 and 2016.11 (refs: `#38045`_) - * a021f76 issue: 37751 Add documentation for option privileged +* **PR** `#38045`_: (`terminalmage`_) yumpkg.py: don't include non-upgrade versions found by "yum list available" + @ *2016-12-02 20:07:38 UTC* -- **PR** `#37810`_: (*rallytime*) Back-port `#37775`_ to 2016.3 - @ *2016-11-21T18:45:53Z* + * a34a763984 Merge pull request `#38045`_ from terminalmage/issue38037 - - **PR** `#37775`_: (*calve*) Document `python` argument in `salt.states.virtualenv_mod` - | refs: `#37810`_ - * adac9d7 Merge pull request `#37810`_ from rallytime/`bp-37775`_ - * 2bed914 Document `python` argument in `salt.states.virtualenv_mod` + * 65289503d9 Simplify logic for matching desired pkg arch with actual pkg arch -* 7de7844 Add nodegroup check to ckminions (`#37763`_) + * 3babbcda94 yumpkg.py: don't include non-upgrade versions found by "yum list available" - - **ISSUE** `#37742`_: (*blaketmiller*) Cannot match on nodegroup when checking minions - | refs: `#37763`_ - - **PR** `#37763`_: (*cachedout*) Add nodegroup check to ckminions + * **PR** `#38034`_: (`cachedout`_) Modify daemons test to use multiprocessing (refs: `#38059`_) -* d674369 Fix ip/port issue with salt-call (`#37766`_) +* **PR** `#37995`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-11-30 20:12:55 UTC* - - **ISSUE** `#37725`_: (*secumod*) salt-call incorrectly parses master hostname:port from minion config - | refs: `#37766`_ - - **PR** `#37766`_: (*cachedout*) Fix ip/port issue with salt-call + * 6942d5d95b Merge pull request `#37995`_ from rallytime/merge-2016.3 -* c62ff6b Add thorium path to syspaths (`#37767`_) + * b44e17921c Merge branch '2015.8' into '2016.3' - - **ISSUE** `#33709`_: (*msummers42*) Any/All Salt-SSH invocations in 2016.3.0 Fails with AttributeError: 'module' object has no attribute 'BASE_THORIUM_ROOTS_DIR' - | refs: `#37767`_ - - **PR** `#37767`_: (*cachedout*) Add thorium path to syspaths + * 7a7e36728f Merge pull request `#37978`_ from terminalmage/ext_pillar_first-docs -- **PR** `#37760`_: (*hu-dabao*) Fix couchbase returner and add couple of more features - @ *2016-11-18T00:28:23Z* + * 61ed9a8657 Add clarifying language to ext_pillar_first docs - * bff949f Merge pull request `#37760`_ from hu-dabao/fix_cb_returner - * de372f2 1. returner no need to check whether the jid exists for external job cache setup 2. add full_ret to return doc so that the document will be informative 3. make ttl as a config attribute because salt-minion does not have keep_jobs attribute 4. add password into config attribute 5. update the documents accordingly + * **PR** `#38002`_: (`laleocen`_) fix broken yaml code block -- **PR** `#37738`_: (*terminalmage*) Allow pillar.get to retrieve fresh pillar data when saltenv passed - @ *2016-11-17T23:13:04Z* +* **ISSUE** `#35088`_: (`Modulus`_) salt/cloud/ec2.py encoding problems. (refs: `#37912`_) - - **ISSUE** `#36629`_: (*yhekma*) The pillar run module does not honor saltenv - | refs: `#37738`_ - * 1f976ac Merge pull request `#37738`_ from terminalmage/issue36629 - * da46678 Allow pillar.get to retrieve fresh pillar data when saltenv passed +* **PR** `#37912`_: (`attiasr`_) fix encoding problem aws responses + @ *2016-11-30 18:10:30 UTC* -* 7aee7fc Switch default filter tag for ONE resources from user only to all resources (`#37745`_) + * 3dd45fbedf Merge pull request `#37912`_ from attiasr/fix_aws_response_encoding - - **PR** `#37745`_: (*cro*) Switch default filter tag for ONE resources from user only to all resources + * ba4ec4e7f1 use Requests result encoding to encode the text -* 6ba8d4e check for SERVICE_DIR in __virtual__ in salt.modules.daemontools (`#37748`_) + * abe4eb3b98 fix encoding problem aws responses - - **ISSUE** `#37498`_: (*githubcdr*) service.restart salt-minion fails on Ubuntu 14.04.5 LTS - | refs: `#37748`_ `#38587`_ - - **PR** `#37748`_: (*silenius*) check for SERVICE_DIR in __virtual__ in salt.modules.daemontools +* **PR** `#37950`_: (`vutny`_) Set default Salt Master address for a Syndic (like for a Minion) + @ *2016-11-30 18:09:04 UTC* -- **PR** `#37735`_: (*Ch3LL*) change size and image of joyent profile - @ *2016-11-16T21:07:52Z* + * 69a74a4d2d Merge pull request `#37950`_ from vutny/fix-starting-up-syndic - - **ISSUE** `#37734`_: (*Ch3LL*) Joyent Cloud Size Issue - | refs: `#37735`_ - * fa78831 Merge pull request `#37735`_ from Ch3LL/fix_joyent_profile - * 9ef41dc change size and image of joyent profile + * 7d9bc9abce syndic_master: correct default value, documentation and example config -- **PR** `#37731`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - @ *2016-11-16T17:13:02Z* + * 92a7c7ed1b Set default Salt Master address for a Syndic (like for a Minion) - - **PR** `#37718`_: (*terminalmage*) Fix incorrectly-formatted RST - * 98e25c6 Merge pull request `#37731`_ from rallytime/merge-2016.3 - * ec13897 Merge branch '2015.8' into '2016.3' + * **PR** `#37964`_: (`terminalmage`_) Add clarification on expr_form usage and future deprecation - * f417dbb Merge pull request `#37718`_ from terminalmage/docs +* **ISSUE** `#37867`_: (`tobiasBora`_) Bug into lsb_release that crash salt (refs: `#37962`_) - * 23b8b2a Fix incorrectly-formatted RST + * **PR** `#37962`_: (`cachedout`_) Catch possible exception from lsb_release -* 3be9ab4 Warn on AES test for systems with > 1 core (`#37724`_) +* **ISSUE** `#37945`_: (`gstachowiak`_) Missing exception handling in salt.master.Maintenance. Process never completes. (refs: `#37961`_) - - **PR** `#37724`_: (*cachedout*) Warn on AES test for systems with > 1 core + * **PR** `#37961`_: (`cachedout`_) Handle empty tokens safely -- **PR** `#37721`_: (*terminalmage*) Fix for pillar setting 'environment' key in __gen_opts() - @ *2016-11-16T16:04:53Z* +* **PR** `#37272`_: (`vutny`_) Get default logging level and log file from default opts dict (refs: `#38223`_) + @ *2016-11-28 23:04:20 UTC* - * 35655d5 Merge pull request `#37721`_ from terminalmage/zd909 - * acdd551 Update git_pillar docs to reflect info from bugfix + * ea46639ce7 Merge pull request `#37272`_ from vutny/fix-getting-default-logging-opts - * 433737d Fix for pillar setting 'environment' key in __gen_opts() + * e5ce52388a Fix description in the Salt Syndic usage info -- **PR** `#37719`_: (*terminalmage*) Fix incorrectly-formatted RST (2016.3 branch) - @ *2016-11-16T08:20:53Z* + * 518a3dd7ee Add unit tests for Salt parsers processing logging options - * 99cda7c Merge pull request `#37719`_ from terminalmage/docs-2016.3 - * f163b4c Fix incorrectly-formatted RST + * 83d6a44254 Add `ssh_log_file` option to master config and documentation -- **PR** `#37694`_: (*cachedout*) Catch differences in git URLs in npm state - @ *2016-11-16T01:56:18Z* + * c8a0915460 Fix configuration example and documentation for `syndic_log_file` option - * 8dea695 Merge pull request `#37694`_ from cachedout/npm_git - * 0e3bc23 Catch differences in git URLs in npm state + * e64dd3ed6b Correct default attributes for various parser classes -- **PR** `#37705`_: (*rallytime*) Don't overwrite the "key" variable passed in to _listeners_present func - @ *2016-11-15T21:26:37Z* + * 82a2e216b3 Fix default usage string for Salt command line programs - - **ISSUE** `#37665`_: (*kluoto*) boto_elb state fails as key is overwritten by the code - | refs: `#37705`_ - * 329448c Merge pull request `#37705`_ from rallytime/`fix-37665`_ - * 3b7e9c5 Don't overwrite the "key" variable passed in to _listeners_present func + * 45dffa292f Fix readding and updating logfile and pidfile config options for Salt API -- **PR** `#37707`_: (*Ch3LL*) add timeout increase on azure tests - @ *2016-11-15T21:24:25Z* + * f47253c21b Fix reading and applying Salt Cloud default configuration - - **PR** `#37239`_: (*Ch3LL*) Fix cloud tests timeout - | refs: `#37707`_ - * ac9a316 Merge pull request `#37707`_ from Ch3LL/fix_timeout_azure - * 363122c add timeout increase on azure tests + * fad5bec936 Work with a copy of default opts dictionaries -- **PR** `#37704`_: (*twangboy*) Fix test disabled 2016.3 [DO NOT MERGE FORWARD] - @ *2016-11-15T16:48:52Z* + * b7c24811e5 Fix `log_level_logfile` config value type - * 1ece265 Merge pull request `#37704`_ from twangboy/fix_test_disabled_2016.3 - * a0429cf Use nfsd instead of apsd for test_disabled + * 1bd76a1d96 Fix setting temporary log level if CLI option omitted -- **PR** `#37690`_: (*twangboy*) Update pyzmq to 15.3.0 for 2016.3 [DO NOT MERGE FORWARD] - @ *2016-11-15T03:10:36Z* + * 121848cc77 Fix obtaining `log_granular_levels` config setting - * 44f05ac Merge pull request `#37690`_ from twangboy/update_pyzmq_2016.3 - * cf55342 Update pyzmq to version 15.3.0 + * 44cf07fec2 Make CLI options take precedence for setting up logfile_logger -- **PR** `#37680`_: (*rallytime*) Back-port `#32965`_ to 2016.3 - @ *2016-11-15T02:56:46Z* + * 61afaf1792 Fix setting option attributes when processing `log_level` and `log_file` - - **PR** `#32965`_: (*kevinquinnyo*) Fix 'present' option when used without 'key_type' - | refs: `#37680`_ - * a743d8b Merge pull request `#37680`_ from rallytime/`bp-32965`_ - * 1865b13 Fix 'present' option when used without 'key_type' + * 3c60e2388e Fix processing of `log_level_logfile` config setting -- **PR** `#37681`_: (*rallytime*) Back-port `#35965`_ to 2016.3 - @ *2016-11-14T21:19:22Z* + * 55a0af5bbd Use attribute functions for getting/setting options and config values - - **ISSUE** `#35964`_: (*edgan*) salt-ssh doesn't set the return code to non-zero on highstate rendering error - | refs: `#35965`_ - - **PR** `#35965`_: (*edgan*) Set the return code to 1 on salt-ssh highstate errors - | refs: `#37681`_ - * 1c2d6ff Merge pull request `#37681`_ from rallytime/`bp-35965`_ - * 700f3fa Set the return code to 1 on salt-ssh highstate errors + * c25f2d091e Fix getting Salt API default logfile option -- **PR** `#37668`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - @ *2016-11-14T15:43:25Z* + * f2422373c1 Remove processing of unused and undocumented `cli_*_log_*` config options - - **PR** `#37641`_: (*cro*) Add docs for rotate_aes_key - * 1b456b5 Merge pull request `#37668`_ from rallytime/merge-2016.3 - * ef684c6 Merge branch '2015.8' into '2016.3' + * 2065e8311c Get default logging level and file from default opts dict - * a01b665 Add docs for rotate_aes_key (`#37641`_) +* **PR** `#37925`_: (`kontrolld`_) Fix missing ipv6 options centos network + @ *2016-11-28 22:38:43 UTC* -- **PR** `#37625`_: (*cachedout*) Return with proper retcodes in batch mode - @ *2016-11-12T20:29:09Z* + * f2f957da6c Merge pull request `#37925`_ from kontrolld/add-ipv6-centos-network - - **ISSUE** `#37492`_: (*JensRantil*) Failing `salt -b 1 minion state.highstate` has wrong exit code - | refs: `#37625`_ - * 305e51d Merge pull request `#37625`_ from cachedout/issue_37492 - * b603152 Return with proper retcodes in batch mode + * ac2b477412 Adding IPv6 functionality for CentOS /etc/sysconfig/network -- **PR** `#37639`_: (*rallytime*) Back-port `#37607`_ to 2016.3 - @ *2016-11-11T20:29:20Z* +* **ISSUE** `#37059`_: (`basepi`_) Beacon fileserver operations cause scheduled jobs with fileserver operations to hang (refs: `#37899`_) - - **ISSUE** `#34547`_: (*sebw*) salt-cloud deployment fails when deploy: True - | refs: `#37607`_ - - **PR** `#37607`_: (*techhat*) Try the connection again, in case it's been reset - | refs: `#37639`_ - - **PR** `#35673`_: (*cro*) Proxies don't handle reusing the SmartConnect instances very well. D… - | refs: `#37607`_ - - **PR** `#34059`_: (*alexbleotu*) Vmware common gh - | refs: `#37607`_ - * 7510cd4 Merge pull request `#37639`_ from rallytime/`bp-37607`_ - * 9914c93 Pylint: Remove kwargs that are not in the 2016.3 branch +* **PR** `#37899`_: (`DmitryKuzmenko`_) Clear functions context in schedule tasks for ZeroMQ. + @ *2016-11-28 22:23:45 UTC* - * d941e93 Disable pylint warning + * c07ad11279 Merge pull request `#37899`_ from DSRCorporation/bugs/37059_schedule_task_hang - * 940ee49 Lint fix + * 9497748546 Clear functions context in schedule tasks for ZeroMQ. - * 69893f0 Try the connection again, in case it's been reset +* **ISSUE** `#37737`_: (`b-harper`_) python client api CloudClient multiple calls needed (refs: `#37928`_) -- **PR** `#37638`_: (*rallytime*) Back-port `#37349`_ to 2016.3 - @ *2016-11-11T20:29:01Z* +* **PR** `#37928`_: (`techhat`_) Don't modify self.opts directly + @ *2016-11-28 21:07:40 UTC* - - **ISSUE** `#37118`_: (*gtmanfred*) group in file.find module unable to be a list - | refs: `#37349`_ `#37349`_ - - **PR** `#37349`_: (*haeac*) Pull request for Bug `#37118`_ - | refs: `#37638`_ - * 24ca960 Merge pull request `#37638`_ from rallytime/`bp-37349`_ - * ba2105b Fix for Bug `#37118`_, the wrong parameter was being used to convert the group name to group id. + * a55519db40 Merge pull request `#37928`_ from techhat/issue37737 -- **PR** `#37644`_: (*Ch3LL*) digital ocean list_keypairs: increase limit for ssh keys parsed - @ *2016-11-11T20:28:46Z* + * a09a60e89b Don't modify self.opts directly - - **ISSUE** `#37643`_: (*Ch3LL*) digital ocean list_keypairs limits to 20 keys - | refs: `#37644`_ - * e1e8b81 Merge pull request `#37644`_ from Ch3LL/fix_37643 - * c02961a list_keypairs: increase limit for ssh keys parsed +* **PR** `#37929`_: (`gtmanfred`_) add list_nodes_min to nova driver + @ *2016-11-28 21:05:40 UTC* -- **PR** `#37640`_: (*rallytime*) Add known issue `#37541`_ to 2016.3.4 release notes - @ *2016-11-11T20:28:12Z* + * 9d17f1ce90 Merge pull request `#37929`_ from gtmanfred/2016.3 - - **ISSUE** `#37541`_: (*yhekma*) salt-minion does not clean up temp files for templates - | refs: `#37540`_ `#37640`_ - * a97c2ad Merge pull request `#37640`_ from rallytime/update-release-notes - * 6d6de12 Grammatical fix + * c7d2c73503 add list_nodes_min to nova driver - * 24d7f20 Add known issue `#37541`_ to 2016.3.4 release notes +* **PR** `#37926`_: (`kontrolld`_) Fixes no IPv6 functionality in /etc/sysconfig/network + @ *2016-11-28 20:40:00 UTC* -- **PR** `#37642`_: (*cro*) Forward-port change from 2015.8 adding release note for rotate_aes_key - @ *2016-11-11T20:27:07Z* + * 3bb743b59f Merge pull request `#37926`_ from kontrolld/fix-ipv6-centos-network - * fab3eaa Merge pull request `#37642`_ from cro/rotate_aes_doc - * 1ca5b95 Forward-port change from 2015.8 adding release note for rotate_aes_key + * 3ed42e5b44 updated -- **PR** `#37629`_: (*TronPaul*) fix __opts__ and provider being None in salt.utils.aws:get_location - @ *2016-11-11T09:49:47Z* + * 3b3bc4f239 Fixes no IPv6 functionality in /etc/sysconfig/network - - **ISSUE** `#37628`_: (*TronPaul*) [git 2016.3] Refreshing of an s3 file server results in an exception - | refs: `#37629`_ - * 4c07b35 Merge pull request `#37629`_ from TronPaul/fix-s3fs-opts - * a452cde fix __opts__ and provider being None issue +* **PR** `#37921`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-11-28 19:54:40 UTC* -- **PR** `#37481`_: (*thatch45*) Raet internal client reference fix - @ *2016-11-11T04:39:41Z* + * 271170a9f3 Merge pull request `#37921`_ from rallytime/merge-2016.3 - * 200d9fc Merge pull request `#37481`_ from thatch45/raet_client - * 50d9111 Attempted fix, needs user verification + * 523a67c422 Merge branch '2015.8' into '2016.3' -- **PR** `#37611`_: (*jeanpralo*) Fix cmd batch raw - @ *2016-11-11T02:53:58Z* + * 4cdc6cf5ec Update earlier release channels' docs with Carbon release notes (`#37914`_) - * b14faf1 Merge pull request `#37611`_ from jeanpralo/fix-cmd-batch-raw - * 4f16840 add integration test for salt.client.LocalClient.cmd_batch + * d31491a7fe [2015.8] Update version numbers in doc config for 2016.11.0 release (`#37918`_) - * ead47e4 update ret dict to avoid hanging +* **PR** `#37924`_: (`cachedout`_) Update test for new gem ver + @ *2016-11-28 18:17:53 UTC* - * 0a2f153 fix dict key for raw support to avoid exception + * 6cd6429ac0 Merge pull request `#37924`_ from cachedout/fix_gem_states -- **PR** `#37614`_: (*gtmanfred*) remove redundant code - @ *2016-11-11T02:49:13Z* + * 894cca3427 Update test for new gem ver - * 35c8333 Merge pull request `#37614`_ from gtmanfred/2016.3 - * 71c2df8 remove redundent code +* **PR** `#37916`_: (`rallytime`_) [2016.3] Update version numbers in doc config for 2016.11.0 release + @ *2016-11-28 17:09:08 UTC* -- **PR** `#37627`_: (*cachedout*) Exempt pip.iteritems from test_valid_docs test - @ *2016-11-11T02:48:37Z* + * c35ba1f390 Merge pull request `#37916`_ from rallytime/doc-update-2016.3 - * 4fab707 Merge pull request `#37627`_ from cachedout/pr-36706 - * 94df2f8 Exempt pip.iteritems from test_valid_docs test + * bd40592289 [2016.3] Update version numbers in doc config for 2016.11.0 release -- **PR** `#36706`_: (*siccrusher*) Add basic sanity checks for env_vars in pip.install function - @ *2016-11-11T02:47:16Z* +* **ISSUE** `#37287`_: (`aaronm-cloudtek`_) salt.states.ddns.present: 'NS' record type always returns as changed (refs: `#37785`_) - - **ISSUE** `#36644`_: (*b1naryth1ef*) env_vars not properly validated/casted to strings w/ virtualenv.manage/pip.install - | refs: `#36706`_ - * ee74f31 Merge pull request `#36706`_ from siccrusher/fix_env_var_validation - * fb27f8b Revert change +* **PR** `#37785`_: (`aaronm-cloudtek`_) respect trailing dot in ddns name parameter + @ *2016-11-28 14:02:10 UTC* - * 79f3e83 Use fully-qualified path for six + * e13a2488c8 Merge pull request `#37785`_ from Cloudtek/ddns-respect-trailing-dot - * 0ca1222 Update pip.py + * 262e3b3697 respect trailing dot in ddns name parameter - * b15de37 * Ensure src is python3 compatible +* **ISSUE** `#37870`_: (`fj40crawler`_) salt.states.augeas.change returns None when test=True (refs: `#37895`_) - * 0976a2d * Before passing on the env_vars dictionary ensure all values are strings. Fixes `#36644`_ +* **PR** `#37895`_: (`fj40crawler`_) Change return value for salt/states/augeas.py to be True instead of N… + @ *2016-11-28 13:49:27 UTC* -- **PR** `#37626`_: (*cachedout*) Exit with proper retcode on hard client failures - @ *2016-11-11T02:38:47Z* + * c03b389422 Merge pull request `#37895`_ from fj40crawler/fix-augeas-return-for-test - - **ISSUE** `#37491`_: (*JensRantil*) "Failed to authenticate! ..." error should exit non-zero - | refs: `#37626`_ - * 902a975 Merge pull request `#37626`_ from cachedout/issue_37491 - * bab9a72 Exit with proper retcode on hard client failures + * ddc238df36 Fixed augeas_test.py to match True v.s. None for test_change_in_test_mode -- **PR** `#37617`_: (*terminalmage*) Clarify docs for git_pillar dynamic env feature - @ *2016-11-11T01:52:52Z* + * ef75c459c0 Merge branch '2016.3' of github.com:saltstack/salt into fix-augeas-return-for-test - * 845f835 Merge pull request `#37617`_ from terminalmage/git_pillar-docs - * 8cdf5db Clarify docs for git_pillar dynamic env feature + * b0fe0cd256 Change return value for salt/states/augeas.py to be True instead of None for cases where salt is run with test=True. Fixes `#37870`_ -- **PR** `#36627`_: (*sjmh*) Skip rest of loop on failed func match - @ *2016-11-10T23:47:12Z* +* **PR** `#37907`_: (`Talkless`_) Fix server trust in test run of svn.latest + @ *2016-11-28 13:47:39 UTC* - * 3079d78 Merge pull request `#36627`_ from sjmh/fix/auth_skip_nomatch - * b3baaf3 Skip rest of loop on failed func match + * fdbc31e8d8 Merge pull request `#37907`_ from Talkless/patch-2 -- **PR** `#37600`_: (*mcalmer*) change TIMEZONE on SUSE systems (bsc`#1008933`_) - @ *2016-11-10T21:54:04Z* + * 072a319490 Fix server trust in test run of svn.latest - - **ISSUE** `#1008933`_: (**) - * a71e7c7 Merge pull request `#37600`_ from mcalmer/fix-timezone-on-SUSE - * 3530b54 change TIMEZONE on SUSE systems (bsc`#1008933`_) +* **PR** `#37896`_: (`toanju`_) rh networking: add missing values + @ *2016-11-27 10:30:35 UTC* -- **PR** `#37602`_: (*DmitryKuzmenko*) Handle master restart in appropriate places using `salt.event` listener. - @ *2016-11-10T21:53:20Z* + * f39fdf443f Merge pull request `#37896`_ from toanju/2016.3 - - **ISSUE** `#37238`_: (*cmclaughlin*) Restarting master causes minion to hang - | refs: `#37438`_ `#37602`_ - - **ISSUE** `#37018`_: (*tsaridas*) get events from python - | refs: `#37438`_ `#37602`_ - - **PR** `#37438`_: (*DmitryKuzmenko*) Fix for `#37238`_ salt hang on master restart - | refs: `#37602`_ - * 39b7587 Merge pull request `#37602`_ from DSRCorporation/bugs/37238_salt_hang_on_master_restart - * d3d987b Handle master restart in appropriate places using `salt.event` listener. + * c95304188e rh networking: add missing values -- **PR** `#37608`_: (*gtmanfred*) allow multiline returns from docker for mac - @ *2016-11-10T21:48:59Z* +* **PR** `#37886`_: (`bdrung`_) Fix various spelling mistakes + @ *2016-11-25 02:59:36 UTC* - * 019e1a7 Merge pull request `#37608`_ from gtmanfred/2016.3 - * 74aee1e allow multiline returns from docker for mac + * ea935c5a91 Merge pull request `#37886`_ from bdrung/fix-typos -* 71032f8 Documentation improvements and corrections (`#37604`_) + * 9a51ba5c5b Fix various spelling mistakes - - **ISSUE** `#37592`_: (*craigafinch*) State git.latest does not work with SSH - | refs: `#37604`_ - - **ISSUE** `#37551`_: (*viict*) git.latest "Not a valid commit name" - | refs: `#37571`_ `#37604`_ - - **PR** `#37604`_: (*terminalmage*) Documentation improvements and corrections +* **ISSUE** `#37732`_: (`dhaines`_) list_semod() (from modules/selinux.py) incompatible with policycoreutils-2.5 (RHEL 7.3) (refs: `#37736`_) -* a7e09f9 Use existing VM's VDD size if not specified in the cloud profile (`#37579`_) +* **PR** `#37736`_: (`dhaines`_) handle semodule version >=2.4 (`#37732`_) and fix typo + @ *2016-11-24 01:44:20 UTC* - - **PR** `#37579`_: (*pass-by-value*) Use existing VM's VDD size if not specified in the cloud profile + * 371b0a86d9 Merge pull request `#37736`_ from dhaines/issue-37732 -- **PR** `#37540`_: (*yhekma*) Added prefix to tempfile for template - @ *2016-11-10T00:37:18Z* + * 7ef590a505 Update selinux.py - - **ISSUE** `#37541`_: (*yhekma*) salt-minion does not clean up temp files for templates - | refs: `#37540`_ `#37640`_ - * fdd13b4 Merge pull request `#37540`_ from yhekma/2016.3 - * 93a59f8 Added prefix to tempfile for template + * 516a67e6a3 fix indexing error -* 5e80acc Update for m2crypto changes removing lhash (`#37578`_) + * 4e49c1e991 fix typo - - **ISSUE** `#37084`_: (*AaronM-Cloudtek*) x509.certificate_managed does not work with m2crypto >=0.25 - | refs: `#37578`_ - - **PR** `#37578`_: (*clinta*) Update for m2crypto changes removing lhash + * b16f2d8400 handle semodule version >=2.4 (`#37732`_) and fix typo -* 928462d fix example of function argument limiting (`#37584`_) +* **PR** `#37797`_: (`clan`_) check count of columns after split + @ *2016-11-24 01:28:59 UTC* - - **PR** `#37584`_: (*clinta*) Fix eauth example for limiting args + * 87aeb66fbf Merge pull request `#37797`_ from clan/extfs -* 2810b85 Add a test to ensure we don't check for fast-forward before fetching (`#37571`_) + * acf0f960ef check count of columns after split - - **ISSUE** `#37551`_: (*viict*) git.latest "Not a valid commit name" - | refs: `#37571`_ `#37604`_ - - **PR** `#37571`_: (*terminalmage*) Add a test to ensure we don't check for fast-forward before fetching +* **PR** `#37762`_: (`twangboy`_) Add pre_versions to chocolatey.installed + @ *2016-11-24 01:27:29 UTC* -- **PR** `#37553`_: (*rallytime*) Back-port `#37521`_ to 2016.3 - @ *2016-11-08T23:11:07Z* + * f7c7109152 Merge pull request `#37762`_ from twangboy/fix_chocolatey_state - - **ISSUE** `#33645`_: (*ketzacoatl*) saltutil.sync_all does not sync custom pillar modules to masterless minions - | refs: `#33833`_ - - **ISSUE** `#25297`_: (*Akilesh1597*) perform 'refresh_pillar' as a part of 'sync_all' - | refs: `#37521`_ `#25361`_ - - **PR** `#37521`_: (*genuss*) refresh_pillar() should be called always with refresh=True during saltutil.sync_all - | refs: `#37553`_ - - **PR** `#33833`_: (*terminalmage*) Support syncing pillar modules to masterless minions - | refs: `#37521`_ - - **PR** `#25361`_: (*tedski*) perform `refresh_pillar` as part of `sync_all` when `refresh=True` - | refs: `#37521`_ - * b01c247 Merge pull request `#37553`_ from rallytime/`bp-37521`_ - * 30f92b0 refresh_pillar() should be called always + * 9696b6dfa5 Use keyword args instead of relying on ordering -- **PR** `#37565`_: (*rallytime*) Back-port `#37549`_ to 2016.3 - @ *2016-11-08T23:10:25Z* + * 398eaa074d Add pre_versions to the available arguments - - **PR** `#37549`_: (*Mrten*) sqlite is not found in 2015.8 - | refs: `#37565`_ - * 694df30 Merge pull request `#37565`_ from rallytime/`bp-37549`_ - * c92a90b Update sqlite3.py +* **PR** `#37866`_: (`meaksh`_) Backport `#37149`_ `#36938`_ and `#36784`_ to 2016.3 + @ *2016-11-23 21:54:17 UTC* - * fb76557 sqlite is not found in 2015.8 + * **PR** `#37857`_: (`meaksh`_) Backport `#37149`_ and `#36938`_ to 2015.8 (refs: `#37866`_) -* 2fc0b22 Fix regression in service.dead state (`#37562`_) + * **PR** `#37856`_: (`meaksh`_) Backport `#36784`_ to 2015.8 (refs: `#37866`_) - - **ISSUE** `#37511`_: (*jdelic*) service.dead now only operates if the service file exists - | refs: `#37562`_ - - **PR** `#37562`_: (*terminalmage*) Fix regression in service.dead state + * **PR** `#37149`_: (`dincamihai`_) Fix pkg.latest_version when latest already installed (refs: `#37857`_, `#37866`_) -* ac754db Skip config type checking for sdb values (`#37560`_) + * **PR** `#36938`_: (`wanparo`_) acl.delfacl: fix position of -X option to setfacl (refs: `#37857`_, `#37866`_) - - **ISSUE** `#37554`_: (*sjmh*) salt-api doesn't dynamically re-read nodegroups configuration - | refs: `#37560`_ - - **PR** `#37560`_: (*whiteinge*) Skip config type checking for sdb values + * **PR** `#36784`_: (`moio`_) OS grains for SLES Expanded Support (refs: `#37856`_, `#37866`_) -* 453319b Don't pass the vpc id to boto.vpc.create_internet_gateway func (`#37556`_) + * 56baa92d55 Merge pull request `#37866`_ from meaksh/2016.3-bp-37149-36938-36784 - - **PR** `#37556`_: (*rallytime*) Don't pass the vpc id to boto.vpc.create_internet_gateway func + * 9d8d578109 Fix pkg.latest_version when latest already installed -* 89b9417 Documentation rendering fixes (`#37543`_) + * ffca0d491c - acl.delfacl: fix position of -X option to setfacl - - **PR** `#37543`_: (*multani*) Documentation rendering fixes + * 3dfed6b841 Adjust linux_acl unit test argument ordering -- **PR** `#37457`_: (*rallytime*) Fixup file.line docs to be more clear and consistent - @ *2016-11-08T00:29:20Z* + * f185ecdde1 core.py: quote style fixed - - **ISSUE** `#31081`_: (*JensRantil*) salt.modules.file.line documentation unclarities - | refs: `#37457`_ - * 96b8b9a Merge pull request `#37457`_ from rallytime/`fix-31081`_ - * 25821bb Clarify which modes use "before", "after", and "indent" options + * 8404d13424 Setting up OS grains for SLES Expanded Support (SUSE's Red Hat compatible platform) - * 8b2d2b9 Clarify file.line state docs as well +* **ISSUE** `#32829`_: (`tyhunt99`_) Dockerng appears to not be using docker registries pillar data (refs: `#36893`_) - * b261589 Move note about using mode=insert with location options to mode section +* **PR** `#37863`_: (`rallytime`_) Back-port `#36893`_ to 2016.3 + @ *2016-11-23 17:09:09 UTC* - * db0b0ce Fixup file.line docs to be more clear and consistent + * **PR** `#36893`_: (`tyhunt99`_) add option to force a reauth for a docker registry (refs: `#37863`_) -- **PR** `#37526`_: (*twangboy*) Remove loop from dsc.apply_config - @ *2016-11-08T00:23:11Z* + * d0cc7f0d56 Merge pull request `#37863`_ from rallytime/bp-36893 - - **ISSUE** `#35799`_: (*davegiles*) dsc.apply_config hangs (no error) on empty directory on target - | refs: `#37526`_ - * 7de790f Merge pull request `#37526`_ from twangboy/fix_35799 - * fc42609 Remove unnecessary format + * 4c70534991 Add versionadded to reauth option in dockerng module - * c934a2b Remove the loop from apply_config + * 5ca2c388c2 added documentation for the new reuth option in docker registry configuration -- **PR** `#37534`_: (*rallytime*) Back-port fix needed from `#37515`_ - @ *2016-11-08T00:14:46Z* + * 5b0c11ab47 add option to force a reauth for a docker registry - - **PR** `#37515`_: (*rallytime*) [carbon] Merge forward from 2016.3 to carbon - | refs: `#37534`_ `#37534`_ - * 94811df Merge pull request `#37534`_ from rallytime/bp-merge-foward-fix - * d1b2af1 Add missing source_hash_name args to a couple funcs + * **PR** `#37847`_: (`laleocen`_) add multiline encryption documentation to nacl -- **PR** `#37533`_: (*whiteinge*) Return a 504 response instead of 500 for Salt timeouts - @ *2016-11-08T00:14:15Z* +* **ISSUE** `#37787`_: (`elyulka`_) user.present state fails to change loginclass on FreeBSD (refs: `#37827`_) - * 17adbb0 Merge pull request `#37533`_ from whiteinge/salt-api-504-timeouts - * 63226ae Return a 504 response instead of 500 for Salt timeouts + * **PR** `#37827`_: (`silenius`_) add missing chloginclass -- **PR** `#37529`_: (*lorengordon*) Backport: PR 36736 to 2016.3 - @ *2016-11-08T00:04:10Z* + * **PR** `#37826`_: (`rallytime`_) Update branch refs to more relevant branch - - **ISSUE** `#36679`_: (*lorengordon*) Command 'Import-Module ServerManager' failed with return code: 1 - | refs: `#36736`_ - - **PR** `#36736`_: (*m03*) Fix issue 36679 win_servermanager error - | refs: `#37529`_ - * a9f03ee Merge pull request `#37529`_ from lorengordon/`bp-36736`_ - * 21c2664 Fix issue 36679 win_servermanager failure + * **PR** `#37822`_: (`laleocen`_) add documenation for multiline encryption using nacl (refs: `#37826`_) -- **PR** `#37519`_: (*rallytime*) Update returner __virtual__() return messages for loader - @ *2016-11-07T23:06:23Z* +* **ISSUE** `#19269`_: (`markuskramerIgitt`_) Undocumented feature `names:` of `file.directory` (refs: `#37823`_) - - **ISSUE** `#37444`_: (*Tanoti*) Returning False from __virtual__ in a returner does not return expected error - | refs: `#37502`_ `#37519`_ - - **PR** `#37502`_: (*cachedout*) Log proper message on returners that cannot be loaded - | refs: `#37519`_ - * 19475aa Merge pull request `#37519`_ from rallytime/returner-load-errors - * fb261a3 Update returner __virtual__() return messages for loader + * **PR** `#37823`_: (`rallytime`_) Add "names" option to file state docs: point users to highstate doc examples -- **PR** `#37527`_: (*rallytime*) Add syndic_id=None kwarg to save_minions funcs in returners - @ *2016-11-07T23:04:03Z* +* **ISSUE** `#15697`_: (`arthurlogilab`_) keystone.user_present should not re-set the password when user exists (refs: `#37821`_) - - **ISSUE** `#35016`_: (*pingangit*) TypeError: save_minions() got an unexpected keyword argument 'syndic_id' - | refs: `#37527`_ - * fefdfab Merge pull request `#37527`_ from rallytime/`fix-35016`_ - * 2944b24 Add syndic_id=None kwarg to save_minions funcs in returners + * **PR** `#37821`_: (`rallytime`_) Clarify keystone.user_present password state docs with default behavior -* b77b6ba fix Lithium to 2015.5.0 (`#37530`_) +* **ISSUE** `#5999`_: (`pille`_) libvirt.keys does not work (refs: `#37820`_) - - **PR** `#37530`_: (*gtmanfred*) fix Lithium to 2015.5.0 + * **PR** `#37820`_: (`rallytime`_) Add some dependency documentation to libvirt docs -- **PR** `#37514`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - @ *2016-11-07T16:51:06Z* +* **PR** `#37772`_: (`bdrung`_) Support initializing OpenSSL 1.1 + @ *2016-11-21 20:28:51 UTC* - - **PR** `#37482`_: (*rallytime*) [2015.8] Doc version updated to 2016.3.4 - * 7431648 Merge pull request `#37514`_ from rallytime/merge-2016.3 - * 41166ae Merge branch '2015.8' into '2016.3' + * 485270f74e Merge pull request `#37772`_ from bdrung/openssl1.1 - * c505a05 [2015.8] Doc version updated to 2016.3.4 (`#37482`_) + * 819c9658ed Support initializing OpenSSL 1.1 -- **PR** `#37503`_: (*cachedout*) Catch loader error on returners without save_load - @ *2016-11-07T09:33:57Z* +* **ISSUE** `#37383`_: (`edwardsdanielj`_) Orchestration arguments (kwarg) not being interperted / How I learned to stop worrying about documentation and love experimenting (refs: `#37817`_) - - **ISSUE** `#36713`_: (*Tanoti*) ExtraData: unpack(b) received extra data after upgrading to 2016.3.3 - | refs: `#37503`_ - * 2d924d0 Merge pull request `#37503`_ from cachedout/issue_36713 - * 5f7f971 Catch loader error on returners without save_load + * **PR** `#37817`_: (`rallytime`_) Update orchestrate runner file.copy doc example -- **PR** `#37499`_: (*cachedout*) Clarify docs on salt-key events - @ *2016-11-07T09:33:20Z* +* **ISSUE** `#37653`_: (`gravyboat`_) Salt.cron docs don't wrap @hourly and @daily correctly in quotes for the examples (refs: `#37816`_) - - **ISSUE** `#37448`_: (*alisson276*) In 'salt/key' events there are acts that never happen - | refs: `#37499`_ - * d95bf59 Merge pull request `#37499`_ from cachedout/key_docs_clarify - * 2758e74 Clarify docs on salt-key events +* **ISSUE** `#31953`_: (`sjorge`_) Documentation for salt.states.cron is incorrect (refs: `#32157`_) -- **PR** `#37500`_: (*cachedout*) Remove unused flag - @ *2016-11-07T09:33:04Z* +* **PR** `#37816`_: (`rallytime`_) Back-port `#32157`_ to 2016.3 + @ *2016-11-21 20:22:27 UTC* - * 1dd1408 Merge pull request `#37500`_ from cachedout/remove_include_errors - * 6c705b1 Remove unused flag + * **PR** `#32157`_: (`cachedout`_) Add quotes to cron doc (refs: `#37816`_) -- **PR** `#37502`_: (*cachedout*) Log proper message on returners that cannot be loaded - | refs: `#37519`_ - @ *2016-11-07T09:32:45Z* + * c5d3d8b66a Merge pull request `#37816`_ from rallytime/bp-32157 - - **ISSUE** `#37444`_: (*Tanoti*) Returning False from __virtual__ in a returner does not return expected error - | refs: `#37502`_ `#37519`_ - * 4b6f1ab Merge pull request `#37502`_ from cachedout/issue_37444 - * 4c5ab05 Remove debugging + * d9c297119e Add quotes to cron doc - * 17d01e4 Log proper message on returners that cannot be loaded +* **PR** `#37812`_: (`rallytime`_) Back-port `#37790`_ to 2016.3 + @ *2016-11-21 18:46:40 UTC* -- **PR** `#37494`_: (*sjorge*) Forgot to update os_family map in `#37472`_ - @ *2016-11-06T22:18:54Z* + * **PR** `#37790`_: (`sofixa`_) Update cloud/proxmox.rst with more options and LXC (refs: `#37812`_) - - **ISSUE** `#37389`_: (*d101nelson*) Some core grains are inaccurate or incomplete for Solaris - | refs: `#37472`_ - - **PR** `#37472`_: (*sjorge*) 2016.3 solaris grains improvements - | refs: `#37494`_ `#37494`_ - * 2422daf Merge pull request `#37494`_ from sjorge/2016.3-osfam_map - * 96ba545 Forgot to update os_family map in `#37472`_ + * 97e6b6aabe Merge pull request `#37812`_ from rallytime/bp-37790 -- **PR** `#37496`_: (*mcalmer*) fix status handling in sysv init scripts - @ *2016-11-06T22:18:00Z* + * ca3b6e7874 Update proxmox.rst with more options and LXC - * 41bd8e3 Merge pull request `#37496`_ from mcalmer/fix-status-handling-in-sysv-init-scripts - * 1fb2c4d fix status handling in sysv init scripts +* **ISSUE** `#37751`_: (`freach`_) Documentation salt.states.dockerng.running: "privileged" property undocumented (refs: `#37789`_) -- **PR** `#37497`_: (*terminalmage*) Update 2016.3.5 release notes with source_hash_name explanation - @ *2016-11-06T22:17:40Z* +* **PR** `#37811`_: (`rallytime`_) Back-port `#37789`_ to 2016.3 + @ *2016-11-21 18:46:21 UTC* - * e741a77 Merge pull request `#37497`_ from terminalmage/release_notes - * c08038d Update 2016.3.5 release notes with source_hash_name explanation + * **PR** `#37789`_: (`fedusia`_) issue: 37751 (refs: `#37811`_) -- **PR** `#37486`_: (*twangboy*) Add requirement for PowerShell 3 on Windows - @ *2016-11-06T06:01:07Z* + * 27703c54bc Merge pull request `#37811`_ from rallytime/bp-37789 - * f4426c2 Merge pull request `#37486`_ from twangboy/fix_win_docs - * 9e0631a Add docs denoting the requirement for at least PowerShell 3 + * ba3fef48e1 fix comment -- **PR** `#37493`_: (*cachedout*) Add sdb support to minion and master configs - @ *2016-11-06T06:00:18Z* + * a021f76a9b issue: 37751 Add documentation for option privileged - * a1f355a Merge pull request `#37493`_ from cachedout/minion_master_sdb - * 9761a46 Add sdb support to minion and master configs +* **PR** `#37810`_: (`rallytime`_) Back-port `#37775`_ to 2016.3 + @ *2016-11-21 18:45:53 UTC* -- **PR** `#37452`_: (*rallytime*) file.line with mode=replace on an empty file should return False, not stacktrace - @ *2016-11-06T01:55:11Z* + * **PR** `#37775`_: (`calve`_) Document `python` argument in `salt.states.virtualenv_mod` (refs: `#37810`_) - - **ISSUE** `#31135`_: (*jeffreyctang*) file.line mode=replace breaks on empty file. - | refs: `#37452`_ - * be93710 Merge pull request `#37452`_ from rallytime/`fix-31135`_ - * c792f76 Bump log level from debug to warning on empty file + * adac9d7c0c Merge pull request `#37810`_ from rallytime/bp-37775 - * 5f181cf file.line with mode=replace on an empty file should return False + * 2bed91437b Document `python` argument in `salt.states.virtualenv_mod` - * 94a00c6 Write a unit test demonstrating stack trace in `#31135`_ +* **ISSUE** `#37742`_: (`blaketmiller`_) Cannot match on nodegroup when checking minions (refs: `#37763`_) -- **PR** `#37469`_: (*terminalmage*) Rewrite file.extract_hash to improve its matching ability - @ *2016-11-06T01:50:01Z* + * **PR** `#37763`_: (`cachedout`_) Add nodegroup check to ckminions - - **ISSUE** `#37001`_: (*phil123456*) URGENT : archive.extracted does not work anymore - | refs: `#37081`_ - - **ISSUE** `#29010`_: (*The-Loeki*) file.managed download failing checksum testing for Ubuntu initrd w/source_hash - | refs: `#37469`_ - - **PR** `#37081`_: (*terminalmage*) Fix archive.extracted remote source_hash verification - | refs: `#37469`_ `#37469`_ - * 129b038 Merge pull request `#37469`_ from terminalmage/issue29010 - * a3f38e5 Update file.extract_hash unit tests +* **ISSUE** `#37725`_: (`secumod`_) salt-call incorrectly parses master hostname:port from minion config (refs: `#37766`_) - * b26b528 Add the source_hash_name param to file.managed states + * **PR** `#37766`_: (`cachedout`_) Fix ip/port issue with salt-call - * 52fe72d Rewrite file.extract_hash +* **ISSUE** `#33709`_: (`msummers42`_) Any/All Salt-SSH invocations in 2016.3.0 Fails with AttributeError: 'module' object has no attribute 'BASE_THORIUM_ROOTS_DIR' (refs: `#37767`_) -- **PR** `#37472`_: (*sjorge*) 2016.3 solaris grains improvements - | refs: `#37494`_ `#37494`_ - @ *2016-11-06T01:46:10Z* + * **PR** `#37767`_: (`cachedout`_) Add thorium path to syspaths - - **ISSUE** `#37389`_: (*d101nelson*) Some core grains are inaccurate or incomplete for Solaris - | refs: `#37472`_ - * 9426b9d Merge pull request `#37472`_ from sjorge/2016.3-solaris-grains - * 2958f5c detect and properly handle OmniOS +* **PR** `#37760`_: (`hu-dabao`_) Fix couchbase returner and add couple of more features + @ *2016-11-18 00:28:23 UTC* - * 37c3a7f handle Oracle Solaris better + * bff949f4e9 Merge pull request `#37760`_ from hu-dabao/fix_cb_returner - * 69706d3 parse minorrelease if it has a / in it + * de372f277e 1. returner no need to check whether the jid exists for external job cache setup 2. add full_ret to return doc so that the document will be informative 3. make ttl as a config attribute because salt-minion does not have keep_jobs attribute 4. add password into config attribute 5. update the documents accordingly - * d1cf4a0 improve regex for parsing /etc/release using files from Solaris 8 SPARC and Solaris 10 +* **ISSUE** `#36629`_: (`yhekma`_) The pillar run module does not honor saltenv (refs: `#37738`_) - * 88eddef some more cleanup for smartos +* **PR** `#37738`_: (`terminalmage`_) Allow pillar.get to retrieve fresh pillar data when saltenv passed + @ *2016-11-17 23:13:04 UTC* - * d3ff39f improve smartos os version grains + * 1f976ac212 Merge pull request `#37738`_ from terminalmage/issue36629 -- **PR** `#37478`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - @ *2016-11-04T20:30:08Z* + * da46678c51 Allow pillar.get to retrieve fresh pillar data when saltenv passed - - **ISSUE** `#37388`_: (*tyhunt99*) [2016.3.4] Refreshing of an s3 file server results in an exception. - | refs: `#37428`_ - - **ISSUE** `#37286`_: (*terminalmage*) GitFS: mountpoints with trailing slashes cause all file paths in that repo to fail to be matched - | refs: `#37408`_ - - **ISSUE** `#36849`_: (*skulikov*) file.managed and archive.extracted don't properly work for tgz remote files - | refs: `#37418`_ - - **PR** `#37441`_: (*rallytime*) Back-port `#37428`_ to 2015.8 - - **PR** `#37428`_: (*cachedout*) Fix incorrect reference of __utils__ in salt.utils - | refs: `#37441`_ - - **PR** `#37418`_: (*terminalmage*) Do not use compression in tornado httpclient requests - - **PR** `#37408`_: (*terminalmage*) Strip slashes from gitfs mountpoints - * 4ba63ab Merge pull request `#37478`_ from rallytime/merge-2016.3 - * 3483a44 Merge branch '2015.8' into '2016.3' + * **PR** `#37745`_: (`cro`_) Switch default filter tag for ONE resources from user only to all resources - * 35888c2 Merge pull request `#37408`_ from terminalmage/issue37286 +* **ISSUE** `#37498`_: (`githubcdr`_) service.restart salt-minion fails on Ubuntu 14.04.5 LTS (refs: `#37748`_, `#38587`_) - * 4e4a057 Strip slashes from gitfs mountpoints + * **PR** `#37748`_: (`silenius`_) check for SERVICE_DIR in __virtual__ in salt.modules.daemontools - * b6c57c6 Merge pull request `#37418`_ from terminalmage/issue36849 +* **ISSUE** `#37734`_: (`Ch3LL`_) Joyent Cloud Size Issue (refs: `#37735`_) - * 740bc54 Do not use compression in tornado httpclient requests +* **PR** `#37735`_: (`Ch3LL`_) change size and image of joyent profile + @ *2016-11-16 21:07:52 UTC* - * 7fba8aa Merge pull request `#37441`_ from rallytime/`bp-37428`_ + * fa7883115e Merge pull request `#37735`_ from Ch3LL/fix_joyent_profile - * 6fe3ef4 Fix incorrect reference of __utils__ in salt.utils + * 9ef41dcdfc change size and image of joyent profile -* 8aa101a Get release notes started for 2016.3.5 (`#37485`_) +* **PR** `#37731`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-11-16 17:13:02 UTC* - - **PR** `#37485`_: (*rallytime*) Get release notes started for 2016.3.5 + * 98e25c68aa Merge pull request `#37731`_ from rallytime/merge-2016.3 -* dfd9495 [2016.3] Doc version updated to 2016.3.4 (`#37483`_) + * ec1389711f Merge branch '2015.8' into '2016.3' - - **PR** `#37483`_: (*rallytime*) [2016.3] Doc version updated to 2016.3.4 + * f417dbbe99 Merge pull request `#37718`_ from terminalmage/docs -- **PR** `#37121`_: (*nevins-b*) allow the file.recurse state to support saltenv - @ *2016-11-04T05:59:28Z* + * 23b8b2a3f4 Fix incorrectly-formatted RST - - **ISSUE** `#37123`_: (*nevins-b*) file.recurse state doesn't support pulling from other environments - | refs: `#37121`_ - * 580eca7 Merge pull request `#37121`_ from nevins-b/2016.3 - * 99d2c36 making messaging in tests match new return + * **PR** `#37724`_: (`cachedout`_) Warn on AES test for systems with > 1 core - * bc4b0e7 adding test for saltenv in file.recurse source url +* **PR** `#37721`_: (`terminalmage`_) Fix for pillar setting 'environment' key in __gen_opts() + @ *2016-11-16 16:04:53 UTC* - * 3315b67 fixing saltenv if not set in url + * 35655d521f Merge pull request `#37721`_ from terminalmage/zd909 - * a9683cb allow the file.recurse state to support saltenv (salt://example/dir?saltenv=dev) + * acdd5513da Update git_pillar docs to reflect info from bugfix -- **PR** `#37426`_: (*jfindlay*) Wait for macOS to change system settings - @ *2016-11-04T04:35:52Z* + * 433737d2dc Fix for pillar setting 'environment' key in __gen_opts() - - **PR** `#37351`_: (*jfindlay*) modules.mac_power: give macOS time to change setting - | refs: `#37426`_ - * 766b143 Merge pull request `#37426`_ from jfindlay/mac_sleep - * 43a8e19 modules.mac_power: wait for system to make change +* **PR** `#37719`_: (`terminalmage`_) Fix incorrectly-formatted RST (2016.3 branch) + @ *2016-11-16 08:20:53 UTC* - * feabca6 modules.mac_system: wait for system to make change + * 99cda7c003 Merge pull request `#37719`_ from terminalmage/docs-2016.3 - * 0213eb9 utils.mac_utils: add confirm_updated + * f163b4c724 Fix incorrectly-formatted RST -- **PR** `#37438`_: (*DmitryKuzmenko*) Fix for `#37238`_ salt hang on master restart - | refs: `#37602`_ - @ *2016-11-04T04:10:51Z* +* **PR** `#37694`_: (`cachedout`_) Catch differences in git URLs in npm state + @ *2016-11-16 01:56:18 UTC* - - **ISSUE** `#37238`_: (*cmclaughlin*) Restarting master causes minion to hang - | refs: `#37438`_ `#37602`_ - - **ISSUE** `#37018`_: (*tsaridas*) get events from python - | refs: `#37438`_ `#37602`_ - * 9eab5c8 Merge pull request `#37438`_ from DSRCorporation/bugs/37238_salt_hang_on_master_restart - * f253d3c Auto reconnect `salt` to master if the connection was lost. + * 8dea695c7c Merge pull request `#37694`_ from cachedout/npm_git -- **PR** `#37440`_: (*rallytime*) Back-port `#31207`_ to 2016.3 - @ *2016-11-04T04:09:33Z* + * 0e3bc2366a Catch differences in git URLs in npm state - - **PR** `#31207`_: (*thusoy*) Remove error logging of missing boto libraries - | refs: `#37440`_ - * 9aa7073 Merge pull request `#37440`_ from rallytime/`bp-31207`_ - * c71ae61 Remove error logging of missing boto libraries +* **ISSUE** `#37665`_: (`kluoto`_) boto_elb state fails as key is overwritten by the code (refs: `#37705`_) -- **PR** `#37442`_: (*twangboy*) Create paths.d directory - @ *2016-11-04T04:07:19Z* +* **PR** `#37705`_: (`rallytime`_) Don't overwrite the "key" variable passed in to _listeners_present func + @ *2016-11-15 21:26:37 UTC* - * edbfadc Merge pull request `#37442`_ from twangboy/fix_osx_postinstall - * 8091a30 Create paths.d directory + * 329448ccd7 Merge pull request `#37705`_ from rallytime/fix-37665 -- **PR** `#37445`_: (*twangboy*) Check for Server os before checking [DO NOT MERGE FORWARD] - @ *2016-11-04T04:04:49Z* + * 3b7e9c5e3b Don't overwrite the "key" variable passed in to _listeners_present func - * afb1b3c Merge pull request `#37445`_ from twangboy/fix_import_error_2016.3 - * c0d5ebd Check for Server os before checking +* **PR** `#37707`_: (`Ch3LL`_) add timeout increase on azure tests + @ *2016-11-15 21:24:25 UTC* -- **PR** `#37446`_: (*twangboy*) Detect VC++ for Python on Win32 - @ *2016-11-04T04:04:02Z* + * **PR** `#37239`_: (`Ch3LL`_) Fix cloud tests timeout (refs: `#37707`_) - * 7a9f95a Merge pull request `#37446`_ from twangboy/fix_build_32 - * 2de69f4 Detect VC for Python correctly on 32bit Windows + * ac9a316b50 Merge pull request `#37707`_ from Ch3LL/fix_timeout_azure -- **PR** `#37447`_: (*rallytime*) Cast ip_protocol rule as a str() in boto_secgroup.present - @ *2016-11-04T04:03:45Z* + * 363122c675 add timeout increase on azure tests - - **ISSUE** `#36961`_: (*nullify005*) boto_secgroup assumes a string when checking ip_protocol validity when not ``tcp|udp|all|-1`` - | refs: `#37447`_ - * 651e0f7 Merge pull request `#37447`_ from rallytime/`fix-36961`_ - * 6b930ac Cast ip_protocol rule as a str() in boto_secgroup.present +* **PR** `#37704`_: (`twangboy`_) Fix test disabled 2016.3 [DO NOT MERGE FORWARD] + @ *2016-11-15 16:48:52 UTC* -- **PR** `#37455`_: (*techhat*) Make api opts respect correct root_dir - @ *2016-11-04T03:25:40Z* + * 1ece265354 Merge pull request `#37704`_ from twangboy/fix_test_disabled_2016.3 - - **ISSUE** `#36446`_: (*whiteinge*) Custom salt-api config problem - | refs: `#37455`_ - - **PR** `#36386`_: (*xiaoanyunfei*) fix salt-api's default opts were covered by salt-master `#35734`_ - | refs: `#37455`_ - * a51d944 Merge pull request `#37455`_ from techhat/issue36446 - * 7eff90d Make api opts respect correct root_dir + * a0429cf839 Use nfsd instead of apsd for test_disabled -- **PR** `#37459`_: (*twangboy*) Fix error message when ConvertTo-Json not supported [DO NOT MERGE FORWARD] - @ *2016-11-04T03:22:31Z* +* **PR** `#37690`_: (`twangboy`_) Update pyzmq to 15.3.0 for 2016.3 [DO NOT MERGE FORWARD] + @ *2016-11-15 03:10:36 UTC* - * 3591bf0 Merge pull request `#37459`_ from twangboy/fix_dsc_json_msg_2016.3 - * 949b709 Use cmd.run_all instead of cmd.shell + * 44f05acbff Merge pull request `#37690`_ from twangboy/update_pyzmq_2016.3 -- **PR** `#37430`_: (*meaksh*) Including resolution parameters in the Zypper debug-solver call during a dry-run dist-upgrade (2016.3) - @ *2016-11-03T14:35:46Z* + * cf55342150 Update pyzmq to version 15.3.0 - - **ISSUE** `#2016`_: (*seanchannel*) status.custom failing on any arguments - - **PR** `#37353`_: (*meaksh*) Including resolution parameters in the Zypper debug-solver call during a dry-run dist-upgrade - | refs: `#37430`_ - * 80a99c4 Merge pull request `#37430`_ from meaksh/zypper-dist-upgrade-debug-solver-`fix-2016`_.3 - * ffc596f Including resolver params for Zypper debug-solver +* **PR** `#37680`_: (`rallytime`_) Back-port `#32965`_ to 2016.3 + @ *2016-11-15 02:56:46 UTC* -* 67cc7a7 Fix incorrect reference of __utils__ in salt.utils (`#37428`_) + * **PR** `#32965`_: (`kevinquinnyo`_) Fix 'present' option when used without 'key_type' (refs: `#37680`_) - - **ISSUE** `#37388`_: (*tyhunt99*) [2016.3.4] Refreshing of an s3 file server results in an exception. - | refs: `#37428`_ - - **PR** `#37428`_: (*cachedout*) Fix incorrect reference of __utils__ in salt.utils - | refs: `#37441`_ + * a743d8b5e6 Merge pull request `#37680`_ from rallytime/bp-32965 -- **PR** `#37419`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - @ *2016-11-02T21:40:04Z* + * 1865b13645 Fix 'present' option when used without 'key_type' - - **ISSUE** `#33187`_: (*usbportnoy*) Deploy to jboss TypeError at boss7.py:469 - | refs: `#33190`_ - - **PR** `#37392`_: (*rallytime*) Back-port `#33190`_ to 2015.8 - - **PR** `#33190`_: (*usbportnoy*) Fixes Type error in jboss state module when concatenating comments - | refs: `#37392`_ - * 7864f9b Merge pull request `#37419`_ from rallytime/merge-2016.3 - * bce47c9 Merge branch '2015.8' into '2016.3' +* **ISSUE** `#35964`_: (`edgan`_) salt-ssh doesn't set the return code to non-zero on highstate rendering error (refs: `#35965`_) - * 7b1d3b5 Merge pull request `#37392`_ from rallytime/`bp-33190`_ +* **PR** `#37681`_: (`rallytime`_) Back-port `#35965`_ to 2016.3 + @ *2016-11-14 21:19:22 UTC* - * 4063bae catch None cases for comments in jboss7 state module + * **PR** `#35965`_: (`edgan`_) Set the return code to 1 on salt-ssh highstate errors (refs: `#37681`_) -* d749567 Fix regression in output for Ctrl-c'ed CLI jobs (`#37416`_) + * 1c2d6ff293 Merge pull request `#37681`_ from rallytime/bp-35965 - - **PR** `#37416`_: (*terminalmage*) Fix regression in output for Ctrl-c'ed CLI jobs + * 700f3fa57f Set the return code to 1 on salt-ssh highstate errors -* e9b4620 Add unit tests for cloning from snapshot (`#37414`_) +* **PR** `#37668`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-11-14 15:43:25 UTC* - - **PR** `#37414`_: (*pass-by-value*) Add unit tests for cloning from snapshot - - **PR** `#37350`_: (*pass-by-value*) Add handling for full and linked clone - | refs: `#37414`_ + * 1b456b55dc Merge pull request `#37668`_ from rallytime/merge-2016.3 -- **PR** `#37404`_: (*cachedout*) Revert "Bootstrap delay option for salt-cloud" - @ *2016-11-02T09:48:53Z* + * ef684c6b02 Merge branch '2015.8' into '2016.3' - - **PR** `#37401`_: (*cachedout*) Bootstrap delay option for salt-cloud - | refs: `#37404`_ - * ecd794a Merge pull request `#37404`_ from saltstack/revert-37401-bootstrap_delay - * e864de8 Revert "Bootstrap delay option for salt-cloud" + * a01b66556f Add docs for rotate_aes_key (`#37641`_) -- **PR** `#37401`_: (*cachedout*) Bootstrap delay option for salt-cloud - | refs: `#37404`_ - @ *2016-11-02T09:02:13Z* +* **ISSUE** `#37492`_: (`JensRantil`_) Failing `salt -b 1 minion state.highstate` has wrong exit code (refs: `#37625`_) - * 2eb44fb Merge pull request `#37401`_ from cachedout/bootstrap_delay - * 6e42b0e Bootstrap delay option for salt-cloud +* **PR** `#37625`_: (`cachedout`_) Return with proper retcodes in batch mode + @ *2016-11-12 20:29:09 UTC* -- **PR** `#37350`_: (*pass-by-value*) Add handling for full and linked clone - | refs: `#37414`_ - @ *2016-11-02T08:02:29Z* + * 305e51d1c0 Merge pull request `#37625`_ from cachedout/issue_37492 - * 9446e48 Merge pull request `#37350`_ from pass-by-value/full_and_linked_clone_v1 - * d8b1c9c Add handling for full and linked clone and commit disk mode additions + * b6031524e5 Return with proper retcodes in batch mode -- **PR** `#37386`_: (*rallytime*) Fix win_useradd.chgroups return when cmd.run_all retcode != 0 - @ *2016-11-02T06:34:12Z* +* **ISSUE** `#34547`_: (`sebw`_) salt-cloud deployment fails when deploy: True (refs: `#37607`_) - - **ISSUE** `#34841`_: (*Ch3LL*) Wrong return when using `user.chgroups` on windows - | refs: `#37386`_ - * c7f4d7f Merge pull request `#37386`_ from rallytime/`fix-34841`_ - * c70492a Fix win_useradd.chgroups return when cmd.run_all retcode != 0 +* **PR** `#37639`_: (`rallytime`_) Back-port `#37607`_ to 2016.3 + @ *2016-11-11 20:29:20 UTC* -- **PR** `#37390`_: (*rallytime*) Don't insert __pub* keys into dnsmasq config file with set_config function - @ *2016-11-02T06:31:53Z* + * **PR** `#37607`_: (`techhat`_) Try the connection again, in case it's been reset (refs: `#37639`_) - - **ISSUE** `#34263`_: (*vernondcole*) Use of dnsmasq.set_config injects unintentional text into the configuration file. - | refs: `#37390`_ - * 34b6c64 Merge pull request `#37390`_ from rallytime/`fix-34263`_ - * e082ff5 Fix failing test now that we're raising a CommandExecutionError + * **PR** `#35673`_: (`cro`_) Proxies don't handle reusing the SmartConnect instances very well. D… (refs: `#37607`_) - * c6a3476 Filter out the __pub keys passed via **kwargs for dnsmasq.set_config + * **PR** `#34059`_: (`alexbleotu`_) Vmware common gh (refs: `#37607`_) - * fd380c7 Add test case to reproduce dnsmasq.set_config failure in `#34263`_ + * 7510cd4da9 Merge pull request `#37639`_ from rallytime/bp-37607 -- **PR** `#37391`_: (*rallytime*) Back-port `#35287`_ to 2016.3 - @ *2016-11-02T06:18:26Z* + * 9914c93bc4 Pylint: Remove kwargs that are not in the 2016.3 branch - - **ISSUE** `#35163`_: (*SolarisYan*) salt file.mkdir - | refs: `#35287`_ `#35189`_ - - **PR** `#35287`_: (*dere*) 2016.3 - | refs: `#37391`_ - - **PR** `#35189`_: (*dere*) return value for file.mkdir instead of None - | refs: `#35287`_ - * 798b2ac Merge pull request `#37391`_ from rallytime/`bp-35287`_ - * 0e1ebea Simplify return value to "True". + * d941e9354d Disable pylint warning - * 13022c5 return value for mkdir instead of None + * 940ee49a0b Lint fix -- **PR** `#37279`_: (*gtmanfred*) initialize super class of NamespacedDictWrapper - @ *2016-11-01T15:12:49Z* + * 69893f0c38 Try the connection again, in case it's been reset - - **ISSUE** `#37264`_: (*junster1*) Parsing __grains__ with json.dumps in a module is returning an empty dict in 2016.3.3 - | refs: `#37279`_ - * 1a4833b Merge pull request `#37279`_ from gtmanfred/2016.3 - * 597f346 initialize super class of NamespacedDictWrapper +* **ISSUE** `saltstack/salt#37118`_: (`gtmanfred`_) group in file.find module unable to be a list (refs: `#37349`_) -- **PR** `#37351`_: (*jfindlay*) modules.mac_power: give macOS time to change setting - | refs: `#37426`_ - @ *2016-10-31T19:15:40Z* +* **ISSUE** `#37118`_: (`gtmanfred`_) group in file.find module unable to be a list (refs: `#37349`_) - * 3511759 Merge pull request `#37351`_ from jfindlay/mac_set - * 0c58056 modules.mac_power: give macOS time to change setting +* **PR** `#37638`_: (`rallytime`_) Back-port `#37349`_ to 2016.3 + @ *2016-11-11 20:29:01 UTC* -- **PR** `#37340`_: (*cachedout*) SIGILL -> SIGKILL in process test - @ *2016-10-31T08:50:10Z* + * **PR** `#37349`_: (`haeac`_) Pull request for Bug `#37118`_ (refs: `#37638`_) - * 25c987e Merge pull request `#37340`_ from cachedout/ill_kill_3 - * a6b7417 SIGILL -> SIGKILL in process test + * 24ca96010d Merge pull request `#37638`_ from rallytime/bp-37349 -- **PR** `#37306`_: (*DmitryKuzmenko*) Don't use os.wait() on subprocesses managed by `multiprocessing`. - @ *2016-10-31T06:55:30Z* + * ba2105bc39 Fix for Bug `#37118`_, the wrong parameter was being used to convert the group name to group id. - - **ISSUE** `#35480`_: (*jelenak*) 200 processes of salt-master (2016.3.2) - | refs: `#37306`_ - * 7f16548 Merge pull request `#37306`_ from DSRCorporation/bugs/35480_master_shutdown_no_process_error - * b6937eb Don't use os.wait() on subprocesses managed by `multiprocessing`. +* **ISSUE** `#37643`_: (`Ch3LL`_) digital ocean list_keypairs limits to 20 keys (refs: `#37644`_) -- **PR** `#37314`_: (*rallytime*) Document the existence of placementgroup option in ec2 driver - @ *2016-10-31T06:42:33Z* +* **PR** `#37644`_: (`Ch3LL`_) digital ocean list_keypairs: increase limit for ssh keys parsed + @ *2016-11-11 20:28:46 UTC* - - **ISSUE** `#34998`_: (*exowaucka*) placementgroup parameter for salt-cloud is undocumented - | refs: `#37314`_ - * bf8ba97 Merge pull request `#37314`_ from rallytime/`fix-34998`_ - * 39459ed Document the existence of placementgroup option in ec2 driver + * e1e8b81d16 Merge pull request `#37644`_ from Ch3LL/fix_37643 -- **PR** `#37219`_: (*alex-zel*) Fix freeipa ldap groups - @ *2016-10-28T04:33:37Z* + * c02961a2f5 list_keypairs: increase limit for ssh keys parsed - - **ISSUE** `#36148`_: (*alex-zel*) Eauth error with openLDAP groups - | refs: `#37219`_ - * e0baf4b Merge pull request `#37219`_ from alex-zel/fix-freeipa-ldap-groups - * b5b2e7e Remove trailing whitespaces +* **ISSUE** `#37541`_: (`yhekma`_) salt-minion does not clean up temp files for templates (refs: `#37540`_, `#37640`_) - * 32f906b Add support for FreeIPA +* **PR** `#37640`_: (`rallytime`_) Add known issue `#37541`_ to 2016.3.4 release notes + @ *2016-11-11 20:28:12 UTC* + * a97c2ad34b Merge pull request `#37640`_ from rallytime/update-release-notes + + * 6d6de12aff Grammatical fix + + * 24d7f20e16 Add known issue `#37541`_ to 2016.3.4 release notes + +* **PR** `#37642`_: (`cro`_) Forward-port change from 2015.8 adding release note for rotate_aes_key + @ *2016-11-11 20:27:07 UTC* + + * fab3eaa237 Merge pull request `#37642`_ from cro/rotate_aes_doc + + * 1ca5b958c6 Forward-port change from 2015.8 adding release note for rotate_aes_key + +* **ISSUE** `#37628`_: (`TronPaul`_) [git 2016.3] Refreshing of an s3 file server results in an exception (refs: `#37629`_) + +* **PR** `#37629`_: (`TronPaul`_) fix __opts__ and provider being None in salt.utils.aws:get_location + @ *2016-11-11 09:49:47 UTC* + + * 4c07b3534a Merge pull request `#37629`_ from TronPaul/fix-s3fs-opts + + * a452cded20 fix __opts__ and provider being None issue + +* **PR** `#37481`_: (`thatch45`_) Raet internal client reference fix + @ *2016-11-11 04:39:41 UTC* + + * 200d9fcb6e Merge pull request `#37481`_ from thatch45/raet_client + + * 50d911160b Attempted fix, needs user verification + +* **PR** `#37611`_: (`jeanpralo`_) Fix cmd batch raw + @ *2016-11-11 02:53:58 UTC* + + * b14faf1c68 Merge pull request `#37611`_ from jeanpralo/fix-cmd-batch-raw + + * 4f16840ef1 add integration test for salt.client.LocalClient.cmd_batch + + * ead47e4bba update ret dict to avoid hanging + + * 0a2f153b6e fix dict key for raw support to avoid exception + +* **PR** `#37614`_: (`gtmanfred`_) remove redundant code + @ *2016-11-11 02:49:13 UTC* + + * 35c8333d04 Merge pull request `#37614`_ from gtmanfred/2016.3 + + * 71c2df89a9 remove redundent code + +* **PR** `#37627`_: (`cachedout`_) Exempt pip.iteritems from test_valid_docs test + @ *2016-11-11 02:48:37 UTC* + + * 4fab707bdd Merge pull request `#37627`_ from cachedout/pr-36706 + + * 94df2f8e6f Exempt pip.iteritems from test_valid_docs test + +* **ISSUE** `#36644`_: (`b1naryth1ef`_) env_vars not properly validated/casted to strings w/ virtualenv.manage/pip.install (refs: `#36706`_) + +* **PR** `#36706`_: (`siccrusher`_) Add basic sanity checks for env_vars in pip.install function + @ *2016-11-11 02:47:16 UTC* + + * ee74f3116e Merge pull request `#36706`_ from siccrusher/fix_env_var_validation + + * fb27f8b69e Revert change + + * 79f3e83f8d Use fully-qualified path for six + + * 0ca1222833 Update pip.py + + * b15de371c1 * Ensure src is python3 compatible + + * 0976a2d1ae * Before passing on the env_vars dictionary ensure all values are strings. Fixes `#36644`_ + +* **ISSUE** `#37491`_: (`JensRantil`_) "Failed to authenticate! ..." error should exit non-zero (refs: `#37626`_) + +* **PR** `#37626`_: (`cachedout`_) Exit with proper retcode on hard client failures + @ *2016-11-11 02:38:47 UTC* + + * 902a97575e Merge pull request `#37626`_ from cachedout/issue_37491 + + * bab9a729b1 Exit with proper retcode on hard client failures + +* **PR** `#37617`_: (`terminalmage`_) Clarify docs for git_pillar dynamic env feature + @ *2016-11-11 01:52:52 UTC* + + * 845f835177 Merge pull request `#37617`_ from terminalmage/git_pillar-docs + + * 8cdf5dbb51 Clarify docs for git_pillar dynamic env feature + +* **PR** `#36627`_: (`sjmh`_) Skip rest of loop on failed func match + @ *2016-11-10 23:47:12 UTC* + + * 3079d78332 Merge pull request `#36627`_ from sjmh/fix/auth_skip_nomatch + + * b3baaf30d0 Skip rest of loop on failed func match + +* **PR** `#37600`_: (`mcalmer`_) change TIMEZONE on SUSE systems (bsc#1008933) + @ *2016-11-10 21:54:04 UTC* + + * a71e7c77b3 Merge pull request `#37600`_ from mcalmer/fix-timezone-on-SUSE + + * 3530b542f0 change TIMEZONE on SUSE systems (bsc#1008933) + +* **ISSUE** `#37238`_: (`cmclaughlin`_) Restarting master causes minion to hang (refs: `#37438`_, `#37602`_) + +* **ISSUE** `#37018`_: (`tsaridas`_) get events from python (refs: `#37438`_, `#37602`_) + +* **PR** `#37602`_: (`DmitryKuzmenko`_) Handle master restart in appropriate places using `salt.event` listener. + @ *2016-11-10 21:53:20 UTC* + + * **PR** `#37438`_: (`DmitryKuzmenko`_) Fix for `#37238`_ salt hang on master restart (refs: `#37602`_) + + * 39b75878cf Merge pull request `#37602`_ from DSRCorporation/bugs/37238_salt_hang_on_master_restart + + * d3d987b19c Handle master restart in appropriate places using `salt.event` listener. + +* **PR** `#37608`_: (`gtmanfred`_) allow multiline returns from docker for mac + @ *2016-11-10 21:48:59 UTC* + + * 019e1a721b Merge pull request `#37608`_ from gtmanfred/2016.3 + + * 74aee1e372 allow multiline returns from docker for mac + +* **ISSUE** `#37592`_: (`craigafinch`_) State git.latest does not work with SSH (refs: `#37604`_) + +* **ISSUE** `#37551`_: (`viict`_) git.latest "Not a valid commit name" (refs: `#37604`_, `#37571`_) + + * **PR** `#37604`_: (`terminalmage`_) Documentation improvements and corrections + + * **PR** `#37579`_: (`pass-by-value`_) Use existing VM's VDD size if not specified in the cloud profile + +* **ISSUE** `#37541`_: (`yhekma`_) salt-minion does not clean up temp files for templates (refs: `#37540`_, `#37640`_) + +* **PR** `#37540`_: (`yhekma`_) Added prefix to tempfile for template + @ *2016-11-10 00:37:18 UTC* + + * fdd13b4145 Merge pull request `#37540`_ from yhekma/2016.3 + + * 93a59f8034 Added prefix to tempfile for template + +* **ISSUE** `#37084`_: (`aaronm-cloudtek`_) x509.certificate_managed does not work with m2crypto >=0.25 (refs: `#37578`_) + + * **PR** `#37578`_: (`clinta`_) Update for m2crypto changes removing lhash + + * **PR** `#37584`_: (`clinta`_) Fix eauth example for limiting args + +* **ISSUE** `#37551`_: (`viict`_) git.latest "Not a valid commit name" (refs: `#37604`_, `#37571`_) + + * **PR** `#37571`_: (`terminalmage`_) Add a test to ensure we don't check for fast-forward before fetching + +* **ISSUE** `#33645`_: (`ketzacoatl`_) saltutil.sync_all does not sync custom pillar modules to masterless minions (refs: `#33833`_) + +* **ISSUE** `#25297`_: (`Akilesh1597`_) perform 'refresh_pillar' as a part of 'sync_all' (refs: `#25361`_, `#37521`_) + +* **PR** `#37553`_: (`rallytime`_) Back-port `#37521`_ to 2016.3 + @ *2016-11-08 23:11:07 UTC* + + * **PR** `#37521`_: (`genuss`_) refresh_pillar() should be called always with refresh=True during saltutil.sync_all (refs: `#37553`_) + + * **PR** `#33833`_: (`terminalmage`_) Support syncing pillar modules to masterless minions (refs: `#37521`_) + + * **PR** `#25361`_: (`tedski`_) perform `refresh_pillar` as part of `sync_all` when `refresh=True` (refs: `#37521`_) + + * b01c247ea9 Merge pull request `#37553`_ from rallytime/bp-37521 + + * 30f92b05f4 refresh_pillar() should be called always + + * **PR** `saltstack/salt#37549`_: (`Mrten`_) sqlite is not found in 2015.8 (refs: `#37565`_) + +* **PR** `#37565`_: (`rallytime`_) Back-port `#37549`_ to 2016.3 + @ *2016-11-08 23:10:25 UTC* + + * **PR** `#37549`_: (`Mrten`_) sqlite is not found in 2015.8 (refs: `#37565`_) + + * 694df30d40 Merge pull request `#37565`_ from rallytime/bp-37549 + + * c92a90b8e5 Update sqlite3.py + + * fb76557a2a sqlite is not found in 2015.8 + +* **ISSUE** `#37511`_: (`jdelic`_) service.dead now only operates if the service file exists (refs: `#37562`_) + + * **PR** `#37562`_: (`terminalmage`_) Fix regression in service.dead state + +* **ISSUE** `#37554`_: (`sjmh`_) salt-api doesn't dynamically re-read nodegroups configuration (refs: `#37560`_) + + * **PR** `#37560`_: (`whiteinge`_) Skip config type checking for sdb values + + * **PR** `#37556`_: (`rallytime`_) Don't pass the vpc id to boto.vpc.create_internet_gateway func + + * **PR** `#37543`_: (`multani`_) Documentation rendering fixes + +* **ISSUE** `saltstack/salt#31081`_: (`JensRantil`_) salt.modules.file.line documentation unclarities (refs: `#37457`_) + +* **PR** `#37457`_: (`rallytime`_) Fixup file.line docs to be more clear and consistent + @ *2016-11-08 00:29:20 UTC* + + * 96b8b9a849 Merge pull request `#37457`_ from rallytime/fix-31081 + + * 25821bb8db Clarify which modes use "before", "after", and "indent" options + + * 8b2d2b9e7b Clarify file.line state docs as well + + * b2615892eb Move note about using mode=insert with location options to mode section + + * db0b0cefb8 Fixup file.line docs to be more clear and consistent + +* **ISSUE** `#35799`_: (`davegiles`_) dsc.apply_config hangs (no error) on empty directory on target (refs: `#37526`_) + +* **PR** `#37526`_: (`twangboy`_) Remove loop from dsc.apply_config + @ *2016-11-08 00:23:11 UTC* + + * 7de790ffed Merge pull request `#37526`_ from twangboy/fix_35799 + + * fc4260911c Remove unnecessary format + + * c934a2bfa7 Remove the loop from apply_config + + * **PR** `saltstack/salt#37515`_: (`rallytime`_) [carbon] Merge forward from 2016.3 to carbon (refs: `#37534`_) + +* **PR** `#37534`_: (`rallytime`_) Back-port fix needed from `#37515`_ + @ *2016-11-08 00:14:46 UTC* + + * **PR** `#37515`_: (`rallytime`_) [carbon] Merge forward from 2016.3 to carbon (refs: `#37534`_) + + * 94811df2ea Merge pull request `#37534`_ from rallytime/bp-merge-foward-fix + + * d1b2af1d69 Add missing source_hash_name args to a couple funcs + +* **PR** `#37533`_: (`whiteinge`_) Return a 504 response instead of 500 for Salt timeouts + @ *2016-11-08 00:14:15 UTC* + + * 17adbb0c9f Merge pull request `#37533`_ from whiteinge/salt-api-504-timeouts + + * 63226aeda6 Return a 504 response instead of 500 for Salt timeouts + +* **ISSUE** `saltstack/salt#36679`_: (`lorengordon`_) Command 'Import-Module ServerManager' failed with return code: 1 (refs: #`saltstack/salt`#36736`_`_, `#36736`_) + + * **PR** `saltstack/salt#36736`_: (`m03`_) Fix issue 36679 win_servermanager error (refs: `#37529`_) + +* **PR** `#37529`_: (`lorengordon`_) Backport: PR 36736 to 2016.3 + @ *2016-11-08 00:04:10 UTC* + + * **PR** `#36736`_: (`m03`_) Fix issue 36679 win_servermanager error + + * a9f03eee6f Merge pull request `#37529`_ from lorengordon/bp-36736 + + * 21c2664b6a Fix issue 36679 win_servermanager failure + +* **ISSUE** `#37444`_: (`Tanoti`_) Returning False from __virtual__ in a returner does not return expected error (refs: #`saltstack/salt`#37502`_`_, `#37519`_, `#37502`_) + + * **PR** `saltstack/salt#37502`_: (`cachedout`_) Log proper message on returners that cannot be loaded (refs: `#37519`_) + +* **PR** `#37519`_: (`rallytime`_) Update returner __virtual__() return messages for loader + @ *2016-11-07 23:06:23 UTC* + + * 19475aada6 Merge pull request `#37519`_ from rallytime/returner-load-errors + + * fb261a31f3 Update returner __virtual__() return messages for loader + +* **ISSUE** `#35016`_: (`pingangit`_) TypeError: save_minions() got an unexpected keyword argument 'syndic_id' (refs: `#37527`_) + +* **PR** `#37527`_: (`rallytime`_) Add syndic_id=None kwarg to save_minions funcs in returners + @ *2016-11-07 23:04:03 UTC* + + * fefdfab850 Merge pull request `#37527`_ from rallytime/fix-35016 + + * 2944b244aa Add syndic_id=None kwarg to save_minions funcs in returners + + * **PR** `#37530`_: (`gtmanfred`_) fix Lithium to 2015.5.0 + +* **PR** `#37514`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-11-07 16:51:06 UTC* + + * 743164844d Merge pull request `#37514`_ from rallytime/merge-2016.3 + + * 41166aede4 Merge branch '2015.8' into '2016.3' + + * c505a059ef [2015.8] Doc version updated to 2016.3.4 (`#37482`_) + +* **ISSUE** `#36713`_: (`Tanoti`_) ExtraData: unpack(b) received extra data after upgrading to 2016.3.3 (refs: `#37503`_) + +* **PR** `#37503`_: (`cachedout`_) Catch loader error on returners without save_load + @ *2016-11-07 09:33:57 UTC* + + * 2d924d0820 Merge pull request `#37503`_ from cachedout/issue_36713 + + * 5f7f971b2c Catch loader error on returners without save_load + +* **ISSUE** `#37448`_: (`alisson276`_) In 'salt/key' events there are acts that never happen (refs: `#37499`_) + +* **PR** `#37499`_: (`cachedout`_) Clarify docs on salt-key events + @ *2016-11-07 09:33:20 UTC* + + * d95bf59f97 Merge pull request `#37499`_ from cachedout/key_docs_clarify + + * 2758e74785 Clarify docs on salt-key events + +* **PR** `#37500`_: (`cachedout`_) Remove unused flag + @ *2016-11-07 09:33:04 UTC* + + * 1dd1408ae6 Merge pull request `#37500`_ from cachedout/remove_include_errors + + * 6c705b11e0 Remove unused flag + +* **ISSUE** `#37444`_: (`Tanoti`_) Returning False from __virtual__ in a returner does not return expected error (refs: #`saltstack/salt`#37502`_`_, `#37519`_, `#37502`_) + +* **PR** `#37502`_: (`cachedout`_) Log proper message on returners that cannot be loaded + @ *2016-11-07 09:32:45 UTC* + + * 4b6f1ab1c4 Merge pull request `#37502`_ from cachedout/issue_37444 + + * 4c5ab057ce Remove debugging + + * 17d01e4f4c Log proper message on returners that cannot be loaded + +* **ISSUE** `#37389`_: (`d101nelson`_) Some core grains are inaccurate or incomplete for Solaris (refs: `#37472`_) + +* **PR** `#37494`_: (`sjorge`_) Forgot to update os_family map in `#37472`_ + @ *2016-11-06 22:18:54 UTC* + + * **PR** `#37472`_: (`sjorge`_) 2016.3 solaris grains improvements (refs: `#37494`_) + + * 2422dafd52 Merge pull request `#37494`_ from sjorge/2016.3-osfam_map + + * 96ba545492 Forgot to update os_family map in `#37472`_ + +* **PR** `#37496`_: (`mcalmer`_) fix status handling in sysv init scripts + @ *2016-11-06 22:18:00 UTC* + + * 41bd8e3f52 Merge pull request `#37496`_ from mcalmer/fix-status-handling-in-sysv-init-scripts + + * 1fb2c4dfcf fix status handling in sysv init scripts + +* **PR** `#37497`_: (`terminalmage`_) Update 2016.3.5 release notes with source_hash_name explanation + @ *2016-11-06 22:17:40 UTC* + + * e741a773a5 Merge pull request `#37497`_ from terminalmage/release_notes + + * c08038d9ea Update 2016.3.5 release notes with source_hash_name explanation + +* **PR** `#37486`_: (`twangboy`_) Add requirement for PowerShell 3 on Windows + @ *2016-11-06 06:01:07 UTC* + + * f4426c2233 Merge pull request `#37486`_ from twangboy/fix_win_docs + + * 9e0631a1ae Add docs denoting the requirement for at least PowerShell 3 + +* **PR** `#37493`_: (`cachedout`_) Add sdb support to minion and master configs + @ *2016-11-06 06:00:18 UTC* + + * a1f355a569 Merge pull request `#37493`_ from cachedout/minion_master_sdb + + * 9761a462c2 Add sdb support to minion and master configs + +* **ISSUE** `#31135`_: (`jeffreyctang`_) file.line mode=replace breaks on empty file. (refs: `#37452`_) + +* **PR** `#37452`_: (`rallytime`_) file.line with mode=replace on an empty file should return False, not stacktrace + @ *2016-11-06 01:55:11 UTC* + + * be93710fee Merge pull request `#37452`_ from rallytime/fix-31135 + + * c792f76d2f Bump log level from debug to warning on empty file + + * 5f181cf00d file.line with mode=replace on an empty file should return False + + * 94a00c66eb Write a unit test demonstrating stack trace in `#31135`_ + +* **ISSUE** `#37001`_: (`phil123456`_) URGENT : archive.extracted does not work anymore (refs: `#37081`_, #saltstack/salt`#37081`_) + +* **ISSUE** `#29010`_: (`The-Loeki`_) file.managed download failing checksum testing for Ubuntu initrd w/source_hash (refs: `#37469`_) + + * **PR** `saltstack/salt#37081`_: (`terminalmage`_) Fix archive.extracted remote source_hash verification (refs: `#37469`_) + +* **PR** `#37469`_: (`terminalmage`_) Rewrite file.extract_hash to improve its matching ability + @ *2016-11-06 01:50:01 UTC* + + * **PR** `#37081`_: (`terminalmage`_) Fix archive.extracted remote source_hash verification (refs: `#37469`_) + + * 129b0387e6 Merge pull request `#37469`_ from terminalmage/issue29010 + + * a3f38e5a9f Update file.extract_hash unit tests + + * b26b528f79 Add the source_hash_name param to file.managed states + + * 52fe72d402 Rewrite file.extract_hash + +* **ISSUE** `#37389`_: (`d101nelson`_) Some core grains are inaccurate or incomplete for Solaris (refs: `#37472`_) + +* **PR** `#37472`_: (`sjorge`_) 2016.3 solaris grains improvements (refs: `#37494`_) + @ *2016-11-06 01:46:10 UTC* + + * 9426b9d5c4 Merge pull request `#37472`_ from sjorge/2016.3-solaris-grains + + * 2958f5ce52 detect and properly handle OmniOS + + * 37c3a7f5ab handle Oracle Solaris better + + * 69706d32be parse minorrelease if it has a / in it + + * d1cf4a0e56 improve regex for parsing /etc/release using files from Solaris 8 SPARC and Solaris 10 + + * 88eddef765 some more cleanup for smartos + + * d3ff39f09c improve smartos os version grains + +* **PR** `#37478`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-11-04 20:30:08 UTC* + + * 4ba63aba48 Merge pull request `#37478`_ from rallytime/merge-2016.3 + + * 3483a445f2 Merge branch '2015.8' into '2016.3' + + * 35888c2e30 Merge pull request `#37408`_ from terminalmage/issue37286 + + * 4e4a05731e Strip slashes from gitfs mountpoints + + * b6c57c6c8d Merge pull request `#37418`_ from terminalmage/issue36849 + + * 740bc54239 Do not use compression in tornado httpclient requests + + * 7fba8aaa7e Merge pull request `#37441`_ from rallytime/bp-37428 + + * 6fe3ef49de Fix incorrect reference of __utils__ in salt.utils + + * **PR** `#37485`_: (`rallytime`_) Get release notes started for 2016.3.5 + + * **PR** `#37483`_: (`rallytime`_) [2016.3] Doc version updated to 2016.3.4 + +* **ISSUE** `#37123`_: (`nevins-b`_) file.recurse state doesn't support pulling from other environments (refs: `#37121`_) + +* **PR** `#37121`_: (`nevins-b`_) allow the file.recurse state to support saltenv + @ *2016-11-04 05:59:28 UTC* + + * 580eca709b Merge pull request `#37121`_ from nevins-b/2016.3 + + * 99d2c360ed making messaging in tests match new return + + * bc4b0e7cda adding test for saltenv in file.recurse source url + + * 3315b67075 fixing saltenv if not set in url + + * a9683cbbd8 allow the file.recurse state to support saltenv (salt://example/dir?saltenv=dev) + +* **PR** `#37426`_: (`jfindlay`_) Wait for macOS to change system settings + @ *2016-11-04 04:35:52 UTC* + + * **PR** `#37351`_: (`jfindlay`_) modules.mac_power: give macOS time to change setting (refs: `#37426`_) + + * 766b1437c2 Merge pull request `#37426`_ from jfindlay/mac_sleep + + * 43a8e199bf modules.mac_power: wait for system to make change + + * feabca6e0b modules.mac_system: wait for system to make change + + * 0213eb9a07 utils.mac_utils: add confirm_updated + +* **ISSUE** `#37238`_: (`cmclaughlin`_) Restarting master causes minion to hang (refs: `#37438`_, `#37602`_) + +* **ISSUE** `#37018`_: (`tsaridas`_) get events from python (refs: `#37438`_, `#37602`_) + +* **PR** `#37438`_: (`DmitryKuzmenko`_) Fix for `#37238`_ salt hang on master restart (refs: `#37602`_) + @ *2016-11-04 04:10:51 UTC* + + * 9eab5c8f71 Merge pull request `#37438`_ from DSRCorporation/bugs/37238_salt_hang_on_master_restart + + * f253d3ce4a Auto reconnect `salt` to master if the connection was lost. + + * **PR** `saltstack/salt#31207`_: (`thusoy`_) Remove error logging of missing boto libraries (refs: `#37440`_) + +* **PR** `#37440`_: (`rallytime`_) Back-port `#31207`_ to 2016.3 + @ *2016-11-04 04:09:33 UTC* + + * **PR** `#31207`_: (`thusoy`_) Remove error logging of missing boto libraries (refs: `#37440`_) + + * 9aa7073f70 Merge pull request `#37440`_ from rallytime/bp-31207 + + * c71ae61271 Remove error logging of missing boto libraries + +* **PR** `#37442`_: (`twangboy`_) Create paths.d directory + @ *2016-11-04 04:07:19 UTC* + + * edbfadca21 Merge pull request `#37442`_ from twangboy/fix_osx_postinstall + + * 8091a3065e Create paths.d directory + +* **PR** `#37445`_: (`twangboy`_) Check for Server os before checking [DO NOT MERGE FORWARD] + @ *2016-11-04 04:04:49 UTC* + + * afb1b3cee5 Merge pull request `#37445`_ from twangboy/fix_import_error_2016.3 + + * c0d5ebdd8a Check for Server os before checking + +* **PR** `#37446`_: (`twangboy`_) Detect VC++ for Python on Win32 + @ *2016-11-04 04:04:02 UTC* + + * 7a9f95ab3b Merge pull request `#37446`_ from twangboy/fix_build_32 + + * 2de69f48f8 Detect VC for Python correctly on 32bit Windows + +* **ISSUE** `saltstack/salt#36961`_: (`nullify005`_) boto_secgroup assumes a string when checking ip_protocol validity when not tcp|udp|all|-1 (refs: `#37447`_) + +* **PR** `#37447`_: (`rallytime`_) Cast ip_protocol rule as a str() in boto_secgroup.present + @ *2016-11-04 04:03:45 UTC* + + * 651e0f728f Merge pull request `#37447`_ from rallytime/fix-36961 + + * 6b930ac7aa Cast ip_protocol rule as a str() in boto_secgroup.present + +* **ISSUE** `#36446`_: (`whiteinge`_) Custom salt-api config problem (refs: `#37455`_) + + * **PR** `saltstack/salt#36386`_: (`xiaoanyunfei`_) fix salt-api's default opts were covered by salt-master `#35734`_ (refs: `#37455`_) + +* **PR** `#37455`_: (`techhat`_) Make api opts respect correct root_dir + @ *2016-11-04 03:25:40 UTC* + + * **PR** `#35734`_: (`xiaoanyunfei`_) fix salt-api's default opts were covered by salt-master (refs: #`saltstack/salt#36386`_) + + * a51d944c7c Merge pull request `#37455`_ from techhat/issue36446 + + * 7eff90d61d Make api opts respect correct root_dir + +* **PR** `#37459`_: (`twangboy`_) Fix error message when ConvertTo-Json not supported [DO NOT MERGE FORWARD] + @ *2016-11-04 03:22:31 UTC* + + * 3591bf0f58 Merge pull request `#37459`_ from twangboy/fix_dsc_json_msg_2016.3 + + * 949b70913d Use cmd.run_all instead of cmd.shell + +* **PR** `#37430`_: (`meaksh`_) Including resolution parameters in the Zypper debug-solver call during a dry-run dist-upgrade (2016.3) + @ *2016-11-03 14:35:46 UTC* + + * **PR** `#37353`_: (`meaksh`_) Including resolution parameters in the Zypper debug-solver call during a dry-run dist-upgrade (refs: `#37430`_) + + * 80a99c4cc5 Merge pull request `#37430`_ from meaksh/zypper-dist-upgrade-debug-solver-fix-2016.3 + + * ffc596f215 Including resolver params for Zypper debug-solver + +* **ISSUE** `#37388`_: (`tyhunt99`_) [2016.3.4] Refreshing of an s3 file server results in an exception. (refs: `#37428`_) + + * **PR** `#37428`_: (`cachedout`_) Fix incorrect reference of __utils__ in salt.utils (refs: `#37441`_) + +* **PR** `#37419`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2016-11-02 21:40:04 UTC* + + * 7864f9b79d Merge pull request `#37419`_ from rallytime/merge-2016.3 + + * bce47c9175 Merge branch '2015.8' into '2016.3' + + * 7b1d3b5562 Merge pull request `#37392`_ from rallytime/bp-33190 + + * 4063bae5de catch None cases for comments in jboss7 state module + + * **PR** `#37416`_: (`terminalmage`_) Fix regression in output for Ctrl-c'ed CLI jobs + + * **PR** `#37414`_: (`pass-by-value`_) Add unit tests for cloning from snapshot + + * **PR** `#37350`_: (`pass-by-value`_) Add handling for full and linked clone (refs: `#37414`_) + + * **PR** `saltstack/salt#37401`_: (`cachedout`_) Bootstrap delay option for salt-cloud (refs: `#37404`_) + +* **PR** `#37404`_: (`cachedout`_) Revert "Bootstrap delay option for salt-cloud" + @ *2016-11-02 09:48:53 UTC* + + * ecd794a233 Merge pull request `#37404`_ from saltstack/revert-37401-bootstrap_delay + + * e864de8f03 Revert "Bootstrap delay option for salt-cloud" + +* **PR** `#37401`_: (`cachedout`_) Bootstrap delay option for salt-cloud + @ *2016-11-02 09:02:13 UTC* + + * 2eb44fbd11 Merge pull request `#37401`_ from cachedout/bootstrap_delay + + * 6e42b0e157 Bootstrap delay option for salt-cloud + +* **PR** `#37350`_: (`pass-by-value`_) Add handling for full and linked clone (refs: `#37414`_) + @ *2016-11-02 08:02:29 UTC* + + * 9446e48da0 Merge pull request `#37350`_ from pass-by-value/full_and_linked_clone_v1 + + * d8b1c9c777 Add handling for full and linked clone and commit disk mode additions + +* **ISSUE** `#34841`_: (`Ch3LL`_) Wrong return when using `user.chgroups` on windows (refs: `#37386`_) + +* **PR** `#37386`_: (`rallytime`_) Fix win_useradd.chgroups return when cmd.run_all retcode != 0 + @ *2016-11-02 06:34:12 UTC* + + * c7f4d7f76a Merge pull request `#37386`_ from rallytime/fix-34841 + + * c70492a1fe Fix win_useradd.chgroups return when cmd.run_all retcode != 0 + +* **ISSUE** `#34263`_: (`vernondcole`_) Use of dnsmasq.set_config injects unintentional text into the configuration file. (refs: `#37390`_) + +* **PR** `#37390`_: (`rallytime`_) Don't insert __pub* keys into dnsmasq config file with set_config function + @ *2016-11-02 06:31:53 UTC* + + * 34b6c6459a Merge pull request `#37390`_ from rallytime/fix-34263 + + * e082ff538b Fix failing test now that we're raising a CommandExecutionError + + * c6a3476abb Filter out the __pub keys passed via \*\*kwargs for dnsmasq.set_config + + * fd380c79b9 Add test case to reproduce dnsmasq.set_config failure in `#34263`_ + +* **ISSUE** `#35163`_: (`SolarisYan`_) salt file.mkdir (refs: `#35287`_, `#35189`_) + +* **PR** `#37391`_: (`rallytime`_) Back-port `#35287`_ to 2016.3 + @ *2016-11-02 06:18:26 UTC* + + * **PR** `#35287`_: (`dere`_) 2016.3 (refs: `#37391`_) + + * **PR** `#35189`_: (`dere`_) return value for file.mkdir instead of None (refs: `#35287`_) + + * 798b2acbe3 Merge pull request `#37391`_ from rallytime/bp-35287 + + * 0e1ebea5a4 Simplify return value to "True". + + * 13022c5cc4 return value for mkdir instead of None + +* **ISSUE** `#37264`_: (`junster1`_) Parsing __grains__ with json.dumps in a module is returning an empty dict in 2016.3.3 (refs: `#37279`_) + +* **PR** `#37279`_: (`gtmanfred`_) initialize super class of NamespacedDictWrapper + @ *2016-11-01 15:12:49 UTC* + + * 1a4833b3a1 Merge pull request `#37279`_ from gtmanfred/2016.3 + + * 597f346d57 initialize super class of NamespacedDictWrapper + +* **PR** `#37351`_: (`jfindlay`_) modules.mac_power: give macOS time to change setting (refs: `#37426`_) + @ *2016-10-31 19:15:40 UTC* + + * 351175931c Merge pull request `#37351`_ from jfindlay/mac_set + + * 0c58056d84 modules.mac_power: give macOS time to change setting + +* **PR** `#37340`_: (`cachedout`_) SIGILL -> SIGKILL in process test + @ *2016-10-31 08:50:10 UTC* + + * 25c987e33a Merge pull request `#37340`_ from cachedout/ill_kill_3 + + * a6b7417fe9 SIGILL -> SIGKILL in process test + +* **ISSUE** `#35480`_: (`jelenak`_) 200 processes of salt-master (2016.3.2) (refs: `#37306`_) + +* **PR** `#37306`_: (`DmitryKuzmenko`_) Don't use os.wait() on subprocesses managed by `multiprocessing`. + @ *2016-10-31 06:55:30 UTC* + + * 7f1654894d Merge pull request `#37306`_ from DSRCorporation/bugs/35480_master_shutdown_no_process_error + + * b6937ebaa8 Don't use os.wait() on subprocesses managed by `multiprocessing`. + +* **ISSUE** `#34998`_: (`exowaucka`_) placementgroup parameter for salt-cloud is undocumented (refs: `#37314`_) + +* **PR** `#37314`_: (`rallytime`_) Document the existence of placementgroup option in ec2 driver + @ *2016-10-31 06:42:33 UTC* + + * bf8ba97d54 Merge pull request `#37314`_ from rallytime/fix-34998 + + * 39459ed30b Document the existence of placementgroup option in ec2 driver + +* **ISSUE** `#36148`_: (`alex-zel`_) Eauth error with openLDAP groups (refs: `#37219`_) + +* **PR** `#37219`_: (`alex-zel`_) Fix freeipa ldap groups + @ *2016-10-28 04:33:37 UTC* + + * e0baf4b193 Merge pull request `#37219`_ from alex-zel/fix-freeipa-ldap-groups + + * b5b2e7e097 Remove trailing whitespaces + + * 32f906b020 Add support for FreeIPA .. _`#10`: https://github.com/saltstack/salt/issues/10 -.. _`#1008933`: https://github.com/saltstack/salt/issues/1008933 .. _`#12788`: https://github.com/saltstack/salt/issues/12788 .. _`#15697`: https://github.com/saltstack/salt/issues/15697 -.. _`#19`: https://github.com/saltstack/salt/issues/19 .. _`#19269`: https://github.com/saltstack/salt/issues/19269 +.. _`#19`: https://github.com/saltstack/salt/issues/19 .. _`#20`: https://github.com/saltstack/salt/issues/20 -.. _`#2016`: https://github.com/saltstack/salt/issues/2016 .. _`#25297`: https://github.com/saltstack/salt/issues/25297 .. _`#25361`: https://github.com/saltstack/salt/pull/25361 .. _`#27355`: https://github.com/saltstack/salt/issues/27355 @@ -1977,7 +2048,6 @@ Changes: .. _`#29294`: https://github.com/saltstack/salt/pull/29294 .. _`#30454`: https://github.com/saltstack/salt/issues/30454 .. _`#30481`: https://github.com/saltstack/salt/pull/30481 -.. _`#31081`: https://github.com/saltstack/salt/issues/31081 .. _`#31135`: https://github.com/saltstack/salt/issues/31135 .. _`#31207`: https://github.com/saltstack/salt/pull/31207 .. _`#31953`: https://github.com/saltstack/salt/issues/31953 @@ -1985,8 +2055,6 @@ Changes: .. _`#32400`: https://github.com/saltstack/salt/issues/32400 .. _`#32829`: https://github.com/saltstack/salt/issues/32829 .. _`#32965`: https://github.com/saltstack/salt/pull/32965 -.. _`#33187`: https://github.com/saltstack/salt/issues/33187 -.. _`#33190`: https://github.com/saltstack/salt/pull/33190 .. _`#33601`: https://github.com/saltstack/salt/pull/33601 .. _`#33645`: https://github.com/saltstack/salt/issues/33645 .. _`#33709`: https://github.com/saltstack/salt/issues/33709 @@ -2007,29 +2075,25 @@ Changes: .. _`#35390`: https://github.com/saltstack/salt/pull/35390 .. _`#35480`: https://github.com/saltstack/salt/issues/35480 .. _`#35673`: https://github.com/saltstack/salt/pull/35673 -.. _`#35734`: https://github.com/saltstack/salt/issues/35734 +.. _`#35734`: https://github.com/saltstack/salt/pull/35734 .. _`#35799`: https://github.com/saltstack/salt/issues/35799 .. _`#35964`: https://github.com/saltstack/salt/issues/35964 .. _`#35965`: https://github.com/saltstack/salt/pull/35965 .. _`#36148`: https://github.com/saltstack/salt/issues/36148 -.. _`#36386`: https://github.com/saltstack/salt/pull/36386 .. _`#36446`: https://github.com/saltstack/salt/issues/36446 .. _`#36548`: https://github.com/saltstack/salt/issues/36548 .. _`#36598`: https://github.com/saltstack/salt/issues/36598 .. _`#36627`: https://github.com/saltstack/salt/pull/36627 .. _`#36629`: https://github.com/saltstack/salt/issues/36629 .. _`#36644`: https://github.com/saltstack/salt/issues/36644 -.. _`#36679`: https://github.com/saltstack/salt/issues/36679 .. _`#36706`: https://github.com/saltstack/salt/pull/36706 .. _`#36707`: https://github.com/saltstack/salt/issues/36707 .. _`#36713`: https://github.com/saltstack/salt/issues/36713 .. _`#36736`: https://github.com/saltstack/salt/pull/36736 .. _`#36784`: https://github.com/saltstack/salt/pull/36784 .. _`#36794`: https://github.com/saltstack/salt/pull/36794 -.. _`#36849`: https://github.com/saltstack/salt/issues/36849 .. _`#36893`: https://github.com/saltstack/salt/pull/36893 .. _`#36938`: https://github.com/saltstack/salt/pull/36938 -.. _`#36961`: https://github.com/saltstack/salt/issues/36961 .. _`#37001`: https://github.com/saltstack/salt/issues/37001 .. _`#37018`: https://github.com/saltstack/salt/issues/37018 .. _`#37059`: https://github.com/saltstack/salt/issues/37059 @@ -2045,7 +2109,6 @@ Changes: .. _`#37264`: https://github.com/saltstack/salt/issues/37264 .. _`#37272`: https://github.com/saltstack/salt/pull/37272 .. _`#37279`: https://github.com/saltstack/salt/pull/37279 -.. _`#37286`: https://github.com/saltstack/salt/issues/37286 .. _`#37287`: https://github.com/saltstack/salt/issues/37287 .. _`#37306`: https://github.com/saltstack/salt/pull/37306 .. _`#37314`: https://github.com/saltstack/salt/pull/37314 @@ -2347,42 +2410,157 @@ Changes: .. _`#38809`: https://github.com/saltstack/salt/pull/38809 .. _`#38812`: https://github.com/saltstack/salt/pull/38812 .. _`#38813`: https://github.com/saltstack/salt/pull/38813 +.. _`#38833`: https://github.com/saltstack/salt/pull/38833 .. _`#5999`: https://github.com/saltstack/salt/issues/5999 -.. _`bp-31207`: https://github.com/saltstack/salt/pull/31207 -.. _`bp-32157`: https://github.com/saltstack/salt/pull/32157 -.. _`bp-32965`: https://github.com/saltstack/salt/pull/32965 -.. _`bp-33190`: https://github.com/saltstack/salt/pull/33190 -.. _`bp-33601`: https://github.com/saltstack/salt/pull/33601 -.. _`bp-35287`: https://github.com/saltstack/salt/pull/35287 -.. _`bp-35965`: https://github.com/saltstack/salt/pull/35965 -.. _`bp-36736`: https://github.com/saltstack/salt/pull/36736 -.. _`bp-36794`: https://github.com/saltstack/salt/pull/36794 -.. _`bp-36893`: https://github.com/saltstack/salt/pull/36893 -.. _`bp-37149`: https://github.com/saltstack/salt/pull/37149 -.. _`bp-37349`: https://github.com/saltstack/salt/pull/37349 -.. _`bp-37428`: https://github.com/saltstack/salt/pull/37428 -.. _`bp-37521`: https://github.com/saltstack/salt/pull/37521 -.. _`bp-37549`: https://github.com/saltstack/salt/pull/37549 -.. _`bp-37607`: https://github.com/saltstack/salt/pull/37607 -.. _`bp-37775`: https://github.com/saltstack/salt/pull/37775 -.. _`bp-37789`: https://github.com/saltstack/salt/pull/37789 -.. _`bp-37790`: https://github.com/saltstack/salt/pull/37790 -.. _`bp-38181`: https://github.com/saltstack/salt/pull/38181 -.. _`bp-38579`: https://github.com/saltstack/salt/pull/38579 -.. _`fix-2016`: https://github.com/saltstack/salt/issues/2016 -.. _`fix-31081`: https://github.com/saltstack/salt/issues/31081 -.. _`fix-31135`: https://github.com/saltstack/salt/issues/31135 -.. _`fix-34263`: https://github.com/saltstack/salt/issues/34263 -.. _`fix-34841`: https://github.com/saltstack/salt/issues/34841 -.. _`fix-34998`: https://github.com/saltstack/salt/issues/34998 -.. _`fix-35016`: https://github.com/saltstack/salt/issues/35016 -.. _`fix-36961`: https://github.com/saltstack/salt/issues/36961 -.. _`fix-37498`: https://github.com/saltstack/salt/issues/37498 -.. _`fix-37665`: https://github.com/saltstack/salt/issues/37665 -.. _`fix-37939`: https://github.com/saltstack/salt/issues/37939 -.. _`fix-38091`: https://github.com/saltstack/salt/issues/38091 -.. _`fix-38174`: https://github.com/saltstack/salt/issues/38174 -.. _`fix-38388`: https://github.com/saltstack/salt/issues/38388 -.. _`fix-38622`: https://github.com/saltstack/salt/issues/38622 -.. _`fix-38629`: https://github.com/saltstack/salt/issues/38629 -.. _`fix-38674`: https://github.com/saltstack/salt/issues/38674 +.. _`747project`: https://github.com/747project +.. _`Akilesh1597`: https://github.com/Akilesh1597 +.. _`Arabus`: https://github.com/Arabus +.. _`AvinashDeluxeVR`: https://github.com/AvinashDeluxeVR +.. _`COLABORATI`: https://github.com/COLABORATI +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`Firewire2002`: https://github.com/Firewire2002 +.. _`JensRantil`: https://github.com/JensRantil +.. _`Modulus`: https://github.com/Modulus +.. _`Mrten`: https://github.com/Mrten +.. _`NickDubelman`: https://github.com/NickDubelman +.. _`SolarisYan`: https://github.com/SolarisYan +.. _`Talkless`: https://github.com/Talkless +.. _`Tanoti`: https://github.com/Tanoti +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`TronPaul`: https://github.com/TronPaul +.. _`UtahDave`: https://github.com/UtahDave +.. _`aaronm-cloudtek`: https://github.com/aaronm-cloudtek +.. _`abonillasuse`: https://github.com/abonillasuse +.. _`alex-zel`: https://github.com/alex-zel +.. _`alexandr-orlov`: https://github.com/alexandr-orlov +.. _`alexbleotu`: https://github.com/alexbleotu +.. _`alisson276`: https://github.com/alisson276 +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`attiasr`: https://github.com/attiasr +.. _`b-harper`: https://github.com/b-harper +.. _`b1naryth1ef`: https://github.com/b1naryth1ef +.. _`basepi`: https://github.com/basepi +.. _`bdrung`: https://github.com/bdrung +.. _`blaketmiller`: https://github.com/blaketmiller +.. _`bshelton229`: https://github.com/bshelton229 +.. _`cachedout`: https://github.com/cachedout +.. _`calve`: https://github.com/calve +.. _`clan`: https://github.com/clan +.. _`clinta`: https://github.com/clinta +.. _`cmclaughlin`: https://github.com/cmclaughlin +.. _`craigafinch`: https://github.com/craigafinch +.. _`cro`: https://github.com/cro +.. _`curiositycasualty`: https://github.com/curiositycasualty +.. _`d101nelson`: https://github.com/d101nelson +.. _`davegiles`: https://github.com/davegiles +.. _`davidpsv17`: https://github.com/davidpsv17 +.. _`dere`: https://github.com/dere +.. _`dereckson`: https://github.com/dereckson +.. _`dhaines`: https://github.com/dhaines +.. _`dincamihai`: https://github.com/dincamihai +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`do3meli`: https://github.com/do3meli +.. _`dragon788`: https://github.com/dragon788 +.. _`edgan`: https://github.com/edgan +.. _`edwardsdanielj`: https://github.com/edwardsdanielj +.. _`elyulka`: https://github.com/elyulka +.. _`ericuldall`: https://github.com/ericuldall +.. _`exowaucka`: https://github.com/exowaucka +.. _`fanirama`: https://github.com/fanirama +.. _`favoretti`: https://github.com/favoretti +.. _`fedusia`: https://github.com/fedusia +.. _`fj40crawler`: https://github.com/fj40crawler +.. _`freach`: https://github.com/freach +.. _`genuss`: https://github.com/genuss +.. _`githubcdr`: https://github.com/githubcdr +.. _`gravyboat`: https://github.com/gravyboat +.. _`gstachowiak`: https://github.com/gstachowiak +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`haeac`: https://github.com/haeac +.. _`heewa`: https://github.com/heewa +.. _`hu-dabao`: https://github.com/hu-dabao +.. _`ikkaro`: https://github.com/ikkaro +.. _`jackywu`: https://github.com/jackywu +.. _`jdelic`: https://github.com/jdelic +.. _`jeanpralo`: https://github.com/jeanpralo +.. _`jeffreyctang`: https://github.com/jeffreyctang +.. _`jelenak`: https://github.com/jelenak +.. _`jerob`: https://github.com/jerob +.. _`jf`: https://github.com/jf +.. _`jfindlay`: https://github.com/jfindlay +.. _`jinm`: https://github.com/jinm +.. _`johje349`: https://github.com/johje349 +.. _`jsandas`: https://github.com/jsandas +.. _`junster1`: https://github.com/junster1 +.. _`ketzacoatl`: https://github.com/ketzacoatl +.. _`kevinquinnyo`: https://github.com/kevinquinnyo +.. _`kluoto`: https://github.com/kluoto +.. _`kontrolld`: https://github.com/kontrolld +.. _`laleocen`: https://github.com/laleocen +.. _`limited`: https://github.com/limited +.. _`lorengordon`: https://github.com/lorengordon +.. _`m03`: https://github.com/m03 +.. _`markuskramerIgitt`: https://github.com/markuskramerIgitt +.. _`mcalmer`: https://github.com/mcalmer +.. _`mchugh19`: https://github.com/mchugh19 +.. _`meaksh`: https://github.com/meaksh +.. _`mikejford`: https://github.com/mikejford +.. _`moio`: https://github.com/moio +.. _`morganwillcock`: https://github.com/morganwillcock +.. _`msummers42`: https://github.com/msummers42 +.. _`multani`: https://github.com/multani +.. _`nevins-b`: https://github.com/nevins-b +.. _`nullify005`: https://github.com/nullify005 +.. _`pass-by-value`: https://github.com/pass-by-value +.. _`phil123456`: https://github.com/phil123456 +.. _`pille`: https://github.com/pille +.. _`pingangit`: https://github.com/pingangit +.. _`rallytime`: https://github.com/rallytime +.. _`rbjorklin`: https://github.com/rbjorklin +.. _`saltstack/salt#31081`: https://github.com/saltstack/salt/issues/31081 +.. _`saltstack/salt#31207`: https://github.com/saltstack/salt/pull/31207 +.. _`saltstack/salt#36386`: https://github.com/saltstack/salt/pull/36386 +.. _`saltstack/salt#36679`: https://github.com/saltstack/salt/issues/36679 +.. _`saltstack/salt#36736`: https://github.com/saltstack/salt/pull/36736 +.. _`saltstack/salt#36961`: https://github.com/saltstack/salt/issues/36961 +.. _`saltstack/salt#37081`: https://github.com/saltstack/salt/pull/37081 +.. _`saltstack/salt#37118`: https://github.com/saltstack/salt/issues/37118 +.. _`saltstack/salt#37358`: https://github.com/saltstack/salt/pull/37358 +.. _`saltstack/salt#37401`: https://github.com/saltstack/salt/pull/37401 +.. _`saltstack/salt#37502`: https://github.com/saltstack/salt/pull/37502 +.. _`saltstack/salt#37515`: https://github.com/saltstack/salt/pull/37515 +.. _`saltstack/salt#37549`: https://github.com/saltstack/salt/pull/37549 +.. _`saltstack/salt#38707`: https://github.com/saltstack/salt/pull/38707 +.. _`sash-kan`: https://github.com/sash-kan +.. _`sebw`: https://github.com/sebw +.. _`secumod`: https://github.com/secumod +.. _`siccrusher`: https://github.com/siccrusher +.. _`silenius`: https://github.com/silenius +.. _`sjmh`: https://github.com/sjmh +.. _`sjorge`: https://github.com/sjorge +.. _`skizunov`: https://github.com/skizunov +.. _`slinn0`: https://github.com/slinn0 +.. _`sofixa`: https://github.com/sofixa +.. _`swalladge`: https://github.com/swalladge +.. _`techhat`: https://github.com/techhat +.. _`tedski`: https://github.com/tedski +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`thusoy`: https://github.com/thusoy +.. _`tjyang`: https://github.com/tjyang +.. _`toanju`: https://github.com/toanju +.. _`tobiasBora`: https://github.com/tobiasBora +.. _`tobithiel`: https://github.com/tobithiel +.. _`tsaridas`: https://github.com/tsaridas +.. _`twangboy`: https://github.com/twangboy +.. _`tyeapple`: https://github.com/tyeapple +.. _`tyhunt99`: https://github.com/tyhunt99 +.. _`vernondcole`: https://github.com/vernondcole +.. _`viict`: https://github.com/viict +.. _`vutny`: https://github.com/vutny +.. _`wanparo`: https://github.com/wanparo +.. _`whiteinge`: https://github.com/whiteinge +.. _`xiaoanyunfei`: https://github.com/xiaoanyunfei +.. _`yhekma`: https://github.com/yhekma +.. _`zwo-bot`: https://github.com/zwo-bot diff --git a/doc/topics/releases/2016.3.6.rst b/doc/topics/releases/2016.3.6.rst index ea2f973918..db7183f43e 100644 --- a/doc/topics/releases/2016.3.6.rst +++ b/doc/topics/releases/2016.3.6.rst @@ -5,1072 +5,1143 @@ Salt 2016.3.6 Release Notes Version 2016.3.6 is a bugfix release for :ref:`2016.3.0 `. -Changes for v2016.3.5..v2016.3.6 --------------------------------- +Statistics +========== -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +- Total Merges: **119** +- Total Issue References: **52** +- Total PR References: **163** -*Generated at: 2017-03-22T20:18:54Z* +- Contributors: **43** (`Adaephon-GH`_, `Ch3LL`_, `DmitryKuzmenko`_, `Foxlik`_, `GideonRed-zz`_, `The-Loeki`_, `UtahDave`_, `alexbleotu`_, `anlutro`_, `bobrik`_, `cachedout`_, `cro`_, `dincamihai`_, `drawsmcgraw`_, `fboismenu`_, `galet`_, `garethgreenaway`_, `grep4linux`_, `gtmanfred`_, `jacobhammons`_, `jfindlay`_, `joe-niland`_, `lvg01`_, `mbom2004`_, `mcalmer`_, `mchugh19`_, `meaksh`_, `mirceaulinic`_, `morganwillcock`_, `narendraingale2`_, `nasenbaer13`_, `ni3mm4nd`_, `rallytime`_, `s0undt3ch`_, `sergeizv`_, `smarsching`_, `techhat`_, `terminalmage`_, `thatch45`_, `twangboy`_, `velom`_, `vutny`_, `yue9944882`_) -Statistics: -- Total Merges: **118** -- Total Issue references: **53** -- Total PR references: **168** +Security Fix +============ -Changes: +**CVE-2017-7893** Compromised salt-minions can impersonate the salt-master. +(Discovery credit: Frank Spierings) -This release includes a CVE Fix: -CVE-2017-7893: Compromised salt-minions can impersonate the salt-master. (Discovery credit: Frank Spierings) +Changelog for v2016.3.5..v2016.3.6 +================================== -- **PR** `#39855`_: (*Foxlik*) Use regular expression instead of split when replacing authorized_keys - @ *2017-03-22T18:28:32Z* +*Generated at: 2018-05-27 13:45:07 UTC* - - **ISSUE** `#39854`_: (*Foxlik*) quoted space in authorized_keys confuses ssh.py - | refs: `#39855`_ - * c59ae9a Merge pull request `#39855`_ from Foxlik/use_regex_to_compare_authorized_keys - * d46845a Add newline at end of file +* **PR** `#40232`_: (`rallytime`_) Update release notes for 2016.3.6 + @ *2017-03-22 21:09:35 UTC* - * d4a3c8a Use regular expression instead of split when replacing authorized_keys + * 24c4ae9c21 Merge pull request `#40232`_ from rallytime/update-release-notes -- **PR** `#40221`_: (*rallytime*) Back-port `#39179`_ to 2016.3 - @ *2017-03-22T17:40:34Z* + * 2ead188b4f Update release notes for 2016.3.6 - - **PR** `#39179`_: (*mcalmer*) fix error parsing - | refs: `#40221`_ - * fd10430 Merge pull request `#40221`_ from rallytime/`bp-39179`_ - * 07dc2de fix error parsing +* **ISSUE** `#39854`_: (`Foxlik`_) quoted space in authorized_keys confuses ssh.py (refs: `#39855`_) -- **PR** `#40206`_: (*cro*) Leave sign_pub_messages off by default. - @ *2017-03-22T16:43:03Z* +* **PR** `#39855`_: (`Foxlik`_) Use regular expression instead of split when replacing authorized_keys + @ *2017-03-22 18:28:32 UTC* - - **ISSUE** `#40203`_: (*frogunder*) 2016.3.6. Minion don't connect to older master. - | refs: `#40206`_ - * a27a2cc Merge pull request `#40206`_ from cro/sign_pub_take2 - * 01048de leave sign_pub_messages off on minion by default. + * c59ae9a82c Merge pull request `#39855`_ from Foxlik/use_regex_to_compare_authorized_keys - * a82b005 Leave sign_pub_messages off by default. + * d46845a5b6 Add newline at end of file -- **PR** `#40193`_: (*rallytime*) Back-port `#40117`_ to 2016.3 - @ *2017-03-22T16:42:21Z* + * d4a3c8a66a Use regular expression instead of split when replacing authorized_keys - - **PR** `#40117`_: (*narendraingale2*) Fix force remove - | refs: `#40193`_ - * d1abb4c Merge pull request `#40193`_ from rallytime/`bp-40117`_ - * cf18579 More optimization. +* **PR** `#40221`_: (`rallytime`_) Back-port `#39179`_ to 2016.3 + @ *2017-03-22 17:40:34 UTC* - * 5a08266 Removed debug statemnt + * **PR** `#39179`_: (`mcalmer`_) fix error parsing (refs: `#40221`_) - * f557f7c Added fix for issue 39393 + * fd10430018 Merge pull request `#40221`_ from rallytime/bp-39179 - * bb62278 Reverting changes. + * 07dc2de084 fix error parsing - * a9107cd Added if condition for broken link. +* **ISSUE** `#40203`_: (`frogunder`_) 2016.3.6. Minion don't connect to older master. (refs: `#40206`_) -- **PR** `#40196`_: (*twangboy*) Update dependencies for PyOpenSSL - @ *2017-03-22T16:40:46Z* +* **PR** `#40206`_: (`cro`_) Leave sign_pub_messages off by default. + @ *2017-03-22 16:43:03 UTC* - * 0f1ff4d Merge pull request `#40196`_ from twangboy/win_fix_deps - * 6761527 Update dependencies for PyOpenSSL + * a27a2cc3bb Merge pull request `#40206`_ from cro/sign_pub_take2 -- **PR** `#40184`_: (*terminalmage*) Link to minion start reactor example from FAQ. - @ *2017-03-21T17:33:09Z* + * 01048de83f leave sign_pub_messages off on minion by default. - * b050151 Merge pull request `#40184`_ from terminalmage/link-reactor-example - * a42be82 Link to minion start reactor example from FAQ. + * a82b005507 Leave sign_pub_messages off by default. -- **PR** `#40182`_: (*terminalmage*) Add support for "stopped" state to dockerng's mod_watch - @ *2017-03-21T15:40:29Z* +* **PR** `#40193`_: (`rallytime`_) Back-port `#40117`_ to 2016.3 + @ *2017-03-22 16:42:21 UTC* - * d4e6c58 Merge pull request `#40182`_ from terminalmage/dockerng-mod_watch-stopped - * 4629a26 Add support for "stopped" state to dockerng's mod_watch + * **PR** `#40117`_: (`narendraingale2`_) Fix force remove (refs: `#40193`_) -- **PR** `#40171`_: (*Ch3LL*) additional PRs/issues for 2016.3.6 release notes - @ *2017-03-20T22:14:17Z* + * d1abb4cbaa Merge pull request `#40193`_ from rallytime/bp-40117 - * a0b4082 Merge pull request `#40171`_ from Ch3LL/2016.3.6_release - * 9c6d8d8 additional PRs/issues for 2016.3.6 release notes + * cf1857904b More optimization. -- **PR** `#40120`_: (*sergeizv*) gce: Exclude GCENodeDriver objects from _expand_node result - @ *2017-03-20T21:44:42Z* + * 5a08266814 Removed debug statemnt - * 33ba782 Merge pull request `#40120`_ from sergeizv/gce-expand-node-fix - * 9d0fbe7 gce: Exclude GCENodeDriver objects from _expand_node result + * f557f7c6bb Added fix for issue 39393 -- **PR** `#40122`_: (*meaksh*) Adding "pkg.install downloadonly=True" support to yum/dnf execution module - @ *2017-03-20T21:44:15Z* + * bb62278b73 Reverting changes. - * 4884397 Merge pull request `#40122`_ from meaksh/2016.3-yum-downloadonly-support - * 067f3f7 Adding downloadonly support to yum/dnf module + * a9107cde44 Added if condition for broken link. -- **PR** `#40159`_: (*cro*) Turn on sign_pub_messages by default. - @ *2017-03-20T21:00:49Z* +* **PR** `#40196`_: (`twangboy`_) Update dependencies for PyOpenSSL + @ *2017-03-22 16:40:46 UTC* - * 60e1d4e Merge pull request `#40159`_ from cro/sign_pub - * e663b76 Fix small syntax error + * 0f1ff4d4a8 Merge pull request `#40196`_ from twangboy/win_fix_deps - * 0a0f46f Turn on sign_pub_messages by default. Make sure messages with no 'sig' are dropped with error when sign_pub_messages is True. + * 6761527793 Update dependencies for PyOpenSSL -- **PR** `#40123`_: (*twangboy*) Adds support for inet_pton in Windows to network util - @ *2017-03-20T16:25:47Z* +* **PR** `#40184`_: (`terminalmage`_) Link to minion start reactor example from FAQ. + @ *2017-03-21 17:33:09 UTC* - * 28e4fc1 Merge pull request `#40123`_ from twangboy/win_fix_network - * 06dfd55 Adds support for inet_pton in Windows to network util + * b0501515cb Merge pull request `#40184`_ from terminalmage/link-reactor-example -- **PR** `#40141`_: (*bobrik*) Use the first address if cannot connect to any - @ *2017-03-20T15:06:57Z* + * a42be82993 Link to minion start reactor example from FAQ. - - **ISSUE** `#39995`_: (*frogunder*) Head of Develop - Multimaster error - | refs: `#40141`_ - - **ISSUE** `#39118`_: (*bobrik*) Minion ipv6 option is not documented - | refs: `#39289`_ - - **PR** `#39289`_: (*bobrik*) Autodetect IPv6 connectivity from minion to master - | refs: `#39766`_ `#40141`_ - * 35ddb79 Merge pull request `#40141`_ from bobrik/fallback-resolve - * af1545d Use the first address if cannot connect to any +* **PR** `#40182`_: (`terminalmage`_) Add support for "stopped" state to dockerng's mod_watch + @ *2017-03-21 15:40:29 UTC* -- **PR** `#40059`_: (*terminalmage*) Fix traceback when virtualenv.managed is invoked with nonexistent user - @ *2017-03-16T20:46:43Z* + * d4e6c58526 Merge pull request `#40182`_ from terminalmage/dockerng-mod_watch-stopped - * 116201f Merge pull request `#40059`_ from terminalmage/fix-virtualenv-traceback - * e3cfd29 Fix traceback when virtualenv.managed is invoked with nonexistent user + * 4629a26fb7 Add support for "stopped" state to dockerng's mod_watch -- **PR** `#40090`_: (*rallytime*) Back-port `#40056`_ to 2016.3 - @ *2017-03-16T19:42:58Z* +* **PR** `#40171`_: (`Ch3LL`_) additional PRs/issues for 2016.3.6 release notes + @ *2017-03-20 22:14:17 UTC* - - **PR** `#40056`_: (*thatch45*) update mention bot blacklist - | refs: `#40090`_ - * a01b52b Merge pull request `#40090`_ from rallytime/`bp-40056`_ - * ae012db update mention bot blacklist + * a0b4082484 Merge pull request `#40171`_ from Ch3LL/2016.3.6_release -- **PR** `#40057`_: (*cachedout*) More mentionbot blacklists - @ *2017-03-16T18:10:11Z* + * 9c6d8d892f additional PRs/issues for 2016.3.6 release notes - * d1570bb Merge pull request `#40057`_ from cachedout/ollie_blacklist - * 0ac2e83 Merge branch '2016.3' into ollie_blacklist +* **PR** `#40120`_: (`sergeizv`_) gce: Exclude GCENodeDriver objects from _expand_node result + @ *2017-03-20 21:44:42 UTC* -- **PR** `#40070`_: (*Ch3LL*) update 2016.3.6 release notes with additional PR's - @ *2017-03-16T15:43:22Z* + * 33ba7821f7 Merge pull request `#40120`_ from sergeizv/gce-expand-node-fix - * d36bdb1 Merge pull request `#40070`_ from Ch3LL/2016.3.6_release - * a1f8b49 update 2016.3.6 release notes with additional PR's + * 9d0fbe7e01 gce: Exclude GCENodeDriver objects from _expand_node result -- **PR** `#40018`_: (*meaksh*) Allow overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call - @ *2017-03-15T19:43:01Z* +* **PR** `#40122`_: (`meaksh`_) Adding "pkg.install downloadonly=True" support to yum/dnf execution module + @ *2017-03-20 21:44:15 UTC* - * 8dcffc7 Merge pull request `#40018`_ from meaksh/2016.3-handling-timeouts-for-manage.up-runner - * 9f5c3b7 Allow setting custom timeouts for 'manage.up' and 'manage.status' + * 48843977c3 Merge pull request `#40122`_ from meaksh/2016.3-yum-downloadonly-support - * 2102d9c Allow setting 'timeout' and 'gather_job_timeout' via kwargs + * 067f3f77c2 Adding downloadonly support to yum/dnf module -- **PR** `#40038`_: (*velom*) correctly parse "pkg_name===version" from pip freeze - @ *2017-03-15T19:30:03Z* +* **PR** `#40159`_: (`cro`_) Turn on sign_pub_messages by default. + @ *2017-03-20 21:00:49 UTC* - * 22fc529 Merge pull request `#40038`_ from velom/fix-pip-freeze-parsing - * 3fae91d correctly parse "pkg_name===version" from pip freeze + * 60e1d4e2f3 Merge pull request `#40159`_ from cro/sign_pub -- **PR** `#40053`_: (*gtmanfred*) Update rh_ip.py - @ *2017-03-15T18:57:32Z* + * e663b761fb Fix small syntax error - - **ISSUE** `#40036`_: (*oogali*) UnboundLocalError: local variable 'ifcfg' referenced before assignment - | refs: `#40053`_ - * 3584f93 Merge pull request `#40053`_ from saltstack/rh_ip_patch - * 219947a Update rh_ip.py + * 0a0f46fb14 Turn on sign_pub_messages by default. Make sure messages with no 'sig' are dropped with error when sign_pub_messages is True. -- **PR** `#40041`_: (*terminalmage*) Fix transposed lines in salt.utils.process - @ *2017-03-15T17:58:24Z* +* **PR** `#40123`_: (`twangboy`_) Adds support for inet_pton in Windows to network util + @ *2017-03-20 16:25:47 UTC* - - **ISSUE** `#40011`_: (*tsaridas*) salt-minion does not shutdown properly 2016.11.3 rh6 - | refs: `#40041`_ - * 837432d Merge pull request `#40041`_ from terminalmage/issue40011 - * 5b5d1b3 Fix transposed lines in salt.utils.process + * 28e4fc17b6 Merge pull request `#40123`_ from twangboy/win_fix_network -- **PR** `#40021`_: (*Ch3LL*) 2016.3.6 release notes with change log - @ *2017-03-14T21:06:18Z* + * 06dfd55ef9 Adds support for inet_pton in Windows to network util - * ee7f3b1 Merge pull request `#40021`_ from Ch3LL/2016.3.6_release - * f3e7e4f Add 2016.3.6 Release Notes +* **ISSUE** `#39995`_: (`frogunder`_) Head of Develop - Multimaster error (refs: `#40141`_) -- **PR** `#40016`_: (*terminalmage*) Attempt to fix failing grains tests in 2016.3 - @ *2017-03-14T18:34:32Z* +* **ISSUE** `#39118`_: (`bobrik`_) Minion ipv6 option is not documented (refs: `#39289`_, `#39131`_) - * 26895b7 Merge pull request `#40016`_ from terminalmage/fix-grains-test - * 0ec81a4 Fixup a syntax error +* **PR** `#40141`_: (`bobrik`_) Use the first address if cannot connect to any + @ *2017-03-20 15:06:57 UTC* - * 5d84b40 Attempt to fix failing grains tests in 2016.3 + * **PR** `#39289`_: (`bobrik`_) Autodetect IPv6 connectivity from minion to master (refs: `#39766`_, `#40141`_) -- **PR** `#39980`_: (*vutny*) [2016.3] Allow using `bg` kwarg for `cmd.run` state function - @ *2017-03-14T17:16:14Z* + * 35ddb79f59 Merge pull request `#40141`_ from bobrik/fallback-resolve - * 0c61d06 Merge pull request `#39980`_ from vutny/cmd-run-state-bg - * a81dc9d [2016.3] Allow using `bg` kwarg for `cmd.run` state function + * af1545deed Use the first address if cannot connect to any -- **PR** `#39994`_: (*rallytime*) Add a versionadded tag for dockerng ulimits addition - @ *2017-03-13T20:58:02Z* +* **PR** `#40059`_: (`terminalmage`_) Fix traceback when virtualenv.managed is invoked with nonexistant user + @ *2017-03-16 20:46:43 UTC* - - **ISSUE** `#39942`_: (*Foxlik*) Web Documentation not in sync with release 2016.11.3 - | refs: `#39994`_ - * b042484 Merge pull request `#39994`_ from rallytime/ulimits-dockerng-version - * 37bd800 Add a versionadded tag for dockerng ulimits addition + * 116201f345 Merge pull request `#40059`_ from terminalmage/fix-virtualenv-traceback -- **PR** `#39988`_: (*terminalmage*) Add comment explaining change from `#39973`_ - @ *2017-03-13T18:37:29Z* + * e3cfd29d6b Fix traceback when virtualenv.managed is invoked with nonexistant user - - **PR** `#39973`_: (*terminalmage*) Don't use docker.Client instance from context if missing attributes - * e125c94 Merge pull request `#39988`_ from terminalmage/dockerng-timeout - * bd2519e Add comment explaining change from `#39973`_ +* **PR** `#40090`_: (`rallytime`_) Back-port `#40056`_ to 2016.3 + @ *2017-03-16 19:42:58 UTC* -- **PR** `#39973`_: (*terminalmage*) Don't use docker.Client instance from context if missing attributes - @ *2017-03-11T14:57:50Z* + * **PR** `#40056`_: (`thatch45`_) update mention bot blacklist (refs: `#40090`_) - * cd0336e Merge pull request `#39973`_ from terminalmage/dockerng-timeout - * 869416e Don't use docker.Client instance from context if missing attributes + * a01b52b9a3 Merge pull request `#40090`_ from rallytime/bp-40056 -- **PR** `#39962`_: (*cachedout*) Disable mention bot delay on 2016.3 - @ *2017-03-10T20:24:08Z* + * ae012db87a update mention bot blacklist - * 282c607 Merge pull request `#39962`_ from cachedout/disable_mentionbot_delay_3 - * 7a638f2 Disable mention bot delay on 2016.3 +* **PR** `#40057`_: (`cachedout`_) More mentionbot blacklists + @ *2017-03-16 18:10:11 UTC* - * 5592c68 More mentionbot blacklists + * d1570bba4c Merge pull request `#40057`_ from cachedout/ollie_blacklist -- **PR** `#39937`_: (*cachedout*) Fix --non-gpg-checks in zypper module - @ *2017-03-10T18:02:51Z* + * 0ac2e83d37 Merge branch '2016.3' into ollie_blacklist - * 1e0c88a Merge pull request `#39937`_ from cachedout/gpg_zypper - * 13ed0d1 Fix --non-gpg-checks in zypper module +* **PR** `#40070`_: (`Ch3LL`_) update 2016.3.6 release notes with additional PR's + @ *2017-03-16 15:43:22 UTC* -- **PR** `#39929`_: (*terminalmage*) Scrap event-based approach for refreshing grains (2016.3 branch) - @ *2017-03-09T22:03:16Z* + * d36bdb1a6e Merge pull request `#40070`_ from Ch3LL/2016.3.6_release - * 4526fc6 Merge pull request `#39929`_ from terminalmage/pr-39770-2016.3 - * cf0100d Scrap event-based approach for refreshing grains + * a1f8b49bd1 update 2016.3.6 release notes with additional PR's -- **PR** `#39919`_: (*The-Loeki*) CIDR matching supports IPv6, update docs - @ *2017-03-09T16:03:00Z* +* **PR** `#40018`_: (`meaksh`_) Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call + @ *2017-03-15 19:43:01 UTC* - - **ISSUE** `#22080`_: (*The-Loeki*) CIDR matching for IPv6 / improve IPv6 support in utils.network - | refs: `#39919`_ - * 111110c Merge pull request `#39919`_ from The-Loeki/patch-1 - * 170cbad CIDR matching supports IPv6, update docs + * 8dcffc7751 Merge pull request `#40018`_ from meaksh/2016.3-handling-timeouts-for-manage.up-runner -- **PR** `#39899`_: (*techhat*) Update cleanup function for azure - @ *2017-03-08T23:28:33Z* + * 9f5c3b7dcd Allows to set custom timeouts for 'manage.up' and 'manage.status' - * caf10e9 Merge pull request `#39899`_ from techhat/cleanupdisks - * baf4579 Update cleanup function for azure + * 2102d9c75c Allows to set 'timeout' and 'gather_job_timeout' via kwargs -- **PR** `#39871`_: (*terminalmage*) Squelch warning for pygit2 import - @ *2017-03-07T20:40:18Z* +* **PR** `#40038`_: (`velom`_) correctly parse "pkg_name===version" from pip freeze + @ *2017-03-15 19:30:03 UTC* - * fcf95f3 Merge pull request `#39871`_ from terminalmage/squelch-import-warning - * 2b2ec69 Squelch warning for pygit2 import + * 22fc5299a2 Merge pull request `#40038`_ from velom/fix-pip-freeze-parsing -- **PR** `#39794`_: (*cachedout*) Clean up errors which might be thrown when the monitor socket shuts down - @ *2017-03-04T16:12:37Z* + * 3fae91d879 correctly parse "pkg_name===version" from pip freeze - * f223fa8 Merge pull request `#39794`_ from cachedout/clean_monitor_socket_shutdown - * 2e683e7 Clean up errors which might be thrown when the monitor socket shuts down +* **ISSUE** `#40036`_: (`oogali`_) UnboundLocalError: local variable 'ifcfg' referenced before assignment (refs: `#40053`_) -- **PR** `#39819`_: (*terminalmage*) Improve the Top File matching docs - @ *2017-03-04T16:06:40Z* +* **PR** `#40053`_: (`gtmanfred`_) Update rh_ip.py + @ *2017-03-15 18:57:32 UTC* - * 4002dc1 Merge pull request `#39819`_ from terminalmage/top-file-matching-docs - * 7178e77 Improve the Top File matching docs + * 3584f935fa Merge pull request `#40053`_ from saltstack/rh_ip_patch -- **PR** `#39820`_: (*ni3mm4nd*) Add missing apostrophe in Beacons topic documentation - @ *2017-03-04T16:05:29Z* + * 219947acdb Update rh_ip.py - * c08aaeb Merge pull request `#39820`_ from ni3mm4nd/beacons_topic_doc_typo - * 804b120 Add missing apostrophe +* **ISSUE** `#40011`_: (`tsaridas`_) salt-minion does not shutdown properly 2016.11.3 rh6 (refs: `#40041`_) -- **PR** `#39826`_: (*cachedout*) Add group func to yubikey auth - @ *2017-03-04T16:02:14Z* +* **PR** `#40041`_: (`terminalmage`_) Fix transposed lines in salt.utils.process + @ *2017-03-15 17:58:24 UTC* - * cbd2a4e Merge pull request `#39826`_ from cachedout/yubikey_fix - * 6125eff Add group func to yubikey auth + * 837432d3d2 Merge pull request `#40041`_ from terminalmage/issue40011 -- **PR** `#39624`_: (*drawsmcgraw*) Address issue 39622 - @ *2017-03-03T15:59:04Z* + * 5b5d1b375c Fix transposed lines in salt.utils.process - - **ISSUE** `#39622`_: (*drawsmcgraw*) boto_vpc.create_subnet does not properly assign tags - | refs: `#39624`_ - * f575ef4 Merge pull request `#39624`_ from drawsmcgraw/39622 - * 13da50b Fix indention lint errors +* **PR** `#40021`_: (`Ch3LL`_) 2016.3.6 release notes with change log + @ *2017-03-14 21:06:18 UTC* - * 5450263 Address issue 39622 + * ee7f3b1200 Merge pull request `#40021`_ from Ch3LL/2016.3.6_release -- **PR** `#39796`_: (*cachedout*) Stop the process manager when it no longer has processes to manage - @ *2017-03-02T23:03:13Z* + * f3e7e4fb2a Add 2016.3.6 Release Notes - - **ISSUE** `#39119`_: (*frogunder*) Head of 2016.3 - Salt-Master uses 90 seconds to restart - | refs: `#39796`_ - * 1f3619c Merge pull request `#39796`_ from cachedout/master_shutdown - * e31d46c Stop the process manager when it no longer has processes to manage +* **PR** `#40016`_: (`terminalmage`_) Attempt to fix failing grains tests in 2016.3 + @ *2017-03-14 18:34:32 UTC* -- **PR** `#39791`_: (*gtmanfred*) load runners if role is master - @ *2017-03-02T19:43:41Z* + * 26895b7be2 Merge pull request `#40016`_ from terminalmage/fix-grains-test - - **ISSUE** `#39333`_: (*jagguli*) Not Available error - Scheduling custom runner functions - | refs: `#39791`_ - - **ISSUE** `#38514`_: (*githubcdr*) Unable to schedule runners - | refs: `#39791`_ - * 53341cf Merge pull request `#39791`_ from gtmanfred/2016.3 - * 3ab4f84 load runners if role is master + * 0ec81a4cde Fixup a syntax error -- **PR** `#39784`_: (*sergeizv*) Fix 39782 - @ *2017-03-02T16:08:51Z* + * 5d84b40bfd Attempt to fix failing grains tests in 2016.3 - - **ISSUE** `#39782`_: (*sergeizv*) salt-cloud show_instance action fails on EC2 instances - | refs: `#39784`_ - - **ISSUE** `#33162`_: (*jfindlay*) Key error with salt.utils.cloud.cache_node and EC2 - | refs: `#33164`_ `#39784`_ - - **PR** `#33164`_: (*jfindlay*) cloud.clouds.ec2: cache each named node - | refs: `#39784`_ `#39784`_ - * c234c25 Merge pull request `#39784`_ from sergeizv/`fix-39782`_ - * b71c3fe Revert "cloud.clouds.ec2: cache each named node (`#33164`_)" +* **PR** `#39980`_: (`vutny`_) [2016.3] Allow to use `bg` kwarg for `cmd.run` state function + @ *2017-03-14 17:16:14 UTC* -- **PR** `#39766`_: (*rallytime*) Restore ipv6 connectivity and "master: :" support - @ *2017-03-02T02:55:55Z* + * 0c61d064ad Merge pull request `#39980`_ from vutny/cmd-run-state-bg - - **ISSUE** `#39336`_: (*GevatterGaul*) salt-minion fails with IPv6 - | refs: `#39766`_ - - **ISSUE** `#39118`_: (*bobrik*) Minion ipv6 option is not documented - | refs: `#39289`_ - - **PR** `#39289`_: (*bobrik*) Autodetect IPv6 connectivity from minion to master - | refs: `#39766`_ `#40141`_ - - **PR** `#25021`_: (*GideonRed*) Introduce ip:port minion config - | refs: `#39766`_ - * 4ee59be Merge pull request `#39766`_ from rallytime/fix-ipv6-connection - * 65b2396 Restore ipv6 connectivity and "master: :" support + * a81dc9dfc1 [2016.3] Allow to use `bg` kwarg for `cmd.run` state function -- **PR** `#39761`_: (*cachedout*) Properly display error in jboss7 state - @ *2017-03-01T18:43:23Z* +* **ISSUE** `#39942`_: (`Foxlik`_) Web Documentation not in sync with release 2016.11.3 (refs: `#39994`_) - - **ISSUE** `#33187`_: (*usbportnoy*) Deploy to jboss TypeError at boss7.py:469 - | refs: `#39170`_ `#39761`_ - * a24da31 Merge pull request `#39761`_ from cachedout/issue_33187 - * c2df29e Properly display error in jboss7 state +* **PR** `#39994`_: (`rallytime`_) Add a versionadded tag for dockerng ulimits addition + @ *2017-03-13 20:58:02 UTC* -- **PR** `#39728`_: (*rallytime*) [2016.3] Bump latest release version to 2016.11.3 - @ *2017-02-28T18:07:44Z* + * b042484455 Merge pull request `#39994`_ from rallytime/ulimits-dockerng-version - * 0888bc3 Merge pull request `#39728`_ from rallytime/update-release-ver-2016.3 - * c9bc8af [2016.3] Bump latest release version to 2016.11.3 + * 37bd800fac Add a versionadded tag for dockerng ulimits addition -- **PR** `#39619`_: (*terminalmage*) Add a function to simply refresh the grains - @ *2017-02-28T00:20:27Z* +* **PR** `#39988`_: (`terminalmage`_) Add comment explaining change from `#39973`_ + @ *2017-03-13 18:37:29 UTC* - * b52dbee Merge pull request `#39619`_ from terminalmage/zd1207 - * c7dfb49 Fix mocking for grains refresh + * **PR** `#39973`_: (`terminalmage`_) Don't use docker.Client instance from context if missing attributes (refs: `#39988`_) - * 7e0ced3 Properly hand proxy minions + * e125c94ba5 Merge pull request `#39988`_ from terminalmage/dockerng-timeout - * 692c456 Add a function to simply refresh the grains + * bd2519ed1b Add comment explaining change from `#39973`_ -- **PR** `#39487`_: (*bobrik*) Document default permission modes for file module - @ *2017-02-24T23:49:00Z* +* **PR** `#39973`_: (`terminalmage`_) Don't use docker.Client instance from context if missing attributes (refs: `#39988`_) + @ *2017-03-11 14:57:50 UTC* - - **ISSUE** `#39482`_: (*bobrik*) file.managed and file mode don't mention default mode - | refs: `#39487`_ - * 3f8b5e6 Merge pull request `#39487`_ from bobrik/mode-docs - * 41ef69b Document default permission modes for file module + * cd0336e868 Merge pull request `#39973`_ from terminalmage/dockerng-timeout -- **PR** `#39641`_: (*smarsching*) Return runner return code in a way compatible with check_state_result - @ *2017-02-24T23:07:11Z* + * 869416e7db Don't use docker.Client instance from context if missing attributes - - **ISSUE** `#39169`_: (*blueyed*) Using batch-mode with `salt.state` in orchestration runner considers all minions to have failed - | refs: `#39641`_ `#39641`_ - * f7389bf Merge pull request `#39641`_ from smarsching/issue-39169-2016.3 - * 88c2d9a Fix return data structure for runner (issue `#39169`_). +* **PR** `#39962`_: (`cachedout`_) Disable mention bot delay on 2016.3 + @ *2017-03-10 20:24:08 UTC* -- **PR** `#39633`_: (*terminalmage*) Fix misspelled argument in salt.modules.systemd.disable() - @ *2017-02-24T18:21:36Z* + * 282c607d26 Merge pull request `#39962`_ from cachedout/disable_mentionbot_delay_3 - * fc970b6 Merge pull request `#39633`_ from terminalmage/fix-systemd-typo - * ca54541 Add missing unit test for disable func + * 7a638f204b Disable mention bot delay on 2016.3 - * 17109e1 Fix misspelled argument in salt.modules.systemd.disable() + * 5592c680b5 More mentionbot blacklists -- **PR** `#39613`_: (*terminalmage*) Fix inaccurate documentation - @ *2017-02-24T06:07:35Z* +* **PR** `#39937`_: (`cachedout`_) Fix --non-gpg-checks in zypper module + @ *2017-03-10 18:02:51 UTC* - * 53e78d6 Merge pull request `#39613`_ from terminalmage/fix-docs - * 9342eda Fix inaccurate documentation + * 1e0c88ae08 Merge pull request `#39937`_ from cachedout/gpg_zypper -- **PR** `#39600`_: (*vutny*) state.file: drop non-relevant examples for `source_hash` parameter - @ *2017-02-23T16:55:27Z* + * 13ed0d1209 Fix --non-gpg-checks in zypper module - * 4e2b852 Merge pull request `#39600`_ from vutny/state-file-docs - * 9b0427c state.file: drop non-relevant examples for `source_hash` parameter +* **PR** `#39929`_: (`terminalmage`_) Scrap event-based approach for refreshing grains (2016.3 branch) + @ *2017-03-09 22:03:16 UTC* -- **PR** `#39584`_: (*cachedout*) A note in the docs about mentionbot - @ *2017-02-23T15:12:13Z* + * 4526fc6e08 Merge pull request `#39929`_ from terminalmage/pr-39770-2016.3 - * ed83420 Merge pull request `#39584`_ from cachedout/mentionbot_docs - * 652044b A note in the docs about mentionbot + * cf0100dabe Scrap event-based approach for refreshing grains -- **PR** `#39583`_: (*cachedout*) Add empty blacklist to mention bot - @ *2017-02-23T02:22:57Z* +* **ISSUE** `#22080`_: (`The-Loeki`_) CIDR matching for IPv6 / improve IPv6 support in utils.network (refs: `#39919`_) - * d3e50b4 Merge pull request `#39583`_ from cachedout/mentionbot_blacklist - * 62491c9 Add empty blacklist to mention bot +* **PR** `#39919`_: (`The-Loeki`_) CIDR matching supports IPv6, update docs + @ *2017-03-09 16:03:00 UTC* -- **PR** `#39579`_: (*rallytime*) [2016.3] Pylint: Remove unused import - @ *2017-02-22T23:46:33Z* + * 111110caf8 Merge pull request `#39919`_ from The-Loeki/patch-1 - * 8352e6b Merge pull request `#39579`_ from rallytime/fix-lint - * 65889e1 [2016.3] Pylint: Remove unused import + * 170cbadc54 CIDR matching supports IPv6, update docs -- **PR** `#39578`_: (*cachedout*) Add mention-bot configuration - @ *2017-02-22T23:39:24Z* +* **PR** `#39899`_: (`techhat`_) Update cleanup function for azure + @ *2017-03-08 23:28:33 UTC* - * 43dba32 Merge pull request `#39578`_ from cachedout/2016.3 - * 344499e Add mention-bot configuration + * caf10e9988 Merge pull request `#39899`_ from techhat/cleanupdisks -- **PR** `#39542`_: (*twangboy*) Gate ssh_known_hosts state against Windows - @ *2017-02-22T20:16:41Z* + * baf4579e63 Update cleanup function for azure - * 8f7a0f9 Merge pull request `#39542`_ from twangboy/gate_ssh_known_hosts - * c90a52e Remove expensive check +* **PR** `#39871`_: (`terminalmage`_) Squelch warning for pygit2 import + @ *2017-03-07 20:40:18 UTC* - * 6d645ca Add __virtual__ function + * fcf95f3654 Merge pull request `#39871`_ from terminalmage/squelch-import-warning -- **PR** `#39289`_: (*bobrik*) Autodetect IPv6 connectivity from minion to master - | refs: `#39766`_ `#40141`_ - @ *2017-02-22T19:05:32Z* + * 2b2ec69d04 Squelch warning for pygit2 import - - **ISSUE** `#39118`_: (*bobrik*) Minion ipv6 option is not documented - | refs: `#39289`_ - * c109658 Merge pull request `#39289`_ from bobrik/autodetect-ipv6 - * 2761a1b Move new kwargs to the end of argument list +* **PR** `#39794`_: (`cachedout`_) Clean up errors which might be thrown when the monitor socket shuts down + @ *2017-03-04 16:12:37 UTC* - * 0df6b92 Narrow down connection exception to socket.error + * f223fa8906 Merge pull request `#39794`_ from cachedout/clean_monitor_socket_shutdown - * e8a2cc0 Do no try to connect to salt master in syndic config test + * 2e683e788b Clean up errors which might be thrown when the monitor socket shuts down - * af95786 Properly log address that failed to resolve or pass connection check +* **PR** `#39819`_: (`terminalmage`_) Improve the Top File matching docs + @ *2017-03-04 16:06:40 UTC* - * 9a34fbe Actually connect to master instead of checking route availability + * 4002dc1947 Merge pull request `#39819`_ from terminalmage/top-file-matching-docs - * c494839 Avoid bare exceptions in dns_check + * 7178e77eee Improve the Top File matching docs - * 29f3766 Rewrite dns_check to try to connect to address +* **PR** `#39820`_: (`ni3mm4nd`_) Add missing apostrophe in Beacons topic documentation + @ *2017-03-04 16:05:29 UTC* - * 55965ce Autodetect IPv6 connectivity from minion to master + * c08aaeb7fd Merge pull request `#39820`_ from ni3mm4nd/beacons_topic_doc_typo -- **PR** `#39569`_: (*s0undt3ch*) Don't use our own six dictionary fixes in this branch - @ *2017-02-22T18:59:49Z* + * 804b12048c Add missing apostrophe - * 3fb928b Merge pull request `#39569`_ from s0undt3ch/2016.3 - * 49da135 Don't use our own six dictionary fixes in this branch +* **PR** `#39826`_: (`cachedout`_) Add group func to yubikey auth + @ *2017-03-04 16:02:14 UTC* -- **PR** `#39508`_: (*dincamihai*) Openscap - @ *2017-02-22T18:36:36Z* + * cbd2a4e3cc Merge pull request `#39826`_ from cachedout/yubikey_fix - * 91e3319 Merge pull request `#39508`_ from dincamihai/openscap - * 9fedb84 Always return oscap's stderr + * 6125eff02d Add group func to yubikey auth - * 0ecde2c Include oscap returncode in response +* **ISSUE** `#39622`_: (`drawsmcgraw`_) boto_vpc.create_subnet does not properly assign tags (refs: `#39624`_) -- **PR** `#39562`_: (*terminalmage*) Add ulimits to dockerng state/exec module - @ *2017-02-22T16:31:49Z* +* **PR** `#39624`_: (`drawsmcgraw`_) Address issue 39622 + @ *2017-03-03 15:59:04 UTC* - - **ISSUE** `#30802`_: (*kjelle*) Missing ulimits on docker.running / dockerng.running - | refs: `#39562`_ - * fbe2194 Merge pull request `#39562`_ from terminalmage/issue30802 - * c503740 Add ulimits to dockerng state/exec module + * f575ef459f Merge pull request `#39624`_ from drawsmcgraw/39622 - * da42040 Try the docker-py 2.0 client name first + * 13da50be33 Fix indention lint errors -* 01d4a84 dockerng.get_client_args: Fix path for endpoint config for some versions of docker-py (`#39544`_) + * 545026352f Address issue 39622 - - **PR** `#39544`_: (*terminalmage*) dockerng.get_client_args: Fix path for endpoint config for some versions of docker-py +* **ISSUE** `#39119`_: (`frogunder`_) Head of 2016.3 - Salt-Master uses 90 seconds to restart (refs: `#39796`_) -- **PR** `#39498`_: (*terminalmage*) Resubmit PR `#39483`_ against 2016.3 branch - @ *2017-02-20T19:35:33Z* +* **PR** `#39796`_: (`cachedout`_) Stop the process manager when it no longer has processes to manage + @ *2017-03-02 23:03:13 UTC* - * dff35b5 Merge pull request `#39498`_ from terminalmage/pr-39483 - * 20b097a dockerng: compare sets instead of lists of security_opt + * 1f3619c1e5 Merge pull request `#39796`_ from cachedout/master_shutdown -- **PR** `#39497`_: (*terminalmage*) Two dockerng compatibility fixes - @ *2017-02-19T17:43:36Z* + * e31d46c1b8 Stop the process manager when it no longer has processes to manage - * 6418e72 Merge pull request `#39497`_ from terminalmage/docker-compat-fixes - * cbd0270 docker: make docker-exec the default execution driver +* **ISSUE** `#39333`_: (`jagguli`_) Not Available error - Scheduling custom runner functions (refs: `#39791`_) - * a6a17d5 Handle docker-py 2.0's new host_config path +* **ISSUE** `#38514`_: (`githubcdr`_) Unable to schedule runners (refs: `#39791`_) -- **PR** `#39423`_: (*dincamihai*) Openscap module - @ *2017-02-17T18:31:04Z* +* **PR** `#39791`_: (`gtmanfred`_) load runners if role is master + @ *2017-03-02 19:43:41 UTC* - * 9c4292f Merge pull request `#39423`_ from dincamihai/openscap - * 9d13422 OpenSCAP module + * 53341cf152 Merge pull request `#39791`_ from gtmanfred/2016.3 -- **PR** `#39464`_: (*gtmanfred*) skip false values from preferred_ip - @ *2017-02-16T22:48:32Z* + * 3ab4f843bf load runners if role is master - - **ISSUE** `#39444`_: (*clem-compilatio*) salt-cloud - IPv6 and IPv4 private_ips - preferred_ip sends False to is_public_ip - | refs: `#39464`_ - * 7dd2502 Merge pull request `#39464`_ from gtmanfred/2016.3 - * f829d6f skip false values from preferred_ip +* **ISSUE** `#39782`_: (`sergeizv`_) salt-cloud show_instance action fails on EC2 instances (refs: `#39784`_) -- **PR** `#39460`_: (*cachedout*) Fix mocks in win_disim tests - @ *2017-02-16T19:27:48Z* +* **ISSUE** `#33162`_: (`jfindlay`_) Key error with salt.utils.cloud.cache_node and EC2 (refs: `#39784`_, `#33164`_) - * db359ff Merge pull request `#39460`_ from cachedout/win_dism_test_fix - * e652a45 Fix mocks in win_disim tests +* **PR** `#39784`_: (`sergeizv`_) Fix 39782 + @ *2017-03-02 16:08:51 UTC* -- **PR** `#39426`_: (*morganwillcock*) win_dism: Return failure when package path does not exist - @ *2017-02-16T00:09:22Z* + * **PR** `#33164`_: (`jfindlay`_) cloud.clouds.ec2: cache each named node (refs: `#39784`_) - * 9dbfba9 Merge pull request `#39426`_ from morganwillcock/dism - * a7d5118 Return failure when package path does not exist + * c234c25092 Merge pull request `#39784`_ from sergeizv/fix-39782 -- **PR** `#39431`_: (*UtahDave*) Fix grains.setval performance - @ *2017-02-15T23:56:30Z* + * b71c3fe13c Revert "cloud.clouds.ec2: cache each named node (`#33164`_)" - * 5616270 Merge pull request `#39431`_ from UtahDave/fix_grains.setval_performance - * 391bbec add docs +* **ISSUE** `#39336`_: (`GevatterGaul`_) salt-minion fails with IPv6 (refs: `#39766`_) - * 709c197 allow sync_grains to be disabled on grains.setval +* **ISSUE** `#39118`_: (`bobrik`_) Minion ipv6 option is not documented (refs: `#39289`_, `#39131`_) -- **PR** `#39405`_: (*rallytime*) Update :depends: docs for boto states and modules - @ *2017-02-15T17:32:08Z* +* **PR** `#39766`_: (`rallytime`_) Restore ipv6 connectivity and "master: :" support + @ *2017-03-02 02:55:55 UTC* - - **ISSUE** `#39304`_: (*Auha*) boto_s3_bucket documentation dependency clarification - | refs: `#39405`_ - * 239e16e Merge pull request `#39405`_ from rallytime/`fix-39304`_ - * bd1fe03 Update :depends: docs for boto states and modules + * **PR** `#39289`_: (`bobrik`_) Autodetect IPv6 connectivity from minion to master (refs: `#39766`_, `#40141`_) -- **PR** `#39411`_: (*rallytime*) Update external_cache docs with other configuration options - @ *2017-02-15T17:30:40Z* + * **PR** `#25021`_: (`GideonRed-zz`_) Introduce ip:port minion config (refs: `#39766`_) - - **ISSUE** `#38762`_: (*oz123*) Configuration information for custom returners - | refs: `#39411`_ - * 415102f Merge pull request `#39411`_ from rallytime/`fix-38762`_ - * e13febe Update external_cache docs with other configuration options + * 4ee59be22c Merge pull request `#39766`_ from rallytime/fix-ipv6-connection -* 7e1803b Update docs on upstream EPEL7 pygit2/libgit2 issues (`#39421`_) + * 65b239664e Restore ipv6 connectivity and "master: :" support - - **PR** `#39421`_: (*terminalmage*) Update docs on upstream EPEL7 pygit2/libgit2 issues +* **ISSUE** `#33187`_: (`usbportnoy`_) Deploy to jboss TypeError at boss7.py:469 (refs: `#39761`_, `#39170`_) -* 4ff13ac salt.fileserver.roots: Fix regression in symlink_list (`#39409`_) +* **PR** `#39761`_: (`cachedout`_) Properly display error in jboss7 state + @ *2017-03-01 18:43:23 UTC* - - **PR** `#39409`_: (*terminalmage*) salt.fileserver.roots: Fix regression in symlink_list - - **PR** `#39337`_: (*terminalmage*) Don't re-walk the roots fileserver in symlink_list() - | refs: `#39409`_ + * a24da31131 Merge pull request `#39761`_ from cachedout/issue_33187 -- **PR** `#39362`_: (*dincamihai*) Add cp.push test - @ *2017-02-14T18:42:11Z* + * c2df29edb2 Properly display error in jboss7 state - * 8b8ab8e Merge pull request `#39362`_ from dincamihai/cp-push-test-2016.3 - * 91383c5 Add cp.push test +* **PR** `#39728`_: (`rallytime`_) [2016.3] Bump latest release version to 2016.11.3 + @ *2017-02-28 18:07:44 UTC* -- **PR** `#39380`_: (*joe-niland*) Quote numeric user names so pwd.getpwnam handles them properly - @ *2017-02-14T18:33:33Z* + * 0888bc32ef Merge pull request `#39728`_ from rallytime/update-release-ver-2016.3 - * 4b726f9 Merge pull request `#39380`_ from joe-niland/quote-numeric-usernames - * c2edfdd Quote numeric user names so pwd.getpwnam handles them properly + * c9bc8af8f2 [2016.3] Bump latest release version to 2016.11.3 -- **PR** `#39400`_: (*meaksh*) Prevents 'OSError' exception in case certain job cache path doesn't exist - @ *2017-02-14T18:27:04Z* +* **PR** `#39619`_: (`terminalmage`_) Add a function to simply refresh the grains + @ *2017-02-28 00:20:27 UTC* - * 1116d32 Merge pull request `#39400`_ from meaksh/2016.3-fix-local-cache-issue - * e7e559e Prevents 'OSError' exception in case path doesn't exist + * b52dbeec68 Merge pull request `#39619`_ from terminalmage/zd1207 -- **PR** `#39300`_: (*terminalmage*) Replace more usage of str.format in the loader - @ *2017-02-13T19:01:19Z* + * c7dfb494a6 Fix mocking for grains refresh - - **PR** `#39227`_: (*terminalmage*) Loader optimzation - | refs: `#39300`_ - * 6c854da Merge pull request `#39300`_ from terminalmage/loader-optimization - * d3e5d15 Replace more usage of str.format in the loader + * 7e0ced3b45 Properly hand proxy minions -- **PR** `#39337`_: (*terminalmage*) Don't re-walk the roots fileserver in symlink_list() - | refs: `#39409`_ - @ *2017-02-13T18:41:17Z* + * 692c456da3 Add a function to simply refresh the grains - * 5286b5f Merge pull request `#39337`_ from terminalmage/issue34428 - * a7d2135 Don't re-walk the roots fileserver in symlink_list() +* **ISSUE** `#39482`_: (`bobrik`_) file.managed and file mode don't mention default mode (refs: `#39487`_) -- **PR** `#39339`_: (*cro*) Add link to external pillar documentation for clarification. - @ *2017-02-13T18:40:13Z* +* **PR** `#39487`_: (`bobrik`_) Document default permission modes for file module + @ *2017-02-24 23:49:00 UTC* - * ce781de Merge pull request `#39339`_ from cro/pillar_filetree_doc - * 410810c Clarification on external pillar usage. + * 3f8b5e6733 Merge pull request `#39487`_ from bobrik/mode-docs -* fa30143 Document the upstream RedHat bug with their pygit2 package (`#39316`_) + * 41ef69b3ca Document default permission modes for file module - - **PR** `#39316`_: (*terminalmage*) Document the upstream RedHat bug with their pygit2 package +* **ISSUE** `#39169`_: (`blueyed`_) Using batch-mode with `salt.state` in orchestration runner considers all minions to have failed (refs: `#39641`_) -- **PR** `#39313`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - @ *2017-02-10T16:23:23Z* +* **PR** `#39641`_: (`smarsching`_) Return runner return code in a way compatible with check_state_result + @ *2017-02-24 23:07:11 UTC* - - **PR** `#39296`_: (*sergeizv*) Whitespace fix in docs Makefile - - **PR** `#39295`_: (*sergeizv*) Fix typo - - **PR** `#39294`_: (*sergeizv*) Fix link in proxyminion guide - - **PR** `#39293`_: (*sergeizv*) Grammar fix - * 9de559f Merge pull request `#39313`_ from rallytime/merge-2016.3 - * 0b8dddf Merge branch '2015.8' into '2016.3' + * f7389bf1f5 Merge pull request `#39641`_ from smarsching/issue-39169-2016.3 - * fc551bc Merge pull request `#39293`_ from sergeizv/grammar-fix + * 88c2d9a540 Fix return data structure for runner (issue `#39169`_). - * 70f2b58 Rewrap paragraph +* **PR** `#39633`_: (`terminalmage`_) Fix misspelled argument in salt.modules.systemd.disable() + @ *2017-02-24 18:21:36 UTC* - * e6ab517 Grammar fix + * fc970b6a16 Merge pull request `#39633`_ from terminalmage/fix-systemd-typo - * 8a1b456 Merge pull request `#39295`_ from sergeizv/typo-fix + * ca54541abe Add missing unit test for disable func - * 5d9f36d Fix typo + * 17109e1522 Fix misspelled argument in salt.modules.systemd.disable() - * cfaafec Merge pull request `#39296`_ from sergeizv/whitespace-fix +* **PR** `#39613`_: (`terminalmage`_) Fix inaccurate documentation + @ *2017-02-24 06:07:35 UTC* - * 1d4c1dc Whitespace fix in docs Makefile + * 53e78d67f6 Merge pull request `#39613`_ from terminalmage/fix-docs - * 0b4dcf4 Merge pull request `#39294`_ from sergeizv/fix-link + * 9342eda377 Fix inaccurate documentation - * 04bde6e Fix link in proxyminion guide +* **PR** `#39600`_: (`vutny`_) state.file: drop non-relevant examples for `source_hash` parameter + @ *2017-02-23 16:55:27 UTC* -* dd3ca0e Fix `#38595`_ - Unexpected error log from redis retuner in master's log (`#39299`_) + * 4e2b852f83 Merge pull request `#39600`_ from vutny/state-file-docs - - **ISSUE** `#38595`_: (*yue9944882*) Redis ext job cache occurred error - | refs: `#38610`_ `#38610`_ - - **PR** `#39299`_: (*rallytime*) Back-port `#38610`_ to 2016.3 - - **PR** `#38610`_: (*yue9944882*) Fix `#38595`_ - Unexpected error log from redis retuner in master's log - | refs: `#39299`_ + * 9b0427c27a state.file: drop non-relevant examples for `source_hash` parameter -- **PR** `#39297`_: (*cro*) Add doc to recommend pgjsonb for master job caches - @ *2017-02-09T22:49:59Z* +* **PR** `#39584`_: (`cachedout`_) A note in the docs about mentionbot + @ *2017-02-23 15:12:13 UTC* - * f16027d Merge pull request `#39297`_ from cro/pg_returner_docs - * 28bac64 Typo + * ed83420417 Merge pull request `#39584`_ from cachedout/mentionbot_docs - * 19fedcd Add doc to recommend pgjsonb for master job caches + * 652044b18f A note in the docs about mentionbot -- **PR** `#39286`_: (*terminalmage*) Allow minion/CLI saltenv/pillarenv to override master when compiling pillar - @ *2017-02-09T21:22:46Z* +* **PR** `#39583`_: (`cachedout`_) Add empty blacklist to mention bot + @ *2017-02-23 02:22:57 UTC* - * 77e50ed Merge pull request `#39286`_ from terminalmage/fix-pillarenv-precedence - * 3cb9833 Allow minion/CLI saltenv/pillarenv to override master when compiling pillar + * d3e50b4f2f Merge pull request `#39583`_ from cachedout/mentionbot_blacklist -- **PR** `#39221`_: (*lvg01*) Fix bug 39220 - @ *2017-02-09T18:12:29Z* + * 62491c900d Add empty blacklist to mention bot - - **ISSUE** `#39220`_: (*lvg01*) state file.line skips leading spaces in content with mode:ensure and indent:False - | refs: `#39221`_ `#39221`_ `#39221`_ `#39221`_ - * 5244041 Merge pull request `#39221`_ from lvg01/fix-bug-39220 - * e8a41d6 Removes to early content stripping (stripping is already done when needed with ident:true), fixes `#39220`_ +* **PR** `#39579`_: (`rallytime`_) [2016.3] Pylint: Remove unused import + @ *2017-02-22 23:46:33 UTC* - * a4b169e Fixed wrong logic, fixes `#39220`_ + * 8352e6b44b Merge pull request `#39579`_ from rallytime/fix-lint -* 5a27207 Add warning for Dulwich removal (`#39280`_) + * 65889e1f30 [2016.3] Pylint: Remove unused import - - **ISSUE** `#36913`_: (*terminalmage*) Support custom refspecs in GitFS - | refs: `#39210`_ - - **PR** `#39280`_: (*terminalmage*) Add warning for Dulwich removal - - **PR** `#39210`_: (*terminalmage*) salt.utils.gitfs: remove dulwich support, make refspecs configurable - | refs: `#39280`_ +* **PR** `#39578`_: (`cachedout`_) Add mention-bot configuration + @ *2017-02-22 23:39:24 UTC* -* 1b9217d Update jsonschema tests to reflect change in jsonschema 2.6.0 (`#39260`_) + * 43dba3254c Merge pull request `#39578`_ from cachedout/2016.3 - - **PR** `#39260`_: (*terminalmage*) Update jsonschema tests to reflect change in jsonschema 2.6.0 + * 344499eef7 Add mention-bot configuration -* c1d16cc Better handling of enabled/disabled arguments in pkgrepo.managed (`#39251`_) +* **PR** `#39542`_: (`twangboy`_) Gate ssh_known_hosts state against Windows + @ *2017-02-22 20:16:41 UTC* - - **ISSUE** `#33536`_: (*murzick*) pkgrepo.managed does not disable a yum repo with "disabled: True" - | refs: `#35055`_ - - **PR** `#39251`_: (*terminalmage*) Better handling of enabled/disabled arguments in pkgrepo.managed - - **PR** `#35055`_: (*galet*) `#33536`_ pkgrepo.managed does not disable a yum repo with "disabled: True" - | refs: `#39251`_ + * 8f7a0f9d96 Merge pull request `#39542`_ from twangboy/gate_ssh_known_hosts -- **PR** `#39227`_: (*terminalmage*) Loader optimzation - | refs: `#39300`_ - @ *2017-02-08T19:38:21Z* + * c90a52ef27 Remove expensive check - * 8e88f71 Merge pull request `#39227`_ from terminalmage/loader-optimization - * c750662 Loader optimzation + * 6d645cae0e Add __virtual__ function -- **PR** `#39228`_: (*gtmanfred*) default to utf8 encoding if not specified - @ *2017-02-08T19:36:57Z* +* **ISSUE** `#39118`_: (`bobrik`_) Minion ipv6 option is not documented (refs: `#39289`_, `#39131`_) - - **ISSUE** `#38856`_: (*fhaynes*) salt-cloud throws an exception when ec2 does not return encoding - | refs: `#39228`_ - * bc89b29 Merge pull request `#39228`_ from gtmanfred/2016.3 - * afee047 default to utf8 encoding if not specified +* **PR** `#39289`_: (`bobrik`_) Autodetect IPv6 connectivity from minion to master (refs: `#39766`_, `#40141`_) + @ *2017-02-22 19:05:32 UTC* -- **PR** `#39231`_: (*terminalmage*) Add clarification for jenkins execution module - @ *2017-02-08T19:34:45Z* + * c10965833a Merge pull request `#39289`_ from bobrik/autodetect-ipv6 - * d9b0671 Merge pull request `#39231`_ from terminalmage/clarify-jenkins-depends - * ad1b125 Add clarification for jenkins execution module + * 2761a1b244 Move new kwargs to the end of argument list -- **PR** `#39232`_: (*terminalmage*) Avoid recursion in s3/svn ext_pillars - @ *2017-02-08T19:33:28Z* + * 0df6b922e7 Narrow down connection exception to socket.error - * ddcff89 Merge pull request `#39232`_ from terminalmage/issue21342 - * c88896c Avoid recursion in s3/svn ext_pillars + * e8a2cc0488 Do no try to connect to salt master in syndic config test -* ef4e437 Fix the win_ip_test failures (`#39230`_) + * af9578631e Properly log address that failed to resolve or pass connection check - - **ISSUE** `#38697`_: (*fboismenu*) On Windows, ip.get_all_interfaces returns at most 2 DNS/WINS Servers - | refs: `#38793`_ - - **PR** `#39230`_: (*rallytime*) Fix the win_ip_test failures - - **PR** `#38793`_: (*fboismenu*) Fix for `#38697`_ - | refs: `#39197`_ `#39230`_ + * 9a34fbeba9 Actually connect to master instead of checking route availability -- **PR** `#39199`_: (*rallytime*) Back-port `#39170`_ to 2016.3 - @ *2017-02-07T16:19:32Z* + * c494839c65 Avoid bare exceptions in dns_check - - **ISSUE** `#33187`_: (*usbportnoy*) Deploy to jboss TypeError at boss7.py:469 - | refs: `#39170`_ `#39761`_ - - **PR** `#39170`_: (*grep4linux*) Added missing source_hash_name argument in get_managed function - | refs: `#39199`_ - * df5f934 Merge pull request `#39199`_ from rallytime/`bp-39170`_ - * c129905 Added missing source_hash_name argument in get_managed function Additional fix to `#33187`_ Customer was still seeing errors, this should now work. Tested with 2015.8.13 and 2016.11.2 + * 29f376676d Rewrite dns_check to try to connect to address -- **PR** `#39206`_: (*cachedout*) Ignore empty dicts in highstate outputter - @ *2017-02-07T16:11:36Z* + * 55965ce505 Autodetect IPv6 connectivity from minion to master - - **ISSUE** `#37174`_: (*mikeadamz*) The State execution failed to record the order in which all states were executed spam while running pkg.upgrade from orchestration runner - | refs: `#39206`_ - * 2621c11 Merge pull request `#39206`_ from cachedout/issue_issue_37174 - * be31e05 Ignore empty dicts in highstate outputter +* **PR** `#39569`_: (`s0undt3ch`_) Don't use our own six dictionary fixes in this branch + @ *2017-02-22 18:59:49 UTC* -- **PR** `#39209`_: (*terminalmage*) Sort the return list from the fileserver.envs runner - @ *2017-02-07T16:07:08Z* + * 3fb928b63a Merge pull request `#39569`_ from s0undt3ch/2016.3 - * dd44045 Merge pull request `#39209`_ from terminalmage/sorted-envs - * e6dda4a Sort the return list from the fileserver.envs runner + * 49da135abd Don't use our own six dictionary fixes in this branch -* 7bed687 [2016.3] Pylint fix (`#39202`_) +* **PR** `#39508`_: (`dincamihai`_) Openscap + @ *2017-02-22 18:36:36 UTC* - - **PR** `#39202`_: (*rallytime*) [2016.3] Pylint fix + * 91e3319df8 Merge pull request `#39508`_ from dincamihai/openscap -- **PR** `#39197`_: (*cachedout*) Pr 38793 - @ *2017-02-06T19:23:12Z* + * 9fedb84607 Always return oscap's stderr - - **ISSUE** `#38697`_: (*fboismenu*) On Windows, ip.get_all_interfaces returns at most 2 DNS/WINS Servers - | refs: `#38793`_ - - **PR** `#38793`_: (*fboismenu*) Fix for `#38697`_ - | refs: `#39197`_ `#39230`_ - * ab76054 Merge pull request `#39197`_ from cachedout/pr-38793 - * f3d35fb Lint fixes + * 0ecde2cd02 Include oscap returncode in response - * 624f25b Fix for `#38697`_ +* **ISSUE** `#30802`_: (`kjelle`_) Missing ulimits on docker.running / dockerng.running (refs: `#39562`_) -- **PR** `#39166`_: (*Ch3LL*) fix boto ec2 module create_image doc - @ *2017-02-06T18:27:17Z* +* **PR** `#39562`_: (`terminalmage`_) Add ulimits to dockerng state/exec module + @ *2017-02-22 16:31:49 UTC* - * fa45cbc Merge pull request `#39166`_ from Ch3LL/fix_boto_ec2_docs - * 90af696 fix boto ec2 module create_image doc + * fbe2194a93 Merge pull request `#39562`_ from terminalmage/issue30802 -- **PR** `#39173`_: (*rallytime*) Restore "Salt Community" doc section - @ *2017-02-06T18:19:11Z* + * c50374041d Add ulimits to dockerng state/exec module - - **PR** `#30770`_: (*jacobhammons*) Doc restructuring, organization, and cleanup - | refs: `#39173`_ - - **PR** `#10792`_: (*cachedout*) Documentation overhaul - | refs: `#39173`_ - * a40cb46 Merge pull request `#39173`_ from rallytime/restore-community-docs - * 5aeddf4 Restore "Salt Community" doc section + * da42040c1a Try the docker-py 2.0 client name first -* 9de08af Apply fix from `#38705`_ to 2016.3 branch (`#39077`_) + * **PR** `#39544`_: (`terminalmage`_) dockerng.get_client_args: Fix path for endpoint config for some versions of docker-py - - **ISSUE** `#38704`_: (*nasenbaer13*) Archive extracted fails when another state run is queued - | refs: `#38705`_ - - **PR** `#39077`_: (*terminalmage*) Apply fix from `#38705`_ to 2016.3 branch - - **PR** `#38705`_: (*nasenbaer13*) Fix for `#38704`_ archive extracted and dockerio states +* **ISSUE** `#39447`_: (`Foxlik`_) dockerng keeps restarting privileged container (refs: `#39483`_) -* da3053e update vmware getting started doc (`#39146`_) +* **PR** `#39498`_: (`terminalmage`_) Resubmit PR `#39483`_ against 2016.3 branch + @ *2017-02-20 19:35:33 UTC* - - **PR** `#39146`_: (*gtmanfred*) update vmware getting started doc + * **PR** `#39483`_: (`Foxlik`_) dockerng: compare sets instead of lists of security_opt (refs: `#39498`_) -* e78ca0f Fixing a weird edge case when using salt syndics and targetting via pillar. Without this fix the master of masters ends up in an infinite loop since the data returned from the minions is differently structured than if a sync was not in use. (`#39145`_) + * dff35b58f8 Merge pull request `#39498`_ from terminalmage/pr-39483 - - **PR** `#39145`_: (*garethgreenaway*) [2016.3] Fix when targeting via pillar with Salt syndic + * 20b097a745 dockerng: compare sets instead of lists of security_opt -- **PR** `#38804`_: (*alexbleotu*) Second attempt to fix prepending of root_dir to paths - @ *2017-02-02T16:10:37Z* +* **PR** `#39497`_: (`terminalmage`_) Two dockerng compatibility fixes + @ *2017-02-19 17:43:36 UTC* - - **ISSUE** `#2016`_: (*seanchannel*) status.custom failing on any arguments - - **ISSUE** `#3`_: (*thatch45*) libvirt module - - **ISSUE** `#1`_: (*thatch45*) Enable regex on the salt cli - * cd8077a Merge pull request `#38804`_ from alexbleotu/root_dir_`fix-2016`_.3-gh - * b3bdd3b Add missing whiteline + * 6418e725ed Merge pull request `#39497`_ from terminalmage/docker-compat-fixes - * c7715ac Merge pull request `#3`_ from cro/ab_rootdirfix + * cbd0270bac docker: make docker-exec the default execution driver - * e8cbafa When running testsuite, salt.syspaths.ROOT_DIR is often empty. + * a6a17d58aa Handle docker-py 2.0's new host_config path - * b12dd44 Merge pull request `#1`_ from cro/ab_rootdirfix +* **PR** `#39423`_: (`dincamihai`_) Openscap module + @ *2017-02-17 18:31:04 UTC* - * bffc537 Remove extra if statements (rstrip will check for the presence anyway). + * 9c4292fb4e Merge pull request `#39423`_ from dincamihai/openscap - * 97521b3 Second attempt to fix prepending of root_dir to paths + * 9d13422ac1 OpenSCAP module -* 6ffeda3 Clarify ipv6 option for minion and interface for master, closes `#39118`_ (`#39131`_) +* **ISSUE** `#39444`_: (`clem-compilatio`_) salt-cloud - IPv6 and IPv4 private_ips - preferred_ip sends False to is_public_ip (refs: `#39464`_) - - **ISSUE** `#39118`_: (*bobrik*) Minion ipv6 option is not documented - | refs: `#39289`_ - - **PR** `#39131`_: (*bobrik*) Clarify ipv6 option for minion and interface for master, closes `#39118`_ +* **PR** `#39464`_: (`gtmanfred`_) skip false values from preferred_ip + @ *2017-02-16 22:48:32 UTC* -* 646b9ea Don't abort pillar.get with merge=True if default is None (`#39116`_) + * 7dd2502360 Merge pull request `#39464`_ from gtmanfred/2016.3 - - **PR** `#39116`_: (*terminalmage*) Don't abort pillar.get with merge=True if default is None + * f829d6f9fc skip false values from preferred_ip -- **PR** `#39091`_: (*terminalmage*) Run test_valid_docs in batches - @ *2017-02-01T19:09:05Z* +* **PR** `#39460`_: (`cachedout`_) Fix mocks in win_disim tests + @ *2017-02-16 19:27:48 UTC* - * cc9b69b Merge pull request `#39091`_ from terminalmage/update-test-valid-docs - * d76f038 add debug logging for batch vars + * db359ff2c3 Merge pull request `#39460`_ from cachedout/win_dism_test_fix - * b4afea2 Don't fail test if data is empty + * e652a45592 Fix mocks in win_disim tests - * b3a5d54 Account for trimmed value in 'salt -d' output +* **PR** `#39426`_: (`morganwillcock`_) win_dism: Return failure when package path does not exist + @ *2017-02-16 00:09:22 UTC* - * 909916c Run test_valid_docs in batches + * 9dbfba9b57 Merge pull request `#39426`_ from morganwillcock/dism -* bcee3d1 Move fileclient tests to tests/integration/fileserver/fileclient_test.py (`#39081`_) + * a7d5118262 Return failure when package path does not exist - - **PR** `#39081`_: (*terminalmage*) Move fileclient tests to tests/integration/fileserver/fileclient_test.py +* **PR** `#39431`_: (`UtahDave`_) Fix grains.setval performance + @ *2017-02-15 23:56:30 UTC* -* 122422b Bump openstack deprecation notice to Oxygen (`#39067`_) + * 56162706e3 Merge pull request `#39431`_ from UtahDave/fix_grains.setval_performance - - **PR** `#39067`_: (*rallytime*) Bump openstack deprecation notice to Oxygen + * 391bbecd90 add docs -- **PR** `#39047`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3 - @ *2017-01-30T23:48:14Z* + * 709c197f84 allow sync_grains to be disabled on grains.setval - - **PR** `#39046`_: (*rallytime*) Add 2015.8.14 release notes file - - **PR** `#39037`_: (*rallytime*) Update 2015.8.13 release notes - * a24af5a Merge pull request `#39047`_ from rallytime/merge-2016.3 - * b732a1f Merge branch '2015.8' into '2016.3' +* **ISSUE** `#39304`_: (`Auha`_) boto_s3_bucket documentation dependency clarification (refs: `#39405`_) - * 56ccae6 Add 2015.8.14 release notes file (`#39046`_) +* **PR** `#39405`_: (`rallytime`_) Update :depends: docs for boto states and modules + @ *2017-02-15 17:32:08 UTC* - * 5943fe6 Update 2015.8.13 release notes (`#39037`_) + * 239e16e612 Merge pull request `#39405`_ from rallytime/fix-39304 -* fef1b11 Add 2016.3.6 release notes file (`#39045`_) + * bd1fe03ce7 Update :depends: docs for boto states and modules - - **PR** `#39045`_: (*rallytime*) Add 2016.3.6 release notes file +* **ISSUE** `#38762`_: (`oz123`_) Configuration information for custom returners (refs: `#39411`_) -* 7c43f4a [2016.3] Update release numbers for doc build (`#39042`_) +* **PR** `#39411`_: (`rallytime`_) Update external_cache docs with other configuration options + @ *2017-02-15 17:30:40 UTC* - - **PR** `#39042`_: (*rallytime*) [2016.3] Update release numbers for doc build + * 415102f346 Merge pull request `#39411`_ from rallytime/fix-38762 -* ff32459 Update 2016.3.5 release notes (`#39038`_) + * e13febe58d Update external_cache docs with other configuration options - - **PR** `#39038`_: (*rallytime*) Update 2016.3.5 release notes + * **PR** `#39421`_: (`terminalmage`_) Update docs on upstream EPEL7 pygit2/libgit2 issues -- **PR** `#39028`_: (*terminalmage*) Clarify delimiter argument - @ *2017-01-30T18:20:26Z* + * **PR** `#39409`_: (`terminalmage`_) salt.fileserver.roots: Fix regression in symlink_list - * 5b09dc4 Merge pull request `#39028`_ from terminalmage/clarify-delimiter-argument - * f29ef07 Clarify delimiter argument + * **PR** `#39337`_: (`terminalmage`_) Don't re-walk the roots fileserver in symlink_list() (refs: `#39409`_) -* 1ff359f Add CLI Example for rest_sample_utils.get_test_string function (`#39030`_) +* **PR** `#39362`_: (`dincamihai`_) Add cp.push test + @ *2017-02-14 18:42:11 UTC* - - **PR** `#39030`_: (*rallytime*) Back-port `#38972`_ to 2016.3 - - **PR** `#38972`_: (*rallytime*) Add CLI Example for rest_sample_utils.get_test_string function - | refs: `#39030`_ + * 8b8ab8ef8e Merge pull request `#39362`_ from dincamihai/cp-push-test-2016.3 -* f13fb9e Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ availability in proxies. (`#38899`_) + * 91383c5a19 Add cp.push test - - **ISSUE** `#38753`_: (*alexbleotu*) `__proxy__` dunder is not injected when invoking the `salt` variable in sls files - | refs: `#38899`_ `#38829`_ - - **ISSUE** `#38557`_: (*alexbleotu*) Proxy not working on develop - | refs: `#38829`_ - - **ISSUE** `#38265`_: (*mirceaulinic*) `__utils__` object not available in proxy module - | refs: `#38899`_ `#38829`_ `#38829`_ - - **ISSUE** `#32918`_: (*mirceaulinic*) Proxy minions reconnection - | refs: `#38829`_ - - **PR** `#38899`_: (*cro*) Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ for proxies. - - **PR** `#38829`_: (*cro*) MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic - | refs: `#38899`_ - - **PR** `#37864`_: (*mirceaulinic*) Proxy keepalive feature - | refs: `#38829`_ +* **PR** `#39380`_: (`joe-niland`_) Quote numeric user names so pwd.getpwnam handles them properly + @ *2017-02-14 18:33:33 UTC* -- **PR** `#38951`_: (*DmitryKuzmenko*) Keep the only one record per module-function in depends decorator. - @ *2017-01-27T17:05:42Z* + * 4b726f955b Merge pull request `#39380`_ from joe-niland/quote-numeric-usernames - - **ISSUE** `#37938`_: (*johje349*) Memory leak in Reactor - | refs: `#38951`_ - - **ISSUE** `#33890`_: (*hvnsweeting*) salt memleak when running state.sls - | refs: `#38951`_ - * da96221 Merge pull request `#38951`_ from DSRCorporation/bugs/37938_fix_depends_decorator_memleak - * 0b18f34 Keep the only one record per module-function in depends decorator. + * c2edfdd464 Quote numeric user names so pwd.getpwnam handles them properly -- **PR** `#38982`_: (*rallytime*) Set response when using "GET" method in s3 utils - @ *2017-01-27T17:04:48Z* +* **PR** `#39400`_: (`meaksh`_) Prevents 'OSError' exception in case certain job cache path doesn't exist + @ *2017-02-14 18:27:04 UTC* - - **ISSUE** `#34780`_: (*joehoyle*) S3fs broken in 2016.3.1 - | refs: `#38982`_ - * 85165ed Merge pull request `#38982`_ from rallytime/`fix-34780`_ - * 1583c55 Set response when using "GET" method in s3 utils + * 1116d32df9 Merge pull request `#39400`_ from meaksh/2016.3-fix-local-cache-issue -- **PR** `#38989`_: (*anlutro*) Documentation: fix SLS in environment variable examples - @ *2017-01-27T17:00:08Z* + * e7e559ef5c Prevents 'OSError' exception in case path doesn't exist - * cfdbc99 Merge pull request `#38989`_ from alprs/docfix-state_pt3_environ - * 52a9ad1 fix SLS in environment variable examples +* **PR** `#39300`_: (`terminalmage`_) Replace more usage of str.format in the loader + @ *2017-02-13 19:01:19 UTC* -- **PR** `#39000`_: (*rallytime*) Skip the test_badload test until Jenkins move is complete - @ *2017-01-27T16:58:21Z* + * **PR** `#39227`_: (`terminalmage`_) Loader optimzation (refs: `#39300`_) - * 55e4d25 Merge pull request `#39000`_ from rallytime/skip-badload-test - * 4b3ff0f Skip the test_badload test until Jenkins move is complete + * 6c854da1d4 Merge pull request `#39300`_ from terminalmage/loader-optimization -- **PR** `#38995`_: (*terminalmage*) Fix pillar.item docstring - @ *2017-01-27T16:58:00Z* + * d3e5d1525e Replace more usage of str.format in the loader - * fe054eb Merge pull request `#38995`_ from terminalmage/fix-pillar.item-docstring - * 06d094d Fix pillar.item docstring +* **PR** `#39337`_: (`terminalmage`_) Don't re-walk the roots fileserver in symlink_list() (refs: `#39409`_) + @ *2017-02-13 18:41:17 UTC* -- **PR** `#38950`_: (*mbom2004*) Fixed Logstash Engine in file logstash.py - @ *2017-01-26T19:10:07Z* + * 5286b5ff1b Merge pull request `#39337`_ from terminalmage/issue34428 - - **ISSUE** `#34551`_: (*mbom2004*) salt.engines.logstash not loading - | refs: `#38950`_ - * b66b6f6 Merge pull request `#38950`_ from mbom2004/2016.3 - * c09f39d Remove unused json import + * a7d2135dc2 Don't re-walk the roots fileserver in symlink_list() - * 249efa3 Fixed Logstash Engine in file logstash.py +* **PR** `#39339`_: (`cro`_) Add link to external pillar documentation for clarification. + @ *2017-02-13 18:40:13 UTC* -* a6c6e47 Handle changing "is_default" value in moto package for boto test mock (`#38973`_) + * ce781deeb5 Merge pull request `#39339`_ from cro/pillar_filetree_doc - - **PR** `#38973`_: (*rallytime*) Handle changing "is_default" value in moto package for boto test mock + * 410810cea2 Clarification on external pillar usage. -- **PR** `#38952`_: (*terminalmage*) Make the ext_pillars available to pillar.ext tunable - @ *2017-01-26T19:01:56Z* + * **PR** `#39316`_: (`terminalmage`_) Document the upstream RedHat bug with their pygit2 package - * b965b5d Merge pull request `#38952`_ from terminalmage/zd1168 - * 6b014e5 Rename on_demand_pillar to on_demand_ext_pillar +* **PR** `#39313`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2017-02-10 16:23:23 UTC* - * d216f90 Document new on_demand_pillar option and add to config template + * 9de559ff4e Merge pull request `#39313`_ from rallytime/merge-2016.3 - * 426b20f Add documentation for on-demand pillar to pillar.ext docstring + * 0b8dddf12b Merge branch '2015.8' into '2016.3' - * 7b10274 Make on-demand ext_pillars tunable + * fc551bcf5d Merge pull request `#39293`_ from sergeizv/grammar-fix - * d54723c Add on_demand_pillar config option + * 70f2b586d3 Rewrap paragraph -- **PR** `#38948`_: (*rallytime*) Bump the template context deprecation version to Oxygen - @ *2017-01-25T19:45:59Z* + * e6ab5178ea Grammar fix - - **ISSUE** `#35777`_: (*rallytime*) Properly deprecate template context data in Oxygen - | refs: `#38948`_ - * 2c4ad85 Merge pull request `#38948`_ from rallytime/bump-template-context-deprecation - * 749e003 Bump the template context deprecation version to Oxygen + * 8a1b45632a Merge pull request `#39295`_ from sergeizv/typo-fix -- **PR** `#38946`_: (*rallytime*) Back-port `#37632`_ to 2016.3 - @ *2017-01-25T19:40:40Z* + * 5d9f36d58d Fix typo - - **PR** `#37632`_: (*twangboy*) Fix versions report for Windows Server platforms - | refs: `#38946`_ - * e4514ca Merge pull request `#38946`_ from rallytime/`bp-37632`_ - * ee37cda Fix some lint + * cfaafece34 Merge pull request `#39296`_ from sergeizv/whitespace-fix - * c08071e Fix versions report for server OSs + * 1d4c1dc140 Whitespace fix in docs Makefile -- **PR** `#38913`_: (*Adaephon-GH*) Ignore plist files without Label key - @ *2017-01-25T19:07:27Z* + * 0b4dcf4a47 Merge pull request `#39294`_ from sergeizv/fix-link - * 953a203 Merge pull request `#38913`_ from Adaephon-GH/patch-1 - * e2f4a16 Removing trailing whitespace + * 04bde6eed2 Fix link in proxyminion guide - * 616292c Ignore plist files without Label key +* **ISSUE** `#38595`_: (`yue9944882`_) Redis ext job cache occurred error (refs: `#38610`_) -- **PR** `#38917`_: (*twangboy*) Update Jinja2 to 2.9.4 - @ *2017-01-25T19:05:38Z* + * **PR** `#39299`_: (`rallytime`_) Back-port `#38610`_ to 2016.3 - * 826dce1 Merge pull request `#38917`_ from twangboy/update_jinja_mac - * 62e608b Update Jinja2 to 2.9.4 + * **PR** `#38610`_: (`yue9944882`_) Fix `#38595`_ - Unexpected error log from redis retuner in master's log (refs: `#39299`_) -- **PR** `#38925`_: (*terminalmage*) Fix two wheel issues in netapi - @ *2017-01-25T18:28:52Z* +* **PR** `#39297`_: (`cro`_) Add doc to recommend pgjsonb for master job caches + @ *2017-02-09 22:49:59 UTC* - - **ISSUE** `#38540`_: (*amendlik*) API wheel client throws exception and success=true - | refs: `#38925`_ - - **ISSUE** `#38537`_: (*amendlik*) API client wheel_async always returns status 500 - | refs: `#38925`_ - * b27733c Merge pull request `#38925`_ from terminalmage/issue38540 - * 76392fc Fix traceback when a netapi module uses wheel_async + * f16027d30e Merge pull request `#39297`_ from cro/pg_returner_docs - * bd4474f Fix 'success' value for wheel commands + * 28bac649ae Typo -- **PR** `#38926`_: (*gtmanfred*) add note about pysss for pam eauth - @ *2017-01-25T18:12:20Z* + * 19fedcdd23 Add doc to recommend pgjsonb for master job caches - * 618596f Merge pull request `#38926`_ from gtmanfred/2016.3 - * 9cae953 add note about pysss for pam eauth +* **PR** `#39286`_: (`terminalmage`_) Allow minion/CLI saltenv/pillarenv to override master when compiling pillar + @ *2017-02-09 21:22:46 UTC* -- **PR** `#38847`_: (*terminalmage*) Catch MinionError in file.source_list - @ *2017-01-24T16:03:10Z* + * 77e50ed8b7 Merge pull request `#39286`_ from terminalmage/fix-pillarenv-precedence - - **ISSUE** `#38825`_: (*IshMalik*) file.managed multiple sources for redundency failure - | refs: `#38847`_ - * 405d86a Merge pull request `#38847`_ from terminalmage/issue38825 - * 11a4780 Use log.exception() instead + * 3cb9833e57 Allow minion/CLI saltenv/pillarenv to override master when compiling pillar - * e40fac5 Catch MinionError in file.source_list +* **ISSUE** `#39220`_: (`lvg01`_) state file.line skips leading spaces in content with mode:ensure and indent:False (refs: `#39221`_) -- **PR** `#38875`_: (*terminalmage*) Reactor: fix traceback when salt:// path is nonexistent - @ *2017-01-24T15:23:39Z* +* **PR** `#39221`_: (`lvg01`_) Fix bug 39220 + @ *2017-02-09 18:12:29 UTC* - - **ISSUE** `#36121`_: (*Ashald*) TemplateNotFound/Unable to cache file - | refs: `#38875`_ - * b5df104 Merge pull request `#38875`_ from terminalmage/issue36121 - * fbc4d2a reactor: ensure glob_ref is a string + * 52440416ca Merge pull request `#39221`_ from lvg01/fix-bug-39220 - * 2e443d7 cp.cache_file: add note re: return for nonexistent salt:// path + * e8a41d6341 Removes to early content stripping (stripping is allready done when needed with ident:true), fixes `#39220`_ -- **PR** `#38890`_: (*cro*) Backport `#38887`_ to 2016.3: Enable resetting a VM via salt-cloud & VMware driver - @ *2017-01-24T15:15:35Z* + * a4b169e0bd Fixed wrong logic, fixes `#39220`_ - - **ISSUE** `#37413`_: (*Snarfingcode666*) Salt-cloud vmware missing reboot command - | refs: `#38890`_ - * e9ebec4 Merge pull request `#38890`_ from cro/vmware_reset_vm_20163 - * 0146562 Call correct function for resetting a VM +* **ISSUE** `#36913`_: (`terminalmage`_) Support custom refspecs in GitFS (refs: `#39210`_) -- **PR** `#38883`_: (*techhat*) Don't require text_out path to exist - @ *2017-01-23T18:20:42Z* + * **PR** `#39280`_: (`terminalmage`_) Add warning for Dulwich removal - - **PR** `#38867`_: (*mchugh19*) Touch deploy.sh before use - | refs: `#38883`_ - - **PR** `#32026`_: (*techhat*) Don't require the decode_out file to already exist - | refs: `#38883`_ - * c3fbfcd Merge pull request `#38883`_ from techhat/dontrequire - * 67bc4d6 Don't require text_out path to exist + * **PR** `#39210`_: (`terminalmage`_) salt.utils.gitfs: remove dulwich support, make refspecs configurable (refs: `#39280`_) -- **PR** `#38851`_: (*terminalmage*) Support docker-py 2.0 in dockerng - @ *2017-01-23T16:48:12Z* + * **PR** `#39260`_: (`terminalmage`_) Update jsonschema tests to reflect change in jsonschema 2.6.0 - * 6430a45 Merge pull request `#38851`_ from terminalmage/docker-py-2.0 - * 3c061b2 Support docker-py 2.0 in dockerng +* **ISSUE** `saltstack/salt#33536`_: (`murzick`_) pkgrepo.managed does not disable a yum repo with "disabled: True" (refs: `#35055`_) -- **PR** `#38844`_: (*cachedout*) Fix memory leak in HTTP client - @ *2017-01-20T20:59:14Z* +* **ISSUE** `#33536`_: (`murzick`_) pkgrepo.managed does not disable a yum repo with "disabled: True" (refs: `#35055`_) - * ac8008d Merge pull request `#38844`_ from cachedout/http_memory_leak - * c46bf85 Fix memory leak in HTTP client + * **PR** `#39251`_: (`terminalmage`_) Better handling of enabled/disabled arguments in pkgrepo.managed -- **PR** `#38823`_: (*gtmanfred*) pass pillar to compound matcher in match module - @ *2017-01-20T19:19:09Z* + * **PR** `#35055`_: (`galet`_) `#33536`_ pkgrepo.managed does not disable a yum repo with "disabled: True" (refs: `#39251`_) - - **ISSUE** `#38798`_: (*ripta*) `match.compound` fails to match when pillar data is used - | refs: `#38823`_ - * dfe6dfe Merge pull request `#38823`_ from gtmanfred/2016.3 - * f0a71e8 pass pillar to compound matcher in match module +* **PR** `#39227`_: (`terminalmage`_) Loader optimzation (refs: `#39300`_) + @ *2017-02-08 19:38:21 UTC* + * 8e88f71dd9 Merge pull request `#39227`_ from terminalmage/loader-optimization + + * c750662946 Loader optimzation + +* **ISSUE** `#38856`_: (`fhaynes`_) salt-cloud throws an exception when ec2 does not return encoding (refs: `#39228`_) + +* **PR** `#39228`_: (`gtmanfred`_) default to utf8 encoding if not specified + @ *2017-02-08 19:36:57 UTC* + + * bc89b297f8 Merge pull request `#39228`_ from gtmanfred/2016.3 + + * afee047b08 default to utf8 encoding if not specified + +* **PR** `#39231`_: (`terminalmage`_) Add clarification for jenkins execution module + @ *2017-02-08 19:34:45 UTC* + + * d9b0671dbd Merge pull request `#39231`_ from terminalmage/clarify-jenkins-depends + + * ad1b1255f2 Add clarification for jenkins execution module + +* **PR** `#39232`_: (`terminalmage`_) Avoid recursion in s3/svn ext_pillars + @ *2017-02-08 19:33:28 UTC* + + * ddcff89a84 Merge pull request `#39232`_ from terminalmage/issue21342 + + * c88896c277 Avoid recursion in s3/svn ext_pillars + +* **ISSUE** `#38697`_: (`fboismenu`_) On Windows, ip.get_all_interfaces returns at most 2 DNS/WINS Servers (refs: `#38793`_) + + * **PR** `#39230`_: (`rallytime`_) Fix the win_ip_test failures + + * **PR** `#38793`_: (`fboismenu`_) Fix for `#38697`_ (refs: `#39197`_, `#39230`_) + +* **ISSUE** `#33187`_: (`usbportnoy`_) Deploy to jboss TypeError at boss7.py:469 (refs: `#39761`_, `#39170`_) + +* **PR** `#39199`_: (`rallytime`_) Back-port `#39170`_ to 2016.3 + @ *2017-02-07 16:19:32 UTC* + + * **PR** `#39170`_: (`grep4linux`_) Added missing source_hash_name argument in get_managed function (refs: `#39199`_) + + * df5f934c34 Merge pull request `#39199`_ from rallytime/bp-39170 + + * c129905310 Added missing source_hash_name argument in get_managed function Additional fix to `#33187`_ Customer was still seeing errors, this should now work. Tested with 2015.8.13 and 2016.11.2 + +* **ISSUE** `#37174`_: (`mikeadamz`_) The State execution failed to record the order in which all states were executed spam while running pkg.upgrade from orchestration runner (refs: `#39206`_) + +* **PR** `#39206`_: (`cachedout`_) Ignore empty dicts in highstate outputter + @ *2017-02-07 16:11:36 UTC* + + * 2621c119fd Merge pull request `#39206`_ from cachedout/issue_issue_37174 + + * be31e0559c Ignore empty dicts in highstate outputter + +* **PR** `#39209`_: (`terminalmage`_) Sort the return list from the fileserver.envs runner + @ *2017-02-07 16:07:08 UTC* + + * dd440452ea Merge pull request `#39209`_ from terminalmage/sorted-envs + + * e6dda4a625 Sort the return list from the fileserver.envs runner + + * **PR** `#39202`_: (`rallytime`_) [2016.3] Pylint fix + +* **ISSUE** `#38697`_: (`fboismenu`_) On Windows, ip.get_all_interfaces returns at most 2 DNS/WINS Servers (refs: `#38793`_) + +* **PR** `#39197`_: (`cachedout`_) Pr 38793 + @ *2017-02-06 19:23:12 UTC* + + * **PR** `#38793`_: (`fboismenu`_) Fix for `#38697`_ (refs: `#39197`_, `#39230`_) + + * ab76054127 Merge pull request `#39197`_ from cachedout/pr-38793 + + * f3d35fb5c6 Lint fixes + + * 624f25b78d Fix for `#38697`_ + +* **PR** `#39166`_: (`Ch3LL`_) fix boto ec2 module create_image doc + @ *2017-02-06 18:27:17 UTC* + + * fa45cbc359 Merge pull request `#39166`_ from Ch3LL/fix_boto_ec2_docs + + * 90af696331 fix boto ec2 module create_image doc + +* **PR** `#39173`_: (`rallytime`_) Restore "Salt Community" doc section + @ *2017-02-06 18:19:11 UTC* + + * **PR** `#30770`_: (`jacobhammons`_) Doc restructuring, organization, and cleanup (refs: `#39173`_) + + * **PR** `#10792`_: (`cachedout`_) Documentation overhaul (refs: `#39173`_) + + * a40cb46249 Merge pull request `#39173`_ from rallytime/restore-community-docs + + * 5aeddf42a0 Restore "Salt Community" doc section + +* **ISSUE** `#38704`_: (`nasenbaer13`_) Archive extracted fails when another state run is queued (refs: `#38705`_) + + * **PR** `#39077`_: (`terminalmage`_) Apply fix from `#38705`_ to 2016.3 branch + + * **PR** `#38705`_: (`nasenbaer13`_) Fix for `#38704`_ archive extracted and dockerio states (refs: `#39077`_) + + * **PR** `#39146`_: (`gtmanfred`_) update vmware getting started doc + + * **PR** `#39145`_: (`garethgreenaway`_) [2016.3] Fix when targeting via pillar with Salt syndic + +* **PR** `#38804`_: (`alexbleotu`_) Second attempt to fix prepending of root_dir to paths + @ *2017-02-02 16:10:37 UTC* + + * cd8077ab81 Merge pull request `#38804`_ from alexbleotu/root_dir_fix-2016.3-gh + + * b3bdd3b04a Add missing whiteline + + * c7715acd53 Merge pull request `#3`_ from cro/ab_rootdirfix + + * e8cbafaaf1 When running testsuite, salt.syspaths.ROOT_DIR is often empty. + + * b12dd44a26 Merge pull request `#1`_ from cro/ab_rootdirfix + + * bffc537aca Remove extra if statements (rstrip will check for the presence anyway). + + * 97521b3468 Second attempt to fix prepending of root_dir to paths + +* **ISSUE** `#39118`_: (`bobrik`_) Minion ipv6 option is not documented (refs: `#39289`_, `#39131`_) + + * **PR** `#39131`_: (`bobrik`_) Clarify ipv6 option for minion and inteface for master, closes `#39118`_ + + * **PR** `#39116`_: (`terminalmage`_) Don't abort pillar.get with merge=True if default is None + +* **PR** `#39091`_: (`terminalmage`_) Run test_valid_docs in batches + @ *2017-02-01 19:09:05 UTC* + + * cc9b69b6bc Merge pull request `#39091`_ from terminalmage/update-test-valid-docs + + * d76f0380d0 add debug logging for batch vars + + * b4afea2a25 Don't fail test if data is empty + + * b3a5d549c1 Account for trimmed value in 'salt -d' output + + * 909916c78e Run test_valid_docs in batches + + * **PR** `#39081`_: (`terminalmage`_) Move fileclient tests to tests/integration/fileserver/fileclient_test.py + + * **PR** `#39067`_: (`rallytime`_) Bump openstack deprecation notice to Oxygen + +* **PR** `#39047`_: (`rallytime`_) [2016.3] Merge forward from 2015.8 to 2016.3 + @ *2017-01-30 23:48:14 UTC* + + * a24af5ac46 Merge pull request `#39047`_ from rallytime/merge-2016.3 + + * b732a1f646 Merge branch '2015.8' into '2016.3' + + * 56ccae6ff7 Add 2015.8.14 release notes file (`#39046`_) + + * 5943fe65d3 Update 2015.8.13 release notes (`#39037`_) + + * **PR** `#39045`_: (`rallytime`_) Add 2016.3.6 release notes file + + * **PR** `#39042`_: (`rallytime`_) [2016.3] Update release numbers for doc build + + * **PR** `#39038`_: (`rallytime`_) Update 2016.3.5 release notes + +* **PR** `#39028`_: (`terminalmage`_) Clarify delimiter argument + @ *2017-01-30 18:20:26 UTC* + + * 5b09dc4198 Merge pull request `#39028`_ from terminalmage/clarify-delimiter-argument + + * f29ef071f3 Clarify delimiter argument + + * **PR** `#39030`_: (`rallytime`_) Back-port `#38972`_ to 2016.3 + + * **PR** `#38972`_: (`rallytime`_) Add CLI Example for rest_sample_utils.get_test_string function (refs: `#39030`_) + +* **ISSUE** `#38753`_: (`alexbleotu`_) `__proxy__` dunder is not injected when invoking the `salt` variable in sls files (refs: `#38899`_, `#38829`_) + +* **ISSUE** `#38557`_: (`alexbleotu`_) Proxy not working on develop (refs: `#38829`_) + +* **ISSUE** `#38265`_: (`mirceaulinic`_) `__utils__` object not available in proxy module (refs: `#38899`_, `#38829`_) + +* **ISSUE** `#32918`_: (`mirceaulinic`_) Proxy minions reconnection (refs: `#38829`_) + + * **PR** `#38899`_: (`cro`_) Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ for proxies. + + * **PR** `#38829`_: (`cro`_) MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic (refs: `#38899`_) + + * **PR** `#37864`_: (`mirceaulinic`_) Proxy keepalive feature (refs: `#38829`_) + +* **ISSUE** `#37938`_: (`johje349`_) Memory leak in Reactor (refs: `#38951`_) + +* **ISSUE** `#33890`_: (`hvnsweeting`_) salt memleak when running state.sls (refs: `#38951`_) + +* **PR** `#38951`_: (`DmitryKuzmenko`_) Keep the only one record per module-function in depends decorator. + @ *2017-01-27 17:05:42 UTC* + + * da96221741 Merge pull request `#38951`_ from DSRCorporation/bugs/37938_fix_depends_decorator_memleak + + * 0b18f34678 Keep the only one record per module-function in depends decorator. + +* **ISSUE** `#34780`_: (`joehoyle`_) S3fs broken in 2016.3.1 (refs: `#38982`_) + +* **PR** `#38982`_: (`rallytime`_) Set response when using "GET" method in s3 utils + @ *2017-01-27 17:04:48 UTC* + + * 85165edb70 Merge pull request `#38982`_ from rallytime/fix-34780 + + * 1583c5579a Set response when using "GET" method in s3 utils + +* **PR** `#38989`_: (`anlutro`_) Documentation: fix SLS in environment variable examples + @ *2017-01-27 17:00:08 UTC* + + * cfdbc99e12 Merge pull request `#38989`_ from alprs/docfix-state_pt3_environ + + * 52a9ad1c60 fix SLS in environment variable examples + +* **PR** `#39000`_: (`rallytime`_) Skip the test_badload test until Jenkins move is complete + @ *2017-01-27 16:58:21 UTC* + + * 55e4d2572e Merge pull request `#39000`_ from rallytime/skip-badload-test + + * 4b3ff0fe0f Skip the test_badload test until Jenkins move is complete + +* **PR** `#38995`_: (`terminalmage`_) Fix pillar.item docstring + @ *2017-01-27 16:58:00 UTC* + + * fe054eb772 Merge pull request `#38995`_ from terminalmage/fix-pillar.item-docstring + + * 06d094dd8f Fix pillar.item docstring + +* **ISSUE** `#34551`_: (`mbom2004`_) salt.engines.logstash not loading (refs: `#38950`_) + +* **PR** `#38950`_: (`mbom2004`_) Fixed Logstash Engine in file logstash.py + @ *2017-01-26 19:10:07 UTC* + + * b66b6f6423 Merge pull request `#38950`_ from mbom2004/2016.3 + + * c09f39d6c9 Remove unused json import + + * 249efa3068 Fixed Logstash Engine in file logstash.py + + * **PR** `#38973`_: (`rallytime`_) Handle changing "is_default" value in moto package for boto test mock + +* **PR** `#38952`_: (`terminalmage`_) Make the ext_pillars available to pillar.ext tunable + @ *2017-01-26 19:01:56 UTC* + + * b965b5dcc2 Merge pull request `#38952`_ from terminalmage/zd1168 + + * 6b014e53fc Rename on_demand_pillar to on_demand_ext_pillar + + * d216f90c63 Document new on_demand_pillar option and add to config template + + * 426b20f02f Add documentation for on-demand pillar to pillar.ext docstring + + * 7b10274b6b Make on-demand ext_pillars tunable + + * d54723ccae Add on_demand_pillar config option + +* **ISSUE** `#35777`_: (`rallytime`_) Properly deprecate template context data in Fluorine (refs: `#38948`_) + +* **PR** `#38948`_: (`rallytime`_) Bump the template context deprecation version to Oxygen + @ *2017-01-25 19:45:59 UTC* + + * 2c4ad85a78 Merge pull request `#38948`_ from rallytime/bump-template-context-deprecation + + * 749e0031d7 Bump the template context deprecation version to Oxygen + +* **PR** `#38946`_: (`rallytime`_) Back-port `#37632`_ to 2016.3 + @ *2017-01-25 19:40:40 UTC* + + * **PR** `#37632`_: (`twangboy`_) Fix versions report for Windows Server platforms (refs: `#38946`_) + + * e4514ca7d8 Merge pull request `#38946`_ from rallytime/bp-37632 + + * ee37cdace9 Fix some lint + + * c08071e182 Fix versions report for server OSs + +* **PR** `#38913`_: (`Adaephon-GH`_) Ignore plist files without Label key + @ *2017-01-25 19:07:27 UTC* + + * 953a20350a Merge pull request `#38913`_ from Adaephon-GH/patch-1 + + * e2f4a16fdd Removing trailing whitespace + + * 616292c6b1 Ignore plist files without Label key + +* **PR** `#38917`_: (`twangboy`_) Update Jinja2 to 2.9.4 + @ *2017-01-25 19:05:38 UTC* + + * 826dce1059 Merge pull request `#38917`_ from twangboy/update_jinja_mac + + * 62e608b627 Update Jinja2 to 2.9.4 + +* **ISSUE** `#38540`_: (`amendlik`_) API wheel client throws exception and success=true (refs: `#38925`_) + +* **ISSUE** `#38537`_: (`amendlik`_) API client wheel_async always returns status 500 (refs: `#38925`_) + +* **PR** `#38925`_: (`terminalmage`_) Fix two wheel issues in netapi + @ *2017-01-25 18:28:52 UTC* + + * b27733cc33 Merge pull request `#38925`_ from terminalmage/issue38540 + + * 76392fc6ad Fix traceback when a netapi module uses wheel_async + + * bd4474fa62 Fix 'success' value for wheel commands + +* **PR** `#38926`_: (`gtmanfred`_) add note about pysss for pam eauth + @ *2017-01-25 18:12:20 UTC* + + * 618596f0cc Merge pull request `#38926`_ from gtmanfred/2016.3 + + * 9cae953c93 add note about pysss for pam eauth + +* **ISSUE** `#38825`_: (`IshMalik`_) file.managed multiple sources for redundency failure (refs: `#38847`_) + +* **PR** `#38847`_: (`terminalmage`_) Catch MinionError in file.source_list + @ *2017-01-24 16:03:10 UTC* + + * 405d86a2ca Merge pull request `#38847`_ from terminalmage/issue38825 + + * 11a47803ce Use log.exception() instead + + * e40fac589a Catch MinionError in file.source_list + +* **ISSUE** `#36121`_: (`Ashald`_) TemplateNotFound/Unable to cache file (refs: `#38875`_) + +* **PR** `#38875`_: (`terminalmage`_) Reactor: fix traceback when salt:// path is nonexistant + @ *2017-01-24 15:23:39 UTC* + + * b5df104fc2 Merge pull request `#38875`_ from terminalmage/issue36121 + + * fbc4d2a2c4 reactor: ensure glob_ref is a string + + * 2e443d79a3 cp.cache_file: add note re: return for nonexistant salt:// path + +* **ISSUE** `#37413`_: (`Snarfingcode666`_) Salt-cloud vmware missing reboot command (refs: `#38887`_, `#38890`_) + +* **PR** `#38890`_: (`cro`_) Backport `#38887`_ to 2016.3: Enable resetting a VM via salt-cloud & VMware driver + @ *2017-01-24 15:15:35 UTC* + + * **PR** `#38887`_: (`cro`_) Enable resetting a VM via salt-cloud & VMware driver (refs: `#38890`_) + + * e9ebec4d80 Merge pull request `#38890`_ from cro/vmware_reset_vm_20163 + + * 0146562fb4 Call correct function for resetting a VM + +* **PR** `#38883`_: (`techhat`_) Don't require text_out path to exist + @ *2017-01-23 18:20:42 UTC* + + * **PR** `#38867`_: (`mchugh19`_) Touch deploy.sh before use (refs: `#38883`_) + + * **PR** `#32026`_: (`techhat`_) Don't require the decode_out file to already exist (refs: `#38883`_) + + * c3fbfcd231 Merge pull request `#38883`_ from techhat/dontrequire + + * 67bc4d6687 Don't require text_out path to exist + +* **PR** `#38851`_: (`terminalmage`_) Support docker-py 2.0 in dockerng + @ *2017-01-23 16:48:12 UTC* + + * 6430a45196 Merge pull request `#38851`_ from terminalmage/docker-py-2.0 + + * 3c061b21fe Support docker-py 2.0 in dockerng + +* **PR** `#38844`_: (`cachedout`_) Fix memory leak in HTTP client + @ *2017-01-20 20:59:14 UTC* + + * ac8008d843 Merge pull request `#38844`_ from cachedout/http_memory_leak + + * c46bf85518 Fix memory leak in HTTP client + +* **ISSUE** `#38798`_: (`ripta`_) `match.compound` fails to match when pillar data is used (refs: `#38823`_) + +* **PR** `#38823`_: (`gtmanfred`_) pass pillar to compound matcher in match module + @ *2017-01-20 19:19:09 UTC* + + * dfe6dfe963 Merge pull request `#38823`_ from gtmanfred/2016.3 + + * f0a71e8707 pass pillar to compound matcher in match module -.. _`#1`: https://github.com/saltstack/salt/issues/1 .. _`#10792`: https://github.com/saltstack/salt/pull/10792 -.. _`#2016`: https://github.com/saltstack/salt/issues/2016 +.. _`#1`: https://github.com/saltstack/salt/issues/1 .. _`#22080`: https://github.com/saltstack/salt/issues/22080 .. _`#25021`: https://github.com/saltstack/salt/pull/25021 -.. _`#3`: https://github.com/saltstack/salt/issues/3 .. _`#30770`: https://github.com/saltstack/salt/pull/30770 .. _`#30802`: https://github.com/saltstack/salt/issues/30802 .. _`#32026`: https://github.com/saltstack/salt/pull/32026 @@ -1116,7 +1187,7 @@ CVE-2017-7893: Compromised salt-minions can impersonate the salt-master. (Discov .. _`#38867`: https://github.com/saltstack/salt/pull/38867 .. _`#38875`: https://github.com/saltstack/salt/pull/38875 .. _`#38883`: https://github.com/saltstack/salt/pull/38883 -.. _`#38887`: https://github.com/saltstack/salt/issues/38887 +.. _`#38887`: https://github.com/saltstack/salt/pull/38887 .. _`#38890`: https://github.com/saltstack/salt/pull/38890 .. _`#38899`: https://github.com/saltstack/salt/pull/38899 .. _`#38913`: https://github.com/saltstack/salt/pull/38913 @@ -1200,10 +1271,11 @@ CVE-2017-7893: Compromised salt-minions can impersonate the salt-master. (Discov .. _`#39426`: https://github.com/saltstack/salt/pull/39426 .. _`#39431`: https://github.com/saltstack/salt/pull/39431 .. _`#39444`: https://github.com/saltstack/salt/issues/39444 +.. _`#39447`: https://github.com/saltstack/salt/issues/39447 .. _`#39460`: https://github.com/saltstack/salt/pull/39460 .. _`#39464`: https://github.com/saltstack/salt/pull/39464 .. _`#39482`: https://github.com/saltstack/salt/issues/39482 -.. _`#39483`: https://github.com/saltstack/salt/issues/39483 +.. _`#39483`: https://github.com/saltstack/salt/pull/39483 .. _`#39487`: https://github.com/saltstack/salt/pull/39487 .. _`#39497`: https://github.com/saltstack/salt/pull/39497 .. _`#39498`: https://github.com/saltstack/salt/pull/39498 @@ -1248,6 +1320,7 @@ CVE-2017-7893: Compromised salt-minions can impersonate the salt-master. (Discov .. _`#39988`: https://github.com/saltstack/salt/pull/39988 .. _`#39994`: https://github.com/saltstack/salt/pull/39994 .. _`#39995`: https://github.com/saltstack/salt/issues/39995 +.. _`#3`: https://github.com/saltstack/salt/issues/3 .. _`#40011`: https://github.com/saltstack/salt/issues/40011 .. _`#40016`: https://github.com/saltstack/salt/pull/40016 .. _`#40018`: https://github.com/saltstack/salt/pull/40018 @@ -1275,13 +1348,71 @@ CVE-2017-7893: Compromised salt-minions can impersonate the salt-master. (Discov .. _`#40203`: https://github.com/saltstack/salt/issues/40203 .. _`#40206`: https://github.com/saltstack/salt/pull/40206 .. _`#40221`: https://github.com/saltstack/salt/pull/40221 -.. _`bp-37632`: https://github.com/saltstack/salt/pull/37632 -.. _`bp-39170`: https://github.com/saltstack/salt/pull/39170 -.. _`bp-39179`: https://github.com/saltstack/salt/pull/39179 -.. _`bp-40056`: https://github.com/saltstack/salt/pull/40056 -.. _`bp-40117`: https://github.com/saltstack/salt/pull/40117 -.. _`fix-2016`: https://github.com/saltstack/salt/issues/2016 -.. _`fix-34780`: https://github.com/saltstack/salt/issues/34780 -.. _`fix-38762`: https://github.com/saltstack/salt/issues/38762 -.. _`fix-39304`: https://github.com/saltstack/salt/issues/39304 -.. _`fix-39782`: https://github.com/saltstack/salt/issues/39782 +.. _`#40232`: https://github.com/saltstack/salt/pull/40232 +.. _`Adaephon-GH`: https://github.com/Adaephon-GH +.. _`Ashald`: https://github.com/Ashald +.. _`Auha`: https://github.com/Auha +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`Foxlik`: https://github.com/Foxlik +.. _`GevatterGaul`: https://github.com/GevatterGaul +.. _`GideonRed-zz`: https://github.com/GideonRed-zz +.. _`IshMalik`: https://github.com/IshMalik +.. _`Snarfingcode666`: https://github.com/Snarfingcode666 +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`UtahDave`: https://github.com/UtahDave +.. _`alexbleotu`: https://github.com/alexbleotu +.. _`amendlik`: https://github.com/amendlik +.. _`anlutro`: https://github.com/anlutro +.. _`blueyed`: https://github.com/blueyed +.. _`bobrik`: https://github.com/bobrik +.. _`cachedout`: https://github.com/cachedout +.. _`clem-compilatio`: https://github.com/clem-compilatio +.. _`cro`: https://github.com/cro +.. _`dincamihai`: https://github.com/dincamihai +.. _`drawsmcgraw`: https://github.com/drawsmcgraw +.. _`fboismenu`: https://github.com/fboismenu +.. _`fhaynes`: https://github.com/fhaynes +.. _`frogunder`: https://github.com/frogunder +.. _`galet`: https://github.com/galet +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`githubcdr`: https://github.com/githubcdr +.. _`grep4linux`: https://github.com/grep4linux +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`hvnsweeting`: https://github.com/hvnsweeting +.. _`jacobhammons`: https://github.com/jacobhammons +.. _`jagguli`: https://github.com/jagguli +.. _`jfindlay`: https://github.com/jfindlay +.. _`joe-niland`: https://github.com/joe-niland +.. _`joehoyle`: https://github.com/joehoyle +.. _`johje349`: https://github.com/johje349 +.. _`kjelle`: https://github.com/kjelle +.. _`lvg01`: https://github.com/lvg01 +.. _`mbom2004`: https://github.com/mbom2004 +.. _`mcalmer`: https://github.com/mcalmer +.. _`mchugh19`: https://github.com/mchugh19 +.. _`meaksh`: https://github.com/meaksh +.. _`mikeadamz`: https://github.com/mikeadamz +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`morganwillcock`: https://github.com/morganwillcock +.. _`murzick`: https://github.com/murzick +.. _`narendraingale2`: https://github.com/narendraingale2 +.. _`nasenbaer13`: https://github.com/nasenbaer13 +.. _`ni3mm4nd`: https://github.com/ni3mm4nd +.. _`oogali`: https://github.com/oogali +.. _`oz123`: https://github.com/oz123 +.. _`rallytime`: https://github.com/rallytime +.. _`ripta`: https://github.com/ripta +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack/salt#33536`: https://github.com/saltstack/salt/issues/33536 +.. _`sergeizv`: https://github.com/sergeizv +.. _`smarsching`: https://github.com/smarsching +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`tsaridas`: https://github.com/tsaridas +.. _`twangboy`: https://github.com/twangboy +.. _`usbportnoy`: https://github.com/usbportnoy +.. _`velom`: https://github.com/velom +.. _`vutny`: https://github.com/vutny +.. _`yue9944882`: https://github.com/yue9944882 diff --git a/doc/topics/releases/2016.3.7.rst b/doc/topics/releases/2016.3.7.rst index 0fca807661..22bedd283e 100644 --- a/doc/topics/releases/2016.3.7.rst +++ b/doc/topics/releases/2016.3.7.rst @@ -4,12 +4,25 @@ Salt 2016.3.7 Release Notes Version 2016.3.7 is a bugfix release for :ref:`2016.3.0 `. -Changes for v2016.3.6..v2016.3.7 --------------------------------- Security Fix ============ -CVE-2017-12791 Maliciously crafted minion IDs can cause unwanted directory traversals on the Salt-master +**CVE-2017-12791** Maliciously crafted minion IDs can cause unwanted directory +traversals on the Salt-master -Correct a flaw in minion id validation which could allow certain minions to authenticate to a master despite not having the correct credentials. To exploit the vulnerability, an attacker must create a salt-minion with an ID containing characters that will cause a directory traversal. Credit for discovering the security flaw goes to: Vernhk@qq.com +This release corrects a flaw in minion ID validation which could allow certain minions to +authenticate to a master despite not having the correct credentials. To exploit +the vulnerability, an attacker must create a salt-minion with an ID containing +characters that will cause a directory traversal. Credit for discovering the +security flaw goes to: Vernhk@qq.com + + +Changelog for v2016.3.6..v2016.3.7 +================================== + +*Generated at: 2018-05-27 14:09:17 UTC* + +* 11d176ff1b Add release notes for 2016.3.7 release + +* dc649ded51 Add clean_id function to salt.utils.verify.py diff --git a/doc/topics/releases/2016.3.8.rst b/doc/topics/releases/2016.3.8.rst index 4d729cca34..4b81d8470e 100644 --- a/doc/topics/releases/2016.3.8.rst +++ b/doc/topics/releases/2016.3.8.rst @@ -4,12 +4,27 @@ Salt 2016.3.8 Release Notes Version 2016.3.8 is a bugfix release for :ref:`2016.3.0 `. -Changes for v2016.3.7..v2016.3.8 --------------------------------- Security Fix ============ -CVE-2017-14695 Directory traversal vulnerability in minion id validation in SaltStack. Allows remote minions with incorrect credentials to authenticate to a master via a crafted minion ID. Credit for discovering the security flaw goes to: Julian Brost (julian@0x4a42.net) +**CVE-2017-14695** Directory traversal vulnerability in minion id validation in +SaltStack. Allows remote minions with incorrect credentials to authenticate to +a master via a crafted minion ID. Credit for discovering the security flaw goes +to: Julian Brost (julian@0x4a42.net) -CVE-2017-14696 Remote Denial of Service with a specially crafted authentication request. Credit for discovering the security flaw goes to: Julian Brost (julian@0x4a42.net) +**CVE-2017-14696** Remote Denial of Service with a specially crafted +authentication request. Credit for discovering the security flaw goes to: +Julian Brost (julian@0x4a42.net) + + +Changelog for v2016.3.7..v2016.3.8 +================================== + +*Generated at: 2018-05-27 14:11:36 UTC* + +* 8cf08bd7be Update 2016.3.7 Release Notes + +* 0425defe84 Do not allow IDs with null bytes in decoded payloads + +* 31b38f50eb Don't allow path separators in minion ID diff --git a/doc/topics/releases/2016.3.9.rst b/doc/topics/releases/2016.3.9.rst index 630801cbe5..1662971e50 100644 --- a/doc/topics/releases/2016.3.9.rst +++ b/doc/topics/releases/2016.3.9.rst @@ -4,26 +4,27 @@ Salt 2016.3.9 Release Notes Version 2016.3.9 is a bugfix release for :ref:`2016.3.0 `. -Changes for v2016.3.7..v2016.3.9 --------------------------------- +Master Changes +============== -New master configuration option `allow_minion_key_revoke`, defaults to True. This option -controls whether a minion can request that the master revoke its key. When True, a minion -can request a key revocation and the master will comply. If it is False, the key will not -be revoked by the msater. +The following options have been added to the master config file: -New master configuration option `require_minion_sign_messages` -This requires that minions cryptographically sign the messages they -publish to the master. If minions are not signing, then log this information -at loglevel 'INFO' and drop the message without acting on it. +- :conf_master:`allow_minion_key_revoke` - This option controls whether a + minion can request that the master revoke its key. When ``True``, a minion + can request a key revocation and the master will comply. If it is ``False``, + the key will not be revoked by the msater. -New master configuration option `drop_messages_signature_fail` -Drop messages from minions when their signatures do not validate. -Note that when this option is False but `require_minion_sign_messages` is True -minions MUST sign their messages but the validity of their signatures -is ignored. +- :conf_master:`require_minion_sign_messages` - This requires that minions + cryptographically sign the messages they publish to the master. If minions + are not signing, then log this information at loglevel ``INFO`` and drop the + message without acting on it. -New minion configuration option `minion_sign_messages` -Causes the minion to cryptographically sign the payload of messages it places -on the event bus for the master. The payloads are signed with the minion's -private key so the master can verify the signature with its public key. +- :conf_master:`drop_messages_signature_fail` - Drop messages from minions when + their signatures do not validate. Note that when this option is ``False`` but + `require_minion_sign_messages` is ``True``, minions *MUST* sign their + messages, but the validity of their signatures is ignored. + +- :conf_master:`minion_sign_messages` - Causes the minion to cryptographically + sign the payload of messages it places on the event bus for the master. The + payloads are signed with the minion's private key so the master can verify + the signature with its public key. diff --git a/doc/topics/releases/2017.7.0.rst b/doc/topics/releases/2017.7.0.rst index 85c1c9fe00..c6f67491d2 100644 --- a/doc/topics/releases/2017.7.0.rst +++ b/doc/topics/releases/2017.7.0.rst @@ -607,13 +607,14 @@ documentation for :ref:`skip_translate New SSH Cache Roster ==================== -The :mod:`SSH cache Roster ` has been rewritten from scratch to increase its usefulness. -The new roster supports all minion matchers, -so it is now possible to target minions identically through `salt` and `salt-ssh`. +The :mod:`SSH cache Roster ` has been rewritten from scratch +to increase its usefulness. The new roster supports all minion matchers, so it +is now possible to target minions identically through `salt` and `salt-ssh`. -Using the new ``roster_order`` configuration syntax it's now possible to compose a roster out of any combination -of grains, pillar and mine data and even Salt SDB URLs. -The new release is also fully IPv4 and IPv6 enabled and even has support for CIDR ranges. +Using the new ``roster_order`` configuration syntax it's now possible to +compose a roster out of any combination of grains, pillar and mine data and +even Salt SDB URLs. The new release is also fully IPv4 and IPv6 enabled and +even has support for CIDR ranges. Salt-SSH Default Options ======================== @@ -621,8 +622,8 @@ Salt-SSH Default Options Defaults for rosters can now be set, so that they don't have to be set on every entry in a roster or specified from the commandline. -The new option is :ref:`roster_defaults` and is specified in -the master config file. +The new option is :conf_master:`roster_defaults` and is specified in the master +config file: .. code-block:: yaml diff --git a/doc/topics/releases/2017.7.1.rst b/doc/topics/releases/2017.7.1.rst index 7cc616c94b..ed6a657ebb 100644 --- a/doc/topics/releases/2017.7.1.rst +++ b/doc/topics/releases/2017.7.1.rst @@ -1,58 +1,113 @@ -============================ +=========================== Salt 2017.7.1 Release Notes -============================ +=========================== Version 2017.7.1 is a bugfix release for :ref:`2017.7.0 `. + +Statistics +========== + +- Total Merges: **16** +- Total Issue References: **12** +- Total PR References: **31** + +- Contributors: **11** (`Ch3LL`_, `TiteiKo`_, `garethgreenaway`_, `gtmanfred`_, `llua`_, `rallytime`_, `seedickcode`_, `skizunov`_, `terminalmage`_, `twangboy`_, `whiteinge`_) + + Security Fix ============ -CVE-2017-12791 Maliciously crafted minion IDs can cause unwanted directory traversals on the Salt-master +**CVE-2017-12791** Maliciously crafted minion IDs can cause unwanted directory +traversals on the Salt-master -Correct a flaw in minion id validation which could allow certain minions to authenticate to a master despite not having the correct credentials. To exploit the vulnerability, an attacker must create a salt-minion with an ID containing characters that will cause a directory traversal. Credit for discovering the security flaw goes to: Vernhk@qq.com - -Changes for v2017.7.0..v2017.7.1 --------------------------------- - -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): - -*Generated at: 2017-07-26T01:09:40Z* - -Statistics: - -- Total Merges: **11** -- Total Issue references: **9** -- Total PR references: **22** - -Changes: +Correct a flaw in minion id validation which could allow certain minions to +authenticate to a master despite not having the correct credentials. To exploit +the vulnerability, an attacker must create a salt-minion with an ID containing +characters that will cause a directory traversal. Credit for discovering the +security flaw goes to: Vernhk@qq.com -- **PR** `#42548`_: (*gtmanfred*) pass in empty kwarg for reactor - @ *2017-07-26T00:41:20Z* +Changelog for v2017.7.0..v2017.7.1 +================================== + +*Generated at: 2018-05-26 20:28:44 UTC* + +* **ISSUE** `saltstack/salt-jenkins#460`_: (`Ch3LL`_) decorator tests failing on python3 (refs: `#42548`_) + +* **PR** `#42595`_: (`gtmanfred`_) make sure to pass arg as well + @ *2017-07-28 16:21:58 UTC* + + * **PR** `#42548`_: (`gtmanfred`_) pass in empty kwarg for reactor (refs: `#42595`_) + + * a50fe5433a Merge pull request `#42595`_ from gtmanfred/2017.7.1 + + * 8f73804b24 make sure to pass arg as well + +* **PR** `#42597`_: (`rallytime`_) Back-port `#42590`_ to 2017.7.1 + @ *2017-07-28 00:20:01 UTC* + + * **PR** `#42590`_: (`TiteiKo`_) Fix missing tornado import (refs: `#42597`_) + + * 3b583330de Merge pull request `#42597`_ from rallytime/bp-42590 + + * 8818b06f22 Fix missing tornado import + +* **ISSUE** `#42404`_: (`gabekahen`_) [2017.7] file.managed with cmd_check "No such file or directory" (refs: `#42411`_) + +* **ISSUE** `#33708`_: (`pepinje`_) visudo check command leaves cache file in /tmp (refs: `#38063`_, `#42411`_) + +* **PR** `#42598`_: (`rallytime`_) Back-port `#42411`_ to 2017.7.1 + @ *2017-07-28 00:19:13 UTC* + + * **PR** `#42411`_: (`seedickcode`_) Fix file.managed check_cmd file not found - Issue `#42404`_ (refs: `#42598`_) + + * **PR** `#38063`_: (`llua`_) tmp file clean up in file.manage - fix for `#33708`_ (refs: `#42411`_) + + * 76f1e53e10 Merge pull request `#42598`_ from rallytime/bp-42411 + + * 190cdb8693 Fix file.managed check_cmd file not found - Issue `#42404`_ + +* **PR** `#42564`_: (`rallytime`_) Back-port `#42555`_ to 2017.7.1 + @ *2017-07-26 17:32:02 UTC* + + * **PR** `#42555`_: (`Ch3LL`_) add changelog to 2017.7.1 release notes (refs: `#42564`_) + + * 5c7def9a43 Merge pull request `#42564`_ from rallytime/bp-42555 + + * 7bcaa5a4cc small markup fix for title + + * d066b599ca add changelog to 2017.7.1 release notes + +* **ISSUE** `saltstack/salt-jenkins#460`_: (`Ch3LL`_) decorator tests failing on python3 (refs: `#42548`_) + +* **PR** `#42548`_: (`gtmanfred`_) pass in empty kwarg for reactor (refs: `#42595`_) + @ *2017-07-26 00:41:20 UTC* - - **ISSUE** `#460`_: (*whiteinge*) Add a topic and a ref for modules/states/returners/renderers/runners - | refs: `#42548`_ * 711b742c54 Merge pull request `#42548`_ from gtmanfred/2017.7.1 + * 0257c1dc32 pass in empty kwarg for reactor * b948e980d2 update chunk, not kwarg in chunk -- **PR** `#42522`_: (*gtmanfred*) pacman wildcard is only for repository installs - @ *2017-07-24T20:51:05Z* +* **ISSUE** `#42519`_: (`xuhcc`_) Error when installing package from file under Arch Linux (refs: `#42522`_) + +* **PR** `#42522`_: (`gtmanfred`_) pacman wildcard is only for repository installs + @ *2017-07-24 20:51:05 UTC* - - **ISSUE** `#42519`_: (*xuhcc*) Error when installing package from file under Arch Linux - | refs: `#42522`_ * 50c1635dcc Merge pull request `#42522`_ from gtmanfred/2017.7.1 + * 7787fb9e1b pacman wildcard is only for repository installs -- **PR** `#42508`_: (*rallytime*) Back-port `#42474`_ to 2017.7.1 - @ *2017-07-24T20:49:51Z* +* **PR** `#42508`_: (`rallytime`_) Back-port `#42474`_ to 2017.7.1 + @ *2017-07-24 20:49:51 UTC* + + * **PR** `#42474`_: (`whiteinge`_) Cmd arg kwarg parsing test (refs: `#42508`_) + + * **PR** `#39646`_: (`terminalmage`_) Handle deprecation of passing string args to load_args_and_kwargs (refs: `#42474`_) + + * 05c07ac049 Merge pull request `#42508`_ from rallytime/bp-42474 - - **PR** `#42474`_: (*whiteinge*) Cmd arg kwarg parsing test - | refs: `#42508`_ - - **PR** `#39646`_: (*terminalmage*) Handle deprecation of passing string args to load_args_and_kwargs - | refs: `#42474`_ - * 05c07ac049 Merge pull request `#42508`_ from rallytime/`bp-42474`_ * 76fb074433 Add a test.arg variant that cleans the pub kwargs by default * 624f63648e Lint fixes @@ -61,74 +116,81 @@ Changes: * 854e098aa0 Add LocalClient.cmd test for arg/kwarg parsing -- **PR** `#42472`_: (*rallytime*) Back-port `#42435`_ to 2017.7.1 - @ *2017-07-24T15:11:13Z* +* **ISSUE** `#42427`_: (`grichmond-salt`_) Issue Passing Variables created from load_json as Inline Pillar Between States (refs: `#42435`_) + +* **PR** `#42472`_: (`rallytime`_) Back-port `#42435`_ to 2017.7.1 + @ *2017-07-24 15:11:13 UTC* + + * **PR** `#42435`_: (`terminalmage`_) Modify our custom YAML loader to treat unicode literals as unicode strings (refs: `#42472`_) + + * 95fe2558e4 Merge pull request `#42472`_ from rallytime/bp-42435 - - **ISSUE** `#42427`_: (*grichmond-salt*) Issue Passing Variables created from load_json as Inline Pillar Between States - | refs: `#42435`_ - - **PR** `#42435`_: (*terminalmage*) Modify our custom YAML loader to treat unicode literals as unicode strings - | refs: `#42472`_ - * 95fe2558e4 Merge pull request `#42472`_ from rallytime/`bp-42435`_ * 5c47af5b98 Modify our custom YAML loader to treat unicode literals as unicode strings -- **PR** `#42473`_: (*rallytime*) Back-port `#42436`_ to 2017.7.1 - @ *2017-07-24T15:10:29Z* +* **ISSUE** `#42374`_: (`tyhunt99`_) [2017.7.0] salt-run mange.versions throws exception if minion is offline or unresponsive (refs: `#42436`_) + +* **PR** `#42473`_: (`rallytime`_) Back-port `#42436`_ to 2017.7.1 + @ *2017-07-24 15:10:29 UTC* + + * **PR** `#42436`_: (`garethgreenaway`_) Fixes to versions function in manage runner (refs: `#42473`_) + + * 5b99d45f54 Merge pull request `#42473`_ from rallytime/bp-42436 - - **ISSUE** `#42374`_: (*tyhunt99*) [2017.7.0] salt-run mange.versions throws exception if minion is offline or unresponsive - | refs: `#42436`_ - - **PR** `#42436`_: (*garethgreenaway*) Fixes to versions function in manage runner - | refs: `#42473`_ - * 5b99d45f54 Merge pull request `#42473`_ from rallytime/`bp-42436`_ * 82ed919803 Updating the versions function inside the manage runner to account for when a minion is offline and we are unable to determine it's version. -- **PR** `#42471`_: (*rallytime*) Back-port `#42399`_ to 2017.7.1 - @ *2017-07-24T15:09:50Z* +* **ISSUE** `#42381`_: (`zebooka`_) Git.detached broken in 2017.7.0 (refs: `#42399`_) + +* **ISSUE** `#38878`_: (`tomlaredo`_) [Naming consistency] git.latest "rev" option VS git.detached "ref" option (refs: `#38898`_) + +* **PR** `#42471`_: (`rallytime`_) Back-port `#42399`_ to 2017.7.1 + @ *2017-07-24 15:09:50 UTC* + + * **PR** `#42399`_: (`rallytime`_) Update old "ref" references to "rev" in git.detached state (refs: `#42471`_) + + * **PR** `#38898`_: (`terminalmage`_) git.detached: rename ref to rev for consistency (refs: `#42399`_) + + * 3d1a2d3f9f Merge pull request `#42471`_ from rallytime/bp-42399 - - **ISSUE** `#42381`_: (*zebooka*) Git.detached broken in 2017.7.0 - | refs: `#42399`_ - - **ISSUE** `#38878`_: (*tomlaredo*) [Naming consistency] git.latest "rev" option VS git.detached "ref" option - | refs: `#38898`_ - - **PR** `#42399`_: (*rallytime*) Update old "ref" references to "rev" in git.detached state - | refs: `#42471`_ - - **PR** `#38898`_: (*terminalmage*) git.detached: rename ref to rev for consistency - | refs: `#42399`_ - * 3d1a2d3f9f Merge pull request `#42471`_ from rallytime/`bp-42399`_ * b9a4669e5a Update old "ref" references to "rev" in git.detached state -- **PR** `#42470`_: (*rallytime*) Back-port `#42031`_ to 2017.7.1 - @ *2017-07-24T15:09:30Z* +* **ISSUE** `#42400`_: (`Enquier`_) Conflict in execution of passing pillar data to orch/reactor event executions 2017.7.0 (refs: `#42031`_) + +* **PR** `#42470`_: (`rallytime`_) Back-port `#42031`_ to 2017.7.1 + @ *2017-07-24 15:09:30 UTC* + + * **PR** `#42031`_: (`skizunov`_) Fix: Reactor emits critical error (refs: `#42470`_) + + * 09766bccbc Merge pull request `#42470`_ from rallytime/bp-42031 - - **ISSUE** `#42400`_: (*Enquier*) Conflict in execution of passing pillar data to orch/reactor event executions 2017.7.0 - | refs: `#42031`_ - - **PR** `#42031`_: (*skizunov*) Fix: Reactor emits critical error - | refs: `#42470`_ - * 09766bccbc Merge pull request `#42470`_ from rallytime/`bp-42031`_ * 0a0c6287a4 Fix: Reactor emits critical error -- **PR** `#42469`_: (*rallytime*) Back-port `#42027`_ to 2017.7.1 - @ *2017-07-21T22:41:02Z* +* **ISSUE** `#41949`_: (`jrporcaro`_) Event returner doesn't work with Windows Master (refs: `#42027`_) + +* **PR** `#42469`_: (`rallytime`_) Back-port `#42027`_ to 2017.7.1 + @ *2017-07-21 22:41:02 UTC* + + * **PR** `#42027`_: (`gtmanfred`_) import salt.minion for EventReturn for Windows (refs: `#42469`_) + + * d7b172a15b Merge pull request `#42469`_ from rallytime/bp-42027 - - **ISSUE** `#41949`_: (*jrporcaro*) Event returner doesn't work with Windows Master - | refs: `#42027`_ - - **PR** `#42027`_: (*gtmanfred*) import salt.minion for EventReturn for Windows - | refs: `#42469`_ - * d7b172a15b Merge pull request `#42469`_ from rallytime/`bp-42027`_ * ed612b4ee7 import salt.minion for EventReturn for Windows -- **PR** `#42466`_: (*rallytime*) Back-port `#42452`_ to 2017.7.1 - @ *2017-07-21T19:41:24Z* +* **PR** `#42466`_: (`rallytime`_) Back-port `#42452`_ to 2017.7.1 + @ *2017-07-21 19:41:24 UTC* + + * **PR** `#42452`_: (`Ch3LL`_) update windows urls to new py2/py3 naming scheme (refs: `#42466`_) + + * 8777b1a825 Merge pull request `#42466`_ from rallytime/bp-42452 - - **PR** `#42452`_: (*Ch3LL*) update windows urls to new py2/py3 naming scheme - | refs: `#42466`_ - * 8777b1a825 Merge pull request `#42466`_ from rallytime/`bp-42452`_ * c10196f68c update windows urls to new py2/py3 naming scheme -- **PR** `#42439`_: (*rallytime*) Back-port `#42409`_ to 2017.7.1 - @ *2017-07-21T17:38:10Z* +* **PR** `#42439`_: (`rallytime`_) Back-port `#42409`_ to 2017.7.1 + @ *2017-07-21 17:38:10 UTC* + + * **PR** `#42409`_: (`twangboy`_) Add Scripts to build Py3 on Mac (refs: `#42439`_) + + * fceaaf41d0 Merge pull request `#42439`_ from rallytime/bp-42409 - - **PR** `#42409`_: (*twangboy*) Add Scripts to build Py3 on Mac - | refs: `#42439`_ - * fceaaf41d0 Merge pull request `#42439`_ from rallytime/`bp-42409`_ * 8176964b41 Remove build and dist, sign pkgs * 2c14d92a07 Fix hard coded pip path @@ -137,17 +199,20 @@ Changes: * 2478447246 Update Python and other reqs -- **PR** `#42441`_: (*rallytime*) Back-port `#42433`_ to 2017.7.1 - @ *2017-07-21T17:37:01Z* +* **ISSUE** `#42403`_: (`astronouth7303`_) [2017.7] Pillar empty when state is applied from orchestrate (refs: `#42433`_) + +* **PR** `#42441`_: (`rallytime`_) Back-port `#42433`_ to 2017.7.1 + @ *2017-07-21 17:37:01 UTC* + + * **PR** `#42433`_: (`terminalmage`_) Only force saltenv/pillarenv to be a string when not None (refs: `#42441`_) + + * 660400560b Merge pull request `#42441`_ from rallytime/bp-42433 - - **ISSUE** `#42403`_: (*astronouth7303*) [2017.7] Pillar empty when state is applied from orchestrate - | refs: `#42433`_ - - **PR** `#42433`_: (*terminalmage*) Only force saltenv/pillarenv to be a string when not None - | refs: `#42441`_ - * 660400560b Merge pull request `#42441`_ from rallytime/`bp-42433`_ * 17f347123a Only force saltenv/pillarenv to be a string when not None - +.. _`#1`: https://github.com/saltstack/salt/issues/1 +.. _`#33708`: https://github.com/saltstack/salt/issues/33708 +.. _`#38063`: https://github.com/saltstack/salt/pull/38063 .. _`#38878`: https://github.com/saltstack/salt/issues/38878 .. _`#38898`: https://github.com/saltstack/salt/pull/38898 .. _`#39646`: https://github.com/saltstack/salt/pull/39646 @@ -159,7 +224,9 @@ Changes: .. _`#42399`: https://github.com/saltstack/salt/pull/42399 .. _`#42400`: https://github.com/saltstack/salt/issues/42400 .. _`#42403`: https://github.com/saltstack/salt/issues/42403 +.. _`#42404`: https://github.com/saltstack/salt/issues/42404 .. _`#42409`: https://github.com/saltstack/salt/pull/42409 +.. _`#42411`: https://github.com/saltstack/salt/pull/42411 .. _`#42427`: https://github.com/saltstack/salt/issues/42427 .. _`#42433`: https://github.com/saltstack/salt/pull/42433 .. _`#42435`: https://github.com/saltstack/salt/pull/42435 @@ -178,13 +245,32 @@ Changes: .. _`#42519`: https://github.com/saltstack/salt/issues/42519 .. _`#42522`: https://github.com/saltstack/salt/pull/42522 .. _`#42548`: https://github.com/saltstack/salt/pull/42548 -.. _`#460`: https://github.com/saltstack/salt/issues/460 -.. _`bp-42027`: https://github.com/saltstack/salt/pull/42027 -.. _`bp-42031`: https://github.com/saltstack/salt/pull/42031 -.. _`bp-42399`: https://github.com/saltstack/salt/pull/42399 -.. _`bp-42409`: https://github.com/saltstack/salt/pull/42409 -.. _`bp-42433`: https://github.com/saltstack/salt/pull/42433 -.. _`bp-42435`: https://github.com/saltstack/salt/pull/42435 -.. _`bp-42436`: https://github.com/saltstack/salt/pull/42436 -.. _`bp-42452`: https://github.com/saltstack/salt/pull/42452 -.. _`bp-42474`: https://github.com/saltstack/salt/pull/42474 +.. _`#42555`: https://github.com/saltstack/salt/pull/42555 +.. _`#42564`: https://github.com/saltstack/salt/pull/42564 +.. _`#42590`: https://github.com/saltstack/salt/pull/42590 +.. _`#42595`: https://github.com/saltstack/salt/pull/42595 +.. _`#42597`: https://github.com/saltstack/salt/pull/42597 +.. _`#42598`: https://github.com/saltstack/salt/pull/42598 +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`Enquier`: https://github.com/Enquier +.. _`TiteiKo`: https://github.com/TiteiKo +.. _`astronouth7303`: https://github.com/astronouth7303 +.. _`gabekahen`: https://github.com/gabekahen +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`grichmond-salt`: https://github.com/grichmond-salt +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`jrporcaro`: https://github.com/jrporcaro +.. _`llua`: https://github.com/llua +.. _`pepinje`: https://github.com/pepinje +.. _`rallytime`: https://github.com/rallytime +.. _`saltstack/salt-jenkins#460`: https://github.com/saltstack/salt-jenkins/issues/460 +.. _`seedickcode`: https://github.com/seedickcode +.. _`skizunov`: https://github.com/skizunov +.. _`terminalmage`: https://github.com/terminalmage +.. _`thatch45`: https://github.com/thatch45 +.. _`tomlaredo`: https://github.com/tomlaredo +.. _`twangboy`: https://github.com/twangboy +.. _`tyhunt99`: https://github.com/tyhunt99 +.. _`whiteinge`: https://github.com/whiteinge +.. _`xuhcc`: https://github.com/xuhcc +.. _`zebooka`: https://github.com/zebooka diff --git a/doc/topics/releases/2017.7.2.rst b/doc/topics/releases/2017.7.2.rst index 97b55226fc..30ddfec437 100644 --- a/doc/topics/releases/2017.7.2.rst +++ b/doc/topics/releases/2017.7.2.rst @@ -4,62 +4,86 @@ Salt 2017.7.2 Release Notes Version 2017.7.2 is a bugfix release for :ref:`2017.7.0 `. -Changes for v2017.7.1..v2017.7.2 --------------------------------- - -Security Fix -============ - -CVE-2017-14695 Directory traversal vulnerability in minion id validation in SaltStack. Allows remote minions with incorrect credentials to authenticate to a master via a crafted minion ID. Credit for discovering the security flaw goes to: Julian Brost (julian@0x4a42.net) - -CVE-2017-14696 Remote Denial of Service with a specially crafted authentication request. Credit for discovering the security flaw goes to: Julian Brost (julian@0x4a42.net) - -Known Issues -============ - -On 2017.7.2 when using salt-api and cherrypy version 5.6.0, issue `#43581`_ will occur when starting the salt-api service. We have patched the cherry-py packages for python-cherrypy-5.6.0-2 from repo.saltstack.com. If you are using python-cherrypy-5.6.0-1 please ensure to run `yum install python-cherrypy` to install the new patched version. - -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): - -*Generated at: 2017-10-02T21:10:14Z* Statistics ========== -- Total Merges: **328** -- Total Issue references: **134** -- Total PR references: **391** +- Total Merges: **329** +- Total Issue References: **73** +- Total PR References: **236** -Changes -======= +- Contributors: **47** (`Ch3LL`_, `CorvinM`_, `DmitryKuzmenko`_, `Giandom`_, `Mapel88`_, `Mareo`_, `SuperPommeDeTerre`_, `The-Loeki`_, `abulford`_, `amendlik`_, `blarghmatey`_, `brejoc`_, `cachedout`_, `carsonoid`_, `cro`_, `damon-atkins`_, `darcoli`_, `dmurphy18`_, `frankiexyz`_, `garethgreenaway`_, `gtmanfred`_, `hibbert`_, `isbm`_, `ixs`_, `jettero`_, `jmarinaro`_, `justincbeard`_, `kkoppel`_, `llua`_, `lomeroe`_, `m03`_, `mcalmer`_, `mirceaulinic`_, `morganwillcock`_, `nhavens`_, `pabloh007`_, `rallytime`_, `seedickcode`_, `shengis`_, `skizunov`_, `terminalmage`_, `the-glu`_, `thusoy`_, `twangboy`_, `vitaliyf`_, `vutny`_, `whiteinge`_) -- **PR** `#43868`_: (*rallytime*) Back-port `#43847`_ to 2017.7.2 - * Fix to module.run -- **PR** `#43756`_: (*gtmanfred*) split build and install for pkg osx - @ *2017-09-26T20:51:28Z* +Security Fix +============ - * 88414d5 Merge pull request `#43756`_ from gtmanfred/2017.7.2 - * f7df41f split build and install for pkg osx +**CVE-2017-14695** Directory traversal vulnerability in minion id validation in +SaltStack. Allows remote minions with incorrect credentials to authenticate to +a master via a crafted minion ID. Credit for discovering the security flaw goes +to: Julian Brost (julian@0x4a42.net) -- **PR** `#43585`_: (*rallytime*) Back-port `#43330`_ to 2017.7.2 - @ *2017-09-19T17:33:34Z* +**CVE-2017-14696** Remote Denial of Service with a specially crafted +authentication request. Credit for discovering the security flaw goes to: +Julian Brost (julian@0x4a42.net) - - **ISSUE** `#43077`_: (*Manoj2087*) Issue with deleting key via wheel - | refs: `#43330`_ - - **PR** `#43330`_: (*terminalmage*) Fix reactor regression + unify reactor config schema - | refs: `#43585`_ - * 89f629233f Merge pull request `#43585`_ from rallytime/`bp-43330`_ - * c4f693bae8 Merge branch '2017.7.2' into `bp-43330`_ -- **PR** `#43586`_: (*rallytime*) Back-port `#43526`_ to 2017.7.2 - @ *2017-09-19T15:36:27Z* +Changelog for v2017.7.1..v2017.7.2 +================================== + +*Generated at: 2018-05-26 21:06:12 UTC* + +* **PR** `#43868`_: (`rallytime`_) Back-port `#43847`_ to 2017.7.2 + @ *2017-10-03 12:00:52 UTC* + + * **PR** `#43847`_: (`cachedout`_) Fix to module.run (refs: `#43868`_) + + * dd0b3388cf Merge pull request `#43868`_ from rallytime/bp-43847 + + * e21d8e9583 Use six.iterkeys() instead of dict.keys() + + * c297ae5557 Improve failures for module.run states + + * 782e67c199 Lint + + * a6c2d78518 Fix typo found by @s0undt3ch + + * 0cac15e502 Fix to module.run [WIP] + +* **PR** `#43871`_: (`rallytime`_) Add updated release notes to 2017.7.2 branch + @ *2017-10-03 11:59:29 UTC* + + * 47af4ae38a Merge pull request `#43871`_ from rallytime/update-release-notes + + * 2337904656 Add updated release notes to 2017.7.2 branch + +* **PR** `#43756`_: (`gtmanfred`_) split build and install for pkg osx + @ *2017-09-26 20:51:28 UTC* + + * 88414d5f73 Merge pull request `#43756`_ from gtmanfred/2017.7.2 + + * f7df41fa94 split build and install for pkg osx + +* **ISSUE** `#43077`_: (`Manoj2087`_) Issue with deleting key via wheel (refs: `#43330`_) + +* **PR** `#43585`_: (`rallytime`_) Back-port `#43330`_ to 2017.7.2 + @ *2017-09-19 17:33:34 UTC* + + * **PR** `#43330`_: (`terminalmage`_) Fix reactor regression + unify reactor config schema (refs: `#43585`_) + + * 89f629233f Merge pull request `#43585`_ from rallytime/bp-43330 + + * c4f693bae8 Merge branch '2017.7.2' into bp-43330 + +* **ISSUE** `#43447`_: (`UtahDave`_) When using Syndic with Multi Master the top level master doesn't reliably get returns from lower minion. (refs: `#43526`_) + +* **PR** `#43586`_: (`rallytime`_) Back-port `#43526`_ to 2017.7.2 + @ *2017-09-19 15:36:27 UTC* + + * **PR** `#43526`_: (`DmitryKuzmenko`_) Forward events to all masters syndic connected to (refs: `#43586`_) + + * abb7fe4422 Merge pull request `#43586`_ from rallytime/bp-43526 - - **ISSUE** `#43447`_: (*UtahDave*) When using Syndic with Multi Master the top level master doesn't reliably get returns from lower minion. - | refs: `#43526`_ - - **PR** `#43526`_: (*DmitryKuzmenko*) Forward events to all masters syndic connected to - | refs: `#43586`_ - * abb7fe4422 Merge pull request `#43586`_ from rallytime/`bp-43526`_ * e076e9b634 Forward events to all masters syndic connected to. * 7abd07fa07 Simplify client logic @@ -74,19 +98,20 @@ Changes * 4afb179bad Un-deprecate passing kwargs outside of 'kwarg' param -- **PR** `#43551`_: (*twangboy*) Fix preinstall script on OSX for 2017.7.2 - @ *2017-09-18T18:35:35Z* +* **PR** `#43551`_: (`twangboy`_) Fix preinstall script on OSX for 2017.7.2 + @ *2017-09-18 18:35:35 UTC* * 3d3b09302d Merge pull request `#43551`_ from twangboy/osx_fix_preinstall_2017.7.2 + * c3d9fb63f0 Merge branch '2017.7.2' into osx_fix_preinstall_2017.7.2 -- **PR** `#43509`_: (*rallytime*) Back-port `#43333`_ to 2017.7.2 - @ *2017-09-15T21:21:40Z* +* **PR** `#43509`_: (`rallytime`_) Back-port `#43333`_ to 2017.7.2 + @ *2017-09-15 21:21:40 UTC* + + * **PR** `#43333`_: (`damon-atkins`_) Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug (refs: `#43509`_) + + * 24691da888 Merge pull request `#43509`_ from rallytime/bp-43333-2017.7.2 - - **ISSUE** `#2`_: (*thatch45*) salt job queries - - **PR** `#43333`_: (*damon-atkins*) Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug - | refs: `#43509`_ - * 24691da888 Merge pull request `#43509`_ from rallytime/`bp-43333`_-2017.7.2 * b3dbafb035 Update doco * 5cdcdbf428 Update win_pkg.py @@ -95,51 +120,55 @@ Changes * f33395f1ee Fix logic in `/etc/paths.d/salt` detection -- **PR** `#43440`_: (*rallytime*) Back-port `#43421`_ to 2017.7.2 - @ *2017-09-11T20:59:53Z* +* **PR** `#43440`_: (`rallytime`_) Back-port `#43421`_ to 2017.7.2 + @ *2017-09-11 20:59:53 UTC* + + * **PR** `#43421`_: (`gtmanfred`_) Revert "Reduce fileclient.get_file latency by merging _file_find and … (refs: `#43440`_) + + * 8964cacbf8 Merge pull request `#43440`_ from rallytime/bp-43421 - - **PR** `#43421`_: (*gtmanfred*) Revert "Reduce fileclient.get_file latency by merging _file_find and … - | refs: `#43440`_ - * 8964cacbf8 Merge pull request `#43440`_ from rallytime/`bp-43421`_ * ea6e661755 Revert "Reduce fileclient.get_file latency by merging _file_find and _file_hash" -- **PR** `#43377`_: (*rallytime*) Back-port `#43193`_ to 2017.7.2 - @ *2017-09-11T15:32:23Z* +* **PR** `#43377`_: (`rallytime`_) Back-port `#43193`_ to 2017.7.2 + @ *2017-09-11 15:32:23 UTC* + + * **PR** `#43193`_: (`jettero`_) Prevent spurious "Template does not exist" error (refs: `#43377`_) + + * **PR** `#39516`_: (`jettero`_) Prevent spurious "Template does not exist" error (refs: `#43193`_) + + * 7fda186b18 Merge pull request `#43377`_ from rallytime/bp-43193 - - **PR** `#43193`_: (*jettero*) Prevent spurious "Template does not exist" error - | refs: `#43377`_ - - **PR** `#39516`_: (*jettero*) Prevent spurious "Template does not exist" error - | refs: `#43193`_ - * 7fda186b18 Merge pull request `#43377`_ from rallytime/`bp-43193`_ * 842b07fd25 Prevent spurious "Template does not exist" error -- **PR** `#43315`_: (*rallytime*) Back-port `#43283`_ to 2017.7.2 - @ *2017-09-05T20:04:25Z* +* **ISSUE** `#42459`_: (`iavael`_) Broken ldap groups retrieval in salt.auth.ldap after upgrade to 2017.7 (refs: `#43283`_) + +* **PR** `#43315`_: (`rallytime`_) Back-port `#43283`_ to 2017.7.2 + @ *2017-09-05 20:04:25 UTC* + + * **PR** `#43283`_: (`DmitryKuzmenko`_) Fix ldap token groups auth. (refs: `#43315`_) + + * 85dba1e898 Merge pull request `#43315`_ from rallytime/bp-43283 - - **ISSUE** `#42459`_: (*iavael*) Broken ldap groups retrieval in salt.auth.ldap after upgrade to 2017.7 - | refs: `#43283`_ - - **PR** `#43283`_: (*DmitryKuzmenko*) Fix ldap token groups auth. - | refs: `#43315`_ - * 85dba1e898 Merge pull request `#43315`_ from rallytime/`bp-43283`_ * f29f5b0cce Fix for tests: don't require 'groups' in the eauth token. * 56938d5bf2 Fix ldap token groups auth. -- **PR** `#43266`_: (*gtmanfred*) switch virtualbox cloud driver to use __utils__ - @ *2017-08-30T18:36:20Z* +* **ISSUE** `#43259`_: (`mahesh21`_) NameError: global name '__opts__' is not defined (refs: `#43266`_) + +* **PR** `#43266`_: (`gtmanfred`_) switch virtualbox cloud driver to use __utils__ + @ *2017-08-30 18:36:20 UTC* - - **ISSUE** `#43259`_: (*mahesh21*) NameError: global name '__opts__' is not defined - | refs: `#43266`_ * 26ff8088cb Merge pull request `#43266`_ from gtmanfred/virtualbox + * 382bf92de7 switch virtualbox cloud driver to use __utils__ -- **PR** `#43073`_: (*Mapel88*) Fix bug `#42936`_ - win_iis module container settings - @ *2017-08-30T18:34:37Z* +* **ISSUE** `#42936`_: (`Mapel88`_) bug in win_iis module & state - container_setting (refs: `#43073`_) + +* **PR** `#43073`_: (`Mapel88`_) Fix bug `#42936`_ - win_iis module container settings + @ *2017-08-30 18:34:37 UTC* - - **ISSUE** `#43110`_: (*Mapel88*) bug in iis_module - create_cert_binding - - **ISSUE** `#42936`_: (*Mapel88*) bug in win_iis module & state - container_setting - | refs: `#43073`_ * ee209b144c Merge pull request `#43073`_ from Mapel88/patch-2 + * b1a3d15b28 Remove trailing whitespace for linter * 25c8190e48 Fix pylint errors @@ -158,83 +187,82 @@ Changes * 13404a47b5 Fix bug `#42936`_ - win_iis module -- **PR** `#43254`_: (*twangboy*) Fix `unit.modules.test_inspect_collector` on Windows - @ *2017-08-30T15:46:07Z* +* **PR** `#43254`_: (`twangboy`_) Fix `unit.modules.test_inspect_collector` on Windows + @ *2017-08-30 15:46:07 UTC* * ec1bedc646 Merge pull request `#43254`_ from twangboy/win_fix_test_inspect_collector + * b401340e6c Fix `unit.modules.test_inspect_collector` on Windows -- **PR** `#43255`_: (*gtmanfred*) always return a dict object - @ *2017-08-30T14:47:15Z* +* **ISSUE** `#43241`_: (`mirceaulinic`_) Error whilst collecting napalm grains (refs: `#43255`_) + +* **PR** `#43255`_: (`gtmanfred`_) always return a dict object + @ *2017-08-30 14:47:15 UTC* - - **ISSUE** `#43241`_: (*mirceaulinic*) Error whilst collecting napalm grains - | refs: `#43255`_ * 1fc7307735 Merge pull request `#43255`_ from gtmanfred/2017.7 + * 83b0bab34b opt_args needs to be a dict -- **PR** `#43229`_: (*twangboy*) Bring changes from `#43228`_ to 2017.7 - @ *2017-08-30T14:26:55Z* +* **PR** `#43229`_: (`twangboy`_) Bring changes from `#43228`_ to 2017.7 + @ *2017-08-30 14:26:55 UTC* + + * **PR** `#43228`_: (`twangboy`_) Win fix pkg.install (refs: `#43229`_) - - **PR** `#43228`_: (*twangboy*) Win fix pkg.install - | refs: `#43229`_ * fa904ee225 Merge pull request `#43229`_ from twangboy/win_fix_pkg.install-2017.7 + * e007a1c26e Fix regex, add `.` * 23ec47c74c Add _ to regex search * b1788b1e5f Bring changes from `#43228`_ to 2017.7 -- **PR** `#43251`_: (*twangboy*) Skips `unit.modules.test_groupadd` on Windows - @ *2017-08-30T13:56:36Z* +* **PR** `#43251`_: (`twangboy`_) Skips `unit.modules.test_groupadd` on Windows + @ *2017-08-30 13:56:36 UTC* * 25666f88f7 Merge pull request `#43251`_ from twangboy/win_skip_test_groupadd + * 5185071d5a Skips `unit.modules.test_groupadd` on Windows -- **PR** `#43256`_: (*twangboy*) Skip mac tests for user and group - @ *2017-08-30T13:18:13Z* +* **PR** `#43256`_: (`twangboy`_) Skip mac tests for user and group + @ *2017-08-30 13:18:13 UTC* * a8e09629b2 Merge pull request `#43256`_ from twangboy/win_skip_mac_tests + * cec627a60b Skip mac tests for user and group -- **PR** `#43226`_: (*lomeroe*) Fixes for issues in PR `#43166`_ - @ *2017-08-29T19:05:39Z* +* **ISSUE** `#42279`_: (`dafyddj`_) win_lgpo matches multiple policies due to startswith() (refs: `#43116`_, `#43156`_, `#43166`_, `#43226`_) + +* **PR** `#43226`_: (`lomeroe`_) Fixes for issues in PR `#43166`_ + @ *2017-08-29 19:05:39 UTC* + + * **PR** `#43166`_: (`lomeroe`_) Backport `#43116`_ to 2017.7 (refs: `#43226`_) + + * **PR** `#43156`_: (`lomeroe`_) Backport `#43116`_ to 2017.7 (refs: `#43166`_) + + * **PR** `#43116`_: (`lomeroe`_) Fix 42279 in develop (refs: `#43166`_, `#43156`_) + + * **PR** `#39773`_: (`twangboy`_) Make win_file use the win_dacl salt util (refs: `#43226`_) - - **ISSUE** `#42279`_: (*dafyddj*) win_lgpo matches multiple policies due to startswith() - | refs: `#43116`_ `#43116`_ `#43166`_ `#43226`_ `#43156`_ - - **PR** `#43166`_: (*lomeroe*) Backport `#43116`_ to 2017.7 - | refs: `#43226`_ - - **PR** `#43156`_: (*lomeroe*) Backport `#43116`_ to 2017.7 - | refs: `#43166`_ - - **PR** `#43116`_: (*lomeroe*) Fix 42279 in develop - | refs: `#43166`_ `#43156`_ - - **PR** `#39773`_: (*twangboy*) Make win_file use the win_dacl salt util - | refs: `#43226`_ * ac2189c870 Merge pull request `#43226`_ from lomeroe/fix_43166 + * 0c424dc4a3 Merge branch '2017.7' into fix_43166 * 324cfd8d1e correcting bad format statement in search for policy to be disabled (fix for `#43166`_) verify that file exists before attempting to remove (fix for commits from `#39773`_) -- **PR** `#43227`_: (*twangboy*) Fix `unit.fileserver.test_gitfs` for Windows - @ *2017-08-29T19:03:36Z* +* **PR** `#43227`_: (`twangboy`_) Fix `unit.fileserver.test_gitfs` for Windows + @ *2017-08-29 19:03:36 UTC* * 6199fb46dc Merge pull request `#43227`_ from twangboy/win_fix_unit_test_gitfs + * c956d24283 Fix is_windows detection when USERNAME missing * 869e8cc603 Fix `unit.fileserver.test_gitfs` for Windows -- **PR** `#43217`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-08-28T16:36:28Z* +* **PR** `#43217`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-08-28 16:36:28 UTC* - - **ISSUE** `#43101`_: (*aogier*) genesis.bootstrap fails if no pkg AND exclude_pkgs (which can't be a string) - | refs: `#43103`_ - - **ISSUE** `#42642`_: (*githubcdr*) state.augeas - | refs: `#42669`_ `#43202`_ - - **ISSUE** `#42329`_: (*jagguli*) State git.latest does not pull latest tags - | refs: `#42663`_ - - **PR** `#43202`_: (*garethgreenaway*) Reverting previous augeas module changes - - **PR** `#43103`_: (*aogier*) genesis.bootstrap deboostrap fix - - **PR** `#42663`_: (*jagguli*) Check remote tags before deciding to do a fetch `#42329`_ * 6adc03e4b4 Merge pull request `#43217`_ from rallytime/merge-2017.7 + * 3911df2f4b Merge branch '2016.11' into '2017.7' * 5308c27f9f Merge pull request `#43202`_ from garethgreenaway/42642_2016_11_augeas_module_revert_fix @@ -265,22 +293,11 @@ Changes * 389c037285 Check remote tags before deciding to do a fetch `#42329`_ -- **PR** `#43201`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-08-25T22:56:46Z* +* **PR** `#43201`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-08-25 22:56:46 UTC* - - **ISSUE** `#43198`_: (*corywright*) disk.format_ needs to be aliased to disk.format - | refs: `#43199`_ - - **ISSUE** `#43143`_: (*abulford*) git.detached does not fetch if rev is missing from local - | refs: `#43178`_ - - **ISSUE** `#495`_: (*syphernl*) mysql.* without having MySQL installed/configured gives traceback - | refs: `#43196`_ - - **PR** `#43199`_: (*corywright*) Add `disk.format` alias for `disk.format_` - - **PR** `#43196`_: (*gtmanfred*) Pin request install to version for npm tests - - **PR** `#43179`_: (*terminalmage*) Fix missed deprecation - - **PR** `#43178`_: (*terminalmage*) git.detached: Fix traceback when rev is a SHA and is not present locally - - **PR** `#43173`_: (*Ch3LL*) Add New Release Branch Strategy to Contribution Docs - - **PR** `#43171`_: (*terminalmage*) Add warning about adding new functions to salt/utils/__init__.py * a563a9422a Merge pull request `#43201`_ from rallytime/merge-2017.7 + * d40eba6b37 Merge branch '2016.11' into '2017.7' * 4193e7f0a2 Merge pull request `#43199`_ from corywright/disk-format-alias @@ -307,21 +324,23 @@ Changes * 1b24244bd3 Add New Release Branch Strategy to Contribution Docs -- **PR** `#42997`_: (*twangboy*) Fix `unit.test_test_module_names` for Windows - @ *2017-08-25T21:19:11Z* +* **PR** `#42997`_: (`twangboy`_) Fix `unit.test_test_module_names` for Windows + @ *2017-08-25 21:19:11 UTC* * ce04ab4286 Merge pull request `#42997`_ from twangboy/win_fix_test_module_names + * 2722e9521d Use os.path.join to create paths -- **PR** `#43006`_: (*SuperPommeDeTerre*) Try to fix `#26995`_ - @ *2017-08-25T21:16:07Z* +* **ISSUE** `#26995`_: (`jbouse`_) Issue with artifactory.downloaded and snapshot artifacts (refs: `#43006`_) + +* **PR** `#43006`_: (`SuperPommeDeTerre`_) Try to fix `#26995`_ + @ *2017-08-25 21:16:07 UTC* - - **ISSUE** `#26995`_: (*jbouse*) Issue with artifactory.downloaded and snapshot artifacts - | refs: `#43006`_ `#43006`_ * c0279e491e Merge pull request `#43006`_ from SuperPommeDeTerre/SuperPommeDeTerre-patch-`#26995`_ + * 30dd6f5d12 Merge remote-tracking branch 'upstream/2017.7' into SuperPommeDeTerre-patch-`#26995`_ - * f42ae9b8cd Merge branch 'SuperPommeDeTerre-patch-`#26995`_' of https://github.com/SuperPommeDeTerre/salt into SuperPommeDeTerre-patch-`#26995`_ + * f42ae9b8cd Merge branch 'SuperPommeDeTerre-patch-#26995' of https://github.com/SuperPommeDeTerre/salt into SuperPommeDeTerre-patch-#26995 * 50ee3d5682 Merge remote-tracking branch 'remotes/origin/2017.7' into SuperPommeDeTerre-patch-`#26995`_ @@ -333,18 +352,20 @@ Changes * db11e1985b Fix for `#26995`_ -- **PR** `#43184`_: (*terminalmage*) docker.compare_container: Perform boolean comparison when one side's value is null/None - @ *2017-08-25T18:42:11Z* +* **ISSUE** `#43162`_: (`MorphBonehunter`_) docker_container.running interference with restart_policy (refs: `#43184`_) + +* **PR** `#43184`_: (`terminalmage`_) docker.compare_container: Perform boolean comparison when one side's value is null/None + @ *2017-08-25 18:42:11 UTC* - - **ISSUE** `#43162`_: (*MorphBonehunter*) docker_container.running interference with restart_policy - | refs: `#43184`_ * b6c5314fe9 Merge pull request `#43184`_ from terminalmage/issue43162 + * 081f42ad71 docker.compare_container: Perform boolean comparison when one side's value is null/None -- **PR** `#43165`_: (*mirceaulinic*) Improve napalm state output in debug mode - @ *2017-08-24T23:05:37Z* +* **PR** `#43165`_: (`mirceaulinic`_) Improve napalm state output in debug mode + @ *2017-08-24 23:05:37 UTC* * 688125bb4f Merge pull request `#43165`_ from cloudflare/fix-napalm-ret + * c10717dc89 Lint and fix * 1cd33cbaa9 Simplify the loaded_ret logic @@ -355,66 +376,68 @@ Changes * 3634055e34 Improve napalm state output in debug mode -- **PR** `#43155`_: (*terminalmage*) Resolve image ID during container comparison - @ *2017-08-24T22:09:47Z* +* **PR** `#43155`_: (`terminalmage`_) Resolve image ID during container comparison + @ *2017-08-24 22:09:47 UTC* * a6a327b1e5 Merge pull request `#43155`_ from terminalmage/issue43001 + * 0186835ebf Fix docstring in test * a0bb654e46 Fixing lint issues * d5b2a0be68 Resolve image ID during container comparison -- **PR** `#43170`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-08-24T19:22:26Z* +* **PR** `#43170`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-08-24 19:22:26 UTC* - - **PR** `#43151`_: (*ushmodin*) state.sls hangs on file.recurse with clean: True on windows - - **PR** `#42969`_: (*ushmodin*) state.sls hangs on file.recurse with clean: True on windows - | refs: `#43151`_ * c071fd44c8 Merge pull request `#43170`_ from rallytime/merge-2017.7 + * 3daad5a3a2 Merge branch '2016.11' into '2017.7' * 669b376abf Merge pull request `#43151`_ from ushmodin/2016.11 * c5841e2ade state.sls hangs on file.recurse with clean: True on windows -- **PR** `#43168`_: (*rallytime*) Back-port `#43041`_ to 2017.7 - @ *2017-08-24T19:07:23Z* +* **ISSUE** `#43040`_: (`darcoli`_) gitFS ext_pillar with branch name __env__ results in empty pillars (refs: `#43041`_) + +* **PR** `#43168`_: (`rallytime`_) Back-port `#43041`_ to 2017.7 + @ *2017-08-24 19:07:23 UTC* + + * **PR** `#43041`_: (`darcoli`_) Do not try to match pillarenv with __env__ (refs: `#43168`_) + + * 034c325a09 Merge pull request `#43168`_ from rallytime/bp-43041 - - **ISSUE** `#43040`_: (*darcoli*) gitFS ext_pillar with branch name __env__ results in empty pillars - | refs: `#43041`_ `#43041`_ - - **PR** `#43041`_: (*darcoli*) Do not try to match pillarenv with __env__ - | refs: `#43168`_ - * 034c325a09 Merge pull request `#43168`_ from rallytime/`bp-43041`_ * d010b74b87 Do not try to match pillarenv with __env__ -- **PR** `#43172`_: (*rallytime*) Move new utils/__init__.py funcs to utils.files.py - @ *2017-08-24T19:05:30Z* +* **PR** `#43172`_: (`rallytime`_) Move new utils/__init__.py funcs to utils.files.py + @ *2017-08-24 19:05:30 UTC* + + * **PR** `#43056`_: (`damon-atkins`_) safe_filename_leaf(file_basename) and safe_filepath(file_path_name) (refs: `#43172`_) - - **PR** `#43056`_: (*damon-atkins*) safe_filename_leaf(file_basename) and safe_filepath(file_path_name) - | refs: `#43172`_ * d48938e6b4 Merge pull request `#43172`_ from rallytime/move-utils-funcs + * 5385c7901e Move new utils/__init__.py funcs to utils.files.py -- **PR** `#43061`_: (*pabloh007*) Have docker.save use the image name when valid if not use image id, i… - @ *2017-08-24T16:32:02Z* +* **ISSUE** `#43043`_: (`pabloh007`_) docker.save and docker.load problem (refs: `#43061`_) + +* **PR** `#43061`_: (`pabloh007`_) Have docker.save use the image name when valid if not use image id, i… + @ *2017-08-24 16:32:02 UTC* - - **ISSUE** `#43043`_: (*pabloh007*) docker.save and docker.load problem - | refs: `#43061`_ `#43061`_ * e60f586442 Merge pull request `#43061`_ from pabloh007/fix-save-image-name-id + * 0ffc57d1df Have docker.save use the image name when valid if not use image id, issue when loading and image is savid with id issue `#43043`_ -- **PR** `#43166`_: (*lomeroe*) Backport `#43116`_ to 2017.7 - | refs: `#43226`_ - @ *2017-08-24T15:01:23Z* +* **ISSUE** `#42279`_: (`dafyddj`_) win_lgpo matches multiple policies due to startswith() (refs: `#43116`_, `#43156`_, `#43166`_, `#43226`_) + +* **PR** `#43166`_: (`lomeroe`_) Backport `#43116`_ to 2017.7 (refs: `#43226`_) + @ *2017-08-24 15:01:23 UTC* + + * **PR** `#43156`_: (`lomeroe`_) Backport `#43116`_ to 2017.7 (refs: `#43166`_) + + * **PR** `#43116`_: (`lomeroe`_) Fix 42279 in develop (refs: `#43166`_, `#43156`_) + + * 9da57543f8 Merge pull request `#43166`_ from lomeroe/bp-43116-2017.7 - - **ISSUE** `#42279`_: (*dafyddj*) win_lgpo matches multiple policies due to startswith() - | refs: `#43116`_ `#43116`_ `#43166`_ `#43226`_ `#43156`_ - - **PR** `#43156`_: (*lomeroe*) Backport `#43116`_ to 2017.7 - | refs: `#43166`_ - - **PR** `#43116`_: (*lomeroe*) Fix 42279 in develop - | refs: `#43166`_ `#43156`_ - * 9da57543f8 Merge pull request `#43166`_ from lomeroe/`bp-43116`_-2017.7 * af181b3257 correct fopen calls from salt.utils for 2017.7 * f74480f11e lint fix @@ -423,11 +446,11 @@ Changes * 9f3047c420 add additional checks for ADM policies that have the same ADMX policy ID (`#42279`_) -- **PR** `#43056`_: (*damon-atkins*) safe_filename_leaf(file_basename) and safe_filepath(file_path_name) - | refs: `#43172`_ - @ *2017-08-23T17:35:02Z* +* **PR** `#43056`_: (`damon-atkins`_) safe_filename_leaf(file_basename) and safe_filepath(file_path_name) (refs: `#43172`_) + @ *2017-08-23 17:35:02 UTC* * 44b3caead1 Merge pull request `#43056`_ from damon-atkins/2017.7 + * 08ded1546e more lint * 6e9c0957fb fix typo @@ -438,15 +461,11 @@ Changes * 964cebd954 safe_filename_leaf(file_basename) and safe_filepath(file_path_name) -- **PR** `#43146`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-08-23T16:56:10Z* +* **PR** `#43146`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-08-23 16:56:10 UTC* - - **ISSUE** `#43036`_: (*mcarlton00*) Linux VMs in Bhyve aren't displayed properly in grains - | refs: `#43037`_ - - **PR** `#43100`_: (*vutny*) [DOCS] Add missing `utils` sub-dir listed for `extension_modules` - - **PR** `#43037`_: (*mcarlton00*) Issue `#43036`_ Bhyve virtual grain in Linux VMs - - **PR** `#42986`_: (*renner*) Notify systemd synchronously (via NOTIFY_SOCKET) * 6ca9131a23 Merge pull request `#43146`_ from rallytime/merge-2017.7 + * bcbe180fbc Merge branch '2016.11' into '2017.7' * ae9d2b7985 Merge pull request `#42986`_ from renner/systemd-notify @@ -463,87 +482,83 @@ Changes * af743ff6c3 [DOCS] Add missing `utils` sub-dir listed for `extension_modules` -- **PR** `#43123`_: (*twangboy*) Fix `unit.utils.test_which` for Windows - @ *2017-08-23T16:01:39Z* +* **PR** `#43123`_: (`twangboy`_) Fix `unit.utils.test_which` for Windows + @ *2017-08-23 16:01:39 UTC* * 03f652159f Merge pull request `#43123`_ from twangboy/win_fix_test_which + * ed97cff5f6 Fix `unit.utils.test_which` for Windows -- **PR** `#43142`_: (*rallytime*) Back-port `#43068`_ to 2017.7 - @ *2017-08-23T15:56:48Z* +* **ISSUE** `#42505`_: (`ikogan`_) selinux.fcontext_policy_present exception looking for selinux.filetype_id_to_string (refs: `#43068`_) + +* **PR** `#43142`_: (`rallytime`_) Back-port `#43068`_ to 2017.7 + @ *2017-08-23 15:56:48 UTC* + + * **PR** `#43068`_: (`ixs`_) Mark selinux._filetype_id_to_string as public function (refs: `#43142`_) + + * 5a4fc07863 Merge pull request `#43142`_ from rallytime/bp-43068 - - **ISSUE** `#42505`_: (*ikogan*) selinux.fcontext_policy_present exception looking for selinux.filetype_id_to_string - | refs: `#43068`_ - - **PR** `#43068`_: (*ixs*) Mark selinux._filetype_id_to_string as public function - | refs: `#43142`_ - * 5a4fc07863 Merge pull request `#43142`_ from rallytime/`bp-43068`_ * efc1c8c506 Mark selinux._filetype_id_to_string as public function -- **PR** `#43038`_: (*twangboy*) Fix `unit.utils.test_url` for Windows - @ *2017-08-23T13:35:25Z* +* **PR** `#43038`_: (`twangboy`_) Fix `unit.utils.test_url` for Windows + @ *2017-08-23 13:35:25 UTC* * 0467a0e3bf Merge pull request `#43038`_ from twangboy/win_unit_utils_test_url + * 7f5ee55f57 Fix `unit.utils.test_url` for Windows -- **PR** `#43097`_: (*twangboy*) Fix `group.present` for Windows - @ *2017-08-23T13:19:56Z* +* **PR** `#43097`_: (`twangboy`_) Fix `group.present` for Windows + @ *2017-08-23 13:19:56 UTC* * e9ccaa61d2 Merge pull request `#43097`_ from twangboy/win_fix_group + * 43b0360763 Fix lint * 9ffe315d7d Add kwargs * 4f4e34c79f Fix group state for Windows -- **PR** `#43115`_: (*rallytime*) Back-port `#42067`_ to 2017.7 - @ *2017-08-22T20:09:52Z* +* **PR** `#43115`_: (`rallytime`_) Back-port `#42067`_ to 2017.7 + @ *2017-08-22 20:09:52 UTC* + + * **PR** `#42067`_: (`vitaliyf`_) Removed several uses of name.split('.')[0] in SoftLayer driver. (refs: `#43115`_) + + * 8140855627 Merge pull request `#43115`_ from rallytime/bp-42067 - - **PR** `#42067`_: (*vitaliyf*) Removed several uses of name.split('.')[0] in SoftLayer driver. - | refs: `#43115`_ - * 8140855627 Merge pull request `#43115`_ from rallytime/`bp-42067`_ * 8a6ad0a9cf Fixed typo. * 9a5ae2bba1 Removed several uses of name.split('.')[0] in SoftLayer driver. -- **PR** `#42962`_: (*twangboy*) Fix `unit.test_doc test` for Windows - @ *2017-08-22T18:06:23Z* +* **PR** `#42962`_: (`twangboy`_) Fix `unit.test_doc test` for Windows + @ *2017-08-22 18:06:23 UTC* * 1e1a81036c Merge pull request `#42962`_ from twangboy/win_unit_test_doc + * 201ceae4c4 Fix lint, remove debug statement * 37029c1a16 Fix unit.test_doc test -- **PR** `#42995`_: (*twangboy*) Fix malformed requisite for Windows - @ *2017-08-22T16:50:01Z* +* **PR** `#42995`_: (`twangboy`_) Fix malformed requisite for Windows + @ *2017-08-22 16:50:01 UTC* * d347d1cf8f Merge pull request `#42995`_ from twangboy/win_fix_invalid_requisite + * 93390de88b Fix malformed requisite for Windows -- **PR** `#43108`_: (*rallytime*) Back-port `#42988`_ to 2017.7 - @ *2017-08-22T16:49:27Z* +* **PR** `#43108`_: (`rallytime`_) Back-port `#42988`_ to 2017.7 + @ *2017-08-22 16:49:27 UTC* + + * **PR** `#42988`_: (`thusoy`_) Fix broken negation in iptables (refs: `#43108`_) + + * 1c7992a832 Merge pull request `#43108`_ from rallytime/bp-42988 - - **PR** `#42988`_: (*thusoy*) Fix broken negation in iptables - | refs: `#43108`_ - * 1c7992a832 Merge pull request `#43108`_ from rallytime/`bp-42988`_ * 1a987cb948 Fix broken negation in iptables -- **PR** `#43107`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-08-22T16:11:25Z* +* **PR** `#43107`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-08-22 16:11:25 UTC* - - **ISSUE** `#42869`_: (*abednarik*) Git Module : Failed to update repository - | refs: `#43064`_ - - **ISSUE** `#42041`_: (*lorengordon*) pkg.list_repo_pkgs fails to find pkgs with spaces around yum repo enabled value - | refs: `#43054`_ - - **ISSUE** `#15171`_: (*JensRantil*) Maximum recursion limit hit related to requisites - | refs: `#42985`_ - - **PR** `#43092`_: (*blarghmatey*) Fixed issue with silently passing all tests in Testinfra module - - **PR** `#43064`_: (*terminalmage*) Fix race condition in git.latest - - **PR** `#43060`_: (*twangboy*) Osx update pkg scripts - - **PR** `#43054`_: (*lorengordon*) Uses ConfigParser to read yum config files - - **PR** `#42985`_: (*DmitryKuzmenko*) Properly handle `prereq` having lost requisites. - - **PR** `#42045`_: (*arount*) Fix: salt.modules.yumpkg: ConfigParser to read ini like files. - | refs: `#43054`_ * c6993f4a84 Merge pull request `#43107`_ from rallytime/merge-2017.7 + * 328dd6aa23 Merge branch '2016.11' into '2017.7' * e2bf2f448e Merge pull request `#42985`_ from DSRCorporation/bugs/15171_recursion_limit @@ -580,44 +595,50 @@ Changes * ca1b1bb633 use configparser to parse yum repo file -- **PR** `#42996`_: (*twangboy*) Fix `unit.test_stateconf` for Windows - @ *2017-08-21T22:43:58Z* +* **PR** `#42996`_: (`twangboy`_) Fix `unit.test_stateconf` for Windows + @ *2017-08-21 22:43:58 UTC* * f9b4976c02 Merge pull request `#42996`_ from twangboy/win_fix_test_stateconf + * 92dc3c0ece Use os.sep for path -- **PR** `#43024`_: (*twangboy*) Fix `unit.utils.test_find` for Windows - @ *2017-08-21T22:38:10Z* +* **PR** `#43024`_: (`twangboy`_) Fix `unit.utils.test_find` for Windows + @ *2017-08-21 22:38:10 UTC* * 19fc644c9b Merge pull request `#43024`_ from twangboy/win_unit_utils_test_find + * fbe54c9a33 Remove unused import six (lint) * b04d1a2f18 Fix `unit.utils.test_find` for Windows -- **PR** `#43088`_: (*gtmanfred*) allow docker util to be reloaded with reload_modules - @ *2017-08-21T22:14:37Z* +* **PR** `#43088`_: (`gtmanfred`_) allow docker util to be reloaded with reload_modules + @ *2017-08-21 22:14:37 UTC* * 1a531169fc Merge pull request `#43088`_ from gtmanfred/2017.7 + * 373a9a0be4 allow docker util to be reloaded with reload_modules -- **PR** `#43091`_: (*blarghmatey*) Fixed issue with silently passing all tests in Testinfra module - @ *2017-08-21T22:06:22Z* +* **PR** `#43091`_: (`blarghmatey`_) Fixed issue with silently passing all tests in Testinfra module + @ *2017-08-21 22:06:22 UTC* * 83e528f0b3 Merge pull request `#43091`_ from mitodl/2017.7 + * b502560e61 Fixed issue with silently passing all tests in Testinfra module -- **PR** `#41994`_: (*twangboy*) Fix `unit.modules.test_cmdmod` on Windows - @ *2017-08-21T21:53:01Z* +* **PR** `#41994`_: (`twangboy`_) Fix `unit.modules.test_cmdmod` on Windows + @ *2017-08-21 21:53:01 UTC* * 5482524270 Merge pull request `#41994`_ from twangboy/win_unit_test_cmdmod + * a5f7288ad9 Skip test that uses pwd, not available on Windows -- **PR** `#42933`_: (*garethgreenaway*) Fixes to osquery module - @ *2017-08-21T20:48:31Z* +* **ISSUE** `#42873`_: (`TheVakman`_) osquery Data Empty Upon Return / Reporting Not Installed (refs: `#42933`_) + +* **PR** `#42933`_: (`garethgreenaway`_) Fixes to osquery module + @ *2017-08-21 20:48:31 UTC* - - **ISSUE** `#42873`_: (*TheVakman*) osquery Data Empty Upon Return / Reporting Not Installed - | refs: `#42933`_ * b33c4abc15 Merge pull request `#42933`_ from garethgreenaway/42873_2017_7_osquery_fix + * 8915e62bd9 Removing an import that is not needed. * 74bc377eb4 Updating the other function that uses cmd.run_all @@ -626,87 +647,65 @@ Changes * 5ac41f496d When running osquery commands through cmd.run we should pass python_shell=True to ensure everything is formatted right. `#42873`_ -- **PR** `#43093`_: (*gtmanfred*) Fix ec2 list_nodes_full to work on 2017.7 - @ *2017-08-21T20:21:21Z* +* **PR** `#43093`_: (`gtmanfred`_) Fix ec2 list_nodes_full to work on 2017.7 + @ *2017-08-21 20:21:21 UTC* * 53c2115769 Merge pull request `#43093`_ from gtmanfred/ec2 + * c7cffb5a04 This block isn't necessary * b7283bcc6f _vm_provider_driver isn't needed anymore -- **PR** `#43087`_: (*rallytime*) Back-port `#42174`_ to 2017.7 - @ *2017-08-21T18:40:18Z* +* **ISSUE** `#43085`_: (`brejoc`_) Patch for Kubernetes module missing from 2017.7 and 2017.7.1 (refs: `#43087`_) + +* **PR** `#43087`_: (`rallytime`_) Back-port `#42174`_ to 2017.7 + @ *2017-08-21 18:40:18 UTC* + + * **PR** `#42174`_: (`mcalmer`_) kubernetes: provide client certificate authentication (refs: `#43087`_) + + * 32f9ade4db Merge pull request `#43087`_ from rallytime/bp-42174 - - **ISSUE** `#43085`_: (*brejoc*) Patch for Kubernetes module missing from 2017.7 and 2017.7.1 - | refs: `#43087`_ - - **PR** `#42174`_: (*mcalmer*) kubernetes: provide client certificate authentication - | refs: `#43087`_ - * 32f9ade4db Merge pull request `#43087`_ from rallytime/`bp-42174`_ * cf6563645b add support for certificate authentication to kubernetes module -- **PR** `#43029`_: (*terminalmage*) Normalize the salt caching API - @ *2017-08-21T16:54:58Z* +* **PR** `#43029`_: (`terminalmage`_) Normalize the salt caching API + @ *2017-08-21 16:54:58 UTC* * 882fcd846f Merge pull request `#43029`_ from terminalmage/fix-func-alias + * f8f74a310c Update localfs cache tests to reflect changes to func naming * c4ae79b229 Rename other refs to cache.ls with cache.list * ee59d127e8 Normalize the salt caching API -- **PR** `#43039`_: (*gtmanfred*) catch ImportError for kubernetes.client import - @ *2017-08-21T14:32:38Z* +* **ISSUE** `#42843`_: (`brejoc`_) Kubernetes module won't work with Kubernetes Python client > 1.0.2 (refs: `#42845`_) + +* **PR** `#43039`_: (`gtmanfred`_) catch ImportError for kubernetes.client import + @ *2017-08-21 14:32:38 UTC* + + * **PR** `#42845`_: (`brejoc`_) API changes for Kubernetes version 2.0.0 (refs: `#43039`_) - - **ISSUE** `#42843`_: (*brejoc*) Kubernetes module won't work with Kubernetes Python client > 1.0.2 - | refs: `#42845`_ - - **PR** `#42845`_: (*brejoc*) API changes for Kubernetes version 2.0.0 - | refs: `#43039`_ * dbee735f6e Merge pull request `#43039`_ from gtmanfred/kube + * 7e269cb368 catch ImportError for kubernetes.client import -- **PR** `#43058`_: (*rallytime*) Update release version number for jenkins.run function - @ *2017-08-21T14:13:34Z* +* **PR** `#43058`_: (`rallytime`_) Update release version number for jenkins.run function + @ *2017-08-21 14:13:34 UTC* * c56a8499b3 Merge pull request `#43058`_ from rallytime/fix-release-num + * d7eef70df0 Update release version number for jenkins.run function -- **PR** `#43051`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-08-18T17:05:57Z* +* **PR** `#43051`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-08-18 17:05:57 UTC* - - **ISSUE** `#42992`_: (*pabloh007*) docker.save flag push does is ignored - - **ISSUE** `#42627`_: (*taigrrr8*) salt-cp no longer works. Was working a few months back. - | refs: `#42890`_ - - **ISSUE** `#40490`_: (*alxwr*) saltstack x509 incompatible to m2crypto 0.26.0 - | refs: `#42760`_ - - **PR** `#43048`_: (*rallytime*) Back-port `#43031`_ to 2016.11 - - **PR** `#43033`_: (*rallytime*) Back-port `#42760`_ to 2016.11 - - **PR** `#43032`_: (*rallytime*) Back-port `#42547`_ to 2016.11 - - **PR** `#43031`_: (*gtmanfred*) use a ruby gem that doesn't have dependencies - | refs: `#43048`_ - - **PR** `#43027`_: (*pabloh007*) Fixes ignore push flag for docker.push module issue `#42992`_ - - **PR** `#43026`_: (*rallytime*) Back-port `#43020`_ to 2016.11 - - **PR** `#43023`_: (*terminalmage*) Fixes/improvements to Jenkins state/module - - **PR** `#43021`_: (*terminalmage*) Use socket.AF_INET6 to get the correct value instead of doing an OS check - - **PR** `#43020`_: (*gtmanfred*) test with gem that appears to be abandoned - | refs: `#43026`_ - - **PR** `#43019`_: (*rallytime*) Update bootstrap script to latest stable: v2017.08.17 - - **PR** `#43014`_: (*Ch3LL*) Change AF_INET6 family for mac in test_host_to_ips - | refs: `#43021`_ - - **PR** `#43009`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - - **PR** `#42954`_: (*Ch3LL*) [2016.3] Bump latest and previous versions - - **PR** `#42949`_: (*Ch3LL*) Add Security Notice to 2016.3.7 Release Notes - - **PR** `#42942`_: (*Ch3LL*) [2016.3] Add clean_id function to salt.utils.verify.py - - **PR** `#42890`_: (*DmitryKuzmenko*) Make chunked mode in salt-cp optional - - **PR** `#42760`_: (*AFriemann*) Catch TypeError thrown by m2crypto when parsing missing subjects in c… - | refs: `#43033`_ - - **PR** `#42547`_: (*blarghmatey*) Updated testinfra modules to work with more recent versions - | refs: `#43032`_ * 7b0c94768a Merge pull request `#43051`_ from rallytime/merge-2017.7 + * 153a463b86 Lint: Add missing blank line * 84829a6f8c Merge branch '2016.11' into '2017.7' - * 43aa46f512 Merge pull request `#43048`_ from rallytime/`bp-43031`_ + * 43aa46f512 Merge pull request `#43048`_ from rallytime/bp-43031 * 35e45049e2 use a ruby gem that doesn't have dependencies @@ -718,19 +717,19 @@ Changes * 822eabcc81 Catch exceptions raised when making changes to jenkins - * 91b583b493 Improve and correct execption raising + * 91b583b493 Improve and correct exception raising * f096917a0e Raise an exception if we fail to cache the config xml - * 2957467ed7 Merge pull request `#43026`_ from rallytime/`bp-43020`_ + * 2957467ed7 Merge pull request `#43026`_ from rallytime/bp-43020 * 0eb15a1f67 test with gem that appears to be abandoned - * 4150b094fe Merge pull request `#43033`_ from rallytime/`bp-42760`_ + * 4150b094fe Merge pull request `#43033`_ from rallytime/bp-42760 * 3e3f7f5d8e Catch TypeError thrown by m2crypto when parsing missing subjects in certificate files. - * b124d3667e Merge pull request `#43032`_ from rallytime/`bp-42547`_ + * b124d3667e Merge pull request `#43032`_ from rallytime/bp-42547 * ea4d7f4176 Updated testinfra modules to work with more recent versions @@ -784,124 +783,106 @@ Changes * b8eee4401e Change AF_INET6 family for mac in test_host_to_ips -- **PR** `#43035`_: (*rallytime*) [2017.7] Merge forward from 2017.7.1 to 2017.7 - @ *2017-08-18T12:58:17Z* +* **PR** `#43035`_: (`rallytime`_) [2017.7] Merge forward from 2017.7.1 to 2017.7 + @ *2017-08-18 12:58:17 UTC* + + * **PR** `#42948`_: (`Ch3LL`_) [2017.7.1] Add clean_id function to salt.utils.verify.py (refs: `#43035`_) + + * **PR** `#42945`_: (`Ch3LL`_) [2017.7] Add clean_id function to salt.utils.verify.py (refs: `#43035`_) - - **PR** `#42948`_: (*Ch3LL*) [2017.7.1] Add clean_id function to salt.utils.verify.py - | refs: `#43035`_ - - **PR** `#42945`_: (*Ch3LL*) [2017.7] Add clean_id function to salt.utils.verify.py - | refs: `#43035`_ * d15b0ca937 Merge pull request `#43035`_ from rallytime/merge-2017.7 + * 756128a896 Merge branch '2017.7.1' into '2017.7' * ab1b099730 Merge pull request `#42948`_ from Ch3LL/2017.7.0_follow_up -- **PR** `#43034`_: (*rallytime*) Back-port `#43002`_ to 2017.7 - @ *2017-08-17T23:18:16Z* +* **ISSUE** `#42989`_: (`blbradley`_) GitFS GitPython performance regression in 2017.7.1 (refs: `#43002`_) + +* **PR** `#43034`_: (`rallytime`_) Back-port `#43002`_ to 2017.7 + @ *2017-08-17 23:18:16 UTC* + + * **PR** `#43002`_: (`the-glu`_) Try to fix `#42989`_ (refs: `#43034`_) + + * bcbb973a71 Merge pull request `#43034`_ from rallytime/bp-43002 - - **ISSUE** `#42989`_: (*blbradley*) GitFS GitPython performance regression in 2017.7.1 - | refs: `#43002`_ `#43002`_ - - **PR** `#43002`_: (*the-glu*) Try to fix `#42989`_ - | refs: `#43034`_ - * bcbb973a71 Merge pull request `#43034`_ from rallytime/`bp-43002`_ * 350c0767dc Try to fix `#42989`_ by doing sslVerify and refspecs for origin remote only if there is no remotes -- **PR** `#42958`_: (*gtmanfred*) runit module should also be loaded as runit - @ *2017-08-17T22:30:23Z* +* **ISSUE** `#42375`_: (`dragonpaw`_) salt.modules.*.__virtualname__ doens't work as documented. (refs: `#42523`_, `#42958`_) + +* **PR** `#42958`_: (`gtmanfred`_) runit module should also be loaded as runit + @ *2017-08-17 22:30:23 UTC* - - **ISSUE** `#42375`_: (*dragonpaw*) salt.modules.*.__virtualname__ doens't work as documented. - | refs: `#42523`_ `#42958`_ * 9182f55bbb Merge pull request `#42958`_ from gtmanfred/2017.7 + * fd6874668b runit module should also be loaded as runit -- **PR** `#43031`_: (*gtmanfred*) use a ruby gem that doesn't have dependencies - | refs: `#43048`_ - @ *2017-08-17T22:26:25Z* +* **PR** `#43031`_: (`gtmanfred`_) use a ruby gem that doesn't have dependencies (refs: `#43048`_) + @ *2017-08-17 22:26:25 UTC* * 5985cc4e8e Merge pull request `#43031`_ from gtmanfred/test_gem + * ba80a7d4b5 use a ruby gem that doesn't have dependencies -- **PR** `#43030`_: (*rallytime*) Small cleanup to dockermod.save - @ *2017-08-17T22:26:00Z* +* **PR** `#43030`_: (`rallytime`_) Small cleanup to dockermod.save + @ *2017-08-17 22:26:00 UTC* * 246176b1a6 Merge pull request `#43030`_ from rallytime/dockermod-minor-change + * d6a5e85632 Small cleanup to dockermod.save -- **PR** `#42993`_: (*pabloh007*) Fixes ignored push flag for docker.push module issue `#42992`_ - @ *2017-08-17T18:50:37Z* +* **ISSUE** `#42992`_: (`pabloh007`_) docker.save flag push does is ignored (refs: `#42993`_, `#43027`_) + +* **PR** `#42993`_: (`pabloh007`_) Fixes ignored push flag for docker.push module issue `#42992`_ + @ *2017-08-17 18:50:37 UTC* - - **ISSUE** `#42992`_: (*pabloh007*) docker.save flag push does is ignored * 160001120b Merge pull request `#42993`_ from pabloh007/fix-docker-save-push + * fe7554cfeb Fixes ignored push flag for docker.push module issue `#42992`_ -- **PR** `#42967`_: (*terminalmage*) Fix bug in on_header callback when no Content-Type is found in headers - @ *2017-08-17T18:48:52Z* +* **ISSUE** `#42941`_: (`danlsgiga`_) pkg.installed fails on installing from HTTPS rpm source (refs: `#42967`_) + +* **PR** `#42967`_: (`terminalmage`_) Fix bug in on_header callback when no Content-Type is found in headers + @ *2017-08-17 18:48:52 UTC* - - **ISSUE** `#42941`_: (*danlsgiga*) pkg.installed fails on installing from HTTPS rpm source - | refs: `#42967`_ * 9009a971b1 Merge pull request `#42967`_ from terminalmage/issue42941 + * b838460816 Fix bug in on_header callback when no Content-Type is found in headers -- **PR** `#43016`_: (*gtmanfred*) service should return false on exception - @ *2017-08-17T18:08:05Z* +* **ISSUE** `#43008`_: (`evelineraine`_) states.service.running always succeeds when watched state has changes (refs: `#43016`_) + +* **PR** `#43016`_: (`gtmanfred`_) service should return false on exception + @ *2017-08-17 18:08:05 UTC* - - **ISSUE** `#43008`_: (*fillarios*) states.service.running always succeeds when watched state has changes - | refs: `#43016`_ * 58f070d7a7 Merge pull request `#43016`_ from gtmanfred/service + * 21c264fe55 service should return false on exception -- **PR** `#43020`_: (*gtmanfred*) test with gem that appears to be abandoned - | refs: `#43026`_ - @ *2017-08-17T16:40:41Z* +* **PR** `#43020`_: (`gtmanfred`_) test with gem that appears to be abandoned (refs: `#43026`_) + @ *2017-08-17 16:40:41 UTC* * 973d288eca Merge pull request `#43020`_ from gtmanfred/test_gem + * 0a1f40a664 test with gem that appears to be abandoned -- **PR** `#42999`_: (*garethgreenaway*) Fixes to slack engine - @ *2017-08-17T15:46:24Z* +* **PR** `#42999`_: (`garethgreenaway`_) Fixes to slack engine + @ *2017-08-17 15:46:24 UTC* * 9cd0607fd4 Merge pull request `#42999`_ from garethgreenaway/slack_engine_allow_editing_messages + * 0ece2a8f0c Fixing a bug that prevented editing Slack messages and having the commands resent to the Slack engine. -- **PR** `#43010`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-08-17T15:10:29Z* +* **PR** `#43010`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-08-17 15:10:29 UTC* - - **ISSUE** `#42803`_: (*gmcwhistler*) master_type: str, not working as expected, parent salt-minion process dies. - | refs: `#42848`_ - - **ISSUE** `#42753`_: (*grichmond-salt*) SaltReqTimeout Error on Some Minions when One Master in a Multi-Master Configuration is Unavailable - | refs: `#42848`_ - - **ISSUE** `#42644`_: (*stamak*) nova salt-cloud -P Private IPs returned, but not public. Checking for misidentified IPs - | refs: `#42940`_ - - **ISSUE** `#38839`_: (*DaveOHenry*) Invoking runner.cloud.action via reactor sls fails - | refs: `#42291`_ - - **PR** `#42968`_: (*vutny*) [DOCS] Fix link to Salt Cloud Feature Matrix - - **PR** `#42959`_: (*rallytime*) Back-port `#42883`_ to 2016.11 - - **PR** `#42952`_: (*Ch3LL*) [2016.11] Bump latest and previous versions - - **PR** `#42950`_: (*Ch3LL*) Add Security Notice to 2016.11.7 Release Notes - - **PR** `#42944`_: (*Ch3LL*) [2016.11] Add clean_id function to salt.utils.verify.py - - **PR** `#42940`_: (*gtmanfred*) create new ip address before checking list of allocated ips - - **PR** `#42919`_: (*rallytime*) Back-port `#42871`_ to 2016.11 - - **PR** `#42918`_: (*rallytime*) Back-port `#42848`_ to 2016.11 - - **PR** `#42883`_: (*rallytime*) Fix failing boto tests - | refs: `#42959`_ - - **PR** `#42871`_: (*amalleo25*) Update joyent.rst - | refs: `#42919`_ - - **PR** `#42861`_: (*twangboy*) Fix pkg.install salt-minion using salt-call - - **PR** `#42848`_: (*DmitryKuzmenko*) Execute fire_master asynchronously in the main minion thread. - | refs: `#42918`_ - - **PR** `#42836`_: (*aneeshusa*) Backport salt.utils.versions from develop to 2016.11 - - **PR** `#42835`_: (*aneeshusa*) Fix typo in utils/versions.py module - | refs: `#42836`_ - - **PR** `#42798`_: (*s-sebastian*) Update return data before calling returners - - **PR** `#42291`_: (*vutny*) Fix `#38839`_: remove `state` from Reactor runner kwags * 31627a9163 Merge pull request `#43010`_ from rallytime/merge-2017.7 + * 8a0f948e4a Merge branch '2016.11' into '2017.7' * 1ee9499d28 Merge pull request `#42968`_ from vutny/doc-salt-cloud-ref * 44ed53b1df [DOCS] Fix link to Salt Cloud Feature Matrix - * 923f9741fe Merge pull request `#42291`_ from vutny/`fix-38839`_ + * 923f9741fe Merge pull request `#42291`_ from vutny/fix-38839 * 5f8f98a01f Fix `#38839`_: remove `state` from Reactor runner kwags @@ -911,7 +892,7 @@ Changes * bd63074e7a create new ip address before checking list of allocated ips - * d6496eca72 Merge pull request `#42959`_ from rallytime/`bp-42883`_ + * d6496eca72 Merge pull request `#42959`_ from rallytime/bp-42883 * c6b9ca4b9e Lint fix: add missing space @@ -941,11 +922,11 @@ Changes * 86ce7004a2 Backport salt.utils.versions from develop to 2016.11 - * 64a79dd5ac Merge pull request `#42919`_ from rallytime/`bp-42871`_ + * 64a79dd5ac Merge pull request `#42919`_ from rallytime/bp-42871 * 4e46c968e6 Update joyent.rst - * bea8ec1098 Merge pull request `#42918`_ from rallytime/`bp-42848`_ + * bea8ec1098 Merge pull request `#42918`_ from rallytime/bp-42848 * cdb48126f7 Make lint happier. @@ -959,176 +940,181 @@ Changes * 1cc86592ed Update return data before calling returners -- **PR** `#42884`_: (*Giandom*) Convert to dict type the pillar string value passed from slack - @ *2017-08-16T22:30:43Z* +* **ISSUE** `#42842`_: (`Giandom`_) retreive kwargs passed with slack engine (refs: `#42884`_) + +* **PR** `#42884`_: (`Giandom`_) Convert to dict type the pillar string value passed from slack + @ *2017-08-16 22:30:43 UTC* - - **ISSUE** `#42842`_: (*Giandom*) retrieve kwargs passed with slack engine - | refs: `#42884`_ * 82be9dceb6 Merge pull request `#42884`_ from Giandom/2017.7.1-fix-slack-engine-pillar-args + * 80fd733c99 Update slack.py -- **PR** `#42963`_: (*twangboy*) Fix `unit.test_fileclient` for Windows - @ *2017-08-16T14:18:18Z* +* **PR** `#42963`_: (`twangboy`_) Fix `unit.test_fileclient` for Windows + @ *2017-08-16 14:18:18 UTC* * 42bd553b98 Merge pull request `#42963`_ from twangboy/win_unit_test_fileclient + * e9febe4893 Fix unit.test_fileclient -- **PR** `#42964`_: (*twangboy*) Fix `salt.utils.recursive_copy` for Windows - @ *2017-08-16T14:17:27Z* +* **PR** `#42964`_: (`twangboy`_) Fix `salt.utils.recursive_copy` for Windows + @ *2017-08-16 14:17:27 UTC* * 7dddeeea8d Merge pull request `#42964`_ from twangboy/win_fix_recursive_copy + * 121cd4ef81 Fix `salt.utils.recursive_copy` for Windows -- **PR** `#42946`_: (*mirceaulinic*) extension_modules should default to $CACHE_DIR/proxy/extmods - @ *2017-08-15T21:26:36Z* +* **ISSUE** `#42943`_: (`mirceaulinic`_) `extension_modules` defaulting to `/var/cache/minion` although running under proxy minion (refs: `#42946`_) + +* **PR** `#42946`_: (`mirceaulinic`_) extension_modules should default to $CACHE_DIR/proxy/extmods + @ *2017-08-15 21:26:36 UTC* - - **ISSUE** `#42943`_: (*mirceaulinic*) `extension_modules` defaulting to `/var/cache/minion` although running under proxy minion - | refs: `#42946`_ * 6da4d1d95e Merge pull request `#42946`_ from cloudflare/px_extmods_42943 + * 73f9135340 extension_modules should default to /proxy/extmods -- **PR** `#42945`_: (*Ch3LL*) [2017.7] Add clean_id function to salt.utils.verify.py - | refs: `#43035`_ - @ *2017-08-15T18:04:20Z* +* **PR** `#42945`_: (`Ch3LL`_) [2017.7] Add clean_id function to salt.utils.verify.py (refs: `#43035`_) + @ *2017-08-15 18:04:20 UTC* * 95645d49f9 Merge pull request `#42945`_ from Ch3LL/2017.7.0_follow_up + * dcd92042e3 remove extra doc * 693a504ef0 update release notes with cve number -- **PR** `#42812`_: (*terminalmage*) Update custom YAML loader tests to properly test unicode literals - @ *2017-08-15T17:50:22Z* +* **ISSUE** `#42427`_: (`grichmond-salt`_) Issue Passing Variables created from load_json as Inline Pillar Between States (refs: `#42435`_) + +* **PR** `#42812`_: (`terminalmage`_) Update custom YAML loader tests to properly test unicode literals + @ *2017-08-15 17:50:22 UTC* + + * **PR** `#42435`_: (`terminalmage`_) Modify our custom YAML loader to treat unicode literals as unicode strings (refs: `#42812`_) - - **ISSUE** `#42427`_: (*grichmond-salt*) Issue Passing Variables created from load_json as Inline Pillar Between States - | refs: `#42435`_ - - **PR** `#42435`_: (*terminalmage*) Modify our custom YAML loader to treat unicode literals as unicode strings - | refs: `#42812`_ * 47ff9d5627 Merge pull request `#42812`_ from terminalmage/yaml-loader-tests + * 9d8486a894 Add test for custom YAML loader with unicode literal strings * a0118bcece Remove bytestrings and use textwrap.dedent for readability -- **PR** `#42953`_: (*Ch3LL*) [2017.7] Bump latest and previous versions - @ *2017-08-15T17:23:28Z* +* **PR** `#42953`_: (`Ch3LL`_) [2017.7] Bump latest and previous versions + @ *2017-08-15 17:23:28 UTC* * 5d0c2198ac Merge pull request `#42953`_ from Ch3LL/latest_2017.7 + * cbecf65823 [2017.7] Bump latest and previous versions -- **PR** `#42951`_: (*Ch3LL*) Add Security Notice to 2017.7.1 Release Notes - @ *2017-08-15T16:49:56Z* +* **PR** `#42951`_: (`Ch3LL`_) Add Security Notice to 2017.7.1 Release Notes + @ *2017-08-15 16:49:56 UTC* * 730e71db17 Merge pull request `#42951`_ from Ch3LL/2017.7.1_docs + * 1d8f827c58 Add Security Notice to 2017.7.1 Release Notes -- **PR** `#42868`_: (*carsonoid*) Stub out required functions in redis_cache - @ *2017-08-15T14:33:54Z* +* **PR** `#42868`_: (`carsonoid`_) Stub out required functions in redis_cache + @ *2017-08-15 14:33:54 UTC* * c1c8cb9bfa Merge pull request `#42868`_ from carsonoid/redisjobcachefix + * 885bee2a7d Stub out required functions for redis cache -- **PR** `#42810`_: (*amendlik*) Ignore error values when listing Windows SNMP community strings - @ *2017-08-15T03:55:15Z* +* **PR** `#42810`_: (`amendlik`_) Ignore error values when listing Windows SNMP community strings + @ *2017-08-15 03:55:15 UTC* * e192d6e0af Merge pull request `#42810`_ from amendlik/win-snmp-community + * dc20e4651b Ignore error values when listing Windows SNMP community strings -- **PR** `#42920`_: (*cachedout*) pid_race - @ *2017-08-15T03:49:10Z* +* **PR** `#42920`_: (`cachedout`_) pid_race + @ *2017-08-15 03:49:10 UTC* * a1817f1de3 Merge pull request `#42920`_ from cachedout/pid_race + * 5e930b8cbd If we catch the pid file in a transistory state, return None -- **PR** `#42925`_: (*terminalmage*) Add debug logging to troubleshoot test failures - @ *2017-08-15T03:47:51Z* +* **PR** `#42925`_: (`terminalmage`_) Add debug logging to troubleshoot test failures + @ *2017-08-15 03:47:51 UTC* * 11a33fe692 Merge pull request `#42925`_ from terminalmage/f26-debug-logging + * 8165f46165 Add debug logging to troubleshoot test failures -- **PR** `#42913`_: (*twangboy*) Change service shutdown timeouts for salt-minion service (Windows) - @ *2017-08-14T20:55:24Z* +* **PR** `#42913`_: (`twangboy`_) Change service shutdown timeouts for salt-minion service (Windows) + @ *2017-08-14 20:55:24 UTC* * a537197030 Merge pull request `#42913`_ from twangboy/win_change_timeout + * ffb23fbe47 Remove the line that wipes out the cache * a3becf8342 Change service shutdown timeouts -- **PR** `#42800`_: (*skizunov*) Fix exception when master_type=disable - @ *2017-08-14T20:53:38Z* +* **PR** `#42800`_: (`skizunov`_) Fix exception when master_type=disable + @ *2017-08-14 20:53:38 UTC* * ca0555f616 Merge pull request `#42800`_ from skizunov/develop6 + * fa5822009f Fix exception when master_type=disable -- **PR** `#42679`_: (*mirceaulinic*) Add multiprocessing option for NAPALM proxy - @ *2017-08-14T20:45:06Z* +* **PR** `#42679`_: (`mirceaulinic`_) Add multiprocessing option for NAPALM proxy + @ *2017-08-14 20:45:06 UTC* * 3af264b664 Merge pull request `#42679`_ from cloudflare/napalm-multiprocessing + * 9c4566db0c multiprocessing option tagged for 2017.7.2 * 37bca1b902 Add multiprocessing option for NAPALM proxy * a2565ba8e5 Add new napalm option: multiprocessing -- **PR** `#42657`_: (*nhavens*) back-port `#42612`_ to 2017.7 - @ *2017-08-14T19:42:26Z* +* **ISSUE** `#42611`_: (`nhavens`_) selinux.boolean state does not return changes (refs: `#42612`_) + +* **PR** `#42657`_: (`nhavens`_) back-port `#42612`_ to 2017.7 + @ *2017-08-14 19:42:26 UTC* + + * **PR** `#42612`_: (`nhavens`_) fix for issue `#42611`_ (refs: `#42657`_) - - **ISSUE** `#42611`_: (*nhavens*) selinux.boolean state does not return changes - | refs: `#42612`_ - - **PR** `#42612`_: (*nhavens*) fix for issue `#42611`_ - | refs: `#42657`_ * 4fcdab3ae9 Merge pull request `#42657`_ from nhavens/2017.7 + * d73c4b55b7 back-port `#42612`_ to 2017.7 -- **PR** `#42709`_: (*whiteinge*) Add token_expire_user_override link to auth runner docstring - @ *2017-08-14T19:03:06Z* +* **PR** `#42709`_: (`whiteinge`_) Add token_expire_user_override link to auth runner docstring + @ *2017-08-14 19:03:06 UTC* * d2b6ce327a Merge pull request `#42709`_ from whiteinge/doc-token_expire_user_override + * c7ea631558 Add more docs on the token_expire param * 4a9f6ba44f Add token_expire_user_override link to auth runner docstring -- **PR** `#42848`_: (*DmitryKuzmenko*) Execute fire_master asynchronously in the main minion thread. - | refs: `#42918`_ - @ *2017-08-14T18:28:38Z* +* **ISSUE** `#42803`_: (`gmcwhistler`_) master_type: str, not working as expected, parent salt-minion process dies. (refs: `#42848`_) + +* **ISSUE** `#42753`_: (`grichmond-salt`_) SaltReqTimeout Error on Some Minions when One Master in a Multi-Master Configuration is Unavailable (refs: `#42848`_) + +* **PR** `#42848`_: (`DmitryKuzmenko`_) Execute fire_master asynchronously in the main minion thread. (refs: `#42918`_) + @ *2017-08-14 18:28:38 UTC* - - **ISSUE** `#42803`_: (*gmcwhistler*) master_type: str, not working as expected, parent salt-minion process dies. - | refs: `#42848`_ - - **ISSUE** `#42753`_: (*grichmond-salt*) SaltReqTimeout Error on Some Minions when One Master in a Multi-Master Configuration is Unavailable - | refs: `#42848`_ * c6a7bf02e9 Merge pull request `#42848`_ from DSRCorporation/bugs/42753_mmaster_timeout + * 7f5412c19e Make lint happier. * ff66b7aaf0 Execute fire_master asynchronously in the main minion thread. -- **PR** `#42911`_: (*gtmanfred*) cloud driver isn't a provider - @ *2017-08-14T17:47:16Z* +* **PR** `#42911`_: (`gtmanfred`_) cloud driver isn't a provider + @ *2017-08-14 17:47:16 UTC* * 6a3279ea50 Merge pull request `#42911`_ from gtmanfred/2017.7 + * 99046b441f cloud driver isn't a provider -- **PR** `#42860`_: (*skizunov*) hash_and_stat_file should return a 2-tuple - @ *2017-08-14T15:44:54Z* +* **PR** `#42860`_: (`skizunov`_) hash_and_stat_file should return a 2-tuple + @ *2017-08-14 15:44:54 UTC* * 4456f7383d Merge pull request `#42860`_ from skizunov/develop7 + * 5f85a03636 hash_and_stat_file should return a 2-tuple -- **PR** `#42889`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-08-14T14:16:20Z* +* **PR** `#42889`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-08-14 14:16:20 UTC* - - **ISSUE** `#41976`_: (*abulford*) dockerng network states do not respect test=True - | refs: `#41977`_ `#41977`_ - - **ISSUE** `#41770`_: (*Ch3LL*) NPM v5 incompatible with salt.modules.cache_list - | refs: `#42856`_ - - **ISSUE** `#475`_: (*thatch45*) Change yaml to use C bindings - | refs: `#42856`_ - - **PR** `#42886`_: (*sarcasticadmin*) Adding missing output flags to salt cli docs - - **PR** `#42882`_: (*gtmanfred*) make sure cmd is not run when npm isn't installed - - **PR** `#42877`_: (*terminalmage*) Add virtual func for cron state module - - **PR** `#42864`_: (*whiteinge*) Make syndic_log_file respect root_dir setting - - **PR** `#42859`_: (*terminalmage*) Add note about git CLI requirement for GitPython to GitFS tutorial - - **PR** `#42856`_: (*gtmanfred*) skip cache_clean test if npm version is >= 5.0.0 - - **PR** `#42788`_: (*amendlik*) Remove waits and retries from Saltify deployment - - **PR** `#41977`_: (*abulford*) Fix dockerng.network_* ignoring of tests=True * c6ca7d639f Merge pull request `#42889`_ from rallytime/merge-2017.7 + * fb7117f2ac Use salt.utils.versions.LooseVersion instead of distutils * 29ff19c587 Merge branch '2016.11' into '2017.7' @@ -1165,19 +1151,20 @@ Changes * 4b1f55da9c Make syndic_log_file respect root_dir setting -- **PR** `#42898`_: (*mirceaulinic*) Minor eos doc correction - @ *2017-08-14T13:42:21Z* +* **PR** `#42898`_: (`mirceaulinic`_) Minor eos doc correction + @ *2017-08-14 13:42:21 UTC* * 4b6fe2ee59 Merge pull request `#42898`_ from mirceaulinic/patch-11 + * 93be79a135 Index eos under the installation instructions list * f903e7bc39 Minor eos doc correction -- **PR** `#42883`_: (*rallytime*) Fix failing boto tests - | refs: `#42959`_ - @ *2017-08-11T20:29:12Z* +* **PR** `#42883`_: (`rallytime`_) Fix failing boto tests (refs: `#42959`_) + @ *2017-08-11 20:29:12 UTC* * 1764878754 Merge pull request `#42883`_ from rallytime/fix-boto-tests + * 6a7bf99848 Lint fix: add missing space * 43643227c6 Skip 2 failing tests in Python 3 due to upstream bugs @@ -1188,103 +1175,82 @@ Changes * 3055e17ed5 Replace @mock_ec2 calls with @mock_ec2_deprecated calls -- **PR** `#42885`_: (*terminalmage*) Move weird tearDown test to an actual tearDown - @ *2017-08-11T19:14:42Z* +* **PR** `#42885`_: (`terminalmage`_) Move weird tearDown test to an actual tearDown + @ *2017-08-11 19:14:42 UTC* * b21778efac Merge pull request `#42885`_ from terminalmage/fix-f26-tests + * 462d653082 Move weird tearDown test to an actual tearDown -- **PR** `#42887`_: (*rallytime*) Remove extraneous "deprecated" notation - @ *2017-08-11T18:34:25Z* +* **ISSUE** `#42870`_: (`boltronics`_) webutil.useradd marked as deprecated:: 2016.3.0 by mistake? (refs: `#42887`_) + +* **PR** `#42887`_: (`rallytime`_) Remove extraneous "deprecated" notation + @ *2017-08-11 18:34:25 UTC* + + * 9868ab6f3b Merge pull request `#42887`_ from rallytime/fix-42870 - - **ISSUE** `#42870`_: (*boltronics*) webutil.useradd marked as deprecated:: 2016.3.0 by mistake? - | refs: `#42887`_ - * 9868ab6f3b Merge pull request `#42887`_ from rallytime/`fix-42870`_ * 71e7581a2d Remove extraneous "deprecated" notation -- **PR** `#42881`_: (*gtmanfred*) fix vmware for python 3.4.2 in salt.utils.vmware - @ *2017-08-11T17:52:29Z* +* **PR** `#42881`_: (`gtmanfred`_) fix vmware for python 3.4.2 in salt.utils.vmware + @ *2017-08-11 17:52:29 UTC* * da71f2a11b Merge pull request `#42881`_ from gtmanfred/vmware + * 05ecc6ac8d fix vmware for python 3.4.2 in salt.utils.vmware -- **PR** `#42845`_: (*brejoc*) API changes for Kubernetes version 2.0.0 - | refs: `#43039`_ - @ *2017-08-11T14:04:30Z* +* **ISSUE** `#42843`_: (`brejoc`_) Kubernetes module won't work with Kubernetes Python client > 1.0.2 (refs: `#42845`_) + +* **PR** `#42845`_: (`brejoc`_) API changes for Kubernetes version 2.0.0 (refs: `#43039`_) + @ *2017-08-11 14:04:30 UTC* - - **ISSUE** `#42843`_: (*brejoc*) Kubernetes module won't work with Kubernetes Python client > 1.0.2 - | refs: `#42845`_ * c7750d5717 Merge pull request `#42845`_ from brejoc/updates-for-kubernetes-2.0.0 + * 81674aa88a Version info in :optdepends: not needed anymore * 71995505bc Not depending on specific K8s version anymore * d8f7d7a7c0 API changes for Kubernetes version 2.0.0 -- **PR** `#42678`_: (*frankiexyz*) Add eos.rst in the installation guide - @ *2017-08-11T13:58:37Z* +* **PR** `#42678`_: (`frankiexyz`_) Add eos.rst in the installation guide + @ *2017-08-11 13:58:37 UTC* * 459fdedc67 Merge pull request `#42678`_ from frankiexyz/2017.7 + * 1598571f52 Add eos.rst in the installation guide -- **PR** `#42778`_: (*gtmanfred*) make sure to use the correct out_file - @ *2017-08-11T13:44:48Z* +* **ISSUE** `#42646`_: (`gmacon`_) SPM fails to install multiple packages (refs: `#42778`_) + +* **PR** `#42778`_: (`gtmanfred`_) make sure to use the correct out_file + @ *2017-08-11 13:44:48 UTC* - - **ISSUE** `#42646`_: (*gmacon*) SPM fails to install multiple packages - | refs: `#42778`_ * 4ce96eb1a1 Merge pull request `#42778`_ from gtmanfred/spm + * 7ef691e8da make sure to use the correct out_file -- **PR** `#42857`_: (*gtmanfred*) use older name if _create_unverified_context is unavailable - @ *2017-08-11T13:37:59Z* +* **ISSUE** `saltstack/salt-jenkins#480`_: (`rallytime`_) [2017.7] PY3 Debian 8 has several vmware unit tests failing (refs: `#42857`_) + +* **PR** `#42857`_: (`gtmanfred`_) use older name if _create_unverified_context is unvailable + @ *2017-08-11 13:37:59 UTC* - - **ISSUE** `#480`_: (*zyluo*) PEP8 types clean-up - | refs: `#42857`_ * 3d05d89e09 Merge pull request `#42857`_ from gtmanfred/vmware - * c1f673eca4 use older name if _create_unverified_context is unavailable -- **PR** `#42866`_: (*twangboy*) Change to GitPython version 2.1.1 - @ *2017-08-11T13:23:52Z* + * c1f673eca4 use older name if _create_unverified_context is unvailable + +* **PR** `#42866`_: (`twangboy`_) Change to GitPython version 2.1.1 + @ *2017-08-11 13:23:52 UTC* * 7e8cfff21c Merge pull request `#42866`_ from twangboy/osx_downgrade_gitpython + * 28053a84a6 Change GitPython version to 2.1.1 -- **PR** `#42855`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-08-10T21:40:39Z* +* **PR** `#42855`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-08-10 21:40:39 UTC* - - **ISSUE** `#42747`_: (*whiteinge*) Outputters mutate data which can be a problem for Runners and perhaps other things - | refs: `#42748`_ - - **ISSUE** `#42731`_: (*infoveinx*) http.query template_data render exception - | refs: `#42804`_ - - **ISSUE** `#42690`_: (*ChristianBeer*) git.latest state with remote set fails on first try - | refs: `#42694`_ - - **ISSUE** `#42683`_: (*rgcosma*) Gluster module broken in 2017.7 - | refs: `#42806`_ - - **ISSUE** `#42600`_: (*twangboy*) Unable to set 'Not Configured' using win_lgpo execution module - | refs: `#42744`_ `#42794`_ `#42795`_ - - **PR** `#42851`_: (*terminalmage*) Backport `#42651`_ to 2016.11 - - **PR** `#42838`_: (*twangboy*) Document requirements for win_pki - - **PR** `#42829`_: (*twangboy*) Fix passing version in pkgs as shown in docs - - **PR** `#42826`_: (*terminalmage*) Fix misspelling of "versions" - - **PR** `#42806`_: (*rallytime*) Update doc references in glusterfs.volume_present - - **PR** `#42805`_: (*rallytime*) Back-port `#42552`_ to 2016.11 - - **PR** `#42804`_: (*rallytime*) Back-port `#42784`_ to 2016.11 - - **PR** `#42795`_: (*lomeroe*) backport `#42744`_ to 2016.11 - - **PR** `#42786`_: (*Ch3LL*) Fix typo for template_dict in http docs - - **PR** `#42784`_: (*gtmanfred*) only read file if ret is not a string in http.query - | refs: `#42804`_ - - **PR** `#42764`_: (*amendlik*) Fix infinite loop with salt-cloud and Windows nodes - - **PR** `#42748`_: (*whiteinge*) Workaround Orchestrate problem that highstate outputter mutates data - - **PR** `#42744`_: (*lomeroe*) fix `#42600`_ in develop - | refs: `#42794`_ `#42795`_ - - **PR** `#42694`_: (*gtmanfred*) allow adding extra remotes to a repository - - **PR** `#42651`_: (*gtmanfred*) python2- prefix for fedora 26 packages - - **PR** `#42552`_: (*remijouannet*) update consul module following this documentation https://www.consul.… - | refs: `#42805`_ * 3ce18637be Merge pull request `#42855`_ from rallytime/merge-2017.7 + * 08bbcf5790 Merge branch '2016.11' into '2017.7' - * 2dde1f77e9 Merge pull request `#42851`_ from terminalmage/`bp-42651`_ + * 2dde1f77e9 Merge pull request `#42851`_ from terminalmage/bp-42651 * a3da86eea8 fix syntax @@ -1294,7 +1260,7 @@ Changes * 21934f61bb python2- prefix for fedora 26 packages - * c746f79a3a Merge pull request `#42806`_ from rallytime/`fix-42683`_ + * c746f79a3a Merge pull request `#42806`_ from rallytime/fix-42683 * 8c8640d6b8 Update doc references in glusterfs.volume_present @@ -1310,11 +1276,11 @@ Changes * 7de687aa57 Document requirements for win_pki - * b3e2ae3c58 Merge pull request `#42805`_ from rallytime/`bp-42552`_ + * b3e2ae3c58 Merge pull request `#42805`_ from rallytime/bp-42552 * 5a91c1f2d1 update consul module following this documentation https://www.consul.io/api/acl.html - * d2ee7934ed Merge pull request `#42804`_ from rallytime/`bp-42784`_ + * d2ee7934ed Merge pull request `#42804`_ from rallytime/bp-42784 * dbd29e4aaa only read file if it is not a string @@ -1326,7 +1292,7 @@ Changes * 90a2fb66a2 Fix typo for template_dict in http docs - * bf6153ebe5 Merge pull request `#42795`_ from lomeroe/`bp-42744`__201611 + * bf6153ebe5 Merge pull request `#42795`_ from lomeroe/bp-42744_201611 * 695f8c1ae4 fix `#42600`_ in develop @@ -1342,119 +1308,117 @@ Changes * 1a0457af51 allow adding extra remotes to a repository -- **PR** `#42808`_: (*terminalmage*) Fix regression in yum/dnf version specification - @ *2017-08-10T15:59:22Z* +* **ISSUE** `#42774`_: (`rossengeorgiev`_) pkg.installed succeeds, but fails when you specify package version (refs: `#42808`_) + +* **PR** `#42808`_: (`terminalmage`_) Fix regression in yum/dnf version specification + @ *2017-08-10 15:59:22 UTC* - - **ISSUE** `#42774`_: (*rossengeorgiev*) pkg.installed succeeds, but fails when you specify package version - | refs: `#42808`_ * f954f4f33a Merge pull request `#42808`_ from terminalmage/issue42774 + * c69f17dd18 Add integration test for `#42774`_ * 78d826dd14 Fix regression in yum/dnf version specification -- **PR** `#42807`_: (*rallytime*) Update modules --> states in kubernetes doc module - @ *2017-08-10T14:10:40Z* +* **ISSUE** `#42639`_: (`amnonbc`_) k8s module needs a way to manage configmaps (refs: `#42807`_) + +* **PR** `#42807`_: (`rallytime`_) Update modules --> states in kubernetes doc module + @ *2017-08-10 14:10:40 UTC* + + * d9b0f44885 Merge pull request `#42807`_ from rallytime/fix-42639 - - **ISSUE** `#42639`_: (*amnonbc*) k8s module needs a way to manage configmaps - | refs: `#42807`_ - * d9b0f44885 Merge pull request `#42807`_ from rallytime/`fix-42639`_ * 152eb88d9f Update modules --> states in kubernetes doc module -- **PR** `#42841`_: (*Mapel88*) Fix bug `#42818`_ in win_iis module - @ *2017-08-10T13:44:21Z* +* **ISSUE** `#42818`_: (`Mapel88`_) Bug in win_iis module - "create_cert_binding" (refs: `#42841`_) + +* **PR** `#42841`_: (`Mapel88`_) Fix bug `#42818`_ in win_iis module + @ *2017-08-10 13:44:21 UTC* - - **ISSUE** `#42818`_: (*Mapel88*) Bug in win_iis module - "create_cert_binding" - | refs: `#42841`_ * b8c7bda68d Merge pull request `#42841`_ from Mapel88/patch-1 + * 497241fbcb Fix bug `#42818`_ in win_iis module -- **PR** `#42782`_: (*rallytime*) Add a cmp compatibility function utility - @ *2017-08-09T22:37:29Z* +* **ISSUE** `#42697`_: (`Ch3LL`_) [Python3] NameError when running salt-run manage.versions (refs: `#42782`_) + +* **PR** `#42782`_: (`rallytime`_) Add a cmp compatibility function utility + @ *2017-08-09 22:37:29 UTC* + + * 135f9522d0 Merge pull request `#42782`_ from rallytime/fix-42697 - - **ISSUE** `#42697`_: (*Ch3LL*) [Python3] NameError when running salt-run manage.versions - | refs: `#42782`_ - * 135f9522d0 Merge pull request `#42782`_ from rallytime/`fix-42697`_ * d707f94863 Update all other calls to "cmp" function * 5605104285 Add a cmp compatibility function utility -- **PR** `#42784`_: (*gtmanfred*) only read file if ret is not a string in http.query - | refs: `#42804`_ - @ *2017-08-08T17:20:13Z* +* **PR** `#42784`_: (`gtmanfred`_) only read file if ret is not a string in http.query (refs: `#42804`_) + @ *2017-08-08 17:20:13 UTC* * ac752223ad Merge pull request `#42784`_ from gtmanfred/http + * d397c90e92 only read file if it is not a string -- **PR** `#42794`_: (*lomeroe*) Backport `#42744`_ to 2017.7 - @ *2017-08-08T17:16:31Z* +* **ISSUE** `#42600`_: (`twangboy`_) Unable to set 'Not Configured' using win_lgpo execution module (refs: `#42744`_, `#42794`_, `#42795`_) + +* **PR** `#42794`_: (`lomeroe`_) Backport `#42744`_ to 2017.7 + @ *2017-08-08 17:16:31 UTC* + + * **PR** `#42744`_: (`lomeroe`_) fix `#42600`_ in develop (refs: `#42794`_, `#42795`_) + + * 44995b1abf Merge pull request `#42794`_ from lomeroe/bp-42744 - - **ISSUE** `#42600`_: (*twangboy*) Unable to set 'Not Configured' using win_lgpo execution module - | refs: `#42744`_ `#42794`_ `#42795`_ - - **PR** `#42744`_: (*lomeroe*) fix `#42600`_ in develop - | refs: `#42794`_ `#42795`_ - * 44995b1abf Merge pull request `#42794`_ from lomeroe/`bp-42744`_ * 0acffc6df5 fix `#42600`_ in develop -- **PR** `#42708`_: (*cro*) Do not change the arguments of the function when memoizing - @ *2017-08-08T13:47:01Z* +* **ISSUE** `#42707`_: (`cro`_) Service module and state fails on FreeBSD (refs: `#42708`_) + +* **PR** `#42708`_: (`cro`_) Do not change the arguments of the function when memoizing + @ *2017-08-08 13:47:01 UTC* - - **ISSUE** `#42707`_: (*cro*) Service module and state fails on FreeBSD - | refs: `#42708`_ * dcf474c47c Merge pull request `#42708`_ from cro/dont_change_args_during_memoize + * a260e913b5 Do not change the arguments of the function when memoizing -- **PR** `#42783`_: (*rallytime*) Sort lists before comparing them in python 3 unit test - @ *2017-08-08T13:25:15Z* +* **PR** `#42783`_: (`rallytime`_) Sort lists before comparing them in python 3 unit test + @ *2017-08-08 13:25:15 UTC* + + * **PR** `#42206`_: (`rallytime`_) [PY3] Fix test that is flaky in Python 3 (refs: `#42783`_) - - **PR** `#42206`_: (*rallytime*) [PY3] Fix test that is flaky in Python 3 - | refs: `#42783`_ * ddb671b8fe Merge pull request `#42783`_ from rallytime/fix-flaky-py3-test + * 998834fbac Sort lists before compairing them in python 3 unit test -- **PR** `#42721`_: (*hibbert*) Allow no ip sg - @ *2017-08-07T22:07:18Z* +* **PR** `#42721`_: (`hibbert`_) Allow no ip sg + @ *2017-08-07 22:07:18 UTC* * d69822fe93 Merge pull request `#42721`_ from hibbert/allow_no_ip_sg + * f58256802a allow_no_ip_sg: Allow user to not supply ipaddress or securitygroups when running boto_efs.create_mount_target -- **PR** `#42769`_: (*terminalmage*) Fix domainname parameter input translation - @ *2017-08-07T20:46:07Z* +* **ISSUE** `#42538`_: (`marnovdm`_) docker_container.running issue since 2017.7.0: passing domainname gives Error 500: json: cannot unmarshal array into Go value of type string (refs: `#42769`_) + +* **PR** `#42769`_: (`terminalmage`_) Fix domainname parameter input translation + @ *2017-08-07 20:46:07 UTC* - - **ISSUE** `#42538`_: (*marnovdm*) docker_container.running issue since 2017.7.0: passing domainname gives Error 500: json: cannot unmarshal array into Go value of type string - | refs: `#42769`_ * bf7938fbe0 Merge pull request `#42769`_ from terminalmage/issue42538 + * 665de2d1f9 Fix domainname parameter input translation -- **PR** `#42388`_: (*The-Loeki*) pillar.items pillar_env & pillar_override are never used - @ *2017-08-07T17:51:48Z* +* **PR** `#42388`_: (`The-Loeki`_) pillar.items pillar_env & pillar_override are never used + @ *2017-08-07 17:51:48 UTC* * 7bf2cdb363 Merge pull request `#42388`_ from The-Loeki/patch-1 + * 664f4b577b pillar.items pillar_env & pillar_override are never used -- **PR** `#42770`_: (*rallytime*) [2017.7] Merge forward from 2017.7.1 to 2017.7 - @ *2017-08-07T16:21:45Z* +* **PR** `#42770`_: (`rallytime`_) [2017.7] Merge forward from 2017.7.1 to 2017.7 + @ *2017-08-07 16:21:45 UTC* * 9a8c9ebffc Merge pull request `#42770`_ from rallytime/merge-2017.7.1-into-2017.7 + * 6d17c9d227 Merge branch '2017.7.1' into '2017.7' -- **PR** `#42768`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-08-07T16:21:17Z* +* **PR** `#42768`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-08-07 16:21:17 UTC* - - **ISSUE** `#42686`_: (*gilbsgilbs*) Unable to set multiple RabbitMQ tags - | refs: `#42693`_ `#42693`_ - - **ISSUE** `#42642`_: (*githubcdr*) state.augeas - | refs: `#42669`_ `#43202`_ - - **ISSUE** `#41433`_: (*sbojarski*) boto_cfn.present fails when reporting error for failed state - | refs: `#42574`_ - - **PR** `#42693`_: (*gilbsgilbs*) Fix RabbitMQ tags not properly set. - - **PR** `#42669`_: (*garethgreenaway*) [2016.11] Fixes to augeas module - - **PR** `#42655`_: (*whiteinge*) Re-enable cpstats for rest_cherrypy - - **PR** `#42629`_: (*xiaoanyunfei*) tornado api - - **PR** `#42623`_: (*terminalmage*) Fix unicode constructor in custom YAML loader - - **PR** `#42574`_: (*sbojarski*) Fixed error reporting in "boto_cfn.present" function. - - **PR** `#33806`_: (*cachedout*) Work around upstream cherrypy bug - | refs: `#42655`_ * c765e528d0 Merge pull request `#42768`_ from rallytime/merge-2017.7 + * 0f75482c37 Merge branch '2016.11' into '2017.7' * 7b2119feee Merge pull request `#42669`_ from garethgreenaway/42642_2016_11_augeas_module_fix @@ -1469,7 +1433,7 @@ Changes * deb6316d67 Fix lint errors - * 6bd91c8b03 Re-enable cpstats for rest_cherrypy + * 6bd91c8b03 Reenable cpstats for rest_cherrypy * 21cf15f9c3 Merge pull request `#42693`_ from gilbsgilbs/fix-rabbitmq-tags @@ -1487,10 +1451,11 @@ Changes * fcf45889dd Fix unicode constructor in custom YAML loader -- **PR** `#42651`_: (*gtmanfred*) python2- prefix for fedora 26 packages - @ *2017-08-07T14:35:04Z* +* **PR** `#42651`_: (`gtmanfred`_) python2- prefix for fedora 26 packages (refs: `#42851`_) + @ *2017-08-07 14:35:04 UTC* * 3f5827f61e Merge pull request `#42651`_ from gtmanfred/2017.7 + * 8784899942 fix syntax * 178cc1bd81 make sure names are correct @@ -1499,96 +1464,108 @@ Changes * 1958d18634 python2- prefix for fedora 26 packages -- **PR** `#42689`_: (*hibbert*) boto_efs_fix_tags: Fix `#42688`_ invalid type for parameter tags - @ *2017-08-06T17:47:07Z* +* **ISSUE** `#42688`_: (`hibbert`_) salt.modules.boto_efs module Invalid type for parameter Tags - type: , valid types: , (refs: `#42689`_) + +* **PR** `#42689`_: (`hibbert`_) boto_efs_fix_tags: Fix `#42688`_ invalid type for parameter tags + @ *2017-08-06 17:47:07 UTC* - - **ISSUE** `#42688`_: (*hibbert*) salt.modules.boto_efs module Invalid type for parameter Tags - type: , valid types: , - | refs: `#42689`_ * 791248e398 Merge pull request `#42689`_ from hibbert/boto_efs_fix_tags + * 157fb28851 boto_efs_fix_tags: Fix `#42688`_ invalid type for parameter tags -- **PR** `#42745`_: (*terminalmage*) docker.compare_container: treat null oom_kill_disable as False - @ *2017-08-05T15:28:20Z* +* **ISSUE** `#42705`_: (`hbruch`_) salt.states.docker_container.running replaces container on subsequent runs if oom_kill_disable unsupported (refs: `#42745`_) + +* **PR** `#42745`_: (`terminalmage`_) docker.compare_container: treat null oom_kill_disable as False + @ *2017-08-05 15:28:20 UTC* - - **ISSUE** `#42705`_: (*hbruch*) salt.states.docker_container.running replaces container on subsequent runs if oom_kill_disable unsupported - | refs: `#42745`_ * 1b3407649b Merge pull request `#42745`_ from terminalmage/issue42705 + * 710bdf6115 docker.compare_container: treat null oom_kill_disable as False -- **PR** `#42704`_: (*whiteinge*) Add import to work around likely multiprocessing scoping bug - @ *2017-08-04T23:03:13Z* +* **ISSUE** `#42649`_: (`tehsu`_) local_batch no longer working in 2017.7.0, 500 error (refs: `#42704`_) + +* **PR** `#42704`_: (`whiteinge`_) Add import to work around likely multiprocessing scoping bug + @ *2017-08-04 23:03:13 UTC* - - **ISSUE** `#42649`_: (*tehsu*) local_batch no longer working in 2017.7.0, 500 error - | refs: `#42704`_ * 5d5b22021b Merge pull request `#42704`_ from whiteinge/expr_form-warn-scope-bug + * 03b675a618 Add import to work around likely multiprocessing scoping bug -- **PR** `#42743`_: (*kkoppel*) Fix docker.compare_container for containers with links - @ *2017-08-04T16:00:33Z* +* **ISSUE** `#42741`_: (`kkoppel`_) docker_container.running keeps re-creating containers with links to other containers (refs: `#42743`_) + +* **PR** `#42743`_: (`kkoppel`_) Fix docker.compare_container for containers with links + @ *2017-08-04 16:00:33 UTC* - - **ISSUE** `#42741`_: (*kkoppel*) docker_container.running keeps re-creating containers with links to other containers - | refs: `#42743`_ * 888e954e73 Merge pull request `#42743`_ from kkoppel/fix-issue-42741 + * de6d3cc0cf Update dockermod.py * 58b997c67f Added a helper function that removes container names from container HostConfig:Links values to enable compare_container() to make the correct decision about differences in links. -- **PR** `#42710`_: (*gtmanfred*) use subtraction instead of or - @ *2017-08-04T15:14:14Z* +* **ISSUE** `#42668`_: (`UtahDave`_) Minions under syndics don't respond to MoM (refs: `#42710`_) + +* **ISSUE** `#42545`_: (`paul-mulvihill`_) Salt-api failing to return results for minions connected via syndics. (refs: `#42710`_) + +* **PR** `#42710`_: (`gtmanfred`_) use subtraction instead of or + @ *2017-08-04 15:14:14 UTC* - - **ISSUE** `#42668`_: (*UtahDave*) Minions under syndics don't respond to MoM - | refs: `#42710`_ - - **ISSUE** `#42545`_: (*paul-mulvihill*) Salt-api failing to return results for minions connected via syndics. - | refs: `#42710`_ * 03a7f9bbee Merge pull request `#42710`_ from gtmanfred/syndic + * 683561a711 use subtraction instead of or -- **PR** `#42670`_: (*gtmanfred*) render kubernetes docs - @ *2017-08-03T20:30:56Z* +* **PR** `#42670`_: (`gtmanfred`_) render kubernetes docs + @ *2017-08-03 20:30:56 UTC* * 005182b6a1 Merge pull request `#42670`_ from gtmanfred/kube + * bca17902f5 add version added info * 4bbfc751ae render kubernetes docs -- **PR** `#42712`_: (*twangboy*) Remove master config file from minion-only installer - @ *2017-08-03T20:25:02Z* +* **PR** `#42712`_: (`twangboy`_) Remove master config file from minion-only installer + @ *2017-08-03 20:25:02 UTC* * df354ddabf Merge pull request `#42712`_ from twangboy/win_build_pkg + * 8604312a7b Remove master conf in minion install -- **PR** `#42714`_: (*cachedout*) Set fact gathering style to 'old' for test_junos - @ *2017-08-03T13:39:40Z* +* **PR** `#42714`_: (`cachedout`_) Set fact gathering style to 'old' for test_junos + @ *2017-08-03 13:39:40 UTC* * bb1dfd4a42 Merge pull request `#42714`_ from cachedout/workaround_jnpr_test_bug + * 834d6c605e Set fact gathering style to 'old' for test_junos -- **PR** `#42481`_: (*twangboy*) Fix `unit.test_crypt` for Windows - @ *2017-08-01T18:10:50Z* +* **PR** `#42481`_: (`twangboy`_) Fix `unit.test_crypt` for Windows + @ *2017-08-01 18:10:50 UTC* * 4c1d931654 Merge pull request `#42481`_ from twangboy/win_unit_test_crypt + * 102509029e Remove chown mock, fix path seps -- **PR** `#42654`_: (*morganwillcock*) Disable ZFS in the core grain for NetBSD - @ *2017-08-01T17:52:36Z* +* **PR** `#42654`_: (`morganwillcock`_) Disable ZFS in the core grain for NetBSD + @ *2017-08-01 17:52:36 UTC* * 8bcefb5e67 Merge pull request `#42654`_ from morganwillcock/zfsgrain + * 49023deb94 Disable ZFS grain on NetBSD -- **PR** `#42453`_: (*gtmanfred*) don't pass user to makedirs on windows - @ *2017-07-31T19:57:57Z* +* **ISSUE** `#42421`_: (`bfilipek`_) archive.extracted on Windows failed when dir not exist (refs: `#42453`_) + +* **PR** `#42453`_: (`gtmanfred`_) don't pass user to makedirs on windows + @ *2017-07-31 19:57:57 UTC* - - **ISSUE** `#42421`_: (*bartuss7*) archive.extracted on Windows failed when dir not exist - | refs: `#42453`_ * 5baf2650fc Merge pull request `#42453`_ from gtmanfred/makedirs + * 559d432930 fix tests * afa7a13ce3 use logic from file.directory for makedirs -- **PR** `#42603`_: (*twangboy*) Add runas_passwd as a global for states - @ *2017-07-31T19:49:49Z* +* **PR** `#42603`_: (`twangboy`_) Add runas_passwd as a global for states + @ *2017-07-31 19:49:49 UTC* * fb81e78f71 Merge pull request `#42603`_ from twangboy/win_fix_runas + * 0c9e40012b Remove deprecation, add logic to state.py * 464ec34713 Fix another instance of runas_passwd @@ -1605,46 +1582,42 @@ Changes * b9c91eba60 Add runas_passwd as a global for states -- **PR** `#42541`_: (*Mareo*) Avoid confusing warning when using file.line - @ *2017-07-31T19:41:58Z* +* **PR** `#42541`_: (`Mareo`_) Avoid confusing warning when using file.line + @ *2017-07-31 19:41:58 UTC* * 75ba23c253 Merge pull request `#42541`_ from epita/fix-file-line-warning + * 2fd172e07b Avoid confusing warning when using file.line -- **PR** `#42625`_: (*twangboy*) Fix the list function in the win_wua execution module - @ *2017-07-31T19:27:16Z* +* **PR** `#42625`_: (`twangboy`_) Fix the list function in the win_wua execution module + @ *2017-07-31 19:27:16 UTC* * 3d328eba80 Merge pull request `#42625`_ from twangboy/fix_win_wua + * 1340c15ce7 Add general usage instructions * 19f34bda55 Fix docs, formatting * b17495c9c8 Fix problem with list when install=True -- **PR** `#42602`_: (*garethgreenaway*) Use superseded and deprecated configuration from pillar - @ *2017-07-31T18:53:06Z* +* **ISSUE** `#42514`_: (`rickh563`_) `module.run` does not work as expected in 2017.7.0 (refs: `#42602`_) + +* **PR** `#42602`_: (`garethgreenaway`_) Use superseded and deprecated configuration from pillar + @ *2017-07-31 18:53:06 UTC* - - **ISSUE** `#42514`_: (*rickh563*) `module.run` does not work as expected in 2017.7.0 - | refs: `#42602`_ * 25094ad9b1 Merge pull request `#42602`_ from garethgreenaway/42514_2017_7_superseded_deprecated_from_pillar + * 2e132daa73 Slight update to formatting * 74bae13939 Small update to something I missed in the first commit. Updating tests to also test for pillar values. * 928a4808dd Updating the superseded and deprecated decorators to work when specified as pillar values. -- **PR** `#42621`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-07-28T19:45:51Z* +* **PR** `#42621`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-07-28 19:45:51 UTC* - - **ISSUE** `#42456`_: (*gdubroeucq*) Use yum lib - | refs: `#42586`_ - - **ISSUE** `#41982`_: (*abulford*) dockerng.network_* matches too easily - | refs: `#41988`_ `#41988`_ `#42006`_ `#42006`_ - - **PR** `#42586`_: (*gdubroeucq*) [Fix] yumpkg.py: add option to the command "check-update" - - **PR** `#42515`_: (*gtmanfred*) Allow not interpreting backslashes in the repl - - **PR** `#41988`_: (*abulford*) Fix dockerng.network_* name matching - | refs: `#42006`_ * b7cd30d3ee Merge pull request `#42621`_ from rallytime/merge-2017.7 + * 58dcb58a47 Merge branch '2016.11' into '2017.7' * cbf752cd73 Merge pull request `#42515`_ from gtmanfred/backslash @@ -1669,36 +1642,39 @@ Changes * 515c612808 Fix dockerng.network_* name matching -- **PR** `#42618`_: (*rallytime*) Back-port `#41690`_ to 2017.7 - @ *2017-07-28T19:27:11Z* +* **ISSUE** `#34245`_: (`Talkless`_) ini.options_present always report state change (refs: `#41690`_) + +* **PR** `#42618`_: (`rallytime`_) Back-port `#41690`_ to 2017.7 + @ *2017-07-28 19:27:11 UTC* + + * **PR** `#41690`_: (`m03`_) Fix issue `#34245`_ with ini.options_present reporting changes (refs: `#42618`_) + + * d48749b476 Merge pull request `#42618`_ from rallytime/bp-41690 - - **ISSUE** `#34245`_: (*Talkless*) ini.options_present always report state change - | refs: `#41690`_ - - **PR** `#41690`_: (*m03*) Fix issue `#34245`_ with ini.options_present reporting changes - | refs: `#42618`_ - * d48749b476 Merge pull request `#42618`_ from rallytime/`bp-41690`_ * 22c6a7c7ff Improve output precision * ee4ea6b860 Fix `#34245`_ ini.options_present reporting changes -- **PR** `#42619`_: (*rallytime*) Back-port `#42589`_ to 2017.7 - @ *2017-07-28T19:26:36Z* +* **ISSUE** `#42588`_: (`ixs`_) salt-ssh fails when using scan roster and detected minions are uncached (refs: `#42589`_) + +* **PR** `#42619`_: (`rallytime`_) Back-port `#42589`_ to 2017.7 + @ *2017-07-28 19:26:36 UTC* + + * **PR** `#42589`_: (`ixs`_) Fix ssh-salt calls with scan roster for uncached clients (refs: `#42619`_) + + * e671242a4f Merge pull request `#42619`_ from rallytime/bp-42589 - - **ISSUE** `#42588`_: (*ixs*) salt-ssh fails when using scan roster and detected minions are uncached - | refs: `#42589`_ - - **PR** `#42589`_: (*ixs*) Fix ssh-salt calls with scan roster for uncached clients - | refs: `#42619`_ - * e671242a4f Merge pull request `#42619`_ from rallytime/`bp-42589`_ * cd5eb93903 Fix ssh-salt calls with scan roster for uncached clients -- **PR** `#42006`_: (*abulford*) Fix dockerng.network_* name matching - @ *2017-07-28T15:52:52Z* +* **ISSUE** `#41982`_: (`abulford`_) dockerng.network_* matches too easily (refs: `#42006`_, `#41988`_) + +* **PR** `#42006`_: (`abulford`_) Fix dockerng.network_* name matching + @ *2017-07-28 15:52:52 UTC* + + * **PR** `#41988`_: (`abulford`_) Fix dockerng.network_* name matching (refs: `#42006`_) - - **ISSUE** `#41982`_: (*abulford*) dockerng.network_* matches too easily - | refs: `#41988`_ `#41988`_ `#42006`_ `#42006`_ - - **PR** `#41988`_: (*abulford*) Fix dockerng.network_* name matching - | refs: `#42006`_ * 7d385f8bdc Merge pull request `#42006`_ from redmatter/fix-dockerng-network-matching-2017.7 + * f83960c02a Lint: Remove extra line at end of file. * c7d364ec56 Add regression tests for `#41982`_ @@ -1709,55 +1685,25 @@ Changes * 8c00c63b55 Fix dockerng.network_* name matching -- **PR** `#42616`_: (*amendlik*) Sync cloud modules - @ *2017-07-28T15:40:36Z* +* **ISSUE** `#12587`_: (`Katafalkas`_) salt-cloud custom functions/actions (refs: `#42616`_) + +* **PR** `#42616`_: (`amendlik`_) Sync cloud modules + @ *2017-07-28 15:40:36 UTC* - - **ISSUE** `#12587`_: (*Katafalkas*) salt-cloud custom functions/actions - | refs: `#42616`_ * ee8aee1496 Merge pull request `#42616`_ from amendlik/sync-clouds + * ab21bd9b5b Sync cloud modules when saltutil.sync_all is run -- **PR** `#42601`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-07-27T22:32:07Z* +* **PR** `#42601`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-07-27 22:32:07 UTC* - - **ISSUE** `#1036125`_: (**) - - **ISSUE** `#42477`_: (*aikar*) Invalid ssh_interface value prevents salt-cloud provisioning without reason of why - | refs: `#42479`_ - - **ISSUE** `#42405`_: (*felrivero*) The documentation is incorrectly compiled (PILLAR section) - | refs: `#42516`_ - - **ISSUE** `#42403`_: (*astronouth7303*) [2017.7] Pillar empty when state is applied from orchestrate - | refs: `#42433`_ - - **ISSUE** `#42375`_: (*dragonpaw*) salt.modules.*.__virtualname__ doens't work as documented. - | refs: `#42523`_ `#42958`_ - - **ISSUE** `#42371`_: (*tsaridas*) Minion unresponsive after trying to failover - | refs: `#42387`_ - - **ISSUE** `#41955`_: (*root360-AndreasUlm*) rabbitmq 3.6.10 changed output => rabbitmq-module broken - | refs: `#41968`_ - - **ISSUE** `#23516`_: (*dkiser*) BUG: cron job scheduler sporadically works - | refs: `#42077`_ - - **PR** `#42573`_: (*rallytime*) Back-port `#42433`_ to 2016.11 - - **PR** `#42571`_: (*twangboy*) Avoid loading system PYTHON* environment vars - - **PR** `#42551`_: (*binocvlar*) Remove '-s' (--script) argument to parted within align_check function - - **PR** `#42527`_: (*twangboy*) Document changes to Windows Update in Windows 10/Server 2016 - - **PR** `#42523`_: (*rallytime*) Add a mention of the True/False returns with __virtual__() - - **PR** `#42516`_: (*rallytime*) Add info about top file to pillar walk-through example to include edit.vim - - **PR** `#42479`_: (*gtmanfred*) validate ssh_interface for ec2 - - **PR** `#42433`_: (*terminalmage*) Only force saltenv/pillarenv to be a string when not None - | refs: `#42573`_ - - **PR** `#42414`_: (*vutny*) DOCS: unify hash sum with hash type format - - **PR** `#42387`_: (*DmitryKuzmenko*) Fix race condition in usage of weakvaluedict - - **PR** `#42339`_: (*isbm*) Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc`#1036125`_) - - **PR** `#42077`_: (*vutny*) Fix scheduled job run on Master if `when` parameter is a list - | refs: `#42107`_ - - **PR** `#41973`_: (*vutny*) Fix Master/Minion scheduled jobs based on Cron expressions - | refs: `#42077`_ - - **PR** `#41968`_: (*root360-AndreasUlm*) Fix rabbitmqctl output sanitizer for version 3.6.10 * e2dd443002 Merge pull request `#42601`_ from rallytime/merge-2017.7 + * 36a1bcf8c5 Merge branch '2016.11' into '2017.7' * 4b16109122 Merge pull request `#42339`_ from isbm/isbm-jobs-scheduled-in-a-future-bsc1036125 - * bbba84ce2d Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc`#1036125`_) + * bbba84ce2d Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc#1036125) * 6c5a7c604a Merge pull request `#42077`_ from vutny/fix-jobs-scheduled-with-whens @@ -1767,7 +1713,7 @@ Changes * d1f2a93368 DOCS: unify hash sum with hash type format - * 535c922511 Merge pull request `#42523`_ from rallytime/`fix-42375`_ + * 535c922511 Merge pull request `#42523`_ from rallytime/fix-42375 * 685c2cced6 Add information about returning a tuple with an error message @@ -1783,7 +1729,7 @@ Changes * c4fabaa192 Remove '-s' (--script) argument to parted within align_check function - * 9e0b4e9faf Merge pull request `#42573`_ from rallytime/`bp-42433`_ + * 9e0b4e9faf Merge pull request `#42573`_ from rallytime/bp-42433 * 0293429e24 Only force saltenv/pillarenv to be a string when not None @@ -1811,14 +1757,19 @@ Changes * 99ec634c6b validate ssh_interface for ec2 - * a925c7029a Merge pull request `#42516`_ from rallytime/`fix-42405`_ + * a925c7029a Merge pull request `#42516`_ from rallytime/fix-42405 * e3a6717efa Add info about top file to pillar walk-through example to include edit.vim -- **PR** `#42290`_: (*isbm*) Backport of `#42270`_ - @ *2017-07-27T22:30:05Z* +* **ISSUE** `#42148`_: (`sjorge`_) [2017.7.0rc1] use_superseded and module.run changes from release notes do nothing? (refs: `#42270`_) + +* **PR** `#42290`_: (`isbm`_) Backport of `#42270`_ + @ *2017-07-27 22:30:05 UTC* + + * **PR** `#42270`_: (`The-Loeki`_) State module.run/wait misses args when looking for kwargs (refs: `#42290`_) * 22eea389fa Merge pull request `#42290`_ from isbm/isbm-module_run_parambug_42270_217 + * e38d432f90 Fix docs * 1e8a56eda5 Describe function tagging @@ -1835,78 +1786,73 @@ Changes * 74689e3462 Add ability to use tagged functions in the same set -- **PR** `#42251`_: (*twangboy*) Fix `unit.modules.test_win_ip` for Windows - @ *2017-07-27T19:22:03Z* +* **PR** `#42251`_: (`twangboy`_) Fix `unit.modules.test_win_ip` for Windows + @ *2017-07-27 19:22:03 UTC* * 4c20f1cfbb Merge pull request `#42251`_ from twangboy/unit_win_test_win_ip + * 97261bfe69 Fix win_inet_pton check for malformatted ip addresses -- **PR** `#42255`_: (*twangboy*) Fix `unit.modules.test_win_system` for Windows - @ *2017-07-27T19:12:42Z* +* **PR** `#42255`_: (`twangboy`_) Fix `unit.modules.test_win_system` for Windows + @ *2017-07-27 19:12:42 UTC* * 2985e4c0e6 Merge pull request `#42255`_ from twangboy/win_unit_test_win_system + * acc0345bc8 Fix unit tests -- **PR** `#42528`_: (*twangboy*) Namespace `cmp_to_key` in the pkg state for Windows - @ *2017-07-27T18:30:23Z* +* **PR** `#42528`_: (`twangboy`_) Namespace `cmp_to_key` in the pkg state for Windows + @ *2017-07-27 18:30:23 UTC* * a573386260 Merge pull request `#42528`_ from twangboy/win_fix_pkg_state + * a040443fa1 Move functools import inside pylint escapes * 118d5134e2 Remove namespaced function `cmp_to_key` * a02c91adda Namespace `cmp_to_key` in the pkg state for Windows -- **PR** `#42534`_: (*jmarinaro*) Fixes AttributeError thrown by chocolatey state - @ *2017-07-27T17:59:50Z* +* **ISSUE** `#42521`_: (`rickh563`_) chocolatey.installed broken on 2017.7.0 (refs: `#42534`_) + +* **PR** `#42534`_: (`jmarinaro`_) Fixes AttributeError thrown by chocolatey state + @ *2017-07-27 17:59:50 UTC* - - **ISSUE** `#42521`_: (*rickh563*) chocolatey.installed broken on 2017.7.0 - | refs: `#42534`_ * 62ae12bcd9 Merge pull request `#42534`_ from jmarinaro/2017.7 + * b242d2d6b5 Fixes AttributeError thrown by chocolatey state Fixes `#42521`_ -- **PR** `#42557`_: (*justincbeard*) Fixing output so --force-color and --no-color override master and min… - @ *2017-07-27T17:07:33Z* +* **ISSUE** `#40354`_: (`exc414`_) CentOS 6.8 Init Script - Sed unterminated address regex (refs: `#42557`_) + +* **ISSUE** `#37312`_: (`gtmanfred`_) CLI flags should take overload settings in the config files (refs: `#42557`_) + +* **PR** `#42557`_: (`justincbeard`_) Fixing output so --force-color and --no-color override master and min… + @ *2017-07-27 17:07:33 UTC* - - **ISSUE** `#40354`_: (*exc414*) CentOS 6.8 Init Script - Sed unterminated address regex - | refs: `#42557`_ - - **ISSUE** `#37312`_: (*gtmanfred*) CLI flags should take overload settings in the config files - | refs: `#42557`_ * 52605c249d Merge pull request `#42557`_ from justincbeard/bugfix_37312 + * ee3bc6eb10 Fixing output so --force-color and --no-color override master and minion config color value -- **PR** `#42567`_: (*skizunov*) Fix disable_ config option - @ *2017-07-27T17:05:00Z* +* **PR** `#42567`_: (`skizunov`_) Fix disable_ config option + @ *2017-07-27 17:05:00 UTC* * ab33517efb Merge pull request `#42567`_ from skizunov/develop3 + * 0f0b7e3e0a Fix disable_ config option -- **PR** `#42577`_: (*twangboy*) Compile scripts with -E -s params for Salt on Mac - @ *2017-07-26T22:44:37Z* +* **PR** `#42577`_: (`twangboy`_) Compile scripts with -E -s params for Salt on Mac + @ *2017-07-26 22:44:37 UTC* * 30bb941179 Merge pull request `#42577`_ from twangboy/mac_scripts + * 69d5973651 Compile scripts with -E -s params for python -- **PR** `#42524`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-07-26T22:41:06Z* +* **PR** `#42524`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-07-26 22:41:06 UTC* - - **ISSUE** `#42417`_: (*clem-compilatio*) salt-cloud - openstack - "no more floating IP addresses" error - but public_ip in node - | refs: `#42509`_ - - **ISSUE** `#42413`_: (*goten4*) Invalid error message when proxy_host is set and tornado not installed - | refs: `#42424`_ - - **ISSUE** `#42357`_: (*Giandom*) Salt pillarenv problem with slack engine - | refs: `#42443`_ `#42444`_ - - **ISSUE** `#42198`_: (*shengis*) state sqlite3.row_absent fail with "parameters are of unsupported type" - | refs: `#42200`_ - - **PR** `#42509`_: (*clem-compilatio*) Fix _assign_floating_ips in openstack.py - - **PR** `#42464`_: (*garethgreenaway*) [2016.11] Small fix to modules/git.py - - **PR** `#42443`_: (*garethgreenaway*) [2016.11] Fix to slack engine - - **PR** `#42424`_: (*goten4*) Fix error message when tornado or pycurl is not installed - - **PR** `#42200`_: (*shengis*) Fix `#42198`_ * 60cd078164 Merge pull request `#42524`_ from rallytime/merge-2017.7 + * 14d8d795f6 Merge branch '2016.11' into '2017.7' - * 1bd5bbccc2 Merge pull request `#42509`_ from clem-compilatio/`fix-42417`_ + * 1bd5bbccc2 Merge pull request `#42509`_ from clem-compilatio/fix-42417 * 72924b06b8 Fix _assign_floating_ips in openstack.py @@ -1926,92 +1872,103 @@ Changes * 1c0574d05e Fix error message when tornado or pycurl is not installed -- **PR** `#42575`_: (*rallytime*) [2017.7] Merge forward from 2017.7.1 to 2017.7 - @ *2017-07-26T22:39:10Z* +* **PR** `#42575`_: (`rallytime`_) [2017.7] Merge forward from 2017.7.1 to 2017.7 + @ *2017-07-26 22:39:10 UTC* * 2acde837df Merge pull request `#42575`_ from rallytime/merge-2017.7.1-into-2017.7 + * 63bb0fb2c4 pass in empty kwarg for reactor * 2868061ee4 update chunk, not kwarg in chunk * 46715e9d94 Merge branch '2017.7.1' into '2017.7' -- **PR** `#42555`_: (*Ch3LL*) add changelog to 2017.7.1 release notes - @ *2017-07-26T14:57:43Z* +* **PR** `#42555`_: (`Ch3LL`_) add changelog to 2017.7.1 release notes + @ *2017-07-26 14:57:43 UTC* * 1d93e92194 Merge pull request `#42555`_ from Ch3LL/7.1_add_changelog + * fb69e71093 add changelog to 2017.7.1 release notes -- **PR** `#42266`_: (*twangboy*) Fix `unit.states.test_file` for Windows - @ *2017-07-25T20:26:32Z* +* **PR** `#42266`_: (`twangboy`_) Fix `unit.states.test_file` for Windows + @ *2017-07-25 20:26:32 UTC* * 07c2793e86 Merge pull request `#42266`_ from twangboy/win_unit_states_test_file + * 669aaee10d Mock file exists properly * a4231c9827 Fix ret mock for linux * 0c484f8979 Fix unit tests on Windows -- **PR** `#42484`_: (*shengis*) Fix a potential Exception with an explicit error message - @ *2017-07-25T18:34:12Z* +* **PR** `#42484`_: (`shengis`_) Fix a potential Exception with an explicit error message + @ *2017-07-25 18:34:12 UTC* * df417eae17 Merge pull request `#42484`_ from shengis/fix-explicit-error-msg-x509-sign-remote + * 0b548c72e1 Fix a potential Exception with an explicit error message -- **PR** `#42529`_: (*gtmanfred*) Fix joyent for python3 - @ *2017-07-25T16:37:48Z* +* **ISSUE** `saltstack/salt-jenkins#396`_: (`Ch3LL`_) Python3 Fix Test: JoyentTest.test_instance (refs: `#42529`_) + +* **ISSUE** `#41720`_: (`rallytime`_) [Py3] Some salt-cloud drivers do not work using Python 3 (refs: `#42529`_) + +* **PR** `#42529`_: (`gtmanfred`_) Fix joyent for python3 + @ *2017-07-25 16:37:48 UTC* - - **ISSUE** `#41720`_: (*rallytime*) [Py3] Some salt-cloud drivers do not work using Python 3 - | refs: `#42529`_ - - **PR** `#396`_: (*mb0*) add file state template context and defaults - | refs: `#42529`_ * 0f25ec76f9 Merge pull request `#42529`_ from gtmanfred/2017.7 + * b7ebb4d81a these drivers do not actually have an issue. * e90ca7a114 use salt encoding for joyent on 2017.7 -- **PR** `#42465`_: (*garethgreenaway*) [2017.7] Small fix to modules/git.py - @ *2017-07-24T17:24:55Z* +* **PR** `#42465`_: (`garethgreenaway`_) [2017.7] Small fix to modules/git.py + @ *2017-07-24 17:24:55 UTC* * 488457c5a0 Merge pull request `#42465`_ from garethgreenaway/2017_7_remove_tmp_identity_file + * 1920dc6079 Uncomment the line that removes the temporary identity file. -- **PR** `#42107`_: (*vutny*) [2017.7] Fix scheduled jobs if `when` parameter is a list - @ *2017-07-24T17:04:12Z* +* **ISSUE** `#23516`_: (`dkiser`_) BUG: cron job scheduler sporadically works (refs: `#42077`_) + +* **PR** `#42107`_: (`vutny`_) [2017.7] Fix scheduled jobs if `when` parameter is a list + @ *2017-07-24 17:04:12 UTC* + + * **PR** `#42077`_: (`vutny`_) Fix scheduled job run on Master if `when` parameter is a list (refs: `#42107`_) + + * **PR** `#41973`_: (`vutny`_) Fix Master/Minion scheduled jobs based on Cron expressions (refs: `#42077`_) - - **ISSUE** `#23516`_: (*dkiser*) BUG: cron job scheduler sporadically works - | refs: `#42077`_ - - **PR** `#42077`_: (*vutny*) Fix scheduled job run on Master if `when` parameter is a list - | refs: `#42107`_ - - **PR** `#41973`_: (*vutny*) Fix Master/Minion scheduled jobs based on Cron expressions - | refs: `#42077`_ * 4f044999fa Merge pull request `#42107`_ from vutny/2017.7-fix-jobs-scheduled-with-whens + * 905be493d4 [2017.7] Fix scheduled jobs if `when` parameter is a list -- **PR** `#42506`_: (*terminalmage*) Add PER_REMOTE_ONLY to init_remotes call in git_pillar runner - @ *2017-07-24T16:59:21Z* +* **PR** `#42506`_: (`terminalmage`_) Add PER_REMOTE_ONLY to init_remotes call in git_pillar runner + @ *2017-07-24 16:59:21 UTC* * 6eaa0763e1 Merge pull request `#42506`_ from terminalmage/fix-git-pillar-runner + * 6352f447ce Add PER_REMOTE_ONLY to init_remotes call in git_pillar runner -- **PR** `#42502`_: (*shengis*) Fix azurerm query to show IPs - @ *2017-07-24T15:54:45Z* +* **PR** `#42502`_: (`shengis`_) Fix azurerm query to show IPs + @ *2017-07-24 15:54:45 UTC* * b88e645f10 Merge pull request `#42502`_ from shengis/fix_azurerm_request_ips + * 92f1890701 Fix azurerm query to show IPs -- **PR** `#42180`_: (*twangboy*) Fix `unit.modules.test_timezone` for Windows - @ *2017-07-24T14:46:16Z* +* **PR** `#42180`_: (`twangboy`_) Fix `unit.modules.test_timezone` for Windows + @ *2017-07-24 14:46:16 UTC* * c793d83d26 Merge pull request `#42180`_ from twangboy/win_unit_test_timezone + * 832a3d86dd Skip tests that use os.symlink on Windows -- **PR** `#42474`_: (*whiteinge*) Cmd arg kwarg parsing test - @ *2017-07-24T14:13:30Z* +* **PR** `#42474`_: (`whiteinge`_) Cmd arg kwarg parsing test + @ *2017-07-24 14:13:30 UTC* + + * **PR** `#39646`_: (`terminalmage`_) Handle deprecation of passing string args to load_args_and_kwargs (refs: `#42474`_) - - **PR** `#39646`_: (*terminalmage*) Handle deprecation of passing string args to load_args_and_kwargs - | refs: `#42474`_ * 083ff00410 Merge pull request `#42474`_ from whiteinge/cmd-arg-kwarg-parsing-test + * 0cc0c0967a Lint fixes * 66093738c8 Add back support for string kwargs @@ -2020,22 +1977,11 @@ Changes * 9f4eb80d90 Add a test.arg variant that cleans the pub kwargs by default -- **PR** `#42425`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-07-21T22:43:41Z* +* **PR** `#42425`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-07-21 22:43:41 UTC* - - **ISSUE** `#42333`_: (*b3hni4*) Getting "invalid type of dict, a list is required" when trying to configure engines in master config file - | refs: `#42352`_ - - **ISSUE** `#32400`_: (*rallytime*) Document Default Config Values - | refs: `#42319`_ - - **PR** `#42370`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - - **PR** `#42368`_: (*twangboy*) Remove build and dist directories before install (2016.11) - - **PR** `#42360`_: (*Ch3LL*) [2016.11] Update version numbers in doc config for 2017.7.0 release - - **PR** `#42359`_: (*Ch3LL*) [2016.3] Update version numbers in doc config for 2017.7.0 release - - **PR** `#42356`_: (*meaksh*) Allow checking whether a function is available on the AliasesLoader wrapper - - **PR** `#42352`_: (*CorvinM*) Multiple documentation fixes - - **PR** `#42350`_: (*twangboy*) Fixes problem with Version and OS Release related grains on certain versions of Python (2016.11) - - **PR** `#42319`_: (*rallytime*) Add more documentation for config options that are missing from master/minion docs * c91a5e539e Merge pull request `#42425`_ from rallytime/merge-2017.7 + * ea457aa0a5 Remove ALIASES block from template util * c673b64583 Merge branch '2016.11' into '2017.7' @@ -2046,7 +1992,7 @@ Changes * 0a72e56f6b Merge pull request `#42356`_ from meaksh/2016.11-AliasesLoader-wrapper-fix - * 915d94219e Allow checking whether a function is available on the AliasesLoader wrapper + * 915d94219e Allow to check whether a function is available on the AliasesLoader wrapper * 10eb7b7a79 Merge pull request `#42368`_ from twangboy/win_fix_build_2016.11 @@ -2072,93 +2018,103 @@ Changes * 526b6ee14d Multiple documentation fixes -- **PR** `#42444`_: (*garethgreenaway*) [2017.7] Fix to slack engine - @ *2017-07-21T22:03:48Z* +* **ISSUE** `#42357`_: (`Giandom`_) Salt pillarenv problem with slack engine (refs: `#42443`_, `#42444`_) + +* **PR** `#42444`_: (`garethgreenaway`_) [2017.7] Fix to slack engine + @ *2017-07-21 22:03:48 UTC* - - **ISSUE** `#42357`_: (*Giandom*) Salt pillarenv problem with slack engine - | refs: `#42443`_ `#42444`_ * 10e4d9234b Merge pull request `#42444`_ from garethgreenaway/42357_2017_7_pass_args_kwargs_correctly + * f411cfc2a9 Updating the slack engine in 2017.7 to pass the args and kwrags correctly to LocalClient -- **PR** `#42461`_: (*rallytime*) Bump warning version from Oxygen to Fluorine in roster cache - @ *2017-07-21T21:33:25Z* +* **PR** `#42461`_: (`rallytime`_) Bump warning version from Oxygen to Fluorine in roster cache + @ *2017-07-21 21:33:25 UTC* * 723be49fac Merge pull request `#42461`_ from rallytime/bump-roster-cache-deprecations + * c0df0137f5 Bump warning version from Oxygen to Fluorine in roster cache -- **PR** `#42436`_: (*garethgreenaway*) Fixes to versions function in manage runner - @ *2017-07-21T19:41:07Z* +* **ISSUE** `#42374`_: (`tyhunt99`_) [2017.7.0] salt-run mange.versions throws exception if minion is offline or unresponsive (refs: `#42436`_) + +* **PR** `#42436`_: (`garethgreenaway`_) Fixes to versions function in manage runner + @ *2017-07-21 19:41:07 UTC* - - **ISSUE** `#42374`_: (*tyhunt99*) [2017.7.0] salt-run mange.versions throws exception if minion is offline or unresponsive - | refs: `#42436`_ * 09521602c1 Merge pull request `#42436`_ from garethgreenaway/42374_manage_runner_minion_offline + * 0fd39498c0 Updating the versions function inside the manage runner to account for when a minion is offline and we are unable to determine it's version. -- **PR** `#42435`_: (*terminalmage*) Modify our custom YAML loader to treat unicode literals as unicode strings - | refs: `#42812`_ - @ *2017-07-21T19:40:34Z* +* **ISSUE** `#42427`_: (`grichmond-salt`_) Issue Passing Variables created from load_json as Inline Pillar Between States (refs: `#42435`_) + +* **PR** `#42435`_: (`terminalmage`_) Modify our custom YAML loader to treat unicode literals as unicode strings (refs: `#42812`_) + @ *2017-07-21 19:40:34 UTC* - - **ISSUE** `#42427`_: (*grichmond-salt*) Issue Passing Variables created from load_json as Inline Pillar Between States - | refs: `#42435`_ * 54193ea543 Merge pull request `#42435`_ from terminalmage/issue42427 + * 31273c7ec1 Modify our custom YAML loader to treat unicode literals as unicode strings -- **PR** `#42399`_: (*rallytime*) Update old "ref" references to "rev" in git.detached state - @ *2017-07-21T19:38:59Z* +* **ISSUE** `#42381`_: (`zebooka`_) Git.detached broken in 2017.7.0 (refs: `#42399`_) + +* **ISSUE** `#38878`_: (`tomlaredo`_) [Naming consistency] git.latest "rev" option VS git.detached "ref" option (refs: `#38898`_) + +* **PR** `#42399`_: (`rallytime`_) Update old "ref" references to "rev" in git.detached state + @ *2017-07-21 19:38:59 UTC* + + * **PR** `#38898`_: (`terminalmage`_) git.detached: rename ref to rev for consistency (refs: `#42399`_) + + * 0b3179135c Merge pull request `#42399`_ from rallytime/fix-42381 - - **ISSUE** `#42381`_: (*zebooka*) Git.detached broken in 2017.7.0 - | refs: `#42399`_ - - **ISSUE** `#38878`_: (*tomlaredo*) [Naming consistency] git.latest "rev" option VS git.detached "ref" option - | refs: `#38898`_ - - **PR** `#38898`_: (*terminalmage*) git.detached: rename ref to rev for consistency - | refs: `#42399`_ - * 0b3179135c Merge pull request `#42399`_ from rallytime/`fix-42381`_ * d9d94fe02f Update old "ref" references to "rev" in git.detached state -- **PR** `#42031`_: (*skizunov*) Fix: Reactor emits critical error - @ *2017-07-21T19:38:34Z* +* **ISSUE** `#42400`_: (`Enquier`_) Conflict in execution of passing pillar data to orch/reactor event executions 2017.7.0 (refs: `#42031`_) + +* **PR** `#42031`_: (`skizunov`_) Fix: Reactor emits critical error + @ *2017-07-21 19:38:34 UTC* - - **ISSUE** `#42400`_: (*Enquier*) Conflict in execution of passing pillar data to orch/reactor event executions 2017.7.0 - | refs: `#42031`_ * bd4adb483d Merge pull request `#42031`_ from skizunov/develop3 + * 540977b4b1 Fix: Reactor emits critical error -- **PR** `#42027`_: (*gtmanfred*) import salt.minion for EventReturn for Windows - @ *2017-07-21T19:37:03Z* +* **ISSUE** `#41949`_: (`jrporcaro`_) Event returner doesn't work with Windows Master (refs: `#42027`_) + +* **PR** `#42027`_: (`gtmanfred`_) import salt.minion for EventReturn for Windows + @ *2017-07-21 19:37:03 UTC* - - **ISSUE** `#41949`_: (*jrporcaro*) Event returner doesn't work with Windows Master - | refs: `#42027`_ * 3abf7ad7d7 Merge pull request `#42027`_ from gtmanfred/2017.7 + * fd4458b6c7 import salt.minion for EventReturn for Windows -- **PR** `#42454`_: (*terminalmage*) Document future renaming of new rand_str jinja filter - @ *2017-07-21T18:47:51Z* +* **PR** `#42454`_: (`terminalmage`_) Document future renaming of new rand_str jinja filter + @ *2017-07-21 18:47:51 UTC* * 994d3dc74a Merge pull request `#42454`_ from terminalmage/jinja-docs-2017.7 + * 98b661406e Document future renaming of new rand_str jinja filter -- **PR** `#42452`_: (*Ch3LL*) update windows urls to new py2/py3 naming scheme - @ *2017-07-21T17:20:47Z* +* **PR** `#42452`_: (`Ch3LL`_) update windows urls to new py2/py3 naming scheme + @ *2017-07-21 17:20:47 UTC* * 4480075129 Merge pull request `#42452`_ from Ch3LL/fix_url_windows + * 3f4a918f73 update windows urls to new py2/py3 naming scheme -- **PR** `#42411`_: (*seedickcode*) Fix file.managed check_cmd file not found - Issue `#42404`_ - @ *2017-07-20T21:59:17Z* +* **ISSUE** `#42404`_: (`gabekahen`_) [2017.7] file.managed with cmd_check "No such file or directory" (refs: `#42411`_) + +* **ISSUE** `#33708`_: (`pepinje`_) visudo check command leaves cache file in /tmp (refs: `#42411`_, `#38063`_) + +* **PR** `#42411`_: (`seedickcode`_) Fix file.managed check_cmd file not found - Issue `#42404`_ + @ *2017-07-20 21:59:17 UTC* + + * **PR** `#38063`_: (`llua`_) tmp file clean up in file.manage - fix for `#33708`_ (refs: `#42411`_) - - **ISSUE** `#42404`_: (*gabekahen*) [2017.7] file.managed with cmd_check "No such file or directory" - | refs: `#42411`_ - - **ISSUE** `#33708`_: (*pepinje*) visudo check command leaves cache file in /tmp - | refs: `#42411`_ `#38063`_ - - **PR** `#38063`_: (*llua*) tmp file clean up in file.manage - fix for `#33708`_ - | refs: `#42411`_ * 33e90be1fe Merge pull request `#42411`_ from seedickcode/check_cmd_fix + * 4ae3911f01 Fix file.managed check_cmd file not found - Issue `#42404`_ -- **PR** `#42409`_: (*twangboy*) Add Scripts to build Py3 on Mac - @ *2017-07-20T21:36:34Z* +* **PR** `#42409`_: (`twangboy`_) Add Scripts to build Py3 on Mac + @ *2017-07-20 21:36:34 UTC* * edde31376a Merge pull request `#42409`_ from twangboy/mac_py3_scripts + * ac0e04af72 Remove build and dist, sign pkgs * 9d66e273c4 Fix hard coded pip path @@ -2167,159 +2123,90 @@ Changes * aa4eed93c8 Update Python and other reqs -- **PR** `#42433`_: (*terminalmage*) Only force saltenv/pillarenv to be a string when not None - | refs: `#42573`_ - @ *2017-07-20T21:32:24Z* +* **ISSUE** `#42403`_: (`astronouth7303`_) [2017.7] Pillar empty when state is applied from orchestrate (refs: `#42433`_) + +* **PR** `#42433`_: (`terminalmage`_) Only force saltenv/pillarenv to be a string when not None (refs: `#42573`_) + @ *2017-07-20 21:32:24 UTC* - - **ISSUE** `#42403`_: (*astronouth7303*) [2017.7] Pillar empty when state is applied from orchestrate - | refs: `#42433`_ * 82982f940d Merge pull request `#42433`_ from terminalmage/issue42403 -- **PR** `#42408`_: (*CorvinM*) Fix documentation misformat in salt.states.file.replace - @ *2017-07-20T00:45:43Z* + +* **PR** `#42408`_: (`CorvinM`_) Fix documentation misformat in salt.states.file.replace + @ *2017-07-20 00:45:43 UTC* * a71938cefe Merge pull request `#42408`_ from CorvinM/file-replace-doc-fix + * 246a2b3e74 Fix documentation misformat in salt.states.file.replace -- **PR** `#42347`_: (*twangboy*) Fixes problem with Version and OS Release related grains on certain versions of Python - @ *2017-07-19T17:05:43Z* +* **PR** `#42347`_: (`twangboy`_) Fixes problem with Version and OS Release related grains on certain versions of Python + @ *2017-07-19 17:05:43 UTC* * d385dfd19d Merge pull request `#42347`_ from twangboy/win_fix_ver_grains + * ef1f663fc9 Detect server OS with a desktop release name -- **PR** `#42366`_: (*twangboy*) Remove build and dist directories before install - @ *2017-07-19T16:37:41Z* +* **PR** `#42366`_: (`twangboy`_) Remove build and dist directories before install + @ *2017-07-19 16:37:41 UTC* * eb9e4206c9 Merge pull request `#42366`_ from twangboy/win_fix_build + * 0946002713 Add blank line after delete * f7c0bb4f46 Remove build and dist directories before install -- **PR** `#42373`_: (*Ch3LL*) Add initial 2017.7.1 Release Notes File - @ *2017-07-19T16:28:46Z* +* **PR** `#42373`_: (`Ch3LL`_) Add initial 2017.7.1 Release Notes File + @ *2017-07-19 16:28:46 UTC* * af7820f25d Merge pull request `#42373`_ from Ch3LL/add_2017.7.1 + * ce1c1b6d28 Add initial 2017.7.1 Release Notes File -- **PR** `#42150`_: (*twangboy*) Fix `unit.modules.test_pip` for Windows - @ *2017-07-19T16:01:17Z* +* **PR** `#42150`_: (`twangboy`_) Fix `unit.modules.test_pip` for Windows + @ *2017-07-19 16:01:17 UTC* * 59e012b485 Merge pull request `#42150`_ from twangboy/win_unit_test_pip + * 4ee24202fc Fix unit tests for test_pip -- **PR** `#42154`_: (*twangboy*) Fix `unit.modules.test_reg_win` for Windows - @ *2017-07-19T16:00:38Z* +* **PR** `#42154`_: (`twangboy`_) Fix `unit.modules.test_reg_win` for Windows + @ *2017-07-19 16:00:38 UTC* * ade25c6b34 Merge pull request `#42154`_ from twangboy/win_unit_test_reg + * 00d9a52802 Fix problem with handling REG_QWORD in list values -- **PR** `#42182`_: (*twangboy*) Fix `unit.modules.test_useradd` for Windows - @ *2017-07-19T15:55:33Z* +* **PR** `#42182`_: (`twangboy`_) Fix `unit.modules.test_useradd` for Windows + @ *2017-07-19 15:55:33 UTC* * 07593675e2 Merge pull request `#42182`_ from twangboy/win_unit_test_useradd + * 8260a71c07 Disable tests that require pwd in Windows -- **PR** `#42364`_: (*twangboy*) Windows Package notes for 2017.7.0 - @ *2017-07-18T19:24:45Z* +* **PR** `#42364`_: (`twangboy`_) Windows Package notes for 2017.7.0 + @ *2017-07-18 19:24:45 UTC* * a175c40c1d Merge pull request `#42364`_ from twangboy/release_notes_2017.7.0 + * 96517d1355 Add note about patched windows packages -- **PR** `#42361`_: (*Ch3LL*) [2017.7] Update version numbers in doc config for 2017.7.0 release - @ *2017-07-18T19:23:22Z* +* **PR** `#42361`_: (`Ch3LL`_) [2017.7] Update version numbers in doc config for 2017.7.0 release + @ *2017-07-18 19:23:22 UTC* * 4dfe50e558 Merge pull request `#42361`_ from Ch3LL/doc-update-2017.7 + * dc5bb301f7 [2017.7] Update version numbers in doc config for 2017.7.0 release -- **PR** `#42363`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-07-18T18:40:48Z* +* **PR** `#42363`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-07-18 18:40:48 UTC* - - **ISSUE** `#42295`_: (*lubyou*) file.absent fails on windows if the file to be removed has the "readonly" attribute set - | refs: `#42308`_ - - **ISSUE** `#42267`_: (*gzcwnk*) salt-ssh not creating ssh keys automatically as per documentation - | refs: `#42314`_ - - **ISSUE** `#42240`_: (*casselt*) empty_password in user.present always changes password, even with test=True - | refs: `#42289`_ - - **ISSUE** `#42232`_: (*astronouth7303*) Half of dnsutil refers to dig - | refs: `#42235`_ - - **ISSUE** `#42194`_: (*jryberg*) pkg version: latest are now broken, appending -latest to filename - | refs: `#42275`_ - - **ISSUE** `#42152`_: (*dubb-b*) salt-cloud errors on Rackspace driver using -out=yaml - | refs: `#42282`_ - - **ISSUE** `#42137`_: (*kiemlicz*) cmd.run with multiple commands - random order of execution - | refs: `#42181`_ - - **ISSUE** `#42116`_: (*terminalmage*) CLI pillar override regression in 2017.7.0rc1 - | refs: `#42119`_ - - **ISSUE** `#42115`_: (*nomeelnoj*) Installing EPEL repo breaks salt-cloud - | refs: `#42163`_ - - **ISSUE** `#42114`_: (*clallen*) saltenv bug in pillar.get execution module function - | refs: `#42121`_ - - **ISSUE** `#41936`_: (*michaelkarrer81*) git.latest identity does not set the correct user for the private key file on the minion - | refs: `#41945`_ - - **ISSUE** `#41721`_: (*sazaro*) state.sysrc broken when setting the value to YES or NO - | refs: `#42269`_ - - **ISSUE** `#41116`_: (*hrumph*) FAQ has wrong instructions for upgrading Windows minion. - | refs: `#42264`_ - - **ISSUE** `#39365`_: (*dglloyd*) service.running fails if sysv script has no status command and enable: True - | refs: `#39366`_ - - **ISSUE** `#1`_: (*thatch45*) Enable regex on the salt cli - - **PR** `#42353`_: (*terminalmage*) is_windows is a function, not a propery/attribute - - **PR** `#42314`_: (*rallytime*) Add clarification to salt ssh docs about key auto-generation. - - **PR** `#42308`_: (*lubyou*) Force file removal on Windows. Fixes `#42295`_ - - **PR** `#42289`_: (*CorvinM*) Multiple empty_password fixes for state.user - - **PR** `#42282`_: (*rallytime*) Handle libcloud objects that throw RepresenterErrors with --out=yaml - - **PR** `#42275`_: (*terminalmage*) pkg.installed: pack name/version into pkgs argument - - **PR** `#42269`_: (*rallytime*) Add some clarity to "multiple quotes" section of yaml docs - - **PR** `#42264`_: (*rallytime*) Update minion restart section in FAQ doc for windows - - **PR** `#42262`_: (*rallytime*) Back-port `#42224`_ to 2016.11 - - **PR** `#42261`_: (*rallytime*) Some minor doc fixes for dnsutil module so they'll render correctly - - **PR** `#42253`_: (*gtmanfred*) Only use unassociated ips when unable to allocate - - **PR** `#42252`_: (*UtahDave*) simple docstring updates - - **PR** `#42235`_: (*astronouth7303*) Abolish references to `dig` in examples. - - **PR** `#42224`_: (*tdutrion*) Remove duplicate instruction in Openstack Rackspace config example - | refs: `#42262`_ - - **PR** `#42215`_: (*twangboy*) Add missing config to example - - **PR** `#42211`_: (*terminalmage*) Only pass a saltenv in orchestration if one was explicitly passed (2016.11) - - **PR** `#42181`_: (*garethgreenaway*) fixes to state.py for names parameter - - **PR** `#42176`_: (*rallytime*) Back-port `#42109`_ to 2016.11 - - **PR** `#42175`_: (*rallytime*) Back-port `#39366`_ to 2016.11 - - **PR** `#42173`_: (*rallytime*) Back-port `#37424`_ to 2016.11 - - **PR** `#42172`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - - **PR** `#42164`_: (*Ch3LL*) Fix kerberos create_keytab doc - - **PR** `#42163`_: (*vutny*) Fix `#42115`_: parse libcloud "rc" version correctly - - **PR** `#42155`_: (*phsteve*) Fix docs for puppet.plugin_sync - - **PR** `#42142`_: (*Ch3LL*) Update builds available for rc1 - - **PR** `#42141`_: (*rallytime*) Back-port `#42098`_ to 2016.11 - - **PR** `#42140`_: (*rallytime*) Back-port `#42097`_ to 2016.11 - - **PR** `#42123`_: (*vutny*) DOCS: describe importing custom util classes - - **PR** `#42121`_: (*terminalmage*) Fix pillar.get when saltenv is passed - - **PR** `#42119`_: (*terminalmage*) Fix regression in CLI pillar override for salt-call - - **PR** `#42109`_: (*arthurlogilab*) [doc] Update aws.rst - add Debian default username - | refs: `#42176`_ - - **PR** `#42098`_: (*twangboy*) Change repo_ng to repo-ng - | refs: `#42141`_ - - **PR** `#42097`_: (*gtmanfred*) require large timediff for ipv6 warning - | refs: `#42140`_ - - **PR** `#42095`_: (*terminalmage*) Add debug logging to dockerng.login - - **PR** `#42094`_: (*terminalmage*) Prevent command from showing in exception when output_loglevel=quiet - - **PR** `#41945`_: (*garethgreenaway*) Fixes to modules/git.py - - **PR** `#41543`_: (*cri-epita*) Fix user creation with empty password - | refs: `#42289`_ `#42289`_ - - **PR** `#39366`_: (*dglloyd*) Pass sig to service.status in after_toggle - | refs: `#42175`_ - - **PR** `#38965`_: (*toanju*) salt-cloud will use list_floating_ips for OpenStack - | refs: `#42253`_ - - **PR** `#37424`_: (*kojiromike*) Avoid Early Convert ret['comment'] to String - | refs: `#42173`_ - - **PR** `#34280`_: (*kevinanderson1*) salt-cloud will use list_floating_ips for Openstack - | refs: `#38965`_ * 587138d771 Merge pull request `#42363`_ from rallytime/merge-2017.7 + * 7aa31ff030 Merge branch '2016.11' into '2017.7' * b256001760 Merge pull request `#42353`_ from terminalmage/fix-git-test * 14cf6ce322 is_windows is a function, not a propery/attribute - * 866a1febb4 Merge pull request `#42264`_ from rallytime/`fix-41116`_ + * 866a1febb4 Merge pull request `#42264`_ from rallytime/fix-41116 * bd638880e3 Add mono-spacing to salt-minion reference for consistency @@ -2329,13 +2216,13 @@ Changes * 663874908a pkg.installed: pack name/version into pkgs argument - * e588f235e0 Merge pull request `#42269`_ from rallytime/`fix-41721`_ + * e588f235e0 Merge pull request `#42269`_ from rallytime/fix-41721 * f2250d474a Add a note about using different styles of quotes. * 38d9b3d553 Add some clarity to "multiple quotes" section of yaml docs - * 5aaa214a75 Merge pull request `#42282`_ from rallytime/`fix-42152`_ + * 5aaa214a75 Merge pull request `#42282`_ from rallytime/fix-42152 * f032223843 Handle libcloud objects that throw RepresenterErrors with --out=yaml @@ -2343,7 +2230,7 @@ Changes * 026ccf401a Force file removal on Windows. Fixes `#42295`_ - * da2a8a518f Merge pull request `#42314`_ from rallytime/`fix-42267`_ + * da2a8a518f Merge pull request `#42314`_ from rallytime/fix-42267 * c406046940 Add clarification to salt ssh docs about key auto-generation. @@ -2363,7 +2250,7 @@ Changes * 494765e939 Updating the git module to allow an identity file to be used when passing the user parameter - * f90e04a2bc Merge pull request `#42289`_ from CorvinM/`bp-41543`_ + * f90e04a2bc Merge pull request `#42289`_ from CorvinM/bp-41543 * 357dc22f05 Fix user creation with empty password @@ -2377,7 +2264,7 @@ Changes * 8c76bbb53d Some minor doc fixes for dnsutil module so they'll render correctly - * 3e9dfbc9cc Merge pull request `#42262`_ from rallytime/`bp-42224`_ + * 3e9dfbc9cc Merge pull request `#42262`_ from rallytime/bp-42224 * c31ded341c Remove duplicate instruction in Openstack Rackspace config example @@ -2407,11 +2294,11 @@ Changes * 22a18fa2ed Only pass a saltenv in orchestration if one was explicitly passed (2016.11) - * 89261cf06c Merge pull request `#42173`_ from rallytime/`bp-37424`_ + * 89261cf06c Merge pull request `#42173`_ from rallytime/bp-37424 * 01addb6053 Avoid Early Convert ret['comment'] to String - * 3b17fb7f83 Merge pull request `#42175`_ from rallytime/`bp-39366`_ + * 3b17fb7f83 Merge pull request `#42175`_ from rallytime/bp-39366 * 53f7b987e8 Pass sig to service.status in after_toggle @@ -2423,7 +2310,7 @@ Changes * fb2cb78a31 Fix docs for puppet.plugin_sync so code-block renders properly and sync is spelled consistently - * 6307b9873f Merge pull request `#42176`_ from rallytime/`bp-42109`_ + * 6307b9873f Merge pull request `#42176`_ from rallytime/bp-42109 * 686926daf7 Update aws.rst - add Debian default username @@ -2445,7 +2332,7 @@ Changes * 47d61f4edf Prevent command from showing in exception when output_loglevel=quiet - * dad255160c Merge pull request `#42163`_ from vutny/`fix-42115`_ + * dad255160c Merge pull request `#42163`_ from vutny/fix-42115 * b27b1e340a Fix `#42115`_: parse libcloud "rc" version correctly @@ -2453,11 +2340,11 @@ Changes * 7c0fb248ec Fix kerberos create_keytab doc - * 678d4d4098 Merge pull request `#42141`_ from rallytime/`bp-42098`_ + * 678d4d4098 Merge pull request `#42141`_ from rallytime/bp-42098 * bd80243233 Change repo_ng to repo-ng - * c8afd7a3c9 Merge pull request `#42140`_ from rallytime/`bp-42097`_ + * c8afd7a3c9 Merge pull request `#42140`_ from rallytime/bp-42097 * 9c4e132540 Import datetime @@ -2467,113 +2354,123 @@ Changes * e1694af39c Update builds available for rc1 -- **PR** `#42340`_: (*isbm*) Bugfix: Jobs scheduled to run at a future time stay pending for Salt … - @ *2017-07-18T18:13:36Z* +* **PR** `#42340`_: (`isbm`_) Bugfix: Jobs scheduled to run at a future time stay pending for Salt … + @ *2017-07-18 18:13:36 UTC* - - **ISSUE** `#1036125`_: (**) * 55b7a5cb4a Merge pull request `#42340`_ from isbm/isbm-jobs-scheduled-in-a-future-2017.7-bsc1036125 - * 774d204d65 Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc`#1036125`_) -- **PR** `#42327`_: (*mirceaulinic*) Default skip_verify to False - @ *2017-07-18T18:04:36Z* + * 774d204d65 Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc#1036125) + +* **PR** `#42327`_: (`mirceaulinic`_) Default skip_verify to False + @ *2017-07-18 18:04:36 UTC* * e72616c5f1 Merge pull request `#42327`_ from mirceaulinic/patch-10 + * c830573a2c Trailing whitespaces * c83e6fc696 Default skip_verify to False -- **PR** `#42179`_: (*rallytime*) Fix some documentation issues found in jinja filters doc topic - @ *2017-07-18T18:01:57Z* +* **ISSUE** `#42151`_: (`sjorge`_) Doc errors in jinja doc for develop branch (refs: `#42179`_) + +* **PR** `#42179`_: (`rallytime`_) Fix some documentation issues found in jinja filters doc topic + @ *2017-07-18 18:01:57 UTC* + + * ba799b2831 Merge pull request `#42179`_ from rallytime/fix-42151 - - **ISSUE** `#42151`_: (*sjorge*) Doc errors in jinja doc for develop branch - | refs: `#42179`_ `#42179`_ - * ba799b2831 Merge pull request `#42179`_ from rallytime/`fix-42151`_ * 798d29276e Add note about "to_bytes" jinja filter issues when using yaml_jinja renderer * 1bbff572ab Fix some documentation issues found in jinja filters doc topic -- **PR** `#42087`_: (*abulford*) Make result=true if Docker volume already exists - @ *2017-07-17T18:41:47Z* +* **ISSUE** `#42076`_: (`abulford`_) dockerng.volume_present test looks as though it would cause a change (refs: `#42087`_, `#42086`_) + +* **PR** `#42087`_: (`abulford`_) Make result=true if Docker volume already exists + @ *2017-07-17 18:41:47 UTC* + + * **PR** `#42086`_: (`abulford`_) Make result=true if Docker volume already exists (refs: `#42087`_) - - **ISSUE** `#42076`_: (*abulford*) dockerng.volume_present test looks as though it would cause a change - | refs: `#42086`_ `#42086`_ `#42087`_ `#42087`_ - - **PR** `#42086`_: (*abulford*) Make result=true if Docker volume already exists - | refs: `#42087`_ * 8dbb93851d Merge pull request `#42087`_ from redmatter/fix-dockerng-volume-present-result-2017.7 + * 2e1dc95500 Make result=true if Docker volume already exists -- **PR** `#42186`_: (*rallytime*) Use long_range function for IPv6Network hosts() function - @ *2017-07-17T18:39:35Z* +* **ISSUE** `#42166`_: (`sjorge`_) [2017.7.0rc1] jinja filter network_hosts fails on large IPv6 networks (refs: `#42186`_) + +* **PR** `#42186`_: (`rallytime`_) Use long_range function for IPv6Network hosts() function + @ *2017-07-17 18:39:35 UTC* + + * c84d6db548 Merge pull request `#42186`_ from rallytime/fix-42166 - - **ISSUE** `#42166`_: (*sjorge*) [2017.7.0rc1] jinja filter network_hosts fails on large IPv6 networks - | refs: `#42186`_ - * c84d6db548 Merge pull request `#42186`_ from rallytime/`fix-42166`_ * b8bcc0d599 Add note to various network_hosts docs about long_run for IPv6 networks * 11862743c2 Use long_range function for IPv6Network hosts() function -- **PR** `#42210`_: (*terminalmage*) Only pass a saltenv in orchestration if one was explicitly passed (2017.7) - @ *2017-07-17T18:22:39Z* +* **PR** `#42210`_: (`terminalmage`_) Only pass a saltenv in orchestration if one was explicitly passed (2017.7) + @ *2017-07-17 18:22:39 UTC* * e7b79e0fd2 Merge pull request `#42210`_ from terminalmage/issue40928-2017.7 + * 771ade5d73 Only pass a saltenv in orchestration if one was explicitly passed (2017.7) -- **PR** `#42236`_: (*mirceaulinic*) New option for napalm proxy/minion: provider - @ *2017-07-17T18:19:56Z* +* **PR** `#42236`_: (`mirceaulinic`_) New option for napalm proxy/minion: provider + @ *2017-07-17 18:19:56 UTC* * 0e49021b0e Merge pull request `#42236`_ from cloudflare/napalm-provider + * 1ac69bd737 Document the provider option and rearrange the doc * 4bf4b14161 New option for napalm proxy/minion: provider -- **PR** `#42257`_: (*twangboy*) Fix `unit.pillar.test_git` for Windows - @ *2017-07-17T17:51:42Z* +* **PR** `#42257`_: (`twangboy`_) Fix `unit.pillar.test_git` for Windows + @ *2017-07-17 17:51:42 UTC* * 3ec5bb1c2f Merge pull request `#42257`_ from twangboy/win_unit_pillar_test_git + * 45be32666a Add error-handling function to shutil.rmtree -- **PR** `#42258`_: (*twangboy*) Fix `unit.states.test_environ` for Windows - @ *2017-07-17T17:50:38Z* +* **PR** `#42258`_: (`twangboy`_) Fix `unit.states.test_environ` for Windows + @ *2017-07-17 17:50:38 UTC* * 36395625c2 Merge pull request `#42258`_ from twangboy/win_unit_states_tests_environ + * 55b278c478 Mock the reg.read_value function -- **PR** `#42265`_: (*rallytime*) Gate boto_elb tests if proper version of moto isn't installed - @ *2017-07-17T17:47:52Z* +* **PR** `#42265`_: (`rallytime`_) Gate boto_elb tests if proper version of moto isn't installed + @ *2017-07-17 17:47:52 UTC* * 894bdd2b19 Merge pull request `#42265`_ from rallytime/gate-moto-version + * 78cdee51d5 Gate boto_elb tests if proper version of moto isn't installed -- **PR** `#42277`_: (*twangboy*) Fix `unit.states.test_winrepo` for Windows - @ *2017-07-17T17:37:07Z* +* **PR** `#42277`_: (`twangboy`_) Fix `unit.states.test_winrepo` for Windows + @ *2017-07-17 17:37:07 UTC* * baf04f2a2d Merge pull request `#42277`_ from twangboy/win_unit_states_test_winrepo + * ed89cd0b93 Use os.sep for path seps -- **PR** `#42309`_: (*terminalmage*) Change "TBD" in versionadded to "2017.7.0" - @ *2017-07-17T17:11:45Z* +* **PR** `#42309`_: (`terminalmage`_) Change "TBD" in versionadded to "2017.7.0" + @ *2017-07-17 17:11:45 UTC* * be6b211683 Merge pull request `#42309`_ from terminalmage/fix-versionadded + * 603f5b7de6 Change "TBD" in versionadded to "2017.7.0" -- **PR** `#42206`_: (*rallytime*) [PY3] Fix test that is flaky in Python 3 - | refs: `#42783`_ - @ *2017-07-17T17:09:53Z* +* **PR** `#42206`_: (`rallytime`_) [PY3] Fix test that is flaky in Python 3 (refs: `#42783`_) + @ *2017-07-17 17:09:53 UTC* * acd29f9b38 Merge pull request `#42206`_ from rallytime/fix-flaky-test + * 2be4865f48 [PY3] Fix test that is flaky in Python 3 -- **PR** `#42126`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-07-17T17:07:19Z* +* **PR** `#42126`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-07-17 17:07:19 UTC* * 8f1cb287cf Merge pull request `#42126`_ from rallytime/merge-2017.7 -* 8b35b367b3 Merge branch '2016.11' into '2017.7' - -- **PR** `#42078`_: (*damon-atkins*) pkg.install and pkg.remove fix version number input. - @ *2017-07-05T06:04:57Z* +* **PR** `#42078`_: (`damon-atkins`_) pkg.install and pkg.remove fix version number input. + @ *2017-07-05 06:04:57 UTC* * 4780d7830a Merge pull request `#42078`_ from damon-atkins/fix_convert_flt_str_version_on_cmd_line + * 09d37dd892 Fix comment typo * 7167549425 Handle version=None when converted to a string it becomes 'None' parm should default to empty string rather than None, it would fix better with existing code. @@ -2582,99 +2479,85 @@ Changes * cf55c3361c pkg.install and pkg.remove on the command line take number version numbers, store them within a float. However version is a string, to support versions numbers like 1.3.4 -- **PR** `#42105`_: (*Ch3LL*) Update releasecanddiate doc with new 2017.7.0rc1 Release - @ *2017-07-04T03:14:42Z* +* **PR** `#42105`_: (`Ch3LL`_) Update releasecanddiate doc with new 2017.7.0rc1 Release + @ *2017-07-04 03:14:42 UTC* * 46d575acbc Merge pull request `#42105`_ from Ch3LL/update_rc + * d4e7b91608 Update releasecanddiate doc with new 2017.7.0rc1 Release -- **PR** `#42099`_: (*rallytime*) Remove references in docs to pip install salt-cloud - @ *2017-07-03T22:13:44Z* +* **ISSUE** `#41885`_: (`astronouth7303`_) Recommended pip installation outdated? (refs: `#42099`_) + +* **PR** `#42099`_: (`rallytime`_) Remove references in docs to pip install salt-cloud + @ *2017-07-03 22:13:44 UTC* + + * d38548bbbd Merge pull request `#42099`_ from rallytime/fix-41885 - - **ISSUE** `#41885`_: (*astronouth7303*) Recommended pip installation outdated? - | refs: `#42099`_ - * d38548bbbd Merge pull request `#42099`_ from rallytime/`fix-41885`_ * c2822e05ad Remove references in docs to pip install salt-cloud -- **PR** `#42086`_: (*abulford*) Make result=true if Docker volume already exists - | refs: `#42087`_ - @ *2017-07-03T15:48:33Z* +* **ISSUE** `#42076`_: (`abulford`_) dockerng.volume_present test looks as though it would cause a change (refs: `#42087`_, `#42086`_) + +* **PR** `#42086`_: (`abulford`_) Make result=true if Docker volume already exists (refs: `#42087`_) + @ *2017-07-03 15:48:33 UTC* - - **ISSUE** `#42076`_: (*abulford*) dockerng.volume_present test looks as though it would cause a change - | refs: `#42086`_ `#42086`_ `#42087`_ `#42087`_ * 81d606a8cb Merge pull request `#42086`_ from redmatter/fix-dockerng-volume-present-result + * 8d549685a7 Make result=true if Docker volume already exists -- **PR** `#42021`_: (*gtmanfred*) Set concurrent to True when running states with sudo - @ *2017-06-30T21:02:15Z* +* **ISSUE** `#25842`_: (`shikhartanwar`_) Running salt-minion as non-root user to execute sudo commands always returns an error (refs: `#42021`_) + +* **PR** `#42021`_: (`gtmanfred`_) Set concurrent to True when running states with sudo + @ *2017-06-30 21:02:15 UTC* - - **ISSUE** `#25842`_: (*shikhartanwar*) Running salt-minion as non-root user to execute sudo commands always returns an error - | refs: `#42021`_ * 7160697123 Merge pull request `#42021`_ from gtmanfred/2016.11 + * 26beb18aa5 Set concurrent to True when running states with sudo -- **PR** `#42029`_: (*terminalmage*) Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips - @ *2017-06-30T20:58:56Z* +* **PR** `#42029`_: (`terminalmage`_) Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips + @ *2017-06-30 20:58:56 UTC* * b784fbbdf8 Merge pull request `#42029`_ from terminalmage/host_to_ips + * 26f848e111 Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips -- **PR** `#42055`_: (*dmurphy18*) Upgrade support for gnupg v2.1 and higher - @ *2017-06-30T20:54:02Z* +* **PR** `#42055`_: (`dmurphy18`_) Upgrade support for gnupg v2.1 and higher + @ *2017-06-30 20:54:02 UTC* * e067020b9b Merge pull request `#42055`_ from dmurphy18/handle_gnupgv21 + * e20cea6350 Upgrade support for gnupg v2.1 and higher -- **PR** `#42048`_: (*Ch3LL*) Add initial 2016.11.7 Release Notes - @ *2017-06-30T16:00:05Z* +* **PR** `#42048`_: (`Ch3LL`_) Add initial 2016.11.7 Release Notes + @ *2017-06-30 16:00:05 UTC* * 74ba2abc48 Merge pull request `#42048`_ from Ch3LL/add_11.7 + * 1de5e008a0 Add initial 2016.11.7 Release Notes - -.. _`#1`: https://github.com/saltstack/salt/issues/1 -.. _`#1036125`: https://github.com/saltstack/salt/issues/1036125 .. _`#12587`: https://github.com/saltstack/salt/issues/12587 -.. _`#15171`: https://github.com/saltstack/salt/issues/15171 -.. _`#2`: https://github.com/saltstack/salt/issues/2 +.. _`#1`: https://github.com/saltstack/salt/issues/1 .. _`#23516`: https://github.com/saltstack/salt/issues/23516 .. _`#25842`: https://github.com/saltstack/salt/issues/25842 .. _`#26995`: https://github.com/saltstack/salt/issues/26995 -.. _`#32400`: https://github.com/saltstack/salt/issues/32400 +.. _`#2`: https://github.com/saltstack/salt/issues/2 .. _`#33708`: https://github.com/saltstack/salt/issues/33708 -.. _`#33806`: https://github.com/saltstack/salt/pull/33806 .. _`#34245`: https://github.com/saltstack/salt/issues/34245 -.. _`#34280`: https://github.com/saltstack/salt/pull/34280 .. _`#37312`: https://github.com/saltstack/salt/issues/37312 -.. _`#37424`: https://github.com/saltstack/salt/pull/37424 .. _`#38063`: https://github.com/saltstack/salt/pull/38063 .. _`#38839`: https://github.com/saltstack/salt/issues/38839 .. _`#38878`: https://github.com/saltstack/salt/issues/38878 .. _`#38898`: https://github.com/saltstack/salt/pull/38898 -.. _`#38965`: https://github.com/saltstack/salt/pull/38965 -.. _`#39365`: https://github.com/saltstack/salt/issues/39365 -.. _`#39366`: https://github.com/saltstack/salt/pull/39366 .. _`#39516`: https://github.com/saltstack/salt/pull/39516 -.. _`#396`: https://github.com/saltstack/salt/pull/396 .. _`#39646`: https://github.com/saltstack/salt/pull/39646 .. _`#39773`: https://github.com/saltstack/salt/pull/39773 .. _`#40354`: https://github.com/saltstack/salt/issues/40354 -.. _`#40490`: https://github.com/saltstack/salt/issues/40490 -.. _`#41116`: https://github.com/saltstack/salt/issues/41116 -.. _`#41433`: https://github.com/saltstack/salt/issues/41433 -.. _`#41543`: https://github.com/saltstack/salt/pull/41543 .. _`#41690`: https://github.com/saltstack/salt/pull/41690 .. _`#41720`: https://github.com/saltstack/salt/issues/41720 -.. _`#41721`: https://github.com/saltstack/salt/issues/41721 -.. _`#41770`: https://github.com/saltstack/salt/issues/41770 .. _`#41885`: https://github.com/saltstack/salt/issues/41885 -.. _`#41936`: https://github.com/saltstack/salt/issues/41936 .. _`#41945`: https://github.com/saltstack/salt/pull/41945 .. _`#41949`: https://github.com/saltstack/salt/issues/41949 -.. _`#41955`: https://github.com/saltstack/salt/issues/41955 .. _`#41968`: https://github.com/saltstack/salt/pull/41968 .. _`#41973`: https://github.com/saltstack/salt/pull/41973 -.. _`#41976`: https://github.com/saltstack/salt/issues/41976 .. _`#41977`: https://github.com/saltstack/salt/pull/41977 .. _`#41982`: https://github.com/saltstack/salt/issues/41982 .. _`#41988`: https://github.com/saltstack/salt/pull/41988 @@ -2684,8 +2567,6 @@ Changes .. _`#42027`: https://github.com/saltstack/salt/pull/42027 .. _`#42029`: https://github.com/saltstack/salt/pull/42029 .. _`#42031`: https://github.com/saltstack/salt/pull/42031 -.. _`#42041`: https://github.com/saltstack/salt/issues/42041 -.. _`#42045`: https://github.com/saltstack/salt/pull/42045 .. _`#42048`: https://github.com/saltstack/salt/pull/42048 .. _`#42055`: https://github.com/saltstack/salt/pull/42055 .. _`#42067`: https://github.com/saltstack/salt/pull/42067 @@ -2696,26 +2577,20 @@ Changes .. _`#42087`: https://github.com/saltstack/salt/pull/42087 .. _`#42094`: https://github.com/saltstack/salt/pull/42094 .. _`#42095`: https://github.com/saltstack/salt/pull/42095 -.. _`#42097`: https://github.com/saltstack/salt/pull/42097 -.. _`#42098`: https://github.com/saltstack/salt/pull/42098 .. _`#42099`: https://github.com/saltstack/salt/pull/42099 .. _`#42105`: https://github.com/saltstack/salt/pull/42105 .. _`#42107`: https://github.com/saltstack/salt/pull/42107 -.. _`#42109`: https://github.com/saltstack/salt/pull/42109 -.. _`#42114`: https://github.com/saltstack/salt/issues/42114 .. _`#42115`: https://github.com/saltstack/salt/issues/42115 -.. _`#42116`: https://github.com/saltstack/salt/issues/42116 .. _`#42119`: https://github.com/saltstack/salt/pull/42119 .. _`#42121`: https://github.com/saltstack/salt/pull/42121 .. _`#42123`: https://github.com/saltstack/salt/pull/42123 .. _`#42126`: https://github.com/saltstack/salt/pull/42126 -.. _`#42137`: https://github.com/saltstack/salt/issues/42137 .. _`#42140`: https://github.com/saltstack/salt/pull/42140 .. _`#42141`: https://github.com/saltstack/salt/pull/42141 .. _`#42142`: https://github.com/saltstack/salt/pull/42142 +.. _`#42148`: https://github.com/saltstack/salt/issues/42148 .. _`#42150`: https://github.com/saltstack/salt/pull/42150 .. _`#42151`: https://github.com/saltstack/salt/issues/42151 -.. _`#42152`: https://github.com/saltstack/salt/issues/42152 .. _`#42154`: https://github.com/saltstack/salt/pull/42154 .. _`#42155`: https://github.com/saltstack/salt/pull/42155 .. _`#42163`: https://github.com/saltstack/salt/pull/42163 @@ -2731,18 +2606,14 @@ Changes .. _`#42181`: https://github.com/saltstack/salt/pull/42181 .. _`#42182`: https://github.com/saltstack/salt/pull/42182 .. _`#42186`: https://github.com/saltstack/salt/pull/42186 -.. _`#42194`: https://github.com/saltstack/salt/issues/42194 .. _`#42198`: https://github.com/saltstack/salt/issues/42198 .. _`#42200`: https://github.com/saltstack/salt/pull/42200 .. _`#42206`: https://github.com/saltstack/salt/pull/42206 .. _`#42210`: https://github.com/saltstack/salt/pull/42210 .. _`#42211`: https://github.com/saltstack/salt/pull/42211 .. _`#42215`: https://github.com/saltstack/salt/pull/42215 -.. _`#42224`: https://github.com/saltstack/salt/pull/42224 -.. _`#42232`: https://github.com/saltstack/salt/issues/42232 .. _`#42235`: https://github.com/saltstack/salt/pull/42235 .. _`#42236`: https://github.com/saltstack/salt/pull/42236 -.. _`#42240`: https://github.com/saltstack/salt/issues/42240 .. _`#42251`: https://github.com/saltstack/salt/pull/42251 .. _`#42252`: https://github.com/saltstack/salt/pull/42252 .. _`#42253`: https://github.com/saltstack/salt/pull/42253 @@ -2754,9 +2625,8 @@ Changes .. _`#42264`: https://github.com/saltstack/salt/pull/42264 .. _`#42265`: https://github.com/saltstack/salt/pull/42265 .. _`#42266`: https://github.com/saltstack/salt/pull/42266 -.. _`#42267`: https://github.com/saltstack/salt/issues/42267 .. _`#42269`: https://github.com/saltstack/salt/pull/42269 -.. _`#42270`: https://github.com/saltstack/salt/issues/42270 +.. _`#42270`: https://github.com/saltstack/salt/pull/42270 .. _`#42275`: https://github.com/saltstack/salt/pull/42275 .. _`#42277`: https://github.com/saltstack/salt/pull/42277 .. _`#42279`: https://github.com/saltstack/salt/issues/42279 @@ -2771,7 +2641,6 @@ Changes .. _`#42319`: https://github.com/saltstack/salt/pull/42319 .. _`#42327`: https://github.com/saltstack/salt/pull/42327 .. _`#42329`: https://github.com/saltstack/salt/issues/42329 -.. _`#42333`: https://github.com/saltstack/salt/issues/42333 .. _`#42339`: https://github.com/saltstack/salt/pull/42339 .. _`#42340`: https://github.com/saltstack/salt/pull/42340 .. _`#42347`: https://github.com/saltstack/salt/pull/42347 @@ -2788,7 +2657,6 @@ Changes .. _`#42366`: https://github.com/saltstack/salt/pull/42366 .. _`#42368`: https://github.com/saltstack/salt/pull/42368 .. _`#42370`: https://github.com/saltstack/salt/pull/42370 -.. _`#42371`: https://github.com/saltstack/salt/issues/42371 .. _`#42373`: https://github.com/saltstack/salt/pull/42373 .. _`#42374`: https://github.com/saltstack/salt/issues/42374 .. _`#42375`: https://github.com/saltstack/salt/issues/42375 @@ -2799,13 +2667,10 @@ Changes .. _`#42400`: https://github.com/saltstack/salt/issues/42400 .. _`#42403`: https://github.com/saltstack/salt/issues/42403 .. _`#42404`: https://github.com/saltstack/salt/issues/42404 -.. _`#42405`: https://github.com/saltstack/salt/issues/42405 .. _`#42408`: https://github.com/saltstack/salt/pull/42408 .. _`#42409`: https://github.com/saltstack/salt/pull/42409 .. _`#42411`: https://github.com/saltstack/salt/pull/42411 -.. _`#42413`: https://github.com/saltstack/salt/issues/42413 .. _`#42414`: https://github.com/saltstack/salt/pull/42414 -.. _`#42417`: https://github.com/saltstack/salt/issues/42417 .. _`#42421`: https://github.com/saltstack/salt/issues/42421 .. _`#42424`: https://github.com/saltstack/salt/pull/42424 .. _`#42425`: https://github.com/saltstack/salt/pull/42425 @@ -2818,13 +2683,11 @@ Changes .. _`#42452`: https://github.com/saltstack/salt/pull/42452 .. _`#42453`: https://github.com/saltstack/salt/pull/42453 .. _`#42454`: https://github.com/saltstack/salt/pull/42454 -.. _`#42456`: https://github.com/saltstack/salt/issues/42456 .. _`#42459`: https://github.com/saltstack/salt/issues/42459 .. _`#42461`: https://github.com/saltstack/salt/pull/42461 .. _`#42464`: https://github.com/saltstack/salt/pull/42464 .. _`#42465`: https://github.com/saltstack/salt/pull/42465 .. _`#42474`: https://github.com/saltstack/salt/pull/42474 -.. _`#42477`: https://github.com/saltstack/salt/issues/42477 .. _`#42479`: https://github.com/saltstack/salt/pull/42479 .. _`#42481`: https://github.com/saltstack/salt/pull/42481 .. _`#42484`: https://github.com/saltstack/salt/pull/42484 @@ -2845,9 +2708,7 @@ Changes .. _`#42538`: https://github.com/saltstack/salt/issues/42538 .. _`#42541`: https://github.com/saltstack/salt/pull/42541 .. _`#42545`: https://github.com/saltstack/salt/issues/42545 -.. _`#42547`: https://github.com/saltstack/salt/pull/42547 .. _`#42551`: https://github.com/saltstack/salt/pull/42551 -.. _`#42552`: https://github.com/saltstack/salt/pull/42552 .. _`#42555`: https://github.com/saltstack/salt/pull/42555 .. _`#42557`: https://github.com/saltstack/salt/pull/42557 .. _`#42567`: https://github.com/saltstack/salt/pull/42567 @@ -2871,11 +2732,8 @@ Changes .. _`#42621`: https://github.com/saltstack/salt/pull/42621 .. _`#42623`: https://github.com/saltstack/salt/pull/42623 .. _`#42625`: https://github.com/saltstack/salt/pull/42625 -.. _`#42627`: https://github.com/saltstack/salt/issues/42627 .. _`#42629`: https://github.com/saltstack/salt/pull/42629 .. _`#42639`: https://github.com/saltstack/salt/issues/42639 -.. _`#42642`: https://github.com/saltstack/salt/issues/42642 -.. _`#42644`: https://github.com/saltstack/salt/issues/42644 .. _`#42646`: https://github.com/saltstack/salt/issues/42646 .. _`#42649`: https://github.com/saltstack/salt/issues/42649 .. _`#42651`: https://github.com/saltstack/salt/pull/42651 @@ -2888,11 +2746,8 @@ Changes .. _`#42670`: https://github.com/saltstack/salt/pull/42670 .. _`#42678`: https://github.com/saltstack/salt/pull/42678 .. _`#42679`: https://github.com/saltstack/salt/pull/42679 -.. _`#42683`: https://github.com/saltstack/salt/issues/42683 -.. _`#42686`: https://github.com/saltstack/salt/issues/42686 .. _`#42688`: https://github.com/saltstack/salt/issues/42688 .. _`#42689`: https://github.com/saltstack/salt/pull/42689 -.. _`#42690`: https://github.com/saltstack/salt/issues/42690 .. _`#42693`: https://github.com/saltstack/salt/pull/42693 .. _`#42694`: https://github.com/saltstack/salt/pull/42694 .. _`#42697`: https://github.com/saltstack/salt/issues/42697 @@ -2905,15 +2760,12 @@ Changes .. _`#42712`: https://github.com/saltstack/salt/pull/42712 .. _`#42714`: https://github.com/saltstack/salt/pull/42714 .. _`#42721`: https://github.com/saltstack/salt/pull/42721 -.. _`#42731`: https://github.com/saltstack/salt/issues/42731 .. _`#42741`: https://github.com/saltstack/salt/issues/42741 .. _`#42743`: https://github.com/saltstack/salt/pull/42743 .. _`#42744`: https://github.com/saltstack/salt/pull/42744 .. _`#42745`: https://github.com/saltstack/salt/pull/42745 -.. _`#42747`: https://github.com/saltstack/salt/issues/42747 .. _`#42748`: https://github.com/saltstack/salt/pull/42748 .. _`#42753`: https://github.com/saltstack/salt/issues/42753 -.. _`#42760`: https://github.com/saltstack/salt/pull/42760 .. _`#42764`: https://github.com/saltstack/salt/pull/42764 .. _`#42768`: https://github.com/saltstack/salt/pull/42768 .. _`#42769`: https://github.com/saltstack/salt/pull/42769 @@ -2940,7 +2792,6 @@ Changes .. _`#42818`: https://github.com/saltstack/salt/issues/42818 .. _`#42826`: https://github.com/saltstack/salt/pull/42826 .. _`#42829`: https://github.com/saltstack/salt/pull/42829 -.. _`#42835`: https://github.com/saltstack/salt/pull/42835 .. _`#42836`: https://github.com/saltstack/salt/pull/42836 .. _`#42838`: https://github.com/saltstack/salt/pull/42838 .. _`#42841`: https://github.com/saltstack/salt/pull/42841 @@ -2958,9 +2809,7 @@ Changes .. _`#42864`: https://github.com/saltstack/salt/pull/42864 .. _`#42866`: https://github.com/saltstack/salt/pull/42866 .. _`#42868`: https://github.com/saltstack/salt/pull/42868 -.. _`#42869`: https://github.com/saltstack/salt/issues/42869 .. _`#42870`: https://github.com/saltstack/salt/issues/42870 -.. _`#42871`: https://github.com/saltstack/salt/pull/42871 .. _`#42873`: https://github.com/saltstack/salt/issues/42873 .. _`#42877`: https://github.com/saltstack/salt/pull/42877 .. _`#42881`: https://github.com/saltstack/salt/pull/42881 @@ -3002,7 +2851,6 @@ Changes .. _`#42964`: https://github.com/saltstack/salt/pull/42964 .. _`#42967`: https://github.com/saltstack/salt/pull/42967 .. _`#42968`: https://github.com/saltstack/salt/pull/42968 -.. _`#42969`: https://github.com/saltstack/salt/pull/42969 .. _`#42985`: https://github.com/saltstack/salt/pull/42985 .. _`#42986`: https://github.com/saltstack/salt/pull/42986 .. _`#42988`: https://github.com/saltstack/salt/pull/42988 @@ -3060,7 +2908,6 @@ Changes .. _`#43093`: https://github.com/saltstack/salt/pull/43093 .. _`#43097`: https://github.com/saltstack/salt/pull/43097 .. _`#43100`: https://github.com/saltstack/salt/pull/43100 -.. _`#43101`: https://github.com/saltstack/salt/issues/43101 .. _`#43103`: https://github.com/saltstack/salt/pull/43103 .. _`#43107`: https://github.com/saltstack/salt/pull/43107 .. _`#43108`: https://github.com/saltstack/salt/pull/43108 @@ -3069,7 +2916,6 @@ Changes .. _`#43116`: https://github.com/saltstack/salt/pull/43116 .. _`#43123`: https://github.com/saltstack/salt/pull/43123 .. _`#43142`: https://github.com/saltstack/salt/pull/43142 -.. _`#43143`: https://github.com/saltstack/salt/issues/43143 .. _`#43146`: https://github.com/saltstack/salt/pull/43146 .. _`#43151`: https://github.com/saltstack/salt/pull/43151 .. _`#43155`: https://github.com/saltstack/salt/pull/43155 @@ -3087,7 +2933,6 @@ Changes .. _`#43184`: https://github.com/saltstack/salt/pull/43184 .. _`#43193`: https://github.com/saltstack/salt/pull/43193 .. _`#43196`: https://github.com/saltstack/salt/pull/43196 -.. _`#43198`: https://github.com/saltstack/salt/issues/43198 .. _`#43199`: https://github.com/saltstack/salt/pull/43199 .. _`#43201`: https://github.com/saltstack/salt/pull/43201 .. _`#43202`: https://github.com/saltstack/salt/pull/43202 @@ -3116,74 +2961,95 @@ Changes .. _`#43551`: https://github.com/saltstack/salt/pull/43551 .. _`#43585`: https://github.com/saltstack/salt/pull/43585 .. _`#43586`: https://github.com/saltstack/salt/pull/43586 -.. _`#475`: https://github.com/saltstack/salt/issues/475 -.. _`#480`: https://github.com/saltstack/salt/issues/480 -.. _`#495`: https://github.com/saltstack/salt/issues/495 -.. _`#43581`: https://github.com/saltstack/salt/issues/43581 .. _`#43756`: https://github.com/saltstack/salt/pull/43756 .. _`#43847`: https://github.com/saltstack/salt/pull/43847 .. _`#43868`: https://github.com/saltstack/salt/pull/43868 -.. _`#475`: https://github.com/saltstack/salt/issues/475 -.. _`#480`: https://github.com/saltstack/salt/issues/480 -.. _`#495`: https://github.com/saltstack/salt/issues/495 -.. _`bp-37424`: https://github.com/saltstack/salt/pull/37424 -.. _`bp-39366`: https://github.com/saltstack/salt/pull/39366 -.. _`bp-41543`: https://github.com/saltstack/salt/pull/41543 -.. _`bp-41690`: https://github.com/saltstack/salt/pull/41690 -.. _`bp-42067`: https://github.com/saltstack/salt/pull/42067 -.. _`bp-42097`: https://github.com/saltstack/salt/pull/42097 -.. _`bp-42098`: https://github.com/saltstack/salt/pull/42098 -.. _`bp-42109`: https://github.com/saltstack/salt/pull/42109 -.. _`bp-42174`: https://github.com/saltstack/salt/pull/42174 -.. _`bp-42224`: https://github.com/saltstack/salt/pull/42224 -.. _`bp-42433`: https://github.com/saltstack/salt/pull/42433 -.. _`bp-42547`: https://github.com/saltstack/salt/pull/42547 -.. _`bp-42552`: https://github.com/saltstack/salt/pull/42552 -.. _`bp-42589`: https://github.com/saltstack/salt/pull/42589 -.. _`bp-42651`: https://github.com/saltstack/salt/pull/42651 -.. _`bp-42744`: https://github.com/saltstack/salt/pull/42744 -.. _`bp-42760`: https://github.com/saltstack/salt/pull/42760 -.. _`bp-42784`: https://github.com/saltstack/salt/pull/42784 -.. _`bp-42848`: https://github.com/saltstack/salt/pull/42848 -.. _`bp-42871`: https://github.com/saltstack/salt/pull/42871 -.. _`bp-42883`: https://github.com/saltstack/salt/pull/42883 -.. _`bp-42988`: https://github.com/saltstack/salt/pull/42988 -.. _`bp-43002`: https://github.com/saltstack/salt/pull/43002 -.. _`bp-43020`: https://github.com/saltstack/salt/pull/43020 -.. _`bp-43031`: https://github.com/saltstack/salt/pull/43031 -.. _`bp-43041`: https://github.com/saltstack/salt/pull/43041 -.. _`bp-43068`: https://github.com/saltstack/salt/pull/43068 -.. _`bp-43116`: https://github.com/saltstack/salt/pull/43116 -.. _`bp-43193`: https://github.com/saltstack/salt/pull/43193 -.. _`bp-43283`: https://github.com/saltstack/salt/pull/43283 -.. _`bp-43330`: https://github.com/saltstack/salt/pull/43330 -.. _`bp-43333`: https://github.com/saltstack/salt/pull/43333 -.. _`bp-43421`: https://github.com/saltstack/salt/pull/43421 -.. _`bp-43526`: https://github.com/saltstack/salt/pull/43526 -.. _`fix-38839`: https://github.com/saltstack/salt/issues/38839 -.. _`fix-41116`: https://github.com/saltstack/salt/issues/41116 -.. _`fix-41721`: https://github.com/saltstack/salt/issues/41721 -.. _`fix-41885`: https://github.com/saltstack/salt/issues/41885 -.. _`fix-42115`: https://github.com/saltstack/salt/issues/42115 -.. _`fix-42151`: https://github.com/saltstack/salt/issues/42151 -.. _`fix-42152`: https://github.com/saltstack/salt/issues/42152 -.. _`fix-42166`: https://github.com/saltstack/salt/issues/42166 -.. _`fix-42267`: https://github.com/saltstack/salt/issues/42267 -.. _`fix-42375`: https://github.com/saltstack/salt/issues/42375 -.. _`fix-42381`: https://github.com/saltstack/salt/issues/42381 -.. _`fix-42405`: https://github.com/saltstack/salt/issues/42405 -.. _`fix-42417`: https://github.com/saltstack/salt/issues/42417 -.. _`fix-42639`: https://github.com/saltstack/salt/issues/42639 -.. _`fix-42683`: https://github.com/saltstack/salt/issues/42683 -.. _`fix-42697`: https://github.com/saltstack/salt/issues/42697 -.. _`fix-42870`: https://github.com/saltstack/salt/issues/42870 - -Build Notes -=========== - -Mac Installer Packages --------------------------- - -Mac Installer packages have been patched with the following PR: 43756_ - -.. _43756: https://github.com/saltstack/salt/pull/43756 +.. _`#43871`: https://github.com/saltstack/salt/pull/43871 +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`CorvinM`: https://github.com/CorvinM +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`Enquier`: https://github.com/Enquier +.. _`Giandom`: https://github.com/Giandom +.. _`Katafalkas`: https://github.com/Katafalkas +.. _`Manoj2087`: https://github.com/Manoj2087 +.. _`Mapel88`: https://github.com/Mapel88 +.. _`Mareo`: https://github.com/Mareo +.. _`MorphBonehunter`: https://github.com/MorphBonehunter +.. _`SuperPommeDeTerre`: https://github.com/SuperPommeDeTerre +.. _`Talkless`: https://github.com/Talkless +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`TheVakman`: https://github.com/TheVakman +.. _`UtahDave`: https://github.com/UtahDave +.. _`abulford`: https://github.com/abulford +.. _`amendlik`: https://github.com/amendlik +.. _`amnonbc`: https://github.com/amnonbc +.. _`astronouth7303`: https://github.com/astronouth7303 +.. _`bfilipek`: https://github.com/bfilipek +.. _`blarghmatey`: https://github.com/blarghmatey +.. _`blbradley`: https://github.com/blbradley +.. _`boltronics`: https://github.com/boltronics +.. _`brejoc`: https://github.com/brejoc +.. _`cachedout`: https://github.com/cachedout +.. _`carsonoid`: https://github.com/carsonoid +.. _`cro`: https://github.com/cro +.. _`dafyddj`: https://github.com/dafyddj +.. _`damon-atkins`: https://github.com/damon-atkins +.. _`danlsgiga`: https://github.com/danlsgiga +.. _`darcoli`: https://github.com/darcoli +.. _`dkiser`: https://github.com/dkiser +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`dragonpaw`: https://github.com/dragonpaw +.. _`evelineraine`: https://github.com/evelineraine +.. _`exc414`: https://github.com/exc414 +.. _`frankiexyz`: https://github.com/frankiexyz +.. _`gabekahen`: https://github.com/gabekahen +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gmacon`: https://github.com/gmacon +.. _`gmcwhistler`: https://github.com/gmcwhistler +.. _`grichmond-salt`: https://github.com/grichmond-salt +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`hbruch`: https://github.com/hbruch +.. _`hibbert`: https://github.com/hibbert +.. _`iavael`: https://github.com/iavael +.. _`ikogan`: https://github.com/ikogan +.. _`isbm`: https://github.com/isbm +.. _`ixs`: https://github.com/ixs +.. _`jbouse`: https://github.com/jbouse +.. _`jettero`: https://github.com/jettero +.. _`jmarinaro`: https://github.com/jmarinaro +.. _`jrporcaro`: https://github.com/jrporcaro +.. _`justincbeard`: https://github.com/justincbeard +.. _`kkoppel`: https://github.com/kkoppel +.. _`llua`: https://github.com/llua +.. _`lomeroe`: https://github.com/lomeroe +.. _`m03`: https://github.com/m03 +.. _`mahesh21`: https://github.com/mahesh21 +.. _`marnovdm`: https://github.com/marnovdm +.. _`mcalmer`: https://github.com/mcalmer +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`morganwillcock`: https://github.com/morganwillcock +.. _`nhavens`: https://github.com/nhavens +.. _`pabloh007`: https://github.com/pabloh007 +.. _`paul-mulvihill`: https://github.com/paul-mulvihill +.. _`pepinje`: https://github.com/pepinje +.. _`rallytime`: https://github.com/rallytime +.. _`rickh563`: https://github.com/rickh563 +.. _`rossengeorgiev`: https://github.com/rossengeorgiev +.. _`saltstack/salt-jenkins#396`: https://github.com/saltstack/salt-jenkins/issues/396 +.. _`saltstack/salt-jenkins#480`: https://github.com/saltstack/salt-jenkins/issues/480 +.. _`seedickcode`: https://github.com/seedickcode +.. _`shengis`: https://github.com/shengis +.. _`shikhartanwar`: https://github.com/shikhartanwar +.. _`sjorge`: https://github.com/sjorge +.. _`skizunov`: https://github.com/skizunov +.. _`tehsu`: https://github.com/tehsu +.. _`terminalmage`: https://github.com/terminalmage +.. _`the-glu`: https://github.com/the-glu +.. _`thusoy`: https://github.com/thusoy +.. _`tomlaredo`: https://github.com/tomlaredo +.. _`twangboy`: https://github.com/twangboy +.. _`tyhunt99`: https://github.com/tyhunt99 +.. _`vitaliyf`: https://github.com/vitaliyf +.. _`vutny`: https://github.com/vutny +.. _`whiteinge`: https://github.com/whiteinge +.. _`zebooka`: https://github.com/zebooka diff --git a/doc/topics/releases/2017.7.3.rst b/doc/topics/releases/2017.7.3.rst index 21205a2ddc..dbddfa9649 100644 --- a/doc/topics/releases/2017.7.3.rst +++ b/doc/topics/releases/2017.7.3.rst @@ -1,137 +1,195 @@ -============================ +=========================== Salt 2017.7.3 Release Notes -============================ +=========================== Version 2017.7.3 is a bugfix release for :ref:`2017.7.0 `. -Changes for v2017.7.2..v2017.7.3 ---------------------------------------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Statistics +========== -*Generated at: 2018-01-25T20:45:09Z* +- Total Merges: **501** +- Total Issue References: **94** +- Total PR References: **423** -Statistics: - -- Total Merges: **499** -- Total Issue references: **161** -- Total PR references: **599** +- Contributors: **86** (`3add3287`_, `BenoitKnecht`_, `Ch3LL`_, `CorvinM`_, `Da-Juan`_, `DmitryKuzmenko`_, `Giandom`_, `The-Loeki`_, `UtahDave`_, `adelcast`_, `amendlik`_, `angeloudy`_, `anlutro`_, `arthurlogilab`_, `basepi`_, `benediktwerner`_, `brejoc`_, `cachedout`_, `campbellmc`_, `chnrxn`_, `clan`_, `corywright`_, `damon-atkins`_, `dincamihai`_, `dmurphy18`_, `eliasp`_, `eradman`_, `forksaber`_, `frogunder`_, `gaborn57`_, `garethgreenaway`_, `golmaal`_, `gracinet`_, `gtmanfred`_, `haam3r`_, `isbm`_, `jettero`_, `jf`_, `jubrad`_, `keesbos`_, `kris-anderson`_, `lomeroe`_, `mateiw`_, `mattLLVW`_, `mephi42`_, `mirceaulinic`_, `mkurtak`_, `morganwillcock`_, `msummers42`_, `mtorromeo`_, `multani`_, `mvivaldi`_, `mz-bmcqueen`_, `nasenbaer13`_, `nicholasmhughes`_, `oarmstrong`_, `pkruk`_, `pratik705`_, `psagers`_, `rallytime`_, `rbjorklin`_, `rcallphin`_, `renner`_, `rhoths`_, `richardsimko`_, `rklaren`_, `roaldnefs`_, `s0undt3ch`_, `samodid`_, `skizunov`_, `skjaro`_, `steverweber`_, `sumeetisp`_, `t0fik`_, `techhat`_, `terminalmage`_, `timfreund`_, `timka`_, `tkwilliams`_, `twangboy`_, `unthought`_, `vernondcole`_, `vutny`_, `wedge-jarrad`_, `whytewolf`_, `xuhcc`_) -Changes: +Windows Changes +=============== -Windows -======= -Execution module pkg --------------------- -Significate changes (PR #43708 & #45390, damon-atkins) have been made to the pkg execution module. Users should test this release against their existing package sls definition files. +:mod:`pkg ` Execution Module` +--------------------------------------------------- -- ``pkg.list_available`` no longer defaults to refreshing the winrepo meta database. -- ``pkg.install`` without a ``version`` parameter no longer upgrades software if the software is already installed. Use ``pkg.install version=latest`` or in a state use ``pkg.latest`` to get the old behavior. -- ``pkg.list_pkgs`` now returns multiple versions if software installed more than once. -- ``pkg.list_pkgs`` now returns 'Not Found' when the version is not found instead of '(value not set)' which matches the contents of the sls definitions. -- ``pkg.remove()`` will wait up to 3 seconds (normally about a second) to detect changes in the registry after removing software, improving reporting of version changes. -- ``pkg.remove()`` can remove ``latest`` software, if ``latest`` is defined in sls definition. -- Documentation was update for the execution module to match the style in new versions, some corrections as well. -- All install/remove commands are prefix with cmd.exe shell and cmdmod is called with a command line string instead of a list. Some sls files in saltstack/salt-winrepo-ng expected the commands to be prefixed with cmd.exe (i.e. the use of ``&``). -- Some execution module functions results, now behavour more like their Unix/Linux versions. -Execution module cmdmod --------------------- -Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don't list-ify string commands on Windows" PR #43807. Linux/Unix OS command & arguments requires a list. Windows was being treated the same. Windows requires commands & arguments to be a string, which this PR fixes. +Significate changes (PR #43708 & #45390, damon-atkins) have been made to the +pkg execution module. Users should test this release against their existing +package sls definition files. + +- :py:func:`pkg.list_available ` no longer + defaults to refreshing the winrepo meta database. +- :py:func:`pkg.install ` without a ``version`` + parameter no longer upgrades software if the software is already installed. + Use ``pkg.install version=latest`` (or simply use a :py:func:`pkg.latest + ` state to get the old behavior. +- :py:func:`pkg.list_pkgs ` now returns + multiple versions if software installed more than once. +- :py:func:`pkg.list_pkgs ` now returns ``Not + Found`` when the version is not found instead of ``(value not set)`` which + matches the contents of the sls definitions. +- :py:func:`pkg.remove ` will wait up to 3 seconds + (normally about a second) to detect changes in the registry after removing + software, improving reporting of version changes. +- :py:func:`pkg.remove ` can remove ``latest`` + software, if ``latest`` is defined in sls definition. +- Documentation was update for the execution module to match the style in new + versions, some corrections as well. +- All install/remove commands are prefix with cmd.exe shell and cmdmod is + called with a command line string instead of a list. Some sls files in + saltstack/salt-winrepo-ng expected the commands to be prefixed with cmd.exe + (i.e. the use of ``&``). +- Some execution module functions results, now behave more like their + Unix/Linux versions. + +:mod:`cmd ` Execution Module +------------------------------------------------- + +Due to a difference in how Python's ``subprocess.Popen()`` spawns processes on +Windows, passing the command as a list of arguments can result in problems. +This is because Windows' *CreateProcess* requires the command to be passed as a +single string. Therefore, ``subprocess`` will attempt to re-assemble the list +of arguments into as string. Some escaped characters and quotes can cause the +resulting string to be incorrectly-assembled, resulting in a failure to execute +the command. + +Salt now deals with these cases by joining the list of arguments correctly and +ensuring that the command is passed to ``subprocess.Popen()`` as a string. -- **PR** `#45681`_: (*damon-atkins*) 2017.7.3 Release notes for Windows - @ *2018-01-25T15:13:18Z* +Changelog for v2017.7.2..v2017.7.3 +================================== + +*Generated at: 2018-05-26 21:36:50 UTC* + +* **ISSUE** `#45743`_: (`frogunder`_) Multi-master PKI not working on Py3 (refs: `#45755`_) + +* **PR** `#45755`_: (`terminalmage`_) salt.crypt: Ensure message is encoded before signing + @ *2018-01-29 19:04:50 UTC* + + * 1439da8d76 Merge pull request `#45755`_ from terminalmage/issue45743 + + * 8af1251c59 salt.crypt: Ensure message is encoded before signing + +* **PR** `#45700`_: (`Ch3LL`_) Add PRs to 2017.7.3 Release Notes + @ *2018-01-25 20:56:45 UTC* + + * fe194d755f Merge pull request `#45700`_ from Ch3LL/7.3_rn + + * 84c8216901 Add PRs to 2017.7.3 Release Notes + +* **PR** `#45681`_: (`damon-atkins`_) 2017.7.3 Release notes for Windows + @ *2018-01-25 15:13:18 UTC* * ce41f6a6ee Merge pull request `#45681`_ from damon-atkins/2017.7.3_win_release_notes + * 1d21f86228 Update 2017.7.3.rst -- **PR** `#45672`_: (*rallytime*) Back-port `#45667`_ to 2017.7.3 - @ *2018-01-25T14:04:54Z* +* **PR** `#45672`_: (`rallytime`_) Back-port `#45667`_ to 2017.7.3 + @ *2018-01-25 14:04:54 UTC* + + * **PR** `#45667`_: (`gtmanfred`_) default to upgrading when refreshing on archlinux (refs: `#45672`_) + + * 2f303439b7 Merge pull request `#45672`_ from rallytime/bp-45667 - - **PR** `#45667`_: (*gtmanfred*) default to upgrading when refreshing on archlinux - | refs: `#45672`_ - * 2f303439b7 Merge pull request `#45672`_ from rallytime/`bp-45667`_ * 74bbaeb7ce we should default to upgrading when refreshing on archlinux -- **PR** `#45669`_: (*rallytime*) Update man pages for 2017.7.3 release - @ *2018-01-24T21:04:59Z* +* **PR** `#45669`_: (`rallytime`_) Update man pages for 2017.7.3 release + @ *2018-01-24 21:04:59 UTC* * 23ff1264e0 Merge pull request `#45669`_ from rallytime/man-pages-2017.7.3 + * d31b41adeb Update man pages for 2017.7.3 release -- **PR** `#45666`_: (*terminalmage*) Fix failing pkg integration tests for releases with no '.' - @ *2018-01-24T17:19:10Z* +* **PR** `#45666`_: (`terminalmage`_) Fix failing pkg integration tests for releases with no '.' + @ *2018-01-24 17:19:10 UTC* * 9a17405ba6 Merge pull request `#45666`_ from terminalmage/salt-jenkins-793 + * 4a6ab729dd Fix failing pkg integration tests for releases with no '.' -- **PR** `#45664`_: (*rallytime*) Back-port `#45452`_ to 2017.7.3 - @ *2018-01-24T15:33:13Z* +* **PR** `#45664`_: (`rallytime`_) Back-port `#45452`_ to 2017.7.3 + @ *2018-01-24 15:33:13 UTC* + + * **PR** `#45452`_: (`adelcast`_) opkg.py: make owner fuction return value, instead of iterator (refs: `#45664`_) + + * 0717f7a578 Merge pull request `#45664`_ from rallytime/bp-45452 - - **PR** `#45452`_: (*adelcast*) opkg.py: make owner function return value, instead of iterator - | refs: `#45664`_ - * 0717f7a578 Merge pull request `#45664`_ from rallytime/`bp-45452`_ * 369720677b opkg.py: make owner function return value, instead of iterator -- **PR** `#45649`_: (*rallytime*) Back-port `#45634`_ to 2017.7.3 - @ *2018-01-24T14:59:43Z* +* **PR** `#45649`_: (`rallytime`_) Back-port `#45634`_ to 2017.7.3 + @ *2018-01-24 14:59:43 UTC* + + * **PR** `#45634`_: (`Ch3LL`_) Add different service name for Mac 10.13 test (refs: `#45649`_) + + * 7934372b7b Merge pull request `#45649`_ from rallytime/bp-45634 - - **PR** `#45634`_: (*Ch3LL*) Add different service name for Mac 10.13 test - | refs: `#45649`_ - * 7934372b7b Merge pull request `#45649`_ from rallytime/`bp-45634`_ * 1c78fc23ea Add different service name for Mac 10.13 test -- **PR** `#45654`_: (*twangboy*) Merge forward `#45638`_ - @ *2018-01-24T14:59:14Z* +* **PR** `#45654`_: (`twangboy`_) Merge forward `#45638`_ + @ *2018-01-24 14:59:14 UTC* + + * **PR** `#45638`_: (`twangboy`_) Win fix shell info (refs: `#45654`_) - - **PR** `#45638`_: (*twangboy*) Win fix shell info - | refs: `#45654`_ * 770f0c4664 Merge pull request `#45654`_ from twangboy/win_fix_shell_info_2017.7.3 + * 5bb01aeb8c Merge forward `#45638`_ -- **PR** `#45653`_: (*rallytime*) Back-port `#45611`_ to 2017.7.3 - @ *2018-01-24T05:20:11Z* +* **PR** `#45653`_: (`rallytime`_) Back-port `#45611`_ to 2017.7.3 + @ *2018-01-24 05:20:11 UTC* + + * **PR** `#45611`_: (`terminalmage`_) Fix unnecessary/incorrect usage of six.binary_type (refs: `#45653`_) + + * 6fc293da46 Merge pull request `#45653`_ from rallytime/bp-45611 - - **PR** `#45611`_: (*terminalmage*) Fix unnecessary/incorrect usage of six.binary_type - | refs: `#45653`_ - * 6fc293da46 Merge pull request `#45653`_ from rallytime/`bp-45611`_ * 0a6b06d8ea Fix unnecessary/incorrect usage of six.binary_type -- **PR** `#45642`_: (*rallytime*) Back-port `#45636`_ to 2017.7.3 - @ *2018-01-23T22:00:30Z* +* **PR** `#45642`_: (`rallytime`_) Back-port `#45636`_ to 2017.7.3 + @ *2018-01-23 22:00:30 UTC* + + * **PR** `#45636`_: (`Ch3LL`_) Fix mac service and pkg tests for 10.13 (refs: `#45642`_) + + * 0a07e0d259 Merge pull request `#45642`_ from rallytime/bp-45636 - - **PR** `#45636`_: (*Ch3LL*) Fix mac service and pkg tests for 10.13 - | refs: `#45642`_ - * 0a07e0d259 Merge pull request `#45642`_ from rallytime/`bp-45636`_ * df0ad54c9a remove unnecessary variable for test * acb14fd43d fix pylint * a9b12cd1ea Fix mac service and pkg tests for 10.13 -- **PR** `#45645`_: (*rallytime*) Back-port `#45606`_ to 2017.7.3 - @ *2018-01-23T21:54:45Z* +* **PR** `#45645`_: (`rallytime`_) Back-port `#45606`_ to 2017.7.3 + @ *2018-01-23 21:54:45 UTC* + + * **PR** `#45606`_: (`terminalmage`_) Fix bug affecting salt-ssh when root_dir differs from the default (refs: `#45645`_) + + * f37a5b6d8d Merge pull request `#45645`_ from rallytime/bp-45606 - - **PR** `#45606`_: (*terminalmage*) Fix bug affecting salt-ssh when root_dir differs from the default - | refs: `#45645`_ - * f37a5b6d8d Merge pull request `#45645`_ from rallytime/`bp-45606`_ * d52d96f30a Fix bug affecting salt-ssh when root_dir differs from the default -- **PR** `#45641`_: (*rallytime*) Back-port `#45508`_ to 2017.7.3 - @ *2018-01-23T21:18:39Z* +* **PR** `#45641`_: (`rallytime`_) Back-port `#45508`_ to 2017.7.3 + @ *2018-01-23 21:18:39 UTC* + + * **PR** `#45508`_: (`frogunder`_) fix test_archive test for mac on 2017.7 branch (refs: `#45641`_) + + * e659793c09 Merge pull request `#45641`_ from rallytime/bp-45508 - - **PR** `#45508`_: (*frogunder*) fix test_archive test for mac on 2017.7 branch - | refs: `#45641`_ - * e659793c09 Merge pull request `#45641`_ from rallytime/`bp-45508`_ * e6917a291e fix test_archive test for mac on 2017.7 branch -- **PR** `#45604`_: (*rallytime*) Back-port `#45582`_ to 2017.7.3 - @ *2018-01-22T16:54:15Z* +* **PR** `#45604`_: (`rallytime`_) Back-port `#45582`_ to 2017.7.3 + @ *2018-01-22 16:54:15 UTC* + + * **PR** `#45582`_: (`terminalmage`_) Two salt-ssh fixes (refs: `#45604`_) + + * ced3269ae8 Merge pull request `#45604`_ from rallytime/bp-45582 - - **PR** `#45582`_: (*terminalmage*) Two salt-ssh fixes - | refs: `#45604`_ - * ced3269ae8 Merge pull request `#45604`_ from rallytime/`bp-45582`_ * bc8a450cc7 Remove state.py utils file from thin list * 629e6c9674 Further fixes to for salt-ssh test under heavy load @@ -140,18 +198,20 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * a61afda100 Pass on OSError if thin tarball already removed -- **PR** `#45591`_: (*gtmanfred*) mark minion_blackout tests as flaky - @ *2018-01-22T00:14:31Z* +* **PR** `#45591`_: (`gtmanfred`_) mark minion_blackout tests as flaky + @ *2018-01-22 00:14:31 UTC* * 4672baa6c8 Merge pull request `#45591`_ from gtmanfred/2017.7.3 + * f7fd35fc4a test updating the minion blackout timeout to 10 seconds -- **PR** `#45585`_: (*rallytime*) Back-port `#45579`_ to 2017.7.3 - @ *2018-01-22T00:13:59Z* +* **PR** `#45585`_: (`rallytime`_) Back-port `#45579`_ to 2017.7.3 + @ *2018-01-22 00:13:59 UTC* + + * **PR** `#45579`_: (`terminalmage`_) Test suite stability fixes (refs: `#45585`_) + + * 2a992f9017 Merge pull request `#45585`_ from rallytime/bp-45579 - - **PR** `#45579`_: (*terminalmage*) Test suite stability fixes - | refs: `#45585`_ - * 2a992f9017 Merge pull request `#45585`_ from rallytime/`bp-45579`_ * 0292c8345b Lint fix: use six's map * 108d8cbeef Use correct utils path for 2017.7 @@ -160,36 +220,40 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 58ad558346 Fix event unpack -- **PR** `#45573`_: (*gtmanfred*) update 2017.7.3 tests - @ *2018-01-20T20:05:13Z* +* **PR** `#45573`_: (`gtmanfred`_) update 2017.7.3 tests + @ *2018-01-20 20:05:13 UTC* * 19cd97ed3b Merge pull request `#45573`_ from gtmanfred/2017.7.3 + * bd3cb47fa7 fix mock for opensuse * 808e26e69a test simple website -- **PR** `#45570`_: (*gtmanfred*) Fix tests for 2017.7.3 - @ *2018-01-20T15:01:21Z* +* **PR** `#45570`_: (`gtmanfred`_) Fix tests for 2017.7.3 + @ *2018-01-20 15:01:21 UTC* * e72d81ef22 Merge pull request `#45570`_ from gtmanfred/2017.7.3 + * 1f71f301ba specify checking man page path * 2ddbcb45c1 fix pkg_resources for usage with testing pip * 0ba39a7108 switch systemd-journald for sshd for arch service test -- **PR** `#45538`_: (*gtmanfred*) Backport test fixes to 2017.7.3 - @ *2018-01-19T14:39:44Z* +* **PR** `#45538`_: (`gtmanfred`_) Backport test fixes to 2017.7.3 + @ *2018-01-19 14:39:44 UTC* * 7bc60c56d4 Merge pull request `#45538`_ from gtmanfred/2017.7.3 + * 801e0639b6 Merge branch '2017.7.3' into 2017.7.3 -- **PR** `#45533`_: (*rallytime*) Back-port `#45529`_ to 2017.7.3 - @ *2018-01-18T22:52:29Z* +* **PR** `#45533`_: (`rallytime`_) Back-port `#45529`_ to 2017.7.3 + @ *2018-01-18 22:52:29 UTC* + + * **PR** `#45529`_: (`Ch3LL`_) Fix UnboundLocalError for pacman pkg installs (refs: `#45533`_) + + * 8ad65e3359 Merge pull request `#45533`_ from rallytime/bp-45529 - - **PR** `#45529`_: (*Ch3LL*) Fix UnboundLocalError for pacman pkg installs - | refs: `#45533`_ - * 8ad65e3359 Merge pull request `#45533`_ from rallytime/`bp-45529`_ * 6d56c64d88 Fix UnboundLocalError for pacman pkg installs * 8d907ee1a0 fix moto version @@ -198,117 +262,125 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * f4b6367cf9 fix fedora pkg test -- **PR** `#45442`_: (*rallytime*) Back-port `#45399`_ to 2017.7.3 - @ *2018-01-17T17:20:48Z* +* **ISSUE** `#45394`_: (`dmurphy18`_) git.latest fails when "depth" is used with a non-default branch (refs: `#45399`_) + +* **PR** `#45442`_: (`rallytime`_) Back-port `#45399`_ to 2017.7.3 + @ *2018-01-17 17:20:48 UTC* + + * **PR** `#45399`_: (`terminalmage`_) Fix git.latest failure when rev is not the default branch (refs: `#45442`_) + + * 7379f9e3e5 Merge pull request `#45442`_ from rallytime/bp-45399 - - **ISSUE** `#45394`_: (*dmurphy18*) git.latest fails when "depth" is used with a non-default branch - | refs: `#45399`_ - - **PR** `#45399`_: (*terminalmage*) Fix git.latest failure when rev is not the default branch - | refs: `#45442`_ - * 7379f9e3e5 Merge pull request `#45442`_ from rallytime/`bp-45399`_ * 590a6db626 Lint: use support TMP path instead of integration TMP path * c081b2c62c Fix git.latest failure when rev is not the default branch -- **PR** `#45468`_: (*twangboy*) Fix some issues with reg.py - @ *2018-01-16T22:23:47Z* +* **PR** `#45468`_: (`twangboy`_) Fix some issues with reg.py + @ *2018-01-16 22:23:47 UTC* * ee5090f69b Merge pull request `#45468`_ from twangboy/win_reg + * a0d21c6354 Fix some issues with reg.py -- **PR** `#45434`_: (*rallytime*) Back-port `#45174`_ to 2017.7.3 - @ *2018-01-14T12:43:16Z* +* **ISSUE** `#44913`_: (`ari`_) FreeBSD packaging install performance regression (refs: `#45174`_) + +* **PR** `#45434`_: (`rallytime`_) Back-port `#45174`_ to 2017.7.3 + @ *2018-01-14 12:43:16 UTC* + + * **PR** `#45174`_: (`eradman`_) Do not force pkg reinstall on FreeBSD (refs: `#45434`_) + + * ef7a896eb6 Merge pull request `#45434`_ from rallytime/bp-45174 - - **ISSUE** `#44913`_: (*ari*) FreeBSD packaging install performance regression - | refs: `#45174`_ - - **PR** `#45174`_: (*eradman*) Do not force pkg reinstall on FreeBSD - | refs: `#45434`_ - * ef7a896eb6 Merge pull request `#45434`_ from rallytime/`bp-45174`_ * b310ff7ab8 Do not force pkg reinstall on FreeBSD -- **PR** `#45395`_: (*rallytime*) Back-port `#45380`_ to 2017.7.3 - @ *2018-01-12T18:49:20Z* +* **PR** `#45395`_: (`rallytime`_) Back-port `#45380`_ to 2017.7.3 + @ *2018-01-12 18:49:20 UTC* + + * **PR** `#45380`_: (`twangboy`_) Backport changes from `#45308`_ (refs: `#45395`_) + + * **PR** `#45308`_: (`twangboy`_) Fix `integration.modules.test_state` for Windows (refs: `#45380`_) + + * c3fdd1dcc4 Merge pull request `#45395`_ from rallytime/bp-45380 - - **PR** `#45380`_: (*twangboy*) Backport changes from `#45308`_ - | refs: `#45395`_ - - **PR** `#45308`_: (*twangboy*) Fix `integration.modules.test_state` for Windows - | refs: `#45380`_ - * c3fdd1dcc4 Merge pull request `#45395`_ from rallytime/`bp-45380`_ * 0356b3d56f Backport changes from `#45308`_ -- **PR** `#45294`_: (*gtmanfred*) include backports_abc - @ *2018-01-11T18:18:16Z* +* **ISSUE** `#44107`_: (`anlutro`_) salt-ssh 2017.7 doesn't work with Python 3, missing backports_abc (refs: `#45294`_) + +* **PR** `#45294`_: (`gtmanfred`_) include backports_abc + @ *2018-01-11 18:18:16 UTC* - - **ISSUE** `#44107`_: (*anlutro*) salt-ssh 2017.7 doesn't work with Python 3, missing backports_abc - | refs: `#45294`_ * f7da716d32 Merge pull request `#45294`_ from gtmanfred/2017.7 + * 3633ceeaa7 Merge branch '2017.7' into 2017.7 * 29806e4496 ignore salt.ext in pylint * 8b597a4890 include backports_abc -- **PR** `#45381`_: (*gtmanfred*) fix module.run docs - @ *2018-01-11T18:02:38Z* +* **ISSUE** `#43130`_: (`boltronics`_) module.run documentation issues (refs: `#45381`_) + +* **PR** `#45381`_: (`gtmanfred`_) fix module.run docs + @ *2018-01-11 18:02:38 UTC* - - **ISSUE** `#43130`_: (*boltronics*) module.run documentation issues - | refs: `#45381`_ * f77a3e9cd4 Merge pull request `#45381`_ from gtmanfred/module.run + * 230e899192 fix module.run docs -- **PR** `#45368`_: (*DmitryKuzmenko*) Fixes to work with pyzmq with --enable-drafts - @ *2018-01-11T17:53:16Z* +* **ISSUE** `#43995`_: (`dragonpaw`_) Using zmq built with --enable-draft breaks Salt (refs: `#45368`_) + +* **PR** `#45368`_: (`DmitryKuzmenko`_) Fixes to work with pyzmq with --enable-drafts + @ *2018-01-11 17:53:16 UTC* - - **ISSUE** `#43995`_: (*dragonpaw*) Using zmq built with --enable-draft breaks Salt - | refs: `#45368`_ * 8efd29f4d9 Merge pull request `#45368`_ from DSRCorporation/bugs/zmq_draft + * 7622e355cf Minor: removed a stale comment. * 00f31bf9b5 Fixes to work with pyzmq with --enable-drafts -- **PR** `#45371`_: (*rallytime*) Back-port `#45158`_ to 2017.7 - @ *2018-01-11T17:51:38Z* +* **PR** `#45371`_: (`rallytime`_) Back-port `#45158`_ to 2017.7 + @ *2018-01-11 17:51:38 UTC* + + * **PR** `#45158`_: (`terminalmage`_) Fix integration.modules.test_state.StateModuleTest.test_exclude (refs: `#45371`_) + + * 22c3efda06 Merge pull request `#45371`_ from rallytime/bp-45158 - - **PR** `#45158`_: (*terminalmage*) Fix integration.modules.test_state.StateModuleTest.test_exclude - | refs: `#45371`_ - * 22c3efda06 Merge pull request `#45371`_ from rallytime/`bp-45158`_ * 3565bc2bf2 Don't use include-test SLS in orch tests * 8bc17e0d7a Fix integration.modules.test_state.StateModuleTest.test_exclude -- **PR** `#45387`_: (*renner*) Set SHELL environment variable - @ *2018-01-11T16:23:21Z* +* **PR** `#45387`_: (`renner`_) Set SHELL environment variable + @ *2018-01-11 16:23:21 UTC* + + * **PR** `#40630`_: (`mateiw`_) develop: SUSE specific changes to salt-api.service (refs: `#45387`_) + + * **PR** `#40620`_: (`mateiw`_) SUSE specific changes to salt-api.service (refs: `#40630`_, `#45387`_) - - **PR** `#40630`_: (*mateiw*) develop: SUSE specific changes to salt-api.service - | refs: `#45387`_ - - **PR** `#40620`_: (*mateiw*) SUSE specific changes to salt-api.service - | refs: `#45387`_ `#40630`_ * 3a0e2de995 Merge pull request `#45387`_ from renner/patch-2 + * 530ddd2d29 Set SHELL environment variable -- **PR** `#45388`_: (*terminalmage*) Fix loader error in 2017.7 tests - @ *2018-01-11T16:13:53Z* +* **PR** `#45388`_: (`terminalmage`_) Fix loader error in 2017.7 tests + @ *2018-01-11 16:13:53 UTC* * dcf98a2260 Merge pull request `#45388`_ from terminalmage/fix-test-loader-error + * 5473c085d9 Fix loader error in 2017.7 tests -- **PR** `#45382`_: (*terminalmage*) Skip flaky test on 2017.7 branch - @ *2018-01-11T14:23:05Z* +* **PR** `#45382`_: (`terminalmage`_) Skip flaky test on 2017.7 branch + @ *2018-01-11 14:23:05 UTC* * d15f9e1020 Merge pull request `#45382`_ from terminalmage/salt-jenkins-686 + * ff3039db6c Skip flaky test on 2017.7 branch -- **PR** `#45369`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2018-01-10T22:14:05Z* +* **PR** `#45369`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2018-01-10 22:14:05 UTC* - - **PR** `#45327`_: (*lomeroe*) Backport `#44861`_ to 2016.11 - - **PR** `#45268`_: (*damon-atkins*) Fix pkg.install packagename version=latest i.e. if on an old version is installed - - **PR** `#44861`_: (*twangboy*) Fix win_lgpo for unknown values - | refs: `#45327`_ * dbe21b2c0d Merge pull request `#45369`_ from rallytime/merge-2017.7 + * f65e091df8 Merge branch '2016.11' into '2017.7' - * 0959ae4ea3 Merge pull request `#45327`_ from lomeroe/`bp-44861`__2016.11 + * 0959ae4ea3 Merge pull request `#45327`_ from lomeroe/bp-44861_2016.11 * 784139f734 Check for values other than 0 or 1 @@ -324,209 +396,216 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * a0d89882b8 Fix pkg.install packagename version=latest i.e. if on an old version upgrade to the latest -- **PR** `#45379`_: (*rhoths*) Minor spelling/grammar fixes in the highstate returner documentation - @ *2018-01-10T20:09:52Z* +* **PR** `#45379`_: (`rhoths`_) Minor spelling/grammar fixes in the highstate returner documentation + @ *2018-01-10 20:09:52 UTC* * 55979b3a48 Merge pull request `#45379`_ from rhoths/rhoths-doc-highstate-1 + * afbbd492cd Minor spelling/grammar fixes in highstate returner -- **PR** `#45358`_: (*UtahDave*) gate the minion data cache refresh events. - @ *2018-01-10T17:21:05Z* +* **PR** `#45358`_: (`UtahDave`_) gate the minion data cache refresh events. + @ *2018-01-10 17:21:05 UTC* + + * **PR** `#45299`_: (`garethgreenaway`_) [2017.7] config gate auth_events (refs: `#45358`_) - - **PR** `#45299`_: (*garethgreenaway*) [2017.7] config gate auth_events - | refs: `#45358`_ * 541e59fa75 Merge pull request `#45358`_ from UtahDave/gate_data_cache_refresh + * 379b6cd23e should be `self`, not `salt` * a82e158f2d gate the minion data cache refresh events. -- **PR** `#45297`_: (*Ch3LL*) Allow macosx service state tests to check for pid return - @ *2018-01-09T20:47:24Z* +* **PR** `#45297`_: (`Ch3LL`_) Allow macosx service state tests to check for pid return + @ *2018-01-09 20:47:24 UTC* * fb87010461 Merge pull request `#45297`_ from Ch3LL/mac_service_state + * 4e569b5802 Allow macosx service state tests to check for pid return -- **PR** `#45351`_: (*dmurphy18*) Update debbuild to explicitly include source code for Debian, Ubuntu - @ *2018-01-09T17:21:51Z* +* **PR** `#45351`_: (`dmurphy18`_) Update debbuild to explicitly include source code for Debian, Ubuntu + @ *2018-01-09 17:21:51 UTC* * beedf6e815 Merge pull request `#45351`_ from dmurphy18/upd_debbuild + * 478dc70092 Update debbuild flags -- **PR** `#45299`_: (*garethgreenaway*) [2017.7] config gate auth_events - | refs: `#45358`_ - @ *2018-01-09T15:00:30Z* +* **PR** `#45299`_: (`garethgreenaway`_) [2017.7] config gate auth_events (refs: `#45358`_) + @ *2018-01-09 15:00:30 UTC* * 66da9b47bc Merge pull request `#45299`_ from garethgreenaway/config_gate_auth_events + * 9a15ec3430 Updating versionadded string. Fixing typo. - * edfc3dc078 Adding in documentation for `auth_events` configuration option + * edfc3dc078 Adding in documention for `auth_events` configuration option * 3ee4eabffd Fixing small typo * 6a28bddcc9 Adding some code to config gate if auth_events are sent -- **PR** `#44856`_: (*Ch3LL*) Add state.running ssh integration test - @ *2018-01-08T21:40:50Z* +* **PR** `#44856`_: (`Ch3LL`_) Add state.running ssh integration test + @ *2018-01-08 21:40:50 UTC* * 8d04c2b3d4 Merge pull request `#44856`_ from Ch3LL/running_test + * 9a35a73711 add time limit to while loop * aeb5f4e248 Add state.running ssh integration test -- **PR** `#45295`_: (*gtmanfred*) test directory that doesn't exist - @ *2018-01-08T20:59:53Z* +* **ISSUE** `saltstack/salt-jenkins#675`_: (`rallytime`_) [2017.7] unit.states.test_file.TestFileState.test_directory is failing on Fedora 27 and CentOS 6 (refs: `#45295`_) + +* **PR** `#45295`_: (`gtmanfred`_) test directory that doesn't exist + @ *2018-01-08 20:59:53 UTC* - - **ISSUE** `#675`_: (*akoumjian*) virtualenv fails without specifying no_site_packages - | refs: `#45295`_ * d0e5e70277 Merge pull request `#45295`_ from gtmanfred/test_directory + * e6178fe6d4 Merge branch '2017.7' into test_directory * 24114e91c1 test was different slightly on 2017.7 * d20fc93625 test directory that doesn't exist -- **PR** `#45302`_: (*gtmanfred*) fix proxy tests for py3 on 2017.7 - @ *2018-01-08T17:41:58Z* +* **ISSUE** `saltstack/salt-jenkins#678`_: (`rallytime`_) [2017.7] Proxy Minion Tests for Py3 are failing (refs: `#45302`_) + +* **PR** `#45302`_: (`gtmanfred`_) fix proxy tests for py3 on 2017.7 + @ *2018-01-08 17:41:58 UTC* - - **ISSUE** `#678`_: (*pille*) add watch support for directories - | refs: `#45302`_ * f49b204b75 Merge pull request `#45302`_ from gtmanfred/proxyp3 + * b295ec0429 make dummy proxy module py3 compatible * 8736e21f65 fix starting proxy minion on py3 * e2824a7253 fix py3 tests -- **PR** `#45279`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2018-01-08T17:26:49Z* +* **PR** `#45279`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2018-01-08 17:26:49 UTC* - - **PR** `#45256`_: (*rallytime*) Back-port `#45034`_ to 2016.11 - - **PR** `#45034`_: (*brejoc*) Fix for pidfile removal logging - | refs: `#45256`_ * eea7158e82 Merge pull request `#45279`_ from rallytime/merge-2017.7 + * 8025b14584 Merge branch '2016.11' into '2017.7' - * 1c5e905b61 Merge pull request `#45256`_ from rallytime/`bp-45034`_ + * 1c5e905b61 Merge pull request `#45256`_ from rallytime/bp-45034 * 68f971b38f Apply test fixes from `#45034`_ to parsers_test.py * 9454236694 Fix for pidfile removal logging -- **PR** `#44853`_: (*gtmanfred*) remove not from vault utils - @ *2018-01-05T17:43:18Z* +* **PR** `#44853`_: (`gtmanfred`_) remove not from vault utils + @ *2018-01-05 17:43:18 UTC* * dab4a8cff3 Merge pull request `#44853`_ from gtmanfred/vault + * bfee1cead6 set role for loading minion config * c5af2e5048 if utils is not loaded, load it * 6a5e0f9ac1 remove not from vault utils -- **PR** `#45277`_: (*rallytime*) Back-port `#45025`_ to 2017.7 - @ *2018-01-05T15:35:53Z* +* **PR** `#45277`_: (`rallytime`_) Back-port `#45025`_ to 2017.7 + @ *2018-01-05 15:35:53 UTC* + + * **PR** `#45025`_: (`steverweber`_) Fix pillar include merge order (refs: `#45277`_) + + * f09d0e5fdb Merge pull request `#45277`_ from rallytime/bp-45025 - - **PR** `#45025`_: (*steverweber*) Fix pillar include merge order - | refs: `#45277`_ - * f09d0e5fdb Merge pull request `#45277`_ from rallytime/`bp-45025`_ * 942c14bb29 pillar body overrides includes * 1152202fdc fix pillar includes from merging over the current sls defines -- **PR** `#45276`_: (*rallytime*) Back-port `#45260`_ to 2017.7 - @ *2018-01-05T14:45:40Z* +* **PR** `#45276`_: (`rallytime`_) Back-port `#45260`_ to 2017.7 + @ *2018-01-05 14:45:40 UTC* + + * **PR** `#45260`_: (`gtmanfred`_) Make some kitchen-salt tests blue (refs: `#45276`_) + + * fc84f1104f Merge pull request `#45276`_ from rallytime/bp-45260 - - **PR** `#45260`_: (*gtmanfred*) Make some kitchen-salt tests blue - | refs: `#45276`_ - * fc84f1104f Merge pull request `#45276`_ from rallytime/`bp-45260`_ * 9ab1af738f switch kitchen-salt to use rsync transport to preserve symlinks * cf98ed472e fix up symlinks -- **PR** `#45255`_: (*rallytime*) Back-port `#44427`_ to 2017.7 - @ *2018-01-04T21:46:17Z* +* **ISSUE** `#43340`_: (`syphernl`_) Upgrading Salt via Salt results in dying minions and broken dpkg (refs: `#45255`_) + +* **PR** `#45255`_: (`rallytime`_) Back-port `#44427`_ to 2017.7 + @ *2018-01-04 21:46:17 UTC* + + * **PR** `#44427`_: (`samodid`_) use KillMode=process for salt-minion.service (refs: `#45255`_) + + * ff9880c498 Merge pull request `#45255`_ from rallytime/bp-44427 - - **ISSUE** `#43340`_: (*syphernl*) Upgrading Salt via Salt results in dying minions and broken dpkg - | refs: `#45255`_ - - **PR** `#44427`_: (*samodid*) use KillMode=process for salt-minion.service - | refs: `#45255`_ - * ff9880c498 Merge pull request `#45255`_ from rallytime/`bp-44427`_ * 6ceafbbf3a use KillMode=process for salt-minion.service -- **PR** `#45251`_: (*forksaber*) Fix `#23454`_ : make pydsl work with salt-ssh - @ *2018-01-04T21:33:09Z* +* **ISSUE** `#23454`_: (`HontoNoRoger`_) SLS rendering error with Salt-SSH (pydsl) (refs: `#45251`_) + +* **PR** `#45251`_: (`forksaber`_) Fix `#23454`_ : make pydsl work with salt-ssh + @ *2018-01-04 21:33:09 UTC* - - **ISSUE** `#23454`_: (*HontoNoRoger*) SLS rendering error with Salt-SSH (pydsl) - | refs: `#45251`_ * e715eb603f Merge pull request `#45251`_ from forksaber/salt-ssh-pydsl + * b3660d5190 [`#23454`_] make pydsl work with salt-ssh -- **PR** `#45254`_: (*Ch3LL*) Add darwin value for ssh grain items tests on MacOSX - @ *2018-01-04T21:31:35Z* +* **PR** `#45254`_: (`Ch3LL`_) Add darwin value for ssh grain items tests on MacOSX + @ *2018-01-04 21:31:35 UTC* * 2934b60d53 Merge pull request `#45254`_ from Ch3LL/fix_mac_grain_ssh + * b4b59b89cd remove platform from salt.utils call for 2017.7 * 85e853a63d Add darwin value for ssh grain items tests on MacOSX -- **PR** `#45135`_: (*twangboy*) Fix win_dacl problems with SIDs - @ *2018-01-04T21:01:48Z* +* **PR** `#45135`_: (`twangboy`_) Fix win_dacl problems with SIDs + @ *2018-01-04 21:01:48 UTC* * af2d880303 Merge pull request `#45135`_ from twangboy/win_fix_dacl + * b31e08946a Merge branch '2017.7' into win_fix_dacl * 35a417f510 Fix win_dacl problems with SIDs -- **PR** `#44930`_: (*frogunder*) man_spm_test - @ *2018-01-04T20:58:02Z* +* **ISSUE** `#43806`_: (`Ch3LL`_) Add spm man Test to Auto Test Suite (refs: `#44930`_) + +* **PR** `#44930`_: (`frogunder`_) man_spm_test + @ *2018-01-04 20:58:02 UTC* - - **ISSUE** `#43806`_: (*Ch3LL*) Add spm man Test to Auto Test Suite - | refs: `#44930`_ * d0a3770035 Merge pull request `#44930`_ from frogunder/man_spm + * 48e6953e1f fix_string_error * c9fa4ed2a7 man_spm_test -- **PR** `#45259`_: (*Ch3LL*) Fix MacOSX Service Status Check and integration test - @ *2018-01-04T14:25:01Z* +* **PR** `#45259`_: (`Ch3LL`_) Fix MacOSX Service Status Check and integration test + @ *2018-01-04 14:25:01 UTC* * 543eebf411 Merge pull request `#45259`_ from Ch3LL/fix-mac-service-test + * 74e6ed60ea Fix MacOSX Service Status Check and integration test -- **PR** `#45263`_: (*sumeetisp*) Updating python version for 2017.7 - @ *2018-01-04T14:16:26Z* +* **PR** `#45263`_: (`sumeetisp`_) Updating python version for 2017.7 + @ *2018-01-04 14:16:26 UTC* - - **ISSUE** `#1`_: (*thatch45*) Enable regex on the salt cli * bbbd1872a7 Merge pull request `#45263`_ from sumeetisp/2017.7 + * e3a5ee3a08 Merge branch '2017.7' into 2017.7 - * 71aea9a3bc Merge pull request `#1`_ from sumeetisp/sumeetisp-python-version + * 71aea9a3bc Merge pull request #1 from sumeetisp/sumeetisp-python-version * 1b4806e2b9 Updating python version -- **PR** `#45244`_: (*twangboy*) Fix search/replace in Py3 - @ *2018-01-04T14:02:22Z* +* **PR** `#45244`_: (`twangboy`_) Fix search/replace in Py3 + @ *2018-01-04 14:02:22 UTC* * d46e1197be Merge pull request `#45244`_ from twangboy/win_fix_portable.py + * e3a8279c01 Get path to python binary based on executable * 03aec37040 Fix search/replace in Py3 -- **PR** `#45233`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2018-01-03T15:34:00Z* +* **PR** `#45233`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2018-01-03 15:34:00 UTC* - - **ISSUE** `#27160`_: (*martinadolfi*) salt.states.mount persistence error using spaces in route - | refs: `#45232`_ `#45232`_ - - **ISSUE** `#598`_: (*syphernl*) Explanation on how to execute interactive installs - | refs: `#45209`_ - - **PR** `#45235`_: (*rallytime*) Back-port `#45209`_ to 2016.11 - - **PR** `#45232`_: (*rasathus*) Backport `#27160`_ to 2016.11 - - **PR** `#45209`_: (*gtmanfred*) enable UsePAM for ssh tests - | refs: `#45235`_ - - **PR** `#44965`_: (*gtmanfred*) check if VALUE is a string_type * eba360870a Merge pull request `#45233`_ from rallytime/merge-2017.7 + * a3d251b2cd Merge branch '2016.11' into '2017.7' - * b75f50afe3 Merge pull request `#45235`_ from rallytime/`bp-45209`_ + * b75f50afe3 Merge pull request `#45235`_ from rallytime/bp-45209 * 2d0a9bbf7e enable UsePAM for ssh tests @@ -542,37 +621,32 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * de53c45c29 Backport `#27160`_ to 2016.11 -- **PR** `#45175`_: (*amendlik*) Pkg uptodate - @ *2018-01-02T17:38:36Z* +* **PR** `#45175`_: (`amendlik`_) Pkg uptodate + @ *2018-01-02 17:38:36 UTC* * 693cc807e8 Merge pull request `#45175`_ from amendlik/pkg-uptodate + * 4f514a29a7 Merge branch '2017.7' into pkg-uptodate -- **PR** `#45226`_: (*gtmanfred*) Update kitchen to use runtests verifier on 2017.7 - @ *2017-12-31T18:13:28Z* +* **PR** `#45226`_: (`gtmanfred`_) Update kitchen to use runtests verifier on 2017.7 + @ *2017-12-31 18:13:28 UTC* * 1b3f3ba1be Merge pull request `#45226`_ from gtmanfred/2017.7 + * 4f3b089e0e fix copying back * f56f062a6a download xml for junit * 7cc342a5d6 use new runtests verifier -- **PR** `#45221`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-12-30T18:08:29Z* +* **PR** `#45221`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-12-30 18:08:29 UTC* - - **ISSUE** `#45188`_: (*jak3kaj*) salt state status.process always returns false - | refs: `#45199`_ - - **ISSUE** `#44516`_: (*doesitblend*) Windows PY3 Minion Returns UTF16 UnicodeError - | refs: `#44944`_ `#45161`_ - - **PR** `#45199`_: (*gtmanfred*) status.pid returns pid ids not process names - - **PR** `#45161`_: (*lomeroe*) Backport `#44944`_ to 2016.11 - - **PR** `#44944`_: (*lomeroe*) win_lgpo registry.pol encoding updates - | refs: `#45161`_ * 7d3a6cbc65 Merge pull request `#45221`_ from rallytime/merge-2017.7 + * 508599e159 Merge branch '2016.11' into '2017.7' - * 707ef55175 Merge pull request `#45161`_ from lomeroe/`bp-44944`__2016.11 + * 707ef55175 Merge pull request `#45161`_ from lomeroe/bp-44944_2016.11 * 0a4c6b5a83 remove references to six.unichr @@ -586,12 +660,13 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * fb07f9ea7d status.pid returns pid ids not process names -- **PR** `#45204`_: (*garethgreenaway*) [2017.7] Fixes to osquery module & addition of unit tests - @ *2017-12-30T13:25:38Z* +* **ISSUE** `#45176`_: (`thuhak`_) osquery execution module does't work with attrs parameter (refs: `#45204`_) + +* **PR** `#45204`_: (`garethgreenaway`_) [2017.7] Fixes to osquery module & addition of unit tests + @ *2017-12-30 13:25:38 UTC* - - **ISSUE** `#45176`_: (*thuhak*) osquery execution module does't work with attrs parameter - | refs: `#45204`_ * abed378981 Merge pull request `#45204`_ from garethgreenaway/45176_fixes_to_osquery_module + * dc933e9e24 Fixing typo * d834bd1b6f Fixing some minor lint issues. @@ -608,17 +683,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 7c67ec39d9 Add tests for pkg.uptodate state -- **PR** `#45203`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-12-29T01:11:03Z* +* **PR** `#45203`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-12-29 01:11:03 UTC* - - **ISSUE** `#44728`_: (*casselt*) Nodegroups can not be defined by glob with ? or seq - | refs: `#45118`_ - - **PR** `#45137`_: (*twangboy*) Catch correct error type in list_keys and list_values - - **PR** `#45130`_: (*rallytime*) Resolve groups for salt api - - **PR** `#45127`_: (*twangboy*) Fix issue with 1641 return code - - **PR** `#45118`_: (*garethgreenaway*) [2016.11] Fix to allow nodegroups to include sequences - - **PR** `#45114`_: (*twangboy*) Move pam library load to try/except block * 5991d8ca15 Merge pull request `#45203`_ from rallytime/merge-2017.7 + * 430c913c8c Merge branch '2016.11' into '2017.7' * d3381e27d0 Merge pull request `#45118`_ from garethgreenaway/44728_nodegroups_seq @@ -643,48 +712,54 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * cf5eae1f77 Move pam library load to try/except block -- **PR** `#45201`_: (*rallytime*) [2017.7] Check for running on python3 before decoding bytes - @ *2017-12-28T22:59:14Z* +* **PR** `#45201`_: (`rallytime`_) [2017.7] Check for running on python3 before decoding bytes + @ *2017-12-28 22:59:14 UTC* + + * **PR** `#45090`_: (`angeloudy`_) fix TypeError in python 3 (refs: `#45201`_) - - **PR** `#45090`_: (*angeloudy*) fix TypeError in python 3 - | refs: `#45201`_ * 882267314f Merge pull request `#45201`_ from rallytime/fix-jinja-template-test-failure + * b4af3bdff8 Check for running on python3 before decoding bytes -- **PR** `#45200`_: (*rallytime*) [2017.7] Fix docstring integration test failure - @ *2017-12-28T22:58:34Z* +* **PR** `#45200`_: (`rallytime`_) [2017.7] Fix docstring integration test failure + @ *2017-12-28 22:58:34 UTC* + + * **PR** `#44552`_: (`Da-Juan`_) pip_state: Check if available upgrades fulfill version requirements. (refs: `#45200`_) - - **PR** `#44552`_: (*Da-Juan*) pip_state: Check if available upgrades fulfill version requirements. - | refs: `#45200`_ * 2e18398f12 Merge pull request `#45200`_ from rallytime/fix-docstring-test-failure + * a26d4795bd [2017.7] Fix docstring integration test failure -- **PR** `#45186`_: (*rallytime*) Back-port `#44922`_ to 2017.7 - @ *2017-12-28T19:02:51Z* +* **PR** `#45186`_: (`rallytime`_) Back-port `#44922`_ to 2017.7 + @ *2017-12-28 19:02:51 UTC* + + * **PR** `#44922`_: (`dincamihai`_) Fix salt-master for old psutil (refs: `#45186`_) + + * 67d97303b5 Merge pull request `#45186`_ from rallytime/bp-44922 - - **PR** `#44922`_: (*dincamihai*) Fix salt-master for old psutil - | refs: `#45186`_ - * 67d97303b5 Merge pull request `#45186`_ from rallytime/`bp-44922`_ * 6970fe8103 Fix salt-master for old psutil -- **PR** `#44624`_: (*eliasp*) Fix Traceback when using the `service.enabled` state on non-booted systems - @ *2017-12-28T10:58:43Z* +* **PR** `#44624`_: (`eliasp`_) Fix Traceback when using the `service.enabled` state on non-booted systems + @ *2017-12-28 10:58:43 UTC* * 30d7f7257a Merge pull request `#44624`_ from eliasp/fix-upstart-utmp-exception + * 43d44e051a Do not blindly assume presence of either `/var/run/utmp` or `/run/utmp`, none of both might be available (e.g. on non-booted systems). -- **PR** `#45183`_: (*twangboy*) Add libnacl dependency - @ *2017-12-27T22:08:32Z* +* **PR** `#45183`_: (`twangboy`_) Add libnacl dependency + @ *2017-12-27 22:08:32 UTC* * 3832e7b227 Merge pull request `#45183`_ from twangboy/win_add_libnacl_2017.7 + * b46845888d Add libnacl dependency -- **PR** `#44966`_: (*rcallphin*) Fix bug with vault runner creating token on empty policy - @ *2017-12-22T20:30:37Z* +* **ISSUE** `#44928`_: (`rcallphin`_) Duplicating master token when no match for Minion policy (Vault Module) (refs: `#44966`_) + +* **PR** `#44966`_: (`rcallphin`_) Fix bug with vault runner creating token on empty policy + @ *2017-12-22 20:30:37 UTC* - - **ISSUE** `#44928`_: (*rcallphin*) Duplicating master token when no match for Minion policy (Vault Module) - | refs: `#44966`_ * fbbf33574e Merge pull request `#44966`_ from rcallphin/fix-bug-vault-empty-policy + * 7f327ab760 Lint: Remove extra whitespace * 04ab6a5e9d Merge branch '2017.7' into fix-bug-vault-empty-policy @@ -693,11 +768,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 48d9cc3674 Fix bug with vault runner creating token on empty policy -- **PR** `#44552`_: (*Da-Juan*) pip_state: Check if available upgrades fulfill version requirements. - | refs: `#45200`_ - @ *2017-12-22T19:25:17Z* +* **PR** `#44552`_: (`Da-Juan`_) pip_state: Check if available upgrades fulfill version requirements. (refs: `#45200`_) + @ *2017-12-22 19:25:17 UTC* * 487207f61d Merge pull request `#44552`_ from Da-Juan/avoid_unneeded_pip_install + * 49a6a8f02e Merge branch '2017.7' into avoid_unneeded_pip_install * 3a8e62493d pip_state: Check if available upgrades fulfill version requirements @@ -706,39 +781,42 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 5219ab974c Add list_all_versions function to pip module -- **PR** `#45090`_: (*angeloudy*) fix TypeError in python 3 - | refs: `#45201`_ - @ *2017-12-22T18:11:13Z* +* **PR** `#45090`_: (`angeloudy`_) fix TypeError in python 3 (refs: `#45201`_) + @ *2017-12-22 18:11:13 UTC* * 5ae26f0c09 Merge pull request `#45090`_ from angeloudy/2017.7 + * cf411f8984 Merge branch '2017.7' into 2017.7 * 177fd18671 fix TypeError in python 3 -- **PR** `#45134`_: (*garethgreenaway*) [2017.7] fix to cmd.script for cwd with space - @ *2017-12-22T15:31:24Z* +* **ISSUE** `#44315`_: (`whytewolf`_) cmd.* cwd does not escape spaces. 2017.7.2 (refs: `#45134`_) + +* **PR** `#45134`_: (`garethgreenaway`_) [2017.7] fix to cmd.script for cwd with space + @ *2017-12-22 15:31:24 UTC* - - **ISSUE** `#44315`_: (*whytewolf*) cmd.* cwd does not escape spaces. 2017.7.2 - | refs: `#45134`_ * a1946730a9 Merge pull request `#45134`_ from garethgreenaway/44315_cmd_script_cwd_with_space + * 48eafe3206 Adding some tests to tests cmd.script with cwd * 8dfcf71b08 Adding _cmd_quote to handle cases when the current working directory for cmd.script might have a space in it. -- **PR** `#44964`_: (*Giandom*) added-highstate-output-to-slack-engine - @ *2017-12-21T21:32:01Z* +* **PR** `#44964`_: (`Giandom`_) added-highstate-output-to-slack-engine + @ *2017-12-21 21:32:01 UTC* * f41adfc913 Merge pull request `#44964`_ from Giandom/2017.7-added-highstate-output-to-slack-engine + * 4526c158f1 added-highstate-output-to-slack-engine * 573a0a4143 added-highstate-output-to-slack-engine * 9a6e03ce6e added-highstate-output-to-slack-engine -- **PR** `#45124`_: (*gtmanfred*) enable using kitchen-salt with ec2 on 2017.7 - @ *2017-12-21T19:11:27Z* +* **PR** `#45124`_: (`gtmanfred`_) enable using kitchen-salt with ec2 on 2017.7 + @ *2017-12-21 19:11:27 UTC* * b49ee97938 Merge pull request `#45124`_ from gtmanfred/2017.7 + * d0586013eb fix pylint * 59e2e56d13 chmod the xml files before trying to copy @@ -747,54 +825,24 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 23bd38ad66 enable using kitchen-salt on ec2 -- **PR** `#45087`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-12-20T22:24:51Z* +* **PR** `#45087`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-12-20 22:24:51 UTC* - - **ISSUE** `#45049`_: (*vernondcole*) salt cloud module documentation is missing from the index. - | refs: `#45070`_ - - **ISSUE** `#45036`_: (*dijit*) Quiet installation of packaged minions fails due to redistributable not being quietly installed [py3] [Windows] - | refs: `#45040`_ `#45040`_ - - **ISSUE** `#44820`_: (*msteed*) Custom returner breaks manage runner - | refs: `#44958`_ - - **ISSUE** `#44378`_: (*llua*) minion: infinite loop during start when schedule key is null - | refs: `#44385`_ - - **ISSUE** `#41286`_: (*arthtux*) boto_vpc.accept_vpc_peering_connection wait a object - | refs: `#41305`_ - - **ISSUE** `#41044`_: (*pirxthepilot*) user.present 'date' parameter is not applying - | refs: `#44078`_ - - **PR** `#45100`_: (*rallytime*) Back-port `#45070`_ to 2016.11 - - **PR** `#45098`_: (*rallytime*) Back-port `#45092`_ to 2016.11 - - **PR** `#45092`_: (*terminalmage*) Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install - | refs: `#45098`_ - - **PR** `#45070`_: (*vernondcole*) insert clouds modules in index - | refs: `#45100`_ - - **PR** `#45069`_: (*rallytime*) Back-port `#45040`_ to 2016.11 - - **PR** `#45040`_: (*dijit*) Installation Fails on headless machines. - | refs: `#45069`_ - - **PR** `#45031`_: (*terminalmage*) Fix invalid exception class in mysql returner - - **PR** `#44972`_: (*terminalmage*) Backport `#44958`_ to 2016.11 branch - - **PR** `#44970`_: (*rallytime*) Update bootstrap script to latest release: 2017.12.13 - - **PR** `#44969`_: (*rallytime*) Back-port `#41305`_ to 2016.11 - - **PR** `#44958`_: (*terminalmage*) Fix a race condition in manage runner - | refs: `#44972`_ - - **PR** `#44385`_: (*gtmanfred*) schedule should be a dict in opts - - **PR** `#44078`_: (*rossengeorgiev*) user.present: allow date param to be 0 - - **PR** `#41305`_: (*arthtux*) correct accept_vpc_peering_connection - | refs: `#44969`_ * 42e894570d Merge pull request `#45087`_ from rallytime/merge-2017.7 + * fe81e2d39a Merge branch '2016.11' into '2017.7' - * 7e128e8f15 Merge pull request `#45100`_ from rallytime/`bp-45070`_ + * 7e128e8f15 Merge pull request `#45100`_ from rallytime/bp-45070 * 0bdb46dab9 add clouds modules to index - * bdf93f339d Merge pull request `#45098`_ from rallytime/`bp-45092`_ + * bdf93f339d Merge pull request `#45098`_ from rallytime/bp-45092 * 80b6bd6813 Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install * 4f21a2bbfd Merge branch '2016.11' into '2017.7' - * 324b7d4058 Merge pull request `#44078`_ from rossengeorgiev/`fix-41044`_ + * 324b7d4058 Merge pull request `#44078`_ from rossengeorgiev/fix-41044 * a81a6fe23c fix `#41044`_; allow for date param to be 0 @@ -802,11 +850,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * b2c8057427 Update bootstrap script to latest release: 2017.12.13 - * 637fdaed58 Merge pull request `#45069`_ from rallytime/`bp-45040`_ + * 637fdaed58 Merge pull request `#45069`_ from rallytime/bp-45040 * aa438e1605 Installation Fails on headless machines. - * 4d6d640381 Merge pull request `#44969`_ from rallytime/`bp-41305`_ + * 4d6d640381 Merge pull request `#44969`_ from rallytime/bp-41305 * 5c4bee43dc correct accept_vpc_peering_connection @@ -814,7 +862,7 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * f3bd12c27c Fix invalid exception class in mysql returner - * 9a7406207f Merge pull request `#44972`_ from terminalmage/`bp-44958`_ + * 9a7406207f Merge pull request `#44972`_ from terminalmage/bp-44958 * a416bf0112 No need to manually do connect_pub, use listen=True in run_job @@ -826,76 +874,75 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 855d933cb7 schedule should be a dict -- **PR** `#45112`_: (*Ch3LL*) Fix spm big file build test to check /tmp - @ *2017-12-20T22:09:21Z* +* **PR** `#45112`_: (`Ch3LL`_) Fix spm big file build test to check /tmp + @ *2017-12-20 22:09:21 UTC* * 9550e742ac Merge pull request `#45112`_ from Ch3LL/fix-arch + * 1bd7110a14 Fix spm big file build test to check /tmp -- **PR** `#45068`_: (*rallytime*) Back-port `#44976`_ to 2017.7 - @ *2017-12-20T16:31:22Z* +* **ISSUE** `#44303`_: (`mwerickso`_) boto3_route53 module times out on retries (refs: `#44976`_) + +* **PR** `#45068`_: (`rallytime`_) Back-port `#44976`_ to 2017.7 + @ *2017-12-20 16:31:22 UTC* + + * **PR** `#44976`_: (`tkwilliams`_) Fix bad variable name in boto3_route53 module - resolves `#44303`_ (refs: `#45068`_) + + * 71f9c7ee49 Merge pull request `#45068`_ from rallytime/bp-44976 - - **ISSUE** `#44303`_: (*mwerickso*) boto3_route53 module times out on retries - | refs: `#44976`_ - - **PR** `#44976`_: (*tkwilliams*) Fix bad variable name in boto3_route53 module - resolves `#44303`_ - | refs: `#45068`_ - * 71f9c7ee49 Merge pull request `#45068`_ from rallytime/`bp-44976`_ * 0ca0f37805 44303 - resolves `#44303`_ -- **PR** `#45099`_: (*rallytime*) Back-port `#44983`_ to 2017.7 - @ *2017-12-20T14:41:22Z* +* **ISSUE** `#44961`_: (`golmaal`_) The archive tar function fails to untar file when dest argument is passed (refs: `#44983`_) + +* **PR** `#45099`_: (`rallytime`_) Back-port `#44983`_ to 2017.7 + @ *2017-12-20 14:41:22 UTC* + + * **PR** `#44983`_: (`golmaal`_) Ref:44961 - Modified archive.tar to add dest at the end of the tar cmd (refs: `#45099`_) + + * 54a33c0e1d Merge pull request `#45099`_ from rallytime/bp-44983 - - **ISSUE** `#44961`_: (*golmaal*) The archive tar function fails to untar file when dest argument is passed - | refs: `#44983`_ - - **PR** `#44983`_: (*golmaal*) Ref:44961 - Modified archive.tar to add dest at the end of the tar cmd - | refs: `#45099`_ - * 54a33c0e1d Merge pull request `#45099`_ from rallytime/`bp-44983`_ * 23361de8a2 Ref:44961 - Modified archive.tar to add dest argument at the end of the tar cmd. -- **PR** `#44650`_: (*frogunder*) add status.pid test - @ *2017-12-19T16:21:09Z* +* **ISSUE** `#43533`_: (`Ch3LL`_) Add status.pid Test to Auto Test Suite (refs: `#44650`_) + +* **PR** `#44650`_: (`frogunder`_) add status.pid test + @ *2017-12-19 16:21:09 UTC* - - **ISSUE** `#43533`_: (*Ch3LL*) Add status.pid Test to Auto Test Suite - | refs: `#44650`_ * e0d7b330fa Merge pull request `#44650`_ from frogunder/status + * 904c0da893 Merge branch '2017.7' into status * 619bd2be1e fix lint error * d406cb07a3 add status.pid test -- **PR** `#44944`_: (*lomeroe*) win_lgpo registry.pol encoding updates - | refs: `#45161`_ - @ *2017-12-19T14:42:49Z* +* **ISSUE** `#44516`_: (`doesitblend`_) Windows PY3 Minion Returns UTF16 UnicodeError (refs: `#45161`_, `#44944`_) + +* **PR** `#44944`_: (`lomeroe`_) win_lgpo registry.pol encoding updates (refs: `#45161`_) + @ *2017-12-19 14:42:49 UTC* - - **ISSUE** `#44516`_: (*doesitblend*) Windows PY3 Minion Returns UTF16 UnicodeError - | refs: `#44944`_ `#45161`_ * 422d8b8f1b Merge pull request `#44944`_ from lomeroe/update_regpol_encoding + * 07d04c7bc7 lint fixes for static regexes * d17c46ce41 lint fixes * ab8e431729 do not decode registry.pol file wholesale, but instead decode individual elements of the file -- **PR** `#44938`_: (*The-Loeki*) Libcloud dns fixes - @ *2017-12-18T15:47:18Z* +* **PR** `#44938`_: (`The-Loeki`_) Libcloud dns fixes + @ *2017-12-18 15:47:18 UTC* * d9a4b9681e Merge pull request `#44938`_ from The-Loeki/libcloud_dns_fixes + * 276e8828ae libcloud_dns: pylint fix * c994423286 Merge branch '2017.7' into libcloud_dns_fixes -- **PR** `#44951`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-12-16T13:16:24Z* +* **PR** `#44951`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-12-16 13:16:24 UTC* - - **ISSUE** `#44734`_: (*cruscio*) Documentation inconsistency for minion ping_interval timing - | refs: `#44770`_ - - **ISSUE** `#44292`_: (*andrew-regan*) grains['virtual_subtype'] assignment for Docker broken on Mac - | refs: `#44335`_ - - **ISSUE** `#4`_: (*thatch45*) pacman module - - **PR** `#44770`_: (*cruscio*) Fix minion ping_interval documentation - - **PR** `#44335`_: (*gtmanfred*) add docker-ce to docker subtype grains check * 5137be01ec Merge pull request `#44951`_ from rallytime/merge-2017.7 + * a0d2dd2069 Lint fix * 9db4179462 Merge branch '2016.11' into '2017.7' @@ -910,95 +957,104 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 1d0bd5bb32 Merge branch '2016.11' into 2016.11 - * f02b02032d Merge pull request `#4`_ from terminalmage/pr-44335 + * f02b02032d Merge pull request #4 from terminalmage/pr-44335 * b4eb1527a6 Add test for PR 44335 * a30af3252e add docker-ce to docker subtype grains check -- **PR** `#44995`_: (*twangboy*) Fix `unit.modules.test_file` for Windows - @ *2017-12-15T17:05:49Z* +* **PR** `#44995`_: (`twangboy`_) Fix `unit.modules.test_file` for Windows + @ *2017-12-15 17:05:49 UTC* * 698b04779e Merge pull request `#44995`_ from twangboy/win_fix_atomicfile + * 8316481944 Comment the salt import * fe34f0c877 Set owner properly on Windows -- **PR** `#44968`_: (*gtmanfred*) fix http wait for state - @ *2017-12-14T20:06:01Z* +* **ISSUE** `#44934`_: (`vernondcole`_) http.wait_for_successful_query does not pause for documented intervals (refs: `#44968`_) + +* **PR** `#44968`_: (`gtmanfred`_) fix http wait for state + @ *2017-12-14 20:06:01 UTC* - - **ISSUE** `#44934`_: (*vernondcole*) http.wait_for_successful_query does not pause for documented intervals - | refs: `#44968`_ * 2e1a57b9bc Merge pull request `#44968`_ from gtmanfred/http + * ca6936f6eb fix http wait for state * c72db283d5 libcloud_dns: Further fixes to state output, pylint fixes * e9bbc23b11 Merge branch '2017.7' into libcloud_dns_fixes -- **PR** `#44900`_: (*xuhcc*) Fix TypeError during rbenv ruby installation when rbenv is not found - @ *2017-12-14T17:37:14Z* +* **ISSUE** `#44811`_: (`xuhcc`_) rbenv.installed fails when rbenv installed globally (refs: `#44900`_) + +* **PR** `#44900`_: (`xuhcc`_) Fix TypeError during rbenv ruby installation when rbenv is not found + @ *2017-12-14 17:37:14 UTC* - - **ISSUE** `#44811`_: (*xuhcc*) rbenv.installed fails when rbenv installed globally - | refs: `#44900`_ * c4f0894689 Merge pull request `#44900`_ from xuhcc/rbenv-ret-fix + * fdd8310c31 Merge branch '2017.7' into rbenv-ret-fix * bfd0972d25 Fix TypeError during rbenv ruby installation when rbenv is not found -- **PR** `#44974`_: (*twangboy*) Skip test_log_created on Windows - @ *2017-12-14T13:59:25Z* +* **PR** `#44974`_: (`twangboy`_) Skip test_log_created on Windows + @ *2017-12-14 13:59:25 UTC* * f0c2cf3cec Merge pull request `#44974`_ from twangboy/win_skip_test_parsers + * 40665d7b08 Skip test_log_created on Windows -- **PR** `#44958`_: (*terminalmage*) Fix a race condition in manage runner - | refs: `#44972`_ - @ *2017-12-13T15:20:36Z* +* **ISSUE** `#44820`_: (`msteed`_) Custom returner breaks manage runner (refs: `#44958`_) + +* **PR** `#44958`_: (`terminalmage`_) Fix a race condition in manage runner (refs: `#44972`_) + @ *2017-12-13 15:20:36 UTC* - - **ISSUE** `#44820`_: (*msteed*) Custom returner breaks manage runner - | refs: `#44958`_ * dad2d723ca Merge pull request `#44958`_ from terminalmage/issue44820 + * ef749abfc6 No need to manually do connect_pub, use listen=True in run_job * 2ac70cfab5 Fix a race condition in manage runner -- **PR** `#44956`_: (*terminalmage*) Avoid traceback when bogus value in pidfile - @ *2017-12-13T14:30:12Z* +* **PR** `#44956`_: (`terminalmage`_) Avoid traceback when bogus value in pidfile + @ *2017-12-13 14:30:12 UTC* * db58345abb Merge pull request `#44956`_ from terminalmage/fix-get_pidfile + * d66f3a98d7 Avoid traceback when bogus value in pidfile -- **PR** `#44945`_: (*gtmanfred*) Fix handling of effective acls - @ *2017-12-12T21:49:34Z* +* **ISSUE** `#44932`_: (`knine`_) ACLs Not Completely Verified (refs: `#44945`_) + +* **PR** `#44945`_: (`gtmanfred`_) Fix handling of effective acls + @ *2017-12-12 21:49:34 UTC* - - **ISSUE** `#44932`_: (*knine*) ACLs Not Completely Verified - | refs: `#44945`_ * e8e3b3c8ff Merge pull request `#44945`_ from gtmanfred/2017.7 + * 66bb755751 add test for effective acls * 0ff52a93dd use last entry in acl -- **PR** `#44942`_: (*rallytime*) Update README with SaltConf18 info - @ *2017-12-12T21:47:23Z* +* **PR** `#44942`_: (`rallytime`_) Update README with SaltConf18 info + @ *2017-12-12 21:47:23 UTC* * 47dc7b7afb Merge pull request `#44942`_ from rallytime/readme-saltconf-update + * d1317c44e2 Update README with SaltConf18 info -- **PR** `#44943`_: (*mvivaldi*) Fix for the jinja documentation - @ *2017-12-12T20:20:41Z* +* **ISSUE** `#44665`_: (`mvivaldi`_) Documentation of salt renders jinja (refs: `#44943`_, `#44895`_) + +* **PR** `#44943`_: (`mvivaldi`_) Fix for the jinja documentation + @ *2017-12-12 20:20:41 UTC* - - **ISSUE** `#44665`_: (*mvivaldi*) Documentation of salt renders jinja - | refs: `#44895`_ `#44943`_ * 7572982419 Merge pull request `#44943`_ from mvivaldi/filters-doc + * d23ac4eabc Fix for the jinja documentation -- **PR** `#44832`_: (*damon-atkins*) win_pkg: Merge full copy of 2016.11 with many fixes and improvements to 2017.7 - @ *2017-12-12T18:30:06Z* +* **ISSUE** `#43417`_: (`damon-atkins`_) win_pkg: pkg.install and pkg.remove general issues (refs: `#44832`_, `#43708`_) + +* **PR** `#44832`_: (`damon-atkins`_) win_pkg: Merge full copy of 2016.11 with many fixes and improvements to 2017.7 + @ *2017-12-12 18:30:06 UTC* - - **ISSUE** `#43417`_: (*damon-atkins*) win_pkg: pkg.install and pkg.remove general issues - | refs: `#43708`_ `#44832`_ * 465cacad83 Merge pull request `#44832`_ from damon-atkins/2017.7_replace_with_newer_2016.11_win_pkg + * a4f0b41ba2 Should be a smaller change set since recent update from 2016.11 * 695334b201 Merge branch '2017.7_replace_with_newer_2016.11_win_pkg' of github.com:damon-atkins/salt into 2017.7_replace_with_newer_2016.11_win_pkg @@ -1007,16 +1063,17 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 4b60b1ec84 Merge remote branch 'refs/remotes/upstream/2017.7' into 2017.7_replace_with_newer_2016.11_win_pkg - * b46f818a57 Raise a PR to fix 2016 issues committed here, fixed issues with merge. + * b46f818a57 Raise a PR to fix 2016 issues commited here, fixed issues with merge. * 32ef1e12ae Merge branch '2017.7' into 2017.7_replace_with_newer_2016.11_win_pkg * 494835c3f2 I backported develop and applied a long list of fixes to 2016.11 this brings these fixes into 2017.7 - Software was not always being removed, general if & was in the string or msi was downloaded to uninstall the software - pkg.list_upgrades failed. Added support for 'latest' and 'Not Found' for version_cmp() to fix this. - output fixes - pkg.list_available no longer forces a pkg.refresh_db this is no longer required, as by default it will update if older than 6 hours - cmd /s /c is prefixed for all commands i.e. installs and removes. - cmd are now strings, instead of a list when using cmd.run. As windows only supports strings. And the " were being broken -- **PR** `#44754`_: (*twangboy*) Fix inet_pton for Windows on Py3 - @ *2017-12-12T14:04:20Z* +* **PR** `#44754`_: (`twangboy`_) Fix inet_pton for Windows on Py3 + @ *2017-12-12 14:04:20 UTC* * a811a92b17 Merge pull request `#44754`_ from twangboy/win_fix_inet_pton + * 25a20109fe Merge branch '2017.7' into win_fix_inet_pton * 849b99eb34 Merge branch '2017.7' into win_fix_inet_pton @@ -1027,10 +1084,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 9b5d8c421b Handle unicode values -- **PR** `#44931`_: (*pkruk*) add missing parenthis to keep integration with python3 - @ *2017-12-12T13:49:39Z* +* **PR** `#44931`_: (`pkruk`_) add missing parenthis to keep integration with python3 + @ *2017-12-12 13:49:39 UTC* * 53b34e24cd Merge pull request `#44931`_ from pkruk/fix-missing-parenthis + * b1ed739b44 Merge branch '2017.7' into fix-missing-parenthis * 4f1b1f12d2 Merge branch 'fix-missing-parenthis' of https://github.com/pkruk/salt into fix-missing-parenthis @@ -1043,55 +1101,45 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * a68d594e3a libcloud_dns: copy args before deleting from them -- **PR** `#44891`_: (*twangboy*) Fix issue with unsafe path in Windows jenkins tests - @ *2017-12-11T21:10:43Z* +* **PR** `#44891`_: (`twangboy`_) Fix issue with unsafe path in Windows jenkins tests + @ *2017-12-11 21:10:43 UTC* * ba6146250a Merge pull request `#44891`_ from twangboy/win_fix_verify + * 7232579167 Allow test suite file_roots as a safe path -- **PR** `#44921`_: (*Ch3LL*) Add test to ensure log files are created - @ *2017-12-11T18:24:16Z* +* **PR** `#44921`_: (`Ch3LL`_) Add test to ensure log files are created + @ *2017-12-11 18:24:16 UTC* * 85160fd297 Merge pull request `#44921`_ from Ch3LL/log_test + * 3bb58fb577 skip salt-key log creation test * 6a379195bc Add test to ensure log files are created -- **PR** `#44787`_: (*rallytime*) GroupAdd test: Add destructive test decorator to entire class - @ *2017-12-11T18:14:18Z* +* **PR** `#44787`_: (`rallytime`_) GroupAdd test: Add destructive test decorator to entire class + @ *2017-12-11 18:14:18 UTC* * 54d29a61cb Merge pull request `#44787`_ from rallytime/groupadd-destructive-clean + * 817ac002b0 Add destructive test decorator to test class -- **PR** `#44895`_: (*mvivaldi*) Jinja Filters doc - @ *2017-12-11T15:32:07Z* +* **ISSUE** `#44665`_: (`mvivaldi`_) Documentation of salt renders jinja (refs: `#44943`_, `#44895`_) + +* **PR** `#44895`_: (`mvivaldi`_) Jinja Filters doc + @ *2017-12-11 15:32:07 UTC* - - **ISSUE** `#44665`_: (*mvivaldi*) Documentation of salt renders jinja - | refs: `#44895`_ `#44943`_ * 0292e3612a Merge pull request `#44895`_ from mvivaldi/filters-doc + * 62409d608a Added Escape Filters and Set Theory Filters in jinja documentation -- **PR** `#44879`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-12-10T16:53:44Z* +* **PR** `#44879`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-12-10 16:53:44 UTC* + + * **PR** `#44855`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 (refs: `#44879`_) - - **ISSUE** `#44730`_: (*msciciel*) State network.routes could not add route without gateway on centos7 - | refs: `#44741`_ - - **ISSUE** `#44530`_: (*roaldnefs*) Identifier not working in salt.states.cron when special is used - | refs: `#44579`_ - - **ISSUE** `#44365`_: (*icycle77*) file.managed appears to ignore source_hash check - | refs: `#44794`_ - - **ISSUE** `#35777`_: (*rallytime*) Properly deprecate template context data in Fluorine - | refs: `#44738`_ - - **ISSUE** `#35523`_: (*rallytime*) Come up with a reasonable alternative for lxc.edited_conf - | refs: `#44738`_ - - **PR** `#44855`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - | refs: `#44879`_ - - **PR** `#44852`_: (*damon-atkins*) win_pkg fix spelling typos and minion option 2016.11 - - **PR** `#44794`_: (*terminalmage*) Fix regression in file.managed when source_hash used with local file - - **PR** `#44741`_: (*gtmanfred*) if gateway is not specified use iface - - **PR** `#44738`_: (*rallytime*) Bump some deprecation warnings from Oxygen to Fluorine - - **PR** `#44579`_: (*roaldnefs*) Fix bug in cron module and state - Fixes `#44530`_ * df28f312ac Merge pull request `#44879`_ from rallytime/merge-2017.7 + * 23c5a4ca3e Merge branch '2016.11' into '2017.7' * bb1f8dceaf Merge pull request `#44579`_ from roaldnefs/fix-cron-identifier @@ -1124,23 +1172,25 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 97328faeac Fix for bug in cron module -- **PR** `#44880`_: (*UtahDave*) Determine windows hardware arch correctly - @ *2017-12-08T22:24:09Z* +* **PR** `#44880`_: (`UtahDave`_) Determine windows hardware arch correctly + @ *2017-12-08 22:24:09 UTC* * 8e14bc3941 Merge pull request `#44880`_ from UtahDave/2017.7local + * 6e3c7ac1ac Merge branch '2017.7' into 2017.7local -- **PR** `#44861`_: (*twangboy*) Fix win_lgpo for unknown values - | refs: `#45327`_ - @ *2017-12-08T18:52:05Z* +* **PR** `#44861`_: (`twangboy`_) Fix win_lgpo for unknown values (refs: `#45327`_) + @ *2017-12-08 18:52:05 UTC* * dc51174670 Merge pull request `#44861`_ from twangboy/win_fix_lgpo_invalid_value + * 89f65e19ff Check for values other than 0 or 1 -- **PR** `#44621`_: (*isbm*) Bugfix: errors in external pillar causes crash, instead of report of them - @ *2017-12-08T18:46:56Z* +* **PR** `#44621`_: (`isbm`_) Bugfix: errors in external pillar causes crash, instead of report of them + @ *2017-12-08 18:46:56 UTC* * f5a143f8c5 Merge pull request `#44621`_ from isbm/isbm-bsc1068446-2017.7 + * 0d2675c4fe Use variable, instead of direct value * 1ddc47da0a Add unit test for _get_pillar_errors when external pillar is clean and internal contains errors @@ -1167,10 +1217,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * dae9c6aa5c Determine windows hardware arch correctly -- **PR** `#43379`_: (*twangboy*) Fix file.managed on Windows with test=True - @ *2017-12-07T21:10:43Z* +* **PR** `#43379`_: (`twangboy`_) Fix file.managed on Windows with test=True + @ *2017-12-07 21:10:43 UTC* * abe089ad54 Merge pull request `#43379`_ from twangboy/win_fix_file.managed + * edcd581ca5 Merge branch '2017.7' into win_fix_file.managed * a27bb6993a Fix py3 error @@ -1203,66 +1254,73 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 6a4e77e4b9 Return empty or unmodified dict on file not found -- **PR** `#44570`_: (*gtmanfred*) Include client mixin globals in scheduler for runner modules - @ *2017-12-07T20:23:33Z* +* **ISSUE** `#44565`_: (`arthurlogilab`_) NameError: global name '__jid_event__' is not defined when running a runner in the scheduler (refs: `#44570`_) + +* **PR** `#44570`_: (`gtmanfred`_) Include client mixin globals in scheduler for runner modules + @ *2017-12-07 20:23:33 UTC* - - **ISSUE** `#44565`_: (*arthurlogilab*) NameError: global name '__jid_event__' is not defined when running a runner in the scheduler - | refs: `#44570`_ * cf4cbcd340 Merge pull request `#44570`_ from gtmanfred/2017.7 + * 7b17f9f63c Merge branch '2017.7' into 2017.7 -- **PR** `#44494`_: (*skizunov*) Fix broken `beacons_before_connect` feature - @ *2017-12-07T18:24:49Z* +* **PR** `#44494`_: (`skizunov`_) Fix broken `beacons_before_connect` feature + @ *2017-12-07 18:24:49 UTC* + + * **PR** `#38289`_: (`skizunov`_) Add config options for running beacons/scheduler before connect (refs: `#44494`_) - - **PR** `#38289`_: (*skizunov*) Add config options for running beacons/scheduler before connect - | refs: `#44494`_ * febb913743 Merge pull request `#44494`_ from skizunov/develop2 + * 7adcfbf8ec Merge branch '2017.7' into develop2 -- **PR** `#44512`_: (*rallytime*) Back-port `#44356`_ to 2017.7 - @ *2017-12-07T14:44:50Z* +* **ISSUE** `#44298`_: (`skjaro`_) ipset state check problem (refs: `#44356`_) - - **ISSUE** `#44298`_: (*skjaro*) ipset state check problem - | refs: `#44356`_ - - **ISSUE** `#39552`_: (*Xiami2012*) ipset.check new implementation by @lingonl has countless critical bugs - | refs: `#44356`_ - - **PR** `#44356`_: (*skjaro*) Fix ipset state with multiple entries and subtypes separated with comma - | refs: `#44512`_ - * 284a817565 Merge pull request `#44512`_ from rallytime/`bp-44356`_ - * 6f92c71834 Merge branch '2017.7' into `bp-44356`_ +* **ISSUE** `#39552`_: (`Xiami2012`_) ipset.check new implementation by @lingonl has countless critical bugs (refs: `#44356`_) + +* **PR** `#44512`_: (`rallytime`_) Back-port `#44356`_ to 2017.7 + @ *2017-12-07 14:44:50 UTC* + + * **PR** `#44356`_: (`skjaro`_) Fix ipset state with multiple entries and subtypes separated with comma (refs: `#44512`_) + + * 284a817565 Merge pull request `#44512`_ from rallytime/bp-44356 + + * 6f92c71834 Merge branch '2017.7' into bp-44356 * 9a325146df Fix lint violation * 5aac729855 Fix check multiple entries with subtypes separated with comma -- **PR** `#44748`_: (*twangboy*) Fix auto login support for OSX - @ *2017-12-07T14:22:23Z* +* **PR** `#44748`_: (`twangboy`_) Fix auto login support for OSX + @ *2017-12-07 14:22:23 UTC* * 74ee7ce541 Merge pull request `#44748`_ from twangboy/osx_fix_auto_login + * 068e463870 Fix lint, add integration tests * 3df886df75 Fix lint, add gtmanfreds change * 16cb24614f Add kcpassword functionality -- **PR** `#44842`_: (*twangboy*) Win fix lgpo unicode on Py3 issue - @ *2017-12-07T14:21:14Z* +* **PR** `#44842`_: (`twangboy`_) Win fix lgpo unicode on Py3 issue + @ *2017-12-07 14:21:14 UTC* * b60cca174c Merge pull request `#44842`_ from twangboy/win_fix_lgpo + * efe77999d1 Gate log.debug statement behind successful pop * 1c0ec79cd1 Fix py3 issue -- **PR** `#44843`_: (*twangboy*) Fix 2 typos in lgpo module - @ *2017-12-06T17:56:44Z* +* **PR** `#44843`_: (`twangboy`_) Fix 2 typos in lgpo module + @ *2017-12-06 17:56:44 UTC* * bb58e2fec0 Merge pull request `#44843`_ from twangboy/win_fix_lgpo_typo + * c8f93e6dd7 Fix 2 types, shorten line lengths for spellchecking -- **PR** `#44827`_: (*mz-bmcqueen*) add more clone options to virtualbox and add better dhcp handling - @ *2017-12-06T15:02:23Z* +* **PR** `#44827`_: (`mz-bmcqueen`_) add more clone options to virtualbox and add better dhcp handling + @ *2017-12-06 15:02:23 UTC* * d6c37ea19c Merge pull request `#44827`_ from mz-bmcqueen/2017.7 + * 4ead3014b7 Merge branch '2017.7' into 2017.7 * b7ce154014 Merge branch '2017.7' of https://github.com/mz-bmcqueen/salt into 2017.7 @@ -1273,30 +1331,33 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * c38ff74261 add more clone options to virtualbox and add better dhcp handling -- **PR** `#44824`_: (*Ch3LL*) Add spm -y and -f arg integration tests - @ *2017-12-05T21:49:32Z* +* **PR** `#44824`_: (`Ch3LL`_) Add spm -y and -f arg integration tests + @ *2017-12-05 21:49:32 UTC* * 019169ed61 Merge pull request `#44824`_ from Ch3LL/spm_args + * d8f81d2e4d fix pylint * 61ac5cf157 Add spm -y and -f arg integration tests -- **PR** `#44742`_: (*Ch3LL*) Add salt-cloud action rename integration test - @ *2017-12-05T17:44:50Z* +* **PR** `#44742`_: (`Ch3LL`_) Add salt-cloud action rename integration test + @ *2017-12-05 17:44:50 UTC* * 59b930668c Merge pull request `#44742`_ from Ch3LL/cloud_action_test + * 951d09ca2f remove unnecessary try/except block * c329ced7ee Add salt-cloud action rename integration test -- **PR** `#44771`_: (*garethgreenaway*) [2017.7] Back porting `#44071`_ - @ *2017-12-05T17:16:06Z* +* **ISSUE** `#42676`_: (`mind-code`_) Changes in Pillar defined Beacons only apply after Minion restart (refs: `#44771`_) + +* **PR** `#44771`_: (`garethgreenaway`_) [2017.7] Back porting `#44071`_ + @ *2017-12-05 17:16:06 UTC* + + * **PR** `#44071`_: (`garethgreenaway`_) [develop] Various fixes to beacons (refs: `#44771`_) - - **ISSUE** `#42676`_: (*mind-code*) Changes in Pillar defined Beacons only apply after Minion restart - | refs: `#44771`_ - - **PR** `#44071`_: (*garethgreenaway*) [develop] Various fixes to beacons - | refs: `#44771`_ * 10442d9211 Merge pull request `#44771`_ from garethgreenaway/42676_backport_44071 + * ec2a8b2032 Merge branch '2017.7' into 42676_backport_44071 * 180971203e Updating minion to respond to list_available events for beacons @@ -1305,47 +1366,13 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * e9e0318bc6 Backporting fixes related to having beacons in pillar from `#44071`_ -- **PR** `#44784`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-12-05T17:13:49Z* +* **PR** `#44784`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-12-05 17:13:49 UTC* + + * **PR** `#44732`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 (refs: `#44784`_) - - **ISSUE** `#44601`_: (*rallytime*) CherryPy 12.0 removed support for "engine.timeout_monitor.on" config option - | refs: `#44602`_ - - **ISSUE** `#44556`_: (*doesitblend*) --static option doesn't return highstate output - | refs: `#44714`_ - - **ISSUE** `#44544`_: (*creideiki*) pgjsonb returner sets wrong timezone on timestamps in database when using Python 2 - | refs: `#44563`_ - - **ISSUE** `#44423`_: (*mtkennerly*) The win_path.exists state cannot prepend to the very start of the PATH - | refs: `#44424`_ - - **ISSUE** `#44034`_: (*seanjnkns*) salt-call pillar overrides broken in 2016.11.8 and 2017.7.2 - | refs: `#44483`_ - - **ISSUE** `#43417`_: (*damon-atkins*) win_pkg: pkg.install and pkg.remove general issues - | refs: `#43708`_ `#44832`_ - - **ISSUE** `#41474`_: (*dmaziuk*) state.file.* line endings - | refs: `#44321`_ - - **ISSUE** `#38452`_: (*jf*) file.line with mode=delete does not preserve ownership of a file - - **ISSUE** `#31405`_: (*SEJeff*) Salt leaves tmp file when file.managed dest file is immutable - | refs: `#44699`_ - - **PR** `#44732`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - | refs: `#44784`_ - - **PR** `#44714`_: (*rallytime*) Allow --static option to display state runs with highstate output - - **PR** `#44699`_: (*jfindlay*) utils/files.py remove temp file upon move failure - - **PR** `#44604`_: (*lorengordon*) Documents the exclude argument in state execution module - - **PR** `#44602`_: (*rallytime*) Handle timeout_monitor attribute error for new versions of CherryPy - | refs: `#44614`_ - - **PR** `#44563`_: (*creideiki*) Send Unix timestamps to database in pgjsonb returner - - **PR** `#44517`_: (*whytewolf*) Publish port doc missing - - **PR** `#44489`_: (*whytewolf*) update log-granular-levels to describe what they are filtering on - - **PR** `#44483`_: (*terminalmage*) salt-call: account for instances where __pillar__ is empty - - **PR** `#44477`_: (*rallytime*) Back-port `#44424`_ to 2016.11 - - **PR** `#44434`_: (*whytewolf*) add a note that describes grain rebuilding on restart and refresh - - **PR** `#44424`_: (*mtkennerly*) Fix `#44423`_: Handle index=None and index=0 distinctly in the win_path.exists state - | refs: `#44477`_ - - **PR** `#44321`_: (*gvengel*) Fix file.line diff formatting. - - **PR** `#44193`_: (*twangboy*) Fix reg.py for use with LGPO module - - **PR** `#43863`_: (*nicholasmhughes*) Atomicfile only copies mode and not user/group perms - - **PR** `#43708`_: (*damon-atkins*) Merge Ready : Backport develop win_pkg to 2016.11 with additional bug fixes - - **PR** `#41279`_: (*Ch3LL*) Add fqdn and dns core grain tests * 23d151b40a Merge pull request `#44784`_ from rallytime/merge-2017.7-1 + * 3d9eafc4bd Lint: Remove extra empty lines at end of files * 239f3511bf Merge branch '2016.11' into '2017.7' @@ -1356,13 +1383,13 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 5c34607f6c utils/files remove temp file upon move failure - * 7434e0afdf Merge pull request `#44714`_ from rallytime/`fix-44556`_ + * 7434e0afdf Merge pull request `#44714`_ from rallytime/fix-44556 * 1bbe1abeb2 Allow --static option to display state runs with highstate output * 998d714ee7 Merge pull request `#44517`_ from whytewolf/publish_port_doc_missing - * 4b5855283a missed one place where i didn't change master_port from my copy to publish_port + * 4b5855283a missed one place where i didnt chanbge master_port from my copy to publish_port * e4610baea5 update doc to have publish port @@ -1374,7 +1401,7 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 231e412ca4 Merge branch '2016.11' into pgjsonb-timestamps-44544 - * 4369df020b Merge pull request `#44602`_ from rallytime/`fix-44601`_ + * 4369df020b Merge pull request `#44602`_ from rallytime/fix-44601 * ff303fd060 Handle timeout_monitor/TimeoutError issues for new versions of CherryPy @@ -1448,7 +1475,7 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * b314549a32 Backport of devlop to 2016.11 with additional bug fixes - * 68ea22188e Merge pull request `#44477`_ from rallytime/`bp-44424`_ + * 68ea22188e Merge pull request `#44477`_ from rallytime/bp-44424 * 4a9f8dcc96 Fix `#44423`_: Handle index=None and index=0 distinctly @@ -1482,245 +1509,268 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * dbeeb0e917 fixes `#38452`_ atomicfile only copies mode and not user/group perms -- **PR** `#44788`_: (*kris-anderson*) Example yaml of influxdb_user state - @ *2017-12-04T14:28:45Z* +* **PR** `#44788`_: (`kris-anderson`_) Example yaml of influxdb_user state + @ *2017-12-04 14:28:45 UTC* * 4643a112e7 Merge pull request `#44788`_ from kris-anderson/example-yaml-of-influxdb-user-state + * afd23d058c converted yaml example to use 2 spaces * 29e410c1ea added a code-block example of how the yaml should be formatted -- **PR** `#44735`_: (*gracinet*) Backported issue `#42713`_ to 2017.7 - @ *2017-12-04T01:43:23Z* +* **ISSUE** `#42713`_: (`boltronics`_) 2017.7.0 master upgrade breaks mine data on non-glob matching on minions (refs: `#44735`_) + +* **PR** `#44735`_: (`gracinet`_) Backported issue `#42713`_ to 2017.7 + @ *2017-12-04 01:43:23 UTC* - - **ISSUE** `#42713`_: (*boltronics*) 2017.7.0 master upgrade breaks mine data on non-glob matching on minions * 4ebac09f60 Merge pull request `#44735`_ from gracinet/42713_backport_2017.7 + * 6806d83314 Merge branch '2017.7' into 42713_backport_2017.7 * fb586c6dce Backported issue `#42713`_ to 2017.7 -- **PR** `#44766`_: (*twangboy*) Fix `unit.utils.test_process` for Windows - @ *2017-12-02T13:15:53Z* +* **PR** `#44766`_: (`twangboy`_) Fix `unit.utils.test_process` for Windows + @ *2017-12-02 13:15:53 UTC* * 06ce7b7328 Merge pull request `#44766`_ from twangboy/win_fix_test_process + * a5737e8fc3 Fix lint errors * be96de09cc Fix pickling error by decorating -- **PR** `#44716`_: (*rallytime*) Back-port `#44605`_ to 2017.7 - @ *2017-12-01T23:12:24Z* +* **ISSUE** `#44083`_: (`ari`_) timezone.system fails when /etc/localtime is missing on FreeBSD (refs: `#44605`_) + +* **PR** `#44716`_: (`rallytime`_) Back-port `#44605`_ to 2017.7 + @ *2017-12-01 23:12:24 UTC* + + * **PR** `#44605`_: (`campbellmc`_) Add handling for FreeBSD in timezone.zone_compare (refs: `#44716`_) + + * f8b8a8966d Merge pull request `#44716`_ from rallytime/bp-44605 - - **ISSUE** `#44083`_: (*ari*) timezone.system fails when /etc/localtime is missing on FreeBSD - | refs: `#44605`_ - - **PR** `#44605`_: (*campbellmc*) Add handling for FreeBSD in timezone.zone_compare - | refs: `#44716`_ - * f8b8a8966d Merge pull request `#44716`_ from rallytime/`bp-44605`_ * 9d43221422 Correct indentation * d6e28ebed1 Add handling for FreeBSD in method zone_compare to avoid exception when /etc/localtime file does is absent. This is valid configuration on FreeBSD and represents UTC. -- **PR** `#44781`_: (*mirceaulinic*) Correct the thorium runner - @ *2017-12-01T22:55:52Z* +* **ISSUE** `#41869`_: (`mirceaulinic`_) Thorium: unable to execute runners (refs: `#44781`_) + +* **PR** `#44781`_: (`mirceaulinic`_) Correct the thorium runner + @ *2017-12-01 22:55:52 UTC* + + * 8ed6287762 Merge pull request `#44781`_ from cloudflare/thorium-fix-41869 - - **ISSUE** `#41869`_: (*mirceaulinic*) Thorium: unable to execute runners - | refs: `#44781`_ - * 8ed6287762 Merge pull request `#44781`_ from cloudflare/thorium-`fix-41869`_ * 83c73a69cb Instance the Runner class instead of the RunnerClient as we're running on the Master * b72b7c5402 Correct the thorium runner -- **PR** `#44466`_: (*twangboy*) Fix `unit.modules.test_disk` for Windows - @ *2017-12-01T22:31:42Z* +* **PR** `#44466`_: (`twangboy`_) Fix `unit.modules.test_disk` for Windows + @ *2017-12-01 22:31:42 UTC* * 52596be102 Merge pull request `#44466`_ from twangboy/win_fix_test_disk + * 5615862f23 Fix some lint * 627d5ab0c9 Mock `salt.utils.which` * e5a96fe00f Skip test_fstype on Windows -- **PR** `#44719`_: (*rallytime*) Back-port `#44667`_ to 2017.7 - @ *2017-12-01T15:20:49Z* +* **ISSUE** `#42763`_: (`xuhcc`_) acme.cert state falsely reports about renewed certificate (refs: `#44667`_) + +* **PR** `#44719`_: (`rallytime`_) Back-port `#44667`_ to 2017.7 + @ *2017-12-01 15:20:49 UTC* + + * **PR** `#44667`_: (`oarmstrong`_) Fix acme.cert to run certbot non-interactively (refs: `#44719`_) + + * b9ad4bba2d Merge pull request `#44719`_ from rallytime/bp-44667 - - **ISSUE** `#42763`_: (*xuhcc*) acme.cert state falsely reports about renewed certificate - | refs: `#44667`_ - - **PR** `#44667`_: (*oarmstrong*) Fix acme.cert to run certbot non-interactively - | refs: `#44719`_ - * b9ad4bba2d Merge pull request `#44719`_ from rallytime/`bp-44667`_ * 3d85a260c4 Fix acme.cert to run certbot non-interactively -- **PR** `#44747`_: (*gtmanfred*) use a copy so roster_defaults doesn't mangle - @ *2017-12-01T15:13:48Z* +* **ISSUE** `#44744`_: (`brmzkw`_) roster_defaults breaks salt-ssh globbing (refs: `#44747`_) + +* **PR** `#44747`_: (`gtmanfred`_) use a copy so roster_defaults doesn't mangle + @ *2017-12-01 15:13:48 UTC* - - **ISSUE** `#44744`_: (*brmzkw*) roster_defaults breaks salt-ssh globbing - | refs: `#44747`_ * d23192c492 Merge pull request `#44747`_ from gtmanfred/roster_defaults + * 911411ed8f add unit test * eefcfc719c use a copy so roster_defaults doesn't mangle -- **PR** `#44717`_: (*garethgreenaway*) [2017.7] Fixes to at module - @ *2017-12-01T14:37:05Z* +* **ISSUE** `#44694`_: (`thuhak`_) state module at.absent does't work (refs: `#44717`_) + +* **PR** `#44717`_: (`garethgreenaway`_) [2017.7] Fixes to at module + @ *2017-12-01 14:37:05 UTC* - - **ISSUE** `#44694`_: (*thuhak*) state module at.absent does't work - | refs: `#44717`_ * 20f20ad9e1 Merge pull request `#44717`_ from garethgreenaway/44694_at_absent_failing_to_find_jobs + * 1f2b3c5f46 Merge branch '2017.7' into 44694_at_absent_failing_to_find_jobs * 3bb385b44e removing debugging logging - * 7f0ff5a8b0 When passing IDs on the command line convert them all the strings for later comparison. + * 7f0ff5a8b0 When passing IDs on the command line convert them all the strings for later comparision. - * 99e436add4 When looking for job ids to remove based on the tag_name the comparison was comparing an INT to a STR, so the correct job id was not being returned. + * 99e436add4 When looking for job ids to remove based on the tag_name the comparision was comparing an INT to a STR, so the correct job id was not being returned. -- **PR** `#44695`_: (*gtmanfred*) pop None for runas and runas_password - @ *2017-12-01T14:35:01Z* +* **ISSUE** `#44136`_: (`dupsatou`_) KeyError: 'runas' after updating to latest salt in yum repo. (refs: `#44695`_) + +* **PR** `#44695`_: (`gtmanfred`_) pop None for runas and runas_password + @ *2017-12-01 14:35:01 UTC* - - **ISSUE** `#44136`_: (*dupsatou*) KeyError: 'runas' after updating to latest salt in yum repo. - | refs: `#44695`_ * 6e61aa787f Merge pull request `#44695`_ from gtmanfred/pop + * 0efb90b6f7 Merge branch '2017.7' into pop -- **PR** `#44725`_: (*whytewolf*) document note suggesting systemd-run --scope with cmd.run_bg - @ *2017-11-30T19:18:06Z* +* **PR** `#44725`_: (`whytewolf`_) document note suggesting systemd-run --scope with cmd.run_bg + @ *2017-11-30 19:18:06 UTC* * 20391c54c0 Merge pull request `#44725`_ from whytewolf/1919_cmd.run_no_daemons + * 4b11f8d66d add quick documentation suggesting systemd-run --scope if using cmd.run_bg with systemd -- **PR** `#44760`_: (*mirceaulinic*) Fix the grains.setvals execution function when working with proxy minions - @ *2017-11-30T18:27:02Z* +* **ISSUE** `#42300`_: (`mirceaulinic`_) Grains state doesn't work (fine) with proxy minions (refs: `#44760`_) + +* **ISSUE** `#42074`_: (`mirceaulinic`_) How to configure static grains for proxy minions (refs: `#44549`_) + +* **PR** `#44760`_: (`mirceaulinic`_) Fix the grains.setvals execution function when working with proxy minions + @ *2017-11-30 18:27:02 UTC* + + * **PR** `#44549`_: (`mirceaulinic`_) Allow proxy minions to load static grains (refs: `#44760`_) - - **ISSUE** `#42300`_: (*mirceaulinic*) Grains state doesn't work (fine) with proxy minions - | refs: `#44760`_ - - **ISSUE** `#42074`_: (*mirceaulinic*) How to configure static grains for proxy minions - | refs: `#44549`_ - - **PR** `#44549`_: (*mirceaulinic*) Allow proxy minions to load static grains - | refs: `#44760`_ * 85451ae977 Merge pull request `#44760`_ from cloudflare/px-grains-set-42300 + * 655139d01c Different path to the static grains file when running under a proxy minion * 3eec8dbc63 Dummy proxy: catch EOFError instead of IOError -- **PR** `#44640`_: (*vutny*) Fix `#44583`_: splay with cron-like scheduled jobs - @ *2017-11-30T15:30:41Z* +* **ISSUE** `#44583`_: (`creideiki`_) Using splay in cron schedule throws exception "unsupported operand type(s) for +: 'NoneType' and 'int'" (refs: `#44640`_) + +* **PR** `#44640`_: (`vutny`_) Fix `#44583`_: splay with cron-like scheduled jobs + @ *2017-11-30 15:30:41 UTC* - - **ISSUE** `#44583`_: (*creideiki*) Using splay in cron schedule throws exception "unsupported operand type(s) for +: 'NoneType' and 'int'" - | refs: `#44640`_ * 06fb80b69c Merge pull request `#44640`_ from vutny/fix-cron-schedule-splay + * d1f247e49e Add basic unit tests for schedule util eval func * 6ff8e75ac6 Fix `#44583`_: splay with cron-like scheduled jobs -- **PR** `#44712`_: (*Ch3LL*) Add pillar ssh integration tests - @ *2017-11-30T15:29:33Z* +* **PR** `#44712`_: (`Ch3LL`_) Add pillar ssh integration tests + @ *2017-11-30 15:29:33 UTC* * e5a1401b82 Merge pull request `#44712`_ from Ch3LL/ssh_pillar_items + * 97ec0e6ea0 Merge branch '2017.7' into ssh_pillar_items * c7f5af1274 Add pillar ssh integration tests -- **PR** `#44763`_: (*mirceaulinic*) Just a small improvement to the Thorium documentation - @ *2017-11-30T14:38:03Z* +* **PR** `#44763`_: (`mirceaulinic`_) Just a small improvement to the Thorium documentation + @ *2017-11-30 14:38:03 UTC* * 2e1c946990 Merge pull request `#44763`_ from cloudflare/thorium-doc + * f8d69dd0ba Add thorium_roots configuration example * 4610fb4e62 thorium_roots not thorium_roots_dir -- **PR** `#44531`_: (*mirceaulinic*) Add deprecation notes for the NAPALM native templates - @ *2017-11-30T14:18:56Z* +* **PR** `#44531`_: (`mirceaulinic`_) Add deprecation notes for the NAPALM native templates + @ *2017-11-30 14:18:56 UTC* * 8ba2df1ea0 Merge pull request `#44531`_ from cloudflare/deprecate-napalm-tpl + * b462776d8b Add deprecation notes for the NAPALM native templates -- **PR** `#44737`_: (*twangboy*) Skip `unit.transport.test_ipc` for Windows - @ *2017-11-29T19:18:21Z* +* **PR** `#44737`_: (`twangboy`_) Skip `unit.transport.test_ipc` for Windows + @ *2017-11-29 19:18:21 UTC* * 7bde48282e Merge pull request `#44737`_ from twangboy/win_skip_test_ipc + * 4e0359b603 Skip IPC transport tests in Windows, not supported -- **PR** `#44629`_: (*Ch3LL*) Add masterless state.highstate integration test - @ *2017-11-29T19:05:23Z* +* **PR** `#44629`_: (`Ch3LL`_) Add masterless state.highstate integration test + @ *2017-11-29 19:05:23 UTC* * c5206113ce Merge pull request `#44629`_ from Ch3LL/high_masterless + * 9b7421b261 Change check to the state id * 9cc853e3d5 Add masterless state.highstate integration test -- **PR** `#44613`_: (*Ch3LL*) Add pillar.items test for masterless - @ *2017-11-29T14:43:11Z* +* **PR** `#44613`_: (`Ch3LL`_) Add pillar.items test for masterless + @ *2017-11-29 14:43:11 UTC* * 2dc3e5c42a Merge pull request `#44613`_ from Ch3LL/pillar_masterless + * 2c2e1e2332 Merge branch '2017.7' into pillar_masterless * 69134e83ca Change order of local kwarg in run_call method * b3b5ecc6ff Add pillar.items test for masterless -- **PR** `#44659`_: (*Ch3LL*) Add state.sls_id to ssh wrapper and tests - @ *2017-11-29T14:41:47Z* +* **PR** `#44659`_: (`Ch3LL`_) Add state.sls_id to ssh wrapper and tests + @ *2017-11-29 14:41:47 UTC* * cc05481026 Merge pull request `#44659`_ from Ch3LL/ssh_sls_id + * 04b5a3dd4e Add state.sls_id to ssh wrapper and tests -- **PR** `#44698`_: (*Ch3LL*) Add salt-ssh mine.get integration test - @ *2017-11-28T22:15:29Z* +* **PR** `#44698`_: (`Ch3LL`_) Add salt-ssh mine.get integration test + @ *2017-11-28 22:15:29 UTC* * 642eed11e1 Merge pull request `#44698`_ from Ch3LL/mine_ssh + * f6a72acfe3 Merge branch '2017.7' into mine_ssh * 9e67babf85 Add teardown to remove ssh dir * f90b4f7653 Add salt-ssh mine.get integration test -- **PR** `#44697`_: (*Ch3LL*) Sort the show_top results for test_state_show_top test - @ *2017-11-28T20:35:41Z* +* **PR** `#44697`_: (`Ch3LL`_) Sort the show_top results for test_state_show_top test + @ *2017-11-28 20:35:41 UTC* * 5d82df5667 Merge pull request `#44697`_ from Ch3LL/show_top_test + * 974db59dc1 convert the assert to a union set instead * add43c4cfe Sort the show_top results for test_state_show_top test -- **PR** `#44608`_: (*Ch3LL*) Add jinja to ssh sls test file - @ *2017-11-27T22:00:28Z* +* **PR** `#44608`_: (`Ch3LL`_) Add jinja to ssh sls test file + @ *2017-11-27 22:00:28 UTC* * f2f6817e86 Merge pull request `#44608`_ from Ch3LL/ssh_jinja + * df669b551d Merge branch '2017.7' into ssh_jinja * ca97517795 Add jinja to ssh sls test file -- **PR** `#44663`_: (*whytewolf*) Update notes around grains topic, and salt.modules.grains and salt.state.grains - @ *2017-11-27T21:33:38Z* +* **ISSUE** `#33957`_: (`ghost`_) grains.setval doesn't setval if set in /etc/salt/minion (refs: `#44663`_) + +* **PR** `#44663`_: (`whytewolf`_) Update notes around grains topic, and salt.modules.grains and salt.state.grains + @ *2017-11-27 21:33:38 UTC* - - **ISSUE** `#33957`_: (*grobinson-blockchain*) grains.setval doesn't setval if set in /etc/salt/minion - | refs: `#44663`_ `#44663`_ * 04b97bcfad Merge pull request `#44663`_ from whytewolf/ZD1777_ensure_understanding_of_minion_config_over_grains_file + * c9122e4b85 fixed pylint error, and updated description on at the top the the module and state. * 7fb208b5ad Update note in topics/grains to reflect that not all grains are ignored. only those set in the minion config -- **PR** `#44332`_: (*mirceaulinic*) Improve the net.load_config execution function - @ *2017-11-27T21:22:18Z* +* **PR** `#44332`_: (`mirceaulinic`_) Improve the net.load_config execution function + @ *2017-11-27 21:22:18 UTC* - - **ISSUE** `#11`_: (*thatch45*) Add disable_modules to the config - - **ISSUE** `#10`_: (*thatch45*) list jobs option - - **ISSUE** `#9`_: (*thatch45*) Enable authentication modes * 364deee6ac Merge pull request `#44332`_ from cloudflare/improve-net-load + * cd0bac87e6 Merge branch '2017.7' into improve-net-load * 6d861f9a74 Disable pylint warning - * 3a0945ce3d Merge pull request `#11`_ from tonybaloney/gh_44332_clone + * 3a0945ce3d Merge pull request #11 from tonybaloney/gh_44332_clone * 88ef9f18fc ignore lint error on import - * 25427d845e convert key iterator to list as python 3 won't index an iterator + * 25427d845e convert key iterator to list as python 3 wont index an iterator * bce50154e5 Merge branch '2017.7' into improve-net-load * ba4a62769c Fix trailing spaces - * 0a47a7acbf Merge pull request `#10`_ from tonybaloney/gh_44332_clone + * 0a47a7acbf Merge pull request #10 from tonybaloney/gh_44332_clone * ba0280e727 linting updates @@ -1728,7 +1778,7 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 386c4e5791 add tests for all the getters - * f3d2d1aaaa Merge pull request `#9`_ from tonybaloney/gh_44332_clone + * f3d2d1aaaa Merge pull request #9 from tonybaloney/gh_44332_clone * c63222358b update tests with correct assertions and mock methods on device instance @@ -1736,31 +1786,33 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * edea76d3f3 Improve the net.load_config function -- **PR** `#44664`_: (*mvivaldi*) Patch 1 - @ *2017-11-27T21:17:20Z* +* **PR** `#44664`_: (`mvivaldi`_) Patch 1 + @ *2017-11-27 21:17:20 UTC* * b6a1ed06b8 Merge pull request `#44664`_ from mvivaldi/patch-1 + * 4551999ec7 Update jinja.py * ae13d57307 Update file.py -- **PR** `#44549`_: (*mirceaulinic*) Allow proxy minions to load static grains - | refs: `#44760`_ - @ *2017-11-27T20:57:09Z* +* **ISSUE** `#42074`_: (`mirceaulinic`_) How to configure static grains for proxy minions (refs: `#44549`_) + +* **PR** `#44549`_: (`mirceaulinic`_) Allow proxy minions to load static grains (refs: `#44760`_) + @ *2017-11-27 20:57:09 UTC* - - **ISSUE** `#42074`_: (*mirceaulinic*) How to configure static grains for proxy minions - | refs: `#44549`_ * 9ea4ee1479 Merge pull request `#44549`_ from cloudflare/fix-proxy-grains + * 7b03574ab6 Merge branch '2017.7' into fix-proxy-grains * 0320174ea4 Add doc note regarding static grains on proxy minions * 509d1af832 Allow proxy minions to load static grains -- **PR** `#44572`_: (*Ch3LL*) Add watch_in integration test - @ *2017-11-27T20:52:31Z* +* **PR** `#44572`_: (`Ch3LL`_) Add watch_in integration test + @ *2017-11-27 20:52:31 UTC* * 5ec7ea0bb5 Merge pull request `#44572`_ from Ch3LL/watchin_test + * 0a54584ddb Merge branch '2017.7' into watchin_test * 898c28e6d9 Merge branch '2017.7' into watchin_test @@ -1773,34 +1825,38 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * c6733ac1ee pop None -- **PR** `#44616`_: (*Ch3LL*) Add Non Base Environment salt:// source integration test - @ *2017-11-22T16:13:54Z* +* **PR** `#44616`_: (`Ch3LL`_) Add Non Base Environement salt:// source integration test + @ *2017-11-22 16:13:54 UTC* * d6ccf4bb30 Merge pull request `#44616`_ from Ch3LL/nonbase_test + * 80b71652e3 Merge branch '2017.7' into nonbase_test - * c9ba33432e Add Non Base Environment salt:// source integration test + * c9ba33432e Add Non Base Environement salt:// source integration test -- **PR** `#44617`_: (*Ch3LL*) Add ssh thin_dir integration test - @ *2017-11-22T16:12:51Z* +* **PR** `#44617`_: (`Ch3LL`_) Add ssh thin_dir integration test + @ *2017-11-22 16:12:51 UTC* * 3ace504c8c Merge pull request `#44617`_ from Ch3LL/thindir_ssh + * 071a1bd65b Merge branch '2017.7' into thindir_ssh -- **PR** `#44625`_: (*Ch3LL*) Add salt-key -d integration test - @ *2017-11-22T03:15:23Z* +* **PR** `#44625`_: (`Ch3LL`_) Add salt-key -d integration test + @ *2017-11-22 03:15:23 UTC* * 2cd618f99b Merge pull request `#44625`_ from Ch3LL/delete_key_test + * 443dc1e16b Merge branch '2017.7' into delete_key_test -- **PR** `#44614`_: (*rallytime*) [2017.7] Move PR `#44602`_ forward to 2017.7 - @ *2017-11-21T21:21:06Z* +* **ISSUE** `#44601`_: (`rallytime`_) CherryPy 12.0 removed support for "engine.timeout_monitor.on" config option (refs: `#44602`_) + +* **PR** `#44614`_: (`rallytime`_) [2017.7] Move PR `#44602`_ forward to 2017.7 + @ *2017-11-21 21:21:06 UTC* + + * **PR** `#44602`_: (`rallytime`_) Handle timeout_monitor attribute error for new versions of CherryPy (refs: `#44614`_) - - **ISSUE** `#44601`_: (*rallytime*) CherryPy 12.0 removed support for "engine.timeout_monitor.on" config option - | refs: `#44602`_ - - **PR** `#44602`_: (*rallytime*) Handle timeout_monitor attribute error for new versions of CherryPy - | refs: `#44614`_ * 4f30e845ee Merge pull request `#44614`_ from rallytime/44602-2017.7 + * 628f015c1b Move TimoutError check lower down in exception list * d26d9ff5e4 Handle timeout_monitor/TimeoutError issues for new versions of CherryPy @@ -1815,109 +1871,120 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 98536110d9 Merge branch '2017.7' into 2017.7 -- **PR** `#44571`_: (*rallytime*) Back-port `#43822`_ to 2017.7 - @ *2017-11-20T19:01:26Z* +* **PR** `#44571`_: (`rallytime`_) Back-port `#43822`_ to 2017.7 + @ *2017-11-20 19:01:26 UTC* + + * **PR** `#43822`_: (`chnrxn`_) check_result: Correctly check the __extend__ state. (refs: `#44571`_) + + * 136b9e3bc4 Merge pull request `#44571`_ from rallytime/bp-43822 - - **PR** `#43822`_: (*chnrxn*) check_result: Correctly check the __extend__ state. - | refs: `#44571`_ - * 136b9e3bc4 Merge pull request `#44571`_ from rallytime/`bp-43822`_ * f81bb61f2d check_result: Correctly check the __extend__ state. -- **PR** `#44588`_: (*rallytime*) Add documentation about logging before modules are loaded - @ *2017-11-20T18:43:18Z* +* **PR** `#44588`_: (`rallytime`_) Add documentation about logging before modules are loaded + @ *2017-11-20 18:43:18 UTC* + + * **PR** `#44576`_: (`rallytime`_) Remove logging from top of napalm util file (refs: `#44588`_) + + * **PR** `#44439`_: (`mirceaulinic`_) Adapt napalm modules to the new library structure (refs: `#44576`_) - - **PR** `#44576`_: (*rallytime*) Remove logging from top of napalm util file - | refs: `#44588`_ - - **PR** `#44439`_: (*mirceaulinic*) Adapt napalm modules to the new library structure - | refs: `#44576`_ * bea7f65291 Merge pull request `#44588`_ from rallytime/logging-in-virtual-funcs + * 90d1cb221d Add documentation about logging before modules are loaded -- **PR** `#44513`_: (*rallytime*) Back-port `#44472`_ to 2017.7 - @ *2017-11-20T16:09:02Z* +* **PR** `#44513`_: (`rallytime`_) Back-port `#44472`_ to 2017.7 + @ *2017-11-20 16:09:02 UTC* + + * **PR** `#44472`_: (`mephi42`_) nova: fix endpoint URL determination in _v3_setup() (refs: `#44513`_) + + * a8044b73c3 Merge pull request `#44513`_ from rallytime/bp-44472 - - **PR** `#44472`_: (*mephi42*) nova: fix endpoint URL determination in _v3_setup() - | refs: `#44513`_ - * a8044b73c3 Merge pull request `#44513`_ from rallytime/`bp-44472`_ * 6e00e415d3 nova: fix endpoint URL determination in _v3_setup() -- **PR** `#44596`_: (*roaldnefs*) Fixed Mattermost module documentation - @ *2017-11-19T23:30:53Z* +* **PR** `#44596`_: (`roaldnefs`_) Fixed Mattermost module documentation + @ *2017-11-19 23:30:53 UTC* * f55b9daa63 Merge pull request `#44596`_ from roaldnefs/fix-mattermost-doc + * 549f4806ce Fixed documentation in Mattermost module -- **PR** `#44528`_: (*tkwilliams*) INFRA-5978 - fix for https://github.com/saltstack/salt/issues/44290 - @ *2017-11-17T17:35:44Z* +* **PR** `#44528`_: (`tkwilliams`_) INFRA-5978 - fix for https://github.com/saltstack/salt/issues/44290 + @ *2017-11-17 17:35:44 UTC* * f84a2b5ab1 Merge pull request `#44528`_ from bodhi-space/infra5978 + * ba1d57f5eb Merge branch '2017.7' into infra5978 * 021692b6c9 INFRA-5978 - pylint / whitespace fix * c2210aaf7c INFRA-5978 - fix for https://github.com/saltstack/salt/issues/44290 -- **PR** `#44537`_: (*Ch3LL*) Add multiple salt-ssh state integration tests - @ *2017-11-17T17:17:48Z* +* **PR** `#44537`_: (`Ch3LL`_) Add multiple salt-ssh state integration tests + @ *2017-11-17 17:17:48 UTC* * 7f2dd0382c Merge pull request `#44537`_ from Ch3LL/ssh_highlow + * b98df6de24 Add known_hosts_file to salt-ssh opts_pkg in wfuncs * 913eedc699 Add multiple salt-ssh state integration tests -- **PR** `#44576`_: (*rallytime*) Remove logging from top of napalm util file - | refs: `#44588`_ - @ *2017-11-17T14:55:13Z* +* **PR** `#44576`_: (`rallytime`_) Remove logging from top of napalm util file (refs: `#44588`_) + @ *2017-11-17 14:55:13 UTC* + + * **PR** `#44439`_: (`mirceaulinic`_) Adapt napalm modules to the new library structure (refs: `#44576`_) - - **PR** `#44439`_: (*mirceaulinic*) Adapt napalm modules to the new library structure - | refs: `#44576`_ * 1975fb41bc Merge pull request `#44576`_ from rallytime/remove-napalm-logging + * eb91af999e Remove logging from top of napalm util file -- **PR** `#44575`_: (*Ch3LL*) Add service.running integration state test - @ *2017-11-16T22:27:57Z* +* **PR** `#44575`_: (`Ch3LL`_) Add service.running integration state test + @ *2017-11-16 22:27:57 UTC* * c2c3048f46 Merge pull request `#44575`_ from Ch3LL/ser_run_test + * 7536150567 Add service.running integration state test -- **PR** `#44518`_: (*twangboy*) Pass root_dir to the win_verify_env function - @ *2017-11-16T20:57:49Z* +* **PR** `#44518`_: (`twangboy`_) Pass root_dir to the win_verify_env function + @ *2017-11-16 20:57:49 UTC* * 24b1d7af31 Merge pull request `#44518`_ from twangboy/win_fix_verify_env + * 47114fdb30 Pass root_dirs to the win_verify_env function * 3385f7faf3 fix pylint * a2af3cb857 Include client mixin globals in scheduler for runner modules -- **PR** `#44551`_: (*mirceaulinic*) Removes proxy minions false alarms and security risks - @ *2017-11-16T15:09:14Z* +* **PR** `#44551`_: (`mirceaulinic`_) Removes proxy minions false alarms and security risks + @ *2017-11-16 15:09:14 UTC* * 1643bb7fd4 Merge pull request `#44551`_ from cloudflare/annoying-tmpnam + * ce1882943d Use salt.utils.files.mkstemp() instead - * 6689bd3b2d Don't use dangerous os.tmpnam + * 6689bd3b2d Dont use dangerous os.tmpnam * 2d6176b0bc Fx2 proxy minion: clean return, like all the other modules -- **PR** `#44541`_: (*terminalmage*) Fix test to reflect changes in YAML dumper - @ *2017-11-15T13:23:58Z* +* **ISSUE** `#30454`_: (`favoretti`_) Using yaml serializer inside jinja template results in unicode being prepended by '!!python/unicode' (refs: `#30481`_, `#42064`_, `#38554`_) + +* **PR** `#44541`_: (`terminalmage`_) Fix test to reflect changes in YAML dumper + @ *2017-11-15 13:23:58 UTC* + + * **PR** `#42064`_: (`The-Loeki`_) utils.jinja: use utils.yamldumper for safe yaml dumping (refs: `#44541`_) + + * **PR** `#38554`_: (`multani`_) Fix YAML deserialization of unicode (refs: `#42064`_) + + * **PR** `#30481`_: (`basepi`_) Add yaml_safe jinja filter (refs: `#38554`_) - - **ISSUE** `#30454`_: (*favoretti*) Using yaml serializer inside jinja template results in unicode being prepended by '!!python/unicode' - | refs: `#42064`_ `#38554`_ `#38554`_ `#30481`_ - - **PR** `#42064`_: (*The-Loeki*) utils.jinja: use utils.yamldumper for safe yaml dumping - | refs: `#44541`_ - - **PR** `#38554`_: (*multani*) Fix YAML deserialization of unicode - | refs: `#42064`_ - - **PR** `#30481`_: (*basepi*) Add yaml_safe jinja filter - | refs: `#38554`_ * 60083ac27b Merge pull request `#44541`_ from terminalmage/fix-yaml-test + * 5b8f54084b Merge branch '2017.7' into fix-yaml-test -- **PR** `#44538`_: (*gtmanfred*) Fix up some test kitchen stuff - @ *2017-11-14T20:36:56Z* +* **PR** `#44538`_: (`gtmanfred`_) Fix up some test kitchen stuff + @ *2017-11-14 20:36:56 UTC* * 5c123eb551 Merge pull request `#44538`_ from gtmanfred/kitchen + * 3e04d2d44c use kitchen-sync for copying files * 9bc70fd31b back up to 2017.7.1 for kitchen tests @@ -1926,17 +1993,17 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 958e1aeb8d Fix test to reflect changes in YAML dumper -- **PR** `#42064`_: (*The-Loeki*) utils.jinja: use utils.yamldumper for safe yaml dumping - | refs: `#44541`_ - @ *2017-11-13T19:45:14Z* +* **ISSUE** `#30454`_: (`favoretti`_) Using yaml serializer inside jinja template results in unicode being prepended by '!!python/unicode' (refs: `#30481`_, `#42064`_, `#38554`_) + +* **PR** `#42064`_: (`The-Loeki`_) utils.jinja: use utils.yamldumper for safe yaml dumping (refs: `#44541`_) + @ *2017-11-13 19:45:14 UTC* + + * **PR** `#38554`_: (`multani`_) Fix YAML deserialization of unicode (refs: `#42064`_) + + * **PR** `#30481`_: (`basepi`_) Add yaml_safe jinja filter (refs: `#38554`_) - - **ISSUE** `#30454`_: (*favoretti*) Using yaml serializer inside jinja template results in unicode being prepended by '!!python/unicode' - | refs: `#42064`_ `#38554`_ `#38554`_ `#30481`_ - - **PR** `#38554`_: (*multani*) Fix YAML deserialization of unicode - | refs: `#42064`_ - - **PR** `#30481`_: (*basepi*) Add yaml_safe jinja filter - | refs: `#38554`_ * 27a7b607b1 Merge pull request `#42064`_ from The-Loeki/jinja_unicode + * b1cf43c02d Merge branch '2017.7' into jinja_unicode * 8c2ac58523 Merge branch '2017.7' into jinja_unicode @@ -1949,32 +2016,35 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 3c9130f9f0 utils.jinja: use utils.yamldumper for safe yaml dumping -- **PR** `#43692`_: (*mirceaulinic*) Addressing a bug in the network find runner - @ *2017-11-13T19:42:24Z* +* **PR** `#43692`_: (`mirceaulinic`_) Addressing a bug in the network find runner + @ *2017-11-13 19:42:24 UTC* * b1f14c7518 Merge pull request `#43692`_ from cloudflare/fix-net-runner + * 02ffb4f38e Merge branch '2017.7' into fix-net-runner * 4b2f791bd2 Check if addr is short IPv6 * 765504c137 Add all the possible keys to the result -- **PR** `#43689`_: (*The-Loeki*) make cached pillars use pillarenv rather than saltenv - @ *2017-11-13T19:30:00Z* +* **ISSUE** `#42393`_: (`The-Loeki`_) pillarenv ignored with Salt Master pillar_cache: True (refs: `#43689`_) + +* **ISSUE** `#36153`_: (`krcroft`_) Pillarenv doesn't allow using separate pillar environments (refs: `#43689`_) + +* **PR** `#43689`_: (`The-Loeki`_) make cached pillars use pillarenv rather than saltenv + @ *2017-11-13 19:30:00 UTC* - - **ISSUE** `#42393`_: (*The-Loeki*) pillarenv ignored with Salt Master pillar_cache: True - | refs: `#43689`_ - - **ISSUE** `#36153`_: (*krcroft*) Pillarenv doesn't allow using separate pillar environments - | refs: `#43689`_ * 1e94a5bd5f Merge pull request `#43689`_ from The-Loeki/cached_pilarenv + * 395c0c424d Merge branch '2017.7' into cached_pilarenv * 60e001733b make cached pillars use pillarenv rather than saltenv -- **PR** `#43837`_: (*twangboy*) Fix `unit.states.test_archive` for Windows - @ *2017-11-13T19:12:19Z* +* **PR** `#43837`_: (`twangboy`_) Fix `unit.states.test_archive` for Windows + @ *2017-11-13 19:12:19 UTC* * f9b273a894 Merge pull request `#43837`_ from twangboy/win_unit_test_archive + * 5505a8819a Merge branch '2017.7' into win_unit_test_archive * b1dfe9c3c8 Format patching with statements for easier reading @@ -1983,16 +2053,18 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 4ef1e3eb97 Fix `unit.states.test_archive` for Windows -- **PR** `#44507`_: (*Ch3LL*) Increase sleep timeout for pillar refresh test - @ *2017-11-13T18:29:06Z* +* **PR** `#44507`_: (`Ch3LL`_) Increase sleep timeout for pillar refresh test + @ *2017-11-13 18:29:06 UTC* * caa81728a0 Merge pull request `#44507`_ from Ch3LL/pillar_time + * ffa4bddcad Increase sleep timeout for pillar refresh test -- **PR** `#44302`_: (*morganwillcock*) Fix traceback and incorrect message when resolving an unresolvable SID - @ *2017-11-13T18:19:01Z* +* **PR** `#44302`_: (`morganwillcock`_) Fix traceback and incorrect message when resolving an unresolvable SID + @ *2017-11-13 18:19:01 UTC* * cffea5ac71 Merge pull request `#44302`_ from morganwillcock/badsid + * f3af106e33 Merge branch 'badsid' of https://github.com/morganwillcock/salt into badsid * 95733fbb3b Merge branch '2017.7' into badsid @@ -2003,63 +2075,70 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 9572aabb67 Fix traceback and incorrect message when resolving an unresolvable SID -- **PR** `#44439`_: (*mirceaulinic*) Adapt napalm modules to the new library structure - | refs: `#44576`_ - @ *2017-11-13T17:43:24Z* +* **PR** `#44439`_: (`mirceaulinic`_) Adapt napalm modules to the new library structure (refs: `#44576`_) + @ *2017-11-13 17:43:24 UTC* * 32fc952000 Merge pull request `#44439`_ from cloudflare/fix-napalm + * f45378af04 Lint: remove extra spaces * c6a38258a3 Add napalm>2.0.0 note and update URLs * 52f73835b8 Adapt napalm modules to the new library structure -- **PR** `#44457`_: (*twangboy*) Remove wmi monkeypatching - @ *2017-11-13T17:38:52Z* +* **PR** `#44457`_: (`twangboy`_) Remove wmi monkeypatching + @ *2017-11-13 17:38:52 UTC* * ebbe5949ea Merge pull request `#44457`_ from twangboy/win_remove_wmi_monkeypatching + * 6c872e95e6 Add back the setup_loader_modules function * 20273e3697 No need for setup_loader_modules since we're actually importing wmi * 8c107873cd Remove wmi monkeypatching -- **PR** `#44490`_: (*Ch3LL*) Enable test_deploy ssh test - @ *2017-11-13T17:12:48Z* +* **PR** `#44490`_: (`Ch3LL`_) Enable test_deploy ssh test + @ *2017-11-13 17:12:48 UTC* * 1da1a97d7d Merge pull request `#44490`_ from Ch3LL/ssh_ping + * e952cd6712 Enable test_deploy ssh test -- **PR** `#44491`_: (*Ch3LL*) Add salt-ssh raw integration tests - @ *2017-11-13T15:47:12Z* +* **PR** `#44491`_: (`Ch3LL`_) Add salt-ssh raw integration tests + @ *2017-11-13 15:47:12 UTC* * 18624d6798 Merge pull request `#44491`_ from Ch3LL/ssh_raw + * 3dc8673417 change class name to raw * 308596ac8d Add salt-ssh raw integration tests -- **PR** `#44492`_: (*twangboy*) Fix `unit.utils.test_cloud` for Windows - @ *2017-11-13T15:44:31Z* +* **PR** `#44492`_: (`twangboy`_) Fix `unit.utils.test_cloud` for Windows + @ *2017-11-13 15:44:31 UTC* * aa17bfa8e7 Merge pull request `#44492`_ from twangboy/win_skip_mode_check + * 2f30ad93b1 Skips mode check in Windows -- **PR** `#44484`_: (*Ch3LL*) Add orchestration tests when target exists or not - @ *2017-11-10T19:24:22Z* +* **PR** `#44484`_: (`Ch3LL`_) Add orchestration tests when target exists or not + @ *2017-11-10 19:24:22 UTC* * 5b95495e75 Merge pull request `#44484`_ from Ch3LL/orch_test + * f3ec6df76e Add orchestration tests when target exists or not -- **PR** `#44480`_: (*Ch3LL*) Add integration pillar command line test - @ *2017-11-10T19:14:31Z* +* **PR** `#44480`_: (`Ch3LL`_) Add integration pillar command line test + @ *2017-11-10 19:14:31 UTC* * 62c42ca6fb Merge pull request `#44480`_ from Ch3LL/override_pillar + * 12fed1b4d8 Add integration pillar command line test -- **PR** `#44317`_: (*Ch3LL*) Add state tests and state request system to salt-ssh - @ *2017-11-10T18:28:43Z* +* **PR** `#44317`_: (`Ch3LL`_) Add state tests and state request system to salt-ssh + @ *2017-11-10 18:28:43 UTC* * cc08ad2edc Merge pull request `#44317`_ from Ch3LL/ssh_test + * 46bce3bd5e add additional parser argument for ssh integration tests * e9231430b5 remove logic similar to cloud/proxy tests @@ -2074,13 +2153,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * faef0886a7 Add state tests and state request system to salt-ssh -- **PR** `#44478`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-11-10T18:00:56Z* +* **PR** `#44478`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-11-10 18:00:56 UTC* - - **ISSUE** `#39901`_: (*seanjnkns*) network.managed ipaddrs ignored - | refs: `#44260`_ - - **PR** `#44260`_: (*seanjnkns*) Fixes `#39901`_ for RH/CentOS 7 * 6669035a30 Merge pull request `#44478`_ from rallytime/merge-2017.7 + * 9fcc2a70b5 Merge branch '2016.11' into '2017.7' * a66cd67d15 Merge pull request `#44260`_ from seanjnkns/issue-39901 @@ -2095,10 +2172,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 6818f3631d Fixes `#39901`_ for RH/CentOS 7 -- **PR** `#44444`_: (*twangboy*) LGPO: Issue with Maximum Password Age - @ *2017-11-10T17:26:53Z* +* **PR** `#44444`_: (`twangboy`_) LGPO: Issue with Maximum Password Age + @ *2017-11-10 17:26:53 UTC* * 60719d0683 Merge pull request `#44444`_ from twangboy/win_lgpo_non_zero + * de6b394445 Remove unneeded functions * ee0914f7e9 Fix some lint, remove unnecessary function @@ -2107,42 +2185,41 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 44f8f43812 Fix problem where 0 isn't 0 -- **PR** `#44467`_: (*twangboy*) Fix `unit.test_doc` for Windows - @ *2017-11-10T15:21:58Z* +* **PR** `#44467`_: (`twangboy`_) Fix `unit.test_doc` for Windows + @ *2017-11-10 15:21:58 UTC* * 4f3a79df07 Merge pull request `#44467`_ from twangboy/win_fix_test_doc + * 0a9e862bf4 Use regex to split -- **PR** `#44443`_: (*Ch3LL*) Add salt-ssh grains.items test - @ *2017-11-09T00:42:11Z* +* **PR** `#44443`_: (`Ch3LL`_) Add salt-ssh grains.items test + @ *2017-11-09 00:42:11 UTC* * ff4f13877f Merge pull request `#44443`_ from Ch3LL/ssh_grains + * 5d1a9af4b5 Add salt-ssh grains.items test -- **PR** `#44429`_: (*Ch3LL*) Fix orch doc from pillat.get to pillar.get - @ *2017-11-07T23:06:38Z* +* **PR** `#44429`_: (`Ch3LL`_) Fix orch doc from pillat.get to pillar.get + @ *2017-11-07 23:06:38 UTC* * dcdf2d4c90 Merge pull request `#44429`_ from Ch3LL/orch_doc + * 38ca5520f0 Fix orch doc from pillat.get to pillar.get -- **PR** `#43817`_: (*The-Loeki*) Orchestrate runner forces pillarenv and saltenv to None - @ *2017-11-07T06:00:16Z* +* **ISSUE** `#42568`_: (`clallen`_) Orchestration runner doesn't populate __pillar__ based on pillarenv (refs: `#43817`_) + +* **PR** `#43817`_: (`The-Loeki`_) Orchestrate runner forces pillarenv and saltenv to None + @ *2017-11-07 06:00:16 UTC* - - **ISSUE** `#42568`_: (*clallen*) Orchestration runner doesn't populate __pillar__ based on pillarenv - | refs: `#43817`_ * 62c4addef8 Merge pull request `#43817`_ from The-Loeki/orch-pillarenv + * 3fd652623c orchestrate runner: retain default envs -- **PR** `#44408`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-11-06T15:53:00Z* +* **PR** `#44408`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-11-06 15:53:00 UTC* - - **ISSUE** `#44313`_: (*rossengeorgiev*) salt-ssh: --user option missing from the cli documentation - | refs: `#44322`_ - - **PR** `#44383`_: (*gtmanfred*) switch salt-jenkins over to saltstack for kitchen-salt tests - - **PR** `#44322`_: (*rossengeorgiev*) updated CLI docs for salt-ssh - - **PR** `#44304`_: (*jfindlay*) states.cron identifier defaults to name - - **PR** `#44173`_: (*twangboy*) Use google style docstrings in win_system.py * 9e4708b7b9 Merge pull request `#44408`_ from rallytime/merge-2017.7 + * edbbd5fc2b Merge branch '2016.11' into '2017.7' * 5e289f42ba Merge pull request `#44383`_ from gtmanfred/2016kitchen @@ -2151,7 +2228,7 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * cab54e34b5 Merge pull request `#44173`_ from twangboy/win_system_docs - * 8e111b413d Fix some of the wording and grammar errors + * 8e111b413d Fix some of the wording and grammer errors * a12bc5ae41 Use google style docstrings @@ -2165,25 +2242,18 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 5b10918f02 updated CLI docs for salt-ssh -- **PR** `#44358`_: (*The-Loeki*) Kubernetes client certificate file usage fix - @ *2017-11-03T21:51:27Z* +* **PR** `#44358`_: (`The-Loeki`_) Kubernetes client certificate file usage fix + @ *2017-11-03 21:51:27 UTC* * b11da0d2da Merge pull request `#44358`_ from The-Loeki/kube-client-cert-file + * 35a8b0bb38 Kubernetes client certificate file usage fix -- **PR** `#44347`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-11-03T21:48:21Z* +* **PR** `#44347`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-11-03 21:48:21 UTC* - - **ISSUE** `#44336`_: (*corywright*) Docs for archive.tar should not use leading dash for tar options - | refs: `#44338`_ `#44339`_ - - **ISSUE** `#44272`_: (*gurubert*) [patch] win_service.stop() fails - | refs: `#44295`_ - - **PR** `#44345`_: (*gtmanfred*) remove binding from erb template rendering - - **PR** `#44342`_: (*gtmanfred*) render template files platforms.yml and driver.yml - - **PR** `#44339`_: (*corywright*) Remove leading dash from options in archive.tar docs (2016.11) - - **PR** `#44295`_: (*gurubert*) fixes issue `#44272`_ - - **PR** `#44286`_: (*gtmanfred*) use our git repo for kitchen-salt * 1974e52c06 Merge pull request `#44347`_ from rallytime/merge-2017.7 + * 9bad04b94b Merge branch '2016.11' into '2017.7' * 4e6f09e3eb Merge pull request `#44345`_ from gtmanfred/2016kitchen @@ -2206,50 +2276,57 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 193e715e37 use our git repo for kitchen-salt -- **PR** `#44364`_: (*Ch3LL*) Include disk size check for test_spm_build_big_file test - @ *2017-11-01T13:57:24Z* +* **PR** `#44364`_: (`Ch3LL`_) Include disk size check for test_spm_build_big_file test + @ *2017-11-01 13:57:24 UTC* * aea9f4a115 Merge pull request `#44364`_ from Ch3LL/fix_size_test + * 952c6bfea4 Include file size check for test_spm_build_big_file test -- **PR** `#44273`_: (*DmitryKuzmenko*) Workaround progressbar failure if minion is behind syndic. - @ *2017-10-31T17:07:17Z* +* **ISSUE** `#44239`_: (`boltronics`_) --progress fails when hosts routed via syndic (refs: `#44273`_) + +* **PR** `#44273`_: (`DmitryKuzmenko`_) Workaround progressbar failure if minion is behind syndic. + @ *2017-10-31 17:07:17 UTC* - - **ISSUE** `#44239`_: (*boltronics*) --progress fails when hosts routed via syndic - | refs: `#44273`_ * 609de9367a Merge pull request `#44273`_ from DSRCorporation/bugs/44239_syndic_progress + * e1a7605623 Workaround progressbar failure if minion is behind syndic. -- **PR** `#44350`_: (*gtmanfred*) update salt-jenkins repo to 2017.7 - @ *2017-10-30T21:31:30Z* +* **PR** `#44350`_: (`gtmanfred`_) update salt-jenkins repo to 2017.7 + @ *2017-10-30 21:31:30 UTC* * eef6dbfa58 Merge pull request `#44350`_ from gtmanfred/2017.7 + * cf71e3d9f2 update salt-jenkins repo to 2017.7 -- **PR** `#44346`_: (*gtmanfred*) remove binding from erb template rendering (2017.7) - @ *2017-10-30T20:57:19Z* +* **PR** `#44346`_: (`gtmanfred`_) remove binding from erb template rendering (2017.7) + @ *2017-10-30 20:57:19 UTC* * d586b3bf97 Merge pull request `#44346`_ from gtmanfred/2017.7 + * bf577c3d8b remove binding -- **PR** `#44343`_: (*gtmanfred*) render template files platforms.yml and driver.yml (2017.7) - @ *2017-10-30T20:04:22Z* +* **PR** `#44343`_: (`gtmanfred`_) render template files platforms.yml and driver.yml (2017.7) + @ *2017-10-30 20:04:22 UTC* * 547aac6658 Merge pull request `#44343`_ from gtmanfred/2017.7 + * ec24fbc0c2 render template files platforms.yml and driver.yml -- **PR** `#44338`_: (*corywright*) Remove leading dash from options in archive.tar docs (2017.7 and develop) - @ *2017-10-30T18:59:33Z* +* **ISSUE** `#44336`_: (`corywright`_) Docs for archive.tar should not use leading dash for tar options (refs: `#44339`_, `#44338`_) + +* **PR** `#44338`_: (`corywright`_) Remove leading dash from options in archive.tar docs (2017.7 and develop) + @ *2017-10-30 18:59:33 UTC* - - **ISSUE** `#44336`_: (*corywright*) Docs for archive.tar should not use leading dash for tar options - | refs: `#44338`_ `#44339`_ * 6e2a74c18b Merge pull request `#44338`_ from corywright/issue-44336-fix-archive-tar-docs-2017-7-and-newer + * 49b0abc284 Remove leading dash (-) from options in archive.tar documentation -- **PR** `#44265`_: (*Ch3LL*) Add service.status integration test - @ *2017-10-30T15:00:12Z* +* **PR** `#44265`_: (`Ch3LL`_) Add service.status integration test + @ *2017-10-30 15:00:12 UTC* * 71923bed97 Merge pull request `#44265`_ from Ch3LL/service_test + * 716aabc0bf Merge branch '2017.7' into service_test * dd5c823210 remove skipIf import @@ -2268,65 +2345,62 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 7911b4b3eb Add service.status integration test -- **PR** `#44294`_: (*nasenbaer13*) Boto asg fixes, Backport of `#43858`_ - @ *2017-10-30T14:48:52Z* +* **PR** `#44294`_: (`nasenbaer13`_) Boto asg fixes, Backport of `#43858`_ + @ *2017-10-30 14:48:52 UTC* + + * **PR** `#43858`_: (`nasenbaer13`_) Boto_ASG fixes for scaling policy rate limiting and tag conversion (refs: `#44294`_) - - **PR** `#43858`_: (*nasenbaer13*) Boto_ASG fixes for scaling policy rate limiting and tag conversion - | refs: `#44294`_ * 8ae9769bfb Merge pull request `#44294`_ from eyj/boto_asg + * f5ad6aeb70 Debug log added when throttled by API * c05d9aeced Encode tags as utf-8, retry policy readout -- **PR** `#44312`_: (*rallytime*) Back-port `#44287`_ to 2017.7 - @ *2017-10-30T14:25:56Z* +* **PR** `#44312`_: (`rallytime`_) Back-port `#44287`_ to 2017.7 + @ *2017-10-30 14:25:56 UTC* - - **PR** `#44287`_: (*jf*) Fix utils.files.guess_archive_type to recognize the "tbz" extension as well - | refs: `#44312`_ - * 68a9bebf90 Merge pull request `#44312`_ from rallytime/`bp-44287`_ - * 4d02e61f97 Merge branch '2017.7' into `bp-44287`_ + * **PR** `#44287`_: (`jf`_) Fix utils.files.guess_archive_type to recognize the "tbz" extension as well (refs: `#44312`_) + + * 68a9bebf90 Merge pull request `#44312`_ from rallytime/bp-44287 + + * 4d02e61f97 Merge branch '2017.7' into bp-44287 * ba0eaae95e Fix utils.files.guess_archive_type to recognize the "tbz" extension as well (also tidy up list of extensions) -- **PR** `#44311`_: (*rallytime*) Back-port `#44262`_ to 2017.7 - @ *2017-10-30T14:25:35Z* +* **ISSUE** `#44258`_: (`oarmstrong`_) docker_container.running recreates containers with multiple links (refs: `#44262`_) - - **ISSUE** `#44258`_: (*oarmstrong*) docker_container.running recreates containers with multiple links - | refs: `#44262`_ - - **PR** `#44262`_: (*oarmstrong*) docker_container.running sort list of links - | refs: `#44311`_ - * b8854e27c0 Merge pull request `#44311`_ from rallytime/`bp-44262`_ - * 72d617cfbe Merge branch '2017.7' into `bp-44262`_ +* **PR** `#44311`_: (`rallytime`_) Back-port `#44262`_ to 2017.7 + @ *2017-10-30 14:25:35 UTC* + + * **PR** `#44262`_: (`oarmstrong`_) docker_container.running sort list of links (refs: `#44311`_) + + * b8854e27c0 Merge pull request `#44311`_ from rallytime/bp-44262 + + * 72d617cfbe Merge branch '2017.7' into bp-44262 * ae34a15503 docker_container.running sort list of links -- **PR** `#44314`_: (*gtmanfred*) update .kitchen.yml to run py3 tests too - @ *2017-10-30T14:23:15Z* +* **PR** `#44314`_: (`gtmanfred`_) update .kitchen.yml to run py3 tests too + @ *2017-10-30 14:23:15 UTC* * 48df79ef77 Merge pull request `#44314`_ from gtmanfred/2017.7 + * 54265769c4 Merge branch '2017.7' into 2017.7 -- **PR** `#44316`_: (*rallytime*) Fix lint failure on 2017.7 branch - @ *2017-10-27T18:36:08Z* +* **PR** `#44316`_: (`rallytime`_) Fix lint failure on 2017.7 branch + @ *2017-10-27 18:36:08 UTC* * dbc5e224e9 Merge pull request `#44316`_ from rallytime/fix-lint + * 6d2490f6a0 Fix lint failure on 2017.7 branch * 39262b625e update .kitchen.yml to run py3 tests too -- **PR** `#44279`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-10-27T16:17:19Z* +* **PR** `#44279`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-10-27 16:17:19 UTC* - - **ISSUE** `#44155`_: (*rhoths*) file.directory with clean not triggering listener in test mode - | refs: `#44160`_ - - **PR** `#44269`_: (*terminalmage*) Fix log message in salt.utils.gitfs - - **PR** `#44268`_: (*twangboy*) Fix typo - - **PR** `#44259`_: (*gtmanfred*) begin switching in kitchen-salt for running the test suite - - **PR** `#44205`_: (*rallytime*) Back-port `#44177`_ to 2016.11 - - **PR** `#44177`_: (*senthilkumar-e*) Fixing default redis.host in documentation - | refs: `#44205`_ - - **PR** `#44160`_: (*gtmanfred*) add changes to test return * b2b0c770a4 Merge pull request `#44279`_ from rallytime/merge-2017.7 + * 8237f45a46 Add print_function to __future__ import list * 055b0701de Lint fix from sloppy merge conflict resolution @@ -2375,66 +2449,74 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * d3d00c3e62 add changes to test return - * e10395483d Merge pull request `#44205`_ from rallytime/`bp-44177`_ + * e10395483d Merge pull request `#44205`_ from rallytime/bp-44177 * b9940f8521 Fixing default redis.host in documentation -- **PR** `#44291`_: (*Ch3LL*) add saltutil.refresh_pillar test - @ *2017-10-27T15:19:43Z* +* **PR** `#44291`_: (`Ch3LL`_) add saltutil.refresh_pillar test + @ *2017-10-27 15:19:43 UTC* * bd5b9dd0aa Merge pull request `#44291`_ from Ch3LL/pillar_test + * 34e2955445 add saltutil.refresh_pillar test -- **PR** `#44267`_: (*twangboy*) Fix type and Py3 issues in LGPO module - @ *2017-10-27T14:27:50Z* +* **PR** `#44267`_: (`twangboy`_) Fix type and Py3 issues in LGPO module + @ *2017-10-27 14:27:50 UTC* * ba17a1c4d0 Merge pull request `#44267`_ from twangboy/win_fix_lgpo + * 5d22d34cac Use unicode_literals * 40636397d8 Fix set for Py3 * 8f8c706426 Fix typo -- **PR** `#44285`_: (*Ch3LL*) add spm integration tests for remove and build - @ *2017-10-26T21:20:10Z* +* **PR** `#44285`_: (`Ch3LL`_) add spm integration tests for remove and build + @ *2017-10-26 21:20:10 UTC* * e16707c403 Merge pull request `#44285`_ from Ch3LL/all_spm + * 1f77f3e6a3 add skipif logic for fallocate cmd * 03b5c4bc6d add spm integration tests for remove and build -- **PR** `#44301`_: (*twangboy*) Fix test_pydsl on Windows - @ *2017-10-26T21:14:21Z* +* **PR** `#44301`_: (`twangboy`_) Fix test_pydsl on Windows + @ *2017-10-26 21:14:21 UTC* * 6392896a22 Merge pull request `#44301`_ from twangboy/win_fix_test_pydsl + * 6db23757bc Fix test_pydsl on Windows -- **PR** `#44293`_: (*UtahDave*) Fix documentation grammar and spelling errors - @ *2017-10-26T13:05:31Z* +* **PR** `#44293`_: (`UtahDave`_) Fix documentation grammar and spelling errors + @ *2017-10-26 13:05:31 UTC* * 8787d02688 Merge pull request `#44293`_ from UtahDave/fix_unittest_docs + * c919648ab4 Fix documentation grammar and spelling errors -- **PR** `#44248`_: (*Ch3LL*) SPM tests: use _spm_build_files method during test_build setup - @ *2017-10-25T19:45:03Z* +* **PR** `#44248`_: (`Ch3LL`_) SPM tests: use _spm_build_files method during test_build setup + @ *2017-10-25 19:45:03 UTC* * 6e33743c1a Merge pull request `#44248`_ from Ch3LL/spm_create_repo + * 0a387c2ecd fix pylint * f383f05a93 Add SPM create_repo integration test -- **PR** `#44253`_: (*Ch3LL*) Add multiple spm integration tests - @ *2017-10-25T13:36:03Z* +* **PR** `#44253`_: (`Ch3LL`_) Add multiple spm integration tests + @ *2017-10-25 13:36:03 UTC* * bd75be24ca Merge pull request `#44253`_ from Ch3LL/spm_install + * 9e2e785034 add spm tests to test runner * 4729ccd32b Add multiple spm integration tests -- **PR** `#44254`_: (*twangboy*) Fix `unit.modules.test_win_groupadd` for Windows - @ *2017-10-25T13:33:40Z* +* **PR** `#44254`_: (`twangboy`_) Fix `unit.modules.test_win_groupadd` for Windows + @ *2017-10-25 13:33:40 UTC* * 75ee1ebc50 Merge pull request `#44254`_ from twangboy/win_fix_test_win_groupadd + * 609361bf48 Fix some lint errors * 1f44d8d5e6 Document helper functions @@ -2447,76 +2529,62 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 6ab82394be Set up mocking -- **PR** `#44266`_: (*Ch3LL*) Add state, grains and service proxy tests - @ *2017-10-25T13:08:50Z* +* **PR** `#44266`_: (`Ch3LL`_) Add state, grains and service proxy tests + @ *2017-10-25 13:08:50 UTC* * 4c23fa63bb Merge pull request `#44266`_ from Ch3LL/proxy_tests + * e5701b472d Add state, grains and service proxy tests -- **PR** `#44244`_: (*mirceaulinic*) Add explicit non-zero retcode to napalm config functions - @ *2017-10-24T09:23:40Z* +* **ISSUE** `#43187`_: (`mirceaulinic`_) How to point from an execution module that a certain function failed (refs: `#44244`_) + +* **PR** `#44244`_: (`mirceaulinic`_) Add explicit non-zero retcode to napalm config functions + @ *2017-10-24 09:23:40 UTC* - - **ISSUE** `#43187`_: (*mirceaulinic*) How to point from an execution module that a certain function failed - | refs: `#44244`_ * c849f350ba Merge pull request `#44244`_ from cloudflare/add-retcode + * a1f27c9f00 Add explicit non-zero retcode to napalm config functions -- **PR** `#44228`_: (*rklaren*) Fixes `#44227`_, make salt-cloud/libvirt cleanup after errors more robust - @ *2017-10-23T17:09:35Z* +* **ISSUE** `#44227`_: (`rklaren`_) salt-cloud leaves a broken vm around when the salt bootstrap fails (refs: `#44228`_) + +* **PR** `#44228`_: (`rklaren`_) Fixes `#44227`_, make salt-cloud/libvirt cleanup after errors more robust + @ *2017-10-23 17:09:35 UTC* - - **ISSUE** `#44227`_: (*rklaren*) salt-cloud leaves a broken vm around when the salt bootstrap fails - | refs: `#44228`_ `#44228`_ * 195b225540 Merge pull request `#44228`_ from rklaren/fix-salt-cloud-libvirt-cleanup-after-errors + * 7917d1e61e Incorporate review comments. * 3a10b6aef1 Fixes `#44227`_, make salt-cloud/libvirt cleanup after errors more robust -- **PR** `#44008`_: (*mtorromeo*) Backport `#43769`_ to 2017.7 - @ *2017-10-23T14:19:57Z* +* **ISSUE** `#19532`_: (`stolendog`_) salt-ssh running git clone with not root user (refs: `#43769`_) + +* **ISSUE** `#10582`_: (`mtorromeo`_) Git ssh helper may be unable run (refs: `#43769`_) + +* **PR** `#44008`_: (`mtorromeo`_) Backport `#43769`_ to 2017.7 + @ *2017-10-23 14:19:57 UTC* + + * **PR** `#43769`_: (`mtorromeo`_) Copy git ssh-id-wrapper to /tmp only if necessary (Fixes `#10582`_, `#19532`_) (refs: `#44008`_) - - **ISSUE** `#19532`_: (*stolendog*) salt-ssh running git clone with not root user - | refs: `#43769`_ - - **ISSUE** `#10582`_: (*mtorromeo*) Git ssh helper may be unable run - | refs: `#43769`_ - - **PR** `#43769`_: (*mtorromeo*) Copy git ssh-id-wrapper to /tmp only if necessary (Fixes `#10582`_, `#19532`_) - | refs: `#44008`_ * 01e7bab990 Merge pull request `#44008`_ from mtorromeo/git-noexec-fix + * a7a841d9d2 Merge branch '2017.7' into git-noexec-fix * d177240cfc Merge branch '2017.7' into git-noexec-fix * a63e6ca963 Copy git ssh-id-wrapper to /tmp only if necessary (Fixes `#10582`_, Fixes `#19532`_) -- **PR** `#44202`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-10-23T14:18:30Z* +* **PR** `#44202`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-10-23 14:18:30 UTC* - - **ISSUE** `#44150`_: (*rossengeorgiev*) version param in pkg.installed broken in 2016.11.8/2017.7.2 in EL6-7 - | refs: `#44188`_ - - **ISSUE** `#44140`_: (*vtolstov*) incorrect network interfaces settings with network.managed under debian jessie - | refs: `#44167`_ - - **ISSUE** `#43936`_: (*oeuftete*) manage.present still reports `lost` minion - | refs: `#43994`_ - - **ISSUE** `#43427`_: (*tylerjones4508*) Salt-Cloud There was a profile error: invalid literal for int() with base 10: - | refs: `#44089`_ - - **ISSUE** `#38367`_: (*tyeapple*) logic error in connected_ids function of salt/utils/minions.py when using include_localhost=True - | refs: `#43994`_ - - **PR** `#44188`_: (*terminalmage*) yumpkg: Check pkgname instead of name to see if it is a kernel pkg - - **PR** `#44167`_: (*garethgreenaway*) Fixes to modules/debian_ip - - **PR** `#44158`_: (*rallytime*) Back-port `#44089`_ to 2016.11 - - **PR** `#44089`_: (*cetanu*) Catch on empty Virtualbox network addr `#43427`_ - | refs: `#44158`_ - - **PR** `#43994`_: (*oeuftete*) Fix manage.present to show lost minions - - **PR** `#43830`_: (*rallytime*) Back-port `#43644`_ to 2016.11 - - **PR** `#43644`_: (*defanator*) Several fixes for RDS DB parameter group management - | refs: `#43830`_ * 85c0ef493f Merge pull request `#44202`_ from rallytime/merge-2017.7 + * 99ff7a5c12 Merge branch '2016.11' into '2017.7' * 09ddfd0c08 Merge pull request `#44167`_ from garethgreenaway/44140_debian_ip_fixes * 5f7555846f When looping through the various pre, post, up and down commands put them into the interface dict using the right internet family variable. - * 9f9e936b52 Merge pull request `#43830`_ from rallytime/`bp-43644`_ + * 9f9e936b52 Merge pull request `#43830`_ from rallytime/bp-43644 * 12845ae802 Several fixes for RDS DB parameter group management @@ -2528,48 +2596,54 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 0692f442db yumpkg: Check pkgname instead of name to see if it is a kernel pkg - * 715edc0cea Merge pull request `#44158`_ from rallytime/`bp-44089`_ + * 715edc0cea Merge pull request `#44158`_ from rallytime/bp-44089 * 534faf0b7a Catch on empty Virtualbox network addr `#43427`_ -- **PR** `#44208`_: (*twangboy*) Fix some lint in PR: 44080 - @ *2017-10-20T16:42:02Z* +* **PR** `#44208`_: (`twangboy`_) Fix some lint in PR: 44080 + @ *2017-10-20 16:42:02 UTC* * d7dc2bd0e8 Merge pull request `#44208`_ from twangboy/win_fix_group.present + * 61e2e9ccda Fix some lint -- **PR** `#43843`_: (*twangboy*) Fix `unit.states.test_mount` for Windows - @ *2017-10-20T14:27:25Z* +* **PR** `#43843`_: (`twangboy`_) Fix `unit.states.test_mount` for Windows + @ *2017-10-20 14:27:25 UTC* * c6d27ada51 Merge pull request `#43843`_ from twangboy/win_unit_test_mount + * a862e0bf2d Remove unneeded import * d78f27466d Fix `unit.states.test_mount` for Windows -- **PR** `#44111`_: (*anlutro*) Try to correctly parse debian codename from /etc/os-release - @ *2017-10-19T22:23:26Z* +* **PR** `#44111`_: (`anlutro`_) Try to correctly parse debian codename from /etc/os-release + @ *2017-10-19 22:23:26 UTC* * 372820ea38 Merge pull request `#44111`_ from alprs/fix-deb8-py3-oscodename + * 1e1e5a3ff6 try to correctly parse debian codename from /etc/os-release -- **PR** `#44187`_: (*twangboy*) Fix pickling errors on Windows - @ *2017-10-19T20:36:51Z* +* **PR** `#44187`_: (`twangboy`_) Fix pickling errors on Windows + @ *2017-10-19 20:36:51 UTC* * 75136152c1 Merge pull request `#44187`_ from twangboy/win_fix_unit_test_daemons.py + * 64d2e4f732 Fix pickling errors on Windows -- **PR** `#44186`_: (*garethgreenaway*) [2017.7] scheduler fixes - @ *2017-10-19T20:36:04Z* +* **ISSUE** `#44181`_: (`jonans`_) Scheduler with multiple when values doesn't run (refs: `#44186`_) + +* **PR** `#44186`_: (`garethgreenaway`_) [2017.7] scheduler fixes + @ *2017-10-19 20:36:04 UTC* - - **ISSUE** `#44181`_: (*jonans*) Scheduler with multiple when values doesn't run - | refs: `#44186`_ * 7a89cd8697 Merge pull request `#44186`_ from garethgreenaway/44181_scheduler_multiple_whens + * 7eef3b3571 Adding a copy.deepcopy to the for loop that looks for old jobs to avoid stale jobs ending up in the list. -- **PR** `#43896`_: (*twangboy*) Fix win_lgpo execution module - @ *2017-10-19T20:13:18Z* +* **PR** `#43896`_: (`twangboy`_) Fix win_lgpo execution module + @ *2017-10-19 20:13:18 UTC* * 1d16ae8ba7 Merge pull request `#43896`_ from twangboy/win_fix_lgpo_scom + * 648d1b8d99 Catch CommandExecutionError * 0040082d0a Fix pylint error @@ -2590,10 +2664,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * f9ad446019 Fix win_lgpo execution module -- **PR** `#44080`_: (*twangboy*) Fix a regression in `group.present` in Windows - @ *2017-10-19T20:10:44Z* +* **PR** `#44080`_: (`twangboy`_) Fix a regression in `group.present` in Windows + @ *2017-10-19 20:10:44 UTC* * 98356b86af Merge pull request `#44080`_ from twangboy/win_fix_group.present + * 29bc80ff87 Improve get_sam_name * ef759a3875 Fix example in function docs for get_sam_name @@ -2602,65 +2677,56 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 83f36cc2ef Account for 15 character limit in hostname - * aa278966de Remove *args, pass gid as a keyword + * aa278966de Remove \*args, pass gid as a keyword - * 5230ecd7e1 Accept *args + * 5230ecd7e1 Accept \*args -- **PR** `#44171`_: (*Ch3LL*) Add SPM Build Integration Tests - @ *2017-10-19T19:49:14Z* +* **PR** `#44171`_: (`Ch3LL`_) Add SPM Build Integration Tests + @ *2017-10-19 19:49:14 UTC* * 5ef124bf2d Merge pull request `#44171`_ from Ch3LL/spm_int + * cd79e9444e remove unneded kwarg * 1541376c4f Add spm build test -- **PR** `#44157`_: (*benediktwerner*) Added 'versionadded' tags to sensehat modules - @ *2017-10-19T14:13:31Z* +* **PR** `#44157`_: (`benediktwerner`_) Added 'versionadded' tags to sensehat modules + @ *2017-10-19 14:13:31 UTC* * 34a843252d Merge pull request `#44157`_ from benediktwerner/2017.7 + * bd825b51cc Changed sensehat versionadded from 2017.7 to 2017.7.0 * f1d3c5bbcf Added 'versionadded' tags to sensehat modules -- **PR** `#44164`_: (*terminalmage*) Fix examples in docker_container.{stopped,absent} docstrings - @ *2017-10-19T14:12:37Z* +* **PR** `#44164`_: (`terminalmage`_) Fix examples in docker_container.{stopped,absent} docstrings + @ *2017-10-19 14:12:37 UTC* * 1427c72e1e Merge pull request `#44164`_ from terminalmage/fix-docker-docstring + * 7b46489e33 Fix examples in docker_container.{stopped,absent} docstrings -- **PR** `#44168`_: (*twangboy*) Fix `unit.test_auth` for Windows - @ *2017-10-19T14:12:22Z* +* **PR** `#44168`_: (`twangboy`_) Fix `unit.test_auth` for Windows + @ *2017-10-19 14:12:22 UTC* * 77969c4161 Merge pull request `#44168`_ from twangboy/win_skip_pam_eath + * bb1d2eb85b Skip tests that are failing on PAM eauth -- **PR** `#44151`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-10-18T16:52:30Z* +* **PR** `#44151`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-10-18 16:52:30 UTC* - - **ISSUE** `#44087`_: (*mfussenegger*) Using state.highstate with `terse=true` prevents useful error output - | refs: `#44093`_ - - **ISSUE** `#43307`_: (*marek-knappe*) Filesystem creation is failing on newly created LV - - **PR** `#44131`_: (*rallytime*) Back-port `#44029`_ to 2016.11 - - **PR** `#44124`_: (*rallytime*) [2016.11] Merge forward from 2016.11.8 to 2016.11 - - **PR** `#44122`_: (*cachedout*) Add note about GPG signing to PR template - - **PR** `#44110`_: (*roaldnefs*) Format fix code example local returner doc - - **PR** `#44097`_: (*gtmanfred*) OpenNebula does not require the template_id to be specified - - **PR** `#44093`_: (*gtmanfred*) don't filter if return is not a dict - - **PR** `#44029`_: (*msummers42*) addresses issue `#43307`_, disk.format_ to disk.format - | refs: `#44131`_ - - **PR** `#44028`_: (*rallytime*) Back-port `#44011`_ to 2016.11.8 - - **PR** `#44011`_: (*Ch3LL*) Security Fixes for 2016.11.8 - | refs: `#44028`_ * 88a776d9d2 Merge pull request `#44151`_ from rallytime/merge-2017.7 + * 6aa8f03a4a Merge branch '2016.11' into '2017.7' - * 0cd493b691 Merge pull request `#44131`_ from rallytime/`bp-44029`_ + * 0cd493b691 Merge pull request `#44131`_ from rallytime/bp-44029 - * bebf301976 fixed test addressing issue `#43307`_, disk.format_ to disk.format + * bebf301976 fixed test addressing issue `#43307`_, disk.format\_ to disk.format - * b4ba7ae2fc addresses issue `#43307`_, disk.format_ to disk.format + * b4ba7ae2fc addresses issue `#43307`_, disk.format\_ to disk.format - * 3a68e356f8 Merge pull request `#44093`_ from gtmanfred/`fix-44087`_ + * 3a68e356f8 Merge pull request `#44093`_ from gtmanfred/fix-44087 * 5455c5053b fix pylint @@ -2676,7 +2742,7 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 59861291c8 Merge branch '2016.11.8' into '2016.11' - * 57623e2abe Merge pull request `#44028`_ from rallytime/`bp-44011`_ + * 57623e2abe Merge pull request `#44028`_ from rallytime/bp-44011 * 89e084bda3 Do not allow IDs with null bytes in decoded payloads @@ -2694,54 +2760,61 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 881f1822f2 Format fix code example local returner doc -- **PR** `#43933`_: (*gtmanfred*) if expect_minions is passed use that instead - @ *2017-10-18T16:43:39Z* +* **ISSUE** `#43918`_: (`mwerickso`_) subset argument does not work with saltmod.state (refs: `#43933`_) + +* **PR** `#43933`_: (`gtmanfred`_) if expect_minions is passed use that instead + @ *2017-10-18 16:43:39 UTC* - - **ISSUE** `#43918`_: (*mwerickso*) subset argument does not work with saltmod.state - | refs: `#43933`_ * 0b47eb7242 Merge pull request `#43933`_ from gtmanfred/2017.7 + * 272dcc6ba5 add inline comment about popping expect_minions * b615ce1762 if expect_minions is passed use that instead -- **PR** `#44081`_: (*skizunov*) Windows: Fix usage of pkgrepo state - @ *2017-10-18T16:16:46Z* +* **PR** `#44081`_: (`skizunov`_) Windows: Fix usage of pkgrepo state + @ *2017-10-18 16:16:46 UTC* * 36da1a7fac Merge pull request `#44081`_ from skizunov/develop3 + * 351d16840b Move strip_uri to salt/utils/pkg/deb.py * f54c7a6f01 Windows: Fix usage of pkgrepo state -- **PR** `#43913`_: (*twangboy*) Fix `unit.templates.test_jinja` for Windows - @ *2017-10-17T21:09:05Z* +* **PR** `#43913`_: (`twangboy`_) Fix `unit.templates.test_jinja` for Windows + @ *2017-10-17 21:09:05 UTC* * afcaa0c591 Merge pull request `#43913`_ from twangboy/win_fix_test_jinja + * a4e2d8059d Fix `unit.templates.test_jinja` for Windows -- **PR** `#43917`_: (*twangboy*) Fix `unit.test_pillar` for Windows - @ *2017-10-17T21:06:46Z* +* **PR** `#43917`_: (`twangboy`_) Fix `unit.test_pillar` for Windows + @ *2017-10-17 21:06:46 UTC* * fc5754c6a1 Merge pull request `#43917`_ from twangboy/win_unit_test_pillar + * 00dbba5712 Fix `unit.test_pillar` for Windows -- **PR** `#44133`_: (*cachedout*) Fix typos in parallel states docs - @ *2017-10-17T15:24:19Z* +* **PR** `#44133`_: (`cachedout`_) Fix typos in parallel states docs + @ *2017-10-17 15:24:19 UTC* * 6252f82f58 Merge pull request `#44133`_ from cachedout/fix_paralell_docs - * 8d1c1e21f0 Fix typos in parallel states docs -- **PR** `#44135`_: (*timfreund*) Insert missing verb in gitfs walkthrough - @ *2017-10-17T14:32:13Z* + * 8d1c1e21f0 Fix typos in paralell states docs + +* **PR** `#44135`_: (`timfreund`_) Insert missing verb in gitfs walkthrough + @ *2017-10-17 14:32:13 UTC* * 0d3f5db867 Merge pull request `#44135`_ from timfreund/insert_missing_verb + * 9557504b75 Insert missing verb in gitfs walkthrough -- **PR** `#44055`_: (*nasenbaer13*) Activate jid_queue also for SingleMinions to workaround (Backport) - @ *2017-10-16T20:14:52Z* +* **PR** `#44055`_: (`nasenbaer13`_) Activate jid_queue also for SingleMinions to workaround (Backport) + @ *2017-10-16 20:14:52 UTC* + + * **PR** `#43860`_: (`nasenbaer13`_) Activate jid_queue also for SingleMinions (occurs on reconnect) (refs: `#44055`_) - - **PR** `#43860`_: (*nasenbaer13*) Activate jid_queue also for SingleMinions (occurs on reconnect) - | refs: `#44055`_ * a9700f6061 Merge pull request `#44055`_ from eyj/jid_queue + * 4bdd5bbf6b Merge branch '2017.7' into jid_queue * facef2227d Merge branch '2017.7' into jid_queue @@ -2750,75 +2823,67 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 255aa94c64 Activate jid_queue also for SingleMinions to workaround 0mq reconnection issues -- **PR** `#44125`_: (*rallytime*) [2017.7] Merge forward from 2017.7.2 to 2017.7 - @ *2017-10-16T20:02:25Z* +* **PR** `#44125`_: (`rallytime`_) [2017.7] Merge forward from 2017.7.2 to 2017.7 + @ *2017-10-16 20:02:25 UTC* - - **PR** `#44027`_: (*rallytime*) Back-port `#44012`_ to 2017.7.2 - - **PR** `#44012`_: (*Ch3LL*) Security Fixes for 2017.7.2 - | refs: `#44027`_ * 2fba45cd3f Merge pull request `#44125`_ from rallytime/merge-2017.7 + * c4ae4a6b50 Merge branch '2017.7.2' into '2017.7' - * 5d719a2219 Merge pull request `#44027`_ from rallytime/`bp-44012`_ + * 5d719a2219 Merge pull request `#44027`_ from rallytime/bp-44012 * f7824e41f3 Don't allow path separators in minion ID * 44060dc9c1 Do not allow IDs with null bytes in decoded payloads -- **PR** `#44029`_: (*msummers42*) addresses issue `#43307`_, disk.format_ to disk.format - | refs: `#44131`_ - @ *2017-10-16T19:59:20Z* +* **ISSUE** `#43307`_: (`marek-knappe`_) Filesystem creation is failing on newly created LV (refs: `#44029`_) + +* **PR** `#44029`_: (`msummers42`_) addresses issue `#43307`_, disk.format\_ to disk.format (refs: `#44131`_) + @ *2017-10-16 19:59:20 UTC* - - **ISSUE** `#43307`_: (*marek-knappe*) Filesystem creation is failing on newly created LV * 68974aa74d Merge pull request `#44029`_ from msummers42/2017.7 - * 16e1c1dfc8 fixed test addressing issue `#43307`_, disk.format_ to disk.format + + * 16e1c1dfc8 fixed test addressing issue `#43307`_, disk.format\_ to disk.format * 3d597db51c Merge branch '2017.7' into 2017.7 - * 18fb0be96a addresses issue `#43307`_, disk.format_ to disk.format + * 18fb0be96a addresses issue `#43307`_, disk.format\_ to disk.format -- **PR** `#44079`_: (*skizunov*) opkg: Fix usage with pkgrepo.managed - @ *2017-10-16T19:58:13Z* +* **PR** `#44079`_: (`skizunov`_) opkg: Fix usage with pkgrepo.managed + @ *2017-10-16 19:58:13 UTC* * d0bbe65ffa Merge pull request `#44079`_ from skizunov/develop2 + * 0614d1af30 Merge branch '2017.7' into develop2 * b6b12fe495 opkg: Fix usage with pkgrepo.managed -- **PR** `#44090`_: (*pratik705*) Fix create_attach_volumes salt-cloud action for gcp - @ *2017-10-16T19:04:22Z* +* **PR** `#44090`_: (`pratik705`_) Fix create_attach_volumes salt-cloud action for gcp + @ *2017-10-16 19:04:22 UTC* * 22a8253595 Merge pull request `#44090`_ from pratik705/fix-create_attach_volumes_salt-cloud_action-GCP + * 3eefd334c5 Fixed "create_attach_volumes" salt-cloud action for GCP -- **PR** `#44121`_: (*benediktwerner*) Fixed code snippet in unit testing documentation - @ *2017-10-16T18:28:36Z* +* **PR** `#44121`_: (`benediktwerner`_) Fixed code snippet in unit testing documentation + @ *2017-10-16 18:28:36 UTC* * 888e5f51a2 Merge pull request `#44121`_ from benediktwerner/2017.7 + * 1319c822bd Fixed code snippet in unit testing doc -- **PR** `#44098`_: (*twangboy*) Return multiprocessing queue in LogSetupMock class - @ *2017-10-16T18:14:30Z* +* **PR** `#44098`_: (`twangboy`_) Return multiprocessing queue in LogSetupMock class + @ *2017-10-16 18:14:30 UTC* * 9fe94d7843 Merge pull request `#44098`_ from twangboy/win_mock_test_parsers + * cc43ca27af Return multiprocessing queue in LogSetupMock class -- **PR** `#44118`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-10-16T17:01:38Z* +* **PR** `#44118`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-10-16 17:01:38 UTC* - - **ISSUE** `#43581`_: (*jcourington*) cherrypy stats issue - | refs: `#44021`_ - - **PR** `#44092`_: (*techhat*) Made sure that unicoded data is sent to sha256() - - **PR** `#44030`_: (*rallytime*) [2016.11] Merge forward from 2016.3 to 2016.11 - - **PR** `#44025`_: (*dayid*) Typo correction of lover to lower - - **PR** `#44021`_: (*whiteinge*) Also catch cpstats AttributeError for bad CherryPy release ~5.6.0 - - **PR** `#44010`_: (*Ch3LL*) Security Fixes for 2016.3.8 - - **PR** `#43977`_: (*Ch3LL*) Add Security Notes to 2016.3.8 Release Notes - - **PR** `#42655`_: (*whiteinge*) Re-enable cpstats for rest_cherrypy - | refs: `#44021`_ - - **PR** `#33806`_: (*cachedout*) Work around upstream cherrypy bug - | refs: `#42655`_ * 0ee04eaf1d Merge pull request `#44118`_ from rallytime/merge-2017.7 + * bbec47afbc Merge branch '2016.11' into '2017.7' * c960ca32c2 Merge pull request `#44092`_ from techhat/awsunicode @@ -2859,84 +2924,72 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 5fb3f5f6b1 Add Security Notes to 2016.3.8 Release Notes -- **PR** `#44099`_: (*twangboy*) Skip Master, Minion, and Syndic parser tests - @ *2017-10-16T16:07:00Z* +* **PR** `#44099`_: (`twangboy`_) Skip Master, Minion, and Syndic parser tests + @ *2017-10-16 16:07:00 UTC* * 28fa097b9b Merge pull request `#44099`_ from twangboy/win_skip_test_parsers + * caf086c05a Skip Master, Minion, and Syndic parser tests -- **PR** `#44106`_: (*roaldnefs*) Fix mattermost returner documentation - @ *2017-10-16T13:12:23Z* +* **PR** `#44106`_: (`roaldnefs`_) Fix mattermost returner documentation + @ *2017-10-16 13:12:23 UTC* * dbf112ead7 Merge pull request `#44106`_ from roaldnefs/fix-doc-mattermost_returner + * b3761a0401 Fix doc indentation in mattermost_returner -- **PR** `#44054`_: (*nasenbaer13*) Backport of missing delete_on_termination - @ *2017-10-13T15:45:25Z* +* **PR** `#44054`_: (`nasenbaer13`_) Backport of missing delete_on_termination + @ *2017-10-13 15:45:25 UTC* + + * **PR** `#43859`_: (`nasenbaer13`_) Add missing delete_on_termination passthrough. Adapt docs. (refs: `#44054`_) - - **PR** `#43859`_: (*nasenbaer13*) Add missing delete_on_termination passthrough. Adapt docs. - | refs: `#44054`_ * fd2c51b76c Merge pull request `#44054`_ from eyj/boto_lc + * 34d4629a64 Merge branch '2017.7' into boto_lc * 9efd63526a Adapted documentation of delete_on_termination parameter * eb2bfd047b Add missing delete_on_termination passthrough. Adapt docs. -- **PR** `#44076`_: (*Ch3LL*) Add spm shell tests - @ *2017-10-13T14:32:19Z* +* **PR** `#44076`_: (`Ch3LL`_) Add spm shell tests + @ *2017-10-13 14:32:19 UTC* * b61ed96268 Merge pull request `#44076`_ from Ch3LL/spm_test + * d2e91c33bd Add spm shell tests -- **PR** `#44051`_: (*twangboy*) Fix some documentation formatting issues in the win_dacl state - @ *2017-10-12T15:40:17Z* +* **PR** `#44051`_: (`twangboy`_) Fix some documentation formatting issues in the win_dacl state + @ *2017-10-12 15:40:17 UTC* * e38f313ac0 Merge pull request `#44051`_ from twangboy/win_fix_docs_dacl + * 377d6b6171 Fix some docs in the win_dacl state module -- **PR** `#44066`_: (*Ch3LL*) Add Known CherryPy Issue to 2017.7.2 Release Notes - @ *2017-10-12T15:18:25Z* +* **PR** `#44066`_: (`Ch3LL`_) Add Known CherryPy Issue to 2017.7.2 Release Notes + @ *2017-10-12 15:18:25 UTC* * a85837d72b Merge pull request `#44066`_ from Ch3LL/cherry_release + * 8e597fcce9 Add Known CherryPy Issue to 2017.7.2 Release Notes -- **PR** `#43889`_: (*CorvinM*) Fix issue with using roster_defaults with flat or cloud rosters. - @ *2017-10-11T23:22:11Z* +* **ISSUE** `#43643`_: (`doublez13`_) salt-ssh: multiple targets fails after upgrade to 2017.7 (refs: `#43889`_) + +* **ISSUE** `#43449`_: (`ecgg`_) salt-ssh -L with hosts down or unreachable returns wrong results (refs: `#43889`_) + +* **PR** `#43889`_: (`CorvinM`_) Fix issue with using roster_defaults with flat or cloud rosters. + @ *2017-10-11 23:22:11 UTC* - - **ISSUE** `#43643`_: (*doublez13*) salt-ssh: multiple targets fails after upgrade to 2017.7 - | refs: `#43889`_ - - **ISSUE** `#43449`_: (*ecgg*) salt-ssh -L with hosts down or unreachable returns wrong results - | refs: `#43889`_ * fcab77ac7b Merge pull request `#43889`_ from CorvinM/issue43449 + * fefd28d896 Add futureproofing to roster_defaults to support roster dictionary options * aebe76b6f8 Fix issue with using roster_defaults with flat or cloud rosters. fixes `#43449`_ fixes `#43643`_ -- **PR** `#44031`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-10-11T22:03:31Z* +* **PR** `#44031`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-10-11 22:03:31 UTC* - - **ISSUE** `#43945`_: (*bobrik*) kmod.present doesn't work with compiled-in modules - - **ISSUE** `#42947`_: (*rossengeorgiev*) Zenoss state changes production state even when test=true - | refs: `#43968`_ - - **ISSUE** `#2291`_: (*scott-w*) Extend pkg to install from file - - **PR** `#44023`_: (*Ch3LL*) Add 2016.11.9 Release Note File - - **PR** `#44019`_: (*benediktwerner*) Added missing docs to the tutorial index and fixed spelling mistake - - **PR** `#44011`_: (*Ch3LL*) Security Fixes for 2016.11.8 - | refs: `#44028`_ - - **PR** `#43991`_: (*Ch3LL*) Add Security Notes to 2016.3.8 Release Notes - - **PR** `#43976`_: (*Ch3LL*) Add Security Notes to 2016.11.8 Release Notes - - **PR** `#43973`_: (*terminalmage*) Fix grains.has_value when value is False - - **PR** `#43968`_: (*rossengeorgiev*) fix zenoss state module not respecting test=true - - **PR** `#43962`_: (*bobrik*) Report built-in modiles in kmod.available, fixes `#43945`_ - - **PR** `#43960`_: (*cro*) Require that bindpw be non-empty when auth.ldap.anonymous is False - - **PR** `#43955`_: (*meaksh*) Enable a new '--with-salt-version' parameter for the "setup.py" script - - **PR** `#43916`_: (*dereckson*) Fix typo in salt-cloud scaleway documentation - - **PR** `#43888`_: (*rallytime*) Back-port `#43841`_ to 2016.11 - - **PR** `#43841`_: (*austinpapp*) add -n with netstat so we don't resolve IPs - | refs: `#43888`_ - - **PR** `#43776`_: (*Ch3LL*) [2016.11] Bump latest and previous versions * 3ad1c6d1d9 Merge pull request `#44031`_ from rallytime/merge-2017.7 + * 1d4a6c3949 Lint: Fixup undefined variable errors * 788ad0609a Merge branch '2016.11' into '2017.7' @@ -2957,9 +3010,9 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 6c30344824 Added missing tutorial docs to the tutorial index - * 364523f5f8 Merge pull request `#43955`_ from meaksh/2016.11-`fix-2291`_ + * 364523f5f8 Merge pull request `#43955`_ from meaksh/2016.11-fix-2291 - * a81b78381b Merge branch '2016.11' into 2016.11-`fix-2291`_ + * a81b78381b Merge branch '2016.11' into 2016.11-fix-2291 * 44bc91bb98 Enable '--with-salt-version' parameter for setup.py script @@ -2993,7 +3046,7 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * bf45ae6e6a Fix grains.has_value when value is False - * 9ac3f2ea7b Merge pull request `#43888`_ from rallytime/`bp-43841`_ + * 9ac3f2ea7b Merge pull request `#43888`_ from rallytime/bp-43841 * 87d676f08a add -n with netstat so we don't resolve @@ -3001,135 +3054,144 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 15b8b8a9f4 Fix typo in salt-cloud scaleway documentation -- **PR** `#44045`_: (*isbm*) Bugfix: always return a string "list" on unknown job target type. - @ *2017-10-11T21:58:12Z* +* **PR** `#44045`_: (`isbm`_) Bugfix: always return a string "list" on unknown job target type. + @ *2017-10-11 21:58:12 UTC* + + * 5db1e8c6ca Merge pull request `#44045`_ from isbm/isbm-tgttype-fix-2017-port - - **PR** `#2017`_: (*thekuffs*) Add additional Esky / Freezing documentation. - - **PR** `#2015`_: (*thekuffs*) Esky / bbfreeze support - | refs: `#2017`_ - * 5db1e8c6ca Merge pull request `#44045`_ from isbm/isbm-tgttype-`fix-2017`_-port * 471ff35c2f Bugfix: always return a string "list" on unknown job target type. -- **PR** `#44026`_: (*rallytime*) Back-port `#43950`_ to 2017.7 - @ *2017-10-11T15:27:49Z* +* **ISSUE** `#43949`_: (`arthurlogilab`_) [logger] [sentry] KeyError: 'SENTRY_PROJECT' (refs: `#43950`_) + +* **PR** `#44026`_: (`rallytime`_) Back-port `#43950`_ to 2017.7 + @ *2017-10-11 15:27:49 UTC* + + * **PR** `#43950`_: (`arthurlogilab`_) [log/sentry] avoid KeyError: 'SENTRY_PROJECT' (refs: `#44026`_) + + * 6c8f7fd5ec Merge pull request `#44026`_ from rallytime/bp-43950 - - **ISSUE** `#43949`_: (*arthurlogilab*) [logger] [sentry] KeyError: 'SENTRY_PROJECT' - | refs: `#43950`_ - - **PR** `#43950`_: (*arthurlogilab*) [log/sentry] avoid KeyError: 'SENTRY_PROJECT' - | refs: `#44026`_ - * 6c8f7fd5ec Merge pull request `#44026`_ from rallytime/`bp-43950`_ * a37e0bad62 [log/sentry] avoid KeyError: 'SENTRY_PROJECT' -- **PR** `#44012`_: (*Ch3LL*) Security Fixes for 2017.7.2 - | refs: `#44027`_ - @ *2017-10-10T20:04:08Z* +* **PR** `#44012`_: (`Ch3LL`_) Security Fixes for 2017.7.2 (refs: `#44027`_) + @ *2017-10-10 20:04:08 UTC* * 369ee8a132 Merge pull request `#44012`_ from Ch3LL/2017.7.1_follow_up + * 92e05cf1c0 Don't allow path separators in minion ID * 70133aa305 Do not allow IDs with null bytes in decoded payloads -- **PR** `#44024`_: (*Ch3LL*) Add 2017.7.3 Release Note File - @ *2017-10-10T20:03:12Z* +* **PR** `#44024`_: (`Ch3LL`_) Add 2017.7.3 Release Note File + @ *2017-10-10 20:03:12 UTC* * 4fe029a0ab Merge pull request `#44024`_ from Ch3LL/7.3rn + * 027f509368 Add 2017.7.3 Release Note File -- **PR** `#43998`_: (*unthought*) Fix gce make_master - @ *2017-10-10T20:01:25Z* +* **ISSUE** `#43997`_: (`unthought`_) gce cloud provider breaks for make_master: True (refs: `#43998`_) + +* **PR** `#43998`_: (`unthought`_) Fix gce make_master + @ *2017-10-10 20:01:25 UTC* - - **ISSUE** `#43997`_: (*unthought*) gce cloud provider breaks for make_master: True - | refs: `#43998`_ * e484d16817 Merge pull request `#43998`_ from unthought/fix-gce-make_master + * 6e9f0fa24e Fix GCE provider: #create returns bootstrap result -- **PR** `#44016`_: (*terminalmage*) Fix on_header callback when not redirecting and no Content-Type present - @ *2017-10-10T19:59:24Z* +* **ISSUE** `#44013`_: (`DenisBY`_) pkgrepo.managed broken in 2017.7.2 (refs: `#44016`_) + +* **PR** `#44016`_: (`terminalmage`_) Fix on_header callback when not redirecting and no Content-Type present + @ *2017-10-10 19:59:24 UTC* - - **ISSUE** `#44013`_: (*DenisBY*) pkgrepo.managed broken in 2017.7.2 - | refs: `#44016`_ * 82b92d54b3 Merge pull request `#44016`_ from terminalmage/issue44013 + * d594b95f92 No need to set a specific encoding if one hasn't been provided via the headers * 425ede4b84 Fix on_header callback when not redirecting and no Content-Type present -- **PR** `#43952`_: (*t0fik*) add requisites to stateconf ( backport `#43920`_) - @ *2017-10-10T13:03:31Z* +* **PR** `#43952`_: (`t0fik`_) add requisites to stateconf ( backport `#43920`_) + @ *2017-10-10 13:03:31 UTC* + + * **PR** `#43920`_: (`t0fik`_) Added missing requisites to stateconf renderer (refs: `#43952`_) * bd879eb66e Merge pull request `#43952`_ from jdsieci/2017.7_add_requisites_to_stateconf + * 9994c64670 Merge branch '2017.7' into 2017.7_add_requisites_to_stateconf -- **PR** `#43777`_: (*Ch3LL*) [2017.7] Bump latest and previous versions - @ *2017-10-09T17:21:57Z* +* **PR** `#43777`_: (`Ch3LL`_) [2017.7] Bump latest and previous versions + @ *2017-10-09 17:21:57 UTC* * a4358dfa36 Merge pull request `#43777`_ from Ch3LL/2017.7.2_docs + * 410c624f7a [2017.7] Bump latest and previous versions -- **PR** `#43978`_: (*Ch3LL*) Add Security Notes to 2017.7.2 Release Notes - @ *2017-10-09T17:20:04Z* +* **PR** `#43978`_: (`Ch3LL`_) Add Security Notes to 2017.7.2 Release Notes + @ *2017-10-09 17:20:04 UTC* * 2a064c1a72 Merge pull request `#43978`_ from Ch3LL/7.2_sec + * 57fd6f7bcb Add Security Notes to 2017.7.2 Release Notes -- **PR** `#43932`_: (*techhat*) Don't try to modify dict while looping through it - @ *2017-10-06T21:20:54Z* +* **PR** `#43932`_: (`techhat`_) Don't try to modify dict while looping through it + @ *2017-10-06 21:20:54 UTC* * d9530e3c52 Merge pull request `#43932`_ from techhat/moddict + * 4a77560646 Don't try to modify dict while looping through it -- **PR** `#43956`_: (*terminalmage*) Fix fileclient's get_url when redirecting to a redirect - @ *2017-10-06T21:19:41Z* +* **PR** `#43956`_: (`terminalmage`_) Fix fileclient's get_url when redirecting to a redirect + @ *2017-10-06 21:19:41 UTC* * 39893a1dab Merge pull request `#43956`_ from terminalmage/fix-get_url-redirects + * 9a4f6a260f Fix fileclient's get_url when redirecting to a redirect -- **PR** `#43943`_: (*twangboy*) Fix `unit.utils.test_utils` for Windows - @ *2017-10-06T19:35:24Z* +* **PR** `#43943`_: (`twangboy`_) Fix `unit.utils.test_utils` for Windows + @ *2017-10-06 19:35:24 UTC* * 1baf286719 Merge pull request `#43943`_ from twangboy/win_unit_test_utils + * 254dac7723 Fix `unit.utils.test_utils` for Windows * 89200ff28e rebase from 2017.7.2 -- **PR** `#43939`_: (*terminalmage*) Fix typo in log message - @ *2017-10-05T23:20:04Z* +* **PR** `#43939`_: (`terminalmage`_) Fix typo in log message + @ *2017-10-05 23:20:04 UTC* * a8f1750323 Merge pull request `#43939`_ from terminalmage/fix-typo + * 29d8cf4f26 Fix typo in log message -- **PR** `#43910`_: (*terminalmage*) Don't put unserializable dict.keys() into state return - @ *2017-10-05T20:33:47Z* +* **ISSUE** `#43909`_: (`frogunder`_) state.highstate not working on py3 setup (refs: `#43910`_) + +* **ISSUE** `#43605`_: (`cruscio`_) Module.Run: Passed invalid arguments to state.apply: can't serialize dict_keys(['task.create_task']) (refs: `#43910`_) + +* **PR** `#43910`_: (`terminalmage`_) Don't put unserializable dict.keys() into state return + @ *2017-10-05 20:33:47 UTC* - - **ISSUE** `#43909`_: (*frogunder*) state.highstate not working on py3 setup - | refs: `#43910`_ - - **ISSUE** `#43605`_: (*cruscio*) Module.Run: Passed invalid arguments to state.apply: can't serialize dict_keys(['task.create_task']) - | refs: `#43910`_ * 1a718eb1ed Merge pull request `#43910`_ from terminalmage/issue43605 + * 042e092ac8 Don't put unserializable dict.keys() into state return -- **PR** `#43927`_: (*rallytime*) Back-port `#43907`_ to 2017.7 - @ *2017-10-05T20:10:16Z* +* **ISSUE** `#41894`_: (`DR3EVR8u8c`_) Salt-cloud can't resize root volume with public ami images (refs: `#43907`_) + +* **ISSUE** `#39257`_: (`aig787`_) Using del_root_vol_on_destroy option in salt-cloud gives IndexError (refs: `#43907`_) + +* **PR** `#43927`_: (`rallytime`_) Back-port `#43907`_ to 2017.7 + @ *2017-10-05 20:10:16 UTC* + + * **PR** `#43907`_: (`richardsimko`_) Make sure EBS volume exists before querying (refs: `#43927`_) + + * **PR** `#33115`_: (`rbjorklin`_) Fix override of ec2 volumetype (refs: `#43907`_) + + * a7a59868c8 Merge pull request `#43927`_ from rallytime/bp-43907 - - **ISSUE** `#41894`_: (*DR3EVR8u8c*) Salt-cloud can't resize root volume with public ami images - | refs: `#43907`_ - - **ISSUE** `#39257`_: (*aig787*) Using del_root_vol_on_destroy option in salt-cloud gives IndexError - | refs: `#43907`_ - - **PR** `#43907`_: (*richardsimko*) Make sure EBS volume exists before querying - | refs: `#43927`_ - - **PR** `#33115`_: (*rbjorklin*) Fix override of ec2 volumetype - | refs: `#43907`_ - * a7a59868c8 Merge pull request `#43927`_ from rallytime/`bp-43907`_ * f62e8ca87f Make sure volume exists before querying -- **PR** `#43934`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-10-05T20:07:36Z* +* **PR** `#43934`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-10-05 20:07:36 UTC* - - **ISSUE** `#43373`_: (*rgcosma*) use keyword breaks sls_id - | refs: `#43707`_ - - **PR** `#43884`_: (*UtahDave*) Update SaltConf banner per Rhett's request - - **PR** `#43869`_: (*terminalmage*) Only join cmd if it's not a string - - **PR** `#43707`_: (*terminalmage*) Add missing support for use/use_in requisites to state.sls_id * 4fcd4709ea Merge pull request `#43934`_ from rallytime/merge-2017.7 + * eaca3291e2 Merge branch '2016.11' into '2017.7' * 2ab7549d48 Merge pull request `#43884`_ from UtahDave/2016.11local @@ -3152,26 +3214,27 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * f73764481b Add missing support for use/use_in requisites to state.sls_id -- **PR** `#43886`_: (*techhat*) Fix object_to_dict in azure - @ *2017-10-05T19:33:56Z* +* **ISSUE** `#43658`_: (`kvnaveen`_) KeyError: 'as_dict' [DEBUG ] LazyLoaded nested.output (refs: `#43886`_) + +* **PR** `#43886`_: (`techhat`_) Fix object_to_dict in azure + @ *2017-10-05 19:33:56 UTC* - - **ISSUE** `#43658`_: (*kvnaveen*) KeyError: 'as_dict' [DEBUG ] LazyLoaded nested.output - | refs: `#43886`_ * 7d174172a0 Merge pull request `#43886`_ from techhat/azuredict + * 223a1eea83 Fix object_to_dict in azure -- **PR** `#43899`_: (*gtmanfred*) enable tox for tests - @ *2017-10-04T15:08:16Z* +* **PR** `#43899`_: (`gtmanfred`_) enable tox for tests + @ *2017-10-04 15:08:16 UTC* * 7038248820 Merge pull request `#43899`_ from gtmanfred/2017.7 + * 51eca1a6bd enable tox for tests -- **PR** `#43828`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-10-04T13:10:13Z* +* **PR** `#43828`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-10-04 13:10:13 UTC* - - **PR** `#43807`_: (*terminalmage*) cmdmod: Don't list-ify string commands on Windows - - **PR** `#43768`_: (*vutny*) Fix Pylint deprecated option warnings * a5abe33e1c Merge pull request `#43828`_ from rallytime/merge-2017.7 + * 2ff02e4320 Merge branch '2016.11' into '2017.7' * 85b3aa332a Merge pull request `#43807`_ from terminalmage/issue43522 @@ -3184,20 +3247,21 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 651ed16ad3 Fix Pylint deprecated option warnings -- **PR** `#43854`_: (*keesbos*) Map __env__ in git_pillar before sanity checks - @ *2017-10-02T20:44:53Z* +* **PR** `#43854`_: (`keesbos`_) Map __env__ in git_pillar before sanity checks + @ *2017-10-02 20:44:53 UTC* + + * **PR** `#43656`_: (`keesbos`_) Git pillar fixes (refs: `#43854`_) - - **PR** `#43656`_: (*keesbos*) Git pillar fixes - | refs: `#43854`_ * 36b0b1174b Merge pull request `#43854`_ from keesbos/2017.7 + * fba9c9a935 Map __env__ in git_pillar before sanity checks -- **PR** `#43847`_: (*cachedout*) Fix to module.run - @ *2017-10-02T19:25:03Z* +* **PR** `#43847`_: (`cachedout`_) Fix to module.run + @ *2017-10-02 19:25:03 UTC* - - **ISSUE** `#17`_: (*thatch45*) Modules need to be autodocumenting * c81e8457b8 Merge pull request `#43847`_ from cachedout/module_run_compare - * b11f8c8f29 Merge pull request `#17`_ from terminalmage/pr-43847 + + * b11f8c8f29 Merge pull request #17 from terminalmage/pr-43847 * 93eaba7c54 Use six.iterkeys() instead of dict.keys() @@ -3205,97 +3269,104 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 71780beb5a Merge branch '2017.7' into module_run_compare -- **PR** `#43844`_: (*garethgreenaway*) [2017.7] Changes to states/file.py and states/archived.py - @ *2017-10-01T09:08:48Z* +* **ISSUE** `#43819`_: (`mephi42`_) archive.extracted shows the http password in the comment field on failure (refs: `#43844`_) + +* **PR** `#43844`_: (`garethgreenaway`_) [2017.7] Changes to states/file.py and states/archived.py + @ *2017-10-01 09:08:48 UTC* - - **ISSUE** `#43819`_: (*mephi42*) archive.extracted shows the http password in the comment field on failure - | refs: `#43844`_ * dd01e0ce67 Merge pull request `#43844`_ from garethgreenaway/43819_redact_url_additions + * c58c72aff9 When using URLs in archive.extracted, on failure the username & password is in the exception. Calling salt.utils.url.redact_http_basic_auth to ensure the credentials are redacted. * f0b985cbbe Merge branch 'module_run_compare' of ssh://github.com/cachedout/salt into module_run_compare * aefc773c2f Merge branch '2017.7' into module_run_compare -- **PR** `#43840`_: (*twangboy*) Fix `unit.states.test_augeas` for Windows - @ *2017-09-29T21:53:21Z* +* **PR** `#43840`_: (`twangboy`_) Fix `unit.states.test_augeas` for Windows + @ *2017-09-29 21:53:21 UTC* * 1f52546eab Merge pull request `#43840`_ from twangboy/win_fix_test_augeas + * fd1d6c31de Fix `unit.states.test_augeas` for Windows -- **PR** `#43801`_: (*terminalmage*) Properly handle UNC paths in salt.utils.path.readlink() - @ *2017-09-29T09:58:02Z* +* **ISSUE** `#43553`_: (`dafyddj`_) Vagrant setup (Windows guest) broken on upgrade to 2017.7 (refs: `#43801`_) + +* **PR** `#43801`_: (`terminalmage`_) Properly handle UNC paths in salt.utils.path.readlink() + @ *2017-09-29 09:58:02 UTC* - - **ISSUE** `#43553`_: (*dafyddj*) Vagrant setup (Windows guest) broken on upgrade to 2017.7 - | refs: `#43801`_ * c6fd2cd452 Merge pull request `#43801`_ from terminalmage/issue43553 + * 66e6e89dc7 Properly handle UNC paths in salt.utils.path.readlink() -- **PR** `#43800`_: (*Ch3LL*) Add note to nitrogen release notes about pip for cent6 - @ *2017-09-28T17:36:49Z* +* **PR** `#43800`_: (`Ch3LL`_) Add note to nitrogen release notes about pip for cent6 + @ *2017-09-28 17:36:49 UTC* * 7304907db6 Merge pull request `#43800`_ from Ch3LL/update_7.0 + * 50779c3b1c Add note to nitrogen release notes about pip for cent6 -- **PR** `#43779`_: (*twangboy*) Fix `unit.modules.test_state` for Windows - @ *2017-09-28T14:27:03Z* +* **PR** `#43779`_: (`twangboy`_) Fix `unit.modules.test_state` for Windows + @ *2017-09-28 14:27:03 UTC* * 6f687fdcff Merge pull request `#43779`_ from twangboy/win_fix_test_state + * a64fe75816 Use os agnostic paths -- **PR** `#43782`_: (*twangboy*) Fix `unit.modules.test_virt` for Windows - @ *2017-09-28T14:25:16Z* +* **PR** `#43782`_: (`twangboy`_) Fix `unit.modules.test_virt` for Windows + @ *2017-09-28 14:25:16 UTC* * db0f569f7a Merge pull request `#43782`_ from twangboy/win_fix_test_virt + * 7192332758 Fix `unit.modules.test_virt` for Windows -- **PR** `#43723`_: (*nicholasmhughes*) Fix ini_manage error and change handling - @ *2017-09-28T09:52:09Z* +* **PR** `#43723`_: (`nicholasmhughes`_) Fix ini_manage error and change handling + @ *2017-09-28 09:52:09 UTC* * dd4fc52f1e Merge pull request `#43723`_ from nicholasmhughes/ini_manage-error-handling + * d68c5c4be0 prevent exception when test=True * cfe37916c3 handling changes per section * 1c484f6ad5 prevent exception when test=True -- **PR** `#43781`_: (*twangboy*) Fix `unit.modules.test_status` for Windows - @ *2017-09-28T09:06:19Z* +* **PR** `#43781`_: (`twangboy`_) Fix `unit.modules.test_status` for Windows + @ *2017-09-28 09:06:19 UTC* * 5e29507c21 Merge pull request `#43781`_ from twangboy/win_fix_test_status + * 16ae8253c1 Mock which, use os.linesep for cmd.run return -- **PR** `#43785`_: (*twangboy*) Fix `unit.modules.test_znc` for Windows - @ *2017-09-28T08:56:11Z* +* **PR** `#43785`_: (`twangboy`_) Fix `unit.modules.test_znc` for Windows + @ *2017-09-28 08:56:11 UTC* * 05c78ae649 Merge pull request `#43785`_ from twangboy/win_fix_test_znc + * 7d90721f6b Merge branch '2017.7' into win_fix_test_znc * 228e74c8e3 Fix `unit.modules.test_znc` for Windows -- **PR** `#43786`_: (*twangboy*) Fix `unit.modules.test_zypper` for Windows - @ *2017-09-28T08:51:59Z* +* **PR** `#43786`_: (`twangboy`_) Fix `unit.modules.test_zypper` for Windows + @ *2017-09-28 08:51:59 UTC* * 10ddb8491c Merge pull request `#43786`_ from twangboy/win_fix_test_zypper + * 1c05e37a66 Merge branch '2017.7' into win_fix_test_zypper * aafec7ab0e Fix `unit.modules.test_zypper` for Windows -- **PR** `#43773`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-09-28T08:48:39Z* +* **PR** `#43773`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-09-28 08:48:39 UTC* - - **ISSUE** `#40311`_: (*cralston0*) --hide-timeout used with --output json --static produces unparseable JSON - | refs: `#43772`_ - - **PR** `#43772`_: (*gtmanfred*) don't print Minion not responding with quiet - - **PR** `#43747`_: (*rallytime*) Add GPG Verification section to Contributing Docs * 9615ca32d5 Merge pull request `#43773`_ from rallytime/merge-2017.7 + * f7035ed7da Merge branch '2017.7' into merge-2017.7 * dfef4a722c Merge branch '2016.11' into '2017.7' * 1a8cc60bb4 Merge pull request `#43772`_ from gtmanfred/2016.11 - * 0194c60960 don't print Minion not responding with quiet + * 0194c60960 dont print Minion not responding with quiet * 9dee896fb9 Merge pull request `#43747`_ from rallytime/gpg-verification @@ -3303,59 +3374,52 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 23bb4a5dde Add GPG Verification section to Contributing Docs -- **PR** `#43784`_: (*twangboy*) Fix `unit.modules.test_win_service` - @ *2017-09-28T03:14:39Z* +* **PR** `#43784`_: (`twangboy`_) Fix `unit.modules.test_win_service` + @ *2017-09-28 03:14:39 UTC* * 9a9cc69d55 Merge pull request `#43784`_ from twangboy/win_fix_test_win_service + * 058e50e530 Fix `unit.modules.test_win_service` -- **PR** `#43774`_: (*The-Loeki*) typo fix aka what is a 'masterarpi' - @ *2017-09-27T18:52:19Z* +* **PR** `#43774`_: (`The-Loeki`_) typo fix aka what is a 'masterarpi' + @ *2017-09-27 18:52:19 UTC* * 1254da1df5 Merge pull request `#43774`_ from The-Loeki/patch-1 + * 84bbe85e60 typo fix aka what is a 'masterarpi' -- **PR** `#43732`_: (*twangboy*) Skip `unit.stats.test_mac_packages` on Windows - @ *2017-09-27T14:48:08Z* +* **PR** `#43732`_: (`twangboy`_) Skip `unit.stats.test_mac_packages` on Windows + @ *2017-09-27 14:48:08 UTC* * 3f888753d4 Merge pull request `#43732`_ from twangboy/win_skip_mac_pkg_tests + * 1c01e06097 Only skip test on Windows * ec99a3ce3c Fix lint error * 61f8a2f7ff Skip mac specific tests -- **PR** `#43761`_: (*Ch3LL*) Release Notes for 2017.7.2 - @ *2017-09-27T14:34:52Z* +* **PR** `#43761`_: (`Ch3LL`_) Release Notes for 2017.7.2 + @ *2017-09-27 14:34:52 UTC* * fb86935d99 Merge pull request `#43761`_ from Ch3LL/release_2017.7.2 + * caf5795856 add mac patch notes * 3d5fce0955 Add 2017.7.2 Release Notes -- **PR** `#43767`_: (*twangboy*) Skip `unit.modules.test_snapper` on Windows - @ *2017-09-27T14:10:27Z* +* **PR** `#43767`_: (`twangboy`_) Skip `unit.modules.test_snapper` on Windows + @ *2017-09-27 14:10:27 UTC* * 5ea603cf16 Merge pull request `#43767`_ from twangboy/win_skip_test_snapper + * b41b9c8378 Skip snapper tests on Windows -- **PR** `#43759`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-09-27T13:30:38Z* +* **PR** `#43759`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-09-27 13:30:38 UTC* - - **ISSUE** `#43729`_: (*The-Loeki*) Docker events engine broken on newer docker.py - | refs: `#43733`_ - - **ISSUE** `#43650`_: (*rallytime*) Review contributing documentation and the merge-forward process - | refs: `#43727`_ - - **ISSUE** `#42706`_: (*blarghmatey*) Parallel Cache Failure - | refs: `#43018`_ `#43159`_ - - **ISSUE** `#42082`_: (*stamak*) [salt.utils.gitfs ][CRITICAL] Invalid gitfs configuration parameter 'saltenv' in remote git+ssh://git@ourgitserver/ourgitrepo.git. - | refs: `#43458`_ - - **PR** `#43733`_: (*terminalmage*) Allow docker_events engine to work with newer docker-py - - **PR** `#43727`_: (*rallytime*) Revise "Contributing" docs: merge-forwards/release branches explained! - - **PR** `#43458`_: (*terminalmage*) Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner - - **PR** `#43018`_: (*jubrad*) Update state.py - | refs: `#43159`_ `#43727`_ * 77c2c7cbf7 Merge pull request `#43759`_ from rallytime/merge-2017.7 + * 120f49f2c4 Merge branch '2016.11' into '2017.7' * 1cc3ad1c8d Merge pull request `#43733`_ from terminalmage/issue43729 @@ -3366,54 +3430,61 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 5f90812b12 Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner - * 023a563657 Merge pull request `#43727`_ from rallytime/`fix-43650`_ + * 023a563657 Merge pull request `#43727`_ from rallytime/fix-43650 * babad12d83 Revise "Contributing" docs: merge-forwards/release branches explained! -- **PR** `#43748`_: (*rallytime*) Add message to boto_kinesis modules if boto libs are missing - @ *2017-09-27T13:19:33Z* +* **ISSUE** `#43737`_: (`syedaali`_) salt.loaded.int.module.boto_kinesis.__virtual__() is wrongly returning `None`. It should either return `True`, `False` or a new name. If you're the developer of the module 'boto_kinesis', please fix this. (refs: `#43748`_) + +* **PR** `#43748`_: (`rallytime`_) Add message to boto_kinesis modules if boto libs are missing + @ *2017-09-27 13:19:33 UTC* + + * 5c203df056 Merge pull request `#43748`_ from rallytime/fix-43737 - - **ISSUE** `#43737`_: (*syedaali*) salt.loaded.int.module.boto_kinesis.__virtual__() is wrongly returning `None`. It should either return `True`, `False` or a new name. If you're the developer of the module 'boto_kinesis', please fix this. - | refs: `#43748`_ - * 5c203df056 Merge pull request `#43748`_ from rallytime/`fix-43737`_ * 5a2593dbd3 Add message to boto_kinesis modules if boto libs are missing -- **PR** `#43731`_: (*twangboy*) Fix `unit.beacons.test_status` for Windows - @ *2017-09-26T16:25:12Z* +* **PR** `#43731`_: (`twangboy`_) Fix `unit.beacons.test_status` for Windows + @ *2017-09-26 16:25:12 UTC* * 2581098595 Merge pull request `#43731`_ from twangboy/win_unit_beacons_test_status + * dc1b36b7e2 Change expected return for Windows -- **PR** `#43724`_: (*brejoc*) Improved delete_deployment test for kubernetes module - @ *2017-09-26T16:19:31Z* +* **PR** `#43724`_: (`brejoc`_) Improved delete_deployment test for kubernetes module + @ *2017-09-26 16:19:31 UTC* * 10f3d47498 Merge pull request `#43724`_ from brejoc/2017.7.kubernetes_delete_test + * 85b0a8c401 Improved delete_deployment test for kubernetes module -- **PR** `#43734`_: (*twangboy*) Fix `unit.modules.test_poudriere` for Windows - @ *2017-09-26T14:13:47Z* +* **PR** `#43734`_: (`twangboy`_) Fix `unit.modules.test_poudriere` for Windows + @ *2017-09-26 14:13:47 UTC* * 13cc27bdab Merge pull request `#43734`_ from twangboy/win_unit_test_poudriere + * 922e60fa67 Add os agnostic paths -- **PR** `#43742`_: (*terminalmage*) Fix incorrect value in docstring - @ *2017-09-26T13:55:00Z* +* **PR** `#43742`_: (`terminalmage`_) Fix incorrect value in docstring + @ *2017-09-26 13:55:00 UTC* * 41aeee7ac8 Merge pull request `#43742`_ from terminalmage/fix-docstring + * 553335b1c9 Fix incorrect value in docstring -- **PR** `#41998`_: (*twangboy*) Fix `unit.modules.test_environ` for Windows - @ *2017-09-26T12:25:48Z* +* **PR** `#41998`_: (`twangboy`_) Fix `unit.modules.test_environ` for Windows + @ *2017-09-26 12:25:48 UTC* * d78b9a3294 Merge pull request `#41998`_ from twangboy/win_unit_test_environ + * d73ef44cf6 Mock with uppercase KEY * 048e16883f Use uppercase KEY -- **PR** `#42036`_: (*twangboy*) Fix `unit.modules.test_file` for Windows - @ *2017-09-26T12:23:10Z* +* **PR** `#42036`_: (`twangboy`_) Fix `unit.modules.test_file` for Windows + @ *2017-09-26 12:23:10 UTC* * 7fbbea3806 Merge pull request `#42036`_ from twangboy/win_unit_test_file + * 056f3bb4c0 Use with to open temp file * 352fe69e35 Clarify the purpose of the for loop @@ -3432,18 +3503,20 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * c5cf5e92c1 Fix many tests -- **PR** `#43557`_: (*clan*) disable modify yaml constructor - @ *2017-09-25T14:03:47Z* +* **PR** `#43557`_: (`clan`_) disable modify yaml constructor + @ *2017-09-25 14:03:47 UTC* * a81d4b8d8d Merge pull request `#43557`_ from clan/yaml + * 485471c8a7 Merge branch '2017.7' into yaml * da15658304 remove modify yaml constructor -- **PR** `#43566`_: (*damon-atkins*) 2017.7 update salt.utils.files.safe_filepath func - @ *2017-09-25T13:58:29Z* +* **PR** `#43566`_: (`damon-atkins`_) 2017.7 update salt.utils.files.safe_filepath func + @ *2017-09-25 13:58:29 UTC* * b5beec16e8 Merge pull request `#43566`_ from damon-atkins/2017.7_update_safe_filename_func + * c7a652784a remove blank line at end of file * e97651d49b Merge branch '2017.7' into 2017.7_update_safe_filename_func @@ -3454,77 +3527,84 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 4171d11838 utils.files.safe_filepath add support to override the os default directory separator -- **PR** `#43712`_: (*wedge-jarrad*) Ignore retcode on call to grep in selinux.py module - @ *2017-09-25T13:56:17Z* +* **ISSUE** `#43711`_: (`wedge-jarrad`_) fcontext_get_policy emits command error if policy doesn't exist (refs: `#43712`_) + +* **PR** `#43712`_: (`wedge-jarrad`_) Ignore retcode on call to grep in selinux.py module + @ *2017-09-25 13:56:17 UTC* + + * 3bb337cf6a Merge pull request `#43712`_ from wedge-jarrad/fix-43711 - - **ISSUE** `#43711`_: (*wedge-jarrad*) fcontext_get_policy emits command error if policy doesn't exist - | refs: `#43712`_ `#43712`_ - * 3bb337cf6a Merge pull request `#43712`_ from wedge-jarrad/`fix-43711`_ * 96c1ef48e6 Ignore retcode on call to grep in selinux.py module -- **PR** `#43716`_: (*gaborn57*) Corrected custom port handling - @ *2017-09-25T13:44:58Z* +* **ISSUE** `#43659`_: (`gaborn57`_) unable to retrieve pillar data in postgres db (refs: `#43716`_) + +* **PR** `#43716`_: (`gaborn57`_) Corrected custom port handling + @ *2017-09-25 13:44:58 UTC* - - **ISSUE** `#43659`_: (*gaborn57*) unable to retrieve pillar data in postgres db - | refs: `#43716`_ * 5b7411e335 Merge pull request `#43716`_ from gaborn57/2017.7 + * 78137c0860 Corrected custom port handling -- **PR** `#43700`_: (*rklaren*) Ensure salt-cloud with libvirt provider does not write low level errors to stderr - @ *2017-09-25T01:47:25Z* +* **PR** `#43700`_: (`rklaren`_) Ensure salt-cloud with libvirt provider does not write low level errors to stderr + @ *2017-09-25 01:47:25 UTC* + + * **PR** `#43684`_: (`rklaren`_) salt-cloud libvirt updates (refs: `#43700`_) - - **PR** `#43684`_: (*rklaren*) salt-cloud libvirt updates - | refs: `#43700`_ * 6bbd50c453 Merge pull request `#43700`_ from rklaren/fix-libvirt-stderr-spam + * 88530c4cb6 Lint fixes * 235bec492e salt-cloud + libvirt: Mention Fedora 26 support * 9aecf5f847 Remove stderr spam when using salt-cloud with libvirt -- **PR** `#43702`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-09-25T01:26:20Z* +* **PR** `#43702`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-09-25 01:26:20 UTC* * 437ac03801 Merge pull request `#43702`_ from rallytime/merge-2017.7 + * 132b1b343b Merge branch '2017.7' into merge-2017.7 -- **PR** `#43681`_: (*terminalmage*) Backport the non-fileclient changes from PR 43518 to 2017.7 - @ *2017-09-22T19:27:25Z* +* **ISSUE** `#38971`_: (`morganwillcock`_) archive.extracted: lots of unnecessary file transferring, copying, and hashing (refs: `#43681`_, `#43518`_) + +* **PR** `#43681`_: (`terminalmage`_) Backport the non-fileclient changes from PR 43518 to 2017.7 + @ *2017-09-22 19:27:25 UTC* + + * **PR** `#43518`_: (`terminalmage`_) Reduce unnecessary file downloading in archive/file states (refs: `#43681`_) - - **ISSUE** `#38971`_: (*morganwillcock*) archive.extracted: lots of unnecessary file transferring, copying, and hashing - | refs: `#43681`_ `#43518`_ - - **PR** `#43518`_: (*terminalmage*) Reduce unnecessary file downloading in archive/file states - | refs: `#43681`_ * 47cd8723c6 Merge pull request `#43681`_ from terminalmage/issue38971-2017.7 + * 91edf865e2 Merge branch '2017.7' into issue38971-2017.7 * 84f34c93be Backport the non-fileclient changes from PR 43518 to 2017.7 -- **PR** `#43687`_: (*mkurtak*) yumpkg.py: install calls list_repo_pkgs only if wildcard is used in pkg name - @ *2017-09-22T19:23:18Z* +* **ISSUE** `#43396`_: (`mkurtak`_) yumpkg pkg.installed slowed down due to wildcard namig support (refs: `#43687`_) + +* **PR** `#43687`_: (`mkurtak`_) yumpkg.py: install calls list_repo_pkgs only if wildcard is used in pkg name + @ *2017-09-22 19:23:18 UTC* + + * 0a1c5185f5 Merge pull request `#43687`_ from mkurtak/fix-43396 - - **ISSUE** `#43396`_: (*mkurtak*) yumpkg pkg.installed slowed down due to wildcard namig support - | refs: `#43687`_ - * 0a1c5185f5 Merge pull request `#43687`_ from mkurtak/`fix-43396`_ * b1e64b11fb yumpkg.py: install calls list_repo_pkgs only if wildcard in pkg name is used -- **PR** `#43467`_: (*DmitryKuzmenko*) Bugs/43124 users regex - @ *2017-09-22T19:21:09Z* +* **ISSUE** `#43124`_: (`UtahDave`_) publisher_acl with regex on username not working and has no documentation (refs: `#43467`_) + +* **PR** `#43467`_: (`DmitryKuzmenko`_) Bugs/43124 users regex + @ *2017-09-22 19:21:09 UTC* - - **ISSUE** `#43124`_: (*UtahDave*) publisher_acl with regex on username not working and has no documentation - | refs: `#43467`_ * 3a79549af4 Merge pull request `#43467`_ from DSRCorporation/bugs/43124_users_regex + * 14bf2dd8ff Support regex in publisher_acl. * 9fe32f8b6e Regex support for user names in external_auth config. -- **PR** `#43670`_: (*DmitryKuzmenko*) Fix for `list` and `contains` redis cache logic. - @ *2017-09-22T17:56:58Z* +* **ISSUE** `#43381`_: (`V3XATI0N`_) Sharing minion data cache causes false errors in returns (refs: `#43670`_) + +* **PR** `#43670`_: (`DmitryKuzmenko`_) Fix for `list` and `contains` redis cache logic. + @ *2017-09-22 17:56:58 UTC* - - **ISSUE** `#43381`_: (*V3XATI0N*) Sharing minion data cache causes false errors in returns - | refs: `#43670`_ - - **PR** `#43648`_: (*rallytime*) Handle VPC/Subnet ID not found errors in boto_vpc module * 0e86266b93 Merge pull request `#43670`_ from DSRCorporation/bugs/43381_redis_cache_fix + * 1c979d5809 Update redis cache `contains` logic to use more efficient `sismember`. * 039d236948 Fixed `list` and `contains` redis cache logic. @@ -3535,33 +3615,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 54842b5012 Handle VPC/Subnet ID not found errors in boto_vpc module -- **PR** `#43697`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-09-22T17:31:09Z* +* **PR** `#43697`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-09-22 17:31:09 UTC* - - **ISSUE** `#42165`_: (*arount*) top_file_merging_strategy: merge does not works - | refs: `#43415`_ - - **ISSUE** `#2`_: (*thatch45*) salt job queries - - **PR** `#43677`_: (*terminalmage*) Fix RST headers for runners (2016.11 branch) - - **PR** `#43673`_: (*rallytime*) Back-port `#43652`_ to 2016.11 - - **PR** `#43672`_: (*rallytime*) Back-port `#43415`_ to 2016.11 - - **PR** `#43663`_: (*moio*) multiprocessing minion option: documentation fixes (develop) - | refs: `#43661`_ - - **PR** `#43661`_: (*moio*) multiprocessing minion option: documentation fixes (2016.11) - - **PR** `#43652`_: (*VertigoRay*) Salt Repo has Deb 9 and 8 - | refs: `#43673`_ - - **PR** `#43646`_: (*brejoc*) Added tests for pid-file deletion in DaemonMixIn - - **PR** `#43591`_: (*rallytime*) [2016.11] Merge forward from 2016.11.8 to 2016.11 - - **PR** `#43575`_: (*akissa*) Fix CSR not recreated if key changes - - **PR** `#43572`_: (*vutny*) cloud.action: list_nodes_min returns all EC2 instances - - **PR** `#43550`_: (*twangboy*) Fix preinstall script on OSX for 2016.11.8 - - **PR** `#43534`_: (*twangboy*) Fixes removal of double-quotes by shlex_split in winrepo for 2016.11 - - **PR** `#43508`_: (*rallytime*) Back-port `#43333`_ to 2016.11.8 - - **PR** `#43434`_: (*rallytime*) Add 2016.11.8 release notes - - **PR** `#43415`_: (*mattLLVW*) Fix env_order in state.py - | refs: `#43672`_ - - **PR** `#43333`_: (*damon-atkins*) Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug - | refs: `#43508`_ * aa47da35dd Merge pull request `#43697`_ from rallytime/merge-2017.7 + * cbae45bec4 Lint: Remove extra line at end of file * fca4e5563a Merge branch '2016.11' into '2017.7' @@ -3570,11 +3628,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * b1b4dafd39 Fix CSR not recreated if key changes - * 1d4fa48209 Merge pull request `#43672`_ from rallytime/`bp-43415`_ + * 1d4fa48209 Merge pull request `#43672`_ from rallytime/bp-43415 * 3fb42bc238 Fix env_order in state.py - * ff832ee607 Merge pull request `#43673`_ from rallytime/`bp-43652`_ + * ff832ee607 Merge pull request `#43673`_ from rallytime/bp-43652 * d91c47c6f0 Salt Repo has Deb 9 and 8 @@ -3606,13 +3664,13 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 1b0a4d39d2 Fix logic in `/etc/paths.d/salt` detection - * a648f75949 Merge pull request `#43508`_ from rallytime/`bp-43333`_ + * a648f75949 Merge pull request `#43508`_ from rallytime/bp-43333 * d4981a2717 Update doco * a7c8b9e048 Update win_pkg.py - * 1d6dc6fb72 Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed on the cli (`#2`_) + * 1d6dc6fb72 Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed on the cli (#2) * e7009877bc Merge pull request `#43434`_ from rallytime/2016.11.8-release-notes @@ -3622,50 +3680,56 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 21966e7ce8 cloud.action: list_nodes_min returns all instances -- **PR** `#43314`_: (*twangboy*) Fix `unit.utils.test_verify` for Windows - @ *2017-09-21T22:26:13Z* +* **PR** `#43314`_: (`twangboy`_) Fix `unit.utils.test_verify` for Windows + @ *2017-09-21 22:26:13 UTC* * e6dc4d64df Merge pull request `#43314`_ from twangboy/win_fix_unit.utils.test_verify + * 9ada7f626c Merge branch '2017.7' into win_fix_unit.utils.test_verify * c0dc3f73ef Use sys.platform instead of salt.utils to detect Windows * e496d28cbf Fix `unit.utils.test_verify` for Windows -- **PR** `#43680`_: (*vernondcole*) correct default value for salt.cache.Cache - @ *2017-09-21T20:09:36Z* +* **ISSUE** `#43599`_: (`vernondcole`_) Incorrect default for salt.cache.Cache() if opts does not define "cache" (refs: `#43680`_) + +* **PR** `#43680`_: (`vernondcole`_) correct default value for salt.cache.Cache + @ *2017-09-21 20:09:36 UTC* - - **ISSUE** `#43599`_: (*vernondcole*) Incorrect default for salt.cache.Cache() if opts does not define "cache" - | refs: `#43680`_ * ec34df2c27 Merge pull request `#43680`_ from vernondcole/fix-salt.cache.Cache-default + * 292f8c79b8 correct default value for salt.cache.Cache -- **PR** `#43530`_: (*twangboy*) Fixes removal of double-quotes by shlex_split in winrepo - @ *2017-09-21T18:04:48Z* +* **PR** `#43530`_: (`twangboy`_) Fixes removal of double-quotes by shlex_split in winrepo + @ *2017-09-21 18:04:48 UTC* * 99d9d784b1 Merge pull request `#43530`_ from twangboy/win_fix_pkg.install + * 7f59119f95 Merge branch '2017.7' into win_fix_pkg.install * f146399f7a Use posix=False for shlex.split -- **PR** `#43671`_: (*rallytime*) [2017.7] Merge forward from 2017.7.2 to 2017.7 - @ *2017-09-21T16:39:49Z* +* **PR** `#43671`_: (`rallytime`_) [2017.7] Merge forward from 2017.7.2 to 2017.7 + @ *2017-09-21 16:39:49 UTC* * 12b5e62d81 Merge pull request `#43671`_ from rallytime/merge-2017.7 + * a401166bd5 Merge branch '2017.7.2' into '2017.7' -- **PR** `#43676`_: (*terminalmage*) Fix RST headers for runners (2017.7 branch) - @ *2017-09-21T16:36:21Z* +* **PR** `#43676`_: (`terminalmage`_) Fix RST headers for runners (2017.7 branch) + @ *2017-09-21 16:36:21 UTC* * e3a2fbc2a3 Merge pull request `#43676`_ from terminalmage/runners-docs-2017.7 + * 9b74634b23 Fix badly-formatted RST in mattermost runner docstring * c0a79c70a4 Fix RST headers for runners (2017.7 branch) -- **PR** `#43235`_: (*brejoc*) Improve delete_deployment handling - @ *2017-09-20T21:33:33Z* +* **PR** `#43235`_: (`brejoc`_) Improve delete_deployment handling + @ *2017-09-20 21:33:33 UTC* * d02953ce6a Merge pull request `#43235`_ from brejoc/improve-async-operation-handling-in-kubernetes-module + * 4e8da3045f Fixed logic for windows fallback * 3b1cb884b9 Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module @@ -3698,75 +3762,83 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 32d7d34fe5 First simple draft for the deletion verification -- **PR** `#43554`_: (*twangboy*) Win fix chocolatey - @ *2017-09-20T16:06:18Z* +* **PR** `#43554`_: (`twangboy`_) Win fix chocolatey + @ *2017-09-20 16:06:18 UTC* * 73cb0c27b5 Merge pull request `#43554`_ from twangboy/win_fix_chocolatey + * e04acb6216 Merge branch '2017.7' into win_fix_chocolatey * 56be5c35eb Improve logic for handling chocolatey states * bcbf7b4e68 Add logic for test=True -- **PR** `#43625`_: (*gtmanfred*) results and columns are lists for mysql returns - @ *2017-09-20T15:42:59Z* +* **ISSUE** `#43598`_: (`davidvon`_) Passed invalid arguments to mysql.file_query: unsupported operand type(s) for +=: 'int' and 'tuple' (refs: `#43625`_) + +* **PR** `#43625`_: (`gtmanfred`_) results and columns are lists for mysql returns + @ *2017-09-20 15:42:59 UTC* - - **ISSUE** `#43598`_: (*davidvon*) Passed invalid arguments to mysql.file_query: unsupported operand type(s) for +=: 'int' and 'tuple' - | refs: `#43625`_ * ed7eeaaafb Merge pull request `#43625`_ from gtmanfred/2017.7 + * f84b50a06b results and columns are lists for mysql returns -- **PR** `#43587`_: (*rallytime*) Add reason to linux_acl state loading failure - @ *2017-09-19T16:26:51Z* +* **ISSUE** `#43560`_: (`smitelli`_) salt.states.linux_acl requires setfacl/getacl binaries but this is not obvious (refs: `#43587`_, `#43580`_) + +* **PR** `#43587`_: (`rallytime`_) Add reason to linux_acl state loading failure + @ *2017-09-19 16:26:51 UTC* + + * **PR** `#43580`_: (`garethgreenaway`_) Updating ACL module and state module documentation (refs: `#43587`_) - - **ISSUE** `#43560`_: (*smitelli*) salt.states.linux_acl requires setfacl/getacl binaries but this is not obvious - | refs: `#43580`_ `#43587`_ - - **PR** `#43580`_: (*garethgreenaway*) Updating ACL module and state module documentation - | refs: `#43587`_ * 1bda4832ef Merge pull request `#43587`_ from rallytime/fix-virtual + * e5297e3869 Add reason to linux_acl state loading failure -- **PR** `#43584`_: (*cachedout*) Enhance engines docs - @ *2017-09-18T20:40:57Z* +* **PR** `#43584`_: (`cachedout`_) Enhance engines docs + @ *2017-09-18 20:40:57 UTC* * 2e19533e3c Merge pull request `#43584`_ from cachedout/engines_doc_clarification + * 634536b0ff Merge branch '2017.7' into engines_doc_clarification * 1a619708c1 Enhance engines docs -- **PR** `#43519`_: (*terminalmage*) Fix incorrect handling of pkg virtual and os_family grain - @ *2017-09-18T20:35:01Z* +* **PR** `#43519`_: (`terminalmage`_) Fix incorrect handling of pkg virtual and os_family grain + @ *2017-09-18 20:35:01 UTC* * 50b134ef4c Merge pull request `#43519`_ from terminalmage/fix-aptpkg + * 0e3c447567 Fix incorrect handling of pkg virtual and os_family grain -- **PR** `#43520`_: (*clan*) _search_name is '' if acl type is other - @ *2017-09-18T20:33:51Z* +* **PR** `#43520`_: (`clan`_) _search_name is '' if acl type is other + @ *2017-09-18 20:33:51 UTC* * dd953f36ae Merge pull request `#43520`_ from clan/acl + * 54216177c1 _search_name is '' if acl type is other -- **PR** `#43561`_: (*wedge-jarrad*) Clean up doc formatting in selinux state & module - @ *2017-09-18T20:28:47Z* +* **PR** `#43561`_: (`wedge-jarrad`_) Clean up doc formatting in selinux state & module + @ *2017-09-18 20:28:47 UTC* * ad9663a7fc Merge pull request `#43561`_ from wedge-jarrad/selinux-doc-cleanup + * 1bd263cd51 Clean up doc formatting in selinux state & module -- **PR** `#43580`_: (*garethgreenaway*) Updating ACL module and state module documentation - | refs: `#43587`_ - @ *2017-09-18T20:11:26Z* +* **ISSUE** `#43560`_: (`smitelli`_) salt.states.linux_acl requires setfacl/getacl binaries but this is not obvious (refs: `#43587`_, `#43580`_) + +* **PR** `#43580`_: (`garethgreenaway`_) Updating ACL module and state module documentation (refs: `#43587`_) + @ *2017-09-18 20:11:26 UTC* - - **ISSUE** `#43560`_: (*smitelli*) salt.states.linux_acl requires setfacl/getacl binaries but this is not obvious - | refs: `#43580`_ `#43587`_ * cc3d9c1a01 Merge pull request `#43580`_ from garethgreenaway/43560_update_linux_acl_documentation + * e63fae4c91 Merge branch '2017.7' into 43560_update_linux_acl_documentation -- **PR** `#43523`_: (*skizunov*) Add back lost logic for multifunc_ordered - @ *2017-09-18T17:46:16Z* +* **PR** `#43523`_: (`skizunov`_) Add back lost logic for multifunc_ordered + @ *2017-09-18 17:46:16 UTC* + + * **PR** `#38168`_: (`skizunov`_) Add support for a multi-func job using same func more than once (refs: `#43523`_) - - **PR** `#38168`_: (*skizunov*) Add support for a multi-func job using same func more than once - | refs: `#43523`_ * bf7b23316f Merge pull request `#43523`_ from skizunov/develop2 + * fb579321a9 Add back lost logic for multifunc_ordered * 117a0ddbbc Updating the documentation to call out the requirement for the getfacl and setfacl binaries @@ -3777,24 +3849,26 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 5dba74d2cb Fix to module.run [WIP] -- **PR** `#43526`_: (*DmitryKuzmenko*) Forward events to all masters syndic connected to - @ *2017-09-18T16:54:46Z* +* **ISSUE** `#43447`_: (`UtahDave`_) When using Syndic with Multi Master the top level master doesn't reliably get returns from lower minion. (refs: `#43526`_) + +* **PR** `#43526`_: (`DmitryKuzmenko`_) Forward events to all masters syndic connected to + @ *2017-09-18 16:54:46 UTC* - - **ISSUE** `#43447`_: (*UtahDave*) When using Syndic with Multi Master the top level master doesn't reliably get returns from lower minion. - | refs: `#43526`_ * e29efecf4f Merge pull request `#43526`_ from DSRCorporation/bugs/43447_syndic_events_forwarding + * 64d6109654 Merge branch '2017.7' into bugs/43447_syndic_events_forwarding * 3b2a529385 Merge branch '2017.7' into bugs/43447_syndic_events_forwarding * 0e4a744d95 Forward events to all masters syndic connected to. -- **PR** `#43330`_: (*terminalmage*) Fix reactor regression + unify reactor config schema - @ *2017-09-18T16:46:11Z* +* **ISSUE** `#43077`_: (`Manoj2087`_) Issue with deleting key via wheel (refs: `#43330`_) + +* **PR** `#43330`_: (`terminalmage`_) Fix reactor regression + unify reactor config schema + @ *2017-09-18 16:46:11 UTC* - - **ISSUE** `#43077`_: (*Manoj2087*) Issue with deleting key via wheel - | refs: `#43330`_ * 56b671e087 Merge pull request `#43330`_ from terminalmage/issue43077 + * a7b4e1f782 Simplify client logic * b85c8510c7 Improve the reactor documentation @@ -3807,14 +3881,15 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 34b6c3b65f Un-deprecate passing kwargs outside of 'kwarg' param -- **PR** `#43505`_: (*rallytime*) Back-port `#43483`_ to 2017.7 - @ *2017-09-15T21:22:12Z* +* **ISSUE** `#33793`_: (`mstarostik`_) states.ssh_auth adds bogus newline before newly added keys (refs: `#43483`_) + +* **PR** `#43505`_: (`rallytime`_) Back-port `#43483`_ to 2017.7 + @ *2017-09-15 21:22:12 UTC* + + * **PR** `#43483`_: (`3add3287`_) Handle bogus newline before newly added keys (refs: `#43505`_) + + * 078d5d17de Merge pull request `#43505`_ from rallytime/bp-43483 - - **ISSUE** `#33793`_: (*mstarostik*) states.ssh_auth adds bogus newline before newly added keys - | refs: `#43483`_ - - **PR** `#43483`_: (*3add3287*) Handle bogus newline before newly added keys - | refs: `#43505`_ - * 078d5d17de Merge pull request `#43505`_ from rallytime/`bp-43483`_ * c68dd5b8a4 Lint: fix spacing * 406f61ac9a Fix indentation from tabs to spaces @@ -3823,36 +3898,22 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 6f6619242f Fix checking for newline on end of file by properly checking the last byte of the file if the file is non empty. -- **PR** `#43491`_: (*rallytime*) Back-port `#43465`_ to 2017.7 - @ *2017-09-15T18:24:47Z* +* **ISSUE** `#43464`_: (`psagers`_) acme.cert state: IOError on failure to create a new certificate (refs: `#43465`_) + +* **PR** `#43491`_: (`rallytime`_) Back-port `#43465`_ to 2017.7 + @ *2017-09-15 18:24:47 UTC* + + * **PR** `#43465`_: (`psagers`_) acme.cert: avoid IOError on failure. (refs: `#43491`_) + + * a6df3f2acc Merge pull request `#43491`_ from rallytime/bp-43465 - - **ISSUE** `#43464`_: (*psagers*) acme.cert state: IOError on failure to create a new certificate - | refs: `#43465`_ - - **PR** `#43465`_: (*psagers*) acme.cert: avoid IOError on failure. - | refs: `#43491`_ - * a6df3f2acc Merge pull request `#43491`_ from rallytime/`bp-43465`_ * 3118faca0a acme.cert: avoid IOError on failure. -- **PR** `#43492`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-09-15T18:23:49Z* +* **PR** `#43492`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-09-15 18:23:49 UTC* - - **ISSUE** `#43386`_: (*rajvidhimar*) Scheduler's job_kwargs not working as expected. - | refs: `#43442`_ `#43443`_ - - **ISSUE** `#43267`_: (*brejoc*) OSError - Can't delete PIDfile when not root - | refs: `#43366`_ - - **ISSUE** `#43223`_: (*rallytime*) Properly deprecate describe_route_table function in boto_vpc module - | refs: `#43445`_ - - **PR** `#43461`_: (*twangboy*) Add `/norestart` switch to vcredist install - - **PR** `#43456`_: (*rallytime*) Add Neon to version list - - **PR** `#43445`_: (*rallytime*) Bump deprecation warning for boto_vpc.describe_route_table - | refs: `#43456`_ `#43456`_ - - **PR** `#43442`_: (*garethgreenaway*) [2016.11] Fixes to scheduler __pub values in kwargs - - **PR** `#43441`_: (*meaksh*) Use $HOME to get the user home directory instead using '~' char - - **PR** `#43432`_: (*rallytime*) Back-port `#43419`_ to 2016.11 - - **PR** `#43419`_: (*gtmanfred*) make cache dirs when spm starts - | refs: `#43432`_ - - **PR** `#43366`_: (*brejoc*) Catching error when PIDfile cannot be deleted * 3620c15c9a Merge pull request `#43492`_ from rallytime/merge-2017.7 + * 4251ce5a27 Merge branch '2016.11' into '2017.7' * f2b86fa2db Merge pull request `#43461`_ from twangboy/win_norestart @@ -3887,56 +3948,62 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * c91cd1c6d9 Bump deprecation warning for boto_vpc.describe_route_table - * c57dc5f0e3 Merge pull request `#43432`_ from rallytime/`bp-43419`_ + * c57dc5f0e3 Merge pull request `#43432`_ from rallytime/bp-43419 * c471a29527 make cache dirs when spm starts -- **PR** `#43513`_: (*haam3r*) Issue `#43479`_ No runners.config in 2017.7 branch - @ *2017-09-15T14:58:27Z* +* **ISSUE** `#43479`_: (`haam3r`_) Mattermost runner failing to retrieve config values due to unavailable config runner (refs: `#43513`_) + +* **PR** `#43513`_: (`haam3r`_) Issue `#43479`_ No runners.config in 2017.7 branch + @ *2017-09-15 14:58:27 UTC* - - **ISSUE** `#43479`_: (*haam3r*) Mattermost runner failing to retrieve config values due to unavailable config runner - | refs: `#43513`_ * 8a90c7059b Merge pull request `#43513`_ from haam3r/2017.7 + * 58f7d051c9 Issue `#43479`_ No runners.config in 2017.7 branch -- **PR** `#43431`_: (*mattLLVW*) Fix /etc/hosts not being modified when hostname is changed - @ *2017-09-13T18:35:55Z* +* **ISSUE** `#42926`_: (`nixjdm`_) network.system not setting hostname in hosts file, preventing sudo. (refs: `#43431`_) + +* **PR** `#43431`_: (`mattLLVW`_) Fix /etc/hosts not being modified when hostname is changed + @ *2017-09-13 18:35:55 UTC* - - **ISSUE** `#42926`_: (*nixjdm*) network.system not setting hostname in hosts file, preventing sudo. - | refs: `#43431`_ * c3d9e2d9b2 Merge pull request `#43431`_ from mattLLVW/fix-hosts-deb + * c6320b1dff Merge branch '2017.7' into fix-hosts-deb * a3b2e19149 Fix /etc/hosts not being modified when hostname is changed -- **PR** `#43403`_: (*twangboy*) Proper timestamp conversion in `redis.lastsave` - @ *2017-09-12T21:18:06Z* +* **PR** `#43403`_: (`twangboy`_) Proper timestamp conversion in `redis.lastsave` + @ *2017-09-12 21:18:06 UTC* * a09f289fbb Merge pull request `#43403`_ from twangboy/win_fix_redismod + * f6da23e1aa Properly handle timestamp conversion -- **PR** `#43463`_: (*twangboy*) Add `/norestart` switch to vcredist installer - @ *2017-09-12T20:29:27Z* +* **PR** `#43463`_: (`twangboy`_) Add `/norestart` switch to vcredist installer + @ *2017-09-12 20:29:27 UTC* * 0eaa5acb72 Merge pull request `#43463`_ from twangboy/win_norestart_2017.7 + * 6984b8fd60 Add /norestart to vcredist installer -- **PR** `#43443`_: (*garethgreenaway*) [2017.7] Fixes to scheduler __pub values in kwargs - @ *2017-09-12T18:14:46Z* +* **ISSUE** `#43386`_: (`rajvidhimar`_) Scheduler's job_kwargs not working as expected. (refs: `#43443`_, `#43442`_) + +* **PR** `#43443`_: (`garethgreenaway`_) [2017.7] Fixes to scheduler __pub values in kwargs + @ *2017-09-12 18:14:46 UTC* - - **ISSUE** `#43386`_: (*rajvidhimar*) Scheduler's job_kwargs not working as expected. - | refs: `#43442`_ `#43443`_ * 2fc237a806 Merge pull request `#43443`_ from garethgreenaway/43386_2017_7_schedule_kwargs_pub + * a29a9855a6 Fixing typo. * 2681b7d3fa Merge branch '2017.7' into 43386_2017_7_schedule_kwargs_pub -- **PR** `#41547`_: (*mirceaulinic*) Override proxy minion opts with pillar data - @ *2017-09-11T21:47:51Z* +* **ISSUE** `#39775`_: (`mirceaulinic`_) Proxy `mine_interval` config ignored (refs: `#41547`_) + +* **PR** `#41547`_: (`mirceaulinic`_) Override proxy minion opts with pillar data + @ *2017-09-11 21:47:51 UTC* - - **ISSUE** `#39775`_: (*mirceaulinic*) Proxy `mine_interval` config ignored - | refs: `#41547`_ `#41547`_ * 5378ac7756 Merge pull request `#41547`_ from cloudflare/px_merge_pillar_opts + * aad39ba665 Document the new opts * cdc0d9674a Allow disabling the mines details merge @@ -3949,10 +4016,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * abab6fd91c Override minion opts with pillar data -- **PR** `#41943`_: (*twangboy*) Fix `unit.returners.test_local_cache` for Windows - @ *2017-09-11T21:34:03Z* +* **PR** `#41943`_: (`twangboy`_) Fix `unit.returners.test_local_cache` for Windows + @ *2017-09-11 21:34:03 UTC* * 08d102c869 Merge pull request `#41943`_ from twangboy/win_unit_test_local_cache + * 3777b34572 Merge branch '2017.7' into win_unit_test_local_cache * 35b79ecde6 Remove `cur` variable, use time.time() in comparison @@ -3961,35 +4029,25 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 844e3f65bc Fix unit tests for Windows -- **PR** `#43424`_: (*twangboy*) Fix `unit.modules.test_hosts` for Windows - @ *2017-09-11T21:28:41Z* +* **PR** `#43424`_: (`twangboy`_) Fix `unit.modules.test_hosts` for Windows + @ *2017-09-11 21:28:41 UTC* * 50ab79f0cb Merge pull request `#43424`_ from twangboy/win_unit_test_hosts + * 90dcf8287c Fix `unit.modules.test_hosts` for Windows -- **PR** `#42652`_: (*skizunov*) Fix loader.py's raw_mod() to look in all module dirs - @ *2017-09-11T19:43:48Z* +* **PR** `#42652`_: (`skizunov`_) Fix loader.py's raw_mod() to look in all module dirs + @ *2017-09-11 19:43:48 UTC* * 0f0ed5a093 Merge pull request `#42652`_ from skizunov/develop3 + * d82e406f15 Fix loader.py's raw_mod() to look in all module dirs -- **PR** `#43438`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-09-11T18:33:39Z* +* **PR** `#43438`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-09-11 18:33:39 UTC* - - **ISSUE** `#43387`_: (*aogier*) genesis.bootstrap debootstrap fails if no qemu specified - | refs: `#43390`_ - - **ISSUE** `#43338`_: (*LEMNX*) virtualenv never-download - | refs: `#43356`_ - - **ISSUE** `#43086`_: (*aogier*) pylint: Instance of 'tuple' has no 'extend' member (no-member) - | refs: `#43105`_ - - **ISSUE** `#2`_: (*thatch45*) salt job queries - - **PR** `#43390`_: (*aogier*) better qemu_static parameter mangle in deboostrap management, tests - - **PR** `#43356`_: (*gtmanfred*) never-download got readded - - **PR** `#43333`_: (*damon-atkins*) Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug - | refs: `#43508`_ - - **PR** `#43325`_: (*doesitblend*) mine_interval option is minutes not seconds - - **PR** `#43105`_: (*aogier*) groupadd module: string does not have attribute 'extend', plus homogeneous `cmd` parm building * ca091bc8a4 Merge pull request `#43438`_ from rallytime/merge-2017.7 + * ef7b4242c3 Merge branch '2016.11' into '2017.7' * 57cccd75d0 Merge pull request `#43390`_ from aogier/43387-genesis-qemu @@ -4030,16 +4088,17 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * c91fc14704 Merge branch '2016.11' into 2016.11 - * cb3af2bbbd Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed on the cli (`#2`_) + * cb3af2bbbd Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed on the cli (#2) * 42a118ff56 fixed cmd composition and unified his making across module * 3fd59ed369 Adding a small check to ensure we do not continue to populate kwargs with __pub_ items from the kwargs item. -- **PR** `#43320`_: (*twangboy*) Fix `unit.modules.test_alternatives` for Windows - @ *2017-09-11T17:28:00Z* +* **PR** `#43320`_: (`twangboy`_) Fix `unit.modules.test_alternatives` for Windows + @ *2017-09-11 17:28:00 UTC* * a9592dd3e2 Merge pull request `#43320`_ from twangboy/win_fix_alternatives + * a909813fa5 Remove unused import (lint) * 3ef8d714cb Fix unit tests to mock salt.utils.path.readlink @@ -4048,10 +4107,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 7c4460164b Fix alternatives for Windows -- **PR** `#43363`_: (*twangboy*) Fix `unit.modules.test_ini_manage` for Windows - @ *2017-09-11T17:10:31Z* +* **PR** `#43363`_: (`twangboy`_) Fix `unit.modules.test_ini_manage` for Windows + @ *2017-09-11 17:10:31 UTC* * 9b89e49846 Merge pull request `#43363`_ from twangboy/scratch_ini_tests + * a94319a082 Make sure formatting of TEST_FILE_CONTENT matches original * 6263bc8983 Remove print statement @@ -4060,69 +4120,53 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 85997391f1 Is this handled the same on Linux and Windows -- **PR** `#43421`_: (*gtmanfred*) Revert "Reduce fileclient.get_file latency by merging _file_find and … - @ *2017-09-11T17:07:18Z* +* **PR** `#43421`_: (`gtmanfred`_) Revert "Reduce fileclient.get_file latency by merging _file_find and … + @ *2017-09-11 17:07:18 UTC* * 673ce387c1 Merge pull request `#43421`_ from gtmanfred/compat + * f85bf8c18f Revert "Reduce fileclient.get_file latency by merging _file_find and _file_hash" -- **PR** `#43415`_: (*mattLLVW*) Fix env_order in state.py - | refs: `#43672`_ - @ *2017-09-11T15:18:08Z* +* **ISSUE** `#42165`_: (`arount`_) top_file_merging_strategy: merge does not works (refs: `#43415`_) + +* **PR** `#43415`_: (`mattLLVW`_) Fix env_order in state.py (refs: `#43672`_) + @ *2017-09-11 15:18:08 UTC* - - **ISSUE** `#42165`_: (*arount*) top_file_merging_strategy: merge does not works - | refs: `#43415`_ * 47d982fd37 Merge pull request `#43415`_ from mattLLVW/fix-env-order + * f6313a1b2c Merge branch '2017.7' into fix-env-order * e93a962980 Fix env_order in state.py -- **PR** `#43422`_: (*twangboy*) Fix `unit.cloud.clouds.test_ec2` for Windows - @ *2017-09-11T15:17:20Z* +* **PR** `#43422`_: (`twangboy`_) Fix `unit.cloud.clouds.test_ec2` for Windows + @ *2017-09-11 15:17:20 UTC* * e89e23a32e Merge pull request `#43422`_ from twangboy/win_unit_cloud_ec2 + * 1379627334 Fix `unit.cloud.clouds.test_ec2` for Windows -- **PR** `#43423`_: (*twangboy*) Fix `unit.modules.test_gem` for Windows - @ *2017-09-11T15:15:28Z* +* **PR** `#43423`_: (`twangboy`_) Fix `unit.modules.test_gem` for Windows + @ *2017-09-11 15:15:28 UTC* * 54f833ac59 Merge pull request `#43423`_ from twangboy/win_unit_test_gem + * b2cea18d13 Fix `unit.modules.test_gem` for Windows -- **PR** `#43419`_: (*gtmanfred*) make cache dirs when spm starts - | refs: `#43432`_ - @ *2017-09-11T13:42:50Z* +* **PR** `#43419`_: (`gtmanfred`_) make cache dirs when spm starts (refs: `#43432`_) + @ *2017-09-11 13:42:50 UTC* * b3116109e5 Merge pull request `#43419`_ from gtmanfred/2017.7 + * 58378866e5 make cache dirs when spm starts -- **PR** `#43371`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-09-08T15:39:12Z* +* **PR** `#43371`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-09-08 15:39:12 UTC* - - **ISSUE** `#43348`_: (*9maf4you*) network.managed doesn't work on CentOS 7 - | refs: `#43359`_ - - **ISSUE** `#43295`_: (*V3XATI0N*) salt.cache.redis_cache does not actually work. - | refs: `#43329`_ - - **ISSUE** `#35840`_: (*junovitch*) preserve_minion_cache is broken in 2016.3+ - | refs: `#42903`_ `#42903`_ - - **PR** `#43361`_: (*rallytime*) Back-port `#43329`_ to 2016.11 - - **PR** `#43360`_: (*terminalmage*) Fix failing tests in Fedora - - **PR** `#43359`_: (*gtmanfred*) ipaddr_start ipaddr_end for el7 - - **PR** `#43329`_: (*johnj*) Fix `#43295`_, better handling of consul initialization - | refs: `#43361`_ - - **PR** `#43247`_: (*rallytime*) Back-port various mention bot settings to 2016.11 - - **PR** `#43244`_: (*rallytime*) Update release branch section with a few more details - - **PR** `#43206`_: (*rallytime*) Always notify tkwilliams when changes occur on boto files - | refs: `#43247`_ - - **PR** `#43183`_: (*basepi*) Add basepi to userBlacklist for mention bot - | refs: `#43247`_ - - **PR** `#42923`_: (*rallytime*) Always notify ryan-lane when changes occur on boto files - | refs: `#43247`_ - - **PR** `#42903`_: (*junovitch*) Fix 'preserve_minion_cache: True' functionality (fixes `#35840`_) * 9b27473763 Merge pull request `#43371`_ from rallytime/merge-2017.7 + * 7b07b58396 Merge branch '2016.11' into '2017.7' - * 0c986f5eba Merge pull request `#43361`_ from rallytime/`bp-43329`_ + * 0c986f5eba Merge pull request `#43361`_ from rallytime/bp-43329 * b09e5b4379 Fix `#43295`_, better handling of consul initialization issues @@ -4156,80 +4200,89 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * bad8f56969 Always notify ryan-lane when changes occur on boto files -- **PR** `#43398`_: (*twangboy*) Fix `unit.modules.test_mount` for Windows - @ *2017-09-08T13:39:29Z* +* **PR** `#43398`_: (`twangboy`_) Fix `unit.modules.test_mount` for Windows + @ *2017-09-08 13:39:29 UTC* * 97f05ff603 Merge pull request `#43398`_ from twangboy/win_fix_test_mount + * 4a8d7e522c Fix tests, Use full path to salt.utils.which -- **PR** `#43399`_: (*twangboy*) Fix `unit.modules.test_pam` for Windows - @ *2017-09-08T13:37:50Z* +* **PR** `#43399`_: (`twangboy`_) Fix `unit.modules.test_pam` for Windows + @ *2017-09-08 13:37:50 UTC* * 6a4cc5c1b0 Merge pull request `#43399`_ from twangboy/win_fix_test_pam + * 6257aa964a Fix `unit.modules.test_pam` for Windows -- **PR** `#43400`_: (*twangboy*) Fix `unit.modules.test_parted` for Windows - @ *2017-09-08T13:37:00Z* +* **PR** `#43400`_: (`twangboy`_) Fix `unit.modules.test_parted` for Windows + @ *2017-09-08 13:37:00 UTC* * 2b5cfae3f8 Merge pull request `#43400`_ from twangboy/win_unit_test_parted + * 8e3e897ee2 Fix `unit.modules.test_parted` for Windows -- **PR** `#43401`_: (*twangboy*) Fix `unit.modules.test_pw_group` for Windows - @ *2017-09-08T13:35:45Z* +* **PR** `#43401`_: (`twangboy`_) Fix `unit.modules.test_pw_group` for Windows + @ *2017-09-08 13:35:45 UTC* * 332deeb013 Merge pull request `#43401`_ from twangboy/win_unit_test_pw_group + * 78e39a1b9d Fix `unit.modules.test_pw_group` for Windows -- **PR** `#43402`_: (*twangboy*) Fix `unit.modules.test_qemu_nbd` for Windows - @ *2017-09-08T13:34:58Z* +* **PR** `#43402`_: (`twangboy`_) Fix `unit.modules.test_qemu_nbd` for Windows + @ *2017-09-08 13:34:58 UTC* * c0f54bfef1 Merge pull request `#43402`_ from twangboy/win_unit_test_qemu_nbd + * 531ce8022b Fix `unit.modules.test_qemu_nbd` for Windows -- **PR** `#43404`_: (*twangboy*) Fix `unit.modules.test_seed` for Windows - @ *2017-09-08T13:32:41Z* +* **PR** `#43404`_: (`twangboy`_) Fix `unit.modules.test_seed` for Windows + @ *2017-09-08 13:32:41 UTC* * be88fbb45f Merge pull request `#43404`_ from twangboy/win_unit_test_seed + * 6ceb895a84 Use os.path.join for paths -- **PR** `#43301`_: (*twangboy*) Fix `unit.test_spm` for Windows - @ *2017-09-08T13:24:35Z* +* **PR** `#43301`_: (`twangboy`_) Fix `unit.test_spm` for Windows + @ *2017-09-08 13:24:35 UTC* * 612c6a8756 Merge pull request `#43301`_ from twangboy/win_fix_unit_test_spm + * 8608a6b303 Merge branch '2017.7' into win_fix_unit_test_spm * b8da04c04d Add Mike's changes * f36efbd6a7 Fix `unit.test_spm` for Windows -- **PR** `#43372`_: (*skizunov*) Fix system.set_system_time when no hw clock is present - @ *2017-09-07T17:45:33Z* +* **PR** `#43372`_: (`skizunov`_) Fix system.set_system_time when no hw clock is present + @ *2017-09-07 17:45:33 UTC* * f959113694 Merge pull request `#43372`_ from skizunov/develop5 + * 281e471853 Fix system.set_system_time when no hw clock is present -- **PR** `#43193`_: (*jettero*) Prevent spurious "Template does not exist" error - @ *2017-09-06T20:16:58Z* +* **PR** `#43193`_: (`jettero`_) Prevent spurious "Template does not exist" error + @ *2017-09-06 20:16:58 UTC* + + * **PR** `#39516`_: (`jettero`_) Prevent spurious "Template does not exist" error (refs: `#43193`_) - - **PR** `#39516`_: (*jettero*) Prevent spurious "Template does not exist" error - | refs: `#43193`_ * 6d13535ed0 Merge pull request `#43193`_ from jettero/template-dne-again + * cde8aed2cf Merge branch '2017.7' into template-dne-again -- **PR** `#43159`_: (*jubrad*) Bp 43018 - @ *2017-09-05T22:29:16Z* +* **ISSUE** `#42706`_: (`blarghmatey`_) Parallel Cache Failure (refs: `#43018`_, `#43159`_) - - **ISSUE** `#42706`_: (*blarghmatey*) Parallel Cache Failure - | refs: `#43018`_ `#43159`_ - - **PR** `#43172`_: (*rallytime*) Move new utils/__init__.py funcs to utils.files.py - - **PR** `#43056`_: (*damon-atkins*) safe_filename_leaf(file_basename) and safe_filepath(file_path_name) - | refs: `#43159`_ `#43172`_ - - **PR** `#43018`_: (*jubrad*) Update state.py - | refs: `#43159`_ `#43727`_ - * 015cbc57d9 Merge pull request `#43159`_ from jubrad/`bp-43018`_ - * 25419a56db Merge branch '2017.7' into `bp-43018`_ +* **PR** `#43159`_: (`jubrad`_) Bp 43018 + @ *2017-09-05 22:29:16 UTC* - * 971b4c0890 Merge branch '2017.7' into `bp-43018`_ + * **PR** `#43056`_: (`damon-atkins`_) safe_filename_leaf(file_basename) and safe_filepath(file_path_name) (refs: `#43159`_, `#43172`_) + + * **PR** `#43018`_: (`jubrad`_) Update state.py (refs: `#43159`_, `#43727`_) + + * 015cbc57d9 Merge pull request `#43159`_ from jubrad/bp-43018 + + * 25419a56db Merge branch '2017.7' into bp-43018 + + * 971b4c0890 Merge branch '2017.7' into bp-43018 * 4f8e6c65e5 access safe_filename_leaf through utils.files, changed in `#43172`_ @@ -4245,35 +4298,34 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 1dcf167bb7 Update state.py -- **PR** `#43232`_: (*terminalmage*) Improve inheritance in salt.utils.gitfs - @ *2017-09-05T20:37:06Z* +* **PR** `#43232`_: (`terminalmage`_) Improve inheritance in salt.utils.gitfs + @ *2017-09-05 20:37:06 UTC* * 6e1b541b46 Merge pull request `#43232`_ from terminalmage/gitfs-inheritance + * 53bd3a3e23 Improve inheritance in salt.utils.gitfs -- **PR** `#43238`_: (*s0undt3ch*) Include the line number by default on the log file format - @ *2017-09-05T20:31:54Z* +* **PR** `#43238`_: (`s0undt3ch`_) Include the line number by default on the log file format + @ *2017-09-05 20:31:54 UTC* * 086b220091 Merge pull request `#43238`_ from s0undt3ch/2017.7 + * 630a1db3ab Include the line number by default on the log file format -- **PR** `#43294`_: (*twangboy*) Win build scripts - @ *2017-09-05T20:12:54Z* +* **PR** `#43294`_: (`twangboy`_) Win build scripts + @ *2017-09-05 20:12:54 UTC* * 09dc58cde5 Merge pull request `#43294`_ from twangboy/win_build_scripts + * 9979ccb613 Remove Py2 and Py3 in the same run * a5d9f85db6 Modifications to build scripts -- **PR** `#43322`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-09-05T18:21:26Z* +* **PR** `#43322`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-09-05 18:21:26 UTC* - - **PR** `#43312`_: (*lordcirth*) cron docs: Remind user to use quotes for special strings - - **PR** `#43290`_: (*lordcirth*) Clarify file.py docs - - **PR** `#43277`_: (*rallytime*) Add CODEOWNERS file - - **PR** `#43274`_: (*terminalmage*) Use six.integer_types instead of int - - **PR** `#43271`_: (*twangboy*) Fix minor formatting issue * 21ab306ef4 Merge pull request `#43322`_ from rallytime/merge-2017.7 + * b1062f8c15 Merge branch '2016.11' into '2017.7' * 02867fdcd2 Merge pull request `#43277`_ from rallytime/owners-file @@ -4298,31 +4350,27 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 91b062f564 Fix formatting issue, spaces surrounding + -- **PR** `#43324`_: (*twangboy*) Fix `unit.modules.test_chef` for Windows - @ *2017-09-05T16:40:11Z* +* **PR** `#43324`_: (`twangboy`_) Fix `unit.modules.test_chef` for Windows + @ *2017-09-05 16:40:11 UTC* * 62429c547d Merge pull request `#43324`_ from twangboy/fix_unit.modules.test_chef + * 5bd5ea042a Fix `unit.modules.test_chef` for Windows -- **PR** `#43268`_: (*rallytime*) Back-port `#43237`_ to 2017.7 - @ *2017-09-01T18:17:13Z* +* **PR** `#43268`_: (`rallytime`_) Back-port `#43237`_ to 2017.7 + @ *2017-09-01 18:17:13 UTC* + + * **PR** `#43237`_: (`timka`_) .utils.aws.get_location() expects a dict (refs: `#43268`_) + + * 367668a0a3 Merge pull request `#43268`_ from rallytime/bp-43237 - - **PR** `#43237`_: (*timka*) .utils.aws.get_location() expects a dict - | refs: `#43268`_ - * 367668a0a3 Merge pull request `#43268`_ from rallytime/`bp-43237`_ * 047ad07da4 .utils.aws.get_location() expects a dict -- **PR** `#43270`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2017-09-01T18:09:46Z* +* **PR** `#43270`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2017-09-01 18:09:46 UTC* - - **ISSUE** `#42279`_: (*dafyddj*) win_lgpo matches multiple policies due to startswith() - | refs: `#43116`_ `#43116`_ `#43154`_ - - **PR** `#43228`_: (*twangboy*) Win fix pkg.install - - **PR** `#43191`_: (*viktorkrivak*) Fix apache.config with multiple statement - - **PR** `#43154`_: (*lomeroe*) Backport `#43116`_ to 2016.11 - - **PR** `#43116`_: (*lomeroe*) Fix 42279 in develop - | refs: `#43154`_ * 02504dd363 Merge pull request `#43270`_ from rallytime/merge-2017.7 + * f8b025f6dc Merge branch '2016.11' into '2017.7' * 3a0b02f3ae Merge pull request `#43228`_ from twangboy/win_fix_pkg.install @@ -4343,7 +4391,7 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * 4164047951 Fix apache.config with multiple statement At this moment when you post more than one statement in config only last is used. Also file is rewrited multiple times until last statement is written. Example: salt '*' apache.config /etc/httpd/conf.d/ports.conf config="[{'Listen': '8080'}, {'Proxy': "Something"}]" Ends only with Proxy Something and ignore Listen 8080, This patch fix this issue. - * b90e59ede9 Merge pull request `#43154`_ from lomeroe/`bp-43116`_-2016.11 + * b90e59ede9 Merge pull request `#43154`_ from lomeroe/bp-43116-2016.11 * 8f593b0b02 verify that files exist before trying to remove them, win_file.remove raises an exception if the file does not exist @@ -4357,58 +4405,65 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * f232bed9f9 add additional checks for ADM policies that have the same ADMX policy ID (`#42279`_) -- **PR** `#43283`_: (*DmitryKuzmenko*) Fix ldap token groups auth. - @ *2017-09-01T17:49:46Z* +* **ISSUE** `#42459`_: (`iavael`_) Broken ldap groups retrieval in salt.auth.ldap after upgrade to 2017.7 (refs: `#43283`_) + +* **PR** `#43283`_: (`DmitryKuzmenko`_) Fix ldap token groups auth. + @ *2017-09-01 17:49:46 UTC* - - **ISSUE** `#42459`_: (*iavael*) Broken ldap groups retrieval in salt.auth.ldap after upgrade to 2017.7 - | refs: `#43283`_ * ece0e393ef Merge pull request `#43283`_ from DSRCorporation/bugs/42459_broken_ldap_groups + * 3ad6911210 Fix for tests: don't require 'groups' in the eauth token. * 1f104cf85b Fix ldap token groups auth. -- **PR** `#43149`_: (*BenoitKnecht*) Fix iptables.get_rules when rules contain --nfmask or --ctmask - @ *2017-09-01T15:57:05Z* +* **PR** `#43149`_: (`BenoitKnecht`_) Fix iptables.get_rules when rules contain --nfmask or --ctmask + @ *2017-09-01 15:57:05 UTC* * 4f023c4cb6 Merge pull request `#43149`_ from BenoitKnecht/2017.7.1 + * 3c1ddc9bde modules: iptables: correctly parse `--nfmask`/`--ctmask` -- **PR** `#43265`_: (*gtmanfred*) make sure meta-data grains work on ec2 - @ *2017-09-01T15:31:12Z* +* **ISSUE** `#43258`_: (`nomeelnoj`_) metadata_server_grains problems (refs: `#43265`_) + +* **PR** `#43265`_: (`gtmanfred`_) make sure meta-data grains work on ec2 + @ *2017-09-01 15:31:12 UTC* - - **ISSUE** `#43258`_: (*nomeelnoj*) metadata_server_grains problems - | refs: `#43265`_ * cf2b75bb86 Merge pull request `#43265`_ from gtmanfred/2017.7 + * 04dd8ebedb make sure meta-data grains work on ec2 -- **PR** `#43299`_: (*twangboy*) Fix `unit.netapi.rest_cherrypy.test_tools` for Windows - @ *2017-09-01T15:13:43Z* +* **PR** `#43299`_: (`twangboy`_) Fix `unit.netapi.rest_cherrypy.test_tools` for Windows + @ *2017-09-01 15:13:43 UTC* * 618b221895 Merge pull request `#43299`_ from twangboy/win_fix_netapi_cherrypy + * fd74acb603 Merge branch '2017.7' into win_fix_netapi_cherrypy -- **PR** `#43300`_: (*twangboy*) Fix `unit.netapi.rest_tornado.test_handlers` for Windows - @ *2017-09-01T13:10:11Z* +* **PR** `#43300`_: (`twangboy`_) Fix `unit.netapi.rest_tornado.test_handlers` for Windows + @ *2017-09-01 13:10:11 UTC* * aee654da92 Merge pull request `#43300`_ from twangboy/win_fix_netapi_rest_tornado + * c93d2ed386 Use os.sep instead of '/' * 3fbf24b91a Use os.sep instead of '/' -- **PR** `#43278`_: (*gtmanfred*) bootstrap can come from dunders - @ *2017-08-31T13:31:20Z* +* **ISSUE** `#43259`_: (`mahesh21`_) NameError: global name '__opts__' is not defined (refs: `#43266`_) + +* **PR** `#43278`_: (`gtmanfred`_) bootstrap can come from dunders + @ *2017-08-31 13:31:20 UTC* + + * **PR** `#43266`_: (`gtmanfred`_) switch virtualbox cloud driver to use __utils__ (refs: `#43278`_) - - **ISSUE** `#43259`_: (*mahesh21*) NameError: global name '__opts__' is not defined - | refs: `#43266`_ - - **PR** `#43266`_: (*gtmanfred*) switch virtualbox cloud driver to use __utils__ - | refs: `#43278`_ * aed2975979 Merge pull request `#43278`_ from gtmanfred/virtualbox + * c4ae2de30f bootstrap can come from dunders -- **PR** `#42975`_: (*brejoc*) Added unit tests for Kubernetes module - @ *2017-08-30T20:30:16Z* +* **PR** `#42975`_: (`brejoc`_) Added unit tests for Kubernetes module + @ *2017-08-30 20:30:16 UTC* * 479e0e06ac Merge pull request `#42975`_ from brejoc/tests-for-kubernetes-module + * fdad9177b5 Merge branch '2017.7' into tests-for-kubernetes-module * c227cb25ad Skipping test on ImportError @@ -4421,45 +4476,32 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' * c8e98c8d8a Added unit tests for Kubernetes module -- **PR** `#43176`_: (*terminalmage*) docker_image states: Handle Hub images prefixed with "docker.io/" - @ *2017-08-30T20:08:13Z* +* **ISSUE** `#42935`_: (`BenjaminSchubert`_) docker_image.present always ends up failing even on correct result. (refs: `#43176`_) + +* **PR** `#43176`_: (`terminalmage`_) docker_image states: Handle Hub images prefixed with "docker.io/" + @ *2017-08-30 20:08:13 UTC* - - **ISSUE** `#42935`_: (*BenjaminSchubert*) docker_image.present always ends up failing even on correct result. - | refs: `#43176`_ * ca7df1d4cf Merge pull request `#43176`_ from terminalmage/issue42935 + * df18a89836 Lint: Remove unused import * 7279f98e92 docker_image states: Handle Hub images prefixed with "docker.io/" * f7c945f6e4 Prevent spurious "Template does not exist" error - -.. _`#1`: https://github.com/saltstack/salt/issues/1 -.. _`#10`: https://github.com/saltstack/salt/issues/10 .. _`#10582`: https://github.com/saltstack/salt/issues/10582 -.. _`#11`: https://github.com/saltstack/salt/issues/11 -.. _`#17`: https://github.com/saltstack/salt/issues/17 .. _`#19532`: https://github.com/saltstack/salt/issues/19532 -.. _`#2`: https://github.com/saltstack/salt/issues/2 -.. _`#2015`: https://github.com/saltstack/salt/pull/2015 -.. _`#2017`: https://github.com/saltstack/salt/pull/2017 -.. _`#2291`: https://github.com/saltstack/salt/issues/2291 .. _`#23454`: https://github.com/saltstack/salt/issues/23454 .. _`#27160`: https://github.com/saltstack/salt/issues/27160 .. _`#30454`: https://github.com/saltstack/salt/issues/30454 .. _`#30481`: https://github.com/saltstack/salt/pull/30481 -.. _`#31405`: https://github.com/saltstack/salt/issues/31405 .. _`#33115`: https://github.com/saltstack/salt/pull/33115 .. _`#33793`: https://github.com/saltstack/salt/issues/33793 -.. _`#33806`: https://github.com/saltstack/salt/pull/33806 .. _`#33957`: https://github.com/saltstack/salt/issues/33957 -.. _`#35523`: https://github.com/saltstack/salt/issues/35523 -.. _`#35777`: https://github.com/saltstack/salt/issues/35777 .. _`#35840`: https://github.com/saltstack/salt/issues/35840 .. _`#36153`: https://github.com/saltstack/salt/issues/36153 .. _`#38168`: https://github.com/saltstack/salt/pull/38168 .. _`#38289`: https://github.com/saltstack/salt/pull/38289 -.. _`#38367`: https://github.com/saltstack/salt/issues/38367 .. _`#38452`: https://github.com/saltstack/salt/issues/38452 .. _`#38554`: https://github.com/saltstack/salt/pull/38554 .. _`#38971`: https://github.com/saltstack/salt/issues/38971 @@ -4468,14 +4510,10 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#39552`: https://github.com/saltstack/salt/issues/39552 .. _`#39775`: https://github.com/saltstack/salt/issues/39775 .. _`#39901`: https://github.com/saltstack/salt/issues/39901 -.. _`#4`: https://github.com/saltstack/salt/issues/4 -.. _`#40311`: https://github.com/saltstack/salt/issues/40311 .. _`#40620`: https://github.com/saltstack/salt/pull/40620 .. _`#40630`: https://github.com/saltstack/salt/pull/40630 .. _`#41044`: https://github.com/saltstack/salt/issues/41044 .. _`#41279`: https://github.com/saltstack/salt/pull/41279 -.. _`#41286`: https://github.com/saltstack/salt/issues/41286 -.. _`#41305`: https://github.com/saltstack/salt/pull/41305 .. _`#41474`: https://github.com/saltstack/salt/issues/41474 .. _`#41547`: https://github.com/saltstack/salt/pull/41547 .. _`#41869`: https://github.com/saltstack/salt/issues/41869 @@ -4485,7 +4523,6 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#42036`: https://github.com/saltstack/salt/pull/42036 .. _`#42064`: https://github.com/saltstack/salt/pull/42064 .. _`#42074`: https://github.com/saltstack/salt/issues/42074 -.. _`#42082`: https://github.com/saltstack/salt/issues/42082 .. _`#42165`: https://github.com/saltstack/salt/issues/42165 .. _`#42279`: https://github.com/saltstack/salt/issues/42279 .. _`#42300`: https://github.com/saltstack/salt/issues/42300 @@ -4493,23 +4530,18 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#42459`: https://github.com/saltstack/salt/issues/42459 .. _`#42568`: https://github.com/saltstack/salt/issues/42568 .. _`#42652`: https://github.com/saltstack/salt/pull/42652 -.. _`#42655`: https://github.com/saltstack/salt/pull/42655 .. _`#42676`: https://github.com/saltstack/salt/issues/42676 .. _`#42706`: https://github.com/saltstack/salt/issues/42706 .. _`#42713`: https://github.com/saltstack/salt/issues/42713 .. _`#42763`: https://github.com/saltstack/salt/issues/42763 .. _`#42903`: https://github.com/saltstack/salt/pull/42903 -.. _`#42923`: https://github.com/saltstack/salt/pull/42923 .. _`#42926`: https://github.com/saltstack/salt/issues/42926 .. _`#42935`: https://github.com/saltstack/salt/issues/42935 -.. _`#42947`: https://github.com/saltstack/salt/issues/42947 .. _`#42975`: https://github.com/saltstack/salt/pull/42975 .. _`#43018`: https://github.com/saltstack/salt/pull/43018 .. _`#43056`: https://github.com/saltstack/salt/pull/43056 .. _`#43077`: https://github.com/saltstack/salt/issues/43077 -.. _`#43086`: https://github.com/saltstack/salt/issues/43086 .. _`#43105`: https://github.com/saltstack/salt/pull/43105 -.. _`#43116`: https://github.com/saltstack/salt/pull/43116 .. _`#43124`: https://github.com/saltstack/salt/issues/43124 .. _`#43130`: https://github.com/saltstack/salt/issues/43130 .. _`#43149`: https://github.com/saltstack/salt/pull/43149 @@ -4517,12 +4549,9 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#43159`: https://github.com/saltstack/salt/pull/43159 .. _`#43172`: https://github.com/saltstack/salt/pull/43172 .. _`#43176`: https://github.com/saltstack/salt/pull/43176 -.. _`#43183`: https://github.com/saltstack/salt/pull/43183 .. _`#43187`: https://github.com/saltstack/salt/issues/43187 .. _`#43191`: https://github.com/saltstack/salt/pull/43191 .. _`#43193`: https://github.com/saltstack/salt/pull/43193 -.. _`#43206`: https://github.com/saltstack/salt/pull/43206 -.. _`#43223`: https://github.com/saltstack/salt/issues/43223 .. _`#43228`: https://github.com/saltstack/salt/pull/43228 .. _`#43232`: https://github.com/saltstack/salt/pull/43232 .. _`#43235`: https://github.com/saltstack/salt/pull/43235 @@ -4534,7 +4563,6 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#43259`: https://github.com/saltstack/salt/issues/43259 .. _`#43265`: https://github.com/saltstack/salt/pull/43265 .. _`#43266`: https://github.com/saltstack/salt/pull/43266 -.. _`#43267`: https://github.com/saltstack/salt/issues/43267 .. _`#43268`: https://github.com/saltstack/salt/pull/43268 .. _`#43270`: https://github.com/saltstack/salt/pull/43270 .. _`#43271`: https://github.com/saltstack/salt/pull/43271 @@ -4555,12 +4583,9 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#43322`: https://github.com/saltstack/salt/pull/43322 .. _`#43324`: https://github.com/saltstack/salt/pull/43324 .. _`#43325`: https://github.com/saltstack/salt/pull/43325 -.. _`#43329`: https://github.com/saltstack/salt/pull/43329 .. _`#43330`: https://github.com/saltstack/salt/pull/43330 .. _`#43333`: https://github.com/saltstack/salt/pull/43333 -.. _`#43338`: https://github.com/saltstack/salt/issues/43338 .. _`#43340`: https://github.com/saltstack/salt/issues/43340 -.. _`#43348`: https://github.com/saltstack/salt/issues/43348 .. _`#43356`: https://github.com/saltstack/salt/pull/43356 .. _`#43359`: https://github.com/saltstack/salt/pull/43359 .. _`#43360`: https://github.com/saltstack/salt/pull/43360 @@ -4569,11 +4594,9 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#43366`: https://github.com/saltstack/salt/pull/43366 .. _`#43371`: https://github.com/saltstack/salt/pull/43371 .. _`#43372`: https://github.com/saltstack/salt/pull/43372 -.. _`#43373`: https://github.com/saltstack/salt/issues/43373 .. _`#43379`: https://github.com/saltstack/salt/pull/43379 .. _`#43381`: https://github.com/saltstack/salt/issues/43381 .. _`#43386`: https://github.com/saltstack/salt/issues/43386 -.. _`#43387`: https://github.com/saltstack/salt/issues/43387 .. _`#43390`: https://github.com/saltstack/salt/pull/43390 .. _`#43396`: https://github.com/saltstack/salt/issues/43396 .. _`#43398`: https://github.com/saltstack/salt/pull/43398 @@ -4633,7 +4656,6 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#43572`: https://github.com/saltstack/salt/pull/43572 .. _`#43575`: https://github.com/saltstack/salt/pull/43575 .. _`#43580`: https://github.com/saltstack/salt/pull/43580 -.. _`#43581`: https://github.com/saltstack/salt/issues/43581 .. _`#43584`: https://github.com/saltstack/salt/pull/43584 .. _`#43587`: https://github.com/saltstack/salt/pull/43587 .. _`#43591`: https://github.com/saltstack/salt/pull/43591 @@ -4642,16 +4664,12 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#43605`: https://github.com/saltstack/salt/issues/43605 .. _`#43625`: https://github.com/saltstack/salt/pull/43625 .. _`#43643`: https://github.com/saltstack/salt/issues/43643 -.. _`#43644`: https://github.com/saltstack/salt/pull/43644 .. _`#43646`: https://github.com/saltstack/salt/pull/43646 .. _`#43648`: https://github.com/saltstack/salt/pull/43648 -.. _`#43650`: https://github.com/saltstack/salt/issues/43650 -.. _`#43652`: https://github.com/saltstack/salt/pull/43652 .. _`#43656`: https://github.com/saltstack/salt/pull/43656 .. _`#43658`: https://github.com/saltstack/salt/issues/43658 .. _`#43659`: https://github.com/saltstack/salt/issues/43659 .. _`#43661`: https://github.com/saltstack/salt/pull/43661 -.. _`#43663`: https://github.com/saltstack/salt/pull/43663 .. _`#43670`: https://github.com/saltstack/salt/pull/43670 .. _`#43671`: https://github.com/saltstack/salt/pull/43671 .. _`#43672`: https://github.com/saltstack/salt/pull/43672 @@ -4675,7 +4693,6 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#43723`: https://github.com/saltstack/salt/pull/43723 .. _`#43724`: https://github.com/saltstack/salt/pull/43724 .. _`#43727`: https://github.com/saltstack/salt/pull/43727 -.. _`#43729`: https://github.com/saltstack/salt/issues/43729 .. _`#43731`: https://github.com/saltstack/salt/pull/43731 .. _`#43732`: https://github.com/saltstack/salt/pull/43732 .. _`#43733`: https://github.com/saltstack/salt/pull/43733 @@ -4711,7 +4728,6 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#43830`: https://github.com/saltstack/salt/pull/43830 .. _`#43837`: https://github.com/saltstack/salt/pull/43837 .. _`#43840`: https://github.com/saltstack/salt/pull/43840 -.. _`#43841`: https://github.com/saltstack/salt/pull/43841 .. _`#43843`: https://github.com/saltstack/salt/pull/43843 .. _`#43844`: https://github.com/saltstack/salt/pull/43844 .. _`#43847`: https://github.com/saltstack/salt/pull/43847 @@ -4734,12 +4750,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#43916`: https://github.com/saltstack/salt/pull/43916 .. _`#43917`: https://github.com/saltstack/salt/pull/43917 .. _`#43918`: https://github.com/saltstack/salt/issues/43918 -.. _`#43920`: https://github.com/saltstack/salt/issues/43920 +.. _`#43920`: https://github.com/saltstack/salt/pull/43920 .. _`#43927`: https://github.com/saltstack/salt/pull/43927 .. _`#43932`: https://github.com/saltstack/salt/pull/43932 .. _`#43933`: https://github.com/saltstack/salt/pull/43933 .. _`#43934`: https://github.com/saltstack/salt/pull/43934 -.. _`#43936`: https://github.com/saltstack/salt/issues/43936 .. _`#43939`: https://github.com/saltstack/salt/pull/43939 .. _`#43943`: https://github.com/saltstack/salt/pull/43943 .. _`#43945`: https://github.com/saltstack/salt/issues/43945 @@ -4777,7 +4792,6 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#44029`: https://github.com/saltstack/salt/pull/44029 .. _`#44030`: https://github.com/saltstack/salt/pull/44030 .. _`#44031`: https://github.com/saltstack/salt/pull/44031 -.. _`#44034`: https://github.com/saltstack/salt/issues/44034 .. _`#44045`: https://github.com/saltstack/salt/pull/44045 .. _`#44051`: https://github.com/saltstack/salt/pull/44051 .. _`#44054`: https://github.com/saltstack/salt/pull/44054 @@ -4790,8 +4804,6 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#44080`: https://github.com/saltstack/salt/pull/44080 .. _`#44081`: https://github.com/saltstack/salt/pull/44081 .. _`#44083`: https://github.com/saltstack/salt/issues/44083 -.. _`#44087`: https://github.com/saltstack/salt/issues/44087 -.. _`#44089`: https://github.com/saltstack/salt/pull/44089 .. _`#44090`: https://github.com/saltstack/salt/pull/44090 .. _`#44092`: https://github.com/saltstack/salt/pull/44092 .. _`#44093`: https://github.com/saltstack/salt/pull/44093 @@ -4811,10 +4823,7 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#44133`: https://github.com/saltstack/salt/pull/44133 .. _`#44135`: https://github.com/saltstack/salt/pull/44135 .. _`#44136`: https://github.com/saltstack/salt/issues/44136 -.. _`#44140`: https://github.com/saltstack/salt/issues/44140 -.. _`#44150`: https://github.com/saltstack/salt/issues/44150 .. _`#44151`: https://github.com/saltstack/salt/pull/44151 -.. _`#44155`: https://github.com/saltstack/salt/issues/44155 .. _`#44157`: https://github.com/saltstack/salt/pull/44157 .. _`#44158`: https://github.com/saltstack/salt/pull/44158 .. _`#44160`: https://github.com/saltstack/salt/pull/44160 @@ -4823,7 +4832,6 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#44168`: https://github.com/saltstack/salt/pull/44168 .. _`#44171`: https://github.com/saltstack/salt/pull/44171 .. _`#44173`: https://github.com/saltstack/salt/pull/44173 -.. _`#44177`: https://github.com/saltstack/salt/pull/44177 .. _`#44181`: https://github.com/saltstack/salt/issues/44181 .. _`#44186`: https://github.com/saltstack/salt/pull/44186 .. _`#44187`: https://github.com/saltstack/salt/pull/44187 @@ -4855,7 +4863,6 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#44286`: https://github.com/saltstack/salt/pull/44286 .. _`#44287`: https://github.com/saltstack/salt/pull/44287 .. _`#44291`: https://github.com/saltstack/salt/pull/44291 -.. _`#44292`: https://github.com/saltstack/salt/issues/44292 .. _`#44293`: https://github.com/saltstack/salt/pull/44293 .. _`#44294`: https://github.com/saltstack/salt/pull/44294 .. _`#44295`: https://github.com/saltstack/salt/pull/44295 @@ -4866,7 +4873,6 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#44304`: https://github.com/saltstack/salt/pull/44304 .. _`#44311`: https://github.com/saltstack/salt/pull/44311 .. _`#44312`: https://github.com/saltstack/salt/pull/44312 -.. _`#44313`: https://github.com/saltstack/salt/issues/44313 .. _`#44314`: https://github.com/saltstack/salt/pull/44314 .. _`#44315`: https://github.com/saltstack/salt/issues/44315 .. _`#44316`: https://github.com/saltstack/salt/pull/44316 @@ -4887,13 +4893,10 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#44356`: https://github.com/saltstack/salt/pull/44356 .. _`#44358`: https://github.com/saltstack/salt/pull/44358 .. _`#44364`: https://github.com/saltstack/salt/pull/44364 -.. _`#44365`: https://github.com/saltstack/salt/issues/44365 -.. _`#44378`: https://github.com/saltstack/salt/issues/44378 .. _`#44383`: https://github.com/saltstack/salt/pull/44383 .. _`#44385`: https://github.com/saltstack/salt/pull/44385 .. _`#44408`: https://github.com/saltstack/salt/pull/44408 .. _`#44423`: https://github.com/saltstack/salt/issues/44423 -.. _`#44424`: https://github.com/saltstack/salt/pull/44424 .. _`#44427`: https://github.com/saltstack/salt/pull/44427 .. _`#44429`: https://github.com/saltstack/salt/pull/44429 .. _`#44434`: https://github.com/saltstack/salt/pull/44434 @@ -4921,16 +4924,13 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#44517`: https://github.com/saltstack/salt/pull/44517 .. _`#44518`: https://github.com/saltstack/salt/pull/44518 .. _`#44528`: https://github.com/saltstack/salt/pull/44528 -.. _`#44530`: https://github.com/saltstack/salt/issues/44530 .. _`#44531`: https://github.com/saltstack/salt/pull/44531 .. _`#44537`: https://github.com/saltstack/salt/pull/44537 .. _`#44538`: https://github.com/saltstack/salt/pull/44538 .. _`#44541`: https://github.com/saltstack/salt/pull/44541 -.. _`#44544`: https://github.com/saltstack/salt/issues/44544 .. _`#44549`: https://github.com/saltstack/salt/pull/44549 .. _`#44551`: https://github.com/saltstack/salt/pull/44551 .. _`#44552`: https://github.com/saltstack/salt/pull/44552 -.. _`#44556`: https://github.com/saltstack/salt/issues/44556 .. _`#44563`: https://github.com/saltstack/salt/pull/44563 .. _`#44565`: https://github.com/saltstack/salt/issues/44565 .. _`#44570`: https://github.com/saltstack/salt/pull/44570 @@ -4973,10 +4973,7 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#44717`: https://github.com/saltstack/salt/pull/44717 .. _`#44719`: https://github.com/saltstack/salt/pull/44719 .. _`#44725`: https://github.com/saltstack/salt/pull/44725 -.. _`#44728`: https://github.com/saltstack/salt/issues/44728 -.. _`#44730`: https://github.com/saltstack/salt/issues/44730 .. _`#44732`: https://github.com/saltstack/salt/pull/44732 -.. _`#44734`: https://github.com/saltstack/salt/issues/44734 .. _`#44735`: https://github.com/saltstack/salt/pull/44735 .. _`#44737`: https://github.com/saltstack/salt/pull/44737 .. _`#44738`: https://github.com/saltstack/salt/pull/44738 @@ -5044,15 +5041,10 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#45025`: https://github.com/saltstack/salt/pull/45025 .. _`#45031`: https://github.com/saltstack/salt/pull/45031 .. _`#45034`: https://github.com/saltstack/salt/pull/45034 -.. _`#45036`: https://github.com/saltstack/salt/issues/45036 -.. _`#45040`: https://github.com/saltstack/salt/pull/45040 -.. _`#45049`: https://github.com/saltstack/salt/issues/45049 .. _`#45068`: https://github.com/saltstack/salt/pull/45068 .. _`#45069`: https://github.com/saltstack/salt/pull/45069 -.. _`#45070`: https://github.com/saltstack/salt/pull/45070 .. _`#45087`: https://github.com/saltstack/salt/pull/45087 .. _`#45090`: https://github.com/saltstack/salt/pull/45090 -.. _`#45092`: https://github.com/saltstack/salt/pull/45092 .. _`#45098`: https://github.com/saltstack/salt/pull/45098 .. _`#45099`: https://github.com/saltstack/salt/pull/45099 .. _`#45100`: https://github.com/saltstack/salt/pull/45100 @@ -5072,13 +5064,11 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#45176`: https://github.com/saltstack/salt/issues/45176 .. _`#45183`: https://github.com/saltstack/salt/pull/45183 .. _`#45186`: https://github.com/saltstack/salt/pull/45186 -.. _`#45188`: https://github.com/saltstack/salt/issues/45188 .. _`#45199`: https://github.com/saltstack/salt/pull/45199 .. _`#45200`: https://github.com/saltstack/salt/pull/45200 .. _`#45201`: https://github.com/saltstack/salt/pull/45201 .. _`#45203`: https://github.com/saltstack/salt/pull/45203 .. _`#45204`: https://github.com/saltstack/salt/pull/45204 -.. _`#45209`: https://github.com/saltstack/salt/pull/45209 .. _`#45221`: https://github.com/saltstack/salt/pull/45221 .. _`#45226`: https://github.com/saltstack/salt/pull/45226 .. _`#45232`: https://github.com/saltstack/salt/pull/45232 @@ -5149,74 +5139,138 @@ Windows cmdmod forcing cmd to be a list (issue #43522) resolved by "cmdmod: Don' .. _`#45669`: https://github.com/saltstack/salt/pull/45669 .. _`#45672`: https://github.com/saltstack/salt/pull/45672 .. _`#45681`: https://github.com/saltstack/salt/pull/45681 -.. _`#598`: https://github.com/saltstack/salt/issues/598 -.. _`#675`: https://github.com/saltstack/salt/issues/675 -.. _`#678`: https://github.com/saltstack/salt/issues/678 -.. _`#9`: https://github.com/saltstack/salt/issues/9 -.. _`bp-41305`: https://github.com/saltstack/salt/pull/41305 -.. _`bp-43018`: https://github.com/saltstack/salt/pull/43018 -.. _`bp-43116`: https://github.com/saltstack/salt/pull/43116 -.. _`bp-43237`: https://github.com/saltstack/salt/pull/43237 -.. _`bp-43329`: https://github.com/saltstack/salt/pull/43329 -.. _`bp-43333`: https://github.com/saltstack/salt/pull/43333 -.. _`bp-43415`: https://github.com/saltstack/salt/pull/43415 -.. _`bp-43419`: https://github.com/saltstack/salt/pull/43419 -.. _`bp-43465`: https://github.com/saltstack/salt/pull/43465 -.. _`bp-43483`: https://github.com/saltstack/salt/pull/43483 -.. _`bp-43644`: https://github.com/saltstack/salt/pull/43644 -.. _`bp-43652`: https://github.com/saltstack/salt/pull/43652 -.. _`bp-43822`: https://github.com/saltstack/salt/pull/43822 -.. _`bp-43841`: https://github.com/saltstack/salt/pull/43841 -.. _`bp-43907`: https://github.com/saltstack/salt/pull/43907 -.. _`bp-43950`: https://github.com/saltstack/salt/pull/43950 -.. _`bp-44011`: https://github.com/saltstack/salt/pull/44011 -.. _`bp-44012`: https://github.com/saltstack/salt/pull/44012 -.. _`bp-44029`: https://github.com/saltstack/salt/pull/44029 -.. _`bp-44089`: https://github.com/saltstack/salt/pull/44089 -.. _`bp-44177`: https://github.com/saltstack/salt/pull/44177 -.. _`bp-44262`: https://github.com/saltstack/salt/pull/44262 -.. _`bp-44287`: https://github.com/saltstack/salt/pull/44287 -.. _`bp-44356`: https://github.com/saltstack/salt/pull/44356 -.. _`bp-44424`: https://github.com/saltstack/salt/pull/44424 -.. _`bp-44427`: https://github.com/saltstack/salt/pull/44427 -.. _`bp-44472`: https://github.com/saltstack/salt/pull/44472 -.. _`bp-44605`: https://github.com/saltstack/salt/pull/44605 -.. _`bp-44667`: https://github.com/saltstack/salt/pull/44667 -.. _`bp-44861`: https://github.com/saltstack/salt/pull/44861 -.. _`bp-44922`: https://github.com/saltstack/salt/pull/44922 -.. _`bp-44944`: https://github.com/saltstack/salt/pull/44944 -.. _`bp-44958`: https://github.com/saltstack/salt/pull/44958 -.. _`bp-44976`: https://github.com/saltstack/salt/pull/44976 -.. _`bp-44983`: https://github.com/saltstack/salt/pull/44983 -.. _`bp-45025`: https://github.com/saltstack/salt/pull/45025 -.. _`bp-45034`: https://github.com/saltstack/salt/pull/45034 -.. _`bp-45040`: https://github.com/saltstack/salt/pull/45040 -.. _`bp-45070`: https://github.com/saltstack/salt/pull/45070 -.. _`bp-45092`: https://github.com/saltstack/salt/pull/45092 -.. _`bp-45158`: https://github.com/saltstack/salt/pull/45158 -.. _`bp-45174`: https://github.com/saltstack/salt/pull/45174 -.. _`bp-45209`: https://github.com/saltstack/salt/pull/45209 -.. _`bp-45260`: https://github.com/saltstack/salt/pull/45260 -.. _`bp-45380`: https://github.com/saltstack/salt/pull/45380 -.. _`bp-45399`: https://github.com/saltstack/salt/pull/45399 -.. _`bp-45452`: https://github.com/saltstack/salt/pull/45452 -.. _`bp-45508`: https://github.com/saltstack/salt/pull/45508 -.. _`bp-45529`: https://github.com/saltstack/salt/pull/45529 -.. _`bp-45579`: https://github.com/saltstack/salt/pull/45579 -.. _`bp-45582`: https://github.com/saltstack/salt/pull/45582 -.. _`bp-45606`: https://github.com/saltstack/salt/pull/45606 -.. _`bp-45611`: https://github.com/saltstack/salt/pull/45611 -.. _`bp-45634`: https://github.com/saltstack/salt/pull/45634 -.. _`bp-45636`: https://github.com/saltstack/salt/pull/45636 -.. _`bp-45667`: https://github.com/saltstack/salt/pull/45667 -.. _`fix-2017`: https://github.com/saltstack/salt/pull/2017 -.. _`fix-2291`: https://github.com/saltstack/salt/issues/2291 -.. _`fix-41044`: https://github.com/saltstack/salt/issues/41044 -.. _`fix-41869`: https://github.com/saltstack/salt/issues/41869 -.. _`fix-43396`: https://github.com/saltstack/salt/issues/43396 -.. _`fix-43650`: https://github.com/saltstack/salt/issues/43650 -.. _`fix-43711`: https://github.com/saltstack/salt/issues/43711 -.. _`fix-43737`: https://github.com/saltstack/salt/issues/43737 -.. _`fix-44087`: https://github.com/saltstack/salt/issues/44087 -.. _`fix-44556`: https://github.com/saltstack/salt/issues/44556 -.. _`fix-44601`: https://github.com/saltstack/salt/issues/44601 +.. _`#45700`: https://github.com/saltstack/salt/pull/45700 +.. _`#45743`: https://github.com/saltstack/salt/issues/45743 +.. _`#45755`: https://github.com/saltstack/salt/pull/45755 +.. _`3add3287`: https://github.com/3add3287 +.. _`BenjaminSchubert`: https://github.com/BenjaminSchubert +.. _`BenoitKnecht`: https://github.com/BenoitKnecht +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`CorvinM`: https://github.com/CorvinM +.. _`DR3EVR8u8c`: https://github.com/DR3EVR8u8c +.. _`Da-Juan`: https://github.com/Da-Juan +.. _`DenisBY`: https://github.com/DenisBY +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`Giandom`: https://github.com/Giandom +.. _`HontoNoRoger`: https://github.com/HontoNoRoger +.. _`Manoj2087`: https://github.com/Manoj2087 +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`UtahDave`: https://github.com/UtahDave +.. _`V3XATI0N`: https://github.com/V3XATI0N +.. _`Xiami2012`: https://github.com/Xiami2012 +.. _`adelcast`: https://github.com/adelcast +.. _`aig787`: https://github.com/aig787 +.. _`amendlik`: https://github.com/amendlik +.. _`angeloudy`: https://github.com/angeloudy +.. _`anlutro`: https://github.com/anlutro +.. _`ari`: https://github.com/ari +.. _`arount`: https://github.com/arount +.. _`arthurlogilab`: https://github.com/arthurlogilab +.. _`basepi`: https://github.com/basepi +.. _`benediktwerner`: https://github.com/benediktwerner +.. _`blarghmatey`: https://github.com/blarghmatey +.. _`boltronics`: https://github.com/boltronics +.. _`brejoc`: https://github.com/brejoc +.. _`brmzkw`: https://github.com/brmzkw +.. _`cachedout`: https://github.com/cachedout +.. _`campbellmc`: https://github.com/campbellmc +.. _`chnrxn`: https://github.com/chnrxn +.. _`clallen`: https://github.com/clallen +.. _`clan`: https://github.com/clan +.. _`corywright`: https://github.com/corywright +.. _`creideiki`: https://github.com/creideiki +.. _`cruscio`: https://github.com/cruscio +.. _`dafyddj`: https://github.com/dafyddj +.. _`damon-atkins`: https://github.com/damon-atkins +.. _`davidvon`: https://github.com/davidvon +.. _`dincamihai`: https://github.com/dincamihai +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`doesitblend`: https://github.com/doesitblend +.. _`doublez13`: https://github.com/doublez13 +.. _`dragonpaw`: https://github.com/dragonpaw +.. _`dupsatou`: https://github.com/dupsatou +.. _`ecgg`: https://github.com/ecgg +.. _`eliasp`: https://github.com/eliasp +.. _`eradman`: https://github.com/eradman +.. _`favoretti`: https://github.com/favoretti +.. _`forksaber`: https://github.com/forksaber +.. _`frogunder`: https://github.com/frogunder +.. _`gaborn57`: https://github.com/gaborn57 +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`ghost`: https://github.com/ghost +.. _`golmaal`: https://github.com/golmaal +.. _`gracinet`: https://github.com/gracinet +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`haam3r`: https://github.com/haam3r +.. _`iavael`: https://github.com/iavael +.. _`isbm`: https://github.com/isbm +.. _`jettero`: https://github.com/jettero +.. _`jf`: https://github.com/jf +.. _`jonans`: https://github.com/jonans +.. _`jubrad`: https://github.com/jubrad +.. _`keesbos`: https://github.com/keesbos +.. _`knine`: https://github.com/knine +.. _`krcroft`: https://github.com/krcroft +.. _`kris-anderson`: https://github.com/kris-anderson +.. _`kvnaveen`: https://github.com/kvnaveen +.. _`lomeroe`: https://github.com/lomeroe +.. _`mahesh21`: https://github.com/mahesh21 +.. _`marek-knappe`: https://github.com/marek-knappe +.. _`mateiw`: https://github.com/mateiw +.. _`mattLLVW`: https://github.com/mattLLVW +.. _`mephi42`: https://github.com/mephi42 +.. _`mind-code`: https://github.com/mind-code +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`mkurtak`: https://github.com/mkurtak +.. _`morganwillcock`: https://github.com/morganwillcock +.. _`mstarostik`: https://github.com/mstarostik +.. _`msteed`: https://github.com/msteed +.. _`msummers42`: https://github.com/msummers42 +.. _`mtorromeo`: https://github.com/mtorromeo +.. _`multani`: https://github.com/multani +.. _`mvivaldi`: https://github.com/mvivaldi +.. _`mwerickso`: https://github.com/mwerickso +.. _`mz-bmcqueen`: https://github.com/mz-bmcqueen +.. _`nasenbaer13`: https://github.com/nasenbaer13 +.. _`nicholasmhughes`: https://github.com/nicholasmhughes +.. _`nixjdm`: https://github.com/nixjdm +.. _`nomeelnoj`: https://github.com/nomeelnoj +.. _`oarmstrong`: https://github.com/oarmstrong +.. _`pkruk`: https://github.com/pkruk +.. _`pratik705`: https://github.com/pratik705 +.. _`psagers`: https://github.com/psagers +.. _`rajvidhimar`: https://github.com/rajvidhimar +.. _`rallytime`: https://github.com/rallytime +.. _`rbjorklin`: https://github.com/rbjorklin +.. _`rcallphin`: https://github.com/rcallphin +.. _`renner`: https://github.com/renner +.. _`rhoths`: https://github.com/rhoths +.. _`richardsimko`: https://github.com/richardsimko +.. _`rklaren`: https://github.com/rklaren +.. _`roaldnefs`: https://github.com/roaldnefs +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack/salt-jenkins#675`: https://github.com/saltstack/salt-jenkins/issues/675 +.. _`saltstack/salt-jenkins#678`: https://github.com/saltstack/salt-jenkins/issues/678 +.. _`samodid`: https://github.com/samodid +.. _`skizunov`: https://github.com/skizunov +.. _`skjaro`: https://github.com/skjaro +.. _`smitelli`: https://github.com/smitelli +.. _`steverweber`: https://github.com/steverweber +.. _`stolendog`: https://github.com/stolendog +.. _`sumeetisp`: https://github.com/sumeetisp +.. _`syedaali`: https://github.com/syedaali +.. _`syphernl`: https://github.com/syphernl +.. _`t0fik`: https://github.com/t0fik +.. _`techhat`: https://github.com/techhat +.. _`terminalmage`: https://github.com/terminalmage +.. _`thuhak`: https://github.com/thuhak +.. _`timfreund`: https://github.com/timfreund +.. _`timka`: https://github.com/timka +.. _`tkwilliams`: https://github.com/tkwilliams +.. _`twangboy`: https://github.com/twangboy +.. _`unthought`: https://github.com/unthought +.. _`vernondcole`: https://github.com/vernondcole +.. _`vutny`: https://github.com/vutny +.. _`wedge-jarrad`: https://github.com/wedge-jarrad +.. _`whytewolf`: https://github.com/whytewolf +.. _`xuhcc`: https://github.com/xuhcc diff --git a/doc/topics/releases/2017.7.4.rst b/doc/topics/releases/2017.7.4.rst index b5f371050a..8c901f5599 100644 --- a/doc/topics/releases/2017.7.4.rst +++ b/doc/topics/releases/2017.7.4.rst @@ -4,34 +4,43 @@ Salt 2017.7.4 Release Notes Version 2017.7.4 is a bugfix release for :ref:`2017.7.0 `. -Changes for v2017.7.3..v2017.7.4 ---------------------------------------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Statistics +========== -*Generated at: 2018-02-16T16:44:38Z* +- Total Merges: **8** +- Total Issue References: **4** +- Total PR References: **11** -Statistics: - -- Total Merges: **7** -- Total Issue references: **4** -- Total PR references: **11** - -Changes: +- Contributors: **6** (`Ch3LL`_, `garethgreenaway`_, `gtmanfred`_, `marccardinal`_, `rallytime`_, `terminalmage`_) -- **PR** `#46066`_: (*rallytime*) Pin tornado version in requirements file - @ *2018-02-16T16:40:05Z* +Changelog for v2017.7.3..v2017.7.4 +================================== + +*Generated at: 2018-05-26 21:48:28 UTC* + +* **PR** `#46074`_: (`Ch3LL`_) Update 2017.7.4 Release Notes with new fixes + @ *2018-02-16 16:47:56 UTC* + + * b5b083fd26 Merge pull request `#46074`_ from Ch3LL/update-7.4 + + * 8d0eeeb059 Update 2017.7.4 Release Notes with new fixes + +* **ISSUE** `#45790`_: (`bdarnell`_) Test with Tornado 5.0b1 (refs: `#46066`_) + +* **PR** `#46066`_: (`rallytime`_) Pin tornado version in requirements file + @ *2018-02-16 16:40:05 UTC* - - **ISSUE** `#45790`_: (*bdarnell*) Test with Tornado 5.0b1 - | refs: `#46066`_ * 32f3d00e44 Merge pull request `#46066`_ from rallytime/pin-tornado + * 6dc1a3b9dc Pin tornado version in requirements file -- **PR** `#46036`_: (*terminalmage*) git.latest: Fix regression with identity file usage - @ *2018-02-16T13:57:23Z* +* **PR** `#46036`_: (`terminalmage`_) git.latest: Fix regression with identity file usage + @ *2018-02-16 13:57:23 UTC* * 85761ee650 Merge pull request `#46036`_ from terminalmage/issue43769 + * e2140d9a84 Mock the ssh.key_is_encrypted utils func * 169924b3fe Move ssh.key_is_encrypted to a utils module temporarily @@ -42,57 +51,61 @@ Changes: * f2b69f703d git.latest: Fix regression with identity file usage -- **PR** `#46009`_: (*Ch3LL*) Add 2017.7.4 Release Notes with PRs - @ *2018-02-13T16:40:30Z* +* **PR** `#46009`_: (`Ch3LL`_) Add 2017.7.4 Release Notes with PRs + @ *2018-02-13 16:40:30 UTC* * 6d534c6e7e Merge pull request `#46009`_ from Ch3LL/rn_7.4 + * ac0baf4b34 Add 2017.7.4 Release Notes with PRs -- **PR** `#45981`_: (*gtmanfred*) use local config for vault when masterless - @ *2018-02-13T15:22:01Z* +* **ISSUE** `#45976`_: (`ghost`_) 6a5e0f9 introduces regression that breaks Vault module for salt masterless (refs: `#45981`_) + +* **PR** `#45981`_: (`gtmanfred`_) use local config for vault when masterless + @ *2018-02-13 15:22:01 UTC* - - **ISSUE** `#45976`_: (*grobinson-blockchain*) 6a5e0f9 introduces regression that breaks Vault module for salt masterless - | refs: `#45981`_ * ca76a0b328 Merge pull request `#45981`_ from gtmanfred/2017.7.3 + * 0d448457dc apparently local is not set by default * 2a92f4bc16 use local config for vault when masterless -- **PR** `#45953`_: (*rallytime*) Back-port `#45928`_ to 2017.7.3 - @ *2018-02-09T22:29:10Z* +* **ISSUE** `#45915`_: (`MatthiasKuehneEllerhold`_) 2017.7.3: Salt-SSH & Vault Pillar: Permission denied "minion.pem" (refs: `#45928`_) + +* **PR** `#45953`_: (`rallytime`_) Back-port `#45928`_ to 2017.7.3 + @ *2018-02-09 22:29:10 UTC* + + * **PR** `#45928`_: (`garethgreenaway`_) [2017.7] Fixing vault when used with pillar over salt-ssh (refs: `#45953`_) + + * 6530649dbc Merge pull request `#45953`_ from rallytime/bp-45928-2017.7.3 - - **ISSUE** `#45915`_: (*MatthiasKuehneEllerhold*) 2017.7.3: Salt-SSH & Vault Pillar: Permission denied "minion.pem" - | refs: `#45928`_ - - **PR** `#45928`_: (*garethgreenaway*) [2017.7] Fixing vault when used with pillar over salt-ssh - | refs: `#45953`_ - * 6530649dbc Merge pull request `#45953`_ from rallytime/`bp-45928`_-2017.7.3 * 85363189d1 Fixing vault when used with pillar over salt-ssh -- **PR** `#45934`_: (*rallytime*) Back-port `#45902`_ to 2017.7.3 - @ *2018-02-09T16:31:08Z* +* **ISSUE** `#45893`_: (`CrackerJackMack`_) archive.extracted ValueError "No path specified" in 2017.7.3 (refs: `#45902`_) + +* **PR** `#45934`_: (`rallytime`_) Back-port `#45902`_ to 2017.7.3 + @ *2018-02-09 16:31:08 UTC* + + * **PR** `#45902`_: (`terminalmage`_) Check the effective saltenv for cached archive (refs: `#45934`_) + + * fb378cebb0 Merge pull request `#45934`_ from rallytime/bp-45902 - - **ISSUE** `#45893`_: (*CrackerJackMack*) archive.extracted ValueError "No path specified" in 2017.7.3 - | refs: `#45902`_ - - **PR** `#45902`_: (*terminalmage*) Check the effective saltenv for cached archive - | refs: `#45934`_ - * fb378cebb0 Merge pull request `#45934`_ from rallytime/`bp-45902`_ * bb83e8b345 Add regression test for issue 45893 * cdda66d759 Remove duplicated section in docstring and fix example * 4b6351cda6 Check the effective saltenv for cached archive -- **PR** `#45935`_: (*rallytime*) Back-port `#45742`_ to 2017.7.3 - @ *2018-02-09T14:02:26Z* +* **PR** `#45935`_: (`rallytime`_) Back-port `#45742`_ to 2017.7.3 + @ *2018-02-09 14:02:26 UTC* + + * **PR** `#45742`_: (`marccardinal`_) list.copy() is not compatible with python 2.7 (refs: `#45935`_) + + * 0d74151c71 Merge pull request `#45935`_ from rallytime/bp-45742 - - **PR** `#45742`_: (*marccardinal*) list.copy() is not compatible with python 2.7 - | refs: `#45935`_ - * 0d74151c71 Merge pull request `#45935`_ from rallytime/`bp-45742`_ * 6a0b5f7af3 Removed the chained copy * ad1150fad4 list.copy() is not compatible with python 2.7 - .. _`#45742`: https://github.com/saltstack/salt/pull/45742 .. _`#45790`: https://github.com/saltstack/salt/issues/45790 .. _`#45893`: https://github.com/saltstack/salt/issues/45893 @@ -107,6 +120,14 @@ Changes: .. _`#46009`: https://github.com/saltstack/salt/pull/46009 .. _`#46036`: https://github.com/saltstack/salt/pull/46036 .. _`#46066`: https://github.com/saltstack/salt/pull/46066 -.. _`bp-45742`: https://github.com/saltstack/salt/pull/45742 -.. _`bp-45902`: https://github.com/saltstack/salt/pull/45902 -.. _`bp-45928`: https://github.com/saltstack/salt/pull/45928 +.. _`#46074`: https://github.com/saltstack/salt/pull/46074 +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`CrackerJackMack`: https://github.com/CrackerJackMack +.. _`MatthiasKuehneEllerhold`: https://github.com/MatthiasKuehneEllerhold +.. _`bdarnell`: https://github.com/bdarnell +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`ghost`: https://github.com/ghost +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`marccardinal`: https://github.com/marccardinal +.. _`rallytime`: https://github.com/rallytime +.. _`terminalmage`: https://github.com/terminalmage diff --git a/doc/topics/releases/2017.7.5.rst b/doc/topics/releases/2017.7.5.rst index d0676d873c..b31093cb2b 100644 --- a/doc/topics/releases/2017.7.5.rst +++ b/doc/topics/releases/2017.7.5.rst @@ -4,36 +4,52 @@ Salt 2017.7.5 Release Notes Version 2017.7.5 is a bugfix release for :ref:`2017.7.0 `. -Changes for v2017.7.4..v2017.7.5 ----------------------------------------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Statistics +========== -*Generated at: 2018-03-19T20:32:02Z* +- Total Merges: **213** +- Total Issue References: **58** +- Total PR References: **202** -Statistics: - -- Total Merges: **211** -- Total Issue references: **64** -- Total PR references: **253** - -Changes: +- Contributors: **52** (`Ch3LL`_, `DmitryKuzmenko`_, `GwiYeong`_, `L4rS6`_, `SteffenKockel`_, `The-Loeki`_, `amendlik`_, `andreaspe`_, `angeloudy`_, `aphor`_, `bdrung`_, `cebe`_, `ciiqr`_, `damon-atkins`_, `danlsgiga`_, `ddoh94`_, `dmurphy18`_, `dwoz`_, `eliasp`_, `frogunder`_, `garethgreenaway`_, `gclinch`_, `gtmanfred`_, `jfindlay`_, `kstreee`_, `marccardinal`_, `mcalmer`_, `mchugh19`_, `meaksh`_, `michelsen`_, `nullify005`_, `oarmstrong`_, `oeuftete`_, `philpep`_, `racker-markh`_, `rallytime`_, `redbaron4`_, `roaldnefs`_, `rongshengfang`_, `rongzeng54`_, `rrroo`_, `samilaine`_, `samodid`_, `skizunov`_, `terminalmage`_, `tintoy`_, `twangboy`_, `viktordaniel`_, `vutny`_, `while0pass`_, `whytewolf`_, `zer0def`_) -- **PR** `#46577`_: (*gtmanfred*) Fix npm issue - @ *2018-03-19T11:51:04Z* +Changelog for v2017.7.4..v2017.7.5 +================================== + +*Generated at: 2018-05-26 21:50:00 UTC* + +* **PR** `#46612`_: (`Ch3LL`_) Add changelog to 2017.7.5 release notes + @ *2018-03-19 20:47:38 UTC* + + * 19bb725698 Merge pull request `#46612`_ from Ch3LL/7.5_rn + + * 6076bfa2ee Add changelog to 2017.7.5 release + +* **PR** `#46572`_: (`dmurphy18`_) Addition of -sa flag to allow for revision numbers other than -0 or -1 + @ *2018-03-19 20:07:26 UTC* + + * 31c78aef11 Merge pull request `#46572`_ from dmurphy18/update_xxxbuild + + * c87511570d Merge branch '2017.7.5' into update_xxxbuild + +* **ISSUE** `saltstack/salt-jenkins#884`_: (`gtmanfred`_) [2017.7.5][Fedora 27][py2/py3] integration.states.test_npm.NpmStateTest.test_npm_install_url_referenced_package (refs: `#46577`_) + +* **PR** `#46577`_: (`gtmanfred`_) Fix npm issue + @ *2018-03-19 11:51:04 UTC* - - **PR** `#884`_: (*dcolish*) Resolve `#789`_, `#670`_ - | refs: `#46577`_ * cdd768fa4d Merge pull request `#46577`_ from gtmanfred/2017.7.5 + * 78cbf7b5cd Fix npm issue * c76f7eb028 enable debug logging on the minionlog -- **PR** `#46551`_: (*terminalmage*) Fix failing pkg integration test on OpenSUSE - @ *2018-03-19T11:50:12Z* +* **PR** `#46551`_: (`terminalmage`_) Fix failing pkg integration test on OpenSUSE + @ *2018-03-19 11:50:12 UTC* * e6682c660c Merge pull request `#46551`_ from terminalmage/salt-jenkins-885 + * 703b5e7e65 Change versionadded to show that 2018.3.0 will not have this function * 010d260d06 Rewrite failing Suse pkg integration test @@ -42,68 +58,78 @@ Changes: * 214f2d6ad3 Add pkg.list_repo_pkgs to zypper.py -- **PR** `#46563`_: (*gtmanfred*) virtualenv version too old for python3.6 - @ *2018-03-15T20:17:16Z* + * 0a541613f2 Additon of -sa flag to allow for revision numbers other than -0 or -1 + +* **ISSUE** `saltstack/salt-jenkins#886`_: (`gtmanfred`_) [2017.7.5][Fedora 26/Ubuntu 17.10][py3] integration.states.test_pip.PipStateTest.test_46127_pip_env_vars (refs: `#46563`_) + +* **PR** `#46563`_: (`gtmanfred`_) virtualenv version too old for python3.6 + @ *2018-03-15 20:17:16 UTC* - - **ISSUE** `#886`_: (*j0nes2k*) Add MAILTO command to cron state - | refs: `#46563`_ * bd62699ccb Merge pull request `#46563`_ from gtmanfred/2017.7.5 + * 8d5ab72983 virtualenv version too old for python3.6 -- **PR** `#46561`_: (*gtmanfred*) disable verbose - @ *2018-03-15T16:36:41Z* +* **PR** `#46561`_: (`gtmanfred`_) disable verbose + @ *2018-03-15 16:36:41 UTC* * 2916708124 Merge pull request `#46561`_ from gtmanfred/2017.7.5 + * 2c39ac6dfb disable verbose -- **PR** `#46537`_: (*rallytime*) Back-port `#46529`_ to 2017.7.5 - @ *2018-03-14T14:47:28Z* +* **PR** `#46537`_: (`rallytime`_) Back-port `#46529`_ to 2017.7.5 + @ *2018-03-14 14:47:28 UTC* + + * **PR** `#46529`_: (`gtmanfred`_) retry if there is a segfault (refs: `#46537`_) + + * ee3bff6e32 Merge pull request `#46537`_ from rallytime/bp-46529 - - **PR** `#46529`_: (*gtmanfred*) retry if there is a segfault - | refs: `#46537`_ - * ee3bff6e32 Merge pull request `#46537`_ from rallytime/`bp-46529`_ * 289c7a228f retry if there is a segfault -- **PR** `#46519`_: (*rallytime*) Update man pages for 2017.7.5 - @ *2018-03-13T20:00:51Z* +* **PR** `#46519`_: (`rallytime`_) Update man pages for 2017.7.5 + @ *2018-03-13 20:00:51 UTC* * 1271536a89 Merge pull request `#46519`_ from rallytime/man-pages-2017.7.5 + * 782a5584f5 Update man pages for 2017.7.5 -- **PR** `#46493`_: (*terminalmage*) salt-call: don't re-use initial pillar if CLI overrides passed - @ *2018-03-12T20:41:52Z* +* **ISSUE** `#46207`_: (`seanjnkns`_) Issue `#44034`_ still unresolved (refs: `#46493`_) + +* **ISSUE** `#44034`_: (`seanjnkns`_) salt-call pillar overrides broken in 2016.11.8 and 2017.7.2 (refs: `#44483`_) + +* **PR** `#46493`_: (`terminalmage`_) salt-call: don't re-use initial pillar if CLI overrides passed + @ *2018-03-12 20:41:52 UTC* + + * **PR** `#44483`_: (`terminalmage`_) salt-call: account for instances where __pillar__ is empty (refs: `#46493`_) - - **ISSUE** `#46207`_: (*seanjnkns*) Issue `#44034`_ still unresolved - | refs: `#46493`_ - - **ISSUE** `#44034`_: (*seanjnkns*) salt-call pillar overrides broken in 2016.11.8 and 2017.7.2 - | refs: `#44483`_ - - **PR** `#44483`_: (*terminalmage*) salt-call: account for instances where __pillar__ is empty - | refs: `#46493`_ * 0e90c8ca6f Merge pull request `#46493`_ from terminalmage/issue46207 + * f06ff68f10 salt-call: don't re-use initial pillar if CLI overrides passed -- **PR** `#46450`_: (*gtmanfred*) load grains for salt.cmd runner - @ *2018-03-12T18:52:22Z* +* **PR** `#46450`_: (`gtmanfred`_) load grains for salt.cmd runner + @ *2018-03-12 18:52:22 UTC* * b11a8fc8e0 Merge pull request `#46450`_ from gtmanfred/salt_runner + * 7974ff7264 load grains for salt.cmd runner -- **PR** `#46337`_: (*gtmanfred*) Fix using names with listen and listen_in - @ *2018-03-12T18:50:00Z* +* **ISSUE** `#30115`_: (`gtmanfred`_) [BUG] listen does not appear to respect the special names directive (refs: `#46337`_) + +* **PR** `#46337`_: (`gtmanfred`_) Fix using names with listen and listen_in + @ *2018-03-12 18:50:00 UTC* - - **ISSUE** `#30115`_: (*gtmanfred*) [BUG] listen does not appear to respect the special names directive - | refs: `#46337`_ * 22d753364b Merge pull request `#46337`_ from gtmanfred/2017.7 + * d6d9e36359 add tests for names and listen/listen_in * 3f8e0db572 let listen_in work with names * 7161f4d4df fix listen to be able to handle names -- **PR** `#46413`_: (*meaksh*) Explore 'module.run' state module output in depth to catch "result" properly - @ *2018-03-12T18:49:07Z* +* **PR** `#46413`_: (`meaksh`_) Explore 'module.run' state module output in depth to catch "result" properly + @ *2018-03-12 18:49:07 UTC* * b7191b8782 Merge pull request `#46413`_ from meaksh/2017.7-explore-result-in-depth + * 885751634e Add new unit test to check state.apply within module.run * 9f19ad5264 Rename and fix recursive method @@ -112,156 +138,176 @@ Changes: * 726ca3044d Explore 'module.run' response to catch the 'result' in depth -- **PR** `#46496`_: (*gtmanfred*) more test kitchen clean up - @ *2018-03-12T18:28:34Z* +* **PR** `#46496`_: (`gtmanfred`_) more test kitchen clean up + @ *2018-03-12 18:28:34 UTC* * 02a79a2014 Merge pull request `#46496`_ from gtmanfred/kitchen + * da002f78d0 include virtualenv path for py3 windows * fe2efe03ea remove duplicate setup -- **PR** `#46330`_: (*bdrung*) Fix ValueError for template in AppsV1beta1DeploymentSpec - @ *2018-03-12T16:56:18Z* +* **ISSUE** `#46329`_: (`bdrung`_) test_create_deployments fails with python-kubernetes 4.0.0 (refs: `#46330`_) + +* **PR** `#46330`_: (`bdrung`_) Fix ValueError for template in AppsV1beta1DeploymentSpec + @ *2018-03-12 16:56:18 UTC* - - **ISSUE** `#46329`_: (*bdrung*) test_create_deployments fails with python-kubernetes 4.0.0 - | refs: `#46330`_ * 5c4c182d75 Merge pull request `#46330`_ from bdrung/fix_kubernetes_test_create_deployments + * 5008c53c44 Fix ValueError for template in AppsV1beta1DeploymentSpec -- **PR** `#46482`_: (*rongshengfang*) Fix KeyError in salt/states/boto_ec2.py - @ *2018-03-12T15:13:13Z* +* **ISSUE** `#46479`_: (`rongshengfang`_) boto_ec2.instance_present throwing KeyError exception when associating EIP to an existing instance (refs: `#46482`_) + +* **PR** `#46482`_: (`rongshengfang`_) Fix KeyError in salt/states/boto_ec2.py + @ *2018-03-12 15:13:13 UTC* - - **ISSUE** `#46479`_: (*rongshengfang*) boto_ec2.instance_present throwing KeyError exception when associating EIP to an existing instance - | refs: `#46482`_ * c7e05d3ff4 Merge pull request `#46482`_ from rongshengfang/fix-keyerror-in-instance_present + * ed8c83e89a Fix KeyError in salt/states/boto_ec2.py when an EIP is being associated to an existing instance with the instance_present state. -- **PR** `#46463`_: (*terminalmage*) Update requirements files to depend on mock>=2.0.0 - @ *2018-03-09T19:24:41Z* +* **PR** `#46463`_: (`terminalmage`_) Update requirements files to depend on mock>=2.0.0 + @ *2018-03-09 19:24:41 UTC* * 573d51afec Merge pull request `#46463`_ from terminalmage/mock-2.0 + * b958b4699c Update requirements files to depend on mock>=2.0.0 -- **PR** `#46422`_: (*rallytime*) Back-port `#46300`_ to 2017.7 - @ *2018-03-09T19:19:25Z* +* **ISSUE** `#46299`_: (`gclinch`_) debconf module fails on Python 3 (refs: `#46300`_) + +* **PR** `#46422`_: (`rallytime`_) Back-port `#46300`_ to 2017.7 + @ *2018-03-09 19:19:25 UTC* + + * **PR** `#46300`_: (`gclinch`_) Python 3 support for debconfmod (fixes `#46299`_) (refs: `#46422`_) + + * a154d35fc7 Merge pull request `#46422`_ from rallytime/bp-46300 - - **ISSUE** `#46299`_: (*gclinch*) debconf module fails on Python 3 - | refs: `#46300`_ - - **PR** `#46300`_: (*gclinch*) Python 3 support for debconfmod (fixes `#46299`_) - | refs: `#46422`_ - * a154d35fc7 Merge pull request `#46422`_ from rallytime/`bp-46300`_ * 829dfde8e8 Change stringutils path to old utils path for 2017.7 * 91db2e0782 Python 3 support -- **PR** `#46320`_: (*mcalmer*) add warning about future config option change - @ *2018-03-09T17:48:29Z* +* **PR** `#46320`_: (`mcalmer`_) add warning about future config option change + @ *2018-03-09 17:48:29 UTC* * 2afaca17a1 Merge pull request `#46320`_ from mcalmer/warn-kubernetes + * c493ced415 add warning about future config option change -- **PR** `#46449`_: (*bdrung*) Make documentation theme configurable - @ *2018-03-09T17:47:15Z* +* **PR** `#46449`_: (`bdrung`_) Make documentation theme configurable + @ *2018-03-09 17:47:15 UTC* * c7f95581e3 Merge pull request `#46449`_ from bdrung/make-doc-theme-configurable + * 4a5da2d144 Make documentation theme configurable -- **PR** `#46162`_: (*rallytime*) Add team-suse to CODEOWNERS file for zypper files - @ *2018-03-09T17:46:13Z* +* **PR** `#46162`_: (`rallytime`_) Add team-suse to CODEOWNERS file for zypper files + @ *2018-03-09 17:46:13 UTC* * 10ce0e9e20 Merge pull request `#46162`_ from rallytime/team-suse-zypper-owner + * 13a295a3b7 Add *pkg* and *snapper* to team-suse * 35c7b7b0d3 Add btrfs, xfs, yumpkg, and kubernetes file to team-suse * 485d777ac0 Add team-suse to CODEOWNERS file for zypper files -- **PR** `#46434`_: (*gtmanfred*) split return key value correctly - @ *2018-03-09T17:45:21Z* +* **PR** `#46434`_: (`gtmanfred`_) split return key value correctly + @ *2018-03-09 17:45:21 UTC* * cac096b311 Merge pull request `#46434`_ from gtmanfred/highstate_return + * d18f1a55a7 fix pylint * 9e2c3f7991 split return key value correctly -- **PR** `#46455`_: (*whytewolf*) .format remove fix for `#44452`_ - @ *2018-03-09T17:37:19Z* +* **ISSUE** `#44452`_: (`konstest`_) salt-cloud can't create snapshots, because there is a bug in the Unicode name of the virtual machine (refs: `#46455`_) + +* **PR** `#46455`_: (`whytewolf`_) .format remove fix for `#44452`_ + @ *2018-03-09 17:37:19 UTC* - - **ISSUE** `#44452`_: (*konstest*) salt-cloud can't create snapshots, because there is a bug in the Unicode name of the virtual machine - | refs: `#46455`_ `#46455`_ * 7dd71101ce Merge pull request `#46455`_ from whytewolf/Issue_44452_unicode_cloud + * 5fe474b1a8 .format remove fix for `#44452`_ -- **PR** `#46428`_: (*twangboy*) Fix issue with dev env install on Windows - @ *2018-03-09T14:52:46Z* +* **PR** `#46428`_: (`twangboy`_) Fix issue with dev env install on Windows + @ *2018-03-09 14:52:46 UTC* * 4c8d9026d3 Merge pull request `#46428`_ from twangboy/win_fix_reqs + * e7ab97cc17 Remove six as a hard dep for Salt * cc67e5c2ef Set six to 1.11.0 -- **PR** `#46454`_: (*gtmanfred*) fix windows for kitchen - @ *2018-03-08T21:19:31Z* +* **PR** `#46454`_: (`gtmanfred`_) fix windows for kitchen + @ *2018-03-08 21:19:31 UTC* * e834d9a63b Merge pull request `#46454`_ from gtmanfred/kitchen + * b8ab8434a5 fix windows for kitchen -- **PR** `#46452`_: (*gtmanfred*) make spm cache_dir instead of all cachedirs - @ *2018-03-08T21:12:20Z* +* **ISSUE** `#46451`_: (`gmacon`_) SPM fails to start with customized cache location (refs: `#46452`_) + +* **PR** `#46452`_: (`gtmanfred`_) make spm cache_dir instead of all cachedirs + @ *2018-03-08 21:12:20 UTC* - - **ISSUE** `#46451`_: (*gmacon*) SPM fails to start with customized cache location - | refs: `#46452`_ * 2886dca88f Merge pull request `#46452`_ from gtmanfred/spm_cache_dir + * 169cf7a4e2 make spm cache_dir instead of all cachedirs -- **PR** `#46446`_: (*bdrung*) Fix various typos - @ *2018-03-08T21:11:47Z* +* **PR** `#46446`_: (`bdrung`_) Fix various typos + @ *2018-03-08 21:11:47 UTC* * a188984cd9 Merge pull request `#46446`_ from bdrung/fix-typos + * 7e6e80be87 heat: Fix spelling mistake of environment * a3c54b50f6 Fix various spelling mistakes -- **PR** `#46309`_: (*bdrung*) Support dynamic pillar_root environment - @ *2018-03-08T19:15:35Z* +* **ISSUE** `#20581`_: (`notpeter`_) Many environments: one pillar_root (all your envs are belong to base) (refs: `#46309`_) + +* **PR** `#46309`_: (`bdrung`_) Support dynamic pillar_root environment + @ *2018-03-08 19:15:35 UTC* - - **ISSUE** `#20581`_: (*notpeter*) Many environments: one pillar_root (all your envs are belong to base) - | refs: `#46309`_ * e35fc5263c Merge pull request `#46309`_ from bdrung/dynamic-pillarenv + * 584b451fd1 Support dynamic pillar_root environment -- **PR** `#46430`_: (*terminalmage*) Improve reliability/idempotence of file.blockreplace state - @ *2018-03-08T15:41:38Z* +* **ISSUE** `#44032`_: (`PhilippeAB`_) blockreplace marker_end isn't applied with newline (refs: `#46430`_) + +* **PR** `#46430`_: (`terminalmage`_) Improve reliability/idempotence of file.blockreplace state + @ *2018-03-08 15:41:38 UTC* - - **ISSUE** `#44032`_: (*PhilippeAB*) blockreplace marker_end isn't applied with newline - | refs: `#46430`_ * 35fe9827fe Merge pull request `#46430`_ from terminalmage/issue44032 + * f9f187e915 Improve reliability/idempotence of file.blockreplace state -- **PR** `#46429`_: (*twangboy*) Fix problem with __virtual__ in win_snmp - @ *2018-03-07T23:26:46Z* +* **PR** `#46429`_: (`twangboy`_) Fix problem with __virtual__ in win_snmp + @ *2018-03-07 23:26:46 UTC* * 2bad0a21c0 Merge pull request `#46429`_ from twangboy/win_fix_snmp + * 8995a9b8de Fix problem with __virtual__ in win_snmp -- **PR** `#46100`_: (*jfindlay*) Handle IPv6 scope parameter in resolv.conf - @ *2018-03-07T19:51:20Z* +* **PR** `#46100`_: (`jfindlay`_) Handle IPv6 scope parameter in resolv.conf + @ *2018-03-07 19:51:20 UTC* * 93a572f229 Merge pull request `#46100`_ from jfindlay/resolv_scope + * d5561bedaf tests.unit.grains.core add scoped IPv6 nameserver * 4e2e62d508 salt.utils.dns parse scope param for ipv6 servers -- **PR** `#46420`_: (*bdrung*) Fix SSH client exception if SSH is not found - @ *2018-03-07T17:49:00Z* +* **PR** `#46420`_: (`bdrung`_) Fix SSH client exception if SSH is not found + @ *2018-03-07 17:49:00 UTC* * 5acc1d5c54 Merge pull request `#46420`_ from bdrung/2017.7 + * e48c13d9e0 Fix SSH client exception if SSH is not found -- **PR** `#46379`_: (*angeloudy*) TypeError: a bytes-like object is required, not 'str' - @ *2018-03-07T15:00:47Z* +* **PR** `#46379`_: (`angeloudy`_) TypeError: a bytes-like object is required, not 'str' + @ *2018-03-07 15:00:47 UTC* * ca6a76e317 Merge pull request `#46379`_ from angeloudy/2017.7 + * 3acb59c74c Merge branch '2017.7' into 2017.7 * d971e0c08b Fix indent @@ -274,116 +320,130 @@ Changes: * 14aba24111 fix bytes-object required error in python 3 -- **PR** `#46404`_: (*gtmanfred*) get 2017.7 ready to switch over to the new jenkins - @ *2018-03-07T14:29:30Z* +* **PR** `#46404`_: (`gtmanfred`_) get 2017.7 ready to switch over to the new jenkins + @ *2018-03-07 14:29:30 UTC* * 73f9233557 Merge pull request `#46404`_ from gtmanfred/kitchen + * c56baa95a8 clone .git for the version tests * 3620611b5b fix unhold package for debian * 5219f7d2ba fix minion log path -- **PR** `#46310`_: (*twangboy*) Update the Windows installer build scripts - @ *2018-03-06T20:21:58Z* +* **ISSUE** `#46192`_: (`asymetrixs`_) salt-log-setup: AttributeError 'NoneType' object has no attribute 'flush' (refs: `#46310`_) + +* **PR** `#46310`_: (`twangboy`_) Update the Windows installer build scripts + @ *2018-03-06 20:21:58 UTC* - - **ISSUE** `#46192`_: (*asymetrixs*) salt-log-setup: AttributeError 'NoneType' object has no attribute 'flush' - | refs: `#46310`_ `#46310`_ * ca28cfd4e4 Merge pull request `#46310`_ from twangboy/win_update_installer_build + * bcf8b19566 Update the installer build -- **PR** `#46316`_: (*twangboy*) Fix issues with the DSC module - @ *2018-03-06T20:16:18Z* +* **PR** `#46316`_: (`twangboy`_) Fix issues with the DSC module + @ *2018-03-06 20:16:18 UTC* * decccbeca3 Merge pull request `#46316`_ from twangboy/win_fix_dsc + * 2042d33d59 Fix issues with the DSC module -- **PR** `#46394`_: (*Ch3LL*) Add mac py2 and py3 packages to mac installation docs - @ *2018-03-06T16:45:30Z* +* **PR** `#46394`_: (`Ch3LL`_) Add mac py2 and py3 packages to mac installation docs + @ *2018-03-06 16:45:30 UTC* * 95586678c3 Merge pull request `#46394`_ from Ch3LL/mac_doc + * 158add6661 change oxdownload to oxdownload-{python_version} * 21aa848c89 Add mac py2 and py3 packages to mac installation docs -- **PR** `#46338`_: (*rallytime*) Remove cmd.wait deprecation reference in docs - @ *2018-03-05T21:48:52Z* +* **ISSUE** `#44831`_: (`kivoli`_) cmd.wait deprecated but cannot replicate conditional execution with onchanges (refs: `#46338`_) + +* **PR** `#46338`_: (`rallytime`_) Remove cmd.wait deprecation reference in docs + @ *2018-03-05 21:48:52 UTC* + + * 07b5d09ac1 Merge pull request `#46338`_ from rallytime/fix-44831 - - **ISSUE** `#44831`_: (*kivoli*) cmd.wait deprecated but cannot replicate conditional execution with onchanges - | refs: `#46338`_ - * 07b5d09ac1 Merge pull request `#46338`_ from rallytime/`fix-44831`_ * 90771da999 Remove cmd.wait deprecation reference in docs -- **PR** `#46333`_: (*danlsgiga*) Fixes color parameter mismatch and handles 204 responses correctly - @ *2018-03-05T19:42:26Z* +* **ISSUE** `#42438`_: (`ajoaugustine`_) Failed to send message: hipchat-message (refs: `#46333`_) + +* **PR** `#46333`_: (`danlsgiga`_) Fixes color parameter mismatch and handles 204 responses correctly + @ *2018-03-05 19:42:26 UTC* - - **ISSUE** `#42438`_: (*ajoaugustine*) Failed to send message: hipchat-message - | refs: `#46333`_ * 3849e7a085 Merge pull request `#46333`_ from danlsgiga/issue-42438 + * 3b13f37b44 Revert changes in the code and change docs instead * 38114a65d8 Fixes color parameter mismatch and handles 204 responses correctly -- **PR** `#46322`_: (*terminalmage*) yamlify_arg: don't treat leading dashes as lists - @ *2018-03-05T15:40:17Z* +* **ISSUE** `#44935`_: (`grinapo`_) module.file.replace string seems to be mutated into arrays (refs: `#46322`_) + +* **PR** `#46322`_: (`terminalmage`_) yamlify_arg: don't treat leading dashes as lists + @ *2018-03-05 15:40:17 UTC* - - **ISSUE** `#44935`_: (*grinapo*) module.file.replace string seems to be mutated into arrays - | refs: `#46322`_ * a8f2f1b063 Merge pull request `#46322`_ from terminalmage/issue44935 + * 85ac6a9893 yamlify_arg: don't treat leading dashes as lists -- **PR** `#46327`_: (*samilaine*) Modify the way a FQDN is handled in the vmware cloud provider. - @ *2018-03-05T15:35:37Z* +* **PR** `#46327`_: (`samilaine`_) Modify the way a FQDN is handled in the vmware cloud provider. + @ *2018-03-05 15:35:37 UTC* * da5c282cb2 Merge pull request `#46327`_ from samilaine/fix-vmware-cloud-fqdn + * 4b8dfb326f Modify the way a FQDN is handled in the vmware cloud provider. -- **PR** `#46318`_: (*terminalmage*) Skip type-checking for several gitfs/git_pillar/winrepo params - @ *2018-03-05T15:04:27Z* +* **PR** `#46318`_: (`terminalmage`_) Skip type-checking for several gitfs/git_pillar/winrepo params + @ *2018-03-05 15:04:27 UTC* * 78c45d3786 Merge pull request `#46318`_ from terminalmage/squelch-warnings + * 5889b36646 Skip type-checking for several gitfs/git_pillar/winrepo params -- **PR** `#46312`_: (*gtmanfred*) add module_dirs to salt ssh thin tarball - @ *2018-03-05T15:00:48Z* +* **ISSUE** `#45535`_: (`whytewolf`_) module_dirs left out salt-ssh, leaving custom ext_pillars and modules out of salt-ssh (refs: `#46312`_) + +* **PR** `#46312`_: (`gtmanfred`_) add module_dirs to salt ssh thin tarball + @ *2018-03-05 15:00:48 UTC* - - **ISSUE** `#45535`_: (*whytewolf*) module_dirs left out salt-ssh, leaving custom ext_pillars and modules out of salt-ssh - | refs: `#46312`_ * bb0d6fc263 Merge pull request `#46312`_ from gtmanfred/2017.7 + * 749ae580ed add module_dirs to salt ssh thin tarball -- **PR** `#46242`_: (*redbaron4*) Pass env_vars to pip.freeze - @ *2018-03-05T14:53:13Z* +* **ISSUE** `#46127`_: (`redbaron4`_) pip.installed does not pass env_vars when calling freeze to check if package is already installed (refs: `#46242`_) + +* **PR** `#46242`_: (`redbaron4`_) Pass env_vars to pip.freeze + @ *2018-03-05 14:53:13 UTC* + + * 88b5f7383d Merge pull request `#46242`_ from redbaron4/fix-46127 - - **ISSUE** `#46127`_: (*redbaron4*) pip.installed does not pass env_vars when calling freeze to check if package is already installed - | refs: `#46242`_ - * 88b5f7383d Merge pull request `#46242`_ from redbaron4/`fix-46127`_ * 06dba51617 Make changes from review - * 727ebe1056 Merge branch '2017.7' into `fix-46127`_ + * 727ebe1056 Merge branch '2017.7' into fix-46127 * 08d1ee8baf Fix Python3 test errors * aa9d709015 Pass env_vars to pip.freeze -- **PR** `#46265`_: (*Ch3LL*) Add username/password to profitbricks conf for cloud tests - @ *2018-03-02T21:40:22Z* +* **PR** `#46265`_: (`Ch3LL`_) Add username/password to profitbricks conf for cloud tests + @ *2018-03-02 21:40:22 UTC* * a0716643e4 Merge pull request `#46265`_ from Ch3LL/profit_cloud + * d4893eab4c Add username/password to profitbricks conf for cloud tests -- **PR** `#46306`_: (*rallytime*) Back-port `#46256`_ to 2017.7 - @ *2018-03-02T21:37:26Z* +* **PR** `#46306`_: (`rallytime`_) Back-port `#46256`_ to 2017.7 + @ *2018-03-02 21:37:26 UTC* + + * **PR** `#46256`_: (`rallytime`_) Don't install msgpack 0.5.5 (refs: `#46306`_) + + * ed7bffa7e0 Merge pull request `#46306`_ from rallytime/bp-46256 - - **PR** `#46256`_: (*rallytime*) Don't install msgpack 0.5.5 - | refs: `#46306`_ - * ed7bffa7e0 Merge pull request `#46306`_ from rallytime/`bp-46256`_ * 6439bce4a8 Don't install msgpack 0.5.5 -- **PR** `#46208`_: (*terminalmage*) Blacklist os.umask - @ *2018-03-02T18:46:07Z* +* **PR** `#46208`_: (`terminalmage`_) Blacklist os.umask + @ *2018-03-02 18:46:07 UTC* * 8c2c4e3316 Merge pull request `#46208`_ from terminalmage/audit-umask-usage + * 9c92aadce8 Disable blacklisted-function check for legitimate uses * 58a11aaa26 Disable pylint check in salt-ssh shim @@ -394,46 +454,45 @@ Changes: * 82ce546e18 Prevent failed os.makedirs from leaving modified umask in place -- **PR** `#46293`_: (*eliasp*) Fix Python3 comparison `TypeError` in `salt.modules.upstart` - @ *2018-03-02T16:36:10Z* +* **PR** `#46293`_: (`eliasp`_) Fix Python3 comparison `TypeError` in `salt.modules.upstart` + @ *2018-03-02 16:36:10 UTC* + + * **PR** `#44624`_: (`eliasp`_) Fix Traceback when using the `service.enabled` state on non-booted systems (refs: `#46293`_) - - **PR** `#44624`_: (*eliasp*) Fix Traceback when using the `service.enabled` state on non-booted systems - | refs: `#46293`_ * 978e869490 Merge pull request `#46293`_ from eliasp/2017.7-44624-py3-compat + * 2e08b0d9c8 Fix Python3 comparison `TypeError` in `salt.modules.upstart` -- **PR** `#46264`_: (*terminalmage*) Fix incorrect merge conflict resolution - @ *2018-03-02T14:21:13Z* +* **ISSUE** `#46128`_: (`Boulet-`_) Mountpoint in git_pillar (refs: `#46264`_) + +* **PR** `#46264`_: (`terminalmage`_) Fix incorrect merge conflict resolution + @ *2018-03-02 14:21:13 UTC* - - **ISSUE** `#46128`_: (*Boulet-*) Mountpoint in git_pillar - | refs: `#46264`_ * bee4a66d0c Merge pull request `#46264`_ from terminalmage/issue46128 + * 68000b7211 Fix incorrect merge conflict resolution -- **PR** `#46296`_: (*vutny*) [DOC] Add missing params to `pillar.get` docstring - @ *2018-03-02T14:19:41Z* +* **PR** `#46296`_: (`vutny`_) [DOC] Add missing params to `pillar.get` docstring + @ *2018-03-02 14:19:41 UTC* * 1e0b3aa348 Merge pull request `#46296`_ from vutny/doc-pillar-get + * 1faa8331e1 [DOC] Add missing params to `pillar.get` docstring -- **PR** `#45874`_: (*GwiYeong*) fix for local client timeout bug - @ *2018-03-01T19:39:35Z* +* **PR** `#45874`_: (`GwiYeong`_) fix for local client timeout bug + @ *2018-03-01 19:39:35 UTC* * c490a50452 Merge pull request `#45874`_ from GwiYeong/2017.7-local-client-hotfix + * 949aefc82b Merge branch '2017.7' into 2017.7-local-client-hotfix * 45d663f435 fix for local client timeout bug -- **PR** `#46261`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2018-03-01T17:55:23Z* +* **PR** `#46261`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2018-03-01 17:55:23 UTC* - - **ISSUE** `#46178`_: (*wedge-jarrad*) mount.mounted forces remount when 'credentials=file' is specified as an option - | refs: `#46179`_ - - **ISSUE** `#45136`_: (*etfeet*) salt state mount.mounted remounts cephfs every time when setting secretfile=path/to/secretfile option - | refs: `#46179`_ - - **PR** `#46253`_: (*rallytime*) Update docbanner for SaltConf18 - - **PR** `#46179`_: (*wedge-jarrad*) Add credentials and secretfile to mount.mounted mount_invisible_keys * 8e8a3a2897 Merge pull request `#46261`_ from rallytime/merge-2017.7 + * 8256ae5ee5 Merge branch '2016.11' into '2017.7' * 140ef4d6b9 Merge pull request `#46253`_ from rallytime/doc-banners @@ -444,105 +503,117 @@ Changes: * 9ca25c4313 Add credentials and secretfile to mount.mounted mount_invisible_keys -- **PR** `#46276`_: (*terminalmage*) salt.utils.docker.translate_input: operate on deepcopy of kwargs - @ *2018-03-01T15:37:44Z* +* **ISSUE** `#44046`_: (`t2b`_) docker_container.running states fail if the argument ulimits is set and a watch requisite is triggered (refs: `#46276`_) + +* **PR** `#46276`_: (`terminalmage`_) salt.utils.docker.translate_input: operate on deepcopy of kwargs + @ *2018-03-01 15:37:44 UTC* - - **ISSUE** `#44046`_: (*t2b*) docker_container.running states fail if the argument ulimits is set and a watch requisite is triggered - | refs: `#46276`_ * 88a3166589 Merge pull request `#46276`_ from terminalmage/issue44046 + * a14d4daf8c salt.utils.docker.translate_input: operate on deepcopy of kwargs -- **PR** `#46183`_: (*oeuftete*) Fix docker_container.running HostConfig Ulimits comparison - @ *2018-02-28T22:22:11Z* +* **ISSUE** `#46182`_: (`oeuftete`_) docker_container.running is sensitive to HostConfig Ulimits ordering (refs: `#46183`_) + +* **PR** `#46183`_: (`oeuftete`_) Fix docker_container.running HostConfig Ulimits comparison + @ *2018-02-28 22:22:11 UTC* - - **ISSUE** `#46182`_: (*oeuftete*) docker_container.running is sensitive to HostConfig Ulimits ordering - | refs: `#46183`_ * da60399b8f Merge pull request `#46183`_ from oeuftete/fix-docker-container-running-host-config-ulimits + * 5b09644429 Sort lists from Ulimits before comparing * 0b80f02226 Update old dockerng doc ref -- **PR** `#46260`_: (*terminalmage*) Normalize global git_pillar/winrepo config items - @ *2018-02-28T22:05:26Z* +* **ISSUE** `#46259`_: (`terminalmage`_) git_pillar_branch overrides branch defined in git_pillar configuration (refs: `#46260`_) + +* **ISSUE** `#46258`_: (`terminalmage`_) git_pillar_base doesn't work for values when PyYAML loads them as int/float (refs: `#46260`_) + +* **PR** `#46260`_: (`terminalmage`_) Normalize global git_pillar/winrepo config items + @ *2018-02-28 22:05:26 UTC* - - **ISSUE** `#46259`_: (*terminalmage*) git_pillar_branch overrides branch defined in git_pillar configuration - | refs: `#46260`_ - - **ISSUE** `#46258`_: (*terminalmage*) git_pillar_base doesn't work for values when PyYAML loads them as int/float - | refs: `#46260`_ * 509429f08c Merge pull request `#46260`_ from terminalmage/git_pillar + * b1ce2501fd Normalize global git_pillar/winrepo config items -- **PR** `#46101`_: (*jfindlay*) In OpenRC exec module, make sure to ignore retcode on status - @ *2018-02-28T20:01:37Z* +* **PR** `#46101`_: (`jfindlay`_) In OpenRC exec module, make sure to ignore retcode on status + @ *2018-02-28 20:01:37 UTC* * a97a3e6fb0 Merge pull request `#46101`_ from jfindlay/openrc_ret + * 2eef3c65a6 tests.unit.modules.gentoo_service add retcode arg * 81ec66fd8b modules.gentoo_service handle stopped retcode -- **PR** `#46254`_: (*rallytime*) Update enterprise banner - @ *2018-02-28T19:54:03Z* +* **PR** `#46254`_: (`rallytime`_) Update enterprise banner + @ *2018-02-28 19:54:03 UTC* * 1a17593c05 Merge pull request `#46254`_ from rallytime/enterprise-banner + * f5fae3dedf Update enterprise banner -- **PR** `#46250`_: (*terminalmage*) Add documentation to the fileserver runner - @ *2018-02-28T18:53:49Z* +* **PR** `#46250`_: (`terminalmage`_) Add documentation to the fileserver runner + @ *2018-02-28 18:53:49 UTC* * 8c50ff32bd Merge pull request `#46250`_ from terminalmage/runner-docs + * 91b4895087 Add documentation to the fileserver runner -- **PR** `#46243`_: (*racker-markh*) Don't ignore 'private_ips' unnecessarily - @ *2018-02-28T15:28:29Z* +* **ISSUE** `#46215`_: (`racker-markh`_) salt-cloud will only intermittently build rackspace cloud instances with purely private networks (refs: `#46243`_) + +* **PR** `#46243`_: (`racker-markh`_) Don't ignore 'private_ips' unnecessarily + @ *2018-02-28 15:28:29 UTC* - - **ISSUE** `#46215`_: (*racker-markh*) salt-cloud will only intermittently build rackspace cloud instances with purely private networks - | refs: `#46243`_ * 53067cca43 Merge pull request `#46243`_ from racker-markh/fix-openstack-private-network-issue + * 50c1e140f0 Don't check deny private_ips already in the original list of private_ips -- **PR** `#46239`_: (*terminalmage*) archive.extracted: don't check source file when if_missing path exists - @ *2018-02-28T15:01:36Z* +* **ISSUE** `#46109`_: (`rombert`_) archive.extracted takes a long time (> 4 minutes) even though directory exists (refs: `#46239`_) + +* **PR** `#46239`_: (`terminalmage`_) archive.extracted: don't check source file when if_missing path exists + @ *2018-02-28 15:01:36 UTC* - - **ISSUE** `#46109`_: (*rombert*) archive.extracted takes a long time (> 4 minutes) even though directory exists - | refs: `#46239`_ * 15405c8760 Merge pull request `#46239`_ from terminalmage/issue46109 + * 586d8b0dcf archive.extracted: don't check source file when if_missing path exists -- **PR** `#46221`_: (*terminalmage*) Fix hanging tests in integration suite - @ *2018-02-27T21:32:25Z* +* **PR** `#46221`_: (`terminalmage`_) Fix hanging tests in integration suite + @ *2018-02-27 21:32:25 UTC* * 633e1208e4 Merge pull request `#46221`_ from terminalmage/salt-jenkins-854 + * 0eb012659c Fix hanging tests in integration suite -- **PR** `#46214`_: (*vutny*) [DOC] Replace `note` rST block for GitHub - @ *2018-02-27T17:42:37Z* +* **PR** `#46214`_: (`vutny`_) [DOC] Replace `note` rST block for GitHub + @ *2018-02-27 17:42:37 UTC* * 7917277345 Merge pull request `#46214`_ from vutny/formulas-readme-formatting + * d702846961 [DOC] Replace `note` rST block for GitHub -- **PR** `#46203`_: (*Ch3LL*) Add 2017.7.5 Release Notes File - @ *2018-02-26T21:17:48Z* +* **PR** `#46203`_: (`Ch3LL`_) Add 2017.7.5 Release Notes File + @ *2018-02-26 21:17:48 UTC* * a2e099b744 Merge pull request `#46203`_ from Ch3LL/7.5_release + * 6ddf3246ce Add 2017.7.5 Release Notes File -- **PR** `#46201`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2018-02-26T18:56:47Z* +* **PR** `#46201`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2018-02-26 18:56:47 UTC* - - **PR** `#46132`_: (*rallytime*) Update release versions for the 2016.11 branch * 973b227818 Merge pull request `#46201`_ from rallytime/merge-2017.7 + * 9ac2101baa Merge branch '2016.11' into '2017.7' * a4c5417d23 Merge pull request `#46132`_ from rallytime/2016.11_update_version_doc * d2196b6df3 Update release versions for the 2016.11 branch -- **PR** `#46139`_: (*bdrung*) Add os grains test cases for Debian/Ubuntu and fix oscodename on Ubuntu - @ *2018-02-26T16:44:04Z* +* **ISSUE** `#34423`_: (`bdrung`_) oscodename wrong on Debian 8 (jessie) (refs: `#46139`_) + +* **PR** `#46139`_: (`bdrung`_) Add os grains test cases for Debian/Ubuntu and fix oscodename on Ubuntu + @ *2018-02-26 16:44:04 UTC* - - **ISSUE** `#34423`_: (*bdrung*) oscodename wrong on Debian 8 (jessie) - | refs: `#46139`_ * 89cf2e5061 Merge pull request `#46139`_ from bdrung/os-grains + * 0b445f2a37 tests: Add unit tests for _parse_os_release() * f6069b77ed Fix osfinger grain on Debian @@ -561,40 +632,45 @@ Changes: * 1d6ef731fe tests: Deduplicate _run_os_grains_tests() -- **PR** `#46133`_: (*rallytime*) Update release versions for the 2017.7 branch - @ *2018-02-26T16:42:43Z* +* **PR** `#46133`_: (`rallytime`_) Update release versions for the 2017.7 branch + @ *2018-02-26 16:42:43 UTC* * c8c71e75ca Merge pull request `#46133`_ from rallytime/2017.7_update_version_doc + * 0ed338e643 Update release versions for the 2017.7 branch -- **PR** `#46185`_: (*terminalmage*) gitfs: Fix detection of base env when its ref is also mapped to a different env - @ *2018-02-26T14:52:16Z* +* **ISSUE** `#46124`_: (`moremo`_) GitFS saltenv ref won't pick up multiple of the same ref (refs: `#46185`_) + +* **PR** `#46185`_: (`terminalmage`_) gitfs: Fix detection of base env when its ref is also mapped to a different env + @ *2018-02-26 14:52:16 UTC* - - **ISSUE** `#46124`_: (*moremo*) GitFS saltenv ref won't pick up multiple of the same ref - | refs: `#46185`_ * 390d592aa6 Merge pull request `#46185`_ from terminalmage/issue46124 + * 3b58dd0da0 gitfs: Fix detection of base env when its ref is also mapped to a different env -- **PR** `#46148`_: (*rallytime*) [2017.7] Merge forward from 2017.7.3 to 2017.7 - @ *2018-02-23T19:21:38Z* +* **PR** `#46148`_: (`rallytime`_) [2017.7] Merge forward from 2017.7.3 to 2017.7 + @ *2018-02-23 19:21:38 UTC* * 705caa8cca Merge pull request `#46148`_ from rallytime/merge-2017.7 + * 25deebf7a6 Merge branch '2017.7.3' into '2017.7' -- **PR** `#46137`_: (*damon-atkins*) [2017.7] update ec2 pillar arguments with better names - @ *2018-02-23T13:32:04Z* +* **PR** `#46137`_: (`damon-atkins`_) [2017.7] update ec2 pillar arguments with better names + @ *2018-02-23 13:32:04 UTC* + + * **PR** `#45878`_: (`damon-atkins`_) ec2_pillar update to fix finding instance-id (refs: `#46137`_) - - **PR** `#45878`_: (*damon-atkins*) ec2_pillar update to fix finding instance-id - | refs: `#46137`_ `#46137`_ `#46137`_ * 10a47dcbc4 Merge pull request `#46137`_ from damon-atkins/2017.7_fix_ec2_pillar2 + * 99e7f6a7d3 update ec2 pillar arguments with better names -- **PR** `#46145`_: (*terminalmage*) 3 small fixes for runners/orchestration - @ *2018-02-22T22:11:11Z* +* **ISSUE** `#46004`_: (`github-abcde`_) opts file_roots gets overwritten with pillar_roots in orchestration run (refs: `#46145`_) + +* **PR** `#46145`_: (`terminalmage`_) 3 small fixes for runners/orchestration + @ *2018-02-22 22:11:11 UTC* - - **ISSUE** `#46004`_: (*github-abcde*) opts file_roots gets overwritten with pillar_roots in orchestration run - | refs: `#46145`_ * d74cb14557 Merge pull request `#46145`_ from terminalmage/issue46004 + * 467ff841cd pillarenv argument should default to None and not the value from opts * 2a185855ea Better solution for fixing the opts munging in pillar.show_pillar runner @@ -609,79 +685,74 @@ Changes: * e0940a9fc4 Properly detect use of the state.orch alias and add orch jid to kwargs -- **PR** `#46135`_: (*rallytime*) Back-port `#46088`_ to 2017.7 - @ *2018-02-22T15:11:14Z* +* **PR** `#46135`_: (`rallytime`_) Back-port `#46088`_ to 2017.7 + @ *2018-02-22 15:11:14 UTC* + + * **PR** `#46088`_: (`rongzeng54`_) fix kernel subpackages install bug (refs: `#46135`_) + + * 0398ce0482 Merge pull request `#46135`_ from rallytime/bp-46088 - - **PR** `#46088`_: (*rongzeng54*) fix kernel subpackages install bug - | refs: `#46135`_ - * 0398ce0482 Merge pull request `#46135`_ from rallytime/`bp-46088`_ * 57a60f62a3 fix kernel subpackages install bug -- **PR** `#46136`_: (*rallytime*) Back-port `#46115`_ to 2017.7 - @ *2018-02-21T19:17:23Z* +* **ISSUE** `#45837`_: (`johje349`_) Salt Cloud does not recognise all Digitalocean sizes (refs: `#46115`_) + +* **PR** `#46136`_: (`rallytime`_) Back-port `#46115`_ to 2017.7 + @ *2018-02-21 19:17:23 UTC* + + * **PR** `#46115`_: (`samodid`_) update digitalocean salt-cloud driver (refs: `#46136`_) + + * 1fcbbd1e02 Merge pull request `#46136`_ from rallytime/bp-46115 - - **ISSUE** `#45837`_: (*johje349*) Salt Cloud does not recognise all Digitalocean sizes - | refs: `#46115`_ - - **PR** `#46115`_: (*samodid*) update digitalocean salt-cloud driver - | refs: `#46136`_ - * 1fcbbd1e02 Merge pull request `#46136`_ from rallytime/`bp-46115`_ * 0a481d707f update digitalocean salt-cloud driver -- **PR** `#45911`_: (*twangboy*) LGPO Module: Convert reg values to unicode for debug - @ *2018-02-21T19:02:17Z* +* **PR** `#45911`_: (`twangboy`_) LGPO Module: Convert reg values to unicode for debug + @ *2018-02-21 19:02:17 UTC* * 11e5e8eb86 Merge pull request `#45911`_ from twangboy/win_fix_lgpo_unicode + * bcde5cc625 Update log statement * e9fa53d3b7 Change the Invalid Data Message * c818d4b791 Convert reg values to unicode for debug -- **PR** `#46123`_: (*gtmanfred*) If no pubkey is passed in openmode fail - @ *2018-02-21T19:01:47Z* +* **ISSUE** `#46085`_: (`zmedico`_) 2017.7.3 salt master with "open_mode: True" becomes unresponsive if minion submits empty public key (refs: `#46123`_) + +* **PR** `#46123`_: (`gtmanfred`_) If no pubkey is passed in openmode fail + @ *2018-02-21 19:01:47 UTC* - - **ISSUE** `#46085`_: (*zmedico*) 2017.7.3 salt master with "open_mode: True" becomes unresponsive if minion submits empty public key - | refs: `#46123`_ * 524a6a72a0 Merge pull request `#46123`_ from gtmanfred/2017.7 + * 8d36730ef7 If no pubkey is passed in openmode fail -- **PR** `#46131`_: (*vutny*) [DOC] Fix code-blocks for reStructuredText - @ *2018-02-21T15:47:05Z* +* **PR** `#46131`_: (`vutny`_) [DOC] Fix code-blocks for reStructuredText + @ *2018-02-21 15:47:05 UTC* * e48fa58012 Merge pull request `#46131`_ from vutny/doc-formula-formatting + * d8fb051e44 [DOC] Fix code-blocks for reStructuredText -- **PR** `#46118`_: (*rallytime*) Back-port `#44603`_ to 2017.7 - @ *2018-02-21T15:21:42Z* +* **ISSUE** `#42763`_: (`xuhcc`_) acme.cert state falsely reports about renewed certificate (refs: `#44603`_) + +* **ISSUE** `#40208`_: (`bewing`_) Inconsistent state return when test=True (refs: `#44603`_) + +* **PR** `#46118`_: (`rallytime`_) Back-port `#44603`_ to 2017.7 + @ *2018-02-21 15:21:42 UTC* + + * **PR** `#44603`_: (`oarmstrong`_) Fix acme state to correctly return on test (refs: `#46118`_) + + * 6cea44ee95 Merge pull request `#46118`_ from rallytime/bp-44603 - - **ISSUE** `#42763`_: (*xuhcc*) acme.cert state falsely reports about renewed certificate - | refs: `#44603`_ - - **ISSUE** `#40208`_: (*bewing*) Inconsistent state return when test=True - | refs: `#44603`_ - - **PR** `#44603`_: (*oarmstrong*) Fix acme state to correctly return on test - | refs: `#46118`_ - * 6cea44ee95 Merge pull request `#46118`_ from rallytime/`bp-44603`_ * 2a2c23c66b Fix acme state to correctly return on test -- **PR** `#46121`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2018-02-21T10:07:18Z* +* **PR** `#46121`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2018-02-21 10:07:18 UTC* - - **ISSUE** `#45910`_: (*lorengordon*) 2016.11.9: UnicodeDecodeError traceback in reg.present - | refs: `#46000`_ - - **ISSUE** `#45790`_: (*bdarnell*) Test with Tornado 5.0b1 - | refs: `#46066`_ - - **PR** `#46093`_: (*wedge-jarrad*) Fix contributing doc typo - - **PR** `#46076`_: (*rallytime*) Back-port `#46066`_ to 2016.11 - - **PR** `#46066`_: (*rallytime*) Pin tornado version in requirements file - | refs: `#46076`_ - - **PR** `#46011`_: (*terminalmage*) cmdmod.py: runas workaround for platforms that don't set a USER env var - - **PR** `#46000`_: (*terminalmage*) salt.states.reg.present: Prevent traceback when reg data is binary - - **PR** `#45992`_: (*bgridley*) Add vpc_peering_connection_id to describe_route_tables route_keys - - **PR** `#45467`_: (*twangboy*) Exclude hidden directories in pkg.refresh_db * 16c382b55b Merge pull request `#46121`_ from rallytime/merge-2017.7 + * 4c2f504a85 Merge branch '2016.11' into '2017.7' - * e197a0fbc5 Merge pull request `#46076`_ from rallytime/`bp-46066`_ + * e197a0fbc5 Merge pull request `#46076`_ from rallytime/bp-46066 * b94d73c53e Pin tornado version in requirements file @@ -727,60 +798,67 @@ Changes: * 2f712691cf Exclude hidden directories in pkg.refresh_db -- **PR** `#46107`_: (*amendlik*) Add --assumeyes on YUM/DNF commands - @ *2018-02-20T22:52:06Z* +* **ISSUE** `#46106`_: (`amendlik`_) yumpkg.refresh_db hangs (refs: `#46107`_) + +* **PR** `#46107`_: (`amendlik`_) Add --assumeyes on YUM/DNF commands + @ *2018-02-20 22:52:06 UTC* - - **ISSUE** `#46106`_: (*amendlik*) yumpkg.refresh_db hangs - | refs: `#46107`_ * b92346645b Merge pull request `#46107`_ from amendlik/yumpkg-assumeyes + * 8d9a432fb2 Add --assumeyes to yum/dnf commands in yumpkg.refresh_db -- **PR** `#46094`_: (*kstreee*) Fix memory leak - @ *2018-02-20T21:36:02Z* +* **PR** `#46094`_: (`kstreee`_) Fix memory leak + @ *2018-02-20 21:36:02 UTC* * 14fe423e0c Merge pull request `#46094`_ from kstreee/fix-memory-leak + * 48080a1bae Fixes memory leak, saltclients should be cleaned after used. * aba00805f4 Adds set_close_callback function to removes stream instance after closed from a set streams. -- **PR** `#46097`_: (*vutny*) [DOC] Put https link to the formulas doc page - @ *2018-02-20T17:07:39Z* +* **ISSUE** `#13`_: (`thatch45`_) Expand the stats module (refs: `#46097`_) + +* **PR** `#46097`_: (`vutny`_) [DOC] Put https link to the formulas doc page + @ *2018-02-20 17:07:39 UTC* - - **ISSUE** `#13`_: (*thatch45*) Expand the stats module - | refs: `#46097`_ * 320c2037e1 Merge pull request `#46097`_ from vutny/fix-https-link + * 2062fd0e5c [DOC] Put https link to the formulas doc page -- **PR** `#46103`_: (*bdrung*) Fix skipping Kubernetes tests if client is not installed - @ *2018-02-20T16:33:42Z* +* **PR** `#46103`_: (`bdrung`_) Fix skipping Kubernetes tests if client is not installed + @ *2018-02-20 16:33:42 UTC* * 0eb137fb4e Merge pull request `#46103`_ from bdrung/2017.7 + * dd3f936557 Fix skipping Kubernetes tests if client is not installed -- **PR** `#46070`_: (*Ch3LL*) add required arg to dns_check jinja doc example - @ *2018-02-16T20:00:44Z* +* **PR** `#46070`_: (`Ch3LL`_) add required arg to dns_check jinja doc example + @ *2018-02-16 20:00:44 UTC* * c3a938e994 Merge pull request `#46070`_ from Ch3LL/fix-doc-dns + * 2a5d855d97 add required arg to dns_check jinja doc example -- **PR** `#46067`_: (*rallytime*) Back-port `#45994`_ to 2017.7 - @ *2018-02-16T19:55:27Z* +* **PR** `#46067`_: (`rallytime`_) Back-port `#45994`_ to 2017.7 + @ *2018-02-16 19:55:27 UTC* + + * **PR** `#45994`_: (`nullify005`_) Fix hosted zone Comment updates & quote TXT entries correctly (refs: `#46067`_) + + * 01042e9d77 Merge pull request `#46067`_ from rallytime/bp-45994 - - **PR** `#45994`_: (*nullify005*) Fix hosted zone Comment updates & quote TXT entries correctly - | refs: `#46067`_ - * 01042e9d77 Merge pull request `#46067`_ from rallytime/`bp-45994`_ * a07bb48726 Correct formatting for lint * e8678f633d Fix Comment being None not '' and inject quotes into the TXT ChangeRecords -- **PR** `#45932`_: (*The-Loeki*) Fix cmd run_all bg error - @ *2018-02-16T14:53:15Z* +* **ISSUE** `#42932`_: (`bobrik`_) cmd.run with bg: true doesn't fail properly (refs: `#45932`_) + +* **PR** `#45932`_: (`The-Loeki`_) Fix cmd run_all bg error + @ *2018-02-16 14:53:15 UTC* + + * **PR** `#39980`_: (`vutny`_) [2016.3] Allow to use `bg` kwarg for `cmd.run` state function (refs: `#45932`_) - - **ISSUE** `#42932`_: (*bobrik*) cmd.run with bg: true doesn't fail properly - | refs: `#45932`_ - - **PR** `#39980`_: (*vutny*) [2016.3] Allow to use `bg` kwarg for `cmd.run` state function - | refs: `#45932`_ * 5e0e2a30e2 Merge pull request `#45932`_ from The-Loeki/fix_cmd_run_all_bg + * f83da27ca5 Merge branch '2017.7' into fix_cmd_run_all_bg * 771758fbca Merge branch '2017.7' into fix_cmd_run_all_bg @@ -789,16 +867,18 @@ Changes: * ebb1f81a9b cmd run: when running in bg, force ignore_retcode=True -- **PR** `#46062`_: (*vutny*) Fix typo in postgres_user.present state function - @ *2018-02-16T14:44:29Z* +* **PR** `#46062`_: (`vutny`_) Fix typo in postgres_user.present state function + @ *2018-02-16 14:44:29 UTC* * 45ace39961 Merge pull request `#46062`_ from vutny/pg-user-state-fix-typo + * a5fbe4e95e Fix typo in postgres_user.present state function -- **PR** `#45763`_: (*twangboy*) Fix rehash function in win_path.py - @ *2018-02-15T20:05:16Z* +* **PR** `#45763`_: (`twangboy`_) Fix rehash function in win_path.py + @ *2018-02-15 20:05:16 UTC* * edcb64de76 Merge pull request `#45763`_ from twangboy/win_fix_path_rehash + * b9a2bc7b29 Fix hyperlinks * 29912adc15 Move the test_rehash test to test_win_functions @@ -817,48 +897,52 @@ Changes: * 967b83940c Fix rehash function -- **PR** `#46042`_: (*jfindlay*) Revise file_tree pillar module documentation - @ *2018-02-15T19:29:52Z* +* **PR** `#46042`_: (`jfindlay`_) Revise file_tree pillar module documentation + @ *2018-02-15 19:29:52 UTC* + + * **PR** `#46027`_: (`jfindlay`_) Revise file_tree pillar module documentation (refs: `#46042`_) - - **PR** `#46027`_: (*jfindlay*) Revise file_tree pillar module documentation - | refs: `#46042`_ * a46fbc546c Merge pull request `#46042`_ from jfindlay/file_tree_doc + * 0ba4954a4b salt.pillar.file_tree revise module documentation * 3c6a5bf967 salt.pillar.file_tree provide better debug info * bb1cdc451e salt.pillar.file_tree no stack trace when nodegroups undefined -- **PR** `#46013`_: (*rallytime*) Back-port `#45598`_ to 2017.7 - @ *2018-02-15T16:11:05Z* +* **PR** `#46013`_: (`rallytime`_) Back-port `#45598`_ to 2017.7 + @ *2018-02-15 16:11:05 UTC* + + * **PR** `#45598`_: (`nullify005`_) Patch around ResourceRecords needing to be present for AliasTarget (refs: `#46013`_) + + * de86126dd8 Merge pull request `#46013`_ from rallytime/bp-45598 - - **PR** `#45598`_: (*nullify005*) Patch around ResourceRecords needing to be present for AliasTarget - | refs: `#46013`_ - * de86126dd8 Merge pull request `#46013`_ from rallytime/`bp-45598`_ * 2ea3fef543 No lazy logging * f427b0febc Change formatting style of logging lines per review * ebb244396b Patch around ResourceRecords needing to be present for AliasTarget entries to work -- **PR** `#46016`_: (*rallytime*) Back-port `#45826`_ to 2017.7 - @ *2018-02-14T18:16:24Z* +* **ISSUE** `#45825`_: (`philpep`_) selinux.fcontext_policy_present doesn't work on Centos 6 with filetype = all files (refs: `#45826`_) + +* **PR** `#46016`_: (`rallytime`_) Back-port `#45826`_ to 2017.7 + @ *2018-02-14 18:16:24 UTC* + + * **PR** `#45826`_: (`philpep`_) Fix selinux.fcontext_policy_present for Centos 6 (refs: `#46016`_) + + * 07e5735471 Merge pull request `#46016`_ from rallytime/bp-45826 - - **ISSUE** `#45825`_: (*philpep*) selinux.fcontext_policy_present doesn't work on Centos 6 with filetype = all files - | refs: `#45826`_ - - **PR** `#45826`_: (*philpep*) Fix selinux.fcontext_policy_present for Centos 6 - | refs: `#46016`_ - * 07e5735471 Merge pull request `#46016`_ from rallytime/`bp-45826`_ * 1916e5c4a4 Fix selinux.fcontext_policy_present for Centos 6 -- **PR** `#46015`_: (*rallytime*) Back-port `#45785`_ to 2017.7 - @ *2018-02-14T18:16:09Z* +* **ISSUE** `#45784`_: (`oarmstrong`_) SELinux module fcontext_get_policy fails with long regex (refs: `#45785`_) + +* **PR** `#46015`_: (`rallytime`_) Back-port `#45785`_ to 2017.7 + @ *2018-02-14 18:16:09 UTC* + + * **PR** `#45785`_: (`oarmstrong`_) m/selinux.fcontext_get_policy allow long filespecs (refs: `#46015`_) + + * a1f4092811 Merge pull request `#46015`_ from rallytime/bp-45785 - - **ISSUE** `#45784`_: (*oarmstrong*) SELinux module fcontext_get_policy fails with long regex - | refs: `#45785`_ `#45785`_ `#45785`_ - - **PR** `#45785`_: (*oarmstrong*) m/selinux.fcontext_get_policy allow long filespecs - | refs: `#46015`_ - * a1f4092811 Merge pull request `#46015`_ from rallytime/`bp-45785`_ * ef6ffb1492 Resolve linting errors * 8047066c46 Remove unused import @@ -869,47 +953,52 @@ Changes: * a830a6e819 m/selinux.fcontext_get_policy allow long filespecs -- **PR** `#46012`_: (*rallytime*) Back-port `#45462`_ to 2017.7 - @ *2018-02-14T18:14:56Z* +* **PR** `#46012`_: (`rallytime`_) Back-port `#45462`_ to 2017.7 + @ *2018-02-14 18:14:56 UTC* + + * **PR** `#45462`_: (`aphor`_) emit port cli version, variants as separate args (refs: `#46012`_) + + * 96097c037e Merge pull request `#46012`_ from rallytime/bp-45462 - - **PR** `#45462`_: (*aphor*) emit port cli version, variants as separate args - | refs: `#46012`_ - * 96097c037e Merge pull request `#46012`_ from rallytime/`bp-45462`_ * 9f76836a6c emit port cli version, variants as separate args -- **PR** `#45991`_: (*terminalmage*) yumpkg: Fix a couple issues with _get_extra_opts - @ *2018-02-14T16:48:28Z* +* **PR** `#45991`_: (`terminalmage`_) yumpkg: Fix a couple issues with _get_extra_opts + @ *2018-02-14 16:48:28 UTC* * 1279924f5f Merge pull request `#45991`_ from terminalmage/fix-duplicate-extra-opts + * 916766f651 yumpkg: Fix a couple issues with _get_extra_opts -- **PR** `#46017`_: (*rallytime*) [2017.7] Merge forward from 2017.7.3 to 2017.7 - @ *2018-02-13T21:43:15Z* +* **PR** `#46017`_: (`rallytime`_) [2017.7] Merge forward from 2017.7.3 to 2017.7 + @ *2018-02-13 21:43:15 UTC* * 8b9adc258e Merge pull request `#46017`_ from rallytime/merge-2017.7 + * a06645ce71 Merge branch '2017.7.3' into '2017.7' -- **PR** `#45988`_: (*rallytime*) Back-port `#45797`_ to 2017.7 - @ *2018-02-13T17:49:02Z* +* **ISSUE** `#45796`_: (`L4rS6`_) aliases module doesn't follow symlinks (refs: `#45797`_) + +* **PR** `#45988`_: (`rallytime`_) Back-port `#45797`_ to 2017.7 + @ *2018-02-13 17:49:02 UTC* + + * **PR** `#45797`_: (`L4rS6`_) follow symlinks in aliases module (close `#45796`_) (refs: `#45988`_) + + * d20ff89414 Merge pull request `#45988`_ from rallytime/bp-45797 - - **ISSUE** `#45796`_: (*L4rS6*) aliases module doesn't follow symlinks - | refs: `#45797`_ - - **PR** `#45797`_: (*L4rS6*) follow symlinks in aliases module (close `#45796`_) - | refs: `#45988`_ - * d20ff89414 Merge pull request `#45988`_ from rallytime/`bp-45797`_ * 953a400d79 follow symlinks -- **PR** `#45711`_: (*bdrung*) Fix Unicode tests when run with LC_ALL=POSIX - @ *2018-02-13T17:42:07Z* +* **PR** `#45711`_: (`bdrung`_) Fix Unicode tests when run with LC_ALL=POSIX + @ *2018-02-13 17:42:07 UTC* * b18087cee0 Merge pull request `#45711`_ from bdrung/fix-unicode-tests + * b6181b5ed6 Fix Unicode tests when run with LC_ALL=POSIX -- **PR** `#45878`_: (*damon-atkins*) ec2_pillar update to fix finding instance-id - | refs: `#46137`_ `#46137`_ `#46137`_ - @ *2018-02-13T17:34:14Z* +* **PR** `#45878`_: (`damon-atkins`_) ec2_pillar update to fix finding instance-id (refs: `#46137`_) + @ *2018-02-13 17:34:14 UTC* * 5271fb1d40 Merge pull request `#45878`_ from damon-atkins/2017.7_fix_ec2_pillar + * 0e74025714 Merge branch '2017.7' into 2017.7_fix_ec2_pillar * b4d0b23891 py3 fix @@ -920,26 +1009,31 @@ Changes: * afb3968aa7 ec2_pillar could not find instance-id, resolved. add support to use any tag to compare minion id against. -- **PR** `#45942`_: (*terminalmage*) Fix incorrect translation of docker port_bindings -> ports (2017.7 branch) - @ *2018-02-13T16:10:03Z* +* **PR** `#45942`_: (`terminalmage`_) Fix incorrect translation of docker port_bindings -> ports (2017.7 branch) + @ *2018-02-13 16:10:03 UTC* * cf367dbd04 Merge pull request `#45942`_ from terminalmage/issue45679-2017.7 + * 89cbd72a0d Don't try to sort ports when translating docker input * 9cd47b39dd Fix incorrect translation of docker port_bindings -> ports -- **PR** `#45959`_: (*rallytime*) A couple of grammar updates for the state compiler docs - @ *2018-02-12T22:17:49Z* +* **PR** `#45959`_: (`rallytime`_) A couple of grammar updates for the state compiler docs + @ *2018-02-12 22:17:49 UTC* * dae41de7a8 Merge pull request `#45959`_ from rallytime/state-doc-update + * 6f781cb95d A couple of grammar updates for the state compiler docs -- **PR** `#45908`_: (*tintoy*) Fix for `#45884`_ ("TypeError: can't serialize `. -This release is still in progress and has not been released yet. +Version 2017.7.6 is a bugfix release for :ref:`2017.7.0 `. + +Statistics +========== + +- Total Merges: **182** +- Total Issue References: **60** +- Total PR References: **217** + +- Contributors: **47** (`Ch3LL`_, `DmitryKuzmenko`_, `GwiYeong`_, `Quarky9`_, `RichardW42`_, `UtahDave`_, `amaclean199`_, `arif-ali`_, `baniobloom`_, `bdrung`_, `benediktwerner`_, `bmiguel-teixeira`_, `cachedout`_, `dafenko`_, `damon-atkins`_, `dwoz`_, `ezh`_, `folti`_, `fpicot`_, `frogunder`_, `garethgreenaway`_, `gtmanfred`_, `isbm`_, `jeroennijhof`_, `jfindlay`_, `jfoboss`_, `kstreee`_, `lomeroe`_, `mattp-`_, `meaksh`_, `mirceaulinic`_, `myinitialsarepm`_, `mzbroch`_, `nages13`_, `paclat`_, `pcjeff`_, `pruiz`_, `psyer`_, `rallytime`_, `s0undt3ch`_, `skizunov`_, `smitty42`_, `terminalmage`_, `twangboy`_, `vutny`_, `yagnik`_, `yannj-fr`_) + +Tornado 5.0 Support for Python 2 Only +------------------------------------- + +Tornado 5.0 moves to using asyncio for all python3 versions. Because of this +and changes in asyncio between python 3.4 and 3.5 to only be able to use one +ioloop, which requires some rearchitecting, support for tornado 5.0 and python3 +versions of salt has been delayed to a later release. + +For now, to use tornado 5.0, the python 2 version of salt must be used. + +Tornado 5.0 Support for Python 2 Only +------------------------------------- + +Tornado 5.0 moves to using asyncio for all python3 versions. Because of this +and changes in asyncio between python 3.4 and 3.5 to only be able to use one +ioloop, which requires some rearchitecting, support for tornado 5.0 and python3 +versions of salt has been delayed to a later release. + +For now, to use tornado 5.0, the python 2 version of salt must be used. Option to Return to Previous Pillar Include Behavior ----------------------------------------------------- +==================================================== Prior to version 2017.7.3, keys from :ref:`pillar includes ` would be merged on top of the pillar SLS. Since 2017.7.3, the includes are @@ -15,42 +43,56 @@ merged together and then the pillar SLS is merged on top of that. The :conf_master:`pillar_includes_override_sls` option has been added allow users to switch back to the pre-2017.7.3 behavior. -Changes for v2017.7.5..v2017.7.6 ---------------------------------------------------------------- -Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs): +Changelog for v2017.7.5..v2017.7.6 +================================== -*Generated at: 2018-05-21T13:58:57Z* +*Generated at: 2018-05-29 14:05:53 UTC* -Statistics: +* **PR** `#47775`_: (`gtmanfred`_) catch UnsupportedOperation with AssertionError + @ *2018-05-22 19:04:13 UTC* -- Total Merges: **179** -- Total Issue references: **63** -- Total PR references: **217** + * edf94c915e Merge pull request `#47775`_ from gtmanfred/2017.7.6 -Changes: + * 548f65d056 catch UnsupportedOperation with AssertionError +* **PR** `#47769`_: (`gtmanfred`_) skip test that breaks test suite + @ *2018-05-22 15:12:54 UTC* -- **PR** `#47702`_: (*damon-atkins*) State pkg.latest called win pkg.install with list of pkgs and the required versions - @ *2018-05-19T11:21:23Z* + * 8c38ecd75f Merge pull request `#47769`_ from gtmanfred/2017.7.6 + + * 3fdfc0fa82 skip test that breaks test suite + +* **PR** `#47747`_: (`Ch3LL`_) Add changelog to 2017.7.6 release notes + @ *2018-05-21 14:25:00 UTC* + + * 0d5b473ce2 Merge pull request `#47747`_ from Ch3LL/rn_2017.7.6 + + * d4aa83b92d Add changelog to 2017.7.6 release notes + +* **ISSUE** `#47484`_: (`whytewolf`_) Windows: pkg.latest state not updating packages. (refs: `#47702`_) + +* **PR** `#47702`_: (`damon-atkins`_) State pkg.latest called win pkg.install with list of pkgs and the required versions + @ *2018-05-19 11:21:23 UTC* - - **ISSUE** `#47484`_: (*whytewolf*) Windows: pkg.latest state not updating packages. - | refs: `#47702`_ * 8a5b34f7d9 Merge pull request `#47702`_ from damon-atkins/2017.7.6_fix_pkg.latest_state + * adcc094e08 Merge branch '2017.7.6' into 2017.7.6_fix_pkg.latest_state -- **PR** `#47700`_: (*yannj-fr*) fix roots modification time check - @ *2018-05-18T18:42:17Z* +* **PR** `#47700`_: (`yannj-fr`_) fix roots modification time check + @ *2018-05-18 18:42:17 UTC* * d610c192d9 Merge pull request `#47700`_ from yannj-fr/2017.7.6 + * 961c1ef61e fix roots modification time check * 2a73e905df Merge branch '2017.7.6' into 2017.7.6 -- **PR** `#47632`_: (*gtmanfred*) handle new _create_stream in tornado 5.0 - @ *2018-05-18T14:25:17Z* +* **PR** `#47632`_: (`gtmanfred`_) handle new _create_stream in tornado 5.0 + @ *2018-05-18 14:25:17 UTC* * 266749420f Merge pull request `#47632`_ from gtmanfred/2017.7.6 + * 2c50c0d2f5 fix pylint * 4a29057b16 Fix last test for tornado @@ -59,12 +101,13 @@ Changes: * 62e468448b handle new _create_stream in tornado 5.0 -- **PR** `#47720`_: (*rallytime*) Back-port `#47692`_ to 2017.7.6 - @ *2018-05-18T13:23:03Z* +* **PR** `#47720`_: (`rallytime`_) Back-port `#47692`_ to 2017.7.6 + @ *2018-05-18 13:23:03 UTC* + + * **PR** `#47692`_: (`dwoz`_) Default windows to m1.small for ec2-classic (refs: `#47720`_) + + * 2643c356af Merge pull request `#47720`_ from rallytime/bp-47692-2017.7.6 - - **PR** `#47692`_: (*dwoz*) Default windows to m1.small for ec2-classic - | refs: `#47720`_ - * 2643c356af Merge pull request `#47720`_ from rallytime/`bp-47692`_-2017.7.6 * 6e5cb36839 Default windows to m1.small for ec2-classic * 20d9785244 fix roots modification time check @@ -79,26 +122,29 @@ Changes: * 075d3d3c49 pkg.install execution module on windows ensures the software package is installed when no version is specified, it does not upgrade the software to the latest. This is per the design. pkg.latest must provide the versions to install to pkg.install -- **PR** `#47667`_: (*Ch3LL*) Update test_mac_user_enable_auto_login to test both py2 and py3 - @ *2018-05-16T15:54:49Z* +* **PR** `#47667`_: (`Ch3LL`_) Update test_mac_user_enable_auto_login to test both py2 and py3 + @ *2018-05-16 15:54:49 UTC* * 16c2153385 Merge pull request `#47667`_ from Ch3LL/mac_user_enable + * ba40d3d1a1 Update test_mac_user_enable_auto_login to test both py2 and py3 -- **PR** `#47645`_: (*Ch3LL*) query the pip path for test test_issue_2087_missing_pip - @ *2018-05-15T17:16:10Z* +* **PR** `#47645`_: (`Ch3LL`_) query the pip path for test test_issue_2087_missing_pip + @ *2018-05-15 17:16:10 UTC* * a4921e86c9 Merge pull request `#47645`_ from Ch3LL/py3_rm_pip + * 225d90ad4c query the pip path for test test_issue_2087_missing_pip -- **PR** `#47646`_: (*rallytime*) Back-port `#47601`_ and `#47643`_ to 2017.7.6 - @ *2018-05-15T14:04:45Z* +* **PR** `#47646`_: (`rallytime`_) Back-port `#47601`_ and `#47643`_ to 2017.7.6 + @ *2018-05-15 14:04:45 UTC* + + * **PR** `#47643`_: (`dwoz`_) Remove unwanted file (refs: `#47646`_) + + * **PR** `#47601`_: (`dwoz`_) Skip tests when we can not use runas (refs: `#47646`_) + + * e441733ac1 Merge pull request `#47646`_ from rallytime/bp-47601-and-47643 - - **PR** `#47643`_: (*dwoz*) Remove unwanted file - | refs: `#47646`_ - - **PR** `#47601`_: (*dwoz*) Skip tests when we can not use runas - | refs: `#47646`_ - * e441733ac1 Merge pull request `#47646`_ from rallytime/`bp-47601`_-and-47643 * 9e1d1a5ef8 Fix typo * 4e94609136 Remove unwanted file @@ -111,57 +157,63 @@ Changes: * e53d6b9ed9 Skip tests when we can not use runas -- **PR** `#47570`_: (*gtmanfred*) Update dependency to msgpack - @ *2018-05-10T13:23:09Z* +* **PR** `#47570`_: (`gtmanfred`_) Update dependency to msgpack + @ *2018-05-10 13:23:09 UTC* * 6f178ca908 Merge pull request `#47570`_ from gtmanfred/2017.7.6 + * 84aa034e03 Update dependency to msgpack -- **PR** `#47523`_: (*rallytime*) [2017.7.6] Update man pages - @ *2018-05-08T13:31:19Z* +* **PR** `#47523`_: (`rallytime`_) [2017.7.6] Update man pages + @ *2018-05-08 13:31:19 UTC* * 98bd598701 Merge pull request `#47523`_ from rallytime/man-pages + * 48ecb78dec [2017.7.6] Update man pages -- **PR** `#47517`_: (*rallytime*) Back-port `#47505`_ to 2017.7.6 - @ *2018-05-07T19:42:37Z* +* **ISSUE** `#47443`_: (`skylerberg`_) Input validation does not raise SaltInvocationError in win_dsc.py (refs: `#47505`_) + +* **PR** `#47517`_: (`rallytime`_) Back-port `#47505`_ to 2017.7.6 + @ *2018-05-07 19:42:37 UTC* + + * **PR** `#47505`_: (`dwoz`_) Raise proper invocation errors (refs: `#47517`_) + + * e608ea9617 Merge pull request `#47517`_ from rallytime/bp-47505-2017.7.6 - - **ISSUE** `#47443`_: (*skylerberg*) Input validation does not raise SaltInvocationError in win_dsc.py - | refs: `#47505`_ - - **PR** `#47505`_: (*dwoz*) Raise proper invocation errors - | refs: `#47517`_ - * e608ea9617 Merge pull request `#47517`_ from rallytime/`bp-47505`_-2017.7.6 * 0734578533 Raise proper invocation errors -- **PR** `#47476`_: (*gtmanfred*) Specify the cache directory for newer virtualenv modules - @ *2018-05-04T19:20:45Z* +* **PR** `#47476`_: (`gtmanfred`_) Specify the cache directory for newer virtualenv modules + @ *2018-05-04 19:20:45 UTC* * 611ca1fc03 Merge pull request `#47476`_ from gtmanfred/2017.7 + * 1f91a85587 specify cache dir for pip install * 99e150e09c check for kitchen-vagrant gem before loading windows tests -- **PR** `#47412`_: (*twangboy*) Fix issue where the cwd was being removed - @ *2018-05-04T17:28:11Z* +* **PR** `#47412`_: (`twangboy`_) Fix issue where the cwd was being removed + @ *2018-05-04 17:28:11 UTC* * 7c3f2c56da Merge pull request `#47412`_ from twangboy/fix_47125 + * c9bab0b8e3 Merge branch '2017.7' into fix_47125 * 2600e404d5 Fix overly long line * 5c8db05769 Fix issue where the cwd was being removed -- **PR** `#47467`_: (*twangboy*) Remove unused settings, update NSIS - @ *2018-05-04T17:11:37Z* +* **PR** `#47467`_: (`twangboy`_) Remove unused settings, update NSIS + @ *2018-05-04 17:11:37 UTC* * 4846e957c4 Merge pull request `#47467`_ from twangboy/cleanup_settings + * 9d498293b1 Remove unused settings, update NSIS -- **PR** `#47196`_: (*twangboy*) Fix issues with pip - @ *2018-05-04T14:23:04Z* +* **PR** `#47196`_: (`twangboy`_) Fix issues with pip + @ *2018-05-04 14:23:04 UTC* - - **ISSUE** `#9`_: (*thatch45*) Enable authentication modes * da9871d36b Merge pull request `#47196`_ from twangboy/fix_47024 + * 14ee5537b9 Add @with_tempdir helper * 6c3b5fa6fa Fix typo @@ -172,7 +224,7 @@ Changes: * 22ac81df63 Fix integration.modules.test_pip - * 57d98224d4 Merge pull request `#9`_ from terminalmage/twangboy/fix_47024 + * 57d98224d4 Merge pull request #9 from terminalmage/twangboy/fix_47024 * 37a13d8004 Update pip unit tests to reflect changes @@ -188,58 +240,65 @@ Changes: * fd47b21530 Fix merge conflict -- **PR** `#47455`_: (*Ch3LL*) Add In Progress Warning for 2017.7.6 Release Notes - @ *2018-05-04T13:44:54Z* +* **PR** `#47455`_: (`Ch3LL`_) Add In Progress Warning for 2017.7.6 Release Notes + @ *2018-05-04 13:44:54 UTC* * e8c4524bae Merge pull request `#47455`_ from Ch3LL/unreleased_rn + * b6d0cc2ab7 Add In Progress Warning for 2017.7.6 Release Notes -- **PR** `#47459`_: (*gtmanfred*) update ubuntu-rolling to 18.04 - @ *2018-05-03T20:39:20Z* +* **PR** `#47459`_: (`gtmanfred`_) update ubuntu-rolling to 18.04 + @ *2018-05-03 20:39:20 UTC* * 2c7a4b6179 Merge pull request `#47459`_ from gtmanfred/2017.7 + * d228e72477 update ubuntu-rolling to 18.04 -- **PR** `#47462`_: (*terminalmage*) Fix docs build on Sphinx 1.7+ - @ *2018-05-03T20:06:57Z* +* **PR** `#47462`_: (`terminalmage`_) Fix docs build on Sphinx 1.7+ + @ *2018-05-03 20:06:57 UTC* * 64a64c0ed7 Merge pull request `#47462`_ from terminalmage/docs + * 6d7803ece0 Fix docs build on Sphinx 1.7+ -- **PR** `#47438`_: (*lomeroe*) lgpo fix for issue `#47436`_ - @ *2018-05-03T14:40:27Z* +* **ISSUE** `#47436`_: (`lomeroe`_) Some Administrative Template policies are not properly set by lgpo (refs: `#47438`_) + +* **ISSUE** `#44516`_: (`doesitblend`_) Windows PY3 Minion Returns UTF16 UnicodeError (refs: `#44944`_) + +* **PR** `#47438`_: (`lomeroe`_) lgpo fix for issue `#47436`_ + @ *2018-05-03 14:40:27 UTC* + + * **PR** `#44944`_: (`lomeroe`_) win_lgpo registry.pol encoding updates (refs: `#46913`_, `#47438`_) - - **ISSUE** `#47436`_: (*lomeroe*) Some Administrative Template policies are not properly set by lgpo - | refs: `#47438`_ `#47438`_ - - **ISSUE** `#44516`_: (*doesitblend*) Windows PY3 Minion Returns UTF16 UnicodeError - | refs: `#44944`_ - - **PR** `#44944`_: (*lomeroe*) win_lgpo registry.pol encoding updates - | refs: `#46913`_ `#47438`_ * 6cd0d31c03 Merge pull request `#47438`_ from lomeroe/double_admx_test + * 4902f1e2ba check if a policy has either an enabled value or enabled list entry or a disabled value or disabled list entry when determining the state of the policy -- **PR** `#47433`_: (*s0undt3ch*) Add missing requirements files not commited in `#47106`_ - @ *2018-05-02T20:57:14Z* +* **ISSUE** `#45790`_: (`bdarnell`_) Test with Tornado 5.0b1 (refs: `#47106`_, `#47433`_) + +* **PR** `#47433`_: (`s0undt3ch`_) Add missing requirements files not commited in `#47106`_ + @ *2018-05-02 20:57:14 UTC* + + * **PR** `#47106`_: (`DmitryKuzmenko`_) Tornado50 compatibility fixes (refs: `#47433`_) - - **ISSUE** `#45790`_: (*bdarnell*) Test with Tornado 5.0b1 - | refs: `#47106`_ `#47433`_ - - **PR** `#47106`_: (*DmitryKuzmenko*) Tornado50 compatibility fixes - | refs: `#47433`_ * ed69821d19 Merge pull request `#47433`_ from s0undt3ch/2017.7 + * 5abadf25d6 Add missing requirements files not commited in `#47106`_ -- **PR** `#47429`_: (*gtmanfred*) server_list_min should use state, not status - @ *2018-05-02T16:27:56Z* +* **ISSUE** `#47424`_: (`bcharron`_) "salt-cloud -m" fails with nova driver: "There was a query error: u'state'" (refs: `#47429`_) + +* **PR** `#47429`_: (`gtmanfred`_) server_list_min should use state, not status + @ *2018-05-02 16:27:56 UTC* - - **ISSUE** `#47424`_: (*bcharron*) "salt-cloud -m" fails with nova driver: "There was a query error: u'state'" - | refs: `#47429`_ * 7ae3497b0c Merge pull request `#47429`_ from gtmanfred/2017.7 + * 8ae32033cc server_list_min should use state, not status -- **PR** `#47399`_: (*isbm*) zeromq 17 deprecation warning backport from 2018.3 + tornado 5 fixes - @ *2018-05-02T15:11:16Z* +* **PR** `#47399`_: (`isbm`_) zeromq 17 deprecation warning backport from 2018.3 + tornado 5 fixes + @ *2018-05-02 15:11:16 UTC* * 2f5fc4ecc5 Merge pull request `#47399`_ from isbm/isbm-zeromq17-deprecationwarning-2017.7.2-v2 + * a36e49fd27 fix pylint * 98b5629b36 Fix imports @@ -306,243 +365,274 @@ Changes: * ad4b40415c Add one place for handling various ZMQ versions and IOLoop classes -- **PR** `#47343`_: (*Ch3LL*) Add additional service module integration tests and enable for windows - @ *2018-05-02T13:39:46Z* +* **PR** `#47343`_: (`Ch3LL`_) Add additional service module integration tests and enable for windows + @ *2018-05-02 13:39:46 UTC* * b14e974b5f Merge pull request `#47343`_ from Ch3LL/win_srv_test + * 2173b6f549 ensure we are enabling/disabling before test * d58be06751 Add additionatl service module integration tests and enable for windows -- **PR** `#47375`_: (*terminalmage*) Warn on use of virtual packages in pkg.installed state - @ *2018-05-01T21:12:18Z* +* **PR** `#47375`_: (`terminalmage`_) Warn on use of virtual packages in pkg.installed state + @ *2018-05-01 21:12:18 UTC* * b0f3fb577f Merge pull request `#47375`_ from terminalmage/issue47310 + * fa2bea52bb Remove extra blank line to appease linter * f8ab2be81c Add debug logging if we fail to detect virtual packages * 67c4fc56ac Warn on use of virtual packages in pkg.installed state -- **PR** `#47415`_: (*kstreee*) Fixes a bug of rest_tornado's 'local' client, complement fix of `#46326`_ - @ *2018-05-01T21:11:25Z* +* **PR** `#47415`_: (`kstreee`_) Fixes a bug of rest_tornado's 'local' client, complement fix of `#46326`_ + @ *2018-05-01 21:11:25 UTC* + + * **PR** `#47200`_: (`kstreee`_) Resolve a conflict with syndic timeout and bug fixes of the local client in rest_tornado (refs: `#47415`_) + + * **PR** `#47123`_: (`rallytime`_) [develop] Merge forward from 2018.3 to develop (refs: `#47200`_) + + * **PR** `#47110`_: (`kstreee`_) Fixes misusing of the timeout option. (refs: `#47200`_) + + * **PR** `#46692`_: (`mattp-`_) saltnado bugfixes for ldap & syndics (refs: `#47123`_, `#47200`_) + + * **PR** `#46326`_: (`kstreee`_) Fixes a timing bug of saltnado's client local. (refs: `#47110`_, `#47123`_, `#47200`_, `#47415`_) + + * **PR** `#45874`_: (`GwiYeong`_) fix for local client timeout bug (refs: `#46326`_) - - **PR** `#47200`_: (*kstreee*) Resolve a conflict with syndic timeout and bug fixes of the local client in rest_tornado - | refs: `#47415`_ - - **PR** `#47123`_: (*rallytime*) [develop] Merge forward from 2018.3 to develop - | refs: `#47200`_ `#47200`_ - - **PR** `#47110`_: (*kstreee*) Fixes misusing of the timeout option. - | refs: `#47200`_ - - **PR** `#46692`_: (*mattp-*) saltnado bugfixes for ldap & syndics - | refs: `#47200`_ `#47123`_ - - **PR** `#46326`_: (*kstreee*) Fixes a timing bug of saltnado's client local. - | refs: `#47110`_ `#47110`_ `#47415`_ `#47200`_ `#47200`_ `#47200`_ `#47123`_ `#47123`_ - - **PR** `#45874`_: (*GwiYeong*) fix for local client timeout bug - | refs: `#46326`_ `#46326`_ `#46326`_ * 56235032f4 Merge pull request `#47415`_ from kstreee/fix-local-client-tgt-bug + * b8d37e0a1e To add a test case for the syndic environment, copies the test case which was written by @mattp- that was already merged into develop branch, related pr is `#46692`_. * 4627bad1fd Realizes 'tgt' field into actual minions using ckminions to subscribe results of the minions before publishing a payload. -- **PR** `#47286`_: (*baniobloom*) fixed vpc_peering_connection_name option - @ *2018-05-01T19:02:10Z* +* **PR** `#47286`_: (`baniobloom`_) fixed vpc_peering_connection_name option + @ *2018-05-01 19:02:10 UTC* * d65ceaee03 Merge pull request `#47286`_ from baniobloom/vpc_peering_connection_name_fix + * a968965087 Merge branch '2017.7' into vpc_peering_connection_name_fix -- **PR** `#47270`_: (*meaksh*) Fix minion scheduler to return 'retcode' from executed functions - @ *2018-04-30T18:21:55Z* +* **PR** `#47270`_: (`meaksh`_) Fix minion scheduler to return 'retcode' from executed functions + @ *2018-04-30 18:21:55 UTC* * 8a5d4437bb Merge pull request `#47270`_ from meaksh/2017.7-fix-retcode-on-schedule-utils + * d299cf3385 Merge branch '2017.7' into 2017.7-fix-retcode-on-schedule-utils * b6da600fff Initialize __context__ retcode for functions handled via schedule util module -- **PR** `#47371`_: (*rallytime*) Fix "of pass" typo in grains.delval docs: change to "or pass" - @ *2018-04-30T18:18:46Z* +* **ISSUE** `#47264`_: (`jf`_) doc: https://docs.saltstack.com/en/latest/ref/modules/all/salt.modules.grains.html#salt.modules.grains.delval s/of pass/or pass/ (refs: `#47371`_) + +* **PR** `#47371`_: (`rallytime`_) Fix "of pass" typo in grains.delval docs: change to "or pass" + @ *2018-04-30 18:18:46 UTC* + + * 5b51075384 Merge pull request `#47371`_ from rallytime/fix-47264 - - **ISSUE** `#47264`_: (*jf*) doc: https://docs.saltstack.com/en/latest/ref/modules/all/salt.modules.grains.html#salt.modules.grains.delval s/of pass/or pass/ - | refs: `#47371`_ - * 5b51075384 Merge pull request `#47371`_ from rallytime/`fix-47264`_ * a43485b49c Fix "of pass" typo in grains.delval docs: change to "or pass" -- **PR** `#47389`_: (*dwoz*) Older GitPython versions will not have close - @ *2018-04-29T16:42:06Z* +* **PR** `#47389`_: (`dwoz`_) Older GitPython versions will not have close + @ *2018-04-29 16:42:06 UTC* * a86e53be66 Merge pull request `#47389`_ from dwoz/moregittestfix + * 67745c1362 Older GitPython versions will not have close -- **PR** `#47388`_: (*dwoz*) Fix missing import - @ *2018-04-28T18:33:14Z* +* **PR** `#47388`_: (`dwoz`_) Fix missing import + @ *2018-04-28 18:33:14 UTC* * a5367eaf63 Merge pull request `#47388`_ from dwoz/test_pip_fix + * eb26321e8b Fix missing import -- **PR** `#47380`_: (*gtmanfred*) add io_loop handling to runtests engine - @ *2018-04-28T17:25:28Z* +* **PR** `#47380`_: (`gtmanfred`_) add io_loop handling to runtests engine + @ *2018-04-28 17:25:28 UTC* * 9b59b991c2 Merge pull request `#47380`_ from gtmanfred/2017.7 + * 93d1445ec1 add io_loop handling to runtests engine -- **PR** `#47384`_: (*dwoz*) Fix py2 version of pip test - @ *2018-04-28T15:13:28Z* +* **PR** `#47384`_: (`dwoz`_) Fix py2 version of pip test + @ *2018-04-28 15:13:28 UTC* * 37822c0cbb Merge pull request `#47384`_ from dwoz/test_pip_fix + * a37a9da1fb Fix py2 version of pip test -- **PR** `#47382`_: (*dwoz*) Close the repo and fix multiple tests - @ *2018-04-28T15:09:17Z* +* **PR** `#47382`_: (`dwoz`_) Close the repo and fix multiple tests + @ *2018-04-28 15:09:17 UTC* * eefd96732e Merge pull request `#47382`_ from dwoz/gitfs_tests + * 1570708fac Close the repo and fix multiple tests -- **PR** `#47369`_: (*terminalmage*) Return an empty dict if no search_order in ldap ext_pillar config file - @ *2018-04-27T20:58:52Z* +* **PR** `#47369`_: (`terminalmage`_) Return an empty dict if no search_order in ldap ext_pillar config file + @ *2018-04-27 20:58:52 UTC* * 57c75ff660 Merge pull request `#47369`_ from terminalmage/ldap_pillar + * 085883ae2d Return an empty dict if no search_order in ldap ext_pillar config file -- **PR** `#47363`_: (*DmitryKuzmenko*) Tornado5.0: Future.exc_info is dropped - @ *2018-04-27T18:30:18Z* +* **PR** `#47363`_: (`DmitryKuzmenko`_) Tornado5.0: Future.exc_info is dropped + @ *2018-04-27 18:30:18 UTC* * bcc66dd9bf Merge pull request `#47363`_ from DSRCorporation/bugs/replace_exc_info_with_exception + * 3f7b93a23c Tornado5.0: Future.exc_info is dropped -- **PR** `#47334`_: (*terminalmage*) pillar_ldap: Fix cryptic errors when config file fails to load - @ *2018-04-27T17:53:51Z* +* **PR** `#47334`_: (`terminalmage`_) pillar_ldap: Fix cryptic errors when config file fails to load + @ *2018-04-27 17:53:51 UTC* * bcef34f7e1 Merge pull request `#47334`_ from terminalmage/ldap_pillar + * 0175a8687c pillar_ldap: Fix cryptic errors when config file fails to load * 65c3ba7ff1 Remove useless documentation * 5d67cb27de Remove unncessary commented line -- **PR** `#47347`_: (*dwoz*) Proper fix for mysql tests - @ *2018-04-27T17:27:53Z* +* **PR** `#47347`_: (`dwoz`_) Proper fix for mysql tests + @ *2018-04-27 17:27:53 UTC* * 31db8ca7ad Merge pull request `#47347`_ from dwoz/test_mysql_fix_again + * add78fb618 Fix linter warnings * 2644cc7553 Fix linter nits * 799c601184 Proper fix for mysql tests -- **PR** `#47359`_: (*gtmanfred*) add mention of the formulas channel to the formulas docs - @ *2018-04-27T16:56:13Z* +* **PR** `#47359`_: (`gtmanfred`_) add mention of the formulas channel to the formulas docs + @ *2018-04-27 16:56:13 UTC* * e573236848 Merge pull request `#47359`_ from gtmanfred/2017.7 + * 6214ed8133 add mention of the formulas channel to the formulas docs -- **PR** `#47317`_: (*dwoz*) Do not join a thread that is stopped - @ *2018-04-27T13:15:09Z* +* **PR** `#47317`_: (`dwoz`_) Do not join a thread that is stopped + @ *2018-04-27 13:15:09 UTC* + + * **PR** `#47279`_: (`dwoz`_) Gracefully shutdown worker threads (refs: `#47317`_) - - **PR** `#47279`_: (*dwoz*) Gracefully shutdown worker threads - | refs: `#47317`_ * 629503b2a8 Merge pull request `#47317`_ from dwoz/threadshutdown + * 6db2a0e4d3 Log exceptions at exception level * d4ae787595 Do not join a thread that is stopped -- **PR** `#47304`_: (*cachedout*) Pass timeout to salt CLI for tests - @ *2018-04-27T13:11:58Z* +* **PR** `#47304`_: (`cachedout`_) Pass timeout to salt CLI for tests + @ *2018-04-27 13:11:58 UTC* * aacd5cefe3 Merge pull request `#47304`_ from cachedout/test_cli_timeout_arg + * 85025af83c Pass timeout to salt CLI for tests -- **PR** `#47311`_: (*Ch3LL*) Add firewall execution modules tests for windows - @ *2018-04-27T13:10:54Z* +* **PR** `#47311`_: (`Ch3LL`_) Add firewall execution modules tests for windows + @ *2018-04-27 13:10:54 UTC* * 55534fb659 Merge pull request `#47311`_ from Ch3LL/firewall_windows + * 4e16c18c16 Add firewall module windows tests to whitelist * 4b2fc4ec66 Add windows firewall execution modules integration tests -- **PR** `#47348`_: (*dwoz*) Ignore gitfs tests when symlinks not enabled - @ *2018-04-27T13:08:27Z* +* **PR** `#47348`_: (`dwoz`_) Ignore gitfs tests when symlinks not enabled + @ *2018-04-27 13:08:27 UTC* * 1667375a80 Merge pull request `#47348`_ from dwoz/no_symlinks + * 94a70e847a Ignore gitfs tests when symlinks not enabled -- **PR** `#47342`_: (*dwoz*) Fix mysql test cases - @ *2018-04-27T00:50:53Z* +* **PR** `#47342`_: (`dwoz`_) Fix mysql test cases + @ *2018-04-27 00:50:53 UTC* * dac04261b5 Merge pull request `#47342`_ from dwoz/test_mysql_fix + * 7496f4c5a8 Fix mysql test cases -- **PR** `#47341`_: (*dwoz*) Fix python 3 support for inet_pton function - @ *2018-04-26T23:35:45Z* +* **PR** `#47341`_: (`dwoz`_) Fix python 3 support for inet_pton function + @ *2018-04-26 23:35:45 UTC* * 34e78ef564 Merge pull request `#47341`_ from dwoz/inet_pton_fix + * 85451f48d4 Fix python 3 support for inet_pton function -- **PR** `#47339`_: (*dwoz*) Use salt.utils.fopen for line ending consistancy - @ *2018-04-26T22:39:56Z* +* **PR** `#47339`_: (`dwoz`_) Use salt.utils.fopen for line ending consistancy + @ *2018-04-26 22:39:56 UTC* * e4779f3246 Merge pull request `#47339`_ from dwoz/ssh_key_test_fix + * e37a93a1ca Remove redundent close call * b2ae5889b7 Close the temporary file handle * 9f7f83a975 Use salt.utils.fopen for line ending consistancy -- **PR** `#47335`_: (*dwoz*) Remove un-needed string-escape - @ *2018-04-26T21:49:27Z* +* **PR** `#47335`_: (`dwoz`_) Remove un-needed string-escape + @ *2018-04-26 21:49:27 UTC* * b221860151 Merge pull request `#47335`_ from dwoz/pip_test_fix + * dcb6a22c00 Remove un-needed string-escape -- **PR** `#47331`_: (*dwoz*) Do not encode usernames - @ *2018-04-26T19:57:28Z* +* **PR** `#47331`_: (`dwoz`_) Do not encode usernames + @ *2018-04-26 19:57:28 UTC* * 1c527bfd3a Merge pull request `#47331`_ from dwoz/py3_wingroup_fix + * cc154ef857 Do not encode usernames -- **PR** `#47329`_: (*cachedout*) Credit Frank Spierings - @ *2018-04-26T16:37:59Z* +* **PR** `#47329`_: (`cachedout`_) Credit Frank Spierings + @ *2018-04-26 16:37:59 UTC* * 708078b152 Merge pull request `#47329`_ from cachedout/frank_credit + * 33c0644ac4 Credit Frank Spierings -- **PR** `#47281`_: (*Ch3LL*) Add win_system integration module tests - @ *2018-04-26T16:07:41Z* +* **PR** `#47281`_: (`Ch3LL`_) Add win_system integration module tests + @ *2018-04-26 16:07:41 UTC* * a545e55543 Merge pull request `#47281`_ from Ch3LL/system_test + * c9181a75a6 Add destructivetest decorator on tests * 0d0c8987fc Add win_system integration module tests -- **PR** `#47283`_: (*Ch3LL*) Add windows ntp integration module tests - @ *2018-04-26T16:04:44Z* +* **PR** `#47283`_: (`Ch3LL`_) Add windows ntp integration module tests + @ *2018-04-26 16:04:44 UTC* * b64d930df0 Merge pull request `#47283`_ from Ch3LL/ntp_test + * ced7f86546 Add windows ntp integration module tests -- **PR** `#47314`_: (*Ch3LL*) Skip netstat test on macosx as its not supported - @ *2018-04-26T16:00:37Z* +* **PR** `#47314`_: (`Ch3LL`_) Skip netstat test on macosx as its not supported + @ *2018-04-26 16:00:37 UTC* * 910aff910f Merge pull request `#47314`_ from Ch3LL/net_mac_test + * 67beb1451c Skip netstat test on macosx as its not supported -- **PR** `#47307`_: (*rallytime*) Back-port `#47257`_ to 2017.7 - @ *2018-04-26T15:16:23Z* +* **PR** `#47307`_: (`rallytime`_) Back-port `#47257`_ to 2017.7 + @ *2018-04-26 15:16:23 UTC* + + * **PR** `#47257`_: (`jeroennijhof`_) Role is not a list but a dictionary (refs: `#47307`_) + + * 0549ef7c16 Merge pull request `#47307`_ from rallytime/bp-47257 - - **PR** `#47257`_: (*jeroennijhof*) Role is not a list but a dictionary - | refs: `#47307`_ - * 0549ef7c16 Merge pull request `#47307`_ from rallytime/`bp-47257`_ * 6c5b2f92bc Role is not a list but a dictionary -- **PR** `#47312`_: (*rallytime*) Update bootstrap script to latest release: 2018.04.25 - @ *2018-04-26T15:15:13Z* +* **PR** `#47312`_: (`rallytime`_) Update bootstrap script to latest release: 2018.04.25 + @ *2018-04-26 15:15:13 UTC* * d6ff4689f6 Merge pull request `#47312`_ from rallytime/update-bootstrap-release + * 765cce06a2 Update bootstrap script to latest release: 2018.04.25 -- **PR** `#47279`_: (*dwoz*) Gracefully shutdown worker threads - | refs: `#47317`_ - @ *2018-04-25T21:15:43Z* +* **PR** `#47279`_: (`dwoz`_) Gracefully shutdown worker threads (refs: `#47317`_) + @ *2018-04-25 21:15:43 UTC* * e0765f5719 Merge pull request `#47279`_ from dwoz/py3_build_fix + * 21dc1bab91 Pep-8 line endings * 717abedaf7 Fix comman wart @@ -559,33 +649,36 @@ Changes: * fe340778fa Gracefully shutdown worker threads -- **PR** `#47113`_: (*jfindlay*) Support proto for IPSec policy extension in iptables state - @ *2018-04-25T18:01:19Z* +* **PR** `#47113`_: (`jfindlay`_) Support proto for IPSec policy extension in iptables state + @ *2018-04-25 18:01:19 UTC* * 44f19b2f94 Merge pull request `#47113`_ from jfindlay/iptables_state + * 8bd08012ee modules,states.iptables support proto for policy ext -- **PR** `#47302`_: (*Ch3LL*) Remove unnecessary code from core grains and add test - @ *2018-04-25T17:58:48Z* +* **PR** `#47302`_: (`Ch3LL`_) Remove unnecessary code from core grains and add test + @ *2018-04-25 17:58:48 UTC* * b7a6206330 Merge pull request `#47302`_ from Ch3LL/dead_code + * daa68b4877 Add virtual grains test for core grains * a59dd2785d Remove dead code in core grains file for virt-what -- **PR** `#47303`_: (*baniobloom*) Added clarity on oldest supported main release branch - @ *2018-04-25T17:52:39Z* +* **PR** `#47303`_: (`baniobloom`_) Added clarity on oldest supported main release branch + @ *2018-04-25 17:52:39 UTC* * e29362acfc Merge pull request `#47303`_ from baniobloom/bug_fix_doc + * b97c9df5f3 added clarity on how to figure out what is the oldest supported main release branch -- **PR** `#47106`_: (*DmitryKuzmenko*) Tornado50 compatibility fixes - | refs: `#47433`_ - @ *2018-04-25T15:32:37Z* +* **ISSUE** `#45790`_: (`bdarnell`_) Test with Tornado 5.0b1 (refs: `#47106`_, `#47433`_) + +* **PR** `#47106`_: (`DmitryKuzmenko`_) Tornado50 compatibility fixes (refs: `#47433`_) + @ *2018-04-25 15:32:37 UTC* - - **ISSUE** `#45790`_: (*bdarnell*) Test with Tornado 5.0b1 - | refs: `#47106`_ `#47433`_ * 0d9d55e013 Merge pull request `#47106`_ from DSRCorporation/bugs/tornado50 + * 39e403b18d Merge branch '2017.7' into bugs/tornado50 * 6706b3a2d1 Run off of a temporary config @@ -594,159 +687,178 @@ Changes: * 2da3983740 Tornado 5.0 compatibility fixes -- **PR** `#47271`_: (*gtmanfred*) load rh_service for amazon linux not booted with systemd - @ *2018-04-25T14:47:06Z* +* **ISSUE** `#47258`_: (`drewmat`_) service state no longer working after kernel upgrade (refs: `#47271`_) + +* **PR** `#47271`_: (`gtmanfred`_) load rh_service for amazon linux not booted with systemd + @ *2018-04-25 14:47:06 UTC* - - **ISSUE** `#47258`_: (*drewmat*) service state no longer working after kernel upgrade - | refs: `#47271`_ * 2e014f4746 Merge pull request `#47271`_ from gtmanfred/amazon + * 8a53908908 Do not load rh_service module when booted with systemd * e4d1d5bf11 Revert "support amazon linux 2 for service module" -- **PR** `#47246`_: (*mirceaulinic*) Attempting to fix `#44847`_: allow a different way to get the test and debug flags into the netconfig state - @ *2018-04-25T14:44:02Z* +* **ISSUE** `#44847`_: (`malbertus`_) netconfig.managed state.apply unexpected behaviour of test & debug variables (refs: `#47246`_) + +* **PR** `#47246`_: (`mirceaulinic`_) Attempting to fix `#44847`_: allow a different way to get the test and debug flags into the netconfig state + @ *2018-04-25 14:44:02 UTC* + + * 599b0ed1e9 Merge pull request `#47246`_ from cloudflare/fix-44847-2017.7 - - **ISSUE** `#44847`_: (*malbertus*) netconfig.managed state.apply unexpected behaviour of test & debug variables - | refs: `#47246`_ `#47246`_ - * 599b0ed1e9 Merge pull request `#47246`_ from cloudflare/`fix-44847`_-2017.7 * ad80028104 This way, we can pass flags such as ``debug`` into the state, but also ``test``. -- **PR** `#47220`_: (*benediktwerner*) Fix pip.installed when no changes occurred with pip >= 1.0.0 - @ *2018-04-25T14:23:50Z* +* **PR** `#47220`_: (`benediktwerner`_) Fix pip.installed when no changes occurred with pip >= 1.0.0 + @ *2018-04-25 14:23:50 UTC* + + * **PR** `#47207`_: (`benediktwerner`_) Fix pip_state with pip3 if no changes occourred (refs: `#47220`_) + + * **PR** `#47102`_: (`gtmanfred`_) dont allow using no_use_wheel for pip 10.0.0 or newer (refs: `#47220`_) - - **PR** `#47207`_: (*benediktwerner*) Fix pip_state with pip3 if no changes occourred - | refs: `#47220`_ - - **PR** `#47102`_: (*gtmanfred*) dont allow using no_use_wheel for pip 10.0.0 or newer - | refs: `#47220`_ * 4e2e1f0719 Merge pull request `#47220`_ from benediktwerner/fix-pip-2017.7 + * 0197c3e973 Fix pip test * 34bf66c09f Fix pip.installed with pip>=10.0.0 -- **PR** `#47272`_: (*rallytime*) Add windows tests and reg module/state to CODEOWNERS file for team-windows - @ *2018-04-25T13:25:29Z* +* **PR** `#47272`_: (`rallytime`_) Add windows tests and reg module/state to CODEOWNERS file for team-windows + @ *2018-04-25 13:25:29 UTC* * 92e606251f Merge pull request `#47272`_ from rallytime/reg-windows-codeowners + * 9445af0185 Add windows tests and reg module/state to CODEOWNERS file for team-windows * 8de3d41adb fixed vpc_peering_connection_name option -- **PR** `#47252`_: (*rallytime*) Fix the matching patterns in the CODEOWNERS file to use fnmatch patterns - @ *2018-04-24T14:10:42Z* +* **PR** `#47252`_: (`rallytime`_) Fix the matching patterns in the CODEOWNERS file to use fnmatch patterns + @ *2018-04-24 14:10:42 UTC* * 9dca5c0221 Merge pull request `#47252`_ from rallytime/codeowners-fixes + * 204b6af92b Fix the matching patterns in the CODEOWNERS file to use fnmatch patterns -- **PR** `#47177`_: (*fpicot*) fix normalize parameter in pkg.installed - @ *2018-04-24T13:37:54Z* +* **ISSUE** `#47173`_: (`fpicot`_) pkg.installed ignores normalize parameter (refs: `#47177`_) + +* **PR** `#47177`_: (`fpicot`_) fix normalize parameter in pkg.installed + @ *2018-04-24 13:37:54 UTC* - - **ISSUE** `#47173`_: (*fpicot*) pkg.installed ignores normalize parameter - | refs: `#47177`_ `#47177`_ * 3de1bb49c8 Merge pull request `#47177`_ from fpicot/fix_47173_pkg_normalize + * 149f846f34 fix normalize parameter in pkg.installed -- **PR** `#47251`_: (*Ch3LL*) Update Docs to remove unnecessary + sign - @ *2018-04-23T19:37:04Z* +* **PR** `#47251`_: (`Ch3LL`_) Update Docs to remove unnecessary + sign + @ *2018-04-23 19:37:04 UTC* * 10e30515dc Merge pull request `#47251`_ from Ch3LL/pub_fix_rn + * fa4c2e6575 Update Docs to remove unnecessary + sign -- **PR** `#47249`_: (*Ch3LL*) Add CVE number to 2016.3.6 Release - @ *2018-04-23T19:05:42Z* +* **PR** `#47249`_: (`Ch3LL`_) Add CVE number to 2016.3.6 Release + @ *2018-04-23 19:05:42 UTC* * bb7850a431 Merge pull request `#47249`_ from Ch3LL/pub_fix_rn + * 24dea24b7e Add CVE number to 2016.3.6 Release -- **PR** `#47227`_: (*pruiz*) Fix issue `#47225`_: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots (2017.7 branch) - @ *2018-04-23T14:05:58Z* +* **ISSUE** `#47225`_: (`pruiz`_) zfs.filesystem_present takes forever on a dataset with lots (10k+) of snapshots (refs: `#47226`_, `#47227`_) + +* **PR** `#47227`_: (`pruiz`_) Fix issue `#47225`_: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots (2017.7 branch) + @ *2018-04-23 14:05:58 UTC* + + * **PR** `#47226`_: (`pruiz`_) Fix issue `#47225`_: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots (refs: `#47227`_) - - **ISSUE** `#47225`_: (*pruiz*) zfs.filesystem_present takes forever on a dataset with lots (10k+) of snapshots - | refs: `#47226`_ - - **PR** `#47226`_: (*pruiz*) Fix issue `#47225`_: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots - | refs: `#47227`_ * 56933eb0b2 Merge pull request `#47227`_ from pruiz/pruiz/zfs-dataset-present-slow-2017.7 + * fded61f19b Fix issue `#47225`_: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots -- **PR** `#47167`_: (*smitty42*) Adding updates for python3 compatibility and new virtualbox SDK versi… - @ *2018-04-23T13:20:42Z* +* **PR** `#47167`_: (`smitty42`_) Adding updates for python3 compatibility and new virtualbox SDK versi… + @ *2018-04-23 13:20:42 UTC* * 9825065048 Merge pull request `#47167`_ from smitty42/vbox-skd-fix + * 5de53139cd Merge branch '2017.7' into vbox-skd-fix -- **PR** `#47213`_: (*dwoz*) Fix coverage on py3 windows builds - @ *2018-04-20T22:09:57Z* +* **PR** `#47213`_: (`dwoz`_) Fix coverage on py3 windows builds + @ *2018-04-20 22:09:57 UTC* * 976f031170 Merge pull request `#47213`_ from dwoz/py3win + * ad9c7f63f0 Fix coverate on py3 windows builds * 91252bac95 Adding updates for python3 compatibility and new virtualbox SDK version support. -- **PR** `#47197`_: (*dwoz*) Move process target to top level module namespace - @ *2018-04-20T15:41:06Z* +* **PR** `#47197`_: (`dwoz`_) Move process target to top level module namespace + @ *2018-04-20 15:41:06 UTC* * cebcd6d069 Merge pull request `#47197`_ from dwoz/testfix + * 25803c9176 Move process target to top level module namespace -- **PR** `#47193`_: (*Ch3LL*) Add network module integration tests - @ *2018-04-20T13:37:19Z* +* **PR** `#47193`_: (`Ch3LL`_) Add network module integration tests + @ *2018-04-20 13:37:19 UTC* * d4269c2b70 Merge pull request `#47193`_ from Ch3LL/network_test + * bbf9987c19 Add network module integration tests -- **PR** `#47189`_: (*Ch3LL*) Add autoruns.list integration test for Windows - @ *2018-04-19T21:16:34Z* +* **PR** `#47189`_: (`Ch3LL`_) Add autoruns.list integration test for Windows + @ *2018-04-19 21:16:34 UTC* * c777248a78 Merge pull request `#47189`_ from Ch3LL/autoruns + * 6a88bedb7a Add autoruns to windows whitelist * e9e4d4af70 Add autoruns.list integration test for Windows -- **PR** `#47184`_: (*Ch3LL*) Add status module integration modules tests for Windows - @ *2018-04-19T19:38:56Z* +* **PR** `#47184`_: (`Ch3LL`_) Add status module integration modules tests for Windows + @ *2018-04-19 19:38:56 UTC* * 65f344e371 Merge pull request `#47184`_ from Ch3LL/status_test + * 25a84428b8 Add status module integration modules tests for Windows -- **PR** `#47163`_: (*rallytime*) Updage jenkins module autodocs to use jenkinsmod name instead - @ *2018-04-19T19:35:00Z* +* **PR** `#47163`_: (`rallytime`_) Updage jenkins module autodocs to use jenkinsmod name instead + @ *2018-04-19 19:35:00 UTC* + + * **PR** `#46801`_: (`yagnik`_) rename jenkins to jenkinsmod (refs: `#46900`_, `#47163`_) - - **PR** `#46801`_: (*yagnik*) rename jenkins to jenkinsmod - | refs: `#46900`_ `#47163`_ * 965600ad6c Merge pull request `#47163`_ from rallytime/jenkins-autodoc + * 0039395017 Updage jenkins module autodocs to use jenkinsmod name instead -- **PR** `#47185`_: (*twangboy*) Add additional integration tests to whitelist - @ *2018-04-19T18:20:25Z* +* **PR** `#47185`_: (`twangboy`_) Add additional integration tests to whitelist + @ *2018-04-19 18:20:25 UTC* * 0a43dde5fc Merge pull request `#47185`_ from twangboy/add_tests + * 345daa0423 Add additional integration tests to whitelist -- **PR** `#47172`_: (*dwoz*) Allow non admin name based runs on windows - @ *2018-04-19T17:26:42Z* +* **PR** `#47172`_: (`dwoz`_) Allow non admin name based runs on windows + @ *2018-04-19 17:26:42 UTC* * 1a600bb9a4 Merge pull request `#47172`_ from dwoz/cover_without_admin + * cadd759727 Use warnings to warn user * 144c68e214 Allow non admin name based runs on windows -- **PR** `#47110`_: (*kstreee*) Fixes misusing of the timeout option. - | refs: `#47200`_ - @ *2018-04-18T17:16:20Z* +* **PR** `#47110`_: (`kstreee`_) Fixes misusing of the timeout option. (refs: `#47200`_) + @ *2018-04-18 17:16:20 UTC* + + * **PR** `#46326`_: (`kstreee`_) Fixes a timing bug of saltnado's client local. (refs: `#47110`_, `#47123`_, `#47200`_, `#47415`_) + + * **PR** `#45874`_: (`GwiYeong`_) fix for local client timeout bug (refs: `#46326`_) - - **PR** `#46326`_: (*kstreee*) Fixes a timing bug of saltnado's client local. - | refs: `#47110`_ `#47110`_ `#47415`_ `#47200`_ `#47200`_ `#47200`_ `#47123`_ `#47123`_ - - **PR** `#45874`_: (*GwiYeong*) fix for local client timeout bug - | refs: `#46326`_ `#46326`_ `#46326`_ * d5997d2301 Merge pull request `#47110`_ from kstreee/fix-misusing-of-timeout + * 0624aee0ed Fixes misusing of the timeout option. -- **PR** `#40961`_: (*terminalmage*) Make error more explicit when PKI dir not present for salt-call - @ *2018-04-18T16:08:17Z* +* **ISSUE** `#40948`_: (`ScoreUnder`_) salt-call falsely reports a master as down if it does not have PKI directories created (refs: `#40961`_) + +* **PR** `#40961`_: (`terminalmage`_) Make error more explicit when PKI dir not present for salt-call + @ *2018-04-18 16:08:17 UTC* - - **ISSUE** `#40948`_: (*ScoreUnder*) salt-call falsely reports a master as down if it does not have PKI directories created - | refs: `#40961`_ * 87ca2b4003 Merge pull request `#40961`_ from terminalmage/issue40948 + * 6ba66cca41 Fix incorrect logic in exception check * fed5041c5f Make error more specific to aid in troubleshooting @@ -755,35 +867,38 @@ Changes: * 3198ca8b19 Make error more explicit when PKI dir not present for salt-call -- **PR** `#47134`_: (*Ch3LL*) Add user integration tests for windows OS - @ *2018-04-18T14:29:40Z* +* **PR** `#47134`_: (`Ch3LL`_) Add user integration tests for windows OS + @ *2018-04-18 14:29:40 UTC* * f5e63584d4 Merge pull request `#47134`_ from Ch3LL/user_win_test + * e7c9bc4038 Add user integration tests for windows OS -- **PR** `#47131`_: (*gtmanfred*) add __cli opts variable for master processes - @ *2018-04-17T21:33:57Z* +* **PR** `#47131`_: (`gtmanfred`_) add __cli opts variable for master processes + @ *2018-04-17 21:33:57 UTC* * da2f6a3fac Merge pull request `#47131`_ from gtmanfred/cli + * 1b1c29bf62 add __cli for master processes -- **PR** `#47129`_: (*rallytime*) Back-port `#47121`_ to 2017.7 - @ *2018-04-17T20:45:11Z* +* **ISSUE** `#47116`_: (`pcjeff`_) pip 10.0.0 can not import pip.req (refs: `#47121`_) + +* **PR** `#47129`_: (`rallytime`_) Back-port `#47121`_ to 2017.7 + @ *2018-04-17 20:45:11 UTC* + + * **PR** `#47121`_: (`pcjeff`_) fix pip import error in pip 10.0.0 (refs: `#47129`_) + + * 9b8e6ffb8c Merge pull request `#47129`_ from rallytime/bp-47121 - - **ISSUE** `#47116`_: (*pcjeff*) pip 10.0.0 can not import pip.req - | refs: `#47121`_ - - **PR** `#47121`_: (*pcjeff*) fix pip import error in pip 10.0.0 - | refs: `#47129`_ - * 9b8e6ffb8c Merge pull request `#47129`_ from rallytime/`bp-47121`_ * 11da526b21 add ImportError * bd0c23396c fix pip.req import error in pip 10.0.0 -- **PR** `#47102`_: (*gtmanfred*) dont allow using no_use_wheel for pip 10.0.0 or newer - | refs: `#47220`_ - @ *2018-04-17T20:44:58Z* +* **PR** `#47102`_: (`gtmanfred`_) dont allow using no_use_wheel for pip 10.0.0 or newer (refs: `#47220`_) + @ *2018-04-17 20:44:58 UTC* * eb5ac51a48 Merge pull request `#47102`_ from gtmanfred/2017.7 + * 3dc93b310b fix tests * 8497e08f8e fix pip module for 10.0.0 @@ -792,78 +907,89 @@ Changes: * b71e3d8a04 dont allow using no_use_wheel for pip 10.0.0 or newer -- **PR** `#47037`_: (*twangboy*) Fix build_env scripts - @ *2018-04-17T18:54:17Z* +* **PR** `#47037`_: (`twangboy`_) Fix build_env scripts + @ *2018-04-17 18:54:17 UTC* * c1dc42e67e Merge pull request `#47037`_ from twangboy/fix_dev_scripts + * 990a24d7ed Fix build_env scripts -- **PR** `#47108`_: (*dwoz*) Fix unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription - @ *2018-04-17T00:25:07Z* +* **PR** `#47108`_: (`dwoz`_) Fix unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription + @ *2018-04-17 00:25:07 UTC* * 6a4c0b8a1a Merge pull request `#47108`_ from dwoz/async_test_fix + * 3d85e30ce5 AsyncTestCase is required for AsyncEventPublisher -- **PR** `#47068`_: (*cachedout*) Catch an operation on a closed socket in a test - @ *2018-04-16T19:56:03Z* +* **PR** `#47068`_: (`cachedout`_) Catch an operation on a closed socket in a test + @ *2018-04-16 19:56:03 UTC* * 03892eaf0b Merge pull request `#47068`_ from cachedout/catch_value_error_socket_test + * 7db5625632 Catch an operation on a closed socket in a test -- **PR** `#47065`_: (*dwoz*) Jinja test fix - @ *2018-04-16T16:16:42Z* +* **PR** `#47065`_: (`dwoz`_) Jinja test fix + @ *2018-04-16 16:16:42 UTC* * 1ea2885ec2 Merge pull request `#47065`_ from dwoz/jinja_test_fix + * 673cd31c65 Merge branch '2017.7' into jinja_test_fix -- **PR** `#47077`_: (*dwoz*) Fix failing state test by normalizing line endings - @ *2018-04-16T15:48:39Z* +* **PR** `#47077`_: (`dwoz`_) Fix failing state test by normalizing line endings + @ *2018-04-16 15:48:39 UTC* * 5293b5b5ca Merge pull request `#47077`_ from dwoz/test_state_fix + * 444da3f893 Fix py3 wart (chr vs bytesstring) * e8acca01c2 Fix failing state test by normalizing line endings -- **PR** `#47067`_: (*gtmanfred*) use the recommended opennebula lookup method - @ *2018-04-16T15:48:15Z* +* **ISSUE** `#46538`_: (`HenriWahl`_) salt-cloud gives "FutureWarning: The behavior of this method will change in future versions." (refs: `#47067`_) + +* **PR** `#47067`_: (`gtmanfred`_) use the recommended opennebula lookup method + @ *2018-04-16 15:48:15 UTC* - - **ISSUE** `#46538`_: (*HenriWahl*) salt-cloud gives "FutureWarning: The behavior of this method will change in future versions." - | refs: `#47067`_ * ca967de5da Merge pull request `#47067`_ from gtmanfred/2017.7 + * f913a7859c use the recommended opennebula lookup method -- **PR** `#47064`_: (*dwoz*) Fix fileserver roots tests - @ *2018-04-14T21:30:23Z* +* **PR** `#47064`_: (`dwoz`_) Fix fileserver roots tests + @ *2018-04-14 21:30:23 UTC* * 7fddad6cd9 Merge pull request `#47064`_ from dwoz/roots_tests_fix + * 25fd7c0694 fix py3 wart, encode os.linesep * d79f1a1961 Fix fileserver roots tests -- **PR** `#47069`_: (*cachedout*) Pass the timeout variable to the CLI when calling salt in tests - @ *2018-04-14T15:20:25Z* +* **PR** `#47069`_: (`cachedout`_) Pass the timeout variable to the CLI when calling salt in tests + @ *2018-04-14 15:20:25 UTC* * 977c6939c4 Merge pull request `#47069`_ from cachedout/match_timeout_arg + * b8990f5258 Pass the timeout variable to the CLI when calling salt in tests -- **PR** `#47074`_: (*dwoz*) Kitchn should ignore artifacts directory - @ *2018-04-14T13:06:19Z* +* **PR** `#47074`_: (`dwoz`_) Kitchn should ignore artifacts directory + @ *2018-04-14 13:06:19 UTC* * 2c4c19c622 Merge pull request `#47074`_ from dwoz/ignore_artifacts + * c3941efad0 Kitchn should ignore artifacts directory -- **PR** `#47055`_: (*mattp-*) `#47000`_ - add proper handling of full_return in cmd_subset - @ *2018-04-13T20:17:10Z* +* **ISSUE** `#47000`_: (`mvintila`_) Client API: full_return paramenter missing from cmd_subset function (refs: `#47055`_) + +* **PR** `#47055`_: (`mattp-`_) `#47000`_ - add proper handling of full_return in cmd_subset + @ *2018-04-13 20:17:10 UTC* - - **ISSUE** `#47000`_: (*mvintila*) Client API: full_return paramenter missing from cmd_subset function - | refs: `#47055`_ * c484c0bd71 Merge pull request `#47055`_ from bloomberg/GH-47000 + * 8af3f5b874 GH-47000: add proper handling of full_return in cmd_subset -- **PR** `#47039`_: (*twangboy*) Fix winrm powershell script - @ *2018-04-13T18:09:56Z* +* **PR** `#47039`_: (`twangboy`_) Fix winrm powershell script + @ *2018-04-13 18:09:56 UTC* * f3496030cc Merge pull request `#47039`_ from twangboy/win_fix_winrm_script + * 6635b9003f Fix winrm powershell script * 46fa2c04de Fix py3 os.linesep wart @@ -874,88 +1000,95 @@ Changes: * efc9866580 Jinja test fixes -- **PR** `#46326`_: (*kstreee*) Fixes a timing bug of saltnado's client local. - | refs: `#47110`_ `#47110`_ `#47415`_ `#47200`_ `#47200`_ `#47200`_ `#47123`_ `#47123`_ - @ *2018-04-13T13:59:28Z* +* **PR** `#46326`_: (`kstreee`_) Fixes a timing bug of saltnado's client local. (refs: `#47110`_, `#47123`_, `#47200`_, `#47415`_) + @ *2018-04-13 13:59:28 UTC* + + * **PR** `#45874`_: (`GwiYeong`_) fix for local client timeout bug (refs: `#46326`_) - - **PR** `#45874`_: (*GwiYeong*) fix for local client timeout bug - | refs: `#46326`_ `#46326`_ `#46326`_ * 1700a10ebe Merge pull request `#46326`_ from kstreee/fix-client-local + * 0f358a9c9e Fixes a timing bug of saltnado's client local. -- **PR** `#46913`_: (*lomeroe*) 2017.7 Fix `#46877`_ -- win_lgpo start/shutdown script reading - @ *2018-04-12T15:10:50Z* +* **ISSUE** `#46877`_: (`trudesea`_) Unable to apply GPO (Windows 2016) (refs: `#46913`_) + +* **ISSUE** `#44516`_: (`doesitblend`_) Windows PY3 Minion Returns UTF16 UnicodeError (refs: `#44944`_) + +* **PR** `#46913`_: (`lomeroe`_) 2017.7 Fix `#46877`_ -- win_lgpo start/shutdown script reading + @ *2018-04-12 15:10:50 UTC* + + * **PR** `#44944`_: (`lomeroe`_) win_lgpo registry.pol encoding updates (refs: `#46913`_, `#47438`_) - - **ISSUE** `#46877`_: (*trudesea*) Unable to apply GPO (Windows 2016) - | refs: `#46913`_ - - **ISSUE** `#44516`_: (*doesitblend*) Windows PY3 Minion Returns UTF16 UnicodeError - | refs: `#44944`_ - - **PR** `#44944`_: (*lomeroe*) win_lgpo registry.pol encoding updates - | refs: `#46913`_ `#47438`_ * c3c00316c5 Merge pull request `#46913`_ from lomeroe/2017_7-fix46877 + * 369a0645ed move exception for clarity * 32ce5bfda5 Use configparser serializer object to read psscript.ini and script.ini startup/shutdown script files. -- **PR** `#47025`_: (*terminalmage*) Fix server_id grain in PY3 on Windows - @ *2018-04-12T15:08:00Z* +* **PR** `#47025`_: (`terminalmage`_) Fix server_id grain in PY3 on Windows + @ *2018-04-12 15:08:00 UTC* * 9e37cfc9d6 Merge pull request `#47025`_ from terminalmage/fix-server_id-windows + * cb0cf89ed3 Fix server_id grain in PY3 on Windows -- **PR** `#47027`_: (*rallytime*) Back-port `#44508`_ to 2017.7 - @ *2018-04-12T15:05:51Z* +* **PR** `#47027`_: (`rallytime`_) Back-port `#44508`_ to 2017.7 + @ *2018-04-12 15:05:51 UTC* + + * **PR** `#44508`_: (`mzbroch`_) Capirca integration (refs: `#47027`_) + + * 2e193cfb45 Merge pull request `#47027`_ from rallytime/bp-44508 - - **PR** `#44508`_: (*mzbroch*) Capirca integration - | refs: `#47027`_ - * 2e193cfb45 Merge pull request `#47027`_ from rallytime/`bp-44508`_ * 8e72f362f4 Add priority field to support the latest capirca. * 112f92baab Add priority field to support the latest capirca. -- **PR** `#47020`_: (*rallytime*) Back-port `#46970`_ to 2017.7 - @ *2018-04-11T21:48:25Z* +* **PR** `#47020`_: (`rallytime`_) Back-port `#46970`_ to 2017.7 + @ *2018-04-11 21:48:25 UTC* + + * **PR** `#46970`_: (`garethgreenaway`_) [2017.7] fix to pkgrepo comments test (refs: `#47020`_) + + * 385fe2bc1e Merge pull request `#47020`_ from rallytime/bp-46970 - - **PR** `#46970`_: (*garethgreenaway*) [2017.7] fix to pkgrepo comments test - | refs: `#47020`_ - * 385fe2bc1e Merge pull request `#47020`_ from rallytime/`bp-46970`_ * 9373dff52b Update test_pkgrepo.py * 13cf9eb5b1 Removing debugging. * a61a8593e5 Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments. -- **PR** `#46539`_: (*jfoboss*) `#46504`_ Fix - @ *2018-04-11T14:13:24Z* +* **ISSUE** `#46504`_: (`jfoboss`_) ntp.managed fails on non-english systems (refs: `#46539`_) + +* **PR** `#46539`_: (`jfoboss`_) `#46504`_ Fix + @ *2018-04-11 14:13:24 UTC* - - **ISSUE** `#46504`_: (*jfoboss*) ntp.managed fails on non-english systems - | refs: `#46539`_ - - **ISSUE** `#1`_: (*thatch45*) Enable regex on the salt cli * 8f994e7cf9 Merge pull request `#46539`_ from jfoboss/patch-1 - * 6890122e41 Merge pull request `#1`_ from twangboy/pull_46539 + + * 6890122e41 Merge pull request #1 from twangboy/pull_46539 * 19c3fadbe5 Fix unit test for win_ntp * 826a8d3099 Fixing `#46504`_ -- **PR** `#46999`_: (*gtmanfred*) switch pip test package - @ *2018-04-10T21:18:33Z* +* **PR** `#46999`_: (`gtmanfred`_) switch pip test package + @ *2018-04-10 21:18:33 UTC* * 74d70e95a5 Merge pull request `#46999`_ from gtmanfred/2017.7 + * 791af8f6ce switch pip test package -- **PR** `#46023`_: (*mattp-*) add parallel support for orchestrations - @ *2018-04-10T19:26:04Z* +* **PR** `#46023`_: (`mattp-`_) add parallel support for orchestrations + @ *2018-04-10 19:26:04 UTC* * 8adaf7f526 Merge pull request `#46023`_ from bloomberg/parallel-orch + * 0ac0b3ca29 Merge branch '2017.7' into parallel-orch -- **PR** `#46613`_: (*myinitialsarepm*) Fix puppet.fact and puppet.facts to use stdout. - @ *2018-04-10T15:18:07Z* +* **ISSUE** `#46581`_: (`qcpeter`_) puppet.fact tries to parse output to stderr (refs: `#46613`_) + +* **PR** `#46613`_: (`myinitialsarepm`_) Fix puppet.fact and puppet.facts to use stdout. + @ *2018-04-10 15:18:07 UTC* - - **ISSUE** `#46581`_: (*qcpeter*) puppet.fact tries to parse output to stderr - | refs: `#46613`_ * 39d65a39cf Merge pull request `#46613`_ from myinitialsarepm/fix_puppet.fact_and_puppet.facts + * 44ecd13abc Update tests to use cmd.run_all * 7d7d40f541 Merge branch '2017.7' into fix_puppet.fact_and_puppet.facts @@ -964,16 +1097,18 @@ Changes: * 69e1f6f681 Fix puppet.fact and puppet.facts to use stdout. -- **PR** `#46991`_: (*gtmanfred*) use saltstack salt-jenkins - @ *2018-04-10T14:19:00Z* +* **PR** `#46991`_: (`gtmanfred`_) use saltstack salt-jenkins + @ *2018-04-10 14:19:00 UTC* * ba5421d988 Merge pull request `#46991`_ from gtmanfred/windows + * 98588c1dc5 use saltstack salt-jenkins -- **PR** `#46975`_: (*gtmanfred*) Make windows work for test runs in jenkinsci - @ *2018-04-10T13:41:18Z* +* **PR** `#46975`_: (`gtmanfred`_) Make windows work for test runs in jenkinsci + @ *2018-04-10 13:41:18 UTC* * 00c4067585 Merge pull request `#46975`_ from gtmanfred/windows + * 1f69c0d7f8 make sure windows outputs xml junit files * 4a2ec1bbb3 support new versions of winrm-fs @@ -984,33 +1119,36 @@ Changes: * b03e272e44 windows work -- **PR** `#46945`_: (*vutny*) [DOC] Fix Jinja block in FAQ page - @ *2018-04-09T13:05:28Z* +* **PR** `#46945`_: (`vutny`_) [DOC] Fix Jinja block in FAQ page + @ *2018-04-09 13:05:28 UTC* * 3cf2353e41 Merge pull request `#46945`_ from vutny/doc-faq-fix-jinja + * bfdf54e61d [DOC] Fix Jinja block in FAQ page -- **PR** `#46925`_: (*terminalmage*) Remove reference to directory support in file.patch state - @ *2018-04-06T13:54:47Z* +* **PR** `#46925`_: (`terminalmage`_) Remove reference to directory support in file.patch state + @ *2018-04-06 13:54:47 UTC* * fc2f728665 Merge pull request `#46925`_ from terminalmage/fix-file.patch-docstring + * 97695657f0 Remove reference to directory support in file.patch state -- **PR** `#46900`_: (*rallytime*) Back-port `#46801`_ to 2017.7 - @ *2018-04-06T13:47:44Z* +* **PR** `#46900`_: (`rallytime`_) Back-port `#46801`_ to 2017.7 + @ *2018-04-06 13:47:44 UTC* + + * **PR** `#46801`_: (`yagnik`_) rename jenkins to jenkinsmod (refs: `#46900`_, `#47163`_) + + * eef6c518e1 Merge pull request `#46900`_ from rallytime/bp-46801 - - **PR** `#46801`_: (*yagnik*) rename jenkins to jenkinsmod - | refs: `#46900`_ `#47163`_ - * eef6c518e1 Merge pull request `#46900`_ from rallytime/`bp-46801`_ * 6a41e8b457 rename jenkins to jenkinsmod -- **PR** `#46899`_: (*rallytime*) Back-port `#45116`_ to 2017.7 - @ *2018-04-06T13:47:17Z* +* **PR** `#46899`_: (`rallytime`_) Back-port `#45116`_ to 2017.7 + @ *2018-04-06 13:47:17 UTC* + + * **PR** `#45116`_: (`arif-ali`_) fix adding parameters to http.query from sdb yaml (refs: `#46899`_) + + * 71839b0303 Merge pull request `#46899`_ from rallytime/bp-45116 - - **ISSUE** `#39832`_: (*ninja-*) Parallel mode crashes with "list index out of range" - - **PR** `#45116`_: (*arif-ali*) fix adding parameters to http.query from sdb yaml - | refs: `#46899`_ - * 71839b0303 Merge pull request `#46899`_ from rallytime/`bp-45116`_ * b92f908da4 fix adding parameters to http.query from sdb yaml * 3d5e69600b address lint issues raised by @isbm @@ -1031,12 +1169,13 @@ Changes: * 6e7007a4dc add parallel support for orchestrations -- **PR** `#44926`_: (*frogunder*) whitelist_acl_test - @ *2018-04-05T15:09:26Z* +* **ISSUE** `#43529`_: (`Ch3LL`_) Add publisher_acl Test to Auto Test Suite (refs: `#44926`_) + +* **PR** `#44926`_: (`frogunder`_) whitelist_acl_test + @ *2018-04-05 15:09:26 UTC* - - **ISSUE** `#43529`_: (*Ch3LL*) Add publisher_acl Test to Auto Test Suite - | refs: `#44926`_ * d0f5b43753 Merge pull request `#44926`_ from frogunder/whitelisted_acl + * 18e460fc30 Merge branch '2017.7' into whitelisted_acl * 1ad4d7d988 fix assert errors @@ -1045,12 +1184,13 @@ Changes: * 19a2244cb7 whitelist_acl_test -- **PR** `#46464`_: (*gtmanfred*) fix salt subset in orchestrator - @ *2018-04-05T14:52:01Z* +* **ISSUE** `#46456`_: (`vitaliyf`_) "ValueError" when running orch with "subset" (refs: `#46464`_) + +* **PR** `#46464`_: (`gtmanfred`_) fix salt subset in orchestrator + @ *2018-04-05 14:52:01 UTC* - - **ISSUE** `#46456`_: (*vitaliyf*) "ValueError" when running orch with "subset" - | refs: `#46464`_ * 7d822f9cec Merge pull request `#46464`_ from gtmanfred/orchestration + * 637cdc6b7b fix pylint * 0151013ddb document `cli` option for cmd_subset @@ -1059,28 +1199,31 @@ Changes: * 3112359dd6 fix salt subset in orchestrator -- **PR** `#46879`_: (*dwoz*) Fix multiple typos causing tests to fail - @ *2018-04-05T13:59:28Z* +* **ISSUE** `#46523`_: (`dwoz`_) Add a test to the cloud suite for Windows minion on EC2 (refs: `#46879`_) + +* **PR** `#46879`_: (`dwoz`_) Fix multiple typos causing tests to fail + @ *2018-04-05 13:59:28 UTC* - - **ISSUE** `#46523`_: (*dwoz*) Add a test to the cloud suite for Windows minion on EC2 - | refs: `#46879`_ * 805ed1c964 Merge pull request `#46879`_ from dwoz/cloudtestfix + * dc54fc53c3 Fix multiple typos causing tests to fail -- **PR** `#46647`_: (*twangboy*) Fix the tear down function in integration.modules.test_grains - @ *2018-04-04T21:14:06Z* +* **PR** `#46647`_: (`twangboy`_) Fix the tear down function in integration.modules.test_grains + @ *2018-04-04 21:14:06 UTC* * f70f6de282 Merge pull request `#46647`_ from twangboy/win_fix_test_grains + * c179388b0e Fix the tear down function in integration.modules.test_grains.GrainsAppendTestCase -- **PR** `#46756`_: (*nages13*) fix grains['virtual_subtype'] to show Docker on xen kernels - @ *2018-04-04T20:53:49Z* +* **ISSUE** `#46754`_: (`nages13`_) grain item virtual_subtype shows 'Xen PV DomU' on Docker containers (refs: `#46756`_) + +* **ISSUE** `#43405`_: (`kfix`_) LXD-created LXC container is detected as a Xen domU (refs: `#46756`_) + +* **PR** `#46756`_: (`nages13`_) fix grains['virtual_subtype'] to show Docker on xen kernels + @ *2018-04-04 20:53:49 UTC* - - **ISSUE** `#46754`_: (*nages13*) grain item virtual_subtype shows 'Xen PV DomU' on Docker containers - | refs: `#46756`_ - - **ISSUE** `#43405`_: (*kfix*) LXD-created LXC container is detected as a Xen domU - | refs: `#46756`_ * 91c078ce12 Merge pull request `#46756`_ from nages13/bugfix-grain-virtual_subtype + * 781f5030a4 Merge branch 'bugfix-grain-virtual_subtype' of https://github.com/nages13/salt into bugfix-grain-virtual_subtype * cd1ac4b7f9 Merge branch '2017.7' into bugfix-grain-virtual_subtype @@ -1101,30 +1244,33 @@ Changes: * 710f74c4a6 fix grains['virtual_subtype'] to show Docker on xen kernels -- **PR** `#46799`_: (*garethgreenaway*) [2017.7] Adding test for PR `#46788`_ - @ *2018-04-04T20:41:23Z* +* **ISSUE** `#46762`_: (`ScoreUnder`_) prereq stack overflow (refs: `#46788`_, `#46799`_) + +* **PR** `#46799`_: (`garethgreenaway`_) [2017.7] Adding test for PR `#46788`_ + @ *2018-04-04 20:41:23 UTC* + + * **PR** `#46788`_: (`garethgreenaway`_) [2017.7] Ensure failed tags are added to self.pre (refs: `#46799`_) - - **ISSUE** `#46762`_: (*ScoreUnder*) prereq stack overflow - | refs: `#46788`_ `#46799`_ - - **PR** `#46788`_: (*garethgreenaway*) [2017.7] Ensure failed tags are added to self.pre - | refs: `#46799`_ * 058bbed221 Merge pull request `#46799`_ from garethgreenaway/46762_prereq_shenanigans_tests + * 13875e78cf Fixing documention string for test. * 3d288c44d4 Fixing test documentation * 6cff02ef6a Adding tests for `#46788`_ -- **PR** `#46867`_: (*terminalmage*) Backport string arg normalization to 2017.7 branch - @ *2018-04-04T18:06:57Z* +* **PR** `#46867`_: (`terminalmage`_) Backport string arg normalization to 2017.7 branch + @ *2018-04-04 18:06:57 UTC* * d9770bf3f8 Merge pull request `#46867`_ from terminalmage/unicode-logging-normalization + * 7652688e83 Backport string arg normalization to 2017.7 branch -- **PR** `#46770`_: (*twangboy*) Change the order of SID Lookup - @ *2018-04-04T17:33:10Z* +* **PR** `#46770`_: (`twangboy`_) Change the order of SID Lookup + @ *2018-04-04 17:33:10 UTC* * 9eb98b1f6e Merge pull request `#46770`_ from twangboy/fix_46433 + * 89af0a6222 Merge branch '2017.7' into fix_46433 * 67b4697578 Remove unused import (ling) @@ -1133,135 +1279,149 @@ Changes: * b383b9b330 Change the order of SID Lookup -- **PR** `#46839`_: (*gtmanfred*) match tuple for targets as well - @ *2018-04-04T14:07:12Z* +* **ISSUE** `#46826`_: (`robgott`_) grain modules using tuples affect targeting (refs: `#46839`_) + +* **PR** `#46839`_: (`gtmanfred`_) match tuple for targets as well + @ *2018-04-04 14:07:12 UTC* - - **ISSUE** `#46826`_: (*robgott*) grain modules using tuples affect targeting - | refs: `#46839`_ * 9c776cffb7 Merge pull request `#46839`_ from gtmanfred/tupletarget + * 3b7208ce27 match tuple for targets as well -- **PR** `#46845`_: (*rallytime*) Back-port `#46817`_ to 2017.7 - @ *2018-04-03T19:52:29Z* +* **ISSUE** `#40245`_: (`czhong111`_) salt-api automatically restart caused by "opening too many files" (refs: `#46817`_) + +* **ISSUE** `#36374`_: (`szjur`_) Descriptor leaks in multithreaded environment (refs: `#46817`_) + +* **ISSUE** `#20639`_: (`GrizzlyV`_) salt.client.LocalClient leaks connections to local salt master (refs: `#46817`_) + +* **PR** `#46845`_: (`rallytime`_) Back-port `#46817`_ to 2017.7 + @ *2018-04-03 19:52:29 UTC* + + * **PR** `#46817`_: (`mattp-`_) address filehandle/event leak in async run_job invocations (refs: `#46845`_) + + * **PR** `#32145`_: (`paclat`_) fixes 29817 (refs: `#46817`_) + + * 7db251dc11 Merge pull request `#46845`_ from rallytime/bp-46817 - - **ISSUE** `#40245`_: (*czhong111*) salt-api automatically restart caused by "opening too many files" - | refs: `#46817`_ - - **ISSUE** `#36374`_: (*szjur*) Descriptor leaks in multithreaded environment - | refs: `#46817`_ - - **ISSUE** `#20639`_: (*GrizzlyV*) salt.client.LocalClient leaks connections to local salt master - | refs: `#46817`_ - - **PR** `#46817`_: (*mattp-*) address filehandle/event leak in async run_job invocations - | refs: `#46845`_ - - **PR** `#32145`_: (*paclat*) fixes 29817 - | refs: `#46817`_ - * 7db251dc11 Merge pull request `#46845`_ from rallytime/`bp-46817`_ * 36a0f6d8ca address filehandle/event leak in async run_job invocations -- **PR** `#46847`_: (*dwoz*) strdup from libc is not available on windows - @ *2018-04-03T19:51:33Z* +* **PR** `#46847`_: (`dwoz`_) strdup from libc is not available on windows + @ *2018-04-03 19:51:33 UTC* * e3d17ab7bc Merge pull request `#46847`_ from dwoz/missing-strdup + * 55845f4846 strdup from libc is not available on windows -- **PR** `#46776`_: (*gtmanfred*) fix shrinking list in for loop bug - @ *2018-04-03T17:32:16Z* +* **ISSUE** `#46765`_: (`roskens`_) pkg.mod_repo fails with a python error when removing a dictionary key (refs: `#46776`_) + +* **PR** `#46776`_: (`gtmanfred`_) fix shrinking list in for loop bug + @ *2018-04-03 17:32:16 UTC* - - **ISSUE** `#46765`_: (*roskens*) pkg.mod_repo fails with a python error when removing a dictionary key - | refs: `#46776`_ * f2dd79f9c4 Merge pull request `#46776`_ from gtmanfred/2017.7 + * edc1059ee0 fix shrinking list in for loop bug -- **PR** `#46838`_: (*gtmanfred*) use http registry for npm - @ *2018-04-03T17:02:32Z* +* **PR** `#46838`_: (`gtmanfred`_) use http registry for npm + @ *2018-04-03 17:02:32 UTC* * 1941426218 Merge pull request `#46838`_ from gtmanfred/npm + * bff61dd291 use http registry for npm -- **PR** `#46823`_: (*rallytime*) Improve __virtual__ checks in sensehat module - @ *2018-04-03T16:56:08Z* +* **ISSUE** `#42312`_: (`frogunder`_) salt-call --local sys.doc none gives error/traceback in raspberry pi (refs: `#46823`_) + +* **PR** `#46823`_: (`rallytime`_) Improve __virtual__ checks in sensehat module + @ *2018-04-03 16:56:08 UTC* + + * e544254e7b Merge pull request `#46823`_ from rallytime/fix-42312 - - **ISSUE** `#42312`_: (*frogunder*) salt-call --local sys.doc none gives error/traceback in raspberry pi - | refs: `#46823`_ - * e544254e7b Merge pull request `#46823`_ from rallytime/`fix-42312`_ * dafa820f93 Improve __virtual__ checks in sensehat module -- **PR** `#46641`_: (*skizunov*) Make LazyLoader thread safe - @ *2018-04-03T16:09:17Z* +* **PR** `#46641`_: (`skizunov`_) Make LazyLoader thread safe + @ *2018-04-03 16:09:17 UTC* * 37f6d2de35 Merge pull request `#46641`_ from skizunov/develop3 + * c624aa4827 Make LazyLoader thread safe -- **PR** `#46837`_: (*rallytime*) [2017.7] Merge forward from 2016.11 to 2017.7 - @ *2018-04-03T14:54:10Z* +* **PR** `#46837`_: (`rallytime`_) [2017.7] Merge forward from 2016.11 to 2017.7 + @ *2018-04-03 14:54:10 UTC* - - **PR** `#46739`_: (*rallytime*) Update release versions for the 2016.11 branch * 989508b100 Merge pull request `#46837`_ from rallytime/merge-2017.7 + * 8522c1d634 Merge branch '2016.11' into '2017.7' * 3e844ed1df Merge pull request `#46739`_ from rallytime/2016.11_update_version_doc * 4d9fc5cc0f Update release versions for the 2016.11 branch -- **PR** `#46740`_: (*rallytime*) Update release versions for the 2017.7 branch - @ *2018-04-03T14:36:07Z* +* **PR** `#46740`_: (`rallytime`_) Update release versions for the 2017.7 branch + @ *2018-04-03 14:36:07 UTC* * 307e7f35f9 Merge pull request `#46740`_ from rallytime/2017.7_update_version_doc + * 7edf98d224 Update 2018.3.0 information and move branch from "latest" to "previous" * 5336e866ac Update release versions for the 2017.7 branch -- **PR** `#46783`_: (*twangboy*) Fix network.managed test=True on Windows - @ *2018-04-03T12:54:56Z* +* **PR** `#46783`_: (`twangboy`_) Fix network.managed test=True on Windows + @ *2018-04-03 12:54:56 UTC* * ebf5dd276f Merge pull request `#46783`_ from twangboy/fix_46680 + * da5ce25ef3 Fix unit tests on Linux * b7f4f377cd Add space I removed * f1c68a09b5 Fix network.managed test=True on Windows -- **PR** `#46821`_: (*rallytime*) Fix the new test failures from the mantest changes - @ *2018-04-03T12:40:51Z* +* **PR** `#46821`_: (`rallytime`_) Fix the new test failures from the mantest changes + @ *2018-04-03 12:40:51 UTC* + + * **PR** `#46778`_: (`terminalmage`_) Replace flaky SPM man test (refs: `#46821`_) - - **PR** `#46778`_: (*terminalmage*) Replace flaky SPM man test - | refs: `#46821`_ `#46821`_ * f652f25cc1 Merge pull request `#46821`_ from rallytime/fix-mantest-failures + * 209a8029c3 Fix the new test failures from the mantest changes -- **PR** `#46800`_: (*lomeroe*) fix win_lgpo to correctly create valuenames of list item types - @ *2018-04-03T12:38:45Z* +* **ISSUE** `#46627`_: (`vangourd`_) Win_LGPO fails on writing Administrative Template for Remote Assistance (refs: `#46800`_) + +* **PR** `#46800`_: (`lomeroe`_) fix win_lgpo to correctly create valuenames of list item types + @ *2018-04-03 12:38:45 UTC* - - **ISSUE** `#46627`_: (*vangourd*) Win_LGPO fails on writing Administrative Template for Remote Assistance - | refs: `#46800`_ * c460f62081 Merge pull request `#46800`_ from lomeroe/2017_7-46627 + * 2bee383e9d correct create list item value names if the valuePrefix attribute does not exist on the list item, the value is the value name, other wise, the valuename a number with the valuePrefix prepended to it -- **PR** `#46675`_: (*dwoz*) Skip test when git symlinks are not configured - @ *2018-04-03T12:19:19Z* +* **ISSUE** `#46347`_: (`twangboy`_) Buid 449: unit.modules.test_inspect_collector (refs: `#46675`_) + +* **PR** `#46675`_: (`dwoz`_) Skip test when git symlinks are not configured + @ *2018-04-03 12:19:19 UTC* - - **ISSUE** `#46347`_: (*twangboy*) Buid 449: unit.modules.test_inspect_collector - | refs: `#46675`_ * df26f2641e Merge pull request `#46675`_ from dwoz/inspectlib-tests + * d39f4852d8 Handle non-zero status exception * 83c005802b Handle cases where git can not be found * 628b87d5c4 Skip test when git symlinks are not configured -- **PR** `#46815`_: (*terminalmage*) Backport `#46809`_ to 2017.7 - @ *2018-04-02T20:05:15Z* +* **ISSUE** `#46808`_: (`ezh`_) Sharedsecret authentication is broken (refs: `#46809`_) + +* **PR** `#46815`_: (`terminalmage`_) Backport `#46809`_ to 2017.7 + @ *2018-04-02 20:05:15 UTC* + + * **PR** `#46809`_: (`ezh`_) Fix sharedsecret authentication (refs: `#46815`_) + + * 4083e7c460 Merge pull request `#46815`_ from terminalmage/bp-46809 - - **ISSUE** `#46808`_: (*ezh*) Sharedsecret authentication is broken - | refs: `#46809`_ - - **PR** `#46809`_: (*ezh*) Fix sharedsecret authentication - | refs: `#46815`_ - * 4083e7c460 Merge pull request `#46815`_ from terminalmage/`bp-46809`_ * 71d5601507 Fix sharedsecret authentication -- **PR** `#46769`_: (*dwoz*) Adding windows minion tests for salt cloud - @ *2018-04-02T18:51:49Z* +* **PR** `#46769`_: (`dwoz`_) Adding windows minion tests for salt cloud + @ *2018-04-02 18:51:49 UTC* * 3bac9717f4 Merge pull request `#46769`_ from dwoz/wincloudtest + * eabc234e5d Fix config override name * 5c22a0f88d Use aboslute imports @@ -1274,73 +1434,78 @@ Changes: * ba5f11476c Adding windows minion tests for salt cloud -- **PR** `#46786`_: (*twangboy*) Return int(-1) when pidfile contains invalid data - @ *2018-04-02T18:42:12Z* +* **PR** `#46786`_: (`twangboy`_) Return int(-1) when pidfile contains invalid data + @ *2018-04-02 18:42:12 UTC* * f1be939763 Merge pull request `#46786`_ from twangboy/fix_46757 + * b0053250ff Remove int(), just return -1 * 7d56126d74 Fixes some lint * 49b3e937da Return int(-1) when pidfile contains invalid data -- **PR** `#46814`_: (*terminalmage*) Backport `#46772`_ to 2017.7 - @ *2018-04-02T18:39:37Z* +* **PR** `#46814`_: (`terminalmage`_) Backport `#46772`_ to 2017.7 + @ *2018-04-02 18:39:37 UTC* + + * **PR** `#46772`_: (`bmiguel-teixeira`_) fix container removal if auto_remove was enabled (refs: `#46814`_) + + * 89bf24b15c Merge pull request `#46814`_ from terminalmage/bp-46772 - - **PR** `#46772`_: (*bmiguel-teixeira*) fix container removal if auto_remove was enabled - | refs: `#46814`_ - * 89bf24b15c Merge pull request `#46814`_ from terminalmage/`bp-46772`_ * a9f26f2ab8 avoid breaking if AutoRemove is not found * 97779c965d fix container removal if auto_remove was enabled -- **PR** `#46813`_: (*terminalmage*) Get rid of confusing debug logging - @ *2018-04-02T18:19:27Z* +* **PR** `#46813`_: (`terminalmage`_) Get rid of confusing debug logging + @ *2018-04-02 18:19:27 UTC* * 5ea4ffbdb6 Merge pull request `#46813`_ from terminalmage/event-debug-log + * 5d6de3a2eb Get rid of confusing debug logging -- **PR** `#46766`_: (*twangboy*) Change the way we're cleaning up after some tests - @ *2018-03-30T18:01:03Z* +* **PR** `#46766`_: (`twangboy`_) Change the way we're cleaning up after some tests + @ *2018-03-30 18:01:03 UTC* * e533b7182d Merge pull request `#46766`_ from twangboy/win_fix_test_git + * 5afc66452c Remove unused/redundant imports * 88fd72c52c Use with_tempfile decorator where possible -- **PR** `#46778`_: (*terminalmage*) Replace flaky SPM man test - | refs: `#46821`_ `#46821`_ - @ *2018-03-30T17:55:14Z* +* **PR** `#46778`_: (`terminalmage`_) Replace flaky SPM man test (refs: `#46821`_) + @ *2018-03-30 17:55:14 UTC* * 69d450db84 Merge pull request `#46778`_ from terminalmage/salt-jenkins-906 + * bbfd35d3ea Replace flaky SPM man test -- **PR** `#46788`_: (*garethgreenaway*) [2017.7] Ensure failed tags are added to self.pre - | refs: `#46799`_ - @ *2018-03-30T17:11:38Z* +* **ISSUE** `#46762`_: (`ScoreUnder`_) prereq stack overflow (refs: `#46788`_, `#46799`_) + +* **PR** `#46788`_: (`garethgreenaway`_) [2017.7] Ensure failed tags are added to self.pre (refs: `#46799`_) + @ *2018-03-30 17:11:38 UTC* - - **ISSUE** `#46762`_: (*ScoreUnder*) prereq stack overflow - | refs: `#46788`_ `#46799`_ * c935ffb740 Merge pull request `#46788`_ from garethgreenaway/46762_prereq_shenanigans + * fa7aed6424 Ensure failed tags are added to self.pre. -- **PR** `#46655`_: (*dwoz*) Fixing cleanUp method to restore environment - @ *2018-03-29T18:31:48Z* +* **ISSUE** `#46354`_: (`twangboy`_) Build 449: unit.test_state (refs: `#46655`_) + +* **ISSUE** `#46350`_: (`twangboy`_) Build 449: unit.test_pyobjects.RendererTests (refs: `#46655`_) + +* **ISSUE** `#46349`_: (`twangboy`_) Build 449: unit.test_pydsl (refs: `#46655`_) + +* **ISSUE** `#46345`_: (`twangboy`_) Build 449: unit.test_pyobjects.MapTests (Manual Pass) (refs: `#46655`_) + +* **PR** `#46655`_: (`dwoz`_) Fixing cleanUp method to restore environment + @ *2018-03-29 18:31:48 UTC* - - **ISSUE** `#46354`_: (*twangboy*) Build 449: unit.test_state - | refs: `#46655`_ - - **ISSUE** `#46350`_: (*twangboy*) Build 449: unit.test_pyobjects.RendererTests - | refs: `#46655`_ - - **ISSUE** `#46349`_: (*twangboy*) Build 449: unit.test_pydsl - | refs: `#46655`_ - - **ISSUE** `#46345`_: (*twangboy*) Build 449: unit.test_pyobjects.MapTests (Manual Pass) - | refs: `#46655`_ * 395b7f8fdc Merge pull request `#46655`_ from dwoz/pyobjects-46350 + * 5aabd442f2 Fix up import and docstring syntax * 62d64c9230 Fix missing import - * 18b1730320 Skip test that requires pywin32 on *nix platforms + * 18b1730320 Skip test that requires pywin32 on \*nix platforms * 45dce1a485 Add reg module to globals @@ -1352,88 +1517,98 @@ Changes: * b4be10b8fc Fixing cleanUp method to restore environment -- **PR** `#46632`_: (*dwoz*) Fix file.recurse w/ clean=True `#36802`_ - @ *2018-03-29T18:30:42Z* +* **ISSUE** `#36802`_: (`rmarcinik`_) using clean=True parameter in file.recurse causes python process to spin out of control (refs: `#46632`_) + +* **PR** `#46632`_: (`dwoz`_) Fix file.recurse w/ clean=True `#36802`_ + @ *2018-03-29 18:30:42 UTC* - - **ISSUE** `#36802`_: (*rmarcinik*) using clean=True parameter in file.recurse causes python process to spin out of control - | refs: `#46632`_ * af45c49c42 Merge pull request `#46632`_ from dwoz/file-recurse-36802 + * 44db77ae79 Fix lint errors and typo * cb5619537f Only change what is essential for test fix * eb822f5a12 Fix file.recurse w/ clean=True `#36802`_ -- **PR** `#46751`_: (*folti*) top file merging strategy 'same' works again - @ *2018-03-28T21:12:27Z* +* **ISSUE** `#46660`_: (`mruepp`_) top file merging same does produce conflicting ids with gitfs (refs: `#46751`_) + +* **PR** `#46751`_: (`folti`_) top file merging strategy 'same' works again + @ *2018-03-28 21:12:27 UTC* - - **ISSUE** `#46660`_: (*mruepp*) top file merging same does produce conflicting ids with gitfs - | refs: `#46751`_ * 6e9f504ed1 Merge pull request `#46751`_ from folti/2017.7 + * 7058f10381 same top merging strategy works again -- **PR** `#46691`_: (*Ch3LL*) Add groupadd module integration tests for Windows - @ *2018-03-28T18:01:46Z* +* **PR** `#46691`_: (`Ch3LL`_) Add groupadd module integration tests for Windows + @ *2018-03-28 18:01:46 UTC* * d3623e0815 Merge pull request `#46691`_ from Ch3LL/win_group_test + * 7cda825e90 Add groupadd module integration tests for Windows -- **PR** `#46696`_: (*dwoz*) Windows `unit.test_client` fixes - @ *2018-03-28T17:55:47Z* +* **ISSUE** `#46352`_: (`twangboy`_) Build 449: unit.test_client (refs: `#46696`_) + +* **PR** `#46696`_: (`dwoz`_) Windows `unit.test_client` fixes + @ *2018-03-28 17:55:47 UTC* - - **ISSUE** `#46352`_: (*twangboy*) Build 449: unit.test_client - | refs: `#46696`_ * 14ab50d3f4 Merge pull request `#46696`_ from dwoz/win_test_client + * ec4634fc06 Better explanation in doc strings * d9ae2abb34 Fix splling in docstring * b40efc5db8 Windows test client fixes -- **PR** `#46732`_: (*rallytime*) Back-port `#46032`_ to 2017.7 - @ *2018-03-28T13:43:17Z* +* **ISSUE** `#45956`_: (`frogunder`_) CTRL-C gives traceback on py3 setup (refs: `#46032`_) + +* **PR** `#46732`_: (`rallytime`_) Back-port `#46032`_ to 2017.7 + @ *2018-03-28 13:43:17 UTC* + + * **PR** `#46032`_: (`DmitryKuzmenko`_) Workaroung python bug in traceback.format_exc() (refs: `#46732`_) + + * 1222bdbc00 Merge pull request `#46732`_ from rallytime/bp-46032 - - **ISSUE** `#45956`_: (*frogunder*) CTRL-C gives traceback on py3 setup - | refs: `#46032`_ - - **PR** `#46032`_: (*DmitryKuzmenko*) Workaroung python bug in traceback.format_exc() - | refs: `#46732`_ - * 1222bdbc00 Merge pull request `#46732`_ from rallytime/`bp-46032`_ * bf0b962dc0 Workaroung python bug in traceback.format_exc() -- **PR** `#46749`_: (*vutny*) [DOC] Remove mentions of COPR repo from RHEL installation page - @ *2018-03-28T13:20:50Z* +* **ISSUE** `#28142`_: (`zmalone`_) Deprecate or update the copr repo (refs: `#46749`_) + +* **PR** `#46749`_: (`vutny`_) [DOC] Remove mentions of COPR repo from RHEL installation page + @ *2018-03-28 13:20:50 UTC* - - **ISSUE** `#28142`_: (*zmalone*) Deprecate or update the copr repo - | refs: `#46749`_ * 50fe1e9480 Merge pull request `#46749`_ from vutny/doc-deprecate-copr + * a1cc55da3d [DOC] Remove mentions of COPR repo from RHEL installation page -- **PR** `#46734`_: (*terminalmage*) Make busybox image builder work with newer busybox releases - @ *2018-03-27T21:14:28Z* +* **PR** `#46734`_: (`terminalmage`_) Make busybox image builder work with newer busybox releases + @ *2018-03-27 21:14:28 UTC* * bd1e8bcc7d Merge pull request `#46734`_ from terminalmage/busybox + * 6502b6b4ff Make busybox image builder work with newer busybox releases -- **PR** `#46742`_: (*gtmanfred*) only use npm test work around on newer versions - @ *2018-03-27T21:13:28Z* +* **ISSUE** `saltstack/salt-jenkins#902`_: (`rallytime`_) [2017.7/.5] Test failures for NPM on CentOS 6/7, Ubuntu 14, and OpenSUSE (refs: `#46742`_) + +* **PR** `#46742`_: (`gtmanfred`_) only use npm test work around on newer versions + @ *2018-03-27 21:13:28 UTC* - - **PR** `#902`_: (*vittyvk*) Develop - | refs: `#46742`_ * c09c6f819c Merge pull request `#46742`_ from gtmanfred/2017.7 + * fd0e649d1e only use npm test work around on newer versions -- **PR** `#46743`_: (*Ch3LL*) Workaround getpwnam in auth test for MacOSX - @ *2018-03-27T21:10:47Z* +* **PR** `#46743`_: (`Ch3LL`_) Workaround getpwnam in auth test for MacOSX + @ *2018-03-27 21:10:47 UTC* * 3b6d5eca88 Merge pull request `#46743`_ from Ch3LL/mac_auth + * 4f1c42c0e3 Workaround getpwnam in auth test for MacOSX -- **PR** `#46171`_: (*amaclean199*) Fix mysql grant comparisons - @ *2018-03-27T17:54:48Z* +* **ISSUE** `#26920`_: (`david-fairbanks42`_) MySQL grant with underscore and wildcard (refs: `#46171`_) + +* **PR** `#46171`_: (`amaclean199`_) Fix mysql grant comparisons + @ *2018-03-27 17:54:48 UTC* - - **ISSUE** `#26920`_: (*david-fairbanks42*) MySQL grant with underscore and wildcard - | refs: `#46171`_ * b548a3e742 Merge pull request `#46171`_ from amaclean199/fix_mysql_grants_comparison + * 97db3d9766 Merge branch '2017.7' into fix_mysql_grants_comparison * 0565b3980e Merge branch '2017.7' into fix_mysql_grants_comparison @@ -1442,22 +1617,23 @@ Changes: * 00d13f05c4 Fix mysql grant comparisons by stripping both of escape characters and quotes. Fixes `#26920`_ -- **PR** `#46709`_: (*vutny*) [DOC] Update FAQ about Salt self-restarting - @ *2018-03-27T14:34:58Z* +* **ISSUE** `#5721`_: (`ozgurakan`_) salt-minion can't restart itself (refs: `#46709`_) + +* **PR** `#46709`_: (`vutny`_) [DOC] Update FAQ about Salt self-restarting + @ *2018-03-27 14:34:58 UTC* - - **ISSUE** `#5721`_: (*ozgurakan*) salt-minion can't restart itself - | refs: `#46709`_ * 554400e067 Merge pull request `#46709`_ from vutny/doc-faq-minion-master-restart + * d0929280fc [DOC] Update FAQ about Salt self-restarting -- **PR** `#46503`_: (*psyer*) Fixes stdout user environment corruption - @ *2018-03-27T14:20:15Z* +* **PR** `#46503`_: (`psyer`_) Fixes stdout user environment corruption + @ *2018-03-27 14:20:15 UTC* - - **ISSUE** `#1`_: (*thatch45*) Enable regex on the salt cli * 3f21e9cc65 Merge pull request `#46503`_ from psyer/fix-cmd-run-env-corrupt + * e8582e80f2 Python 3-compatibility fix to unit test - * 27f651906d Merge pull request `#1`_ from terminalmage/fix-cmd-run-env-corrupt + * 27f651906d Merge pull request #1 from terminalmage/fix-cmd-run-env-corrupt * 172d3b2e04 Allow cases where no marker was found to proceed without raising exception @@ -1485,10 +1661,11 @@ Changes: * 15868bc88c Fixes stdout user environment corruption -- **PR** `#46432`_: (*twangboy*) Default to UTF-8 for templated files - @ *2018-03-26T19:02:14Z* +* **PR** `#46432`_: (`twangboy`_) Default to UTF-8 for templated files + @ *2018-03-26 19:02:14 UTC* * ac2a6616a7 Merge pull request `#46432`_ from twangboy/win_locales_utf8 + * affa35c30d Revert passing encoding * a0ab27ef15 Merge remote-tracking branch 'dw/win_locales_utf8' into win_locales_utf8 @@ -1507,32 +1684,36 @@ Changes: * 8d7e2d0058 Default to utf-8 on Windows -- **PR** `#46669`_: (*terminalmage*) Add option to return to pre-2017.7.3 pillar include merge order - @ *2018-03-26T19:00:28Z* +* **PR** `#46669`_: (`terminalmage`_) Add option to return to pre-2017.7.3 pillar include merge order + @ *2018-03-26 19:00:28 UTC* * fadc5e4ba4 Merge pull request `#46669`_ from terminalmage/pillar-merge-order + * b4a1d34b47 Add option to return to pre-2017.7.3 pillar include merge order -- **PR** `#46711`_: (*terminalmage*) Add performance reminder for wildcard versions - @ *2018-03-26T18:07:31Z* +* **PR** `#46711`_: (`terminalmage`_) Add performance reminder for wildcard versions + @ *2018-03-26 18:07:31 UTC* * b90f0d1364 Merge pull request `#46711`_ from terminalmage/wildcard-versions-info + * fc7d16f1af Add performance reminder for wildcard versions -- **PR** `#46693`_: (*dwoz*) File and Pillar roots are dictionaries - @ *2018-03-26T15:15:38Z* +* **ISSUE** `#46353`_: (`twangboy`_) Build 449: unit.returners.test_smtp_return (refs: `#46693`_) + +* **PR** `#46693`_: (`dwoz`_) File and Pillar roots are dictionaries + @ *2018-03-26 15:15:38 UTC* - - **ISSUE** `#46353`_: (*twangboy*) Build 449: unit.returners.test_smtp_return - | refs: `#46693`_ * 6c80d90bb6 Merge pull request `#46693`_ from dwoz/test_smtp_return + * 5bf850c67f File and Pillar roots are dictionaries -- **PR** `#46543`_: (*dafenko*) Fix missing saltenv and pillarenv in pillar.item - @ *2018-03-26T15:05:13Z* +* **ISSUE** `#36153`_: (`krcroft`_) Pillarenv doesn't allow using separate pillar environments (refs: `#46543`_) + +* **PR** `#46543`_: (`dafenko`_) Fix missing saltenv and pillarenv in pillar.item + @ *2018-03-26 15:05:13 UTC* - - **ISSUE** `#36153`_: (*krcroft*) Pillarenv doesn't allow using separate pillar environments - | refs: `#46543`_ `#46543`_ * 9a6bc1418c Merge pull request `#46543`_ from dafenko/fix-add-saltenv-pillarenv-to-pillar-item + * 6d5b2068aa Merge branch '2017.7' into fix-add-saltenv-pillarenv-to-pillar-item * 5219377313 Merge branch '2017.7' into fix-add-saltenv-pillarenv-to-pillar-item @@ -1547,108 +1728,121 @@ Changes: * 267ae9f633 Fix missing saltenv and pillarenv in pillar.item -- **PR** `#46679`_: (*vutny*) [DOC] Correct examples in `pkg` state module - @ *2018-03-26T14:40:07Z* +* **PR** `#46679`_: (`vutny`_) [DOC] Correct examples in `pkg` state module + @ *2018-03-26 14:40:07 UTC* * f776040e25 Merge pull request `#46679`_ from vutny/doc-state-pkg + * 4a730383bf [DOC] Correct examples in `pkg` state module -- **PR** `#46646`_: (*twangboy*) Fix `unit.returners.test_local_cache` for Windows - @ *2018-03-26T14:16:23Z* +* **PR** `#46646`_: (`twangboy`_) Fix `unit.returners.test_local_cache` for Windows + @ *2018-03-26 14:16:23 UTC* * 47409eaa6e Merge pull request `#46646`_ from twangboy/win_fix_test_local_cache + * 8d93156604 Fix `unit.returners.test_local_cache` for Windows -- **PR** `#46649`_: (*terminalmage*) Make server_id consistent on Python 3 - @ *2018-03-26T13:58:59Z* +* **ISSUE** `#46595`_: (`aboe76`_) saltstack server_id changes with each run on python3 (refs: `#46649`_) + +* **PR** `#46649`_: (`terminalmage`_) Make server_id consistent on Python 3 + @ *2018-03-26 13:58:59 UTC* - - **ISSUE** `#46595`_: (*aboe76*) saltstack server_id changes with each run on python3 - | refs: `#46649`_ * 0c2dce0416 Merge pull request `#46649`_ from terminalmage/issue46595 + * e82a1aa1ec Make server_id consistent on Python 3 -- **PR** `#46588`_: (*UtahDave*) Don't crash when saltwinshell is missing - @ *2018-03-21T20:26:31Z* +* **PR** `#46588`_: (`UtahDave`_) Don't crash when saltwinshell is missing + @ *2018-03-21 20:26:31 UTC* * 4e7466a21c Merge pull request `#46588`_ from UtahDave/no_crash_winshell + * b7842a1777 Update error message. * 95dfdb91ca Don't stacktrace when salt-ssh w/o saltwinshell -- **PR** `#46631`_: (*rallytime*) Fix pillar unit test failures: file_roots and pillar_roots environments should be lists - @ *2018-03-21T19:22:49Z* +* **ISSUE** `#22063`_: (`jeanpralo`_) Wildcard inside top.sls file for pillar (refs: `#41423`_) + +* **ISSUE** `#20581`_: (`notpeter`_) Many environments: one pillar_root (all your envs are belong to base) (refs: `#46309`_) + +* **PR** `#46631`_: (`rallytime`_) Fix pillar unit test failures: file_roots and pillar_roots environments should be lists + @ *2018-03-21 19:22:49 UTC* + + * **PR** `#46629`_: (`terminalmage`_) Fix symlink loop when file_roots/pillar_roots is a string instead of a list (refs: `#46631`_) + + * **PR** `#46569`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 (refs: `#46631`_) + + * **PR** `#46309`_: (`bdrung`_) Support dynamic pillar_root environment (refs: `#46631`_) + + * **PR** `#41423`_: (`RichardW42`_) pillar: target's state list support wildcard in top.sls (refs: `#46631`_) - - **ISSUE** `#22063`_: (*jeanpralo*) Wildcard inside top.sls file for pillar - | refs: `#41423`_ - - **ISSUE** `#20581`_: (*notpeter*) Many environments: one pillar_root (all your envs are belong to base) - | refs: `#46309`_ - - **PR** `#46629`_: (*terminalmage*) Fix symlink loop when file_roots/pillar_roots is a string instead of a list - | refs: `#46631`_ - - **PR** `#46569`_: (*rallytime*) [2018.3] Merge forward from 2017.7 to 2018.3 - | refs: `#46631`_ - - **PR** `#46309`_: (*bdrung*) Support dynamic pillar_root environment - | refs: `#46631`_ - - **PR** `#41423`_: (*RichardW42*) pillar: target's state list support wildcard in top.sls - | refs: `#46631`_ * 33af3cfc7c Merge pull request `#46631`_ from rallytime/update-pillar-unit-tests + * 0f728186aa Fix pillar unit test failures: file_roots and pillar_roots environments should be lists -- **PR** `#46640`_: (*terminalmage*) Clarify the docs for the file.copy state - @ *2018-03-21T19:14:50Z* +* **ISSUE** `#26450`_: (`typeshige`_) file.copy: source file is not present. (refs: `#46640`_) + +* **PR** `#46640`_: (`terminalmage`_) Clarify the docs for the file.copy state + @ *2018-03-21 19:14:50 UTC* - - **ISSUE** `#26450`_: (*typeshige*) file.copy: source file is not present. - | refs: `#46640`_ * d329e7af78 Merge pull request `#46640`_ from terminalmage/file.copy-docs + * 480c5f8faa Clarify the docs for the file.copy state -- **PR** `#46642`_: (*vutny*) [DOC] Unify cloud modules index header - @ *2018-03-21T19:13:28Z* +* **PR** `#46642`_: (`vutny`_) [DOC] Unify cloud modules index header + @ *2018-03-21 19:13:28 UTC* * ff40590c06 Merge pull request `#46642`_ from vutny/doc-cloud-index + * 51e6aa54a1 [DOC] Unify cloud modules index header -- **PR** `#46619`_: (*rallytime*) [2017.7] Merge forward from 2017.7.5 to 2017.7 - @ *2018-03-20T19:03:30Z* +* **PR** `#46619`_: (`rallytime`_) [2017.7] Merge forward from 2017.7.5 to 2017.7 + @ *2018-03-20 19:03:30 UTC* * 83ed40c06a Merge pull request `#46619`_ from rallytime/merge-2017.7 + * bcbddf5d07 Merge branch '2017.7.5' into '2017.7' -- **PR** `#46584`_: (*twangboy*) Fix issue LGPO issue - @ *2018-03-20T17:48:33Z* +* **PR** `#46584`_: (`twangboy`_) Fix issue LGPO issue + @ *2018-03-20 17:48:33 UTC* * df12135439 Merge pull request `#46584`_ from twangboy/lgpo-46568 + * 661017104b Detect disabled reg_multi_sz elements properly -- **PR** `#46624`_: (*twangboy*) Fix a few inconsitencies in the installer script - @ *2018-03-20T17:47:44Z* +* **PR** `#46624`_: (`twangboy`_) Fix a few inconsitencies in the installer script + @ *2018-03-20 17:47:44 UTC* * 2fd3aa487c Merge pull request `#46624`_ from twangboy/win_fix_installer + * fa0b0efe46 Fix some installer script inconsistencies -- **PR** `#46571`_: (*garethgreenaway*) [2017.7] fixes to state.py - @ *2018-03-20T13:40:04Z* +* **ISSUE** `#46552`_: (`JeffLee123`_) State with require requisite executes despite onfail requisite on another state. (refs: `#46571`_) + +* **PR** `#46571`_: (`garethgreenaway`_) [2017.7] fixes to state.py + @ *2018-03-20 13:40:04 UTC* - - **ISSUE** `#46552`_: (*JeffLee123*) State with require requisite executes despite onfail requisite on another state. - | refs: `#46571`_ * f038e3c452 Merge pull request `#46571`_ from garethgreenaway/46552_onfail_and_require + * 152c43c843 Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't excute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran. -- **PR** `#46520`_: (*gtmanfred*) pass utils to the scheduler for reloading in modules - @ *2018-03-20T13:35:49Z* +* **ISSUE** `#46512`_: (`blarghmatey`_) git.pull failing when run from the salt scheduler (refs: `#46520`_) + +* **PR** `#46520`_: (`gtmanfred`_) pass utils to the scheduler for reloading in modules + @ *2018-03-20 13:35:49 UTC* - - **ISSUE** `#46512`_: (*blarghmatey*) git.pull failing when run from the salt scheduler - | refs: `#46520`_ * 2677330e19 Merge pull request `#46520`_ from gtmanfred/2017.7 + * caefedc095 make sure utils is empty for pickling for windows * 2883548e6b pass utils to the scheduler for reloading in modules -- **PR** `#46531`_: (*terminalmage*) Fix regression in yumpkg._parse_repo_file() - @ *2018-03-20T13:34:59Z* +* **ISSUE** `#44299`_: (`nhavens`_) 2017.7.2 breaks pkgrepo.managed yum repo comments (refs: `#46531`_) + +* **PR** `#46531`_: (`terminalmage`_) Fix regression in yumpkg._parse_repo_file() + @ *2018-03-20 13:34:59 UTC* - - **ISSUE** `#44299`_: (*nhavens*) 2017.7.2 breaks pkgrepo.managed yum repo comments - | refs: `#46531`_ * 7bc3c2e588 Merge pull request `#46531`_ from terminalmage/issue44299 + * b70c3389da Fix case where no comments specified * ce391c53f4 Add regression test for `#44299`_ @@ -1657,66 +1851,72 @@ Changes: * f0c79e3da3 Slight modification to salt.utils.pkg.rpm.combine_comments() -- **PR** `#46567`_: (*dwoz*) Honor named tests when running integration suites - @ *2018-03-20T13:24:42Z* +* **ISSUE** `#46521`_: (`dwoz`_) `--name` argument not honored for cloud test suite (refs: `#46567`_) + +* **PR** `#46567`_: (`dwoz`_) Honor named tests when running integration suites + @ *2018-03-20 13:24:42 UTC* - - **ISSUE** `#46521`_: (*dwoz*) `--name` argument not honored for cloud test suite - | refs: `#46567`_ * b80edb5d26 Merge pull request `#46567`_ from dwoz/runtest-n-wart + * 3b6901e19d Honor named tests when running integration suites -- **PR** `#46580`_: (*twangboy*) Clarify some issues with msu files in win_dism.py - @ *2018-03-16T18:57:55Z* +* **PR** `#46580`_: (`twangboy`_) Clarify some issues with msu files in win_dism.py + @ *2018-03-16 18:57:55 UTC* * 1dcd22e767 Merge pull request `#46580`_ from twangboy/win_update_docs_dism + * d52b99d7a3 Clarify some issues with msu files in win_dism.py -- **PR** `#46541`_: (*gtmanfred*) handle user-data for metadata grains - @ *2018-03-15T17:21:31Z* +* **ISSUE** `#46073`_: (`layer3switch`_) salt 2017.7.3 grains metadata collection in AWS EC2 cause failure and nested iteration (refs: `#46541`_) + +* **PR** `#46541`_: (`gtmanfred`_) handle user-data for metadata grains + @ *2018-03-15 17:21:31 UTC* - - **ISSUE** `#46073`_: (*layer3switch*) salt 2017.7.3 grains metadata collection in AWS EC2 cause failure and nested iteration - | refs: `#46541`_ * 0a68c22332 Merge pull request `#46541`_ from gtmanfred/metadata + * 19bd1d9db5 handle user-data for metadata grains -- **PR** `#46547`_: (*garethgreenaway*) [2017.7] Disable service module for Cumulus - @ *2018-03-15T16:15:00Z* +* **ISSUE** `#46427`_: (`wasabi222`_) cumulus linux should use systemd as a default service pkg instead of debian_service (refs: `#46547`_) + +* **PR** `#46547`_: (`garethgreenaway`_) [2017.7] Disable service module for Cumulus + @ *2018-03-15 16:15:00 UTC* - - **ISSUE** `#46427`_: (*wasabi222*) cumulus linux should use systemd as a default service pkg instead of debian_service - | refs: `#46547`_ * 048b2ba3f6 Merge pull request `#46547`_ from garethgreenaway/46427_service_module_cumulus + * edd0b11447 Merge branch '2017.7' into 46427_service_module_cumulus * ea3c16080e Disable the `service` module on Cumulus since it is using systemd. -- **PR** `#46548`_: (*Ch3LL*) profitbrick test: check for foo,bar username,password set in profitbrick config - @ *2018-03-15T14:25:27Z* +* **PR** `#46548`_: (`Ch3LL`_) profitbrick test: check for foo,bar username,password set in profitbrick config + @ *2018-03-15 14:25:27 UTC* * 98e3260b9a Merge pull request `#46548`_ from Ch3LL/profit_test + * db96c4e72e check for foo,bar username,password set in profitbrick config -- **PR** `#46549`_: (*Ch3LL*) Fix dimensionsdata test random_name call - @ *2018-03-15T14:23:41Z* +* **PR** `#46549`_: (`Ch3LL`_) Fix dimensionsdata test random_name call + @ *2018-03-15 14:23:41 UTC* * 79f2a76609 Merge pull request `#46549`_ from Ch3LL/dimension_test + * bb338c464c Fix dimensionsdata test random_name call -- **PR** `#46529`_: (*gtmanfred*) retry if there is a segfault - @ *2018-03-13T22:41:54Z* +* **PR** `#46529`_: (`gtmanfred`_) retry if there is a segfault + @ *2018-03-13 22:41:54 UTC* * 083846fe0e Merge pull request `#46529`_ from gtmanfred/kitchen + * 50d6e2c7be retry if there is a segfault -- **PR** `#46511`_: (*rallytime*) Back-port `#45769`_ to 2017.7 - @ *2018-03-13T17:08:52Z* +* **PR** `#46511`_: (`rallytime`_) Back-port `#45769`_ to 2017.7 + @ *2018-03-13 17:08:52 UTC* + + * **PR** `#45769`_: (`Quarky9`_) Surpress boto WARNING during SQS msg decode in sqs_engine (refs: `#46511`_) + + * 5cc11129f1 Merge pull request `#46511`_ from rallytime/bp-45769 - - **PR** `#45769`_: (*Quarky9*) Surpress boto WARNING during SQS msg decode in sqs_engine - | refs: `#46511`_ - * 5cc11129f1 Merge pull request `#46511`_ from rallytime/`bp-45769`_ * a8ffceda53 Surpress boto WARNING during decode, reference: https://github.com/boto/boto/issues/2965 - -.. _`#1`: https://github.com/saltstack/salt/issues/1 .. _`#20581`: https://github.com/saltstack/salt/issues/20581 .. _`#20639`: https://github.com/saltstack/salt/issues/20639 .. _`#22063`: https://github.com/saltstack/salt/issues/22063 @@ -1976,23 +2176,91 @@ Changes: .. _`#47700`: https://github.com/saltstack/salt/pull/47700 .. _`#47702`: https://github.com/saltstack/salt/pull/47702 .. _`#47720`: https://github.com/saltstack/salt/pull/47720 +.. _`#47747`: https://github.com/saltstack/salt/pull/47747 +.. _`#47769`: https://github.com/saltstack/salt/pull/47769 +.. _`#47775`: https://github.com/saltstack/salt/pull/47775 .. _`#5721`: https://github.com/saltstack/salt/issues/5721 -.. _`#9`: https://github.com/saltstack/salt/issues/9 -.. _`#902`: https://github.com/saltstack/salt/pull/902 -.. _`bp-44508`: https://github.com/saltstack/salt/pull/44508 -.. _`bp-45116`: https://github.com/saltstack/salt/pull/45116 -.. _`bp-45769`: https://github.com/saltstack/salt/pull/45769 -.. _`bp-46032`: https://github.com/saltstack/salt/pull/46032 -.. _`bp-46772`: https://github.com/saltstack/salt/pull/46772 -.. _`bp-46801`: https://github.com/saltstack/salt/pull/46801 -.. _`bp-46809`: https://github.com/saltstack/salt/pull/46809 -.. _`bp-46817`: https://github.com/saltstack/salt/pull/46817 -.. _`bp-46970`: https://github.com/saltstack/salt/pull/46970 -.. _`bp-47121`: https://github.com/saltstack/salt/pull/47121 -.. _`bp-47257`: https://github.com/saltstack/salt/pull/47257 -.. _`bp-47505`: https://github.com/saltstack/salt/pull/47505 -.. _`bp-47601`: https://github.com/saltstack/salt/pull/47601 -.. _`bp-47692`: https://github.com/saltstack/salt/pull/47692 -.. _`fix-42312`: https://github.com/saltstack/salt/issues/42312 -.. _`fix-44847`: https://github.com/saltstack/salt/issues/44847 -.. _`fix-47264`: https://github.com/saltstack/salt/issues/47264 +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`GrizzlyV`: https://github.com/GrizzlyV +.. _`GwiYeong`: https://github.com/GwiYeong +.. _`HenriWahl`: https://github.com/HenriWahl +.. _`JeffLee123`: https://github.com/JeffLee123 +.. _`Quarky9`: https://github.com/Quarky9 +.. _`RichardW42`: https://github.com/RichardW42 +.. _`ScoreUnder`: https://github.com/ScoreUnder +.. _`UtahDave`: https://github.com/UtahDave +.. _`aboe76`: https://github.com/aboe76 +.. _`amaclean199`: https://github.com/amaclean199 +.. _`arif-ali`: https://github.com/arif-ali +.. _`baniobloom`: https://github.com/baniobloom +.. _`bcharron`: https://github.com/bcharron +.. _`bdarnell`: https://github.com/bdarnell +.. _`bdrung`: https://github.com/bdrung +.. _`benediktwerner`: https://github.com/benediktwerner +.. _`blarghmatey`: https://github.com/blarghmatey +.. _`bmiguel-teixeira`: https://github.com/bmiguel-teixeira +.. _`cachedout`: https://github.com/cachedout +.. _`czhong111`: https://github.com/czhong111 +.. _`dafenko`: https://github.com/dafenko +.. _`damon-atkins`: https://github.com/damon-atkins +.. _`david-fairbanks42`: https://github.com/david-fairbanks42 +.. _`doesitblend`: https://github.com/doesitblend +.. _`drewmat`: https://github.com/drewmat +.. _`dwoz`: https://github.com/dwoz +.. _`ezh`: https://github.com/ezh +.. _`folti`: https://github.com/folti +.. _`fpicot`: https://github.com/fpicot +.. _`frogunder`: https://github.com/frogunder +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`isbm`: https://github.com/isbm +.. _`jeanpralo`: https://github.com/jeanpralo +.. _`jeroennijhof`: https://github.com/jeroennijhof +.. _`jf`: https://github.com/jf +.. _`jfindlay`: https://github.com/jfindlay +.. _`jfoboss`: https://github.com/jfoboss +.. _`kfix`: https://github.com/kfix +.. _`krcroft`: https://github.com/krcroft +.. _`kstreee`: https://github.com/kstreee +.. _`layer3switch`: https://github.com/layer3switch +.. _`lomeroe`: https://github.com/lomeroe +.. _`malbertus`: https://github.com/malbertus +.. _`mattp-`: https://github.com/mattp- +.. _`meaksh`: https://github.com/meaksh +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`mruepp`: https://github.com/mruepp +.. _`mvintila`: https://github.com/mvintila +.. _`myinitialsarepm`: https://github.com/myinitialsarepm +.. _`mzbroch`: https://github.com/mzbroch +.. _`nages13`: https://github.com/nages13 +.. _`nhavens`: https://github.com/nhavens +.. _`notpeter`: https://github.com/notpeter +.. _`ozgurakan`: https://github.com/ozgurakan +.. _`paclat`: https://github.com/paclat +.. _`pcjeff`: https://github.com/pcjeff +.. _`pruiz`: https://github.com/pruiz +.. _`psyer`: https://github.com/psyer +.. _`qcpeter`: https://github.com/qcpeter +.. _`rallytime`: https://github.com/rallytime +.. _`rmarcinik`: https://github.com/rmarcinik +.. _`robgott`: https://github.com/robgott +.. _`roskens`: https://github.com/roskens +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`saltstack/salt-jenkins#902`: https://github.com/saltstack/salt-jenkins/issues/902 +.. _`skizunov`: https://github.com/skizunov +.. _`skylerberg`: https://github.com/skylerberg +.. _`smitty42`: https://github.com/smitty42 +.. _`szjur`: https://github.com/szjur +.. _`terminalmage`: https://github.com/terminalmage +.. _`trudesea`: https://github.com/trudesea +.. _`twangboy`: https://github.com/twangboy +.. _`typeshige`: https://github.com/typeshige +.. _`vangourd`: https://github.com/vangourd +.. _`vitaliyf`: https://github.com/vitaliyf +.. _`vutny`: https://github.com/vutny +.. _`wasabi222`: https://github.com/wasabi222 +.. _`whytewolf`: https://github.com/whytewolf +.. _`yagnik`: https://github.com/yagnik +.. _`yannj-fr`: https://github.com/yannj-fr +.. _`zmalone`: https://github.com/zmalone diff --git a/doc/topics/releases/2017.7.7.rst b/doc/topics/releases/2017.7.7.rst new file mode 100644 index 0000000000..bf5ad025dd --- /dev/null +++ b/doc/topics/releases/2017.7.7.rst @@ -0,0 +1,89 @@ +=========================== +Salt 2017.7.7 Release Notes +=========================== + +Version 2017.7.7 is a bugfix release for :ref:`2017.7.0 `. + +The ``2017.7.7`` release contains only a small number of fixes, which are detailed +below. + +This release fixes two critical issues. + +The first is Issue `#48038`_, which is a critical bug that occurs in a multi-syndic +setup where the same job is run multiple times on a minion. + +The second issue is `#48130`_. This bug appears in certain setups where the Master +reports a Minion time-out, even though the job is still running on the Minion. + +Both of these issues have been fixed with this release. + +Statistics +========== + +- Total Merges: **5** +- Total Issue References: **2** +- Total PR References: **6** + +- Contributors: **3** (`garethgreenaway`_, `gtmanfred`_, `rallytime`_) + +Changelog for v2017.7.6..v2017.7.7 +================================== + +*Generated at: 2018-06-17 19:26:52 UTC* + +* **ISSUE** `#48130`_: (`rmarchei`_) Minion timeouts with 2018.3.1 (refs: `#48157`_) + +* **PR** `#48157`_: (`gtmanfred`_) always listen when gathering job info + @ *2018-06-17 19:04:09 UTC* + + * 8af4452134 Merge pull request `#48157`_ from gtmanfred/2017.7.7 + + * d8209e8a40 always listen when gathering job info + +* **PR** `#48140`_: (`rallytime`_) Update man pages for 2017.7.7 + @ *2018-06-14 21:22:43 UTC* + + * b98c52ee51 Merge pull request `#48140`_ from rallytime/man-pages-2017.7.7 + + * 8893bf0d4c Update man pages for 2017.7.7 + +* **PR** `#48136`_: (`gtmanfred`_) [2017.7.7] bootstrap kitchen branch tests with 2017.7.6 + @ *2018-06-14 21:20:16 UTC* + + * baa0363336 Merge pull request `#48136`_ from gtmanfred/2017.7.7 + + * fce1c31146 bootstrap kitchen branch tests with 2017.7.6 + +* **PR** `#48134`_: (`rallytime`_) Add release notes file for 2017.7.7 + @ *2018-06-14 16:31:34 UTC* + + * b0ba08f4d9 Merge pull request `#48134`_ from rallytime/release-notes-2017.7.7 + + * 217005b8f1 Add missing `v` for tag reference + + * d53569d1e3 Add release notes file for 2017.7.7 + +* **ISSUE** `#48038`_: (`austinpapp`_) jobs are not dedup'ing minion side (refs: `#48075`_) + +* **PR** `#48098`_: (`rallytime`_) Back-port `#48075`_ to 2017.7.7 + @ *2018-06-14 12:53:42 UTC* + + * **PR** `#48075`_: (`garethgreenaway`_) [2017.7] Ensure that the shared list of jids is passed (refs: `#48098`_) + + * 084de927fe Merge pull request `#48098`_ from rallytime/bp-48075-2017.7.7 + + * e4e62e8b3a Ensure that the shared list of jids is passed when creating the Minion. Fixes an issue when minions are pointed at multiple syndics. + +.. _`#48038`: https://github.com/saltstack/salt/issues/48038 +.. _`#48075`: https://github.com/saltstack/salt/pull/48075 +.. _`#48098`: https://github.com/saltstack/salt/pull/48098 +.. _`#48130`: https://github.com/saltstack/salt/issues/48130 +.. _`#48134`: https://github.com/saltstack/salt/pull/48134 +.. _`#48136`: https://github.com/saltstack/salt/pull/48136 +.. _`#48140`: https://github.com/saltstack/salt/pull/48140 +.. _`#48157`: https://github.com/saltstack/salt/pull/48157 +.. _`austinpapp`: https://github.com/austinpapp +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`rallytime`: https://github.com/rallytime +.. _`rmarchei`: https://github.com/rmarchei diff --git a/doc/topics/releases/2017.7.8.rst b/doc/topics/releases/2017.7.8.rst new file mode 100644 index 0000000000..f3f0cdf71b --- /dev/null +++ b/doc/topics/releases/2017.7.8.rst @@ -0,0 +1,31 @@ +======================================== +In Progress: Salt 2017.7.8 Release Notes +======================================== + +Version 2017.7.8 is an **unreleased** bugfix release for :ref:`2017.7.0 `. +This release is still in progress and has not been released yet. + +New win_snmp behavior +===================== + +- :py:func:`win_snmp.get_community_names + ` now returns the SNMP settings + actually in effect on the box. If settings are managed via GroupPolicy, those + settings will be returned. Otherwise, normal settings are returned. + +- :py:func:`win_snmp.set_community_names + ` now raises an error when SNMP + settings are being managed by GroupPolicy. + +Option Added to Disable Docker Mine Updates +=========================================== + +When a docker container is added, removed, started, stopped, etc., the results +of a :py:func:`docker.ps verbose=True all=True host=True +` are sent to the :ref:`mine `, to be +used by :py:func:`mine.get_docker `. + +A new config option (:conf_minion:`docker.update_mine`) has been added. When +set to ``False``, Salt will not send this information to the mine. This is +useful in cases where sensitive information is stored in the container's +environment. diff --git a/doc/topics/releases/2018.3.0.rst b/doc/topics/releases/2018.3.0.rst index 66a251bc21..a1befac851 100644 --- a/doc/topics/releases/2018.3.0.rst +++ b/doc/topics/releases/2018.3.0.rst @@ -5,7 +5,7 @@ Salt 2018.3.0 Release Notes - Codename Oxygen ============================================= Unicode/Python 3 Compatibility Improvements -------------------------------------------- +=========================================== This release fixes a number of nagging issues with Unicode strings in Salt under Python 2 (ex. ``'ascii' codec can't decode byte 0xd0``). For best @@ -24,13 +24,13 @@ Lots of Docker Improvements --------------------------- Much Improved Support for Docker Networking -=========================================== +******************************************* The :py:func:`docker_network.present ` state has undergone a full rewrite, which includes the following improvements: Full API Support for Network Management -======================================= +*************************************** The improvements made to input handling in the :py:func:`docker_container.running ` @@ -39,14 +39,14 @@ state for 2017.7.0 have now been expanded to :py:func:`docker_network.present tunable configuration arguments. Custom Subnets -============== +************** Custom subnets can now be configured. Both IPv4 and mixed IPv4/IPv6 networks are supported. See :ref:`here ` for more information. -Network Configuration in :py:func:`docker_container.running` States -=================================================================== +Network Configuration in :py:func:`docker_container.running ` States +********************************************************************************************************** A long-requested feature has finally been added! It is now possible to configure static IPv4/IPv6 addresses, as well as links and labels. See @@ -54,12 +54,13 @@ configure static IPv4/IPv6 addresses, as well as links and labels. See information. .. note:: - While the ``containers`` argument to :py:func:`docker_network.present` - will continue to be supported, it will no longer be the recommended way of - ensuring that a container is attached to a network. + While the ``containers`` argument to :py:func:`docker_network.present + ` will continue to be supported, it + will no longer be the recommended way of ensuring that a container is + attached to a network. Improved Handling of Images from Custom Registries -================================================== +************************************************** Rather than attempting to parse the tag from the passed image name, Salt will now resolve that tag down to an image ID and use that ID instead. @@ -69,7 +70,7 @@ now resolve that tag down to an image ID and use that ID instead. management. See below for a full list of these changes. Backward-incompatible Changes to Docker Image Management -******************************************************** +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Passing image names to the following functions must now be done using separate ``repository`` and ``tag`` arguments: @@ -86,7 +87,7 @@ Additionally, the ``tag`` argument must now be explicitly passed to the unless the image is being pulled from a docker registry. State and Execution Module Support for ``docker run`` Functionality -=================================================================== +******************************************************************* The :py:func:`docker_container.running ` state is good for containers which run services, but it is not as useful for @@ -106,14 +107,14 @@ State support has also been added via the :py:func:`docker_container.run is run. Full API Support for :py:func:`docker.logs ` -========================================================================= +************************************************************************* This function now supports all of the functions that its Docker API counterpart does, allowing you to do things like include timestamps, and also suppress stdout/stderr, etc. in the return. `start` Argument Added to :py:func:`docker.create ` Function -=========================================================================================== +******************************************************************************************* This removes the need to run :py:func:`docker.start ` separately when creating containers on the @@ -124,16 +125,16 @@ Salt CLI. salt myminion docker.create image=foo/bar:baz command=/path/to/command start=True Use SaltSSH Minions like regular Master-Minions ------------------------------------------------ +=============================================== The Master process can now also call SSH minions as if they were connected to -the master using ZeroMQ. By setting `enable_ssh_minions: True` in the the -master config file, the master will create a SaltSSH client process which -connects to the minion and returns the output for the `salt` commandline to use -like a regular minion. This can be used anywhere the LocalClient is used. +the master using ZeroMQ. By setting ``enable_ssh_minions: True`` in the master +config file, the master will create a Salt SSH client process which connects to +the minion and returns the output for the ``salt`` CLI to use like a regular +minion. This can be used anywhere the LocalClient is used. Exceptions Raised for Authentication/Authorization Errors ---------------------------------------------------------- +========================================================= When sending ``publish`` commands via ``master.py`` and ``masterapi.py`` and an authorization or authentication problem is encountered, Salt will now raise the @@ -143,7 +144,7 @@ The reasoning behind this change is to make it easier to debug various scenarios surrounding authentication and authorization issues more effectively. Comparison Operators in Package Installation --------------------------------------------- +============================================ Salt now supports using comparison operators (e.g. ``>=1.2.3``) when installing packages on minions which use :mod:`yum/dnf ` or @@ -152,7 +153,7 @@ packages on minions which use :mod:`yum/dnf ` or remote execution function. :ref:`Master Tops ` Changes ------------------------------------------------ +=============================================== When both :ref:`Master Tops ` and a :ref:`Top File ` produce SLS matches for a given minion, the matches @@ -164,7 +165,7 @@ To make master tops matches execute first, followed by top file matches, set the new :conf_minion:`master_tops_first` minion config option to ``True``. Several Jinja Filters Renamed ------------------------------ +============================= The following Jinja filters (originally added in 2017.7.0) have been renamed due to the fact that they were inaccurately named when initially added. The @@ -175,7 +176,7 @@ original names will be supported until the Neon release of Salt. - :jinja_ref:`jinja_decode_list` renamed to :jinja_ref:`jinja_encode_list` Return Codes for Runner/Wheel Functions ---------------------------------------- +======================================= When using :ref:`orchestration `, runner and wheel functions used to report a ``True`` result if the function ran to completion @@ -194,7 +195,7 @@ they failed. Here's some example pseudocode: return result Variable Update Intervals for Fileserver Backends -------------------------------------------------- +================================================= Prior to this release, fileservers would be updated as part of a dedicated "maintenance" process, in which various routine maintenance tasks were @@ -224,7 +225,7 @@ examples. for the next feature release (Fluorine). LDAP via External Authentication Changes ----------------------------------------- +======================================== In this release of Salt, if LDAP Bind Credentials are supplied, then these credentials will be used for all LDAP access except the first @@ -238,7 +239,7 @@ the LDAP user's existence and group membership. The user's LDAP credentials were used from then on. Stormpath External Authentication Removed ------------------------------------------ +========================================= Per Stormpath's announcement, their API will be shutting down on 8/17/2017 at noon PST so the Stormpath external authentication module has been removed. @@ -247,7 +248,7 @@ https://stormpath.com/oktaplusstormpath New (Proxy) Minion Configuration Options ----------------------------------------- +======================================== To be able to connect the Minion to the Master using a certain source IP address or port, the following options have been added: @@ -258,7 +259,7 @@ or port, the following options have been added: - :conf_minion:`source_publish_port` :conf_minion:`environment` config option renamed to :conf_minion:`saltenv` --------------------------------------------------------------------------- +========================================================================== The :conf_minion:`environment` config option predates referring to a salt fileserver environment as a **saltenv**. To pin a minion to a single @@ -270,14 +271,14 @@ consistency, :conf_minion:`environment` is now simply referred to as used as :conf_minion:`saltenv`. :conf_minion:`lock_saltenv` config option added ------------------------------------------------ +=============================================== If set to ``True``, this option will prevent a minion from allowing the ``saltenv`` argument to override the value set in :conf_minion:`saltenv` when running states. Failed Minions for State/Function Orchestration Jobs Added to Changes Dictionary --------------------------------------------------------------------------------- +================================================================================ For orchestration jobs which run states (or run remote execution functions and also use a :ref:`fail function ` to indicate @@ -289,16 +290,26 @@ failed returns in these cases are now included in the changes dictionary, making for much easier parsing. Grains ------- -* ``fc_wwn``: Show all fibre channel world wide port names for a host, must be enabled with `fibre_channel_grains` -* ``iscsi_iqn``: Show the iSCSI IQN name for a host -* ``swap_total``: Show the configured swap_total for Linux, \*BSD, OS X and Solaris/SunOS -* ``virtual``: - * identifies reports KVM and VMM hypervisors when running an OpenBSD guest - * for detecting Solaris Logical Domains (LDOMs) running on T-Series SPARC hardware. The ``virtual_subtype`` grain is populated as a list of domain roles. +====== + +- ``fc_wwn`` - Show all fibre channel world wide port names for a host, must be + enabled with `fibre_channel_grains` + +- ``iscsi_iqn`` - Show the iSCSI IQN name for a host + +- ``swap_total`` - Show the configured swap_total for Linux, \*BSD, OS X and + Solaris/SunOS + +- ``virtual``: + + - identifies reports KVM and VMM hypervisors when running an OpenBSD guest + + - for detecting Solaris Logical Domains (LDOMs) running on T-Series SPARC + hardware. The ``virtual_subtype`` grain is populated as a list of domain + roles. Salt Minion Auto-discovery ------------------------- +========================== Using auto-discovery, the Salt Minion now no longer needs to be configured against a specific DNS name or IP address of a Master. @@ -312,8 +323,9 @@ Configuration By default, automatic discovery is disabled. .. warning:: - Due to the current limitations that will be changing in a future release, before you turn on auto-discovery, - make sure your network is secured and trusted. + Due to the current limitations that will be changing in a future release, + before you turn on auto-discovery, make sure your network is secured and + trusted. Auto-discovery is configured on Master and Minion. Both of them are configured via the ``discovery`` option as follows: @@ -373,16 +385,18 @@ In addition to the ``mapping`` and ``port`` options, the following additional op Connection to a type instead of DNS =================================== -By now each Minion was connecting to a Master by DNS or IP address. From now on it is possible -also to connect to a _type_ of a Master. For example, in a network there are three different -Masters, each corresponds for a particular niche or environment or specific role etc. The Minion -is supposed to connect only to one of those Masters that is described appropriately. +By now each Minion was connecting to a Master by DNS or IP address. From now on +it is possible also to connect to a _type_ of a Master. For example, in a +network there are three different Masters, each corresponds for a particular +niche or environment or specific role etc. The Minion is supposed to connect +only to one of those Masters that is described appropriately. -To achieve such an effect, each `/etc/salt/master` configuration should have a `discovery` option, -which should have a `mapping` element with arbitrary key/value pairs. The same configuration should -be on the Minion, so then when mapping matches, Minion recognises Master as its connection target. +To achieve such an effect, each ``/etc/salt/master`` configuration should have +a ``discovery`` option, which should have a ``mapping`` element with arbitrary +key/value pairs. The same configuration should be on the Minion, so then when +mapping matches, Minion recognises Master as its connection target. -Example for Master configuration (`/etc/salt/master`): +Example for Master configuration (``/etc/salt/master``): .. code-block:: yaml @@ -391,9 +405,10 @@ Example for Master configuration (`/etc/salt/master`): description: SES 5.0 node: 1 -The example above describes a system that is running a particular product, where `description` is -an arbitrary key and `SES 5.0` is just a string. In order to match exactly this Master, the -following configuration at Minion should be present: +The example above describes a system that is running a particular product, +where ``description`` is an arbitrary key and ``SES 5.0`` is just a string. In +order to match exactly this Master, the following configuration at Minion +should be present: .. code-block:: yaml @@ -403,53 +418,57 @@ following configuration at Minion should be present: description: SES 5.0 node: 1 -Notice `match` criteria is set to `all`. This would mean that from all found Masters select only -that, which `description` is set to `SES 5.0` _and_ `node` is set to `1`. All other Masters will -be ignored. +Notice ``match`` criteria is set to ``all``. This would mean that from all +found Masters select only that, which ``description`` is set to ``SES 5.0`` +_and_ ``node`` is set to ``1``. All other Masters will be ignored. Limitations =========== -This feature has a couple of _temporary_ limitations that are subject to change in the future: +This feature has a couple of _temporary_ limitations that are subject to change +in the future: -- Only one Master on the network is supported. Currently the Minion cannot select which Master - out of few the same to choose. This will change to choosing the Master that is least loaded. -- Minions will accept _any_ master that matches connection criteria without any particular - security applied (priv/pub key check, signature, fingerprint etc). That implies that administrator - is expected to know his network and make sure it is clean. +- Only one Master on the network is supported. Currently the Minion cannot + select which Master out of few the same to choose. This will change to + choosing the Master that is least loaded. + +- Minions will accept _any_ master that matches connection criteria without any + particular security applied (priv/pub key check, signature, fingerprint etc). + That implies that administrator is expected to know his network and make sure + it is clean. New Modules ------------ +=========== - :mod:`salt.modules.purefa ` New NaCl Renderer ------------------ +================= A new renderer has been added for encrypted data. New support for Cisco UCS Chassis ---------------------------------- +================================= The salt proxy minion now allows for control of Cisco USC chassis. See the ``cimc`` modules for details. New support for Cassandra v3 ----------------------------- +============================ The ``cassandra_cql`` module now supports Cassandra v3 which has changed its internal schema to define keyspaces and columns. New salt-ssh roster -------------------- +=================== A new roster has been added that allows users to pull in a list of hosts for salt-ssh targeting from a ``~/.ssh`` configuration. For full details, please see the ``sshconfig`` roster. New GitFS Features ------------------- +================== Two new features which affect how GitFS maps branches/tags to fileserver environments (i.e. ``saltenvs``) have been added: @@ -473,52 +492,75 @@ environments (i.e. ``saltenvs``) have been added: available as saltenvs. Additional output modes ------------------------ +======================= -The ``state_output`` parameter now supports ``full_id``, ``changes_id`` and ``terse_id``. -Just like ``mixed_id``, these use the state ID as name in the highstate output. -For more information on these output modes, see the docs for the :mod:`Highstate Outputter `. +The ``state_output`` parameter now supports ``full_id``, ``changes_id`` and +``terse_id``. Just like ``mixed_id``, these use the state ID as name in the +highstate output. For more information on these output modes, see the docs for +the :mod:`Highstate Outputter `. Windows -------- +======= + Python Version -============== -Python 2 Windows API was design when Windows did not support Unicode. Windows now supports -Unicode however to keep backwards compatibility Python 2 Windows API has not been changed. -Python 3 Windows API supports Unicode. Salt Python 3 installer is the recommend choice for -users who need characters other than Non-ASCII (7bit) characters. +-------------- -Execution module changes -======================== -pkg -*** -Significate changes have been made to the :mod:`win_pkg ` execution module. Users should test this release against their existing package sls definition files. These changes are also in 2016.11.9 & 2017.7.3. +Python 2 Windows API was design when Windows did not support Unicode. Windows +now supports Unicode however to keep backwards compatibility Python 2 Windows +API has not been changed. Python 3 Windows API supports Unicode. Salt Python 3 +installer is the recommend choice for users who need characters other than +Non-ASCII (7bit) characters. -- ``pkg.list_available`` no longer defaults to refreshing the winrepo meta database. -- ``pkg.install`` without a ``version`` parameter no longer upgrades software if the software is already installed. Use ``pkg.install version=latest`` or in a state use ``pkg.latest`` to get the old behavior. -- ``pkg.list_pkgs`` now returns multiple versions if software installed more than once. -- ``pkg.list_pkgs`` now returns 'Not Found' when the version is not found instead of '(value not set)' which matches the contents of the sls definitions. -- ``pkg.remove()`` will wait upto 3 seconds (normally about a second) to detect changes in the registry after removing software, improving reporting of version changes. -- ``pkg.remove()`` can remove ``latest`` software, if ``latest`` is defined in sls definition. -- Documentation was update for the execution module to match the style in new versions, some corrections as well. -- All install/remove commands are prefix with cmd.exe shell and cmdmod is called with a command line string instead of a list. Some sls files in saltstack/salt-winrepo-ng expected the commands to be prefixed with cmd.exe (i.e. the use of ``&``). -- Some execution module functions results, now behavour more like their Unix/Linux versions. +:py:mod:`pkg ` Execution module changes +------------------------------------------------------------- -cmdmod -****** -Linux/Unix OS command & arguments requires a python list. Windows was being treated -the same. Windows requires commands & arguments to be a string. These changes are -also in 2016.11.9 & 2017.7.3. +Significant changes have been made to the :mod:`win_pkg ` +execution module. Users should test this release against their existing package +sls definition files. These changes are also in 2016.11.9 & 2017.7.3. + +- ``pkg.list_available`` no longer defaults to refreshing the winrepo meta + database. + +- ``pkg.install`` without a ``version`` parameter no longer upgrades software + if the software is already installed. Use ``pkg.install version=latest`` or + in a state use ``pkg.latest`` to get the old behavior. + +- ``pkg.list_pkgs`` now returns multiple versions if software installed more + than once. + +- ``pkg.list_pkgs`` now returns 'Not Found' when the version is not found + instead of '(value not set)' which matches the contents of the sls + definitions. + +- ``pkg.remove()`` will wait up to 3 seconds (normally about a second) to detect + changes in the registry after removing software, improving reporting of + version changes. + +- ``pkg.remove()`` can remove ``latest`` software, if ``latest`` is defined in + sls definition. + +- Documentation was update for the execution module to match the style in new + versions, some corrections as well. + +- All install/remove commands are prefix with cmd.exe shell and cmdmod is + called with a command line string instead of a list. Some sls files in + saltstack/salt-winrepo-ng expected the commands to be prefixed with cmd.exe + (i.e. the use of ``&``). + +- Some execution module functions results, now behavour more like their + Unix/Linux versions. Installer -========= +--------- + Changes to config handling ************************** -Behavior with existing configuration has changed. With previous windows installers the -existing config was used and the master and minion id could be modified via the -installer. It was problematic in that it didn't account for configuration that -may be defined in the ``minion.d`` directory. This change gives you the option -via a drop-down list to use one of the following: + +Behavior with existing configuration has changed. With previous windows +installers the existing config was used and the master and minion id could be +modified via the installer. It was problematic in that it didn't account for +configuration that may be defined in the ``minion.d`` directory. This change +gives you the option via a drop-down list to use one of the following: - Default Config: Use the config that comes with the installer - Existing Config: Use the current config without changes @@ -544,24 +586,27 @@ default config will be used. Multi-master configuration ************************** + The installer now has the ability to apply a multi-master configuration either -from the gui or the command line. The ``master`` field in the gui can accept +from the GUI or the command line. The ``master`` field in the GUI can accept either a single master or a comma-separated list of masters. The command-line switch (``/master=``) can accept the same. Command-line help ***************** + The Windows installer will now display command-line help when a help switch (``/?``) is passed. -utils.pkg.win preview -===================== -A new utils python module has been added, which gathers information about windows -installed software. This is currently not used by any salt execution module or state. -Users are encource to run this and report any issues. Running the command with the -``detail`` option will be useful for anyone developing windows package definitions. -With salt installed in the default location the following command will print the help -message. +New utils module ``salt.utils.pkg.win`` +--------------------------------------- + +A new utils module has been added, which gathers information about windows +installed software. This is currently not used by any salt execution module or +state at this time. Users are encouraged to run this and report any issues. +Running the command with the ``detail`` option will be useful for anyone +developing windows package definitions. With salt installed in the default +location the following command will print the help message. .. code-block:: text @@ -570,10 +615,10 @@ message. c:\salt\bin\python.exe c:\salt\bin\lib\site-packages\salt\utils\pkg\win.py detail system Salt Cloud Features -------------------- +=================== OpenStack Revamp -================ +---------------- The OpenStack Driver has been rewritten mostly from scratch. Salt is now using the `shade driver `. @@ -604,7 +649,7 @@ setups using shade as well. Pre-Flight Commands -=================== +------------------- Support has been added for specified "preflight commands" to run on a VM before the deploy script is run. These must be defined as a list in a cloud configuration @@ -623,9 +668,9 @@ file. For example: These commands will run in sequence **before** the bootstrap script is executed. New salt-cloud Grains -===================== +--------------------- -When salt cloud creates a new minon, it will now add grain information +When salt-cloud creates a new minion, it will now add grain information to the minion configuration file, identifying the resources originally used to create it. @@ -643,7 +688,7 @@ The generation of salt-cloud grains can be suppressed by the option ``enable_cloud_grains: 'False'`` in the cloud configuration file. Upgraded Saltify Driver -======================= +----------------------- The salt-cloud Saltify driver is used to provision machines which are not controlled by a dedicated cloud supervisor (such as typical hardware @@ -659,7 +704,7 @@ After disconnection from ("destroying" on) one master, a machine can be re-purposed by connecting to ("creating" on) a subsequent master. New Vagrant Driver -================== +------------------ The salt-cloud Vagrant driver brings virtual machines running in a limited environment, such as a programmer's workstation, under salt-cloud control. @@ -674,23 +719,27 @@ The master can be a very limited machine, such as a Raspberry Pi, or a small VagrantBox VM. Python PyWinRM Module -===================== +--------------------- + Versions of ``pywinrm>=0.2.1`` are finally able to disable validation of self -signed certificates. :ref:`Here` for more information. +signed certificates. :ref:`Here ` for more information. DigitalOcean -============ +------------ + The DigitalOcean driver has been renamed to conform to the company name. The new driver name is ``digitalocean``. The old name ``digital_ocean`` and a -short one ``do`` will still be supported through virtual aliases, this is mostly -cosmetic. +short one ``do`` will still be supported through virtual aliases, this is +mostly cosmetic. Azure Cloud -=========== -The azure sdk used for the ``azurearm`` cloud driver now depends on ``azure-cli>=2.0.12`` +----------- -New pillar/master_tops module called saltclass ----------------------------------------------- +The azure sdk used for the ``azurearm`` cloud driver now depends on +``azure-cli>=2.0.12`` + +New ``saltclass`` pillar/master_tops modules +============================================ This module clones the behaviour of reclass (http://reclass.pantsfullofunix.net/), without the need of an external app, and add several features to improve flexibility. Saltclass lets you define your nodes from simple ``yaml`` files (``.yml``) through hierarchical class inheritance with the possibility to override pillars down the tree. @@ -698,21 +747,37 @@ Saltclass lets you define your nodes from simple ``yaml`` files (``.yml``) throu **Features** - Define your nodes through hierarchical class inheritance -- Reuse your reclass datas with minimal modifications - - applications => states - - parameters => pillars -- Use Jinja templating in your yaml definitions -- Access to the following Salt objects in Jinja - - ``__opts__`` - - ``__salt__`` - - ``__grains__`` - - ``__pillars__`` - - ``minion_id`` -- Chose how to merge or override your lists using ^ character (see examples) -- Expand variables ${} with possibility to escape them if needed \${} (see examples) -- Ignores missing node/class and will simply return empty without breaking the pillar module completely - will be logged -An example subset of datas is available here: http://git.mauras.ch/salt/saltclass/src/master/examples +- Reuse your reclass data with minimal modifications + + - applications => states + + - parameters => pillars + +- Use Jinja templating in your yaml definitions + +- Access to the following Salt objects in Jinja + + - ``__opts__`` + + - ``__salt__`` + + - ``__grains__`` + + - ``__pillars__`` + + - ``minion_id`` + +- Chose how to merge or override your lists using ^ character (see examples) + +- Expand variables ${} with possibility to escape them if needed \${} (see + examples) + +- Ignores missing node/class and will simply return empty without breaking the + pillar module completely - will be logged + +An example subset of data is available here: +http://git.mauras.ch/salt/saltclass/src/master/examples ========================== =========== Terms usable in yaml files Description @@ -729,10 +794,11 @@ A class consists of: - zero or more states - any number of pillars -A child class can override pillars from a parent class. -A node definition is a class in itself with an added ``environment`` parameter for ``saltenv`` definition. +A child class can override pillars from a parent class. A node definition is a +class in itself with an added ``environment`` parameter for ``saltenv`` +definition. -**class names** +**Class Names** Class names mimic salt way of defining states and pillar files. This means that ``default.users`` class name will correspond to one of these: @@ -740,7 +806,7 @@ This means that ``default.users`` class name will correspond to one of these: - ``/classes/default/users.yml`` - ``/classes/default/users/init.yml`` -**Saltclass tree** +**Saltclass Tree** A saltclass tree would look like this: @@ -781,7 +847,7 @@ A saltclass tree would look like this: ``/nodes/lausanne/qls.node1.yml`` -.. code-block:: yaml +.. code-block:: jinja environment: base @@ -875,222 +941,252 @@ Not using ``^`` as the first entry will simply merge the lists **Known limitation** -Currently you can't have both a variable and an escaped variable in the same string as the escaped one will not be correctly rendered - '\${xx}' will stay as is instead of being rendered as '${xx}' +Currently you can't have both a variable and an escaped variable in the same +string as the escaped one will not be correctly rendered - '\${xx}' will stay +as is instead of being rendered as '${xx}' Lists of comments in state returns ----------------------------------- +================================== -State functions can now return a list of strings for the ``comment`` field, -as opposed to only a single string. -This is meant to ease writing states with multiple or multi-part comments. +State functions can now return a list of strings for the ``comment`` field, as +opposed to only a single string. This is meant to ease writing states with +multiple or multi-part comments. Beacon configuration changes ----------------------------- +============================ -In order to remain consistent and to align with other Salt components such as states, -support for configuring beacons using dictionary based configuration has been deprecated -in favor of list based configuration. All beacons have a validation function which will -check the configuration for the correct format and only load if the validation passes. +In order to remain consistent and to align with other Salt components such as +states, support for configuring beacons using dictionary based configuration +has been deprecated in favor of list based configuration. All beacons have a +validation function which will check the configuration for the correct format +and only load if the validation passes. -- ``avahi_announce`` beacon +avahi_announce +-------------- - Old behavior: +Old behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - avahi_announce: - run_once: True - servicetype: _demo._tcp - port: 1234 - txt: - ProdName: grains.productname - SerialNo: grains.serialnumber - Comments: 'this is a test' + beacons: + avahi_announce: + run_once: True + servicetype: _demo._tcp + port: 1234 + txt: + ProdName: grains.productname + SerialNo: grains.serialnumber + Comments: 'this is a test' - New behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - avahi_announce: - - run_once: True - - servicetype: _demo._tcp - - port: 1234 - - txt: - ProdName: grains.productname - SerialNo: grains.serialnumber - Comments: 'this is a test' + beacons: + avahi_announce: + - run_once: True + - servicetype: _demo._tcp + - port: 1234 + - txt: + ProdName: grains.productname + SerialNo: grains.serialnumber + Comments: 'this is a test' - - ``bonjour_announce`` beacon +bonjour_announce +---------------- - Old behavior: +Old behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - bonjour_announce: - run_once: True - servicetype: _demo._tcp - port: 1234 - txt: - ProdName: grains.productname - SerialNo: grains.serialnumber - Comments: 'this is a test' + beacons: + bonjour_announce: + run_once: True + servicetype: _demo._tcp + port: 1234 + txt: + ProdName: grains.productname + SerialNo: grains.serialnumber + Comments: 'this is a test' - New behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - bonjour_announce: - - run_once: True - - servicetype: _demo._tcp - - port: 1234 - - txt: - ProdName: grains.productname - SerialNo: grains.serialnumber - Comments: 'this is a test' + beacons: + bonjour_announce: + - run_once: True + - servicetype: _demo._tcp + - port: 1234 + - txt: + ProdName: grains.productname + SerialNo: grains.serialnumber + Comments: 'this is a test' -- ``btmp`` beacon +btmp +---- - Old behavior: +Old behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - btmp: {} + beacons: + btmp: {} - New behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - btmp: [] + beacons: + btmp: [] -- ``glxinfo`` beacon +glxinfo +------- - Old behavior: +Old behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - glxinfo: - user: frank - screen_event: True + beacons: + glxinfo: + user: frank + screen_event: True - New behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - glxinfo: - - user: frank - - screen_event: True + beacons: + glxinfo: + - user: frank + - screen_event: True -- ``haproxy`` beacon +haproxy +------- - Old behavior: +Old behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - haproxy: - - www-backend: - threshold: 45 - servers: - - web1 - - web2 - - interval: 120 - - New behavior: - - .. code-block:: yaml - - beacons: - haproxy: - - backends: - www-backend: - threshold: 45 - servers: + beacons: + haproxy: + - www-backend: + threshold: 45 + servers: - web1 - web2 - interval: 120 -- ``inotify`` beacon +New behavior: - Old behavior: +.. code-block:: yaml - .. code-block:: yaml + beacons: + haproxy: + - backends: + www-backend: + threshold: 45 + servers: + - web1 + - web2 + - interval: 120 - beacons: - inotify: +inotify +------- + +Old behavior: + +.. code-block:: yaml + + beacons: + inotify: + /path/to/file/or/dir: + mask: + - open + - create + - close_write + recurse: True + auto_add: True + exclude: + - /path/to/file/or/dir/exclude1 + - /path/to/file/or/dir/exclude2 + - /path/to/file/or/dir/regex[a-m]*$: + regex: True + coalesce: True + +New behavior: + +.. code-block:: yaml + + beacons: + inotify: + - files: /path/to/file/or/dir: - mask: - - open - - create - - close_write - recurse: True - auto_add: True - exclude: - - /path/to/file/or/dir/exclude1 - - /path/to/file/or/dir/exclude2 - - /path/to/file/or/dir/regex[a-m]*$: - regex: True - coalesce: True + mask: + - open + - create + - close_write + recurse: True + auto_add: True + exclude: + - /path/to/file/or/dir/exclude1 + - /path/to/file/or/dir/exclude2 + - /path/to/file/or/dir/regex[a-m]*$: + regex: True + - coalesce: True - New behavior: +journald +-------- - .. code-block:: yaml +Old behavior: - beacons: - inotify: - - files: - /path/to/file/or/dir: - mask: - - open - - create - - close_write - recurse: True - auto_add: True - exclude: - - /path/to/file/or/dir/exclude1 - - /path/to/file/or/dir/exclude2 - - /path/to/file/or/dir/regex[a-m]*$: - regex: True - - coalesce: True +.. code-block:: yaml -- ``journald`` beacon + beacons: + journald: + sshd: + SYSLOG_IDENTIFIER: sshd + PRIORITY: 6 - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - journald: + beacons: + journald: + - services: sshd: SYSLOG_IDENTIFIER: sshd PRIORITY: 6 - New behavior: +load +---- - .. code-block:: yaml +Old behavior: - beacons: - journald: - - services: - sshd: - SYSLOG_IDENTIFIER: sshd - PRIORITY: 6 +.. code-block:: yaml -- ``load`` beacon + beacons: + load: + 1m: + - 0.0 + - 2.0 + 5m: + - 0.0 + - 1.5 + 15m: + - 0.1 + - 1.0 + emitatstartup: True + onchangeonly: False - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - load: + beacons: + load: + - averages: 1m: - 0.0 - 2.0 @@ -1100,371 +1196,377 @@ check the configuration for the correct format and only load if the validation p 15m: - 0.1 - 1.0 - emitatstartup: True - onchangeonly: False + - emitatstartup: True + - onchangeonly: False - New behavior: +log +--- - .. code-block:: yaml +Old behavior: - beacons: - load: - - averages: - 1m: - - 0.0 - - 2.0 - 5m: - - 0.0 - - 1.5 - 15m: - - 0.1 - - 1.0 - - emitatstartup: True - - onchangeonly: False +.. code-block:: yaml -- ``log`` beacon + beacons: + log: + file: + : + regex: - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - log: - file: + beacons: + log: + - file: + - tags: : regex: - New behavior: +network_info +------------ - .. code-block:: yaml +Old behavior: - beacons: - log: - - file: - - tags: - : - regex: +.. code-block:: yaml -- ``network_info`` beacon + beacons: + network_info: + - eth0: + type: equal + bytes_sent: 100000 + bytes_recv: 100000 + packets_sent: 100000 + packets_recv: 100000 + errin: 100 + errout: 100 + dropin: 100 + dropout: 100 - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - network_info: - - eth0: - type: equal - bytes_sent: 100000 - bytes_recv: 100000 - packets_sent: 100000 - packets_recv: 100000 - errin: 100 - errout: 100 - dropin: 100 - dropout: 100 - - New behavior: - - .. code-block:: yaml - - beacons: - network_info: - - interfaces: - eth0: - type: equal - bytes_sent: 100000 - bytes_recv: 100000 - packets_sent: 100000 - packets_recv: 100000 - errin: 100 - errout: 100 - dropin: 100 - dropout: 100 - -- ``network_settings`` beacon - - Old behavior: - - .. code-block:: yaml - - beacons: - network_settings: + beacons: + network_info: + - interfaces: eth0: - ipaddr: - promiscuity: - onvalue: 1 - eth1: - linkmode: + type: equal + bytes_sent: 100000 + bytes_recv: 100000 + packets_sent: 100000 + packets_recv: 100000 + errin: 100 + errout: 100 + dropin: 100 + dropout: 100 - New behavior: +network_settings +---------------- - .. code-block:: yaml +Old behavior: - beacons: - network_settings: - - interfaces: - - eth0: - ipaddr: - promiscuity: - onvalue: 1 - - eth1: - linkmode: +.. code-block:: yaml -- ``proxy_example`` beacon + beacons: + network_settings: + eth0: + ipaddr: + promiscuity: + onvalue: 1 + eth1: + linkmode: - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - proxy_example: - endpoint: beacon + beacons: + network_settings: + - interfaces: + - eth0: + ipaddr: + promiscuity: + onvalue: 1 + - eth1: + linkmode: - New behavior: +proxy_example +------------- - .. code-block:: yaml +Old behavior: - beacons: - proxy_example: - - endpoint: beacon +.. code-block:: yaml -- ``ps`` beacon + beacons: + proxy_example: + endpoint: beacon - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - ps: - - salt-master: running - - mysql: stopped + beacons: + proxy_example: + - endpoint: beacon - New behavior: +ps +-- - .. code-block:: yaml +Old behavior: - beacons: - ps: - - processes: - salt-master: running - mysql: stopped +.. code-block:: yaml -- ``salt_proxy`` beacon + beacons: + ps: + - salt-master: running + - mysql: stopped - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - salt_proxy: - - p8000: {} - - p8001: {} + beacons: + ps: + - processes: + salt-master: running + mysql: stopped - New behavior: +salt_proxy +---------- - .. code-block:: yaml +Old behavior: - beacons: - salt_proxy: - - proxies: - p8000: {} - p8001: {} +.. code-block:: yaml -- ``sensehat`` beacon + beacons: + salt_proxy: + - p8000: {} + - p8001: {} - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - sensehat: + beacons: + salt_proxy: + - proxies: + p8000: {} + p8001: {} + +sensehat +-------- + +Old behavior: + +.. code-block:: yaml + + beacons: + sensehat: + humidity: 70% + temperature: [20, 40] + temperature_from_pressure: 40 + pressure: 1500 + +New behavior: + +.. code-block:: yaml + + beacons: + sensehat: + - sensors: humidity: 70% temperature: [20, 40] temperature_from_pressure: 40 pressure: 1500 - New behavior: +service +------- - .. code-block:: yaml +Old behavior: - beacons: - sensehat: - - sensors: - humidity: 70% - temperature: [20, 40] - temperature_from_pressure: 40 - pressure: 1500 +.. code-block:: yaml -- ``service`` beacon + beacons: + service: + salt-master: + mysql: - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - service: - salt-master: - mysql: + beacons: + service: + - services: + nginx: + onchangeonly: True + delay: 30 + uncleanshutdown: /run/nginx.pid - New behavior: +sh +-- - .. code-block:: yaml +Old behavior: - beacons: - service: - - services: - nginx: - onchangeonly: True - delay: 30 - uncleanshutdown: /run/nginx.pid +.. code-block:: yaml -- ``sh`` beacon + beacons: + sh: {} - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - sh: {} + beacons: + sh: [] - New behavior: +status +------ - .. code-block:: yaml +Old behavior: - beacons: - sh: [] +.. code-block:: yaml -- ``status`` beacon + beacons: + status: {} - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - status: {} + beacons: + status: [] - New behavior: +telegram_bot_msg +---------------- - .. code-block:: yaml +Old behavior: - beacons: - status: [] +.. code-block:: yaml -- ``telegram_bot_msg`` beacon + beacons: + telegram_bot_msg: + token: "" + accept_from: + - "" + interval: 10 - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - telegram_bot_msg: - token: "" - accept_from: - - "" - interval: 10 + beacons: + telegram_bot_msg: + - token: "" + - accept_from: + - "" + - interval: 10 - New behavior: +twilio_txt_msg +-------------- - .. code-block:: yaml +Old behavior: - beacons: - telegram_bot_msg: - - token: "" - - accept_from: - - "" - - interval: 10 +.. code-block:: yaml -- ``twilio_txt_msg`` beacon + beacons: + twilio_txt_msg: + account_sid: "" + auth_token: "" + twilio_number: "+15555555555" + interval: 10 - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - twilio_txt_msg: - account_sid: "" - auth_token: "" - twilio_number: "+15555555555" - interval: 10 + beacons: + twilio_txt_msg: + - account_sid: "" + - auth_token: "" + - twilio_number: "+15555555555" + - interval: 10 - New behavior: +wtmp +---- - .. code-block:: yaml +Old behavior: - beacons: - twilio_txt_msg: - - account_sid: "" - - auth_token: "" - - twilio_number: "+15555555555" - - interval: 10 +.. code-block:: yaml -- ``wtmp`` beacon + beacons: + wtmp: {} - Old behavior: +New behavior: - .. code-block:: yaml +.. code-block:: yaml - beacons: - wtmp: {} - - New behavior: - - .. code-block:: yaml - - beacons: - wtmp: [] + beacons: + wtmp: [] New requisites available in state compiler ------------------------------------------- +========================================== -- ``require_any`` -The use of ``require_any`` demands that one of the required states executes before the -dependent state. The state containing the ``require_any`` requisite is defined as the -dependent state. The states specified in the ``require_any`` statement are defined as the -required states. If at least one of the required state's execution succeeds, the dependent state -will then execute. If all of the executions by the required states fail, the dependent state -will not execute. +require_any +----------- + +The use of ``require_any`` demands that one of the required states executes +before the dependent state. The state containing the ``require_any`` requisite +is defined as the dependent state. The states specified in the ``require_any`` +statement are defined as the required states. If at least one of the required +state's execution succeeds, the dependent state will then execute. If all of +the executions by the required states fail, the dependent state will not +execute. + +watch_any +--------- -- ``watch_any`` The state containing the ``watch_any`` requisite is defined as the watching -state. The states specified in the ``watch_any`` statement are defined as the watched -states. When the watched states execute, they will return a dictionary containing -a key named "changes". +state. The states specified in the ``watch_any`` statement are defined as the +watched states. When the watched states execute, they will return a dictionary +containing a key named "changes". -If the "result" of any of the watched states is ``True``, the watching state *will -execute normally*, and if all of them are ``False``, the watching state will never run. -This part of ``watch`` mirrors the functionality of the ``require`` requisite. +If the "result" of any of the watched states is ``True``, the watching state +*will execute normally*, and if all of them are ``False``, the watching state +will never run. This part of ``watch`` mirrors the functionality of the +``require`` requisite. If the "result" of any of the watched states is ``True`` *and* the "changes" key contains a populated dictionary (changes occurred in the watched state), then the ``watch`` requisite can add additional behavior. This additional behavior is defined by the ``mod_watch`` function within the watching state module. If the ``mod_watch`` function exists in the watching state module, it -will be called *in addition to* the normal watching state. The return data -from the ``mod_watch`` function is what will be returned to the master in this -case; the return data from the main watching function is discarded. +will be called *in addition to* the normal watching state. The return data from +the ``mod_watch`` function is what will be returned to the master in this case; +the return data from the main watching function is discarded. If the "changes" key contains an empty dictionary, the ``watch`` requisite acts exactly like the ``require`` requisite (the watching state will execute if "result" is ``True``, and fail if "result" is ``False`` in the watched state). -- ``onchanges_any`` -The ``onchanges_any`` requisite makes a state only apply one of the required states -generates changes, and if one of the watched state's "result" is ``True``. This can be -a useful way to execute a post hook after changing aspects of a system. +onchanges_any +------------- -- ``onfail_any`` -The ``onfail_any`` requisite allows for reactions to happen strictly as a response -to the failure of at least one other state. This can be used in a number of ways, such as -executing a second attempt to set up a service or begin to execute a separate -thread of states because of a failure. +The ``onchanges_any`` requisite makes a state only apply one of the required +states generates changes, and if one of the watched state's "result" is +``True``. This can be a useful way to execute a post hook after changing +aspects of a system. -The ``onfail_any`` requisite is applied in the same way as ``require_any`` and ``watch_any``: +onfail_any +---------- -Basic Slots support in states compiler --------------------------------------- +The ``onfail_any`` requisite allows for reactions to happen strictly as a +response to the failure of at least one other state. This can be used in a +number of ways, such as executing a second attempt to set up a service or begin +to execute a separate thread of states because of a failure. + +The ``onfail_any`` requisite is applied in the same way as ``require_any`` and +``watch_any``. + +Basic Slots support in state compiler +===================================== Slots extend the state syntax and allows you to do things right before the state function is executed. So you can make a decision in the last moment right @@ -1482,7 +1584,7 @@ Slot syntax looks close to the simple python function call. Here is a simple exa Read more :ref:`here `. Cryptographic layer changes ---------------------------- +=========================== M2Crypto is coming back. We are making the crypto backend modular but in this release M2Crypto is enabled if it's importable by Python. If not Cryptodome or @@ -1491,22 +1593,22 @@ same way as PyCrypto so there would be no compatibility issues, different nodes could use different backends. NaCL Module and Runner changes ------------------------------- +============================== In addition to argument changes in both the NaCL module and runner for future removal in the Neon release, the default "box_type" has changed from ``secretbox`` to ``sealedbox``. SecretBox is data encrypted using private key ``sk`` and Sealedbox is encrypted using public key ``pk``. -``utils`` functions moved into separate modules ------------------------------------------------ +``utils`` functions reorganized into separate modules +===================================================== -The Salt utility functions from ``salt.utils`` have been moved into different -modules, grouped logically based on their functionality. This change is -backwards compatible, but the old imports will no longer be supported starting -with release Neon. +The Salt utility functions from ``salt.utils`` (typically used by those +developing extension modules for Salt) have been moved into different modules, +grouped logically based on their functionality. The old function names will +continue to work until the ``Neon`` release of Salt (due around Q1 2019). -The functions have been moved as follows: +The renamed functions are: - ``salt.utils.appendproctitle``: use ``salt.utils.process.appendproctitle`` instead. @@ -1667,165 +1769,180 @@ The functions have been moved as follows: instead. Deprecations ------------- +============ Configuration Option Deprecations -================================= +--------------------------------- - The ``requests_lib`` configuration option has been removed. Please use ``backend`` instead. Profitbricks Cloud Updated Dependency -===================================== +------------------------------------- The minimum version of the ``profitbrick`` python package for the ``profitbricks`` cloud driver has changed from 3.0.0 to 3.1.0. +Execution Module Deprecations +----------------------------- -Module Deprecations -=================== +- The ``blockdev`` execution module has been removed. Its functions were merged + with the :py:mod:`disk ` module. -The ``blockdev`` execution module has been removed. Its functions were merged -with the ``disk`` module. Please use the ``disk`` execution module instead. +- The :py:mod:`lxc ` execution module has been changed as + follows: -The ``lxc`` execution module had the following changes: + - The ``dnsservers`` option to :py:func:`lxc.cloud_init_interface + ` no longer defaults to + ``4.4.4.4`` and ``8.8.8.8``. -- The ``dnsservers`` option to the ``cloud_init_interface`` function no longer - defaults to ``4.4.4.4`` and ``8.8.8.8``. -- The ``dns_via_dhcp`` option to the ``cloud_init_interface`` function defaults - to ``True`` now instead of ``False``. + - The ``dns_via_dhcp`` option to :py:func:`lxc.cloud_init_interface + ` now defaults to ``True`` instead + of ``False``. -The ``win_psget`` module had the following changes: +- The :py:mod:`win_psget ` module has been changed as + follows: -- The ``psversion`` function was removed. Please use ``cmd.shell_info`` instead. + - The ``psget.psversion`` function was removed. Please use + :py:func:`cmd.shell_info ` instead. -The ``win_service`` module had the following changes: +- The :py:mod:`win_service ` module (which provides + the ``service`` module on Windows platforms) has been changed as follows: -- The ``config`` function was removed. Please use the ``modify`` function - instead. -- The ``binpath`` option was removed from the ``create`` function. Please use - ``bin_path`` instead. -- The ``depend`` option was removed from the ``create`` function. Please use - ``dependencies`` instead. -- The ``DisplayName`` option was removed from the ``create`` function. Please - use ``display_name`` instead. -- The ``error`` option was removed from the ``create`` function. Please use - ``error_control`` instead. -- The ``group`` option was removed from the ``create`` function. Please use - ``load_order_group`` instead. -- The ``obj`` option was removed from the ``create`` function. Please use - ``account_name`` instead. -- The ``password`` option was removed from the ``create`` function. Please use - ``account_password`` instead. -- The ``start`` option was removed from the ``create`` function. Please use - ``start_type`` instead. -- The ``type`` option was removed from the ``create`` function. Please use - ``service_type`` instead. + - The ``config`` function was removed. Please use :py:func:`service.modify + ` instead. -The ``nacl`` module had the following changes: + - The following arguments to the :py:func:`service.create + ` function have been renamed: -- The ``key_file`` option was replaced in the ``keygen``, ``enc`` and ``dec`` -functions. Please use the ``sk_file`` option instead. + - ``binpath`` has been renamed to ``bin_path`` -- The ``key`` option was replaced in the ``keygen``, ``enc`` and ``dec`` -functions. Please use the ``sk`` option instead. + - ``depend`` has been renamed to ``dependencies`` + - ``DisplayName`` has been renamed to ``display_name`` + + - ``error`` has been renamed to ``error_control`` + + - ``group`` has been renamed to ``load_order_group`` + + - ``obj`` has been renamed to ``account_name`` + + - ``password`` has been renamed to ``account_password`` + + - ``start`` has been renamed to ``start_type`` + + - ``type`` has been renamed to ``service_type`` + +- The :py:mod:`nacl ` module has been changed as follows: + + - The following arguments have been renamed in the :py:mod:`nacl.keygen + `, :py:mod:`nacl.enc `, and + :py:mod:`nacl.dec `: + + - ``key_file`` has been renamed to ``sk_file`` + + - ``key`` has been renamed to ``sk`` Runner Deprecations -=================== +------------------- -The ``manage`` runner had the following changes: +- The :py:mod:`manage ` runner has been changed as follows: -- The ``root_user`` kwarg was removed from the ``bootstrap`` function. Please - use ``salt-ssh`` roster entries for the host instead. + - ``root_user`` argument was removed from the :py:func:`manage.bootstrap + ` function. Please use ``salt-ssh`` roster + entries for the host instead. -The ``nacl`` runner had the following changes: +- The :py:mod:`nacl ` runner has been changed as follows: -- The ``key_file`` option was replaced in the ``keygen``, ``enc`` and ``dec`` -functions. Please use the ``sk_file`` option instead. + - The following arguments have been renamed in the :py:mod:`nacl.keygen + `, :py:mod:`nacl.enc `, and + :py:mod:`nacl.dec `: -- The ``key`` option was replaced in the ``keygen``, ``enc`` and ``dec`` -functions. Please use the ``sk`` option instead. + - ``key_file`` has been renamed to ``sk_file`` + + - ``key`` has been renamed to ``sk`` State Deprecations -================== +------------------ -The ``archive`` state had the following changes: +- In the :py:func:`archive ` state, the + ``tar_options`` and ``zip_options`` options were removed. Please use + ``options`` instead. -- The ``tar_options`` and the ``zip_options`` options were removed from the - ``extracted`` function. Please use ``options`` instead. +- The :py:func:`cmd ` state had the following changes: -The ``cmd`` state had the following changes: + - The ``user`` and ``group`` options were removed from the following functions + (please use ``runas`` instead): -- The ``user`` and ``group`` options were removed from the ``run`` function. - Please use ``runas`` instead. -- The ``user`` and ``group`` options were removed from the ``script`` function. - Please use ``runas`` instead. -- The ``user`` and ``group`` options were removed from the ``wait`` function. - Please use ``runas`` instead. -- The ``user`` and ``group`` options were removed from the ``wait_script`` - function. Please use ``runas`` instead. + - :py:func:`cmd.run ` -The ``file`` state had the following changes: + - :py:func:`cmd.script ` -- The ``show_diff`` option was removed. Please use ``show_changes`` instead. + - :py:func:`cmd.wait ` + + - :py:func:`cmd.wait_script ` + +- In the :py:mod:`file ` states, the ``show_diff`` option was + removed in all states where it was previously supported. Please use + ``show_changes`` instead. Grain Deprecations -================== +------------------ -For ``smartos`` some grains have been deprecated. These grains will be removed in Neon. +- For ``smartos``, some grains have been deprecated. These grains will be + removed in Neon: -- The ``hypervisor_uuid`` has been replaced with ``mdata:sdc:server_uuid`` grain. -- The ``datacenter`` has been replaced with ``mdata:sdc:datacenter_name`` grain. + - The ``hypervisor_uuid`` grain has been replaced with + ``mdata:sdc:server_uuid`` -Minion Blackout ---------------- - -During a blackout, minions will not execute any remote execution commands, -except for :mod:`saltutil.refresh_pillar `. -Previously, support was added so that blackouts are enabled using a special -pillar key, ``minion_blackout`` set to ``True`` and an optional pillar key -``minion_blackout_whitelist`` to specify additional functions that are permitted -during blackout. This release adds support for using this feature in the grains -as well, by using special grains keys ``minion_blackout`` and -``minion_blackout_whitelist``. + - The ``datacenter`` grain has been replaced with + ``mdata:sdc:datacenter_name`` Pillar Deprecations ------------------- -The legacy configuration for ``git_pillar`` has been removed. Please use the new -configuration for ``git_pillar``, which is documented in the external pillar module -for :mod:`git_pillar `. +The legacy configuration for ``git_pillar`` has been removed. Please use the +new configuration for ``git_pillar`` which was added in 2015.8.0, which is +documented :py:mod:`here `. Utils Deprecations -================== - -The ``salt.utils.cloud.py`` file had the following change: - -- The ``fire_event`` function now requires a ``sock_dir`` argument. It was - previously optional. - -Other Miscellaneous Deprecations -================================ - -The ``version.py`` file had the following changes: - -- The ``rc_info`` function was removed. Please use ``pre_info`` instead. - -Warnings for moving away from the ``env`` option were removed. ``saltenv`` -should be used instead. The removal of these warnings does not have a behavior -change. Only the warning text was removed. - -Sentry Log Handler ------------------ -Configuring sentry raven python client via ``project``, ``servers``, ``public_key -and ``secret_key`` is deprecated and won't work with sentry clients > 3.0. -Instead, the ``dsn`` config param must be used. +- In ``salt.utils.cloud``, the ``fire_event`` function now requires a + ``sock_dir`` argument. It was previously optional. + +Other Miscellaneous Deprecations +-------------------------------- + +- In ``version.py``, the ``rc_info`` function was removed. Please use + ``pre_info`` instead. + +- Warnings for moving away from the ``env`` option were removed. ``saltenv`` + should be used instead. The removal of these warnings does not have a + behavior change. Only the warning text was removed. + +Minion Blackout +=============== + +During a blackout, minions will not execute any remote execution commands, +except for :mod:`saltutil.refresh_pillar +`. Previously, support was added so that +blackouts are enabled using a special pillar key, ``minion_blackout`` set to +``True`` and an optional pillar key ``minion_blackout_whitelist`` to specify +additional functions that are permitted during blackout. This release adds +support for using this feature in the grains as well, by using special grains +keys ``minion_blackout`` and ``minion_blackout_whitelist``. + +Sentry Log Handler +================== + +Configuring sentry raven python client via ``project``, ``servers``, +``public_key and ``secret_key`` is deprecated and won't work with sentry +clients > 3.0. Instead, the ``dsn`` config param must be used. RAET transport --------------- +============== We haven't been doing development on RAET for quite some time and decided that 2018.3.0 is the time to announce the deprecation. RAET support will be removed diff --git a/doc/topics/releases/2018.3.1.rst b/doc/topics/releases/2018.3.1.rst index 1fbc59a85b..41c8820d7b 100644 --- a/doc/topics/releases/2018.3.1.rst +++ b/doc/topics/releases/2018.3.1.rst @@ -1,12 +1,31 @@ =========================== -In Progress: Salt 2018.3.1 Release Notes +Salt 2018.3.1 Release Notes =========================== -Version 2018.3.1 is an **unreleased** bugfix release for :ref:`2018.3.0 `. -This release is still in progress and has not been released yet. +Version 2018.3.1 is a bugfix release for :ref:`2018.3.0 `. + +Statistics +========== + +- Total Merges: **525** +- Total Issue References: **74** +- Total PR References: **255** + +- Contributors: **55** (`Ch3LL`_, `DmitryKuzmenko`_, `Giandom`_, `Kimol`_, `L4rS6`_, `LukeCarrier`_, `OrlandoArcapix`_, `TamCore`_, `The-Loeki`_, `UtahDave`_, `aesposito91`_, `bbinet`_, `bdrung`_, `boltronics`_, `bosatsu`_, `clan`_, `corywright`_, `damon-atkins`_, `dincamihai`_, `dmurphy18`_, `dnABic`_, `douglasjreynolds`_, `dwoz`_, `edgan`_, `ejparker12`_, `esell`_, `ezh`_, `femnad`_, `folti`_, `garethgreenaway`_, `gtmanfred`_, `isbm`_, `jasperla`_, `johnj`_, `mateiw`_, `mcalmer`_, `mirceaulinic`_, `morganwillcock`_, `opdude`_, `pcn`_, `pruiz`_, `psagers`_, `psyer`_, `rallytime`_, `robinro`_, `s0undt3ch`_, `samodid`_, `shengis`_, `skjaro`_, `tankywoo`_, `terminalmage`_, `twangboy`_, `vutny`_, `yannj-fr`_, `zmedico`_) + + +Tornado 5.0 Support for Python 2 Only +===================================== + +Tornado 5.0 moves to using asyncio for all python3 versions. Because of this +and changes in asyncio between python 3.4 and 3.5 to only be able to use one +ioloop, which requires some rearchitecting, support for tornado 5.0 and python3 +versions of salt has been delayed to a later release. + +For now, to use tornado 5.0, the python 2 version of salt must be used. Changes to Slack Engine pillars -------------------------------- +=============================== When using ``groups_pillar_name`` for the slack engine, the engine should be used as part of a salt-minion process running on the master. This will allow @@ -15,7 +34,7 @@ create a LocalClient connection to the master ipc sockets to control environments. Changes to Automatically Updating the Roster File -------------------------------------------------- +================================================= In ``2018.3.0`` salt-ssh was configured to automatically update the flat roster file if a minion was not found for salt-ssh. This was decided to be @@ -23,3 +42,4791 @@ undesireable as a default. The ``--skip-roster`` flag has been removed and replaced with ``--update-roster``, which will enable salt-ssh to add minions to the flat roster file. This behavior can also be enabled by setting ``ssh_update_roster: True`` in the master config file. + +Changelog for v2018.3.0..v2018.3.1 +================================== + + +*Generated at: 2018-06-06 17:43:01 UTC* + +* **ISSUE** `#47955`_: (`frogunder`_) 2018.3.1 Creating Windows machine in Amazon using salt-cloud fails. (refs: `#47989`_) + +* **PR** `#47998`_: (`rallytime`_) Back-port `#47989`_ to 2018.3.1 + @ *2018-06-06 17:08:04 UTC* + + * **PR** `#47989`_: (`dwoz`_) Properly decode password from aws using m2crypto (refs: `#47998`_) + + * 605463ca0d Merge pull request `#47998`_ from rallytime/bp-47989 + + * 1b7e9ac2d3 Lint fixes + + * 0545152ddd Properly decode password from aws using m2crypto + +* **PR** `#47965`_: (`Ch3LL`_) Add PR 47924 from 2018.3 branch + @ *2018-06-06 13:54:09 UTC* + + * dbc798ac68 Merge pull request `#47965`_ from Ch3LL/gitpy_mac_3.1 + + * bf608abd44 Catch all exceptions in git import for salt.utils.gitfs + +* **PR** `#47973`_: (`terminalmage`_) salt.modules.testinframod: fix TypeError invoking types.FunctionType + @ *2018-06-06 13:53:46 UTC* + + * 864d640633 Merge pull request `#47973`_ from terminalmage/fix-testinfra + + * 4518c89484 Lint: Remove unused six import + + * c6816b2149 salt.modules.testinframod: fix TypeError invoking types.FunctionType + +* **ISSUE** `#47236`_: (`MorphBonehunter`_) x509.private_key_managed broken after upgrade to 2018.3.0 (refs: `#47957`_) + +* **PR** `#47967`_: (`rallytime`_) Back-port `#47957`_ to 2018.3.1 + @ *2018-06-06 13:53:28 UTC* + + * **PR** `#47957`_: (`garethgreenaway`_) [2018.8] Ensure x509 passphrase is a string (refs: `#47967`_) + + * 5ddcfff420 Merge pull request `#47967`_ from rallytime/bp-47957 + + * 9a55579af1 removing unnecessary change + + * 329b2e5956 Ensuring that when a passphrase is passed in, it is returned as a string from the passphrase callback. + +* **PR** `#47902`_: (`Ch3LL`_) Remove In Progress for 2018.3.1 Release Notes + @ *2018-05-30 18:26:49 UTC* + + * 9c964fdbce Merge pull request `#47902`_ from Ch3LL/rn_in_progress + + * f560a151cd Remove In Progress for 2018.3.1 Release Notes + +* **PR** `#47897`_: (`Ch3LL`_) Add changelog to 2018.3.1 release notes + @ *2018-05-30 15:04:42 UTC* + + * ea7b4fdc08 Merge pull request `#47897`_ from Ch3LL/rn_2018 + + * e27ee273a7 Add == line to changelog line for release notes + + * 61e56d275d Add changelog to 2018.3.1 release notes + +* **ISSUE** `#47784`_: (`jpsv`_) win_lgpo.py line 5368; AttributeError: 'OrderedDict' object has no attribute 'lower' (refs: `#47848`_) + +* **PR** `#47848`_: (`twangboy`_) Fix some major issues with the LGPO module + @ *2018-05-30 13:37:32 UTC* + + * f15e636d5e Merge pull request `#47848`_ from twangboy/fix_47784 + + * 98facf8dc8 Remove log.debug statement in __virtual__ + + * f037fa4064 Fix some major issues with the LGPO module + +* **PR** `#47881`_: (`gtmanfred`_) quote python_version in requirements.txt + @ *2018-05-29 21:12:05 UTC* + + * 92b8c4c08e Merge pull request `#47881`_ from gtmanfred/2018.3.1 + + * 3d874b5529 quote python_version in requirements.txt + +* **PR** `#47874`_: (`gtmanfred`_) Tornado 5.0 is only supported on python 2 for now + @ *2018-05-29 19:45:44 UTC* + + * 705bf8172d Merge pull request `#47874`_ from gtmanfred/2018.3.1 + + * 13f920415a add tornado5 note to 2018.3.1 + + * aeacd2b749 allow tornado 5.0 to be installed only for python2 + +* **PR** `#47820`_: (`Ch3LL`_) Remove output_loglevel in mac_system module + @ *2018-05-25 13:10:36 UTC* + + * 09e8c5f0cd Merge pull request `#47820`_ from Ch3LL/mac_system + + * 362414e53b Remove output_loglevel in mac_system module + +* **PR** `#47798`_: (`rallytime`_) Back-port `#47776`_ to 2018.3.1 + @ *2018-05-23 15:10:43 UTC* + + * **PR** `#47776`_: (`garethgreenaway`_) [2018.3] Fixes to failing _before_connect tests (refs: `#47798`_) + + * 7e314c26c8 Merge pull request `#47798`_ from rallytime/bp-47776 + + * ae881547d2 Fixing unit.test_minion.MinionTestCase.test_beacons_before_connect and unit.test_minion.MinionTestCase.test_scheduler_before_connect. + +* **PR** `#47782`_: (`rallytime`_) Back-port `#47775`_ to 2018.3.1 + @ *2018-05-22 20:56:37 UTC* + + * **PR** `#47775`_: (`gtmanfred`_) catch UnsupportedOperation with AssertionError (refs: `#47782`_) + + * 9c610da0bc Merge pull request `#47782`_ from rallytime/bp-47775 + + * bab9c966c5 catch UnsupportedOperation with AssertionError + +* **PR** `#47770`_: (`rallytime`_) Back-port `#47769`_ to 2018.3.1 + @ *2018-05-22 17:27:20 UTC* + + * **PR** `#47769`_: (`gtmanfred`_) skip test that breaks test suite (refs: `#47770`_) + + * 4adf10b20b Merge pull request `#47770`_ from rallytime/bp-47769 + + * 3cfb95c7bc skip test that breaks test suite + +* **PR** `#47724`_: (`terminalmage`_) 2 master_tops/ext_nodes fixes + @ *2018-05-21 15:59:04 UTC* + + * bbe8e62a98 Merge pull request `#47724`_ from terminalmage/master_tops_fixes + + * 48b8c5acd1 Merge branch '2018.3.1' into master_tops_fixes + + * 89b3070d4c Change deprecation warning to debug logging + + * ceb6e10f87 Fix spurious "Malformed request" error + +* **ISSUE** `#47484`_: (`whytewolf`_) Windows: pkg.latest state not updating packages. (refs: `#47702`_) + +* **PR** `#47739`_: (`rallytime`_) Back-port `#47702`_ to 2018.3.1 + @ *2018-05-21 15:37:03 UTC* + + * **PR** `#47702`_: (`damon-atkins`_) State pkg.latest called win pkg.install with list of pkgs and the required versions (refs: `#47739`_) + + * 97d6fe7434 Merge pull request `#47739`_ from rallytime/bp-47702 + + * f79da64bb0 Update is_windows path to use `platform` + + * f04b19b5b6 Ensure targeted_pkgs always contains value for non-windows. + + * 14659f9cad Adjusted based on feed back. + + * 9f18f7cdf5 Whitespace lint issues + + * 2a29b28ee6 pkg.install execution module on windows ensures the software package is installed when no version is specified, it does not upgrade the software to the latest. This is per the design. pkg.latest must provide the versions to install to pkg.install + +* **PR** `#47730`_: (`rallytime`_) Back-port `#47700`_ to 2018.3.1 + @ *2018-05-21 15:36:16 UTC* + + * **PR** `#47700`_: (`yannj-fr`_) fix roots modification time check (refs: `#47730`_) + + * cfbe0ba73e Merge pull request `#47730`_ from rallytime/bp-47700 + + * 9bc35b88ea fix roots modification time check + +* **PR** `#47727`_: (`Ch3LL`_) Fix salt.utils.versions.warn_until spelling + @ *2018-05-21 13:41:00 UTC* + + * 3614d3d83a Merge pull request `#47727`_ from Ch3LL/spelling + + * 47a8de5b73 Fix salt.utils.versions.warn_until spelling + +* **PR** `#47736`_: (`Ch3LL`_) mac_utils test: patch __salt__['cmd.run*'] + @ *2018-05-21 13:38:59 UTC* + + * bb45cdaefe Merge pull request `#47736`_ from Ch3LL/fix_util_mac_test + + * ee90c779a8 mac_utils test: patch __salt__['cmd.run*'] + +* **PR** `#47641`_: (`gtmanfred`_) fix _create_stream and tornado 5.0 + @ *2018-05-18 14:25:36 UTC* + + * 43930f8bac Merge pull request `#47641`_ from gtmanfred/2018.3.1 + + * 037fd92f59 fix pylint + + * 75d42d8963 Fix last test for tornado + + * a046512287 allow using tornado 5.0 + + * 05e651f038 fix _create_stream and tornado 5.0 + +* **ISSUE** `#47532`_: (`edgan`_) roster auto-add feature in salt-ssh-2018.3.0 (refs: `#47541`_) + +* **PR** `#47541`_: (`gtmanfred`_) switch skip-roster to update-roster + @ *2018-05-18 13:29:50 UTC* + + * 9f926bcd1a Merge pull request `#47541`_ from gtmanfred/2018.3 + + * 8c5c780292 switch skip-roster to update-roster + +* **PR** `#47719`_: (`rallytime`_) Back-port `#47692`_ to 2018.3.1 + @ *2018-05-18 13:22:02 UTC* + + * **PR** `#47692`_: (`dwoz`_) Default windows to m1.small for ec2-classic (refs: `#47719`_) + + * a963f1b558 Merge pull request `#47719`_ from rallytime/bp-47692 + + * 1d9f247fb7 Default windows to m1.small for ec2-classic + +* **PR** `#47706`_: (`Ch3LL`_) Add cmd._run_all_quiet to mac_utils and __utils__ in mac_service + @ *2018-05-18 01:11:46 UTC* + + * c9108893ab Merge pull request `#47706`_ from Ch3LL/mac_service_util + + * 3611af699f remove added space + + * 9921caa143 fix pylint + + * 317e41d3c0 use cmd._run_quiet and cmd._run_all_quiet instead of importing minion_mods in __salt__ + + * a78652515a Add __salt__ to mac_utils and __utils__ in mac_service + +* **PR** `#47664`_: (`rallytime`_) Back-port `#47645`_ to 2018.3.1 + @ *2018-05-15 18:25:27 UTC* + + * **PR** `#47645`_: (`Ch3LL`_) query the pip path for test test_issue_2087_missing_pip (refs: `#47664`_) + + * fb3bf1ff3e Merge pull request `#47664`_ from rallytime/bp-47645 + + * 0a732d8e66 query the pip path for test test_issue_2087_missing_pip + +* **PR** `#47647`_: (`rallytime`_) Back-port `#47601`_ and `#47643`_ to 2018.3.1 + @ *2018-05-15 14:07:54 UTC* + + * **PR** `#47643`_: (`dwoz`_) Remove unwanted file (refs: `#47647`_) + + * **PR** `#47601`_: (`dwoz`_) Skip tests when we can not use runas (refs: `#47647`_) + + * 9039fee104 Merge pull request `#47647`_ from rallytime/bp-47601-and-47643-2018.3.1 + + * 7214fe17c8 Fix typo + + * 506dceed17 Remove unwanted file + + * b6a21dfda3 use ignore-undefined-variable + + * 2429f9fe8a Ignore pylint WindowsError + + * 2d63682fea Better doc string + + * ec2adff699 Skip tests when we can not use runas + +* **PR** `#47596`_: (`rallytime`_) Back-port `#47568`_ to 2018.3.1 + @ *2018-05-10 22:09:09 UTC* + + * **PR** `#47568`_: (`terminalmage`_) salt.serializers.yaml/yamlex: remove invalid multi_constructor (refs: `#47596`_) + + * 17b5265d95 Merge pull request `#47596`_ from rallytime/bp-47568 + + * ecf5dc8b9f Add exception logging on serialize/deserialize exceptions + + * 9659b19819 salt.serializers.yaml/yamlex: remove invalid multi_constructor + +* **PR** `#47595`_: (`rallytime`_) Back-port `#47569`_ to 2018.3.1 + @ *2018-05-10 22:08:53 UTC* + + * **PR** `#47569`_: (`Ch3LL`_) Update salt.utils.path mock in virtual core test (refs: `#47595`_) + + * c4c400f3e9 Merge pull request `#47595`_ from rallytime/bp-47569 + + * 0763f96458 update salt.utils.platform path for virt core test + + * 718252c1ef Update salt.utils.path mock in virtual core test + +* **PR** `#47599`_: (`rallytime`_) Back-port `#47570`_ to 2018.3.1 + @ *2018-05-10 22:06:44 UTC* + + * **PR** `#47570`_: (`gtmanfred`_) Update dependency to msgpack (refs: `#47599`_) + + * ec7de14be0 Merge pull request `#47599`_ from rallytime/bp-47570 + + * 9334c03da9 Update dependency to msgpack + +* **PR** `#47571`_: (`rallytime`_) [2018.3.1] Update man pages + @ *2018-05-10 16:21:57 UTC* + + * 2a10d92669 Merge pull request `#47571`_ from rallytime/man-pages + + * ade5e9f664 [2018.3.1] Update man pages + +* **PR** `#47550`_: (`pcn`_) Fixes a bad deletion I did that only surfaced in 2018.3 + @ *2018-05-09 13:36:33 UTC* + + * 85284caaf9 Merge pull request `#47550`_ from pcn/fix-disable-term-protect-in-2018.3 + + * d58a56877c Fixes a bad deletion I did that only surfaced in 2018.3 + +* **ISSUE** `#47553`_: (`douglasjreynolds`_) Unicode version error in lxc (refs: `#47554`_) + +* **PR** `#47554`_: (`douglasjreynolds`_) Converted unicode str version to a LooseVersion; matching line 2080. + @ *2018-05-09 13:34:13 UTC* + + * f9083ff77e Merge pull request `#47554`_ from douglasjreynolds/lxc_unicode_fix + + * e6bce581c6 Converted unicode str version to _LooseVersion to match line 2080. + +* **PR** `#47518`_: (`Ch3LL`_) Fix 47364: ensure we are not caching zfs.is_supported + @ *2018-05-09 13:29:07 UTC* + + * fe4e79f1de Merge pull request `#47518`_ from Ch3LL/zfs_support + + * d19fef963e remove unnecessary patch in zfs.is_supported test + + * 58c4f29f96 Fix 47364: ensure we are not caching zfs.is_supported + +* **PR** `#47159`_: (`terminalmage`_) Fix for whitelist/blacklist checking for non-list iterables + @ *2018-05-08 20:43:51 UTC* + + * 332e9f13a6 Merge pull request `#47159`_ from terminalmage/whitelist_blacklist-iter-fix + + * ca936de372 Treat empty whitelist/blacklist as no whitelist/blacklist + + * bcccaf2621 Raise a TypeError when invalid input passed to check_whitelist_blacklist + + * 2ae510ff2b Fix comment in test + + * 17398efcf7 Fix for whitelist/blacklist checking for non-list iterables + +* **PR** `#47514`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-05-08 18:36:54 UTC* + + * 21809ddc02 Merge pull request `#47514`_ from rallytime/merge-2018.3 + + * e2616b605f Update the pip tests to use the parsing syntax generated in PR `#47196`_ + + * b13b59791f Remove double instance of adding `--format=json` in pip module + + * 2ad60c7e81 Lint: remove duplicate function in helpers.py + + * 75480158b3 Lint: cur_version should just be pip_version + + * 5565d5e9b1 Update old utils paths with new utils paths + + * 786076ac03 Merge branch '2017.7' into '2018.3' + + * 611ca1fc03 Merge pull request `#47476`_ from gtmanfred/2017.7 + + * 1f91a85587 specify cache dir for pip install + + * 99e150e09c check for kitchen-vagrant gem before loading windows tests + + * 7c3f2c56da Merge pull request `#47412`_ from twangboy/fix_47125 + + * c9bab0b8e3 Merge branch '2017.7' into fix_47125 + + * 2600e404d5 Fix overly long line + + * 5c8db05769 Fix issue where the cwd was being removed + + * 4846e957c4 Merge pull request `#47467`_ from twangboy/cleanup_settings + + * 9d498293b1 Remove unused settings, update NSIS + + * da9871d36b Merge pull request `#47196`_ from twangboy/fix_47024 + + * 14ee5537b9 Add @with_tempdir helper + + * 6c3b5fa6fa Fix typo + + * f031710af2 Merge branch '2017.7' into fix_47024 + + * 7c46d9d0d4 Fix integration.modules.test_pip + + * 22ac81df63 Fix integration.modules.test_pip + + * 57d98224d4 Merge pull request #9 from terminalmage/twangboy/fix_47024 + + * 37a13d8004 Update pip unit tests to reflect changes + + * 7f86779be0 Lint fix + + * c48d8f4f61 DRY and other fixes in pip module + + * b1117896a0 Change from global variable to __context__`` + + * 3e6e524eca Fix some tests`` + + * c94f0f20e4 Fix lint error + + * fd47b21530 Fix merge conflict + + * e8c4524bae Merge pull request `#47455`_ from Ch3LL/unreleased_rn + + * b6d0cc2ab7 Add In Progress Warning for 2017.7.6 Release Notes + + * 2c7a4b6179 Merge pull request `#47459`_ from gtmanfred/2017.7 + + * d228e72477 update ubuntu-rolling to 18.04 + + * 64a64c0ed7 Merge pull request `#47462`_ from terminalmage/docs + + * 6d7803ece0 Fix docs build on Sphinx 1.7+ + + * 6cd0d31c03 Merge pull request `#47438`_ from lomeroe/double_admx_test + + * 4902f1e2ba check if a policy has either an enabled value or enabled list entry or a disabled value or disabled list entry when determining the state of the policy + + * ed69821d19 Merge pull request `#47433`_ from s0undt3ch/2017.7 + + * 5abadf25d6 Add missing requirements files not commited in `#47106`_ + +* **ISSUE** `#47443`_: (`skylerberg`_) Input validation does not raise SaltInvocationError in win_dsc.py (refs: `#47505`_) + +* **PR** `#47516`_: (`rallytime`_) Back-port `#47505`_ to 2018.3 + @ *2018-05-08 13:32:33 UTC* + + * **PR** `#47505`_: (`dwoz`_) Raise proper invocation errors (refs: `#47516`_) + + * 9559ac7679 Merge pull request `#47516`_ from rallytime/bp-47505 + + * 7c60e4071e Raise proper invocation errors + +* **ISSUE** `#47502`_: (`psagers`_) service.enable (and .disable) destroys /etc/rc.conf on FreeBSD (refs: `#47503`_) + +* **PR** `#47515`_: (`rallytime`_) Back-port `#47503`_ to 2018.3 + @ *2018-05-08 13:32:03 UTC* + + * **PR** `#47503`_: (`psagers`_) Fix `#47502`_: Remove an extraneous (accidentally introduced?) call to rstrip() (refs: `#47515`_) + + * bf79acfbc8 Merge pull request `#47515`_ from rallytime/bp-47503 + + * 821dbb88a0 Fix `#47502`_: Remove an extraneous (accidentally introduced?) call to rstrip. + +* **ISSUE** `#47511`_: (`joesusecom`_) sshconfig salt-ssh roster is missing in the documentation (refs: `#47531`_) + +* **PR** `#47531`_: (`gtmanfred`_) add ssh config doc for rosters + @ *2018-05-07 22:26:30 UTC* + + * 779b3ed056 Merge pull request `#47531`_ from gtmanfred/2018.3 + + * 92ded7162c add ssh config doc for rosters + +* **PR** `#47520`_: (`rallytime`_) Cleanup weird spaces + @ *2018-05-07 19:50:58 UTC* + + * 95b2f9db30 Merge pull request `#47520`_ from rallytime/cleanup-spaces + + * e9cb080a00 Cleanup weird spaces + +* **PR** `#47495`_: (`dwoz`_) Fix crufty nssm.exe reference + @ *2018-05-07 19:12:49 UTC* + + * 05fc52f124 Merge pull request `#47495`_ from dwoz/uninstall_wart + + * caa36c9064 Merge branch '2018.3' into uninstall_wart + +* **ISSUE** `#47322`_: (`masau`_) lxc clone not working (refs: `#47494`_) + +* **PR** `#47494`_: (`ejparker12`_) Fixed lxc.clone unhandled exception in salt/modules/lxc.py + @ *2018-05-07 19:03:58 UTC* + + * 3cc7d3ae7c Merge pull request `#47494`_ from ejparker12/fix-lxc-clone + + * e0e2c9782d Fixed lxc.clone unhandled exception in salt/modules/lxc.py + +* **ISSUE** `#47496`_: (`mateiw`_) salt-ssh --extra-filerefs doesn't include any files if no refs in state files (refs: `#47497`_) + +* **PR** `#47497`_: (`mateiw`_) Fix salt-ssh --extra-filerefs to include files even if no refs in states to apply + @ *2018-05-07 19:02:50 UTC* + + * adde83f639 Merge pull request `#47497`_ from mateiw/2018.3-fix-ssh-extra-files-refs-issue-47496 + + * d67239aae7 --extra-filerefs include files even if no refs in states to apply + +* **ISSUE** `#47404`_: (`shengis`_) Localized version of yum breaks pkg.install (refs: `#47441`_) + +* **PR** `#47441`_: (`shengis`_) Fix _run to reset LANGUAGE env variable + @ *2018-05-07 18:29:25 UTC* + + * 34b1b1ee53 Merge pull request `#47441`_ from shengis/fix-run-env-reset + + * 62fc16b721 Merge branch '2018.3' into fix-run-env-reset + + * 3b02b0bdc1 Merge branch '2018.3' into fix-run-env-reset + + * ee2ab38c8c Fix _run to reset LANGUAGE env variable + +* **ISSUE** `#47479`_: (`whytewolf`_) win_task.info on py3 throwing error, but works in py2 (refs: `#47507`_) + +* **PR** `#47507`_: (`gtmanfred`_) fix win_task for py3 + @ *2018-05-07 17:41:21 UTC* + + * 17cfd4f7cf Merge pull request `#47507`_ from gtmanfred/2018.3 + + * 19db39f402 fix win_task for py3 + +* **PR** `#47472`_: (`terminalmage`_) salt.utils.hashutils: Fix UnicodeEncodeError in several funcs + @ *2018-05-07 13:31:07 UTC* + + * a4c2df8fb2 Merge pull request `#47472`_ from terminalmage/hashutils + + * 7266c9984d salt.utils.hashutils: Fix UnicodeEncodeError in several funcs + +* **PR** `#47485`_: (`gtmanfred`_) add openstack modules to doc index.rst + @ *2018-05-07 13:11:42 UTC* + + * 8b0a370189 Merge pull request `#47485`_ from gtmanfred/2018.3 + + * c86163d79f add openstack modules to doc index.rst + + * 3557fc5fa6 Fix crufty nssm.exe reference + +* **PR** `#47482`_: (`gtmanfred`_) add all autodoc for new salt openstack modules + @ *2018-05-04 21:03:38 UTC* + + * 8df37f734a Merge pull request `#47482`_ from gtmanfred/2018.3 + + * 1f65d5cb73 add all autodoc for new salt openstack modules + +* **PR** `#47447`_: (`dwoz`_) Fix failing test due to windows console encoding + @ *2018-05-04 16:41:29 UTC* + + * d20ca15c5d Merge pull request `#47447`_ from dwoz/strv + + * 8c01773833 Use the same non decodable bytes for all tests + + * 983881a2a1 Add bytes that will not decode using cp1252 + +* **PR** `#47466`_: (`dwoz`_) bytes file that decodes the same utf-8 and cp1252 + @ *2018-05-04 15:54:24 UTC* + + * 8c5b30b541 Merge pull request `#47466`_ from dwoz/randbytes + + * fd9bc06aab bytes file that decodes the same utf-8 and cp1252 + +* **ISSUE** `#46660`_: (`mruepp`_) top file merging same does produce conflicting ids with gitfs (refs: `#47354`_, `#46751`_) + +* **PR** `#47465`_: (`rallytime`_) Back-port `#47354`_ to 2018.3 + @ *2018-05-04 13:06:04 UTC* + + * **PR** `#47354`_: (`folti`_) fix forward port of `#46751`_ (refs: `#47465`_) + + * **PR** `#46751`_: (`folti`_) top file merging strategy 'same' works again (refs: `#47354`_) + + * 3658604c43 Merge pull request `#47465`_ from rallytime/bp-47354 + + * 3df6fa7990 fix forward port of `#46751`_ + +* **PR** `#47435`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-05-04 13:05:32 UTC* + + * fa293f8fac Merge pull request `#47435`_ from rallytime/merge-2018.3 + + * be0731da5f Add skipIfs back in for rest_tornado tests + + * fd98ee3dc1 Lint: Add missing blank line + + * 561718b20b Update old is_windows utils path to new utils path + + * a94cdf8a0d Merge branch '2017.7' into '2018.3' + + * 7ae3497b0c Merge pull request `#47429`_ from gtmanfred/2017.7 + + * 8ae32033cc server_list_min should use state, not status + + * 2f5fc4ecc5 Merge pull request `#47399`_ from isbm/isbm-zeromq17-deprecationwarning-2017.7.2-v2 + + * a36e49fd27 fix pylint + + * 98b5629b36 Fix imports + + * d94c0f0152 Remove unnecessary variable + + * 8e377b5653 Lintfix: E0203 and attribute access + + * 2aab70b1b8 Install ZMQ handler if <15 version + + * 296c589f4b Use ZMQ switch utility in the integration tests + + * ab5fa34d7c Use ZMQ_VERSION_INFO constant everywhere + + * 43b5558b82 Add trace logging on ZMQ sockets communication + + * 164204a9fe Remove duplicate code for ZMQ monitor handling + + * 834b1e4ff0 Remove obsolete ZMQIOLoop direct instance + + * 1c90cbdb3c Remove an empty line + + * ef2e0acd66 Add logging on ZMQ socket exception + + * 38ceed371d Lintfix: ident + + * 1ece6a5f52 Lintfix: line too long + + * 4e650c0b44 Remove code duplicate by reusing utilities functions + + * 57da54b676 Fix imports + + * 948368e9a1 Add libzmq version info builder + + * 0b4a17b859 Update log exception message + + * 116e1809fc Put a message alongside the exception to the logs + + * 4bc43124b7 Remove unnecessary ZMQ import and check for its presence + + * 05f4d40269 Use utility for ZMQ import handling in SSH client + + * 457ef7d9a5 Use utility for ZMQ import handling in flo/zero + + * 08dee6f5bd Use utility for ZMQ import handling + + * e2a353cfb0 Remove unnecessary ZMQ extra-check for cache utils + + * c8f2cc271d Remove unnecessary ZMQ extra-check for master utils + + * 3940667bb9 Remove old ZMQ import handling + + * f34a53e029 Use ZMQ utility for version check + + * cbb26dcb28 Use ZMQ installer for master + + * 453e83210a Add ZMQ version build + + * af9601e21d Use ZMQ importer utility in async + + * d50b2b2023 Incorporate tornado-5 fixes + + * 1fd9af0655 Add ZMQ backward-compatibility tornado installer for older versions + + * ad4b40415c Add one place for handling various ZMQ versions and IOLoop classes + + * b14e974b5f Merge pull request `#47343`_ from Ch3LL/win_srv_test + + * 2173b6f549 ensure we are enabling/disabling before test + + * d58be06751 Add additionatl service module integration tests and enable for windows + + * b0f3fb577f Merge pull request `#47375`_ from terminalmage/issue47310 + + * fa2bea52bb Remove extra blank line to appease linter + + * f8ab2be81c Add debug logging if we fail to detect virtual packages + + * 67c4fc56ac Warn on use of virtual packages in pkg.installed state + + * 56235032f4 Merge pull request `#47415`_ from kstreee/fix-local-client-tgt-bug + + * b8d37e0a1e To add a test case for the syndic environment, copies the test case which was written by @mattp- that was already merged into develop branch, related pr is `#46692`_. + + * 4627bad1fd Realizes 'tgt' field into actual minions using ckminions to subscribe results of the minions before publishing a payload. + + * d65ceaee03 Merge pull request `#47286`_ from baniobloom/vpc_peering_connection_name_fix + + * a968965087 Merge branch '2017.7' into vpc_peering_connection_name_fix + + * 8a5d4437bb Merge pull request `#47270`_ from meaksh/2017.7-fix-retcode-on-schedule-utils + + * d299cf3385 Merge branch '2017.7' into 2017.7-fix-retcode-on-schedule-utils + + * b6da600fff Initialize __context__ retcode for functions handled via schedule util module + + * 5b51075384 Merge pull request `#47371`_ from rallytime/fix-47264 + + * a43485b49c Fix "of pass" typo in grains.delval docs: change to "or pass" + + * a86e53be66 Merge pull request `#47389`_ from dwoz/moregittestfix + + * 67745c1362 Older GitPython versions will not have close + + * a5367eaf63 Merge pull request `#47388`_ from dwoz/test_pip_fix + + * eb26321e8b Fix missing import + + * 9b59b991c2 Merge pull request `#47380`_ from gtmanfred/2017.7 + + * 93d1445ec1 add io_loop handling to runtests engine + + * 37822c0cbb Merge pull request `#47384`_ from dwoz/test_pip_fix + + * a37a9da1fb Fix py2 version of pip test + + * eefd96732e Merge pull request `#47382`_ from dwoz/gitfs_tests + + * 1570708fac Close the repo and fix multiple tests + + * 57c75ff660 Merge pull request `#47369`_ from terminalmage/ldap_pillar + + * 085883ae2d Return an empty dict if no search_order in ldap ext_pillar config file + + * bcc66dd9bf Merge pull request `#47363`_ from DSRCorporation/bugs/replace_exc_info_with_exception + + * 3f7b93a23c Tornado5.0: Future.exc_info is dropped + + * bcef34f7e1 Merge pull request `#47334`_ from terminalmage/ldap_pillar + + * 0175a8687c pillar_ldap: Fix cryptic errors when config file fails to load + + * 65c3ba7ff1 Remove useless documentation + + * 5d67cb27de Remove unncessary commented line + + * 8de3d41adb fixed vpc_peering_connection_name option + +* **PR** `#47464`_: (`dwoz`_) Skip tests not applicable to windows + @ *2018-05-04 13:04:38 UTC* + + * 51d21afd4f Merge pull request `#47464`_ from dwoz/skiP_syslog_tests + + * ca9393b7fb Skip tests not applicable to windows + +* **PR** `#47456`_: (`dwoz`_) Sysname returns text type + @ *2018-05-04 02:57:50 UTC* + + * 3219430dcc Merge pull request `#47456`_ from dwoz/sysname + + * 559ee1961f Sysname returns text type + +* **PR** `#47458`_: (`Ch3LL`_) Add In Progress Warning for 2018.3.1 Release Notes + @ *2018-05-03 20:40:46 UTC* + + * f3918514a7 Merge pull request `#47458`_ from Ch3LL/unreleased_rn_2018 + + * 6a261e5e3a Add In Progress Warning for 2018.3.1 Release Notes + +* **PR** `#47448`_: (`dwoz`_) Fix missing import in test suite + @ *2018-05-03 14:30:23 UTC* + + * 9fbdcbe994 Merge pull request `#47448`_ from dwoz/transport_import + + * 7e04eb82e1 Fix missing import in test suite + +* **ISSUE** `#47260`_: (`mew1033`_) disable_saltenv_mapping not working as expected (refs: `#47410`_) + +* **PR** `#47410`_: (`terminalmage`_) gitfs: Fix identification of base env when saltenv mapping is disabled + @ *2018-05-03 14:12:27 UTC* + + * 157a32af7f Merge pull request `#47410`_ from terminalmage/issue47260 + + * 3ab332ad0e Update tests to reflect bugfix + + * 7b8127f336 gitfs: Fix identification of base env when saltenv mapping is disabled + +* **PR** `#47413`_: (`dmurphy18`_) Repobuild improvements for Ubuntu 18.04 lack of gpg2 and better error checking + @ *2018-05-02 16:21:31 UTC* + + * 091e4cf9a6 Merge pull request `#47413`_ from saltstack/repobuild_improv + + * c064032110 Removed extra spaces for pylint + + * 20c50b3331 Minor cleanup due to review comments + + * c143b359e9 Update for Ubuntu 18.04 lack of gpg2 and enhanced error checking + +* **PR** `#47216`_: (`twangboy`_) Reg docs + @ *2018-05-02 13:33:27 UTC* + + * 5e5774fd37 Merge pull request `#47216`_ from twangboy/reg_docs + + * 0beeb58b16 Fix lint, add bytes + + * bad441f8dc Fix some lint` + + * af5139c2ff Add additional examples + + * 24df6ec1b7 Additional docs formatting + + * ff46b27a60 Update reg docs, fix formatting issues + +* **PR** `#47417`_: (`gtmanfred`_) revert instantiating a Caller Client in the engine + @ *2018-05-01 18:58:06 UTC* + + * 63baf4c4f8 Merge pull request `#47417`_ from gtmanfred/slack + + * 5c8ea7f506 Update slack.py + + * ee8a5eeb10 revert instantiating a Caller Client in the engine + +* **ISSUE** `#45790`_: (`bdarnell`_) Test with Tornado 5.0b1 (refs: `#46066`_, `#47106`_, `#47433`_) + +* **PR** `#47368`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-05-01 18:56:20 UTC* + + * **PR** `#47106`_: (`DmitryKuzmenko`_) Tornado50 compatibility fixes (refs: `#47374`_, `#47368`_, `#47433`_) + + * **PR** `#46002`_: (`isbm`_) Pyzmq 17.0.0 proper handling (refs: `#47374`_, `#47368`_) + + * 0bdfaa5ffe Merge pull request `#47368`_ from rallytime/merge-2018.3 + + * 46806e595b Update test assertion comment for pip pkgs + + * d9d24de49e Lint: Add missing import + + * c7b73d132e Merge branch '2017.7' into '2018.3' + + * 31db8ca7ad Merge pull request `#47347`_ from dwoz/test_mysql_fix_again + + * add78fb618 Fix linter warnings + + * 2644cc7553 Fix linter nits + + * 799c601184 Proper fix for mysql tests + + * fefc0cc3ca Update old utils paths to use new utils paths + + * 13e8124031 Merge branch '2017.7' into '2018.3' + + * e573236848 Merge pull request `#47359`_ from gtmanfred/2017.7 + + * 6214ed8133 add mention of the formulas channel to the formulas docs + + * 629503b2a8 Merge pull request `#47317`_ from dwoz/threadshutdown + + * 6db2a0e4d3 Log exceptions at exception level + + * d4ae787595 Do not join a thread that is stopped + + * aacd5cefe3 Merge pull request `#47304`_ from cachedout/test_cli_timeout_arg + + * 85025af83c Pass timeout to salt CLI for tests + + * 55534fb659 Merge pull request `#47311`_ from Ch3LL/firewall_windows + + * 4e16c18c16 Add firewall module windows tests to whitelist + + * 4b2fc4ec66 Add windows firewall execution modules integration tests + + * 1667375a80 Merge pull request `#47348`_ from dwoz/no_symlinks + + * 94a70e847a Ignore gitfs tests when symlinks not enabled + + * dac04261b5 Merge pull request `#47342`_ from dwoz/test_mysql_fix + + * 7496f4c5a8 Fix mysql test cases + + * 34e78ef564 Merge pull request `#47341`_ from dwoz/inet_pton_fix + + * 85451f48d4 Fix python 3 support for inet_pton function + + * e4779f3246 Merge pull request `#47339`_ from dwoz/ssh_key_test_fix + + * e37a93a1ca Remove redundent close call + + * b2ae5889b7 Close the temporary file handle + + * 9f7f83a975 Use salt.utils.fopen for line ending consistancy + + * b221860151 Merge pull request `#47335`_ from dwoz/pip_test_fix + + * dcb6a22c00 Remove un-needed string-escape + + * 1c527bfd3a Merge pull request `#47331`_ from dwoz/py3_wingroup_fix + + * cc154ef857 Do not encode usernames + + * 708078b152 Merge pull request `#47329`_ from cachedout/frank_credit + + * 33c0644ac4 Credit Frank Spierings + + * a545e55543 Merge pull request `#47281`_ from Ch3LL/system_test + + * c9181a75a6 Add destructivetest decorator on tests + + * 0d0c8987fc Add win_system integration module tests + + * b64d930df0 Merge pull request `#47283`_ from Ch3LL/ntp_test + + * ced7f86546 Add windows ntp integration module tests + + * 910aff910f Merge pull request `#47314`_ from Ch3LL/net_mac_test + + * 67beb1451c Skip netstat test on macosx as its not supported + + * 0549ef7c16 Merge pull request `#47307`_ from rallytime/bp-47257 + + * 6c5b2f92bc Role is not a list but a dictionary + + * d6ff4689f6 Merge pull request `#47312`_ from rallytime/update-bootstrap-release + + * 765cce06a2 Update bootstrap script to latest release: 2018.04.25 + + * e0765f5719 Merge pull request `#47279`_ from dwoz/py3_build_fix + + * 21dc1bab91 Pep-8 line endings + + * 717abedaf7 Fix comman wart + + * 4100dcd64c Close might get called more than once + + * dbe671f943 Stop socket before queue on delete + + * 9587f5c69e Silence pylint import-error for six.moves + + * 4b0c7d3b34 Fix typo + + * 05adf7c2b1 Use six.moves for queue import + + * fe340778fa Gracefully shutdown worker threads + + * 44f19b2f94 Merge pull request `#47113`_ from jfindlay/iptables_state + + * 8bd08012ee modules,states.iptables support proto for policy ext + + * b7a6206330 Merge pull request `#47302`_ from Ch3LL/dead_code + + * daa68b4877 Add virtual grains test for core grains + + * a59dd2785d Remove dead code in core grains file for virt-what + + * e29362acfc Merge pull request `#47303`_ from baniobloom/bug_fix_doc + + * b97c9df5f3 added clarity on how to figure out what is the oldest supported main release branch + + * 0d9d55e013 Merge pull request `#47106`_ from DSRCorporation/bugs/tornado50 + + * 39e403b18d Merge branch '2017.7' into bugs/tornado50 + + * 6706b3a2d1 Run off of a temporary config + + * d6873800d5 Allow running pytest>=3.5.0 + + * 2da3983740 Tornado 5.0 compatibility fixes + + * 2e014f4746 Merge pull request `#47271`_ from gtmanfred/amazon + + * 8a53908908 Do not load rh_service module when booted with systemd + + * e4d1d5bf11 Revert "support amazon linux 2 for service module" + + * 599b0ed1e9 Merge pull request `#47246`_ from cloudflare/fix-44847-2017.7 + + * ad80028104 This way, we can pass flags such as ``debug`` into the state, but also ``test``. + + * 4e2e1f0719 Merge pull request `#47220`_ from benediktwerner/fix-pip-2017.7 + + * 0197c3e973 Fix pip test + + * 34bf66c09f Fix pip.installed with pip>=10.0.0 + + * 92e606251f Merge pull request `#47272`_ from rallytime/reg-windows-codeowners + + * 9445af0185 Add windows tests and reg module/state to CODEOWNERS file for team-windows + + * 9dca5c0221 Merge pull request `#47252`_ from rallytime/codeowners-fixes + + * 204b6af92b Fix the matching patterns in the CODEOWNERS file to use fnmatch patterns + + * 3de1bb49c8 Merge pull request `#47177`_ from fpicot/fix_47173_pkg_normalize + + * 149f846f34 fix normalize parameter in pkg.installed + + * 10e30515dc Merge pull request `#47251`_ from Ch3LL/pub_fix_rn + + * fa4c2e6575 Update Docs to remove unnecessary + sign + + * bb7850a431 Merge pull request `#47249`_ from Ch3LL/pub_fix_rn + + * 24dea24b7e Add CVE number to 2016.3.6 Release + + * 56933eb0b2 Merge pull request `#47227`_ from pruiz/pruiz/zfs-dataset-present-slow-2017.7 + + * fded61f19b Fix issue `#47225`_: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots + + * 9825065048 Merge pull request `#47167`_ from smitty42/vbox-skd-fix + + * 5de53139cd Merge branch '2017.7' into vbox-skd-fix + + * 976f031170 Merge pull request `#47213`_ from dwoz/py3win + + * ad9c7f63f0 Fix coverate on py3 windows builds + + * 91252bac95 Adding updates for python3 compatibility and new virtualbox SDK version support. + + * cebcd6d069 Merge pull request `#47197`_ from dwoz/testfix + + * 25803c9176 Move process target to top level module namespace + + * d4269c2b70 Merge pull request `#47193`_ from Ch3LL/network_test + + * bbf9987c19 Add network module integration tests + + * c777248a78 Merge pull request `#47189`_ from Ch3LL/autoruns + + * 6a88bedb7a Add autoruns to windows whitelist + + * e9e4d4af70 Add autoruns.list integration test for Windows + +* **PR** `#47403`_: (`rallytime`_) Back-port `#47356`_ to 2018.3 + @ *2018-05-01 15:19:06 UTC* + + * **PR** `#47356`_: (`robinro`_) Fix sysctl translate (refs: `#47403`_) + + * 4e6870305c Merge pull request `#47403`_ from rallytime/bp-47356 + + * 9b682bc48e Fix sysctl translate + +* **PR** `#47407`_: (`terminalmage`_) Reduce severity of missing X_update_interval key + @ *2018-05-01 15:18:46 UTC* + + * 7e0cdd6145 Merge pull request `#47407`_ from terminalmage/update-interval-log + + * abc592bfff Reduce severity of missing X_update_interval key + +* **ISSUE** `#47042`_: (`valentin2105`_) [ERROR] Unable to manage file: 'utf8' codec can't decode byte (refs: `#47061`_) + +* **PR** `#47405`_: (`terminalmage`_) Fix file.get_diff regression in 2018.3 branch + @ *2018-05-01 15:16:46 UTC* + + * **PR** `#47061`_: (`terminalmage`_) Fix diffing binary files in file.get_diff (refs: `#47405`_) + + * 1377942bcc Merge pull request `#47405`_ from terminalmage/binary-diff + + * 89ddb08026 Use a lambda instead of defining a one-line function + + * b79ff04fda Remove no-longer-used enumerate + + * e03b865359 Add unit test for file.get_diff + + * 5bdc9e9bd5 Fix UnboundLocalError in file.get_diff + +* **ISSUE** `#47325`_: (`robertodocampo`_) docker_container.running creates containers using the image ID as the image name (refs: `#47367`_) + +* **PR** `#47367`_: (`terminalmage`_) Start docker containers with image name instead of ID + @ *2018-04-30 18:46:13 UTC* + + * c267e6083e Merge pull request `#47367`_ from terminalmage/issue47325 + + * 798134caa3 Add regression test for creating images with image name insead of ID + + * 4ed47e839c Start docker containers with image name instead of ID + +* **ISSUE** `#47006`_: (`cedwards`_) marathon & fx2 grain modules cause master and minion failure (refs: `#47401`_) + +* **PR** `#47401`_: (`gtmanfred`_) fix proxy virtual checks for marathon and fx2 + @ *2018-04-30 18:44:46 UTC* + + * 3bb00cbb55 Merge pull request `#47401`_ from gtmanfred/proxy + + * 99f9231759 fix proxy virtual checks for marathon and fx2 + +* **PR** `#47397`_: (`rallytime`_) Add 2018.3.1 Release Notes + @ *2018-04-30 14:44:38 UTC* + + * c160fe36ce Merge pull request `#47397`_ from rallytime/2018.3.1-release-notes + + * 3b40cdad2a Add 2018.3.1 Release Notes + +* **ISSUE** `#45790`_: (`bdarnell`_) Test with Tornado 5.0b1 (refs: `#46066`_, `#47106`_, `#47433`_) + +* **PR** `#47374`_: (`DmitryKuzmenko`_) tornado50 merge forward for 2018.3 + @ *2018-04-29 16:29:12 UTC* + + * **PR** `#47106`_: (`DmitryKuzmenko`_) Tornado50 compatibility fixes (refs: `#47374`_, `#47368`_, `#47433`_) + + * **PR** `#46002`_: (`isbm`_) Pyzmq 17.0.0 proper handling (refs: `#47374`_, `#47368`_) + + * 3400f829c4 Merge pull request `#47374`_ from DSRCorporation/bugs/tornado50-2018.3 + + * 400999c54f fix pylint + + * 47b6d409d1 add io_loop handling to runtests engine + + * fd074fdb7d use salt.utils.zeromq + + * 4ae33c5d9a Run off of a temporary config + + * 7938b4906e Allow running pytest>=3.5.0 + + * 34058c181e Tornado 5.0 compatibility fixes + +* **ISSUE** `#47124`_: (`mchugh19`_) Vault module problem in 2018.3.0 (refs: `#47379`_) + +* **PR** `#47379`_: (`dwoz`_) Properly encode messages when creating/validating signatures with m2crypto + @ *2018-04-28 08:38:23 UTC* + + * 2afe4bee95 Merge pull request `#47379`_ from dwoz/m2crypto_regression + + * 068f2d430d Always sign and verify bytes + + * 7810ebaba9 Add sign regression tests + + * f4441c3a1c Adding regression test for 47124 + +* **PR** `#47277`_: (`morganwillcock`_) Fix minion crash on NetBSD + @ *2018-04-27 15:02:21 UTC* + + * 7390b72808 Merge pull request `#47277`_ from morganwillcock/netbsdswap + + * 0bcb1a079a Merge branch '2018.3' into netbsdswap + + * 30478e8c9c Use swapctl for NetBSD + +* **PR** `#47320`_: (`twangboy`_) Change from NSSM to SSM + @ *2018-04-27 14:37:50 UTC* + + * 2b7c7ef704 Merge pull request `#47320`_ from twangboy/win_ssm + + * 5549d83aae Use ssm instead of nssm + +* **PR** `#47308`_: (`rallytime`_) Back-port `#47287`_ to 2018.3 + @ *2018-04-27 13:50:49 UTC* + + * **PR** `#47287`_: (`esell`_) convert unicode ssh pass to str for azure (refs: `#47308`_) + + * b6df5facce Merge pull request `#47308`_ from rallytime/bp-47287 + + * 5f392a23fe convert unicode ssh pass to str for azure + +* **ISSUE** `#47324`_: (`rlschilperoort`_) archive.extracted keep and/or keep_source not working (refs: `#47332`_) + +* **PR** `#47332`_: (`garethgreenaway`_) [2018.3] Removing duplicate code from state/archive.py + @ *2018-04-27 13:12:51 UTC* + + * efa3aab800 Merge pull request `#47332`_ from garethgreenaway/47324_archive_extracted_keep_keep_source + + * cc10bfec6b Removing redundant code which is prevening keep & keep_source from being set. + +* **PR** `#47326`_: (`The-Loeki`_) Some Redis fixes + @ *2018-04-26 17:12:47 UTC* + + * 245d62ca16 Merge pull request `#47326`_ from The-Loeki/redis-cache-sockets + + * d86fbe5bdd redis_return: add unix_socket_path to docs + + * ee9f533765 redis_cache: document UNIX socket access + + * 5337558a5a redis_return: Let redis handle pool creation, add UNIX socket support + + * c90f83b0f9 redis_return: cluster_mode default to False in __virtual__ to prevent KeyError stacktraces + + * 71e3286829 redis_return: Fix code blocks in docs + + * e6605f1c78 redis_cache fix code blox in docs + + * 40e67747ee redis_cache: add socket to options + +* **PR** `#47319`_: (`dwoz`_) Skip unix group tests on windows. + @ *2018-04-26 15:59:35 UTC* + + * 27a438f0ff Merge pull request `#47319`_ from dwoz/skip_tests + + * d9442d043e Skip tests not applicable to windows + +* **PR** `#47293`_: (`dwoz`_) The grp module is not available on windows + @ *2018-04-25 20:22:34 UTC* + + * 057f668788 Merge pull request `#47293`_ from dwoz/win_build_fix + + * 0386216005 Fix sneaky indention + + * 082b8d0b3d Use salt.utils.platform + + * cc2538e08f The grp modules is not available on windows + +* **ISSUE** `#46862`_: (`kivoli`_) Setting locale.system fails in 2018.3 (refs: `#47280`_, `#46869`_) + +* **PR** `#47280`_: (`gtmanfred`_) make sure not to send invalid information + @ *2018-04-25 17:46:45 UTC* + + * fff4f8c1a5 Merge pull request `#47280`_ from gtmanfred/localectl + + * 7c212cbb2d fix pylint + + * 6754787e8e update localemod tests + + * 9075070573 make sure not to send invalid information + +* **ISSUE** `#46977`_: (`gtmanfred`_) [2018.3.0] Backwards compatibilty breaking change in 2018.3.0 (refs: `#47038`_) + +* **PR** `#47038`_: (`garethgreenaway`_) [2018.3] fix to fileclient.py + @ *2018-04-25 14:57:04 UTC* + + * 205701dcbe Merge pull request `#47038`_ from garethgreenaway/46977_fixing_fileclient_forward_compatibilty + + * ba01d2133a Updating version.py to include Magnesium. + + * 10c823dd79 The _ext_nodes master function has been renamed to _master_tops. To ensure compatibility when using older Salt masters we continue to pass the function as _ext_nodes until the Magnesium release. + +* **ISSUE** `#47059`_: (`OrlandoArcapix`_) Some states incorrectly return None instead of an empty dict when there are no changes (refs: `#47060`_) + +* **ISSUE** `#46985`_: (`OrlandoArcapix`_) grafana4_user.present and grafana4_org.present states not working in 2018.3.0 (refs: `#47048`_) + +* **PR** `#47060`_: (`OrlandoArcapix`_) Return an empty dict for 'changes' instead of 'None' + @ *2018-04-25 14:55:24 UTC* + + * **PR** `#47048`_: (`OrlandoArcapix`_) Issue46985 fix grafana4 state (refs: `#47060`_) + + * 89daf4fdc7 Merge pull request `#47060`_ from OrlandoArcapix/Issue47059-return_dict_from_state + + * 5378e4fd07 Update grafana_datasource test to check for empty dict being returned on no changes, rather than None + + * f115452653 Return an empty dict for 'changes' instead of 'None' + +* **ISSUE** `#47089`_: (`syphernl`_) UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 404: ordinal not in range(128) (refs: `#47153`_) + +* **PR** `#47153`_: (`terminalmage`_) salt.modules.ssh: properly encode/decode I/O + @ *2018-04-25 14:53:51 UTC* + + * 10cc0d312b Merge pull request `#47153`_ from terminalmage/issue47089 + + * bdb52797f8 salt.modules.ssh: properly encode/decode I/O + +* **ISSUE** `#47199`_: (`tkaehn`_) Targeting by list (-L) broken for minions behind syndic? (refs: `#47275`_) + +* **PR** `#47275`_: (`terminalmage`_) Fix false failure events sent when using syndic + @ *2018-04-25 13:56:47 UTC* + + * b5d64f1a70 Merge pull request `#47275`_ from terminalmage/issue47199 + + * 8012ad12f8 Fix false failure events sent when using syndic + +* **ISSUE** `#47267`_: (`skjaro`_) Problem with beacon diskusage on windows platform in 2018.3 (refs: `#47284`_) + +* **PR** `#47284`_: (`skjaro`_) Fix beacon diskusage documentation for the new beahavior mentioned in issue `#47267`_ + @ *2018-04-25 13:52:30 UTC* + + * 6215a995d8 Merge pull request `#47284`_ from skjaro/beacon_diskusage_doc_fix + + * fcc042aa5f Fix beacon documentation for the new beahavior mentioned in issue `#47267`_ + +* **PR** `#47291`_: (`bosatsu`_) Fix proxy minion beacon doc + @ *2018-04-25 13:42:36 UTC* + + * 3ef4fe6ed2 Merge pull request `#47291`_ from bosatsu/fix-proxy-minion-beacon-doc + + * 01980b4c43 Fix topics/releases/2018.3.0.rst to include correct example of proxy_example beacon yaml configuration. + + * 9682e26eec Fix topics/proxyminion/beacon.rst to include correct example of salt_proxy beacon yaml configuration. + +* **ISSUE** `#47239`_: (`bosatsu`_) Unable to load salt_proxy beacon on minion in 2018.3.0 (refs: `#47255`_) + +* **PR** `#47255`_: (`garethgreenaway`_) [2018.3] Fixes to salt_proxy beacon and beacon tests + @ *2018-04-25 13:41:51 UTC* + + * ea2d68b865 Merge pull request `#47255`_ from garethgreenaway/47239_fixes_to_salt_proxy_beacon + + * a2a8d78cb0 Fixing status beacon tests. + + * c87d6cae23 Ensure the salt_proxy is returning the correct tuple when the configuration is valid. Update various beacon unit tests to ensure they are testing the results of the validate function for a True result. + +* **PR** `#47292`_: (`dwoz`_) Fix decorator wart + @ *2018-04-25 04:25:23 UTC* + + * **PR** `#47290`_: (`dwoz`_) Run cache_master test in tmp dir (refs: `#47292`_) + + * 19f9e8258f Merge pull request `#47292`_ from dwoz/cp_fix_again + + * 7d045eb235 Fix decorator wart + +* **PR** `#47285`_: (`dwoz`_) Fix reg grains test + @ *2018-04-25 00:16:56 UTC* + + * da532aa1ac Merge pull request `#47285`_ from dwoz/core_test_fix + + * 884f4c1829 Fix extra space + + * 8a9027c0c9 Fix reg grains test + +* **PR** `#47290`_: (`dwoz`_) Run cache_master test in tmp dir (refs: `#47292`_) + @ *2018-04-24 23:37:21 UTC* + + * f591cff643 Merge pull request `#47290`_ from dwoz/test_cp_fix + + * 5ff51affbd Run cache_master test in tmp dir + +* **ISSUE** `#47092`_: (`syphernl`_) [2018.3.0] pkg.installed breaks with virtual packages (refs: `#47250`_) + +* **ISSUE** `#38838`_: (`Zorlin`_) Failing to remove nginx (refs: `#44455`_) + +* **PR** `#47250`_: (`terminalmage`_) Fix virtual package detection + @ *2018-04-24 19:22:24 UTC* + + * **PR** `#44455`_: (`samodid`_) Fix for `#38838`_ (refs: `#47250`_) + + * 6d323aa8f0 Merge pull request `#47250`_ from terminalmage/issue47092 + + * b8630a70be Fix virtual package detection + +* **ISSUE** `#47225`_: (`pruiz`_) zfs.filesystem_present takes forever on a dataset with lots (10k+) of snapshots (refs: `#47228`_, `#47227`_, `#47226`_) + +* **PR** `#47228`_: (`pruiz`_) Fix issue `#47225`_: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots (2018.3 branch) + @ *2018-04-24 13:35:21 UTC* + + * **PR** `#47226`_: (`pruiz`_) Fix issue `#47225`_: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots (refs: `#47228`_, `#47227`_) + + * 428e915d6a Merge pull request `#47228`_ from pruiz/pruiz/zfs-dataset-present-slow-2018.3 + + * cfbf136ab2 Fix issue `#47225`_: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots + +* **ISSUE** `#46943`_: (`Auha`_) Slack.Engine could not start (refs: `#47262`_, `#47109`_) + +* **PR** `#47262`_: (`garethgreenaway`_) [2018.3] Fixes to targeting in Slack engine + @ *2018-04-24 13:18:36 UTC* + + * 0b836106b9 Merge pull request `#47262`_ from garethgreenaway/slack_engine_target_fix + + * bcdef641e8 Removing target and tgt_type from the cmdline that is passed along to Salt, the target is used else where and including it in the cmdline causes problem when it is passed along. Adding an additional test to ensure we are getting the right targt. + +* **ISSUE** `#47047`_: (`Giandom`_) Pillars aren't evaluated when alias is passed in Slack Engine (refs: `#47142`_) + +* **PR** `#47142`_: (`garethgreenaway`_) [2018.3] pillar and output formatting fixes to Slack engine + @ *2018-04-23 19:55:07 UTC* + + * 2ed4b38b02 Merge pull request `#47142`_ from garethgreenaway/47047_passing_pillar_to_slack_aliases + + * 6f183e1d80 Initial commmit for unit/engines/test_slack_engine + + * a2840fc230 Only include the rest of the cmdline if the cmd is an alias. + + * e846df7409 Fixing a bug when passing pillar values to aliases for the Slack engine. Cleaned up the formatting of the results, color codes don't translate well into Slack output. For any state runs, eg. highstate. apply, sls, we run the output through the highstate formater. For anything else run it though the yaml outputer. Running it though highstate causes errors when the output does match what the highstate output is expecting. + +* **PR** `#47245`_: (`terminalmage`_) Ensure we pass hexid as bytes when zmq_filtering enabled + @ *2018-04-23 16:54:57 UTC* + + * 42a0e655dc Merge pull request `#47245`_ from terminalmage/zeromq-bytes + + * a7accc0548 Ensure we pass hexid as bytes when zmq_filtering enabled + +* **PR** `#47242`_: (`aesposito91`_) PY3 fix for zeromq setsockopt + @ *2018-04-23 16:38:09 UTC* + + * 73525d1460 Merge pull request `#47242`_ from aesposito91/2018.3 + + * b225351e6d Update napalm_syslog.py + +* **ISSUE** `#47117`_: (`prashanthtuttu`_) Napalm / Capirca Issue (refs: `#47241`_) + +* **PR** `#47241`_: (`mirceaulinic`_) Fix the imports into the netacl execution and state modules + @ *2018-04-23 14:56:32 UTC* + + * b78295aee9 Merge pull request `#47241`_ from cloudflare/fix-47117 + + * 26c5583264 `#47117`_: fix the napalm imports in the netacl state module + + * 48396467c1 `#47117`_: fix the napalm imports in the netacl execution module + +* **PR** `#47219`_: (`garethgreenaway`_) [2018.3] Fixing a backward compatibility issue with vault module & runner + @ *2018-04-23 14:10:19 UTC* + + * 88557ea991 Merge pull request `#47219`_ from garethgreenaway/vault_backward_compatibility + + * 1758081ffe When using the vault module on a 2018.3 minion against a 2017.7 master, the 2018.3 minion is expecting a verify element in the results from the Salt runner on the master. The runner in 2017.7 did not include a verify element, which results in an error. This change accounts for this by using the default in 2018.3 which is not to verify if not configured. + +* **PR** `#47186`_: (`dmurphy18`_) backport of issue 46933, updated ZFS handling to Salt 2018.3.x + @ *2018-04-23 14:07:06 UTC* + + * 370feadbd2 Merge pull request `#47186`_ from dmurphy18/zfs_backport_46933 + + * 283359d315 Corrected typo in comma-seprated and 2018.3.0 -> 2018.3.1 + + * b7f8d5a22f Replace use of Fluorine with 2018.3.0 for comma-separated warnings + + * 3f30ab2ed6 ZFS backport of 46933 to 2018.3.1 + +* **PR** `#47217`_: (`twangboy`_) Remove installation of pywin32 from setup.py + @ *2018-04-23 13:32:54 UTC* + + * bf3a67d11b Merge pull request `#47217`_ from twangboy/fix_setup + + * eb3d45bb08 Remove installation of pywin32 from setup.py + +* **PR** `#47195`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-04-20 19:25:30 UTC* + + * 8e21703f13 Merge pull request `#47195`_ from rallytime/merge-2018.3 + + * f90fd8c663 Test fix: file strings must be unicode in master config + + * bee4948df1 Lint: use full path for event utils function + + * 120c5446b7 Update old utils paths to new utils paths + + * 4718d31e53 Merge branch '2017.7' into '2018.3' + + * 65f344e371 Merge pull request `#47184`_ from Ch3LL/status_test + + * 25a84428b8 Add status module integration modules tests for Windows + + * 965600ad6c Merge pull request `#47163`_ from rallytime/jenkins-autodoc + + * 0039395017 Updage jenkins module autodocs to use jenkinsmod name instead + + * 0a43dde5fc Merge pull request `#47185`_ from twangboy/add_tests + + * 345daa0423 Add additional integration tests to whitelist + + * 1a600bb9a4 Merge pull request `#47172`_ from dwoz/cover_without_admin + + * cadd759727 Use warnings to warn user + + * 144c68e214 Allow non admin name based runs on windows + + * d5997d2301 Merge pull request `#47110`_ from kstreee/fix-misusing-of-timeout + + * 0624aee0ed Fixes misusing of the timeout option. + + * 87ca2b4003 Merge pull request `#40961`_ from terminalmage/issue40948 + + * 6ba66cca41 Fix incorrect logic in exception check + + * fed5041c5f Make error more specific to aid in troubleshooting + + * 8c67ab53b4 Fix path in log message + + * 3198ca8b19 Make error more explicit when PKI dir not present for salt-call + + * f5e63584d4 Merge pull request `#47134`_ from Ch3LL/user_win_test + + * e7c9bc4038 Add user integration tests for windows OS + + * da2f6a3fac Merge pull request `#47131`_ from gtmanfred/cli + + * 1b1c29bf62 add __cli for master processes + + * 9b8e6ffb8c Merge pull request `#47129`_ from rallytime/bp-47121 + + * 11da526b21 add ImportError + + * bd0c23396c fix pip.req import error in pip 10.0.0 + + * eb5ac51a48 Merge pull request `#47102`_ from gtmanfred/2017.7 + + * 3dc93b310b fix tests + + * 8497e08f8e fix pip module for 10.0.0 + + * 4c07a3d1e9 fix other tests + + * b71e3d8a04 dont allow using no_use_wheel for pip 10.0.0 or newer + + * c1dc42e67e Merge pull request `#47037`_ from twangboy/fix_dev_scripts + + * 990a24d7ed Fix build_env scripts + +* **ISSUE** `#46906`_: (`whytewolf`_) Windows failure with PR 46541 (refs: `#47168`_) + +* **PR** `#47168`_: (`gtmanfred`_) fix metadata grain for py3 and windows + @ *2018-04-20 19:07:50 UTC* + + * a56eb7e05d Merge pull request `#47168`_ from gtmanfred/metadata + + * 396f7906e3 fix metadata grain for py3 and windows + +* **ISSUE** `#46918`_: (`AmbicaY`_) napalm/capirca issue (refs: `#47202`_) + +* **PR** `#47202`_: (`mirceaulinic`_) Fix `#46918`_: add the TTL field + @ *2018-04-20 14:34:09 UTC* + + * 6135b76e2c Merge pull request `#47202`_ from cloudflare/fix-46918 + + * 1e74141cc0 Fix `#46918`_ + +* **ISSUE** `#47150`_: (`srkunze`_) [Regression] ip_to_host and SSH._expand_target require missing reverse-lookup (refs: `#47191`_) + +* **PR** `#47191`_: (`terminalmage`_) salt-ssh: Do not attempt to match host/ip to minion ID if reverse lookup fails + @ *2018-04-20 14:20:05 UTC* + + * 7f1115e611 Merge pull request `#47191`_ from terminalmage/issue47150 + + * 95a6f075cb Add debug logging when ip_to_host fails + + * 45696e622b salt-ssh: Do not attempt to match host/ip to minion ID if reverse lookup fails + +* **PR** `#47122`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-04-19 20:44:18 UTC* + + * 1947ffdf56 Merge pull request `#47122`_ from rallytime/merge-2018.3 + + * 878fa06134 Test fix: remove tornado testing lib from class + + * a40f007962 lint: get_context is in stringutils.py now + + * 3416e398c6 Update old utils paths references to use new paths + + * 94c2a12be6 Merge branch '2017.7' into '2018.3' + + * 6a4c0b8a1a Merge pull request `#47108`_ from dwoz/async_test_fix + + * 3d85e30ce5 AsyncTestCase is required for AsyncEventPublisher + + * 03892eaf0b Merge pull request `#47068`_ from cachedout/catch_value_error_socket_test + + * 7db5625632 Catch an operation on a closed socket in a test + + * 1ea2885ec2 Merge pull request `#47065`_ from dwoz/jinja_test_fix + + * 673cd31c65 Merge branch '2017.7' into jinja_test_fix + + * 5293b5b5ca Merge pull request `#47077`_ from dwoz/test_state_fix + + * 444da3f893 Fix py3 wart (chr vs bytesstring) + + * e8acca01c2 Fix failing state test by normalizing line endings + + * ca967de5da Merge pull request `#47067`_ from gtmanfred/2017.7 + + * f913a7859c use the recommended opennebula lookup method + + * 7fddad6cd9 Merge pull request `#47064`_ from dwoz/roots_tests_fix + + * 25fd7c0694 fix py3 wart, encode os.linesep + + * d79f1a1961 Fix fileserver roots tests + + * 977c6939c4 Merge pull request `#47069`_ from cachedout/match_timeout_arg + + * b8990f5258 Pass the timeout variable to the CLI when calling salt in tests + + * 2c4c19c622 Merge pull request `#47074`_ from dwoz/ignore_artifacts + + * c3941efad0 Kitchn should ignore artifacts directory + + * c484c0bd71 Merge pull request `#47055`_ from bloomberg/GH-47000 + + * 8af3f5b874 GH-47000: add proper handling of full_return in cmd_subset + + * f3496030cc Merge pull request `#47039`_ from twangboy/win_fix_winrm_script + + * 6635b9003f Fix winrm powershell script + + * 46fa2c04de Fix py3 os.linesep wart + + * 3c565d7e54 Use salt.utils.fopen + + * aa965310f1 Clean up cruft + + * efc9866580 Jinja test fixes + +* **PR** `#47162`_: (`terminalmage`_) Partial backport of `#47161`_ to 2018.3 branch + @ *2018-04-19 19:28:47 UTC* + + * **PR** `#47161`_: (`terminalmage`_) Fix failing pillar unit test (refs: `#47162`_) + + * 291cca7ed8 Merge pull request `#47162`_ from terminalmage/bp-47161 + + * d185f97a47 mocked file_roots and pillar_roots should be dicts + +* **ISSUE** `#47081`_: (`sjorge`_) file.directory with recursion fails if there are non-ascii characters in the path (refs: `#47165`_) + +* **PR** `#47165`_: (`terminalmage`_) Make sure a str type is passed to os.walk + @ *2018-04-19 14:59:16 UTC* + + * 2ee8006da3 Merge pull request `#47165`_ from terminalmage/issue47081 + + * 9e29acb477 Make sure a str type is passed to os.walk + +* **PR** `#47070`_: (`terminalmage`_) Use decorators for temp files/dirs in test suite + @ *2018-04-19 14:01:48 UTC* + + * 6257862bbb Merge pull request `#47070`_ from terminalmage/with_tempdir + + * 048728d2b7 Remove unused imports + + * 879c557264 Use decorators for temp files/dirs in test suite + +* **PR** `#47155`_: (`mcalmer`_) Fix patchinstall for yumpkg + @ *2018-04-18 19:24:17 UTC* + + * b46365614b Merge pull request `#47155`_ from mcalmer/fix-patchinstall + + * 382afba457 fix invalid string compare + + * 8c19368938 provide kwargs to pkg_resource.parse_targets required to detect advisory type + +* **ISSUE** `#47042`_: (`valentin2105`_) [ERROR] Unable to manage file: 'utf8' codec can't decode byte (refs: `#47061`_) + +* **PR** `#47061`_: (`terminalmage`_) Fix diffing binary files in file.get_diff (refs: `#47405`_) + @ *2018-04-18 18:52:10 UTC* + + * 13ae1a2413 Merge pull request `#47061`_ from terminalmage/issue47042 + + * 87f6cefea3 Rewrite flaky utf8 state to make it easier to troubleshoot + + * df6e535f05 Fix diffing binary files in file.get_diff + +* **PR** `#47058`_: (`terminalmage`_) Fix calls to file.lsattr when lsattr is not installed + @ *2018-04-18 16:30:12 UTC* + + * cba0f13cd9 Merge pull request `#47058`_ from terminalmage/lsattr + + * eeb067e910 Fix calls to file.lsattr when lsattr is not installed + +* **ISSUE** `#46929`_: (`noelmcloughlin`_) 2018.3 regression file.managed.context parsing (refs: `#47104`_) + +* **PR** `#47104`_: (`terminalmage`_) yamlloader: Properly handle colons in inline dicts + @ *2018-04-18 16:22:47 UTC* + + * b96ce23b3f Merge pull request `#47104`_ from terminalmage/issue46929 + + * 33bf6643cd Add additional test for plain scalars + + * 508659b682 yamlloader: Properly handle colons in inline dicts + +* **ISSUE** `#46887`_: (`julientravelaer`_) ldap.managed broken with 2018.3.0 (refs: `#47029`_) + +* **ISSUE** `#46859`_: (`cheribral`_) pillar_ldap causing TypeError exceptions in python-ldap with unicode objects (refs: `#47029`_) + +* **PR** `#47076`_: (`terminalmage`_) pillar_ldap: Load config options as str types + @ *2018-04-18 16:16:22 UTC* + + * **PR** `#47029`_: (`terminalmage`_) ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types (refs: `#47076`_) + + * c12697b173 Merge pull request `#47076`_ from terminalmage/issue46859 + + * c06c859caf pillar_ldap: Load config options as str types + +* **PR** `#47107`_: (`twangboy`_) Fix issues with reg state, add tests + @ *2018-04-18 15:53:02 UTC* + + * 50bd885ec7 Merge pull request `#47107`_ from twangboy/fix_46932 + + * ae8ab2ab1a Fix tests for py3, enable tearDown + + * 3cf4ac1475 Add integration tests for reg state + + * cc259b146f Cast vdata to appropriate type in reg state + +* **ISSUE** `#46909`_: (`epelc`_) Binary `contents_pillar` with file.managed raises UnicodeDecodeError (refs: `#47041`_) + +* **PR** `#47041`_: (`terminalmage`_) Force null bytes to be str types + @ *2018-04-18 14:08:25 UTC* + + * d6c59696be Merge pull request `#47041`_ from terminalmage/issue46909 + + * e4182715be Special check specifically for bytes types + + * ee90dd5d95 Merge branch '2018.3' into issue46909 + + * 0e99343a7f Use the same way of defining contents in both file.managed states + + * 5741d287b5 Move back to using null byte check for contents + + * 8e214c9fa9 file.managed: Add test to ensure binary contents work + + * 7b7dc94610 Use salt.utils.stringutils.is_binary to check if contents are binary + + * e3c969da81 PY3: Ensure binary contents work with file.managed + + * 5d98a8bedd Make salt.utils.stringutils.to_binary work for bytestrings + + * 1024000369 Force null bytes to be str types + +* **PR** `#47007`_: (`twangboy`_) Fix some issues with the win_servermanager module + @ *2018-04-17 20:57:04 UTC* + + * 9a9f6524f8 Merge pull request `#47007`_ from twangboy/fix_46968 + + * 432db7c6ec Lint: Remove unused import + + * 10341e8f8b Remove erroneous pop statement + + * 56582f293a Remove redundant try/except block from state` + + * 6ad2427279 Remove unnecessary try/except blocks + + * 92eeaa51bd Put some error checking in the shell command + +* **ISSUE** `#46943`_: (`Auha`_) Slack.Engine could not start (refs: `#47262`_, `#47109`_) + +* **PR** `#47109`_: (`garethgreenaway`_) [2018.3] fixes to Slack engine + @ *2018-04-17 13:56:27 UTC* + + * a52137ee36 Merge pull request `#47109`_ from garethgreenaway/46943_slack_engine_fixes + + * 02baa76595 Fixing a bug that occured when a comment was added to a message sent to Slack by Salt. Also making `slack_engine:groups_pillar` optional. + +* **PR** `#47045`_: (`tankywoo`_) Fix ba7d00f5 for gentoo pkg.installed method + @ *2018-04-17 13:55:45 UTC* + + * 6c16a34c44 Merge pull request `#47045`_ from tankywoo/fix-gentoo-pkg-installed + + * 551f4e10cf Fix ba7d00f5 for gentoo pkg.installed + +* **PR** `#47053`_: (`clan`_) handle jinja error in level + @ *2018-04-16 22:47:54 UTC* + + * 86c7cfef56 Merge pull request `#47053`_ from clan/jinja-error + + * a847466946 handle jinja error in level + +* **PR** `#47062`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-04-16 19:58:32 UTC* + + * 7bfa608e9f Merge pull request `#47062`_ from rallytime/merge-2018.3 + + * 59f5880e72 lint fix + + * 1ddf8c584b Update old utils files to new new utils files path + + * 28a79ebba4 Merge branch '2017.7' into '2018.3' + + * 1700a10ebe Merge pull request `#46326`_ from kstreee/fix-client-local + + * 0f358a9c9e Fixes a timing bug of saltnado's client local. + + * c3c00316c5 Merge pull request `#46913`_ from lomeroe/2017_7-fix46877 + + * 369a0645ed move exception for clarity + + * 32ce5bfda5 Use configparser serializer object to read psscript.ini and script.ini startup/shutdown script files. + + * 9e37cfc9d6 Merge pull request `#47025`_ from terminalmage/fix-server_id-windows + + * cb0cf89ed3 Fix server_id grain in PY3 on Windows + + * 2e193cfb45 Merge pull request `#47027`_ from rallytime/bp-44508 + + * 8e72f362f4 Add priority field to support the latest capirca. + + * 112f92baab Add priority field to support the latest capirca. + + * 385fe2bc1e Merge pull request `#47020`_ from rallytime/bp-46970 + + * 9373dff52b Update test_pkgrepo.py + + * 13cf9eb5b1 Removing debugging. + + * a61a8593e5 Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments. + +* **PR** `#47066`_: (`terminalmage`_) Fix regression in handling of environment/saltenv + @ *2018-04-16 19:57:12 UTC* + + * fa27e64a33 Merge pull request `#47066`_ from terminalmage/issue46979 + + * 5c4c0468ad Fix regression in handling of environment/saltenv + +* **PR** `#47051`_: (`rallytime`_) Simplify LooseVersion check in `__virtual__` check in mac_assistive module + @ *2018-04-13 19:43:33 UTC* + + * 8761b81a69 Merge pull request `#47051`_ from rallytime/fix-lint + + * d52b3689d9 Simplify LooseVersion check in `__virtual__` check in mac_assistive module + +* **PR** `#47057`_: (`corywright`_) Fix copy/paste typo in minionfs tutorial + @ *2018-04-13 19:43:01 UTC* + + * bbb8018b55 Merge pull request `#47057`_ from corywright/fix-minionfs-whitelist-docs + + * 9b7ee97d12 Fix copy/paste typo in minionfs tutorial + +* **ISSUE** `#46931`_: (`anlutro`_) file.managed diff is switched when using template in salt-ssh 2018.3 (refs: `#47046`_) + +* **PR** `#47046`_: (`clan`_) switch order of file to be diffed + @ *2018-04-13 13:40:13 UTC* + + * d5afa4a2c5 Merge pull request `#47046`_ from clan/file_diff + + * bb58605c54 switch order of file to be diffed + +* **ISSUE** `#46985`_: (`OrlandoArcapix`_) grafana4_user.present and grafana4_org.present states not working in 2018.3.0 (refs: `#47048`_) + +* **PR** `#47048`_: (`OrlandoArcapix`_) Issue46985 fix grafana4 state (refs: `#47060`_) + @ *2018-04-13 13:34:29 UTC* + + * ec9251ecd3 Merge pull request `#47048`_ from OrlandoArcapix/Issue46985-fix-grafana4-state + + * 259d747414 Remove accidentally added copy of a file + + * 6c8c3da74d Return an empty dict instead of 'None' from grafana4 states + +* **PR** `#47017`_: (`opdude`_) Don’t encode a unicode string + @ *2018-04-13 13:31:33 UTC* + + * d8c4c221cf Merge pull request `#47017`_ from Unity-Technologies/hotfix/pip_windows + + * 838670f626 Don’t encode a unicode string + +* **ISSUE** `#46917`_: (`boltronics`_) mysql_grants.present broken with `database: somedatabase.*` (refs: `#46919`_) + +* **PR** `#47019`_: (`rallytime`_) Back-port `#46919`_ to 2018.3 + @ *2018-04-12 19:43:01 UTC* + + * **PR** `#46919`_: (`boltronics`_) Replace failing is and is not tests with == and != (refs: `#47019`_) + + * 5b7544eaa0 Merge pull request `#47019`_ from rallytime/bp-46919 + + * 6837d6c138 Replace failing is and is not tests with == and != + +* **ISSUE** `#46887`_: (`julientravelaer`_) ldap.managed broken with 2018.3.0 (refs: `#47029`_) + +* **ISSUE** `#46859`_: (`cheribral`_) pillar_ldap causing TypeError exceptions in python-ldap with unicode objects (refs: `#47029`_) + +* **PR** `#47029`_: (`terminalmage`_) ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types (refs: `#47076`_) + @ *2018-04-12 19:41:29 UTC* + + * ac2d54d78a Merge pull request `#47029`_ from terminalmage/issue46859 + + * ab6314247b ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types + + * 7691dee4ed Add to_str option to decode funcs + +* **ISSUE** `#46868`_: (`tjyang`_) 2017.7.4 to 2018.3.0 upgrade issue: Salt request timed out. The master is not responding (refs: `#46930`_) + +* **PR** `#46930`_: (`dwoz`_) Clean up bad public key headers + @ *2018-04-12 18:57:37 UTC* + + * e6e07720fa Merge pull request `#46930`_ from dwoz/crptodomekeyfix + + * f2e484ed54 Merge branch '2018.3' into crptodomekeyfix + + * e1995a92ee Fix verify signature test + + * 0ba32118d9 Add test for bad public key without m2crypto + + * a44c356233 Clean up bad public key headers + +* **ISSUE** `#46951`_: (`Giandom`_) Slack engine error using aliases: TypeError unhashable type (refs: `#47008`_) + +* **PR** `#47008`_: (`garethgreenaway`_) [2018.3] Fixing aliases in slack engine + @ *2018-04-12 15:24:40 UTC* + + * 0e43becc12 Merge pull request `#47008`_ from garethgreenaway/46951_fixing_slack_engine_aliases + + * dc2a72d44f Fixing aliases in slack engine + +* **ISSUE** `#46947`_: (`Giandom`_) Slack engine groups error (refs: `#47009`_) + +* **PR** `#47009`_: (`garethgreenaway`_) [2018.3] fixes to slack engine documentation + @ *2018-04-12 15:20:54 UTC* + + * c33de7c82d Merge pull request `#47009`_ from garethgreenaway/46947_slack_documentation_update_catch_non_dicts + + * f0fadbb4ce Fixing indention for slack documention. Updating try..except to ensure we catch when groups aren't dicts. + +* **PR** `#47023`_: (`rallytime`_) Back-port `#46997`_ to 2018.3 + @ *2018-04-12 15:05:24 UTC* + + * **PR** `#46997`_: (`LukeCarrier`_) Fix respository (=> repository) typo in sls_build (refs: `#47023`_) + + * **PR** `#44638`_: (`terminalmage`_) Many improvements to docker network and container states (refs: `#46997`_) + + * 68d17c71f1 Merge pull request `#47023`_ from rallytime/bp-46997 + + * c2c60f4ffc Fix respository (=> repository) typo in sls_build + +* **PR** `#47026`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-04-12 14:39:41 UTC* + + * 9cf3c6406a Merge pull request `#47026`_ from rallytime/merge-2018.3 + + * ba70df9d62 Use msgpack utils for loads call, import msgpack for UnpackValueError + + * 34a478dfe5 Update old fopen path with new utils files path + + * 590c7fc13f Merge branch '2017.7' into '2018.3' + + * 8f994e7cf9 Merge pull request `#46539`_ from jfoboss/patch-1 + + * 6890122e41 Merge pull request `#1`_ from twangboy/pull_46539 + + * 19c3fadbe5 Fix unit test for win_ntp + + * 826a8d3099 Fixing `#46504`_ + + * 74d70e95a5 Merge pull request `#46999`_ from gtmanfred/2017.7 + + * 791af8f6ce switch pip test package + + * 8adaf7f526 Merge pull request `#46023`_ from bloomberg/parallel-orch + + * 0ac0b3ca29 Merge branch '2017.7' into parallel-orch + + * 39d65a39cf Merge pull request `#46613`_ from myinitialsarepm/fix_puppet.fact_and_puppet.facts + + * 44ecd13abc Update tests to use cmd.run_all + + * 7d7d40f541 Merge branch '2017.7' into fix_puppet.fact_and_puppet.facts + + * 0ce1520bd0 Merge branch '2017.7' into fix_puppet.fact_and_puppet.facts + + * 69e1f6f681 Fix puppet.fact and puppet.facts to use stdout. + + * 3d5e69600b address lint issues raised by @isbm + + * a9866c7a03 fix parallel mode py3 compatibility + + * 6d7730864a removing prereq from test orch + + * 6c8a25778f add integration test to runners/test_state to exercise parallel + + * 2c86f16b39 cherry-pick cdata KeyError prevention from `#39832`_ + + * 26a96e8933 record start/stop duration for parallel processes separately + + * e4844bdf2b revisit previous join() behavior in check_requisites + + * f00a359cdf join() parallel process instead of a recursive sleep + + * 6e7007a4dc add parallel support for orchestrations + +* **PR** `#47021`_: (`garethgreenaway`_) [2018.3] Fixing integration.modules.test_state_jinja_filters.StateModuleJinjaFiltersTest.test_path_which + @ *2018-04-12 13:12:39 UTC* + + * d3be828696 Merge pull request `#47021`_ from garethgreenaway/920_state_module_jinja_filters_test_test_path_which + + * 2ccf2c5fe0 Fixing test_path_which to check that the filter is available rather than results. + +* **PR** `#47022`_: (`corywright`_) Add auth.file module to auth documentation page + @ *2018-04-11 21:11:10 UTC* + + * 66e8445b82 Merge pull request `#47022`_ from corywright/add-auth-file-module-to-docs + + * bd0918fc40 Add auth.file module to auth documentation page + +* **PR** `#45774`_: (`twangboy`_) Fix __virtual__ issue in mac_system.py + @ *2018-04-11 14:26:13 UTC* + + * 12ecfdee93 Merge pull request `#45774`_ from twangboy/mac_add_service_util + + * 5796696617 Fix tests for Py3 + + * 7b40218790 Fix lint, remove sentence from docstring + + * 781880f0fc Add _available_services function for testing + + * 6080633613 Add assert_called_with + + * 1bf70b2033 Add more tests for available_services + + * b429fc3e74 Add tests for mac_utils + + * b5f67130cc Used \*args and \*\*kwargs + + * ed061617a2 Fix unicode_literal issue in mac_assistive + + * 82e17e5fc8 Fix args/kwargs + + * 455146500a Move some functions into mac_utils + + * 125586264b Add utils\mac_service.py + +* **ISSUE** `#46953`_: (`cskowronnek`_) salt-cloud azurearm [ERROR ] There was a profile error: Parameter 'subscription_id' must be str. (refs: `#47012`_) + +* **PR** `#47012`_: (`terminalmage`_) Azure: ensure subscription_id is a str type + @ *2018-04-11 13:57:08 UTC* + + * 79347f108a Merge pull request `#47012`_ from terminalmage/issue46953 + + * 5192622a32 Azure: ensure subscription_id is a str type + +* **PR** `#46526`_: (`Ch3LL`_) Add tests for new source_* minion options + @ *2018-04-10 19:56:45 UTC* + + * 6503bf8dfa Merge pull request `#46526`_ from Ch3LL/ip_conf + + * c01180ff47 Patch ZMQ versions for master_uri test + + * da38f332a5 Change comment and salt.utils.network import + + * e972ebdf1a Add for new source_* minion options + +* **PR** `#46993`_: (`L4rS6`_) Fix: tuple instead of string + @ *2018-04-10 17:07:59 UTC* + + * 03907d3fce Merge pull request `#46993`_ from L4rS6/fix-broken-keystone-auth/2018.3 + + * e33ba1b3d5 Fix: tuple instead of string + +* **PR** `#46990`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-04-10 17:07:33 UTC* + + * ffaee26540 Merge pull request `#46990`_ from rallytime/merge-2018.3 + + * ccc5bad2df Merge branch '2017.7' into merge-2018.3 + + * ba5421d988 Merge pull request `#46991`_ from gtmanfred/windows + + * 98588c1dc5 use saltstack salt-jenkins + + * 2f1cf3e511 Merge branch '2017.7' into '2018.3' + + * 00c4067585 Merge pull request `#46975`_ from gtmanfred/windows + + * 1f69c0d7f8 make sure windows outputs xml junit files + + * 4a2ec1bbb3 support new versions of winrm-fs + + * b9efec8526 remove libnacl on windows + + * 2edd5eaf9e fix path + + * b03e272e44 windows work + + * 3cf2353e41 Merge pull request `#46945`_ from vutny/doc-faq-fix-jinja + + * bfdf54e61d [DOC] Fix Jinja block in FAQ page + + * fc2f728665 Merge pull request `#46925`_ from terminalmage/fix-file.patch-docstring + + * 97695657f0 Remove reference to directory support in file.patch state + + * eef6c518e1 Merge pull request `#46900`_ from rallytime/bp-46801 + + * 6a41e8b457 rename jenkins to jenkinsmod + + * 71839b0303 Merge pull request `#46899`_ from rallytime/bp-45116 + + * b92f908da4 fix adding parameters to http.query from sdb yaml + +* **PR** `#46339`_: (`DmitryKuzmenko`_) SSH State test failures + @ *2018-04-10 17:06:51 UTC* + + * a34b92ae82 Merge pull request `#46339`_ from DSRCorporation/bugs/ssh_state_test_failures + + * bd98c49dc7 Merge branch '2018.3' into bugs/ssh_state_test_failures + + * 6fdc458a7f Increase timeout for run_run in ShellCase + + * 8e60cccdfb Give background task more chance to start. + + * e0b6878fac One more useful assert for better test results. + + * 92a6c43c73 More logging and assertion fixes. Extended ssh ops timeout. + + * 6ebdd17ac4 Advanced logging in the failing SSH State tests. + +* **PR** `#46989`_: (`Ch3LL`_) Fix redis cache log debug line + @ *2018-04-10 16:35:12 UTC* + + * 9924100c44 Merge pull request `#46989`_ from Ch3LL/redis_log + + * 6160bc06c6 Fix redis cache log debug line + +* **ISSUE** `#46834`_: (`oeuftete`_) strftime filter not found in 2018.3.0 (refs: `#46848`_) + +* **ISSUE** `#46668`_: (`anlutro`_) Jinja2 filter strftime stopped working in salt-ssh 2018.3 (refs: `#46848`_, `#46744`_) + +* **PR** `#46848`_: (`garethgreenaway`_) [2018.8] salt-ssh jinja filters tests + @ *2018-04-10 16:19:51 UTC* + + * c6431936cb Merge pull request `#46848`_ from garethgreenaway/testing_jinja_filters_avaiable_via_salt_ssh + + * 5fcda3eff8 Merge branch '2018.3' into testing_jinja_filters_avaiable_via_salt_ssh + + * 0adfee9b11 Updating a couple tests. Fixing check_whitelist_blacklist to work with PY3 when non-iterables are passed. Adding warning about lst_avg results being wrong and future updates in Neon. + + * f3f42146ca Removing expected from strftime and hashsum tests since the results are always different and we are only concerned about the filter being available. + + * 860234c045 Fixing lint. + + * 0891c6b580 fixing docstring + + * c8945e4b2e cleaning up some imports. + + * 0599759e5b cleaning up some test doc strings. + + * dceda5eb88 Moving all jinja filter tests into support/jinja_filters.py. Updaitng integration/ssh/test_jinja_filters.py to use those tests. Adding integration/modules/test_state_jinja_filters.py to also use the common jinja filter tests. + + * 07d7e3ca01 Adding a new integration test and corresponding state files to test availabilty of jinja filters when using salt-ssh. + +* **ISSUE** `#46880`_: (`liquidgecka`_) rabbitmq_policy broken in 2018.3.0 (refs: `#46973`_) + +* **PR** `#46973`_: (`rallytime`_) New "apply_to" kwarg in rabbitmq module should be added at the end + @ *2018-04-10 14:42:32 UTC* + + * **PR** `#41233`_: (`dnABic`_) added parameter apply_to for rabbitmq policy (refs: `#46973`_) + + * fbbcb7584c Merge pull request `#46973`_ from rallytime/fix-46880 + + * 8ce21f982c New "apply_to" kwarg in rabbitmq module should be added at the end + +* **ISSUE** `#46934`_: (`d601`_) GPG encrypted binary data in pillars breaks in 2018.3.0 (refs: `#46966`_) + +* **PR** `#46966`_: (`terminalmage`_) Fix traceback when attempting to decode binary data to unicode + @ *2018-04-10 14:08:35 UTC* + + * 58f59cfbff Merge pull request `#46966`_ from terminalmage/issue46934 + + * df43ffdb8f salt.payload.Serial: fix traceback when unpacking binary blob + + * 40a49358c9 gpg renderer: fix tranceback when decrypted ciphertext contains binary data + + * 17a88f6a71 Include exc_info in pillar render errors to aid in troubleshooting + +* **ISSUE** `#46881`_: (`SynPrime`_) Cron.file - source file not found (refs: `#46944`_) + +* **PR** `#46944`_: (`garethgreenaway`_) [2018.3] cron.file with salt source URL + @ *2018-04-10 13:34:03 UTC* + + * e33e792e2a Merge pull request `#46944`_ from garethgreenaway/46881_Cron_file_source_file_not_found + + * 438aafeb03 Adding kwargs to calls into file module functions + + * 14d12b1d6b Remove unused imports. Gating tests so they do not run on Windows + + * 623d96f21a Adding dummy cron file for integration/states/test_cron + + * c8e01871d6 Adding an integration test to test cron.file. + + * ddc55d8f9b Fixing bug that made cron.file unable to use a file via a Salt URL. + +* **PR** `#46937`_: (`gtmanfred`_) enable_ssh_minions does not work with subset yet + @ *2018-04-07 02:54:56 UTC* + + * 08e8782f76 Merge pull request `#46937`_ from gtmanfred/2018.3 + + * 3fb75e903c enable_ssh_minions does not work with subset yet + +* **PR** `#46936`_: (`gtmanfred`_) don't copy __pycache__ or .pyc files for kitchen + @ *2018-04-06 19:15:46 UTC* + + * ac4e7cd73f Merge pull request `#46936`_ from gtmanfred/2018.3 + + * 91474878fa don't copy __pycache__ or .pyc files for kitchen + +* **ISSUE** `#46659`_: (`stamak`_) [salt-cloud] [new oxygen openstack driver ] no public_ips and floating_ips in salt-cloud output (refs: `#46912`_) + +* **PR** `#46912`_: (`gtmanfred`_) pull latest vm data after building for openstack shade driver + @ *2018-04-06 13:46:42 UTC* + + * 8105fd9715 Merge pull request `#46912`_ from gtmanfred/openstack + + * 5ef538f8ad pull latest vm data after building for openstack shade driver + +* **PR** `#46908`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-04-05 21:27:03 UTC* + + * 735ea12960 Merge pull request `#46908`_ from rallytime/merge-2018.3 + + * 102e966512 Remove redundant section in log setup + + * 177c686b52 Update old utils paths to new utils paths + + * 0a297e7319 Merge branch '2017.7' into '2018.3' + + * d0f5b43753 Merge pull request `#44926`_ from frogunder/whitelisted_acl + + * 18e460fc30 Merge branch '2017.7' into whitelisted_acl + + * 1ad4d7d988 fix assert errors + + * e6a56016df update test + + * 19a2244cb7 whitelist_acl_test + + * 7d822f9cec Merge pull request `#46464`_ from gtmanfred/orchestration + + * 637cdc6b7b fix pylint + + * 0151013ddb document `cli` option for cmd_subset + + * 4a3ed6607d add test for subset in orchestration + + * 3112359dd6 fix salt subset in orchestrator + + * 805ed1c964 Merge pull request `#46879`_ from dwoz/cloudtestfix + + * dc54fc53c3 Fix multiple typos causing tests to fail + + * f70f6de282 Merge pull request `#46647`_ from twangboy/win_fix_test_grains + + * c179388b0e Fix the tear down function in integration.modules.test_grains.GrainsAppendTestCase + + * 91c078ce12 Merge pull request `#46756`_ from nages13/bugfix-grain-virtual_subtype + + * 781f5030a4 Merge branch 'bugfix-grain-virtual_subtype' of https://github.com/nages13/salt into bugfix-grain-virtual_subtype + + * cd1ac4b7f9 Merge branch '2017.7' into bugfix-grain-virtual_subtype + + * 0ace76c0e7 Merge branch '2017.7' into bugfix-grain-virtual_subtype + + * 9eb6f5c0d0 Merge branch '2017.7' into bugfix-grain-virtual_subtype + + * 73d6d9d365 Merge branch '2017.7' into bugfix-grain-virtual_subtype + + * a4a17eba6a Merge branch '2017.7' into bugfix-grain-virtual_subtype + + * bf5034dbdb Merge branch '2017.7' into bugfix-grain-virtual_subtype + + * 8d12770951 Merge branch '2017.7' into bugfix-grain-virtual_subtype + + * 7e704c0e81 Moved down container check code below hypervisors to validate containers type running in virtual environment. Fixes `#46754`_ & `#43405`_ + + * 710f74c4a6 fix grains['virtual_subtype'] to show Docker on xen kernels + + * 058bbed221 Merge pull request `#46799`_ from garethgreenaway/46762_prereq_shenanigans_tests + + * 13875e78cf Fixing documention string for test. + + * 3d288c44d4 Fixing test documentation + + * 6cff02ef6a Adding tests for `#46788`_ + + * d9770bf3f8 Merge pull request `#46867`_ from terminalmage/unicode-logging-normalization + + * 7652688e83 Backport string arg normalization to 2017.7 branch + + * 9eb98b1f6e Merge pull request `#46770`_ from twangboy/fix_46433 + + * 89af0a6222 Merge branch '2017.7' into fix_46433 + + * 67b4697578 Remove unused import (ling) + + * 9302fa5ab0 Clean up code comments + + * b383b9b330 Change the order of SID Lookup + + * 9c776cffb7 Merge pull request `#46839`_ from gtmanfred/tupletarget + + * 3b7208ce27 match tuple for targets as well + + * 7db251dc11 Merge pull request `#46845`_ from rallytime/bp-46817 + + * 36a0f6d8ca address filehandle/event leak in async run_job invocations + + * e3d17ab7bc Merge pull request `#46847`_ from dwoz/missing-strdup + + * 55845f4846 strdup from libc is not available on windows + + * f2dd79f9c4 Merge pull request `#46776`_ from gtmanfred/2017.7 + + * edc1059ee0 fix shrinking list in for loop bug + +* **PR** `#46853`_: (`terminalmage`_) Add back date_format filter + @ *2018-04-05 20:33:50 UTC* + + * 9a47afc33b Merge pull request `#46853`_ from terminalmage/date_format_filter + + * 266d13a665 Add back date_format filter + +* **PR** `#46882`_: (`jasperla`_) Backport `#46280`_ `#46849`_ `#46852`_ to 2018.3 + @ *2018-04-05 14:29:12 UTC* + + * **PR** `#46852`_: (`jasperla`_) fix creating a nic tag on a link with double 0 in the MAC (refs: `#46882`_) + + * **PR** `#46849`_: (`jasperla`_) Unbreak creating etherstubs on SmartOS (refs: `#46882`_) + + * **PR** `#46280`_: (`jasperla`_) Remove unneeded checks for binaries in SmartOS modules (refs: `#46882`_) + + * a064a3e695 Merge pull request `#46882`_ from jasperla/smartos/backports + + * 47a66975ff fix creating a nic tag on a link with double 0 in the MAC + + * a3cb0e576e Unbreak creating etherstubs on SmartOS + + * e703254990 Remove unneeded checks for binaries in SmartOS modules + +* **PR** `#46873`_: (`terminalmage`_) Attempt UTF-8 first when decoding/encoding + @ *2018-04-05 14:16:28 UTC* + + * 4e5e291c99 Merge pull request `#46873`_ from terminalmage/utf8-first + + * cf28eb74aa Don't log command when output_loglevel == 'quiet' + + * f59cee28db Remove hacky workarounds to get encode/decode tests to pass on Windows + + * 76e5d81bb4 Remove hacky workaround to get Windows to decode deserialized data properly + + * 0b5729e58a Remove hacky workaround to get git state/exec module to work properly on Windows + + * 22ff48518f Attempt UTF-8 first when decoding/encoding + +* **ISSUE** `#43499`_: (`tyeapple`_) zmq setsockopt need to adapt python3 (refs: `#46874`_) + +* **PR** `#46878`_: (`terminalmage`_) Backport `#46874`_ to 2018.3 + @ *2018-04-05 13:26:04 UTC* + + * **PR** `#46874`_: (`johnj`_) Use bytestrings for PY3 compatibility when running setsockopt for zmq.SUBSCRIBE (refs: `#46878`_) + + * 1518762465 Merge pull request `#46878`_ from terminalmage/bp-46874 + + * d9511d04d4 `#43499`_, zmq setsockopt need to adapt python3 + +* **ISSUE** `#46862`_: (`kivoli`_) Setting locale.system fails in 2018.3 (refs: `#47280`_, `#46869`_) + +* **PR** `#46869`_: (`gtmanfred`_) Always return dictionary for _localectl_status + @ *2018-04-05 13:25:14 UTC* + + * 67894e3ee9 Merge pull request `#46869`_ from gtmanfred/2018.3 + + * 1496e985f7 fix pylint + + * 75425dfd20 fix tests for localemod + + * 2d7c7b5e33 Always return dictionary for _localectl_status + +* **PR** `#46870`_: (`mirceaulinic`_) Correct the documentation for two new proxy modules + @ *2018-04-04 21:48:41 UTC* + + * 58c8ff18e2 Merge pull request `#46870`_ from cloudflare/proxy-doc + + * f4b6184476 Corect and add the cimc proxy module to autodoc + + * a99bc202b9 Correct & add Panos to autodoc + +* **PR** `#46729`_: (`terminalmage`_) Performance improvement/error catching in expr_match + @ *2018-04-04 20:25:57 UTC* + + * d7e4b9d755 Merge pull request `#46729`_ from terminalmage/expr_match + + * 70cfafe299 Add test case + + * 250039b11f Restore original variable name + + * ae0f112a49 Log an exception when non-string val/expr passed to expr_match + + * dac42a672b Performance improvement/error catching in expr_match + +* **PR** `#46872`_: (`terminalmage`_) Backport `#46863`_ to 2018.3 + @ *2018-04-04 19:04:40 UTC* + + * **PR** `#46863`_: (`TamCore`_) fixed top function which was broken since commit 002aa88a97e (refs: `#46872`_) + + * e0b383afb5 Merge pull request `#46872`_ from terminalmage/bp-46863 + + * be284e5b99 Add skipIf when older mock present + + * db8faaee56 Add unit tests for ext_nodes master_tops module + + * ee437f7cbf fixed top function which was broken since commit 002aa88a97e + +* **PR** `#46850`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-04-04 18:07:44 UTC* + + * 5c76d98d1a Merge pull request `#46850`_ from rallytime/merge-2018.3 + + * a0fcd5c053 Fix test_cp failure: forgot to add tgt to test when @with_tempfile is present + + * d0202cab72 Resolve bad merge: there should only be one test_get_file_from_env_in_url test + + * e28f71b418 Lint: use full salt utils path + + * 4ad50bbdee Update old utils paths to new paths + + * 893196d3e6 Merge branch '2017.7' into '2018.3' + + * 1941426218 Merge pull request `#46838`_ from gtmanfred/npm + + * bff61dd291 use http registry for npm + + * e544254e7b Merge pull request `#46823`_ from rallytime/fix-42312 + + * dafa820f93 Improve __virtual__ checks in sensehat module + + * 37f6d2de35 Merge pull request `#46641`_ from skizunov/develop3 + + * c624aa4827 Make LazyLoader thread safe + + * 989508b100 Merge pull request `#46837`_ from rallytime/merge-2017.7 + + * 8522c1d634 Merge branch '2016.11' into '2017.7' + + * 3e844ed1df Merge pull request `#46739`_ from rallytime/2016.11_update_version_doc + + * 4d9fc5cc0f Update release versions for the 2016.11 branch + + * 307e7f35f9 Merge pull request `#46740`_ from rallytime/2017.7_update_version_doc + + * 7edf98d224 Update 2018.3.0 information and move branch from "latest" to "previous" + + * 5336e866ac Update release versions for the 2017.7 branch + + * ebf5dd276f Merge pull request `#46783`_ from twangboy/fix_46680 + + * da5ce25ef3 Fix unit tests on Linux + + * b7f4f377cd Add space I removed + + * f1c68a09b5 Fix network.managed test=True on Windows + + * f652f25cc1 Merge pull request `#46821`_ from rallytime/fix-mantest-failures + + * 209a8029c3 Fix the new test failures from the mantest changes + + * c460f62081 Merge pull request `#46800`_ from lomeroe/2017_7-46627 + + * 2bee383e9d correct create list item value names if the valuePrefix attribute does not exist on the list item, the value is the value name, other wise, the valuename a number with the valuePrefix prepended to it + + * df26f2641e Merge pull request `#46675`_ from dwoz/inspectlib-tests + + * d39f4852d8 Handle non-zero status exception + + * 83c005802b Handle cases where git can not be found + + * 628b87d5c4 Skip test when git symlinks are not configured + + * 4083e7c460 Merge pull request `#46815`_ from terminalmage/bp-46809 + + * 71d5601507 Fix sharedsecret authentication + + * 3bac9717f4 Merge pull request `#46769`_ from dwoz/wincloudtest + + * eabc234e5d Fix config override name + + * 5c22a0f88d Use aboslute imports + + * 810042710d Set default cloud test timeout back to 500 seconds + + * 5ac89ad307 Use winrm_verify_ssl option causing tests to pass + + * 71858a709c allow not verifying ssl winrm saltcloud + + * ba5f11476c Adding windows minion tests for salt cloud + + * f1be939763 Merge pull request `#46786`_ from twangboy/fix_46757 + + * b0053250ff Remove int(), just return -1 + + * 7d56126d74 Fixes some lint + + * 49b3e937da Return int(-1) when pidfile contains invalid data + + * 89bf24b15c Merge pull request `#46814`_ from terminalmage/bp-46772 + + * a9f26f2ab8 avoid breaking if AutoRemove is not found + + * 97779c965d fix container removal if auto_remove was enabled + + * 5ea4ffbdb6 Merge pull request `#46813`_ from terminalmage/event-debug-log + + * 5d6de3a2eb Get rid of confusing debug logging + + * e533b7182d Merge pull request `#46766`_ from twangboy/win_fix_test_git + + * 5afc66452c Remove unused/redundant imports + + * 88fd72c52c Use with_tempfile decorator where possible + + * 69d450db84 Merge pull request `#46778`_ from terminalmage/salt-jenkins-906 + + * bbfd35d3ea Replace flaky SPM man test + + * c935ffb740 Merge pull request `#46788`_ from garethgreenaway/46762_prereq_shenanigans + + * fa7aed6424 Ensure failed tags are added to self.pre. + + * 395b7f8fdc Merge pull request `#46655`_ from dwoz/pyobjects-46350 + + * 5aabd442f2 Fix up import and docstring syntax + + * 62d64c9230 Fix missing import + + * 18b1730320 Skip test that requires pywin32 on \*nix platforms + + * 45dce1a485 Add reg module to globals + + * 09f9322981 Fix pep8 wart + + * 73d06f664b Fix linter error + + * 009a8f56ea Fix up environ state tests for Windows + + * b4be10b8fc Fixing cleanUp method to restore environment + + * af45c49c42 Merge pull request `#46632`_ from dwoz/file-recurse-36802 + + * 44db77ae79 Fix lint errors and typo + + * cb5619537f Only change what is essential for test fix + + * eb822f5a12 Fix file.recurse w/ clean=True `#36802`_ + + * 6e9f504ed1 Merge pull request `#46751`_ from folti/2017.7 + + * 7058f10381 same top merging strategy works again + + * d3623e0815 Merge pull request `#46691`_ from Ch3LL/win_group_test + + * 7cda825e90 Add groupadd module integration tests for Windows + + * 14ab50d3f4 Merge pull request `#46696`_ from dwoz/win_test_client + + * ec4634fc06 Better explanation in doc strings + + * d9ae2abb34 Fix splling in docstring + + * b40efc5db8 Windows test client fixes + +* **PR** `#46851`_: (`rallytime`_) Back-port `#46844`_ to 2018.3 + @ *2018-04-04 18:04:59 UTC* + + * **PR** `#46844`_: (`UtahDave`_) Fix warning format in 2018.3.0 release notes (refs: `#46851`_) + + * b808ba7049 Merge pull request `#46851`_ from rallytime/bp-46844 + + * ab2ccea1af Quick grammar fix in 2018.3.0 release notes + + * af7bad3c7f Fix warning format in 2018.3.0 release notes + +* **ISSUE** `#46864`_: (`femnad`_) Attribute Error When Invoking Vault Module Method (refs: `#46865`_) + +* **PR** `#46865`_: (`femnad`_) Fix Log Line for Vault Token Generation Debug Line + @ *2018-04-04 14:52:00 UTC* + + * ea56778e03 Merge pull request `#46865`_ from femnad/fix-log-in-vault-runner + + * 01a5b88e7b Fix Log Line for Vault Token Generation Debug Line + +* **PR** `#46836`_: (`rallytime`_) [2018.3] Merge forward from 2018.3.0rc1 to 2018.3 + @ *2018-04-03 16:54:53 UTC* + + * a0e168ccee Merge pull request `#46836`_ from rallytime/merge-2018.3 + + * e75ba1f502 Merge branch '2018.3.0rc1' into '2018.3' + + * 39235715e6 Merge pull request `#46792`_ from damon-atkins/patch-1 + + * db5b9464e6 provided an example + + * 41e3e1e253 Update windows information in release notes + + * 99447fbf49 Added more windows information + + * d4241006f2 Update 2018.3.0.rst Windows Items, Group topics + +* **ISSUE** `#46808`_: (`ezh`_) Sharedsecret authentication is broken (refs: `#46809`_) + +* **PR** `#46809`_: (`ezh`_) Fix sharedsecret authentication (refs: `#46815`_) + @ *2018-04-03 16:53:24 UTC* + + * 4a358217a0 Merge pull request `#46809`_ from ezh/2018.3-sharedsecret + + * 20db8f03f7 Merge branch '2018.3' into 2018.3-sharedsecret + + * 9df6d18ec7 Fix sharedsecret authentication + +* **PR** `#46820`_: (`rallytime`_) [2018.3] Update the latest release information for docs + @ *2018-04-03 14:36:31 UTC* + + * 1519d7d895 Merge pull request `#46820`_ from rallytime/2018.3_update_version_doc + + * 274f8ee0dd [2018.3] Update the latest release information for docs + +* **PR** `#46731`_: (`rallytime`_) Back-port `#46024`_ to 2018.3 + @ *2018-04-02 19:00:42 UTC* + + * **PR** `#46024`_: (`zmedico`_) Trivial bug fixes for tagify and fire_args functions (refs: `#46731`_) + + * 07f1141722 Merge pull request `#46731`_ from rallytime/bp-46024 + + * ee4ee5b619 fire_args: fix UnboundLocalError: local variable 'tag' + + * 4ce2c21824 tagify: handle integer suffix list + +* **ISSUE** `#46779`_: (`anlutro`_) salt-ssh 2018.3 states with "runas" fail with "Environment could not be retrieved for User" (refs: `#46796`_) + +* **PR** `#46796`_: (`terminalmage`_) Fix regression introduced in merge-forward + @ *2018-04-02 18:10:22 UTC* + + * **PR** `#46503`_: (`psyer`_) Fixes stdout user environment corruption (refs: `#46796`_) + + * 4f31c1062d Merge pull request `#46796`_ from terminalmage/issue46779 + + * f8f9d045ac Add regression test + + * e0e4e19ba3 Include extra troubleshooting information + + * dcb0c67309 Fix regression introduced in merge-forward + +* **PR** `#46690`_: (`dincamihai`_) Fix unicode handling in pkg.info_installed + @ *2018-03-29 14:10:48 UTC* + + * 4609a7dd85 Merge pull request `#46690`_ from dincamihai/2018.3 + + * 980adf8253 Fix unicode handling in pkg.info_installed + +* **PR** `#46746`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-03-28 21:13:07 UTC* + + * e5b3c8fa91 Merge pull request `#46746`_ from rallytime/merge-2018.3 + + * e8864b7b0b Merge branch '2017.7' into '2018.3' + + * 1222bdbc00 Merge pull request `#46732`_ from rallytime/bp-46032 + + * bf0b962dc0 Workaroung python bug in traceback.format_exc() + + * 50fe1e9480 Merge pull request `#46749`_ from vutny/doc-deprecate-copr + + * a1cc55da3d [DOC] Remove mentions of COPR repo from RHEL installation page + + * bd1e8bcc7d Merge pull request `#46734`_ from terminalmage/busybox + + * 6502b6b4ff Make busybox image builder work with newer busybox releases + + * c09c6f819c Merge pull request `#46742`_ from gtmanfred/2017.7 + + * fd0e649d1e only use npm test work around on newer versions + + * 3b6d5eca88 Merge pull request `#46743`_ from Ch3LL/mac_auth + + * 4f1c42c0e3 Workaround getpwnam in auth test for MacOSX + + * d0278345fc Update old utils paths to new utils paths + + * e312efb5e7 Merge branch '2017.7' into '2018.3' + + * b548a3e742 Merge pull request `#46171`_ from amaclean199/fix_mysql_grants_comparison + + * 97db3d9766 Merge branch '2017.7' into fix_mysql_grants_comparison + + * 0565b3980e Merge branch '2017.7' into fix_mysql_grants_comparison + + * 8af407173d Merge branch '2017.7' into fix_mysql_grants_comparison + + * 00d13f05c4 Fix mysql grant comparisons by stripping both of escape characters and quotes. Fixes `#26920`_ + + * 554400e067 Merge pull request `#46709`_ from vutny/doc-faq-minion-master-restart + + * d0929280fc [DOC] Update FAQ about Salt self-restarting + + * 3f21e9cc65 Merge pull request `#46503`_ from psyer/fix-cmd-run-env-corrupt + + * e8582e80f2 Python 3-compatibility fix to unit test + + * 27f651906d Merge pull request `#1`_ from terminalmage/fix-cmd-run-env-corrupt + + * 172d3b2e04 Allow cases where no marker was found to proceed without raising exception + + * 35ad828ab8 Simplify the marker parsing logic + + * a09f20ab45 fix repr for the linter + + * 4ee723ac0f Rework how errors are output + + * dc283940e0 Merge branch '2017.7' into fix-cmd-run-env-corrupt + + * a91926561f Fix linting problems + + * e8d3d017f9 fix bytes or str in find command + + * 0877cfc38f Merge branch '2017.7' into fix-cmd-run-env-corrupt + + * 86176d1252 Merge branch '2017.7' into fix-cmd-run-env-corrupt + + * 3a7cc44ade Add python3 support for byte encoded markers + + * 09048139c7 Do not show whole env in error + + * ed94700255 fix missing raise statement + + * 15868bc88c Fixes stdout user environment corruption + + * ac2a6616a7 Merge pull request `#46432`_ from twangboy/win_locales_utf8 + + * affa35c30d Revert passing encoding + + * a0ab27ef15 Merge remote-tracking branch 'dw/win_locales_utf8' into win_locales_utf8 + + * 9f95c50061 Use default SLS encoding, fall back to system encoding + + * 6548d550d0 Use salt.utils.to_unicode + + * 8c0164fb63 Add ability to specify encoding in sdecode + + * 2e7985a81c Default to utf-8 on Windows + + * 8017860dcc Use salt.utils.to_unicode + + * c10ed26eab Add ability to specify encoding in sdecode + + * 8d7e2d0058 Default to utf-8 on Windows + + * fadc5e4ba4 Merge pull request `#46669`_ from terminalmage/pillar-merge-order + + * b4a1d34b47 Add option to return to pre-2017.7.3 pillar include merge order + + * b90f0d1364 Merge pull request `#46711`_ from terminalmage/wildcard-versions-info + + * fc7d16f1af Add performance reminder for wildcard versions + + * 6c80d90bb6 Merge pull request `#46693`_ from dwoz/test_smtp_return + + * 5bf850c67f File and Pillar roots are dictionaries + + * 9a6bc1418c Merge pull request `#46543`_ from dafenko/fix-add-saltenv-pillarenv-to-pillar-item + + * 6d5b2068aa Merge branch '2017.7' into fix-add-saltenv-pillarenv-to-pillar-item + + * 5219377313 Merge branch '2017.7' into fix-add-saltenv-pillarenv-to-pillar-item + + * b7d39caa86 Merge branch '2017.7' into fix-add-saltenv-pillarenv-to-pillar-item + + * 25f1074a85 Add docstring for added parameters + + * 973bc13955 Merge branch '2017.7' into fix-add-saltenv-pillarenv-to-pillar-item + + * 164314a859 Merge branch '2017.7' into fix-add-saltenv-pillarenv-to-pillar-item + + * 267ae9f633 Fix missing saltenv and pillarenv in pillar.item + + * f776040e25 Merge pull request `#46679`_ from vutny/doc-state-pkg + + * 4a730383bf [DOC] Correct examples in `pkg` state module + + * 47409eaa6e Merge pull request `#46646`_ from twangboy/win_fix_test_local_cache + + * 8d93156604 Fix `unit.returners.test_local_cache` for Windows + + * 0c2dce0416 Merge pull request `#46649`_ from terminalmage/issue46595 + + * e82a1aa1ec Make server_id consistent on Python 3 + + * 4e7466a21c Merge pull request `#46588`_ from UtahDave/no_crash_winshell + + * b7842a1777 Update error message. + + * 95dfdb91ca Don't stacktrace when salt-ssh w/o saltwinshell + + * 33af3cfc7c Merge pull request `#46631`_ from rallytime/update-pillar-unit-tests + + * 0f728186aa Fix pillar unit test failures: file_roots and pillar_roots environments should be lists + + * d329e7af78 Merge pull request `#46640`_ from terminalmage/file.copy-docs + + * 480c5f8faa Clarify the docs for the file.copy state + + * ff40590c06 Merge pull request `#46642`_ from vutny/doc-cloud-index + + * 51e6aa54a1 [DOC] Unify cloud modules index header + + * 83ed40c06a Merge pull request `#46619`_ from rallytime/merge-2017.7 + + * bcbddf5d07 Merge branch '2017.7.5' into '2017.7' + + * 19bb725698 Merge pull request `#46612`_ from Ch3LL/7.5_rn + + * 6076bfa2ee Add changelog to 2017.7.5 release + + * 31c78aef11 Merge pull request `#46572`_ from dmurphy18/update_xxxbuild + + * c87511570d Merge branch '2017.7.5' into update_xxxbuild + + * cdd768fa4d Merge pull request `#46577`_ from gtmanfred/2017.7.5 + + * 78cbf7b5cd Fix npm issue + + * c76f7eb028 enable debug logging on the minionlog + + * e6682c660c Merge pull request `#46551`_ from terminalmage/salt-jenkins-885 + + * 703b5e7e65 Change versionadded to show that 2018.3.0 will not have this function + + * 010d260d06 Rewrite failing Suse pkg integration test + + * f3f5dec239 zypper.py: fix version argument being ignored + + * 214f2d6ad3 Add pkg.list_repo_pkgs to zypper.py + + * 0a541613f2 Additon of -sa flag to allow for revision numbers other than -0 or -1 + + * bd62699ccb Merge pull request `#46563`_ from gtmanfred/2017.7.5 + + * 8d5ab72983 virtualenv version too old for python3.6 + + * 2916708124 Merge pull request `#46561`_ from gtmanfred/2017.7.5 + + * 2c39ac6dfb disable verbose + + * ee3bff6e32 Merge pull request `#46537`_ from rallytime/bp-46529 + + * 289c7a228f retry if there is a segfault + + * 1271536a89 Merge pull request `#46519`_ from rallytime/man-pages-2017.7.5 + + * 782a5584f5 Update man pages for 2017.7.5 + + * df12135439 Merge pull request `#46584`_ from twangboy/lgpo-46568 + + * 661017104b Detect disabled reg_multi_sz elements properly + + * 2fd3aa487c Merge pull request `#46624`_ from twangboy/win_fix_installer + + * fa0b0efe46 Fix some installer script inconsistencies + + * f038e3c452 Merge pull request `#46571`_ from garethgreenaway/46552_onfail_and_require + + * 152c43c843 Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't excute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran. + + * 2677330e19 Merge pull request `#46520`_ from gtmanfred/2017.7 + + * caefedc095 make sure utils is empty for pickling for windows + + * 2883548e6b pass utils to the scheduler for reloading in modules + + * 7bc3c2e588 Merge pull request `#46531`_ from terminalmage/issue44299 + + * b70c3389da Fix case where no comments specified + + * ce391c53f4 Add regression test for `#44299`_ + + * c3e36a6c94 Fix regression in yumpkg._parse_repo_file() + + * f0c79e3da3 Slight modification to salt.utils.pkg.rpm.combine_comments() + + * b80edb5d26 Merge pull request `#46567`_ from dwoz/runtest-n-wart + + * 3b6901e19d Honor named tests when running integration suites + + * 1dcd22e767 Merge pull request `#46580`_ from twangboy/win_update_docs_dism + + * d52b99d7a3 Clarify some issues with msu files in win_dism.py + + * 0a68c22332 Merge pull request `#46541`_ from gtmanfred/metadata + + * 19bd1d9db5 handle user-data for metadata grains + +* **ISSUE** `#46668`_: (`anlutro`_) Jinja2 filter strftime stopped working in salt-ssh 2018.3 (refs: `#46848`_, `#46744`_) + +* **PR** `#46744`_: (`garethgreenaway`_) [2018.3] Ensure salt.utils.dateutils is available for templates via salt-ssh + @ *2018-03-28 21:09:46 UTC* + + * ef68df7f3a Merge pull request `#46744`_ from garethgreenaway/46668_jinja2_filter_strftime_unavailable + + * 0b30955c00 Including salt.utils.dateutils so various jinja_filters are available when using salt-ssh. + +* **ISSUE** `#46334`_: (`sjorge`_) [2018.3.0rc1] Stacktrace on call to nacl.dec (refs: `#46426`_) + +* **PR** `#46720`_: (`rallytime`_) Bump deprecation notices in nacl module & runner to Neon + @ *2018-03-27 21:15:46 UTC* + + * **PR** `#46426`_: (`garethgreenaway`_) [2018.3.0rc1] fixes to nacl module & runner (refs: `#46639`_, `#46720`_) + + * 65bb37effd Merge pull request `#46720`_ from rallytime/bump-nacl-deprecation + + * 5102c0310c Bump deprecation notices in nacl module & runner to Neon + +* **PR** `#46733`_: (`rallytime`_) [2018.3] Merge forward from 2018.3.0rc1 to 2018.3 + @ *2018-03-27 18:46:43 UTC* + + * c83d9e66fe Merge pull request `#46733`_ from rallytime/merge-2018.3 + + * 00d4eb26f3 Merge branch '2018.3.0rc1' into '2018.3' + +* **PR** `#46565`_: (`twangboy`_) Create reg salt util (2018.3) + @ *2018-03-26 22:03:33 UTC* + + * 0faced1d54 Merge pull request `#46565`_ from twangboy/win_fix_cmd_powershell_2018.3 + + * 5ee64e9b0e Fix lint (spelling error) + + * 0de54ed953 Additional tests + + * fc9ecd75e2 Skip unit.state.test_reg unless on Windows + + * aa98bdf250 Fix some lint + + * e0d201a96f Make sure the docs are correct for the tests + + * f15f92318d Add tests for salt.utils.win_reg + + * f7112b19a2 Submit `#46527`_ agains 2018.3 + +* **ISSUE** `#46334`_: (`sjorge`_) [2018.3.0rc1] Stacktrace on call to nacl.dec (refs: `#46426`_) + +* **PR** `#46639`_: (`terminalmage`_) Use the correct path for nacl certificates in Windows + @ *2018-03-26 19:20:10 UTC* + + * **PR** `#46426`_: (`garethgreenaway`_) [2018.3.0rc1] fixes to nacl module & runner (refs: `#46639`_, `#46720`_) + + * dd52368f90 Merge pull request `#46639`_ from terminalmage/nacl-default-path + + * 2f7660fe35 Use the correct path for nacl certificates in Windows + +* **PR** `#46416`_: (`dincamihai`_) Fix cp.push empty file + @ *2018-03-26 17:52:47 UTC* + + * 2efef52a3e Merge pull request `#46416`_ from dincamihai/fix-cp.push-empty-file + + * 536ba0fa1e Fix cp.push empty file + +* **PR** `#46643`_: (`mcalmer`_) fix docker return + @ *2018-03-26 15:52:31 UTC* + + * 84579e7652 Merge pull request `#46643`_ from mcalmer/fix-docker-return + + * 3ceb63f607 fix checking test results + + * af64632bf3 add unit test for failed login + + * 0fc7989236 make it possible to use login, pull and push from module.run and detect errors + +* **PR** `#46650`_: (`Ch3LL`_) Mirror libnacl imports in test from the nacl module + @ *2018-03-26 14:48:40 UTC* + + * c67afbeb36 Merge pull request `#46650`_ from Ch3LL/nacl_test + + * 9fef8bc431 Mirror libnacl imports in test from the nacl runner + + * f11d58a8e9 Mirror libnacl imports in test from the nacl module + +* **PR** `#46645`_: (`terminalmage`_) Add Unicode / Python 3 update to 2018.3.0 release notes + @ *2018-03-26 14:43:53 UTC* + + * 03b58a01cf Merge pull request `#46645`_ from terminalmage/release-notes + + * 986c7bcdae Rewrite unicode/py3 section + + * 064bc83276 Add Unicode / Python 3 update to 2018.3.0 release notes + +* **ISSUE** `#46150`_: (`whytewolf`_) With chocolately.version some packages don't work with check_remote=True (refs: `#46661`_) + +* **PR** `#46661`_: (`Kimol`_) Chocolatey - Lowered name of local and remote packages before comparing versions. + @ *2018-03-26 14:35:39 UTC* + + * 308c9ddfc3 Merge pull request `#46661`_ from Kimol/2018.3-fix_chocolatey_check_remote_packages + + * 52581e7918 Removed trailing whitespace + + * 123a86947c Chocolatey - Added lowering local packages for unifing both local and remote names to lowercase for comparison. + + * 4be1a991c2 Lowered name of available packages before comparing with local packages + +* **PR** `#46569`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 (refs: `#46631`_) + @ *2018-03-21 20:57:04 UTC* + + * 2e1f7c37f7 Merge pull request `#46569`_ from rallytime/merge-2018.3 + + * 46ba72fb1c Fix pillar unit test failures: file_roots and pillar_roots environments should be lists + + * fe2d46dd0c Better merge conflict resolution for setup.py windows changes + + * 8886b61576 Update old utils paths to new paths + + * 8d1e1e7f94 Merge branch '2017.7' into '2018.3' + + * 048b2ba3f6 Merge pull request `#46547`_ from garethgreenaway/46427_service_module_cumulus + + * edd0b11447 Merge branch '2017.7' into 46427_service_module_cumulus + + * ea3c16080e Disable the `service` module on Cumulus since it is using systemd. + + * 98e3260b9a Merge pull request `#46548`_ from Ch3LL/profit_test + + * db96c4e72e check for foo,bar username,password set in profitbrick config + + * 79f2a76609 Merge pull request `#46549`_ from Ch3LL/dimension_test + + * bb338c464c Fix dimensionsdata test random_name call + + * 083846fe0e Merge pull request `#46529`_ from gtmanfred/kitchen + + * 50d6e2c7be retry if there is a segfault + + * 5cc11129f1 Merge pull request `#46511`_ from rallytime/bp-45769 + + * a8ffceda53 Surpress boto WARNING during decode, reference: https://github.com/boto/boto/issues/2965 + + * 0e90c8ca6f Merge pull request `#46493`_ from terminalmage/issue46207 + + * f06ff68f10 salt-call: don't re-use initial pillar if CLI overrides passed + + * b11a8fc8e0 Merge pull request `#46450`_ from gtmanfred/salt_runner + + * 7974ff7264 load grains for salt.cmd runner + + * 22d753364b Merge pull request `#46337`_ from gtmanfred/2017.7 + + * d6d9e36359 add tests for names and listen/listen_in + + * 3f8e0db572 let listen_in work with names + + * 7161f4d4df fix listen to be able to handle names + + * b7191b8782 Merge pull request `#46413`_ from meaksh/2017.7-explore-result-in-depth + + * 885751634e Add new unit test to check state.apply within module.run + + * 9f19ad5264 Rename and fix recursive method + + * 1476ace558 Fix Python3 and pylint issue + + * 726ca3044d Explore 'module.run' response to catch the 'result' in depth + + * 02a79a2014 Merge pull request `#46496`_ from gtmanfred/kitchen + + * da002f78d0 include virtualenv path for py3 windows + + * fe2efe03ea remove duplicate setup + + * 5c4c182d75 Merge pull request `#46330`_ from bdrung/fix_kubernetes_test_create_deployments + + * 5008c53c44 Fix ValueError for template in AppsV1beta1DeploymentSpec + + * c7e05d3ff4 Merge pull request `#46482`_ from rongshengfang/fix-keyerror-in-instance_present + + * ed8c83e89a Fix KeyError in salt/states/boto_ec2.py when an EIP is being associated to an existing instance with the instance_present state. + + * 573d51afec Merge pull request `#46463`_ from terminalmage/mock-2.0 + + * b958b4699c Update requirements files to depend on mock>=2.0.0 + + * a154d35fc7 Merge pull request `#46422`_ from rallytime/bp-46300 + + * 829dfde8e8 Change stringutils path to old utils path for 2017.7 + + * 91db2e0782 Python 3 support + + * 2afaca17a1 Merge pull request `#46320`_ from mcalmer/warn-kubernetes + + * c493ced415 add warning about future config option change + + * c7f95581e3 Merge pull request `#46449`_ from bdrung/make-doc-theme-configurable + + * 4a5da2d144 Make documentation theme configurable + + * 10ce0e9e20 Merge pull request `#46162`_ from rallytime/team-suse-zypper-owner + + * 13a295a3b7 Add *pkg* and *snapper* to team-suse + + * 35c7b7b0d3 Add btrfs, xfs, yumpkg, and kubernetes file to team-suse + + * 485d777ac0 Add team-suse to CODEOWNERS file for zypper files + + * cac096b311 Merge pull request `#46434`_ from gtmanfred/highstate_return + + * d18f1a55a7 fix pylint + + * 9e2c3f7991 split return key value correctly + + * 7dd71101ce Merge pull request `#46455`_ from whytewolf/Issue_44452_unicode_cloud + + * 5fe474b1a8 .format remove fix for `#44452`_ + + * 4c8d9026d3 Merge pull request `#46428`_ from twangboy/win_fix_reqs + + * e7ab97cc17 Remove six as a hard dep for Salt + + * cc67e5c2ef Set six to 1.11.0 + + * e834d9a63b Merge pull request `#46454`_ from gtmanfred/kitchen + + * b8ab8434a5 fix windows for kitchen + + * 2886dca88f Merge pull request `#46452`_ from gtmanfred/spm_cache_dir + + * 169cf7a4e2 make spm cache_dir instead of all cachedirs + + * a188984cd9 Merge pull request `#46446`_ from bdrung/fix-typos + + * 7e6e80be87 heat: Fix spelling mistake of environment + + * a3c54b50f6 Fix various spelling mistakes + + * e35fc5263c Merge pull request `#46309`_ from bdrung/dynamic-pillarenv + + * 584b451fd1 Support dynamic pillar_root environment + + * 35fe9827fe Merge pull request `#46430`_ from terminalmage/issue44032 + + * f9f187e915 Improve reliability/idempotence of file.blockreplace state + + * 2bad0a21c0 Merge pull request `#46429`_ from twangboy/win_fix_snmp + + * 8995a9b8de Fix problem with __virtual__ in win_snmp + + * 93a572f229 Merge pull request `#46100`_ from jfindlay/resolv_scope + + * d5561bedaf tests.unit.grains.core add scoped IPv6 nameserver + + * 4e2e62d508 salt.utils.dns parse scope param for ipv6 servers + + * 5acc1d5c54 Merge pull request `#46420`_ from bdrung/2017.7 + + * e48c13d9e0 Fix SSH client exception if SSH is not found + + * ca6a76e317 Merge pull request `#46379`_ from angeloudy/2017.7 + + * 3acb59c74c Merge branch '2017.7' into 2017.7 + + * d971e0c08b Fix indent + + * 269514683f Update http.py + + * 908c040ac3 Update http.py + + * 51ba3c135b Update http.py + + * 14aba24111 fix bytes-object required error in python 3 + + * 73f9233557 Merge pull request `#46404`_ from gtmanfred/kitchen + + * c56baa95a8 clone .git for the version tests + + * 3620611b5b fix unhold package for debian + + * 5219f7d2ba fix minion log path + + * ca28cfd4e4 Merge pull request `#46310`_ from twangboy/win_update_installer_build + + * bcf8b19566 Update the installer build + + * decccbeca3 Merge pull request `#46316`_ from twangboy/win_fix_dsc + + * 2042d33d59 Fix issues with the DSC module + +* **PR** `#46620`_: (`rallytime`_) [2018.3] Merge 2018.3.0rc1 into 2018.3 + @ *2018-03-20 22:45:00 UTC* + + * 8cdd56b9dc Merge pull request `#46620`_ from rallytime/merge-2018.3.0rc1-into-2018.3 + + * b03cda3cea Merge branch '2018.3.0rc1' into '2018.3' + +* **PR** `#46606`_: (`Ch3LL`_) add autodoc topics for infoblox state modules + @ *2018-03-19 21:35:46 UTC* + + * 2d2fe22ae2 Merge pull request `#46606`_ from Ch3LL/infoblox_docs + + * 6eab6a7dc4 add autodoc topics for infoblox state modules + +* **PR** `#46540`_: (`s0undt3ch`_) Some missing `isinstance` checks. + @ *2018-03-15 16:17:19 UTC* + + * 1191d5b379 Merge pull request `#46540`_ from s0undt3ch/2018.3 + + * fa1d668774 Some missing `isinstance` checks. Committed again through a PR. + +* **PR** `#46513`_: (`rallytime`_) [2018.3] Merge forward from 2018.3.0rc1 to 2018.3 + @ *2018-03-15 15:58:59 UTC* + + * 5429438e4b Merge pull request `#46513`_ from rallytime/merge-2018.3 + + * aa760334a1 Merge branch '2018.3.0rc1' into '2018.3' + +* **ISSUE** `#43208`_: (`mitar`_) Prevent user.present to change uid and gid of existing user (refs: `#46502`_) + +* **PR** `#46502`_: (`terminalmage`_) user.present: don't change uid/gid unless explicitly told to + @ *2018-03-13 14:25:20 UTC* + + * 3e073c7e8a Merge pull request `#46502`_ from terminalmage/issue43208 + + * 4106840deb user.present: don't change uid/gid unless explicitly told to + +* **PR** `#46398`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-03-12 20:25:19 UTC* + + * 7cdb00ca9c Merge pull request `#46398`_ from rallytime/merge-2018.3 + + * d22e5ba442 Merge fix: return back `wb+` mode in `crypt.gen_keys`. + + * c7dddaf8ce Lint: Use log variable, not logger. + + * ca1860cd91 Use new get_umask function in mask calls in virt.py + + * 19ec7b6de1 Update old utils paths with new utils paths + + * d83727fdf9 Merge branch '2017.7' into '2018.3' + + * 95586678c3 Merge pull request `#46394`_ from Ch3LL/mac_doc + + * 158add6661 change oxdownload to oxdownload-{python_version} + + * 21aa848c89 Add mac py2 and py3 packages to mac installation docs + + * 07b5d09ac1 Merge pull request `#46338`_ from rallytime/fix-44831 + + * 90771da999 Remove cmd.wait deprecation reference in docs + + * 3849e7a085 Merge pull request `#46333`_ from danlsgiga/issue-42438 + + * 3b13f37b44 Revert changes in the code and change docs instead + + * 38114a65d8 Fixes color parameter mismatch and handles 204 responses correctly + + * a8f2f1b063 Merge pull request `#46322`_ from terminalmage/issue44935 + + * 85ac6a9893 yamlify_arg: don't treat leading dashes as lists + + * da5c282cb2 Merge pull request `#46327`_ from samilaine/fix-vmware-cloud-fqdn + + * 4b8dfb326f Modify the way a FQDN is handled in the vmware cloud provider. + + * 78c45d3786 Merge pull request `#46318`_ from terminalmage/squelch-warnings + + * 5889b36646 Skip type-checking for several gitfs/git_pillar/winrepo params + + * bb0d6fc263 Merge pull request `#46312`_ from gtmanfred/2017.7 + + * 749ae580ed add module_dirs to salt ssh thin tarball + + * 88b5f7383d Merge pull request `#46242`_ from redbaron4/fix-46127 + + * 06dba51617 Make changes from review + + * 727ebe1056 Merge branch '2017.7' into fix-46127 + + * 08d1ee8baf Fix Python3 test errors + + * aa9d709015 Pass env_vars to pip.freeze + + * a0716643e4 Merge pull request `#46265`_ from Ch3LL/profit_cloud + + * d4893eab4c Add username/password to profitbricks conf for cloud tests + + * ed7bffa7e0 Merge pull request `#46306`_ from rallytime/bp-46256 + + * 6439bce4a8 Don't install msgpack 0.5.5 + + * 8c2c4e3316 Merge pull request `#46208`_ from terminalmage/audit-umask-usage + + * 9c92aadce8 Disable blacklisted-function check for legitimate uses + + * 58a11aaa26 Disable pylint check in salt-ssh shim + + * ecadf67659 Blacklist os.umask + + * 31b1d98fcb Replace direct use of os.umask with use of existing context manager + + * 82ce546e18 Prevent failed os.makedirs from leaving modified umask in place + + * 978e869490 Merge pull request `#46293`_ from eliasp/2017.7-44624-py3-compat + + * 2e08b0d9c8 Fix Python3 comparison `TypeError` in `salt.modules.upstart` + + * bee4a66d0c Merge pull request `#46264`_ from terminalmage/issue46128 + + * 68000b7211 Fix incorrect merge conflict resolution + + * 1e0b3aa348 Merge pull request `#46296`_ from vutny/doc-pillar-get + + * 1faa8331e1 [DOC] Add missing params to `pillar.get` docstring + + * c490a50452 Merge pull request `#45874`_ from GwiYeong/2017.7-local-client-hotfix + + * 949aefc82b Merge branch '2017.7' into 2017.7-local-client-hotfix + + * 45d663f435 fix for local client timeout bug + + * 8e8a3a2897 Merge pull request `#46261`_ from rallytime/merge-2017.7 + + * 8256ae5ee5 Merge branch '2016.11' into '2017.7' + + * 140ef4d6b9 Merge pull request `#46253`_ from rallytime/doc-banners + + * 07ed8c7db3 Update docbanner for SaltConf18 + + * 9fe86ee520 Merge pull request `#46179`_ from wedge-jarrad/cifs-remount-fix + + * 9ca25c4313 Add credentials and secretfile to mount.mounted mount_invisible_keys + +* **PR** `#46421`_: (`bdrung`_) Skip SSHPasswordTests if ssh binary is not found + @ *2018-03-09 16:21:02 UTC* + + * 9c089aa4de Merge pull request `#46421`_ from bdrung/skip-ssh-tests-if-ssh-is-missing + + * 3d6f658309 Skip SSHPasswordTests if ssh binary is not found + +* **PR** `#46453`_: (`bdrung`_) Fix various spelling mistakes in 2018.3 + @ *2018-03-09 14:48:33 UTC* + + * **PR** `#46446`_: (`bdrung`_) Fix various typos (refs: `#46453`_) + + * 4cbfde5839 Merge pull request `#46453`_ from bdrung/fix-typos-2018.3 + + * 3d37eca847 Fix various spelling mistakes + +* **ISSUE** `#44032`_: (`PhilippeAB`_) blockreplace marker_end isn't applied with newline (refs: `#46430`_) + +* **PR** `#46437`_: (`terminalmage`_) Improve reliability/idempotence of file.blockreplace state (2018.3 branch) + @ *2018-03-08 15:38:53 UTC* + + * **PR** `#46430`_: (`terminalmage`_) Improve reliability/idempotence of file.blockreplace state (refs: `#46437`_) + + * a43d999fb8 Merge pull request `#46437`_ from terminalmage/issue44032-2018.3 + + * 4798187035 Improve reliability/idempotence of file.blockreplace state (2018.3 branch) + +* **PR** `#46328`_: (`dincamihai`_) Fix openscap push + @ *2018-03-07 17:51:41 UTC* + + * 0c66507aff Merge pull request `#46328`_ from dincamihai/2018.3.0rc1 + + * b5e508f339 Fix openscap push + +* **PR** `#46174`_: (`twangboy`_) Fix a unicode issue with the git module on Windows + @ *2018-03-06 18:53:53 UTC* + + * 82cb2ea5a0 Merge pull request `#46174`_ from twangboy/win_fix_test_git_2 + + * 80e3a47dd4 Add output_encoding argument to git state, and add docs + + * 661a0687ec Fix git utf-8 issues for Windows + +* **PR** `#46235`_: (`twangboy`_) Fix `unit.modules.test_ssh` for Windows + @ *2018-03-05 20:39:44 UTC* + + * 7690cf8564 Merge pull request `#46235`_ from twangboy/win_fix_test_ssh + + * 9ea02d7045 Use write instead of writelines for Windows + +* **PR** `#46332`_: (`terminalmage`_) Update the merge-forward docs to reference the 2018.3 branch + @ *2018-03-05 19:39:56 UTC* + + * c4f366cdd9 Merge pull request `#46332`_ from terminalmage/merge-forward-docs + + * 0411845cec Update the merge-forward docs to reference the 2018.3 branch + +* **PR** `#46307`_: (`rallytime`_) [2018.3] Merge forward from 2018.3.0rc1 to 2018.3 + @ *2018-03-03 12:56:07 UTC* + + * 241611aca5 Merge pull request `#46307`_ from rallytime/merge-2018.3 + + * c9fa21f62c Merge branch '2018.3.0rc1' into '2018.3' + +* **PR** `#46314`_: (`terminalmage`_) Merge 2017.7 branch into 2018.3 + @ *2018-03-03 12:54:27 UTC* + + * 30c34f0c62 Merge pull request `#46314`_ from terminalmage/merge-2017.7-2018.3 + + * 61ab47ee70 Merge branch '2017.7' into merge-2017.7-2018.3 + + * 88a3166589 Merge pull request `#46276`_ from terminalmage/issue44046 + + * a14d4daf8c salt.utils.docker.translate_input: operate on deepcopy of kwargs + + * da60399b8f Merge pull request `#46183`_ from oeuftete/fix-docker-container-running-host-config-ulimits + + * 5b09644429 Sort lists from Ulimits before comparing + + * 0b80f02226 Update old dockerng doc ref + + * 509429f08c Merge pull request `#46260`_ from terminalmage/git_pillar + + * b1ce2501fd Normalize global git_pillar/winrepo config items + + * a97a3e6fb0 Merge pull request `#46101`_ from jfindlay/openrc_ret + + * 2eef3c65a6 tests.unit.modules.gentoo_service add retcode arg + + * 81ec66fd8b modules.gentoo_service handle stopped retcode + + * 1a17593c05 Merge pull request `#46254`_ from rallytime/enterprise-banner + + * f5fae3dedf Update enterprise banner + + * 8c50ff32bd Merge pull request `#46250`_ from terminalmage/runner-docs + + * 91b4895087 Add documentation to the fileserver runner + + * 53067cca43 Merge pull request `#46243`_ from racker-markh/fix-openstack-private-network-issue + + * 50c1e140f0 Don't check deny private_ips already in the original list of private_ips + + * 15405c8760 Merge pull request `#46239`_ from terminalmage/issue46109 + + * 586d8b0dcf archive.extracted: don't check source file when if_missing path exists + +* **ISSUE** `#33177`_: (`robnagler`_) pillar.stack should not continue after errors (refs: `#46287`_) + +* **PR** `#46287`_: (`bbinet`_) Update PillarStack stack.py to latest upstream version + @ *2018-03-02 21:39:52 UTC* + + * 194b0317ac Merge pull request `#46287`_ from bbinet/upstream-pillarstack + + * b14b6f2c95 Update PillarStack stack.py to latest upstream version + +* **PR** `#46227`_: (`Ch3LL`_) Mock file_client call in smtp return test + @ *2018-02-28 22:12:22 UTC* + + * 7382654c70 Merge pull request `#46227`_ from Ch3LL/smtp_file_client + + * 280dc9a2b6 Mock file_client call in smtp return test + +* **PR** `#46232`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-02-28 19:16:37 UTC* + + * 123625213e Merge pull request `#46232`_ from rallytime/merge-2018.3 + + * 04f24c1794 Lint: fix from a bad merge + + * aad61c77bd Update old utils paths to new paths + + * 7243baf2c0 Merge branch '2017.7' into '2018.3' + + * 633e1208e4 Merge pull request `#46221`_ from terminalmage/salt-jenkins-854 + + * 0eb012659c Fix hanging tests in integration suite + + * 7917277345 Merge pull request `#46214`_ from vutny/formulas-readme-formatting + + * d702846961 [DOC] Replace `note` rST block for GitHub + + * a2e099b744 Merge pull request `#46203`_ from Ch3LL/7.5_release + + * 6ddf3246ce Add 2017.7.5 Release Notes File + + * 973b227818 Merge pull request `#46201`_ from rallytime/merge-2017.7 + + * 9ac2101baa Merge branch '2016.11' into '2017.7' + + * a4c5417d23 Merge pull request `#46132`_ from rallytime/2016.11_update_version_doc + + * d2196b6df3 Update release versions for the 2016.11 branch + + * 89cf2e5061 Merge pull request `#46139`_ from bdrung/os-grains + + * 0b445f2a37 tests: Add unit tests for _parse_os_release() + + * f6069b77ed Fix osfinger grain on Debian + + * 8dde55a761 tests: Add os_grains test cases for Debian + + * ff02ab9937 tests: Add Ubuntu 17.10 (artful) os_grains test case + + * 77d5356aba Fix incorrect oscodename grain on Ubuntu + + * 7e62dc9fd2 tests: Support reading os-release files from disk + + * a92ec0db1b Make _parse_os_release() always callable + + * eee1fe5b38 tests: Dissolve _run_ubuntu_os_grains_tests + + * 1d6ef731fe tests: Deduplicate _run_os_grains_tests() + + * c8c71e75ca Merge pull request `#46133`_ from rallytime/2017.7_update_version_doc + + * 0ed338e643 Update release versions for the 2017.7 branch + + * 390d592aa6 Merge pull request `#46185`_ from terminalmage/issue46124 + + * 3b58dd0da0 gitfs: Fix detection of base env when its ref is also mapped to a different env + + * 705caa8cca Merge pull request `#46148`_ from rallytime/merge-2017.7 + + * 25deebf7a6 Merge branch '2017.7.3' into '2017.7' + + * b5b083fd26 Merge pull request `#46074`_ from Ch3LL/update-7.4 + + * 8d0eeeb059 Update 2017.7.4 Release Notes with new fixes + + * 32f3d00e44 Merge pull request `#46066`_ from rallytime/pin-tornado + + * 6dc1a3b9dc Pin tornado version in requirements file + + * 85761ee650 Merge pull request `#46036`_ from terminalmage/issue43769 + + * e2140d9a84 Mock the ssh.key_is_encrypted utils func + + * 169924b3fe Move ssh.key_is_encrypted to a utils module temporarily + + * 54f4d78f7a Only keep ssh.py in the Windows installer + + * 5f04531e1b Keep ssh state and execution modules in the installer + + * f2b69f703d git.latest: Fix regression with identity file usage + + * 10a47dcbc4 Merge pull request `#46137`_ from damon-atkins/2017.7_fix_ec2_pillar2 + + * 99e7f6a7d3 update ec2 pillar arguments with better names + + * d74cb14557 Merge pull request `#46145`_ from terminalmage/issue46004 + + * 467ff841cd pillarenv argument should default to None and not the value from opts + + * 2a185855ea Better solution for fixing the opts munging in pillar.show_pillar runner + + * e2c4702e0c Update tests to reflect changes to the SaltCacheLoader + + * f9301fcc34 Document behavior when orchestration runnner invoked with non-orch states + + * 9644579cd0 Instantiate the SaltCacheLoader's fileclient in the __init__ + + * f9a6c86e21 salt.runners.pillar.show_pillar: don't modify master opts + + * e0940a9fc4 Properly detect use of the state.orch alias and add orch jid to kwargs + +* **ISSUE** `#42932`_: (`bobrik`_) cmd.run with bg: true doesn't fail properly (refs: `#46172`_, `#45932`_) + +* **PR** `#46172`_: (`The-Loeki`_) cmdmod: reimplementation of `#45932`_ for Oxygen + @ *2018-02-28 19:14:26 UTC* + + * **PR** `#45932`_: (`The-Loeki`_) Fix cmd run_all bg error (refs: `#46172`_) + + * **PR** `#39980`_: (`vutny`_) [2016.3] Allow to use `bg` kwarg for `cmd.run` state function (refs: `#46172`_, `#45932`_) + + * 20d869c228 Merge pull request `#46172`_ from The-Loeki/fix_cmd_run_all_bg_oxygen + + * 3ecf5018d0 Merge branch '2018.3' into fix_cmd_run_all_bg_oxygen + + * b5315e817b Merge branch '2018.3' into fix_cmd_run_all_bg_oxygen + + * beabf4f06b cmdmod: reimplementation of `#45932`_ for Oxygen + +* **PR** `#46238`_: (`terminalmage`_) Don't allow salt.utils.files.fopen() to open stdin/stdout/stderr + @ *2018-02-28 19:08:23 UTC* + + * 687575b582 Merge pull request `#46238`_ from terminalmage/fds-in-fopen + + * fe1527a3c4 Don't allow salt.utils.files.fopen() to open stdin/stdout/stderr + +* **PR** `#46219`_: (`twangboy`_) Fix `unit.modules.test_network` for Windows + @ *2018-02-28 15:45:02 UTC* + + * 3da5dcb313 Merge pull request `#46219`_ from twangboy/win_fix_inet_pton + + * 46f1d2cc09 Use six.text_type instead of six.u + +* **PR** `#46228`_: (`twangboy`_) Fix `unit.modules.test_pip` for Windows + @ *2018-02-28 15:37:49 UTC* + + * 44343f8063 Merge pull request `#46228`_ from twangboy/win_fix_test_pip + + * 415821eee9 Fix encoding issue + +* **PR** `#46198`_: (`rallytime`_) [2018.3] Merge forward from 2018.3.0rc1 to 2018.3 + @ *2018-02-27 15:17:51 UTC* + + * adc8950bbe Merge pull request `#46198`_ from rallytime/merge-2018.3 + + * 1b4dc71930 Lint fix + + * 776f2ea5d7 Merge branch '2018.3.0rc1' into '2018.3' + +* **ISSUE** `#45849`_: (`Epiclemonaid`_) XenServer Provisioning errors out on this line. removing it succeeds. (refs: `#46168`_) + +* **PR** `#46168`_: (`gtmanfred`_) driver and provider should be specified + @ *2018-02-26 16:17:13 UTC* + + * 06d2dff3ac Merge pull request `#46168`_ from gtmanfred/2018.3 + + * ac99bd26db driver and provider should be specified + +* **PR** `#46161`_: (`rallytime`_) [2018.3] Merge forward from 2017.7 to 2018.3 + @ *2018-02-26 15:29:39 UTC* + + * 605e5eff73 Merge pull request `#46161`_ from rallytime/merge-2018.3 + + * 69ac94baca Update utils paths + + * cffbf52c10 Lint fix: remove extra line + + * 79bed6cff1 Merge branch '2017.7' into '2018.3' + + * 0398ce0482 Merge pull request `#46135`_ from rallytime/bp-46088 + + * 57a60f62a3 fix kernel subpackages install bug + + * 1fcbbd1e02 Merge pull request `#46136`_ from rallytime/bp-46115 + + * 0a481d707f update digitalocean salt-cloud driver + + * 11e5e8eb86 Merge pull request `#45911`_ from twangboy/win_fix_lgpo_unicode + + * bcde5cc625 Update log statement + + * e9fa53d3b7 Change the Invalid Data Message + + * c818d4b791 Convert reg values to unicode for debug + + * 524a6a72a0 Merge pull request `#46123`_ from gtmanfred/2017.7 + + * 8d36730ef7 If no pubkey is passed in openmode fail + + * e48fa58012 Merge pull request `#46131`_ from vutny/doc-formula-formatting + + * d8fb051e44 [DOC] Fix code-blocks for reStructuredText + + * 6cea44ee95 Merge pull request `#46118`_ from rallytime/bp-44603 + + * 2a2c23c66b Fix acme state to correctly return on test + + * 16c382b55b Merge pull request `#46121`_ from rallytime/merge-2017.7 + + * 4c2f504a85 Merge branch '2016.11' into '2017.7' + + * e197a0fbc5 Merge pull request `#46076`_ from rallytime/bp-46066 + + * b94d73c53e Pin tornado version in requirements file + + * c72c1bde5f Merge pull request `#46093`_ from wedge-jarrad/contributing-doc-typo + + * 5a0fe104f7 Fix contributing doc typo + + * 3cb83ea87e Merge pull request `#45992`_ from bgridley/fix-routes-present-state + + * 679787699c Add vpc_peering_connection_id to describe_route_tables route_keys + + * 8a60635da0 Merge pull request `#46000`_ from terminalmage/issue45910 + + * 8cf13325ee salt.states.reg.present: Prevent traceback when reg data is binary + + * 1f44e285dc Merge pull request `#46011`_ from terminalmage/fix-solaris-runas + + * 8ee0a3a28b Move Solaris USER workaround up a bit + + * 13cdb52690 cmdmod.py: runas workaround for platforms that don't set a USER env var + + * 30fb8f7be0 Merge pull request `#45467`_ from twangboy/win_exclude_hidden + + * ea41215646 Make the regex pattern less greedy + + * 6d223cffa7 Add tip about passing bogus saltenv + + * 1282ae3a93 Skip hidden first + + * 437a457911 Skip hidden dirs in genrepo + + * 87dc554dc3 Add final updates to docs + + * 3646d5c897 Fix some docs formatting, add some warnings + + * 35c81faf5a Log the source_dir when caching the files + + * 91c3da8dfd Improve docs for pkg.refresh_db + + * 4803d92707 Add some documentation + + * 08b82e0875 Fix lint error, use raw + + * 2f712691cf Exclude hidden directories in pkg.refresh_db + + * b92346645b Merge pull request `#46107`_ from amendlik/yumpkg-assumeyes + + * 8d9a432fb2 Add --assumeyes to yum/dnf commands in yumpkg.refresh_db + + * 14fe423e0c Merge pull request `#46094`_ from kstreee/fix-memory-leak + + * 48080a1bae Fixes memory leak, saltclients should be cleaned after used. + + * aba00805f4 Adds set_close_callback function to removes stream instance after closed from a set streams. + + * 320c2037e1 Merge pull request `#46097`_ from vutny/fix-https-link + + * 2062fd0e5c [DOC] Put https link to the formulas doc page + + * 0eb137fb4e Merge pull request `#46103`_ from bdrung/2017.7 + + * dd3f936557 Fix skipping Kubernetes tests if client is not installed + + * c3a938e994 Merge pull request `#46070`_ from Ch3LL/fix-doc-dns + + * 2a5d855d97 add required arg to dns_check jinja doc example + + * 01042e9d77 Merge pull request `#46067`_ from rallytime/bp-45994 + + * a07bb48726 Correct formatting for lint + + * e8678f633d Fix Comment being None not '' and inject quotes into the TXT ChangeRecords + + * 5e0e2a30e2 Merge pull request `#45932`_ from The-Loeki/fix_cmd_run_all_bg + + * f83da27ca5 Merge branch '2017.7' into fix_cmd_run_all_bg + + * 771758fbca Merge branch '2017.7' into fix_cmd_run_all_bg + + * c54fcf7a2d cmd: move separate DRY logging blocks into _run, prevent logging on bg=True, don't use_vt on bg + + * ebb1f81a9b cmd run: when running in bg, force ignore_retcode=True + + * 45ace39961 Merge pull request `#46062`_ from vutny/pg-user-state-fix-typo + + * a5fbe4e95e Fix typo in postgres_user.present state function + + * edcb64de76 Merge pull request `#45763`_ from twangboy/win_fix_path_rehash + + * b9a2bc7b29 Fix hyperlinks + + * 29912adc15 Move the test_rehash test to test_win_functions + + * adc594c183 Remove duplicate link + + * e84628c1eb Add some comments to the code + + * d50d5f582f Add additional info to docs for `broadcast_setting_change` + + * 3a54e09cd9 Rename setting to message + + * a3f9e99bc0 Change to a generic function to broadcast change + + * 79299361c3 Create refresh_environment salt util + + * 967b83940c Fix rehash function + + * a46fbc546c Merge pull request `#46042`_ from jfindlay/file_tree_doc + + * 0ba4954a4b salt.pillar.file_tree revise module documentation + + * 3c6a5bf967 salt.pillar.file_tree provide better debug info + + * bb1cdc451e salt.pillar.file_tree no stack trace when nodegroups undefined + + * de86126dd8 Merge pull request `#46013`_ from rallytime/bp-45598 + + * 2ea3fef543 No lazy logging + + * f427b0febc Change formatting style of logging lines per review + + * ebb244396b Patch around ResourceRecords needing to be present for AliasTarget entries to work + +* **PR** `#46160`_: (`rallytime`_) Mark 2 tests as flaky + @ *2018-02-23 19:10:06 UTC* + + * 05b771bfd7 Merge pull request `#46160`_ from rallytime/flaky-tests + + * 49e49ae51b Mark 2 tests as flaky + +* **PR** `#46006`_: (`dincamihai`_) Remove obsolete unicode handling in pkg.info_installed + @ *2018-02-22 19:22:36 UTC* + + * 9b2bc1982c Merge pull request `#46006`_ from dincamihai/oxygen.rc1 + + * 99079fc442 Remove obsolete unicode handling in pkg.info_installed + +* **PR** `#46078`_: (`rallytime`_) [oxygen] Merge forward from oxygen.rc1 to oxygen + @ *2018-02-20 21:49:04 UTC* + + * 93dab45307 Merge pull request `#46078`_ from rallytime/merge-oxygen + + * 2d0f81fd1b Merge branch 'oxygen.rc1' into 'oxygen' + +* **ISSUE** `#45938`_: (`edgan`_) zookeeper.present state doesn't deal with an existing zode with no ACL specified (refs: `#46043`_) + +* **PR** `#46071`_: (`rallytime`_) Back-port `#46043`_ to oxygen + @ *2018-02-16 19:56:36 UTC* + + * **PR** `#46043`_: (`edgan`_) Allow zookeeper znode creation to not require an ACL (refs: `#46071`_) + + * 8d99c3b8fe Merge pull request `#46071`_ from rallytime/bp-46043 + + * b82c8bd630 Allow zookeeper znode creation to not require an ACL + +* **PR** `#46056`_: (`Ch3LL`_) Fix mac_assistive module not loading + @ *2018-02-16 14:57:46 UTC* + + * 5a31422432 Merge pull request `#46056`_ from Ch3LL/ver_mac + + * e44f5133c5 Fix mac_assistive module not loading + +* **PR** `#46041`_: (`rallytime`_) [oxygen] Merge forward from 2017.7 to oxygen + @ *2018-02-16 14:55:51 UTC* + + * cdca28f5da Merge pull request `#46041`_ from rallytime/merge-oxygen + + * e060a74fd8 Merge branch '2017.7' into 'oxygen' + + * 07e5735471 Merge pull request `#46016`_ from rallytime/bp-45826 + + * 1916e5c4a4 Fix selinux.fcontext_policy_present for Centos 6 + + * a1f4092811 Merge pull request `#46015`_ from rallytime/bp-45785 + + * ef6ffb1492 Resolve linting errors + + * 8047066c46 Remove unused import + + * 8f7c45935a Add tests for salt.modules.selinux.fcontext_get_policy + + * bafb7b4e6e Ensure parsed fields are stripped + + * a830a6e819 m/selinux.fcontext_get_policy allow long filespecs + + * 96097c037e Merge pull request `#46012`_ from rallytime/bp-45462 + + * 9f76836a6c emit port cli version, variants as separate args + + * 1279924f5f Merge pull request `#45991`_ from terminalmage/fix-duplicate-extra-opts + + * 916766f651 yumpkg: Fix a couple issues with _get_extra_opts + + * 8b9adc258e Merge pull request `#46017`_ from rallytime/merge-2017.7 + + * a06645ce71 Merge branch '2017.7.3' into '2017.7' + + * 6d534c6e7e Merge pull request `#46009`_ from Ch3LL/rn_7.4 + + * ac0baf4b34 Add 2017.7.4 Release Notes with PRs + + * ca76a0b328 Merge pull request `#45981`_ from gtmanfred/2017.7.3 + + * 0d448457dc apparently local is not set by default + + * 2a92f4bc16 use local config for vault when masterless + + * 6530649dbc Merge pull request `#45953`_ from rallytime/bp-45928-2017.7.3 + + * 85363189d1 Fixing vault when used with pillar over salt-ssh + + * fb378cebb0 Merge pull request `#45934`_ from rallytime/bp-45902 + + * bb83e8b345 Add regression test for issue 45893 + + * cdda66d759 Remove duplicated section in docstring and fix example + + * 4b6351cda6 Check the effective saltenv for cached archive + + * 0d74151c71 Merge pull request `#45935`_ from rallytime/bp-45742 + + * 6a0b5f7af3 Removed the chained copy + + * ad1150fad4 list.copy() is not compatible with python 2.7 + + * d20ff89414 Merge pull request `#45988`_ from rallytime/bp-45797 + + * 953a400d79 follow symlinks + + * b18087cee0 Merge pull request `#45711`_ from bdrung/fix-unicode-tests + + * b6181b5ed6 Fix Unicode tests when run with LC_ALL=POSIX + + * 5271fb1d40 Merge pull request `#45878`_ from damon-atkins/2017.7_fix_ec2_pillar + + * 0e74025714 Merge branch '2017.7' into 2017.7_fix_ec2_pillar + + * b4d0b23891 py3 fix + + * 75d9e20d8a Add ignoring 'terminated', 'stopped' instances, to improve changes of a single match + + * 0093472a37 added tag_key_list and tag_key_sep to create ec2_tags_list + + * afb3968aa7 ec2_pillar could not find instance-id, resolved. add support to use any tag to compare minion id against. + + * cf367dbd04 Merge pull request `#45942`_ from terminalmage/issue45679-2017.7 + + * 89cbd72a0d Don't try to sort ports when translating docker input + + * 9cd47b39dd Fix incorrect translation of docker port_bindings -> ports + + * dae41de7a8 Merge pull request `#45959`_ from rallytime/state-doc-update + + * 6f781cb95d A couple of grammar updates for the state compiler docs + + * 007214f7bf Merge pull request `#45908`_ from DimensionDataResearch/fix/issue/45884 + + * 1a75786b5a Fix linter warnings. + + * 82ec0b589c Revert to using salt.utils.cloud.is_public_ip. + + * 9b6b01873b Fix violations reported by flake8. + + * a2bc155c73 Use __utils__['cloud.'] instead of salt.cloud.utils. + + * 98907a32cb Ensure 'auth' parameter is correctly passed to dimensiondata driver. + + * de26b03e2c Fix copy/paste bug in dimensiondata provider integration test. + + * 6b1b6be427 Add integration tests for dimensiondata cloud provider. + + * f6ea9fed7d Ensure that event data provided by the dimensiondata driver is serialisable. + + * efcbfa868c Merge pull request `#45985`_ from garethgreenaway/2017_7_fixing_mac_tests_again + + * 7b8dc14433 Missing `format` in the call to write. + + * bf03abd07c Merge pull request `#45958`_ from garethgreenaway/backport-fixing_mactests_queue_full + + * 25dffaae91 Backporting `#45935`_ + + * bab365d6c6 Merge pull request `#45949`_ from rallytime/merge-2017.7 + + * f51687e903 Merge branch '2016.11' into '2017.7' + + * 7779fea7ba Merge pull request `#45940`_ from dmurphy18/fix_aix_cmdmod + + * dd2788419b Fix use of 'su' for AIX to use '-' + + * 7fd00ec752 Merge pull request `#45928`_ from garethgreenaway/45915_fixing_vault_pillar_for_salt_ssh + + * 259e60e5d4 Fixing vault when used with pillar over salt-ssh + + * 9d14ad9ccf Merge pull request `#45925`_ from terminalmage/fix-spelling + + * 7a143fe454 Fix spelling error in docstring + +* **PR** `#45972`_: (`mcalmer`_) move log_file option to changeable defaults + @ *2018-02-15 18:57:24 UTC* + + * 057e895faf Merge pull request `#45972`_ from mcalmer/allow-salt-ssh-define-log_file + + * f89a20bf3e move log_file option to changeable defaults + +* **PR** `#46007`_: (`rallytime`_) [oxygen] Merge forward from oxygen.rc1 to oxygen + @ *2018-02-13 18:50:09 UTC* + + * d4377d4678 Merge pull request `#46007`_ from rallytime/merge-oxygen + + * d6c2d0693a Merge branch 'oxygen.rc1' into 'oxygen' + +* **PR** `#45944`_: (`mirceaulinic`_) Add NetBox module autodoc + @ *2018-02-13 00:01:48 UTC* + + * 069f790b3c Merge pull request `#45944`_ from cloudflare/netbox-autodoc + + * ed69b987cf Add NetBox module autodoc + +* **PR** `#45984`_: (`garethgreenaway`_) [oxygen] Missing `format` in the call to write. + @ *2018-02-12 19:06:04 UTC* + + * 2a6285d313 Merge pull request `#45984`_ from garethgreenaway/fixing_mac_tests_again + + * ae7791d30b Missing `format` in the call to write. + +* **PR** `#45922`_: (`rallytime`_) [oxygen] Merge forward from 2017.7 to oxygen + @ *2018-02-09 20:24:26 UTC* + + * 88f481a3df Merge pull request `#45922`_ from rallytime/merge-oxygen + + * 9c49c8d47c Remove extra patch + + * b96f4cf8ad Remove duplicate import in cmdmod.py + + * 34ecdffa71 Replace old utils paths with new paths + + * d80547e0b8 Merge branch '2017.7' into 'oxygen' + + * 0cbe93cd69 Merge pull request `#45920`_ from rallytime/merge-2017.7 + + * e4e4744218 Merge branch '2016.11' into '2017.7' + + * 27ff82f996 Merge pull request `#45864`_ from rallytime/release-note-fix + + * 104a24f244 Remove extraneous ] in release notes for 2016.11.9 + + * 5fa010de2b Merge pull request `#45787`_ from rallytime/2016.11.9_docs + + * a38d4d44fa [2016.11] Bump latest and previous versions + + * 643a8a5278 Merge pull request `#45814`_ from gtmanfred/2017.7 + + * d8eec9aa97 fix cookies dict size changing in http.query + + * 3a3f87c16d Merge pull request `#45877`_ from rallytime/new-release-notes + + * f937e8ba81 Add release notes file for 2017.7.4 release + + * 1c3cc00670 Merge pull request `#45904`_ from rallytime/bp-41017 + + * 80c56cdcea Fixed typo in pkg state documentation + + * 317d35bd15 Merge pull request `#45907`_ from terminalmage/fix-grains-backport + + * 6cf7e50cc4 Fix backport of grains fix + + * dade5f0cab Merge pull request `#45906`_ from rallytime/bp-45548 + + * 1befa7386c Update x509.py + + * 82c473a1fe Merge pull request `#45902`_ from terminalmage/issue45893 + + * 9d200efc26 Add regression test for issue 45893 + + * 1468f1d0ff Remove duplicated section in docstring and fix example + + * 6cc5cd9b8a Check the effective saltenv for cached archive + + * fdedde3cfb Merge pull request `#45862`_ from rallytime/bp-45830 + + * 1024856f9a Wrapping the put_nowait in a try...except and catching the exception when the multiprocessing queue is full. This situation is happening when running the full testing suite on MacOS where the queue limit is 32767 vs on Linux where the queue limit is unlimited. + + * 43a45b42c3 Merge pull request `#45779`_ from The-Loeki/patch-3 + + * 8575ae3d52 Merge branch '2017.7' into patch-3 + + * 47cf00d88e SSH shell shim: Don't use $() for optimal support + + * cca997d0da Merge pull request `#45788`_ from rallytime/2017.7.3_docs + + * d5faf6126b [2017.7] Bump latest and previous versions + + * 746206cebe Merge pull request `#45842`_ from rallytime/bp-45827 + + * c631598a87 Fix traceback in disks grains when /sys/block not available + + * 900aadcd67 Merge pull request `#45721`_ from garethgreenaway/44978_show_duration_when_no_state_run + + * 359265869f Adding a couple tests to ensure that duration is included in state run results even when states do not run. + + * 912347abc3 Include the duration when a state does not run, for example when the `onchanges` requisite is not met. + + * 80a2d009b4 Merge pull request `#45517`_ from kstreee/fix-mkdir + + * 24d41f2451 Fixes base dir making logic to ensure not raising the exception when base directory already exists. + + * 7a4b1b2e77 Merge pull request `#45835`_ from kstreee/fix-missing-return-statement + + * 68c7f3dcba Adds a missing return statement. + + * 0a04f118c2 Merge pull request `#45840`_ from rallytime/bp-45603 + + * 9653363131 Fix for duplicate entries with pkrepo.managed + + * bd2178cd5f Merge pull request `#45716`_ from ciiqr/fix_cmd_script_quoting + + * 217791079b some code cleanup (lint errors and escape_argument as _cmd_quote) + + * 1c29bc5a3d fixed quoting of script path in cmd.script + + * 272f912c7c Merge pull request `#45719`_ from bdrung/fix-python3-sphinx-build + + * 179e8fbe73 doc: Do not mock non-existing __qualname__ attribute + + * 971e59ebe2 Drop enforcing new-style object for SaltYamlSafeLoader + + * fc04336c3b Merge pull request `#45764`_ from mchugh19/2017.7 + + * 0a7f1a4d75 English better + + * 37e067c7b5 support amazon linux 2 for service module + +* **PR** `#45861`_: (`rallytime`_) [oxygen] Merge forward from oxygen.rc1 to oxygen + @ *2018-02-08 13:39:59 UTC* + + * 048c18ea42 Merge pull request `#45861`_ from rallytime/merge-oxygen + + * 6d812ac192 Merge branch 'oxygen.rc1' into 'oxygen' + +* **PR** `#45852`_: (`Giandom`_) fix-missing-highstate-module-import + @ *2018-02-05 15:02:39 UTC* + + * 1bd38fb3b7 Merge pull request `#45852`_ from Giandom/fix-missing-highstate-module-import + + * dc5a8f9233 fix-missing-highstate-module-import + +* **PR** `#45829`_: (`rallytime`_) [oxygen] Merge forward from 2017.7 to oxygen + @ *2018-02-02 20:20:32 UTC* + + * 5f54ce7b5f Merge pull request `#45829`_ from rallytime/merge-oxygen + + * 34a17819ca Add opts to salt.utils.jid.gen_jid call in minion.py + + * 79d071df9c Merge branch '2017.7' into 'oxygen' + + * f234bf52f4 Merge pull request `#45756`_ from roaldnefs/fix-grafana4-documentation + + * 92979c0b57 Fix grafana4 states documentation + + * 685b683db5 Merge pull request `#45801`_ from rallytime/merge-2017.7 + + * 26e992e011 Merge branch '2016.11' into '2017.7' + + * 746386d04c Merge pull request `#45794`_ from vutny/doc-file-state-examples + + * ddfeae6a29 [DOC] Fix code-block rST directive in file state module + + * abc9ece214 Merge pull request `#45780`_ from vutny/doc-pkgrepo-zypper + + * f80c7d8d69 [DOC] Add missing gpgautoimport for pkgrepo.managed + + * c7d319f3bc Merge pull request `#45802`_ from rallytime/merge-2017.7-from-2017.7.3 + + * eb48513ba0 Merge branch '2017.7.3' into '2017.7' + + * 1439da8d76 Merge pull request `#45755`_ from terminalmage/issue45743 + + * 8af1251c59 salt.crypt: Ensure message is encoded before signing + + * 96e9232cc2 Merge pull request `#45761`_ from gtmanfred/2017.7 + + * 280767ed57 generate a jid for cache_jobs on the minion + +* **PR** `#45819`_: (`Giandom`_) oxygen-added-highstate-output-to-slack-engine + @ *2018-02-01 18:38:42 UTC* + + * 3471796c51 Merge pull request `#45819`_ from Giandom/oxygen-added-highstate-output-to-slack-engine + + * 1af8899a9d oxygen-added-highstate-output-to-slack-engine + +.. _`#1`: https://github.com/saltstack/salt/issues/1 +.. _`#26920`: https://github.com/saltstack/salt/issues/26920 +.. _`#33177`: https://github.com/saltstack/salt/issues/33177 +.. _`#36802`: https://github.com/saltstack/salt/issues/36802 +.. _`#38838`: https://github.com/saltstack/salt/issues/38838 +.. _`#39832`: https://github.com/saltstack/salt/issues/39832 +.. _`#39980`: https://github.com/saltstack/salt/pull/39980 +.. _`#40961`: https://github.com/saltstack/salt/pull/40961 +.. _`#41233`: https://github.com/saltstack/salt/pull/41233 +.. _`#42932`: https://github.com/saltstack/salt/issues/42932 +.. _`#43208`: https://github.com/saltstack/salt/issues/43208 +.. _`#43405`: https://github.com/saltstack/salt/issues/43405 +.. _`#43499`: https://github.com/saltstack/salt/issues/43499 +.. _`#44032`: https://github.com/saltstack/salt/issues/44032 +.. _`#44299`: https://github.com/saltstack/salt/issues/44299 +.. _`#44452`: https://github.com/saltstack/salt/issues/44452 +.. _`#44455`: https://github.com/saltstack/salt/pull/44455 +.. _`#44638`: https://github.com/saltstack/salt/pull/44638 +.. _`#44926`: https://github.com/saltstack/salt/pull/44926 +.. _`#45467`: https://github.com/saltstack/salt/pull/45467 +.. _`#45517`: https://github.com/saltstack/salt/pull/45517 +.. _`#45711`: https://github.com/saltstack/salt/pull/45711 +.. _`#45716`: https://github.com/saltstack/salt/pull/45716 +.. _`#45719`: https://github.com/saltstack/salt/pull/45719 +.. _`#45721`: https://github.com/saltstack/salt/pull/45721 +.. _`#45755`: https://github.com/saltstack/salt/pull/45755 +.. _`#45756`: https://github.com/saltstack/salt/pull/45756 +.. _`#45761`: https://github.com/saltstack/salt/pull/45761 +.. _`#45763`: https://github.com/saltstack/salt/pull/45763 +.. _`#45764`: https://github.com/saltstack/salt/pull/45764 +.. _`#45774`: https://github.com/saltstack/salt/pull/45774 +.. _`#45779`: https://github.com/saltstack/salt/pull/45779 +.. _`#45780`: https://github.com/saltstack/salt/pull/45780 +.. _`#45787`: https://github.com/saltstack/salt/pull/45787 +.. _`#45788`: https://github.com/saltstack/salt/pull/45788 +.. _`#45790`: https://github.com/saltstack/salt/issues/45790 +.. _`#45794`: https://github.com/saltstack/salt/pull/45794 +.. _`#45801`: https://github.com/saltstack/salt/pull/45801 +.. _`#45802`: https://github.com/saltstack/salt/pull/45802 +.. _`#45814`: https://github.com/saltstack/salt/pull/45814 +.. _`#45819`: https://github.com/saltstack/salt/pull/45819 +.. _`#45829`: https://github.com/saltstack/salt/pull/45829 +.. _`#45835`: https://github.com/saltstack/salt/pull/45835 +.. _`#45840`: https://github.com/saltstack/salt/pull/45840 +.. _`#45842`: https://github.com/saltstack/salt/pull/45842 +.. _`#45849`: https://github.com/saltstack/salt/issues/45849 +.. _`#45852`: https://github.com/saltstack/salt/pull/45852 +.. _`#45861`: https://github.com/saltstack/salt/pull/45861 +.. _`#45862`: https://github.com/saltstack/salt/pull/45862 +.. _`#45864`: https://github.com/saltstack/salt/pull/45864 +.. _`#45874`: https://github.com/saltstack/salt/pull/45874 +.. _`#45877`: https://github.com/saltstack/salt/pull/45877 +.. _`#45878`: https://github.com/saltstack/salt/pull/45878 +.. _`#45902`: https://github.com/saltstack/salt/pull/45902 +.. _`#45904`: https://github.com/saltstack/salt/pull/45904 +.. _`#45906`: https://github.com/saltstack/salt/pull/45906 +.. _`#45907`: https://github.com/saltstack/salt/pull/45907 +.. _`#45908`: https://github.com/saltstack/salt/pull/45908 +.. _`#45911`: https://github.com/saltstack/salt/pull/45911 +.. _`#45920`: https://github.com/saltstack/salt/pull/45920 +.. _`#45922`: https://github.com/saltstack/salt/pull/45922 +.. _`#45925`: https://github.com/saltstack/salt/pull/45925 +.. _`#45928`: https://github.com/saltstack/salt/pull/45928 +.. _`#45932`: https://github.com/saltstack/salt/pull/45932 +.. _`#45934`: https://github.com/saltstack/salt/pull/45934 +.. _`#45935`: https://github.com/saltstack/salt/pull/45935 +.. _`#45938`: https://github.com/saltstack/salt/issues/45938 +.. _`#45940`: https://github.com/saltstack/salt/pull/45940 +.. _`#45942`: https://github.com/saltstack/salt/pull/45942 +.. _`#45944`: https://github.com/saltstack/salt/pull/45944 +.. _`#45949`: https://github.com/saltstack/salt/pull/45949 +.. _`#45953`: https://github.com/saltstack/salt/pull/45953 +.. _`#45958`: https://github.com/saltstack/salt/pull/45958 +.. _`#45959`: https://github.com/saltstack/salt/pull/45959 +.. _`#45972`: https://github.com/saltstack/salt/pull/45972 +.. _`#45981`: https://github.com/saltstack/salt/pull/45981 +.. _`#45984`: https://github.com/saltstack/salt/pull/45984 +.. _`#45985`: https://github.com/saltstack/salt/pull/45985 +.. _`#45988`: https://github.com/saltstack/salt/pull/45988 +.. _`#45991`: https://github.com/saltstack/salt/pull/45991 +.. _`#45992`: https://github.com/saltstack/salt/pull/45992 +.. _`#46000`: https://github.com/saltstack/salt/pull/46000 +.. _`#46002`: https://github.com/saltstack/salt/pull/46002 +.. _`#46006`: https://github.com/saltstack/salt/pull/46006 +.. _`#46007`: https://github.com/saltstack/salt/pull/46007 +.. _`#46009`: https://github.com/saltstack/salt/pull/46009 +.. _`#46011`: https://github.com/saltstack/salt/pull/46011 +.. _`#46012`: https://github.com/saltstack/salt/pull/46012 +.. _`#46013`: https://github.com/saltstack/salt/pull/46013 +.. _`#46015`: https://github.com/saltstack/salt/pull/46015 +.. _`#46016`: https://github.com/saltstack/salt/pull/46016 +.. _`#46017`: https://github.com/saltstack/salt/pull/46017 +.. _`#46023`: https://github.com/saltstack/salt/pull/46023 +.. _`#46024`: https://github.com/saltstack/salt/pull/46024 +.. _`#46036`: https://github.com/saltstack/salt/pull/46036 +.. _`#46041`: https://github.com/saltstack/salt/pull/46041 +.. _`#46042`: https://github.com/saltstack/salt/pull/46042 +.. _`#46043`: https://github.com/saltstack/salt/pull/46043 +.. _`#46056`: https://github.com/saltstack/salt/pull/46056 +.. _`#46062`: https://github.com/saltstack/salt/pull/46062 +.. _`#46066`: https://github.com/saltstack/salt/pull/46066 +.. _`#46067`: https://github.com/saltstack/salt/pull/46067 +.. _`#46070`: https://github.com/saltstack/salt/pull/46070 +.. _`#46071`: https://github.com/saltstack/salt/pull/46071 +.. _`#46074`: https://github.com/saltstack/salt/pull/46074 +.. _`#46076`: https://github.com/saltstack/salt/pull/46076 +.. _`#46078`: https://github.com/saltstack/salt/pull/46078 +.. _`#46093`: https://github.com/saltstack/salt/pull/46093 +.. _`#46094`: https://github.com/saltstack/salt/pull/46094 +.. _`#46097`: https://github.com/saltstack/salt/pull/46097 +.. _`#46100`: https://github.com/saltstack/salt/pull/46100 +.. _`#46101`: https://github.com/saltstack/salt/pull/46101 +.. _`#46103`: https://github.com/saltstack/salt/pull/46103 +.. _`#46107`: https://github.com/saltstack/salt/pull/46107 +.. _`#46118`: https://github.com/saltstack/salt/pull/46118 +.. _`#46121`: https://github.com/saltstack/salt/pull/46121 +.. _`#46123`: https://github.com/saltstack/salt/pull/46123 +.. _`#46131`: https://github.com/saltstack/salt/pull/46131 +.. _`#46132`: https://github.com/saltstack/salt/pull/46132 +.. _`#46133`: https://github.com/saltstack/salt/pull/46133 +.. _`#46135`: https://github.com/saltstack/salt/pull/46135 +.. _`#46136`: https://github.com/saltstack/salt/pull/46136 +.. _`#46137`: https://github.com/saltstack/salt/pull/46137 +.. _`#46139`: https://github.com/saltstack/salt/pull/46139 +.. _`#46145`: https://github.com/saltstack/salt/pull/46145 +.. _`#46148`: https://github.com/saltstack/salt/pull/46148 +.. _`#46150`: https://github.com/saltstack/salt/issues/46150 +.. _`#46160`: https://github.com/saltstack/salt/pull/46160 +.. _`#46161`: https://github.com/saltstack/salt/pull/46161 +.. _`#46162`: https://github.com/saltstack/salt/pull/46162 +.. _`#46168`: https://github.com/saltstack/salt/pull/46168 +.. _`#46171`: https://github.com/saltstack/salt/pull/46171 +.. _`#46172`: https://github.com/saltstack/salt/pull/46172 +.. _`#46174`: https://github.com/saltstack/salt/pull/46174 +.. _`#46179`: https://github.com/saltstack/salt/pull/46179 +.. _`#46183`: https://github.com/saltstack/salt/pull/46183 +.. _`#46185`: https://github.com/saltstack/salt/pull/46185 +.. _`#46198`: https://github.com/saltstack/salt/pull/46198 +.. _`#46201`: https://github.com/saltstack/salt/pull/46201 +.. _`#46203`: https://github.com/saltstack/salt/pull/46203 +.. _`#46208`: https://github.com/saltstack/salt/pull/46208 +.. _`#46214`: https://github.com/saltstack/salt/pull/46214 +.. _`#46219`: https://github.com/saltstack/salt/pull/46219 +.. _`#46221`: https://github.com/saltstack/salt/pull/46221 +.. _`#46227`: https://github.com/saltstack/salt/pull/46227 +.. _`#46228`: https://github.com/saltstack/salt/pull/46228 +.. _`#46232`: https://github.com/saltstack/salt/pull/46232 +.. _`#46235`: https://github.com/saltstack/salt/pull/46235 +.. _`#46238`: https://github.com/saltstack/salt/pull/46238 +.. _`#46239`: https://github.com/saltstack/salt/pull/46239 +.. _`#46242`: https://github.com/saltstack/salt/pull/46242 +.. _`#46243`: https://github.com/saltstack/salt/pull/46243 +.. _`#46250`: https://github.com/saltstack/salt/pull/46250 +.. _`#46253`: https://github.com/saltstack/salt/pull/46253 +.. _`#46254`: https://github.com/saltstack/salt/pull/46254 +.. _`#46260`: https://github.com/saltstack/salt/pull/46260 +.. _`#46261`: https://github.com/saltstack/salt/pull/46261 +.. _`#46264`: https://github.com/saltstack/salt/pull/46264 +.. _`#46265`: https://github.com/saltstack/salt/pull/46265 +.. _`#46276`: https://github.com/saltstack/salt/pull/46276 +.. _`#46280`: https://github.com/saltstack/salt/pull/46280 +.. _`#46287`: https://github.com/saltstack/salt/pull/46287 +.. _`#46293`: https://github.com/saltstack/salt/pull/46293 +.. _`#46296`: https://github.com/saltstack/salt/pull/46296 +.. _`#46306`: https://github.com/saltstack/salt/pull/46306 +.. _`#46307`: https://github.com/saltstack/salt/pull/46307 +.. _`#46309`: https://github.com/saltstack/salt/pull/46309 +.. _`#46310`: https://github.com/saltstack/salt/pull/46310 +.. _`#46312`: https://github.com/saltstack/salt/pull/46312 +.. _`#46314`: https://github.com/saltstack/salt/pull/46314 +.. _`#46316`: https://github.com/saltstack/salt/pull/46316 +.. _`#46318`: https://github.com/saltstack/salt/pull/46318 +.. _`#46320`: https://github.com/saltstack/salt/pull/46320 +.. _`#46322`: https://github.com/saltstack/salt/pull/46322 +.. _`#46326`: https://github.com/saltstack/salt/pull/46326 +.. _`#46327`: https://github.com/saltstack/salt/pull/46327 +.. _`#46328`: https://github.com/saltstack/salt/pull/46328 +.. _`#46330`: https://github.com/saltstack/salt/pull/46330 +.. _`#46332`: https://github.com/saltstack/salt/pull/46332 +.. _`#46333`: https://github.com/saltstack/salt/pull/46333 +.. _`#46334`: https://github.com/saltstack/salt/issues/46334 +.. _`#46337`: https://github.com/saltstack/salt/pull/46337 +.. _`#46338`: https://github.com/saltstack/salt/pull/46338 +.. _`#46339`: https://github.com/saltstack/salt/pull/46339 +.. _`#46379`: https://github.com/saltstack/salt/pull/46379 +.. _`#46394`: https://github.com/saltstack/salt/pull/46394 +.. _`#46398`: https://github.com/saltstack/salt/pull/46398 +.. _`#46404`: https://github.com/saltstack/salt/pull/46404 +.. _`#46413`: https://github.com/saltstack/salt/pull/46413 +.. _`#46416`: https://github.com/saltstack/salt/pull/46416 +.. _`#46420`: https://github.com/saltstack/salt/pull/46420 +.. _`#46421`: https://github.com/saltstack/salt/pull/46421 +.. _`#46422`: https://github.com/saltstack/salt/pull/46422 +.. _`#46426`: https://github.com/saltstack/salt/pull/46426 +.. _`#46428`: https://github.com/saltstack/salt/pull/46428 +.. _`#46429`: https://github.com/saltstack/salt/pull/46429 +.. _`#46430`: https://github.com/saltstack/salt/pull/46430 +.. _`#46432`: https://github.com/saltstack/salt/pull/46432 +.. _`#46434`: https://github.com/saltstack/salt/pull/46434 +.. _`#46437`: https://github.com/saltstack/salt/pull/46437 +.. _`#46446`: https://github.com/saltstack/salt/pull/46446 +.. _`#46449`: https://github.com/saltstack/salt/pull/46449 +.. _`#46450`: https://github.com/saltstack/salt/pull/46450 +.. _`#46452`: https://github.com/saltstack/salt/pull/46452 +.. _`#46453`: https://github.com/saltstack/salt/pull/46453 +.. _`#46454`: https://github.com/saltstack/salt/pull/46454 +.. _`#46455`: https://github.com/saltstack/salt/pull/46455 +.. _`#46463`: https://github.com/saltstack/salt/pull/46463 +.. _`#46464`: https://github.com/saltstack/salt/pull/46464 +.. _`#46482`: https://github.com/saltstack/salt/pull/46482 +.. _`#46493`: https://github.com/saltstack/salt/pull/46493 +.. _`#46496`: https://github.com/saltstack/salt/pull/46496 +.. _`#46502`: https://github.com/saltstack/salt/pull/46502 +.. _`#46503`: https://github.com/saltstack/salt/pull/46503 +.. _`#46504`: https://github.com/saltstack/salt/issues/46504 +.. _`#46511`: https://github.com/saltstack/salt/pull/46511 +.. _`#46513`: https://github.com/saltstack/salt/pull/46513 +.. _`#46519`: https://github.com/saltstack/salt/pull/46519 +.. _`#46520`: https://github.com/saltstack/salt/pull/46520 +.. _`#46526`: https://github.com/saltstack/salt/pull/46526 +.. _`#46527`: https://github.com/saltstack/salt/pull/46527 +.. _`#46529`: https://github.com/saltstack/salt/pull/46529 +.. _`#46531`: https://github.com/saltstack/salt/pull/46531 +.. _`#46537`: https://github.com/saltstack/salt/pull/46537 +.. _`#46539`: https://github.com/saltstack/salt/pull/46539 +.. _`#46540`: https://github.com/saltstack/salt/pull/46540 +.. _`#46541`: https://github.com/saltstack/salt/pull/46541 +.. _`#46543`: https://github.com/saltstack/salt/pull/46543 +.. _`#46547`: https://github.com/saltstack/salt/pull/46547 +.. _`#46548`: https://github.com/saltstack/salt/pull/46548 +.. _`#46549`: https://github.com/saltstack/salt/pull/46549 +.. _`#46551`: https://github.com/saltstack/salt/pull/46551 +.. _`#46561`: https://github.com/saltstack/salt/pull/46561 +.. _`#46563`: https://github.com/saltstack/salt/pull/46563 +.. _`#46565`: https://github.com/saltstack/salt/pull/46565 +.. _`#46567`: https://github.com/saltstack/salt/pull/46567 +.. _`#46569`: https://github.com/saltstack/salt/pull/46569 +.. _`#46571`: https://github.com/saltstack/salt/pull/46571 +.. _`#46572`: https://github.com/saltstack/salt/pull/46572 +.. _`#46577`: https://github.com/saltstack/salt/pull/46577 +.. _`#46580`: https://github.com/saltstack/salt/pull/46580 +.. _`#46584`: https://github.com/saltstack/salt/pull/46584 +.. _`#46588`: https://github.com/saltstack/salt/pull/46588 +.. _`#46606`: https://github.com/saltstack/salt/pull/46606 +.. _`#46612`: https://github.com/saltstack/salt/pull/46612 +.. _`#46613`: https://github.com/saltstack/salt/pull/46613 +.. _`#46619`: https://github.com/saltstack/salt/pull/46619 +.. _`#46620`: https://github.com/saltstack/salt/pull/46620 +.. _`#46624`: https://github.com/saltstack/salt/pull/46624 +.. _`#46631`: https://github.com/saltstack/salt/pull/46631 +.. _`#46632`: https://github.com/saltstack/salt/pull/46632 +.. _`#46639`: https://github.com/saltstack/salt/pull/46639 +.. _`#46640`: https://github.com/saltstack/salt/pull/46640 +.. _`#46641`: https://github.com/saltstack/salt/pull/46641 +.. _`#46642`: https://github.com/saltstack/salt/pull/46642 +.. _`#46643`: https://github.com/saltstack/salt/pull/46643 +.. _`#46645`: https://github.com/saltstack/salt/pull/46645 +.. _`#46646`: https://github.com/saltstack/salt/pull/46646 +.. _`#46647`: https://github.com/saltstack/salt/pull/46647 +.. _`#46649`: https://github.com/saltstack/salt/pull/46649 +.. _`#46650`: https://github.com/saltstack/salt/pull/46650 +.. _`#46655`: https://github.com/saltstack/salt/pull/46655 +.. _`#46659`: https://github.com/saltstack/salt/issues/46659 +.. _`#46660`: https://github.com/saltstack/salt/issues/46660 +.. _`#46661`: https://github.com/saltstack/salt/pull/46661 +.. _`#46668`: https://github.com/saltstack/salt/issues/46668 +.. _`#46669`: https://github.com/saltstack/salt/pull/46669 +.. _`#46675`: https://github.com/saltstack/salt/pull/46675 +.. _`#46679`: https://github.com/saltstack/salt/pull/46679 +.. _`#46690`: https://github.com/saltstack/salt/pull/46690 +.. _`#46691`: https://github.com/saltstack/salt/pull/46691 +.. _`#46692`: https://github.com/saltstack/salt/pull/46692 +.. _`#46693`: https://github.com/saltstack/salt/pull/46693 +.. _`#46696`: https://github.com/saltstack/salt/pull/46696 +.. _`#46709`: https://github.com/saltstack/salt/pull/46709 +.. _`#46711`: https://github.com/saltstack/salt/pull/46711 +.. _`#46720`: https://github.com/saltstack/salt/pull/46720 +.. _`#46729`: https://github.com/saltstack/salt/pull/46729 +.. _`#46731`: https://github.com/saltstack/salt/pull/46731 +.. _`#46732`: https://github.com/saltstack/salt/pull/46732 +.. _`#46733`: https://github.com/saltstack/salt/pull/46733 +.. _`#46734`: https://github.com/saltstack/salt/pull/46734 +.. _`#46739`: https://github.com/saltstack/salt/pull/46739 +.. _`#46740`: https://github.com/saltstack/salt/pull/46740 +.. _`#46742`: https://github.com/saltstack/salt/pull/46742 +.. _`#46743`: https://github.com/saltstack/salt/pull/46743 +.. _`#46744`: https://github.com/saltstack/salt/pull/46744 +.. _`#46746`: https://github.com/saltstack/salt/pull/46746 +.. _`#46749`: https://github.com/saltstack/salt/pull/46749 +.. _`#46751`: https://github.com/saltstack/salt/pull/46751 +.. _`#46754`: https://github.com/saltstack/salt/issues/46754 +.. _`#46756`: https://github.com/saltstack/salt/pull/46756 +.. _`#46766`: https://github.com/saltstack/salt/pull/46766 +.. _`#46769`: https://github.com/saltstack/salt/pull/46769 +.. _`#46770`: https://github.com/saltstack/salt/pull/46770 +.. _`#46776`: https://github.com/saltstack/salt/pull/46776 +.. _`#46778`: https://github.com/saltstack/salt/pull/46778 +.. _`#46779`: https://github.com/saltstack/salt/issues/46779 +.. _`#46783`: https://github.com/saltstack/salt/pull/46783 +.. _`#46786`: https://github.com/saltstack/salt/pull/46786 +.. _`#46788`: https://github.com/saltstack/salt/pull/46788 +.. _`#46792`: https://github.com/saltstack/salt/pull/46792 +.. _`#46796`: https://github.com/saltstack/salt/pull/46796 +.. _`#46799`: https://github.com/saltstack/salt/pull/46799 +.. _`#46800`: https://github.com/saltstack/salt/pull/46800 +.. _`#46808`: https://github.com/saltstack/salt/issues/46808 +.. _`#46809`: https://github.com/saltstack/salt/pull/46809 +.. _`#46813`: https://github.com/saltstack/salt/pull/46813 +.. _`#46814`: https://github.com/saltstack/salt/pull/46814 +.. _`#46815`: https://github.com/saltstack/salt/pull/46815 +.. _`#46820`: https://github.com/saltstack/salt/pull/46820 +.. _`#46821`: https://github.com/saltstack/salt/pull/46821 +.. _`#46823`: https://github.com/saltstack/salt/pull/46823 +.. _`#46834`: https://github.com/saltstack/salt/issues/46834 +.. _`#46836`: https://github.com/saltstack/salt/pull/46836 +.. _`#46837`: https://github.com/saltstack/salt/pull/46837 +.. _`#46838`: https://github.com/saltstack/salt/pull/46838 +.. _`#46839`: https://github.com/saltstack/salt/pull/46839 +.. _`#46844`: https://github.com/saltstack/salt/pull/46844 +.. _`#46845`: https://github.com/saltstack/salt/pull/46845 +.. _`#46847`: https://github.com/saltstack/salt/pull/46847 +.. _`#46848`: https://github.com/saltstack/salt/pull/46848 +.. _`#46849`: https://github.com/saltstack/salt/pull/46849 +.. _`#46850`: https://github.com/saltstack/salt/pull/46850 +.. _`#46851`: https://github.com/saltstack/salt/pull/46851 +.. _`#46852`: https://github.com/saltstack/salt/pull/46852 +.. _`#46853`: https://github.com/saltstack/salt/pull/46853 +.. _`#46859`: https://github.com/saltstack/salt/issues/46859 +.. _`#46862`: https://github.com/saltstack/salt/issues/46862 +.. _`#46863`: https://github.com/saltstack/salt/pull/46863 +.. _`#46864`: https://github.com/saltstack/salt/issues/46864 +.. _`#46865`: https://github.com/saltstack/salt/pull/46865 +.. _`#46867`: https://github.com/saltstack/salt/pull/46867 +.. _`#46868`: https://github.com/saltstack/salt/issues/46868 +.. _`#46869`: https://github.com/saltstack/salt/pull/46869 +.. _`#46870`: https://github.com/saltstack/salt/pull/46870 +.. _`#46872`: https://github.com/saltstack/salt/pull/46872 +.. _`#46873`: https://github.com/saltstack/salt/pull/46873 +.. _`#46874`: https://github.com/saltstack/salt/pull/46874 +.. _`#46878`: https://github.com/saltstack/salt/pull/46878 +.. _`#46879`: https://github.com/saltstack/salt/pull/46879 +.. _`#46880`: https://github.com/saltstack/salt/issues/46880 +.. _`#46881`: https://github.com/saltstack/salt/issues/46881 +.. _`#46882`: https://github.com/saltstack/salt/pull/46882 +.. _`#46887`: https://github.com/saltstack/salt/issues/46887 +.. _`#46899`: https://github.com/saltstack/salt/pull/46899 +.. _`#46900`: https://github.com/saltstack/salt/pull/46900 +.. _`#46906`: https://github.com/saltstack/salt/issues/46906 +.. _`#46908`: https://github.com/saltstack/salt/pull/46908 +.. _`#46909`: https://github.com/saltstack/salt/issues/46909 +.. _`#46912`: https://github.com/saltstack/salt/pull/46912 +.. _`#46913`: https://github.com/saltstack/salt/pull/46913 +.. _`#46917`: https://github.com/saltstack/salt/issues/46917 +.. _`#46918`: https://github.com/saltstack/salt/issues/46918 +.. _`#46919`: https://github.com/saltstack/salt/pull/46919 +.. _`#46925`: https://github.com/saltstack/salt/pull/46925 +.. _`#46929`: https://github.com/saltstack/salt/issues/46929 +.. _`#46930`: https://github.com/saltstack/salt/pull/46930 +.. _`#46931`: https://github.com/saltstack/salt/issues/46931 +.. _`#46934`: https://github.com/saltstack/salt/issues/46934 +.. _`#46936`: https://github.com/saltstack/salt/pull/46936 +.. _`#46937`: https://github.com/saltstack/salt/pull/46937 +.. _`#46943`: https://github.com/saltstack/salt/issues/46943 +.. _`#46944`: https://github.com/saltstack/salt/pull/46944 +.. _`#46945`: https://github.com/saltstack/salt/pull/46945 +.. _`#46947`: https://github.com/saltstack/salt/issues/46947 +.. _`#46951`: https://github.com/saltstack/salt/issues/46951 +.. _`#46953`: https://github.com/saltstack/salt/issues/46953 +.. _`#46966`: https://github.com/saltstack/salt/pull/46966 +.. _`#46973`: https://github.com/saltstack/salt/pull/46973 +.. _`#46975`: https://github.com/saltstack/salt/pull/46975 +.. _`#46977`: https://github.com/saltstack/salt/issues/46977 +.. _`#46985`: https://github.com/saltstack/salt/issues/46985 +.. _`#46989`: https://github.com/saltstack/salt/pull/46989 +.. _`#46990`: https://github.com/saltstack/salt/pull/46990 +.. _`#46991`: https://github.com/saltstack/salt/pull/46991 +.. _`#46993`: https://github.com/saltstack/salt/pull/46993 +.. _`#46997`: https://github.com/saltstack/salt/pull/46997 +.. _`#46999`: https://github.com/saltstack/salt/pull/46999 +.. _`#47006`: https://github.com/saltstack/salt/issues/47006 +.. _`#47007`: https://github.com/saltstack/salt/pull/47007 +.. _`#47008`: https://github.com/saltstack/salt/pull/47008 +.. _`#47009`: https://github.com/saltstack/salt/pull/47009 +.. _`#47012`: https://github.com/saltstack/salt/pull/47012 +.. _`#47017`: https://github.com/saltstack/salt/pull/47017 +.. _`#47019`: https://github.com/saltstack/salt/pull/47019 +.. _`#47020`: https://github.com/saltstack/salt/pull/47020 +.. _`#47021`: https://github.com/saltstack/salt/pull/47021 +.. _`#47022`: https://github.com/saltstack/salt/pull/47022 +.. _`#47023`: https://github.com/saltstack/salt/pull/47023 +.. _`#47025`: https://github.com/saltstack/salt/pull/47025 +.. _`#47026`: https://github.com/saltstack/salt/pull/47026 +.. _`#47027`: https://github.com/saltstack/salt/pull/47027 +.. _`#47029`: https://github.com/saltstack/salt/pull/47029 +.. _`#47037`: https://github.com/saltstack/salt/pull/47037 +.. _`#47038`: https://github.com/saltstack/salt/pull/47038 +.. _`#47039`: https://github.com/saltstack/salt/pull/47039 +.. _`#47041`: https://github.com/saltstack/salt/pull/47041 +.. _`#47042`: https://github.com/saltstack/salt/issues/47042 +.. _`#47045`: https://github.com/saltstack/salt/pull/47045 +.. _`#47046`: https://github.com/saltstack/salt/pull/47046 +.. _`#47047`: https://github.com/saltstack/salt/issues/47047 +.. _`#47048`: https://github.com/saltstack/salt/pull/47048 +.. _`#47051`: https://github.com/saltstack/salt/pull/47051 +.. _`#47053`: https://github.com/saltstack/salt/pull/47053 +.. _`#47055`: https://github.com/saltstack/salt/pull/47055 +.. _`#47057`: https://github.com/saltstack/salt/pull/47057 +.. _`#47058`: https://github.com/saltstack/salt/pull/47058 +.. _`#47059`: https://github.com/saltstack/salt/issues/47059 +.. _`#47060`: https://github.com/saltstack/salt/pull/47060 +.. _`#47061`: https://github.com/saltstack/salt/pull/47061 +.. _`#47062`: https://github.com/saltstack/salt/pull/47062 +.. _`#47064`: https://github.com/saltstack/salt/pull/47064 +.. _`#47065`: https://github.com/saltstack/salt/pull/47065 +.. _`#47066`: https://github.com/saltstack/salt/pull/47066 +.. _`#47067`: https://github.com/saltstack/salt/pull/47067 +.. _`#47068`: https://github.com/saltstack/salt/pull/47068 +.. _`#47069`: https://github.com/saltstack/salt/pull/47069 +.. _`#47070`: https://github.com/saltstack/salt/pull/47070 +.. _`#47074`: https://github.com/saltstack/salt/pull/47074 +.. _`#47076`: https://github.com/saltstack/salt/pull/47076 +.. _`#47077`: https://github.com/saltstack/salt/pull/47077 +.. _`#47081`: https://github.com/saltstack/salt/issues/47081 +.. _`#47089`: https://github.com/saltstack/salt/issues/47089 +.. _`#47092`: https://github.com/saltstack/salt/issues/47092 +.. _`#47102`: https://github.com/saltstack/salt/pull/47102 +.. _`#47104`: https://github.com/saltstack/salt/pull/47104 +.. _`#47106`: https://github.com/saltstack/salt/pull/47106 +.. _`#47107`: https://github.com/saltstack/salt/pull/47107 +.. _`#47108`: https://github.com/saltstack/salt/pull/47108 +.. _`#47109`: https://github.com/saltstack/salt/pull/47109 +.. _`#47110`: https://github.com/saltstack/salt/pull/47110 +.. _`#47113`: https://github.com/saltstack/salt/pull/47113 +.. _`#47117`: https://github.com/saltstack/salt/issues/47117 +.. _`#47122`: https://github.com/saltstack/salt/pull/47122 +.. _`#47124`: https://github.com/saltstack/salt/issues/47124 +.. _`#47129`: https://github.com/saltstack/salt/pull/47129 +.. _`#47131`: https://github.com/saltstack/salt/pull/47131 +.. _`#47134`: https://github.com/saltstack/salt/pull/47134 +.. _`#47142`: https://github.com/saltstack/salt/pull/47142 +.. _`#47150`: https://github.com/saltstack/salt/issues/47150 +.. _`#47153`: https://github.com/saltstack/salt/pull/47153 +.. _`#47155`: https://github.com/saltstack/salt/pull/47155 +.. _`#47159`: https://github.com/saltstack/salt/pull/47159 +.. _`#47161`: https://github.com/saltstack/salt/pull/47161 +.. _`#47162`: https://github.com/saltstack/salt/pull/47162 +.. _`#47163`: https://github.com/saltstack/salt/pull/47163 +.. _`#47165`: https://github.com/saltstack/salt/pull/47165 +.. _`#47167`: https://github.com/saltstack/salt/pull/47167 +.. _`#47168`: https://github.com/saltstack/salt/pull/47168 +.. _`#47172`: https://github.com/saltstack/salt/pull/47172 +.. _`#47177`: https://github.com/saltstack/salt/pull/47177 +.. _`#47184`: https://github.com/saltstack/salt/pull/47184 +.. _`#47185`: https://github.com/saltstack/salt/pull/47185 +.. _`#47186`: https://github.com/saltstack/salt/pull/47186 +.. _`#47189`: https://github.com/saltstack/salt/pull/47189 +.. _`#47191`: https://github.com/saltstack/salt/pull/47191 +.. _`#47193`: https://github.com/saltstack/salt/pull/47193 +.. _`#47195`: https://github.com/saltstack/salt/pull/47195 +.. _`#47196`: https://github.com/saltstack/salt/pull/47196 +.. _`#47197`: https://github.com/saltstack/salt/pull/47197 +.. _`#47199`: https://github.com/saltstack/salt/issues/47199 +.. _`#47202`: https://github.com/saltstack/salt/pull/47202 +.. _`#47213`: https://github.com/saltstack/salt/pull/47213 +.. _`#47216`: https://github.com/saltstack/salt/pull/47216 +.. _`#47217`: https://github.com/saltstack/salt/pull/47217 +.. _`#47219`: https://github.com/saltstack/salt/pull/47219 +.. _`#47220`: https://github.com/saltstack/salt/pull/47220 +.. _`#47225`: https://github.com/saltstack/salt/issues/47225 +.. _`#47226`: https://github.com/saltstack/salt/pull/47226 +.. _`#47227`: https://github.com/saltstack/salt/pull/47227 +.. _`#47228`: https://github.com/saltstack/salt/pull/47228 +.. _`#47236`: https://github.com/saltstack/salt/issues/47236 +.. _`#47239`: https://github.com/saltstack/salt/issues/47239 +.. _`#47241`: https://github.com/saltstack/salt/pull/47241 +.. _`#47242`: https://github.com/saltstack/salt/pull/47242 +.. _`#47245`: https://github.com/saltstack/salt/pull/47245 +.. _`#47246`: https://github.com/saltstack/salt/pull/47246 +.. _`#47249`: https://github.com/saltstack/salt/pull/47249 +.. _`#47250`: https://github.com/saltstack/salt/pull/47250 +.. _`#47251`: https://github.com/saltstack/salt/pull/47251 +.. _`#47252`: https://github.com/saltstack/salt/pull/47252 +.. _`#47255`: https://github.com/saltstack/salt/pull/47255 +.. _`#47260`: https://github.com/saltstack/salt/issues/47260 +.. _`#47262`: https://github.com/saltstack/salt/pull/47262 +.. _`#47267`: https://github.com/saltstack/salt/issues/47267 +.. _`#47270`: https://github.com/saltstack/salt/pull/47270 +.. _`#47271`: https://github.com/saltstack/salt/pull/47271 +.. _`#47272`: https://github.com/saltstack/salt/pull/47272 +.. _`#47275`: https://github.com/saltstack/salt/pull/47275 +.. _`#47277`: https://github.com/saltstack/salt/pull/47277 +.. _`#47279`: https://github.com/saltstack/salt/pull/47279 +.. _`#47280`: https://github.com/saltstack/salt/pull/47280 +.. _`#47281`: https://github.com/saltstack/salt/pull/47281 +.. _`#47283`: https://github.com/saltstack/salt/pull/47283 +.. _`#47284`: https://github.com/saltstack/salt/pull/47284 +.. _`#47285`: https://github.com/saltstack/salt/pull/47285 +.. _`#47286`: https://github.com/saltstack/salt/pull/47286 +.. _`#47287`: https://github.com/saltstack/salt/pull/47287 +.. _`#47290`: https://github.com/saltstack/salt/pull/47290 +.. _`#47291`: https://github.com/saltstack/salt/pull/47291 +.. _`#47292`: https://github.com/saltstack/salt/pull/47292 +.. _`#47293`: https://github.com/saltstack/salt/pull/47293 +.. _`#47302`: https://github.com/saltstack/salt/pull/47302 +.. _`#47303`: https://github.com/saltstack/salt/pull/47303 +.. _`#47304`: https://github.com/saltstack/salt/pull/47304 +.. _`#47307`: https://github.com/saltstack/salt/pull/47307 +.. _`#47308`: https://github.com/saltstack/salt/pull/47308 +.. _`#47311`: https://github.com/saltstack/salt/pull/47311 +.. _`#47312`: https://github.com/saltstack/salt/pull/47312 +.. _`#47314`: https://github.com/saltstack/salt/pull/47314 +.. _`#47317`: https://github.com/saltstack/salt/pull/47317 +.. _`#47319`: https://github.com/saltstack/salt/pull/47319 +.. _`#47320`: https://github.com/saltstack/salt/pull/47320 +.. _`#47322`: https://github.com/saltstack/salt/issues/47322 +.. _`#47324`: https://github.com/saltstack/salt/issues/47324 +.. _`#47325`: https://github.com/saltstack/salt/issues/47325 +.. _`#47326`: https://github.com/saltstack/salt/pull/47326 +.. _`#47329`: https://github.com/saltstack/salt/pull/47329 +.. _`#47331`: https://github.com/saltstack/salt/pull/47331 +.. _`#47332`: https://github.com/saltstack/salt/pull/47332 +.. _`#47334`: https://github.com/saltstack/salt/pull/47334 +.. _`#47335`: https://github.com/saltstack/salt/pull/47335 +.. _`#47339`: https://github.com/saltstack/salt/pull/47339 +.. _`#47341`: https://github.com/saltstack/salt/pull/47341 +.. _`#47342`: https://github.com/saltstack/salt/pull/47342 +.. _`#47343`: https://github.com/saltstack/salt/pull/47343 +.. _`#47347`: https://github.com/saltstack/salt/pull/47347 +.. _`#47348`: https://github.com/saltstack/salt/pull/47348 +.. _`#47354`: https://github.com/saltstack/salt/pull/47354 +.. _`#47356`: https://github.com/saltstack/salt/pull/47356 +.. _`#47359`: https://github.com/saltstack/salt/pull/47359 +.. _`#47363`: https://github.com/saltstack/salt/pull/47363 +.. _`#47367`: https://github.com/saltstack/salt/pull/47367 +.. _`#47368`: https://github.com/saltstack/salt/pull/47368 +.. _`#47369`: https://github.com/saltstack/salt/pull/47369 +.. _`#47371`: https://github.com/saltstack/salt/pull/47371 +.. _`#47374`: https://github.com/saltstack/salt/pull/47374 +.. _`#47375`: https://github.com/saltstack/salt/pull/47375 +.. _`#47379`: https://github.com/saltstack/salt/pull/47379 +.. _`#47380`: https://github.com/saltstack/salt/pull/47380 +.. _`#47382`: https://github.com/saltstack/salt/pull/47382 +.. _`#47384`: https://github.com/saltstack/salt/pull/47384 +.. _`#47388`: https://github.com/saltstack/salt/pull/47388 +.. _`#47389`: https://github.com/saltstack/salt/pull/47389 +.. _`#47397`: https://github.com/saltstack/salt/pull/47397 +.. _`#47399`: https://github.com/saltstack/salt/pull/47399 +.. _`#47401`: https://github.com/saltstack/salt/pull/47401 +.. _`#47403`: https://github.com/saltstack/salt/pull/47403 +.. _`#47404`: https://github.com/saltstack/salt/issues/47404 +.. _`#47405`: https://github.com/saltstack/salt/pull/47405 +.. _`#47407`: https://github.com/saltstack/salt/pull/47407 +.. _`#47410`: https://github.com/saltstack/salt/pull/47410 +.. _`#47412`: https://github.com/saltstack/salt/pull/47412 +.. _`#47413`: https://github.com/saltstack/salt/pull/47413 +.. _`#47415`: https://github.com/saltstack/salt/pull/47415 +.. _`#47417`: https://github.com/saltstack/salt/pull/47417 +.. _`#47429`: https://github.com/saltstack/salt/pull/47429 +.. _`#47433`: https://github.com/saltstack/salt/pull/47433 +.. _`#47435`: https://github.com/saltstack/salt/pull/47435 +.. _`#47438`: https://github.com/saltstack/salt/pull/47438 +.. _`#47441`: https://github.com/saltstack/salt/pull/47441 +.. _`#47443`: https://github.com/saltstack/salt/issues/47443 +.. _`#47447`: https://github.com/saltstack/salt/pull/47447 +.. _`#47448`: https://github.com/saltstack/salt/pull/47448 +.. _`#47455`: https://github.com/saltstack/salt/pull/47455 +.. _`#47456`: https://github.com/saltstack/salt/pull/47456 +.. _`#47458`: https://github.com/saltstack/salt/pull/47458 +.. _`#47459`: https://github.com/saltstack/salt/pull/47459 +.. _`#47462`: https://github.com/saltstack/salt/pull/47462 +.. _`#47464`: https://github.com/saltstack/salt/pull/47464 +.. _`#47465`: https://github.com/saltstack/salt/pull/47465 +.. _`#47466`: https://github.com/saltstack/salt/pull/47466 +.. _`#47467`: https://github.com/saltstack/salt/pull/47467 +.. _`#47472`: https://github.com/saltstack/salt/pull/47472 +.. _`#47476`: https://github.com/saltstack/salt/pull/47476 +.. _`#47479`: https://github.com/saltstack/salt/issues/47479 +.. _`#47482`: https://github.com/saltstack/salt/pull/47482 +.. _`#47484`: https://github.com/saltstack/salt/issues/47484 +.. _`#47485`: https://github.com/saltstack/salt/pull/47485 +.. _`#47494`: https://github.com/saltstack/salt/pull/47494 +.. _`#47495`: https://github.com/saltstack/salt/pull/47495 +.. _`#47496`: https://github.com/saltstack/salt/issues/47496 +.. _`#47497`: https://github.com/saltstack/salt/pull/47497 +.. _`#47502`: https://github.com/saltstack/salt/issues/47502 +.. _`#47503`: https://github.com/saltstack/salt/pull/47503 +.. _`#47505`: https://github.com/saltstack/salt/pull/47505 +.. _`#47507`: https://github.com/saltstack/salt/pull/47507 +.. _`#47511`: https://github.com/saltstack/salt/issues/47511 +.. _`#47514`: https://github.com/saltstack/salt/pull/47514 +.. _`#47515`: https://github.com/saltstack/salt/pull/47515 +.. _`#47516`: https://github.com/saltstack/salt/pull/47516 +.. _`#47518`: https://github.com/saltstack/salt/pull/47518 +.. _`#47520`: https://github.com/saltstack/salt/pull/47520 +.. _`#47531`: https://github.com/saltstack/salt/pull/47531 +.. _`#47532`: https://github.com/saltstack/salt/issues/47532 +.. _`#47541`: https://github.com/saltstack/salt/pull/47541 +.. _`#47550`: https://github.com/saltstack/salt/pull/47550 +.. _`#47553`: https://github.com/saltstack/salt/issues/47553 +.. _`#47554`: https://github.com/saltstack/salt/pull/47554 +.. _`#47568`: https://github.com/saltstack/salt/pull/47568 +.. _`#47569`: https://github.com/saltstack/salt/pull/47569 +.. _`#47570`: https://github.com/saltstack/salt/pull/47570 +.. _`#47571`: https://github.com/saltstack/salt/pull/47571 +.. _`#47595`: https://github.com/saltstack/salt/pull/47595 +.. _`#47596`: https://github.com/saltstack/salt/pull/47596 +.. _`#47599`: https://github.com/saltstack/salt/pull/47599 +.. _`#47601`: https://github.com/saltstack/salt/pull/47601 +.. _`#47641`: https://github.com/saltstack/salt/pull/47641 +.. _`#47643`: https://github.com/saltstack/salt/pull/47643 +.. _`#47645`: https://github.com/saltstack/salt/pull/47645 +.. _`#47647`: https://github.com/saltstack/salt/pull/47647 +.. _`#47664`: https://github.com/saltstack/salt/pull/47664 +.. _`#47692`: https://github.com/saltstack/salt/pull/47692 +.. _`#47700`: https://github.com/saltstack/salt/pull/47700 +.. _`#47702`: https://github.com/saltstack/salt/pull/47702 +.. _`#47706`: https://github.com/saltstack/salt/pull/47706 +.. _`#47719`: https://github.com/saltstack/salt/pull/47719 +.. _`#47724`: https://github.com/saltstack/salt/pull/47724 +.. _`#47727`: https://github.com/saltstack/salt/pull/47727 +.. _`#47730`: https://github.com/saltstack/salt/pull/47730 +.. _`#47736`: https://github.com/saltstack/salt/pull/47736 +.. _`#47739`: https://github.com/saltstack/salt/pull/47739 +.. _`#47769`: https://github.com/saltstack/salt/pull/47769 +.. _`#47770`: https://github.com/saltstack/salt/pull/47770 +.. _`#47775`: https://github.com/saltstack/salt/pull/47775 +.. _`#47776`: https://github.com/saltstack/salt/pull/47776 +.. _`#47782`: https://github.com/saltstack/salt/pull/47782 +.. _`#47784`: https://github.com/saltstack/salt/issues/47784 +.. _`#47798`: https://github.com/saltstack/salt/pull/47798 +.. _`#47820`: https://github.com/saltstack/salt/pull/47820 +.. _`#47848`: https://github.com/saltstack/salt/pull/47848 +.. _`#47874`: https://github.com/saltstack/salt/pull/47874 +.. _`#47881`: https://github.com/saltstack/salt/pull/47881 +.. _`#47897`: https://github.com/saltstack/salt/pull/47897 +.. _`#47902`: https://github.com/saltstack/salt/pull/47902 +.. _`#47955`: https://github.com/saltstack/salt/issues/47955 +.. _`#47957`: https://github.com/saltstack/salt/pull/47957 +.. _`#47965`: https://github.com/saltstack/salt/pull/47965 +.. _`#47967`: https://github.com/saltstack/salt/pull/47967 +.. _`#47973`: https://github.com/saltstack/salt/pull/47973 +.. _`#47989`: https://github.com/saltstack/salt/pull/47989 +.. _`#47998`: https://github.com/saltstack/salt/pull/47998 +.. _`AmbicaY`: https://github.com/AmbicaY +.. _`Auha`: https://github.com/Auha +.. _`Ch3LL`: https://github.com/Ch3LL +.. _`DmitryKuzmenko`: https://github.com/DmitryKuzmenko +.. _`Epiclemonaid`: https://github.com/Epiclemonaid +.. _`Giandom`: https://github.com/Giandom +.. _`Kimol`: https://github.com/Kimol +.. _`L4rS6`: https://github.com/L4rS6 +.. _`LukeCarrier`: https://github.com/LukeCarrier +.. _`MorphBonehunter`: https://github.com/MorphBonehunter +.. _`OrlandoArcapix`: https://github.com/OrlandoArcapix +.. _`PhilippeAB`: https://github.com/PhilippeAB +.. _`SynPrime`: https://github.com/SynPrime +.. _`TamCore`: https://github.com/TamCore +.. _`The-Loeki`: https://github.com/The-Loeki +.. _`UtahDave`: https://github.com/UtahDave +.. _`Zorlin`: https://github.com/Zorlin +.. _`aesposito91`: https://github.com/aesposito91 +.. _`anlutro`: https://github.com/anlutro +.. _`bbinet`: https://github.com/bbinet +.. _`bdarnell`: https://github.com/bdarnell +.. _`bdrung`: https://github.com/bdrung +.. _`bobrik`: https://github.com/bobrik +.. _`boltronics`: https://github.com/boltronics +.. _`bosatsu`: https://github.com/bosatsu +.. _`cedwards`: https://github.com/cedwards +.. _`cheribral`: https://github.com/cheribral +.. _`clan`: https://github.com/clan +.. _`corywright`: https://github.com/corywright +.. _`cskowronnek`: https://github.com/cskowronnek +.. _`d601`: https://github.com/d601 +.. _`damon-atkins`: https://github.com/damon-atkins +.. _`dincamihai`: https://github.com/dincamihai +.. _`dmurphy18`: https://github.com/dmurphy18 +.. _`dnABic`: https://github.com/dnABic +.. _`douglasjreynolds`: https://github.com/douglasjreynolds +.. _`dwoz`: https://github.com/dwoz +.. _`edgan`: https://github.com/edgan +.. _`ejparker12`: https://github.com/ejparker12 +.. _`epelc`: https://github.com/epelc +.. _`esell`: https://github.com/esell +.. _`ezh`: https://github.com/ezh +.. _`femnad`: https://github.com/femnad +.. _`folti`: https://github.com/folti +.. _`frogunder`: https://github.com/frogunder +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`isbm`: https://github.com/isbm +.. _`jasperla`: https://github.com/jasperla +.. _`joesusecom`: https://github.com/joesusecom +.. _`johnj`: https://github.com/johnj +.. _`jpsv`: https://github.com/jpsv +.. _`julientravelaer`: https://github.com/julientravelaer +.. _`kivoli`: https://github.com/kivoli +.. _`liquidgecka`: https://github.com/liquidgecka +.. _`masau`: https://github.com/masau +.. _`mateiw`: https://github.com/mateiw +.. _`mcalmer`: https://github.com/mcalmer +.. _`mchugh19`: https://github.com/mchugh19 +.. _`mew1033`: https://github.com/mew1033 +.. _`mirceaulinic`: https://github.com/mirceaulinic +.. _`mitar`: https://github.com/mitar +.. _`morganwillcock`: https://github.com/morganwillcock +.. _`mruepp`: https://github.com/mruepp +.. _`noelmcloughlin`: https://github.com/noelmcloughlin +.. _`oeuftete`: https://github.com/oeuftete +.. _`opdude`: https://github.com/opdude +.. _`pcn`: https://github.com/pcn +.. _`prashanthtuttu`: https://github.com/prashanthtuttu +.. _`pruiz`: https://github.com/pruiz +.. _`psagers`: https://github.com/psagers +.. _`psyer`: https://github.com/psyer +.. _`rallytime`: https://github.com/rallytime +.. _`rlschilperoort`: https://github.com/rlschilperoort +.. _`robertodocampo`: https://github.com/robertodocampo +.. _`robinro`: https://github.com/robinro +.. _`robnagler`: https://github.com/robnagler +.. _`s0undt3ch`: https://github.com/s0undt3ch +.. _`samodid`: https://github.com/samodid +.. _`shengis`: https://github.com/shengis +.. _`sjorge`: https://github.com/sjorge +.. _`skjaro`: https://github.com/skjaro +.. _`skylerberg`: https://github.com/skylerberg +.. _`srkunze`: https://github.com/srkunze +.. _`stamak`: https://github.com/stamak +.. _`syphernl`: https://github.com/syphernl +.. _`tankywoo`: https://github.com/tankywoo +.. _`terminalmage`: https://github.com/terminalmage +.. _`tjyang`: https://github.com/tjyang +.. _`tkaehn`: https://github.com/tkaehn +.. _`twangboy`: https://github.com/twangboy +.. _`tyeapple`: https://github.com/tyeapple +.. _`valentin2105`: https://github.com/valentin2105 +.. _`vutny`: https://github.com/vutny +.. _`whytewolf`: https://github.com/whytewolf +.. _`yannj-fr`: https://github.com/yannj-fr +.. _`zmedico`: https://github.com/zmedico diff --git a/doc/topics/releases/2018.3.2.rst b/doc/topics/releases/2018.3.2.rst new file mode 100644 index 0000000000..ca775905cd --- /dev/null +++ b/doc/topics/releases/2018.3.2.rst @@ -0,0 +1,117 @@ +=========================== +Salt 2018.3.2 Release Notes +=========================== + +Version 2018.3.2 is a bugfix release for :ref:`2018.3.0 `. + +The ``2018.3.2`` release contains only a small number of fixes, which are detailed +below. + +This release fixes two critical issues. + +The first is Issue `#48038`_, which is a critical bug that occurs in a multi-syndic +setup where the same job is run multiple times on a minion. + +The second issue is `#48130`_. This bug appears in certain setups where the Master +reports a Minion time-out, even though the job is still running on the Minion. + +Both of these issues have been fixed with this release. + +Statistics +========== + +- Total Merges: **7** +- Total Issue References: **2** +- Total PR References: **10** + +- Contributors: **4** (`cro`_, `garethgreenaway`_, `gtmanfred`_, `rallytime`_) + + +Changelog for v2018.3.1..v2018.3.2 +================================== + +*Generated at: 2018-06-17 19:17:16 UTC* + +* **ISSUE** `#48130`_: (`rmarchei`_) Minion timeouts with 2018.3.1 (refs: `#48158`_) + +* **PR** `#48158`_: (`gtmanfred`_) always listen when gathering job info + @ *2018-06-17 19:04:03 UTC* + + * 521e926458 Merge pull request `#48158`_ from gtmanfred/2018.3.2 + + * cecf564433 always listen when gathering job info + +* **PR** `#48138`_: (`rallytime`_) Update man pages for 2018.3.2 + @ *2018-06-14 21:22:34 UTC* + + * f154545aff Merge pull request `#48138`_ from rallytime/man-pages-2018.3.2 + + * 8c340134f5 Update man pages for 2018.3.2 + +* **PR** `#48137`_: (`gtmanfred`_) [2018.3.2] bootstrap kitchen branch tests with 2017.7.6 + @ *2018-06-14 21:20:28 UTC* + + * b49271b76d Merge pull request `#48137`_ from gtmanfred/2018.3.2 + + * 6128519e8b bootstrap kitchen branch tests with 2017.7.6 + +* **PR** `#48129`_: (`rallytime`_) Add release notes for 2018.3.2 + @ *2018-06-14 15:48:36 UTC* + + * 21aaf1cbc4 Merge pull request `#48129`_ from rallytime/release-notes-2018.3.2 + + * 0b13be0111 Add release notes for 2018.3.2 + +* **PR** `#48100`_: (`rallytime`_) Back-port `#48014`_ to 2018.3.2 + @ *2018-06-14 12:54:52 UTC* + + * **PR** `#48014`_: (`cro`_) Find job pause (refs: `#48100`_) + + * 36b99ae80a Merge pull request `#48100`_ from rallytime/bp-48014 + + * 77feccc5c4 Lint: Add blank line + + * 159b052962 One more case where returner doesn't respond + + * 91b45b4cc4 Catch two cases when a returner is not able to be contacted--these would throw a stacktrace. + +* **PR** `#48099`_: (`rallytime`_) Back-port `#47915`_ to 2018.3.2 + @ *2018-06-14 12:54:23 UTC* + + * **PR** `#47915`_: (`garethgreenaway`_) [2018.3] state runner pause resume kill (refs: `#48099`_) + + * 40c1bfdec9 Merge pull request `#48099`_ from rallytime/bp-47915 + + * 3556850058 fixing typo in alias_function call. + + * 4b0ff496fa Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality. + +* **ISSUE** `#48038`_: (`austinpapp`_) jobs are not dedup'ing minion side (refs: `#48075`_) + +* **PR** `#48097`_: (`rallytime`_) Back-port `#48075`_ to 2018.3.2 + @ *2018-06-14 12:52:44 UTC* + + * **PR** `#48075`_: (`garethgreenaway`_) [2017.7] Ensure that the shared list of jids is passed (refs: `#48097`_) + + * 074a97dcfa Merge pull request `#48097`_ from rallytime/bp-48075 + + * e4c719b55f Ensure that the shared list of jids is passed when creating the Minion. Fixes an issue when minions are pointed at multiple syndics. + +.. _`#47915`: https://github.com/saltstack/salt/pull/47915 +.. _`#48014`: https://github.com/saltstack/salt/pull/48014 +.. _`#48038`: https://github.com/saltstack/salt/issues/48038 +.. _`#48075`: https://github.com/saltstack/salt/pull/48075 +.. _`#48097`: https://github.com/saltstack/salt/pull/48097 +.. _`#48099`: https://github.com/saltstack/salt/pull/48099 +.. _`#48100`: https://github.com/saltstack/salt/pull/48100 +.. _`#48129`: https://github.com/saltstack/salt/pull/48129 +.. _`#48130`: https://github.com/saltstack/salt/issues/48130 +.. _`#48137`: https://github.com/saltstack/salt/pull/48137 +.. _`#48138`: https://github.com/saltstack/salt/pull/48138 +.. _`#48158`: https://github.com/saltstack/salt/pull/48158 +.. _`austinpapp`: https://github.com/austinpapp +.. _`cro`: https://github.com/cro +.. _`garethgreenaway`: https://github.com/garethgreenaway +.. _`gtmanfred`: https://github.com/gtmanfred +.. _`rallytime`: https://github.com/rallytime +.. _`rmarchei`: https://github.com/rmarchei diff --git a/doc/topics/releases/2018.3.3.rst b/doc/topics/releases/2018.3.3.rst new file mode 100644 index 0000000000..3f448947bc --- /dev/null +++ b/doc/topics/releases/2018.3.3.rst @@ -0,0 +1,16 @@ +======================================== +In Progress: Salt 2018.3.3 Release Notes +======================================== + +Version 2018.3.3 is an **unreleased** bugfix release for :ref:`2018.3.0 `. +This release is still in progress and has not been released yet. + +Changes to win_timezone +======================= + +Improves timezone detection by using the pytz module. + +``timezone.get_offset`` and ``timezone.get_zonecode`` now work properly. + +Adds ``timezone.list`` to list supported timezones in either Windows or Unix +format. diff --git a/doc/topics/releases/fluorine.rst b/doc/topics/releases/fluorine.rst index 0738b581e2..261d4012c7 100644 --- a/doc/topics/releases/fluorine.rst +++ b/doc/topics/releases/fluorine.rst @@ -4,9 +4,79 @@ Salt Release Notes - Codename Fluorine ====================================== +Non-Backward-Compatible Change to YAML Renderer +=============================================== + +In earlier releases, this was considered valid usage in Python 2, assuming that +``data`` was a list or dictionary containing keys/values which are ``unicode`` +types: + +.. code-block:: jinja + + /etc/foo.conf: + file.managed: + - source: salt://foo.conf.jinja + - template: jinja + - context: + data: {{ data }} + +One common use case for this is when using one of Salt's :jinja_ref:`custom +Jinja filters ` which return lists or dictionaries, such +as the :jinja_ref:`ipv4` filter. + +In Python 2, Jinja will render the ``unicode`` string types within the +list/dictionary with the "u" prefix (e.g. ``{u'foo': u'bar'}``). While not +valid YAML, earlier releases would successfully load these values. + +As of this release, the above SLS would result in an error message. To allow +for a data structure to be dumped directly into your SLS file, use the `tojson +Jinja filter`_: + +.. code-block:: jinja + + /etc/foo.conf: + file.managed: + - source: salt://foo.conf.jinja + - template: jinja + - context: + data: {{ data|tojson }} + +.. note:: + This filter was added in Jinja 2.9. However, fear not! The 2018.3.3 release + added a ``tojson`` filter which will be used if this filter is not already + present, making it available on platforms like RHEL 7 and Ubuntu 14.04 + which provide older versions of Jinja. + +.. important:: + The :jinja_ref:`json_encode_dict` and :jinja_ref:`json_encode_list` filters + do not actually dump the results to JSON. Since ``tojson`` accomplishes + what those filters were designed to do, they are now deprecated and will be + removed in the Neon release. The ``tojson`` filter should be used in all + cases where :jinja_ref:`json_encode_dict` and :jinja_ref:`json_encode_list` + would have been used. + +.. _`tojson Jinja filter`: http://jinja.pocoo.org/docs/2.10/templates/#tojson + +New Docker Proxy Minion +======================= + +Docker containers can now be treated as actual minions without installing salt +in the container, using the new :py:mod:`docker proxy minion `. + +This proxy minion uses the :py:mod:`docker executor ` to +pass commands to the docker container using :py:func:`docker.call +`. Any state module calls are passed through the +corresponding function from the :py:mod:`docker ` +module. + +.. code-block:: yaml + + proxy: + proxytype: docker + name: keen_proskuriakova Grains Dictionary Passed into Custom Grains -------------------------------------------- +=========================================== Starting in this release, if a custom grains function accepts a variable named ``grains``, the Grains dictionary of the already compiled grains will be passed @@ -14,9 +84,81 @@ in. Because of the non-deterministic order that grains are rendered in, the only grains that can be relied upon to be passed in are ``core.py`` grains, since those are compiled first. +Configurable Module Environment +=============================== + +Salt modules (states, execution modules, returners, etc.) now can have custom +environment variables applied when running shell commands. This can be +configured by setting a ``system-environment`` key either in Grains or Pillar. +The syntax is as follows: + +.. code-block:: yaml + + system-environment: + + : + # Namespace for all functions in the module + _: + : + + # Namespace only for particular function in the module + : + : + +- ```` would be the type of module (i.e. ``states``, ``modules``, etc.). + +- ```` would be the module's name. + + .. note:: + The module name can be either the virtual name (e.g. ``pkg``), or the + physical name (e.g. ``yumpkg``). + +- ```` would be the function name within that module. To apply + environment variables to *all* functions in a given module, use an underscore + (i.e. ``_``) as the function name. For example, to set the same environment + variable for all package management functions, the following could be used: + + .. code-block:: yaml + + system-environment: + modules: + pkg: + _: + SOMETHING: for_all + + To set an environment variable in ``pkg.install`` only: + + .. code-block:: yaml + + system-environment: + modules: + pkg: + install: + LC_ALL: en_GB.UTF-8 + + To set the same variable but only for SUSE minions (which use zypper for + package management): + + .. code-block:: yaml + + system-environment: + modules: + zypper: + install: + LC_ALL: en_GB.UTF-8 + +.. note:: + This is not supported throughout Salt; the module must explicitly support + this feature (though this may change in the future). As of this release, + the only modules which support this are the following ``pkg`` virtual + modules: + + - :py:mod:`aptpkg ` + - :py:mod:`yumpkg ` + - :py:mod:`zypper ` "Virtual Package" Support Dropped for APT ------------------------------------------ +========================================= In APT, some packages have an associated list of packages which they provide. This allows one to do things like run ``apt-get install foo`` when the real @@ -242,7 +384,7 @@ help determine what package name is correct: Minion Startup Events ---------------------- +===================== When a minion starts up it sends a notification on the event bus with a tag that looks like this: ``salt/minion//start``. For historical reasons @@ -261,7 +403,7 @@ syndic respects :conf_minion:`enable_legacy_startup_events` as well. Failhard changes ----------------- +================ It is now possible to override a global failhard setting with a state-level failhard setting. This is most useful in case where global failhard is set to @@ -276,7 +418,7 @@ any ``onfail*``-requisites were used). Pass Through Options to :py:func:`file.serialize ` State ------------------------------------------------------------------------------------- +==================================================================================== This allows for more granular control over the way in which the dataset is serialized. See the documentation for the new ``serializer_opts`` option in the @@ -285,7 +427,7 @@ information. :py:func:`file.patch ` State Rewritten -------------------------------------------------------------- +============================================================= The :py:func:`file.patch ` state has been rewritten with several new features: @@ -297,12 +439,26 @@ several new features: In addition, it is no longer necessary to specify what the hash of the patched file should be. +New no_proxy Minion Configuration +================================= + +Pass a list of hosts using the ``no_proxy`` minion config option to bypass an HTTP +proxy. + +.. note:: + This key does nothing unless proxy_host is configured and it does not support + any kind of wildcards. + +.. code-block:: yaml + + no_proxy: [ '127.0.0.1', 'foo.tld' ] + Deprecations ------------- +============ API Deprecations -================ +---------------- Support for :ref:`LocalClient `'s ``expr_form`` argument has been removed. Please use ``tgt_type`` instead. This change was made due to @@ -322,121 +478,160 @@ their code to use ``tgt_type``. {'jerry': 'root'} Module Deprecations -=================== +------------------- -The ``napalm_network`` module had the following changes: +- The :py:mod:`napalm_network ` module has been + changed as follows: -- Support for the ``template_path`` has been removed in the ``load_template`` - function. This is because support for NAPALM native templates has been - dropped. + - Support for the ``template_path`` has been removed from + :py:func:`net.load_template ` + function. This is because support for NAPALM native templates has been + dropped. -The ``trafficserver`` module had the following changes: +- The :py:mod:`trafficserver ` module has been + changed as follows: -- Support for the ``match_var`` function was removed. Please use the - ``match_metric`` function instead. -- Support for the ``read_var`` function was removed. Please use the - ``read_config`` function instead. -- Support for the ``set_var`` function was removed. Please use the - ``set_config`` function instead. + - The ``trafficserver.match_var`` function was removed. Please use + :py:func:`trafficserver.match_metric + ` instead. -The ``win_update`` module has been removed. It has been replaced by ``win_wua`` -module. + - The ``trafficserver.read_var`` function was removed. Please use + :py:func:`trafficserver.read_config + ` instead. -The ``win_wua`` module had the following changes: + - The ``trafficserver.set_var`` function was removed. Please use + :py:func:`trafficserver.set_config + ` instead. -- Support for the ``download_update`` function has been removed. Please use the - ``download`` function instead. -- Support for the ``download_updates`` function has been removed. Please use the - ``download`` function instead. -- Support for the ``install_update`` function has been removed. Please use the - ``install`` function instead. -- Support for the ``install_updates`` function has been removed. Please use the - ``install`` function instead. -- Support for the ``list_update`` function has been removed. Please use the - ``get`` function instead. -- Support for the ``list_updates`` function has been removed. Please use the - ``list`` function instead. +- The ``win_update`` module has been removed. It has been replaced by + :py:mod:`win_wua `. + +- The :py:mod:`win_wua ` module has been changed as + follows: + + - The ``win_wua.download_update`` and ``win_wua.download_updates`` + functions have been removed. Please use :py:func:`win_wua.download + ` instead. + + - The ``win_wua.install_update`` and ``win_wua.install_updates`` + functions have been removed. Please use :py:func:`win_wua.install + ` instead. + + - The ``win_wua.list_update`` function has been removed. Please use + functions have been removed. Please use :py:func:`win_wua.get + ` instead. + + - The ``win_wua.list_updates`` function has been removed. Please use + functions have been removed. Please use :py:func:`win_wua.list + ` instead. Pillar Deprecations -=================== +------------------- -The ``vault`` pillar had the following changes: +- The :py:mod:`vault ` external pillar has been changed as + follows: -- Support for the ``profile`` argument was removed. Any options passed up until - and following the first ``path=`` are discarded. + - Support for the ``profile`` argument was removed. Any options passed up + until and following the first ``path=`` are discarded. Roster Deprecations -=================== +------------------- -The ``cache`` roster had the following changes: +- The :py:mod:`cache ` roster has been changed as follows: -- Support for ``roster_order`` as a list or tuple has been removed. As of the - ``Fluorine`` release, ``roster_order`` must be a dictionary. -- The ``roster_order`` option now includes IPv6 in addition to IPv4 for the - ``private``, ``public``, ``global`` or ``local`` settings. The syntax for these - settings has changed to ``ipv4-*`` or ``ipv6-*``, respectively. + - Support for ``roster_order`` as a list or tuple has been removed. As of + the ``Fluorine`` release, ``roster_order`` must be a dictionary. + + - The ``roster_order`` option now includes IPv6 in addition to IPv4 for the + ``private``, ``public``, ``global`` or ``local`` settings. The syntax for + these settings has changed to ``ipv4-*`` or ``ipv6-*``, respectively. State Deprecations -================== +------------------ -The ``docker`` state has been removed. The following functions should be used -instead. +- The ``docker`` state module has been removed -- The ``docker.running`` function was removed. Please update applicable SLS files - to use the ``docker_container.running`` function instead. -- The ``docker.stopped`` function was removed. Please update applicable SLS files - to use the ``docker_container.stopped`` function instead. -- The ``docker.absent`` function was removed. Please update applicable SLS files - to use the ``docker_container.absent`` function instead. -- The ``docker.absent`` function was removed. Please update applicable SLS files - to use the ``docker_container.absent`` function instead. -- The ``docker.network_present`` function was removed. Please update applicable - SLS files to use the ``docker_network.present`` function instead. -- The ``docker.network_absent`` function was removed. Please update applicable - SLS files to use the ``docker_network.absent`` function instead. -- The ``docker.image_present`` function was removed. Please update applicable SLS - files to use the ``docker_image.present`` function instead. -- The ``docker.image_absent`` function was removed. Please update applicable SLS - files to use the ``docker_image.absent`` function instead. -- The ``docker.volume_present`` function was removed. Please update applicable SLS - files to use the ``docker_volume.present`` function instead. -- The ``docker.volume_absent`` function was removed. Please update applicable SLS - files to use the ``docker_volume.absent`` function instead. + - In :ref:`2017.7.0 `, the states from this module were + split into four separate state modules: -The ``docker_network`` state had the following changes: + - :py:mod:`docker_container ` -- Support for the ``driver`` option has been removed from the ``absent`` function. - This option had no functionality in ``docker_network.absent``. + - :py:mod:`docker_image ` -The ``git`` state had the following changes: + - :py:mod:`docker_volume ` -- Support for the ``ref`` option in the ``detached`` state has been removed. - Please use the ``rev`` option instead. + - :py:mod:`docker_network ` -The ``k8s`` state has been removed. The following functions should be used -instead: + - The ``docker`` module remained, for backward-compatibility, but it has now + been removed. Please update SLS files to use the new state names: -- The ``k8s.label_absent`` function was removed. Please update applicable SLS - files to use the ``kubernetes.node_label_absent`` function instead. -- The ``k8s.label_present`` function was removed. Please updated applicable SLS - files to use the ``kubernetes.node_label_present`` function instead. -- The ``k8s.label_folder_absent`` function was removed. Please update applicable - SLS files to use the ``kubernetes.node_label_folder_absent`` function instead. + - ``docker.running`` => :py:func:`docker_container.running + ` -The ``netconfig`` state had the following changes: + - ``docker.stopped`` => :py:func:`docker_container.stopped + ` -- Support for the ``template_path`` option in the ``managed`` state has been - removed. This is because support for NAPALM native templates has been dropped. + - ``docker.absent`` => :py:func:`docker_container.absent + ` -The ``trafficserver`` state had the following changes: + - ``docker.network_present`` => :py:func:`docker_network.present + ` -- Support for the ``set_var`` function was removed. Please use the ``config`` - function instead. + - ``docker.network_absent`` => :py:func:`docker_network.absent + ` -The ``win_update`` state has been removed. Please use the ``win_wua`` state instead. + - ``docker.image_present`` => :py:func:`docker_image.present + ` + + - ``docker.image_absent`` => :py:func:`docker_image.absent + ` + + - ``docker.volume_present`` => :py:func:`docker_volume.present + ` + + - ``docker.volume_absent`` => :py:func:`docker_volume.absent + ` + +- The :py:mod:`docker_network ` state module has + been changed as follows: + + - The ``driver`` option has been removed from + :py:func:`docker_network.absent `. It + had no functionality, as the state simply deletes the specified network + name if it exists. + +- The deprecated ``ref`` option has been removed from the + :py:func:`git.detached ` state. Please use ``rev`` + instead. + +- The ``k8s`` state module has been removed in favor of the :py:mod:`kubernetes + ` state mdoule. Please update SLS files as follows: + + - In place of ``k8s.label_present``, use + :py:func:`kubernetes.node_label_present + ` + + - In place of ``k8s.label_absent``, use + :py:func:`kubernetes.node_label_absent + ` + + - In place of ``k8s.label_folder_absent``, use + :py:func:`kubernetes.node_label_folder_absent + ` + +- Support for the ``template_path`` option in the :py:func:`netconfig.managed + ` + state has been removed. Please use :py:func:`trafficserver.config + ` instead. + +- The ``win_update`` state module has been removed. It has been replaced by + :py:mod:`win_wua `. Utils Deprecations -================== +------------------ The ``vault`` utils module had the following changes: @@ -444,7 +639,17 @@ The ``vault`` utils module had the following changes: Please see the :mod:`vault execution module ` documentation for details on the new configuration schema. -===================== +Dependency Deprecations +----------------------- + +Salt-Cloud has been updated to use the ``pypsexec`` Python library instead of the +``winexe`` executable. Both ``winexe`` and ``pypsexec`` run remote commands +against Windows OSes. Since ``winexe`` is not packaged for every system, it has +been deprecated in favor of ``pypsexec``. + +Salt-Cloud has deprecated the use ``impacket`` in favor of ``smbprotocol``. +This changes was made because ``impacket`` is not compatible with Python 3. + SaltSSH major updates ===================== @@ -476,62 +681,97 @@ configuration in /etc/salt/master as follows: markupsafe: /opt/markupsafe backports_abc: /opt/backports_abc.py -It is also possible to use several alternative versions of Salt. You can for instance generate -a minimal tarball using runners and include that. But this is only possible, when such specific -Salt version is also available on the Master machine, although does not need to be directly -installed together with the older Python interpreter. +It is also possible to use several alternative versions of Salt. You can for +instance generate a minimal tarball using runners and include that. But this is +only possible, when such specific Salt version is also available on the Master +machine, although does not need to be directly installed together with the +older Python interpreter. + +SaltSSH now support private key's passphrase. You can configure it by: + +* `--priv-passwd` for salt-ssh cli +* `salt_priv_passwd` for salt master configure file +* `priv_passwd` for salt roster file -======================== -Salt-Cloud major updates -======================== - - -Dependency Deprecations -======================= - -Salt-Cloud has been updated to use the ``pypsexec`` Python library instead of the -``winexe`` executable. Both ``winexe`` and ``pypsexec`` run remote commands -against Windows OSes. Since ``winexe`` is not packaged for every system, it has -been deprecated in favor of ``pypsexec``. - -Salt-Cloud has deprecated the use ``impacket`` in favor of ``smbprotocol``. -This changes was made because ``impacket`` is not compatible with Python 3. - - -==================== State Module Changes ==================== -states.saltmod --------------- -The 'test' option now defaults to None. A value of True or False set here is -passed to the state being run and can be used to override a ``test:True`` option -set in the minion's config file. In previous releases the minion's config option -would take precedence and it would be impossible to run an orchestration on a -minion with test mode set to True in the config file. +:py:mod:`salt ` State Module (used in orchestration) +------------------------------------------------------------------------- + +The ``test`` option now defaults to None. A value of ``True`` or ``False`` set +here is passed to the state being run and can be used to override a ``test: +True`` option set in the minion's config file. In previous releases the +minion's config option would take precedence and it would be impossible to run +an orchestration on a minion with test mode set to True in the config file. If a minion is not in permanent test mode due to the config file and the 'test' argument here is left as None then a value of ``test=True`` on the command-line is passed correctly to the minion to run an orchestration in test mode. At present it is not possible to pass ``test=False`` on the command-line to override a -minion in permanent test mode and so the ``test:False`` option must still be set +minion in permanent test mode and so the ``test: False`` option must still be set in the orchestration file. -states.event --------------- -The :ref:`event.send ` state does not know the results of -the sent event, so returns changed every state run. It can now be set to -return changed or unchanged. +:py:func:`event.send ` State +---------------------------------------------------- + +The :py:func:`event.send ` state does not know the +results of the sent event, so returns changed every state run. It can now be +set to return changed or unchanged. -============================ LDAP External Authentication ============================ -freeipa 'groupattribute' support --------------------------------- -Previously, if Salt was using external authentication against a freeipa LDAP system -it could only search for users via the 'accountattributename' field. This release -add an additional search using the 'groupattribute' field as well. The original -'accountattributename' search is done first then the 'groupattribute' allowing for -backward compatibility with previous Salt releases. +freeipa ``groupattribute`` support +---------------------------------- + +Previously, if Salt was using external authentication against a freeipa LDAP +system it could only search for users via the ``accountattributename`` field. +This release add an additional search using the ``groupattribute`` field as +well. The original ``accountattributename`` search is done first then the +``groupattribute`` allowing for backward compatibility with previous Salt +releases. + +Jinja Include Relative Paths +============================ + +When a jinja include template name begins with ``./`` or +``../`` then the import will be relative to the importing file. + +Prior practices required the following construct: + +.. code-block:: jinja + + {% from tpldir ~ '/foo' import bar %} + +A more "natural" construct is now supported: + +.. code-block:: jinja + + {% from './foo' import bar %} + +Comparatively when importing from a parent directory - prior practice: + +.. code-block:: jinja + + {% from tpldir ~ '/../foo' import bar %} + +New style for including from a parent directory: + +.. code-block:: jinja + + {% from '../foo' import bar %} + +salt-api +======== + +salt-api Windows support +------------------------ + +Previously, salt-api was was not supported on the Microsoft Windows platforms. Now it is! +salt-api provides a RESTful interface to a running Salt system. It allows +for viewing minions, runners, and jobs as well as running execution modules +and runners of a running Salt system through a REST API that returns JSON. +See Salt-API_ documentation. +.. _Salt-API: https://docs.saltstack.com/en/latest/topics/netapi/index.html diff --git a/doc/topics/releases/includes/2015.8.0.pull_list.rst b/doc/topics/releases/includes/2015.8.0.pull_list.rst index a2dd0900b7..91f30e1f21 100644 --- a/doc/topics/releases/includes/2015.8.0.pull_list.rst +++ b/doc/topics/releases/includes/2015.8.0.pull_list.rst @@ -785,6 +785,7 @@ Pull Requests: .. _`#25216`: https://github.com/saltstack/salt/pull/25216 .. _`#25219`: https://github.com/saltstack/salt/pull/25219 .. _`#25222`: https://github.com/saltstack/salt/pull/25222 +.. _`#25223`: https://github.com/saltstack/salt/issues/25223 .. _`#25225`: https://github.com/saltstack/salt/pull/25225 .. _`#25226`: https://github.com/saltstack/salt/pull/25226 .. _`#25234`: https://github.com/saltstack/salt/pull/25234 @@ -873,12 +874,14 @@ Pull Requests: .. _`#25433`: https://github.com/saltstack/salt/pull/25433 .. _`#25438`: https://github.com/saltstack/salt/pull/25438 .. _`#25439`: https://github.com/saltstack/salt/pull/25439 +.. _`#25448`: https://github.com/saltstack/salt/issues/25448 .. _`#25449`: https://github.com/saltstack/salt/pull/25449 .. _`#25451`: https://github.com/saltstack/salt/pull/25451 .. _`#25457`: https://github.com/saltstack/salt/pull/25457 .. _`#25459`: https://github.com/saltstack/salt/pull/25459 .. _`#25461`: https://github.com/saltstack/salt/pull/25461 .. _`#25462`: https://github.com/saltstack/salt/pull/25462 +.. _`#25463`: https://github.com/saltstack/salt/issues/25463 .. _`#25464`: https://github.com/saltstack/salt/pull/25464 .. _`#25465`: https://github.com/saltstack/salt/pull/25465 .. _`#25467`: https://github.com/saltstack/salt/pull/25467 @@ -889,6 +892,7 @@ Pull Requests: .. _`#25487`: https://github.com/saltstack/salt/pull/25487 .. _`#25489`: https://github.com/saltstack/salt/pull/25489 .. _`#25491`: https://github.com/saltstack/salt/pull/25491 +.. _`#25492`: https://github.com/saltstack/salt/issues/25492 .. _`#25498`: https://github.com/saltstack/salt/pull/25498 .. _`#25501`: https://github.com/saltstack/salt/pull/25501 .. _`#25505`: https://github.com/saltstack/salt/pull/25505 @@ -1389,6 +1393,7 @@ Pull Requests: .. _`#26646`: https://github.com/saltstack/salt/pull/26646 .. _`#26648`: https://github.com/saltstack/salt/pull/26648 .. _`#26649`: https://github.com/saltstack/salt/pull/26649 +.. _`#26650`: https://github.com/saltstack/salt/pull/26650 .. _`#26651`: https://github.com/saltstack/salt/pull/26651 .. _`#26653`: https://github.com/saltstack/salt/pull/26653 .. _`#26654`: https://github.com/saltstack/salt/pull/26654 diff --git a/doc/topics/slots/index.rst b/doc/topics/slots/index.rst index 42a77cf1bd..30f796ea11 100644 --- a/doc/topics/slots/index.rst +++ b/doc/topics/slots/index.rst @@ -29,7 +29,7 @@ argument value in states. Slot syntax looks close to the simple python function call. -.. code-block:: +.. code-block:: text __slot__:salt:.(, ..., , ...) diff --git a/doc/topics/spm/spm_formula.rst b/doc/topics/spm/spm_formula.rst index 0901885455..c9a9206fc4 100644 --- a/doc/topics/spm/spm_formula.rst +++ b/doc/topics/spm/spm_formula.rst @@ -164,7 +164,7 @@ states are evaluated before ``tgt`` states. Each of these sections needs to be evaluated as text, rather than as YAML. Consider the following block: -.. code-block:: text +.. code-block:: yaml pre_local_state: > echo test > /tmp/spmtest: @@ -187,7 +187,7 @@ a minion. the ``>`` marker to denote that the state is evaluated as text, not a data structure. -.. code-block:: text +.. code-block:: yaml pre_local_state: > echo test > /tmp/spmtest: @@ -203,7 +203,7 @@ the ``spm`` command is running on is a master. Because ``tgt`` states require that a target be specified, their code blocks are a little different. Consider the following state: -.. code-block:: text +.. code-block:: yaml pre_tgt_state: tgt: '*' @@ -229,7 +229,7 @@ This means that you can use Jinja or any other supported renderer inside of Salt. All formula variables are available to the renderer, so you can reference ``FORMULA`` data inside your state if you need to: -.. code-block:: text +.. code-block:: yaml pre_tgt_state: tgt: '*' diff --git a/doc/topics/ssh/roster.rst b/doc/topics/ssh/roster.rst index e969479e4d..f9d1f0dfd2 100644 --- a/doc/topics/ssh/roster.rst +++ b/doc/topics/ssh/roster.rst @@ -53,6 +53,7 @@ The information which can be stored in a roster ``target`` is the following: priv: # File path to ssh private key, defaults to salt-ssh.rsa # The priv can also be set to agent-forwarding to not specify # a key, but use ssh agent forwarding + priv_passwd: # Passphrase for ssh private key timeout: # Number of seconds to wait for response when establishing # an SSH connection minion_opts: # Dictionary of minion opts diff --git a/doc/topics/targeting/grains.rst b/doc/topics/targeting/grains.rst index 2070a25890..6f081f9c48 100644 --- a/doc/topics/targeting/grains.rst +++ b/doc/topics/targeting/grains.rst @@ -20,11 +20,10 @@ matching minion: salt -G 'cpuarch:x86_64' grains.item num_cpus Additionally, globs can be used in grain matches, and grains that are nested in -a :ref:`dictionary ` can be matched by adding a colon for -each level that is traversed. For example, the following will match hosts that -have a grain called ``ec2_tags``, which itself is a -:ref:`dict ` with a key named ``environment``, which -has a value that contains the word ``production``: +a dictionary can be matched by adding a colon for each level that is traversed. +For example, the following will match hosts that have a grain called +``ec2_tags``, which itself is a dictionary with a key named ``environment``, +which has a value that contains the word ``production``: .. code-block:: bash diff --git a/doc/topics/troubleshooting/yaml_idiosyncrasies.rst b/doc/topics/troubleshooting/yaml_idiosyncrasies.rst index f5a9fed916..9e665462ff 100644 --- a/doc/topics/troubleshooting/yaml_idiosyncrasies.rst +++ b/doc/topics/troubleshooting/yaml_idiosyncrasies.rst @@ -39,10 +39,10 @@ fact that the data is uniform and not deeply nested. Nested Dictionaries ------------------- -When :ref:`dicts ` are nested within other data -structures (particularly lists), the indentation logic sometimes changes. -Examples of where this might happen include ``context`` and ``default`` options -from the :mod:`file.managed ` state: +When dictionaries are nested within other data structures (particularly lists), +the indentation logic sometimes changes. Examples of where this might happen +include ``context`` and ``default`` options from the :mod:`file.managed +` state: .. code-block:: yaml @@ -77,11 +77,11 @@ deeply-nested dict can be declared with curly braces: - group: root - mode: 644 - template: jinja - - context: { - custom_var: "override" } - - defaults: { - custom_var: "default value", - other_var: 123 } + - context: + custom_var: "override" + - defaults: + custom_var: "default value" + other_var: 123 Here is a more concrete example of how YAML actually handles these indentations, using the Python interpreter on the command line: @@ -160,7 +160,7 @@ them. When using a jinja ``load_yaml`` map, items must be quoted twice. For example: - .. code-block:: yaml + .. code-block:: jinja {% load_yaml as wsus_schedule %} diff --git a/doc/topics/tutorials/cloud_controller.rst b/doc/topics/tutorials/cloud_controller.rst index 39a8249092..dbeee13d35 100644 --- a/doc/topics/tutorials/cloud_controller.rst +++ b/doc/topics/tutorials/cloud_controller.rst @@ -246,7 +246,7 @@ the new virtual machine on. Using ``salt://`` assumes that the CentOS virtual machine image is located in the root of the :ref:`file-server` on the master. When images are cloned (i.e. copied locatlly after retrieval from the file server) the destination directory on the hypervisor minion is determined by the ``virt:images`` -config option; by default this is ``/srv/salt/salt-images/``. +config option; by default this is ``/srv/salt-images/``. When a VM is initialized using ``virt.init`` the image is copied to the hypervisor using ``cp.cache_file`` and will be mounted and seeded with a minion. Seeding includes diff --git a/doc/topics/tutorials/cron.rst b/doc/topics/tutorials/cron.rst index 25e490dd25..59d83cf400 100644 --- a/doc/topics/tutorials/cron.rst +++ b/doc/topics/tutorials/cron.rst @@ -33,7 +33,7 @@ at midnight. may not include the path for any scripts or commands used by Salt, and it may be necessary to set the PATH accordingly in the crontab: - .. code-block:: bash + .. code-block:: text PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin diff --git a/doc/topics/tutorials/gitfs.rst b/doc/topics/tutorials/gitfs.rst index c56d60371a..20cac6f567 100644 --- a/doc/topics/tutorials/gitfs.rst +++ b/doc/topics/tutorials/gitfs.rst @@ -70,6 +70,7 @@ packages. Additionally, keep in mind that :ref:`SSH authentication in pygit2 ` requires libssh2_ (*not* libssh) development libraries to be present before libgit2_ is built. On some Debian-based distros ``pkg-config`` is also required to link libgit2_ with libssh2. + .. note:: If you are receiving the error "Unsupported URL Protocol" in the Salt Master log when making a connection using SSH, review the libssh2 details listed @@ -596,9 +597,8 @@ overrides all levels below it): .. code-block:: yaml gitfs_saltenv: - - saltenv: - - dev: - - mountpoint: salt://bar + - dev: + - mountpoint: salt://bar 3. Per-remote configuration parameter @@ -1001,7 +1001,7 @@ If not, then the easiest way to add the key is to su to the user (usually ``root``) under which the salt-master runs and attempt to login to the server via SSH: -.. code-block:: bash +.. code-block:: text $ su - Password: diff --git a/doc/topics/tutorials/http.rst b/doc/topics/tutorials/http.rst index e6b20c62a2..9682f873a9 100644 --- a/doc/topics/tutorials/http.rst +++ b/doc/topics/tutorials/http.rst @@ -252,7 +252,7 @@ Proxy If the ``tornado`` backend is used (``tornado`` is the default), proxy information configured in ``proxy_host``, ``proxy_port``, ``proxy_username``, -and ``proxy_password`` from the ``__opts__`` dictionary will be used. Normally +``proxy_password`` and ``no_proxy`` from the ``__opts__`` dictionary will be used. Normally these are set in the minion configuration file. .. code-block:: yaml @@ -261,6 +261,7 @@ these are set in the minion configuration file. proxy_port: 31337 proxy_username: charon proxy_password: obolus + no_proxy: ['127.0.0.1', 'localhost'] .. code-block:: python diff --git a/doc/topics/tutorials/index.rst b/doc/topics/tutorials/index.rst index 7ff571f945..cff2e74488 100644 --- a/doc/topics/tutorials/index.rst +++ b/doc/topics/tutorials/index.rst @@ -2,37 +2,8 @@ Tutorials Index =============== -* :ref:`Salt as a Cloud Controller ` -* :ref:`Using Cron with Salt ` -* :ref:`Automatic Updates / Frozen Deployments ` -* :ref:`ESXi Proxy Minion ` -* :ref:`Opening the Firewall up for Salt ` -* :ref:`Git Fileserver Backend Walkthrough ` -* :ref:`Halite ` -* :ref:`HTTP Modules ` -* :ref:`Using Salt at Scale ` -* :ref:`LXC Management with Salt ` -* :ref:`MinionFS Backend Walkthrough ` -* :ref:`Remote Execution Tutorial ` -* :ref:`Multi-Master-PKI Tutorial With Failover ` -* :ref:`Multi Master Tutorial ` -* :ref:`Pillar Walkthrough ` -* :ref:`Packaging External Modules for Salt` -* :ref:`Salt Masterless Quickstart ` -* :ref:`running salt as normal user tutorial ` -* :ref:`Salt Bootstrap ` -* :ref:`Standalone Minion ` -* :ref:`How Do I Use Salt States? ` -* :ref:`States tutorial, part 1 - Basic Usage ` -* :ref:`States tutorial, part 2 - More Complex States, Requisites ` -* :ref:`States tutorial, part 3 - Templating, Includes, Extends ` -* :ref:`States tutorial, part 4 ` -* :ref:`How to Convert Jinja Logic to an Execution Module ` -* :ref:`Syslog-ng usage ` -* :ref:`The macOS (Maverick) Developer Step By Step Guide To Salt Installation ` -* :ref:`SaltStack Walk-through ` -* :ref:`Writing Salt Tests ` -* :ref:`Multi-cloud orchestration with Apache Libcloud ` -* :ref:`Running Salt States and Commands in Docker Containers ` -* :ref:`Preseed Minion with Accepted Key ` -* :ref:`Autoaccept Minions from Grains ` +.. toctree:: + :maxdepth: 1 + :glob: + + * diff --git a/doc/topics/tutorials/multimaster_pki.rst b/doc/topics/tutorials/multimaster_pki.rst index 45ba01a01a..0dc9dbb5b9 100644 --- a/doc/topics/tutorials/multimaster_pki.rst +++ b/doc/topics/tutorials/multimaster_pki.rst @@ -104,6 +104,7 @@ master_sign.pub) must be copied from the master to the minions pki-directory. /etc/salt/pki/minion/master_sign.pub +.. important:: DO NOT COPY THE master_sign.pem FILE. IT MUST STAY ON THE MASTER AND ONLY THERE! @@ -123,7 +124,7 @@ debug mode. Upon connecting to the master, the following lines should appear on the output: -.. code-block:: bash +.. code-block:: text [DEBUG ] Attempting to authenticate with the Salt Master at 172.16.0.10 [DEBUG ] Loaded minion key: /etc/salt/pki/minion/minion.pem @@ -136,7 +137,7 @@ Upon connecting to the master, the following lines should appear on the output: If the signature verification fails, something went wrong and it will look like this -.. code-block:: bash +.. code-block:: text [DEBUG ] Attempting to authenticate with the Salt Master at 172.16.0.10 [DEBUG ] Loaded minion key: /etc/salt/pki/minion/minion.pem diff --git a/doc/topics/tutorials/packaging_modules.rst b/doc/topics/tutorials/packaging_modules.rst index 434bdb94d2..ee52293511 100644 --- a/doc/topics/tutorials/packaging_modules.rst +++ b/doc/topics/tutorials/packaging_modules.rst @@ -10,11 +10,11 @@ External Modules Setuptools Entry-Points Support The salt loader was enhanced to look for external modules by looking at the `salt.loader` entry-point: - https://pythonhosted.org/setuptools/setuptools.html#dynamic-discovery-of-services-and-plugins - + https://setuptools.readthedocs.io/en/latest/pkg_resources.html#entry-points + `pkg_resources` should be installed, which is normally included in setuptools. - https://pythonhosted.org/setuptools/pkg_resources.html + https://setuptools.readthedocs.io/en/latest/pkg_resources.html The package which has custom engines, minion modules, outputters, etc, should require setuptools and should define the following entry points in its setup diff --git a/doc/topics/tutorials/pillar.rst b/doc/topics/tutorials/pillar.rst index 3ec2c1ddea..a75b32c237 100644 --- a/doc/topics/tutorials/pillar.rst +++ b/doc/topics/tutorials/pillar.rst @@ -330,7 +330,13 @@ Nested pillar values can also be set via the command line: .. code-block:: bash - salt '*' state.sls my_sls_file pillar='{"foo": {"bar": "baz"}}' + salt '*' state.sls my_sls_file pillar='{"foo": {"bar": "baz"}}' + +Lists can be passed via command line pillar data as follows: + +.. code-block:: bash + + salt '*' state.sls my_sls_file pillar='{"some_list": ["foo", "bar", "baz"]}' .. note:: diff --git a/doc/topics/tutorials/salt_bootstrap.rst b/doc/topics/tutorials/salt_bootstrap.rst index 605dc66634..871e0f1efa 100644 --- a/doc/topics/tutorials/salt_bootstrap.rst +++ b/doc/topics/tutorials/salt_bootstrap.rst @@ -268,7 +268,7 @@ Command Line Options Here's a summary of the command line options: -.. code-block:: bash +.. code-block:: text $ sh bootstrap-salt.sh -h diff --git a/doc/topics/tutorials/starting_states.rst b/doc/topics/tutorials/starting_states.rst index 53e911ebae..574b848b11 100644 --- a/doc/topics/tutorials/starting_states.rst +++ b/doc/topics/tutorials/starting_states.rst @@ -29,12 +29,11 @@ file is just a data structure under the hood. While understanding that the SLS is just a data structure isn't critical for understanding and making use of Salt States, it should help bolster knowledge of where the real power is. -SLS files are therefore, in reality, just :ref:`dictionaries -`, :ref:`lists `, :ref:`strings -`, and :ref:`numbers `. -By using this approach Salt can be much more flexible. As one writes more state -files, it becomes clearer exactly what is being written. The result is a system -that is easy to understand, yet grows with the needs of the admin or developer. +SLS files are therefore, in reality, just dictionaries, lists, strings, and +numbers. By using this approach Salt can be much more flexible. As one writes +more state files, it becomes clearer exactly what is being written. The result +is a system that is easy to understand, yet grows with the needs of the admin +or developer. The Top File diff --git a/doc/topics/tutorials/states_pt2.rst b/doc/topics/tutorials/states_pt2.rst index 1c131be865..06148b858b 100644 --- a/doc/topics/tutorials/states_pt2.rst +++ b/doc/topics/tutorials/states_pt2.rst @@ -125,7 +125,7 @@ Verify that Apache is now serving your custom HTML. you could modify our Apache example from earlier as follows: .. code-block:: yaml - :emphasize-lines: 1,2,3,4,11,12 + :emphasize-lines: 1,2,3,10,11 /etc/httpd/extra/httpd-vhosts.conf: file.managed: diff --git a/doc/topics/tutorials/walkthrough_macosx.rst b/doc/topics/tutorials/walkthrough_macosx.rst index 93183d9dd4..00d6c31feb 100644 --- a/doc/topics/tutorials/walkthrough_macosx.rst +++ b/doc/topics/tutorials/walkthrough_macosx.rst @@ -13,14 +13,14 @@ consisting of one master, and one minion running on a local VM hosted on macOS. `here `_. The 5 Cent Salt Intro ---------------------- +===================== Since you're here you've probably already heard about Salt, so you already know Salt lets you configure and run commands on hordes of servers easily. Here's a brief overview of a Salt cluster: - Salt works by having a "master" server sending commands to one or multiple - "minion" servers [#]_. The master server is the "command center". It is + "minion" servers. The master server is the "command center". It is going to be the place where you store your configuration files, aka: "which server is the db, which is the web server, and what libraries and software they should have installed". The minions receive orders from the master. @@ -52,7 +52,7 @@ Here's a brief overview of a Salt cluster: it also contains some Salt configuration. More on that in step 3. Also note that all configuration files are YAML files. So indentation matters. -.. [#] +.. note:: Salt also works with "masterless" configuration where a minion is autonomous (in which case salt can be seen as a local configuration tool), @@ -64,14 +64,14 @@ Before Digging In, The Architecture Of The Salt Cluster ------------------------------------------------------- Salt Master -+++++++++++ +*********** The "Salt master" server is going to be the Mac OS machine, directly. Commands will be run from a terminal app, so Salt will need to be installed on the Mac. This is going to be more convenient for toying around with configuration files. Salt Minion -+++++++++++ +*********** We'll only have one "Salt minion" server. It is going to be running on a Virtual Machine running on the Mac, using VirtualBox. It will run an Ubuntu @@ -80,7 +80,8 @@ distribution. Step 1 - Configuring The Salt Master On Your Mac ================================================ -`official documentation + +`Official Documentation `_ Because Salt has a lot of dependencies that are not built in macOS, we will use @@ -113,7 +114,9 @@ it all over again. It also lets you *uninstall* things easily. Install Homebrew ---------------- + Install Homebrew here http://brew.sh/ + Or just type .. code-block:: bash @@ -496,7 +499,7 @@ http://192.168.33.10/, you should see the standard Nginx welcome page. Congratulations! Where To Go From Here ---------------------- +===================== A full description of configuration management within Salt (sls files among other things) is available here: diff --git a/doc/topics/utils/index.rst b/doc/topics/utils/index.rst index fa01c3695a..2ea3564f9a 100644 --- a/doc/topics/utils/index.rst +++ b/doc/topics/utils/index.rst @@ -139,13 +139,18 @@ where it is necessary to invoke the same function from a custom :ref:`outputter `/returner, as well as an execution module. Utility modules placed in ``salt://_utils/`` will be synced to the minions when -any of the following Salt functions are called: +a :ref:`highstate ` is run, as well as when any of the +following Salt functions are called: -* :mod:`state.apply ` -* :mod:`saltutil.sync_utils ` -* :mod:`saltutil.sync_all ` +* :py:func:`saltutil.sync_utils ` +* :py:func:`saltutil.sync_all ` + +As of the Fluorine release, as well as 2017.7.7 and 2018.3.2 in their +respective release cycles, the ``sync`` argument to :py:func:`state.apply +`/:py:func:`state.sls ` can +be used to sync custom types when running individual SLS files. To sync to the Master, use either of the following: -* :mod:`saltutil.sync_utils ` -* :mod:`saltutil.sync_all ` +* :py:func:`saltutil.sync_utils ` +* :py:func:`saltutil.sync_all ` diff --git a/doc/topics/venafi/index.rst b/doc/topics/venafi/index.rst index d163eed783..b756d4f271 100644 --- a/doc/topics/venafi/index.rst +++ b/doc/topics/venafi/index.rst @@ -3,7 +3,8 @@ Venafi Tools for Salt ===================== Introduction -~~~~~~~~~~~ +~~~~~~~~~~~~ + Before using these modules you need to register an account with Venafi, and configure it in your ``master`` configuration file. @@ -31,7 +32,7 @@ file and set the ``api_key`` to it: venafi: api_key: abcdef01-2345-6789-abcd-ef0123456789 -To enable the ability for creating keys and certificates it is necessary to enable the +To enable the ability for creating keys and certificates it is necessary to enable the external pillars. Open the ``/etc/salt/master`` file and add: .. code-block:: yaml @@ -49,7 +50,7 @@ in ``/etc/salt/master`` and add the base_url information following under the ven Example Usage -~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~ Generate a CSR and submit it to Venafi for issuance, using the 'Internet' zone: salt-run venafi.request minion.example.com minion.example.com zone=Internet @@ -58,12 +59,13 @@ aaa-bbb-ccc-dddd: salt-run venafi.pickup aaa-bbb-ccc-dddd Runner Functions -~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~ gen_key ------- + Generate and return a ``private_key``. If a ``dns_name`` is passed in, the -``private_key`` will be cached under that name. +``private_key`` will be cached under that name. The key will be generated based on the policy values that were configured by the Venafi administrator. A default Certificate Use Policy is associated @@ -90,11 +92,12 @@ will be used. gen_csr ------- + Generate a csr using the host's private_key. Analogous to: .. code-block:: bash - salt-run venafi.gen_csr minion.example.com minion.example.com country=US \ + salt-run venafi.gen_csr minion.example.com minion.example.com country=US \ state=California loc=Sacramento org=CompanyName org_unit=DevOps \ zone=Internet password=SecretSauce @@ -125,11 +128,12 @@ Generate a csr using the host's private_key. Analogous to: request ------- + Request a new certificate. Analogous to: .. code-block:: bash - salt-run venafi.request minion.example.com minion.example.com country=US \ + salt-run venafi.request minion.example.com minion.example.com country=US \ state=California loc=Sacramento org=CompanyName org_unit=DevOps \ zone=Internet password=SecretSauce @@ -162,10 +166,11 @@ Request a new certificate. Analogous to: register -------- + Register a new user account .. code-block:: bash - + salt-run venafi.register username@example.com :param str email: Required. The email address to use for the new Venafi account. @@ -173,10 +178,11 @@ Register a new user account show_company ------------ + Show company information, especially the company id .. code-block:: bash - + salt-run venafi.show_company example.com :param str domain: Required. The domain name to look up information for. @@ -184,19 +190,21 @@ Show company information, especially the company id show_csrs --------- + Show certificate requests for the configured API key. .. code-block:: bash - + salt-run venafi.show_csrs show_zones ---------- + Show zones for the specified company id. .. code-block:: bash - + salt-run venafi.show_zones :param str company_id: Optional. The company id to show the zones for. @@ -204,22 +212,24 @@ Show zones for the specified company id. pickup, show_cert ----------------- + Show certificate requests for the specified certificate id. Analogous to the VCert pickup command. .. code-block:: bash - + salt-run venafi.pickup 4295ebc0-14bf-11e7-b965-1df050017ec1 -:param str id_: Required. The id of the certificate to look up. +:param str id\_: Required. The id of the certificate to look up. show_rsa -------- + Show a private RSA key. .. code-block:: bash - + salt-run venafi.show_rsa minion.example.com minion.example.com :param str minion_id: The name of the minion to display the key for. @@ -229,19 +239,21 @@ Show a private RSA key. list_domain_cache ----------------- + List domains that have been cached on this master. .. code-block:: bash - + salt-run venafi.list_domain_cache del_cached_domain ----------------- + Delete a domain from this master's cache. .. code-block:: bash - + salt-run venafi.delete_domain_cache example.com :param str domains: A domain name, or a comma-separated list of domain names, diff --git a/pkg/deb/salt-syndic.service b/pkg/deb/salt-syndic.service index b01dab3b4d..017c55aecd 100644 --- a/pkg/deb/salt-syndic.service +++ b/pkg/deb/salt-syndic.service @@ -1,6 +1,7 @@ [Unit] Description=The Salt Syndic daemon After=network.target +PartOf=salt-master.service [Service] Type=notify diff --git a/pkg/salt-syndic.service b/pkg/salt-syndic.service index 9c9a1e0940..b22a48d6f6 100644 --- a/pkg/salt-syndic.service +++ b/pkg/salt-syndic.service @@ -2,6 +2,7 @@ Description=The Salt Master Server Documentation=man:salt-syndic(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltstack.com/en/latest/contents.html After=network.target +PartOf=salt-master.service [Service] Type=notify diff --git a/pkg/smartos/esky/requirements.txt b/pkg/smartos/esky/requirements.txt index 73b4f12858..1551b62623 100644 --- a/pkg/smartos/esky/requirements.txt +++ b/pkg/smartos/esky/requirements.txt @@ -1,5 +1,5 @@ GitPython==0.3.2.RC1 -dateutils +python-dateutil pyghmi croniter Mako diff --git a/pkg/suse/salt-master.service b/pkg/suse/salt-master.service index c0ea4606d8..b31c1a1373 100644 --- a/pkg/suse/salt-master.service +++ b/pkg/suse/salt-master.service @@ -4,7 +4,7 @@ Documentation=man:salt-master(1) file:///usr/share/doc/salt/html/contents.html h After=network.target [Service] -LimitNOFILE=16384 +LimitNOFILE=100000 Type=simple ExecStart=/usr/bin/salt-master TasksMax=infinity diff --git a/pkg/windows/build_env_2.ps1 b/pkg/windows/build_env_2.ps1 index 31a53eb0fc..eb9d546fbe 100644 --- a/pkg/windows/build_env_2.ps1 +++ b/pkg/windows/build_env_2.ps1 @@ -197,17 +197,17 @@ Write-Output " ----------------------------------------------------------------" Write-Output " - $script_name :: Updating PIP and SetupTools . . ." Write-Output " ----------------------------------------------------------------" if ( ! [bool]$Env:SALT_PIP_LOCAL_CACHE) { - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --no-cache-dir install -r $($script_path)\req_pip.txt" "python pip" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check --no-cache-dir install -r $($script_path)\req_pip.txt" "python pip" } else { $p = New-Item $Env:SALT_PIP_LOCAL_CACHE -ItemType Directory -Force # Ensure directory exists if ( (Get-ChildItem $Env:SALT_PIP_LOCAL_CACHE | Measure-Object).Count -eq 0 ) { # folder empty Write-Output " pip download from req_pip.txt into empty local cache SALT_REQ_PIP $Env:SALT_PIP_LOCAL_CACHE" - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip download --dest $Env:SALT_PIP_LOCAL_CACHE -r $($script_path)\req_pip.txt" "pip download" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check download --dest $Env:SALT_PIP_LOCAL_CACHE -r $($script_path)\req_pip.txt" "pip download" } Write-Output " reading from local pip cache $Env:SALT_PIP_LOCAL_CACHE" Write-Output " If a (new) resource is missing, please delete all files in this cache, go online and repeat" - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip install --no-index --find-links=$Env:SALT_PIP_LOCAL_CACHE -r $($script_path)\req_pip.txt" "pip install" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check install --no-index --find-links=$Env:SALT_PIP_LOCAL_CACHE -r $($script_path)\req_pip.txt" "pip install" } #============================================================================== @@ -218,16 +218,16 @@ Write-Output " ----------------------------------------------------------------" Write-Output " - $script_name :: Installing pypi resources using pip . . ." Write-Output " ----------------------------------------------------------------" if ( ! [bool]$Env:SALT_REQ_LOCAL_CACHE) { - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --no-cache-dir install -r $($script_path)\req.txt" "pip install" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check --no-cache-dir install -r $($script_path)\req.txt" "pip install" } else { if ( (Get-ChildItem $Env:SALT_REQ_LOCAL_CACHE | Measure-Object).Count -eq 0 ) { # folder empty Write-Output " pip download from req.txt into empty local cache SALT_REQ $Env:SALT_REQ_LOCAL_CACHE" - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip download --dest $Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip download" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check download --dest $Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip download" } Write-Output " reading from local pip cache $Env:SALT_REQ_LOCAL_CACHE" Write-Output " If a (new) resource is missing, please delete all files in this cache, go online and repeat" - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip install --no-index --find-links=$Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip install" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python2Dir'])\python.exe -m pip --disable-pip-version-check install --no-index --find-links=$Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip install" } #============================================================================== diff --git a/pkg/windows/build_env_3.ps1 b/pkg/windows/build_env_3.ps1 index de6725e335..7725a50fa8 100644 --- a/pkg/windows/build_env_3.ps1 +++ b/pkg/windows/build_env_3.ps1 @@ -197,17 +197,17 @@ Write-Output " ----------------------------------------------------------------" Write-Output " - $script_name :: Updating PIP and SetupTools . . ." Write-Output " ----------------------------------------------------------------" if ( ! [bool]$Env:SALT_PIP_LOCAL_CACHE) { - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --no-cache-dir install -r $($script_path)\req_pip.txt" "python pip" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check --no-cache-dir install -r $($script_path)\req_pip.txt" "python pip" } else { $p = New-Item $Env:SALT_PIP_LOCAL_CACHE -ItemType Directory -Force # Ensure directory exists if ( (Get-ChildItem $Env:SALT_PIP_LOCAL_CACHE | Measure-Object).Count -eq 0 ) { # folder empty Write-Output " pip download from req_pip.txt into empty local cache SALT_REQ_PIP $Env:SALT_PIP_LOCAL_CACHE" - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip download --dest $Env:SALT_PIP_LOCAL_CACHE -r $($script_path)\req_pip.txt" "pip download" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check download --dest $Env:SALT_PIP_LOCAL_CACHE -r $($script_path)\req_pip.txt" "pip download" } Write-Output " reading from local pip cache $Env:SALT_PIP_LOCAL_CACHE" Write-Output " If a (new) resource is missing, please delete all files in this cache, go online and repeat" - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip install --no-index --find-links=$Env:SALT_PIP_LOCAL_CACHE -r $($script_path)\req_pip.txt" "pip install" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check install --no-index --find-links=$Env:SALT_PIP_LOCAL_CACHE -r $($script_path)\req_pip.txt" "pip install" } #============================================================================== @@ -218,16 +218,16 @@ Write-Output " ----------------------------------------------------------------" Write-Output " - $script_name :: Installing pypi resources using pip . . ." Write-Output " ----------------------------------------------------------------" if ( ! [bool]$Env:SALT_REQ_LOCAL_CACHE) { - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --no-cache-dir install -r $($script_path)\req.txt" "pip install" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check --no-cache-dir install -r $($script_path)\req.txt" "pip install" } else { if ( (Get-ChildItem $Env:SALT_REQ_LOCAL_CACHE | Measure-Object).Count -eq 0 ) { # folder empty Write-Output " pip download from req.txt into empty local cache SALT_REQ $Env:SALT_REQ_LOCAL_CACHE" - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip download --dest $Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip download" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check download --dest $Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip download" } Write-Output " reading from local pip cache $Env:SALT_REQ_LOCAL_CACHE" Write-Output " If a (new) resource is missing, please delete all files in this cache, go online and repeat" - Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip install --no-index --find-links=$Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip install" + Start_Process_and_test_exitcode "cmd" "/c $($ini['Settings']['Python3Dir'])\python.exe -m pip --disable-pip-version-check install --no-index --find-links=$Env:SALT_REQ_LOCAL_CACHE -r $($script_path)\req.txt" "pip install" } #============================================================================== diff --git a/pkg/windows/buildenv/salt-api.bat b/pkg/windows/buildenv/salt-api.bat new file mode 100644 index 0000000000..c329478e71 --- /dev/null +++ b/pkg/windows/buildenv/salt-api.bat @@ -0,0 +1,12 @@ +@ echo off +:: Script for starting the Salt-Api +:: Accepts all parameters that Salt-Api accepts + +:: Define Variables +Set SaltDir=%~dp0 +Set SaltDir=%SaltDir:~0,-1% +Set Python=%SaltDir%\bin\python.exe +Set Script=%SaltDir%\bin\Scripts\salt-api + +:: Launch Script +"%Python%" -E -s "%Script%" %* diff --git a/pkg/windows/sign.bat b/pkg/windows/sign.bat new file mode 100644 index 0000000000..1be972f427 --- /dev/null +++ b/pkg/windows/sign.bat @@ -0,0 +1,165 @@ +:: ############################################################################ +:: +:: FILE: sign.bat +:: +:: DESCRIPTION: Signing and Hashing script for Salt builds on Windows. +:: Requires an official Code Signing Certificate and drivers +:: installed to sign the files. Generates hashes in MD5 and +:: SHA256 in a file of the same name with a `.md5` or +:: `.sha256` extension. +:: +:: NOTE: This script is used internally by SaltStack to sign and +:: hash Windows Installer builds and uses resources not +:: available to the community, such as SaltStack's Code +:: Signing Certificate. It is placed here for version +:: control. +:: +:: COPYRIGHT: (c) 2012-2018 by the SaltStack Team +:: +:: LICENSE: Apache 2.0 +:: ORGANIZATION: SaltStack, Inc (saltstack.com) +:: CREATED: 2017 +:: +:: ############################################################################ +:: +:: USAGE: The script must be located in a directory that has the installer +:: files in a subfolder named with the major version, ie: `2018.3`. +:: Insert the key fob that contains the code signing certificate. Run +:: the script passing the full version: `.\sign.bat 2018.3.1`. +:: +:: The script will sign the installers and generate the corresponding +:: hash files. These can then be uploaded to the salt repo. +:: +:: The files must be in the following format: +:: \Salt-Minion----Setup.exe +:: So, for a Salt Minion installer for 2018.3.1 on AMD64 for Python 3 +:: file would be placed in a subdirectory named `2018.3` and the file +:: would be named: `Salt-Minion-2018.3.1-Py3-AMD64-Setup.exe`. This +:: is how the file is created by the NSI Script anyway. +:: +:: ############################################################################ +@ echo off +if [%1]==[] ( + echo You must pass a version + goto quit +) else ( + set "Version=%~1" +) + +for /F "tokens=1,2 delims=." %%a in ("%Version%") do (set Series=%%a.%%b) + +:: Sign Installer Files +echo =========================================================================== +echo Signing... +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +signtool.exe sign /t http://timestamp.digicert.com ^ + "%Series%\Salt-Minion-%Version%-AMD64-Setup.exe" ^ + "%Series%\Salt-Minion-%Version%-x86-Setup.exe" ^ + "%Series%\Salt-%Version%-AMD64-Setup.exe" ^ + "%Series%\Salt-%Version%-x86-Setup.exe" ^ + "%Series%\Salt-%Version%-Py2-AMD64-Setup.exe" ^ + "%Series%\Salt-%Version%-Py2-x86-Setup.exe" ^ + "%Series%\Salt-%Version%-Py3-AMD64-Setup.exe" ^ + "%Series%\Salt-%Version%-Py3-x86-Setup.exe" ^ + "%Series%\Salt-Minion-%Version%-Py2-AMD64-Setup.exe" ^ + "%Series%\Salt-Minion-%Version%-Py2-x86-Setup.exe" ^ + "%Series%\Salt-Minion-%Version%-Py3-AMD64-Setup.exe" ^ + "%Series%\Salt-Minion-%Version%-Py3-x86-Setup.exe" +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +echo Signing Complete +echo =========================================================================== + +:: Create Hash files +echo =========================================================================== +echo Creating Hashes... +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +set "file_name=Salt-Minion-%Version%-AMD64-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + + +set "file_name=Salt-Minion-%Version%-x86-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + +set "file_name=Salt-%Version%-AMD64-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + +set "file_name=Salt-%Version%-x86-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + +set "file_name=Salt-%Version%-Py2-AMD64-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + +set "file_name=Salt-%Version%-Py2-x86-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + +set "file_name=Salt-%Version%-Py3-AMD64-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + +set "file_name=Salt-%Version%-Py3-x86-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + +set "file_name=Salt-Minion-%Version%-Py2-AMD64-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + +set "file_name=Salt-Minion-%Version%-Py2-x86-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + +set "file_name=Salt-Minion-%Version%-Py3-AMD64-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + +set "file_name=Salt-Minion-%Version%-Py3-x86-Setup.exe" +set "file=.\%Series%\%file_name%" +if exist "%file%" ( + echo - %file_name% + powershell -c "$hash = (Get-FileHash -Algorithm MD5 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.md5\"" + powershell -c "$hash = (Get-FileHash -Algorithm SHA256 \"%file%\").Hash; Out-File -InputObject $hash\" %file_name%\" -FilePath \"%file%.sha256\"") + +echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +echo Hashing Complete +echo =========================================================================== + +:quit diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index de3a013904..0000000000 --- a/pytest.ini +++ /dev/null @@ -1,4 +0,0 @@ -[pytest] -addopts = --ssh-tests -ra -sv -testpaths = tests -norecursedirs = tests/kitchen diff --git a/requirements/base.txt b/requirements/base.txt index e6ba75beb6..ec8dc3b33a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -5,6 +5,8 @@ msgpack>=0.5,!=0.5.5 PyYAML MarkupSafe requests>=1.0.0 -tornado>=4.2.1,<6.0 +tornado>=4.2.1,<6.0; python_version < '3' +tornado>=4.2.1,<5.0; python_version >= '3.4' + # Required by Tornado to handle threads stuff. futures>=2.0; python_version < '3.0' diff --git a/requirements/dev.txt b/requirements/dev.txt index 57af6f81e7..f362e35b2f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,10 +1,6 @@ -r base.txt mock>=2.0.0 -apache-libcloud>=0.14.0 -boto>=2.32.1 -boto3>=1.2.1 -moto>=0.3.6 SaltPyLint>=v2017.3.6 pytest>=3.5.0 git+https://github.com/saltstack/pytest-salt.git@master#egg=pytest-salt diff --git a/requirements/pytest.txt b/requirements/pytest.txt index e5ec2acff3..4c824c38ca 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -1,3 +1,4 @@ pytest>=3.5.0 pytest-helpers-namespace pytest-tempdir +pytest-cov diff --git a/requirements/tests.txt b/requirements/tests.txt new file mode 100644 index 0000000000..ffd8207ec8 --- /dev/null +++ b/requirements/tests.txt @@ -0,0 +1,36 @@ +-r zeromq.txt +-r dev.txt +-r pytest.txt +apache-libcloud>=1.0.0 +boto>=2.32.1 +boto3>=1.2.1 +moto>=0.3.6 +docker; sys.platform != 'win32' +docker==2.7.0; sys.platform == 'win32' +virtualenv +setuptools>=30 +six>=1.10.0 +timelib +coverage +keyring==5.7.1 +python-gnupg +python-etcd==0.4.2 +GitPython +supervisor; python_version < '3' +kubernetes<4.0 +psutil +pyvmomi +setproctitle +cherrypy; sys.platform != 'win32' and sys.platform != 'darwin' +pyinotify; sys.platform != 'win32' and sys.platform != 'darwin' +PyMySQL; sys.platform != 'win32' and sys.platform != 'darwin' +jsonschema +strict_rfc3339 +rfc3987 +jinja2 +pyOpenSSL +ioflo +dnspython +SaltTesting==2017.6.1 +junos-eznc +jxmlease diff --git a/salt/auth/__init__.py b/salt/auth/__init__.py index 962a6a9e41..c4e44097f3 100644 --- a/salt/auth/__init__.py +++ b/salt/auth/__init__.py @@ -43,9 +43,12 @@ AUTH_INTERNAL_KEYWORDS = frozenset([ 'cmd', 'eauth', 'fun', + 'gather_job_timeout', 'kwarg', 'match', - 'print_event' + 'print_event', + 'raw', + 'yield_pub_data' ]) @@ -284,7 +287,7 @@ class LoadAuth(object): return False if load['eauth'] not in self.opts['external_auth']: - # The eauth system is not enabled, fail + log.debug('The eauth system "%s" is not enabled', load['eauth']) log.warning('Authentication failure of type "eauth" occurred.') return False @@ -362,6 +365,7 @@ class LoadAuth(object): eauth = token['eauth'] if token else load['eauth'] if eauth not in self.opts['external_auth']: # No matching module is allowed in config + log.debug('The eauth system "%s" is not enabled', eauth) log.warning('Authorization failure occurred.') return None @@ -372,6 +376,9 @@ class LoadAuth(object): name = self.load_name(load) # The username we are attempting to auth with groups = self.get_groups(load) # The groups this user belongs to eauth_config = self.opts['external_auth'][eauth] + if not eauth_config: + log.debug('eauth "%s" configuration is empty', eauth) + if not groups: groups = [] @@ -691,6 +698,7 @@ class Resolver(object): if fstr not in self.auth: print(('The specified external authentication system "{0}" is ' 'not available').format(eauth)) + print("Available eauth types: {0}".format(", ".join(self.auth.file_mapping.keys()))) return ret args = salt.utils.args.arg_lookup(self.auth[fstr]) diff --git a/salt/beacons/avahi_announce.py b/salt/beacons/avahi_announce.py index 7c598518fd..1806164a06 100644 --- a/salt/beacons/avahi_announce.py +++ b/salt/beacons/avahi_announce.py @@ -104,42 +104,37 @@ def beacon(config): (do not poll) on the beacon configuration. The following are required configuration settings: - 'servicetype': The service type to announce. - 'port': The port of the service to announce. - 'txt': The TXT record of the service being announced as a dict. - Grains can be used to define TXT values using the syntax: - grains. - or: - grains.[i] - where i is an integer representing the index of the grain to - use. If the grain is not a list, the index is ignored. + + - ``servicetype`` - The service type to announce + - ``port`` - The port of the service to announce + - ``txt`` - The TXT record of the service being announced as a dict. Grains + can be used to define TXT values using one of following two formats: + + - ``grains.`` + - ``grains.[i]`` where i is an integer representing the + index of the grain to use. If the grain is not a list, the index is + ignored. The following are optional configuration settings: - 'servicename': Set the name of the service. Will use the hostname from - __grains__['host'] if not set. - 'reset_on_change': If true and there is a change in TXT records - detected, it will stop announcing the service and - then restart announcing the service. This - interruption in service announcement may be - desirable if the client relies on changes in the - browse records to update its cache of the TXT - records. - Defaults to False. - 'reset_wait': The number of seconds to wait after announcement stops - announcing and before it restarts announcing in the - case where there is a change in TXT records detected - and 'reset_on_change' is True. - Defaults to 0. - 'copy_grains': If set to True, it will copy the grains passed into - the beacon when it backs them up to check for changes - on the next iteration. Normally, instead of copy, it - would use straight value assignment. This will allow - detection of changes to grains where the grains are - modified in-place instead of completely replaced. - In-place grains changes are not currently done in the - main Salt code but may be done due to a custom - plug-in. - Defaults to False. + + - ``servicename`` - Set the name of the service. Will use the hostname from + the minion's ``host`` grain if this value is not set. + - ``reset_on_change`` - If ``True`` and there is a change in TXT records + detected, it will stop announcing the service and then restart announcing + the service. This interruption in service announcement may be desirable + if the client relies on changes in the browse records to update its cache + of TXT records. Defaults to ``False``. + - ``reset_wait`` - The number of seconds to wait after announcement stops + announcing and before it restarts announcing in the case where there is a + change in TXT records detected and ``reset_on_change`` is ``True``. + Defaults to ``0``. + - ``copy_grains`` - If ``True``, Salt will copy the grains passed into the + beacon when it backs them up to check for changes on the next iteration. + Normally, instead of copy, it would use straight value assignment. This + will allow detection of changes to grains where the grains are modified + in-place instead of completely replaced. In-place grains changes are not + currently done in the main Salt code but may be done due to a custom + plug-in. Defaults to ``False``. Example Config diff --git a/salt/beacons/bonjour_announce.py b/salt/beacons/bonjour_announce.py index e6c858adf6..e1f1d83fe4 100644 --- a/salt/beacons/bonjour_announce.py +++ b/salt/beacons/bonjour_announce.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - Beacon to announce via Bonjour (zeroconf) +Beacon to announce via Bonjour (zeroconf) ''' # Import Python libs @@ -98,42 +98,37 @@ def beacon(config): (do not poll) on the beacon configuration. The following are required configuration settings: - 'servicetype': The service type to announce. - 'port': The port of the service to announce. - 'txt': The TXT record of the service being announced as a dict. - Grains can be used to define TXT values using the syntax: - grains. - or: - grains.[i] - where i is an integer representing the index of the grain to - use. If the grain is not a list, the index is ignored. + + - ``servicetype`` - The service type to announce + - ``port`` - The port of the service to announce + - ``txt`` - The TXT record of the service being announced as a dict. Grains + can be used to define TXT values using one of following two formats: + + - ``grains.`` + - ``grains.[i]`` where i is an integer representing the + index of the grain to use. If the grain is not a list, the index is + ignored. The following are optional configuration settings: - 'servicename': Set the name of the service. Will use the hostname from - __grains__['host'] if not set. - 'reset_on_change': If true and there is a change in TXT records - detected, it will stop announcing the service and - then restart announcing the service. This - interruption in service announcement may be - desirable if the client relies on changes in the - browse records to update its cache of the TXT - records. - Defaults to False. - 'reset_wait': The number of seconds to wait after announcement stops - announcing and before it restarts announcing in the - case where there is a change in TXT records detected - and 'reset_on_change' is True. - Defaults to 0. - 'copy_grains': If set to True, it will copy the grains passed into - the beacon when it backs them up to check for changes - on the next iteration. Normally, instead of copy, it - would use straight value assignment. This will allow - detection of changes to grains where the grains are - modified in-place instead of completely replaced. - In-place grains changes are not currently done in the - main Salt code but may be done due to a custom - plug-in. - Defaults to False. + + - ``servicename`` - Set the name of the service. Will use the hostname from + the minion's ``host`` grain if this value is not set. + - ``reset_on_change`` - If ``True`` and there is a change in TXT records + detected, it will stop announcing the service and then restart announcing + the service. This interruption in service announcement may be desirable + if the client relies on changes in the browse records to update its cache + of TXT records. Defaults to ``False``. + - ``reset_wait`` - The number of seconds to wait after announcement stops + announcing and before it restarts announcing in the case where there is a + change in TXT records detected and ``reset_on_change`` is ``True``. + Defaults to ``0``. + - ``copy_grains`` - If ``True``, Salt will copy the grains passed into the + beacon when it backs them up to check for changes on the next iteration. + Normally, instead of copy, it would use straight value assignment. This + will allow detection of changes to grains where the grains are modified + in-place instead of completely replaced. In-place grains changes are not + currently done in the main Salt code but may be done due to a custom + plug-in. Defaults to ``False``. Example Config diff --git a/salt/beacons/btmp.py b/salt/beacons/btmp.py index feb1c58c6c..62d8236c5a 100644 --- a/salt/beacons/btmp.py +++ b/salt/beacons/btmp.py @@ -10,10 +10,10 @@ Beacon to fire events at failed login of users # Import python libs from __future__ import absolute_import, unicode_literals +import datetime import logging import os import struct -import time # Import Salt Libs import salt.utils.stringutils @@ -102,8 +102,8 @@ def _check_time_range(time_range, now): Check time range ''' if _TIME_SUPPORTED: - _start = int(time.mktime(dateutil_parser.parse(time_range['start']).timetuple())) - _end = int(time.mktime(dateutil_parser.parse(time_range['end']).timetuple())) + _start = dateutil_parser.parse(time_range['start']) + _end = dateutil_parser.parse(time_range['end']) return bool(_start <= now <= _end) else: @@ -249,7 +249,7 @@ def beacon(config): else: fp_.seek(loc) while True: - now = int(time.time()) + now = datetime.datetime.now() raw = fp_.read(SIZE) if len(raw) != SIZE: return ret diff --git a/salt/beacons/napalm_beacon.py b/salt/beacons/napalm_beacon.py index 1d447b3612..5d6ed7b277 100644 --- a/salt/beacons/napalm_beacon.py +++ b/salt/beacons/napalm_beacon.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- ''' -NAPALM functions -================ +Watch NAPALM functions and fire events on specific triggers +=========================================================== .. versionadded:: 2018.3.0 -Watch NAPALM functions and fire events on specific triggers. .. note:: @@ -14,7 +13,7 @@ Watch NAPALM functions and fire events on specific triggers. Check the documentation for the :mod:`NAPALM proxy module `. - _NAPALM: http://napalm.readthedocs.io/en/latest/index.html + .. _NAPALM: http://napalm.readthedocs.io/en/latest/index.html The configuration accepts a list of Salt functions to be invoked, and the corresponding output hierarchy that should @@ -134,7 +133,7 @@ Event structure example: .. code-block:: json - salt/beacon/edge01.bjm01/napalm/junos/ntp.stats { + { "_stamp": "2017-09-05T09:51:09.377202", "args": [], "data": { diff --git a/salt/beacons/sensehat.py b/salt/beacons/sensehat.py index 49f8b209c4..34d9b6bc41 100644 --- a/salt/beacons/sensehat.py +++ b/salt/beacons/sensehat.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' -Beacon to monitor temperature, humidity and pressure using the SenseHat -of a Raspberry Pi. +Monitor temperature, humidity and pressure using the SenseHat of a Raspberry Pi +=============================================================================== .. versionadded:: 2017.7.0 diff --git a/salt/beacons/wtmp.py b/salt/beacons/wtmp.py index 05b76e07b8..45215ba0a3 100644 --- a/salt/beacons/wtmp.py +++ b/salt/beacons/wtmp.py @@ -10,17 +10,17 @@ Beacon to fire events at login of users as registered in the wtmp file # Import Python libs from __future__ import absolute_import, unicode_literals +import datetime import logging import os import struct -import time # Import salt libs import salt.utils.stringutils import salt.utils.files # Import 3rd-party libs -import salt.ext.six +from salt.ext import six # pylint: disable=import-error from salt.ext.six.moves import map # pylint: enable=import-error @@ -102,8 +102,8 @@ def _check_time_range(time_range, now): Check time range ''' if _TIME_SUPPORTED: - _start = int(time.mktime(dateutil_parser.parse(time_range['start']).timetuple())) - _end = int(time.mktime(dateutil_parser.parse(time_range['end']).timetuple())) + _start = dateutil_parser.parse(time_range['start']) + _end = dateutil_parser.parse(time_range['end']) return bool(_start <= now <= _end) else: @@ -248,7 +248,7 @@ def beacon(config): else: fp_.seek(loc) while True: - now = int(time.time()) + now = datetime.datetime.now() raw = fp_.read(SIZE) if len(raw) != SIZE: return ret @@ -257,7 +257,7 @@ def beacon(config): event = {} for ind, field in enumerate(FIELDS): event[field] = pack[ind] - if isinstance(event[field], salt.ext.six.string_types): + if isinstance(event[field], six.string_types): if isinstance(event[field], bytes): event[field] = salt.utils.stringutils.to_unicode(event[field]) event[field] = event[field].strip('\x00') diff --git a/salt/cache/redis_cache.py b/salt/cache/redis_cache.py index 2b6c9ad8fd..994be8f213 100644 --- a/salt/cache/redis_cache.py +++ b/salt/cache/redis_cache.py @@ -7,22 +7,21 @@ Redis plugin for the Salt caching subsystem. .. versionadded:: 2017.7.0 -As Redis provides a simple mechanism for very fast key-value store, -in order to privde the necessary features for the Salt -caching subsystem, the following conventions are used: +As Redis provides a simple mechanism for very fast key-value store, in order to +privde the necessary features for the Salt caching subsystem, the following +conventions are used: -- a Redis key consists of the bank name and the cache key separated by ``/``, e.g.: -``$KEY_minions/alpha/stuff`` where ``minions/alpha`` is the bank name -and ``stuff`` is the key name. -- as the caching subsystem is organised as a tree, we need to store the -caching path and identify the bank and its offspring. -At the same time, Redis is linear -and we need to avoid doing ``keys `` which is very inefficient -as it goes through all the keys on the remote Redis server. -Instead, each bank hierarchy has a Redis SET associated -which stores the list of sub-banks. By default, these keys begin with ``$BANK_``. -- in addition, each key name is stored in a separate SET -of all the keys within a bank. By default, these SETs begin with ``$BANKEYS_``. +- A Redis key consists of the bank name and the cache key separated by ``/``, e.g.: + ``$KEY_minions/alpha/stuff`` where ``minions/alpha`` is the bank name + and ``stuff`` is the key name. +- As the caching subsystem is organised as a tree, we need to store the caching + path and identify the bank and its offspring. At the same time, Redis is + linear and we need to avoid doing ``keys `` which is very + inefficient as it goes through all the keys on the remote Redis server. + Instead, each bank hierarchy has a Redis SET associated which stores the list + of sub-banks. By default, these keys begin with ``$BANK_``. +- In addition, each key name is stored in a separate SET of all the keys within + a bank. By default, these SETs begin with ``$BANKEYS_``. For example, to store the key ``my-key`` under the bank ``root-bank/sub-bank/leaf-bank``, the following hierarchy will be built: @@ -94,7 +93,6 @@ db: ``'0'`` The database index. .. note:: - The database index must be specified as string not as integer value! password: diff --git a/salt/cli/caller.py b/salt/cli/caller.py index 523f99f335..84eb610bb7 100644 --- a/salt/cli/caller.py +++ b/salt/cli/caller.py @@ -120,7 +120,7 @@ class BaseCaller(object): ''' Print out the grains ''' - grains = salt.loader.grains(self.opts) + grains = self.minion.opts.get('grains') or salt.loader.grains(self.opts) salt.output.display_output({'local': grains}, 'grains', self.opts) def run(self): diff --git a/salt/cli/salt.py b/salt/cli/salt.py index cdec5a6e3c..1a12f52e3b 100644 --- a/salt/cli/salt.py +++ b/salt/cli/salt.py @@ -402,7 +402,7 @@ class SaltCMD(salt.utils.parsers.SaltCMDOptionParser): # if there is a dict with retcode, use that if isinstance(ret, dict) and ret.get('retcode', 0) != 0: if isinstance(ret.get('retcode', 0), dict): - return max(ret.get('retcode', {0: 0}).values()) + return max(six.itervalues(ret.get('retcode', {0: 0}))) return ret['retcode'] # if its a boolean, False means 1 elif isinstance(ret, bool) and not ret: diff --git a/salt/client/__init__.py b/salt/client/__init__.py index 4758056d92..60902ccbd6 100644 --- a/salt/client/__init__.py +++ b/salt/client/__init__.py @@ -228,7 +228,7 @@ class LocalClient(object): # Looks like the timeout is invalid, use config return self.opts['timeout'] - def gather_job_info(self, jid, tgt, tgt_type, **kwargs): + def gather_job_info(self, jid, tgt, tgt_type, listen=True, **kwargs): ''' Return the information about a given job ''' @@ -240,6 +240,7 @@ class LocalClient(object): arg=[jid], tgt_type=tgt_type, timeout=timeout, + listen=listen, **kwargs ) @@ -521,7 +522,15 @@ class LocalClient(object): {'dave': {...}} {'stewart': {...}} ''' + # We need to re-import salt.utils.args here + # even though it has already been imported. + # when cmd_batch is called via the NetAPI + # the module is unavailable. + import salt.utils.args + + # Late import - not used anywhere else in this file import salt.cli.batch + arg = salt.utils.args.condition_input(arg, kwarg) opts = {'tgt': tgt, 'fun': fun, diff --git a/salt/client/netapi.py b/salt/client/netapi.py index 3307b2dbf9..ec6ee7a664 100644 --- a/salt/client/netapi.py +++ b/salt/client/netapi.py @@ -14,6 +14,41 @@ import salt.utils.process log = logging.getLogger(__name__) +class RunNetapi(salt.utils.process.SignalHandlingMultiprocessingProcess): + ''' + Runner class that's pickable for netapi modules + ''' + def __init__(self, opts, fname, **kwargs): + super(RunNetapi, self).__init__(**kwargs) + self.opts = opts + self.fname = fname + + # __setstate__ and __getstate__ are only used on Windows. + # We do this so that __init__ will be invoked on Windows in the child + # process so that a register_after_fork() equivalent will work on Windows. + def __setstate__(self, state): + self._is_child = True + self.__init__( + state['opts'], + state['fname'], + log_queue=state['log_queue'], + log_queue_level=state['log_queue_level'] + ) + + def __getstate__(self): + return { + 'opts': self.opts, + 'fname': self.fname, + 'log_queue': self.log_queue, + 'log_queue_level': self.log_queue_level + } + + def run(self): + netapi = salt.loader.netapi(self.opts) + netapi_func = netapi[self.fname] + netapi_func() + + class NetapiClient(object): ''' Start each netapi module that is configured to run @@ -30,10 +65,20 @@ class NetapiClient(object): if not len(self.netapi): log.error("Did not find any netapi configurations, nothing to start") + kwargs = {} + if salt.utils.platform.is_windows(): + kwargs['log_queue'] = salt.log.setup.get_multiprocessing_logging_queue() + kwargs['log_queue_level'] = salt.log.setup.get_multiprocessing_logging_level() + for fun in self.netapi: if fun.endswith('.start'): log.info('Starting %s netapi module', fun) - self.process_manager.add_process(self.netapi[fun]) + self.process_manager.add_process( + RunNetapi, + args=(self.opts, fun), + kwargs=kwargs, + name='RunNetapi' + ) # Install the SIGINT/SIGTERM handlers if not done so far if signal.getsignal(signal.SIGINT) is signal.SIG_DFL: diff --git a/salt/client/ssh/__init__.py b/salt/client/ssh/__init__.py index 98d6305e87..6a4ca58b64 100644 --- a/salt/client/ssh/__init__.py +++ b/salt/client/ssh/__init__.py @@ -281,6 +281,10 @@ class SSH(object): salt.config.DEFAULT_MASTER_OPTS['ssh_passwd'] ), 'priv': priv, + 'priv_passwd': self.opts.get( + 'ssh_priv_passwd', + salt.config.DEFAULT_MASTER_OPTS['ssh_priv_passwd'] + ), 'timeout': self.opts.get( 'ssh_timeout', salt.config.DEFAULT_MASTER_OPTS['ssh_timeout'] @@ -824,6 +828,7 @@ class Single(object): port=None, passwd=None, priv=None, + priv_passwd=None, timeout=30, sudo=False, tty=False, @@ -885,6 +890,7 @@ class Single(object): 'port': port, 'passwd': passwd, 'priv': priv, + 'priv_passwd': priv_passwd, 'timeout': timeout, 'sudo': sudo, 'tty': tty, @@ -1243,7 +1249,10 @@ ARGS = {arguments}\n'''.format(config=self.minion_config, shim_tmp_file.write(salt.utils.stringutils.to_bytes(cmd_str)) # Copy shim to target system, under $HOME/. - target_shim_file = '.{0}.{1}'.format(binascii.hexlify(os.urandom(6)).decode('ascii'), extension) + target_shim_file = '.{0}.{1}'.format( + binascii.hexlify(os.urandom(6)).decode('ascii'), + extension + ) if self.winrm: target_shim_file = saltwinshell.get_target_shim_file(self, target_shim_file) self.shell.send(shim_tmp_file.name, target_shim_file, makedirs=True) @@ -1387,6 +1396,30 @@ ARGS = {arguments}\n'''.format(config=self.minion_config, perm_error_fmt = 'Permissions problem, target user may need '\ 'to be root or use sudo:\n {0}' + def _version_mismatch_error(): + messages = { + 2: { + 6: 'Install Python 2.7 / Python 3 Salt dependencies on the Salt SSH master \n' + 'to interact with Python 2.7 / Python 3 targets', + 7: 'Install Python 2.6 / Python 3 Salt dependencies on the Salt SSH master \n' + 'to interact with Python 2.6 / Python 3 targets', + }, + 3: { + 'default': '- Install Python 2.6/2.7 Salt dependencies on the Salt SSH \n' + ' master to interact with Python 2.6/2.7 targets\n' + '- Install Python 3 on the target machine(s)', + }, + 'default': 'Matching major/minor Python release (>=2.6) needed both on the Salt SSH \n' + 'master and target machine', + } + major, minor = sys.version_info[:2] + help_msg = ( + messages.get(major, {}).get(minor) + or messages.get(major, {}).get('default') + or messages['default'] + ) + return 'Python version error. Recommendation(s) follow:\n' + help_msg + errors = [ ( (), @@ -1396,7 +1429,7 @@ ARGS = {arguments}\n'''.format(config=self.minion_config, ( (salt.defaults.exitcodes.EX_THIN_PYTHON_INVALID,), 'Python interpreter is too old', - 'salt requires python 2.6 or newer on target hosts, must have same major version as origin host' + _version_mismatch_error() ), ( (salt.defaults.exitcodes.EX_THIN_CHECKSUM,), diff --git a/salt/client/ssh/shell.py b/salt/client/ssh/shell.py index ea7f7f7d60..0713258267 100644 --- a/salt/client/ssh/shell.py +++ b/salt/client/ssh/shell.py @@ -24,6 +24,7 @@ log = logging.getLogger(__name__) SSH_PASSWORD_PROMPT_RE = re.compile(r'(?:.*)[Pp]assword(?: for .*)?:', re.M) KEY_VALID_RE = re.compile(r'.*\(yes\/no\).*') +SSH_PRIVATE_KEY_PASSWORD_PROMPT_RE = re.compile(r'Enter passphrase for key', re.M) # Keep these in sync with ./__init__.py RSTR = '_edbc7885e4f9aac9b83b35999b68d015148caf467b78fa39c05f669c0ff89878' @@ -76,6 +77,7 @@ class Shell(object): port=None, passwd=None, priv=None, + priv_passwd=None, timeout=None, sudo=False, tty=False, @@ -92,6 +94,7 @@ class Shell(object): self.port = port self.passwd = six.text_type(passwd) if passwd else passwd self.priv = priv + self.priv_passwd = priv_passwd self.timeout = timeout self.sudo = sudo self.tty = tty @@ -399,6 +402,11 @@ class Shell(object): if buff and RSTR_RE.search(buff): # We're getting results back, don't try to send passwords send_password = False + if buff and SSH_PRIVATE_KEY_PASSWORD_PROMPT_RE.search(buff): + if not self.priv_passwd: + return '', 'Private key file need passphrase', 254 + term.sendline(self.priv_passwd) + continue if buff and SSH_PASSWORD_PROMPT_RE.search(buff) and send_password: if not self.passwd: return '', 'Permission denied, no authentication information', 254 diff --git a/salt/cloud/clouds/azurearm.py b/salt/cloud/clouds/azurearm.py index 24ee0290f4..bf7a87b307 100644 --- a/salt/cloud/clouds/azurearm.py +++ b/salt/cloud/clouds/azurearm.py @@ -544,7 +544,7 @@ def list_nodes_full(call=None): try: node['image'] = node['storage_profile']['os_disk']['image']['uri'] except (TypeError, KeyError): - node['image'] = None + node['image'] = node.get('storage_profile', {}).get('image_reference', {}).get('id') try: netifaces = node['network_profile']['network_interfaces'] for index, netiface in enumerate(netifaces): @@ -1177,19 +1177,22 @@ def request_instance(vm_): volume['create_option'] = 'empty' data_disks.append(DataDisk(**volume)) + img_ref = None if vm_['image'].startswith('http') or vm_.get('vhd') == 'unmanaged': if vm_['image'].startswith('http'): source_image = VirtualHardDisk(vm_['image']) - img_ref = None else: source_image = None - img_pub, img_off, img_sku, img_ver = vm_['image'].split('|') - img_ref = ImageReference( - publisher=img_pub, - offer=img_off, - sku=img_sku, - version=img_ver, - ) + if '|' in vm_['image']: + img_pub, img_off, img_sku, img_ver = vm_['image'].split('|') + img_ref = ImageReference( + publisher=img_pub, + offer=img_off, + sku=img_sku, + version=img_ver, + ) + elif vm_['image'].startswith('/subscriptions'): + img_ref = ImageReference(id=vm_['image']) if win_installer: os_type = 'Windows' else: @@ -1210,19 +1213,22 @@ def request_instance(vm_): disk_size_gb=vm_.get('os_disk_size_gb') ) else: - img_pub, img_off, img_sku, img_ver = vm_['image'].split('|') source_image = None os_type = None os_disk = OSDisk( create_option=DiskCreateOptionTypes.from_image, disk_size_gb=vm_.get('os_disk_size_gb') ) - img_ref = ImageReference( - publisher=img_pub, - offer=img_off, - sku=img_sku, - version=img_ver, - ) + if '|' in vm_['image']: + img_pub, img_off, img_sku, img_ver = vm_['image'].split('|') + img_ref = ImageReference( + publisher=img_pub, + offer=img_off, + sku=img_sku, + version=img_ver, + ) + elif vm_['image'].startswith('/subscriptions'): + img_ref = ImageReference(id=vm_['image']) userdata_file = config.get_cloud_config_value( 'userdata_file', vm_, __opts__, search_global=False, default=None diff --git a/salt/cloud/clouds/digitalocean.py b/salt/cloud/clouds/digitalocean.py index 823405c78b..4c509f1f62 100644 --- a/salt/cloud/clouds/digitalocean.py +++ b/salt/cloud/clouds/digitalocean.py @@ -83,9 +83,10 @@ def get_configured_provider(): Return the first configured instance. ''' return config.is_provider_configured( - __opts__, - __active_provider_name__ or __virtualname__, - ('personal_access_token',) + opts=__opts__, + provider=__active_provider_name__ or __virtualname__, + aliases=__virtual_aliases__, + required_keys=('personal_access_token',) ) @@ -381,6 +382,15 @@ def create(vm_): raise SaltCloudConfigError("'ipv6' should be a boolean value.") kwargs['ipv6'] = ipv6 + monitoring = config.get_cloud_config_value( + 'monitoring', vm_, __opts__, search_global=False, default=None, + ) + + if monitoring is not None: + if not isinstance(monitoring, bool): + raise SaltCloudConfigError("'monitoring' should be a boolean value.") + kwargs['monitoring'] = monitoring + kwargs['tags'] = config.get_cloud_config_value( 'tags', vm_, __opts__, search_global=False, default=False ) diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py index 37196db637..970d51a1fd 100644 --- a/salt/cloud/clouds/ec2.py +++ b/salt/cloud/clouds/ec2.py @@ -16,6 +16,11 @@ To use the EC2 cloud module, set up the cloud configuration at # EC2 metadata set both id and key to 'use-instance-role-credentials' id: GKTADJGHEIQSXMKKRBJ08H key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs + + # If 'role_arn' is specified the above credentials are used to + # to assume to the role. By default, role_arn is set to None. + role_arn: arn:aws:iam::012345678910:role/SomeRoleName + # The ssh keyname to use keyname: default # The amazon security group @@ -48,6 +53,10 @@ To use the EC2 cloud module, set up the cloud configuration at # Optional ssh_gateway_username: root + # Default to nc -q0 %h %p + # Optional + ssh_gateway_command: "-W %h:%p" + # One authentication method is required. If both # are specified, Private key wins. @@ -1078,6 +1087,12 @@ def get_ssh_gateway_config(vm_): search_global=False ) + # ssh_gateway_command + ssh_gateway_config['ssh_gateway_command'] = config.get_cloud_config_value( + 'ssh_gateway_command', vm_, __opts__, default=None, + search_global=False + ) + # Check if private key exists key_filename = ssh_gateway_config['ssh_gateway_key'] if key_filename is not None and not os.path.isfile(key_filename): @@ -2044,6 +2059,8 @@ def request_instance(vm_=None, call=None): if spot_config: sir_id = data[0]['spotInstanceRequestId'] + vm_['spotRequestId'] = sir_id + def __query_spot_instance_request(sir_id, location): params = {'Action': 'DescribeSpotInstanceRequests', 'SpotInstanceRequestId.1': sir_id} @@ -2424,7 +2441,7 @@ def wait_for_instance( ) pprint.pprint(console) time.sleep(5) - output = console['output_decoded'] + output = salt.utils.stringutils.to_unicode(console['output_decoded']) comps = output.split('-----BEGIN SSH HOST KEY KEYS-----') if len(comps) < 2: # Fail; there are no host keys @@ -2666,6 +2683,51 @@ def create(vm_=None, call=None): location=location ) + # Once instance tags are set, tag the spot request if configured + if 'spot_config' in vm_ and 'tag' in vm_['spot_config']: + + if not isinstance(vm_['spot_config']['tag'], dict): + raise SaltCloudConfigError( + '\'tag\' should be a dict.' + ) + + for value in six.itervalues(vm_['spot_config']['tag']): + if not isinstance(value, str): + raise SaltCloudConfigError( + '\'tag\' values must be strings. Try quoting the values. ' + 'e.g. "2013-09-19T20:09:46Z".' + ) + + spot_request_tags = {} + + if 'spotRequestId' not in vm_: + raise SaltCloudConfigError('Failed to find spotRequestId') + + sir_id = vm_['spotRequestId'] + + spot_request_tags['Name'] = vm_['name'] + + for k, v in six.iteritems(vm_['spot_config']['tag']): + spot_request_tags[k] = v + + __utils__['cloud.fire_event']( + 'event', + 'setting tags', + 'salt/cloud/spot_request_{0}/tagging'.format(sir_id), + args={'tags': spot_request_tags}, + sock_dir=__opts__['sock_dir'], + transport=__opts__['transport'] + ) + salt.utils.cloud.wait_for_fun( + set_tags, + timeout=30, + name=vm_['name'], + tags=spot_request_tags, + instance_id=sir_id, + call='action', + location=location + ) + network_interfaces = config.get_cloud_config_value( 'network_interfaces', vm_, @@ -4782,7 +4844,7 @@ def get_password_data( rsa_key = kwargs['key'] pwdata = base64.b64decode(pwdata) if HAS_M2: - key = RSA.load_key_string(rsa_key) + key = RSA.load_key_string(rsa_key.encode('ascii')) password = key.private_decrypt(pwdata, RSA.pkcs1_padding) else: dsize = Crypto.Hash.SHA.digest_size diff --git a/salt/cloud/clouds/gce.py b/salt/cloud/clouds/gce.py index 75109491be..dbd51e6c1f 100644 --- a/salt/cloud/clouds/gce.py +++ b/salt/cloud/clouds/gce.py @@ -2374,21 +2374,30 @@ def destroy(vm_name, call=None): def create_attach_volumes(name, kwargs, call=None): ''' + .. versionadded:: 2017.7.0 + Create and attach multiple volumes to a node. The 'volumes' and 'node' arguments are required, where 'node' is a libcloud node, and 'volumes' is a list of maps, where each map contains: - 'size': The size of the new disk in GB. Required. - 'type': The disk type, either pd-standard or pd-ssd. Optional, defaults to pd-standard. - 'image': An image to use for this new disk. Optional. - 'snapshot': A snapshot to use for this new disk. Optional. - 'auto_delete': An option(bool) to keep or remove the disk upon - instance deletion. Optional, defaults to False. + size + The size of the new disk in GB. Required. + + type + The disk type, either pd-standard or pd-ssd. Optional, defaults to pd-standard. + + image + An image to use for this new disk. Optional. + + snapshot + A snapshot to use for this new disk. Optional. + + auto_delete + An option(bool) to keep or remove the disk upon instance deletion. + Optional, defaults to False. Volumes are attached in the order in which they are given, thus on a new node the first volume will be /dev/sdb, the second /dev/sdc, and so on. - - .. versionadded:: 2017.7.0 ''' if call != 'action': raise SaltCloudSystemExit( diff --git a/salt/cloud/clouds/oneandone.py b/salt/cloud/clouds/oneandone.py index de1cb1436f..922c2b7ba3 100644 --- a/salt/cloud/clouds/oneandone.py +++ b/salt/cloud/clouds/oneandone.py @@ -3,18 +3,14 @@ 1&1 Cloud Server Module ======================= -======= -The 1&1 SaltStack cloud module allows a 1&1 server to -be automatically deployed and bootstrapped with Salt. -It also has functions to create block storages -and ssh keys. +The 1&1 SaltStack cloud module allows a 1&1 server to be automatically deployed +and bootstrapped with Salt. It also has functions to create block storages and +ssh keys. :depends: 1and1 >= 1.2.0 -The module requires the 1&1 api_token to be provided. -The server should also be assigned a public LAN, a private LAN, -or both along with SSH key pairs. -... +The module requires the 1&1 api_token to be provided. The server should also +be assigned a public LAN, a private LAN, or both along with SSH key pairs. Set up the cloud configuration at ``/etc/salt/cloud.providers`` or ``/etc/salt/cloud.providers.d/oneandone.conf``: diff --git a/salt/cloud/clouds/opennebula.py b/salt/cloud/clouds/opennebula.py index f46b745af2..67831476c0 100644 --- a/salt/cloud/clouds/opennebula.py +++ b/salt/cloud/clouds/opennebula.py @@ -971,7 +971,7 @@ def create(vm_): vm\_ The dictionary use to create a VM. - Optional vm_ dict options for overwriting template: + Optional vm\_ dict options for overwriting template: region_id Optional - OpenNebula Zone ID diff --git a/salt/cloud/clouds/openstack.py b/salt/cloud/clouds/openstack.py index 0ac8ec21b5..2a5786cf54 100644 --- a/salt/cloud/clouds/openstack.py +++ b/salt/cloud/clouds/openstack.py @@ -542,7 +542,7 @@ def list_subnets(conn=None, call=None, kwargs=None): network network to list subnets of - .. code-block:: + .. code-block:: bash salt-cloud -f list_subnets myopenstack network=salt-net diff --git a/salt/cloud/clouds/virtualbox.py b/salt/cloud/clouds/virtualbox.py index 66cfd9ade6..fb833c50b7 100644 --- a/salt/cloud/clouds/virtualbox.py +++ b/salt/cloud/clouds/virtualbox.py @@ -114,27 +114,33 @@ def map_clonemode(vm_info): def create(vm_info): - """ - Creates a virtual machine from the given VM information. - This is what is used to request a virtual machine to be created by the - cloud provider, wait for it to become available, - and then (optionally) log in and install Salt on it. + ''' + Creates a virtual machine from the given VM information - Fires: - "starting create" : This event is tagged salt/cloud//creating. - The payload contains the names of the VM, profile and provider. + This is what is used to request a virtual machine to be created by the + cloud provider, wait for it to become available, and then (optionally) log + in and install Salt on it. + + Events fired: + + This function fires the event ``salt/cloud/vm_name/creating``, with the + payload containing the names of the VM, profile, and provider. @param vm_info - { - name: - profile: - driver: : - clonefrom: - clonemode: (default: state, choices: state, child, all) - } + + .. code-block:: text + + { + name: + profile: + driver: : + clonefrom: + clonemode: (default: state, choices: state, child, all) + } + @type vm_info dict @return dict of resulting vm. !!!Passwords can and should be included!!! - """ + ''' try: # Check for required profile parameters before sending any API calls. if vm_info['profile'] and config.is_profile_configured( diff --git a/salt/cloud/clouds/vmware.py b/salt/cloud/clouds/vmware.py index 0984535bcb..2405485cdb 100644 --- a/salt/cloud/clouds/vmware.py +++ b/salt/cloud/clouds/vmware.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +# pylint: disable=C0302 ''' VMware Cloud Module =================== @@ -116,8 +117,8 @@ configuration, run :py:func:`test_vcenter_connection` # Import python libs from __future__ import absolute_import, print_function, unicode_literals from random import randint -from re import findall, split, search, compile import pprint +import re import logging import time import os.path @@ -140,14 +141,14 @@ try: # Attempt to import pyVmomi libs from pyVmomi import vim HAS_PYVMOMI = True -except Exception: +except ImportError: HAS_PYVMOMI = False # Disable InsecureRequestWarning generated on python > 2.6 try: from requests.packages.urllib3 import disable_warnings # pylint: disable=no-name-in-module disable_warnings() -except Exception: +except ImportError: pass ESX_5_5_NAME_PORTION = 'VMware ESXi 5.5' @@ -272,7 +273,14 @@ def _edit_existing_hard_disk_helper(disk, size_kb=None, size_gb=None, mode=None) return disk_spec -def _add_new_hard_disk_helper(disk_label, size_gb, unit_number, controller_key=1000, thin_provision=False, eagerly_scrub=False, datastore=None, vm_name=None): +def _add_new_hard_disk_helper(disk_label, + size_gb, + unit_number, + controller_key=1000, + thin_provision=False, + eagerly_scrub=False, + datastore=None, + vm_name=None): random_key = randint(-2099, -2000) size_kb = int(size_gb * 1024.0 * 1024.0) @@ -334,7 +342,11 @@ def _add_new_hard_disk_helper(disk_label, size_gb, unit_number, controller_key=1 return disk_spec -def _edit_existing_network_adapter(network_adapter, new_network_name, adapter_type, switch_type, container_ref=None): +def _edit_existing_network_adapter(network_adapter, + new_network_name, + adapter_type, + switch_type, + container_ref=None): adapter_type.strip().lower() switch_type.strip().lower() @@ -406,7 +418,12 @@ def _edit_existing_network_adapter(network_adapter, new_network_name, adapter_ty return network_spec -def _add_new_network_adapter_helper(network_adapter_label, network_name, adapter_type, switch_type, mac, container_ref=None): +def _add_new_network_adapter_helper(network_adapter_label, + network_name, + adapter_type, + switch_type, + mac, + container_ref=None): random_key = randint(-4099, -4000) adapter_type.strip().lower() @@ -483,7 +500,9 @@ def _edit_existing_scsi_controller(scsi_controller, bus_sharing): return scsi_spec -def _add_new_scsi_controller_helper(scsi_controller_label, properties, bus_number): +def _add_new_scsi_controller_helper(scsi_controller_label, + properties, + bus_number): random_key = randint(-1050, -1000) adapter_type = properties['type'].strip().lower() if 'type' in properties else None bus_sharing = properties['bus_sharing'].strip().lower() if 'bus_sharing' in properties else None @@ -530,7 +549,9 @@ def _add_new_scsi_controller_helper(scsi_controller_label, properties, bus_numbe return scsi_spec -def _add_new_ide_controller_helper(ide_controller_label, controller_key, bus_number): +def _add_new_ide_controller_helper(ide_controller_label, + controller_key, + bus_number): ''' Helper function for adding new IDE controllers @@ -595,7 +616,11 @@ def _edit_existing_cd_or_dvd_drive(drive, device_type, mode, iso_path): return drive_spec -def _add_new_cd_or_dvd_drive_helper(drive_label, controller_key, device_type, mode, iso_path): +def _add_new_cd_or_dvd_drive_helper(drive_label, + controller_key, + device_type, + mode, + iso_path): random_key = randint(-3025, -3000) device_type.strip().lower() @@ -743,7 +768,9 @@ def _manage_devices(devices, vm=None, container_ref=None, new_vm_name=None): if disk_spec is not None: device_specs.append(disk_spec) - elif isinstance(device.backing, vim.vm.device.VirtualEthernetCard.NetworkBackingInfo) or isinstance(device.backing, vim.vm.device.VirtualEthernetCard.DistributedVirtualPortBackingInfo): + elif isinstance(device.backing, ( + vim.vm.device.VirtualEthernetCard.NetworkBackingInfo, + vim.vm.device.VirtualEthernetCard.DistributedVirtualPortBackingInfo)): # this is a network adapter if 'network' in list(devices.keys()): # there is atleast one network adapter specified to be created/configured @@ -851,7 +878,15 @@ def _manage_devices(devices, vm=None, container_ref=None, new_vm_name=None): thin_provision = bool(devices['disk'][disk_label]['thin_provision']) if 'thin_provision' in devices['disk'][disk_label] else False eagerly_scrub = bool(devices['disk'][disk_label]['eagerly_scrub']) if 'eagerly_scrub' in devices['disk'][disk_label] else False datastore = devices['disk'][disk_label].get('datastore', None) - disk_spec = _add_new_hard_disk_helper(disk_label, size_gb, unit_number, thin_provision=thin_provision, eagerly_scrub=eagerly_scrub, datastore=datastore, vm_name=new_vm_name) + disk_spec = _add_new_hard_disk_helper( + disk_label, + size_gb, + unit_number, + thin_provision=thin_provision, + eagerly_scrub=eagerly_scrub, + datastore=datastore, + vm_name=new_vm_name + ) # when creating both SCSI controller and Hard disk at the same time we need the randomly # assigned (temporary) key of the newly created SCSI controller @@ -897,7 +932,13 @@ def _manage_devices(devices, vm=None, container_ref=None, new_vm_name=None): cd_drive_label ) else: - cd_drive_spec = _add_new_cd_or_dvd_drive_helper(cd_drive_label, controller_key, device_type, mode, iso_path) + cd_drive_spec = _add_new_cd_or_dvd_drive_helper( + cd_drive_label, + controller_key, + device_type, + mode, + iso_path + ) device_specs.append(cd_drive_spec) ide_controllers[controller_key] += 1 @@ -958,11 +999,7 @@ def _valid_ip(ip_address): first_octet, second_octet, third_octet, fourth_octet = octets # Check first_octet meets conditions - if first_octet < 1: - return False - elif first_octet > 223: - return False - elif first_octet == 127: + if first_octet < 1 or first_octet > 223 or first_octet == 127: return False # Check 169.254.X.X condition @@ -988,10 +1025,9 @@ def _wait_for_ip(vm_ref, max_wait): resolved_ips = salt.utils.network.host_to_ips(vm_name) log.debug("Timeout waiting for VMware tools. The name %s resolved " "to %s", vm_name, resolved_ips) - if isinstance(resolved_ips, list) and len(resolved_ips): + if isinstance(resolved_ips, list) and resolved_ips: return resolved_ips[0] - else: - return False + return False time_counter = 0 starttime = time.time() while time_counter < max_wait_ip: @@ -1057,17 +1093,27 @@ def _wait_for_host(host_ref, task_type, sleep_seconds=5, log_level='debug'): def _format_instance_info_select(vm, selection): + def defaultto(machine, section, default='N/A'): + ''' + Return either a named value from a VirtualMachineConfig or a + default string "N/A". + ''' + return default if section not in machine else machine[section] + vm_select_info = {} if 'id' in selection: vm_select_info['id'] = vm["name"] if 'image' in selection: - vm_select_info['image'] = "{0} (Detected)".format(vm["config.guestFullName"]) if "config.guestFullName" in vm else "N/A" + vm_select_info['image'] = "{0} (Detected)".format( + defaultto(vm, "config.guestFullName")) if 'size' in selection: - cpu = vm["config.hardware.numCPU"] if "config.hardware.numCPU" in vm else "N/A" - ram = "{0} MB".format(vm["config.hardware.memoryMB"]) if "config.hardware.memoryMB" in vm else "N/A" + cpu = defaultto(vm, "config.hardware.numCPU") + ram = "{0} MB".format( + defaultto(vm, "config.hardware.memoryMB") + ) vm_select_info['size'] = "cpu: {0}\nram: {1}".format(cpu, ram) vm_select_info['size_dict'] = { 'cpu': cpu, @@ -1075,19 +1121,23 @@ def _format_instance_info_select(vm, selection): } if 'state' in selection: - vm_select_info['state'] = six.text_type(vm["summary.runtime.powerState"]) if "summary.runtime.powerState" in vm else "N/A" + vm_select_info['state'] = six.text_type( + defaultto(vm, "summary.runtime.powerState") + ) if 'guest_id' in selection: - vm_select_info['guest_id'] = vm["config.guestId"] if "config.guestId" in vm else "N/A" + vm_select_info['guest_id'] = defaultto(vm, "config.guestId") if 'hostname' in selection: vm_select_info['hostname'] = vm["object"].guest.hostName if 'path' in selection: - vm_select_info['path'] = vm["config.files.vmPathName"] if "config.files.vmPathName" in vm else "N/A" + vm_select_info['path'] = defaultto(vm, "config.files.vmPathName") if 'tools_status' in selection: - vm_select_info['tools_status'] = six.text_type(vm["guest.toolsStatus"]) if "guest.toolsStatus" in vm else "N/A" + vm_select_info['tools_status'] = six.text_type( + defaultto(vm, "guest.toolsStatus") + ) if 'private_ips' in selection or 'networks' in selection: network_full_info = {} @@ -1108,7 +1158,8 @@ def _format_instance_info_select(vm, selection): if 'networks' in selection: vm_select_info['networks'] = network_full_info - if 'devices' in selection or 'mac_address' in selection or 'mac_addresses' in selection: + if any(x in ['devices', 'mac_address', 'mac_addresses'] + for x in selection): device_full_info = {} device_mac_addresses = [] if "config.hardware.device" in vm: @@ -1169,13 +1220,13 @@ def _format_instance_info_select(vm, selection): if 'files' in selection: file_full_info = {} - if "layoutEx.file" in file: # pylint: disable=E1135 - for file in vm["layoutEx.file"]: - file_full_info[file.key] = { - 'key': file.key, - 'name': file.name, - 'size': file.size, - 'type': file.type + if "layoutEx.file" in vm: + for filename in vm["layoutEx.file"]: + file_full_info[filename.key] = { + 'key': filename.key, + 'name': filename.name, + 'size': filename.size, + 'type': filename.type } vm_select_info['files'] = file_full_info @@ -1235,12 +1286,12 @@ def _format_instance_info(vm): file_full_info = {} if "layoutEx.file" in vm: - for file in vm["layoutEx.file"]: - file_full_info[file.key] = { - 'key': file.key, - 'name': file.name, - 'size': file.size, - 'type': file.type + for filename in vm["layoutEx.file"]: + file_full_info[filename.key] = { + 'key': filename.key, + 'name': filename.name, + 'size': filename.size, + 'type': filename.type } network_full_info = {} @@ -1309,11 +1360,13 @@ def _get_snapshots(snapshot_list, current_snapshot=None, parent_snapshot_path="" def _get_snapshot_ref_helper(base_snapshot, snapshot_name): if base_snapshot.name == snapshot_name: return base_snapshot - else: - for snapshot in base_snapshot.childSnapshotList: - snapshot_ref = _get_snapshot_ref_helper(snapshot, snapshot_name) - if snapshot_ref is not None: - return snapshot_ref + + for snapshot in base_snapshot.childSnapshotList: + snapshot_ref = _get_snapshot_ref_helper(snapshot, snapshot_name) + if snapshot_ref is not None: + return snapshot_ref + + return None def _get_snapshot_ref_by_name(vm_ref, snapshot_name): @@ -1333,26 +1386,22 @@ def _upg_tools_helper(vm, reboot=False): # Exit if template if vm.config.template: status = 'VMware tools cannot be updated on a template' - return status # Exit if VMware tools is already up to date - if vm.guest.toolsStatus == "toolsOk": + elif vm.guest.toolsStatus == "toolsOk": status = 'VMware tools is already up to date' - return status # Exit if VM is not powered on - if vm.summary.runtime.powerState != "poweredOn": + elif vm.summary.runtime.powerState != "poweredOn": status = 'VM must be powered on to upgrade tools' - return status # Exit if VMware tools is either not running or not installed - if vm.guest.toolsStatus in ["toolsNotRunning", "toolsNotInstalled"]: + elif vm.guest.toolsStatus in ["toolsNotRunning", "toolsNotInstalled"]: status = 'VMware tools is either not running or not installed' - return status # If vmware tools is out of date, check major OS family # Upgrade tools on Linux and Windows guests - if vm.guest.toolsStatus == "toolsOld": + elif vm.guest.toolsStatus == "toolsOld": log.info('Upgrading VMware tools on %s', vm.name) try: if vm.guest.guestFamily == "windowsGuest" and not reboot: @@ -1361,8 +1410,7 @@ def _upg_tools_helper(vm, reboot=False): elif vm.guest.guestFamily in ["linuxGuest", "windowsGuest"]: task = vm.UpgradeTools() else: - status = 'Only Linux and Windows guests are currently supported' - return status + return 'Only Linux and Windows guests are currently supported' salt.utils.vmware.wait_for_task(task, vm.name, 'tools upgrade', @@ -1375,15 +1423,19 @@ def _upg_tools_helper(vm, reboot=False): # Show the traceback if the debug logging level is enabled exc_info_on_loglevel=logging.DEBUG ) - status = 'VMware tools upgrade failed' - return status + return 'VMware tools upgrade failed' status = 'VMware tools upgrade succeeded' - return status + else: + status = 'VMWare tools could not be upgraded' - return 'VMware tools could not be upgraded' + return status def _get_hba_type(hba_type): + ''' + Convert a string representation of a HostHostBusAdapter into an + object reference. + ''' if hba_type == "parallel": return vim.host.ParallelScsiHba elif hba_type == "block": @@ -1393,6 +1445,8 @@ def _get_hba_type(hba_type): elif hba_type == "fibre": return vim.host.FibreChannelHba + raise ValueError('Unknown Host Bus Adapter Type') + def test_vcenter_connection(kwargs=None, call=None): ''' @@ -1857,6 +1911,8 @@ def show_instance(name, call=None): if vm['name'] == name: return _format_instance_info(vm) + return {} + def avail_images(call=None): ''' @@ -2379,10 +2435,11 @@ def create(vm_): ''' try: # Check for required profile parameters before sending any API calls. - if vm_['profile'] and config.is_profile_configured(__opts__, - __active_provider_name__ or 'vmware', - vm_['profile'], - vm_=vm_) is False: + if (vm_['profile'] and + config.is_profile_configured(__opts__, + __active_provider_name__ or 'vmware', + vm_['profile'], + vm_=vm_) is False): return False except AttributeError: pass @@ -2491,11 +2548,20 @@ def create(vm_): if 'clonefrom' in vm_: # If datacenter is specified, set the container reference to start search from it instead if datacenter: - datacenter_ref = salt.utils.vmware.get_mor_by_property(si, vim.Datacenter, datacenter) + datacenter_ref = salt.utils.vmware.get_mor_by_property( + si, + vim.Datacenter, + datacenter + ) container_ref = datacenter_ref if datacenter_ref else None # Clone VM/template from specified VM/template - object_ref = salt.utils.vmware.get_mor_by_property(si, vim.VirtualMachine, vm_['clonefrom'], container_ref=container_ref) + object_ref = salt.utils.vmware.get_mor_by_property( + si, + vim.VirtualMachine, + vm_['clonefrom'], + container_ref=container_ref + ) if object_ref: clone_type = "template" if object_ref.config.template else "vm" else: @@ -2508,13 +2574,23 @@ def create(vm_): # Either a cluster, or a resource pool must be specified when cloning from template or creating. if resourcepool: - resourcepool_ref = salt.utils.vmware.get_mor_by_property(si, vim.ResourcePool, resourcepool, container_ref=container_ref) + resourcepool_ref = salt.utils.vmware.get_mor_by_property( + si, + vim.ResourcePool, + resourcepool, + container_ref=container_ref + ) if not resourcepool_ref: log.error("Specified resource pool: '%s' does not exist", resourcepool) if not clone_type or clone_type == "template": raise SaltCloudSystemExit('You must specify a resource pool that exists.') elif cluster: - cluster_ref = salt.utils.vmware.get_mor_by_property(si, vim.ClusterComputeResource, cluster, container_ref=container_ref) + cluster_ref = salt.utils.vmware.get_mor_by_property( + si, + vim.ClusterComputeResource, + cluster, + container_ref=container_ref + ) if not cluster_ref: log.error("Specified cluster: '%s' does not exist", cluster) if not clone_type or clone_type == "template": @@ -2539,7 +2615,12 @@ def create(vm_): search_reference = container_ref for folder_part in folder_parts: if folder_part: - folder_ref = salt.utils.vmware.get_mor_by_property(si, vim.Folder, folder_part, container_ref=search_reference) + folder_ref = salt.utils.vmware.get_mor_by_property( + si, + vim.Folder, + folder_part, + container_ref=search_reference + ) search_reference = folder_ref if not folder_ref: log.error("Specified folder: '%s' does not exist", folder) @@ -2570,7 +2651,12 @@ def create(vm_): # Either a datastore/datastore cluster can be optionally specified. # If not specified, the current datastore is used. if datastore: - datastore_ref = salt.utils.vmware.get_mor_by_property(si, vim.Datastore, datastore, container_ref=container_ref) + datastore_ref = salt.utils.vmware.get_mor_by_property( + si, + vim.Datastore, + datastore, + container_ref=container_ref + ) if datastore_ref: # specific datastore has been specified reloc_spec.datastore = datastore_ref @@ -2584,7 +2670,12 @@ def create(vm_): log.debug("Using datastore used by the %s %s", clone_type, vm_['clonefrom']) if host: - host_ref = salt.utils.vmware.get_mor_by_property(si, vim.HostSystem, host, container_ref=container_ref) + host_ref = salt.utils.vmware.get_mor_by_property( + si, + vim.HostSystem, + host, + container_ref=container_ref + ) if host_ref: reloc_spec.host = host_ref else: @@ -2595,12 +2686,21 @@ def create(vm_): 'You must specify a datastore when creating not cloning.' ) else: - datastore_ref = salt.utils.vmware.get_mor_by_property(si, vim.Datastore, datastore) + datastore_ref = salt.utils.vmware.get_mor_by_property( + si, + vim.Datastore, + datastore + ) if not datastore_ref: raise SaltCloudSystemExit("Specified datastore: '{0}' does not exist".format(datastore)) if host: - host_ref = salt.utils.vmware.get_mor_by_property(_get_si(), vim.HostSystem, host, container_ref=container_ref) + host_ref = salt.utils.vmware.get_mor_by_property( + _get_si(), + vim.HostSystem, + host, + container_ref=container_ref + ) if not host_ref: log.error("Specified host: '%s' does not exist", host) @@ -2633,7 +2733,8 @@ def create(vm_): if memory: try: - memory_num, memory_unit = findall(r"[^\W\d_]+|\d+.\d+|\d+", memory) + memory_num, memory_unit = re.findall(r"[^\W\d_]+|\d+.\d+|\d+", + memory) if memory_unit.lower() == "mb": memory_mb = int(memory_num) elif memory_unit.lower() == "gb": @@ -2681,18 +2782,22 @@ def create(vm_): if 'dns_servers' in list(vm_.keys()): global_ip.dnsServerList = vm_['dns_servers'] - non_hostname_chars = compile(r'[^\w-]') - if search(non_hostname_chars, vm_name): - hostName = split(non_hostname_chars, vm_name, maxsplit=1)[0] - domainName = split(non_hostname_chars, vm_name, maxsplit=1)[-1] + non_hostname_chars = re.compile(r'[^\w-]') + if re.search(non_hostname_chars, vm_name): + host_name = re.split(non_hostname_chars, + vm_name, + maxsplit=1)[0] + domain_name = re.split(non_hostname_chars, + vm_name, + maxsplit=1)[-1] else: - hostName = vm_name - domainName = domain + host_name = vm_name + domain_name = domain if 'Windows' not in object_ref.config.guestFullName: identity = vim.vm.customization.LinuxPrep() - identity.hostName = vim.vm.customization.FixedName(name=hostName) - identity.domain = domainName + identity.hostName = vim.vm.customization.FixedName(name=host_name) + identity.domain = domain_name else: identity = vim.vm.customization.Sysprep() identity.guiUnattended = vim.vm.customization.GuiUnattended() @@ -2705,7 +2810,7 @@ def create(vm_): identity.userData.fullName = win_user_fullname identity.userData.orgName = win_organization_name identity.userData.computerName = vim.vm.customization.FixedName() - identity.userData.computerName.name = hostName + identity.userData.computerName.name = host_name identity.identification = vim.vm.customization.Identification() custom_spec = vim.vm.customization.Specification( globalIPSettings=global_ip, @@ -2806,7 +2911,7 @@ def create(vm_): # if specified, prefer ssh_host to the discovered ip address if 'ssh_host' not in vm_: vm_['ssh_host'] = ip - log.info("[ {0} ] Deploying to {1}".format(vm_name, vm_['ssh_host'])) + log.info("[ %s ] Deploying to %s", vm_name, vm_['ssh_host']) out = __utils__['cloud.bootstrap'](vm_, __opts__) @@ -2872,8 +2977,8 @@ def get_clonespec_for_valid_snapshot(config_spec, object_ref, reloc_spec, templa if moving: return build_clonespec(config_spec, object_ref, reloc_spec, template) - else: - return None + + return None def build_clonespec(config_spec, object_ref, reloc_spec, template): @@ -2887,12 +2992,12 @@ def build_clonespec(config_spec, object_ref, reloc_spec, template): config=config_spec, snapshot=object_ref.snapshot.currentSnapshot ) - else: - return vim.vm.CloneSpec( - template=template, - location=reloc_spec, - config=config_spec - ) + + return vim.vm.CloneSpec( + template=template, + location=reloc_spec, + config=config_spec + ) def create_datacenter(kwargs=None, call=None): @@ -3553,8 +3658,8 @@ def create_folder(kwargs=None, call=None): if path_exists: return {inventory_path: 'specfied path already exists'} - else: - return {inventory_path: 'created the specified path'} + + return {inventory_path: 'created the specified path'} def create_snapshot(name, kwargs=None, call=None): @@ -3757,10 +3862,11 @@ def remove_snapshot(name, kwargs=None, call=None): return 'failed to remove snapshot' if vm_ref.snapshot: - return {'Snapshot removed successfully': _get_snapshots(vm_ref.snapshot.rootSnapshotList, - vm_ref.snapshot.currentSnapshot)} - else: - return 'Snapshots removed successfully' + return {'Snapshot removed successfully': + _get_snapshots(vm_ref.snapshot.rootSnapshotList, + vm_ref.snapshot.currentSnapshot)} + + return 'Snapshots removed successfully' def remove_all_snapshots(name, kwargs=None, call=None): @@ -3785,9 +3891,10 @@ def remove_all_snapshots(name, kwargs=None, call=None): 'The remove_all_snapshots action must be called with ' '-a or --action.' ) - connection = _str_to_bool(kwargs.get('merge_snapshots')) if kwargs and 'merge_snapshots' in kwargs else True - vm_ref = salt.utils.vmware.get_mor_by_property(_get_si(), vim.VirtualMachine, name) + vm_ref = salt.utils.vmware.get_mor_by_property(_get_si(), + vim.VirtualMachine, + name) try: task = vm_ref.RemoveAllSnapshots() @@ -3799,9 +3906,9 @@ def remove_all_snapshots(name, kwargs=None, call=None): # Show the traceback if the debug logging level is enabled exc_info_on_loglevel=logging.DEBUG ) - return 'failed to remove snapshots' + return 'Failed to remove snapshots' - return 'removed all snapshots' + return 'Removed all snapshots' def convert_to_template(name, kwargs=None, call=None): @@ -3950,11 +4057,28 @@ def add_host(kwargs=None, call=None): spec.sslThumbprint = host_ssl_thumbprint else: log.warning('SSL thumbprint has not been specified in provider configuration') + # This smells like a not-so-good idea. A plenty of VMWare VCenters + # do not listen to the default port 443. try: log.debug('Trying to get the SSL thumbprint directly from the host system') - p1 = subprocess.Popen(('echo', '-n'), stdout=subprocess.PIPE, stderr=subprocess.PIPE) - p2 = subprocess.Popen(('openssl', 's_client', '-connect', '{0}:443'.format(host_name)), stdin=p1.stdout, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - p3 = subprocess.Popen(('openssl', 'x509', '-noout', '-fingerprint', '-sha1'), stdin=p2.stdout, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p1 = subprocess.Popen(('echo', '-n'), + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + p2 = subprocess.Popen(('openssl', + 's_client', + '-connect', + '{0}:443'.format(host_name)), + stdin=p1.stdout, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + p3 = subprocess.Popen(('openssl', + 'x509', + '-noout', + '-fingerprint', + '-sha1'), + stdin=p2.stdout, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) out = salt.utils.stringutils.to_str(p3.stdout.read()) ssl_thumbprint = out.split('=')[-1].strip() log.debug('SSL thumbprint received from the host system: %s', ssl_thumbprint) @@ -3980,7 +4104,7 @@ def add_host(kwargs=None, call=None): if isinstance(exc, vim.fault.SSLVerifyFault): log.error('Authenticity of the host\'s SSL certificate is not verified') log.info('Try again after setting the esxi_host_ssl_thumbprint ' - 'to %s in provider configuration', exc.thumbprint) + 'to %s in provider configuration', spec.sslThumbprint) log.error( 'Error while adding host %s: %s', host_name, exc, diff --git a/salt/cloud/exceptions.py b/salt/cloud/exceptions.py index 842fcbd9d7..e482697b4c 100644 --- a/salt/cloud/exceptions.py +++ b/salt/cloud/exceptions.py @@ -5,7 +5,7 @@ Salt cloud related exceptions. - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) ''' from __future__ import absolute_import, print_function, unicode_literals diff --git a/salt/config/__init__.py b/salt/config/__init__.py index a0474a402a..d072724714 100644 --- a/salt/config/__init__.py +++ b/salt/config/__init__.py @@ -1091,6 +1091,8 @@ VALID_OPTS = { 'proxy_username': six.string_types, 'proxy_password': six.string_types, 'proxy_port': int, + # Exclude list of hostnames from proxy + 'no_proxy': list, # Minion de-dup jid cache max size 'minion_jid_queue_hwm': int, @@ -1775,6 +1777,7 @@ DEFAULT_MASTER_OPTS = { 'syndic_jid_forward_cache_hwm': 100, 'regen_thin': False, 'ssh_passwd': '', + 'ssh_priv_passwd': '', 'ssh_port': '22', 'ssh_sudo': False, 'ssh_sudo_user': '', @@ -2785,6 +2788,8 @@ def cloud_config(path, env_var='SALT_CLOUD_CONFIG', defaults=None, # prepend root_dir prepend_root_dirs = ['cachedir'] + if 'log_file' in opts and urlparse(opts['log_file']).scheme == '': + prepend_root_dirs.append(opts['log_file']) prepend_root_dir(opts, prepend_root_dirs) # Return the final options @@ -3345,7 +3350,7 @@ def get_cloud_config_value(name, vm_, opts, default=None, search_global=True): return value -def is_provider_configured(opts, provider, required_keys=(), log_message=True): +def is_provider_configured(opts, provider, required_keys=(), log_message=True, aliases=()): ''' Check and return the first matching and fully configured cloud provider configuration. @@ -3373,7 +3378,7 @@ def is_provider_configured(opts, provider, required_keys=(), log_message=True): for alias, drivers in six.iteritems(opts['providers']): for driver, provider_details in six.iteritems(drivers): - if driver != provider: + if driver != provider and driver not in aliases: continue # If we reached this far, we have a matching provider, let's see if diff --git a/salt/config/schemas/__init__.py b/salt/config/schemas/__init__.py index 5d301f75ba..f2091c23eb 100644 --- a/salt/config/schemas/__init__.py +++ b/salt/config/schemas/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.config.schemas ~~~~~~~~~~~~~~~~~~~ diff --git a/salt/config/schemas/common.py b/salt/config/schemas/common.py index 2917b81d71..62c4f3e0ed 100644 --- a/salt/config/schemas/common.py +++ b/salt/config/schemas/common.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.config.schemas.common diff --git a/salt/config/schemas/minion.py b/salt/config/schemas/minion.py index ac0068d5df..f98e44b7bd 100644 --- a/salt/config/schemas/minion.py +++ b/salt/config/schemas/minion.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.config.schemas.minion ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/salt/config/schemas/ssh.py b/salt/config/schemas/ssh.py index a218a1d285..8f38d6b659 100644 --- a/salt/config/schemas/ssh.py +++ b/salt/config/schemas/ssh.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.config.schemas.ssh @@ -54,6 +54,9 @@ class RosterEntryConfig(Schema): priv = StringItem(title='Private Key', description='File path to ssh private key, defaults to salt-ssh.rsa', min_length=1) + priv_passwd = SecretItem(title='Private Key passphrase', + description='Passphrase for private key file', + min_length=1) passwd_or_priv_requirement = AnyOfItem(items=(RequirementsItem(requirements=['passwd']), RequirementsItem(requirements=['priv'])))(flatten=True) sudo = BooleanItem(title='Sudo', diff --git a/salt/engines/ircbot.py b/salt/engines/ircbot.py index e22bbf3e40..e112a1e046 100644 --- a/salt/engines/ircbot.py +++ b/salt/engines/ircbot.py @@ -6,7 +6,7 @@ IRC Bot engine Example Configuration -.. code:: yaml +.. code-block:: yaml engines: - ircbot: @@ -26,7 +26,7 @@ Example Configuration allow_nicks: - gtmanfred -Available commands on irc are +Available commands on irc are: ping return pong diff --git a/salt/engines/junos_syslog.py b/salt/engines/junos_syslog.py index 40624880ee..6a3611ad72 100644 --- a/salt/engines/junos_syslog.py +++ b/salt/engines/junos_syslog.py @@ -27,27 +27,29 @@ of the following fields: 9. pid 10. raw (the raw event data forwarded from the device) -The topic title can consist of any of the combination of above fields, -but the topic has to start with 'jnpr/syslog'. -So, we can have different combinations: - - jnpr/syslog/hostip/daemon/event - - jnpr/syslog/daemon/severity +The topic title can consist of any of the combination of above fields, but the +topic has to start with ``jnpr/syslog``. Here are a couple example +combinations: + +- jnpr/syslog/hostip/daemon/event +- jnpr/syslog/daemon/severity The corresponding dynamic topic sent on salt event bus would look something like: - - jnpr/syslog/1.1.1.1/mgd/UI_COMMIT_COMPLETED - - jnpr/syslog/sshd/7 -The default topic title is 'jnpr/syslog/hostname/event'. +- jnpr/syslog/1.1.1.1/mgd/UI_COMMIT_COMPLETED +- jnpr/syslog/sshd/7 -The user can choose the type of data he/she wants of the event bus. -Like, if one wants only events pertaining to a particular daemon, he/she can -specify that in the configuration file: +The default topic title is ``jnpr/syslog/hostname/event``. + +One can choose the type of data they want from the event bus. For example, if +one wants only events pertaining to a particular daemon, this can be specified +in the configuration file: .. code-block:: yaml daemon: mgd -One can even have a list of daemons like: +One can even have a list of daemons: .. code-block:: yaml @@ -70,15 +72,15 @@ Example configuration (to be written in master config file) For junos_syslog engine to receive events, syslog must be set on the junos device. This can be done via following configuration: -.. code-block:: shell +.. code-block:: text set system syslog host port 516 any any Below is a sample syslog event which is received from the junos device: -.. code-block:: shell +.. code-block:: text - '<30>May 29 05:18:12 bng-ui-vm-9 mspd[1492]: No chassis configuration found' + <30>May 29 05:18:12 bng-ui-vm-9 mspd[1492]: No chassis configuration found The source for parsing the syslog messages is taken from: https://gist.github.com/leandrosilva/3651640#file-xlog-py diff --git a/salt/engines/napalm_syslog.py b/salt/engines/napalm_syslog.py index 947131da5d..f0cc02b7b9 100644 --- a/salt/engines/napalm_syslog.py +++ b/salt/engines/napalm_syslog.py @@ -65,7 +65,7 @@ Event example: .. code-block:: json - napalm/syslog/junos/BGP_PREFIX_THRESH_EXCEEDED/vmx01 { + { "_stamp": "2017-05-26T10:03:18.653045", "error": "BGP_PREFIX_THRESH_EXCEEDED", "host": "vmx01", @@ -118,17 +118,18 @@ Event example: "timestamp": "1495741841" } -To consume the events and eventually react and deploy a configuration -changes on the device(s) firing the event, one is able to -identify the minion ID, using one of the following alternatives, but not limited to: +To consume the events and eventually react and deploy a configuration changes +on the device(s) firing the event, one is able to identify the minion ID, using +one of the following alternatives, but not limited to: - :mod:`Host grains ` to match the event tag - :mod:`Host DNS grain ` to match the IP address in the event data - :mod:`Hostname grains ` to match the event tag - :ref:`Define static grains ` - :ref:`Write a grains module ` -- :ref:`Targeting minions using pillar data ` -- the user -can insert certain information in the pillar and then use it to identify minions +- :ref:`Targeting minions using pillar data ` - The user can + configure certain information in the Pillar data and then use it to identify + minions Master configuration example, to match the event and react: diff --git a/salt/engines/slack.py b/salt/engines/slack.py index e664bbee03..d58eaaeec7 100644 --- a/salt/engines/slack.py +++ b/salt/engines/slack.py @@ -18,10 +18,11 @@ the saltmaster's minion pillar. .. versionadded: 2016.3.0 -:configuration: Example configuration using only a 'default' group. The default group is not special. -In addition, other groups are being loaded from pillars. +:configuration: Example configuration using only a 'default' group. The default + group is not special. In addition, other groups are being loaded from + pillars. -.. code-block:: yaml +.. code-block:: text engines: - slack: @@ -42,7 +43,7 @@ In addition, other groups are being loaded from pillars. list_jobs: cmd: jobs.list_jobs list_commands: - cmd: pillar.get salt:engines:slack:valid_commands target=saltmaster tgt_type=list + cmd: 'pillar.get salt:engines:slack:valid_commands target=saltmaster tgt_type=list' default_target: target: saltmaster tgt_type: glob @@ -54,12 +55,14 @@ In addition, other groups are being loaded from pillars. target: saltmaster tgt_type: list -:configuration: Example configuration using the 'default' group and a non-default group and a pillar that will be merged in - If the user is '*' (without the quotes) then the group's users or commands will match all users as appropriate +:configuration: Example configuration using the 'default' group and a + non-default group and a pillar that will be merged in If the user is '*' + (without the quotes) then the group's users or commands will match all + users as appropriate .. versionadded: 2017.7.0 -.. code-block:: yaml +.. code-block:: text engines: - slack: @@ -79,7 +82,7 @@ In addition, other groups are being loaded from pillars. list_jobs: cmd: jobs.list_jobs list_commands: - cmd: pillar.get salt:engines:slack:valid_commands target=saltmaster tgt_type=list + cmd: 'pillar.get salt:engines:slack:valid_commands target=saltmaster tgt_type=list' gods: users: - garethgreenaway @@ -401,13 +404,16 @@ class SlackClient(object): input_valid_users = set input_valid_commands = set - When the trigger_string prefixes the message text, yields a dictionary of { - 'message_data': m_data, - 'cmdline': cmdline_list, # this is a list - 'channel': channel, - 'user': m_data['user'], - 'slack_client': sc - } + When the trigger_string prefixes the message text, yields a dictionary + of:: + + { + 'message_data': m_data, + 'cmdline': cmdline_list, # this is a list + 'channel': channel, + 'user': m_data['user'], + 'slack_client': sc + } else yields {'message_data': m_data} and the caller can handle that @@ -526,17 +532,18 @@ class SlackClient(object): If no configured target is provided, the command line will be parsed for target=foo and tgt_type=bar - Test for this: - h = {'aliases': {}, 'commands': {'cmd.run', 'pillar.get'}, - 'default_target': {'target': '*', 'tgt_type': 'glob'}, - 'targets': {'pillar.get': {'target': 'you_momma', 'tgt_type': 'list'}}, - 'users': {'dmangot', 'jmickle', 'pcn'}} - f = {'aliases': {}, 'commands': {'cmd.run', 'pillar.get'}, - 'default_target': {}, 'targets': {},'users': {'dmangot', 'jmickle', 'pcn'}} + Test for this:: - g = {'aliases': {}, 'commands': {'cmd.run', 'pillar.get'}, - 'default_target': {'target': '*', 'tgt_type': 'glob'}, - 'targets': {}, 'users': {'dmangot', 'jmickle', 'pcn'}} + h = {'aliases': {}, 'commands': {'cmd.run', 'pillar.get'}, + 'default_target': {'target': '*', 'tgt_type': 'glob'}, + 'targets': {'pillar.get': {'target': 'you_momma', 'tgt_type': 'list'}}, + 'users': {'dmangot', 'jmickle', 'pcn'}} + f = {'aliases': {}, 'commands': {'cmd.run', 'pillar.get'}, + 'default_target': {}, 'targets': {},'users': {'dmangot', 'jmickle', 'pcn'}} + + g = {'aliases': {}, 'commands': {'cmd.run', 'pillar.get'}, + 'default_target': {'target': '*', 'tgt_type': 'glob'}, + 'targets': {}, 'users': {'dmangot', 'jmickle', 'pcn'}} Run each of them through ``get_configured_target(('foo', f), 'pillar.get')`` and confirm a valid target diff --git a/salt/executors/docker.py b/salt/executors/docker.py new file mode 100644 index 0000000000..14080998cd --- /dev/null +++ b/salt/executors/docker.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +''' +Docker executor module + +.. versionadded: Fluorine + +Used with the docker proxy minion. +''' +from __future__ import absolute_import, unicode_literals + + +__virtualname__ = 'docker' +DOCKER_MOD_MAP = { + 'state.sls': 'docker.sls', + 'state.apply': 'docker.apply', + 'state.highstate': 'docker.highstate', +} + + +def __virtual__(): + if 'proxy' not in __opts__: + return False, 'Docker executor is only meant to be used with Docker Proxy Minions' + if __opts__.get('proxy', {}).get('proxytype') != __virtualname__: + return False, 'Proxytype does not match: {0}'.format(__virtualname__) + return True + + +def execute(opts, data, func, args, kwargs): + ''' + Directly calls the given function with arguments + ''' + if data['fun'] == 'saltutil.find_job': + return __executors__['direct_call.execute'](opts, data, func, args, kwargs) + if data['fun'] in DOCKER_MOD_MAP: + return __executors__['direct_call.execute'](opts, data, __salt__[DOCKER_MOD_MAP[data['fun']]], [opts['proxy']['name']] + args, kwargs) + return __salt__['docker.call'](opts['proxy']['name'], data['fun'], *args, **kwargs) + + +def allow_missing_func(function): # pylint: disable=unused-argument + ''' + Allow all calls to be passed through to docker container. + + The docker call will use direct_call, which will return back if the module + was unable to be run. + ''' + return True diff --git a/salt/fileserver/s3fs.py b/salt/fileserver/s3fs.py index 3487b53cdc..40934de9b0 100644 --- a/salt/fileserver/s3fs.py +++ b/salt/fileserver/s3fs.py @@ -69,7 +69,7 @@ structure:: If you deal with objects greater than 8MB, then you should use the following AWS CLI config to avoid mutipart upload: - .. code-block:: + .. code-block:: text s3 = multipart_threshold = 1024MB diff --git a/salt/grains/core.py b/salt/grains/core.py index da4219620e..853d61edcc 100644 --- a/salt/grains/core.py +++ b/salt/grains/core.py @@ -190,7 +190,7 @@ def _linux_gpu_data(): return {} # dominant gpu vendors to search for (MUST be lowercase for matching below) - known_vendors = ['nvidia', 'amd', 'ati', 'intel'] + known_vendors = ['nvidia', 'amd', 'ati', 'intel', 'cirrus logic', 'vmware', 'matrox', 'aspeed'] gpu_classes = ('vga compatible controller', '3d controller') devs = [] @@ -251,7 +251,7 @@ def _netbsd_gpu_data(): - vendor: nvidia|amd|ati|... model: string ''' - known_vendors = ['nvidia', 'amd', 'ati', 'intel', 'cirrus logic', 'vmware'] + known_vendors = ['nvidia', 'amd', 'ati', 'intel', 'cirrus logic', 'vmware', 'matrox', 'aspeed'] gpus = [] try: @@ -947,7 +947,7 @@ def _virtual(osdata): if os.path.isfile('/sys/devices/virtual/dmi/id/product_name'): try: with salt.utils.files.fopen('/sys/devices/virtual/dmi/id/product_name', 'r') as fhr: - output = fhr.read() + output = salt.utils.stringutils.to_unicode(fhr.read()) if 'VirtualBox' in output: grains['virtual'] = 'VirtualBox' elif 'RHEV Hypervisor' in output: @@ -1350,7 +1350,6 @@ _OS_NAME_MAP = { 'scientific': 'ScientificLinux', 'synology': 'Synology', 'nilrt': 'NILinuxRT', - 'nilrt-xfce': 'NILinuxRT-XFCE', 'poky': 'Poky', 'manjaro': 'Manjaro', 'manjarolin': 'Manjaro', @@ -1423,13 +1422,24 @@ _OS_FAMILY_MAP = { 'Cumulus': 'Debian', 'Deepin': 'Debian', 'NILinuxRT': 'NILinuxRT', - 'NILinuxRT-XFCE': 'NILinuxRT', 'KDE neon': 'Debian', 'Void': 'Void', 'IDMS': 'Debian', 'AIX': 'AIX', } +# Matches any possible format: +# DISTRIB_ID="Ubuntu" +# DISTRIB_ID='Mageia' +# DISTRIB_ID=Fedora +# DISTRIB_RELEASE='10.10' +# DISTRIB_CODENAME='squeeze' +# DISTRIB_DESCRIPTION='Ubuntu 10.10' +_LSB_REGEX = re.compile(( + '^(DISTRIB_(?:ID|RELEASE|CODENAME|DESCRIPTION))=(?:\'|")?' + '([\\w\\s\\.\\-_]+)(?:\'|")?' +)) + def _linux_bin_exists(binary): ''' @@ -1462,32 +1472,49 @@ def _get_interfaces(): return _INTERFACES -def _parse_os_release(os_release_files): +def _parse_lsb_release(): + ret = {} + try: + log.trace('Attempting to parse /etc/lsb-release') + with salt.utils.files.fopen('/etc/lsb-release') as ifile: + for line in ifile: + try: + key, value = _LSB_REGEX.match(line.rstrip('\n')).groups()[:2] + except AttributeError: + pass + else: + # Adds lsb_distrib_{id,release,codename,description} + ret['lsb_{0}'.format(key.lower())] = value.rstrip() + except (IOError, OSError) as exc: + log.trace('Failed to parse /etc/lsb-release: %s', exc) + return ret + + +def _parse_os_release(*os_release_files): ''' Parse os-release and return a parameter dictionary See http://www.freedesktop.org/software/systemd/man/os-release.html for specification of the file format. ''' - - data = dict() + ret = {} for filename in os_release_files: - if os.path.isfile(filename): + try: + with salt.utils.files.fopen(filename) as ifile: + regex = re.compile('^([\\w]+)=(?:\'|")?(.*?)(?:\'|")?$') + for line in ifile: + match = regex.match(line.strip()) + if match: + # Shell special characters ("$", quotes, backslash, + # backtick) are escaped with backslashes + ret[match.group(1)] = re.sub( + r'\\([$"\'\\`])', r'\1', match.group(2) + ) break - else: - # None of the specified os-release files exist - return data + except (IOError, OSError): + pass - with salt.utils.files.fopen(filename) as ifile: - regex = re.compile('^([\\w]+)=(?:\'|")?(.*?)(?:\'|")?$') - for line in ifile: - match = regex.match(line.strip()) - if match: - # Shell special characters ("$", quotes, backslash, backtick) - # are escaped with backslashes - data[match.group(1)] = re.sub(r'\\([$"\'\\`])', r'\1', match.group(2)) - - return data + return ret def os_data(): @@ -1550,6 +1577,7 @@ def os_data(): elif salt.utils.platform.is_linux(): # Add SELinux grain, if you have it if _linux_bin_exists('selinuxenabled'): + log.trace('Adding selinux grains') grains['selinux'] = {} grains['selinux']['enabled'] = __salt__['cmd.retcode']( 'selinuxenabled' @@ -1561,6 +1589,7 @@ def os_data(): # Add systemd grain, if you have it if _linux_bin_exists('systemctl') and _linux_bin_exists('localectl'): + log.trace('Adding systemd grains') grains['systemd'] = {} systemd_info = __salt__['cmd.run']( 'systemctl --version' @@ -1570,74 +1599,77 @@ def os_data(): # Add init grain grains['init'] = 'unknown' + log.trace('Adding init grain') try: os.stat('/run/systemd/system') grains['init'] = 'systemd' except (OSError, IOError): - if os.path.exists('/proc/1/cmdline'): + try: with salt.utils.files.fopen('/proc/1/cmdline') as fhr: init_cmdline = fhr.read().replace('\x00', ' ').split() + except (IOError, OSError): + pass + else: + try: + init_bin = salt.utils.path.which(init_cmdline[0]) + except IndexError: + # Emtpy init_cmdline + init_bin = None + log.warning('Unable to fetch data from /proc/1/cmdline') + if init_bin is not None and init_bin.endswith('bin/init'): + supported_inits = (b'upstart', b'sysvinit', b'systemd') + edge_len = max(len(x) for x in supported_inits) - 1 try: - init_bin = salt.utils.path.which(init_cmdline[0]) - except IndexError: - # Emtpy init_cmdline - init_bin = None - log.warning( - "Unable to fetch data from /proc/1/cmdline" - ) - if init_bin is not None and init_bin.endswith('bin/init'): - supported_inits = (b'upstart', b'sysvinit', b'systemd') - edge_len = max(len(x) for x in supported_inits) - 1 - try: - buf_size = __opts__['file_buffer_size'] - except KeyError: - # Default to the value of file_buffer_size for the minion - buf_size = 262144 - try: - with salt.utils.files.fopen(init_bin, 'rb') as fp_: - buf = True - edge = b'' + buf_size = __opts__['file_buffer_size'] + except KeyError: + # Default to the value of file_buffer_size for the minion + buf_size = 262144 + try: + with salt.utils.files.fopen(init_bin, 'rb') as fp_: + edge = b'' + buf = fp_.read(buf_size).lower() + while buf: + buf = edge + buf + for item in supported_inits: + if item in buf: + if six.PY3: + item = item.decode('utf-8') + grains['init'] = item + buf = b'' + break + edge = buf[-edge_len:] buf = fp_.read(buf_size).lower() - while buf: - buf = edge + buf - for item in supported_inits: - if item in buf: - if six.PY3: - item = item.decode('utf-8') - grains['init'] = item - buf = b'' - break - edge = buf[-edge_len:] - buf = fp_.read(buf_size).lower() - except (IOError, OSError) as exc: - log.error( - 'Unable to read from init_bin (%s): %s', - init_bin, exc - ) - elif salt.utils.path.which('supervisord') in init_cmdline: - grains['init'] = 'supervisord' - elif salt.utils.path.which('dumb-init') in init_cmdline: - # https://github.com/Yelp/dumb-init - grains['init'] = 'dumb-init' - elif salt.utils.path.which('tini') in init_cmdline: - # https://github.com/krallin/tini - grains['init'] = 'tini' - elif init_cmdline == ['runit']: - grains['init'] = 'runit' - elif '/sbin/my_init' in init_cmdline: - #Phusion Base docker container use runit for srv mgmt, but my_init as pid1 - grains['init'] = 'runit' - else: - log.info( - 'Could not determine init system from command line: (%s)', - ' '.join(init_cmdline) + except (IOError, OSError) as exc: + log.error( + 'Unable to read from init_bin (%s): %s', + init_bin, exc ) + elif salt.utils.path.which('supervisord') in init_cmdline: + grains['init'] = 'supervisord' + elif salt.utils.path.which('dumb-init') in init_cmdline: + # https://github.com/Yelp/dumb-init + grains['init'] = 'dumb-init' + elif salt.utils.path.which('tini') in init_cmdline: + # https://github.com/krallin/tini + grains['init'] = 'tini' + elif init_cmdline == ['runit']: + grains['init'] = 'runit' + elif '/sbin/my_init' in init_cmdline: + # Phusion Base docker container use runit for srv mgmt, but + # my_init as pid1 + grains['init'] = 'runit' + else: + log.info( + 'Could not determine init system from command line: (%s)', + ' '.join(init_cmdline) + ) # Add lsb grains on any distro with lsb-release. Note that this import # can fail on systems with lsb-release installed if the system package # does not install the python package for the python interpreter used by # Salt (i.e. python2 or python3) try: + log.trace('Getting lsb_release distro information') import lsb_release # pylint: disable=import-error release = lsb_release.get_distro_information() for key, value in six.iteritems(release): @@ -1650,35 +1682,21 @@ def os_data(): # Catch a NameError to workaround possible breakage in lsb_release # See https://github.com/saltstack/salt/issues/37867 except (ImportError, NameError): - # if the python library isn't available, default to regex - if os.path.isfile('/etc/lsb-release'): - # Matches any possible format: - # DISTRIB_ID="Ubuntu" - # DISTRIB_ID='Mageia' - # DISTRIB_ID=Fedora - # DISTRIB_RELEASE='10.10' - # DISTRIB_CODENAME='squeeze' - # DISTRIB_DESCRIPTION='Ubuntu 10.10' - regex = re.compile(( - '^(DISTRIB_(?:ID|RELEASE|CODENAME|DESCRIPTION))=(?:\'|")?' - '([\\w\\s\\.\\-_]+)(?:\'|")?' - )) - with salt.utils.files.fopen('/etc/lsb-release') as ifile: - for line in ifile: - match = regex.match(line.rstrip('\n')) - if match: - # Adds: - # lsb_distrib_{id,release,codename,description} - grains[ - 'lsb_{0}'.format(match.groups()[0].lower()) - ] = match.groups()[1].rstrip() + # if the python library isn't available, try to parse + # /etc/lsb-release using regex + log.trace('lsb_release python bindings not available') + grains.update(_parse_lsb_release()) + if grains.get('lsb_distrib_description', '').lower().startswith('antergos'): # Antergos incorrectly configures their /etc/lsb-release, # setting the DISTRIB_ID to "Arch". This causes the "os" grain # to be incorrectly set to "Arch". grains['osfullname'] = 'Antergos Linux' elif 'lsb_distrib_id' not in grains: - os_release = _parse_os_release(['/etc/os-release', '/usr/lib/os-release']) + log.trace( + 'Failed to get lsb_distrib_id, trying to parse os-release' + ) + os_release = _parse_os_release('/etc/os-release', '/usr/lib/os-release') if os_release: if 'NAME' in os_release: grains['lsb_distrib_id'] = os_release['NAME'].strip() @@ -1703,6 +1721,7 @@ def os_data(): elif os_release.get("VERSION") == "Tumbleweed": grains['osfullname'] = os_release["VERSION"] elif os.path.isfile('/etc/SuSE-release'): + log.trace('Parsing distrib info from /etc/SuSE-release') grains['lsb_distrib_id'] = 'SUSE' version = '' patch = '' @@ -1724,6 +1743,7 @@ def os_data(): if not grains.get('lsb_distrib_codename'): grains['lsb_distrib_codename'] = 'n.a' elif os.path.isfile('/etc/altlinux-release'): + log.trace('Parsing distrib info from /etc/altlinux-release') # ALT Linux grains['lsb_distrib_id'] = 'altlinux' with salt.utils.files.fopen('/etc/altlinux-release') as ifile: @@ -1739,6 +1759,7 @@ def os_data(): grains['lsb_distrib_codename'] = \ comps[3].replace('(', '').replace(')', '') elif os.path.isfile('/etc/centos-release'): + log.trace('Parsing distrib info from /etc/centos-release') # CentOS Linux grains['lsb_distrib_id'] = 'CentOS' with salt.utils.files.fopen('/etc/centos-release') as ifile: @@ -1756,6 +1777,9 @@ def os_data(): elif os.path.isfile('/etc.defaults/VERSION') \ and os.path.isfile('/etc.defaults/synoinfo.conf'): grains['osfullname'] = 'Synology' + log.trace( + 'Parsing Synology distrib info from /etc/.defaults/VERSION' + ) with salt.utils.files.fopen('/etc.defaults/VERSION', 'r') as fp_: synoinfo = {} for line in fp_: @@ -1779,6 +1803,10 @@ def os_data(): # Use the already intelligent platform module to get distro info # (though apparently it's not intelligent enough to strip quotes) + log.trace( + 'Getting OS name, release, and codename from ' + 'platform.linux_distribution()' + ) (osname, osrelease, oscodename) = \ [x.strip('"').strip("'") for x in linux_distribution(supported_dists=_supported_dists)] @@ -1788,8 +1816,11 @@ def os_data(): # so that linux_distribution() does the /etc/lsb-release parsing, but # we do it anyway here for the sake for full portability. if 'osfullname' not in grains: - grains['osfullname'] = \ - grains.get('lsb_distrib_id', osname).strip() + # If NI Linux RT distribution, set the grains['osfullname'] to 'nilrt' + if grains.get('lsb_distrib_id', '').lower().startswith('nilrt'): + grains['osfullname'] = 'nilrt' + else: + grains['osfullname'] = grains.get('lsb_distrib_id', osname).strip() if 'osrelease' not in grains: # NOTE: This is a workaround for CentOS 7 os-release bug # https://bugs.centos.org/view.php?id=8359 @@ -2226,11 +2257,10 @@ def dns(): def get_machine_id(): ''' - Provide the machine-id + Provide the machine-id for machine/virtualization combination ''' # Provides: # machine-id - if platform.system() == 'AIX': return _aix_get_machine_id() @@ -2499,9 +2529,9 @@ def _hw_data(osdata): product_regexes = [ re.compile(r) for r in [ - r'(?im)^\s*System\s+Configuration:\s*.*?sun\d\S+\s(.*)', # prtdiag - r'(?im)^\s*banner-name:\s*(.*)', # prtconf - r'(?im)^\s*product-name:\s*(.*)', # prtconf + r'(?im)^\s*System\s+Configuration:\s*.*?sun\d\S+[^\S\r\n]*(.*)', # prtdiag + r'(?im)^[^\S\r\n]*banner-name:[^\S\r\n]*(.*)', # prtconf + r'(?im)^[^\S\r\n]*product-name:[^\S\r\n]*(.*)', # prtconf ] ] @@ -2568,8 +2598,30 @@ def _hw_data(osdata): for regex in product_regexes: res = regex.search(data) if res and len(res.groups()) >= 1: - grains['product'] = res.group(1).strip().replace("'", "") - break + t_productname = res.group(1).strip().replace("'", "") + if t_productname: + grains['product'] = t_productname + grains['productname'] = t_productname + break + elif osdata['kernel'] == 'AIX': + cmd = salt.utils.path.which('prtconf') + if data: + data = __salt__['cmd.run']('{0}'.format(cmd)) + os.linesep + for dest, regstring in (('serialnumber', r'(?im)^\s*Machine\s+Serial\s+Number:\s+(\S+)'), + ('systemfirmware', r'(?im)^\s*Firmware\s+Version:\s+(.*)')): + for regex in [re.compile(r) for r in [regstring]]: + res = regex.search(data) + if res and len(res.groups()) >= 1: + grains[dest] = res.group(1).strip().replace("'", '') + + product_regexes = [re.compile(r'(?im)^\s*System\s+Model:\s+(\S+)')] + for regex in product_regexes: + res = regex.search(data) + if res and len(res.groups()) >= 1: + grains['manufacturer'], grains['productname'] = res.group(1).strip().replace("'", "").split(",") + break + else: + log.error('The \'prtconf\' binary was not found in $PATH.') elif osdata['kernel'] == 'AIX': cmd = salt.utils.path.which('prtconf') diff --git a/salt/loader.py b/salt/loader.py index 89596487f9..1a0d90f2a2 100644 --- a/salt/loader.py +++ b/salt/loader.py @@ -971,12 +971,14 @@ def executors(opts, functions=None, context=None, proxy=None): ''' Returns the executor modules ''' - return LazyLoader( + executors = LazyLoader( _module_dirs(opts, 'executors', 'executor'), opts, tag='executor', pack={'__salt__': functions, '__context__': context or {}, '__proxy__': proxy or {}}, ) + executors.pack['__executors__'] = executors + return executors def cache(opts, serial): diff --git a/salt/log/__init__.py b/salt/log/__init__.py index 2ada13bacd..2fbd276079 100644 --- a/salt/log/__init__.py +++ b/salt/log/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.log diff --git a/salt/log/handlers/fluent_mod.py b/salt/log/handlers/fluent_mod.py index 20724f4ed0..e09f23bbc5 100644 --- a/salt/log/handlers/fluent_mod.py +++ b/salt/log/handlers/fluent_mod.py @@ -1,15 +1,15 @@ # -*- coding: utf-8 -*- ''' Fluent Logging Handler - ======================== + ====================== .. versionadded:: 2015.8.0 - This module provides some `Fluent`_ logging handlers. + This module provides some fluentd_ logging handlers. Fluent Logging Handler - ------------------- + ---------------------- In the `fluent` configuration file: @@ -60,16 +60,15 @@ Log Level ......... - The ``fluent_handler`` - configuration section accepts an additional setting ``log_level``. If not - set, the logging level used will be the one defined for ``log_level`` in - the global configuration file section. + The ``fluent_handler`` configuration section accepts an additional setting + ``log_level``. If not set, the logging level used will be the one defined + for ``log_level`` in the global configuration file section. .. admonition:: Inspiration This work was inspired in `fluent-logger-python`_ - .. _`fluentd`: http://www.fluentd.org + .. _fluentd: http://www.fluentd.org .. _`fluent-logger-python`: https://github.com/fluent/fluent-logger-python ''' diff --git a/salt/log/handlers/sentry_mod.py b/salt/log/handlers/sentry_mod.py index 0b32cca533..43ac5b8262 100644 --- a/salt/log/handlers/sentry_mod.py +++ b/salt/log/handlers/sentry_mod.py @@ -8,7 +8,7 @@ This module provides a `Sentry`_ logging handler. Sentry is an open source error tracking platform that provides deep context about exceptions that happen in production. Details about stack traces along with the context - variables available at the time of the exeption are easily browsable and + variables available at the time of the exception are easily browsable and filterable from the online interface. For more details please see `Sentry`_. diff --git a/salt/log/mixins.py b/salt/log/mixins.py index eaf8899dea..383964858a 100644 --- a/salt/log/mixins.py +++ b/salt/log/mixins.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.log.mixins diff --git a/salt/log/setup.py b/salt/log/setup.py index dc1997fe9a..4c6d5dd8fd 100644 --- a/salt/log/setup.py +++ b/salt/log/setup.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.log.setup diff --git a/salt/master.py b/salt/master.py index dc2d849fdd..0b0cfedc0f 100644 --- a/salt/master.py +++ b/salt/master.py @@ -349,8 +349,8 @@ class FileserverUpdate(salt.utils.process.SignalHandlingMultiprocessingProcess): ''' A process from which to update any dynamic fileserver backends ''' - def __init__(self, opts, log_queue=None): - super(FileserverUpdate, self).__init__(log_queue=log_queue) + def __init__(self, opts, **kwargs): + super(FileserverUpdate, self).__init__(**kwargs) self.opts = opts self.update_threads = {} # Avoid circular import @@ -363,11 +363,15 @@ class FileserverUpdate(salt.utils.process.SignalHandlingMultiprocessingProcess): # process so that a register_after_fork() equivalent will work on Windows. def __setstate__(self, state): self._is_child = True - self.__init__(state['opts'], log_queue=state['log_queue']) + self.__init__( + state['opts'], + log_queue=state['log_queue'], + ) def __getstate__(self): return {'opts': self.opts, - 'log_queue': self.log_queue} + 'log_queue': self.log_queue, + } def fill_buckets(self): ''' @@ -2073,6 +2077,8 @@ class ClearFuncs(object): if not authorized: # Authorization error occurred. Do not continue. + if auth_type == 'eauth' and not auth_list and 'username' in extra and 'eauth' in extra: + log.debug('Auth configuration for eauth "%s" and user "%s" is empty', extra['eauth'], extra['username']) log.warning(err_msg) return {'error': {'name': 'AuthorizationError', 'message': 'Authorization error occurred.'}} diff --git a/salt/minion.py b/salt/minion.py index 1fba16456c..db86dea857 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -1073,7 +1073,7 @@ class Minion(MinionBase): # Flag meaning minion has finished initialization including first connect to the master. # True means the Minion is fully functional and ready to handle events. self.ready = False - self.jid_queue = jid_queue or [] + self.jid_queue = [] if jid_queue is None else jid_queue self.periodic_callbacks = {} if io_loop is None: @@ -1172,10 +1172,11 @@ class Minion(MinionBase): # I made the following 3 line oddity to preserve traceback. # Please read PR #23978 before changing, hopefully avoiding regressions. # Good luck, we're all counting on you. Thanks. - future_exception = self._connect_master_future.exception() - if future_exception: - # This needs to be re-raised to preserve restart_on_error behavior. - raise six.reraise(*future_exception) + if self._connect_master_future.done(): + future_exception = self._connect_master_future.exception() + if future_exception: + # This needs to be re-raised to preserve restart_on_error behavior. + raise six.reraise(*future_exception) if timeout and self._sync_connect_master_success is False: raise SaltDaemonNotRunning('Failed to connect to the salt-master') @@ -1565,7 +1566,15 @@ class Minion(MinionBase): fp_.write(minion_instance.serial.dumps(sdata)) ret = {'success': False} function_name = data['fun'] - if function_name in minion_instance.functions: + executors = data.get('module_executors') or \ + getattr(minion_instance, 'module_executors', []) or \ + opts.get('module_executors', ['direct_call']) + allow_missing_funcs = any([ + minion_instance.executors['{0}.allow_missing_func'.format(executor)](function_name) + for executor in executors + if '{0}.allow_missing_func' in minion_instance.executors + ]) + if function_name in minion_instance.functions or allow_missing_funcs is True: try: minion_blackout_violation = False if minion_instance.connected and minion_instance.opts['pillar'].get('minion_blackout', False): @@ -1583,14 +1592,17 @@ class Minion(MinionBase): 'to False in pillar or grains to resume operations. Only ' 'saltutil.refresh_pillar allowed in blackout mode.') - func = minion_instance.functions[function_name] - args, kwargs = load_args_and_kwargs( - func, - data['arg'], - data) + if function_name in minion_instance.functions: + func = minion_instance.functions[function_name] + args, kwargs = load_args_and_kwargs( + func, + data['arg'], + data) + else: + # only run if function_name is not in minion_instance.functions and allow_missing_funcs is True + func = function_name + args, kwargs = data['arg'], data minion_instance.functions.pack['__context__']['retcode'] = 0 - - executors = data.get('module_executors') or opts.get('module_executors', ['direct_call']) if isinstance(executors, six.string_types): executors = [executors] elif not isinstance(executors, list) or not executors: @@ -1656,7 +1668,9 @@ class Minion(MinionBase): ) ret['out'] = 'nested' except TypeError as exc: - msg = 'Passed invalid arguments to {0}: {1}\n{2}'.format(function_name, exc, func.__doc__) + msg = 'Passed invalid arguments to {0}: {1}\n{2}'.format( + function_name, exc, func.__doc__ or '' + ) log.warning(msg, exc_info_on_loglevel=logging.DEBUG) ret['return'] = msg ret['out'] = 'nested' @@ -3597,6 +3611,7 @@ class ProxyMinion(Minion): self._running = False raise SaltSystemExit(code=-1, msg=errmsg) + self.module_executors = self.proxy.get('{0}.module_executors'.format(fq_proxyname), lambda: [])() proxy_init_fn = self.proxy[fq_proxyname + '.init'] proxy_init_fn(self.opts) @@ -3747,6 +3762,9 @@ class ProxyMinion(Minion): minion_instance.proxy.reload_modules() fq_proxyname = opts['proxy']['proxytype'] + + minion_instance.module_executors = minion_instance.proxy.get('{0}.module_executors'.format(fq_proxyname), lambda: [])() + proxy_init_fn = minion_instance.proxy[fq_proxyname + '.init'] proxy_init_fn(opts) if not hasattr(minion_instance, 'serial'): diff --git a/salt/modules/apk.py b/salt/modules/apk.py index 838a6318f9..2e9a2a952e 100644 --- a/salt/modules/apk.py +++ b/salt/modules/apk.py @@ -304,7 +304,7 @@ def install(name=None, # We don't support installing specific version for now # so transform the dict in list ignoring version provided pkgs = [ - p.keys()[0] for p in pkgs + next(iter(p)) for p in pkgs if isinstance(p, dict) ] pkg_to_install.extend(pkgs) diff --git a/salt/modules/aptpkg.py b/salt/modules/aptpkg.py index e0340fc0d2..d59f8adc94 100644 --- a/salt/modules/aptpkg.py +++ b/salt/modules/aptpkg.py @@ -44,6 +44,7 @@ import salt.utils.stringutils import salt.utils.systemd import salt.utils.versions import salt.utils.yaml +import salt.utils.environment from salt.exceptions import ( CommandExecutionError, MinionError, SaltInvocationError ) @@ -108,7 +109,7 @@ def __virtual__(): # grain to the minion. if __grains__.get('os_family') == 'Debian': return __virtualname__ - return (False, 'The pkg module could not be loaded: unsupported OS family') + return False, 'The pkg module could not be loaded: unsupported OS family' def __init__(opts): @@ -158,6 +159,23 @@ def _check_apt(): ) +def _call_apt(args, scope=True, **kwargs): + ''' + Call apt* utilities. + ''' + cmd = [] + if scope and salt.utils.systemd.has_scope(__context__) and __salt__['config.get']('systemd.scope', True): + cmd.extend(['systemd-run', '--scope']) + cmd.extend(args) + + params = {'output_loglevel': 'trace', + 'python_shell': False, + 'env': salt.utils.environment.get_module_environment(globals())} + params.update(kwargs) + + return __salt__['cmd.run_all'](cmd, **params) + + def _warn_software_properties(repo): ''' Warn of missing python-software-properties package. @@ -221,10 +239,7 @@ def latest_version(*names, **kwargs): cmd = ['apt-cache', '-q', 'policy', name] if repo is not None: cmd.extend(repo) - out = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False, - env={'LC_ALL': 'C', 'LANG': 'C'}) + out = _call_apt(cmd, scope=False) candidate = '' for line in salt.utils.itertools.split(out['stdout'], '\n'): @@ -328,10 +343,7 @@ def refresh_db(cache_valid_time=0, failhard=False): except IOError as exp: log.warning("could not stat cache directory due to: %s", exp) - cmd = ['apt-get', '-q', 'update'] - call = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) + call = _call_apt(['apt-get', '-q', 'update'], scope=False) if call['retcode'] != 0: comment = '' if 'stderr' in call: @@ -563,9 +575,7 @@ def install(name=None, if pkg_params is None or len(pkg_params) == 0: return {} - use_scope = salt.utils.systemd.has_scope(__context__) \ - and __salt__['config.get']('systemd.scope', True) - cmd_prefix = ['systemd-run', '--scope'] if use_scope else [] + cmd_prefix = [] old = list_pkgs() targets = [] @@ -750,9 +760,7 @@ def install(name=None, unhold(pkgs=to_unhold) for cmd in cmds: - out = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) + out = _call_apt(cmd) if out['retcode'] != 0 and out['stderr']: errors.append(out['stderr']) @@ -794,20 +802,11 @@ def _uninstall(action='remove', name=None, pkgs=None, **kwargs): targets.extend([x for x in pkg_params if x in old_removed]) if not targets: return {} - cmd = [] - if salt.utils.systemd.has_scope(__context__) \ - and __salt__['config.get']('systemd.scope', True): - cmd.extend(['systemd-run', '--scope']) - cmd.extend(['apt-get', '-q', '-y', action]) + cmd = ['apt-get', '-q', '-y', action] cmd.extend(targets) env = _parse_env(kwargs.get('env')) env.update(DPKG_ENV_VARS.copy()) - out = __salt__['cmd.run_all']( - cmd, - env=env, - output_loglevel='trace', - python_shell=False, - ) + out = _call_apt(cmd, env=env) if out['retcode'] != 0 and out['stderr']: errors = [out['stderr']] else: @@ -860,16 +859,13 @@ def autoremove(list_only=False, purge=False): salt '*' pkg.autoremove purge=True ''' cmd = [] - if salt.utils.systemd.has_scope(__context__) \ - and __salt__['config.get']('systemd.scope', True): - cmd.extend(['systemd-run', '--scope']) if list_only: ret = [] cmd.extend(['apt-get', '--assume-no']) if purge: cmd.append('--purge') cmd.append('autoremove') - out = __salt__['cmd.run'](cmd, python_shell=False, ignore_retcode=True) + out = _call_apt(cmd, ignore_retcode=True)['stdout'] found = False for line in out.splitlines(): if found is True: @@ -887,7 +883,7 @@ def autoremove(list_only=False, purge=False): if purge: cmd.append('--purge') cmd.append('autoremove') - __salt__['cmd.run'](cmd, python_shell=False) + _call_apt(cmd, ignore_retcode=True) __context__.pop('pkg.list_pkgs', None) new = list_pkgs() return salt.utils.data.compare_dicts(old, new) @@ -1045,14 +1041,8 @@ def upgrade(refresh=True, dist_upgrade=False, **kwargs): force_conf = '--force-confnew' else: force_conf = '--force-confold' - cmd = [] - if salt.utils.systemd.has_scope(__context__) \ - and __salt__['config.get']('systemd.scope', True): - cmd.extend(['systemd-run', '--scope']) - - cmd.extend(['apt-get', '-q', '-y', - '-o', 'DPkg::Options::={0}'.format(force_conf), - '-o', 'DPkg::Options::=--force-confdef']) + cmd = ['apt-get', '-q', '-y', '-o', 'DPkg::Options::={0}'.format(force_conf), + '-o', 'DPkg::Options::=--force-confdef'] if kwargs.get('force_yes', False): cmd.append('--force-yes') @@ -1062,11 +1052,7 @@ def upgrade(refresh=True, dist_upgrade=False, **kwargs): cmd.append('--download-only') cmd.append('dist-upgrade' if dist_upgrade else 'upgrade') - - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False, - env=DPKG_ENV_VARS.copy()) + result = _call_apt(cmd, env=DPKG_ENV_VARS.copy()) __context__.pop('pkg.list_pkgs', None) new = list_pkgs() ret = salt.utils.data.compare_dicts(old, new) @@ -1345,10 +1331,7 @@ def _get_upgradable(dist_upgrade=True, **kwargs): except KeyError: pass - call = __salt__['cmd.run_all'](cmd, - python_shell=False, - output_loglevel='trace') - + call = _call_apt(cmd) if call['retcode'] != 0: msg = 'Failed to get upgrades' for key in ('stderr', 'stdout'): @@ -1560,13 +1543,7 @@ def list_repo_pkgs(*args, **kwargs): # pylint: disable=unused-import salt '*' pkg.list_repo_pkgs salt '*' pkg.list_repo_pkgs foo bar baz ''' - out = __salt__['cmd.run_all']( - ['apt-cache', 'dump'], - output_loglevel='trace', - ignore_retcode=True, - python_shell=False - ) - + out = _call_apt(['apt-cache', 'dump'], scope=False, ignore_retcode=True) ret = {} pkg_name = None skip_pkg = False @@ -1852,7 +1829,7 @@ def get_repo_keys(): cmd = ['apt-key', 'adv', '--list-public-keys', '--with-fingerprint', '--with-fingerprint', '--with-colons', '--fixed-list-mode'] - cmd_ret = __salt__['cmd.run_all'](cmd=cmd) + cmd_ret = _call_apt(cmd, scope=False) if cmd_ret['retcode'] != 0: log.error(cmd_ret['stderr']) @@ -1927,7 +1904,7 @@ def add_repo_key(path=None, text=None, keyserver=None, keyid=None, saltenv='base salt '*' pkg.add_repo_key keyserver='keyserver.example' keyid='0000AAAA' ''' cmd = ['apt-key'] - kwargs = {'python_shell': False} + kwargs = {} current_repo_keys = get_repo_keys() @@ -1964,8 +1941,7 @@ def add_repo_key(path=None, text=None, keyserver=None, keyid=None, saltenv='base log.debug("The keyid '%s' already present: %s", keyid, current_keyid) return True - kwargs.update({'cmd': cmd}) - cmd_ret = __salt__['cmd.run_all'](**kwargs) + cmd_ret = _call_apt(cmd, **kwargs) if cmd_ret['retcode'] == 0: return True @@ -2019,8 +1995,7 @@ def del_repo_key(name=None, **kwargs): 'keyid or keyid_ppa and PPA name must be passed' ) - cmd = ['apt-key', 'del', keyid] - result = __salt__['cmd.run_all'](cmd, python_shell=False) + result = _call_apt(['apt-key', 'del', keyid], scope=False) if result['retcode'] != 0: msg = 'Failed to remove keyid {0}' if result['stderr']: @@ -2120,10 +2095,7 @@ def mod_repo(repo, saltenv='base', **kwargs): cmd = ['apt-add-repository', repo] else: cmd = ['apt-add-repository', '-y', repo] - out = __salt__['cmd.run_all'](cmd, - python_shell=False, - env=env, - **kwargs) + out = _call_apt(cmd, env=env, scope=False, **kwargs) if out['retcode']: raise CommandExecutionError( 'Unable to add PPA \'{0}\'. \'{1}\' exited with ' @@ -2236,6 +2208,7 @@ def mod_repo(repo, saltenv='base', **kwargs): ) full_comp_list = set(repo_comps) + no_proxy = __salt__['config.option']('no_proxy') if 'keyid' in kwargs: keyid = kwargs.pop('keyid', None) @@ -2255,15 +2228,13 @@ def mod_repo(repo, saltenv='base', **kwargs): if keyserver: if not imported: http_proxy_url = _get_http_proxy_url() - if http_proxy_url: + if http_proxy_url and keyserver not in no_proxy: cmd = ['apt-key', 'adv', '--keyserver-options', 'http-proxy={0}'.format(http_proxy_url), '--keyserver', keyserver, '--logger-fd', '1', '--recv-keys', key] else: cmd = ['apt-key', 'adv', '--keyserver', keyserver, '--logger-fd', '1', '--recv-keys', key] - ret = __salt__['cmd.run_all'](cmd, - python_shell=False, - **kwargs) + ret = _call_apt(cmd, scope=False, **kwargs) if ret['retcode'] != 0: raise CommandExecutionError( 'Error: key retrieval failed: {0}'.format(ret['stdout']) @@ -2583,7 +2554,7 @@ def set_selections(path=None, selection=None, clear=False, saltenv='base'): if clear: cmd = 'dpkg --clear-selections' if not __opts__['test']: - result = __salt__['cmd.run_all'](cmd, output_loglevel='trace') + result = _call_apt(cmd, scope=False) if result['retcode'] != 0: err = ('Running dpkg --clear-selections failed: ' '{0}'.format(result['stderr'])) @@ -2601,9 +2572,7 @@ def set_selections(path=None, selection=None, clear=False, saltenv='base'): cmd = 'dpkg --set-selections' cmd_in = '{0} {1}'.format(_pkg, _state) if not __opts__['test']: - result = __salt__['cmd.run_all'](cmd, - stdin=cmd_in, - output_loglevel='trace') + result = _call_apt(cmd, scope=False, stdin=cmd_in) if result['retcode'] != 0: log.error( 'failed to set state %s for package %s', @@ -2740,8 +2709,7 @@ def show(*names, **kwargs): if not names: return {} - cmd = ['apt-cache', 'show'] + list(names) - result = __salt__['cmd.run_all'](cmd, output_loglevel='trace') + result = _call_apt(['apt-cache', 'show'] + list(names), scope=False) def _add(ret, pkginfo): name = pkginfo.pop('Package', None) diff --git a/salt/modules/archive.py b/salt/modules/archive.py index 5d2f9fd5c3..bc68a30026 100644 --- a/salt/modules/archive.py +++ b/salt/modules/archive.py @@ -186,12 +186,13 @@ def list_(name, else {'fileobj': cached.stdout, 'mode': 'r|'} with contextlib.closing(tarfile.open(**open_kwargs)) as tar_archive: for member in tar_archive.getmembers(): + _member = salt.utils.data.decode(member.name) if member.issym(): - links.append(member.name) + links.append(_member) elif member.isdir(): - dirs.append(member.name + '/') + dirs.append(_member + '/') else: - files.append(member.name) + files.append(_member) return dirs, files, links except tarfile.ReadError: diff --git a/salt/modules/boto3_route53.py b/salt/modules/boto3_route53.py index e8b5cc4f17..c5be14da61 100644 --- a/salt/modules/boto3_route53.py +++ b/salt/modules/boto3_route53.py @@ -52,11 +52,13 @@ Execution module for Amazon Route53 written against Boto 3 from __future__ import absolute_import, print_function, unicode_literals import logging import time +import re # Import Salt libs import salt.utils.compat import salt.utils.versions -from salt.exceptions import SaltInvocationError +from salt.exceptions import SaltInvocationError, CommandExecutionError +from salt.ext import six log = logging.getLogger(__name__) # pylint: disable=W1699 # Import third party libs @@ -243,7 +245,7 @@ def get_hosted_zones_by_domain(Name, region=None, key=None, keyid=None, profile= ''' conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) zones = [z for z in _collect_results(conn.list_hosted_zones, 'HostedZones', {}) - if z['Name'] == Name] + if z['Name'] == aws_encode(Name)] ret = [] for z in zones: ret += get_hosted_zone(Id=z['Id'], region=region, key=key, keyid=keyid, profile=profile) @@ -344,6 +346,7 @@ def create_hosted_zone(Name, VPCId=None, VPCName=None, VPCRegion=None, CallerRef ''' if not Name.endswith('.'): raise SaltInvocationError('Domain must be fully-qualified, complete with trailing period.') + Name = aws_encode(Name) conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) deets = find_hosted_zone(Name=Name, PrivateZone=PrivateZone, region=region, key=key, keyid=keyid, profile=profile) @@ -718,6 +721,96 @@ def delete_hosted_zone_by_domain(Name, PrivateZone=None, region=None, key=None, return delete_hosted_zone(Id=Id, region=region, key=key, keyid=keyid, profile=profile) +def aws_encode(x): + ''' + An implementation of the encoding required to suport AWS's domain name + rules defined here__: + + .. __: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html + + While AWS's documentation specifies individual ASCII characters which need + to be encoded, we instead just try to force the string to one of + escaped unicode or idna depending on whether there are non-ASCII characters + present. + + This means that we support things like ドメイン.テスト as a domain name string. + + More information about IDNA encoding in python is found here__: + + .. __: https://pypi.org/project/idna + + ''' + ret = None + try: + x.encode('ascii') + ret = re.sub(r'\\x([a-f0-8]{2})', + _hexReplace, x.encode('unicode_escape')) + except UnicodeEncodeError: + ret = x.encode('idna') + except Exception as e: + log.error("Couldn't encode %s using either 'unicode_escape' or 'idna' codecs", x) + raise CommandExecutionError(e) + log.debug('AWS-encoded result for %s: %s', x, ret) + return ret + + +def _aws_encode_changebatch(o): + ''' + helper method to process a change batch & encode the bits which need encoding. + ''' + change_idx = 0 + while change_idx < len(o['Changes']): + o['Changes'][change_idx]['ResourceRecordSet']['Name'] = aws_encode(o['Changes'][change_idx]['ResourceRecordSet']['Name']) + if 'ResourceRecords' in o['Changes'][change_idx]['ResourceRecordSet']: + rr_idx = 0 + while rr_idx < len(o['Changes'][change_idx]['ResourceRecordSet']['ResourceRecords']): + o['Changes'][change_idx]['ResourceRecordSet']['ResourceRecords'][rr_idx]['Value'] = aws_encode(o['Changes'][change_idx]['ResourceRecordSet']['ResourceRecords'][rr_idx]['Value']) + rr_idx += 1 + if 'AliasTarget' in o['Changes'][change_idx]['ResourceRecordSet']: + o['Changes'][change_idx]['ResourceRecordSet']['AliasTarget']['DNSName'] = aws_encode(o['Changes'][change_idx]['ResourceRecordSet']['AliasTarget']['DNSName']) + change_idx += 1 + return o + + +def _aws_decode(x): + ''' + An implementation of the decoding required to suport AWS's domain name + rules defined here__: + + .. __: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html + + The important part is this: + + If the domain name includes any characters other than a to z, 0 to 9, - (hyphen), + or _ (underscore), Route 53 API actions return the characters as escape codes. + This is true whether you specify the characters as characters or as escape + codes when you create the entity. + The Route 53 console displays the characters as characters, not as escape codes." + + For a list of ASCII characters the corresponding octal codes, do an internet search on "ascii table". + + We look for the existance of any escape codes which give us a clue that + we're received an escaped unicode string; or we assume it's idna encoded + and then decode as necessary. + ''' + if '\\' in x: + return x.decode('unicode_escape') + return x.decode('idna') + + +def _hexReplace(x): + ''' + Converts a hex code to a base 16 int then the octal of it, minus the leading + zero. + + This is necessary because x.encode('unicode_escape') automatically assumes + you want a hex string, which AWS will accept but doesn't result in what + you really want unless it's an octal escape sequence + ''' + c = int(x.group(1), 16) + return '\\' + str(oct(c))[1:] + + def get_resource_records(HostedZoneId=None, Name=None, StartRecordName=None, StartRecordType=None, PrivateZone=None, region=None, key=None, keyid=None, profile=None): @@ -763,7 +856,7 @@ def get_resource_records(HostedZoneId=None, Name=None, StartRecordName=None, if done: return ret args = {'HostedZoneId': HostedZoneId} - args.update({'StartRecordName': next_rr_name}) if next_rr_name else None + args.update({'StartRecordName': aws_encode(next_rr_name)}) if next_rr_name else None # Grrr, can't specify type unless name is set... We'll do this via filtering later instead args.update({'StartRecordType': next_rr_type}) if next_rr_name and next_rr_type else None args.update({'StartRecordIdentifier': next_rr_id}) if next_rr_id else None @@ -774,6 +867,18 @@ def get_resource_records(HostedZoneId=None, Name=None, StartRecordName=None, next_rr_type = r.get('NextRecordType') next_rr_id = r.get('NextRecordIdentifier') for rr in rrs: + rr['Name'] = _aws_decode(rr['Name']) + # now iterate over the ResourceRecords and replace any encoded + # value strings with the decoded versions + if 'ResourceRecords' in rr: + x = 0 + while x < len(rr['ResourceRecords']): + if 'Value' in rr['ResourceRecords'][x]: + rr['ResourceRecords'][x]['Value'] = _aws_decode(rr['ResourceRecords'][x]['Value']) + x += 1 + # or if we are an AliasTarget then decode the DNSName + if 'AliasTarget' in rr: + rr['AliasTarget']['DNSName'] = _aws_decode(rr['AliasTarget']['DNSName']) if StartRecordName and rr['Name'] != StartRecordName: done = True break @@ -800,9 +905,6 @@ def change_resource_record_sets(HostedZoneId=None, Name=None, PrivateZone=None, ChangeBatch=None, region=None, key=None, keyid=None, profile=None): ''' - Ugh!!! Not gonna try to reproduce and validatethis mess in here - just pass what we get to AWS - and let it decide if it's valid or not... - See the `AWS Route53 API docs`__ as well as the `Boto3 documentation`__ for all the details... .. __: https://docs.aws.amazon.com/Route53/latest/APIReference/API_ChangeResourceRecordSets.html @@ -812,41 +914,42 @@ def change_resource_record_sets(HostedZoneId=None, Name=None, parameters and combinations thereof are quite varied, so perusal of the above linked docs is highly recommended for any non-trival configurations. - .. code-block:: json - ChangeBatch={ - 'Comment': 'string', - 'Changes': [ - { - 'Action': 'CREATE'|'DELETE'|'UPSERT', - 'ResourceRecordSet': { - 'Name': 'string', - 'Type': 'SOA'|'A'|'TXT'|'NS'|'CNAME'|'MX'|'NAPTR'|'PTR'|'SRV'|'SPF'|'AAAA', - 'SetIdentifier': 'string', - 'Weight': 123, - 'Region': 'us-east-1'|'us-east-2'|'us-west-1'|'us-west-2'|'ca-central-1'|'eu-west-1'|'eu-west-2'|'eu-central-1'|'ap-southeast-1'|'ap-southeast-2'|'ap-northeast-1'|'ap-northeast-2'|'sa-east-1'|'cn-north-1'|'ap-south-1', - 'GeoLocation': { - 'ContinentCode': 'string', - 'CountryCode': 'string', - 'SubdivisionCode': 'string' - }, - 'Failover': 'PRIMARY'|'SECONDARY', - 'TTL': 123, - 'ResourceRecords': [ - { - 'Value': 'string' + .. code-block:: text + + { + "Comment": "string", + "Changes": [ + { + "Action": "CREATE"|"DELETE"|"UPSERT", + "ResourceRecordSet": { + "Name": "string", + "Type": "SOA"|"A"|"TXT"|"NS"|"CNAME"|"MX"|"NAPTR"|"PTR"|"SRV"|"SPF"|"AAAA", + "SetIdentifier": "string", + "Weight": 123, + "Region": "us-east-1"|"us-east-2"|"us-west-1"|"us-west-2"|"ca-central-1"|"eu-west-1"|"eu-west-2"|"eu-central-1"|"ap-southeast-1"|"ap-southeast-2"|"ap-northeast-1"|"ap-northeast-2"|"sa-east-1"|"cn-north-1"|"ap-south-1", + "GeoLocation": { + "ContinentCode": "string", + "CountryCode": "string", + "SubdivisionCode": "string" }, - ], - 'AliasTarget': { - 'HostedZoneId': 'string', - 'DNSName': 'string', - 'EvaluateTargetHealth': True|False - }, - 'HealthCheckId': 'string', - 'TrafficPolicyInstanceId': 'string' - } - }, - ] - } + "Failover": "PRIMARY"|"SECONDARY", + "TTL": 123, + "ResourceRecords": [ + { + "Value": "string" + }, + ], + "AliasTarget": { + "HostedZoneId": "string", + "DNSName": "string", + "EvaluateTargetHealth": True|False + }, + "HealthCheckId": "string", + "TrafficPolicyInstanceId": "string" + } + }, + ] + } CLI Example: @@ -879,7 +982,8 @@ def change_resource_record_sets(HostedZoneId=None, Name=None, return [] HostedZoneId = zone[0]['HostedZone']['Id'] - args = {'HostedZoneId': HostedZoneId, 'ChangeBatch': ChangeBatch} + args = {'HostedZoneId': HostedZoneId, 'ChangeBatch': _aws_encode_changebatch(ChangeBatch)} + conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) tries = 20 # A bit more headroom while tries: diff --git a/salt/modules/boto_ec2.py b/salt/modules/boto_ec2.py index e5358fabb4..4245850f6f 100644 --- a/salt/modules/boto_ec2.py +++ b/salt/modules/boto_ec2.py @@ -7,37 +7,35 @@ Connection module for Amazon EC2 :configuration: This module accepts explicit EC2 credentials but can also utilize IAM roles assigned to the instance through Instance Profiles. Dynamic credentials are then automatically obtained from AWS API and no - further configuration is necessary. More Information available at: + further configuration is necessary. More Information available here__. - .. code-block:: text +.. __: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html - http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html +If IAM roles are not used you need to specify them either in a pillar or +in the minion's config file: - If IAM roles are not used you need to specify them either in a pillar or - in the minion's config file: +.. code-block:: yaml - .. code-block:: yaml + ec2.keyid: GKTADJGHEIQSXMKKRBJ08H + ec2.key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs - ec2.keyid: GKTADJGHEIQSXMKKRBJ08H - ec2.key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs +A region may also be specified in the configuration: - A region may also be specified in the configuration: +.. code-block:: yaml - .. code-block:: yaml + ec2.region: us-east-1 - ec2.region: us-east-1 +If a region is not specified, the default is us-east-1. - If a region is not specified, the default is us-east-1. +It's also possible to specify key, keyid, and region via a profile, either +as a passed in dict, or as a string to pull from pillars or minion config: - It's also possible to specify key, keyid, and region via a profile, either - as a passed in dict, or as a string to pull from pillars or minion config: +.. code-block:: yaml - .. code-block:: yaml - - myprofile: - keyid: GKTADJGHEIQSXMKKRBJ08H - key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs - region: us-east-1 + myprofile: + keyid: GKTADJGHEIQSXMKKRBJ08H + key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs + region: us-east-1 :depends: boto @@ -918,8 +916,11 @@ def run(image_id, name=None, tags=None, key_name=None, security_groups=None, data structure describing the EBS volumes associated with the Image. (string) - A string representation of a BlockDeviceMapping structure (dict) - A dict describing a BlockDeviceMapping structure + YAML example: + .. code-block:: yaml + device-maps: /dev/sdb: ephemeral_name: ephemeral0 @@ -932,6 +933,7 @@ def run(image_id, name=None, tags=None, key_name=None, security_groups=None, /dev/sdf: size: 20 volume_type: gp2 + disable_api_termination (bool) – If True, the instances will be locked and will not be able to be terminated via the API. @@ -1704,28 +1706,31 @@ def get_all_volumes(volume_ids=None, filters=None, return_objs=False, associated with those in the list will be returned. filters (dict) - Additional constraints on which volumes to return. Valid filters are: - attachment.attach-time - The time stamp when the attachment initiated. - attachment.delete-on-termination - Whether the volume is deleted on instance termination. - attachment.device - The device name that is exposed to the instance (for example, /dev/sda1). - attachment.instance-id - The ID of the instance the volume is attached to. - attachment.status - The attachment state (attaching | attached | detaching | detached). - availability-zone - The Availability Zone in which the volume was created. - create-time - The time stamp when the volume was created. - encrypted - The encryption status of the volume. - size - The size of the volume, in GiB. - snapshot-id - The snapshot from which the volume was created. - status - The status of the volume (creating | available | in-use | deleting | deleted | error). - tag:key=value - The key/value combination of a tag assigned to the resource. - volume-id - The volume ID. - volume-type - The Amazon EBS volume type. This can be gp2 for General Purpose SSD, io1 for - Provisioned IOPS SSD, st1 for Throughput Optimized HDD, sc1 for Cold HDD, or - standard for Magnetic volumes. + + - attachment.attach-time - The time stamp when the attachment initiated. + - attachment.delete-on-termination - Whether the volume is deleted on instance termination. + - attachment.device - The device name that is exposed to the instance (for example, /dev/sda1). + - attachment.instance-id - The ID of the instance the volume is attached to. + - attachment.status - The attachment state (attaching | attached | detaching | detached). + - availability-zone - The Availability Zone in which the volume was created. + - create-time - The time stamp when the volume was created. + - encrypted - The encryption status of the volume. + - size - The size of the volume, in GiB. + - snapshot-id - The snapshot from which the volume was created. + - status - The status of the volume (creating | available | in-use | deleting | deleted | error). + - tag:key=value - The key/value combination of a tag assigned to the resource. + - volume-id - The volume ID. + - volume-type - The Amazon EBS volume type. This can be ``gp2`` for General + Purpose SSD, ``io1`` for Provisioned IOPS SSD, ``st1`` for Throughput + Optimized HDD, ``sc1`` for Cold HDD, or ``standard`` for Magnetic volumes. + return_objs - (bool) - Changes the return type from list of volume IDs to list of boto.ec2.volume.Volume objects + (bool) - Changes the return type from list of volume IDs to list of + boto.ec2.volume.Volume objects returns - (list) - A list of the requested values: Either the volume IDs; or, if return_objs is true, - boto.ec2.volume.Volume objects. + (list) - A list of the requested values: Either the volume IDs or, if + return_objs is ``True``, boto.ec2.volume.Volume objects. CLI Example: diff --git a/salt/modules/boto_lambda.py b/salt/modules/boto_lambda.py index daa8ec06a3..f28ec96ae8 100644 --- a/salt/modules/boto_lambda.py +++ b/salt/modules/boto_lambda.py @@ -5,45 +5,44 @@ Connection module for Amazon Lambda .. versionadded:: 2016.3.0 :depends: - - boto - - boto3 + +- boto +- boto3 The dependencies listed above can be installed via package or pip. :configuration: This module accepts explicit Lambda credentials but can also utilize IAM roles assigned to the instance through Instance Profiles. Dynamic credentials are then automatically obtained from AWS API and no - further configuration is necessary. More Information available at: + further configuration is necessary. More Information available here__. - .. code-block:: text +.. __: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html - http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html +If IAM roles are not used you need to specify them either in a pillar or +in the minion's config file: - If IAM roles are not used you need to specify them either in a pillar or - in the minion's config file: +.. code-block:: yaml - .. code-block:: yaml + lambda.keyid: GKTADJGHEIQSXMKKRBJ08H + lambda.key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs - lambda.keyid: GKTADJGHEIQSXMKKRBJ08H - lambda.key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs +A region may also be specified in the configuration: - A region may also be specified in the configuration: +.. code-block:: yaml - .. code-block:: yaml + lambda.region: us-east-1 - lambda.region: us-east-1 +If a region is not specified, the default is us-east-1. - If a region is not specified, the default is us-east-1. +It's also possible to specify key, keyid and region via a profile, either +as a passed in dict, or as a string to pull from pillars or minion config: - It's also possible to specify key, keyid and region via a profile, either - as a passed in dict, or as a string to pull from pillars or minion config: +.. code-block:: yaml - .. code-block:: yaml - - myprofile: - keyid: GKTADJGHEIQSXMKKRBJ08H - key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs - region: us-east-1 + myprofile: + keyid: GKTADJGHEIQSXMKKRBJ08H + key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs + region: us-east-1 .. versionchanged:: 2015.8.0 All methods now return a dictionary. Create and delete methods return: @@ -216,21 +215,24 @@ def create_function(FunctionName, Runtime, Role, Handler, ZipFile=None, region=None, key=None, keyid=None, profile=None, VpcConfig=None, Environment=None): ''' + .. versionadded:: 2017.7.0 + Given a valid config, create a function. Environment The parent object that contains your environment's configuration - settings. This is a dictionary of the form: - { - 'Variables': { - 'VariableName': 'VariableValue' + settings. This is a dictionary of the form: + + .. code-block:: python + + { + 'Variables': { + 'VariableName': 'VariableValue' + } } - } - .. versionadded:: 2017.7.0 - - Returns {created: true} if the function was created and returns - {created: False} if the function was not created. + Returns ``{'created': True}`` if the function was created and ``{created: + False}`` if the function was not created. CLI Example: @@ -360,21 +362,24 @@ def update_function_config(FunctionName, Role=None, Handler=None, VpcConfig=None, WaitForRole=False, RoleRetries=5, Environment=None): ''' + .. versionadded:: 2017.7.0 + Update the named lambda function to the configuration. Environment The parent object that contains your environment's configuration - settings. This is a dictionary of the form: - { - 'Variables': { - 'VariableName': 'VariableValue' + settings. This is a dictionary of the form: + + .. code-block:: python + + { + 'Variables': { + 'VariableName': 'VariableValue' + } } - } - .. versionadded:: 2017.7.0 - - Returns {updated: true} if the function was updated and returns - {updated: False} if the function was not updated. + Returns ``{'updated': True}`` if the function was updated, and + ``{'updated': False}`` if the function was not updated. CLI Example: diff --git a/salt/modules/boto_vpc.py b/salt/modules/boto_vpc.py index aece94c0e9..2c9800503b 100644 --- a/salt/modules/boto_vpc.py +++ b/salt/modules/boto_vpc.py @@ -12,37 +12,35 @@ Connection module for Amazon VPC :configuration: This module accepts explicit VPC credentials but can also utilize IAM roles assigned to the instance through Instance Profiles. Dynamic credentials are then automatically obtained from AWS API and no - further configuration is necessary. More Information available at: + further configuration is necessary. More Information available here__. - .. code-block:: text +.. __: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html - http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html +If IAM roles are not used you need to specify them either in a pillar or +in the minion's config file: - If IAM roles are not used you need to specify them either in a pillar or - in the minion's config file: +.. code-block:: yaml - .. code-block:: yaml + vpc.keyid: GKTADJGHEIQSXMKKRBJ08H + vpc.key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs - vpc.keyid: GKTADJGHEIQSXMKKRBJ08H - vpc.key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs +A region may also be specified in the configuration: - A region may also be specified in the configuration: +.. code-block:: yaml - .. code-block:: yaml + vpc.region: us-east-1 - vpc.region: us-east-1 +If a region is not specified, the default is us-east-1. - If a region is not specified, the default is us-east-1. +It's also possible to specify key, keyid and region via a profile, either +as a passed in dict, or as a string to pull from pillars or minion config: - It's also possible to specify key, keyid and region via a profile, either - as a passed in dict, or as a string to pull from pillars or minion config: +.. code-block:: yaml - .. code-block:: yaml - - myprofile: - keyid: GKTADJGHEIQSXMKKRBJ08H - key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs - region: us-east-1 + myprofile: + keyid: GKTADJGHEIQSXMKKRBJ08H + key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs + region: us-east-1 .. versionchanged:: 2015.8.0 All methods now return a dictionary. Create and delete methods return: @@ -2905,10 +2903,10 @@ def accept_vpc_peering_connection( # pylint: disable=too-many-arguments :param conn_id: The ID to use. String type. :param name: The name of this VPC peering connection. String type. :param region: The AWS region to use. Type string. - :param key. The key to use for this connection. Type string. - :param keyid. The key id to use. - :param profile. The profile to use. - :param dry_run. The dry_run flag to set. + :param key: The key to use for this connection. Type string. + :param keyid: The key id to use. + :param profile: The profile to use. + :param dry_run: The dry_run flag to set. :return: dict Warning: Please specify either the ``vpc_peering_connection_id`` or diff --git a/salt/modules/capirca_acl.py b/salt/modules/capirca_acl.py index 4a25acb0af..94889e87ac 100644 --- a/salt/modules/capirca_acl.py +++ b/salt/modules/capirca_acl.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' Capirca ACL -============ +=========== Generate ACL (firewall) configuration for network devices. @@ -683,7 +683,7 @@ def get_term_config(platform, select a source just using the name, instead of specifying a destination_port and protocol. Allows the same options as ``source_service``. - **term_fields + term_fields Term attributes. To see what fields are supported, please consult the list of supported keywords_. Some platforms have few other optional_ keywords. diff --git a/salt/modules/ceph.py b/salt/modules/ceph.py index 873f8d715b..c8c1b60783 100644 --- a/salt/modules/ceph.py +++ b/salt/modules/ceph.py @@ -90,8 +90,7 @@ def partition_is(dev): .. code-block:: bash - salt '*' ceph.partition_is /dev/sdc1 - + salt '*' ceph.partition_is /dev/sdc1 ''' return ceph_cfg.partition_is(dev) @@ -106,17 +105,14 @@ def zap(target=None, **kwargs): 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - dev The block device to format. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. cluster_uuid - Set the cluster date will be added too. Defaults to the value found in - local config. + The cluster UUID. Defaults to value found in ceph config file. ''' if target is not None: log.warning("Depricated use of function, use kwargs") @@ -127,7 +123,7 @@ def zap(target=None, **kwargs): def osd_prepare(**kwargs): ''' - prepare an OSD + Prepare an OSD CLI Example: @@ -140,19 +136,18 @@ def osd_prepare(**kwargs): 'osd_fs_type'='xfs' \\ 'osd_uuid'='2a143b73-6d85-4389-a9e9-b8a78d9e1e07' \\ 'journal_uuid'='4562a5db-ff6f-4268-811d-12fd4a09ae98' - Notes: cluster_uuid - Set the device to store the osd data on. + The device to store the osd data on. journal_dev - Set the journal device. defaults to osd_dev. + The journal device. defaults to osd_dev. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. cluster_uuid - Set the cluster date will be added too. Defaults to the value found in local config. + The cluster date will be added too. Defaults to the value found in local config. osd_fs_type set the file system to store OSD data with. Defaults to "xfs". @@ -191,18 +186,15 @@ def keyring_create(**kwargs): 'keyring_type'='admin' \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - keyring_type - Required parameter - Can be set to: - admin, mon, osd, rgw, mds + keyring_type (required) + One of ``admin``, ``mon``, ``osd``, ``rgw``, ``mds`` cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.keyring_create(**kwargs) @@ -218,20 +210,16 @@ def keyring_save(**kwargs): salt '*' ceph.keyring_save \\ 'keyring_type'='admin' \\ 'cluster_name'='ceph' \\ - 'cluster_uuid'='cluster_uuid' \\ - '' - Notes: + 'cluster_uuid'='cluster_uuid' - keyring_type - Required parameter - Can be set to: - admin, mon, osd, rgw, mds + keyring_type (required) + One of ``admin``, ``mon``, ``osd``, ``rgw``, ``mds`` cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.keyring_save(**kwargs) @@ -248,18 +236,15 @@ def keyring_purge(**kwargs): 'keyring_type'='admin' \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - keyring_type - Required parameter - Can be set to: - admin, mon, osd, rgw, mds + keyring_type (required) + One of ``admin``, ``mon``, ``osd``, ``rgw``, ``mds`` cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. If no ceph config file is found, this command will fail. ''' @@ -268,7 +253,7 @@ def keyring_purge(**kwargs): def keyring_present(**kwargs): ''' - Is keyring on disk + Returns ``True`` if the keyring is present on disk, otherwise ``False`` CLI Example: @@ -278,25 +263,22 @@ def keyring_present(**kwargs): 'keyring_type'='admin' \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - keyring_type - Required parameter - Can be set to: - admin, mon, osd, rgw, mds + keyring_type (required) + One of ``admin``, ``mon``, ``osd``, ``rgw``, ``mds`` cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.keyring_present(**kwargs) def keyring_auth_add(**kwargs): ''' - Add keyring to authorised list + Add keyring to authorized list CLI Example: @@ -306,18 +288,15 @@ def keyring_auth_add(**kwargs): 'keyring_type'='admin' \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - keyring_type - Required parameter - Can be set to: - admin, mon, osd, rgw, mds + keyring_type (required) + One of ``admin``, ``mon``, ``osd``, ``rgw``, ``mds`` cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.keyring_auth_add(**kwargs) @@ -334,25 +313,22 @@ def keyring_auth_del(**kwargs): 'keyring_type'='admin' \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - keyring_type - Required parameter - Can be set to: - admin, mon, osd, rgw, mds + keyring_type (required) + One of ``admin``, ``mon``, ``osd``, ``rgw``, ``mds`` cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.keyring_auth_del(**kwargs) def mon_is(**kwargs): ''' - Is this a mon node + Returns ``True`` if the target is a mon node, otherwise ``False`` CLI Example: @@ -361,13 +337,12 @@ def mon_is(**kwargs): salt '*' ceph.mon_is \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. ''' return ceph_cfg.mon_is(**kwargs) @@ -383,20 +358,19 @@ def mon_status(**kwargs): salt '*' ceph.mon_status \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.status(**kwargs) def mon_quorum(**kwargs): ''' - Is mon daemon in quorum + Returns ``True`` if the mon daemon is in the quorum, otherwise ``False`` CLI Example: @@ -405,20 +379,19 @@ def mon_quorum(**kwargs): salt '*' ceph.mon_quorum \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.mon_quorum(**kwargs) def mon_active(**kwargs): ''' - Is mon daemon running + Returns ``True`` if the mon daemon is running, otherwise ``False`` CLI Example: @@ -427,13 +400,12 @@ def mon_active(**kwargs): salt '*' ceph.mon_active \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.mon_active(**kwargs) @@ -449,13 +421,12 @@ def mon_create(**kwargs): salt '*' ceph.mon_create \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.mon_create(**kwargs) @@ -470,13 +441,11 @@ def rgw_pools_create(**kwargs): salt '*' ceph.rgw_pools_create - Notes: - cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.rgw_pools_create(**kwargs) @@ -491,13 +460,11 @@ def rgw_pools_missing(**kwargs): salt '*' ceph.rgw_pools_missing - Notes: - cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.rgw_pools_missing(**kwargs) @@ -515,17 +482,14 @@ def rgw_create(**kwargs): 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - - name: - Required parameter - Set the rgw client name. Must start with 'rgw.' + name (required) + The RGW client name. Must start with ``rgw.`` cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.rgw_create(**kwargs) @@ -543,17 +507,14 @@ def rgw_destroy(**kwargs): 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - - name: - Required parameter - Set the rgw client name. Must start with 'rgw.' + name (required) + The RGW client name (must start with ``rgw.``) cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.rgw_destroy(**kwargs) @@ -573,25 +534,20 @@ def mds_create(**kwargs): 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: + name (required) + The MDS name (must start with ``mds.``) - name: - Required parameter - Set the rgw client name. Must start with 'mds.' + port (required) + Port to which the MDS will listen - port: - Required parameter - Port for the mds to listen to. - - addr: - Required parameter - Address or IP address for the mds to listen to. + addr (required) + Address or IP address for the MDS to listen cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.mds_create(**kwargs) @@ -609,17 +565,14 @@ def mds_destroy(**kwargs): 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - - name: - Required parameter - Set the rgw client name. Must start with 'mds.' + name (required) + The MDS name (must start with ``mds.``) cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.mds_destroy(**kwargs) @@ -635,13 +588,12 @@ def keyring_auth_list(**kwargs): salt '*' ceph.keyring_auth_list \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. ''' return ceph_cfg.keyring_auth_list(**kwargs) @@ -657,13 +609,12 @@ def pool_list(**kwargs): salt '*' ceph.pool_list \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. ''' return ceph_cfg.pool_list(**kwargs) @@ -679,13 +630,12 @@ def pool_add(pool_name, **kwargs): salt '*' ceph.pool_add pool_name \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. pg_num Default to 8 @@ -697,10 +647,10 @@ def pool_add(pool_name, **kwargs): can take values "replicated" or "erasure" erasure_code_profile - Set the "erasure_code_profile" + The "erasure_code_profile" crush_ruleset - Set the crush map rule set + The crush map rule set ''' return ceph_cfg.pool_add(pool_name, **kwargs) @@ -716,13 +666,12 @@ def pool_del(pool_name, **kwargs): salt '*' ceph.pool_del pool_name \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. ''' return ceph_cfg.pool_del(pool_name, **kwargs) @@ -739,13 +688,11 @@ def purge(**kwargs): 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. ''' return ceph_cfg.purge(**kwargs) @@ -753,6 +700,12 @@ def purge(**kwargs): def ceph_version(): ''' Get the version of ceph installed + + CLI Example: + + .. code-block:: bash + + salt '*' ceph.ceph_version ''' return ceph_cfg.ceph_version() @@ -768,26 +721,19 @@ def cluster_quorum(**kwargs): salt '*' ceph.cluster_quorum \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - Get the cluster quorum status. - - Scope: - Cluster wide - - Arguments: cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.cluster_quorum(**kwargs) def cluster_status(**kwargs): ''' - Get the cluster status + Get the cluster status, including health if in quorum CLI Example: @@ -796,18 +742,11 @@ def cluster_status(**kwargs): salt '*' ceph.cluster_status \\ 'cluster_name'='ceph' \\ 'cluster_uuid'='cluster_uuid' - Notes: - Get the cluster status including health if in quorum. - - Scope: - Cluster wide - - Arguments: cluster_uuid - Set the cluster UUID. Defaults to value found in ceph config file. + The cluster UUID. Defaults to value found in ceph config file. cluster_name - Set the cluster name. Defaults to "ceph". + The cluster name. Defaults to ``ceph``. ''' return ceph_cfg.cluster_status(**kwargs) diff --git a/salt/modules/cimc.py b/salt/modules/cimc.py index 62b4f73a7c..0398c24e70 100644 --- a/salt/modules/cimc.py +++ b/salt/modules/cimc.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- ''' -Module to provide Cisco UCS compatibility to Salt. +Module to provide Cisco UCS compatibility to Salt -:codeauthor: :email:`Spencer Ervin ` +:codeauthor: ``Spencer Ervin `` :maturity: new :depends: none :platform: unix @@ -15,12 +15,13 @@ parameters, or as configuration settings in pillar as a Salt proxy. Options passed into opts will be ignored if options are passed into pillar. .. seealso:: - :prox:`Cisco UCS Proxy Module ` + :py:mod:`Cisco UCS Proxy Module ` About ===== -This execution module was designed to handle connections to a Cisco UCS server. This module adds support to send -connections directly to the device through the rest API. +This execution module was designed to handle connections to a Cisco UCS server. +This module adds support to send connections directly to the device through the +rest API. ''' diff --git a/salt/modules/cloud.py b/salt/modules/cloud.py index cfce90a109..9464347ada 100644 --- a/salt/modules/cloud.py +++ b/salt/modules/cloud.py @@ -205,11 +205,14 @@ def map_run(path=None, **kwargs): Execute a salt cloud map file Cloud Map data can be retrieved from several sources: - - a local file (provide the path to the file to the 'path' argument) - - a JSON-formatted map directly (provide the appropriately formatted to using the 'map_data' argument) - - the Salt Pillar (provide the map name of under 'pillar:cloud:maps' to the 'map_pillar' argument) - Note: Only one of these sources can be read at a time. The options are listed in their order of precedence. + - a local file (provide the path to the file to the 'path' argument) + - a JSON-formatted map directly (provide the appropriately formatted to using the 'map_data' argument) + - the Salt Pillar (provide the map name of under 'pillar:cloud:maps' to the 'map_pillar' argument) + + .. note:: + Only one of these sources can be read at a time. The options are listed + in their order of precedence. CLI Examples: diff --git a/salt/modules/cmdmod.py b/salt/modules/cmdmod.py index fb7ca0a499..4464883797 100644 --- a/salt/modules/cmdmod.py +++ b/salt/modules/cmdmod.py @@ -1087,11 +1087,9 @@ def run(cmd, .. versionadded:: Fluorine - :param bool stdin_raw_newlines : False - Normally, newlines present in ``stdin`` as ``\\n`` will be 'unescaped', - i.e. replaced with a ``\n``. Set this parameter to ``True`` to leave - the newlines as-is. This should be used when you are supplying data - using ``stdin`` that should not be modified. + :param bool stdin_raw_newlines: False + If ``True``, Salt will not automatically convert the characters ``\\n`` + present in the ``stdin`` value to newlines. .. versionadded:: Fluorine @@ -1329,11 +1327,9 @@ def shell(cmd, .. versionadded:: Fluorine - :param bool stdin_raw_newlines : False - Normally, newlines present in ``stdin`` as ``\\n`` will be 'unescaped', - i.e. replaced with a ``\n``. Set this parameter to ``True`` to leave - the newlines as-is. This should be used when you are supplying data - using ``stdin`` that should not be modified. + :param bool stdin_raw_newlines: False + If ``True``, Salt will not automatically convert the characters ``\\n`` + present in the ``stdin`` value to newlines. .. versionadded:: Fluorine @@ -1544,11 +1540,9 @@ def run_stdout(cmd, .. versionadded:: Fluorine - :param bool stdin_raw_newlines : False - Normally, newlines present in ``stdin`` as ``\\n`` will be 'unescaped', - i.e. replaced with a ``\n``. Set this parameter to ``True`` to leave - the newlines as-is. This should be used when you are supplying data - using ``stdin`` that should not be modified. + :param bool stdin_raw_newlines: False + If ``True``, Salt will not automatically convert the characters ``\\n`` + present in the ``stdin`` value to newlines. .. versionadded:: Fluorine @@ -1742,11 +1736,9 @@ def run_stderr(cmd, .. versionadded:: Fluorine - :param bool stdin_raw_newlines : False - Normally, newlines present in ``stdin`` as ``\\n`` will be 'unescaped', - i.e. replaced with a ``\n``. Set this parameter to ``True`` to leave - the newlines as-is. This should be used when you are supplying data - using ``stdin`` that should not be modified. + :param bool stdin_raw_newlines: False + If ``True``, Salt will not automatically convert the characters ``\\n`` + present in the ``stdin`` value to newlines. .. versionadded:: Fluorine @@ -1964,11 +1956,9 @@ def run_all(cmd, .. versionadded:: Fluorine - :param bool stdin_raw_newlines : False - Normally, newlines present in ``stdin`` as ``\\n`` will be 'unescaped', - i.e. replaced with a ``\n``. Set this parameter to ``True`` to leave - the newlines as-is. This should be used when you are supplying data - using ``stdin`` that should not be modified. + :param bool stdin_raw_newlines: False + If ``True``, Salt will not automatically convert the characters ``\\n`` + present in the ``stdin`` value to newlines. .. versionadded:: Fluorine @@ -2153,11 +2143,9 @@ def retcode(cmd, .. versionadded:: Fluorine - :param bool stdin_raw_newlines : False - Normally, newlines present in ``stdin`` as ``\\n`` will be 'unescaped', - i.e. replaced with a ``\n``. Set this parameter to ``True`` to leave - the newlines as-is. This should be used when you are supplying data - using ``stdin`` that should not be modified. + :param bool stdin_raw_newlines: False + If ``True``, Salt will not automatically convert the characters ``\\n`` + present in the ``stdin`` value to newlines. .. versionadded:: Fluorine @@ -2401,11 +2389,9 @@ def script(source, .. versionadded:: Fluorine - :param bool stdin_raw_newlines : False - Normally, newlines present in ``stdin`` as ``\\n`` will be 'unescaped', - i.e. replaced with a ``\n``. Set this parameter to ``True`` to leave - the newlines as-is. This should be used when you are supplying data - using ``stdin`` that should not be modified. + :param bool stdin_raw_newlines: False + If ``True``, Salt will not automatically convert the characters ``\\n`` + present in the ``stdin`` value to newlines. .. versionadded:: Fluorine @@ -2647,11 +2633,9 @@ def script_retcode(source, .. versionadded:: Fluorine - :param bool stdin_raw_newlines : False - Normally, newlines present in ``stdin`` as ``\\n`` will be 'unescaped', - i.e. replaced with a ``\n``. Set this parameter to ``True`` to leave - the newlines as-is. This should be used when you are supplying data - using ``stdin`` that should not be modified. + :param bool stdin_raw_newlines: False + If ``True``, Salt will not automatically convert the characters ``\\n`` + present in the ``stdin`` value to newlines. .. versionadded:: Fluorine @@ -2970,7 +2954,8 @@ def run_chroot(root, the return code will be overridden with zero. .. versionadded:: Fluorine -CLI Example: + + CLI Example: .. code-block:: bash @@ -3453,11 +3438,9 @@ def powershell(cmd, .. versionadded:: Fluorine - :param bool stdin_raw_newlines : False - Normally, newlines present in ``stdin`` as ``\\n`` will be 'unescaped', - i.e. replaced with a ``\n``. Set this parameter to ``True`` to leave - the newlines as-is. This should be used when you are supplying data - using ``stdin`` that should not be modified. + :param bool stdin_raw_newlines: False + If ``True``, Salt will not automatically convert the characters ``\\n`` + present in the ``stdin`` value to newlines. .. versionadded:: Fluorine @@ -3757,11 +3740,9 @@ def powershell_all(cmd, .. versionadded:: Fluorine - :param bool stdin_raw_newlines : False - Normally, newlines present in ``stdin`` as ``\\n`` will be 'unescaped', - i.e. replaced with a ``\n``. Set this parameter to ``True`` to leave - the newlines as-is. This should be used when you are supplying data - using ``stdin`` that should not be modified. + :param bool stdin_raw_newlines: False + If ``True``, Salt will not automatically convert the characters ``\\n`` + present in the ``stdin`` value to newlines. .. versionadded:: Fluorine @@ -4016,11 +3997,9 @@ def run_bg(cmd, .. versionadded:: Fluorine - :param bool stdin_raw_newlines : False - Normally, newlines present in ``stdin`` as ``\\n`` will be 'unescaped', - i.e. replaced with a ``\n``. Set this parameter to ``True`` to leave - the newlines as-is. This should be used when you are supplying data - using ``stdin`` that should not be modified. + :param bool stdin_raw_newlines: False + If ``True``, Salt will not automatically convert the characters ``\\n`` + present in the ``stdin`` value to newlines. .. versionadded:: Fluorine diff --git a/salt/modules/consul.py b/salt/modules/consul.py index 8176b43729..1c73120b8a 100644 --- a/salt/modules/consul.py +++ b/salt/modules/consul.py @@ -126,7 +126,6 @@ def list_(consul_url=None, token=None, key=None, **kwargs): .. code-block:: bash salt '*' consul.list - salt '*' consul.list key='web' ''' @@ -178,17 +177,15 @@ def get(consul_url=None, key=None, token=None, recurse=False, decode=False, raw= .. code-block:: bash salt '*' consul.get key='web/key1' - - salt '*' consul.list key='web' recurse='True - - salt '*' consul.list key='web' recurse='True' decode='True' + salt '*' consul.get key='web' recurse=True + salt '*' consul.get key='web' recurse=True decode=True By default values stored in Consul are base64 encoded, passing the decode option will show them as the decoded values. .. code-block:: bash - salt '*' consul.list key='web' recurse='True' decode='True' raw='True' + salt '*' consul.get key='web' recurse=True decode=True raw=True By default Consult will return other information about the key, the raw option will return only the raw value. @@ -251,11 +248,9 @@ def put(consul_url=None, token=None, key=None, value=None, **kwargs): salt '*' consul.put key='web/key1' value="Hello there" - salt '*' consul.put key='web/key1' value="Hello there" - acquire='d5d371f4-c380-5280-12fd-8810be175592' + salt '*' consul.put key='web/key1' value="Hello there" acquire='d5d371f4-c380-5280-12fd-8810be175592' - salt '*' consul.put key='web/key1' value="Hello there" - release='d5d371f4-c380-5280-12fd-8810be175592' + salt '*' consul.put key='web/key1' value="Hello there" release='d5d371f4-c380-5280-12fd-8810be175592' ''' ret = {} @@ -366,7 +361,6 @@ def delete(consul_url=None, token=None, key=None, **kwargs): .. code-block:: bash salt '*' consul.delete key='web' - salt '*' consul.delete key='web' recurse='True' ''' @@ -714,8 +708,7 @@ def agent_check_register(consul_url=None, token=None, **kwargs): .. code-block:: bash - salt '*' consul.agent_check_register name='Memory Utilization' - script='/usr/local/bin/check_mem.py' interval='15s' + salt '*' consul.agent_check_register name='Memory Utilization' script='/usr/local/bin/check_mem.py' interval='15s' ''' ret = {} @@ -835,8 +828,7 @@ def agent_check_pass(consul_url=None, token=None, checkid=None, **kwargs): .. code-block:: bash - salt '*' consul.agent_check_pass checkid='redis_check1' - note='Forcing check into passing state.' + salt '*' consul.agent_check_pass checkid='redis_check1' note='Forcing check into passing state.' ''' ret = {} @@ -885,8 +877,7 @@ def agent_check_warn(consul_url=None, token=None, checkid=None, **kwargs): .. code-block:: bash - salt '*' consul.agent_check_warn checkid='redis_check1' - note='Forcing check into warning state.' + salt '*' consul.agent_check_warn checkid='redis_check1' note='Forcing check into warning state.' ''' ret = {} @@ -935,8 +926,7 @@ def agent_check_fail(consul_url=None, token=None, checkid=None, **kwargs): .. code-block:: bash - salt '*' consul.agent_check_fail checkid='redis_check1' - note='Forcing check into critical state.' + salt '*' consul.agent_check_fail checkid='redis_check1' note='Forcing check into critical state.' ''' ret = {} @@ -999,9 +989,7 @@ def agent_service_register(consul_url=None, token=None, **kwargs): .. code-block:: bash - salt '*' consul.agent_service_register name='redis' - tags='["master", "v1"]' address="127.0.0.1" port="8080" - check_script="/usr/local/bin/check_redis.py" interval="10s" + salt '*' consul.agent_service_register name='redis' tags='["master", "v1"]' address="127.0.0.1" port="8080" check_script="/usr/local/bin/check_redis.py" interval="10s" ''' ret = {} @@ -1144,8 +1132,7 @@ def agent_service_maintenance(consul_url=None, token=None, serviceid=None, **kwa .. code-block:: bash - salt '*' consul.agent_service_deregister serviceid='redis' - enable='True' reason='Down for upgrade' + salt '*' consul.agent_service_deregister serviceid='redis' enable='True' reason='Down for upgrade' ''' ret = {} @@ -1216,8 +1203,7 @@ def session_create(consul_url=None, token=None, **kwargs): .. code-block:: bash - salt '*' consul.session_create node='node1' name='my-session' - behavior='delete' ttl='3600s' + salt '*' consul.session_create node='node1' name='my-session' behavior='delete' ttl='3600s' ''' ret = {} @@ -1444,9 +1430,7 @@ def catalog_register(consul_url=None, token=None, **kwargs): .. code-block:: bash - salt '*' consul.catalog_register node='node1' address='192.168.1.1' - service='redis' service_address='127.0.0.1' service_port='8080' - service_id='redis_server1' + salt '*' consul.catalog_register node='node1' address='192.168.1.1' service='redis' service_address='127.0.0.1' service_port='8080' service_id='redis_server1' ''' ret = {} @@ -1596,8 +1580,7 @@ def catalog_deregister(consul_url=None, token=None, **kwargs): .. code-block:: bash - salt '*' consul.catalog_register node='node1' - serviceid='redis_server1' checkid='redis_check1' + salt '*' consul.catalog_register node='node1' serviceid='redis_server1' checkid='redis_check1' ''' ret = {} diff --git a/salt/modules/cyg.py b/salt/modules/cyg.py index 61a5849c08..fcbdbbd85a 100644 --- a/salt/modules/cyg.py +++ b/salt/modules/cyg.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -""" +''' Manage cygwin packages. Module file to accompany the cyg state. -""" +''' from __future__ import absolute_import, print_function, unicode_literals # Import python libs @@ -49,7 +49,9 @@ __func_alias__ = { def _get_cyg_dir(cyg_arch='x86_64'): - """Return the cygwin install directory based on the architecture.""" + ''' + Return the cygwin install directory based on the architecture. + ''' if cyg_arch == 'x86_64': return 'cygwin64' elif cyg_arch == 'x86': @@ -60,12 +62,12 @@ def _get_cyg_dir(cyg_arch='x86_64'): def _check_cygwin_installed(cyg_arch='x86_64'): - """ + ''' Return True or False if cygwin is installed. Use the cygcheck executable to check install. It is installed as part of the base package, and we use it to check packages - """ + ''' path_to_cygcheck = os.sep.join(['C:', _get_cyg_dir(cyg_arch), 'bin', 'cygcheck.exe']) @@ -78,7 +80,9 @@ def _check_cygwin_installed(cyg_arch='x86_64'): def _get_all_packages(mirror=DEFAULT_MIRROR, cyg_arch='x86_64'): - """Return the list of packages based on the mirror provided.""" + ''' + Return the list of packages based on the mirror provided. + ''' if 'cyg.all_packages' not in __context__: __context__['cyg.all_packages'] = {} if mirror not in __context__['cyg.all_packages']: @@ -133,12 +137,12 @@ def check_valid_package(package, def _run_silent_cygwin(cyg_arch='x86_64', args=None, mirrors=None): - """ + ''' Retrieve the correct setup.exe. Run it with the correct arguments to get the bare minimum cygwin installation up and running. - """ + ''' cyg_cache_dir = os.sep.join(['c:', 'cygcache']) cyg_setup = 'setup-{0}.exe'.format(cyg_arch) cyg_setup_path = os.sep.join([cyg_cache_dir, cyg_setup]) @@ -188,7 +192,9 @@ def _run_silent_cygwin(cyg_arch='x86_64', def _cygcheck(args, cyg_arch='x86_64'): - """Run the cygcheck executable.""" + ''' + Run the cygcheck executable. + ''' cmd = ' '.join([ os.sep.join(['c:', _get_cyg_dir(cyg_arch), 'bin', 'cygcheck']), '-c', args]) @@ -204,7 +210,7 @@ def _cygcheck(args, cyg_arch='x86_64'): def install(packages=None, cyg_arch='x86_64', mirrors=None): - """ + ''' Install one or several packages. packages : None @@ -219,8 +225,8 @@ def install(packages=None, .. code-block:: bash salt '*' cyg.install dos2unix - salt '*' cyg.install dos2unix mirrors=[{'http://mirror': 'http://url/to/public/key}] - """ + salt '*' cyg.install dos2unix mirrors="[{'http://mirror': 'http://url/to/public/key}]' + ''' args = [] # If we want to install packages if packages is not None: @@ -236,7 +242,7 @@ def install(packages=None, def uninstall(packages, cyg_arch='x86_64', mirrors=None): - """ + ''' Uninstall one or several packages. packages @@ -251,8 +257,8 @@ def uninstall(packages, .. code-block:: bash salt '*' cyg.uninstall dos2unix - salt '*' cyg.uninstall dos2unix mirrors=[{'http://mirror': 'http://url/to/public/key}] - """ + salt '*' cyg.uninstall dos2unix mirrors="[{'http://mirror': 'http://url/to/public/key}]" + ''' args = [] if packages is not None: args.append('--remove-packages {pkgs}'.format(pkgs=packages)) @@ -265,7 +271,7 @@ def uninstall(packages, def update(cyg_arch='x86_64', mirrors=None): - """ + ''' Update all packages. cyg_arch : x86_64 @@ -277,8 +283,8 @@ def update(cyg_arch='x86_64', mirrors=None): .. code-block:: bash salt '*' cyg.update - salt '*' cyg.update dos2unix mirrors=[{'http://mirror': 'http://url/to/public/key}] - """ + salt '*' cyg.update dos2unix mirrors="[{'http://mirror': 'http://url/to/public/key}]" + ''' args = [] args.append('--upgrade-also') @@ -292,7 +298,7 @@ def update(cyg_arch='x86_64', mirrors=None): def list_(package='', cyg_arch='x86_64'): - """ + ''' List locally installed packages. package : '' @@ -307,7 +313,7 @@ def list_(package='', cyg_arch='x86_64'): .. code-block:: bash salt '*' cyg.list - """ + ''' pkgs = {} args = ' '.join(['-c', '-d', package]) stdout = _cygcheck(args, cyg_arch=cyg_arch) diff --git a/salt/modules/defaults.py b/salt/modules/defaults.py index 9f1e9749df..677602caf4 100644 --- a/salt/modules/defaults.py +++ b/salt/modules/defaults.py @@ -156,34 +156,38 @@ def update(dest, defaults, merge_lists=True, in_place=True): and defaults.deepcopy to avoid redundant in jinja. Example: + .. code-block:: yaml - group01: - defaults: - enabled: True - extra: - - test - - stage - nodes: - host01: - index: foo - upstream: bar - host02: - index: foo2 - upstream: bar2 + group01: + defaults: + enabled: True + extra: + - test + - stage + nodes: + host01: + index: foo + upstream: bar + host02: + index: foo2 + upstream: bar2 - .. code-block:: - {% do salt['defaults.update'](group01.nodes, group01.defaults) %} + .. code-block:: jinja + + {% do salt['defaults.update'](group01.nodes, group01.defaults) %} Each node will look like the following: + .. code-block:: yaml - host01: - enabled: True - index: foo - upstream: bar - extra: - - test - - stage + + host01: + enabled: True + index: foo + upstream: bar + extra: + - test + - stage merge_lists : True If True, it will also merge lists instead of replace their items. diff --git a/salt/modules/dockercompose.py b/salt/modules/dockercompose.py index 725bea549b..61e937536c 100644 --- a/salt/modules/dockercompose.py +++ b/salt/modules/dockercompose.py @@ -43,13 +43,13 @@ In order to use the module if you have no docker-compose file on the server you can issue the command create, it takes two arguments the path where the docker-compose.yml will be stored and the content of this latter: -.. code-block:: bash +.. code-block:: text # salt-call -l debug dockercompose.create /tmp/toto ' - database: - image: mongo:3.0 - command: mongod --smallfiles --quiet --logpath=/dev/null - ' + database: + image: mongo:3.0 + command: mongod --smallfiles --quiet --logpath=/dev/null + ' Then you can execute a list of method defined at the bottom with at least one argument (the path where the docker-compose.yml will be read) and an optional diff --git a/salt/modules/dockermod.py b/salt/modules/dockermod.py index 58464c67df..365b437980 100644 --- a/salt/modules/dockermod.py +++ b/salt/modules/dockermod.py @@ -19,7 +19,7 @@ Management of Docker Containers .. _lxc-attach: https://linuxcontainers.org/lxc/manpages/man1/lxc-attach.1.html .. _nsenter: http://man7.org/linux/man-pages/man1/nsenter.1.html .. _docker-exec: http://docs.docker.com/reference/commandline/cli/#exec -.. _`low-level API`: http://docker-py.readthedocs.io/en/stable/api.html +.. _`docker-py Low-level API`: http://docker-py.readthedocs.io/en/stable/api.html .. _timelib: https://pypi.python.org/pypi/timelib .. _`trusted builds`: https://blog.docker.com/2013/11/introducing-trusted-builds/ .. _`Docker Engine API`: https://docs.docker.com/engine/api/v1.33/#operation/ContainerCreate @@ -201,6 +201,7 @@ import pipes import re import shutil import string +import sys import time import uuid import subprocess @@ -257,6 +258,7 @@ __func_alias__ = { 'signal_': 'signal', 'start_': 'start', 'tag_': 'tag', + 'apply_': 'apply' } # Minimum supported versions @@ -271,6 +273,13 @@ NOTSET = object() __virtualname__ = 'docker' __virtual_aliases__ = ('dockerng', 'moby') +__proxyenabled__ = ['docker'] +__outputter__ = { + 'sls': 'highstate', + 'apply_': 'highstate', + 'highstate': 'highstate', +} + def __virtual__(): ''' @@ -436,11 +445,20 @@ def _refresh_mine_cache(wrapped): refresh salt mine on exit. ''' returned = wrapped(*args, **__utils__['args.clean_kwargs'](**kwargs)) - __salt__['mine.send']('docker.ps', verbose=True, all=True, host=True) + if _check_update_mine(): + __salt__['mine.send']('docker.ps', verbose=True, all=True, host=True) return returned return wrapper +def _check_update_mine(): + try: + ret = __context__['docker.update_mine'] + except KeyError: + ret = __context__['docker.update_mine'] = __salt__['config.get']('docker.update_mine', default=True) + return ret + + # Helper functions def _change_state(name, action, expected, *args, **kwargs): ''' @@ -788,7 +806,7 @@ def get_client_args(limit=None): Added ability to limit the input to specific client functions Many functions in Salt have been written to support the full list of - arguments for a given function in docker-py's `low-level API`_. However, + arguments for a given function in the `docker-py Low-level API`_. However, depending on the version of docker-py installed on the minion, the available arguments may differ. This function will get the arguments for various functions in the installed version of docker-py, to be used as a @@ -996,17 +1014,17 @@ def compare_container_networks(first, second): :py:func:`docker_container.running ` state), automatic IP configuration will also be checked in these cases. - This function uses the :minion_opts:`docker.compare_container_networks` + This function uses the :conf_minion:`docker.compare_container_networks` minion config option to determine which keys to examine. This provides flexibility in the event that features added in a future Docker release necessitate changes to how Salt compares networks. In these cases, rather than waiting for a new Salt release one can just set - :minion_opts:`docker.compare_container_networks`. + :conf_minion:`docker.compare_container_networks`. .. note:: The checks for automatic IP configuration described above only apply if ``IPAMConfig`` is among the keys set for static IP checks in - :minion_opts:`docker.compare_container_networks`. + :conf_minion:`docker.compare_container_networks`. first Name or ID of first container (old) @@ -2820,9 +2838,9 @@ def create(image, Example: - - ``log_opt="syslog-address=tcp://192.168.0.42,syslog-facility=daemon" - - ``log_opt="['syslog-address=tcp://192.168.0.42', 'syslog-facility=daemon']" - - ``log_opt="{'syslog-address': 'tcp://192.168.0.42', 'syslog-facility: daemon + - ``log_opt="syslog-address=tcp://192.168.0.42,syslog-facility=daemon"`` + - ``log_opt="['syslog-address=tcp://192.168.0.42', 'syslog-facility=daemon']"`` + - ``log_opt="{'syslog-address': 'tcp://192.168.0.42', 'syslog-facility': 'daemon'}"`` lxc_conf Additional LXC configuration parameters to set before starting the @@ -5087,7 +5105,7 @@ def create_network(name, other issues to be more easily worked around. See the following links for more information: - - docker-py `low-level API`_ + - `docker-py Low-level API`_ - `Docker Engine API`_ .. versionadded:: 2018.3.0 @@ -5178,6 +5196,8 @@ def create_network(name, get an error unless you have set up a fixed IPv6 subnet. Consult the `Docker IPv6 docs`_ for information on how to do this. + .. _`Docker IPv6 docs`: https://docs.docker.com/v17.09/engine/userguide/networking/default_network/ipv6/ + attachable : False If ``True``, and the network is in the global scope, non-service containers on worker nodes will be able to connect to the network. @@ -6586,6 +6606,9 @@ def _compile_state(sls_opts, mods=None): ''' st_ = HighState(sls_opts) + if not mods: + return st_.compile_low_chunks() + high_data, errors = st_.render_highstate({sls_opts['saltenv']: mods}) high_data, ext_errors = st_.state.reconcile_extend(high_data) errors += ext_errors @@ -6658,7 +6681,7 @@ def call(name, function, *args, **kwargs): try: salt_argv = [ - 'python', + 'python{0}'.format(sys.version_info[0]), os.path.join(thin_dest_path, 'salt-call'), '--metadata', '--local', @@ -6692,6 +6715,27 @@ def call(name, function, *args, **kwargs): run_all(name, subprocess.list2cmdline(rm_thin_argv)) +def apply_(name, mods=None, **kwargs): + ''' + .. versionadded:: Fluorine + + Apply states! This function will call highstate or state.sls based on the + arguments passed in, ``apply`` is intended to be the main gateway for + all state executions. + + CLI Example: + + .. code-block:: bash + + salt 'docker' docker.apply web01 + salt 'docker' docker.apply web01 test + salt 'docker' docker.apply web01 test,pkgs + ''' + if mods: + return sls(name, mods, **kwargs) + return highstate(name, **kwargs) + + def sls(name, mods=None, **kwargs): ''' Apply the states defined by the specified SLS modules to the running @@ -6809,6 +6853,31 @@ def sls(name, mods=None, **kwargs): return ret +def highstate(name, saltenv='base', **kwargs): + ''' + Apply a highstate to the running container + + .. versionadded:: Fluorine + + The container does not need to have Salt installed, but Python is required. + + name + Container name or ID + + saltenv : base + Specify the environment from which to retrieve the SLS indicated by the + `mods` parameter. + + CLI Example: + + .. code-block:: bash + + salt myminion docker.highstate compassionate_mirzakhani + + ''' + return sls(name, saltenv='base', **kwargs) + + def sls_build(repository, tag='latest', base='opensuse/python', diff --git a/salt/modules/ebuild.py b/salt/modules/ebuild.py index dffd831e01..44f02b0ce2 100644 --- a/salt/modules/ebuild.py +++ b/salt/modules/ebuild.py @@ -16,9 +16,11 @@ i.e. ``'vim'`` will not work, ``'app-editors/vim'`` will. from __future__ import absolute_import, print_function, unicode_literals # Import python libs +import os import copy import logging import re +import datetime # Import salt libs import salt.utils.args @@ -437,7 +439,21 @@ def list_pkgs(versions_as_list=False, **kwargs): def refresh_db(): ''' - Updates the portage tree (emerge --sync). Uses eix-sync if available. + Update the portage tree using the first available method from the following + list: + + - emaint sync + - eix-sync + - emerge-webrsync + - emerge --sync + + To prevent the portage tree from being synced within one day of the + previous sync, add the following pillar data for this minion: + + .. code-block:: yaml + + portage: + sync_wait_one_day: True CLI Example: @@ -445,28 +461,37 @@ def refresh_db(): salt '*' pkg.refresh_db ''' + has_emaint = os.path.isdir('/etc/portage/repos.conf') + has_eix = True if 'eix.sync' in __salt__ else False + has_webrsync = True if __salt__['makeconf.features_contains']('webrsync-gpg') else False + # Remove rtag file to keep multiple refreshes from happening in pkg states salt.utils.pkg.clear_rtag(__opts__) - if 'eix.sync' in __salt__: - return __salt__['eix.sync']() + # Option to prevent syncing package tree if done in the last 24 hours + if __salt__['pillar.get']('portage:sync_wait_one_day', False): + main_repo_root = __salt__['cmd.run']('portageq get_repo_path / gentoo') + day = datetime.timedelta(days=1) + now = datetime.datetime.now() + timestamp = datetime.datetime.fromtimestamp(os.path.getmtime(main_repo_root)) + if now - timestamp < day: + log.info('Did not sync package tree since last sync was done at' + ' {0}, less than 1 day ago'.format(timestamp)) + return False - if 'makeconf.features_contains'in __salt__ and __salt__['makeconf.features_contains']('webrsync-gpg'): - # GPG sign verify is supported only for "webrsync" + if has_emaint: + return __salt__['cmd.retcode']('emaint sync -a') == 0 + elif has_eix: + return __salt__['eix.sync']() + elif has_webrsync: + # GPG sign verify is supported only for 'webrsync' cmd = 'emerge-webrsync -q' - # We prefer 'delta-webrsync' to 'webrsync' + # Prefer 'delta-webrsync' to 'webrsync' if salt.utils.path.which('emerge-delta-webrsync'): cmd = 'emerge-delta-webrsync -q' - return __salt__['cmd.retcode'](cmd, python_shell=False) == 0 + return __salt__['cmd.retcode'](cmd) == 0 else: - if __salt__['cmd.retcode']('emerge --ask n --quiet --sync', - python_shell=False) == 0: - return True - # We fall back to "webrsync" if "rsync" fails for some reason - cmd = 'emerge-webrsync -q' - # We prefer 'delta-webrsync' to 'webrsync' - if salt.utils.path.which('emerge-delta-webrsync'): - cmd = 'emerge-delta-webrsync -q' - return __salt__['cmd.retcode'](cmd, python_shell=False) == 0 + # Default to deprecated `emerge --sync` form + return __salt__['cmd.retcode']('emerge --ask n --quiet --sync') == 0 def _flags_changed(inst_flags, conf_flags): diff --git a/salt/modules/file.py b/salt/modules/file.py index 31e26e0169..ba9bafd168 100644 --- a/salt/modules/file.py +++ b/salt/modules/file.py @@ -576,30 +576,26 @@ def lsattr(path): return results -def chattr(*args, **kwargs): +def chattr(*files, **kwargs): ''' .. versionadded:: 2018.3.0 - Change the attributes of files - - *args - list of files to modify attributes of - - **kwargs - the following are valid pairs: + Change the attributes of files. This function accepts one or more files and + the following options: operator - add|remove - determines whether attributes should be added or removed from files + Can be wither ``add`` or ``remove``. Determines whether attributes + should be added or removed from files attributes - acdijstuADST - string of characters representing attributes to add/remove from files + One or more of the following characters: ``acdijstuADST``, representing + attributes to add to/remove from files version - a version number to assign to the files + a version number to assign to the file(s) flags - [RVf] + One or more of the following characters: ``RVf``, representing flags to assign to chattr (recurse, verbose, suppress most errors) CLI Example: @@ -609,34 +605,34 @@ def chattr(*args, **kwargs): salt '*' file.chattr foo1.txt foo2.txt operator=add attributes=ai salt '*' file.chattr foo3.txt operator=remove attributes=i version=2 ''' - args = [arg if salt.utils.stringutils.is_quoted(arg) else '"{0}"'.format(arg) - for arg in args] - operator = kwargs.pop('operator', None) attributes = kwargs.pop('attributes', None) flags = kwargs.pop('flags', None) version = kwargs.pop('version', None) - if (operator is None) or (operator not in ['add', 'remove']): + if (operator is None) or (operator not in ('add', 'remove')): raise SaltInvocationError( "Need an operator: 'add' or 'remove' to modify attributes.") if attributes is None: raise SaltInvocationError("Need attributes: [AacDdijsTtSu]") + cmd = ['chattr'] + if operator == "add": attrs = '+{0}'.format(attributes) elif operator == "remove": attrs = '-{0}'.format(attributes) - flgs = '' + cmd.append(attrs) + if flags is not None: - flgs = '-{0}'.format(flags) + cmd.append('-{0}'.format(flags)) - vrsn = '' if version is not None: - vrsn = '-v {0}'.format(version) + cmd.extend(['-v', version]) + + cmd.extend(files) - cmd = 'chattr {0} {1} {2} {3}'.format(attrs, flgs, vrsn, ' '.join(args)) result = __salt__['cmd.run'](cmd, python_shell=False) if bool(result): @@ -2049,9 +2045,14 @@ def line(path, content=None, match=None, mode=None, location=None, fh_ = None try: # Make sure we match the file mode from salt.utils.files.fopen - mode = 'wb' if six.PY2 and salt.utils.platform.is_windows() else 'w' + if six.PY2 and salt.utils.platform.is_windows(): + mode = 'wb' + body = salt.utils.data.encode_list(body) + else: + mode = 'w' + body = salt.utils.data.decode_list(body, to_str=True) fh_ = salt.utils.atomicfile.atomic_open(path, mode) - fh_.write(''.join(body)) + fh_.writelines(body) finally: if fh_: fh_.close() @@ -2103,8 +2104,8 @@ def replace(path, otherwise all occurrences will be replaced. flags (list or int) - A list of flags defined in the :ref:`re module documentation - `. Each list item should be a string that will + A list of flags defined in the ``re`` module documentation from the + Python standard library. Each list item should be a string that will correlate to the human-friendly flag name. E.g., ``['IGNORECASE', 'MULTILINE']``. Optionally, ``flags`` may be an int, with a value corresponding to the XOR (``|``) of all the desired flags. Defaults to @@ -4463,7 +4464,7 @@ def check_perms(name, ret, user, group, mode, attrs=None, follow_symlinks=False) lattrs = lsattr(name) if lattrs is not None: # List attributes on file - perms['lattrs'] = ''.join(lattrs.get('name', '')) + perms['lattrs'] = ''.join(lattrs.get(name, '')) # Remove attributes on file so changes can be enforced. if perms['lattrs']: chattr(name, operator='remove', attributes=perms['lattrs']) diff --git a/salt/modules/freebsd_sysctl.py b/salt/modules/freebsd_sysctl.py index 630147c066..7265748fa3 100644 --- a/salt/modules/freebsd_sysctl.py +++ b/salt/modules/freebsd_sysctl.py @@ -165,7 +165,7 @@ def persist(name, value, config='/etc/sysctl.conf'): if not edited: nlines.append("{0}\n".format(_formatfor(name, value, config))) with salt.utils.files.fopen(config, 'w+') as ofile: - nlines = [salt.utils.stringutils.to_str(_l) for _l in nlines] + nlines = [salt.utils.stringutils.to_str(_l) + '\n' for _l in nlines] ofile.writelines(nlines) if config != '/boot/loader.conf': assign(name, value) diff --git a/salt/modules/git.py b/salt/modules/git.py index 504f93aed9..557e290d68 100644 --- a/salt/modules/git.py +++ b/salt/modules/git.py @@ -3813,15 +3813,23 @@ def remote_refs(url, https_pass=None, ignore_retcode=False, output_encoding=None, - saltenv='base'): + saltenv='base', + **kwargs): ''' .. versionadded:: 2015.8.0 - Return the remote refs for the specified URL + Return the remote refs for the specified URL by running ``git ls-remote``. url URL of the remote repository + filter + Optionally provide a ref name to ``git ls-remote``. This can be useful + to make this function run faster on repositories with many + branches/tags. + + .. versionadded:: Fluorine + heads : False Restrict output to heads. Can be combined with ``tags``. @@ -3893,7 +3901,13 @@ def remote_refs(url, .. code-block:: bash salt myminion git.remote_refs https://github.com/saltstack/salt.git + salt myminion git.remote_refs https://github.com/saltstack/salt.git filter=develop ''' + kwargs = salt.utils.args.clean_kwargs(**kwargs) + filter_ = kwargs.pop('filter', None) + if kwargs: + salt.utils.args.invalid_kwargs(kwargs) + command = ['git', 'ls-remote'] if heads: command.append('--heads') @@ -3906,6 +3920,8 @@ def remote_refs(url, https_only=True)) except ValueError as exc: raise SaltInvocationError(exc.__str__()) + if filter_: + command.append(filter_) output = _git_run(command, user=user, password=password, diff --git a/salt/modules/glusterfs.py b/salt/modules/glusterfs.py index ea42b07bae..9e01eca8c5 100644 --- a/salt/modules/glusterfs.py +++ b/salt/modules/glusterfs.py @@ -29,10 +29,6 @@ def __virtual__(): return (False, 'glusterfs server is not installed') -def _get_minor_version(): - return int(_get_version()[1]) - - def _get_version(): # Set the default minor version to 6 for tests version = [3, 6] @@ -40,8 +36,9 @@ def _get_version(): result = __salt__['cmd.run'](cmd).splitlines() for line in result: if line.startswith('glusterfs'): - version = line.split()[1].split('.') - return version + version = line.split()[-1].split('.') + version = [int(i) for i in version] + return tuple(version) def _gluster_ok(xml_data): @@ -74,7 +71,7 @@ def _gluster_xml(cmd): # We will pass the command string as stdin to allow for much longer # command strings. This is especially useful for creating large volumes # where the list of bricks exceeds 128 characters. - if _get_minor_version() < 6: + if _get_version() < (3, 6,): result = __salt__['cmd.run']( 'script -q -c "gluster --xml --mode=script"', stdin="{0}\n\004".format(cmd) ) @@ -223,7 +220,7 @@ def peer(name): def create_volume(name, bricks, stripe=False, replica=False, device_vg=False, transport='tcp', start=False, force=False): ''' - Create a glusterfs volume. + Create a glusterfs volume name Name of the gluster volume @@ -255,7 +252,7 @@ def create_volume(name, bricks, stripe=False, replica=False, device_vg=False, force Force volume creation, this works even if creating in root FS - CLI Example: + CLI Examples: .. code-block:: bash @@ -392,7 +389,6 @@ def info(name=None): .. code-block:: bash salt '*' glusterfs.info - ''' cmd = 'volume info' if name is not None: @@ -428,7 +424,7 @@ def info(name=None): def start_volume(name, force=False): ''' - Start a gluster volume. + Start a gluster volume name Volume name @@ -461,13 +457,14 @@ def start_volume(name, force=False): def stop_volume(name, force=False): ''' - Stop a gluster volume. + Stop a gluster volume name Volume name force Force stop the volume + .. versionadded:: 2015.8.4 CLI Example: @@ -498,8 +495,14 @@ def delete_volume(target, stop=True): target Volume to delete - stop - Stop volume before delete if it is started, True by default + stop : True + If ``True``, stop volume before delete + + CLI Example: + + .. code-block:: bash + + salt '*' glusterfs.delete_volume ''' volinfo = info() if target not in volinfo: @@ -531,6 +534,12 @@ def add_volume_bricks(name, bricks): bricks List of bricks to add to the volume + + CLI Example: + + .. code-block:: bash + + salt '*' glusterfs.add_volume_bricks ''' volinfo = info() @@ -569,6 +578,12 @@ def enable_quota_volume(name): name Name of the gluster volume + + CLI Example: + + .. code-block:: bash + + salt '*' glusterfs.enable_quota_volume ''' cmd = 'volume quota {0} enable'.format(name) @@ -583,6 +598,12 @@ def disable_quota_volume(name): name Name of the gluster volume + + CLI Example: + + .. code-block:: bash + + salt '*' glusterfs.disable_quota_volume ''' cmd = 'volume quota {0} disable'.format(name) @@ -612,7 +633,6 @@ def set_quota_volume(name, path, size, enable_quota=False): .. code-block:: bash salt '*' glusterfs.set_quota_volume enable_quota=True - ''' cmd = 'volume quota {0}'.format(name) if path: @@ -630,16 +650,19 @@ def set_quota_volume(name, path, size, enable_quota=False): def unset_quota_volume(name, path): ''' - Unset quota to glusterfs volume. + Unset quota on glusterfs volume + name Name of the gluster volume + path Folder path for restriction in volume + CLI Example: + .. code-block:: bash salt '*' glusterfs.unset_quota_volume - ''' cmd = 'volume quota {0}'.format(name) if path: @@ -652,10 +675,16 @@ def unset_quota_volume(name, path): def list_quota_volume(name): ''' - List quotas of glusterfs volume. + List quotas of glusterfs volume + name Name of the gluster volume + CLI Example: + + .. code-block:: bash + + salt '*' glusterfs.list_quota_volume ''' cmd = 'volume quota {0}'.format(name) cmd += ' list' @@ -677,9 +706,12 @@ def get_op_version(name): .. versionadded:: Fluorine Returns the glusterfs volume op-version + name Name of the glusterfs volume + CLI Example: + .. code-block:: bash salt '*' glusterfs.get_op_version @@ -716,11 +748,8 @@ def get_max_op_version(): salt '*' glusterfs.get_max_op_version ''' - - minor_version = _get_minor_version() - - if int(minor_version) < 10: - return False, 'Glusterfs version must be 3.10+. Your version is {0}.'.format(str('.'.join(_get_version()))) + if _get_version() < (3, 10,): + return False, 'Glusterfs version must be 3.10+. Your version is {0}.'.format(str('.'.join(str(i) for i in _get_version()))) cmd = 'volume get all cluster.max-op-version' root = _gluster_xml(cmd) @@ -746,9 +775,12 @@ def set_op_version(version): .. versionadded:: Fluorine Set the glusterfs volume op-version + version Version to set the glusterfs volume op-version + CLI Example: + .. code-block:: bash salt '*' glusterfs.set_op_version diff --git a/salt/modules/gpg.py b/salt/modules/gpg.py index 5d57e4a192..53252d31d9 100644 --- a/salt/modules/gpg.py +++ b/salt/modules/gpg.py @@ -1051,16 +1051,15 @@ def verify(text=None, signature Specify the filename of a detached signature. - .. versionadded:: 2018.3.0 + + .. versionadded:: 2018.3.0 CLI Example: .. code-block:: bash salt '*' gpg.verify text='Hello there. How are you?' - salt '*' gpg.verify filename='/path/to/important.file' - salt '*' gpg.verify filename='/path/to/important.file' use_passphrase=True ''' diff --git a/salt/modules/infoblox.py b/salt/modules/infoblox.py index 511512d284..479446e827 100644 --- a/salt/modules/infoblox.py +++ b/salt/modules/infoblox.py @@ -97,7 +97,8 @@ def diff_objects(obja, objb): Diff two complex infoblox objects. This is used from salt states to detect changes in objects. - Using `func:nextavailableip` will not cause a diff if the ipaddres is in range + Using ``func:nextavailableip`` will not cause a diff if the ipaddress is in + range ''' return libinfoblox.diff_obj(obja, objb) @@ -108,6 +109,8 @@ def is_ipaddr_in_ipfunc_range(ipaddr, ipfunc): CLI Example: + .. code-block:: bash + salt-call infoblox.is_ipaddr_in_ipfunc_range \ ipaddr="10.0.2.2" ipfunc="func:nextavailableip:10.0.0.0/8" ''' @@ -118,10 +121,12 @@ def update_host(name, data, **api_opts): ''' Update host record. This is a helper call to update_object. - Find a hosts `_ref` then call update_object with the record data. + Find a hosts ``_ref`` then call update_object with the record data. CLI Example: + .. code-block:: bash + salt-call infoblox.update_host name=fqdn data={} ''' o = get_host(name=name, **api_opts) @@ -130,8 +135,7 @@ def update_host(name, data, **api_opts): def update_object(objref, data, **api_opts): ''' - Update raw infoblox object. - This is a low level api call. + Update raw infoblox object. This is a low level api call. CLI Example: @@ -147,11 +151,12 @@ def update_object(objref, data, **api_opts): def delete_object(objref, **api_opts): ''' - Delete infoblox object. - This is a low level api call. + Delete infoblox object. This is a low level api call. CLI Example: + .. code-block:: bash + salt-call infoblox.delete_object objref=[ref_of_object] ''' if '__opts__' in globals() and __opts__['test']: @@ -162,11 +167,12 @@ def delete_object(objref, **api_opts): def create_object(object_type, data, **api_opts): ''' - Create raw infoblox object - This is a low level api call. + Create raw infoblox object. This is a low level api call. CLI Example: + .. code-block:: bash + salt-call infoblox.update_object object_type=record:host data={} ''' if '__opts__' in globals() and __opts__['test']: @@ -178,11 +184,12 @@ def create_object(object_type, data, **api_opts): def get_object(objref, data=None, return_fields=None, max_results=None, ensure_none_or_one_result=False, **api_opts): ''' - Get raw infoblox object. - This is a low level api call. + Get raw infoblox object. This is a low level api call. CLI Example: + .. code-block:: bash + salt-call infoblox.get_object objref=[_ref of object] ''' if not data: @@ -198,6 +205,8 @@ def create_cname(data, **api_opts): CLI Example: + .. code-block:: bash + salt-call infoblox.create_cname data={ \ "comment": "cname to example server", \ "name": "example.example.com", \ @@ -215,7 +224,9 @@ def get_cname(name=None, canonical=None, return_fields=None, **api_opts): ''' Get CNAME information. - CLI Example: + CLI Examples: + + .. code-block:: bash salt-call infoblox.get_cname name=example.example.com salt-call infoblox.get_cname canonical=example-ha-0.example.com @@ -229,10 +240,12 @@ def update_cname(name, data, **api_opts): ''' Update CNAME. This is a helper call to update_object. - Find a CNAME `_ref` then call update_object with the record data. + Find a CNAME ``_ref`` then call update_object with the record data. CLI Example: + .. code-block:: bash + salt-call infoblox.update_cname name=example.example.com data="{ 'canonical':'example-ha-0.example.com', 'use_ttl':true, @@ -251,7 +264,9 @@ def delete_cname(name=None, canonical=None, **api_opts): If record is not found, return True - CLI Example: + CLI Examples: + + .. code-block:: bash salt-call infoblox.delete_cname name=example.example.com salt-call infoblox.delete_cname canonical=example-ha-0.example.com @@ -266,16 +281,13 @@ def get_host(name=None, ipv4addr=None, mac=None, return_fields=None, **api_opts) ''' Get host information - CLI Example: + CLI Examples: + + .. code-block:: bash salt-call infoblox.get_host hostname.domain.ca salt-call infoblox.get_host ipv4addr=123.123.122.12 salt-call infoblox.get_host mac=00:50:56:84:6e:ae - - return_fields= - https://INFOBLOX/wapidoc/objects/record.host.html#fields-list - - return_fields='ipv4addrs,aliases,name,configure_for_dns,extattrs,disable,view,comment,zone' ''' infoblox = _get_infoblox(**api_opts) host = infoblox.get_host(name=name, mac=mac, ipv4addr=ipv4addr, return_fields=return_fields) @@ -288,6 +300,8 @@ def get_host_advanced(name=None, ipv4addr=None, mac=None, **api_opts): CLI Example: + .. code-block:: bash + salt-call infoblox.get_host_advanced hostname.domain.ca ''' infoblox = _get_infoblox(**api_opts) @@ -299,7 +313,8 @@ def get_host_domainname(name, domains=None, **api_opts): ''' Get host domain name - If no domains are passed, the hostname is checked for a zone in infoblox, if no zone split on first dot. + If no domains are passed, the hostname is checked for a zone in infoblox, + if no zone split on first dot. If domains are provided, the best match out of the list is returned. @@ -309,6 +324,8 @@ def get_host_domainname(name, domains=None, **api_opts): CLI Example: + .. code-block:: bash + salt-call uwl.get_host_domainname name=localhost.t.domain.com \ domains=['domain.com', 't.domain.com.'] @@ -337,15 +354,19 @@ def get_host_hostname(name, domains=None, **api_opts): ''' Get hostname - If no domains are passed, the hostname is checked for a zone in infoblox, if no zone split on first dot. + If no domains are passed, the hostname is checked for a zone in infoblox, + if no zone split on first dot. - If domains are provided, the best match out of the list is truncated from the fqdn leaving the hostname. + If domains are provided, the best match out of the list is truncated from + the fqdn leaving the hostname. If no matching domains are found the fqdn is returned. dots at end of names are ignored. - CLI Example: + CLI Examples: + + .. code-block:: bash salt-call infoblox.get_host_hostname fqdn=localhost.xxx.t.domain.com \ domains="['domain.com', 't.domain.com']" @@ -371,6 +392,8 @@ def get_host_mac(name=None, allow_array=False, **api_opts): CLI Example: + .. code-block:: bash + salt-call infoblox.get_host_mac host=localhost.domain.com ''' data = get_host(name=name, **api_opts) @@ -392,7 +415,9 @@ def get_host_ipv4(name=None, mac=None, allow_array=False, **api_opts): Use `allow_array` to return possible multiple values. - CLI Example: + CLI Examples: + + .. code-block:: bash salt-call infoblox.get_host_ipv4 host=localhost.domain.com salt-call infoblox.get_host_ipv4 mac=00:50:56:84:6e:ae @@ -416,14 +441,13 @@ def get_host_ipv4addr_info(ipv4addr=None, mac=None, ''' Get host ipv4addr information - return_fields='mac,host,configure_for_dhcp,ipv4addr' + CLI Examples: - CLI Example: + .. code-block:: bash salt-call infoblox.get_ipv4addr ipv4addr=123.123.122.12 salt-call infoblox.get_ipv4addr mac=00:50:56:84:6e:ae - salt-call infoblox.get_ipv4addr mac=00:50:56:84:6e:ae return_fields=host - return_fields='mac,host,configure_for_dhcp,ipv4addr' + salt-call infoblox.get_ipv4addr mac=00:50:56:84:6e:ae return_fields=host return_fields='mac,host,configure_for_dhcp,ipv4addr' ''' infoblox = _get_infoblox(**api_opts) return infoblox.get_host_ipv4addr_object(ipv4addr, mac, discovered_data, return_fields) @@ -437,6 +461,8 @@ def get_host_ipv6addr_info(ipv6addr=None, mac=None, CLI Example: + .. code-block:: bash + salt-call infoblox.get_host_ipv6addr_info ipv6addr=2001:db8:85a3:8d3:1349:8a2e:370:7348 ''' infoblox = _get_infoblox(**api_opts) @@ -445,9 +471,8 @@ def get_host_ipv6addr_info(ipv6addr=None, mac=None, def get_network(ipv4addr=None, network=None, return_fields=None, **api_opts): ''' - Get list of all networks. - This is helpful when looking up subnets to - use with func:nextavailableip + Get list of all networks. This is helpful when looking up subnets to use + with func:nextavailableip This call is offen slow and not cached! @@ -456,6 +481,8 @@ def get_network(ipv4addr=None, network=None, return_fields=None, **api_opts): CLI Example: + .. code-block:: bash + salt-call infoblox.get_network ''' infoblox = _get_infoblox(**api_opts) @@ -468,6 +495,8 @@ def delete_host(name=None, mac=None, ipv4addr=None, **api_opts): CLI Example: + .. code-block:: bash + salt-call infoblox.delete_host name=example.domain.com salt-call infoblox.delete_host ipv4addr=123.123.122.12 salt-call infoblox.delete_host ipv4addr=123.123.122.12 mac=00:50:56:84:6e:ae @@ -483,15 +512,18 @@ def create_host(data, **api_opts): Add host record Avoid race conditions, use func:nextavailableip for ipv[4,6]addrs: - - func:nextavailableip:network/ZG54dfgsrDFEFfsfsLzA:10.0.0.0/8/default - - func:nextavailableip:10.0.0.0/8 - - func:nextavailableip:10.0.0.0/8,external - - func:nextavailableip:10.0.0.3-10.0.0.10 + + - func:nextavailableip:network/ZG54dfgsrDFEFfsfsLzA:10.0.0.0/8/default + - func:nextavailableip:10.0.0.0/8 + - func:nextavailableip:10.0.0.0/8,external + - func:nextavailableip:10.0.0.3-10.0.0.10 See your infoblox API for full `data` format. CLI Example: + .. code-block:: bash + salt-call infoblox.create_host \ data = {'name': 'hostname.example.ca', @@ -514,6 +546,8 @@ def get_ipv4_range(start_addr=None, end_addr=None, return_fields=None, **api_opt CLI Example: + .. code-block:: bash + salt-call infoblox.get_ipv4_range start_addr=123.123.122.12 ''' infoblox = _get_infoblox(**api_opts) @@ -526,7 +560,9 @@ def delete_ipv4_range(start_addr=None, end_addr=None, **api_opts): CLI Example: - salt-call infoblox.delete_ipv4_range start_addr=123.123.122.12 + .. code-block:: bash + + salt-call infoblox.delete_ipv4_range start_addr=123.123.122.12 ''' r = get_ipv4_range(start_addr, end_addr, **api_opts) if r: @@ -544,6 +580,8 @@ def create_ipv4_range(data, **api_opts): CLI Example: + .. code-block:: bash + salt-call infoblox.create_ipv4_range data={ start_addr: '129.97.150.160', end_addr: '129.97.150.170'} @@ -560,6 +598,8 @@ def create_a(data, **api_opts): CLI Example: + .. code-block:: bash + salt-call infoblox.create_a \ data = name: 'fastlinux.math.example.ca' @@ -573,7 +613,9 @@ def get_a(name=None, ipv4addr=None, allow_array=True, **api_opts): ''' Get A record - CLI Example: + CLI Examples: + + .. code-block:: bash salt-call infoblox.get_a name=abc.example.com salt-call infoblox.get_a ipv4addr=192.168.3.5 @@ -593,14 +635,16 @@ def delete_a(name=None, ipv4addr=None, allow_array=False, **api_opts): ''' Delete A record - If the A record is used as a round robin you can set - `allow_array=true to delete all records for the hostname. + If the A record is used as a round robin you can set ``allow_array=True`` to + delete all records for the hostname. - CLI Example: + CLI Examples: + + .. code-block:: bash salt-call infoblox.delete_a name=abc.example.com salt-call infoblox.delete_a ipv4addr=192.168.3.5 - salt-call infoblox.delete_a name=acname.example.com allow_array=true + salt-call infoblox.delete_a name=acname.example.com allow_array=True ''' r = get_a(name, ipv4addr, allow_array=False, **api_opts) if not r: diff --git a/salt/modules/ini_manage.py b/salt/modules/ini_manage.py index 8ab2cee358..b6db2661b4 100644 --- a/salt/modules/ini_manage.py +++ b/salt/modules/ini_manage.py @@ -35,9 +35,9 @@ def __virtual__(): return __virtualname__ -ini_regx = re.compile(r'^\s*\[(.+?)\]\s*$', flags=re.M) -com_regx = re.compile(r'^\s*(#|;)\s*(.*)') -indented_regx = re.compile(r'(\s+)(.*)') +INI_REGX = re.compile(r'^\s*\[(.+?)\]\s*$', flags=re.M) +COM_REGX = re.compile(r'^\s*(#|;)\s*(.*)') +INDENTED_REGX = re.compile(r'(\s+)(.*)') def set_option(file_name, sections=None, separator='='): @@ -105,7 +105,13 @@ def get_option(file_name, section, option, separator='='): salt '*' ini.get_option /path/to/ini section_name option_name ''' inifile = _Ini.get_ini_file(file_name, separator=separator) - return inifile.get(section, {}).get(option, None) + if section: + try: + return inifile.get(section, {}).get(option, None) + except AttributeError: + return None + else: + return inifile.get(option, None) def remove_option(file_name, section, option, separator='='): @@ -129,7 +135,10 @@ def remove_option(file_name, section, option, separator='='): salt '*' ini.remove_option /path/to/ini section_name option_name ''' inifile = _Ini.get_ini_file(file_name, separator=separator) - value = inifile.get(section, {}).pop(option, None) + if isinstance(inifile.get(section), (dict, OrderedDict)): + value = inifile.get(section, {}).pop(option, None) + else: + value = inifile.pop(option, None) inifile.flush() return value @@ -182,15 +191,53 @@ def remove_section(file_name, section, separator='='): salt '*' ini.remove_section /path/to/ini section_name ''' + inifile = _Ini.get_ini_file(file_name, separator=separator) + if section in inifile: + section = inifile.pop(section) + inifile.flush() + ret = {} + for key, value in six.iteritems(section): + if key[0] != '#': + ret.update({key: value}) + return ret + + +def get_ini(file_name, separator='='): + ''' + Retrieve whole structure from an ini file and return it as dictionary. + + API Example: + + .. code-block:: python + + import salt + sc = salt.client.get_local_client() + sc.cmd('target', 'ini.get_ini', + [path_to_ini_file]) + + CLI Example: + + .. code-block:: bash + + salt '*' ini.get_ini /path/to/ini + ''' + def ini_odict2dict(odict): + ''' + Transform OrderedDict to regular dict recursively + :param odict: OrderedDict + :return: regular dict + ''' + ret = {} + for key, val in six.iteritems(odict): + if key[0] != '#': + if isinstance(val, (dict, OrderedDict)): + ret.update({key: ini_odict2dict(val)}) + else: + ret.update({key: val}) + return ret inifile = _Ini.get_ini_file(file_name, separator=separator) - section = inifile.pop(section, {}) - inifile.flush() - ret = {} - for key, value in six.iteritems(section): - if key[0] != '#': - ret.update({key: value}) - return ret + return ini_odict2dict(inifile) class _Section(OrderedDict): @@ -221,7 +268,7 @@ class _Section(OrderedDict): self.pop(opt) for opt_str in inicontents.split(os.linesep): # Match comments - com_match = com_regx.match(opt_str) + com_match = COM_REGX.match(opt_str) if com_match: name = '#comment{0}'.format(comment_count) self.com = com_match.group(1) @@ -229,7 +276,7 @@ class _Section(OrderedDict): self.update({name: opt_str}) continue # Add indented lines to the value of the previous entry. - indented_match = indented_regx.match(opt_str) + indented_match = INDENTED_REGX.match(opt_str) if indented_match: indent = indented_match.group(1).replace('\t', ' ') if indent > curr_indent: @@ -318,7 +365,7 @@ class _Section(OrderedDict): sections_dict = OrderedDict() for name, value in six.iteritems(self): # Handle Comment Lines - if com_regx.match(name): + if COM_REGX.match(name): yield '{0}{1}'.format(value, os.linesep) # Handle Sections elif isinstance(value, _Section): @@ -363,9 +410,6 @@ class _Section(OrderedDict): class _Ini(_Section): - def __init__(self, name, inicontents='', separator='=', commenter='#'): - super(_Ini, self).__init__(name, inicontents, separator, commenter) - def refresh(self, inicontents=None): if inicontents is None: try: @@ -382,7 +426,7 @@ class _Ini(_Section): # Remove anything left behind from a previous run. self.clear() - inicontents = ini_regx.split(inicontents) + inicontents = INI_REGX.split(inicontents) inicontents.reverse() # Pop anything defined outside of a section (ie. at the top of # the ini file). diff --git a/salt/modules/inspectlib/fsdb.py b/salt/modules/inspectlib/fsdb.py index 40955854c0..5c74cd7384 100644 --- a/salt/modules/inspectlib/fsdb.py +++ b/salt/modules/inspectlib/fsdb.py @@ -15,7 +15,7 @@ # limitations under the License. ''' - :codeauthor: :email:`Bo Maryniuk ` + :codeauthor: Bo Maryniuk ''' from __future__ import absolute_import, with_statement diff --git a/salt/modules/ipmi.py b/salt/modules/ipmi.py index 9d8416213a..3fe265f2e9 100644 --- a/salt/modules/ipmi.py +++ b/salt/modules/ipmi.py @@ -202,57 +202,62 @@ def set_channel_access(channel=14, access_update_mode='non_volatile', :param alerting: PEF Alerting Enable/Disable - - True = enable PEF Alerting - - False = disable PEF Alerting on this channel - (Alert Immediate command can still be used to generate alerts) + + - True = enable PEF Alerting + - False = disable PEF Alerting on this channel + (Alert Immediate command can still be used to generate alerts) :param per_msg_auth: Per-message Authentication - - True = enable - - False = disable Per-message Authentication. [Authentication required to - activate any session on this channel, but authentication not - used on subsequent packets for the session.] + + - True = enable + - False = disable Per-message Authentication. [Authentication required to + activate any session on this channel, but authentication not + used on subsequent packets for the session.] :param user_level_auth: - User Level Authentication Enable/Disable. - - True = enable User Level Authentication. All User Level commands are - to be authenticated per the Authentication Type that was - negotiated when the session was activated. - - False = disable User Level Authentication. Allow User Level commands to - be executed without being authenticated. - If the option to disable User Level Command authentication is - accepted, the BMC will accept packets with Authentication Type - set to None if they contain user level commands. - For outgoing packets, the BMC returns responses with the same - Authentication Type that was used for the request. + User Level Authentication Enable/Disable + + - True = enable User Level Authentication. All User Level commands are + to be authenticated per the Authentication Type that was + negotiated when the session was activated. + - False = disable User Level Authentication. Allow User Level commands to + be executed without being authenticated. + If the option to disable User Level Command authentication is + accepted, the BMC will accept packets with Authentication Type + set to None if they contain user level commands. + For outgoing packets, the BMC returns responses with the same + Authentication Type that was used for the request. :param access_mode: - Access Mode for IPMI messaging - (PEF Alerting is enabled/disabled separately from IPMI messaging) - - disabled = disabled for IPMI messaging - - pre_boot = pre-boot only channel only available when system is - in a powered down state or in BIOS prior to start of boot. - - always = channel always available regardless of system mode. - BIOS typically dedicates the serial connection to the BMC. - - shared = same as always available, but BIOS typically leaves the - serial port available for software use. + Access Mode for IPMI messaging (PEF Alerting is enabled/disabled + separately from IPMI messaging) + + - disabled = disabled for IPMI messaging + - pre_boot = pre-boot only channel only available when system is + in a powered down state or in BIOS prior to start of boot. + - always = channel always available regardless of system mode. + BIOS typically dedicates the serial connection to the BMC. + - shared = same as always available, but BIOS typically leaves the + serial port available for software use. :param privilege_update_mode: - Channel Privilege Level Limit. - This value sets the maximum privilege level - that can be accepted on the specified channel. - - dont_change = don't set or change channel Privilege Level Limit - - non_volatile = non-volatile Privilege Level Limit according - - volatile = volatile setting of Privilege Level Limit + Channel Privilege Level Limit. This value sets the maximum privilege + level that can be accepted on the specified channel. + + - dont_change = don't set or change channel Privilege Level Limit + - non_volatile = non-volatile Privilege Level Limit according + - volatile = volatile setting of Privilege Level Limit :param privilege_level: Channel Privilege Level Limit - - reserved = unused - - callback - - user - - operator - - administrator - - proprietary = used by OEM + + - reserved = unused + - callback + - user + - operator + - administrator + - proprietary = used by OEM :param kwargs: - api_host=127.0.0.1 @@ -277,9 +282,11 @@ def get_channel_access(channel=14, read_mode='non_volatile', **kwargs): :param kwargs:api_host='127.0.0.1' api_user='admin' api_pass='example' api_port=623 :param channel: number [1:7] + :param read_mode: - non_volatile = get non-volatile Channel Access - volatile = get present volatile (active) setting of Channel Access + :param kwargs: - api_host=127.0.0.1 - api_user=admin @@ -287,7 +294,8 @@ def get_channel_access(channel=14, read_mode='non_volatile', **kwargs): - api_port=623 - api_kg=None - return + Return Data + A Python dict with the following keys/values: .. code-block:: python @@ -333,8 +341,8 @@ def get_channel_info(channel=14, **kwargs): - api_port=623 - api_kg=None - return - channel session supports: + Return Data + channel session supports .. code-block:: none @@ -366,24 +374,23 @@ def set_user_access(uid, channel=14, callback=True, link_auth=True, ipmi_msg=Tru :param callback: User Restricted to Callback - - False = User Privilege Limit is determined by the User Privilege Limit - parameter, below, for both callback and non-callback connections. - - True = User Privilege Limit is determined by the User Privilege Limit - parameter for callback connections, but is restricted to Callback - level for non-callback connections. Thus, a user can only initiate - a Callback when they 'call in' to the BMC, but once the callback - connection has been made, the user could potentially establish a - session as an Operator. - :param link_auth: User Link authentication - enable/disable (used to enable whether this - user's name and password information will be used for link + - False = User Privilege Limit is determined by the User Privilege Limit + parameter, below, for both callback and non-callback connections. + - True = User Privilege Limit is determined by the User Privilege Limit + parameter for callback connections, but is restricted to Callback + level for non-callback connections. Thus, a user can only initiate + a Callback when they 'call in' to the BMC, but once the callback + connection has been made, the user could potentially establish a + session as an Operator. + + :param link_auth: User Link authentication enable/disable (used to enable + whether this user's name and password information will be used for link authentication, e.g. PPP CHAP) for the given channel. Link authentication itself is a global setting for the channel and is enabled/disabled via the serial/modem configuration parameters. - :param ipmi_msg: User IPMI Messaging: - (used to enable/disable whether + :param ipmi_msg: User IPMI Messaging: (used to enable/disable whether this user's name and password information will be used for IPMI Messaging. In this case, 'IPMI Messaging' refers to the ability to execute generic IPMI commands that are not associated with a @@ -397,12 +404,13 @@ def set_user_access(uid, channel=14, callback=True, link_auth=True, ipmi_msg=Tru :param privilege_level: User Privilege Limit. (Determines the maximum privilege level that the user is allowed to switch to on the specified channel.) - - callback - - user - - operator - - administrator - - proprietary - - no_access + + - callback + - user + - operator + - administrator + - proprietary + - no_access :param kwargs: - api_host=127.0.0.1 @@ -434,20 +442,20 @@ def get_user_access(uid, channel=14, **kwargs): - api_port=623 - api_kg=None - return + Return Data - .. code-block:: none + .. code-block:: none - channel_info: - - max_user_count = maximum number of user IDs on this channel - - enabled_users = count of User ID slots presently in use - - users_with_fixed_names = count of user IDs with fixed names - access: - - callback - - link_auth - - ipmi_msg - - privilege_level: [reserved, callback, user, operator - administrator, proprietary, no_access] + channel_info: + - max_user_count = maximum number of user IDs on this channel + - enabled_users = count of User ID slots presently in use + - users_with_fixed_names = count of user IDs with fixed names + access: + - callback + - link_auth + - ipmi_msg + - privilege_level: [reserved, callback, user, operator + administrator, proprietary, no_access] CLI Examples: @@ -792,19 +800,19 @@ def get_user(uid, channel=14, **kwargs): - api_port=623 - api_kg=None - return + Return Data - .. code-block:: none + .. code-block:: none - name: (str) - uid: (int) - channel: (int) - access: - - callback (bool) - - link_auth (bool) - - ipmi_msg (bool) - - privilege_level: (str)[callback, user, operatorm administrator, - proprietary, no_access] + name: (str) + uid: (int) + channel: (int) + access: + - callback (bool) + - link_auth (bool) + - ipmi_msg (bool) + - privilege_level: (str)[callback, user, operatorm administrator, + proprietary, no_access] CLI Examples: diff --git a/salt/modules/iptables.py b/salt/modules/iptables.py index 894db7cc2e..a033165be4 100644 --- a/salt/modules/iptables.py +++ b/salt/modules/iptables.py @@ -5,26 +5,25 @@ Support for iptables Configuration Options --------------------- -The following options can be set in the :ref:`minion config -`, :ref:`minion grains` -, :ref:`minion pillar`, or -`master config`. +The following options can be set in the minion config, grains, pillar, or +master config. The configuration is read using :py:func:`config.get +`. - ``iptables.save_filters``: List of REGEX strings to FILTER OUT matching lines - This is useful for filtering out chains, rules, etc that you do not - wish to persist, such as ephemeral Docker rules. + This is useful for filtering out chains, rules, etc that you do not wish to + persist, such as ephemeral Docker rules. - The default is to not filter out anything. + The default is to not filter out anything. - .. code-block:: yaml + .. code-block:: yaml - iptables.save_filters: - - "-j CATTLE_PREROUTING" - - "-j DOCKER" - - "-A POSTROUTING" - - "-A CATTLE_POSTROUTING" - - "-A FORWARD" + iptables.save_filters: + - "-j CATTLE_PREROUTING" + - "-j DOCKER" + - "-A POSTROUTING" + - "-A CATTLE_POSTROUTING" + - "-A FORWARD" ''' from __future__ import absolute_import, unicode_literals, print_function diff --git a/salt/modules/jenkinsmod.py b/salt/modules/jenkinsmod.py index 195a59aaec..dfd4527d1d 100644 --- a/salt/modules/jenkinsmod.py +++ b/salt/modules/jenkinsmod.py @@ -109,9 +109,9 @@ def run(script): ''' .. versionadded:: 2017.7.0 - Execute a groovy script on the jenkins master + Execute a script on the jenkins master - :param script: The groovy script + :param script: The script CLI Example: diff --git a/salt/modules/junos.py b/salt/modules/junos.py index 4c174e301a..7d54b72808 100644 --- a/salt/modules/junos.py +++ b/salt/modules/junos.py @@ -25,6 +25,7 @@ except ImportError: from salt._compat import ElementTree as etree # Import Salt libs +import salt.utils.args import salt.utils.files import salt.utils.json import salt.utils.stringutils @@ -74,12 +75,11 @@ def facts_refresh(): the device configuration is changed by some other actor. This function will also refresh the facts stored in the salt grains. - Usage: + CLI Example: .. code-block:: bash salt 'device_name' junos.facts_refresh - ''' conn = __proxy__['junos.conn']() ret = dict() @@ -105,12 +105,11 @@ def facts(): Displays the facts gathered during the connection. These facts are also stored in Salt grains. - Usage: + CLI Example: .. code-block:: bash salt 'device_name' junos.facts - ''' ret = dict() try: @@ -123,45 +122,41 @@ def facts(): return ret -def rpc(cmd=None, dest=None, format='xml', **kwargs): +def rpc(cmd=None, dest=None, **kwargs): ''' - This function executes the rpc provided as arguments on the junos device. + This function executes the RPC provided as arguments on the junos device. The returned data can be stored in a file. - Usage: + cmd + The RPC to be executed + + dest + Destination file where the RPC output is stored. Note that the file + will be stored on the proxy minion. To push the files to the master use + :py:func:`cp.push `. + + format : xml + The format in which the RPC reply is received from the device + + dev_timeout : 30 + The NETCONF RPC timeout (in seconds) + + filter + Used with the ``get-config`` RPC to get specific configuration + + terse : False + Amount of information you want + + interface_name + Name of the interface to query + + CLI Example: .. code-block:: bash - salt 'device' junos.rpc 'get_config' '/var/log/config.txt' 'text' filter='' - - salt 'device' junos.rpc 'get-interface-information' '/home/user/interface.xml' interface_name='lo0' terse=True - - salt 'device' junos.rpc 'get-chassis-inventory' - - Parameters: - Required - * cmd: - The rpc to be executed. (default = None) - Optional - * dest: - Destination file where the rpc output is stored. (default = None) - Note that the file will be stored on the proxy minion. To push the - files to the master use the salt's following execution module: - :py:func:`cp.push ` - * format: - The format in which the rpc reply is received from the device. - (default = xml) - * kwargs: keyworded arguments taken by rpc call like- - * dev_timeout: - Set NETCONF RPC timeout. Can be used for commands which - take a while to execute. (default= 30 seconds) - * filter: - Only to be used with 'get-config' rpc to get specific configuration. - * terse: - Amount of information you want. - * interface_name: - Name of the interface whose information you want. - + salt 'device' junos.rpc get_config /var/log/config.txt format=text filter='' + salt 'device' junos.rpc get-interface-information /home/user/interface.xml interface_name='lo0' terse=True + salt 'device' junos.rpc get-chassis-inventory ''' conn = __proxy__['junos.conn']() @@ -173,6 +168,10 @@ def rpc(cmd=None, dest=None, format='xml', **kwargs): ret['out'] = False return ret + format_ = kwargs.pop('format', 'xml') + if not format_: + format_ = 'xml' + op = dict() if '__pub_arg' in kwargs: if kwargs['__pub_arg']: @@ -192,7 +191,7 @@ def rpc(cmd=None, dest=None, format='xml', **kwargs): filter_reply = etree.XML(op['filter']) del op['filter'] - op.update({'format': format}) + op.update({'format': format_}) try: reply = getattr( conn.rpc, @@ -213,7 +212,7 @@ def rpc(cmd=None, dest=None, format='xml', **kwargs): reply = getattr( conn.rpc, cmd.replace('-', - '_'))({'format': format}, + '_'))({'format': format_}, **op) except Exception as exception: ret['message'] = 'RPC execution failed due to "{0}"'.format( @@ -221,10 +220,10 @@ def rpc(cmd=None, dest=None, format='xml', **kwargs): ret['out'] = False return ret - if format == 'text': + if format_ == 'text': # Earlier it was ret['message'] ret['rpc_reply'] = reply.text - elif format == 'json': + elif format_ == 'json': # Earlier it was ret['message'] ret['rpc_reply'] = reply else: @@ -232,9 +231,9 @@ def rpc(cmd=None, dest=None, format='xml', **kwargs): ret['rpc_reply'] = jxmlease.parse(etree.tostring(reply)) if dest: - if format == 'text': + if format_ == 'text': write_response = reply.text - elif format == 'json': + elif format_ == 'json': write_response = salt.utils.json.dumps(reply, indent=1) else: write_response = etree.tostring(reply) @@ -245,29 +244,27 @@ def rpc(cmd=None, dest=None, format='xml', **kwargs): def set_hostname(hostname=None, **kwargs): ''' - To set the name of the device. + Set the device's hostname - Usage: + hostname + The name to be set + + dev_timeout : 30 + The NETCONF RPC timeout (in seconds) + + comment + Provide a comment to the commit + + confirm + Provide time in minutes for commit confirmation. If this option is + specified, the commit will be rolled back in the specified amount of time + unless the commit is confirmed. + + CLI Example: .. code-block:: bash salt 'device_name' junos.set_hostname salt-device - - Parameters: - Required - * hostname: The name to be set. (default = None) - Optional - * kwargs: Keyworded arguments which can be provided like- - * dev_timeout: - Set NETCONF RPC timeout. Can be used for commands - which take a while to execute. (default = 30 seconds) - * comment: - Provide a comment to the commit. (default = None) - * confirm: - Provide time in minutes for commit confirmation. \ - If this option is specified, the commit will be rollbacked in \ - the given time unless the commit is confirmed. - ''' conn = __proxy__['junos.conn']() ret = dict() @@ -325,43 +322,41 @@ def commit(**kwargs): ''' To commit the changes loaded in the candidate configuration. - Usage: + dev_timeout : 30 + The NETCONF RPC timeout (in seconds) + + comment + Provide a comment for the commit + + confirm + Provide time in minutes for commit confirmation. If this option is + specified, the commit will be rolled back in the specified amount of time + unless the commit is confirmed. + + sync : False + When ``True``, on dual control plane systems, requests that the candidate + configuration on one control plane be copied to the other control plane, + checked for correct syntax, and committed on both Routing Engines. + + force_sync : False + When ``True``, on dual control plane systems, force the candidate + configuration on one control plane to be copied to the other control + plane. + + full + When ``True``, requires all the daemons to check and evaluate the new + configuration. + + detail + When ``True``, return commit detail + + CLI Examples: .. code-block:: bash salt 'device_name' junos.commit comment='Commiting via saltstack' detail=True - salt 'device_name' junos.commit dev_timeout=60 confirm=10 - salt 'device_name' junos.commit sync=True dev_timeout=90 - - - Parameters: - Optional - * kwargs: Keyworded arguments which can be provided like- - * dev_timeout: - Set NETCONF RPC timeout. Can be used for commands which take a \ - while to execute. (default = 30 seconds) - * comment: - Provide a comment to the commit. (default = None) - * confirm: - Provide time in minutes for commit confirmation. If this option \ - is specified, the commit will be rollbacked in the given time \ - unless the commit is confirmed. - * sync: - On dual control plane systems, requests that the candidate\ - configuration on one control plane be copied to the other \ - control plane,checked for correct syntax, and committed on \ - both Routing Engines. (default = False) - * force_sync: - On dual control plane systems, force the candidate configuration - on one control plane to be copied to the other control plane. - * full: - When set to True requires all the daemons to check and evaluate \ - the new configuration. - * detail: - When true return commit detail. - ''' conn = __proxy__['junos.conn']() @@ -408,34 +403,37 @@ def commit(**kwargs): return ret -def rollback(id=0, **kwargs): +def rollback(**kwargs): ''' - To rollback the last committed configuration changes and commit the same. + Roll back the last committed configuration changes and commit - Usage: + id : 0 + The rollback ID value (0-49) + + dev_timeout : 30 + The NETCONF RPC timeout (in seconds) + + comment + Provide a comment for the commit + + confirm + Provide time in minutes for commit confirmation. If this option is + specified, the commit will be rolled back in the specified amount of time + unless the commit is confirmed. + + diffs_file + Path to the file where the diff (difference in old configuration and the + committed configuration) will be stored. Note that the file will be + stored on the proxy minion. To push the files to the master use + :py:func:`cp.push `. + + CLI Example: .. code-block:: bash salt 'device_name' junos.rollback 10 - - Parameters: - Optional - * id: - The rollback id value [0-49]. (default = 0) - * kwargs: Keyworded arguments which can be provided like- - * dev_timeout: - Set NETCONF RPC timeout. Can be used for commands which - take a while to execute. (default = 30 seconds) - * comment: - Provide a comment to the commit. (default = None) - * confirm: - Provide time in minutes for commit confirmation. If this option \ - is specified, the commit will be rollbacked in the given time \ - unless the commit is confirmed. - * diffs_file: - Path to the file where any diffs will be written. (default = None) - ''' + id_ = kwargs.pop('id', 0) ret = dict() conn = __proxy__['junos.conn']() @@ -449,7 +447,7 @@ def rollback(id=0, **kwargs): op.update(kwargs) try: - ret['out'] = conn.cu.rollback(id) + ret['out'] = conn.cu.rollback(id_) except Exception as exception: ret['message'] = 'Rollback failed due to "{0}"'.format(exception) ret['out'] = False @@ -495,28 +493,29 @@ def rollback(id=0, **kwargs): return ret -def diff(id=0): +def diff(**kwargs): ''' - Gives the difference between the candidate and the current configuration. + Returns the difference between the candidate and the current configuration - Usage: + id : 0 + The rollback ID value (0-49) + + CLI Example: .. code-block:: bash salt 'device_name' junos.diff 3 - - - Parameters: - Optional - * id: - The rollback id value [0-49]. (default = 0) - ''' + kwargs = salt.utils.args.clean_kwargs(**kwargs) + id_ = kwargs.pop('id', 0) + if kwargs: + salt.utils.args.invalid_kwargs(kwargs) + conn = __proxy__['junos.conn']() ret = dict() ret['out'] = True try: - ret['message'] = conn.cu.diff(rb_id=id) + ret['message'] = conn.cu.diff(rb_id=id_) except Exception as exception: ret['message'] = 'Could not get diff with error "{0}"'.format( exception) @@ -527,39 +526,36 @@ def diff(id=0): def ping(dest_ip=None, **kwargs): ''' - To send ping RPC to a device. + Send a ping RPC to a device - Usage: + dest_ip + The IP of the device to ping + + dev_timeout : 30 + The NETCONF RPC timeout (in seconds) + + rapid : False + When ``True``, executes ping at 100pps instead of 1pps + + ttl + Maximum number of IP routers (IP hops) allowed between source and + destination + + routing_instance + Name of the routing instance to use to send the ping + + interface + Interface used to send traffic + + count : 5 + Number of packets to send + + CLI Examples: .. code-block:: bash salt 'device_name' junos.ping '8.8.8.8' count=5 - salt 'device_name' junos.ping '8.8.8.8' ttl=1 rapid=True - - - Parameters: - Required - * dest_ip: - The IP which is to be pinged. (default = None) - Optional - * kwargs: Keyworded arguments which can be provided like- - * dev_timeout: - Set NETCONF RPC timeout. Can be used for commands which - take a while to execute. (default = 30 seconds) - * rapid: - Setting this to True executes ping at 100pps instead of 1pps. \ - (default = False) - * ttl: - Maximum number of IP routers (IP hops) allowed between source \ - and destination. - * routing_instance: - Name of the routing instance to use to send the ping. - * interface: - Interface used to send traffic out. - * count: - Number of packets to send. (default = 5) - ''' conn = __proxy__['junos.conn']() ret = dict() @@ -590,46 +586,38 @@ def ping(dest_ip=None, **kwargs): return ret -def cli(command=None, format='text', **kwargs): +def cli(command=None, **kwargs): ''' Executes the CLI commands and returns the output in specified format. \ (default is text) The output can also be stored in a file. - Usage: + command (required) + The command to execute on the Junos CLI + + format : text + Format in which to get the CLI output (either ``text`` or ``xml``) + + dev_timeout : 30 + The NETCONF RPC timeout (in seconds) + + dest + Destination file where the RPC output is stored. Note that the file + will be stored on the proxy minion. To push the files to the master use + :py:func:`cp.push `. + + CLI Examples: .. code-block:: bash salt 'device_name' junos.cli 'show system commit' - salt 'device_name' junos.cli 'show version' dev_timeout=40 - - salt 'device_name' junos.cli 'show system alarms' 'xml' dest=/home/user/cli_output.txt - - - Parameters: - Required - * command: - The command that need to be executed on Junos CLI. (default = None) - Optional - * format: - Format in which to get the CLI output. (text or xml, \ - default = 'text') - * kwargs: Keyworded arguments which can be provided like- - * dev_timeout: - Set NETCONF RPC timeout. Can be used for commands which - take a while to execute. (default = 30 seconds) - * dest: - The destination file where the CLI output can be stored.\ - (default = None) - + salt 'device_name' junos.cli 'show system alarms' format=xml dest=/home/user/cli_output.txt ''' conn = __proxy__['junos.conn']() - # Cases like salt 'device_name' junos.cli 'show system alarms' '' - # In this case the format becomes '' (empty string). And reply is sent in xml - # We want the format to default to text. - if not format: - format = 'text' + format_ = kwargs.pop('format', 'text') + if not format_: + format_ = 'text' ret = dict() if command is None: @@ -646,13 +634,13 @@ def cli(command=None, format='text', **kwargs): op.update(kwargs) try: - result = conn.cli(command, format, warning=False) + result = conn.cli(command, format_, warning=False) except Exception as exception: ret['message'] = 'Execution failed due to "{0}"'.format(exception) ret['out'] = False return ret - if format == 'text': + if format_ == 'text': ret['message'] = result else: result = etree.tostring(result) @@ -668,39 +656,36 @@ def cli(command=None, format='text', **kwargs): def shutdown(**kwargs): ''' - Shut down (power off) or reboot a device running Junos OS. - This includes all Routing Engines in a Virtual Chassis or a dual Routing \ - Engine system. + Shut down (power off) or reboot a device running Junos OS. This includes + all Routing Engines in a Virtual Chassis or a dual Routing Engine system. - Usage: + .. note:: + One of ``shutdown`` or ``reboot`` must be set to ``True`` or no + action will be taken. + + shutdown : False + Set this to ``True`` if you want to shutdown the machine. This is a + safety mechanism so that the user does not accidentally shutdown the + junos device. + + reboot : False + If ``True``, reboot instead of shutting down + + at + Used when rebooting, to specify the date and time the reboot should take + place. The value of this option must match the JunOS CLI reboot syntax. + + in_min + Used when shutting down. Specify the delay (in minutes) before the + device will be shut down. + + CLI Examples: .. code-block:: bash salt 'device_name' junos.shutdown reboot=True - salt 'device_name' junos.shutdown shutdown=True in_min=10 - salt 'device_name' junos.shutdown shutdown=True - - - Parameters: - Optional - * kwargs: - * shutdown: - Set this to true if you want to shutdown the machine. - (default=False, this is a safety mechanism so that the user does - not accidentally shutdown the junos device.) - * reboot: - Whether to reboot instead of shutdown. (default=False) - Note that either one of the above arguments has to be specified - (shutdown or reboot) for this function to work. - * at: - Date and time the reboot should take place. The - string must match the junos cli reboot syntax - (To be used only if reboot=True) - * in_min: - Specify delay in minutes for shutdown - ''' conn = __proxy__['junos.conn']() ret = dict() @@ -749,71 +734,73 @@ def install_config(path=None, **kwargs): Installs the given configuration file into the candidate configuration. Commits the changes if the commit checks or throws an error. - Usage: + path (required) + Path where the configuration/template file is present. If the file has + a ``.conf`` extension, the content is treated as text format. If the + file has a ``.xml`` extension, the content is treated as XML format. If + the file has a ``.set`` extension, the content is treated as Junos OS + ``set`` commands. + + mode : exclusive + The mode in which the configuration is locked. Can be one of + ``private``, ``dynamic``, ``batch``, ``exclusive``. + + dev_timeout : 30 + Set NETCONF RPC timeout. Can be used for commands which take a while to + execute. + + overwrite : False + Set to ``True`` if you want this file is to completely replace the + configuration file. + + replace : False + Specify whether the configuration file uses ``replace:`` statements. If + ``True``, only those statements under the ``replace`` tag will be + changed. + + format + Determines the format of the contents + + update : False + Compare a complete loaded configuration against the candidate + configuration. For each hierarchy level or configuration object that is + different in the two configurations, the version in the loaded + configuration replaces the version in the candidate configuration. When + the configuration is later committed, only system processes that are + affected by the changed configuration elements parse the new + configuration. This action is supported from PyEZ 2.1. + + comment + Provide a comment for the commit + + confirm + Provide time in minutes for commit confirmation. If this option is + specified, the commit will be rolled back in the specified amount of time + unless the commit is confirmed. + + diffs_file + Path to the file where the diff (difference in old configuration and the + committed configuration) will be stored. Note that the file will be + stored on the proxy minion. To push the files to the master use + :py:func:`cp.push `. + + template_vars + Variables to be passed into the template processing engine in addition to + those present in pillar, the minion configuration, grains, etc. You may + reference these variables in your template like so: + + .. code-block:: jinja + + {{ template_vars["var_name"] }} + + CLI Examples: .. code-block:: bash salt 'device_name' junos.install_config 'salt://production/network/routers/config.set' - salt 'device_name' junos.install_config 'salt://templates/replace_config.conf' replace=True comment='Committed via SaltStack' - salt 'device_name' junos.install_config 'salt://my_new_configuration.conf' dev_timeout=300 diffs_file='/salt/confs/old_config.conf' overwrite=True - salt 'device_name' junos.install_config 'salt://syslog_template.conf' template_vars='{"syslog_host": "10.180.222.7"}' - - Parameters: - Required - * path: - Path where the configuration/template file is present. If the file has a \ - '*.conf' extension, - the content is treated as text format. If the file has a '*.xml' \ - extension, - the content is treated as XML format. If the file has a '*.set' \ - extension, - the content is treated as Junos OS 'set' commands.(default = None) - Optional - * kwargs: Keyworded arguments which can be provided like- - * mode: The mode in which the configuration is locked. - (Options: private, dynamic, batch, exclusive; default= exclusive) - * dev_timeout: - Set NETCONF RPC timeout. Can be used for commands which - take a while to execute. (default = 30 seconds) - * overwrite: - Set to True if you want this file is to completely replace the\ - configuration file. (default = False) - * replace: - Specify whether the configuration file uses "replace:" statements. - Those statements under the 'replace' tag will only be changed.\ - (default = False) - * format: - Determines the format of the contents. - * update: - Compare a complete loaded configuration against - the candidate configuration. For each hierarchy level or - configuration object that is different in the two configurations, - the version in the loaded configuration replaces the version in the - candidate configuration. When the configuration is later committed, - only system processes that are affected by the changed configuration - elements parse the new configuration. This action is supported from - PyEZ 2.1 (default = False) - * comment: - Provide a comment to the commit. (default = None) - * confirm: - Provide time in minutes for commit confirmation. - If this option is specified, the commit will be rollbacked in \ - the given time unless the commit is confirmed. - * diffs_file: - Path to the file where the diff (difference in old configuration - and the committed configuration) will be stored.(default = None) - Note that the file will be stored on the proxy minion. To push the - files to the master use the salt's following execution module: \ - :py:func:`cp.push ` - * template_vars: - Variables to be passed into the template processing engine in addition - to those present in __pillar__, __opts__, __grains__, etc. - You may reference these variables in your template like so: - {{ template_vars["var_name"] }} - ''' conn = __proxy__['junos.conn']() ret = dict() @@ -947,12 +934,11 @@ def zeroize(): ''' Resets the device to default factory settings - Usage: + CLI Example: .. code-block:: bash salt 'device_name' junos.zeroize - ''' conn = __proxy__['junos.conn']() ret = dict() @@ -973,30 +959,24 @@ def install_os(path=None, **kwargs): the device is rebooted, if reboot=True is given as a keyworded argument. - Usage: + path (required) + Path where the image file is present on the proxy minion + + dev_timeout : 30 + The NETCONF RPC timeout (in seconds) + + reboot : False + Whether to reboot after installation + + no_copy : False + If ``True`` the software package will not be SCP’d to the device + + CLI Examples: .. code-block:: bash salt 'device_name' junos.install_os 'salt://images/junos_image.tgz' reboot=True - salt 'device_name' junos.install_os 'salt://junos_16_1.tgz' dev_timeout=300 - - - Parameters: - Required - * path: - Path where the image file is present on the proxy minion. - Optional - * kwargs: keyworded arguments to be given such as dev_timeout, reboot etc - * dev_timeout: - Set NETCONF RPC timeout. Can be used to RPCs which - take a while to execute. (default = 30 seconds) - * reboot: - Whether to reboot after installation (default = False) - * no_copy: - When True the software package will not be SCP’d to the device. \ - (default = False) - ''' conn = __proxy__['junos.conn']() ret = dict() @@ -1055,22 +1035,19 @@ def install_os(path=None, **kwargs): def file_copy(src=None, dest=None): ''' - Copies the file from the local device to the junos device. + Copies the file from the local device to the junos device - Usage: + src + The source path where the file is kept. + + dest + The destination path on the where the file will be copied + + CLI Example: .. code-block:: bash salt 'device_name' junos.file_copy /home/m2/info.txt info_copy.txt - - - Parameters: - Required - * src: - The sorce path where the file is kept. - * dest: - The destination path where the file will be copied. - ''' conn = __proxy__['junos.conn']() ret = dict() @@ -1104,22 +1081,22 @@ def file_copy(src=None, dest=None): def lock(): - """ + ''' Attempts an exclusive lock on the candidate configuration. This is a non-blocking call. .. note:: - Any user who wishes to use lock, must necessarily unlock the - configuration too. Ensure :py:func:`unlock ` - is called in the same orchestration run in which the lock is called. + When locking, it is important to remember to call + :py:func:`junos.unlock ` once finished. If + locking during orchestration, remember to include a step in the + orchestration job to unlock. - Usage: + CLI Example: .. code-block:: bash salt 'device_name' junos.lock - - """ + ''' conn = __proxy__['junos.conn']() ret = dict() ret['out'] = True @@ -1134,16 +1111,15 @@ def lock(): def unlock(): - """ + ''' Unlocks the candidate configuration. - Usage: + CLI Example: .. code-block:: bash salt 'device_name' junos.unlock - - """ + ''' conn = __proxy__['junos.conn']() ret = dict() ret['out'] = True @@ -1159,11 +1135,47 @@ def unlock(): def load(path=None, **kwargs): - """ - + ''' Loads the configuration from the file provided onto the device. - Usage: + path (required) + Path where the configuration/template file is present. If the file has + a ``.conf`` extension, the content is treated as text format. If the + file has a ``.xml`` extension, the content is treated as XML format. If + the file has a ``.set`` extension, the content is treated as Junos OS + ``set`` commands. + + overwrite : False + Set to ``True`` if you want this file is to completely replace the + configuration file. + + replace : False + Specify whether the configuration file uses ``replace:`` statements. If + ``True``, only those statements under the ``replace`` tag will be + changed. + + format + Determines the format of the contents + + update : False + Compare a complete loaded configuration against the candidate + configuration. For each hierarchy level or configuration object that is + different in the two configurations, the version in the loaded + configuration replaces the version in the candidate configuration. When + the configuration is later committed, only system processes that are + affected by the changed configuration elements parse the new + configuration. This action is supported from PyEZ 2.1. + + template_vars + Variables to be passed into the template processing engine in addition to + those present in pillar, the minion configuration, grains, etc. You may + reference these variables in your template like so: + + .. code-block:: jinja + + {{ template_vars["var_name"] }} + + CLI Examples: .. code-block:: bash @@ -1174,45 +1186,7 @@ def load(path=None, **kwargs): salt 'device_name' junos.load 'salt://my_new_configuration.conf' overwrite=True salt 'device_name' junos.load 'salt://syslog_template.conf' template_vars='{"syslog_host": "10.180.222.7"}' - - Parameters: - Required - * path: - Path where the configuration/template file is present. If the file has a \ - '*.conf' extension, - the content is treated as text format. If the file has a '*.xml' \ - extension, - the content is treated as XML format. If the file has a '*.set' \ - extension, - the content is treated as Junos OS 'set' commands.(default = None) - Optional - * kwargs: Keyworded arguments which can be provided like- - * overwrite: - Set to True if you want this file is to completely replace the\ - configuration file. (default = False) - * replace: - Specify whether the configuration file uses "replace:" statements. - Those statements under the 'replace' tag will only be changed.\ - (default = False) - * format: - Determines the format of the contents. - * update: - Compare a complete loaded configuration against - the candidate configuration. For each hierarchy level or - configuration object that is different in the two configurations, - the version in the loaded configuration replaces the version in the - candidate configuration. When the configuration is later committed, - only system processes that are affected by the changed configuration - elements parse the new configuration. This action is supported from - PyEZ 2.1 (default = False) - * template_vars: - Variables to be passed into the template processing engine in addition - to those present in __pillar__, __opts__, __grains__, etc. - You may reference these variables in your template like so: - {{ template_vars["var_name"] }} - - - """ + ''' conn = __proxy__['junos.conn']() ret = dict() ret['out'] = True @@ -1288,17 +1262,15 @@ def load(path=None, **kwargs): def commit_check(): - """ + ''' + Perform a commit check on the configuration - Perform a commit check on the configuration. - - Usage: + CLI Example: .. code-block:: bash salt 'device_name' junos.commit_check - - """ + ''' conn = __proxy__['junos.conn']() ret = dict() ret['out'] = True diff --git a/salt/modules/k8s.py b/salt/modules/k8s.py index ce8727421e..e0af204ba0 100644 --- a/salt/modules/k8s.py +++ b/salt/modules/k8s.py @@ -210,6 +210,7 @@ def _set_labels(node, apiserver_url, labels): def get_labels(node=None, apiserver_url=None): ''' .. versionadded:: 2016.3.0 + Get labels from the current node CLI Example: diff --git a/salt/modules/kernelpkg_linux_apt.py b/salt/modules/kernelpkg_linux_apt.py index d08388f7e1..2adaab49a3 100644 --- a/salt/modules/kernelpkg_linux_apt.py +++ b/salt/modules/kernelpkg_linux_apt.py @@ -114,7 +114,6 @@ def latest_installed(): salt '*' kernelpkg.latest_installed .. note:: - This function may not return the same value as :py:func:`~salt.modules.kernelpkg_linux_apt.active` if a new kernel has been installed and the system has not yet been rebooted. @@ -163,9 +162,9 @@ def upgrade(reboot=False, at_time=None): salt '*' kernelpkg.upgrade reboot=True at_time=1 .. note:: - An immediate reboot often shuts down the system before the minion - has a chance to return, resulting in errors. A minimal delay (1 minute) - is useful to ensure the result is delivered to the master. + An immediate reboot often shuts down the system before the minion has a + chance to return, resulting in errors. A minimal delay (1 minute) is + useful to ensure the result is delivered to the master. ''' result = __salt__['pkg.install']( name='{0}-{1}'.format(_package_prefix(), latest_available())) diff --git a/salt/modules/kernelpkg_linux_yum.py b/salt/modules/kernelpkg_linux_yum.py index c9da824523..668c62f14a 100644 --- a/salt/modules/kernelpkg_linux_yum.py +++ b/salt/modules/kernelpkg_linux_yum.py @@ -108,7 +108,6 @@ def latest_installed(): salt '*' kernelpkg.latest_installed .. note:: - This function may not return the same value as :py:func:`~salt.modules.kernelpkg_linux_yum.active` if a new kernel has been installed and the system has not yet been rebooted. @@ -157,9 +156,9 @@ def upgrade(reboot=False, at_time=None): salt '*' kernelpkg.upgrade reboot=True at_time=1 .. note:: - An immediate reboot often shuts down the system before the minion - has a chance to return, resulting in errors. A minimal delay (1 minute) - is useful to ensure the result is delivered to the master. + An immediate reboot often shuts down the system before the minion has a + chance to return, resulting in errors. A minimal delay (1 minute) is + useful to ensure the result is delivered to the master. ''' result = __salt__['pkg.upgrade'](name=_package_name()) _needs_reboot = needs_reboot() diff --git a/salt/modules/ldap3.py b/salt/modules/ldap3.py index 8c937f766f..9b11745709 100644 --- a/salt/modules/ldap3.py +++ b/salt/modules/ldap3.py @@ -411,7 +411,8 @@ def add(connect_spec, dn, attributes): modlist = salt.utils.data.decode( ldap.modlist.addModlist(attributes), - to_str=True + to_str=True, + preserve_tuples=True ) try: l.c.add_s(dn, modlist) @@ -512,7 +513,7 @@ def modify(connect_spec, dn, directives): modlist[idx] = (mod[0], mod[1], [_format_unicode_password(x) for x in mod[2]]) - modlist = salt.utils.data.decode(modlist, to_str=True) + modlist = salt.utils.data.decode(modlist, to_str=True, preserve_tuples=True) try: l.c.modify_s(dn, modlist) except ldap.LDAPError as e: @@ -581,7 +582,8 @@ def change(connect_spec, dn, before, after): modlist = salt.utils.data.decode( ldap.modlist.modifyModlist(before, after), - to_str=True + to_str=True, + preserve_tuples=True ) try: l.c.modify_s(dn, modlist) diff --git a/salt/modules/logadm.py b/salt/modules/logadm.py index 869e5b7987..2ccc7e7f79 100644 --- a/salt/modules/logadm.py +++ b/salt/modules/logadm.py @@ -249,7 +249,7 @@ def rotate(name, pattern=None, conf_file=default_conf, **kwargs): alias for log_file conf_file : string optional path to alternative configuration file - **kwargs : boolean|string|int + kwargs : boolean|string|int optional additional flags and parameters .. note:: diff --git a/salt/modules/lxc.py b/salt/modules/lxc.py index 32bdc6bd19..ab0c2dd1bc 100644 --- a/salt/modules/lxc.py +++ b/salt/modules/lxc.py @@ -2268,22 +2268,22 @@ def _change_state(cmd, # as te command itself mess with double forks; we must not # communicate with it, but just wait for the exit status pkwargs = {'python_shell': False, + 'redirect_stderr': True, 'with_communicate': with_communicate, 'use_vt': use_vt, 'stdin': stdin, - 'stdout': stdout, - 'stderr': stderr} + 'stdout': stdout} for i in [a for a in pkwargs]: val = pkwargs[i] if val is _marker: pkwargs.pop(i, None) - error = __salt__['cmd.run_stderr'](cmd, **pkwargs) + _cmdout = __salt__['cmd.run_all'](cmd, **pkwargs) - if error: + if _cmdout['retcode'] != 0: raise CommandExecutionError( 'Error changing state for container \'{0}\' using command ' - '\'{1}\': {2}'.format(name, cmd, error) + '\'{1}\': {2}'.format(name, cmd, _cmdout['stdout']) ) if expected is not None: # some commands do not wait, so we will @@ -3504,7 +3504,9 @@ def bootstrap(name, configdir = '/var/tmp/.c_{0}'.format(rstr) cmd = 'install -m 0700 -d {0}'.format(configdir) - if run(name, cmd, python_shell=False): + if run_all( + name, cmd, path=path, python_shell=False + )['retcode'] != 0: log.error('tmpdir %s creation failed %s', configdir, cmd) return False @@ -3514,6 +3516,7 @@ def bootstrap(name, copy_to(name, bs_, script, path=path) result = run_all(name, 'sh -c "chmod +x {0}"'.format(script), + path=path, python_shell=True) copy_to(name, cfg_files['config'], @@ -3539,6 +3542,7 @@ def bootstrap(name, run_all(name, 'sh -c \'if [ -f "{0}" ];then rm -f "{0}";fi\'' ''.format(script), + path=path, ignore_retcode=True, python_shell=True) else: diff --git a/salt/modules/mac_power.py b/salt/modules/mac_power.py index 72c5825ed6..0fed9157b0 100644 --- a/salt/modules/mac_power.py +++ b/salt/modules/mac_power.py @@ -78,7 +78,8 @@ def get_sleep(): Computer, Display, and Hard Disk are displayed. :return: A dictionary containing the sleep status for Computer, Display, and - Hard Disk + Hard Disk + :rtype: dict CLI Example: @@ -287,8 +288,8 @@ def set_wake_on_modem(enabled): detected. :param bool enabled: True to enable, False to disable. "On" and "Off" are - also acceptable values. Additionally you can pass 1 and 0 to represent True - and False respectively + also acceptable values. Additionally you can pass 1 and 0 to represent + True and False respectively :return: True if successful, False if not :rtype: bool @@ -334,8 +335,8 @@ def set_wake_on_network(enabled): is detected. :param bool enabled: True to enable, False to disable. "On" and "Off" are - also acceptable values. Additionally you can pass 1 and 0 to represent True - and False respectively + also acceptable values. Additionally you can pass 1 and 0 to represent + True and False respectively :return: True if successful, False if not :rtype: bool @@ -381,8 +382,8 @@ def set_restart_power_failure(enabled): failure. :param bool enabled: True to enable, False to disable. "On" and "Off" are - also acceptable values. Additionally you can pass 1 and 0 to represent True - and False respectively + also acceptable values. Additionally you can pass 1 and 0 to represent + True and False respectively :return: True if successful, False if not :rtype: bool @@ -430,8 +431,8 @@ def set_restart_freeze(enabled): functions remains in case they ever fix the bug. :param bool enabled: True to enable, False to disable. "On" and "Off" are - also acceptable values. Additionally you can pass 1 and 0 to represent True - and False respectively + also acceptable values. Additionally you can pass 1 and 0 to represent + True and False respectively :return: True if successful, False if not :rtype: bool @@ -459,7 +460,8 @@ def get_sleep_on_power_button(): supported :return: A string value representing the "allow power button to sleep - computer" settings + computer" settings + :rtype: string CLI Example: @@ -479,8 +481,8 @@ def set_sleep_on_power_button(enabled): Set whether or not the power button can sleep the computer. :param bool enabled: True to enable, False to disable. "On" and "Off" are - also acceptable values. Additionally you can pass 1 and 0 to represent True - and False respectively + also acceptable values. Additionally you can pass 1 and 0 to represent + True and False respectively :return: True if successful, False if not :rtype: bool diff --git a/salt/modules/mac_service.py b/salt/modules/mac_service.py index 373207aacd..645adf0ca4 100644 --- a/salt/modules/mac_service.py +++ b/salt/modules/mac_service.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- ''' The service module for macOS + .. versionadded:: 2016.3.0 This module has support for services in the following locations. .. code-block:: bash + /System/Library/LaunchDaemons/ /System/Library/LaunchAgents/ /Library/LaunchDaemons/ @@ -15,10 +17,9 @@ This module has support for services in the following locations. /Users/foo/Library/LaunchAgents/ .. note:: - - As of version "Fluorine", if a service is located in a ``LaunchAgent`` path - and a ``runas`` user is NOT specified the current console user will be used - to properly interact with the service. + As of the Fluorine release, if a service is located in a ``LaunchAgent`` + path and a ``runas`` user is NOT specified, the current console user will + be used to properly interact with the service. ''' from __future__ import absolute_import, unicode_literals, print_function diff --git a/salt/modules/mac_shadow.py b/salt/modules/mac_shadow.py index 88b5441736..2f615da905 100644 --- a/salt/modules/mac_shadow.py +++ b/salt/modules/mac_shadow.py @@ -105,7 +105,7 @@ def _get_account_policy_data_value(name, key): :param str name: The username :param str key: The accountPolicy key - :return: the value contained within the key + :return: The value contained within the key :rtype: str :raises: CommandExecutionError on user not found or any other unknown error @@ -141,7 +141,7 @@ def info(name): ''' Return information for the specified user - :param str name: the username + :param str name: The username :return: A dictionary containing the user's shadow information :rtype: dict @@ -187,9 +187,9 @@ def get_account_created(name): ''' Get the date/time the account was created - :param str name: the username of the account + :param str name: The username of the account - :return: the date/time the account was created (yyyy-mm-dd hh:mm:ss) + :return: The date/time the account was created (yyyy-mm-dd hh:mm:ss) :rtype: str :raises: CommandExecutionError on user not found or any other unknown error @@ -213,9 +213,9 @@ def get_last_change(name): ''' Get the date/time the account was changed - :param str name: the username of the account + :param str name: The username of the account - :return: the date/time the account was modified (yyyy-mm-dd hh:mm:ss) + :return: The date/time the account was modified (yyyy-mm-dd hh:mm:ss) :rtype: str :raises: CommandExecutionError on user not found or any other unknown error @@ -239,7 +239,7 @@ def get_login_failed_count(name): ''' Get the the number of failed login attempts - :param str name: the username of the account + :param str name: The username of the account :return: The number of failed login attempts :rtype: int @@ -261,10 +261,10 @@ def get_login_failed_last(name): ''' Get the date/time of the last failed login attempt - :param str name: the username of the account + :param str name: The username of the account - :return: the date/time of the last failed login attempt on this account - (yyyy-mm-dd hh:mm:ss) + :return: The date/time of the last failed login attempt on this account + (yyyy-mm-dd hh:mm:ss) :rtype: str :raises: CommandExecutionError on user not found or any other unknown error @@ -288,9 +288,9 @@ def set_maxdays(name, days): ''' Set the maximum age of the password in days - :param str name: the username of the account + :param str name: The username of the account - :param int days: the maximum age of the account in days + :param int days: The maximum age of the account in days :return: True if successful, False if not :rtype: bool @@ -315,9 +315,9 @@ def get_maxdays(name): ''' Get the maximum age of the password - :param str name: the username of the account + :param str name: The username of the account - :return: the maximum age of the password in days + :return: The maximum age of the password in days :rtype: int :raises: CommandExecutionError on user not found or any other unknown error @@ -404,10 +404,10 @@ def set_change(name, date): Sets the date on which the password expires. The user will be required to change their password. Format is mm/dd/yyyy - :param str name: the name of the user account + :param str name: The name of the user account - :param date date: the date the password will expire. Must be in mm/dd/yyyy - format. + :param date date: The date the password will expire. Must be in mm/dd/yyyy + format. :return: True if successful, otherwise False :rtype: bool @@ -430,7 +430,7 @@ def get_change(name): ''' Gets the date on which the password expires - :param str name: the name of the user account + :param str name: The name of the user account :return: The date the password will expire :rtype: str @@ -456,10 +456,10 @@ def set_expire(name, date): Sets the date on which the account expires. The user will not be able to login after this date. Date format is mm/dd/yyyy - :param str name: the name of the user account + :param str name: The name of the user account - :param datetime date: the date the account will expire. Format must be - mm/dd/yyyy + :param datetime date: The date the account will expire. Format must be + mm/dd/yyyy. :return: True if successful, False if not :rtype: bool @@ -482,9 +482,9 @@ def get_expire(name): ''' Gets the date on which the account expires - :param str name: the name of the user account + :param str name: The name of the user account - :return: the date the account expires + :return: The date the account expires :rtype: str :raises: CommandExecutionError on user not found or any other unknown error @@ -542,7 +542,7 @@ def set_password(name, password): process list while the command is running) :param str name: The name of the local user, which is assumed to be in the - local directory service + local directory service :param str password: The plaintext password to set diff --git a/salt/modules/mac_softwareupdate.py b/salt/modules/mac_softwareupdate.py index 479d8185be..cee95fc279 100644 --- a/salt/modules/mac_softwareupdate.py +++ b/salt/modules/mac_softwareupdate.py @@ -186,8 +186,7 @@ def schedule_enabled(): Check the status of automatic update scheduling. :return: True if scheduling is enabled, False if disabled - - ``True``: Automatic checking is on, - - ``False``: Automatic checking is off, + :rtype: bool CLI Example: @@ -208,9 +207,10 @@ def schedule_enable(enable): ''' Enable/disable automatic update scheduling. - :param enable: True/On/Yes/1 to turn on automatic updates. False/No/Off/0 to - turn off automatic updates. If this value is empty, the current status will - be returned. + :param enable: True/On/Yes/1 to turn on automatic updates. False/No/Off/0 + to turn off automatic updates. If this value is empty, the current + status will be returned. + :type: bool str :return: True if scheduling is enabled, False if disabled @@ -238,17 +238,16 @@ def update_all(recommended=False, restart=True): of the update and the status of its installation. :param bool recommended: If set to True, only install the recommended - updates. If set to False (default) all updates are installed. + updates. If set to False (default) all updates are installed. :param bool restart: Set this to False if you do not want to install updates - that require a restart. Default is True + that require a restart. Default is True :return: A dictionary containing the updates that were installed and the - status of its installation. If no updates were installed an empty dictionary - is returned. + status of its installation. If no updates were installed an empty + dictionary is returned. + :rtype: dict - - ``True``: The update was installed. - - ``False``: The update was not installed. CLI Example: @@ -385,10 +384,10 @@ def download_all(recommended=False, restart=True): are now downloaded. :param bool recommended: If set to True, only install the recommended - updates. If set to False (default) all updates are installed. + updates. If set to False (default) all updates are installed. :param bool restart: Set this to False if you do not want to install updates - that require a restart. Default is True + that require a restart. Default is True :return: A list containing all downloaded updates on the system. :rtype: list diff --git a/salt/modules/mac_sysctl.py b/salt/modules/mac_sysctl.py index 030a0db9f5..f0f4447e9b 100644 --- a/salt/modules/mac_sysctl.py +++ b/salt/modules/mac_sysctl.py @@ -179,13 +179,10 @@ def persist(name, value, config='/etc/sysctl.conf', apply_change=False): rest = rest[len(rest_v):] if rest_v == value: return 'Already set' - new_line = '{0}={1}'.format(name, value) - nlines.append(new_line) - nlines.append('\n') + nlines.append('{0}={1}\n'.format(name, value)) edited = True if not edited: - nlines.append('{0}={1}'.format(name, value)) - nlines.append('\n') + nlines.append('{0}={1}\n'.format(name, value)) nlines = [salt.utils.stringutils.to_str(_l) for _l in nlines] with salt.utils.files.fopen(config, 'w+') as ofile: ofile.writelines(nlines) diff --git a/salt/modules/mac_system.py b/salt/modules/mac_system.py index 3b0facf303..badf3c0c8e 100644 --- a/salt/modules/mac_system.py +++ b/salt/modules/mac_system.py @@ -74,8 +74,7 @@ def _atrun_enabled(): # Collect information on service: will raise an error if it fails salt.utils.mac_utils.launchctl('list', label, - return_stdout=True, - output_loglevel='quiet') + return_stdout=True) return True except CommandExecutionError: return False @@ -111,9 +110,8 @@ def _enable_atrun(): return False salt.utils.mac_utils.launchctl('enable', - 'system/{0}'.format(label), - output_loglevel='quiet') - salt.utils.mac_utils.launchctl('load', path, output_loglevel='quiet') + 'system/{0}'.format(label)) + salt.utils.mac_utils.launchctl('load', path) return _atrun_enabled() @@ -137,17 +135,18 @@ def halt(at_time=None): Halt a running system :param str at_time: Any valid `at` expression. For example, some valid at - expressions could be: - - noon - - midnight - - fri - - 9:00 AM - - 2:30 PM tomorrow - - now + 10 minutes + expressions could be: - Note:: - If you pass a time only, with no 'AM/PM' designation, you have to double - quote the parameter on the command line. For example: '"14:00"' + - noon + - midnight + - fri + - 9:00 AM + - 2:30 PM tomorrow + - now + 10 minutes + + .. note:: + If you pass a time only, with no 'AM/PM' designation, you have to + double quote the parameter on the command line. For example: '"14:00"' CLI Example: @@ -166,17 +165,18 @@ def sleep(at_time=None): sleep. :param str at_time: Any valid `at` expression. For example, some valid at - expressions could be: - - noon - - midnight - - fri - - 9:00 AM - - 2:30 PM tomorrow - - now + 10 minutes + expressions could be: - Note:: - If you pass a time only, with no 'AM/PM' designation, you have to double - quote the parameter on the command line. For example: '"14:00"' + - noon + - midnight + - fri + - 9:00 AM + - 2:30 PM tomorrow + - now + 10 minutes + + .. note:: + If you pass a time only, with no 'AM/PM' designation, you have to + double quote the parameter on the command line. For example: '"14:00"' CLI Example: @@ -194,17 +194,18 @@ def restart(at_time=None): Restart the system :param str at_time: Any valid `at` expression. For example, some valid at - expressions could be: - - noon - - midnight - - fri - - 9:00 AM - - 2:30 PM tomorrow - - now + 10 minutes + expressions could be: - Note:: - If you pass a time only, with no 'AM/PM' designation, you have to double - quote the parameter on the command line. For example: '"14:00"' + - noon + - midnight + - fri + - 9:00 AM + - 2:30 PM tomorrow + - now + 10 minutes + + .. note:: + If you pass a time only, with no 'AM/PM' designation, you have to + double quote the parameter on the command line. For example: '"14:00"' CLI Example: @@ -222,17 +223,18 @@ def shutdown(at_time=None): Shutdown the system :param str at_time: Any valid `at` expression. For example, some valid at - expressions could be: - - noon - - midnight - - fri - - 9:00 AM - - 2:30 PM tomorrow - - now + 10 minutes + expressions could be: - Note:: - If you pass a time only, with no 'AM/PM' designation, you have to double - quote the parameter on the command line. For example: '"14:00"' + - noon + - midnight + - fri + - 9:00 AM + - 2:30 PM tomorrow + - now + 10 minutes + + .. note:: + If you pass a time only, with no 'AM/PM' designation, you have to + double quote the parameter on the command line. For example: '"14:00"' CLI Example: @@ -271,8 +273,8 @@ def set_remote_login(enable): Set the remote login (SSH) to either on or off. :param bool enable: True to enable, False to disable. "On" and "Off" are - also acceptable values. Additionally you can pass 1 and 0 to represent True - and False respectively + also acceptable values. Additionally you can pass 1 and 0 to represent + True and False respectively :return: True if successful, False if not :rtype: bool @@ -323,8 +325,8 @@ def set_remote_events(enable): AppleScripts) :param bool enable: True to enable, False to disable. "On" and "Off" are - also acceptable values. Additionally you can pass 1 and 0 to represent True - and False respectively + also acceptable values. Additionally you can pass 1 and 0 to represent + True and False respectively :return: True if successful, False if not :rtype: bool @@ -513,7 +515,7 @@ def get_restart_delay(): power failure. :return: A string value representing the number of seconds the system will - delay restart after power loss + delay restart after power loss :rtype: str CLI Example: @@ -600,8 +602,8 @@ def set_disable_keyboard_on_lock(enable): enclosure lock is engaged. :param bool enable: True to enable, False to disable. "On" and "Off" are - also acceptable values. Additionally you can pass 1 and 0 to represent True - and False respectively + also acceptable values. Additionally you can pass 1 and 0 to represent + True and False respectively :return: True if successful, False if not :rtype: bool @@ -658,20 +660,17 @@ def set_boot_arch(arch='default'): Set the kernel to boot in 32 or 64 bit mode on next boot. .. note:: - - This command fails with the following error: - - ``changes to kernel architecture failed to save!`` - - The setting is not updated. This is either an apple bug, not available - on the test system, or a result of system files now being locked down in - macOS (SIP Protection). + When this function fails with the error ``changes to kernel + architecture failed to save!``, then the boot arch is not updated. + This is either an Apple bug, not available on the test system, or a + result of system files being locked down in macOS (SIP Protection). :param str arch: A string representing the desired architecture. If no - value is passed, default is assumed. Valid values include: - - i386 - - x86_64 - - default + value is passed, default is assumed. Valid values include: + + - i386 + - x86_64 + - default :return: True if successful, False if not :rtype: bool diff --git a/salt/modules/mac_timezone.py b/salt/modules/mac_timezone.py index 230fffac4c..6e4a18bffd 100644 --- a/salt/modules/mac_timezone.py +++ b/salt/modules/mac_timezone.py @@ -80,10 +80,11 @@ def set_date(date): Set the current month, day, and year :param str date: The date to set. Valid date formats are: - - %m:%d:%y - - %m:%d:%Y - - %m/%d/%y - - %m/%d/%Y + + - %m:%d:%y + - %m:%d:%Y + - %m/%d/%y + - %m/%d/%Y :return: True if successful, False if not :rtype: bool @@ -125,8 +126,8 @@ def set_time(time): ''' Sets the current time. Must be in 24 hour format. - :param str time: The time to set in 24 hour format. - The value must be double quoted. ie: '"17:46"' + :param str time: The time to set in 24 hour format. The value must be + double quoted. ie: '"17:46"' :return: True if successful, False if not :rtype: bool @@ -332,8 +333,9 @@ def set_time_server(time_server='time.apple.com'): Designates a network time server. Enter the IP address or DNS name for the network time server. - :param time_server: IP or DNS name of the network time server. If nothing is - passed the time server will be set to the macOS default of 'time.apple.com' + :param time_server: IP or DNS name of the network time server. If nothing + is passed the time server will be set to the macOS default of + 'time.apple.com' :type: str :return: True if successful, False if not diff --git a/salt/modules/mac_xattr.py b/salt/modules/mac_xattr.py index 207fe46b8c..e5bd5d402d 100644 --- a/salt/modules/mac_xattr.py +++ b/salt/modules/mac_xattr.py @@ -42,7 +42,7 @@ def list_(path, **kwargs): :param bool hex: Return the values with forced hexadecimal values :return: A dictionary containing extended attributes and values for the - given file + given file :rtype: dict :raises: CommandExecutionError on file not found or any other unknown error @@ -93,7 +93,7 @@ def read(path, attribute, **kwargs): :rtype: str :raises: CommandExecutionError on file not found, attribute not found, and - any other unknown error + any other unknown error CLI Example: @@ -175,13 +175,13 @@ def delete(path, attribute): :param str path: The file(s) to get attributes from :param str attribute: The attribute name to be deleted from the - file/directory + file/directory :return: True if successful, otherwise False :rtype: bool :raises: CommandExecutionError on file not found, attribute not found, and - any other unknown error + any other unknown error CLI Example: diff --git a/salt/modules/match.py b/salt/modules/match.py index ba7ed6428a..fe9fcb42de 100644 --- a/salt/modules/match.py +++ b/salt/modules/match.py @@ -362,7 +362,7 @@ def search_by(lookup, tgt_type='compound', minion_id=None): Pillar Example: - .. code-block:: yaml + .. code-block:: jinja {% set roles = salt.match.search_by({ 'web': ['G@os_family:Debian not nodeX'], diff --git a/salt/modules/mattermost.py b/salt/modules/mattermost.py index 7232dc0a0c..98dc6606ed 100644 --- a/salt/modules/mattermost.py +++ b/salt/modules/mattermost.py @@ -109,7 +109,7 @@ def post_message(message, .. code-block:: bash - salt '*' mattermost.post_message message='Build is done" + salt '*' mattermost.post_message message='Build is done' ''' if not api_url: api_url = _get_api_url() diff --git a/salt/modules/memcached.py b/salt/modules/memcached.py index 06cde0da6e..f2effe1230 100644 --- a/salt/modules/memcached.py +++ b/salt/modules/memcached.py @@ -61,7 +61,7 @@ def _connect(host=DEFAULT_HOST, port=DEFAULT_PORT): def _check_stats(conn): ''' Helper function to check the stats data passed into it, and raise an - execption if none are returned. Otherwise, the stats are returned. + exception if none are returned. Otherwise, the stats are returned. ''' stats = conn.get_stats() if not stats: diff --git a/salt/modules/mine.py b/salt/modules/mine.py index a9dbb793b0..7990a14835 100644 --- a/salt/modules/mine.py +++ b/salt/modules/mine.py @@ -361,10 +361,18 @@ def flush(): def get_docker(interfaces=None, cidrs=None, with_container_id=False): ''' - Get all mine data for 'docker.get_containers' and run an aggregation - routine. The "interfaces" parameter allows for specifying which network - interfaces to select ip addresses from. The "cidrs" parameter allows for - specifying a list of cidrs which the ip address must match. + .. versionchanged:: 2017.7.8,2018.3.3 + When :conf_minion:`docker.update_mine` is set to ``False`` for a given + minion, no mine data will be populated for that minion, and thus none + will be returned for it. + .. versionchanged:: Fluorine + :conf_minion:`docker.update_mine` now defaults to ``False`` + + Get all mine data for :py:func:`docker.ps ` and + run an aggregation routine. The ``interfaces`` parameter allows for + specifying the network interfaces from which to select IP addresses. The + ``cidrs`` parameter allows for specifying a list of subnets which the IP + address must match. with_container_id Boolean, to expose container_id in the list of results diff --git a/salt/modules/mount.py b/salt/modules/mount.py index 3375943d95..2c59a1a236 100644 --- a/salt/modules/mount.py +++ b/salt/modules/mount.py @@ -121,18 +121,30 @@ def _active_mounts_aix(ret): ''' for line in __salt__['cmd.run_stdout']('mount -p').split('\n'): comps = re.sub(r"\s+", " ", line).split() - if comps and comps[0] == 'node' or comps[0] == '--------': - continue - if len(comps) < 8: - ret[comps[1]] = {'device': comps[0], - 'fstype': comps[2], - 'opts': _resolve_user_group_names(comps[6].split(','))} - else: - ret[comps[2]] = {'node': comps[0], - 'device': comps[1], - 'fstype': comps[3], - 'opts': _resolve_user_group_names(comps[7].split(','))} - + if comps: + if comps[0] == 'node' or comps[0] == '--------': + continue + comps_len = len(comps) + if line.startswith((' ', '\t')): + curr_opts = _resolve_user_group_names(comps[6].split(',')) if 7 == comps_len else [] + if curr_opts: + ret[comps[1]] = {'device': comps[0], + 'fstype': comps[2], + 'opts': curr_opts} + else: + ret[comps[1]] = {'device': comps[0], + 'fstype': comps[2]} + else: + curr_opts = _resolve_user_group_names(comps[7].split(',')) if 8 == comps_len else [] + if curr_opts: + ret[comps[2]] = {'node': comps[0], + 'device': comps[1], + 'fstype': comps[3], + 'opts': curr_opts} + else: + ret[comps[2]] = {'node': comps[0], + 'device': comps[1], + 'fstype': comps[3]} return ret @@ -228,7 +240,7 @@ def active(extended=False): ret = {} if __grains__['os'] == 'FreeBSD': _active_mounts_freebsd(ret) - elif __grains__['kernel'] == 'AIX': + elif 'AIX' in __grains__['kernel']: _active_mounts_aix(ret) elif __grains__['kernel'] == 'SunOS': _active_mounts_solaris(ret) @@ -276,9 +288,11 @@ class _fstab_entry(object): raise cls.ParseError("Comment!") comps = line.split() - if len(comps) != 6: + if len(comps) < 4 or len(comps) > 6: raise cls.ParseError("Invalid Entry!") + comps.extend(['0'] * (len(keys) - len(comps))) + return dict(zip(keys, comps)) @classmethod @@ -423,6 +437,7 @@ class _vfstab_entry(object): def fstab(config='/etc/fstab'): ''' .. versionchanged:: 2016.3.2 + List the contents of the fstab CLI Example: @@ -465,6 +480,7 @@ def fstab(config='/etc/fstab'): def vfstab(config='/etc/vfstab'): ''' .. versionadded:: 2016.3.2 + List the contents of the vfstab CLI Example: @@ -480,6 +496,7 @@ def vfstab(config='/etc/vfstab'): def rm_fstab(name, device, config='/etc/fstab'): ''' .. versionchanged:: 2016.3.2 + Remove the mount point from the fstab CLI Example: @@ -531,6 +548,7 @@ def rm_fstab(name, device, config='/etc/fstab'): def rm_vfstab(name, device, config='/etc/vfstab'): ''' .. versionadded:: 2016.3.2 + Remove the mount point from the vfstab CLI Example: @@ -1040,7 +1058,7 @@ def mount(name, device, mkmnt=False, fstype='', opts='defaults', user=None, util return False # Darwin doesn't expect defaults when mounting without other options - if 'defaults' in opts and __grains__['os'] in ['MacOS', 'Darwin']: + if 'defaults' in opts and __grains__['os'] in ['MacOS', 'Darwin', 'AIX']: opts = None if isinstance(opts, six.string_types): @@ -1053,7 +1071,9 @@ def mount(name, device, mkmnt=False, fstype='', opts='defaults', user=None, util if opts is not None: lopts = ','.join(opts) args = '-o {0}'.format(lopts) - if fstype: + + # use of fstype on AIX is with /etc/filesystems + if fstype and 'AIX' not in __grains__['os']: args += ' -t {0}'.format(fstype) cmd = 'mount {0} {1} {2} '.format(args, device, name) out = __salt__['cmd.run_all'](cmd, runas=user, python_shell=False) @@ -1080,6 +1100,10 @@ def remount(name, device, mkmnt=False, fstype='', opts='defaults', user=None): if fstype == 'smbfs': force_mount = True + if 'AIX' in __grains__['os']: + if opts == 'defaults': + opts = '' + if isinstance(opts, six.string_types): opts = opts.split(',') mnts = active() @@ -1092,7 +1116,9 @@ def remount(name, device, mkmnt=False, fstype='', opts='defaults', user=None): umount(name, device, user=user) lopts = ','.join(opts) args = '-o {0}'.format(lopts) - if fstype: + + # use of fstype on AIX is with /etc/filesystems + if fstype and 'AIX' not in __grains__['os']: args += ' -t {0}'.format(fstype) if __grains__['os'] not in ['OpenBSD', 'MacOS', 'Darwin'] or force_mount: cmd = 'mount {0} {1} {2} '.format(args, device, name) @@ -1186,6 +1212,17 @@ def swaps(): 'size': int(comps[3]), 'used': (int(comps[3]) - int(comps[4])), 'priority': '-'} + elif 'AIX' in __grains__['kernel']: + for line in __salt__['cmd.run_stdout']('swap -l').splitlines(): + if line.startswith('device'): + continue + comps = line.split() + + # AIX uses MB for units + ret[comps[0]] = {'type': 'device', + 'size': int(comps[3][:-2]) * 1024, + 'used': (int(comps[3][:-2]) - int(comps[4][:-2])) * 1024, + 'priority': '-'} elif __grains__['os'] != 'OpenBSD': with salt.utils.files.fopen('/proc/swaps') as fp_: for line in fp_: @@ -1238,7 +1275,7 @@ def swapon(name, priority=None): return False else: cmd = 'swapon {0}'.format(name) - if priority: + if priority and 'AIX' not in __grains__['kernel']: cmd += ' -p {0}'.format(priority) __salt__['cmd.run'](cmd, python_shell=False) diff --git a/salt/modules/mssql.py b/salt/modules/mssql.py index 6d3802c00a..ba62050012 100644 --- a/salt/modules/mssql.py +++ b/salt/modules/mssql.py @@ -137,7 +137,9 @@ def db_create(database, containment='NONE', new_database_options=None, **kwargs) new_database_options can only be a list of strings CLI Example: + .. code-block:: bash + salt minion mssql.db_create DB_NAME ''' if containment not in ['NONE', 'PARTIAL']: @@ -299,18 +301,22 @@ def login_exists(login, domain='', **kwargs): def login_create(login, new_login_password=None, new_login_domain='', new_login_roles=None, new_login_options=None, **kwargs): ''' - Creates a new login. - Does not update password of existing logins. - For Windows authentication, provide new_login_domain. - For SQL Server authentication, prvide new_login_password. - Since hashed passwords are varbinary values, if the - new_login_password is 'int / long', it will be considered - to be HASHED. - new_login_roles can only be a list of SERVER roles - new_login_options can only be a list of strings + Creates a new login. Does not update password of existing logins. For + Windows authentication, provide ``new_login_domain``. For SQL Server + authentication, prvide ``new_login_password``. Since hashed passwords are + *varbinary* values, if the ``new_login_password`` is 'int / long', it will + be considered to be HASHED. + + new_login_roles + a list of SERVER roles + + new_login_options + a list of strings CLI Example: + .. code-block:: bash + salt minion mssql.login_create LOGIN_NAME database=DBNAME [new_login_password=PASSWORD] ''' # One and only one of password and domain should be specifies @@ -408,13 +414,14 @@ def user_list(**kwargs): def user_create(username, login=None, domain='', database=None, roles=None, options=None, **kwargs): ''' - Creates a new user. - If login is not specified, the user will be created without a login. - domain, if provided, will be prepended to username. + Creates a new user. If login is not specified, the user will be created + without a login. domain, if provided, will be prepended to username. options can only be a list of strings CLI Example: + .. code-block:: bash + salt minion mssql.user_create USERNAME database=DBNAME ''' if domain and not login: diff --git a/salt/modules/msteams.py b/salt/modules/msteams.py index b43f6b405d..69e40f75c2 100644 --- a/salt/modules/msteams.py +++ b/salt/modules/msteams.py @@ -1,14 +1,17 @@ # -*- coding: utf-8 -*- ''' Module for sending messages to MS Teams + .. versionadded:: 2017.7.0 + :configuration: This module can be used by either passing a hook_url directly or by specifying it in a configuration profile in the salt - master/minion config. - For example: - .. code-block:: yaml - msteams: - hook_url: https://outlook.office.com/webhook/837 + master/minion config. For example: + +.. code-block:: yaml + + msteams: + hook_url: https://outlook.office.com/webhook/837 ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals @@ -59,8 +62,11 @@ def post_card(message, :param title: Optional title for the posted card :param theme_color: Optional hex color highlight for the posted card :return: Boolean if message was sent successfully. + CLI Example: + .. code-block:: bash + salt '*' msteams.post_card message="Build is done" ''' diff --git a/salt/modules/mysql.py b/salt/modules/mysql.py index a5965f3a25..8f370f031d 100644 --- a/salt/modules/mysql.py +++ b/salt/modules/mysql.py @@ -35,6 +35,7 @@ Module to provide MySQL compatibility to salt. # Import python libs from __future__ import absolute_import, print_function, unicode_literals +import hashlib import time import logging import re @@ -200,6 +201,12 @@ def __virtual__(): return bool(MySQLdb), 'No python mysql client installed.' if MySQLdb is None else '' +def __mysql_hash_password(password): + _password = hashlib.sha1(password).digest() + _password = '*{0}'.format(hashlib.sha1(_password).hexdigest().upper()) + return _password + + def __check_table(name, table, **connection_args): dbc = _connect(**connection_args) if dbc is None: @@ -1201,6 +1208,7 @@ def user_exists(user, salt '*' mysql.user_exists 'username' passwordless=True salt '*' mysql.user_exists 'username' password_column='authentication_string' ''' + server_version = version(**connection_args) dbc = _connect(**connection_args) # Did we fail to connect with the user we are checking # Its password might have previously change with the same command/state @@ -1232,8 +1240,14 @@ def user_exists(user, else: qry += ' AND ' + password_column + ' = \'\'' elif password: - qry += ' AND ' + password_column + ' = PASSWORD(%(password)s)' - args['password'] = six.text_type(password) + if salt.utils.versions.version_cmp(server_version, '8.0.11') <= 0: + # Hash the password before comparing + _password = __mysql_hash_password(password) + qry += ' AND ' + password_column + ' = %(password)s' + else: + _password = password + qry += ' AND ' + password_column + ' = PASSWORD(%(password)s)' + args['password'] = six.text_type(_password) elif password_hash: qry += ' AND ' + password_column + ' = %(password)s' args['password'] = password_hash @@ -1331,6 +1345,7 @@ def user_create(user, salt '*' mysql.user_create 'username' 'hostname' password_hash='hash' salt '*' mysql.user_create 'username' 'hostname' allow_passwordless=True ''' + server_version = version(**connection_args) if user_exists(user, host, **connection_args): log.info('User \'%s\'@\'%s\' already exists', user, host) return False @@ -1351,7 +1366,10 @@ def user_create(user, qry += ' IDENTIFIED BY %(password)s' args['password'] = six.text_type(password) elif password_hash is not None: - qry += ' IDENTIFIED BY PASSWORD %(password)s' + if salt.utils.versions.version_cmp(server_version, '8.0.11') <= 0: + qry += ' IDENTIFIED BY %(password)s' + else: + qry += ' IDENTIFIED BY PASSWORD %(password)s' args['password'] = password_hash elif salt.utils.data.is_true(allow_passwordless): if salt.utils.data.is_true(unix_socket): @@ -1431,9 +1449,13 @@ def user_chpass(user, salt '*' mysql.user_chpass frank localhost password_hash='hash' salt '*' mysql.user_chpass frank localhost allow_passwordless=True ''' + server_version = version(**connection_args) args = {} if password is not None: - password_sql = 'PASSWORD(%(password)s)' + if salt.utils.versions.version_cmp(server_version, '8.0.11') <= 0: + password_sql = '%(password)s' + else: + password_sql = 'PASSWORD(%(password)s)' args['password'] = password elif password_hash is not None: password_sql = '%(password)s' diff --git a/salt/modules/namecheap_dns.py b/salt/modules/namecheap_dns.py index aa45bb3765..8adc5691af 100644 --- a/salt/modules/namecheap_dns.py +++ b/salt/modules/namecheap_dns.py @@ -1,45 +1,30 @@ # -*- coding: utf-8 -*- ''' -Namecheap dns management +Namecheap DNS Management .. versionadded:: 2017.7.0 - General Notes - ------------- +Prerequisites +------------- - Use this module to manage dns through the namecheap - api. The Namecheap settings will be set in grains. +This module uses the ``requests`` Python module to communicate to the namecheap +API. - Installation Prerequisites - -------------------------- +Configuration +------------- - - This module uses the following python libraries to communicate to - the namecheap API: +The Namecheap username, API key and URL should be set in the minion configuration +file, or in the Pillar data. - * ``requests`` - - .. code-block:: bash - - pip install requests - - - As saltstack depends on ``requests`` this shouldn't be a problem - - Prerequisite Configuration - -------------------------- - - - The namecheap username, api key and url should be set in a minion - configuration file or pillar - - .. code-block:: yaml - - namecheap.name: companyname - namecheap.key: a1b2c3d4e5f67a8b9c0d1e2f3 - namecheap.client_ip: 162.155.30.172 - #Real url - namecheap.url: https://api.namecheap.com/xml.response - #Sandbox url - #namecheap.url: https://api.sandbox.namecheap.xml.response +.. code-block:: yaml + namecheap.name: companyname + namecheap.key: a1b2c3d4e5f67a8b9c0d1e2f3 + namecheap.client_ip: 162.155.30.172 + #Real url + namecheap.url: https://api.namecheap.com/xml.response + #Sandbox url + #namecheap.url: https://api.sandbox.namecheap.xml.response ''' # Import Python libs @@ -75,10 +60,10 @@ def get_hosts(sld, tld): returns a dictionary of information about the requested domain sld - string sld of the domainname + SLD of the domain name tld - string tld of the domainname + TLD of the domain name CLI Example: @@ -106,10 +91,10 @@ def get_list(sld, tld): returns a dictionary of information about requested domain sld - string sld of the domainname + SLD of the domain name tld - string tld of the domain name + TLD of the domain name CLI Example: @@ -137,21 +122,23 @@ def set_hosts(sld, tld, hosts): returns True if the host records were set successfully sld - string sld of the domainname + SLD of the domain name tld - string tld of the domain name + TLD of the domain name hosts - array of dictionaries each dictionary should contain the following keys: - 'hostname', 'recordtype', and 'address' - 'ttl' is optional, Default value is 1800 - 'mxpref' is optional but must be included with 'emailtype' + Must be passed as a list of Python dictionaries, with each dictionary + containing the following keys: - 'hostname' should be the subdomain/hostname - 'recordtype' should be A,AAAA,CNAME,MX,MXE,TXT,URL,URL301,FRAME - 'address' should be url or ip address - 'ttl' should be an integer between 60 to 60000 + - **hostname** + - **recordtype** - One of ``A``, ``AAAA``, ``CNAME``, ``MX``, ``MXE``, + ``TXT``, ``URL``, ``URL301``, or ``FRAME`` + - **address** - URL or IP address + - **ttl** - An integer between 60 and 60000 (default: ``1800``) + + Additonally, the ``mxpref`` key can be present, but must be accompanied + by an ``emailtype`` key. CLI Example: @@ -190,10 +177,10 @@ def set_custom(sld, tld, nameservers): returns True if the custom nameservers were set successfully sld - string sld of the domainname + SLD of the domain name tld - string tld of the domain name + TLD of the domain name nameservers array of strings List of nameservers to be associated with this domain @@ -218,17 +205,18 @@ def set_custom(sld, tld, nameservers): def set_default(sld, tld): ''' - Sets domain to use namecheap default DNS servers. - Required for free services like Host record management, - URL forwarding, email forwarding, dynamic dns and other value added services. - - returns True if the domain was set to default + Sets domain to use namecheap default DNS servers. Required for free + services like Host record management, URL forwarding, email forwarding, + dynamic DNS and other value added services. sld - string sld of the domainname + SLD of the domain name tld - string tld of the domain name + TLD of the domain name + + Returns ``True`` if the domain was successfully pointed at the default DNS + servers. CLI Example: diff --git a/salt/modules/namecheap_domains.py b/salt/modules/namecheap_domains.py index 8aef56fbb2..a79b9351a4 100644 --- a/salt/modules/namecheap_domains.py +++ b/salt/modules/namecheap_domains.py @@ -1,44 +1,30 @@ # -*- coding: utf-8 -*- ''' -Namecheap domains management +Namecheap Domain Management - .. versionadded:: 2017.7.0 +.. versionadded:: 2017.7.0 - General Notes - ------------- +Prerequisites +------------- - Use this module to manage domains through the namecheap - api. The Namecheap settings will be set in grains. +This module uses the ``requests`` Python module to communicate to the namecheap +API. - Installation Prerequisites - -------------------------- +Configuration +------------- - - This module uses the following python libraries to communicate to - the namecheap API: +The Namecheap username, API key and URL should be set in the minion configuration +file, or in the Pillar data. - * ``requests`` - .. code-block:: bash - - pip install requests - - - As saltstack depends on ``requests`` this shouldn't be a problem - - Prerequisite Configuration - -------------------------- - - - The namecheap username, api key and url should be set in a minion - configuration file or pillar - - .. code-block:: yaml - - namecheap.name: companyname - namecheap.key: a1b2c3d4e5f67a8b9c0d1e2f3 - namecheap.client_ip: 162.155.30.172 - #Real url - namecheap.url: https://api.namecheap.com/xml.response - #Sandbox url - #namecheap.url: https://api.sandbox.namecheap.xml.response +.. code-block:: yaml + namecheap.name: companyname + namecheap.key: a1b2c3d4e5f67a8b9c0d1e2f3 + namecheap.client_ip: 162.155.30.172 + #Real url + namecheap.url: https://api.namecheap.com/xml.response + #Sandbox url + #namecheap.url: https://api.sandbox.namecheap.xml.response ''' from __future__ import absolute_import, print_function, unicode_literals @@ -66,18 +52,18 @@ def reactivate(domain_name): ''' Try to reactivate the expired domain name - returns the following information in a dictionary - issuccess bool indicates whether the domain was renewed successfully - amount charged for reactivation - orderid unique integer value for the order - transactionid unique integer value for the transaction + Returns the following information: + + - Whether or not the domain was reactivated successfully + - The amount charged for reactivation + - The order ID + - The transaction ID CLI Example: .. code-block:: bash salt 'my-minion' namecheap_domains.reactivate my-domain-name - ''' opts = salt.utils.namecheap.get_opts('namecheap.domains.reactivate') opts['DomainName'] = domain_name @@ -95,16 +81,19 @@ def renew(domain_name, years, promotion_code=None): ''' Try to renew the specified expiring domain name for a specified number of years - returns the following information in a dictionary - renew bool indicates whether the domain was renewed successfully - domainid unique integer value for the domain - orderid unique integer value for the order - transactionid unique integer value for the transaction - amount charged for renewal + domain_name + The domain name to be renewed - Required parameters: - domain_name - string The domain name you wish to renew + years + Number of years to renew + + Returns the following information: + + - Whether or not the domain was renewed successfully + - The domain ID + - The order ID + - The transaction ID + - The amount charged for renewal CLI Example: @@ -130,16 +119,23 @@ def renew(domain_name, years, promotion_code=None): def create(domain_name, years, **kwargs): ''' - Try to create the specified domain name for the specified number of years + Try to register the specified domain name - returns the following information in a dictionary - registered True/False - amount charged for registration - domainid unique integer value for the domain - orderid unique integer value for the order - transactionid unique integer value for the transaction - whoisguardenable True,False if enabled for this domain - nonrealtimedomain True,False if domain registration is instant or not + domain_name + The domain name to be registered + + years + Number of years to register + + Returns the following information: + + - Whether or not the domain was renewed successfully + - Whether or not WhoisGuard is enabled + - Whether or not registration is instant + - The amount charged for registration + - The domain ID + - The order ID + - The transaction ID CLI Example: @@ -214,12 +210,12 @@ def check(*domains_to_check): ''' Checks the availability of domains - returns a dictionary where the domain name is the key and - the availability is the value of True/False - domains_to_check array of strings List of domains to check + Returns a dictionary mapping the each domain name to a boolean denoting + whether or not it is available. + CLI Example: .. code-block:: bash @@ -311,25 +307,22 @@ def get_list(list_type=None, Returns a list of domains for the particular user as a list of objects offset by ``page`` length of ``page_size`` - list_type - string Possible values are ALL/EXPIRING/EXPIRED - Default: ALL + list_type : ALL + One of ``ALL``, ``EXPIRING``, ``EXPIRED`` search_term - string Keyword to look for on the domain list + Keyword to look for on the domain list - page - integer Page to return - Default: 1 + page : 1 + Number of result page to return - page_size - integer Number of domains to be listed in a page - Minimum value is 10 and maximum value is 100 - Default: 20 + page_size : 20 + Number of domains to be listed per page (minimum: ``10``, maximum: + ``100``) sort_by - string Possible values are NAME/NAME_DESC/EXPIREDATE/ - EXPIREDATE_DESC/CREATEDATE/CREATEDATE_DESC + One of ``NAME``, ``NAME_DESC``, ``EXPIREDATE``, ``EXPIREDATE_DESC``, + ``CREATEDATE``, or ``CREATEDATE_DESC`` CLI Example: diff --git a/salt/modules/namecheap_ns.py b/salt/modules/namecheap_ns.py index f6f5be7105..95ce1ff8f7 100644 --- a/salt/modules/namecheap_ns.py +++ b/salt/modules/namecheap_ns.py @@ -1,45 +1,30 @@ # -*- coding: utf-8 -*- ''' -Namecheap nameservers management +Namecheap Nameserver Management .. versionadded:: 2017.7.0 - General Notes - ------------- +Prerequisites +------------- - Use this module to manage nameservers through the namecheap - api. The Namecheap settings will be set in grains. +This module uses the ``requests`` Python module to communicate to the namecheap +API. - Installation Prerequisites - -------------------------- +Configuration +------------- - - This module uses the following python libraries to communicate to - the namecheap API: +The Namecheap username, API key and URL should be set in the minion configuration +file, or in the Pillar data. - * ``requests`` - - .. code-block:: bash - - pip install requests - - - As saltstack depends on ``requests`` this shouldn't be a problem - - Prerequisite Configuration - -------------------------- - - - The namecheap username, api key and url should be set in a minion - configuration file or pillar - - .. code-block:: yaml - - namecheap.name: companyname - namecheap.key: a1b2c3d4e5f67a8b9c0d1e2f3 - namecheap.client_ip: 162.155.30.172 - #Real url - namecheap.url: https://api.namecheap.com/xml.response - #Sandbox url - #namecheap.url: https://api.sandbox.namecheap.xml.response +.. code-block:: yaml + namecheap.name: companyname + namecheap.key: a1b2c3d4e5f67a8b9c0d1e2f3 + namecheap.client_ip: 162.155.30.172 + #Real url + namecheap.url: https://api.namecheap.com/xml.response + #Sandbox url + #namecheap.url: https://api.sandbox.namecheap.xml.response ''' from __future__ import absolute_import, print_function, unicode_literals @@ -66,21 +51,21 @@ def __virtual__(): def get_info(sld, tld, nameserver): ''' - Retrieves information about a registered nameserver + Retrieves information about a registered nameserver. Returns the following + information: - returns the following information in a dictionary - ipaddress set for the nameserver - domain name for which you are trying to get nameserver details - status an array of status about the nameservers + - IP Address set for the nameserver + - Domain name which was queried + - A list of nameservers and their statuses sld - string SLD of the DomainName + SLD of the domain name tld - string TLD of the DomainName + TLD of the domain name nameserver - string Nameserver to retrieve + Nameserver to retrieve CLI Example: @@ -104,24 +89,23 @@ def get_info(sld, tld, nameserver): def update(sld, tld, nameserver, old_ip, new_ip): ''' - Deletes a nameserver - - returns True if the nameserver was updated successfully + Deletes a nameserver. Returns ``True`` if the nameserver was updated + successfully. sld - string SLD of the DomainName + SLD of the domain name tld - string TLD of the DomainName + TLD of the domain name nameserver - string Nameserver to create + Nameserver to create old_ip - string existing ip address + Current ip address new_ip - string new ip address + New ip address CLI Example: @@ -146,18 +130,17 @@ def update(sld, tld, nameserver, old_ip, new_ip): def delete(sld, tld, nameserver): ''' - Deletes a nameserver - - returns True if the nameserver was deleted successfully + Deletes a nameserver. Returns ``True`` if the nameserver was deleted + successfully sld - string SLD of the DomainName + SLD of the domain name tld - string TLD of the DomainName + TLD of the domain name nameserver - string Nameserver to create + Nameserver to delete CLI Example: @@ -180,21 +163,20 @@ def delete(sld, tld, nameserver): def create(sld, tld, nameserver, ip): ''' - Creates a new nameserver - - returns True if the nameserver was created successfully + Creates a new nameserver. Returns ``True`` if the nameserver was created + successfully. sld - string SLD of the DomainName + SLD of the domain name tld - string TLD of the DomainName + TLD of the domain name nameserver - string Nameserver to create + Nameserver to create ip - string Nameserver IP address + Nameserver IP address CLI Example: diff --git a/salt/modules/namecheap_ssl.py b/salt/modules/namecheap_ssl.py index fcf55eafdf..b4917897c3 100644 --- a/salt/modules/namecheap_ssl.py +++ b/salt/modules/namecheap_ssl.py @@ -1,44 +1,30 @@ # -*- coding: utf-8 -*- ''' -Namecheap ssl management +Namecheap SSL Certificate Management - .. versionadded:: 2017.7.0 +.. versionadded:: 2017.7.0 - General Notes - ------------- +Prerequisites +------------- - Use this module to manage ssl certificates through the namecheap - api. The Namecheap settings will be set in grains. +This module uses the ``requests`` Python module to communicate to the namecheap +API. - Installation Prerequisites - -------------------------- +Configuration +------------- - - This module uses the following python libraries to communicate to - the namecheap API: +The Namecheap username, API key and URL should be set in the minion configuration +file, or in the Pillar data. - * ``requests`` - .. code-block:: bash - - pip install requests - - - As saltstack depends on ``requests`` this shouldn't be a problem - - Prerequisite Configuration - -------------------------- - - - The namecheap username, api key and url should be set in a minion - configuration file or pillar - - .. code-block:: yaml - - namecheap.name: companyname - namecheap.key: a1b2c3d4e5f67a8b9c0d1e2f3 - namecheap.client_ip: 162.155.30.172 - #Real url - namecheap.url: https://api.namecheap.com/xml.response - #Sandbox url - #namecheap.url: https://api.sandbox.namecheap.xml.response +.. code-block:: yaml + namecheap.name: companyname + namecheap.key: a1b2c3d4e5f67a8b9c0d1e2f3 + namecheap.client_ip: 162.155.30.172 + #Real url + namecheap.url: https://api.namecheap.com/xml.response + #Sandbox url + #namecheap.url: https://api.sandbox.namecheap.xml.response ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals @@ -73,42 +59,61 @@ def reissue(csr_file, http_dc_validation=False, **kwargs): ''' - Reissues a purchased SSL certificate + Reissues a purchased SSL certificate. Returns a dictionary of result + values. - returns a dictionary of result values + csr_file + Path to Certificate Signing Request file - Required Parameters: - csr - string Certificate Signing Request + certificate_id + Unique ID of the SSL certificate you wish to activate - certificate_id - integer Unique ID of the SSL certificate you wish to activate + web_server_type + The type of certificate format to return. Possible values include: - web_server_type - string The type of certificate format to return - Possible values: apacheopenssl, apachessl, apacheraven, - apachessleay, c2net, ibmhttp, iplanet, - domino, dominogo4625, dominogo4626, - netscape, zeusv3, apache2, - apacheapachessl, cobaltseries, cpanel, - ensim, hsphere, ipswitch, plesk, - tomcat, weblogic, website, webstar, - iis, other, iis4, iis5 + - apache2 + - apacheapachessl + - apacheopenssl + - apacheraven + - apachessl + - apachessleay + - c2net + - cobaltseries + - cpanel + - domino + - dominogo4625 + - dominogo4626 + - ensim + - hsphere + - ibmhttp + - iis + - iis4 + - iis5 + - iplanet + - ipswitch + - netscape + - other + - plesk + - tomcat + - weblogic + - website + - webstar + - zeusv3 - approver_email - string The email ID which is on the approver email list - http_dc_validation must be set to False if this parameter - is used + approver_email + The email ID which is on the approver email list. - http_dc_validation - bool An indicator that shows if certificate should be - activated using HTTP-based validation. Please specify - True if you wish to use HTTP-based validation. - approver_email should be set to None if this parameter - is used + .. note:: + ``http_dc_validation`` must be set to ``False`` if this option is + used. - Other required parameters: - please see https://www.namecheap.com/support/api/methods/ssl/reissue.aspx + http_dc_validation : False + Whether or not to activate using HTTP-based validation. + + .. note:: + For other parameters which may be required, see here__. + + .. __: https://www.namecheap.com/support/api/methods/ssl/reissue.aspx CLI Example: @@ -127,42 +132,61 @@ def activate(csr_file, http_dc_validation=False, **kwargs): ''' - Activates a newly purchased SSL certificate + Activates a newly-purchased SSL certificate. Returns a dictionary of result + values. - returns a dictionary of result values + csr_file + Path to Certificate Signing Request file - Required Parameters: - csr - string Certificate Signing Request + certificate_id + Unique ID of the SSL certificate you wish to activate - certificate_id - integer Unique ID of the SSL certificate you wish to activate + web_server_type + The type of certificate format to return. Possible values include: - web_server_type - string The type of certificate format to return - Possible values: apacheopenssl, apachessl, apacheraven, - apachessleay, c2net, ibmhttp, iplanet, - domino, dominogo4625, dominogo4626, - netscape, zeusv3, apache2, - apacheapachessl, cobaltseries, cpanel, - ensim, hsphere, ipswitch, plesk, - tomcat, weblogic, website, webstar, - iis, other, iis4, iis5 + - apache2 + - apacheapachessl + - apacheopenssl + - apacheraven + - apachessl + - apachessleay + - c2net + - cobaltseries + - cpanel + - domino + - dominogo4625 + - dominogo4626 + - ensim + - hsphere + - ibmhttp + - iis + - iis4 + - iis5 + - iplanet + - ipswitch + - netscape + - other + - plesk + - tomcat + - weblogic + - website + - webstar + - zeusv3 - approver_email - string The email ID which is on the approver email list - http_dc_validation must be set to False if this parameter - is used + approver_email + The email ID which is on the approver email list. - http_dc_validation - bool An indicator that shows if certificate should be - activated using HTTP-based validation. Please specify - True if you wish to use HTTP-based validation. - approver_email should be set to None if this parameter - is used + .. note:: + ``http_dc_validation`` must be set to ``False`` if this option is + used. - Other required parameters: - please see https://www.namecheap.com/support/api/methods/ssl/activate.aspx + http_dc_validation : False + Whether or not to activate using HTTP-based validation. + + .. note:: + For other parameters which may be required, see here__. + + .. __: https://www.namecheap.com/support/api/methods/ssl/activate.aspx CLI Example: @@ -267,39 +291,56 @@ def __get_certificates(command, def renew(years, certificate_id, certificate_type, promotion_code=None): ''' - Renews an SSL certificate if it is ACTIVE and Expires <= 30 days + Renews an SSL certificate if it is ACTIVE and Expires <= 30 days. Returns + the following information: - returns a dictionary with the following values: - orderid A unique integer value that represents the order - transactionid A unique integer value that represents the transaction - chargedamount The amount charged for the order - certificateid A unique integer value that represents the SSL + - The certificate ID + - The order ID + - The transaction ID + - The amount charged for the order - Required parameters: - years - integer Number of years to register - Default: 1 + years : 1 + Number of years to register - certificate_id - integer Unique identifier for the existing certificate to renew + certificate_id + Unique ID of the SSL certificate you wish to renew - certificate_type - string Type of SSL Certificate, - Possible Values: QuickSSL Premium, RapidSSL, RapidSSL Wildcard, - PremiumSSL, InstantSSL, PositiveSSL, PositiveSSL Wildcard, - True BusinessID with EV, True BusinessID, - True BusinessID Wildcard, True BusinessID Multi Domain, - True BusinessID with EV Multi Domain, Secure Site, - Secure Site Pro, Secure Site with EV, - Secure Site Pro with EV, EssentialSSL, EssentialSSL Wildcard, - InstantSSL Pro, PremiumSSL Wildcard, EV SSL, EV SSL SGC, - SSL123, SSL Web Server, SGC Supercert, SSL Webserver EV, - EV Multi Domain SSL, Multi Domain SSL, - PositiveSSL Multi Domain, Unified Communications + certificate_type + Type of SSL Certificate. Possible values include: - Optional parameters: - promotional_code - string Promotional (coupon) code for the certificate + - EV Multi Domain SSL + - EV SSL + - EV SSL SGC + - EssentialSSL + - EssentialSSL Wildcard + - InstantSSL + - InstantSSL Pro + - Multi Domain SSL + - PositiveSSL + - PositiveSSL Multi Domain + - PositiveSSL Wildcard + - PremiumSSL + - PremiumSSL Wildcard + - QuickSSL Premium + - RapidSSL + - RapidSSL Wildcard + - SGC Supercert + - SSL Web Server + - SSL Webserver EV + - SSL123 + - Secure Site + - Secure Site Pro + - Secure Site Pro with EV + - Secure Site with EV + - True BusinessID + - True BusinessID Multi Domain + - True BusinessID Wildcard + - True BusinessID with EV + - True BusinessID with EV Multi Domain + - Unified Communications + + promotional_code + An optional promo code to use when renewing the certificate CLI Example: @@ -365,104 +406,120 @@ def renew(years, certificate_id, certificate_type, promotion_code=None): def create(years, certificate_type, promotion_code=None, sans_to_add=None): ''' - Creates a new SSL certificate + Creates a new SSL certificate. Returns the following information: - returns a dictionary with the following values: - issuccess Indicates whether SSL order was successful - orderid A unique integer value that represents the order - transactionid A unique integer value that represents the transaction - chargedamount The amount charged for the order - certificateid A unique integer value that represents the SSL - created The date on which the certificate is created - expires The date on which the certificate expires - ssltype Type of SSL cerificate - years Number of years for which the certificate is purchased - status The current status of SSL certificate + - Whether or not the SSL order was successful + - The certificate ID + - The order ID + - The transaction ID + - The amount charged for the order + - The date on which the certificate was created + - The date on which the certificate will expire + - The type of SSL certificate + - The number of years for which the certificate was purchased + - The current status of the SSL certificate - Required parameters: - years - integer Number of years to register - Default: 1 + years : 1 + Number of years to register - certificate_type - string Type of SSL Certificate, - Possible Values: QuickSSL Premium, RapidSSL, RapidSSL Wildcard, - PremiumSSL, InstantSSL, PositiveSSL, PositiveSSL Wildcard, - True BusinessID with EV, True BusinessID, - True BusinessID Wildcard, True BusinessID Multi Domain, - True BusinessID with EV Multi Domain, Secure Site, - Secure Site Pro, Secure Site with EV, - Secure Site Pro with EV, EssentialSSL, EssentialSSL Wildcard, - InstantSSL Pro, PremiumSSL Wildcard, EV SSL, EV SSL SGC, - SSL123, SSL Web Server, SGC Supercert, SSL Webserver EV, - EV Multi Domain SSL, Multi Domain SSL, - PositiveSSL Multi Domain, Unified Communications + certificate_type + Type of SSL Certificate. Possible values include: - Optional parameters: - promotional_code - string Promotional (coupon) code for the certificate + - EV Multi Domain SSL + - EV SSL + - EV SSL SGC + - EssentialSSL + - EssentialSSL Wildcard + - InstantSSL + - InstantSSL Pro + - Multi Domain SSL + - PositiveSSL + - PositiveSSL Multi Domain + - PositiveSSL Wildcard + - PremiumSSL + - PremiumSSL Wildcard + - QuickSSL Premium + - RapidSSL + - RapidSSL Wildcard + - SGC Supercert + - SSL Web Server + - SSL Webserver EV + - SSL123 + - Secure Site + - Secure Site Pro + - Secure Site Pro with EV + - Secure Site with EV + - True BusinessID + - True BusinessID Multi Domain + - True BusinessID Wildcard + - True BusinessID with EV + - True BusinessID with EV Multi Domain + - Unified Communications - sans_to_add - integer This parameter defines the number of add-on domains to be purchased in - addition to the default number of domains included with a multi-domain - certificate. Each certificate that supports SANs has the default number - of domains included. You may check the default number of domains - included and the maximum number of domains that can be added to it - in the table below. - Default: 0 --------------------------------------------------------------------------------- -Provider Product name Default number of Maximum number of Maximum number - domains (domain from total domains of domains - CSR is counted here) that can be - passed in - SANStoADD - parameter --------------------------------------------------------------------------------- -Comodo PositiveSSL 3 100 97 - Multi-Domain --------------------------------------------------------------------------------- -Comodo Multi-Domain 3 100 97 - SSL --------------------------------------------------------------------------------- -Comodo EV Multi- 3 100 97 - Domain SSL --------------------------------------------------------------------------------- -Comodo Unified 3 100 97 - Communications --------------------------------------------------------------------------------- -GeoTrust QuickSSL 1 1 domain + The only - Premium 4 subdomains supported - value is 4 --------------------------------------------------------------------------------- -GeoTrust True 5 25 20 - BusinessID - with EV - Multi-Domain --------------------------------------------------------------------------------- -GeoTrust True Business 5 25 20 - ID Multi- - Domain --------------------------------------------------------------------------------- -Thawte SSL Web 1 25 24 - Server --------------------------------------------------------------------------------- -Thawte SSL Web 1 25 24 - Server with - EV --------------------------------------------------------------------------------- -Thawte SGC Supercerts 1 25 24 --------------------------------------------------------------------------------- -Symantec Secure Site 1 25 24 - Pro with EV --------------------------------------------------------------------------------- -Symantec Secure Site 1 25 24 - with EV --------------------------------------------------------------------------------- -Symantec Secure Site 1 25 24 --------------------------------------------------------------------------------- -Symantec Secure Site 1 25 24 - Pro --------------------------------------------------------------------------------- + promotional_code + An optional promo code to use when creating the certificate + + sans_to_add : 0 + This parameter defines the number of add-on domains to be purchased in + addition to the default number of domains included with a multi-domain + certificate. Each certificate that supports SANs has the default number + of domains included. You may check the default number of domains + included and the maximum number of domains that can be added to it in + the table below. + + +----------+----------------+----------------------+-------------------+----------------+ + | Provider | Product name | Default number of | Maximum number of | Maximum number | + | | | domains (domain from | total domains | of domains | + | | | CSR is counted here) | | that can be | + | | | | | passed in | + | | | | | sans_to_add | + | | | | | parameter | + +----------+----------------+----------------------+-------------------+----------------+ + | Comodo | PositiveSSL | 3 | 100 | 97 | + | | Multi-Domain | | | | + +----------+----------------+----------------------+-------------------+----------------+ + | Comodo | Multi-Domain | 3 | 100 | 97 | + | | SSL | | | | + +----------+----------------+----------------------+-------------------+----------------+ + | Comodo | EV Multi- | 3 | 100 | 97 | + | | Domain SSL | | | | + +----------+----------------+----------------------+-------------------+----------------+ + | Comodo | Unified | 3 | 100 | 97 | + | | Communications | | | | + +----------+----------------+----------------------+-------------------+----------------+ + | GeoTrust | QuickSSL | 1 | 1 domain + | The only | + | | Premium | | 4 subdomains | supported | + | | | | | value is 4 | + +----------+----------------+----------------------+-------------------+----------------+ + | GeoTrust | True | 5 | 25 | 20 | + | | BusinessID | | | | + | | with EV | | | | + | | Multi-Domain | | | | + +----------+----------------+----------------------+-------------------+----------------+ + | GeoTrust | True Business | 5 | 25 | 20 | + | | ID Multi- | | | | + | | Domain | | | | + +----------+----------------+----------------------+-------------------+----------------+ + | Thawte | SSL Web | 1 | 25 | 24 | + | | Server | | | | + +----------+----------------+----------------------+-------------------+----------------+ + | Thawte | SSL Web | 1 | 25 | 24 | + | | Server with | | | | + | | EV | | | | + +----------+----------------+----------------------+-------------------+----------------+ + | Thawte | SGC Supercerts | 1 | 25 | 24 | + +----------+----------------+----------------------+-------------------+----------------+ + | Symantec | Secure Site | 1 | 25 | 24 | + | | Pro with EV | | | | + +----------+----------------+----------------------+-------------------+----------------+ + | Symantec | Secure Site | 1 | 25 | 24 | + | | with EV | | | | + +----------+----------------+----------------------+-------------------+----------------+ + | Symantec | Secure Site | 1 | 25 | 24 | + +----------+----------------+----------------------+-------------------+----------------+ + | Symantec | Secure Site | 1 | 25 | 24 | + | | Pro | | | | + +----------+----------------+----------------------+-------------------+----------------+ CLI Example: @@ -533,34 +590,48 @@ Symantec Secure Site 1 25 24 def parse_csr(csr_file, certificate_type, http_dc_validation=False): ''' - Parses the CSR + Parses the CSR. Returns a dictionary of result values. - returns a dictionary of result values + csr_file + Path to Certificate Signing Request file - Required parameters: + certificate_type + Type of SSL Certificate. Possible values include: - csr_file - string Certificate Signing Request File + - EV Multi Domain SSL + - EV SSL + - EV SSL SGC + - EssentialSSL + - EssentialSSL Wildcard + - InstantSSL + - InstantSSL Pro + - Multi Domain SSL + - PositiveSSL + - PositiveSSL Multi Domain + - PositiveSSL Wildcard + - PremiumSSL + - PremiumSSL Wildcard + - QuickSSL Premium + - RapidSSL + - RapidSSL Wildcard + - SGC Supercert + - SSL Web Server + - SSL Webserver EV + - SSL123 + - Secure Site + - Secure Site Pro + - Secure Site Pro with EV + - Secure Site with EV + - True BusinessID + - True BusinessID Multi Domain + - True BusinessID Wildcard + - True BusinessID with EV + - True BusinessID with EV Multi Domain + - Unified Communications - certificate_type - string Type of SSL Certificate, - Possible Values: QuickSSL Premium, RapidSSL, RapidSSL Wildcard, - PremiumSSL, InstantSSL, PositiveSSL, PositiveSSL Wildcard, - True BusinessID with EV, True BusinessID, - True BusinessID Wildcard, True BusinessID Multi Domain, - True BusinessID with EV Multi Domain, Secure Site, - Secure Site Pro, Secure Site with EV, - Secure Site Pro with EV, EssentialSSL, EssentialSSL Wildcard, - InstantSSL Pro, PremiumSSL Wildcard, EV SSL, EV SSL SGC, - SSL123, SSL Web Server, SGC Supercert, SSL Webserver EV, - EV Multi Domain SSL, Multi Domain SSL, - PositiveSSL Multi Domain, Unified Communications - - Optional parameter: - - http_dc_validation - bool True if a Comodo certificate and validation should be done with files - instead of emails and to return the info to do so + http_dc_validation : False + Set to ``True`` if a Comodo certificate and validation should be + done with files instead of emails and to return the info to do so CLI Example: @@ -626,32 +697,35 @@ def get_list(**kwargs): ''' Returns a list of SSL certificates for a particular user - Optional parameters: + ListType : All + Possible values: - ListType - string Possible values: All,Processing,EmailSent, - TechnicalProblem,InProgress,Completed, - Deactivated,Active,Cancelled,NewPurchase, - NewRenewal - Default: All + - All + - Processing + - EmailSent + - TechnicalProblem + - InProgress + - Completed + - Deactivated + - Active + - Cancelled + - NewPurchase + - NewRenewal SearchTerm - string Keyword to look for on the SSL list + Keyword to look for on the SSL list - Page - integer Page to return - Default: 1 + Page : 1 + Page number to return - PageSize - integer Total number of SSL certificates to display in a page - Minimum value is 10 and maximum value is 100 - Default: 20 + PageSize : 20 + Total number of SSL certificates to display per page (minimum: + ``10``, maximum: ``100``) SoryBy - string Possible values are PURCHASEDATE,PURCHASEDATE_DESC, - SSLTYPE,SSLTYPE_DESC, - EXPIREDATETIME,EXPIREDATETIME_DESC, - Host_Name,Host_Name_DESC + One of ``PURCHASEDATE``, ``PURCHASEDATE_DESC``, ``SSLTYPE``, + ``SSLTYPE_DESC``, ``EXPIREDATETIME``, ``EXPIREDATETIME_DESC``, + ``Host_Name``, or ``Host_Name_DESC`` CLI Example: @@ -680,22 +754,25 @@ def get_list(**kwargs): def get_info(certificate_id, returncertificate=False, returntype=None): ''' - Retrieves information about the requested SSL certificate + Retrieves information about the requested SSL certificate. Returns a + dictionary of information about the SSL certificate with two keys: - returns a dictionary of information about the SSL certificate with two keys - "ssl" contains the metadata information - "certificate" contains the details for the certificate like - the CSR, Approver, and certificate data + - **ssl** - Contains the metadata information + - **certificate** - Contains the details for the certificate such as the + CSR, Approver, and certificate data certificate_id - integer Unique ID of the SSL certificate + Unique ID of the SSL certificate - returncertificate - bool True to ask for the certificate in response + returncertificate : False + Set to ``True`` to ask for the certificate in response returntype - string Type of returned certificate. Parameter takes "Individual (for X.509 format) or PKCS7" - Required if returncertificate is True + Optional type for the returned certificate. Can be either "Individual" + (for X.509 format) or "PKCS7" + + .. note:: + Required if ``returncertificate`` is ``True`` CLI Example: diff --git a/salt/modules/namecheap_users.py b/salt/modules/namecheap_users.py index 9dd39ea4ec..543674b3e0 100644 --- a/salt/modules/namecheap_users.py +++ b/salt/modules/namecheap_users.py @@ -1,44 +1,30 @@ # -*- coding: utf-8 -*- ''' -Namecheap users management +Namecheap User Management - .. versionadded:: 2017.7.0 +.. versionadded:: 2017.7.0 - General Notes - ------------- +Prerequisites +------------- - Use this module to manage users through the namecheap - api. The Namecheap settings will be set in grains. +This module uses the ``requests`` Python module to communicate to the namecheap +API. - Installation Prerequisites - -------------------------- +Configuration +------------- - - This module uses the following python libraries to communicate to - the namecheap API: +The Namecheap username, API key and URL should be set in the minion configuration +file, or in the Pillar data. - * ``requests`` - .. code-block:: bash - - pip install requests - - - As saltstack depends on ``requests`` this shouldn't be a problem - - Prerequisite Configuration - -------------------------- - - - The namecheap username, api key and url should be set in a minion - configuration file or pillar - - .. code-block:: yaml - - namecheap.name: companyname - namecheap.key: a1b2c3d4e5f67a8b9c0d1e2f3 - namecheap.client_ip: 162.155.30.172 - #Real url - namecheap.url: https://api.namecheap.com/xml.response - #Sandbox url - #namecheap.url: https://api.sandbox.namecheap.xml.response +.. code-block:: yaml + namecheap.name: companyname + namecheap.key: a1b2c3d4e5f67a8b9c0d1e2f3 + namecheap.client_ip: 162.155.30.172 + #Real url + namecheap.url: https://api.namecheap.com/xml.response + #Sandbox url + #namecheap.url: https://api.sandbox.namecheap.xml.response ''' from __future__ import absolute_import, print_function, unicode_literals @@ -62,13 +48,14 @@ def __virtual__(): def get_balances(): ''' - Gets information about fund in the user's account. This method returns the following information: - Available Balance, Account Balance, Earned Amount, Withdrawable Amount and Funds Required for AutoRenew. + Gets information about fund in the user's account. This method returns the + following information: Available Balance, Account Balance, Earned Amount, + Withdrawable Amount and Funds Required for AutoRenew. - NOTE: If a domain setup with automatic renewal is expiring within the next 90 days, - the FundsRequiredForAutoRenew attribute shows the amount needed in your Namecheap account to complete auto renewal. - - returns a dictionary of the results + .. note:: + If a domain setup with automatic renewal is expiring within the next 90 + days, the FundsRequiredForAutoRenew attribute shows the amount needed + in your Namecheap account to complete auto renewal. CLI Example: @@ -91,11 +78,11 @@ def check_balances(minimum=100): ''' Checks if the provided minimum value is present in the user's account. - Returns a boolean. Returns ``False`` if the user's account balance is less than the - provided minimum or ``True`` if greater than the minimum. + Returns a boolean. Returns ``False`` if the user's account balance is less + than the provided minimum or ``True`` if greater than the minimum. - minimum - The value to check. Defaults to ``100``. + minimum : 100 + The value to check CLI Example: diff --git a/salt/modules/napalm.py b/salt/modules/napalm.py index 40e1ab66ca..5ade9efd30 100644 --- a/salt/modules/napalm.py +++ b/salt/modules/napalm.py @@ -7,10 +7,10 @@ Helpers for the NAPALM modules. .. versionadded:: 2017.7.0 ''' - from __future__ import absolute_import, unicode_literals, print_function # Import python stdlib +import inspect import logging log = logging.getLogger(__file__) @@ -20,6 +20,24 @@ from salt.utils.napalm import proxy_napalm_wrap # Import Salt modules from salt.ext import six +from salt.exceptions import CommandExecutionError +try: + from netmiko import BaseConnection + HAS_NETMIKO = True +except ImportError: + HAS_NETMIKO = False + +try: + import napalm.base.netmiko_helpers + HAS_NETMIKO_HELPERS = True +except ImportError: + HAS_NETMIKO_HELPERS = False + +try: + import jxmlease # pylint: disable=unused-import + HAS_JXMLEASE = True +except ImportError: + HAS_JXMLEASE = False # ---------------------------------------------------------------------------------------------------------------------- # module properties @@ -44,6 +62,86 @@ def __virtual__(): # helper functions -- will not be exported # ---------------------------------------------------------------------------------------------------------------------- + +def _get_netmiko_args(optional_args): + ''' + Check for Netmiko arguments that were passed in as NAPALM optional arguments. + + Return a dictionary of these optional args that will be passed into the + Netmiko ConnectHandler call. + + .. note:: + + This is a port of the NAPALM helper for backwards compatibility with + older versions of NAPALM, and stability across Salt features. + If the netmiko helpers module is available however, it will prefer that + implementation nevertheless. + ''' + if HAS_NETMIKO_HELPERS: + return napalm.base.netmiko_helpers.netmiko_args(optional_args) + # Older version don't have the netmiko_helpers module, the following code is + # simply a port from the NAPALM code base, for backwards compatibility: + # https://github.com/napalm-automation/napalm/blob/develop/napalm/base/netmiko_helpers.py + netmiko_args, _, _, netmiko_defaults = inspect.getargspec(BaseConnection.__init__) + check_self = netmiko_args.pop(0) + if check_self != 'self': + raise ValueError('Error processing Netmiko arguments') + netmiko_argument_map = dict(six.moves.zip(netmiko_args, netmiko_defaults)) + # Netmiko arguments that are integrated into NAPALM already + netmiko_filter = ['ip', 'host', 'username', 'password', 'device_type', 'timeout'] + # Filter out all of the arguments that are integrated into NAPALM + for k in netmiko_filter: + netmiko_argument_map.pop(k) + # Check if any of these arguments were passed in as NAPALM optional_args + netmiko_optional_args = {} + for k, v in six.iteritems(netmiko_argument_map): + try: + netmiko_optional_args[k] = optional_args[k] + except KeyError: + pass + # Return these arguments for use with establishing Netmiko SSH connection + return netmiko_optional_args + + +def _inject_junos_proxy(napalm_device): + ''' + Inject the junos.conn key into the __proxy__, reusing the existing NAPALM + connection to the Junos device. + ''' + def _ret_device(): + return napalm_device['DRIVER'].device + __proxy__['junos.conn'] = _ret_device + # Injecting the junos.conn key into the __proxy__ object, we can then + # access the features that already exist into the junos module, as long + # as the rest of the dependencies are installed (jxmlease). + # junos-eznc is already installed, as part of NAPALM, and the napalm + # driver for junos already makes use of the Device class from this lib. + # So pointing the __proxy__ object to this object already loaded into + # memory, we can go and re-use the features from the existing junos + # Salt module. + + +def _junos_prep_fun(napalm_device): + ''' + Prepare the Junos function. + ''' + if __grains__['os'] != 'junos': + return { + 'out': None, + 'result': False, + 'comment': 'This function is only available on Junos' + } + if not HAS_JXMLEASE: + return { + 'out': None, + 'result': False, + 'comment': 'Please install jxmlease (``pip install jxmlease``) to be able to use this function.' + } + _inject_junos_proxy(napalm_device) + return { + 'result': True + } + # ---------------------------------------------------------------------------------------------------------------------- # callable functions # ---------------------------------------------------------------------------------------------------------------------- @@ -169,20 +267,66 @@ def call(method, *args, **kwargs): @proxy_napalm_wrap -def compliance_report(filepath, **kwargs): +def compliance_report(filepath=None, + string=None, + renderer='jinja|yaml', + **kwargs): ''' Return the compliance report. filepath The absolute path to the validation file. + .. versionchanged:: Fluorine + + Beginning with release codename ``Fluorine``, this function has been + enhanced, to be able to leverage the multi-engine template rendering + of Salt, besides the possibility to retrieve the file source from + remote systems, the URL schemes supported being: + + - ``salt://`` + - ``http://`` and ``https://`` + - ``ftp://`` + - ``s3://`` + - ``swift:/`` + + Or on the local file system (on the Minion). + + .. note:: + + The rendering result does not necessarily need to be YAML, instead + it can be any format interpreted by Salt's rendering pipeline + (including pure Python). + + string + + .. versionchanged:: Fluorine + + The compliance report send as inline string, to be used as the file to + send through the renderer system. Note, not all renderer modules can + work with strings; the 'py' renderer requires a file, for example. + + renderer: ``jinja|yaml`` + + .. versionchanged:: Fluorine + + The renderer pipe to send the file through; this is overridden by a + "she-bang" at the top of the file. + + kwargs + + .. versionchanged:: Fluorine + + Keyword args to pass to Salt's compile_template() function. + CLI Example: .. code-block:: bash salt '*' napalm.compliance_report ~/validate.yml + salt '*' napalm.compliance_report salt://path/to/validator.sls - Validation File Example: + Validation File Example (pure YAML): .. code-block:: yaml @@ -191,10 +335,24 @@ def compliance_report(filepath, **kwargs): - get_interfaces_ip: Management1: - ipv4: - 10.0.2.14: - prefix_length: 24 - _mode: strict + ipv4: + 10.0.2.14: + prefix_length: 24 + _mode: strict + + Validation File Example (as Jinja + YAML): + + .. code-block:: yaml + + - get_facts: + os_version: {{ grains.version }} + - get_interfaces_ip: + Loopback0: + ipv4: + {{ grains.lo0.ipv4 }}: + prefix_length: 24 + _mode: strict + - get_bgp_neighbors: {{ pillar.bgp.neighbors }} Output Example: @@ -236,8 +394,534 @@ def compliance_report(filepath, **kwargs): result: True ''' + validation_string = __salt__['slsutil.renderer'](path=filepath, + string=string, + default_renderer=renderer, + **kwargs) return salt.utils.napalm.call( napalm_device, # pylint: disable=undefined-variable 'compliance_report', - validation_file=filepath + validation_source=validation_string ) + + +@proxy_napalm_wrap +def netmiko_args(**kwargs): + ''' + .. versionadded:: Fluorine + + Return the key-value arguments used for the authentication arguments for + the netmiko module. + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.netmiko_args + ''' + if not HAS_NETMIKO: + raise CommandExecutionError('Please install netmiko to be able to use this feature.') + kwargs = {} + napalm_opts = salt.utils.napalm.get_device_opts(__opts__, salt_obj=__salt__) + optional_args = napalm_opts['OPTIONAL_ARGS'] + netmiko_args = _get_netmiko_args(optional_args) + kwargs['host'] = napalm_opts['HOSTNAME'] + kwargs['username'] = napalm_opts['USERNAME'] + kwargs['password'] = napalm_opts['PASSWORD'] + kwargs['timeout'] = napalm_opts['TIMEOUT'] + kwargs.update(netmiko_args) + netmiko_device_type_map = { + 'junos': 'juniper_junos', + 'ios': 'cisco_ios', + 'iosxr': 'cisco_xr', + 'eos': 'arista_eos', + 'nxos_ssh': 'cisco_nxos', + 'asa': 'cisco_asa', + 'fortios': 'fortinet', + 'panos': 'paloalto_panos', + 'aos': 'alcatel_aos', + 'vyos': 'vyos' + } + # If you have a device type that is not listed here, please submit a PR + # to add it, and/or add the map into your opts/Pillar: netmiko_device_type_map + # Example: + # + # netmiko_device_type_map: + # junos: juniper_junos + # ios: cisco_ios + # + #etc. + netmiko_device_type_map.update(__salt__['config.get']('netmiko_device_type_map', {})) + kwargs['device_type'] = netmiko_device_type_map[__grains__['os']] + return kwargs + + +@proxy_napalm_wrap +def netmiko_fun(fun, *args, **kwargs): + ''' + .. versionadded:: Fluorine + + Call an arbitrary function from the :mod:`Netmiko` + module, passing the authentication details from the existing NAPALM + connection. + + fun + The name of the function from the :mod:`Netmiko` + to invoke. + + args + List of arguments to send to the execution function specified in + ``fun``. + + kwargs + Key-value arguments to send to the execution function specified in + ``fun``. + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.netmiko_fun send_command 'show version' + ''' + if 'netmiko.' not in fun: + fun = 'netmiko.{fun}'.format(fun=fun) + netmiko_kwargs = netmiko_args() + kwargs.update(netmiko_kwargs) + return __salt__[fun](*args, **kwargs) + + +@proxy_napalm_wrap +def netmiko_call(method, *args, **kwargs): + ''' + .. versionadded:: Fluorine + + Execute an arbitrary Netmiko method, passing the authentication details from + the existing NAPALM connection. + + method + The name of the Netmiko method to execute. + + args + List of arguments to send to the Netmiko method specified in ``method``. + + kwargs + Key-value arguments to send to the execution function specified in + ``method``. + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.netmiko_call send_command 'show version' + ''' + netmiko_kwargs = netmiko_args() + kwargs.update(netmiko_kwargs) + return __salt__['netmiko.call'](method, *args, **kwargs) + + +@proxy_napalm_wrap +def netmiko_multi_call(*methods, **kwargs): + ''' + .. versionadded:: Fluorine + + Execute a list of arbitrary Netmiko methods, passing the authentication + details from the existing NAPALM connection. + + methods + List of dictionaries with the following keys: + + - ``name``: the name of the Netmiko function to invoke. + - ``args``: list of arguments to send to the ``name`` method. + - ``kwargs``: key-value arguments to send to the ``name`` method. + + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.netmiko_multi_call "{'name': 'send_command', 'args': ['show version']}" "{'name': 'send_command', 'args': ['show interfaces']}" + ''' + netmiko_kwargs = netmiko_args() + kwargs.update(netmiko_kwargs) + return __salt__['netmiko.multi_call'](*methods, **kwargs) + + +@proxy_napalm_wrap +def netmiko_commands(*commands, **kwargs): + ''' + .. versionadded:: Fluorine + + Invoke one or more commands to be executed on the remote device, via Netmiko. + Returns a list of strings, with the output from each command. + + commands + A list of commands to be executed. + + expect_string + Regular expression pattern to use for determining end of output. + If left blank will default to being based on router prompt. + + delay_factor: ``1`` + Multiplying factor used to adjust delays (default: ``1``). + + max_loops: ``500`` + Controls wait time in conjunction with delay_factor. Will default to be + based upon self.timeout. + + auto_find_prompt: ``True`` + Whether it should try to auto-detect the prompt (default: ``True``). + + strip_prompt: ``True`` + Remove the trailing router prompt from the output (default: ``True``). + + strip_command: ``True`` + Remove the echo of the command from the output (default: ``True``). + + normalize: ``True`` + Ensure the proper enter is sent at end of command (default: ``True``). + + use_textfsm: ``False`` + Process command output through TextFSM template (default: ``False``). + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.netmiko_commands 'show version' 'show interfaces' + ''' + conn = netmiko_conn(**kwargs) + ret = [] + for cmd in commands: + ret.append(conn.send_command(cmd)) + return ret + + +@proxy_napalm_wrap +def netmiko_config(*config_commands, **kwargs): + ''' + .. versionadded:: Fluorine + + Load a list of configuration commands on the remote device, via Netmiko. + + .. warning:: + + Please remember that ``netmiko`` does not have any rollback safeguards + and any configuration change will be directly loaded into the running + config if the platform doesn't have the concept of ``candidate`` config. + + On Junos, or other platforms that have this capability, the changes will + not be loaded into the running config, and the user must set the + ``commit`` argument to ``True`` to transfer the changes from the + candidate into the running config before exiting. + + config_commands + A list of configuration commands to be loaded on the remote device. + + config_file + Read the configuration commands from a file. The file can equally be a + template that can be rendered using the engine of choice (see + ``template_engine``). + + This can be specified using the absolute path to the file, or using one + of the following URL schemes: + + - ``salt://``, to fetch the file from the Salt fileserver. + - ``http://`` or ``https://`` + - ``ftp://`` + - ``s3://`` + - ``swift://`` + + exit_config_mode: ``True`` + Determines whether or not to exit config mode after complete. + + delay_factor: ``1`` + Factor to adjust delays. + + max_loops: ``150`` + Controls wait time in conjunction with delay_factor (default: ``150``). + + strip_prompt: ``False`` + Determines whether or not to strip the prompt (default: ``False``). + + strip_command: ``False`` + Determines whether or not to strip the command (default: ``False``). + + config_mode_command + The command to enter into config mode. + + commit: ``False`` + Commit the configuration changes before exiting the config mode. This + option is by default disabled, as many platforms don't have this + capability natively. + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.netmiko_config 'set system ntp peer 1.2.3.4' commit=True + salt '*' napalm.netmiko_config https://bit.ly/2sgljCB + ''' + netmiko_kwargs = netmiko_args() + kwargs.update(netmiko_kwargs) + return __salt__['netmiko.send_config'](config_commands=config_commands, + **kwargs) + + +@proxy_napalm_wrap +def netmiko_conn(**kwargs): + ''' + .. versionadded:: Fluorine + + Return the connection object with the network device, over Netmiko, passing + the authentication details from the existing NAPALM connection. + + .. warning:: + + This function is not suitable for CLI usage, more rather to be used + in various Salt modules. + + USAGE Example: + + .. code-block:: python + + conn = __salt__['napalm.netmiko_conn']() + res = conn.send_command('show interfaces') + conn.disconnect() + ''' + netmiko_kwargs = netmiko_args() + kwargs.update(netmiko_kwargs) + return __salt__['netmiko.get_connection'](**kwargs) + + +@proxy_napalm_wrap +def junos_rpc(cmd=None, dest=None, format=None, **kwargs): + ''' + .. versionadded:: Fluorine + + Execute an RPC request on the remote Junos device. + + cmd + The RPC request to the executed. To determine the RPC request, you can + check the from the command line of the device, by executing the usual + command followed by ``| display xml rpc``, e.g., + ``show lldp neighbors | display xml rpc``. + + dest + Destination file where the RPC output is stored. Note that the file will + be stored on the Proxy Minion. To push the files to the Master, use + :mod:`cp.push ` Execution function. + + format: ``xml`` + The format in which the RPC reply is received from the device. + + dev_timeout: ``30`` + The NETCONF RPC timeout. + + filter + Used with the ``get-config`` RPC request to filter out the config tree. + + terse: ``False`` + Whether to return terse output. + + .. note:: + + Some RPC requests may not support this argument. + + interface_name + Name of the interface to query. + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.junos_rpc get-lldp-neighbors-information + salt '*' napalm.junos_rcp get-config + ''' + prep = _junos_prep_fun(napalm_device) # pylint: disable=undefined-variable + if not prep['result']: + return prep + if not format: + format = 'xml' + rpc_ret = __salt__['junos.rpc'](cmd=cmd, + dest=dest, + format=format, + **kwargs) + rpc_ret['comment'] = rpc_ret.pop('message', '') + rpc_ret['result'] = rpc_ret.pop('out', False) + rpc_ret['out'] = rpc_ret.pop('rpc_reply', None) + # The comment field is "message" in the Junos module + return rpc_ret + + +@proxy_napalm_wrap +def junos_install_os(path=None, **kwargs): + ''' + .. versionadded:: Fluorine + + Installs the given image on the device. + + path + The image file source. This argument supports the following URIs: + + - Absolute path on the Minion. + - ``salt://`` to fetch from the Salt fileserver. + - ``http://`` and ``https://`` + - ``ftp://`` + - ``swift:/`` + - ``s3://`` + + dev_timeout: ``30`` + The NETCONF RPC timeout (in seconds) + + reboot: ``False`` + Whether to reboot the device after the installation is complete. + + no_copy: ``False`` + If ``True`` the software package will not be copied to the remote + device. + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.junos_install_os salt://images/junos_16_1.tgz reboot=True + ''' + prep = _junos_prep_fun(napalm_device) # pylint: disable=undefined-variable + if not prep['result']: + return prep + return __salt__['junos.install_os'](path=path, **kwargs) + + +@proxy_napalm_wrap +def junos_facts(**kwargs): + ''' + .. versionadded:: Fluorine + + The complete list of Junos facts collected by ``junos-eznc``. + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.junos_facts + ''' + prep = _junos_prep_fun(napalm_device) # pylint: disable=undefined-variable + if not prep['result']: + return prep + facts = dict(napalm_device['DRIVER'].device.facts) # pylint: disable=undefined-variable + if 'version_info' in facts: + facts['version_info'] = \ + dict(facts['version_info']) + # For backward compatibility. 'junos_info' is present + # only of in newer versions of facts. + if 'junos_info' in facts: + for re in facts['junos_info']: + facts['junos_info'][re]['object'] = \ + dict(facts['junos_info'][re]['object']) + return facts + + +@proxy_napalm_wrap +def junos_cli(command, format=None, dev_timeout=None, dest=None, **kwargs): + ''' + .. versionadded:: Fluorine + + Execute a CLI command and return the output in the specified format. + + command + The command to execute on the Junos CLI. + + format: ``text`` + Format in which to get the CLI output (either ``text`` or ``xml``). + + dev_timeout: ``30`` + The NETCONF RPC timeout (in seconds). + + dest + Destination file where the RPC output is stored. Note that the file will + be stored on the Proxy Minion. To push the files to the Master, use + :mod:`cp.push `. + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.junos_cli 'show lldp neighbors' + ''' + prep = _junos_prep_fun(napalm_device) # pylint: disable=undefined-variable + if not prep['result']: + return prep + return __salt__['junos.cli'](command, + format=format, + dev_timeout=dev_timeout, + dest=dest, + **kwargs) + + +@proxy_napalm_wrap +def junos_copy_file(src, dst, **kwargs): + ''' + .. versionadded:: Fluorine + + Copies the file on the remote Junos device. + + src + The source file path. This argument accepts the usual Salt URIs (e.g., + ``salt://``, ``http://``, ``https://``, ``s3://``, ``ftp://``, etc.). + + dst + The destination path on the device where to copy the file. + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.junos_copy_file https://example.com/junos.cfg /var/tmp/myjunos.cfg + ''' + prep = _junos_prep_fun(napalm_device) # pylint: disable=undefined-variable + if not prep['result']: + return prep + cached_src = __salt__['cp.cache_file'](src) + return __salt__['junos.file_copy'](cached_src, dst) + + +@proxy_napalm_wrap +def junos_call(fun, *args, **kwargs): + ''' + .. versionadded:: Fluorine + + Execute an arbitrary function from the + :mod:`junos execution module `. To check what ``args`` + and ``kwargs`` you must send to the function, please consult the appropriate + documentation. + + fun + The name of the function. E.g., ``set_hostname``. + + args + List of arguments to send to the ``junos`` function invoked. + + kwargs + Dictionary of key-value arguments to send to the ``juno`` function + invoked. + + CLI Example: + + .. code-block:: bash + + salt '*' napalm.junos_fun cli 'show system commit' + ''' + prep = _junos_prep_fun(napalm_device) # pylint: disable=undefined-variable + if not prep['result']: + return prep + if 'junos.' not in fun: + mod_fun = 'junos.{}'.format(fun) + else: + mod_fun = fun + if mod_fun not in __salt__: + return { + 'out': None, + 'result': False, + 'comment': '{} is not a valid function'.format(fun) + } + return __salt__[mod_fun](*args, **kwargs) diff --git a/salt/modules/napalm_acl.py b/salt/modules/napalm_acl.py index e6de0cf02d..ce56572d4a 100644 --- a/salt/modules/napalm_acl.py +++ b/salt/modules/napalm_acl.py @@ -210,13 +210,13 @@ def load_term_config(filter_name, select a source just using the name, instead of specifying a destination_port and protocol. Allows the same options as ``source_service``. - **term_fields - Term attributes. - To see what fields are supported, please consult the list of supported keywords_. - Some platforms have few other optional_ keywords. + term_fields + Term attributes. To see what fields are supported, please consult the + list of supported keywords_. Some platforms have a few other optional_ + keywords. - .. _keywords: https://github.com/google/capirca/wiki/Policy-format#keywords - .. _optional: https://github.com/google/capirca/wiki/Policy-format#optionally-supported-keywords + .. _keywords: https://github.com/google/capirca/wiki/Policy-format#keywords + .. _optional: https://github.com/google/capirca/wiki/Policy-format#optionally-supported-keywords .. note:: The following fields are accepted (some being platform-specific): @@ -347,8 +347,10 @@ def load_term_config(filter_name, .. code-block:: yaml source_port: - - [1000, 2000] - - [3000, 4000] + - - 1000 + - 2000 + - - 3000 + - 4000 With the configuration above, the user is able to select the 1000-2000 and 3000-4000 source port ranges. @@ -621,11 +623,14 @@ def load_filter_config(filter_name, - my-filter: terms: - my-term: - source_port: [1234, 1235] + source_port: + - 1234 + - 1235 action: reject - my-other-term: source_port: - - [5678, 5680] + - - 5678 + - 5680 protocol: tcp action: accept ''' @@ -749,7 +754,7 @@ def load_policy_config(filters=None, Output Example: - .. code-block:: yaml + .. code-block:: text edge01.flw01: ---------- @@ -803,7 +808,9 @@ def load_policy_config(filters=None, - my-filter: terms: - my-term: - source_port: [1234, 1235] + source_port: + - 1234 + - 1235 protocol: - tcp - udp diff --git a/salt/modules/napalm_bgp.py b/salt/modules/napalm_bgp.py index f3cc87112d..e6da8fcfc4 100644 --- a/salt/modules/napalm_bgp.py +++ b/salt/modules/napalm_bgp.py @@ -64,9 +64,11 @@ def config(group=None, neighbor=None, **kwargs): :param group: Name of the group selected to display the configuration. :param neighbor: IP Address of the neighbor to display the configuration. - If the group parameter is not specified, the neighbor setting will be ignored. - :return: A dictionary containing the BGP configuration from the network device. - The keys of the main dictionary are the group names. + If the group parameter is not specified, the neighbor setting will be + ignored. + + :return: A dictionary containing the BGP configuration from the network + device. The keys of the main dictionary are the group names. Each group has the following properties: @@ -174,45 +176,46 @@ def neighbors(neighbor=None, **kwargs): Provides details regarding the BGP sessions configured on the network device. :param neighbor: IP Address of a specific neighbor. - :return: A dictionary with the statistics of the all/selected BGP neighbors. - Outer dictionary keys represent the VRF name. - Keys of inner dictionary represent the AS numbers, while the values are lists of dictionaries, - having the following keys: - * up (True/False) - * local_as (int) - * remote_as (int) - * local_address (string) - * routing_table (string) - * local_address_configured (True/False) - * local_port (int) - * remote_address (string) - * remote_port (int) - * multihop (True/False) - * multipath (True/False) - * remove_private_as (True/False) - * import_policy (string) - * export_policy (string) - * input_messages (int) - * output_messages (int) - * input_updates (int) - * output_updates (int) - * messages_queued_out (int) - * connection_state (string) - * previous_connection_state (string) - * last_event (string) - * suppress_4byte_as (True/False) - * local_as_prepend (True/False) - * holdtime (int) - * configured_holdtime (int) - * keepalive (int) - * configured_keepalive (int) - * active_prefix_count (int) - * received_prefix_count (int) - * accepted_prefix_count (int) - * suppressed_prefix_count (int) - * advertised_prefix_count (int) - * flap_count (int) + :return: A dictionary with the statistics of the all/selected BGP + neighbors. Outer dictionary keys represent the VRF name. Keys of inner + dictionary represent the AS numbers, while the values are lists of + dictionaries, having the following keys: + + - up (True/False) + - local_as (int) + - remote_as (int) + - local_address (string) + - routing_table (string) + - local_address_configured (True/False) + - local_port (int) + - remote_address (string) + - remote_port (int) + - multihop (True/False) + - multipath (True/False) + - remove_private_as (True/False) + - import_policy (string) + - export_policy (string) + - input_messages (int) + - output_messages (int) + - input_updates (int) + - output_updates (int) + - messages_queued_out (int) + - connection_state (string) + - previous_connection_state (string) + - last_event (string) + - suppress_4byte_as (True/False) + - local_as_prepend (True/False) + - holdtime (int) + - configured_holdtime (int) + - keepalive (int) + - configured_keepalive (int) + - active_prefix_count (int) + - received_prefix_count (int) + - accepted_prefix_count (int) + - suppressed_prefix_count (int) + - advertised_prefix_count (int) + - flap_count (int) CLI Example: diff --git a/salt/modules/napalm_network.py b/salt/modules/napalm_network.py index 173b25193c..b8375fd845 100644 --- a/salt/modules/napalm_network.py +++ b/salt/modules/napalm_network.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' NAPALM Network -=============== +============== Basic methods for interaction with the network device through the virtual proxy 'napalm'. @@ -833,12 +833,12 @@ def ipaddrs(**kwargs): # pylint: disable=unused-argument ''' Returns IP addresses configured on the device. - - :return: A dictionary with the IPv4 and IPv6 addresses of the interfaces.\ - Returns all configured IP addresses on all interfaces as a dictionary of dictionaries.\ - Keys of the main dictionary represent the name of the interface.\ - Values of the main dictionary represent are dictionaries that may consist of two keys\ - 'ipv4' and 'ipv6' (one, both or none) which are themselvs dictionaries with the IP addresses as keys.\ + :return: A dictionary with the IPv4 and IPv6 addresses of the interfaces. + Returns all configured IP addresses on all interfaces as a dictionary + of dictionaries. Keys of the main dictionary represent the name of the + interface. Values of the main dictionary represent are dictionaries + that may consist of two keys 'ipv4' and 'ipv6' (one, both or none) + which are themselvs dictionaries with the IP addresses as keys. CLI Example: @@ -893,8 +893,8 @@ def interfaces(**kwargs): # pylint: disable=unused-argument ''' Returns details of the interfaces on the device. - :return: Returns a dictionary of dictionaries. \ - The keys for the first dictionary will be the interfaces in the devices. + :return: Returns a dictionary of dictionaries. The keys for the first + dictionary will be the interfaces in the devices. CLI Example: @@ -941,8 +941,9 @@ def lldp(interface='', **kwargs): # pylint: disable=unused-argument Returns a detailed view of the LLDP neighbors. :param interface: interface name to filter on - :return: A dictionary with the LLDL neighbors.\ - The keys are the interfaces with LLDP activated on. + + :return: A dictionary with the LLDL neighbors. The keys are the + interfaces with LLDP activated on. CLI Example: @@ -1074,19 +1075,18 @@ def config(source=None, **kwargs): # pylint: disable=unused-argument ''' .. versionadded:: 2017.7.0 - Return the whole configuration of the network device. - By default, it will return all possible configuration - sources supported by the network device. + Return the whole configuration of the network device. By default, it will + return all possible configuration sources supported by the network device. At most, there will be: - running config - startup config - candidate config - To return only one of the configurations, you can use - the ``source`` argument. + To return only one of the configurations, you can use the ``source`` + argument. - source (optional) + source Which configuration type you want to display, default is all of them. Options: @@ -1457,26 +1457,26 @@ def load_template(template_name, .. versionadded:: 2016.11.2 - **template_vars + template_vars Dictionary with the arguments/context to be used when the template is rendered. .. note:: - Do not explicitly specify this argument. - This represents any other variable that will be sent - to the template rendering system. + Do not explicitly specify this argument. This represents any other + variable that will be sent to the template rendering system. Please see the examples below! :return: a dictionary having the following keys: - * result (bool): if the config was applied successfully. It is ``False`` only in case of failure. In case \ - there are no changes to be applied and successfully performs all operations it is still ``True`` and so will be \ - the ``already_configured`` flag (example below) - * comment (str): a message for the user - * already_configured (bool): flag to check if there were no changes applied - * loaded_config (str): the configuration loaded on the device, after rendering the template. Requires ``debug`` \ - to be set as ``True`` - * diff (str): returns the config changes applied + - result (bool): if the config was applied successfully. It is ``False`` + only in case of failure. In case there are no changes to be applied and + successfully performs all operations it is still ``True`` and so will be + the ``already_configured`` flag (example below) + - comment (str): a message for the user + - already_configured (bool): flag to check if there were no changes applied + - loaded_config (str): the configuration loaded on the device, after + rendering the template. Requires ``debug`` to be set as ``True`` + - diff (str): returns the config changes applied The template can use variables from the ``grains``, ``pillar`` or ``opts``, for example: diff --git a/salt/modules/napalm_ntp.py b/salt/modules/napalm_ntp.py index abb43baa36..07a5456ec2 100644 --- a/salt/modules/napalm_ntp.py +++ b/salt/modules/napalm_ntp.py @@ -220,9 +220,11 @@ def set_peers(*peers, **options): Configures a list of NTP peers on the device. :param peers: list of IP Addresses/Domain Names - :param bool test: discard loaded config. By default `test` is False (will not dicard the changes) - :param bool commit: commit loaded config. By default `commit` is True (will commit the changes). Useful when - the user does not want to commit after each change, but after a couple. + :param test (bool): discard loaded config. By default ``test`` is False + (will not dicard the changes) + :commit commit (bool): commit loaded config. By default ``commit`` is True + (will commit the changes). Useful when the user does not want to commit + after each change, but after a couple. By default this function will commit the config changes (if any). To load without committing, use the `commit` option. For dry run use the `test` argument. @@ -248,14 +250,15 @@ def set_peers(*peers, **options): @proxy_napalm_wrap def set_servers(*servers, **options): - ''' Configures a list of NTP servers on the device. :param servers: list of IP Addresses/Domain Names - :param bool test: discard loaded config. By default `test` is False (will not dicard the changes) - :param bool commit: commit loaded config. By default `commit` is True (will commit the changes). Useful when - the user does not want to commit after each change, but after a couple. + :param test (bool): discard loaded config. By default ``test`` is False + (will not dicard the changes) + :commit commit (bool): commit loaded config. By default ``commit`` is True + (will commit the changes). Useful when the user does not want to commit + after each change, but after a couple. By default this function will commit the config changes (if any). To load without committing, use the `commit` option. For dry run use the `test` argument. @@ -286,12 +289,15 @@ def delete_peers(*peers, **options): Removes NTP peers configured on the device. :param peers: list of IP Addresses/Domain Names to be removed as NTP peers - :param bool test: discard loaded config. By default `test` is False (will not dicard the changes) - :param bool commit: commit loaded config. By default `commit` is True (will commit the changes). Useful when - the user does not want to commit after each change, but after a couple. + :param test (bool): discard loaded config. By default ``test`` is False + (will not dicard the changes) + :param commit (bool): commit loaded config. By default ``commit`` is True + (will commit the changes). Useful when the user does not want to commit + after each change, but after a couple. - By default this function will commit the config changes (if any). To load without committing, use the `commit` - option. For dry run use the `test` argument. + By default this function will commit the config changes (if any). To load + without committing, use the ``commit`` option. For a dry run, use the + ``test`` argument. CLI Example: @@ -318,13 +324,17 @@ def delete_servers(*servers, **options): ''' Removes NTP servers configured on the device. - :param servers: list of IP Addresses/Domain Names to be removed as NTP servers - :param bool test: discard loaded config. By default `test` is False (will not dicard the changes) - :param bool commit: commit loaded config. By default `commit` is True (will commit the changes). Useful when - the user does not want to commit after each change, but after a couple. + :param servers: list of IP Addresses/Domain Names to be removed as NTP + servers + :param test (bool): discard loaded config. By default ``test`` is False + (will not dicard the changes) + :param commit (bool): commit loaded config. By default ``commit`` is True + (will commit the changes). Useful when the user does not want to commit + after each change, but after a couple. - By default this function will commit the config changes (if any). To load without committing, use the `commit` - option. For dry run use the `test` argument. + By default this function will commit the config changes (if any). To load + without committing, use the ``commit`` option. For dry run use the ``test`` + argument. CLI Example: diff --git a/salt/modules/napalm_probes.py b/salt/modules/napalm_probes.py index 0db5b9f70f..5198ab94f3 100644 --- a/salt/modules/napalm_probes.py +++ b/salt/modules/napalm_probes.py @@ -178,26 +178,29 @@ def results(**kwargs): # pylint: disable=unused-argument @proxy_napalm_wrap def set_probes(probes, test=False, commit=True, **kwargs): # pylint: disable=unused-argument - ''' Configures RPM/SLA probes on the device. Calls the configuration template 'set_probes' from the NAPALM library, providing as input a rich formatted dictionary with the configuration details of the probes to be configured. :param probes: Dictionary formatted as the output of the function config() + :param test: Dry run? If set as True, will apply the config, discard and return the changes. Default: False - and will commit the changes on the device. - :param commit: Commit? (default: True) Sometimes it is not needed to commit the config immediately - after loading the changes. E.g.: a state loads a couple of parts (add / remove / update) - and would not be optimal to commit after each operation. - Also, from the CLI when the user needs to apply the similar changes before committing, - can specify commit=False and will not discard the config. + + :param commit: Commit? (default: True) Sometimes it is not needed to commit + the config immediately after loading the changes. E.g.: a state loads a + couple of parts (add / remove / update) and would not be optimal to + commit after each operation. Also, from the CLI when the user needs to + apply the similar changes before committing, can specify commit=False + and will not discard the config. + :raise MergeConfigException: If there is an error on the configuration sent. :return a dictionary having the following keys: - * result (bool): if the config was applied successfully. It is `False` only in case of failure. In case - there are no changes to be applied and successfully performs all operations it is still `True` and so will be - the `already_configured` flag (example below) + * result (bool): if the config was applied successfully. It is `False` + only in case of failure. In case there are no changes to be applied + and successfully performs all operations it is still `True` and so + will be the `already_configured` flag (example below) * comment (str): a message for the user * already_configured (bool): flag to check if there were no changes applied * diff (str): returns the config changes applied @@ -275,24 +278,27 @@ def delete_probes(probes, test=False, commit=True, **kwargs): # pylint: disable providing as input a rich formatted dictionary with the configuration details of the probes to be removed from the configuration of the device. - :param probes: Dictionary with a similar format as the output dictionary of the function config(), - where the details are not necessary. - :param test: Dry run? If set as True, will apply the config, discard and return the changes. Default: False - and will commit the changes on the device. - :param commit: Commit? (default: True) Sometimes it is not needed to commit the config immediately - after loading the changes. E.g.: a state loads a couple of parts (add / remove / update) - and would not be optimal to commit after each operation. - Also, from the CLI when the user needs to apply the similar changes before committing, - can specify commit=False and will not discard the config. - :raise MergeConfigException: If there is an error on the configuration sent. - :return a dictionary having the following keys: + :param probes: Dictionary with a similar format as the output dictionary of + the function config(), where the details are not necessary. + :param test: Dry run? If set as True, will apply the config, discard and + return the changes. Default: False + :param commit: Commit? (default: True) Sometimes it is not needed to commit + the config immediately after loading the changes. E.g.: a state loads a + couple of parts (add / remove / update) and would not be optimal to + commit after each operation. Also, from the CLI when the user needs to + apply the similar changes before committing, can specify commit=False + and will not discard the config. - * result (bool): if the config was applied successfully. It is `False` only in case of failure. In case - there are no changes to be applied and successfully performs all operations it is still `True` and so will be - the `already_configured` flag (example below) - * comment (str): a message for the user - * already_configured (bool): flag to check if there were no changes applied - * diff (str): returns the config changes applied + :raise MergeConfigException: If there is an error on the configuration sent. + :return: A dictionary having the following keys: + + - result (bool): if the config was applied successfully. It is `False` only + in case of failure. In case there are no changes to be applied and + successfully performs all operations it is still `True` and so will be + the `already_configured` flag (example below) + - comment (str): a message for the user + - already_configured (bool): flag to check if there were no changes applied + - diff (str): returns the config changes applied Input example: @@ -318,29 +324,34 @@ def delete_probes(probes, test=False, commit=True, **kwargs): # pylint: disable def schedule_probes(probes, test=False, commit=True, **kwargs): # pylint: disable=unused-argument ''' - Will schedule the probes. On Cisco devices, it is not enough to define the probes, it is also necessary - to schedule them. - This method calls the configuration template 'schedule_probes' from the NAPALM library, - providing as input a rich formatted dictionary with the names of the probes and the tests to be scheduled. + Will schedule the probes. On Cisco devices, it is not enough to define the + probes, it is also necessary to schedule them. + + This function calls the configuration template ``schedule_probes`` from the + NAPALM library, providing as input a rich formatted dictionary with the + names of the probes and the tests to be scheduled. + + :param probes: Dictionary with a similar format as the output dictionary of + the function config(), where the details are not necessary. + :param test: Dry run? If set as True, will apply the config, discard and + return the changes. Default: False + :param commit: Commit? (default: True) Sometimes it is not needed to commit + the config immediately after loading the changes. E.g.: a state loads a + couple of parts (add / remove / update) and would not be optimal to + commit after each operation. Also, from the CLI when the user needs to + apply the similar changes before committing, can specify commit=False + and will not discard the config. - :param probes: Dictionary with a similar format as the output dictionary of the function config(), - where the details are not necessary. - :param test: Dry run? If set as True, will apply the config, discard and return the changes. Default: False - and will commit the changes on the device. - :param commit: Commit? (default: True) Sometimes it is not needed to commit the config immediately - after loading the changes. E.g.: a state loads a couple of parts (add / remove / update) - and would not be optimal to commit after each operation. - Also, from the CLI when the user needs to apply the similar changes before committing, - can specify commit=False and will not discard the config. :raise MergeConfigException: If there is an error on the configuration sent. - :return a dictionary having the following keys: + :return: a dictionary having the following keys: - * result (bool): if the config was applied successfully. It is `False` only in case of failure. In case - there are no changes to be applied and successfully performs all operations it is still `True` and so will be - the `already_configured` flag (example below) - * comment (str): a message for the user - * already_configured (bool): flag to check if there were no changes applied - * diff (str): returns the config changes applied + - result (bool): if the config was applied successfully. It is `False` only + in case of failure. In case there are no changes to be applied and + successfully performs all operations it is still `True` and so will be + the `already_configured` flag (example below) + - comment (str): a message for the user + - already_configured (bool): flag to check if there were no changes applied + - diff (str): returns the config changes applied Input example: diff --git a/salt/modules/napalm_snmp.py b/salt/modules/napalm_snmp.py index 5486dd2d31..5fb2e8d84c 100644 --- a/salt/modules/napalm_snmp.py +++ b/salt/modules/napalm_snmp.py @@ -92,26 +92,35 @@ def remove_config(chassis_id=None, Removes a configuration element from the SNMP configuration. :param chassis_id: (optional) Chassis ID + :param community: (optional) A dictionary having the following optional keys: - * acl (if any policy / ACL need to be set) - * mode: rw or ro. Default: ro + + - acl (if any policy / ACL need to be set) + - mode: rw or ro. Default: ro + :param contact: Contact details + :param location: Location + :param test: Dry run? If set as True, will apply the config, discard and return the changes. Default: False - and will commit the changes on the device. - :param commit: Commit? (default: True) Sometimes it is not needed to commit the config immediately - after loading the changes. E.g.: a state loads a couple of parts (add / remove / update) - and would not be optimal to commit after each operation. - Also, from the CLI when the user needs to apply the similar changes before committing, - can specify commit=False and will not discard the config. + + :param commit: Commit? (default: True) Sometimes it is not needed to commit + the config immediately after loading the changes. E.g.: a state loads a + couple of parts (add / remove / update) and would not be optimal to + commit after each operation. Also, from the CLI when the user needs to + apply the similar changes before committing, can specify commit=False + and will not discard the config. + :raise MergeConfigException: If there is an error on the configuration sent. - :return a dictionary having the following keys: - * result (bool): if the config was applied successfully. It is `False` only in case of failure. In case - there are no changes to be applied and successfully performs all operations it is still `True` and so will be - the `already_configured` flag (example below) - * comment (str): a message for the user - * already_configured (bool): flag to check if there were no changes applied - * diff (str): returns the config changes applied + :return: A dictionary having the following keys: + + - result (bool): if the config was applied successfully. It is `False` + only in case of failure. In case there are no changes to be applied + and successfully performs all operations it is still `True` and so + will be the `already_configured` flag (example below) + - comment (str): a message for the user + - already_configured (bool): flag to check if there were no changes applied + - diff (str): returns the config changes applied CLI Example: @@ -153,12 +162,13 @@ def update_config(chassis_id=None, :param chassis_id: (optional) Chassis ID :param community: (optional) A dictionary having the following optional keys: - * acl (if any policy / ACL need to be set) - * mode: rw or ro. Default: ro + + - acl (if any policy / ACL need to be set) + - mode: rw or ro. Default: ro + :param contact: Contact details :param location: Location :param test: Dry run? If set as True, will apply the config, discard and return the changes. Default: False - and will commit the changes on the device. :param commit: Commit? (default: True) Sometimes it is not needed to commit the config immediately after loading the changes. E.g.: a state loads a couple of parts (add / remove / update) and would not be optimal to commit after each operation. @@ -166,12 +176,14 @@ def update_config(chassis_id=None, can specify commit=False and will not discard the config. :raise MergeConfigException: If there is an error on the configuration sent. :return a dictionary having the following keys: - * result (bool): if the config was applied successfully. It is `False` only in case of failure. In case - there are no changes to be applied and successfully performs all operations it is still `True` and so will be - the `already_configured` flag (example below) - * comment (str): a message for the user - * already_configured (bool): flag to check if there were no changes applied - * diff (str): returns the config changes applied + + - result (bool): if the config was applied successfully. It is `False` only + in case of failure. In case there are no changes to be applied and + successfully performs all operations it is still `True` and so will be + the `already_configured` flag (example below) + - comment (str): a message for the user + - already_configured (bool): flag to check if there were no changes applied + - diff (str): returns the config changes applied CLI Example: diff --git a/salt/modules/napalm_users.py b/salt/modules/napalm_users.py index bf651c6f69..90af792765 100644 --- a/salt/modules/napalm_users.py +++ b/salt/modules/napalm_users.py @@ -104,21 +104,27 @@ def set_users(users, test=False, commit=True, **kwargs): # pylint: disable=unus Configures users on network devices. :param users: Dictionary formatted as the output of the function config() - :param test: Dry run? If set as True, will apply the config, discard and return the changes. Default: False - and will commit the changes on the device. - :param commit: Commit? (default: True) Sometimes it is not needed to commit the config immediately - after loading the changes. E.g.: a state loads a couple of parts (add / remove / update) - and would not be optimal to commit after each operation. - Also, from the CLI when the user needs to apply the similar changes before committing, - can specify commit=False and will not discard the config. + + :param test: Dry run? If set as True, will apply the config, discard and + return the changes. Default: False + + :param commit: Commit? (default: True) Sometimes it is not needed to commit + the config immediately after loading the changes. E.g.: a state loads a + couple of parts (add / remove / update) and would not be optimal to + commit after each operation. Also, from the CLI when the user needs to + apply the similar changes before committing, can specify commit=False + and will not discard the config. + :raise MergeConfigException: If there is an error on the configuration sent. :return a dictionary having the following keys: - * result (bool): if the config was applied successfully. It is `False` only in case of failure. In case - there are no changes to be applied and successfully performs all operations it is still `True` and so will be - the `already_configured` flag (example below) - * comment (str): a message for the user - * already_configured (bool): flag to check if there were no changes applied - * diff (str): returns the config changes applied + + - result (bool): if the config was applied successfully. It is `False` only + in case of failure. In case there are no changes to be applied and + successfully performs all operations it is still `True` and so will be + the `already_configured` flag (example below) + - comment (str): a message for the user + - already_configured (bool): flag to check if there were no changes applied + - diff (str): returns the config changes applied CLI Example: @@ -142,7 +148,6 @@ def delete_users(users, test=False, commit=True, **kwargs): # pylint: disable=u :param users: Dictionary formatted as the output of the function config() :param test: Dry run? If set as True, will apply the config, discard and return the changes. Default: False - and will commit the changes on the device. :param commit: Commit? (default: True) Sometimes it is not needed to commit the config immediately after loading the changes. E.g.: a state loads a couple of parts (add / remove / update) and would not be optimal to commit after each operation. @@ -150,12 +155,13 @@ def delete_users(users, test=False, commit=True, **kwargs): # pylint: disable=u can specify commit=False and will not discard the config. :raise MergeConfigException: If there is an error on the configuration sent. :return a dictionary having the following keys: - * result (bool): if the config was applied successfully. It is `False` only in case of failure. In case - there are no changes to be applied and successfully performs all operations it is still `True` and so will be - the `already_configured` flag (example below) - * comment (str): a message for the user - * already_configured (bool): flag to check if there were no changes applied - * diff (str): returns the config changes applied + - result (bool): if the config was applied successfully. It is `False` + only in case of failure. In case there are no changes to be applied + and successfully performs all operations it is still `True` and so + will be the `already_configured` flag (example below) + - comment (str): a message for the user + - already_configured (bool): flag to check if there were no changes applied + - diff (str): returns the config changes applied CLI Example: diff --git a/salt/modules/napalm_yang_mod.py b/salt/modules/napalm_yang_mod.py index 30fb61c608..6083052339 100644 --- a/salt/modules/napalm_yang_mod.py +++ b/salt/modules/napalm_yang_mod.py @@ -155,7 +155,7 @@ def parse(*models, **kwargs): Output Example: - .. code-block:: json + .. code-block:: python { "interfaces": { diff --git a/salt/modules/netmiko_mod.py b/salt/modules/netmiko_mod.py new file mode 100644 index 0000000000..094ec93f90 --- /dev/null +++ b/salt/modules/netmiko_mod.py @@ -0,0 +1,644 @@ +# -*- coding: utf-8 -*- +''' +Netmiko Execution Module +======================== + +.. versionadded:: Fluorine + +Execution module to interface the connection with a remote network device. It is +flexible enough to execute the commands both when running under a Netmiko Proxy +Minion, as well as running under a Regular Minion by specifying the connection +arguments, i.e., ``device_type``, ``ip``, ``username``, ``password`` etc. + +:codeauthor: Mircea Ulinic & Kirk Byers +:maturity: new +:depends: netmiko +:platform: unix + +Dependencies +------------ + +The ``netmiko`` proxy modules requires Netmiko to be installed: ``pip install netmiko``. + +Usage +----- + +This module can equally be used via the :mod:`netmiko ` +Proxy module (check documentation), or directly from an arbitrary (Proxy) Minion +that is running on a server (computer) having access to the network device, and +has the ``netmiko`` library installed. + +When running outside of the :mod:`netmiko Proxy ` (i.e., +from another Proxy Minion type, or regular Minion), the netmiko connection +arguments can be either specified from the CLI when executing the command, or +in a configuration block under the ``netmiko`` key in the configuration opts +(i.e., (Proxy) Minion configuration file), or Pillar. The module supports these +simultaneously. These fields are the exact same supported by the ``netmiko`` +Proxy Module: + +- ``device_type`` - Class selection based on device type. Supported options: + + - ``a10``: A10 Networks + - ``accedian``: Accedian Networks + - ``alcatel_aos``: Alcatel AOS + - ``alcatel_sros``: Alcatel SROS + - ``apresia_aeos``: Apresia AEOS + - ``arista_eos``: Arista EOS + - ``aruba_os``: Aruba + - ``avaya_ers``: Avaya ERS + - ``avaya_vsp``: Avaya VSP + - ``brocade_fastiron``: Brocade Fastiron + - ``brocade_netiron``: Brocade Netiron + - ``brocade_nos``: Brocade NOS + - ``brocade_vdx``: Brocade NOS + - ``brocade_vyos``: VyOS + - ``checkpoint_gaia``: Check Point GAiA + - ``calix_b6``: Calix B6 + - ``ciena_saos``: Ciena SAOS + - ``cisco_asa``: Cisco SA + - ``cisco_ios``: Cisco IOS + - ``cisco_nxos``: Cisco NX-oS + - ``cisco_s300``: Cisco S300 + - ``cisco_tp``: Cisco TpTcCe + - ``cisco_wlc``: Cisco WLC + - ``cisco_xe``: Cisco IOS + - ``cisco_xr``: Cisco XR + - ``coriant``: Coriant + - ``dell_force10``: Dell Force10 + - ``dell_os10``: Dell OS10 + - ``dell_powerconnect``: Dell PowerConnect + - ``eltex``: Eltex + - ``enterasys``: Enterasys + - ``extreme``: Extreme + - ``extreme_wing``: Extreme Wing + - ``f5_ltm``: F5 LTM + - ``fortinet``: Fortinet + - ``generic_termserver``: TerminalServer + - ``hp_comware``: HP Comware + - ``hp_procurve``: HP Procurve + - ``huawei``: Huawei + - ``huawei_vrpv8``: Huawei VRPV8 + - ``juniper``: Juniper Junos + - ``juniper_junos``: Juniper Junos + - ``linux``: Linux + - ``mellanox``: Mellanox + - ``mrv_optiswitch``: MrvOptiswitch + - ``netapp_cdot``: NetAppcDot + - ``netscaler``: Netscaler + - ``ovs_linux``: OvsLinux + - ``paloalto_panos``: PaloAlto Panos + - ``pluribus``: Pluribus + - ``quanta_mesh``: Quanta Mesh + - ``ruckus_fastiron``: Ruckus Fastiron + - ``ubiquiti_edge``: Ubiquiti Edge + - ``ubiquiti_edgeswitch``: Ubiquiti Edge + - ``vyatta_vyos``: VyOS + - ``vyos``: VyOS + - ``brocade_fastiron_telnet``: Brocade Fastiron over Telnet + - ``brocade_netiron_telnet``: Brocade Netiron over Telnet + - ``cisco_ios_telnet``: Cisco IOS over Telnet + - ``apresia_aeos_telnet``: Apresia AEOS over Telnet + - ``arista_eos_telnet``: Arista EOS over Telnet + - ``hp_procurve_telnet``: HP Procurve over Telnet + - ``hp_comware_telnet``: HP Comware over Telnet + - ``juniper_junos_telnet``: Juniper Junos over Telnet + - ``calix_b6_telnet``: Calix B6 over Telnet + - ``dell_powerconnect_telnet``: Dell PowerConnect over Telnet + - ``generic_termserver_telnet``: TerminalServer over Telnet + - ``extreme_telnet``: Extreme Networks over Telnet + - ``ruckus_fastiron_telnet``: Ruckus Fastiron over Telnet + - ``cisco_ios_serial``: Cisco IOS over serial port + +- ``ip`` - IP address of target device (not required if ``host`` is provided) + +- ``host`` - Hostname of target device (not required if ``ip`` is provided) + +- ``username`` - Username to authenticate against target device, if required + +- ``password`` - Password to authenticate against target device, if required + +- ``secret`` - The enable password if target device requires one + +- ``port`` - The destination port used to connect to the target device + +- ``global_delay_factor`` - Multiplication factor affecting Netmiko delays + (default: ``1``) + +- ``use_keys`` - Connect to target device using SSH keys (default: ``False``) + +- ``key_file`` - Filename path of the SSH key file to use + +- ``allow_agent`` - Enable use of SSH key-agent + +- ``ssh_strict`` - Automatically reject unknown SSH host keys (default: + ``False``, which means unknown SSH host keys will be accepted) + +- ``system_host_keys`` - Load host keys from the user's "known_hosts" file + (default: ``False``) + +- ``alt_host_keys`` - If ``True``, host keys will be loaded from the file + specified in ``alt_key_file`` (default: ``False``) + +- ``alt_key_file`` - SSH host key file to use (if ``alt_host_keys=True``) + +- ``ssh_config_file`` - File name of OpenSSH configuration file + +- ``timeout`` - Connection timeout, in seconds (default: ``90``) + +- ``session_timeout`` - Set a timeout for parallel requests, in seconds + (default: ``60``) + +- ``keepalive`` - Send SSH keepalive packets at a specific interval, in + seconds. Currently defaults to ``0``, for backwards compatibility (it will + not attempt to keep the connection alive using the KEEPALIVE packets). + +- ``default_enter`` - Character(s) to send to correspond to enter key (default: + ``\\n``) + +- ``response_return`` - Character(s) to use in normalized return data to + represent enter key (default: ``\\n``) + +Example (when not running in a ``netmiko`` Proxy Minion): + +.. code-block:: yaml + + netmiko: + username: test + password: test + +In case the ``username`` and ``password`` are the same on any device you are +targeting, the block above (besides other parameters specific to your +environment you might need) should suffice to be able to execute commands from +outside a ``netmiko`` Proxy, e.g.: + +.. code-block:: bash + + salt '*' netmiko.send_command 'show version' host=router1.example.com device_type=juniper + salt '*' netmiko.send_config https://bit.ly/2sgljCB host=sw2.example.com device_type=cisco_ios + +.. note:: + + Remember that the above applies only when not running in a ``netmiko`` Proxy + Minion. If you want to use the :mod:``, please follow + the documentation notes for a proper setup. +''' +from __future__ import absolute_import + +# Import python stdlib +import logging +import inspect + +# Import Salt libs +from salt.ext import six +from salt.exceptions import CommandExecutionError +try: + from salt.utils.args import clean_kwargs + from salt.utils.files import mkstemp +except ImportError: + from salt.utils import clean_kwargs + from salt.utils import mkstemp + +# Import third party libs +try: + from netmiko import ConnectHandler + from netmiko import BaseConnection + HAS_NETMIKO = True +except ImportError: + HAS_NETMIKO = False + +# ----------------------------------------------------------------------------- +# execution module properties +# ----------------------------------------------------------------------------- + +__proxyenabled__ = ['*'] +# Any Proxy Minion should be able to execute these (not only netmiko) + +__virtualname__ = 'netmiko' +# The Execution Module will be identified as ``netmiko`` + +# ----------------------------------------------------------------------------- +# globals +# ----------------------------------------------------------------------------- + +log = logging.getLogger(__name__) + +# ----------------------------------------------------------------------------- +# propery functions +# ----------------------------------------------------------------------------- + + +def __virtual__(): + ''' + Execution module available only if Netmiko is installed. + ''' + if not HAS_NETMIKO: + return False, 'The netmiko execution module requires netmiko library to be installed.' + return __virtualname__ + +# ----------------------------------------------------------------------------- +# helper functions +# ----------------------------------------------------------------------------- + + +def _prepare_connection(**kwargs): + ''' + Prepare the connection with the remote network device, and clean up the key + value pairs, removing the args used for the connection init. + ''' + init_args = {} + fun_kwargs = {} + netmiko_kwargs = __salt__['config.get']('netmiko', {}) + netmiko_kwargs.update(kwargs) # merge the CLI args with the opts/pillar + netmiko_init_args, _, _, netmiko_defaults = inspect.getargspec(BaseConnection.__init__) + check_self = netmiko_init_args.pop(0) + for karg, warg in six.iteritems(netmiko_kwargs): + if karg not in netmiko_init_args: + if warg is not None: + fun_kwargs[karg] = warg + continue + if warg is not None: + init_args[karg] = warg + conn = ConnectHandler(**init_args) + return conn, fun_kwargs + +# ----------------------------------------------------------------------------- +# callable functions +# ----------------------------------------------------------------------------- + + +def get_connection(**kwargs): + ''' + Return the Netmiko connection object. + + .. warning:: + + This function returns an unserializable object, hence it is not meant + to be used on the CLI. This should mainly be used when invoked from + other modules for the low level connection with the network device. + + kwargs + Key-value dictionary with the authentication details. + + USAGE Example: + + .. code-block:: python + + conn = __salt__['netmiko.get_connection'](host='router1.example.com', + username='example', + password='example') + show_if = conn.send_command('show interfaces') + conn.disconnect() + ''' + kwargs = clean_kwargs(**kwargs) + if 'netmiko.conn' in __proxy__: + return __proxy__['netmiko.conn']() + conn, kwargs = _prepare_connection(**kwargs) + return conn + + +def call(method, *args, **kwargs): + ''' + Invoke an arbitrary Netmiko method. + + method + The name of the Netmiko method to invoke. + + args + A list of arguments to send to the method invoked. + + kwargs + Key-value dictionary to send to the method invoked. + ''' + kwargs = clean_kwargs(**kwargs) + if 'netmiko.call' in __proxy__: + return __proxy__['netmiko.call'](method, *args, **kwargs) + conn, kwargs = _prepare_connection(**kwargs) + ret = getattr(conn, method)(*args, **kwargs) + conn.disconnect() + return ret + + +def multi_call(*methods, **kwargs): + ''' + Invoke multiple Netmiko methods at once, and return their output, as list. + + methods + A list of dictionaries with the following keys: + + - ``name``: the name of the Netmiko method to be executed. + - ``args``: list of arguments to be sent to the Netmiko method. + - ``kwargs``: dictionary of arguments to be sent to the Netmiko method. + + kwargs + Key-value dictionary with the connection details (when not running + under a Proxy Minion). + ''' + kwargs = clean_kwargs(**kwargs) + if 'netmiko.conn' in __proxy__: + conn = __proxy__['netmiko.conn']() + else: + conn, kwargs = _prepare_connection(**kwargs) + ret = [] + for method in methods: + # Explicit unpacking + method_name = method['name'] + method_args = method.get('args', []) + method_kwargs = method.get('kwargs', []) + ret.append(getattr(conn, method_name)(*method_args, **method_kwargs)) + if 'netmiko.conn' not in __proxy__: + conn.disconnect() + return ret + + +def send_command(command_string, **kwargs): + ''' + Execute command_string on the SSH channel using a pattern-based mechanism. + Generally used for show commands. By default this method will keep waiting + to receive data until the network device prompt is detected. The current + network device prompt will be determined automatically. + + command_string + The command to be executed on the remote device. + + expect_string + Regular expression pattern to use for determining end of output. + If left blank will default to being based on router prompt. + + delay_factor: ``1`` + Multiplying factor used to adjust delays (default: ``1``). + + max_loops: ``500`` + Controls wait time in conjunction with delay_factor. Will default to be + based upon self.timeout. + + auto_find_prompt: ``True`` + Whether it should try to auto-detect the prompt (default: ``True``). + + strip_prompt: ``True`` + Remove the trailing router prompt from the output (default: ``True``). + + strip_command: ``True`` + Remove the echo of the command from the output (default: ``True``). + + normalize: ``True`` + Ensure the proper enter is sent at end of command (default: ``True``). + + use_textfsm: ``False`` + Process command output through TextFSM template (default: ``False``). + + CLI Example: + + .. code-block:: bash + + salt '*' netmiko.send_command 'show version' + salt '*' netmiko.send_command 'show_version' host='router1.example.com' username='example' device_type='cisco_ios' + ''' + return call('send_command', command_string, **kwargs) + + +def send_command_timing(command_string, **kwargs): + ''' + Execute command_string on the SSH channel using a delay-based mechanism. + Generally used for show commands. + + command_string + The command to be executed on the remote device. + + delay_factor: ``1`` + Multiplying factor used to adjust delays (default: ``1``). + + max_loops: ``500`` + Controls wait time in conjunction with delay_factor. Will default to be + based upon self.timeout. + + strip_prompt: ``True`` + Remove the trailing router prompt from the output (default: ``True``). + + strip_command: ``True`` + Remove the echo of the command from the output (default: ``True``). + + normalize: ``True`` + Ensure the proper enter is sent at end of command (default: ``True``). + + use_textfsm: ``False`` + Process command output through TextFSM template (default: ``False``). + + CLI Example: + + .. code-block:: bash + + salt '*' netmiko.send_command_timing 'show version' + salt '*' netmiko.send_command_timing 'show version' host='router1.example.com' username='example' device_type='arista_eos' + ''' + return call('send_command_timing', command_string, **kwargs) + + +def enter_config_mode(**kwargs): + ''' + Enter into config mode. + + config_command + Configuration command to send to the device. + + pattern + Pattern to terminate reading of channel. + + CLI Example: + + .. code-block:: bash + + salt '*' netmiko.enter_config_mode + salt '*' netmiko.enter_config_mode device_type='juniper_junos' ip='192.168.0.1' username='example' + ''' + return call('config_mode', **kwargs) + + +def exit_config_mode(**kwargs): + ''' + Exit from configuration mode. + + exit_config + Command to exit configuration mode. + + pattern + Pattern to terminate reading of channel. + + CLI Example: + + .. code-block:: bash + + salt '*' netmiko.exit_config_mode + salt '*' netmiko.exit_config_mode device_type='juniper' ip='192.168.0.1' username='example' + ''' + return call('exit_config_mode', **kwargs) + + +def send_config(config_file=None, + config_commands=None, + template_engine='jinja', + commit=False, + source_hash=None, + source_hash_name=None, + user=None, + group=None, + mode=None, + attrs=None, + context=None, + defaults=None, + skip_verify=False, + saltenv='base', + **kwargs): + ''' + Send configuration commands down the SSH channel. + Return the configuration lines sent to the device. + + The function is flexible to send the configuration from a local or remote + file, or simply the commands as list. + + config_file + The source file with the configuration commands to be sent to the + device. + + The file can also be a template that can be rendered using the template + engine of choice. + + This can be specified using the absolute path to the file, or using one + of the following URL schemes: + + - ``salt://``, to fetch the file from the Salt fileserver. + - ``http://`` or ``https://`` + - ``ftp://`` + - ``s3://`` + - ``swift://`` + + config_commands + Multiple configuration commands to be sent to the device. + + .. note:: + + This argument is ignored when ``config_file`` is specified. + + template_engine: ``jinja`` + The template engine to use when rendering the source file. Default: + ``jinja``. To simply fetch the file without attempting to render, set + this argument to ``None``. + + commit: ``False`` + Commit the configuration changes before exiting the config mode. This + option is by default disabled, as many platforms don't have this + capability natively. + + source_hash + The hash of the ``config_file`` + + source_hash_name + When ``source_hash`` refers to a remote file, this specifies the + filename to look for in that file. + + user + Owner of the file. + + group + Group owner of the file. + + mode + Permissions of the file. + + attrs + Attributes of the file. + + context + Variables to add to the template context. + + defaults + Default values of the context_dict. + + skip_verify: ``False`` + If ``True``, hash verification of remote file sources (``http://``, + ``https://``, ``ftp://``, etc.) will be skipped, and the ``source_hash`` + argument will be ignored. + + exit_config_mode: ``True`` + Determines whether or not to exit config mode after complete. + + delay_factor: ``1`` + Factor to adjust delays. + + max_loops: ``150`` + Controls wait time in conjunction with delay_factor (default: ``150``). + + strip_prompt: ``False`` + Determines whether or not to strip the prompt (default: ``False``). + + strip_command: ``False`` + Determines whether or not to strip the command (default: ``False``). + + config_mode_command + The command to enter into config mode. + + CLI Example: + + .. code-block:: bash + + salt '*' netmiko.send_config config_file=salt://config.txt + salt '*' netmiko.send_config config_file=https://bit.ly/2sgljCB device_type='cisco_ios' ip='1.2.3.4' username='example' + ''' + if config_file: + if template_engine: + tmp_file = mkstemp() + file_mgd = __salt__['file.get_managed'](tmp_file, + template_engine, + config_file, + source_hash, + source_hash_name, + user, + group, + mode, + attrs, + saltenv, + context, + defaults, + skip_verify) + if not file_mgd[0]: + raise CommandExecutionError(file_mgd[2]) + file_str = __salt__['file.read'](file_mgd[0]) + __salt__['file.remove'](file_mgd[0]) + else: + # If no template engine wanted, simply fetch the source file + file_str = __salt__['cp.get_file_str'](config_file, + saltenv=saltenv) + if file_str is False: + raise CommandExecutionError('Source file {} not found'.format(config_file)) + config_commands = file_str.splitlines() + if isinstance(config_commands, (six.string_types, six.text_type)): + config_commands = [config_commands] + kwargs = clean_kwargs(**kwargs) + if 'netmiko.conn' in __proxy__: + conn = __proxy__['netmiko.conn']() + else: + conn, kwargs = _prepare_connection(**kwargs) + if commit: + kwargs['exit_config_mode'] = False # don't exit config mode after + # loading the commands, wait for explicit commit + ret = conn.send_config_set(config_commands=config_commands, **kwargs) + if commit: + ret += conn.commit() + return ret + + +def commit(**kwargs): + ''' + Commit the configuration changes. + + .. warning:: + + This function is supported only on the platforms that support the + ``commit`` operation. + + CLI Example: + + .. code-block:: bash + + salt '*' netmiko.commit + ''' + return call('commit', **kwargs) diff --git a/salt/modules/network.py b/salt/modules/network.py index 422f4ae068..bdf73dfc89 100644 --- a/salt/modules/network.py +++ b/salt/modules/network.py @@ -1354,6 +1354,12 @@ def mod_hostname(hostname): elif __grains__['os_family'] in ('Debian', 'NILinuxRT'): with salt.utils.files.fopen('/etc/hostname', 'w') as fh_: fh_.write(salt.utils.stringutils.to_str(hostname + '\n')) + if __grains__['lsb_distrib_id'] == 'nilrt': + str_hostname = salt.utils.stringutils.to_str(hostname) + nirtcfg_cmd = '/usr/local/natinst/bin/nirtcfg' + nirtcfg_cmd += ' --set section=SystemSettings,token=\'Host_Name\',value=\'{0}\''.format(str_hostname) + if __salt__['cmd.run_all'](nirtcfg_cmd)['retcode'] != 0: + raise CommandExecutionError('Couldn\'t set hostname to: {0}\n'.format(str_hostname)) elif __grains__['os_family'] == 'OpenBSD': with salt.utils.files.fopen('/etc/myname', 'w') as fh_: fh_.write(salt.utils.stringutils.to_str(hostname + '\n')) diff --git a/salt/modules/neutron.py b/salt/modules/neutron.py index 03a5db4699..b193944f26 100644 --- a/salt/modules/neutron.py +++ b/salt/modules/neutron.py @@ -827,8 +827,8 @@ def update_floatingip(floatingip_id, port=None, profile=None): salt '*' neutron.update_floatingip network-name port-name :param floatingip_id: ID of floatingIP - :param port: ID or name of port, to associate floatingip to - `None` or do not specify to disassociate the floatingip (Optional) + :param port: ID or name of port, to associate floatingip to `None` or do + not specify to disassociate the floatingip (Optional) :param profile: Profile to build on (Optional) :return: Value of updated floating IP information ''' @@ -1560,6 +1560,7 @@ def list_firewalls(profile=None): .. code-block:: bash salt '*' neutron.list_firewalls + :param profile: Profile to build on (Optional) :return: List of firewalls ''' diff --git a/salt/modules/neutronng.py b/salt/modules/neutronng.py index d67da9188a..d0b24f4b9b 100644 --- a/salt/modules/neutronng.py +++ b/salt/modules/neutronng.py @@ -110,16 +110,23 @@ def network_create(auth=None, **kwargs): ''' Create a network - Parameters: - Defaults: shared=False, admin_state_up=True, external=False, - provider=None, project_id=None + name + Name of the network being created - name (string): Name of the network being created. - shared (bool): Set the network as shared. - admin_state_up (bool): Set the network administrative state to up. - external (bool): Whether this network is externally accessible. - provider (dict): A dict of network provider options. - project_id (string): Specify the project ID this network will be created on. + shared : False + If ``True``, set the network as shared + + admin_state_up : True + If ``True``, Set the network administrative state to "up" + + external : False + Control whether or not this network is externally accessible + + provider + An optional Python dictionary of network provider options + + project_id + The project ID on which this network will be created CLI Example: @@ -144,16 +151,15 @@ def network_delete(auth=None, **kwargs): ''' Delete a network - Parameters: - name: Name or ID of the network being deleted. + name_or_id + Name or ID of the network being deleted CLI Example: .. code-block:: bash - salt '*' neutronng.network_delete name=network1 - salt '*' neutronng.network_delete \ - name=1dcac318a83b4610b7a7f7ba01465548 + salt '*' neutronng.network_delete name_or_id=network1 + salt '*' neutronng.network_delete name_or_id=1dcac318a83b4610b7a7f7ba01465548 ''' cloud = get_operator_cloud(auth) @@ -165,10 +171,8 @@ def list_networks(auth=None, **kwargs): ''' List networks - Parameters: - Defaults: filters=None - - filters (dict): dict of filter conditions to push down + filters + A Python dictionary of filter conditions to push down CLI Example: @@ -188,10 +192,8 @@ def network_get(auth=None, **kwargs): ''' Get a single network - Parameters: - Defaults: filters=None - - filters (dict): dict of filter conditions to push down + filters + A Python dictionary of filter conditions to push down CLI Example: @@ -209,18 +211,57 @@ def subnet_create(auth=None, **kwargs): ''' Create a subnet - Parameters: - Defaults: cidr=None, ip_version=4, enable_dhcp=False, subnet_name=None, - tenant_id=None, allocation_pools=None, gateway_ip=None, - disable_gateway_ip=False, dns_nameservers=None, host_routes=None, - ipv6_ra_mode=None, ipv6_address_mode=None, - use_default_subnetpool=False + network_name_or_id + The unique name or ID of the attached network. If a non-unique name is + supplied, an exception is raised. - allocation_pools: - A list of dictionaries of the start and end addresses for allocation pools. + cidr + The CIDR - dns_nameservers: A list of DNS name servers for the subnet. - host_routes: A list of host route dictionaries for the subnet. + ip_version + The IP version, which is 4 or 6. + + enable_dhcp : False + Set to ``True`` if DHCP is enabled and ``False`` if disabled + + subnet_name + The name of the subnet + + tenant_id + The ID of the tenant who owns the network. Only administrative users + can specify a tenant ID other than their own. + + allocation_pools + A list of dictionaries of the start and end addresses for the + allocation pools. + + gateway_ip + The gateway IP address. When you specify both ``allocation_pools`` and + ``gateway_ip``, you must ensure that the gateway IP does not overlap + with the specified allocation pools. + + disable_gateway_ip : False + Set to ``True`` if gateway IP address is disabled and ``False`` if + enabled. It is not allowed with ``gateway_ip``. + + dns_nameservers + A list of DNS name servers for the subnet + + host_routes + A list of host route dictionaries for the subnet + + ipv6_ra_mode + IPv6 Router Advertisement mode. Valid values are ``dhcpv6-stateful``, + ``dhcpv6-stateless``, or ``slaac``. + + ipv6_address_mode + IPv6 address mode. Valid values are ``dhcpv6-stateful``, + ``dhcpv6-stateless``, or ``slaac``. + + use_default_subnetpool + If ``True``, use the default subnetpool for ``ip_version`` to obtain a + CIDR. It is required to pass ``None`` to the ``cidr`` argument when + enabling this option. CLI Example: @@ -248,19 +289,38 @@ def subnet_update(auth=None, **kwargs): ''' Update a subnet - Parameters: - Defaults: subnet_name=None, enable_dhcp=None, gateway_ip=None,\ - disable_gateway_ip=None, allocation_pools=None, \ - dns_nameservers=None, host_routes=None + name_or_id + Name or ID of the subnet to update - name: Name or ID of the subnet to update. - subnet_name: The new name of the subnet. + subnet_name + The new name of the subnet + + enable_dhcp + Set to ``True`` if DHCP is enabled and ``False`` if disabled + + gateway_ip + The gateway IP address. When you specify both allocation_pools and + gateway_ip, you must ensure that the gateway IP does not overlap with + the specified allocation pools. + + disable_gateway_ip : False + Set to ``True`` if gateway IP address is disabled and False if enabled. + It is not allowed with ``gateway_ip``. + + allocation_pools + A list of dictionaries of the start and end addresses for the + allocation pools. + + dns_nameservers + A list of DNS name servers for the subnet + + host_routes + A list of host route dictionaries for the subnet .. code-block:: bash salt '*' neutronng.subnet_update name=subnet1 subnet_name=subnet2 - salt '*' neutronng.subnet_update name=subnet1\ - dns_nameservers='["8.8.8.8", "8.8.8.7"]' + salt '*' neutronng.subnet_update name=subnet1 dns_nameservers='["8.8.8.8", "8.8.8.7"]' ''' cloud = get_operator_cloud(auth) @@ -272,8 +332,8 @@ def subnet_delete(auth=None, **kwargs): ''' Delete a subnet - Parameters: - name: Name or ID of the subnet to update. + name + Name or ID of the subnet to update CLI Example: @@ -293,10 +353,8 @@ def list_subnets(auth=None, **kwargs): ''' List subnets - Parameters: - Defaults: filters=None - - filters (dict): dict of filter conditions to push down + filters + A Python dictionary of filter conditions to push down CLI Example: @@ -316,10 +374,8 @@ def subnet_get(auth=None, **kwargs): ''' Get a single subnet - Parameters: - Defaults: filters=None - - filters (dict): dict of filter conditions to push down + filters + A Python dictionary of filter conditions to push down CLI Example: @@ -337,8 +393,8 @@ def security_group_create(auth=None, **kwargs): ''' Create a security group. Use security_group_get to create default. - Parameters: - Defaults: project_id=None + project_id + The project ID on which this security group will be created CLI Example: @@ -360,9 +416,14 @@ def security_group_update(secgroup=None, auth=None, **kwargs): ''' Update a security group - secgroup: Name, ID or Raw Object of the security group to update. - name: New name for the security group. - description: New description for the security group. + secgroup + Name, ID or Raw Object of the security group to update + + name + New name for the security group + + description + New description for the security group CLI Example: @@ -384,14 +445,14 @@ def security_group_delete(auth=None, **kwargs): ''' Delete a security group - Parameters: - name: The name or unique ID of the security group. + name_or_id + The name or unique ID of the security group CLI Example: .. code-block:: bash - salt '*' neutronng.security_group_delete name=secgroup1 + salt '*' neutronng.security_group_delete name_or_id=secgroup1 ''' cloud = get_operator_cloud(auth) @@ -404,10 +465,8 @@ def security_group_get(auth=None, **kwargs): Get a single security group. This will create a default security group if one does not exist yet for a particular project id. - Parameters: - Defaults: filters=None - - filters (dict): dict of filter conditions to push down + filters + A Python dictionary of filter conditions to push down CLI Example: @@ -429,15 +488,48 @@ def security_group_rule_create(auth=None, **kwargs): ''' Create a rule in a security group - Parameters: - Defaults: port_range_min=None, port_range_max=None, protocol=None, - remote_ip_prefix=None, remote_group_id=None, direction='ingress', - ethertype='IPv4', project_id=None + secgroup_name_or_id + The security group name or ID to associate with this security group + rule. If a non-unique group name is given, an exception is raised. - secgroup_name_or_id: - This is the Name or Id of security group you want to create a rule in. - However, it throws errors on non-unique security group names like - 'default' even when you supply a project_id + port_range_min + The minimum port number in the range that is matched by the security + group rule. If the protocol is TCP or UDP, this value must be less than + or equal to the port_range_max attribute value. If nova is used by the + cloud provider for security groups, then a value of None will be + transformed to -1. + + port_range_max + The maximum port number in the range that is matched by the security + group rule. The port_range_min attribute constrains the port_range_max + attribute. If nova is used by the cloud provider for security groups, + then a value of None will be transformed to -1. + + protocol + The protocol that is matched by the security group rule. Valid values + are ``None``, ``tcp``, ``udp``, and ``icmp``. + + remote_ip_prefix + The remote IP prefix to be associated with this security group rule. + This attribute matches the specified IP prefix as the source IP address + of the IP packet. + + remote_group_id + The remote group ID to be associated with this security group rule + + direction + Either ``ingress`` or ``egress``; the direction in which the security + group rule is applied. For a compute instance, an ingress security + group rule is applied to incoming (ingress) traffic for that instance. + An egress rule is applied to traffic leaving the instance + + ethertype + Must be IPv4 or IPv6, and addresses represented in CIDR must match the + ingress or egress rules + + project_id + Specify the project ID this security group will be created on + (admin-only) CLI Example: @@ -464,15 +556,14 @@ def security_group_rule_delete(auth=None, **kwargs): ''' Delete a security group - Parameters: - rule_id (string): The unique ID of the security group rule. + name_or_id + The unique ID of the security group rule CLI Example: .. code-block:: bash - salt '*' neutronng.security_group_rule_delete\ - rule_id=1dcac318a83b4610b7a7f7ba01465548 + salt '*' neutronng.security_group_rule_delete name_or_id=1dcac318a83b4610b7a7f7ba01465548 ''' cloud = get_operator_cloud(auth) diff --git a/salt/modules/nilrt_ip.py b/salt/modules/nilrt_ip.py index a3d9d0ad24..85876f0e94 100644 --- a/salt/modules/nilrt_ip.py +++ b/salt/modules/nilrt_ip.py @@ -8,13 +8,16 @@ The networking module for NI Linux Real-Time distro from __future__ import absolute_import, print_function, unicode_literals import logging import time +import os # Import salt libs -import salt.utils.validate.net import salt.exceptions +import salt.utils.files +import salt.utils.validate.net # Import 3rd-party libs from salt.ext import six +from salt.ext.six.moves import configparser try: import pyconnman HAS_PYCONNMAN = True @@ -25,6 +28,11 @@ try: HAS_DBUS = True except ImportError: HAS_DBUS = False +try: + import pyiface + HAS_PYIFACE = True +except ImportError: + HAS_PYIFACE = False log = logging.getLogger(__name__) @@ -32,7 +40,10 @@ log = logging.getLogger(__name__) __virtualname__ = 'ip' SERVICE_PATH = '/net/connman/service/' +INTERFACES_CONFIG = '/var/lib/connman/interfaces.config' _CONFIG_TRUE = ['yes', 'on', 'true', '1', True] +IFF_LOOPBACK = 0x8 +IFF_RUNNING = 0x40 def __virtual__(): @@ -43,6 +54,8 @@ def __virtual__(): return False, 'The python package pyconnman is not installed' if not HAS_DBUS: return False, 'The python DBus package is not installed' + if not HAS_PYIFACE: + return False, 'The python pyiface package is not installed' if __grains__['os_family'] == 'NILinuxRT': try: state = _get_state @@ -170,7 +183,7 @@ def _get_service_info(service): info = 'requestmode' if value == 'dhcp': value = 'dhcp_linklocal' - elif value == 'manual': + elif value in ('manual', 'fixed'): value = 'static' data['ipv4'][info.lower()] = six.text_type(value) except Exception as exc: @@ -218,6 +231,52 @@ def _dict_to_string(dictionary): return ret.splitlines() +def _get_static_info(interface): + ''' + Return information about an interface from config file. + + :param interface: interface label + ''' + parser = configparser.ConfigParser() + if os.path.exists(INTERFACES_CONFIG): + try: + with salt.utils.files.fopen(INTERFACES_CONFIG, 'r') as config_file: + parser.read_file(config_file) + except configparser.MissingSectionHeaderError: + pass + data = { + 'connectionid': interface.name, + 'label': interface.name, + 'hwaddr': interface.hwaddr[:-1], + 'up': False, + 'ipv4': { + 'supportedrequestmodes': ['static', 'dhcp_linklocal'], + 'requestmode': 'static' + }, + 'wireless': False + } + hwaddr_section_number = ''.join(data['hwaddr'].split(':')) + if parser.has_section('interface_{0}'.format(hwaddr_section_number)): + ipv4_information = parser.get('interface_{0}'.format(hwaddr_section_number), 'IPv4').split('/') + data['ipv4']['address'] = ipv4_information[0] + data['ipv4']['dns'] = parser.get('interface_{0}'.format(hwaddr_section_number), 'Nameservers').split(',') + data['ipv4']['netmask'] = ipv4_information[1] + data['ipv4']['gateway'] = ipv4_information[2] + return data + + +def _get_info(interface): + ''' + Return information about an interface even if it's not associated with a service. + + :param interface: interface label + ''' + service = _interface_to_service(interface.name) + if service is not None: + return _get_service_info(service) + return _get_static_info(interface) + + def get_interfaces_details(): ''' Get details about all the interfaces on the minion @@ -231,10 +290,11 @@ def get_interfaces_details(): salt '*' ip.get_interfaces_details ''' - services = [] - for service in _get_services(): - services.append(_get_service_info(service)) - interfaceList = {'interfaces': services} + interfaces = [] + for interface in pyiface.getIfaces(): + if interface.flags & IFF_LOOPBACK == 0: + interfaces.append(_get_info(interface)) + interfaceList = {'interfaces': interfaces} return interfaceList @@ -358,6 +418,48 @@ def set_dhcp_linklocal_all(interface): return True +def _configure_static_interface(interface, **settings): + ''' + Configure an interface that is not detected as a service by Connman (i.e. link is down) + + :param interface: interface label + :param settings: + - ip + - netmask + - gateway + - dns + - name + :return: True if settings were applied successfully. + :rtype: bool + ''' + interface = pyiface.Interface(name=interface) + parser = configparser.ConfigParser() + if os.path.exists(INTERFACES_CONFIG): + try: + with salt.utils.files.fopen(INTERFACES_CONFIG, 'r') as config_file: + parser.read_file(config_file) + except configparser.MissingSectionHeaderError: + pass + hwaddr = interface.hwaddr[:-1] + hwaddr_section_number = ''.join(hwaddr.split(':')) + if not parser.has_section('interface_{0}'.format(hwaddr_section_number)): + parser.add_section('interface_{0}'.format(hwaddr_section_number)) + ip_address = settings.get('ip', '0.0.0.0') + netmask = settings.get('netmask', '0.0.0.0') + gateway = settings.get('gateway', '0.0.0.0') + dns_servers = settings.get('dns', '') + name = settings.get('name', 'ethernet_cable_{0}'.format(hwaddr_section_number)) + parser.set('interface_{0}'.format(hwaddr_section_number), 'IPv4', '{0}/{1}/{2}'. + format(ip_address, netmask, gateway)) + parser.set('interface_{0}'.format(hwaddr_section_number), 'Nameservers', dns_servers) + parser.set('interface_{0}'.format(hwaddr_section_number), 'Name', name) + parser.set('interface_{0}'.format(hwaddr_section_number), 'MAC', hwaddr) + parser.set('interface_{0}'.format(hwaddr_section_number), 'Type', 'ethernet') + with salt.utils.files.fopen(INTERFACES_CONFIG, 'w') as config_file: + parser.write(config_file) + return True + + def set_static_all(interface, address, netmask, gateway, nameservers): ''' Configure specified adapter to use ipv4 manual settings @@ -390,6 +492,9 @@ def set_static_all(interface, address, netmask, gateway, nameservers): nameservers = nameservers.split(' ') service = _interface_to_service(interface) if not service: + if interface in pyiface.getIfaces(): + return _configure_static_interface(interface, **{'ip': address, 'dns': ','.join(nameservers), + 'netmask': netmask, 'gateway': gateway}) raise salt.exceptions.CommandExecutionError('Invalid interface name: {0}'.format(interface)) service = pyconnman.ConnService(_add_path(service)) ipv4 = service.get_property('IPv4.Configuration') @@ -428,7 +533,9 @@ def build_interface(iface, iface_type, enable, **settings): Build an interface script for a network interface. CLI Example: + .. code-block:: bash + salt '*' ip.build_interface eth0 eth ''' if iface_type != 'eth': @@ -457,7 +564,9 @@ def build_network_settings(**settings): Build the global network script. CLI Example: + .. code-block:: bash + salt '*' ip.build_network_settings ''' changes = [] @@ -483,7 +592,9 @@ def get_network_settings(): Return the contents of the global network script. CLI Example: + .. code-block:: bash + salt '*' ip.get_network_settings ''' settings = [] @@ -499,7 +610,9 @@ def apply_network_settings(**settings): Apply global network configuration. CLI Example: + .. code-block:: bash + salt '*' ip.apply_network_settings ''' if 'require_reboot' not in settings: diff --git a/salt/modules/nix.py b/salt/modules/nix.py index d57acef3a9..39dd8f6364 100644 --- a/salt/modules/nix.py +++ b/salt/modules/nix.py @@ -5,9 +5,11 @@ Work with Nix packages .. versionadded:: 2017.7.0 -Does not require the machine to be Nixos, just have Nix installed and available to use for the user running this command. Their profile must -be located in their home, under ``$HOME/.nix-profile/``, and the nix store, unless specially set up, should be in ``/nix``. To easily use this -with multiple users or a root user, set up the _`nix-daemon`. +Does not require the machine to be Nixos, just have Nix installed and available +to use for the user running this command. Their profile must be located in +their home, under ``$HOME/.nix-profile/``, and the nix store, unless specially +set up, should be in ``/nix``. To easily use this with multiple users or a root +user, set up the `nix-daemon`_. This module exposes most of the common nix operations. Currently not meant to be run as a ``pkg`` module, but explicitly as ``nix.*``. diff --git a/salt/modules/nova.py b/salt/modules/nova.py index d23afe3b0c..9e7708bdbf 100644 --- a/salt/modules/nova.py +++ b/salt/modules/nova.py @@ -5,7 +5,9 @@ Module for handling OpenStack Nova calls :depends: - novaclient Python module :configuration: This module is not usable until the user, password, tenant, and auth URL are specified either in a pillar or in the minion's config file. - For example:: + For example: + + .. code-block:: yaml keystone.user: admin keystone.password: verybadpass @@ -16,7 +18,9 @@ Module for handling OpenStack Nova calls If configuration for multiple OpenStack accounts is required, they can be set up as different configuration profiles: - For example:: + For example: + + .. code-block:: yaml openstack1: keystone.user: admin @@ -32,14 +36,17 @@ Module for handling OpenStack Nova calls With this configuration in place, any of the nova functions can make use of a configuration profile by declaring it explicitly. - For example:: + For example: + + .. code-block:: bash salt '*' nova.flavor_list profile=openstack1 To use keystoneauth1 instead of keystoneclient, include the `use_keystoneauth` option in the pillar or minion config. - .. note:: this is required to use keystone v3 as for authentication. + .. note:: + This is required to use keystone v3 as for authentication. .. code-block:: yaml @@ -51,12 +58,15 @@ Module for handling OpenStack Nova calls keystone.verify: '/path/to/custom/certs/ca-bundle.crt' - Note: by default the nova module will attempt to verify its connection - utilizing the system certificates. If you need to verify against another bundle - of CA certificates or want to skip verification altogether you will need to - specify the `verify` option. You can specify True or False to verify (or not) - against system certificates, a path to a bundle or CA certs to check against, or - None to allow keystoneauth to search for the certificates on its own.(defaults to True) + .. note:: + By default the nova module will attempt to verify its connection + utilizing the system certificates. If you need to verify against + another bundle of CA certificates or want to skip verification + altogether you will need to specify the `verify` option. You can + specify True or False to verify (or not) against system certificates, a + path to a bundle or CA certs to check against, or None to allow + keystoneauth to search for the certificates on its own. (defaults to + True) ''' from __future__ import absolute_import, unicode_literals, print_function @@ -196,9 +206,7 @@ def volume_list(search_opts=None, profile=None): .. code-block:: bash - salt '*' nova.volume_list \ - search_opts='{"display_name": "myblock"}' \ - profile=openstack + salt '*' nova.volume_list search_opts='{"display_name": "myblock"}' profile=openstack ''' conn = _auth(profile) @@ -337,8 +345,7 @@ def volume_attach(name, .. code-block:: bash salt '*' nova.volume_attach myblock slice.example.com profile=openstack - salt '*' nova.volume_attach myblock server.example.com \ - device='/dev/xvdb' profile=openstack + salt '*' nova.volume_attach myblock server.example.com device=/dev/xvdb profile=openstack ''' conn = _auth(profile) @@ -461,8 +468,7 @@ def flavor_create(name, # pylint: disable=C0103 .. code-block:: bash - salt '*' nova.flavor_create myflavor flavor_id=6 \ - ram=4096 disk=10 vcpus=1 + salt '*' nova.flavor_create myflavor flavor_id=6 ram=4096 disk=10 vcpus=1 ''' conn = _auth(profile) return conn.flavor_create( @@ -510,7 +516,7 @@ def keypair_add(name, pubfile=None, pubkey=None, profile=None): .. code-block:: bash - salt '*' nova.keypair_add mykey pubfile='/home/myuser/.ssh/id_rsa.pub' + salt '*' nova.keypair_add mykey pubfile=/home/myuser/.ssh/id_rsa.pub salt '*' nova.keypair_add mykey pubkey='ssh-rsa myuser@mybox' ''' conn = _auth(profile) @@ -529,7 +535,7 @@ def keypair_delete(name, profile=None): .. code-block:: bash - salt '*' nova.keypair_delete mykey' + salt '*' nova.keypair_delete mykey ''' conn = _auth(profile) return conn.keypair_delete(name) @@ -562,8 +568,7 @@ def image_meta_set(image_id=None, .. code-block:: bash - salt '*' nova.image_meta_set 6f52b2ff-0b31-4d84-8fd1-af45b84824f6 \ - cheese=gruyere + salt '*' nova.image_meta_set 6f52b2ff-0b31-4d84-8fd1-af45b84824f6 cheese=gruyere salt '*' nova.image_meta_set name=myimage salad=pasta beans=baked ''' conn = _auth(profile) @@ -586,8 +591,7 @@ def image_meta_delete(image_id=None, # pylint: disable=C0103 .. code-block:: bash - salt '*' nova.image_meta_delete \ - 6f52b2ff-0b31-4d84-8fd1-af45b84824f6 keys=cheese + salt '*' nova.image_meta_delete 6f52b2ff-0b31-4d84-8fd1-af45b84824f6 keys=cheese salt '*' nova.image_meta_delete name=myimage keys=salad,beans ''' conn = _auth(profile) diff --git a/salt/modules/opkg.py b/salt/modules/opkg.py index 80e0720c3b..6ac568614d 100644 --- a/salt/modules/opkg.py +++ b/salt/modules/opkg.py @@ -56,23 +56,32 @@ log = logging.getLogger(__name__) # Define the module's virtual name __virtualname__ = 'pkg' -NILRT_MODULE_STATE_PATH = '/var/lib/salt/kernel_module_state' +NILRT_RESTARTCHECK_STATE_PATH = '/var/lib/salt/restartcheck_state' -def _update_nilrt_module_dep_info(): +def _update_nilrt_restart_state(): ''' - Update modules.dep timestamp & checksum. + NILRT systems determine whether to reboot after various package operations + including but not limited to kernel module installs/removals by checking + specific file md5sums & timestamps. These files are touched/modified by + the post-install/post-remove functions of their respective packages. + + The opkg module uses this function to store/update those file timestamps + and checksums to be used later by the restartcheck module. - NILRT systems determine whether to reboot after kernel module install/ - removals/etc by checking modules.dep which gets modified/touched by - each kernel module on-target dkms-like compilation. This function - updates the module.dep data after each opkg kernel module operation - which needs a reboot as detected by the salt checkrestart module. ''' __salt__['cmd.shell']('stat -c %Y /lib/modules/$(uname -r)/modules.dep >{0}/modules.dep.timestamp' - .format(NILRT_MODULE_STATE_PATH)) + .format(NILRT_RESTARTCHECK_STATE_PATH)) __salt__['cmd.shell']('md5sum /lib/modules/$(uname -r)/modules.dep >{0}/modules.dep.md5sum' - .format(NILRT_MODULE_STATE_PATH)) + .format(NILRT_RESTARTCHECK_STATE_PATH)) + + # We can't assume nisysapi.ini always exists like modules.dep + nisysapi_path = '/usr/local/natinst/share/nisysapi.ini' + if os.path.exists(nisysapi_path): + __salt__['cmd.shell']('stat -c %Y {0} >{1}/nisysapi.ini.timestamp' + .format(nisysapi_path, NILRT_RESTARTCHECK_STATE_PATH)) + __salt__['cmd.shell']('md5sum {0} >{1}/nisysapi.ini.md5sum' + .format(nisysapi_path, NILRT_RESTARTCHECK_STATE_PATH)) def _get_restartcheck_result(errors): @@ -94,7 +103,7 @@ def _process_restartcheck_result(rs_result): return for rstr in rs_result: if 'System restart required' in rstr: - _update_nilrt_module_dep_info() + _update_nilrt_restart_state() __salt__['system.set_reboot_required_witnessed']() else: service = os.path.join('/etc/init.d', rstr) @@ -108,16 +117,17 @@ def __virtual__(): ''' if __grains__.get('os_family') == 'NILinuxRT': try: - os.makedirs(NILRT_MODULE_STATE_PATH) + os.makedirs(NILRT_RESTARTCHECK_STATE_PATH) except OSError as exc: if exc.errno != errno.EEXIST: return False, 'Error creating {0} (-{1}): {2}'.format( - NILRT_MODULE_STATE_PATH, + NILRT_RESTARTCHECK_STATE_PATH, exc.errno, exc.strerror) - if not (os.path.exists(os.path.join(NILRT_MODULE_STATE_PATH, 'modules.dep.timestamp')) and - os.path.exists(os.path.join(NILRT_MODULE_STATE_PATH, 'modules.dep.md5sum'))): - _update_nilrt_module_dep_info() + # modules.dep always exists, make sure it's restart state files also exist + if not (os.path.exists(os.path.join(NILRT_RESTARTCHECK_STATE_PATH, 'modules.dep.timestamp')) and + os.path.exists(os.path.join(NILRT_RESTARTCHECK_STATE_PATH, 'modules.dep.md5sum'))): + _update_nilrt_restart_state() return __virtualname__ if os.path.isdir(OPKG_CONFDIR): @@ -1108,7 +1118,7 @@ def version_cmp(pkg1, pkg2, ignore_epoch=False, **kwargs): # pylint: disable=un def list_repos(**kwargs): # pylint: disable=unused-argument ''' - Lists all repos on /etc/opkg/*.conf + Lists all repos on ``/etc/opkg/*.conf`` CLI Example: @@ -1146,7 +1156,7 @@ def list_repos(**kwargs): # pylint: disable=unused-argument def get_repo(alias, **kwargs): # pylint: disable=unused-argument ''' - Display a repo from the /etc/opkg/*.conf + Display a repo from the ``/etc/opkg/*.conf`` CLI Examples: @@ -1220,7 +1230,7 @@ def _mod_repo_in_file(alias, repostr, filepath): def del_repo(alias, **kwargs): # pylint: disable=unused-argument ''' - Delete a repo from /etc/opkg/*.conf + Delete a repo from ``/etc/opkg/*.conf`` If the file does not contain any other repo configuration, the file itself will be deleted. diff --git a/salt/modules/oracle.py b/salt/modules/oracle.py index 68f1baf7ce..b8be41a23c 100644 --- a/salt/modules/oracle.py +++ b/salt/modules/oracle.py @@ -23,9 +23,14 @@ Oracle DataBase connection module .. code-block:: yaml - oracle.dbs: list of known based - oracle.dbs..uri: connection credentials in format: - user/password@host[:port]/sid[ as {sysdba|sysoper}] + oracle: + dbs: + : + uri: connection credentials in format: + user/password@host[:port]/sid[ servicename as {sysdba|sysoper}] + optional keyword servicename will determine whether it is a sid or service_name + : + uri: ..... ''' from __future__ import absolute_import, print_function, unicode_literals @@ -92,9 +97,14 @@ def _connect(uri): else: credentials = uri_l[0] mode = 0 + + serv_name = False userpass, hostportsid = credentials.split('@') user, password = userpass.split('/') hostport, sid = hostportsid.split('/') + if 'servicename' in sid: + serv_name = True + sid = sid.split('servicename')[0].strip() hostport_l = hostport.split(':') if len(hostport_l) == 2: host, port = hostport_l @@ -104,7 +114,12 @@ def _connect(uri): log.debug('connect: %s', (user, password, host, port, sid, mode)) # force UTF-8 client encoding os.environ['NLS_LANG'] = '.AL32UTF8' - conn = cx_Oracle.connect(user, password, + if serv_name: + conn = cx_Oracle.connect(user, password, + cx_Oracle.makedsn(host, port, service_name=sid), + mode) + else: + conn = cx_Oracle.connect(user, password, cx_Oracle.makedsn(host, port, sid), mode) conn.outputtypehandler = _unicode_output diff --git a/salt/modules/out.py b/salt/modules/out.py index 3a95572881..792c046689 100644 --- a/salt/modules/out.py +++ b/salt/modules/out.py @@ -47,7 +47,7 @@ def out_format(data, out='nested', opts=None, **kwargs): opts Dictionary of configuration options. Default: ``__opts__``. - **kwargs + kwargs Arguments to sent to the outputter module. CLI Example: @@ -74,7 +74,7 @@ def string_format(data, out='nested', opts=None, **kwargs): opts Dictionary of configuration options. Default: ``__opts__``. - **kwargs + kwargs Arguments to sent to the outputter module. CLI Example: @@ -101,7 +101,7 @@ def html_format(data, out='nested', opts=None, **kwargs): opts Dictionary of configuration options. Default: ``__opts__``. - **kwargs + kwargs Arguments to sent to the outputter module. CLI Example: diff --git a/salt/modules/panos.py b/salt/modules/panos.py index bf71e7d47d..f14f0f635f 100644 --- a/salt/modules/panos.py +++ b/salt/modules/panos.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- ''' -Module to provide Palo Alto compatibility to Salt. +Module to provide Palo Alto compatibility to Salt -:codeauthor: :email:`Spencer Ervin ` +:codeauthor: ``Spencer Ervin `` :maturity: new :depends: none :platform: unix @@ -17,7 +17,7 @@ parameters, or as configuration settings in pillar as a Salt proxy. Options passed into opts will be ignored if options are passed into pillar. .. seealso:: - :prox:`Palo Alto Proxy Module ` + :py:mod:`Palo Alto Proxy Module ` About ===== diff --git a/salt/modules/parallels.py b/salt/modules/parallels.py index b17e623d43..7d9ee1bbd4 100644 --- a/salt/modules/parallels.py +++ b/salt/modules/parallels.py @@ -77,11 +77,9 @@ def _find_guids(guid_string): Example data (this string contains two distinct GUIDs): - .. code-block:: - - PARENT_SNAPSHOT_ID SNAPSHOT_ID - {a5b8999f-5d95-4aff-82de-e515b0101b66} - {a5b8999f-5d95-4aff-82de-e515b0101b66} *{a7345be5-ab66-478c-946e-a6c2caf14909} + PARENT_SNAPSHOT_ID SNAPSHOT_ID + {a5b8999f-5d95-4aff-82de-e515b0101b66} + {a5b8999f-5d95-4aff-82de-e515b0101b66} *{a7345be5-ab66-478c-946e-a6c2caf14909} ''' guids = [] for found_guid in re.finditer(GUID_REGEX, guid_string): diff --git a/salt/modules/pcs.py b/salt/modules/pcs.py index 57d9f9f2fe..6900c065ee 100644 --- a/salt/modules/pcs.py +++ b/salt/modules/pcs.py @@ -147,10 +147,7 @@ def auth(nodes, pcsuser='hacluster', pcspasswd='hacluster', extra_args=None): .. code-block:: bash - salt '*' pcs.auth nodes='[ node1.example.org node2.example.org ]' \\ - pcsuser='hacluster' \\ - pcspasswd='hoonetorg' \\ - extra_args=[ '--force' ] + salt '*' pcs.auth nodes='[ node1.example.org node2.example.org ]' pcsuser=hacluster pcspasswd=hoonetorg extra_args="[ '--force' ]" ''' cmd = ['pcs', 'cluster', 'auth'] @@ -201,8 +198,7 @@ def cluster_setup(nodes, pcsclustername='pcscluster', extra_args=None): .. code-block:: bash - salt '*' pcs.cluster_setup nodes='[ node1.example.org node2.example.org ]' \\ - pcsclustername='pcscluster' + salt '*' pcs.cluster_setup nodes='[ node1.example.org node2.example.org ]' pcsclustername=pcscluster ''' cmd = ['pcs', 'cluster', 'setup'] @@ -228,7 +224,7 @@ def cluster_node_add(node, extra_args=None): .. code-block:: bash - salt '*' pcs.cluster_node_add node=node2.example.org' + salt '*' pcs.cluster_node_add node=node2.example.org ''' cmd = ['pcs', 'cluster', 'node', 'add'] @@ -254,8 +250,7 @@ def cib_create(cibfile, scope='configuration', extra_args=None): .. code-block:: bash - salt '*' pcs.cib_create cibfile='/tmp/VIP_apache_1.cib' \\ - 'scope=False' + salt '*' pcs.cib_create cibfile='/tmp/VIP_apache_1.cib' scope=False ''' cmd = ['pcs', 'cluster', 'cib', cibfile] if isinstance(scope, six.string_types): @@ -281,8 +276,7 @@ def cib_push(cibfile, scope='configuration', extra_args=None): .. code-block:: bash - salt '*' pcs.cib_push cibfile='/tmp/VIP_apache_1.cib' \\ - 'scope=False' + salt '*' pcs.cib_push cibfile='/tmp/VIP_apache_1.cib' scope=False ''' cmd = ['pcs', 'cluster', 'cib-push', cibfile] if isinstance(scope, six.string_types): @@ -324,9 +318,7 @@ def prop_show(prop, extra_args=None, cibfile=None): .. code-block:: bash - salt '*' pcs.prop_show cibfile='/tmp/2_node_cluster.cib' \\ - prop='no-quorum-policy' \\ - cibfile='/tmp/2_node_cluster.cib' + salt '*' pcs.prop_show cibfile='/tmp/2_node_cluster.cib' prop='no-quorum-policy' cibfile='/tmp/2_node_cluster.cib' ''' return item_show(item='property', item_id=prop, extra_args=extra_args, cibfile=cibfile) @@ -348,9 +340,7 @@ def prop_set(prop, value, extra_args=None, cibfile=None): .. code-block:: bash - salt '*' pcs.prop_set prop='no-quorum-policy' \\ - value='ignore' \\ - cibfile='/tmp/2_node_cluster.cib' + salt '*' pcs.prop_set prop='no-quorum-policy' value='ignore' cibfile='/tmp/2_node_cluster.cib' ''' return item_create(item='property', item_id='{0}={1}'.format(prop, value), @@ -375,8 +365,7 @@ def stonith_show(stonith_id, extra_args=None, cibfile=None): .. code-block:: bash - salt '*' pcs.stonith_show stonith_id='eps_fence' \\ - cibfile='/tmp/2_node_cluster.cib' + salt '*' pcs.stonith_show stonith_id='eps_fence' cibfile='/tmp/2_node_cluster.cib' ''' return item_show(item='stonith', item_id=stonith_id, extra_args=extra_args, cibfile=cibfile) @@ -398,19 +387,8 @@ def stonith_create(stonith_id, stonith_device_type, stonith_device_options=None, .. code-block:: bash - salt '*' pcs.stonith_create stonith_id='eps_fence' \\ - stonith_device_type='fence_eps' \\ - stonith_device_options="[ \\ - 'pcmk_host_map=node1.example.org:01;node2.example.org:02', \\ - 'ipaddr=myepsdevice.example.org', \\ - 'action=reboot', \\ - 'power_wait=5', \\ - 'verbose=1', \\ - 'debug=/var/log/pcsd/eps_fence.log', \\ - 'login=hidden', \\ - 'passwd=hoonetorg' \\ - ]" \\ - cibfile='/tmp/cib_for_stonith.cib' + salt '*' pcs.stonith_create stonith_id='eps_fence' stonith_device_type='fence_eps' + stonith_device_options="['pcmk_host_map=node1.example.org:01;node2.example.org:02', 'ipaddr=myepsdevice.example.org', 'action=reboot', 'power_wait=5', 'verbose=1', 'debug=/var/log/pcsd/eps_fence.log', 'login=hidden', 'passwd=hoonetorg']" cibfile='/tmp/cib_for_stonith.cib' ''' return item_create(item='stonith', item_id=stonith_id, @@ -434,8 +412,7 @@ def resource_show(resource_id, extra_args=None, cibfile=None): .. code-block:: bash - salt '*' pcs.resource_show resource_id='galera' \\ - cibfile='/tmp/cib_for_galera.cib' + salt '*' pcs.resource_show resource_id='galera' cibfile='/tmp/cib_for_galera.cib' ''' return item_show(item='resource', item_id=resource_id, extra_args=extra_args, cibfile=cibfile) @@ -457,13 +434,7 @@ def resource_create(resource_id, resource_type, resource_options=None, cibfile=N .. code-block:: bash - salt '*' pcs.resource_create resource_id='galera' \\ - resource_type='ocf:heartbeat:galera' \\ - resource_options="[ \\ - 'wsrep_cluster_address=gcomm://node1.example.org,node2.example.org,node3.example.org' \\ - '--master' \\ - ]" \\ - cibfile='/tmp/cib_for_galera.cib' + salt '*' pcs.resource_create resource_id='galera' resource_type='ocf:heartbeat:galera' resource_options="['wsrep_cluster_address=gcomm://node1.example.org,node2.example.org,node3.example.org', '--master']" cibfile='/tmp/cib_for_galera.cib' ''' return item_create(item='resource', item_id=resource_id, diff --git a/salt/modules/pillar.py b/salt/modules/pillar.py index 0c704a11f8..c85669d645 100644 --- a/salt/modules/pillar.py +++ b/salt/modules/pillar.py @@ -40,10 +40,10 @@ def get(key, ''' .. versionadded:: 0.14 - Attempt to retrieve the named value from pillar, if the named value is not - available return the passed default. The default return is an empty string - except ``__opts__['pillar_raise_on_missing']`` is set to True, in which - case a ``KeyError`` exception will be raised. + Attempt to retrieve the named value from :ref:`in-memory pillar data + `. If the pillar key is not present in the in-memory + pillar, then the value specified in the ``default`` option (described + below) will be returned. If the merge parameter is set to ``True``, the default will be recursively merged into the returned pillar data. @@ -62,8 +62,12 @@ def get(key, The pillar key to get value from default - If specified, return this value in case when named pillar value does - not exist. + The value specified by this option will be returned if the desired + pillar key does not exist. + + If a default value is specified, then it will be an empty string, + unless :conf_minion:`pillar_raise_on_missing` is set to ``True``, in + which case an error will be raised. merge : ``False`` If ``True``, the retrieved values will be merged into the passed diff --git a/salt/modules/pip.py b/salt/modules/pip.py index e5bda8a916..68ed8098a3 100644 --- a/salt/modules/pip.py +++ b/salt/modules/pip.py @@ -172,20 +172,7 @@ def _get_pip_bin(bin_env): # If the python binary was passed, return it if 'python' in os.path.basename(bin_env): return [os.path.normpath(bin_env), '-m', 'pip'] - # Try to find the python binary based on the location of pip in a - # virtual environment, should be relative - if 'pip' in os.path.basename(bin_env): - # Look in the same directory as the pip binary, and also its - # parent directories. - pip_dirname = os.path.dirname(bin_env) - pip_parent_dir = os.path.dirname(pip_dirname) - for bin_path in _search_paths(pip_dirname, pip_parent_dir): - if os.path.isfile(bin_path): - logger.debug('pip: Found python binary: %s', bin_path) - return [os.path.normpath(bin_path), '-m', 'pip'] - - # Couldn't find python, use the passed pip binary - # This has the limitation of being unable to update pip itself + # We have been passed a pip binary, use the pip binary. return [os.path.normpath(bin_env)] raise CommandExecutionError( @@ -465,6 +452,13 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914 ``/usr/bin/pip-2.7`` or ``/usr/bin/pip-2.6``. If a directory path is specified, it is assumed to be a virtualenv. + .. note:: + + For Windows, if the pip module is being used to upgrade the pip + package, bin_env should be the path to the virtualenv or to the + python binary that should be used. The pip command is unable to + upgrade itself in Windows. + use_wheel Prefer wheel archives (requires pip>=1.4) @@ -1436,7 +1430,8 @@ def list_all_versions(pkg, include_rc=False, user=None, cwd=None, - index_url=None): + index_url=None, + extra_index_url=None): ''' .. versionadded:: 2017.7.3 @@ -1470,6 +1465,10 @@ def list_all_versions(pkg, Base URL of Python Package Index .. versionadded:: Fluorine + extra_index_url + Additional URL of Python Package Index + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1486,6 +1485,13 @@ def list_all_versions(pkg, ) cmd.extend(['--index-url', index_url]) + if extra_index_url: + if not salt.utils.url.validate(extra_index_url, VALID_PROTOS): + raise CommandExecutionError( + '\'{0}\' is not a valid URL'.format(extra_index_url) + ) + cmd.extend(['--extra-index-url', extra_index_url]) + cmd_kwargs = dict(cwd=cwd, runas=user, output_loglevel='quiet', redirect_stderr=True) if bin_env and os.path.isdir(bin_env): cmd_kwargs['env'] = {'VIRTUAL_ENV': bin_env} diff --git a/salt/modules/pkgin.py b/salt/modules/pkgin.py index a8ba9a481a..240f79ca26 100644 --- a/salt/modules/pkgin.py +++ b/salt/modules/pkgin.py @@ -147,6 +147,7 @@ def search(pkg_name): def latest_version(*names, **kwargs): ''' .. versionchanged: 2016.3.0 + Return the latest version of the named package available for upgrade or installation. @@ -263,6 +264,7 @@ def refresh_db(force=False): def list_pkgs(versions_as_list=False, **kwargs): ''' .. versionchanged: 2016.3.0 + List the packages currently installed as a dict:: {'': ''} @@ -656,6 +658,7 @@ def file_list(package): def file_dict(*packages): ''' .. versionchanged: 2016.3.0 + List the files that belong to a package. CLI Examples: diff --git a/salt/modules/pkgng.py b/salt/modules/pkgng.py index 65ba6d7f89..4ec00d9bf0 100644 --- a/salt/modules/pkgng.py +++ b/salt/modules/pkgng.py @@ -1885,7 +1885,7 @@ def hold(name=None, pkgs=None, **kwargs): # pylint: disable=W0613 .. note:: This function is provided primarily for compatibilty with some - parts of :py:module:`states.pkg `. + parts of :py:mod:`states.pkg `. Consider using Consider using :py:func:`pkg.lock ` instead. instead. name @@ -1949,9 +1949,9 @@ def unhold(name=None, pkgs=None, **kwargs): # pylint: disable=W0613 Remove version locks .. note:: - This function is provided primarily for compatibilty with some - parts of :py:module:`states.pkg `. - Consider using :py:func:`pkg.unlock ` instead. + This function is provided primarily for compatibilty with some parts of + :py:mod:`states.pkg `. Consider using + :py:func:`pkg.unlock ` instead. name The name of the package to be unheld diff --git a/salt/modules/postfix.py b/salt/modules/postfix.py index 09b043f503..2557d7b70e 100644 --- a/salt/modules/postfix.py +++ b/salt/modules/postfix.py @@ -293,9 +293,10 @@ def set_main(key, value, path=MAIN_CF): pairs, conf_list = _parse_main(path) new_conf = [] + key_line_match = re.compile("^{0}([\\s=]|$)".format(re.escape(key))) if key in pairs: for line in conf_list: - if line.startswith(key): + if re.match(key_line_match, line): new_conf.append('{0} = {1}'.format(key, value)) else: new_conf.append(line) diff --git a/salt/modules/postgres.py b/salt/modules/postgres.py index a300e1b1d8..a18f75f4bd 100644 --- a/salt/modules/postgres.py +++ b/salt/modules/postgres.py @@ -199,7 +199,9 @@ def _run_initdb(name, password=None, encoding='UTF8', locale=None, - runas=None): + runas=None, + waldir=None, + checksums=False): ''' Helper function to call initdb ''' @@ -227,6 +229,15 @@ def _run_initdb(name, if locale is not None: cmd.append('--locale={0}'.format(locale)) + # intentionally use short option, as the long option name has been + # renamed from "xlogdir" to "waldir" in PostgreSQL 10 + if waldir is not None: + cmd.append('-X') + cmd.append(waldir) + + if checksums: + cmd.append('--data-checksums') + if password is not None: pgpassfile = salt.utils.files.mkstemp(text=True) with salt.utils.files.fopen(pgpassfile, 'w') as fp_: @@ -1464,11 +1475,12 @@ def is_available_extension(name, def _pg_is_older_ext_ver(a, b): - '''Return true if version a is lesser than b - TODO: be more intelligent to test versions - ''' - return a < b + Compare versions of extensions using salt.utils.versions.LooseVersion. + + Returns ``True`` if version a is lesser than b. + ''' + return _LooseVersion(a) < _LooseVersion(b) def is_installed_extension(name, @@ -3079,6 +3091,8 @@ def datadir_init(name, password=None, encoding='UTF8', locale=None, + waldir=None, + checksums=False, runas=None): ''' .. versionadded:: 2016.3.0 @@ -3109,8 +3123,22 @@ def datadir_init(name, locale The default locale for new databases + waldir + The transaction log (WAL) directory (default is to keep WAL + inside the data directory) + + .. versionadded:: Fluorine + + checksums + If True, the cluster will be created with data page checksums. + + .. note:: Data page checksums are supported since PostgreSQL 9.3. + + .. versionadded:: Fluorine + runas The system user the operation should be performed on behalf of + ''' if datadir_exists(name): log.info('%s already exists', name) diff --git a/salt/modules/purefb.py b/salt/modules/purefb.py index de4c641fba..91ec9bd659 100644 --- a/salt/modules/purefb.py +++ b/salt/modules/purefb.py @@ -297,8 +297,9 @@ def fs_create(name, size=None, proto='NFS', nfs_rules='*(rw,no_root_squash)', sn snapshot: boolean (Optional) Are snapshots enabled on the filesystem. Default is False nfs_rules : string - (Optional) export rules for NFS. If not specified default is *(rw,no_root_squash) - Refer to Pure Storage documentation for formatting rules. + (Optional) export rules for NFS. If not specified default is + ``*(rw,no_root_squash)``. Refer to Pure Storage documentation for + formatting rules. size : string if specified capacity of filesystem. If not specified default to 32G. Refer to Pure Storage documentation for formatting rules. diff --git a/salt/modules/rabbitmq.py b/salt/modules/rabbitmq.py index 273f562614..4532114276 100644 --- a/salt/modules/rabbitmq.py +++ b/salt/modules/rabbitmq.py @@ -19,6 +19,7 @@ import salt.utils.path import salt.utils.platform import salt.utils.user from salt.exceptions import CommandExecutionError, SaltInvocationError +from salt.utils.versions import LooseVersion as _LooseVersion # Import 3rd-party libs from salt.ext import six @@ -555,7 +556,7 @@ def set_permissions(vhost, user, conf='.*', write='.*', read='.*', runas=None): .. code-block:: bash - salt '*' rabbitmq.set_permissions 'myvhost' 'myuser' + salt '*' rabbitmq.set_permissions myvhost myuser ''' if runas is None and not salt.utils.platform.is_windows(): runas = salt.utils.user.get_user() @@ -577,7 +578,7 @@ def list_permissions(vhost, runas=None): .. code-block:: bash - salt '*' rabbitmq.list_permissions '/myvhost' + salt '*' rabbitmq.list_permissions /myvhost ''' if runas is None and not salt.utils.platform.is_windows(): runas = salt.utils.user.get_user() @@ -598,7 +599,7 @@ def list_user_permissions(name, runas=None): .. code-block:: bash - salt '*' rabbitmq.list_user_permissions 'user'. + salt '*' rabbitmq.list_user_permissions user ''' if runas is None and not salt.utils.platform.is_windows(): runas = salt.utils.user.get_user() @@ -618,7 +619,7 @@ def set_user_tags(name, tags, runas=None): .. code-block:: bash - salt '*' rabbitmq.set_user_tags 'myadmin' 'administrator' + salt '*' rabbitmq.set_user_tags myadmin administrator ''' if runas is None and not salt.utils.platform.is_windows(): runas = salt.utils.user.get_user() @@ -685,7 +686,7 @@ def join_cluster(host, user='rabbit', ram_node=None, runas=None): .. code-block:: bash - salt '*' rabbitmq.join_cluster 'rabbit.example.com' 'rabbit' + salt '*' rabbitmq.join_cluster rabbit.example.com rabbit ''' cmd = [RABBITMQCTL, 'join_cluster'] if ram_node: @@ -837,7 +838,7 @@ def list_policies(vhost="/", runas=None): .. code-block:: bash - salt '*' rabbitmq.list_policies' + salt '*' rabbitmq.list_policies ''' ret = {} if runas is None and not salt.utils.platform.is_windows(): @@ -849,24 +850,43 @@ def list_policies(vhost="/", runas=None): python_shell=False) _check_response(res) output = res['stdout'] + + if __grains__['os_family'] != 'FreeBSD': + version = __salt__['pkg.version']('rabbitmq-server').split('-')[0] + else: + version = __salt__['pkg.version']('rabbitmq').split('-')[0] + for line in _output_lines_to_list(output): parts = line.split('\t') + if len(parts) not in (5, 6): continue + vhost, name = parts[0], parts[1] if vhost not in ret: ret[vhost] = {} ret[vhost][name] = {} - # How many fields are there? - 'apply_to' was inserted in position - # 2 at some point - offset = len(parts) - 5 - if len(parts) == 6: - ret[vhost][name]['apply_to'] = parts[2] - ret[vhost][name].update({ - 'pattern': parts[offset+2], - 'definition': parts[offset+3], - 'priority': parts[offset+4] - }) + + if _LooseVersion(version) >= _LooseVersion("3.7"): + # in version 3.7 the position of apply_to and pattern has been + # switched + ret[vhost][name]['pattern'] = parts[2] + ret[vhost][name]['apply_to'] = parts[3] + ret[vhost][name]['definition'] = parts[4] + ret[vhost][name]['priority'] = parts[5] + else: + # How many fields are there? - 'apply_to' was inserted in position + # 2 at some point + # and in version 3.7 the position of apply_to and pattern has been + # switched + offset = len(parts) - 5 + if len(parts) == 6: + ret[vhost][name]['apply_to'] = parts[2] + ret[vhost][name].update({ + 'pattern': parts[offset+2], + 'definition': parts[offset+3], + 'priority': parts[offset+4] + }) return ret @@ -919,7 +939,7 @@ def delete_policy(vhost, name, runas=None): .. code-block:: bash - salt '*' rabbitmq.delete_policy / HA' + salt '*' rabbitmq.delete_policy / HA ''' if runas is None and not salt.utils.platform.is_windows(): runas = salt.utils.user.get_user() diff --git a/salt/modules/reg.py b/salt/modules/reg.py index 5f06b5f728..3531110ab1 100644 --- a/salt/modules/reg.py +++ b/salt/modules/reg.py @@ -2,22 +2,20 @@ r''' Manage the Windows registry ------ Hives ----- Hives are the main sections of the registry and all begin with the word HKEY. - - HKEY_LOCAL_MACHINE - - HKEY_CURRENT_USER - - HKEY_USER +- HKEY_LOCAL_MACHINE +- HKEY_CURRENT_USER +- HKEY_USER + ----- Keys ---- Keys are the folders in the registry. Keys can have many nested subkeys. Keys can have a value assigned to them under the (Default) ------------------ Values or Entries ----------------- @@ -25,7 +23,6 @@ Values or Entries are the name/data pairs beneath the keys and subkeys. All keys have a default name/data pair. The name is ``(Default)`` with a displayed value of ``(value not set)``. The actual value is Null. -------- Example ------- diff --git a/salt/modules/restartcheck.py b/salt/modules/restartcheck.py index c4cf642c64..42227d13bc 100644 --- a/salt/modules/restartcheck.py +++ b/salt/modules/restartcheck.py @@ -345,34 +345,64 @@ def _check_timeout(start_time, timeout): raise salt.exceptions.TimeoutError('Timeout expired.') +def _file_changed_nilrt(full_filepath): + ''' + Detect whether a file changed in an NILinuxRT system using md5sum and timestamp + files from a state directory. + + Returns: + - False if md5sum/timestamp state files don't exist + - True/False depending if ``base_filename`` got modified/touched + ''' + rs_state_dir = "/var/lib/salt/restartcheck_state" + base_filename = os.path.basename(full_filepath) + timestamp_file = os.path.join(rs_state_dir, '{0}.timestamp'.format(base_filename)) + md5sum_file = os.path.join(rs_state_dir, '{0}.md5sum'.format(base_filename)) + + if not os.path.exists(timestamp_file) or not os.path.exists(md5sum_file): + return False + + prev_timestamp = __salt__['file.read'](timestamp_file).rstrip() + # Need timestamp in seconds so floor it using int() + cur_timestamp = str(int(os.path.getmtime(full_filepath))) + + if prev_timestamp != cur_timestamp: + return True + + return bool(__salt__['cmd.retcode']('md5sum -cs {0}'.format(md5sum_file), output_loglevel="quiet")) + + def _kernel_modules_changed_nilrt(kernelversion): ''' Once a NILRT kernel module is inserted, it can't be rmmod so systems need - rebooting (some modules explicitely ask for reboots even on first install), + rebooting (some modules explicitly ask for reboots even on first install), hence this functionality of determining if the module state got modified by testing if depmod was run. Returns: - True/False depending if modules.dep got modified/touched ''' - depmodpath_base = '/lib/modules/{0}/modules.dep'.format(kernelversion) - depmodpath_timestamp = "/var/lib/salt/kernel_module_state/modules.dep.timestamp" - depmodpath_md5sum = "/var/lib/salt/kernel_module_state/modules.dep.md5sum" + if kernelversion is not None: + return _file_changed_nilrt('/lib/modules/{0}/modules.dep'.format(kernelversion)) + return False - # nothing can be detected without these dependencies - if (kernelversion is None or - not os.path.exists(depmodpath_timestamp) or - not os.path.exists(depmodpath_md5sum)): - return False - prev_timestamp = __salt__['file.read'](depmodpath_timestamp).rstrip() - # need timestamp in seconds so floor it using int() - cur_timestamp = str(int(os.path.getmtime(depmodpath_base))) +def _sysapi_changed_nilrt(): + ''' + Besides the normal Linux kernel driver interfaces, NILinuxRT-supported hardware features an + extensible, plugin-based device enumeration and configuration interface named "System API". + When an installed package is extending the API it is very hard to know all repercurssions and + actions to be taken, so reboot making sure all drivers are reloaded, hardware reinitialized, + daemons restarted, etc. - if prev_timestamp != cur_timestamp: - return True - - return bool(__salt__['cmd.retcode']('md5sum -cs {0}'.format(depmodpath_md5sum), output_loglevel="quiet")) + Returns: + - True/False depending on if nisysapi.ini got modified/touched + - False if nisysapi.ini does not exist to avoid triggering unnecessary reboots + ''' + nisysapi_path = '/usr/local/natinst/share/nisysapi.ini' + if os.path.exists(nisysapi_path): + return _file_changed_nilrt(nisysapi_path) + return False # pylint: disable=too-many-locals,too-many-branches,too-many-statements @@ -427,8 +457,8 @@ def restartcheck(ignorelist=None, blacklist=None, excludepid=None, **kwargs): _check_timeout(start_time, timeout) if kernel in kernel_current: if __grains__.get('os_family') == 'NILinuxRT': - # Check kernel modules for version changes - if not _kernel_modules_changed_nilrt(kernel): + # Check kernel modules and hardware API's for version changes + if not _kernel_modules_changed_nilrt(kernel) and not _sysapi_changed_nilrt(): kernel_restart = False break else: diff --git a/salt/modules/rpm.py b/salt/modules/rpm.py index 3683234f59..15738b2523 100644 --- a/salt/modules/rpm.py +++ b/salt/modules/rpm.py @@ -9,6 +9,7 @@ import logging import os import re import datetime +from salt.utils.versions import LooseVersion # Import Salt libs import salt.utils.decorators.path @@ -609,7 +610,7 @@ def info(*packages, **kwargs): # pick only latest versions # (in case multiple packages installed, e.g. kernel) ret = dict() - for pkg_data in reversed(sorted(_ret, key=lambda x: x['edition'])): + for pkg_data in reversed(sorted(_ret, key=lambda x: LooseVersion(x['edition']))): pkg_name = pkg_data.pop('name') # Filter out GPG public keys packages if pkg_name.startswith('gpg-pubkey'): diff --git a/salt/modules/rpmbuild.py b/salt/modules/rpmbuild.py index 3fd3c94931..832570e6df 100644 --- a/salt/modules/rpmbuild.py +++ b/salt/modules/rpmbuild.py @@ -213,7 +213,7 @@ def make_src_pkg(dest_dir, spec, sources, env=None, template=None, saltenv='base runas The user to run the build process as - .. versionadded:: 2018.3.2 + .. versionadded:: 2018.3.3 .. note:: diff --git a/salt/modules/runit.py b/salt/modules/runit.py index 3827cf41be..75615448d2 100644 --- a/salt/modules/runit.py +++ b/salt/modules/runit.py @@ -561,10 +561,8 @@ def enable(name, start=False, **kwargs): name the service's name - start - ``False`` : Do not start the service once enabled. Default mode. - (consistent with other service management) - ``True`` : also start the service at the same time (default sv mode) + start : False + If ``True``, start the service once enabled. CLI Example: diff --git a/salt/modules/s6.py b/salt/modules/s6.py index b9785cb6b7..f938ae4142 100644 --- a/salt/modules/s6.py +++ b/salt/modules/s6.py @@ -14,7 +14,7 @@ so it can be used to maintain services using the ``provider`` argument: Note that the ``enabled`` argument is not available with this provider. -:codeauthor: :email:`Marek Skrobacki ` +:codeauthor: Marek Skrobacki ''' from __future__ import absolute_import, unicode_literals, print_function diff --git a/salt/modules/saltcheck.py b/salt/modules/saltcheck.py index 900546c65e..e4801d6a4e 100644 --- a/salt/modules/saltcheck.py +++ b/salt/modules/saltcheck.py @@ -2,65 +2,62 @@ ''' A module for testing the logic of states and highstates -Saltcheck provides unittest like functionality requiring only the knowledge of salt module execution and yaml. - -In order to run state and highstate saltcheck tests a sub-folder of a state must be creaed and named "saltcheck-tests". - -Tests for a state should be created in files ending in *.tst and placed in the saltcheck-tests folder. - -Multiple tests can be created in a file. -Multiple *.tst files can be created in the saltcheck-tests folder. -Salt rendering is supported in test files e.g. yaml + jinja. -The "id" of a test works in the same manner as in salt state files. -They should be unique and descriptive. - -Example file system layout: -/srv/salt/apache/ - init.sls - config.sls - saltcheck-tests/ - pkg_and_mods.tst - config.tst - - -Saltcheck Test Syntax: - -Unique-ID: - module_and_function: - args: - kwargs: - assertion: - expected-return: - - -Example test 1: - -echo-test-hello: - module_and_function: test.echo - args: - - "hello" - kwargs: - assertion: assertEqual - expected-return: 'hello' - - :codeauthor: William Cannon :maturity: new + +Saltcheck provides unittest like functionality requiring only the knowledge of +salt module execution and yaml. + +In order to run state and highstate saltcheck tests a sub-folder of a state must +be created and named ``saltcheck-tests``. + +Tests for a state should be created in files ending in ``*.tst`` and placed in +the ``saltcheck-tests`` folder. + +Multiple tests can be created in a file. Multiple ``*.tst`` files can be +created in the ``saltcheck-tests`` folder. Salt rendering is supported in test +files (e.g. ``yaml + jinja``). The ``id`` of a test works in the same manner as +in salt state files. They should be unique and descriptive. + +Example file system layout: + +.. code-block: txt + + /srv/salt/apache/ + init.sls + config.sls + saltcheck-tests/ + pkg_and_mods.tst + config.tst + +Example: + +.. code-block:: yaml + + echo-test-hello: + module_and_function: test.echo + args: + - "hello" + kwargs: + assertion: assertEqual + expected-return: 'hello' + ''' + +# Import Python libs from __future__ import absolute_import, unicode_literals, print_function import logging import os import time from json import loads, dumps -try: - import salt.utils.files - import salt.utils.path - import salt.utils.yaml - import salt.client - import salt.exceptions - from salt.ext import six -except ImportError: - pass + +# Import Salt libs +import salt.utils.files +import salt.utils.path +import salt.utils.yaml +import salt.client +import salt.exceptions +from salt.ext import six log = logging.getLogger(__name__) @@ -81,6 +78,9 @@ def update_master_cache(): Can be automated by setting "auto_update_master_cache: True" in minion config CLI Example: + + .. code-block:: bash + salt '*' saltcheck.update_master_cache ''' __salt__['cp.cache_master']() @@ -92,7 +92,11 @@ def run_test(**kwargs): Execute one saltcheck test and return result :param keyword arg test: - CLI Example:: + + CLI Example: + + .. code-block:: bash + salt '*' saltcheck.run_test test='{"module_and_function": "test.echo", "assertion": "assertEqual", @@ -115,8 +119,11 @@ def run_state_tests(state): :param str state: the name of a user defined state - CLI Example:: - salt '*' saltcheck.run_state_tests postfix + CLI Example: + + .. code-block:: bash + + salt '*' saltcheck.run_state_tests postfix ''' scheck = SaltCheck() paths = scheck.get_state_search_path_list() @@ -157,8 +164,11 @@ def run_highstate_tests(): ''' Execute all tests for a salt highstate and return results - CLI Example:: - salt '*' saltcheck.run_highstate_tests + CLI Example: + + .. code-block:: bash + + salt '*' saltcheck.run_highstate_tests ''' scheck = SaltCheck() paths = scheck.get_state_search_path_list() @@ -203,7 +213,9 @@ def run_highstate_tests(): def _render_file(file_path): - '''call the salt utility to render a file''' + ''' + call the salt utility to render a file + ''' # salt-call slsutil.renderer /srv/salt/jinjatest/saltcheck-tests/test1.tst rendered = __salt__['slsutil.renderer'](file_path) log.info("rendered: %s", rendered) @@ -211,19 +223,25 @@ def _render_file(file_path): def _is_valid_module(module): - '''return a list of all modules available on minion''' + ''' + Return a list of all modules available on minion + ''' modules = __salt__['sys.list_modules']() return bool(module in modules) def _get_auto_update_cache_value(): - '''return the config value of auto_update_master_cache''' + ''' + Return the config value of auto_update_master_cache + ''' __salt__['config.get']('auto_update_master_cache') return True def _is_valid_function(module_name, function): - '''Determine if a function is valid for a module''' + ''' + Determine if a function is valid for a module + ''' try: functions = __salt__['sys.list_functions'](module_name) except salt.exceptions.SaltException: @@ -232,7 +250,9 @@ def _is_valid_function(module_name, function): def _get_top_states(): - ''' equivalent to a salt cli: salt web state.show_top''' + ''' + Equivalent to a salt cli: salt web state.show_top + ''' alt_states = [] try: returned = __salt__['state.show_top']() @@ -245,7 +265,9 @@ def _get_top_states(): def _get_state_sls(state): - ''' equivalent to a salt cli: salt web state.show_low_sls STATE''' + ''' + Equivalent to a salt cli: salt web state.show_low_sls STATE + ''' sls_list_state = [] try: returned = __salt__['state.show_low_sls'](state) @@ -281,11 +303,14 @@ class SaltCheck(object): update_master_cache() def __is_valid_test(self, test_dict): - '''Determine if a test contains: - a test name, - a valid module and function, - a valid assertion, - an expected return value''' + ''' + Determine if a test contains: + + - a test name + - a valid module and function + - a valid assertion + - an expected return value + ''' tots = 0 # need total of >= 6 to be a valid test m_and_f = test_dict.get('module_and_function', None) assertion = test_dict.get('assertion', None) @@ -314,7 +339,9 @@ class SaltCheck(object): fun, args, kwargs): - '''Generic call of salt Caller command''' + ''' + Generic call of salt Caller command + ''' value = False try: if args and kwargs: @@ -332,7 +359,9 @@ class SaltCheck(object): return value def run_test(self, test_dict): - '''Run a single saltcheck test''' + ''' + Run a single saltcheck test + ''' if self.__is_valid_test(test_dict): mod_and_func = test_dict['module_and_function'] args = test_dict.get('args', None) @@ -516,8 +545,9 @@ class SaltCheck(object): @staticmethod def get_state_search_path_list(): - '''For the state file system, return a - list of paths to search for states''' + ''' + For the state file system, return a list of paths to search for states + ''' # state cache should be updated before running this method search_list = [] cachedir = __opts__.get('cachedir', None) @@ -533,7 +563,7 @@ class SaltCheck(object): class StateTestLoader(object): ''' Class loads in test files for a state - e.g. state_dir/saltcheck-tests/[1.tst, 2.tst, 3.tst] + e.g. state_dir/saltcheck-tests/[1.tst, 2.tst, 3.tst] ''' def __init__(self, search_paths): @@ -543,7 +573,9 @@ class StateTestLoader(object): self.test_dict = {} def load_test_suite(self): - '''load tests either from one file, or a set of files''' + ''' + Load tests either from one file, or a set of files + ''' self.test_dict = {} for myfile in self.test_files: # self.load_file(myfile) @@ -578,7 +610,9 @@ class StateTestLoader(object): return def gather_files(self, filepath): - '''gather files for a test suite''' + ''' + Gather files for a test suite + ''' self.test_files = [] log.info("gather_files: %s", time.time()) filepath = filepath + os.sep + 'saltcheck-tests' @@ -594,7 +628,9 @@ class StateTestLoader(object): @staticmethod def convert_sls_to_paths(sls_list): - '''Converting sls to paths''' + ''' + Converting sls to paths + ''' new_sls_list = [] for sls in sls_list: sls = sls.replace(".", os.sep) @@ -603,12 +639,16 @@ class StateTestLoader(object): @staticmethod def convert_sls_to_path(sls): - '''Converting sls to paths''' + ''' + Converting sls to paths + ''' sls = sls.replace(".", os.sep) return sls def add_test_files_for_sls(self, sls_path): - '''Adding test files''' + ''' + Adding test files + ''' for path in self.search_paths: full_path = path + os.sep + sls_path rootdir = full_path diff --git a/salt/modules/service.py b/salt/modules/service.py index a041fb1e0f..c26c6500b7 100644 --- a/salt/modules/service.py +++ b/salt/modules/service.py @@ -106,7 +106,7 @@ def start(name): salt '*' service.start ''' - return __salt__['service.run'](name, 'start') + return run(name, 'start') def stop(name): @@ -119,7 +119,7 @@ def stop(name): salt '*' service.stop ''' - return __salt__['service.run'](name, 'stop') + return run(name, 'stop') def restart(name): @@ -132,7 +132,7 @@ def restart(name): salt '*' service.restart ''' - return __salt__['service.run'](name, 'restart') + return run(name, 'restart') def status(name, sig=None): @@ -185,7 +185,7 @@ def reload_(name): salt '*' service.reload ''' - return __salt__['service.run'](name, 'reload') + return run(name, 'reload') def available(name): diff --git a/salt/modules/smartos_imgadm.py b/salt/modules/smartos_imgadm.py index c11285a4ba..d6fc5873e0 100644 --- a/salt/modules/smartos_imgadm.py +++ b/salt/modules/smartos_imgadm.py @@ -25,38 +25,6 @@ __func_alias__ = { __virtualname__ = 'imgadm' -def _exit_status(retcode): - ''' - Translate exit status of imgadm - ''' - ret = {0: 'Successful completion.', - 1: 'An error occurred.', - 2: 'Usage error.', - 3: 'Image not installed.'}[retcode] - return ret - - -def _parse_image_meta(image=None, detail=False): - if not image: - return {} - - if detail: - return { - 'name': image['manifest']['name'], - 'version': image['manifest']['version'], - 'os': image['manifest']['os'], - 'description': image['manifest']['description'], - 'published': image['manifest']['published_at'], - 'source': image['source'] - } - else: - return '{name}@{version} [{date}]'.format( - name=image['manifest']['name'], - version=image['manifest']['version'], - date=image['manifest']['published_at'], - ) - - def __virtual__(): ''' Provides imgadm only on SmartOS @@ -72,6 +40,102 @@ def __virtual__(): ) +def _exit_status(retcode, stderr=None): + ''' + Translate exit status of imgadm + ''' + ret = {0: 'Successful completion.', + 1: 'An error occurred.' if not stderr else stderr, + 2: 'Usage error.', + 3: 'Image not installed.'}[retcode] + return ret + + +def _parse_image_meta(image=None, detail=False): + ret = None + + if image and 'Error' in image: + ret = image + elif image: + name = image['manifest']['name'] + version = image['manifest']['version'] + os = image['manifest']['os'] + description = image['manifest']['description'] + published = image['manifest']['published_at'] + source = image['source'] + if image['manifest']['name'] == 'docker-layer': + # NOTE: skip docker-layer unless it has a docker:repo and docker:tag + name = None + docker_repo = None + docker_tag = None + for tag in image['manifest']['tags']: + if tag.startswith('docker:tag:') and image['manifest']['tags'][tag]: + docker_tag = tag.split(':')[-1] + elif tag == 'docker:repo': + docker_repo = image['manifest']['tags'][tag] + + if docker_repo and docker_tag: + name = '{}:{}'.format(docker_repo, docker_tag) + description = 'Docker image imported from {repo}:{tag} on {date}.'.format( + repo=docker_repo, + tag=docker_tag, + date=published, + ) + + if name and detail: + ret = { + 'name': name, + 'version': version, + 'os': os, + 'description': description, + 'published': published, + 'source': source, + } + elif name: + ret = '{name}@{version} [{published}]'.format( + name=name, + version=version, + published=published, + ) + + return ret + + +def _split_docker_uuid(uuid): + ''' + Split a smartos docker uuid into repo and tag + ''' + if uuid: + uuid = uuid.split(':') + if len(uuid) == 2: + tag = uuid[1] + repo = uuid[0] + if len(repo.split('/')) == 2: + return repo, tag + return None, None + + +def _is_uuid(uuid): + ''' + Check if uuid is a valid smartos uuid + + Example: e69a0918-055d-11e5-8912-e3ceb6df4cf8 + ''' + if uuid and list((len(x) for x in uuid.split('-'))) == [8, 4, 4, 4, 12]: + return True + return False + + +def _is_docker_uuid(uuid): + ''' + Check if uuid is a valid smartos docker uuid + + Example plexinc/pms-docker:plexpass + ''' + repo, tag = _split_docker_uuid(uuid) + return not (not repo and not tag) + + def version(): ''' Return imgadm version @@ -89,6 +153,22 @@ def version(): return ret[-1] +def docker_to_uuid(uuid): + ''' + Get the image uuid from an imported docker image + + .. versionadded:: Fluorine + ''' + if _is_uuid(uuid): + return uuid + if _is_docker_uuid(uuid): + images = list_installed(verbose=True) + for image_uuid in images: + if images[image_uuid]['name'] == uuid: + return image_uuid + return None + + def update_installed(uuid=''): ''' Gather info on unknown image(s) (locally installed) @@ -127,7 +207,6 @@ def avail(search=None, verbose=False): cmd = 'imgadm avail -j' res = __salt__['cmd.run_all'](cmd) retcode = res['retcode'] - result = {} if retcode != 0: ret['Error'] = _exit_status(retcode) return ret @@ -138,9 +217,12 @@ def avail(search=None, verbose=False): if search and search not in image['manifest']['name']: # we skip if we are searching but don't have a match continue - result[image['manifest']['uuid']] = _parse_image_meta(image, verbose) + uuid = image['manifest']['uuid'] + data = _parse_image_meta(image, verbose) + if data: + ret[uuid] = data - return result + return ret def list_installed(verbose=False): @@ -150,25 +232,33 @@ def list_installed(verbose=False): verbose : boolean (False) toggle verbose output + .. versionchanged:: Fluorine + + Docker images are now also listed + CLI Example: .. code-block:: bash - salt '*' imgadm.list [verbose=True] + salt '*' imgadm.list + salt '*' imgadm.list docker=True + salt '*' imgadm.list verbose=True ''' ret = {} cmd = 'imgadm list -j' res = __salt__['cmd.run_all'](cmd) retcode = res['retcode'] - result = {} if retcode != 0: ret['Error'] = _exit_status(retcode) return ret for image in salt.utils.json.loads(res['stdout']): - result[image['manifest']['uuid']] = _parse_image_meta(image, verbose) + uuid = image['manifest']['uuid'] + data = _parse_image_meta(image, verbose) + if data: + ret[uuid] = data - return result + return ret def show(uuid): @@ -183,15 +273,21 @@ def show(uuid): .. code-block:: bash salt '*' imgadm.show e42f8c84-bbea-11e2-b920-078fab2aab1f + salt '*' imgadm.show plexinc/pms-docker:plexpass ''' ret = {} - cmd = 'imgadm show {0}'.format(uuid) - res = __salt__['cmd.run_all'](cmd, python_shell=False) - retcode = res['retcode'] - if retcode != 0: - ret['Error'] = _exit_status(retcode) - return ret - ret = salt.utils.json.loads(res['stdout']) + + if _is_uuid(uuid) or _is_docker_uuid(uuid): + cmd = 'imgadm show {0}'.format(uuid) + res = __salt__['cmd.run_all'](cmd, python_shell=False) + retcode = res['retcode'] + if retcode != 0: + ret['Error'] = _exit_status(retcode, res['stderr']) + else: + ret = salt.utils.json.loads(res['stdout']) + else: + ret['Error'] = "{} is not a valid uuid.".format(uuid) + return ret @@ -207,15 +303,24 @@ def get(uuid): .. code-block:: bash salt '*' imgadm.get e42f8c84-bbea-11e2-b920-078fab2aab1f + salt '*' imgadm.get plexinc/pms-docker:plexpass ''' ret = {} - cmd = 'imgadm get {0}'.format(uuid) - res = __salt__['cmd.run_all'](cmd, python_shell=False) - retcode = res['retcode'] - if retcode != 0: - ret['Error'] = _exit_status(retcode) - return ret - ret = salt.utils.json.loads(res['stdout']) + + if _is_docker_uuid(uuid): + uuid = docker_to_uuid(uuid) + + if _is_uuid(uuid): + cmd = 'imgadm get {0}'.format(uuid) + res = __salt__['cmd.run_all'](cmd, python_shell=False) + retcode = res['retcode'] + if retcode != 0: + ret['Error'] = _exit_status(retcode, res['stderr']) + else: + ret = salt.utils.json.loads(res['stdout']) + else: + ret['Error'] = "{} is not a valid uuid.".format(uuid) + return ret @@ -242,7 +347,9 @@ def import_image(uuid, verbose=False): ret['Error'] = _exit_status(retcode) return ret - return {uuid: _parse_image_meta(get(uuid), verbose)} + uuid = docker_to_uuid(uuid) + data = _parse_image_meta(get(uuid), verbose) + return {uuid: data} def delete(uuid): @@ -308,4 +415,97 @@ def vacuum(verbose=False): return list(result.keys()) +def sources(verbose=False): + ''' + Return a list of available sources + + verbose : boolean (False) + toggle verbose output + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' imgadm.sources + ''' + ret = {} + cmd = 'imgadm sources -j' + res = __salt__['cmd.run_all'](cmd) + retcode = res['retcode'] + if retcode != 0: + ret['Error'] = _exit_status(retcode) + return ret + + for src in salt.utils.json.loads(res['stdout']): + ret[src['url']] = src + del src['url'] + + if not verbose: + ret = list(ret) + + return ret + + +def source_delete(source): + ''' + Delete a source + + source : string + source url to delete + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' imgadm.source_delete https://updates.joyent.com + ''' + ret = {} + cmd = 'imgadm sources -d {0}'.format(source) + res = __salt__['cmd.run_all'](cmd) + retcode = res['retcode'] + if retcode != 0: + ret['Error'] = _exit_status(retcode, res['stderr']) + return ret + + return sources(False) + + +def source_add(source, source_type='imgapi'): + ''' + Add a new source + + source : string + source url to add + source_trype : string (imgapi) + source type, either imgapi or docker + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' imgadm.source_add https://updates.joyent.com + salt '*' imgadm.source_add https://docker.io docker + ''' + ret = {} + + # NOTE: there are some undocumented deprecated source types + # so we just warn instead of error on those + if source_type not in ['imgapi', 'docker']: + log.warning('Possible unsupported imgage source type specified!') + + cmd = 'imgadm sources -a {0} -t {1}'.format(source, source_type) + res = __salt__['cmd.run_all'](cmd) + retcode = res['retcode'] + if retcode != 0: + ret['Error'] = _exit_status(retcode, res['stderr']) + return ret + + return sources(False) + # vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 diff --git a/salt/modules/smtp.py b/salt/modules/smtp.py index ff50b3382d..0da29acbf9 100644 --- a/salt/modules/smtp.py +++ b/salt/modules/smtp.py @@ -43,14 +43,20 @@ Module for Sending Messages via SMTP from __future__ import absolute_import, unicode_literals, print_function import logging +import os import socket +# Import salt libs +import salt.utils.files + log = logging.getLogger(__name__) HAS_LIBS = False try: import smtplib import email.mime.text + import email.mime.application + import email.mime.multipart HAS_LIBS = True except ImportError: pass @@ -76,7 +82,8 @@ def send_msg(recipient, use_ssl='True', username=None, password=None, - profile=None): + profile=None, + attachments=None): ''' Send a message to an SMTP recipient. Designed for use in states. @@ -84,11 +91,9 @@ def send_msg(recipient, .. code-block:: bash - smtp.send_msg 'admin@example.com' 'This is a salt module test' \ - profile='my-smtp-account' - smtp.send_msg 'admin@example.com' 'This is a salt module test' \ - username='myuser' password='verybadpass' sender="admin@example.com' \ - server='smtp.domain.com' + salt '*' smtp.send_msg 'admin@example.com' 'This is a salt module test' profile='my-smtp-account' + salt '*' smtp.send_msg 'admin@example.com' 'This is a salt module test' username='myuser' password='verybadpass' sender='admin@example.com' server='smtp.domain.com' + salt '*' smtp.send_msg 'admin@example.com' 'This is a salt module test' username='myuser' password='verybadpass' sender='admin@example.com' server='smtp.domain.com' attachments="['/var/log/messages']" ''' if profile: creds = __salt__['config.option'](profile) @@ -98,7 +103,11 @@ def send_msg(recipient, username = creds.get('smtp.username') password = creds.get('smtp.password') - msg = email.mime.text.MIMEText(message) + if attachments: + msg = email.mime.multipart.MIMEMultipart() + msg.attach(email.mime.text.MIMEText(message)) + else: + msg = email.mime.text.MIMEText(message) msg['Subject'] = subject msg['From'] = sender msg['To'] = recipient @@ -139,6 +148,14 @@ def send_msg(recipient, log.debug("SMTP Authentication Failure") return False + if attachments: + for f in attachments: + name = os.path.basename(f) + with salt.utils.files.fopen(f, 'rb') as fin: + att = email.mime.application.MIMEApplication(fin.read(), Name=name) + att['Content-Disposition'] = 'attachment; filename="{0}"'.format(name) + msg.attach(att) + try: smtpconn.sendmail(sender, recipients, msg.as_string()) except smtplib.SMTPRecipientsRefused: diff --git a/salt/modules/snapper.py b/salt/modules/snapper.py index f72012960c..74648a8a70 100644 --- a/salt/modules/snapper.py +++ b/salt/modules/snapper.py @@ -227,8 +227,8 @@ def set_config(name='root', **kwargs): salt '*' snapper.set_config SYNC_ACL=True - Keys are case insensitive as they will be always uppercased to - snapper convention. The above example is equivalent to: + Keys are case insensitive as they will be always uppercased to snapper + convention. The above example is equivalent to: .. code-block:: bash diff --git a/salt/modules/solaris_user.py b/salt/modules/solaris_user.py index 617dffa541..5107435cc9 100644 --- a/salt/modules/solaris_user.py +++ b/salt/modules/solaris_user.py @@ -438,8 +438,11 @@ def list_groups(name): def list_users(): ''' Return a list of all users + CLI Example: + .. code-block:: bash + salt '*' user.list_users ''' return sorted([user.pw_name for user in pwd.getpwall()]) diff --git a/salt/modules/state.py b/salt/modules/state.py index cd25ec920f..a04308811c 100644 --- a/salt/modules/state.py +++ b/salt/modules/state.py @@ -602,8 +602,7 @@ def template_str(tem, queue=False, **kwargs): return ret -def apply_(mods=None, - **kwargs): +def apply_(mods=None, **kwargs): ''' .. versionadded:: 2015.5.0 @@ -743,6 +742,22 @@ def apply_(mods=None, .. code-block:: bash salt '*' state.apply test localconfig=/path/to/minion.yml + + sync_mods + If specified, the desired custom module types will be synced prior to + running the SLS files: + + .. code-block:: bash + + salt '*' state.apply test sync_mods=states,modules + salt '*' state.apply test sync_mods=all + + .. note:: + This option is ignored when no SLS files are specified, as a + :ref:`highstate ` automatically syncs all custom + module types. + + .. versionadded:: 2017.7.8,2018.3.3,Fluorine ''' if mods: return sls(mods, **kwargs) @@ -1068,7 +1083,7 @@ def highstate(test=None, queue=False, **kwargs): return ret -def sls(mods, test=None, exclude=None, queue=False, **kwargs): +def sls(mods, test=None, exclude=None, queue=False, sync_mods=None, **kwargs): ''' Execute the states in one or more SLS files @@ -1160,6 +1175,17 @@ def sls(mods, test=None, exclude=None, queue=False, **kwargs): .. versionadded:: 2015.8.4 + sync_mods + If specified, the desired custom module types will be synced prior to + running the SLS files: + + .. code-block:: bash + + salt '*' state.sls test sync_mods=states,modules + salt '*' state.sls test sync_mods=all + + .. versionadded:: 2017.7.8,2018.3.3,Fluorine + CLI Example: .. code-block:: bash @@ -1223,6 +1249,28 @@ def sls(mods, test=None, exclude=None, queue=False, **kwargs): '{0}.cache.p'.format(kwargs.get('cache_name', 'highstate')) ) + if sync_mods is True: + sync_mods = ['all'] + if sync_mods is not None: + sync_mods = salt.utils.args.split_input(sync_mods) + else: + sync_mods = [] + + if 'all' in sync_mods and sync_mods != ['all']: + # Prevent unnecessary extra syncing + sync_mods = ['all'] + + for module_type in sync_mods: + try: + __salt__['saltutil.sync_{0}'.format(module_type)]( + saltenv=opts['saltenv'] + ) + except KeyError: + log.warning( + 'Invalid custom module type \'%s\', ignoring', + module_type + ) + try: st_ = salt.state.HighState(opts, pillar_override, @@ -2084,9 +2132,9 @@ def pkg(pkg_path, # Verify that the tarball does not extract outside of the intended root members = s_pkg.getmembers() for member in members: - if member.path.startswith((os.sep, '..{0}'.format(os.sep))): + if salt.utils.stringutils.to_unicode(member.path).startswith((os.sep, '..{0}'.format(os.sep))): return {} - elif '..{0}'.format(os.sep) in member.path: + elif '..{0}'.format(os.sep) in salt.utils.stringutils.to_unicode(member.path): return {} s_pkg.extractall(root) s_pkg.close() diff --git a/salt/modules/statuspage.py b/salt/modules/statuspage.py index 0880a84593..3fa5dd0aa4 100644 --- a/salt/modules/statuspage.py +++ b/salt/modules/statuspage.py @@ -173,9 +173,6 @@ def create(endpoint='incidents', api_url Custom API URL in case the user has a StatusPage service running in a custom environment. - **kwargs - Other params. - CLI Example: .. code-block:: bash diff --git a/salt/modules/system.py b/salt/modules/system.py index 0a09cef95c..37e5f48235 100644 --- a/salt/modules/system.py +++ b/salt/modules/system.py @@ -256,10 +256,10 @@ def get_system_time(utc_offset=None): Get the system time. :param str utc_offset: The utc offset in 4 digit (+0600) format with an - optional sign (+/-). Will default to None which will use the local - timezone. To set the time based off of UTC use "'+0000'". Note: if being - passed through the command line will need to be quoted twice to allow - negative offsets. + optional sign (+/-). Will default to None which will use the local + timezone. To set the time based off of UTC use "'+0000'". Note: if + being passed through the command line will need to be quoted twice to + allow negative offsets. :return: Returns the system time in HH:MM:SS AM/PM format. :rtype: str @@ -290,10 +290,10 @@ def set_system_time(newtime, utc_offset=None): Meaning you may have to quote the text twice from the command line. :param str utc_offset: The utc offset in 4 digit (+0600) format with an - optional sign (+/-). Will default to None which will use the local - timezone. To set the time based off of UTC use "'+0000'". Note: if being - passed through the command line will need to be quoted twice to allow - negative offsets. + optional sign (+/-). Will default to None which will use the local + timezone. To set the time based off of UTC use "'+0000'". Note: if + being passed through the command line will need to be quoted twice to + allow negative offsets. :return: Returns True if successful. Otherwise False. :rtype: bool @@ -317,10 +317,10 @@ def get_system_date_time(utc_offset=None): Get the system date/time. :param str utc_offset: The utc offset in 4 digit (+0600) format with an - optional sign (+/-). Will default to None which will use the local - timezone. To set the time based off of UTC use "'+0000'". Note: if being - passed through the command line will need to be quoted twice to allow - negative offsets. + optional sign (+/-). Will default to None which will use the local + timezone. To set the time based off of UTC use "'+0000'". Note: if + being passed through the command line will need to be quoted twice to + allow negative offsets. :return: Returns the system time in YYYY-MM-DD hh:mm:ss format. :rtype: str @@ -358,10 +358,10 @@ def set_system_date_time(years=None, :param int minutes: Minutes digit: 0 - 59 :param int seconds: Seconds digit: 0 - 59 :param str utc_offset: The utc offset in 4 digit (+0600) format with an - optional sign (+/-). Will default to None which will use the local - timezone. To set the time based off of UTC use "'+0000'". Note: if being - passed through the command line will need to be quoted twice to allow - negative offsets. + optional sign (+/-). Will default to None which will use the local + timezone. To set the time based off of UTC use "'+0000'". Note: if + being passed through the command line will need to be quoted twice to + allow negative offsets. :return: True if successful. Otherwise False. :rtype: bool @@ -410,10 +410,10 @@ def get_system_date(utc_offset=None): Get the system date :param str utc_offset: The utc offset in 4 digit (+0600) format with an - optional sign (+/-). Will default to None which will use the local - timezone. To set the time based off of UTC use "'+0000'". Note: if being - passed through the command line will need to be quoted twice to allow - negative offsets. + optional sign (+/-). Will default to None which will use the local + timezone. To set the time based off of UTC use "'+0000'". Note: if + being passed through the command line will need to be quoted twice to + allow negative offsets. :return: Returns the system date. :rtype: str @@ -432,7 +432,8 @@ def set_system_date(newdate, utc_offset=None): Set the system date. Use format for the date. :param str newdate: - The date to set. Can be any of the following formats + The date to set. Can be any of the following formats: + - YYYY-MM-DD - MM-DD-YYYY - MM-DD-YY @@ -465,9 +466,9 @@ def set_system_date(newdate, utc_offset=None): # Note that _FixedOffset(0) is a way to build a UTC tzinfo object. class _FixedOffset(tzinfo): - """ + ''' Fixed offset in minutes east from UTC. - """ + ''' def __init__(self, offset): super(self.__class__, self).__init__() diff --git a/salt/modules/telemetry.py b/salt/modules/telemetry.py index 9582a4bd3f..06509a9b87 100644 --- a/salt/modules/telemetry.py +++ b/salt/modules/telemetry.py @@ -7,18 +7,19 @@ Connection module for Telemetry https://github.com/mongolab/mongolab-telemetry-api-docs/blob/master/alerts.md :configuration: This module accepts explicit telemetry credentials or - can also read api key credentials from a pillar. More Information available at:: + can also read api key credentials from a pillar. More Information available + here__. - https://github.com/mongolab/mongolab-telemetry-api-docs/blob/master/alerts.md +.. __: https://github.com/mongolab/mongolab-telemetry-api-docs/blob/master/alerts.md - In the minion's config file: +In the minion's config file: - .. code-block:: yaml +.. code-block:: yaml - telemetry.telemetry_api_keys: - - abc123 # Key 1 - - efg321 # Backup Key 1 - telemetry_api_base_url: https://telemetry-api.mongolab.com/v0 + telemetry.telemetry_api_keys: + - abc123 # Key 1 + - efg321 # Backup Key 1 + telemetry_api_base_url: https://telemetry-api.mongolab.com/v0 :depends: requests diff --git a/salt/modules/template.py b/salt/modules/template.py new file mode 100644 index 0000000000..47b4bd3ca4 --- /dev/null +++ b/salt/modules/template.py @@ -0,0 +1,120 @@ +# -*- coding: utf-8 -*- +''' +Template Utils +============== + +.. versionadded:: Fluorine + +A collection of helper functions to provide direct access to Salt's template +rendering system (and avoid reinventing wheels). +''' + +# Import Python libs +from __future__ import absolute_import, unicode_literals, print_function + +# Import Salt modules +from salt.utils.files import mkstemp +from salt.exceptions import CommandExecutionError + + +def render(source=None, + source_string=None, + template_engine='jinja', + source_hash=None, + source_hash_name=None, + user=None, + group=None, + mode=None, + attrs=None, + context=None, + defaults=None, + skip_verify=True, + saltenv='base'): + ''' + Render the remote template file, or the template as string. + + source + The template source file to be rendered. No need to use this argument + when passing ``source_string``. + + This can be specified using the absolute path to the file, or using one + of the following URL schemes: + + - ``salt://``, to fetch the file from the Salt fileserver. + - ``http://`` or ``https://`` + - ``ftp://`` + - ``s3://`` + - ``swift://`` + + source_string + The template source, as text. No need to use this argument when passing + ``source``. + + template_engine: ``jinja`` + The template engine to use when rendering the source file. Default: + ``jinja``. To simply fetch the file without attempting to render, set + this argument to ``None``. + + source_hash + The hash of the ``source`` file. + + source_hash_name + When ``source_hash`` refers to a remote file, this specifies the + filename to look for in that file. + + user + Owner of the file. + + group + Group owner of the file. + + mode + Permissions of the file. + + attrs + Attributes of the file. + + context + Variables to add to the template context. + + defaults + Default values of the context dictionary. + + skip_verify: ``True`` + If ``True``, hash verification of remote file sources (``http://``, + ``https://``, ``ftp://``, etc.) will be skipped, and the ``source_hash`` + argument will be ignored. + + CLI Example: + + .. code-block:: bash + + salt '*' template.render source=https://bit.ly/2yuSs2Y context="{'hostname': 'example.com'}" + salt '*' template.render source=salt://path/to/template.mako context="{'hostname': 'example.com'}" + salt '*' template.render source_string='hostname {{ hostname }}' context="{'hostname': 'example.com'}" + ''' + dest_file = mkstemp() + if source_string: + source = mkstemp() + __salt__['file.write'](source, source_string) + file_mgd = __salt__['file.get_managed'](dest_file, + template_engine, + source, + source_hash, + source_hash_name, + user, + group, + mode, + attrs, + saltenv, + context, + defaults, + skip_verify) + if not file_mgd[0]: + raise CommandExecutionError(file_mgd[2]) + file_str = __salt__['file.read'](file_mgd[0]) + # Removing the temporary file(s) created along the way + __salt__['file.remove'](file_mgd[0]) + if source_string: + __salt__['file.remove'](source) + return file_str diff --git a/salt/modules/testinframod.py b/salt/modules/testinframod.py index 394dbec969..9a81a372d0 100644 --- a/salt/modules/testinframod.py +++ b/salt/modules/testinframod.py @@ -16,7 +16,6 @@ import types log = logging.getLogger(__name__) -from salt.ext import six try: import testinfra from testinfra import modules @@ -218,7 +217,7 @@ def _copy_function(module_name, name=None): comparison: eq ``` """ - log.debug('Generating function for %s module', module_name) + log.debug('Generating function for testinfra.%s', module_name) def _run_tests(name, **methods): success = True @@ -278,9 +277,15 @@ def _copy_function(module_name, name=None): )) return success, pass_msgs, fail_msgs func = _run_tests + if name is not None: + # types.FunctionType requires a str for __name__ attribute, using a + # unicode type will result in a TypeError. + name = str(name) # future lint: disable=blacklisted-function + else: + name = func.__name__ return types.FunctionType(func.__code__, func.__globals__, - name or func.__name__, + name, func.__defaults__, func.__closure__) @@ -297,7 +302,7 @@ def _register_functions(): modules_ = [module_ for module_ in modules.modules] for mod_name in modules_: - mod_func = _copy_function(mod_name, six.text_type(mod_name)) + mod_func = _copy_function(mod_name, mod_name) mod_func.__doc__ = _build_doc(mod_name) __all__.append(mod_name) globals()[mod_name] = mod_func diff --git a/salt/modules/timezone.py b/salt/modules/timezone.py index a1d186195e..2a69925d9a 100644 --- a/salt/modules/timezone.py +++ b/salt/modules/timezone.py @@ -98,7 +98,7 @@ def _get_zone_sysconfig(): def _get_zone_etc_localtime(): - tzfile = '/etc/localtime' + tzfile = _get_localtime_path() tzdir = '/usr/share/zoneinfo/' tzdir_len = len(tzdir) try: @@ -281,8 +281,9 @@ def set_zone(timezone): if not os.path.exists(zonepath) and 'AIX' not in __grains__['os_family']: return 'Zone does not exist: {0}'.format(zonepath) - if os.path.exists('/etc/localtime'): - os.unlink('/etc/localtime') + tzfile = _get_localtime_path() + if os.path.exists(tzfile): + os.unlink(tzfile) if 'Solaris' in __grains__['os_family']: __salt__['file.sed']( @@ -300,7 +301,7 @@ def set_zone(timezone): __salt__['cmd.retcode'](cmd, python_shell=False) return False else: - os.symlink(zonepath, '/etc/localtime') + os.symlink(zonepath, tzfile) if 'RedHat' in __grains__['os_family']: __salt__['file.sed']( @@ -345,10 +346,10 @@ def zone_compare(timezone): return timezone == get_zone() if 'FreeBSD' in __grains__['os_family']: - if not os.path.isfile(_get_etc_localtime_path()): + if not os.path.isfile(_get_localtime_path()): return timezone == get_zone() - tzfile = _get_etc_localtime_path() + tzfile = _get_localtime_path() zonepath = _get_zone_file(timezone) try: return filecmp.cmp(tzfile, zonepath, shallow=False) @@ -364,7 +365,9 @@ def zone_compare(timezone): raise -def _get_etc_localtime_path(): +def _get_localtime_path(): + if 'NILinuxRT' in __grains__['os_family'] and 'nilrt' in __grains__['lsb_distrib_id']: + return '/etc/natinst/share/localtime' return '/etc/localtime' @@ -495,61 +498,66 @@ def set_hwclock(clock): salt '*' timezone.set_hwclock UTC ''' - os_family = __grains__['os_family'] - if os_family in ('AIX', 'NILinuxRT'): - if clock.lower() != 'utc': - raise SaltInvocationError( - 'UTC is the only permitted value' - ) - return True - - timezone = get_zone() - - if 'Solaris' in __grains__['os_family']: - if clock.lower() not in ('localtime', 'utc'): - raise SaltInvocationError( - 'localtime and UTC are the only permitted values' - ) - if 'sparc' in __grains__['cpuarch']: - raise SaltInvocationError( - 'UTC is the only choice for SPARC architecture' - ) - cmd = ['rtc', '-z', 'GMT' if clock.lower() == 'utc' else timezone] - return __salt__['cmd.retcode'](cmd, python_shell=False) == 0 - - zonepath = '/usr/share/zoneinfo/{0}'.format(timezone) - - if not os.path.exists(zonepath): - raise CommandExecutionError( - 'Zone \'{0}\' does not exist'.format(zonepath) - ) - - os.unlink('/etc/localtime') - os.symlink(zonepath, '/etc/localtime') - - if 'Arch' in __grains__['os_family']: - cmd = ['timezonectl', 'set-local-rtc', + if salt.utils.path.which('timedatectl'): + cmd = ['timedatectl', 'set-local-rtc', 'true' if clock == 'localtime' else 'false'] return __salt__['cmd.retcode'](cmd, python_shell=False) == 0 - elif 'RedHat' in __grains__['os_family']: - __salt__['file.sed']( - '/etc/sysconfig/clock', '^ZONE=.*', 'ZONE="{0}"'.format(timezone)) - elif 'Suse' in __grains__['os_family']: - __salt__['file.sed']( - '/etc/sysconfig/clock', '^TIMEZONE=.*', 'TIMEZONE="{0}"'.format(timezone)) - elif 'Debian' in __grains__['os_family']: - if clock == 'UTC': - __salt__['file.sed']('/etc/default/rcS', '^UTC=.*', 'UTC=yes') - elif clock == 'localtime': - __salt__['file.sed']('/etc/default/rcS', '^UTC=.*', 'UTC=no') - elif 'Gentoo' in __grains__['os_family']: - if clock not in ('UTC', 'localtime'): - raise SaltInvocationError( - 'Only \'UTC\' and \'localtime\' are allowed' + else: + os_family = __grains__['os_family'] + if os_family in ('AIX', 'NILinuxRT'): + if clock.lower() != 'utc': + raise SaltInvocationError( + 'UTC is the only permitted value' + ) + return True + + timezone = get_zone() + + if 'Solaris' in __grains__['os_family']: + if clock.lower() not in ('localtime', 'utc'): + raise SaltInvocationError( + 'localtime and UTC are the only permitted values' + ) + if 'sparc' in __grains__['cpuarch']: + raise SaltInvocationError( + 'UTC is the only choice for SPARC architecture' + ) + cmd = ['rtc', '-z', 'GMT' if clock.lower() == 'utc' else timezone] + return __salt__['cmd.retcode'](cmd, python_shell=False) == 0 + + zonepath = '/usr/share/zoneinfo/{0}'.format(timezone) + + if not os.path.exists(zonepath): + raise CommandExecutionError( + 'Zone \'{0}\' does not exist'.format(zonepath) ) - if clock == 'localtime': - clock = 'local' - __salt__['file.sed']( - '/etc/conf.d/hwclock', '^clock=.*', 'clock="{0}"'.format(clock)) + + os.unlink('/etc/localtime') + os.symlink(zonepath, '/etc/localtime') + + if 'Arch' in __grains__['os_family']: + cmd = ['timezonectl', 'set-local-rtc', + 'true' if clock == 'localtime' else 'false'] + return __salt__['cmd.retcode'](cmd, python_shell=False) == 0 + elif 'RedHat' in __grains__['os_family']: + __salt__['file.sed']( + '/etc/sysconfig/clock', '^ZONE=.*', 'ZONE="{0}"'.format(timezone)) + elif 'Suse' in __grains__['os_family']: + __salt__['file.sed']( + '/etc/sysconfig/clock', '^TIMEZONE=.*', 'TIMEZONE="{0}"'.format(timezone)) + elif 'Debian' in __grains__['os_family']: + if clock == 'UTC': + __salt__['file.sed']('/etc/default/rcS', '^UTC=.*', 'UTC=yes') + elif clock == 'localtime': + __salt__['file.sed']('/etc/default/rcS', '^UTC=.*', 'UTC=no') + elif 'Gentoo' in __grains__['os_family']: + if clock not in ('UTC', 'localtime'): + raise SaltInvocationError( + 'Only \'UTC\' and \'localtime\' are allowed' + ) + if clock == 'localtime': + clock = 'local' + __salt__['file.sed']( + '/etc/conf.d/hwclock', '^clock=.*', 'clock="{0}"'.format(clock)) return True diff --git a/salt/modules/tls.py b/salt/modules/tls.py index f15efcbb25..fd2a8daef9 100644 --- a/salt/modules/tls.py +++ b/salt/modules/tls.py @@ -4,8 +4,9 @@ A salt module for SSL/TLS. Can create a Certificate Authority (CA) or use Self-Signed certificates. -:depends: - PyOpenSSL Python module (0.10 or later, 0.14 or later for - X509 extension support) +:depends: PyOpenSSL Python module (0.10 or later, 0.14 or later for X509 + extension support) + :configuration: Add the following values in /etc/salt/minion for the CA module to function properly: @@ -14,7 +15,7 @@ or use Self-Signed certificates. ca.cert_base_path: '/etc/pki' -CLI Example #1 +CLI Example #1: Creating a CA, a server request and its signed certificate: .. code-block:: bash diff --git a/salt/modules/tomcat.py b/salt/modules/tomcat.py index 3d933db467..0b7d1dc0b4 100644 --- a/salt/modules/tomcat.py +++ b/salt/modules/tomcat.py @@ -180,13 +180,14 @@ def _auth(uri): def extract_war_version(war): ''' - Extract the version from the war file name. There does not seem to be a - standard for encoding the version into the `war file name - `_. + Extract the version from the war file name. There does not seem to be a + standard for encoding the version into the `war file name`_ + + .. _`war file name`: https://tomcat.apache.org/tomcat-6.0-doc/deployer-howto.html Examples: - .. code-block:: text + .. code-block:: bash /path/salt-2015.8.6.war -> 2015.8.6 /path/V6R2013xD5.war -> None @@ -204,15 +205,18 @@ def _wget(cmd, opts=None, url='http://localhost:8080/manager', timeout=180): cmd the command to execute + url - the URL of the server manager webapp - example: http://localhost:8080/manager + The URL of the server manager webapp (example: + http://localhost:8080/manager) + opts a dict of arguments + timeout timeout for HTTP request - return value is a dict in the from of:: + Return value is a dict in the from of:: { res: [True|False] diff --git a/salt/modules/vault.py b/salt/modules/vault.py index 46245646f2..8596d3dadd 100644 --- a/salt/modules/vault.py +++ b/salt/modules/vault.py @@ -111,7 +111,7 @@ Functions to interact with Hashicorp Vault. .*: - vault.generate_token -.. _vault-setup +.. _vault-setup: ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals @@ -129,14 +129,14 @@ def read_secret(path, key=None): .. code-block:: jinja - my-secret: {{ salt['vault'].read_secret('secret/my/secret', 'some-key') }} + my-secret: {{ salt['vault'].read_secret('secret/my/secret', 'some-key') }} .. code-block:: jinja - {% set supersecret = salt['vault'].read_secret('secret/my/secret') %} - secrets: - first: {{ supersecret.first }} - second: {{ supersecret.second }} + {% set supersecret = salt['vault'].read_secret('secret/my/secret') %} + secrets: + first: {{ supersecret.first }} + second: {{ supersecret.second }} ''' log.debug('Reading Vault secret for %s at %s', __grains__['id'], path) try: @@ -211,7 +211,7 @@ def delete_secret(path): .. code-block:: bash - salt '*' vault.delete_secret "secret/my/secret" + salt '*' vault.delete_secret "secret/my/secret" ''' log.debug('Deleting vault secrets for %s in %s', __grains__['id'], path) try: diff --git a/salt/modules/virt.py b/salt/modules/virt.py index 17e37a80ff..27b0129b02 100644 --- a/salt/modules/virt.py +++ b/salt/modules/virt.py @@ -43,6 +43,8 @@ the remote libvirt machine. Per call connection setup ------------------------- +.. versionadded:: Fluorine + All the calls requiring the libvirt connection configuration as mentioned above can override this configuration using ``connection``, ``username`` and ``password`` parameters. @@ -55,17 +57,16 @@ whatever the ``virt:connection`` is. The calls not using the libvirt connection setup are: - - get_profiles - - seed_non_shared_migrate - - virt_type - - is_*hyper - - all migration functions +- ``seed_non_shared_migrate`` +- ``virt_type`` +- ``is_*hyper`` +- all migration functions Reference: - - http://libvirt.org/drvesx.html#uriformat - - http://libvirt.org/uri.html#URI_config - - http://libvirt.org/auth.html#Auth_client_config +- `libvirt ESX URI format `_ +- `libvirt URI format `_ +- `libvirt authentication configuration `_ :depends: libvirt Python module ''' @@ -87,6 +88,7 @@ import datetime from xml.etree import ElementTree # Import third party libs +import xml.dom from xml.dom import minidom import jinja2 import jinja2.exceptions @@ -99,6 +101,7 @@ except ImportError: # Import salt libs import salt.utils.files +import salt.utils.json import salt.utils.network import salt.utils.path import salt.utils.stringutils @@ -127,8 +130,6 @@ VIRT_STATE_NAME_MAP = {0: 'running', 5: 'shutdown', 6: 'crashed'} -VIRT_DEFAULT_HYPER = 'kvm' - def __virtual__(): if not HAS_LIBVIRT: @@ -173,6 +174,11 @@ def __get_conn(**kwargs): ''' Detects what type of dom this node is and attempts to connect to the correct hypervisor via libvirt. + + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + ''' # This has only been tested on kvm and xen, it needs to be expanded to # support all vm layers supported by libvirt @@ -239,9 +245,21 @@ def __get_conn(**kwargs): return conn +def _get_domain_types(**kwargs): + ''' + Return the list of possible values for the type attribute. + ''' + caps = capabilities(**kwargs) + return sorted(set([x for y in [guest['arch']['domains'].keys() for guest in caps['guests']] for x in y])) + + def _get_domain(conn, *vms, **kwargs): ''' Return a domain object for the named VM or return domain object for all VMs. + + :params conn: libvirt connection object + :param vms: list of domain names to look for + :param iterable: True to return an array in all cases ''' ret = list() lookup_vms = list() @@ -275,48 +293,111 @@ def _get_domain(conn, *vms, **kwargs): def _parse_qemu_img_info(info): ''' - Parse qemu-img info output into disk infos YAML + Parse qemu-img info JSON output into disk infos dictionary ''' - output = [] - snapshots = False - columns = None - lines = info.strip().split('\n') - for line in lines: - if line.startswith('Snapshot list:'): - snapshots = True - continue + raw_infos = salt.utils.json.loads(info) + disks = [] + for disk_infos in raw_infos: + disk = { + 'file': disk_infos['filename'], + 'file format': disk_infos['format'], + 'disk size': disk_infos['actual-size'], + 'virtual size': disk_infos['virtual-size'], + 'cluster size': disk_infos['cluster-size'] + } - # If this is a copy-on-write image, then the backing file - # represents the base image - # - # backing file: base.qcow2 (actual path: /var/shared/base.qcow2) - elif line.startswith('backing file'): - matches = re.match(r'.*\(actual path: (.*?)\)', line) - if matches: - output.append('backing file: {0}'.format(matches.group(1))) - continue + if 'full-backing-filename' in disk_infos.keys(): + disk['backing file'] = format(disk_infos['full-backing-filename']) - elif snapshots: - if line.startswith('ID'): # Do not parse table headers - line = line.replace('VM SIZE', 'VMSIZE') - line = line.replace('VM CLOCK', 'TIME VMCLOCK') - columns = re.split(r'\s+', line) - columns = [c.lower() for c in columns] - output.append('snapshots:') - continue - fields = re.split(r'\s+', line) - for i, field in enumerate(fields): - sep = ' ' - if i == 0: - sep = '-' - output.append( - '{0} {1}: "{2}"'.format( - sep, columns[i], field - ) - ) - continue - output.append(line) - return '\n'.join(output) + if 'snapshots' in disk_infos.keys(): + disk['snapshots'] = [ + { + 'id': snapshot['id'], + 'tag': snapshot['name'], + 'vmsize': snapshot['vm-state-size'], + 'date': datetime.datetime.fromtimestamp( + float('{}.{}'.format(snapshot['date-sec'], snapshot['date-nsec']))).isoformat(), + 'vmclock': datetime.datetime.utcfromtimestamp( + float('{}.{}'.format(snapshot['vm-clock-sec'], + snapshot['vm-clock-nsec']))).time().isoformat() + } for snapshot in disk_infos['snapshots']] + disks.append(disk) + + for disk in disks: + if 'backing file' in disk.keys(): + candidates = [info for info in disks if 'file' in info.keys() and info['file'] == disk['backing file']] + if candidates: + disk['backing file'] = candidates[0] + + return disks[0] + + +def _get_uuid(dom): + ''' + Return a uuid from the named vm + + CLI Example: + + .. code-block:: bash + + salt '*' virt.get_uuid + ''' + uuid = '' + doc = minidom.parse(_StringIO(get_xml(dom))) + for node in doc.getElementsByTagName('uuid'): + uuid = node.firstChild.nodeValue + return uuid + + +def _get_on_poweroff(dom): + ''' + Return `on_poweroff` setting from the named vm + + CLI Example: + + .. code-block:: bash + + salt '*' virt.get_on_restart + ''' + on_poweroff = '' + doc = minidom.parse(_StringIO(get_xml(dom))) + for node in doc.getElementsByTagName('on_poweroff'): + on_poweroff = node.firstChild.nodeValue + return on_poweroff + + +def _get_on_reboot(dom): + ''' + Return `on_reboot` setting from the named vm + + CLI Example: + + .. code-block:: bash + + salt '*' virt.get_on_reboot + ''' + on_restart = '' + doc = minidom.parse(_StringIO(get_xml(dom))) + for node in doc.getElementsByTagName('on_reboot'): + on_restart = node.firstChild.nodeValue + return on_restart + + +def _get_on_crash(dom): + ''' + Return `on_crash` setting from the named vm + + CLI Example: + + .. code-block:: bash + + salt '*' virt.get_on_crash + ''' + on_crash = '' + doc = minidom.parse(_StringIO(get_xml(dom))) + for node in doc.getElementsByTagName('on_crash'): + on_crash = node.firstChild.nodeValue + return on_crash def _get_nics(dom): @@ -366,8 +447,8 @@ def _get_graphics(dom): 'listen': 'None', 'port': 'None', 'type': 'None'} - xml = dom.XMLDesc(0) - ssock = _StringIO(xml) + desc = dom.XMLDesc(0) + ssock = _StringIO(desc) doc = minidom.parse(ssock) for node in doc.getElementsByTagName('domain'): g_nodes = node.getElementsByTagName('graphics') @@ -405,25 +486,26 @@ def _get_disks(dom): qemu_target = '{0}:{1}'.format( source.getAttribute('protocol'), source.getAttribute('name')) - if qemu_target: - disks[target.getAttribute('dev')] = { - 'file': qemu_target, - 'type': elem.getAttribute('device')} - for dev in disks: - try: - hypervisor = __salt__['config.get']('libvirt:hypervisor', 'kvm') - if hypervisor not in ['qemu', 'kvm']: - break + if not qemu_target: + continue - stdout = subprocess.Popen( - ['qemu-img', 'info', disks[dev]['file']], - shell=False, - stdout=subprocess.PIPE).communicate()[0] - qemu_output = salt.utils.stringutils.to_str(stdout) - output = _parse_qemu_img_info(qemu_output) - disks[dev].update(salt.utils.yaml.safe_load(output)) - except TypeError: - disks[dev].update({'image': 'Does not exist'}) + disk = {'file': qemu_target, + 'type': elem.getAttribute('device')} + + driver = _get_xml_first_element_by_tag_name(elem, 'driver') + if driver and driver.getAttribute('type') == 'qcow2': + try: + stdout = subprocess.Popen( + ['qemu-img', 'info', '--output', 'json', '--backing-chain', disk['file']], + shell=False, + stdout=subprocess.PIPE).communicate()[0] + qemu_output = salt.utils.stringutils.to_str(stdout) + output = _parse_qemu_img_info(qemu_output) + disk.update(output) + except TypeError: + disk.update({'file': 'Does not exist'}) + + disks[target.getAttribute('dev')] = disk return disks @@ -485,11 +567,11 @@ def _gen_xml(name, diskp, nicp, hypervisor, + graphics=None, **kwargs): ''' Generate the XML string to define a libvirt VM ''' - hypervisor = 'vmware' if hypervisor == 'esxi' else hypervisor mem = int(mem) * 1024 # MB context = { 'hypervisor': hypervisor, @@ -499,11 +581,17 @@ def _gen_xml(name, } if hypervisor in ['qemu', 'kvm']: context['controller_model'] = False - elif hypervisor in ['esxi', 'vmware']: + elif hypervisor == 'vmware': # TODO: make bus and model parameterized, this works for 64-bit Linux context['controller_model'] = 'lsilogic' - context['enable_vnc'] = bool(kwargs.get('enable_vnc', True)) + # By default, set the graphics to listen to all addresses + if graphics: + if 'listen' not in graphics: + graphics['listen'] = {'type': 'address', 'address': '0.0.0.0'} + elif 'address' not in graphics['listen'] and graphics['listen']['type'] == 'address': + graphics['listen']['address'] = '0.0.0.0' + context['graphics'] = graphics if 'boot_dev' in kwargs: context['boot_dev'] = [] @@ -527,24 +615,20 @@ def _gen_xml(name, context['disks'] = {} for i, disk in enumerate(diskp): - for disk_name, args in six.iteritems(disk): - context['disks'][disk_name] = {} - fn_ = '{0}.{1}'.format(disk_name, args['format']) - context['disks'][disk_name]['file_name'] = fn_ - context['disks'][disk_name]['source_file'] = os.path.join(args['pool'], - name, - fn_) - if hypervisor in ['qemu', 'kvm']: - context['disks'][disk_name]['target_dev'] = 'vd{0}'.format(string.ascii_lowercase[i]) - context['disks'][disk_name]['address'] = False - context['disks'][disk_name]['driver'] = True - elif hypervisor in ['esxi', 'vmware']: - context['disks'][disk_name]['target_dev'] = 'sd{0}'.format(string.ascii_lowercase[i]) - context['disks'][disk_name]['address'] = True - context['disks'][disk_name]['driver'] = False - context['disks'][disk_name]['disk_bus'] = args['model'] - context['disks'][disk_name]['type'] = args['format'] - context['disks'][disk_name]['index'] = six.text_type(i) + context['disks'][disk['name']] = {} + context['disks'][disk['name']]['file_name'] = disk['filename'] + context['disks'][disk['name']]['source_file'] = disk['source_file'] + if hypervisor in ['qemu', 'kvm']: + context['disks'][disk['name']]['target_dev'] = 'vd{0}'.format(string.ascii_lowercase[i]) + context['disks'][disk['name']]['address'] = False + context['disks'][disk['name']]['driver'] = True + elif hypervisor in ['esxi', 'vmware']: + context['disks'][disk['name']]['target_dev'] = 'sd{0}'.format(string.ascii_lowercase[i]) + context['disks'][disk['name']]['address'] = True + context['disks'][disk['name']]['driver'] = False + context['disks'][disk['name']]['disk_bus'] = disk['model'] + context['disks'][disk['name']]['type'] = disk['format'] + context['disks'][disk['name']]['index'] = six.text_type(i) context['nics'] = nicp @@ -560,21 +644,20 @@ def _gen_xml(name, def _gen_vol_xml(vmname, diskname, + disktype, size, - hypervisor, - **kwargs): + pool): ''' Generate the XML string to define a libvirt storage volume ''' size = int(size) * 1024 # MB - disk_info = _get_image_info(hypervisor, vmname, **kwargs) context = { 'name': vmname, - 'filename': '{0}.{1}'.format(diskname, disk_info['disktype']), + 'filename': '{0}.{1}'.format(diskname, disktype), 'volname': diskname, - 'disktype': disk_info['disktype'], + 'disktype': disktype, 'size': six.text_type(size), - 'pool': disk_info['pool'], + 'pool': pool, } fn_ = 'libvirt_volume.jinja' try: @@ -631,24 +714,6 @@ def _gen_pool_xml(name, return template.render(**context) -def _qemu_image_info(path): - ''' - Detect information for the image at path - ''' - ret = {} - out = __salt__['cmd.run']('qemu-img info {0}'.format(path)) - - match_map = {'size': r'virtual size: \w+ \((\d+) byte[s]?\)', - 'format': r'file format: (\w+)'} - - for info, search in six.iteritems(match_map): - try: - ret[info] = re.search(search, out).group(1) - except AttributeError: - continue - return ret - - def _get_images_dir(): ''' Extract the images dir from the configuration. First attempts to @@ -669,32 +734,23 @@ def _get_images_dir(): return img_dir -def _qemu_image_create(vm_name, - disk_file_name, - disk_image=None, - disk_size=None, - disk_type='qcow2', - enable_qcow=False, - saltenv='base'): +def _qemu_image_create(disk, create_overlay=False, saltenv='base'): ''' Create the image file using specified disk_size or/and disk_image Return path to the created image file ''' + disk_size = disk.get('size', None) + disk_image = disk.get('image', None) + if not disk_size and not disk_image: raise CommandExecutionError( 'Unable to create new disk {0}, please specify' ' disk size and/or disk image argument' - .format(disk_file_name) + .format(disk['filename']) ) - img_dir = _get_images_dir() - - img_dest = os.path.join( - img_dir, - vm_name, - disk_file_name - ) + img_dest = disk['source_file'] log.debug('Image destination will be %s', img_dest) img_dir = os.path.dirname(img_dest) log.debug('Image destination directory is %s', img_dir) @@ -713,7 +769,7 @@ def _qemu_image_create(vm_name, imageinfo = salt.utils.yaml.safe_load(res) qcow2 = imageinfo['file format'] == 'qcow2' try: - if enable_qcow and qcow2: + if create_overlay and qcow2: log.info('Cloning qcow2 image %s using copy on write', sfn) __salt__['cmd.run']( 'qemu-img create -f qcow2 -o backing_file={0} {1}' @@ -750,7 +806,7 @@ def _qemu_image_create(vm_name, log.debug('Create empty image with size %sM', disk_size) __salt__['cmd.run']( 'qemu-img create -f {0} {1} {2}M' - .format(disk_type, img_dest, disk_size) + .format(disk.get('format', 'qcow2'), img_dest, disk_size) ) else: raise CommandExecutionError( @@ -772,26 +828,7 @@ def _qemu_image_create(vm_name, return img_dest -# TODO: this function is deprecated, should be merged and replaced -# with _disk_profile() -def _get_image_info(hypervisor, name, **kwargs): - ''' - Determine disk image info, such as filename, image format and - storage pool, based on which hypervisor is used - ''' - ret = {} - if hypervisor in ['esxi', 'vmware']: - ret['disktype'] = 'vmdk' - ret['filename'] = '{0}{1}'.format(name, '.vmdk') - ret['pool'] = '[{0}] '.format(kwargs.get('pool', '0')) - elif hypervisor in ['kvm', 'qemu']: - ret['disktype'] = 'qcow2' - ret['filename'] = '{0}{1}'.format(name, '.qcow2') - ret['pool'] = __salt__['config.option']('virt.images') - return ret - - -def _disk_profile(profile, hypervisor, **kwargs): +def _disk_profile(profile, hypervisor, disks=None, vm_name=None, image=None, pool=None, **kwargs): ''' Gather the disk profile from the config or apply the default based on the active hypervisor @@ -831,43 +868,152 @@ def _disk_profile(profile, hypervisor, **kwargs): default to whatever is best suitable for the active hypervisor. ''' default = [{'system': - {'size': '8192'}}] - if hypervisor in ['esxi', 'vmware']: + {'size': 8192}}] + if hypervisor == 'vmware': overlay = {'format': 'vmdk', 'model': 'scsi', - 'pool': '[{0}] '.format(kwargs.get('pool', '0'))} + 'pool': '[{0}] '.format(pool if pool else '0')} elif hypervisor in ['qemu', 'kvm']: overlay = {'format': 'qcow2', - 'model': 'virtio', - 'pool': _get_images_dir()} + 'model': 'virtio'} else: overlay = {} + # Get the disks from the profile disklist = copy.deepcopy( __salt__['config.get']('virt:disk', {}).get(profile, default)) - for key, val in six.iteritems(overlay): - for i, disks in enumerate(disklist): - for disk in disks: - if key not in disks[disk]: - disklist[i][disk][key] = val + + # Transform the list to remove one level of dictionnary and add the name as a property + disklist = [dict(d, name=name) for disk in disklist for name, d in disk.items()] + + # Add the image to the first disk if there is one + if image: + # If image is specified in module arguments, then it will be used + # for the first disk instead of the image from the disk profile + log.debug('%s image from module arguments will be used for disk "%s"' + ' instead of %s', image, disklist[0]['name'], disklist[0].get('image', "")) + disklist[0]['image'] = image + + # Merge with the user-provided disks definitions + if disks: + for udisk in disks: + if 'name' in udisk: + found = [disk for disk in disklist if udisk['name'] == disk['name']] + if found: + found[0].update(udisk) + else: + disklist.append(udisk) + + for disk in disklist: + # Add the missing properties that have defaults + for key, val in six.iteritems(overlay): + if key not in disk: + disk[key] = val + + base_dir = disk.get('pool', None) + if hypervisor in ['qemu', 'kvm']: + # Compute the base directory from the pool property. We may have either a path + # or a libvirt pool name there. + # If the pool is a known libvirt one with a target path, use it as target path + if not base_dir: + base_dir = _get_images_dir() + else: + if not base_dir.startswith('/'): + # The pool seems not to be a path, lookup for pool infos + pool = pool_info(base_dir, **kwargs) + if not pool or not pool['target_path'] or pool['target_path'].startswith('/dev'): + raise CommandExecutionError( + 'Unable to create new disk {0}, specified pool {1} does not exist ' + 'or is unsupported'.format(disk['name'], base_dir)) + base_dir = pool['target_path'] + + # Compute the filename and source file properties if possible + if vm_name: + disk['filename'] = '{0}_{1}.{2}'.format(vm_name, disk['name'], disk['format']) + disk['source_file'] = os.path.join(base_dir, disk['filename']) + return disklist -def _nic_profile(profile_name, hypervisor, **kwargs): +def _complete_nics(interfaces, hypervisor, dmac=None): ''' - Compute NIC data based on profile + Complete missing data for network interfaces. ''' - default = [{'eth0': {}}] vmware_overlay = {'type': 'bridge', 'source': 'DEFAULT', 'model': 'e1000'} kvm_overlay = {'type': 'bridge', 'source': 'br0', 'model': 'virtio'} overlays = { 'kvm': kvm_overlay, 'qemu': kvm_overlay, - 'esxi': vmware_overlay, 'vmware': vmware_overlay, } + def _normalize_net_types(attributes): + ''' + Guess which style of definition: + + bridge: br0 + + or + + network: net0 + + or + + type: network + source: net0 + ''' + for type_ in ['bridge', 'network']: + if type_ in attributes: + attributes['type'] = type_ + # we want to discard the original key + attributes['source'] = attributes.pop(type_) + + attributes['type'] = attributes.get('type', None) + attributes['source'] = attributes.get('source', None) + + def _apply_default_overlay(attributes): + ''' + Apply the default overlay to attributes + ''' + for key, value in six.iteritems(overlays[hypervisor]): + if key not in attributes or not attributes[key]: + attributes[key] = value + + def _assign_mac(attributes, hypervisor): + ''' + Compute mac address for NIC depending on hypervisor + ''' + if dmac is not None: + log.debug('Default MAC address is %s', dmac) + if salt.utils.validate.net.mac(dmac): + attributes['mac'] = dmac + else: + msg = 'Malformed MAC address: {0}'.format(dmac) + raise CommandExecutionError(msg) + else: + if hypervisor in ['qemu', 'kvm']: + attributes['mac'] = salt.utils.network.gen_mac( + prefix='52:54:00') + else: + attributes['mac'] = salt.utils.network.gen_mac() + + for interface in interfaces: + _normalize_net_types(interface) + _assign_mac(interface, hypervisor) + if hypervisor in overlays: + _apply_default_overlay(interface) + + return interfaces + + +def _nic_profile(profile_name, hypervisor, dmac=None): + ''' + Compute NIC data based on profile + ''' + + default = [{'eth0': {}}] + # support old location config_data = __salt__['config.option']('virt.nic', {}).get( profile_name, None @@ -929,64 +1075,8 @@ def _nic_profile(profile_name, hypervisor, **kwargs): else: interfaces.append(interface) - def _normalize_net_types(attributes): - ''' - Guess which style of definition: - - bridge: br0 - - or - - network: net0 - - or - - type: network - source: net0 - ''' - for type_ in ['bridge', 'network']: - if type_ in attributes: - attributes['type'] = type_ - # we want to discard the original key - attributes['source'] = attributes.pop(type_) - - attributes['type'] = attributes.get('type', None) - attributes['source'] = attributes.get('source', None) - - def _apply_default_overlay(attributes): - ''' - Apply the default overlay to attributes - ''' - for key, value in six.iteritems(overlays[hypervisor]): - if key not in attributes or not attributes[key]: - attributes[key] = value - - def _assign_mac(attributes, hypervisor): - ''' - Compute mac address for NIC depending on hypervisor - ''' - dmac = kwargs.get('dmac', None) - if dmac is not None: - log.debug('DMAC address is %s', dmac) - if salt.utils.validate.net.mac(dmac): - attributes['mac'] = dmac - else: - msg = 'Malformed MAC address: {0}'.format(dmac) - raise CommandExecutionError(msg) - else: - if hypervisor in ['qemu', 'kvm']: - attributes['mac'] = salt.utils.network.gen_mac( - prefix='52:54:00') - else: - attributes['mac'] = salt.utils.network.gen_mac() - - for interface in interfaces: - _normalize_net_types(interface) - _assign_mac(interface, hypervisor) - if hypervisor in overlays: - _apply_default_overlay(interface) - - return interfaces + # dmac can only be used from init() + return _complete_nics(interfaces, hypervisor, dmac=dmac) def init(name, @@ -994,9 +1084,11 @@ def init(name, mem, image=None, nic='default', - hypervisor=VIRT_DEFAULT_HYPER, + interfaces=None, + hypervisor=None, start=True, # pylint: disable=redefined-outer-name disk='default', + disks=None, saltenv='base', seed=True, install=True, @@ -1005,11 +1097,211 @@ def init(name, seed_cmd='seed.apply', enable_vnc=False, enable_qcow=False, + graphics=None, **kwargs): ''' Initialize a new vm - CLI Example: + :param name: name of the virtual machine to create + :param cpu: Number of virtual CPUs to assign to the virtual machine + :param mem: Amount of memory to allocate to the virtual machine in MiB. + :param image: Path to a disk image to use as the first disk (Default: ``None``). + Deprecated in favor of the ``disks`` parameter. To set (or change) the image of a + disk, add the following to the disks definitions: + + .. code-block:: python + + { + 'name': 'name_of_disk_to_change', + 'image': '/path/to/the/image' + } + + :param nic: NIC profile to use (Default: ``'default'``). + The profile interfaces can be customized / extended with the interfaces parameter. + :param interfaces: + List of dictionaries providing details on the network interfaces to create. + These data are merged with the ones from the nic profile. The structure of + each dictionary is documented in :ref:`init-nic-def`. + + .. versionadded:: Fluorine + :param hypervisor: the virtual machine type. By default the value will be computed according + to the virtual host capabilities. + :param start: ``True`` to start the virtual machine after having defined it (Default: ``True``) + :param disk: Disk profile to use (Default: ``'default'``). + :param disks: List of dictionaries providing details on the disk devices to create. + These data are merged with the ones from the disk profile. The structure of + each dictionary is documented in :ref:`init-disk-def`. + + .. versionadded:: Fluorine + :param saltenv: Fileserver environment (Default: ``'base'``). + See :mod:`cp module for more details ` + :param seed: ``True`` to seed the disk image. Only used when the ``image`` parameter is provided. + (Default: ``True``) + :param install: install salt minion if absent (Default: ``True``) + :param pub_key: public key to seed with (Default: ``None``) + :param priv_key: public key to seed with (Default: ``None``) + :param seed_cmd: Salt command to execute to seed the image. (Default: ``'seed.apply'``) + :param enable_vnc: + ``True`` to setup a vnc display for the VM (Default: ``False``) + + Deprecated in favor of the ``graphics`` parameter. Could be replaced with + the following: + + .. code-block:: python + + graphics={'type': 'vnc'} + + .. deprecated:: Fluorine + :param graphics: + Dictionary providing details on the graphics device to create. (Default: ``None``) + See :ref:`init-graphics-def` for more details on the possible values. + + .. versionadded:: Fluorine + :param enable_qcow: + ``True`` to create a QCOW2 overlay image, rather than copying the image + (Default: ``False``). + + Deprecated in favor of ``disks`` parameter. Add the following to the disks + definitions to create an overlay image of a template disk image with an + image set: + + .. code-block:: python + + { + 'name': 'name_of_disk_to_change', + 'overlay_image': True + } + + .. deprecated:: Fluorine + :param pool: + Path of the folder where the image files are located for vmware/esx hypervisors. + + Deprecated in favor of ``disks`` parameter. Add the following to the disks + definitions to set the vmware datastore of a disk image: + + .. code-block:: python + + { + 'name': 'name_of_disk_to_change', + 'pool': 'mydatastore' + } + + .. deprecated:: Flurorine + :param dmac: + Default MAC address to use for the network interfaces. By default MAC addresses are + automatically generated. + + Deprecated in favor of ``interfaces`` parameter. Add the following to the interfaces + definitions to force the mac address of a NIC: + + .. code-block:: python + + { + 'name': 'name_of_nic_to_change', + 'mac': 'MY:MA:CC:ADD:RE:SS' + } + + .. deprecated:: Fluorine + :param config: minion configuration to use when seeding. + See :mod:`seed module for more details ` + :param boot_dev: String of space-separated devices to boot from (Default: ``'hd'``) + :param serial_type: Serial device type. One of ``'pty'``, ``'tcp'`` (Default: ``None``) + :param telnet_port: Telnet port to use for serial device of type ``tcp``. + :param console: ``True`` to add a console device along with serial one (Default: ``True``) + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + .. _init-nic-def: + + .. rubric:: Network Interfaces Definitions + + Network interfaces dictionaries can contain the following properties: + + name + Name of the network interface. This is only used as a key to merge with the profile data + + type + Network type. One of ``'bridge'``, ``'network'`` + + source + The network source, typically the bridge or network name + + mac + The desired mac address, computed if ``None`` (Default: ``None``). + + model + The network card model (Default: depends on the hypervisor) + + .. _init-disk-def: + + .. rubric:: Disks Definitions + + Disk dictionaries can contain the following properties: + + disk_name + Name of the disk. This is mostly used in the name of the disk image and as a key to merge + with the profile data. + + format + Format of the disk image, like ``'qcow2'``, ``'raw'``, ``'vmdk'``. + (Default: depends on the hypervisor) + + size + Disk size in MiB + + pool + Path to the folder or name of the pool where disks should be created. + (Default: depends on hypervisor) + + model + One of the disk busses allowed by libvirt (Default: depends on hypervisor) + + See `libvirt documentation `_ + for the allowed bus types. + + image + Path to the image to use for the disk. If no image is provided, an empty disk will be created + (Default: ``None``) + + overlay_image + ``True`` to create a QCOW2 disk image with ``image`` as backing file. If ``False`` + the file pointed to by the ``image`` property will simply be copied. (Default: ``False``) + + .. _init-graphics-def: + + .. rubric:: Graphics Definition + + The graphics dictionnary can have the following properties: + + type + Graphics type. The possible values are ``'spice'``, ``'vnc'`` and other values + allowed as a libvirt graphics type (Default: ``None``) + + See `the libvirt documentation `_ + for more details on the possible types + + port + Port to export the graphics on for ``vnc``, ``spice`` and ``rdp`` types. + + tls_port + Port to export the graphics over a secured connection for ``spice`` type. + + listen + Dictionary defining on what address to listen on for ``vnc``, ``spice`` and ``rdp``. + It has a ``type`` property with ``address`` and ``None`` as possible values, and an + ``address`` property holding the IP or hostname to listen on. + + By default, not setting the ``listen`` part of the dictionary will default to + listen on all addresses. + + .. rubric:: CLI Example .. code-block:: bash @@ -1019,95 +1311,148 @@ def init(name, The disk images will be created in an image folder within the directory defined by the ``virt:images`` option. Its default value is - ``/srv/salt/salt-images/`` but this can changed with such a configuration: + ``/srv/salt-images/`` but this can changed with such a configuration: .. code-block:: yaml virt: images: /data/my/vm/images/ ''' + hypervisors = _get_domain_types(**kwargs) hypervisor = __salt__['config.get']('libvirt:hypervisor', hypervisor) + if hypervisor is not None: + salt.utils.versions.warn_until( + 'Sodium', + '\'libvirt:hypervisor\' configuration property has been deprecated. ' + 'Rather use the \'virt:connection:uri\' to properly define the libvirt ' + 'URI or alias of the host to connect to. \'libvirt:hypervisor\' will ' + 'stop being used in {version}.' + ) + else: + # Use the machine types as possible values + # Prefer 'kvm' over the others if available + hypervisor = 'kvm' if 'kvm' in hypervisors else hypervisors[0] + + # esxi used to be a possible value for the hypervisor: map it to vmware since it's the same + hypervisor = 'vmware' if hypervisor == 'esxi' else hypervisor + log.debug('Using hyperisor %s', hypervisor) - nicp = _nic_profile(nic, hypervisor, **kwargs) + # the NICs are computed as follows: + # 1 - get the default NICs from the profile + # 2 - Complete the users NICS + # 3 - Update the default NICS list to the users one, matching key is the name + dmac = kwargs.get('dmac', None) + if dmac: + salt.utils.versions.warn_until( + 'Sodium', + '\'dmac\' parameter has been deprecated. Rather use the \'interfaces\' parameter ' + 'to properly define the desired MAC address. \'dmac\' will be removed in {version}.' + ) + nicp = _nic_profile(nic, hypervisor, dmac=dmac) log.debug('NIC profile is %s', nicp) + if interfaces: + users_nics = _complete_nics(interfaces, hypervisor) + for unic in users_nics: + found = [nic for nic in nicp if nic['name'] == unic['name']] + if found: + found[0].update(unic) + else: + nicp.append(unic) + log.debug('Merged NICs: %s', nicp) - diskp = _disk_profile(disk, hypervisor, **kwargs) + # the disks are computed as follows: + # 1 - get the disks defined in the profile + # 2 - set the image on the first disk (will be removed later) + # 3 - update the disks from the profile with the ones from the user. The matching key is the name. + pool = kwargs.get('pool', None) + if pool: + salt.utils.versions.warn_until( + 'Sodium', + '\'pool\' parameter has been deprecated. Rather use the \'disks\' parameter ' + 'to properly define the vmware datastore of disks. \'pool\' will be removed in {version}.' + ) if image: - # If image is specified in module arguments, then it will be used - # for the first disk instead of the image from the disk profile - disk_name = next(six.iterkeys(diskp[0])) - log.debug('%s image from module arguments will be used for disk "%s"' - ' instead of %s', image, disk_name, diskp[0][disk_name].get('image')) - diskp[0][disk_name]['image'] = image + salt.utils.versions.warn_until( + 'Sodium', + '\'image\' parameter has been deprecated. Rather use the \'disks\' parameter ' + 'to override or define the image. \'image\' will be removed in {version}.' + ) + + diskp = _disk_profile(disk, hypervisor, disks, name, image=image, pool=pool, **kwargs) # Create multiple disks, empty or from specified images. for _disk in diskp: log.debug("Creating disk for VM [ %s ]: %s", name, _disk) - for disk_name, args in six.iteritems(_disk): - - if hypervisor in ['esxi', 'vmware']: - if 'image' in args: - # TODO: we should be copying the image file onto the ESX host - raise SaltInvocationError( - 'virt.init does not support image ' - 'template in conjunction with esxi hypervisor' - ) - else: - # assume libvirt manages disks for us - log.debug('Generating libvirt XML for %s', _disk) - xml = _gen_vol_xml( - name, - disk_name, - args['size'], - hypervisor, - ) - define_vol_xml_str(xml) - - elif hypervisor in ['qemu', 'kvm']: - - disk_type = args.get('format', 'qcow2') - disk_image = args.get('image', None) - disk_size = args.get('size', None) - disk_file_name = '{0}.{1}'.format(disk_name, disk_type) - - img_dest = _qemu_image_create( - vm_name=name, - disk_file_name=disk_file_name, - disk_image=disk_image, - disk_size=disk_size, - disk_type=disk_type, - enable_qcow=enable_qcow, - saltenv=saltenv, - ) - - # Seed only if there is an image specified - if seed and disk_image: - log.debug('Seed command is %s', seed_cmd) - __salt__[seed_cmd]( - img_dest, - id_=name, - config=kwargs.get('config'), - install=install, - pub_key=pub_key, - priv_key=priv_key, - ) - - else: - # Unknown hypervisor + if hypervisor == 'vmware': + if 'image' in _disk: + # TODO: we should be copying the image file onto the ESX host raise SaltInvocationError( - 'Unsupported hypervisor when handling disk image: {0}' - .format(hypervisor) + 'virt.init does not support image ' + 'template in conjunction with esxi hypervisor' ) + else: + # assume libvirt manages disks for us + log.debug('Generating libvirt XML for %s', _disk) + vol_xml = _gen_vol_xml( + name, + _disk['name'], + _disk['format'], + _disk['size'], + _disk['pool'] + ) + define_vol_xml_str(vol_xml) + + elif hypervisor in ['qemu', 'kvm']: + + create_overlay = enable_qcow + if create_overlay: + salt.utils.versions.warn_until( + 'Sodium', + '\'enable_qcow\' parameter has been deprecated. Rather use the \'disks\' ' + 'parameter to override or define the image. \'enable_qcow\' will be removed ' + 'in {version}.' + ) + else: + create_overlay = _disk.get('overlay_image', False) + + img_dest = _qemu_image_create(_disk, create_overlay, saltenv) + + # Seed only if there is an image specified + if seed and _disk.get('image', None): + log.debug('Seed command is %s', seed_cmd) + __salt__[seed_cmd]( + img_dest, + id_=name, + config=kwargs.get('config'), + install=install, + pub_key=pub_key, + priv_key=priv_key, + ) + + else: + # Unknown hypervisor + raise SaltInvocationError( + 'Unsupported hypervisor when handling disk image: {0}' + .format(hypervisor) + ) log.debug('Generating VM XML') - kwargs['enable_vnc'] = enable_vnc - xml = _gen_xml(name, cpu, mem, diskp, nicp, hypervisor, **kwargs) + + if enable_vnc: + salt.utils.versions.warn_until( + 'Sodium', + '\'enable_vnc\' parameter has been deprecated in favor of ' + '\'graphics\'. Use graphics={\'type\': \'vnc\'} for the same behavior. ' + '\'enable_vnc\' will be removed in {version}. ') + graphics = {'type': 'vnc'} + + vm_xml = _gen_xml(name, cpu, mem, diskp, nicp, hypervisor, graphics, **kwargs) conn = __get_conn(**kwargs) try: - conn.defineXML(xml) + conn.defineXML(vm_xml) except libvirtError as err: # check if failure is due to this domain already existing if "domain '{}' already exists".format(name) in six.text_type(err): @@ -1129,6 +1474,16 @@ def list_domains(**kwargs): ''' Return a list of available domains. + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1147,6 +1502,16 @@ def list_active_vms(**kwargs): ''' Return a list of names for active virtual machine on the minion + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1165,6 +1530,16 @@ def list_inactive_vms(**kwargs): ''' Return a list of names for inactive virtual machine on the minion + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1184,6 +1559,17 @@ def vm_info(vm_=None, **kwargs): Return detailed information about the vms on this hyper in a list of dicts: + :param vm_: name of the domain + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + .. code-block:: python [ @@ -1216,6 +1602,10 @@ def vm_info(vm_=None, **kwargs): 'disks': _get_disks(dom), 'graphics': _get_graphics(dom), 'nics': _get_nics(dom), + 'uuid': _get_uuid(dom), + 'on_crash': _get_on_crash(dom), + 'on_reboot': _get_on_reboot(dom), + 'on_poweroff': _get_on_poweroff(dom), 'maxMem': int(raw[1]), 'mem': int(raw[2]), 'state': VIRT_STATE_NAME_MAP.get(raw[0], 'unknown')} @@ -1237,6 +1627,17 @@ def vm_state(vm_=None, **kwargs): If you pass a VM name in as an argument then it will return info for just the named VM, otherwise it will return all VMs. + :param vm_: name of the domain + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1282,6 +1683,16 @@ def node_info(**kwargs): ''' Return a dict with information about this node + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1298,6 +1709,17 @@ def get_nics(vm_, **kwargs): ''' Return info about the network interfaces of a named vm + :param vm_: name of the domain + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1314,6 +1736,17 @@ def get_macs(vm_, **kwargs): ''' Return a list off MAC addresses from the named vm + :param vm_: name of the domain + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1334,6 +1767,17 @@ def get_graphics(vm_, **kwargs): ''' Returns the information on vnc for a given vm + :param vm_: name of the domain + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1350,6 +1794,17 @@ def get_disks(vm_, **kwargs): ''' Return the disks of a named vm + :param vm_: name of the domain + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1367,8 +1822,18 @@ def setmem(vm_, memory, config=False, **kwargs): Changes the amount of memory allocated to VM. The VM must be shutdown for this to work. - memory is to be specified in MB - If config is True then we ask libvirt to modify the config as well + :param vm_: name of the domain + :param memory: memory amount to set in MB + :param config: if True then libvirt will be asked to modify the config as well + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine CLI Example: @@ -1404,9 +1869,21 @@ def setvcpus(vm_, vcpus, config=False, **kwargs): Changes the amount of vcpus allocated to VM. The VM must be shutdown for this to work. - vcpus is an int representing the number to be assigned If config is True then we ask libvirt to modify the config as well + :param vm_: name of the domain + :param vcpus: integer representing the number of CPUs to be assigned + :param config: if True then libvirt will be asked to modify the config as well + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1451,6 +1928,16 @@ def freemem(**kwargs): Return an int representing the amount of memory (in MB) that has not been given to virtual machines on this node + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1479,6 +1966,16 @@ def freecpu(**kwargs): Return an int representing the number of unallocated cpus on this hypervisor + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1495,6 +1992,16 @@ def full_info(**kwargs): ''' Return the node_info, vm_info and freemem + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1514,6 +2021,17 @@ def get_xml(vm_, **kwargs): ''' Returns the XML for a given vm + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1526,14 +2044,25 @@ def get_xml(vm_, **kwargs): return xml_desc -def get_profiles(hypervisor=None): +def get_profiles(hypervisor=None, **kwargs): ''' Return the virt profiles for hypervisor. Currently there are profiles for: - - nic - - disk + - nic + - disk + + :param hypervisor: override the default machine type. + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine CLI Example: @@ -1543,10 +2072,24 @@ def get_profiles(hypervisor=None): salt '*' virt.get_profiles hypervisor=esxi ''' ret = {} - if hypervisor: - hypervisor = hypervisor - else: - hypervisor = __salt__['config.get']('libvirt:hypervisor', VIRT_DEFAULT_HYPER) + + hypervisors = _get_domain_types(**kwargs) + default_hypervisor = 'kvm' if 'kvm' in hypervisors else hypervisors[0] + + if not hypervisor: + hypervisor = __salt__['config.get']('libvirt:hypervisor') + if hypervisor is not None: + salt.utils.versions.warn_until( + 'Sodium', + '\'libvirt:hypervisor\' configuration property has been deprecated. ' + 'Rather use the \'virt:connection:uri\' to properly define the libvirt ' + 'URI or alias of the host to connect to. \'libvirt:hypervisor\' will ' + 'stop being used in {version}.' + ) + else: + # Use the machine types as possible values + # Prefer 'kvm' over the others if available + hypervisor = default_hypervisor virtconf = __salt__['config.get']('virt', {}) for typ in ['disk', 'nic']: _func = getattr(sys.modules[__name__], '_{0}_profile'.format(typ)) @@ -1562,6 +2105,17 @@ def shutdown(vm_, **kwargs): ''' Send a soft shutdown signal to the named vm + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1579,6 +2133,17 @@ def pause(vm_, **kwargs): ''' Pause the named vm + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1596,6 +2161,17 @@ def resume(vm_, **kwargs): ''' Resume the named vm + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1613,6 +2189,17 @@ def start(name, **kwargs): ''' Start a defined domain + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1629,6 +2216,17 @@ def stop(name, **kwargs): ''' Hard power down the virtual machine, this is equivalent to pulling the power. + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1645,6 +2243,17 @@ def reboot(name, **kwargs): ''' Reboot a domain via ACPI request + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1661,6 +2270,17 @@ def reset(vm_, **kwargs): ''' Reset a VM by emulating the reset button on a physical machine + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1682,6 +2302,17 @@ def ctrl_alt_del(vm_, **kwargs): ''' Sends CTRL+ALT+DEL to a VM + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1695,10 +2326,21 @@ def ctrl_alt_del(vm_, **kwargs): return ret -def create_xml_str(xml, **kwargs): +def create_xml_str(xml, **kwargs): # pylint: disable=redefined-outer-name ''' Start a domain based on the XML passed to the function + :param xml: libvirt XML definition of the domain + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1715,6 +2357,17 @@ def create_xml_path(path, **kwargs): ''' Start a domain based on the XML-file path passed to the function + :param path: path to a file containing the libvirt XML definition of the domain + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1731,10 +2384,21 @@ def create_xml_path(path, **kwargs): return False -def define_xml_str(xml, **kwargs): +def define_xml_str(xml, **kwargs): # pylint: disable=redefined-outer-name ''' Define a domain based on the XML passed to the function + :param xml: libvirt XML definition of the domain + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1751,6 +2415,17 @@ def define_xml_path(path, **kwargs): ''' Define a domain based on the XML-file path passed to the function + :param path: path to a file containing the libvirt XML definition of the domain + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1768,10 +2443,21 @@ def define_xml_path(path, **kwargs): return False -def define_vol_xml_str(xml, **kwargs): +def define_vol_xml_str(xml, **kwargs): # pylint: disable=redefined-outer-name ''' Define a volume based on the XML passed to the function + :param xml: libvirt XML definition of the storage volume + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1808,6 +2494,17 @@ def define_vol_xml_path(path, **kwargs): ''' Define a volume based on the XML-file path passed to the function + :param path: path to a file containing the libvirt XML definition of the volume + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1829,6 +2526,10 @@ def migrate_non_shared(vm_, target, ssh=False): ''' Attempt to execute non-shared storage "all" migration + :param vm_: domain name + :param target: target libvirt host name + :param ssh: True to connect over ssh + CLI Example: .. code-block:: bash @@ -1859,6 +2560,10 @@ def migrate_non_shared_inc(vm_, target, ssh=False): ''' Attempt to execute non-shared storage "all" migration + :param vm_: domain name + :param target: target libvirt host name + :param ssh: True to connect over ssh + CLI Example: .. code-block:: bash @@ -1889,6 +2594,10 @@ def migrate(vm_, target, ssh=False): ''' Shared storage migration + :param vm_: domain name + :param target: target libvirt host name + :param ssh: True to connect over ssh + CLI Example: .. code-block:: bash @@ -1921,6 +2630,10 @@ def seed_non_shared_migrate(disks, force=False): destination, pass the disks information via this function, to the migration destination before executing the migration. + :param disks: the list of disk data as provided by virt.get_disks + :param force: skip checking the compatibility of source and target disk + images if True. (default: False) + CLI Example: .. code-block:: bash @@ -1956,6 +2669,19 @@ def set_autostart(vm_, state='on', **kwargs): Set the autostart flag on a VM so that the VM will start with the host system on reboot. + :param vm_: domain name + :param state: 'on' to auto start the pool, anything else to mark the + pool not to be started when the host boots + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1983,6 +2709,17 @@ def undefine(vm_, **kwargs): Remove a defined vm, this does not purge the virtual machine image, and this only works if the vm is powered down + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -1991,7 +2728,11 @@ def undefine(vm_, **kwargs): ''' conn = __get_conn(**kwargs) dom = _get_domain(conn, vm_) - ret = dom.undefine() == 0 + if getattr(libvirt, 'VIR_DOMAIN_UNDEFINE_NVRAM', False): + # This one is only in 1.2.8+ + ret = dom.undefineFlags(libvirt.VIR_DOMAIN_UNDEFINE_NVRAM) == 0 + else: + ret = dom.undefine() == 0 conn.close() return ret @@ -2006,6 +2747,21 @@ def purge(vm_, dirs=False, removables=None, **kwargs): disruption, the default but dangerous value is True. This will be changed to the safer False default value in Sodium. + :param vm_: domain name + :param dirs: pass True to remove containing directories + :param removables: pass True to remove removable devices + + .. versionadded:: Fluorine + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + CLI Example: .. code-block:: bash @@ -2034,7 +2790,11 @@ def purge(vm_, dirs=False, removables=None, **kwargs): if dirs: for dir_ in directories: shutil.rmtree(dir_) - dom.undefine() + if getattr(libvirt, 'VIR_DOMAIN_UNDEFINE_NVRAM', False): + # This one is only in 1.2.8+ + dom.undefineFlags(libvirt.VIR_DOMAIN_UNDEFINE_NVRAM) + else: + dom.undefine() conn.close() return True @@ -2052,15 +2812,9 @@ def virt_type(): return __grains__['virtual'] -def is_kvm_hyper(): +def _is_kvm_hyper(): ''' Returns a bool whether or not this node is a KVM hypervisor - - CLI Example: - - .. code-block:: bash - - salt '*' virt.is_kvm_hyper ''' try: with salt.utils.files.fopen('/proc/modules') as fp_: @@ -2072,15 +2826,29 @@ def is_kvm_hyper(): return 'libvirtd' in __salt__['cmd.run'](__grains__['ps']) -def is_xen_hyper(): +def is_kvm_hyper(): ''' - Returns a bool whether or not this node is a XEN hypervisor + Returns a bool whether or not this node is a KVM hypervisor CLI Example: .. code-block:: bash - salt '*' virt.is_xen_hyper + salt '*' virt.is_kvm_hyper + + .. deprecated:: Fluorine + ''' + salt.utils.versions.warn_until( + 'Sodium', + '\'is_kvm_hyper\' function has been deprecated. Use the \'get_hypervisor\' == "kvm" instead. ' + '\'is_kvm_hyper\' will be removed in {version}.' + ) + return _is_kvm_hyper() + + +def _is_xen_hyper(): + ''' + Returns a bool whether or not this node is a XEN hypervisor ''' try: if __grains__['virtual_subtype'] != 'Xen Dom0': @@ -2098,6 +2866,51 @@ def is_xen_hyper(): return 'libvirtd' in __salt__['cmd.run'](__grains__['ps']) +def is_xen_hyper(): + ''' + Returns a bool whether or not this node is a XEN hypervisor + + CLI Example: + + .. code-block:: bash + + salt '*' virt.is_xen_hyper + + .. deprecated:: Fluorine + ''' + salt.utils.versions.warn_until( + 'Sodium', + '\'is_xen_hyper\' function has been deprecated. Use the \'get_hypervisor\' == "xen" instead. ' + '\'is_xen_hyper\' will be removed in {version}.' + ) + return _is_xen_hyper() + + +def get_hypervisor(): + ''' + Returns the name of the hypervisor running on this node or ``None``. + + Detected hypervisors: + + - kvm + - xen + + CLI Example: + + .. code-block:: bash + + salt '*' virt.get_hypervisor + + .. versionadded:: Fluorine + the function and the ``kvm`` and ``xen`` hypervisors support + ''' + # To add a new 'foo' hypervisor, add the _is_foo_hyper function, + # add 'foo' to the list below and add it to the docstring with a .. versionadded:: + hypervisors = ['kvm', 'xen'] + result = [hyper for hyper in hypervisors if getattr(sys.modules[__name__], '_is_{}_hyper').format(hyper)()] + return result[0] if result else None + + def is_hyper(): ''' Returns a bool whether or not this node is a hypervisor of any kind @@ -2118,6 +2931,17 @@ def vm_cputime(vm_=None, **kwargs): Return cputime used by the vms on this hyper in a list of dicts: + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + .. code-block:: python [ @@ -2170,6 +2994,17 @@ def vm_netstats(vm_=None, **kwargs): Return combined network counters used by the vms on this hyper in a list of dicts: + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + .. code-block:: python [ @@ -2240,6 +3075,17 @@ def vm_diskstats(vm_=None, **kwargs): Return disk usage counters used by the vms on this hyper in a list of dicts: + :param vm_: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + .. code-block:: python [ @@ -2335,6 +3181,17 @@ def list_snapshots(domain=None, **kwargs): ''' List available snapshots for certain vm or for all. + :param domain: domain name + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + .. versionadded:: 2016.3.0 CLI Example: @@ -2357,13 +3214,21 @@ def snapshot(domain, name=None, suffix=None, **kwargs): ''' Create a snapshot of a VM. - Options: + :param domain: domain name + :param name: Name of the snapshot. If the name is omitted, then will be used original domain + name with ISO 8601 time as a suffix. - * **name**: Name of the snapshot. If the name is omitted, then will be used original domain name with - ISO 8601 time as a suffix. + :param suffix: Add suffix for the new name. Useful in states, where such snapshots + can be distinguished from manually created. + :param connection: libvirt connection URI, overriding defaults - * **suffix**: Add suffix for the new name. Useful in states, where such snapshots - can be distinguished from manually created. + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine .. versionadded:: 2016.3.0 @@ -2397,9 +3262,17 @@ def delete_snapshots(name, *names, **kwargs): ''' Delete one or more snapshots of the given VM. - Options: + :param name: domain name + :param names: names of the snapshots to remove + :param connection: libvirt connection URI, overriding defaults - * **all**: Remove all snapshots. Values: True or False (default False). + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine .. versionadded:: 2016.3.0 @@ -2429,9 +3302,18 @@ def revert_snapshot(name, vm_snapshot=None, cleanup=False, **kwargs): ''' Revert snapshot to the previous from current (if available) or to the specific. - Options: + :param name: domain name + :param vm_snapshot: name of the snapshot to revert + :param cleanup: Remove all newer than reverted snapshots. Values: True or False (default False). + :param connection: libvirt connection URI, overriding defaults - * **cleanup**: Remove all newer than reverted snapshots. Values: True or False (default False). + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine .. versionadded:: 2016.3.0 @@ -2500,9 +3382,7 @@ def revert_snapshot(name, vm_snapshot=None, cleanup=False, **kwargs): def _capabilities(conn): ''' - Return connection capabilities - It's a huge klutz to parse right, - so hide func for now and pass on the XML instead + Return connection capabilities as XML. ''' caps = conn.getCapabilities() caps = minidom.parseString(caps) @@ -2510,6 +3390,438 @@ def _capabilities(conn): return caps +def _get_xml_first_element_by_tag_name(node, name): # pylint: disable=invalid-name + ''' + Convenience function getting the first result of getElementsByTagName() or None. + ''' + nodes = node.getElementsByTagName(name) + return nodes[0] if nodes else None + + +def _get_xml_element_text(node): + ''' + Get the text value of an XML element. + ''' + return "".join([child.data for child in node.childNodes if child.nodeType == xml.dom.Node.TEXT_NODE]) + + +def _get_xml_child_text(node, name, default): + ''' + Get the text value of the child named name of XML element node + ''' + result = "".join([_get_xml_element_text(child) for child in node.childNodes + if child.nodeType == xml.dom.Node.ELEMENT_NODE and child.tagName == name]) + return result if result else default + + +def _caps_add_machine(machines, node): + ''' + Parse the element of the host capabilities and add it + to the machines list. + ''' + maxcpus = node.getAttribute('maxCpus') + canonical = node.getAttribute('canonical') + name = _get_xml_element_text(node) + + alternate_name = "" + if canonical: + alternate_name = name + name = canonical + + machine = machines.get(name) + if not machine: + machine = {'alternate_names': []} + if maxcpus: + machine['maxcpus'] = int(maxcpus) + machines[name] = machine + if alternate_name: + machine['alternate_names'].append(alternate_name) + + +def _parse_caps_guest(guest): + ''' + Parse the element of the connection capabilities XML + ''' + arch_node = _get_xml_first_element_by_tag_name(guest, 'arch') + result = { + 'os_type': _get_xml_element_text(guest.getElementsByTagName('os_type')[0]), + 'arch': { + 'name': arch_node.getAttribute('name'), + 'machines': {}, + 'domains': {} + }, + } + + for child in arch_node.childNodes: + if child.nodeType != xml.dom.Node.ELEMENT_NODE: + continue + if child.tagName == 'wordsize': + result['arch']['wordsize'] = int(_get_xml_element_text(child)) + elif child.tagName == 'emulator': + result['arch']['emulator'] = _get_xml_element_text(child) + elif child.tagName == 'machine': + _caps_add_machine(result['arch']['machines'], child) + elif child.tagName == 'domain': + domain_type = child.getAttribute('type') + domain = { + 'emulator': None, + 'machines': {} + } + emulator_node = _get_xml_first_element_by_tag_name(child, 'emulator') + if emulator_node: + domain['emulator'] = _get_xml_element_text(emulator_node) + for machine in child.getElementsByTagName('machine'): + _caps_add_machine(domain['machines'], machine) + result['arch']['domains'][domain_type] = domain + + # Note that some features have no default and toggle attributes. + # This may not be a perfect match, but represent them as enabled by default + # without possibility to toggle them. + features_node = _get_xml_first_element_by_tag_name(guest, 'features') + result['features'] = {child.tagName: {'toggle': True if child.getAttribute('toggle') == 'yes' else False, + 'default': True if child.getAttribute('default') == 'no' else True} + for child in features_node.childNodes if child.nodeType == xml.dom.Node.ELEMENT_NODE} + + return result + + +def _parse_caps_cell(cell): + ''' + Parse the nodes of the connection capabilities XML output. + ''' + result = { + 'id': int(cell.getAttribute('id')) + } + + mem_node = _get_xml_first_element_by_tag_name(cell, 'memory') + if mem_node: + unit = mem_node.getAttribute('unit') if mem_node.hasAttribute('unit') else 'KiB' + memory = _get_xml_element_text(mem_node) + result['memory'] = "{} {}".format(memory, unit) + + pages = [{'size': "{} {}".format(page.getAttribute('size'), + page.getAttribute('unit') if page.getAttribute('unit') else 'KiB'), + 'available': int(_get_xml_element_text(page))} + for page in cell.getElementsByTagName('pages')] + if pages: + result['pages'] = pages + + distances = {int(distance.getAttribute('id')): int(distance.getAttribute('value')) + for distance in cell.getElementsByTagName('sibling')} + if distances: + result['distances'] = distances + + cpus = [] + for cpu_node in cell.getElementsByTagName('cpu'): + cpu = { + 'id': int(cpu_node.getAttribute('id')) + } + socket_id = cpu_node.getAttribute('socket_id') + if socket_id: + cpu['socket_id'] = int(socket_id) + + core_id = cpu_node.getAttribute('core_id') + if core_id: + cpu['core_id'] = int(core_id) + siblings = cpu_node.getAttribute('siblings') + if siblings: + cpu['siblings'] = siblings + cpus.append(cpu) + if cpus: + result['cpus'] = cpus + + return result + + +def _parse_caps_bank(bank): + ''' + Parse the element of the connection capabilities XML. + ''' + result = { + 'id': int(bank.getAttribute('id')), + 'level': int(bank.getAttribute('level')), + 'type': bank.getAttribute('type'), + 'size': "{} {}".format(bank.getAttribute('size'), bank.getAttribute('unit')), + 'cpus': bank.getAttribute('cpus') + } + + controls = [] + for control in bank.getElementsByTagName('control'): + unit = control.getAttribute('unit') + result_control = { + 'granularity': "{} {}".format(control.getAttribute('granularity'), unit), + 'type': control.getAttribute('type'), + 'maxAllocs': int(control.getAttribute('maxAllocs')) + } + + minimum = control.getAttribute('min') + if minimum: + result_control['min'] = "{} {}".format(minimum, unit) + controls.append(result_control) + if controls: + result['controls'] = controls + + return result + + +def _parse_caps_host(host): + ''' + Parse the element of the connection capabilities XML. + ''' + result = {} + for child in host.childNodes: + if child.nodeType != xml.dom.Node.ELEMENT_NODE: + continue + + if child.tagName == 'uuid': + result['uuid'] = _get_xml_element_text(child) + + elif child.tagName == 'cpu': + cpu = { + 'arch': _get_xml_child_text(child, 'arch', None), + 'model': _get_xml_child_text(child, 'model', None), + 'vendor': _get_xml_child_text(child, 'vendor', None), + 'features': [feature.getAttribute('name') for feature in child.getElementsByTagName('feature')], + 'pages': [{'size': '{} {}'.format(page.getAttribute('size'), + page.getAttribute('unit') if page.hasAttribute('unit') else 'KiB')} + for page in child.getElementsByTagName('pages')] + } + # Parse the cpu tag + microcode = _get_xml_first_element_by_tag_name(child, 'microcode') + if microcode: + cpu['microcode'] = microcode.getAttribute('version') + + topology = _get_xml_first_element_by_tag_name(child, 'topology') + if topology: + cpu['sockets'] = int(topology.getAttribute('sockets')) + cpu['cores'] = int(topology.getAttribute('cores')) + cpu['threads'] = int(topology.getAttribute('threads')) + result['cpu'] = cpu + + elif child.tagName == "power_management": + result['power_management'] = [node.tagName for node in child.childNodes + if node.nodeType == xml.dom.Node.ELEMENT_NODE] + + elif child.tagName == "migration_features": + result['migration'] = { + 'live': bool(child.getElementsByTagName('live')), + 'transports': [_get_xml_element_text(node) for node in child.getElementsByTagName('uri_transport')] + } + + elif child.tagName == "topology": + result['topology'] = { + 'cells': [_parse_caps_cell(cell) for cell in child.getElementsByTagName('cell')] + } + + elif child.tagName == 'cache': + result['cache'] = { + 'banks': [_parse_caps_bank(bank) for bank in child.getElementsByTagName('bank')] + } + + result['security'] = [{ + 'model': _get_xml_child_text(secmodel, 'model', None), + 'doi': _get_xml_child_text(secmodel, 'doi', None), + 'baselabels': [{'type': label.getAttribute('type'), 'label': _get_xml_element_text(label)} + for label in secmodel.getElementsByTagName('baselabel')] + } + for secmodel in host.getElementsByTagName('secmodel')] + + return result + + +def capabilities(**kwargs): + ''' + Return the hypervisor connection capabilities. + + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.capabilities + ''' + conn = __get_conn(**kwargs) + caps = _capabilities(conn) + conn.close() + + return { + 'host': _parse_caps_host(caps.getElementsByTagName('host')[0]), + 'guests': [_parse_caps_guest(guest) for guest in caps.getElementsByTagName('guest')] + } + + +def _parse_caps_enum(node): + ''' + Return a tuple containing the name of the enum and the possible values + ''' + return (node.getAttribute('name') or None, + [_get_xml_element_text(value) for value in node.getElementsByTagName('value')]) + + +def _parse_caps_cpu(node): + ''' + Parse the element of the domain capabilities + ''' + result = {} + for mode in node.getElementsByTagName('mode'): + if not mode.getAttribute('supported') == 'yes': + continue + + name = mode.getAttribute('name') + if name == 'host-passthrough': + result[name] = True + + elif name == 'host-model': + host_model = {} + model_node = _get_xml_first_element_by_tag_name(mode, 'model') + if model_node: + model = { + 'name': _get_xml_element_text(model_node) + } + + vendor_id = model_node.getAttribute('vendor_id') + if vendor_id: + model['vendor_id'] = vendor_id + + fallback = model_node.getAttribute('fallback') + if fallback: + model['fallback'] = fallback + host_model['model'] = model + + vendor = _get_xml_child_text(mode, 'vendor', None) + if vendor: + host_model['vendor'] = vendor + + features = {feature.getAttribute('name'): feature.getAttribute('policy') + for feature in mode.getElementsByTagName('feature')} + if features: + host_model['features'] = features + + result[name] = host_model + + elif name == 'custom': + custom_model = {} + models = {_get_xml_element_text(model): model.getAttribute('usable') + for model in mode.getElementsByTagName('model')} + if models: + custom_model['models'] = models + result[name] = custom_model + + return result + + +def _parse_caps_devices_features(node): + ''' + Parse the devices or features list of the domain capatilities + ''' + result = {} + for child in node.childNodes: + if child.nodeType != xml.dom.Node.ELEMENT_NODE or not child.getAttribute('supported') == 'yes': + continue + enums = [_parse_caps_enum(node) for node in child.getElementsByTagName('enum')] + result[child.tagName] = {item[0]: item[1] for item in enums if item[0]} + return result + + +def _parse_caps_loader(node): + ''' + Parse the element of the domain capabilities. + ''' + enums = [_parse_caps_enum(enum) for enum in node.getElementsByTagName('enum')] + result = {item[0]: item[1] for item in enums if item[0]} + + values = [_get_xml_element_text(child) for child in node.childNodes + if child.nodeType == xml.dom.Node.ELEMENT_NODE and child.tagName == 'value'] + + if values: + result['values'] = values + + return result + + +def domain_capabilities(emulator=None, arch=None, machine=None, domain=None, **kwargs): + ''' + Return the domain capabilities given an emulator, architecture, machine or virtualization type. + + .. versionadded:: Fluorine + + :param emulator: return the capabilities for the given emulator binary + :param arch: return the capabilities for the given CPU architecture + :param machine: return the capabilities for the given emulated machine type + :param domain: return the capabilities for the given virtualization type. + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + The list of the possible emulator, arch, machine and domain can be found in + the host capabilities output. + + If none of the parameters is provided the libvirt default domain capabilities + will be returned. + + CLI Example: + + .. code-block:: bash + + salt '*' virt.domain_capabilities arch='x86_64' domain='kvm' + + ''' + conn = __get_conn(**kwargs) + caps = conn.getDomainCapabilities(emulator, arch, machine, domain, 0) + caps = minidom.parseString(caps) + conn.close() + + root_node = caps.getElementsByTagName('domainCapabilities')[0] + + result = { + 'emulator': _get_xml_child_text(root_node, 'path', None), + 'domain': _get_xml_child_text(root_node, 'domain', None), + 'machine': _get_xml_child_text(root_node, 'machine', None), + 'arch': _get_xml_child_text(root_node, 'arch', None) + } + + for child in root_node.childNodes: + if child.nodeType != xml.dom.Node.ELEMENT_NODE: + continue + + if child.tagName == 'vcpu' and child.getAttribute('max'): + result['max_vcpus'] = int(child.getAttribute('max')) + + elif child.tagName == 'iothreads': + iothreads = child.getAttribute('supported') == 'yes' + if iothreads is not None: + result['iothreads'] = iothreads + + elif child.tagName == 'os': + result['os'] = {} + loader_node = _get_xml_first_element_by_tag_name(child, 'loader') + if loader_node and loader_node.getAttribute('supported') == 'yes': + loader = _parse_caps_loader(loader_node) + result['os']['loader'] = loader + + elif child.tagName == 'cpu': + cpu = _parse_caps_cpu(child) + if cpu: + result['cpu'] = cpu + + elif child.tagName == 'devices': + devices = _parse_caps_devices_features(child) + if devices: + result['devices'] = devices + + elif child.tagName == 'features': + features = _parse_caps_devices_features(child) + if features: + result['features'] = features + + return result + + def cpu_baseline(full=False, migratable=False, out='libvirt', **kwargs): ''' Return the optimal 'custom' CPU baseline config for VM's on this minion @@ -2519,6 +3831,15 @@ def cpu_baseline(full=False, migratable=False, out='libvirt', **kwargs): :param full: Return all CPU features rather than the ones on top of the closest CPU model :param migratable: Exclude CPU features that are unmigratable (libvirt 2.13+) :param out: 'libvirt' (default) for usable libvirt XML definition, 'salt' for nice dict + :param connection: libvirt connection URI, overriding defaults + + .. versionadded:: Fluorine + :param username: username to connect with, overriding defaults + + .. versionadded:: Fluorine + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine CLI Example: @@ -2599,19 +3920,24 @@ def net_define(name, bridge, forward, **kwargs): :param tag: Vlan tag :param autostart: Network autostart (default True) :param start: Network start (default True) + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults CLI Example: .. code-block:: bash salt '*' virt.net_define network main bridge openvswitch + + .. versionadded:: Fluorine ''' conn = __get_conn(**kwargs) vport = kwargs.get('vport', None) tag = kwargs.get('tag', None) autostart = kwargs.get('autostart', True) starting = kwargs.get('start', True) - xml = _gen_net_xml( + net_xml = _gen_net_xml( name, bridge, forward, @@ -2619,7 +3945,7 @@ def net_define(name, bridge, forward, **kwargs): tag, ) try: - conn.networkDefineXML(xml) + conn.networkDefineXML(net_xml) except libvirtError as err: log.warning(err) conn.close() @@ -2649,6 +3975,177 @@ def net_define(name, bridge, forward, **kwargs): return True +def list_networks(**kwargs): + ''' + List all virtual networks. + + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.list_networks + ''' + conn = __get_conn(**kwargs) + try: + return [net.name() for net in conn.listAllNetworks()] + finally: + conn.close() + + +def network_info(name, **kwargs): + ''' + Return informations on a virtual network provided its name. + + :param name: virtual network name + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.network_info default + ''' + result = {} + conn = __get_conn(**kwargs) + try: + net = conn.networkLookupByName(name) + leases = net.DHCPLeases() + for lease in leases: + if lease['type'] == libvirt.VIR_IP_ADDR_TYPE_IPV4: + lease['type'] = 'ipv4' + elif lease['type'] == libvirt.VIR_IP_ADDR_TYPE_IPV6: + lease['type'] = 'ipv6' + else: + lease['type'] = 'unknown' + + result = { + 'uuid': net.UUIDString(), + 'bridge': net.bridgeName(), + 'autostart': net.autostart(), + 'active': net.isActive(), + 'persistent': net.isPersistent(), + 'leases': leases + } + except libvirt.libvirtError as err: + log.debug('Silenced libvirt error: %s', str(err)) + finally: + conn.close() + return result + + +def network_start(name, **kwargs): + ''' + Start a defined virtual network. + + :param name: virtual network name + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.network_start default + ''' + conn = __get_conn(**kwargs) + try: + net = conn.networkLookupByName(name) + return not bool(net.create()) + finally: + conn.close() + + +def network_stop(name, **kwargs): + ''' + Stop a defined virtual network. + + :param name: virtual network name + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.network_stop default + ''' + conn = __get_conn(**kwargs) + try: + net = conn.networkLookupByName(name) + return not bool(net.destroy()) + finally: + conn.close() + + +def network_undefine(name, **kwargs): + ''' + Remove a defined virtual network. This does not stop the virtual network. + + :param name: virtual network name + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.network_undefine default + ''' + conn = __get_conn(**kwargs) + try: + net = conn.networkLookupByName(name) + return not bool(net.undefine()) + finally: + conn.close() + + +def network_set_autostart(name, state='on', **kwargs): + ''' + Set the autostart flag on a virtual network so that the network + will start with the host system on reboot. + + :param name: virtual network name + :param state: 'on' to auto start the network, anything else to mark the + virtual network not to be started when the host boots + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt "*" virt.network_set_autostart + ''' + conn = __get_conn(**kwargs) + try: + net = conn.networkLookupByName(name) + return not bool(net.setAutostart(1 if state == 'on' else 0)) + finally: + conn.close() + + def pool_define_build(name, **kwargs): ''' Create libvirt pool. @@ -2659,12 +4156,17 @@ def pool_define_build(name, **kwargs): :param source: Pool dev source :param autostart: Pool autostart (default True) :param start: Pool start (default True) + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults CLI Example: .. code-block:: bash salt '*' virt.pool_define base logical base + + .. versionadded:: Fluorine ''' exist = False update = False @@ -2674,14 +4176,14 @@ def pool_define_build(name, **kwargs): source = kwargs.pop('source', None) autostart = kwargs.pop('autostart', True) starting = kwargs.pop('start', True) - xml = _gen_pool_xml( + pool_xml = _gen_pool_xml( name, ptype, target, source, ) try: - conn.storagePoolDefineXML(xml) + conn.storagePoolDefineXML(pool_xml) except libvirtError as err: log.warning(err) if err.get_error_code() == libvirt.VIR_ERR_STORAGE_POOL_BUILT or libvirt.VIR_ERR_OPERATION_FAILED: @@ -2724,3 +4226,279 @@ def pool_define_build(name, **kwargs): return (True, 'Pool exist') return True + + +def list_pools(**kwargs): + ''' + List all storage pools. + + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.list_pools + ''' + conn = __get_conn(**kwargs) + try: + return [pool.name() for pool in conn.listAllStoragePools()] + finally: + conn.close() + + +def pool_info(name, **kwargs): + ''' + Return informations on a storage pool provided its name. + + :param name: libvirt storage pool name + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.pool_info default + ''' + result = {} + conn = __get_conn(**kwargs) + try: + pool = conn.storagePoolLookupByName(name) + infos = pool.info() + states = ['inactive', 'building', 'running', 'degraded', 'inaccessible'] + state = states[infos[0]] if infos[0] < len(states) else 'unknown' + desc = minidom.parseString(pool.XMLDesc()) + pool_node = _get_xml_first_element_by_tag_name(desc, 'pool') + path_node = _get_xml_first_element_by_tag_name(desc, 'path') + result = { + 'uuid': pool.UUIDString(), + 'state': state, + 'capacity': infos[1], + 'allocation': infos[2], + 'free': infos[3], + 'autostart': pool.autostart(), + 'persistent': pool.isPersistent(), + 'target_path': _get_xml_element_text(path_node) if path_node else None, + 'type': pool_node.getAttribute('type') + } + except libvirt.libvirtError as err: + log.debug('Silenced libvirt error: %s', str(err)) + finally: + conn.close() + return result + + +def pool_start(name, **kwargs): + ''' + Start a defined libvirt storage pool. + + :param name: libvirt storage pool name + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.pool_start default + ''' + conn = __get_conn(**kwargs) + try: + pool = conn.storagePoolLookupByName(name) + return not bool(pool.create()) + finally: + conn.close() + + +def pool_build(name, **kwargs): + ''' + Build a defined libvirt storage pool. + + :param name: libvirt storage pool name + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.pool_build default + ''' + conn = __get_conn(**kwargs) + try: + pool = conn.storagePoolLookupByName(name) + return not bool(pool.build()) + finally: + conn.close() + + +def pool_stop(name, **kwargs): + ''' + Stop a defined libvirt storage pool. + + :param name: libvirt storage pool name + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.pool_stop default + ''' + conn = __get_conn(**kwargs) + try: + pool = conn.storagePoolLookupByName(name) + return not bool(pool.destroy()) + finally: + conn.close() + + +def pool_undefine(name, **kwargs): + ''' + Remove a defined libvirt storage pool. The pool needs to be stopped before calling. + + :param name: libvirt storage pool name + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.pool_undefine default + ''' + conn = __get_conn(**kwargs) + try: + pool = conn.storagePoolLookupByName(name) + return not bool(pool.undefine()) + finally: + conn.close() + + +def pool_delete(name, fast=True, **kwargs): + ''' + Delete the resources of a defined libvirt storage pool. + + :param name: libvirt storage pool name + :param fast: if set to False, zeroes out all the data. + Default value is True. + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.pool_delete default + ''' + conn = __get_conn(**kwargs) + try: + pool = conn.storagePoolLookupByName(name) + flags = libvirt.VIR_STORAGE_POOL_DELETE_NORMAL + if fast: + flags = libvirt.VIR_STORAGE_POOL_DELETE_ZEROED + return not bool(pool.delete(flags)) + finally: + conn.close() + + +def pool_refresh(name, **kwargs): + ''' + Refresh a defined libvirt storage pool. + + :param name: libvirt storage pool name + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt '*' virt.pool_refresh default + ''' + conn = __get_conn(**kwargs) + try: + pool = conn.storagePoolLookupByName(name) + return not bool(pool.refresh()) + finally: + conn.close() + + +def pool_set_autostart(name, state='on', **kwargs): + ''' + Set the autostart flag on a libvirt storage pool so that the storage pool + will start with the host system on reboot. + + :param name: libvirt storage pool name + :param state: 'on' to auto start the pool, anything else to mark the + pool not to be started when the host boots + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt "*" virt.pool_set_autostart + ''' + conn = __get_conn(**kwargs) + try: + pool = conn.storagePoolLookupByName(name) + return not bool(pool.setAutostart(1 if state == 'on' else 0)) + finally: + conn.close() + + +def pool_list_volumes(name, **kwargs): + ''' + List the volumes contained in a defined libvirt storage pool. + + :param name: libvirt storage pool name + :param connection: libvirt connection URI, overriding defaults + :param username: username to connect with, overriding defaults + :param password: password to connect with, overriding defaults + + .. versionadded:: Fluorine + + CLI Example: + + .. code-block:: bash + + salt "*" virt.pool_list_volumes + ''' + conn = __get_conn(**kwargs) + try: + pool = conn.storagePoolLookupByName(name) + return pool.listVolumes() + finally: + conn.close() diff --git a/salt/modules/vmctl.py b/salt/modules/vmctl.py index 4e13cb6e4f..8efed524ad 100644 --- a/salt/modules/vmctl.py +++ b/salt/modules/vmctl.py @@ -4,7 +4,7 @@ Manage vms running on the OpenBSD VMM hypervisor using vmctl(8). .. versionadded:: Fluorine -:codeauthor: :email:`Jasper Lievisse Adriaanse ` +:codeauthor: ``Jasper Lievisse Adriaanse `` .. note:: @@ -285,8 +285,8 @@ def start(name=None, id=None, bootpath=None, disk=None, disks=None, local_iface= def status(name=None, id=None): ''' - List VMs running on the host, or only the VM specified by ``id''. - When both a name and id are provided, the id is ignored. + List VMs running on the host, or only the VM specified by ``id``. When + both a name and id are provided, the id is ignored. name: Name of the defined VM. diff --git a/salt/modules/vsphere.py b/salt/modules/vsphere.py index 7fc971a621..c266bd9857 100644 --- a/salt/modules/vsphere.py +++ b/salt/modules/vsphere.py @@ -4,7 +4,7 @@ Manage VMware vCenter servers and ESXi hosts. .. versionadded:: 2015.8.4 -:codeauthor: :email:`Alexandru Bleotu ` +:codeauthor: Alexandru Bleotu Dependencies ============ @@ -9059,8 +9059,7 @@ def create_vm(vm_name, cpu, memory, image, version, datacenter, datastore, .. code-block:: bash - salt vm_minion vsphere.create_vm vm_name=vmname \ - cpu='{count: 2, nested: True}' ... + salt vm_minion vsphere.create_vm vm_name=vmname cpu='{count: 2, nested: True}' ... vm_name Name of the virtual machine @@ -9090,7 +9089,9 @@ def create_vm(vm_name, cpu, memory, image, version, datacenter, datastore, devices interfaces + .. code-block:: bash + interfaces: adapter: 'Network adapter 1' name: vlan100 @@ -9103,7 +9104,9 @@ def create_vm(vm_name, cpu, memory, image, version, datacenter, datastore, start_connected: True disks + .. code-block:: bash + disks: adapter: 'Hard disk 1' size: 16 @@ -9116,14 +9119,18 @@ def create_vm(vm_name, cpu, memory, image, version, datacenter, datastore, filename: 'vm/mydisk.vmdk' scsi_devices + .. code-block:: bash + scsi_devices: controller: 'SCSI controller 0' type: paravirtual bus_sharing: no_sharing serial_ports + .. code-block:: bash + serial_ports: adapter: 'Serial port 1' type: network @@ -9138,7 +9145,9 @@ def create_vm(vm_name, cpu, memory, image, version, datacenter, datastore, yield: False cd_drives + .. code-block:: bash + cd_drives: adapter: 'CD/DVD drive 0' controller: 'IDE 0' diff --git a/salt/modules/win_dsc.py b/salt/modules/win_dsc.py index 09739d90c3..fa7de9a944 100644 --- a/salt/modules/win_dsc.py +++ b/salt/modules/win_dsc.py @@ -649,57 +649,56 @@ def set_lcm_config(config_mode=None, For detailed descriptions of the parameters see: https://msdn.microsoft.com/en-us/PowerShell/DSC/metaConfig - Args: + config_mode (str): How the LCM applies the configuration. Valid values + are: - config_mode (str): How the LCM applies the configuration. Valid values - are: + - ApplyOnly + - ApplyAndMonitor + - ApplyAndAutoCorrect - - ApplyOnly - - ApplyAndMonitor - - ApplyAndAutoCorrect + config_mode_freq (int): How often, in minutes, the current configuration + is checked and applied. Ignored if config_mode is set to ApplyOnly. + Default is 15. - config_mode_freq (int): How often, in minutes, the current configuration - is checked and applied. Ignored if config_mode is set to ApplyOnly. - Default is 15. + refresh_mode (str): How the LCM gets configurations. Valid values are: - refresh_mode (str): How the LCM gets configurations. Valid values are: + - Disabled + - Push + - Pull - - Disabled - - Push - - Pull + refresh_freq (int): How often, in minutes, the LCM checks for updated + configurations. (pull mode only) Default is 30. - refresh_freq (int): How often, in minutes, the LCM checks for updated - configurations. (pull mode only) Default is 30. + reboot_if_needed (bool): Reboot the machine if needed after a + configuration is applied. Default is False. - .. note:: Either `config_mode_freq` or `refresh_freq` needs to be a - multiple of the other. See documentation on MSDN for more details. + action_after_reboot (str): Action to take after reboot. Valid values + are: - reboot_if_needed (bool): Reboot the machine if needed after a - configuration is applied. Default is False. + - ContinueConfiguration + - StopConfiguration - action_after_reboot (str): Action to take after reboot. Valid values - are: + certificate_id (guid): A GUID that specifies a certificate used to + access the configuration: (pull mode) - - ContinueConfiguration - - StopConfiguration + configuration_id (guid): A GUID that identifies the config file to get + from a pull server. (pull mode) - certificate_id (guid): A GUID that specifies a certificate used to - access the configuration: (pull mode) + allow_module_overwrite (bool): New configs are allowed to overwrite old + ones on the target node. - configuration_id (guid): A GUID that identifies the config file to get - from a pull server. (pull mode) + debug_mode (str): Sets the debug level. Valid values are: - allow_module_overwrite (bool): New configs are allowed to overwrite old - ones on the target node. + - None + - ForceModuleImport + - All - debug_mode (str): Sets the debug level. Valid values are: + status_retention_days (int): Number of days to keep status of the + current config. - - None - - ForceModuleImport - - All - - status_retention_days (int): Number of days to keep status of the - current config. + .. note:: + Either ``config_mode_freq`` or ``refresh_freq`` needs to be a + multiple of the other. See documentation on MSDN for more details. Returns: bool: True if successful, otherwise False diff --git a/salt/modules/win_file.py b/salt/modules/win_file.py index 301b35b54b..a8c96706f1 100644 --- a/salt/modules/win_file.py +++ b/salt/modules/win_file.py @@ -53,7 +53,7 @@ from salt.modules.file import (check_hash, # pylint: disable=W0611 get_hash, manage_file, file_exists, get_diff, line, list_backups, __clean_tmp, check_file_meta, _binary_replace, _splitlines_preserving_trailing_newline, restore_backup, - access, copy, readdir, rmdir, truncate, replace, delete_backup, + access, copy, readdir, read, rmdir, truncate, replace, delete_backup, search, _get_flags, extract_hash, _error, _sed_esc, _psed, RE_FLAG_TABLE, blockreplace, prepend, seek_read, seek_write, rename, lstat, path_exists_glob, write, pardir, join, HASHES, HASHES_REVMAP, @@ -111,7 +111,7 @@ def __virtual__(): global contains_regex, contains_glob, get_source_sum global find, psed, get_sum, check_hash, get_hash, delete_backup global get_diff, line, _get_flags, extract_hash, comment_line - global access, copy, readdir, rmdir, truncate, replace, search + global access, copy, readdir, read, rmdir, truncate, replace, search global _binary_replace, _get_bkroot, list_backups, restore_backup global _splitlines_preserving_trailing_newline global blockreplace, prepend, seek_read, seek_write, rename, lstat @@ -158,6 +158,7 @@ def __virtual__(): access = _namespaced_function(access, globals()) copy = _namespaced_function(copy, globals()) readdir = _namespaced_function(readdir, globals()) + read = _namespaced_function(read, globals()) rmdir = _namespaced_function(rmdir, globals()) truncate = _namespaced_function(truncate, globals()) blockreplace = _namespaced_function(blockreplace, globals()) diff --git a/salt/modules/win_iis.py b/salt/modules/win_iis.py index 70faac2254..53150365f4 100644 --- a/salt/modules/win_iis.py +++ b/salt/modules/win_iis.py @@ -1802,9 +1802,13 @@ def list_worker_processes(apppool): def get_webapp_settings(name, site, settings): r''' + .. versionadded:: 2017.7.0 + Get the value of the setting for the IIS web application. + .. note:: - Params are case sensitive. + Params are case sensitive + :param str name: The name of the IIS web application. :param str site: The site name contains the web application. Example: Default Web Site @@ -1812,9 +1816,11 @@ def get_webapp_settings(name, site, settings): Available settings: physicalPath, applicationPool, userName, password Returns: dict: A dictionary of the provided settings and their values. - .. versionadded:: 2017.7.0 + CLI Example: + .. code-block:: bash + salt '*' win_iis.get_webapp_settings name='app0' site='Default Web Site' settings="['physicalPath','applicationPool']" ''' @@ -1872,22 +1878,28 @@ def get_webapp_settings(name, site, settings): def set_webapp_settings(name, site, settings): r''' + .. versionadded:: 2017.7.0 + Configure an IIS application. + .. note:: - This function only configures existing app. - Params are case sensitive. + This function only configures an existing app. Params are case + sensitive. + :param str name: The IIS application. :param str site: The IIS site name. :param str settings: A dictionary of the setting names and their values. - :available settings: physicalPath: The physical path of the webapp. - : applicationPool: The application pool for the webapp. - : userName: "connectAs" user - : password: "connectAs" password for user + - physicalPath: The physical path of the webapp. + - applicationPool: The application pool for the webapp. + - userName: "connectAs" user + - password: "connectAs" password for user :return: A boolean representing whether all changes succeeded. :rtype: bool - .. versionadded:: 2017.7.0 + CLI Example: + .. code-block:: bash + salt '*' win_iis.set_webapp_settings name='app0' site='site0' settings="{'physicalPath': 'C:\site0', 'apppool': 'site0'}" ''' pscmd = list() diff --git a/salt/modules/win_lgpo.py b/salt/modules/win_lgpo.py index af85d08ab9..874b7db467 100644 --- a/salt/modules/win_lgpo.py +++ b/salt/modules/win_lgpo.py @@ -35,7 +35,7 @@ Current known limitations - lxml - uuid - struct - - salt.modules.reg + - salt.utils.win_reg ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function @@ -98,7 +98,7 @@ try: import lxml import struct from lxml import etree - from salt.modules.reg import Registry as Registry + from salt.utils.win_reg import Registry HAS_WINDOWS_MODULES = True TRUE_VALUE_XPATH = etree.XPath('.//*[local-name() = "trueValue"]') FALSE_VALUE_XPATH = etree.XPath('.//*[local-name() = "falseValue"]') @@ -3345,9 +3345,11 @@ def __virtual__(): ''' Only works on Windows systems ''' - if salt.utils.platform.is_windows() and HAS_WINDOWS_MODULES: - return __virtualname__ - return False + if not salt.utils.platform.is_windows(): + return False, 'win_lgpo: Not a Windows System' + if not HAS_WINDOWS_MODULES: + return False, 'win_lgpo: Required modules failed to load' + return __virtualname__ def _updateNamespace(item, new_namespace): @@ -6045,7 +6047,7 @@ def set_(computer_policy=None, user_policy=None, else: raise SaltInvocationError(msg) if policy_namespace and policy_name in _admTemplateData[policy_namespace] and the_policy is not None: - log.debug('setting == %s', _admTemplateData[policy_namespace][policy_name].lower()) + log.debug('setting == %s', six.text_type(_admTemplateData[policy_namespace][policy_name]).lower()) log.debug(six.text_type(_admTemplateData[policy_namespace][policy_name]).lower()) if six.text_type(_admTemplateData[policy_namespace][policy_name]).lower() != 'disabled' \ and six.text_type(_admTemplateData[policy_namespace][policy_name]).lower() != 'not configured': diff --git a/salt/modules/win_pkg.py b/salt/modules/win_pkg.py index 3fad4ea73d..117a3fa82b 100644 --- a/salt/modules/win_pkg.py +++ b/salt/modules/win_pkg.py @@ -29,11 +29,11 @@ suppress refreshes when the metadata is less than a given number of seconds old. .. note:: - Version numbers can be `version number string`, `latest` and `Not Found`. - Where `Not Found` means this module was not able to determine the version of - the software installed, it can also be used as the version number in sls - definitions file in these cases. Versions numbers are sorted in order of - 0,`Not Found`,`order version numbers`,...,`latest`. + Version numbers can be ``version number string``, ``latest`` and ``Not + Found``, where ``Not Found`` means this module was not able to determine + the version of the software installed, it can also be used as the version + number in sls definitions file in these cases. Versions numbers are sorted + in order of 0, ``Not Found``, ``order version numbers``, ..., ``latest``. ''' @@ -367,12 +367,9 @@ def list_pkgs(versions_as_list=False, **kwargs): ''' List the packages currently installed - Args: - version_as_list (bool): Returns the versions as a list - - Kwargs: - saltenv (str): The salt environment to use. Default ``base``. - refresh (bool): Refresh package metadata. Default ``False`. + version_as_list (bool): Returns the versions as a list + saltenv (str): The salt environment to use. Default ``base``. + refresh (bool): Refresh package metadata. Default ``False``. Returns: dict: A dictionary of installed software with versions installed @@ -614,8 +611,10 @@ def refresh_db(**kwargs): There is no need to call `pkg.refresh_db` every time you work with the pkg module. Automatic refresh will occur based on the following minion configuration settings: - - `winrepo_cache_expire_min` - - `winrepo_cache_expire_max` + + - `winrepo_cache_expire_min` + - `winrepo_cache_expire_max` + However, if the package definition files have changed, as would be the case if you are developing a new package definition, this function should be called to ensure the minion has the latest information about @@ -630,19 +629,19 @@ def refresh_db(**kwargs): For more information see :ref:`Windows Software Repository ` - Kwargs: + Arguments: - saltenv (str): Salt environment. Default: ``base`` + saltenv (str): Salt environment. Default: ``base`` - verbose (bool): - Return a verbose data structure which includes 'success_list', a - list of all sls files and the package names contained within. - Default is 'False' + verbose (bool): + Return a verbose data structure which includes 'success_list', a + list of all sls files and the package names contained within. + Default is 'False' - failhard (bool): - If ``True``, an error will be raised if any repo SLS files fails to - process. If ``False``, no error will be raised, and a dictionary - containing the full results will be returned. + failhard (bool): + If ``True``, an error will be raised if any repo SLS files fails to + process. If ``False``, no error will be raised, and a dictionary + containing the full results will be returned. Returns: dict: A dictionary containing the results of the database refresh. @@ -954,7 +953,7 @@ def _repo_process_pkg_sls(filename, short_path_name, ret, successful_verbose): else: ret.setdefault('repo', {}).update(config) ret.setdefault('name_map', {}).update(revmap) - successful_verbose[short_path_name] = config.keys() + successful_verbose[short_path_name] = list(config.keys()) elif config: return _failed_compile('Compiled contents', 'not a dictionary/hash') else: diff --git a/salt/modules/win_repo.py b/salt/modules/win_repo.py index 654918a9b6..c0a9dde453 100644 --- a/salt/modules/win_repo.py +++ b/salt/modules/win_repo.py @@ -127,6 +127,7 @@ def update_git_repos(clean=False): def show_sls(name, saltenv='base'): r''' .. versionadded:: 2015.8.0 + Display the rendered software definition from a specific sls file in the local winrepo cache. This will parse all Jinja. Run pkg.refresh_db to pull the latest software definitions from the master. diff --git a/salt/modules/win_snmp.py b/salt/modules/win_snmp.py index a47be22d6b..6c73b53ef0 100644 --- a/salt/modules/win_snmp.py +++ b/salt/modules/win_snmp.py @@ -9,16 +9,20 @@ import logging # Import Salt libs import salt.utils.platform -from salt.exceptions import SaltInvocationError +from salt.exceptions import SaltInvocationError, CommandExecutionError # Import 3rd party libs from salt.ext import six _HKEY = 'HKLM' + _SNMP_KEY = r'SYSTEM\CurrentControlSet\Services\SNMP\Parameters' _AGENT_KEY = r'{0}\RFC1156Agent'.format(_SNMP_KEY) _COMMUNITIES_KEY = r'{0}\ValidCommunities'.format(_SNMP_KEY) +_SNMP_GPO_KEY = r'SOFTWARE\Policies\SNMP\Parameters' +_COMMUNITIES_GPO_KEY = r'{0}\ValidCommunities'.format(_SNMP_GPO_KEY) + _PERMISSION_TYPES = {'None': 1, 'Notify': 2, 'Read Only': 4, @@ -284,6 +288,21 @@ def get_community_names(): ''' Get the current accepted SNMP community names and their permissions. + If community names are being managed by Group Policy, those values will be + returned instead like this: + + .. code-block:: bash + + TestCommunity: + Managed by GPO + + Community names managed normally will denote the permission instead: + + .. code-block:: bash + + TestCommunity: + Read Only + Returns: dict: A dictionary of community names and permissions. @@ -294,25 +313,69 @@ def get_community_names(): salt '*' win_snmp.get_community_names ''' ret = dict() - current_values = __salt__['reg.list_values']( - _HKEY, _COMMUNITIES_KEY, include_default=False) - # The communities are stored as the community name with a numeric permission - # value. Convert the numeric value to the text equivalent, as present in the - # Windows SNMP service GUI. - if isinstance(current_values, list): - for current_value in current_values: + # Look in GPO settings first + if __salt__['reg.key_exists'](_HKEY, _COMMUNITIES_GPO_KEY): - # Ignore error values - if not isinstance(current_value, dict): - continue + _LOG.debug('Loading communities from Group Policy settings') - permissions = six.text_type() - for permission_name in _PERMISSION_TYPES: - if current_value['vdata'] == _PERMISSION_TYPES[permission_name]: - permissions = permission_name - break - ret[current_value['vname']] = permissions + current_values = __salt__['reg.list_values']( + _HKEY, _COMMUNITIES_GPO_KEY, include_default=False) + + # GPO settings are different in that they do not designate permissions + # They are a numbered list of communities like so: + # + # {1: "community 1", + # 2: "community 2"} + # + # Denote that it is being managed by Group Policy. + # + # community 1: + # Managed by GPO + # community 2: + # Managed by GPO + if isinstance(current_values, list): + for current_value in current_values: + + # Ignore error values + if not isinstance(current_value, dict): + continue + + ret[current_value['vdata']] = 'Managed by GPO' + + if not ret: + + _LOG.debug('Loading communities from SNMP settings') + + current_values = __salt__['reg.list_values']( + _HKEY, _COMMUNITIES_KEY, include_default=False) + + # The communities are stored as the community name with a numeric + # permission value. Like this (4 = Read Only): + # + # {"community 1": 4, + # "community 2": 4} + # + # Convert the numeric value to the text equivalent, as present in the + # Windows SNMP service GUI. + # + # community 1: + # Read Only + # community 2: + # Read Only + if isinstance(current_values, list): + for current_value in current_values: + + # Ignore error values + if not isinstance(current_value, dict): + continue + + permissions = six.text_type() + for permission_name in _PERMISSION_TYPES: + if current_value['vdata'] == _PERMISSION_TYPES[permission_name]: + permissions = permission_name + break + ret[current_value['vname']] = permissions if not ret: _LOG.debug('Unable to find existing communities.') @@ -323,6 +386,11 @@ def set_community_names(communities): ''' Manage the SNMP accepted community names and their permissions. + .. note:: + Settings managed by Group Policy will always take precedence over those + set using the SNMP interface. Therefore if this function finds Group + Policy settings it will raise a CommandExecutionError + Args: communities (dict): A dictionary of SNMP community names and permissions. The possible permissions can be found via @@ -331,6 +399,10 @@ def set_community_names(communities): Returns: bool: True if successful, otherwise False + Raises: + CommandExecutionError: + If SNMP settings are being managed by Group Policy + CLI Example: .. code-block:: bash @@ -339,6 +411,11 @@ def set_community_names(communities): ''' values = dict() + if __salt__['reg.key_exists'](_HKEY, _COMMUNITIES_GPO_KEY): + _LOG.debug('Communities on this system are managed by Group Policy') + raise CommandExecutionError( + 'Communities on this system are managed by Group Policy') + current_communities = get_community_names() if communities == current_communities: diff --git a/salt/modules/win_task.py b/salt/modules/win_task.py index 643a54fc79..636d0ed848 100644 --- a/salt/modules/win_task.py +++ b/salt/modules/win_task.py @@ -320,8 +320,8 @@ def list_tasks(location='\\'): List all tasks located in a specific location in the task scheduler. :param str location: A string value representing the folder from which you - want to list tasks. Default is '\\' which is the root for the task - scheduler (C:\Windows\System32\tasks). + want to list tasks. Default is '\\' which is the root for the task + scheduler (C:\Windows\System32\tasks). :return: Returns a list of tasks. :rtype: list @@ -353,8 +353,8 @@ def list_folders(location='\\'): List all folders located in a specific location in the task scheduler. :param str location: A string value representing the folder from which you - want to list tasks. Default is '\\' which is the root for the task - scheduler (C:\Windows\System32\tasks). + want to list tasks. Default is '\\' which is the root for the task + scheduler (C:\Windows\System32\tasks). :return: Returns a list of folders. :rtype: list @@ -388,8 +388,8 @@ def list_triggers(name, location='\\'): :param str name: The name of the task for which list triggers. :param str location: A string value representing the location of the task - from which to list triggers. Default is '\\' which is the root for the task - scheduler (C:\Windows\System32\tasks). + from which to list triggers. Default is '\\' which is the root for the + task scheduler (C:\Windows\System32\tasks). :return: Returns a list of triggers. :rtype: list @@ -424,8 +424,8 @@ def list_actions(name, location='\\'): :param str name: The name of the task for which list actions. :param str location: A string value representing the location of the task - from which to list actions. Default is '\\' which is the root for the task - scheduler (C:\Windows\System32\tasks). + from which to list actions. Default is '\\' which is the root for the + task scheduler (C:\Windows\System32\tasks). :return: Returns a list of actions. :rtype: list @@ -463,23 +463,24 @@ def create_task(name, Create a new task in the designated location. This function has many keyword arguments that are not listed here. For additional arguments see: - - py:function::`edit_task` - - py:function::`add_action` - - py:function::`add_trigger` + - :py:func:`edit_task` + - :py:func:`add_action` + - :py:func:`add_trigger` :param str name: The name of the task. This will be displayed in the task - scheduler. + scheduler. :param str location: A string value representing the location in which to - create the task. Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + create the task. Default is '\\' which is the root for the task + scheduler (C:\Windows\System32\tasks). :param str user_name: The user account under which to run the task. To - specify the 'System' account, use 'System'. The password will be ignored. + specify the 'System' account, use 'System'. The password will be + ignored. :param str password: The password to use for authentication. This should set - the task to run whether the user is logged in or not, but is currently not - working. + the task to run whether the user is logged in or not, but is currently + not working. :param bool force: If the task exists, overwrite the existing task. @@ -545,24 +546,25 @@ def create_task_from_xml(name, Create a task based on XML. Source can be a file or a string of XML. :param str name: The name of the task. This will be displayed in the task - scheduler. + scheduler. :param str location: A string value representing the location in which to - create the task. Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + create the task. Default is '\\' which is the root for the task + scheduler (C:\Windows\System32\tasks). :param str xml_text: A string of xml representing the task to be created. - This will be overridden by `xml_path` if passed. + This will be overridden by `xml_path` if passed. :param str xml_path: The path to an XML file on the local system containing - the xml that defines the task. This will override `xml_text` + the xml that defines the task. This will override `xml_text` :param str user_name: The user account under which to run the task. To - specify the 'System' account, use 'System'. The password will be ignored. + specify the 'System' account, use 'System'. The password will be + ignored. :param str password: The password to use for authentication. This should set - the task to run whether the user is logged in or not, but is currently not - working. + the task to run whether the user is logged in or not, but is currently + not working. :return: True if successful, False if unsuccessful :rtype: bool @@ -641,11 +643,11 @@ def create_folder(name, location='\\'): Create a folder in which to create tasks. :param str name: The name of the folder. This will be displayed in the task - scheduler. + scheduler. :param str location: A string value representing the location in which to - create the folder. Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + create the folder. Default is '\\' which is the root for the task + scheduler (C:\Windows\System32\tasks). :return: True if successful, False if unsuccessful :rtype: bool @@ -711,40 +713,44 @@ def edit_task(name=None, Edit the parameters of a task. Triggers and Actions cannot be edited yet. :param str name: The name of the task. This will be displayed in the task - scheduler. + scheduler. :param str location: A string value representing the location in which to - create the task. Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + create the task. Default is '\\' which is the root for the task + scheduler (C:\Windows\System32\tasks). :param str user_name: The user account under which to run the task. To - specify the 'System' account, use 'System'. The password will be ignored. + specify the 'System' account, use 'System'. The password will be + ignored. :param str password: The password to use for authentication. This should set - the task to run whether the user is logged in or not, but is currently not - working. + the task to run whether the user is logged in or not, but is currently + not working. - .. note:: The combination of user_name and password determine how the task - runs. For example, if a username is passed without at password the task will - only run when the user is logged in. If a password is passed as well the - task will run whether the user is logged on or not. If you pass 'System' as - the username the task will run as the system account (the password parameter - is ignored. + .. note:: + The combination of user_name and password determine how the task runs. + For example, if a username is passed without at password the task will + only run when the user is logged in. If a password is passed as well + the task will run whether the user is logged on or not. If you pass + 'System' as the username the task will run as the system account (the + password parameter is ignored. :param str description: A string representing the text that will be - displayed in the description field in the task scheduler. + displayed in the description field in the task scheduler. :param bool enabled: A boolean value representing whether or not the task is - enabled. + enabled. :param bool hidden: A boolean value representing whether or not the task is - hidden. + hidden. :param bool run_if_idle: Boolean value that indicates that the Task - Scheduler will run the task only if the computer is in an idle state. + Scheduler will run the task only if the computer is in an idle state. :param str idle_duration: A value that indicates the amount of time that the - computer must be in an idle state before the task is run. Valid values are: + computer must be in an idle state before the task is run. Valid values + are: + - 1 minute - 5 minutes - 10 minutes @@ -753,8 +759,9 @@ def edit_task(name=None, - 1 hour :param str idle_wait_timeout: A value that indicates the amount of time that - the Task Scheduler will wait for an idle condition to occur. Valid values - are: + the Task Scheduler will wait for an idle condition to occur. Valid + values are: + - Do not wait - 1 minute - 5 minutes @@ -765,39 +772,40 @@ def edit_task(name=None, - 2 hours :param bool idle_stop_on_end: Boolean value that indicates that the Task - Scheduler will terminate the task if the idle condition ends before the task - is completed. + Scheduler will terminate the task if the idle condition ends before the + task is completed. :param bool idle_restart: Boolean value that indicates whether the task is - restarted when the computer cycles into an idle condition more than once. + restarted when the computer cycles into an idle condition more than + once. :param bool ac_only: Boolean value that indicates that the Task Scheduler - will launch the task only while on AC power. + will launch the task only while on AC power. :param bool stop_if_on_batteries: Boolean value that indicates that the task - will be stopped if the computer begins to run on battery power. + will be stopped if the computer begins to run on battery power. :param bool wake_to_run: Boolean value that indicates that the Task - Scheduler will wake the computer when it is time to run the task. + Scheduler will wake the computer when it is time to run the task. :param bool run_if_network: Boolean value that indicates that the Task - Scheduler will run the task only when a network is available. + Scheduler will run the task only when a network is available. :param guid network_id: GUID value that identifies a network profile. :param str network_name: Sets the name of a network profile. The name is - used for display purposes. + used for display purposes. :param bool allow_demand_start: Boolean value that indicates that the task - can be started by using either the Run command or the Context menu. + can be started by using either the Run command or the Context menu. :param bool start_when_available: Boolean value that indicates that the Task - Scheduler can start the task at any time after its scheduled time has - passed. + Scheduler can start the task at any time after its scheduled time has + passed. :param restart_every: A value that specifies the interval between task - restart attempts. Valid values are: - :type: bool str + restart attempts. Valid values are: + - False (to disable) - 1 minute - 5 minutes @@ -808,11 +816,11 @@ def edit_task(name=None, - 2 hours :param int restart_count: The number of times the Task Scheduler will - attempt to restart the task. Valid values are integers 1 - 999. + attempt to restart the task. Valid values are integers 1 - 999. :param execution_time_limit: The amount of time allowed to complete the - task. Valid values are: - :type: bool str + task. Valid values are: + - False (to disable) - 1 hour - 2 hours @@ -823,12 +831,12 @@ def edit_task(name=None, - 3 days :param bool force_stop: Boolean value that indicates that the task may be - terminated by using TerminateProcess. + terminated by using TerminateProcess. :param delete_after: The amount of time that the Task Scheduler will - wait before deleting the task after it expires. Requires a trigger with an - expiration date. Valid values are: - :type: bool str + wait before deleting the task after it expires. Requires a trigger with + an expiration date. Valid values are: + - False (to disable) - Immediately - 30 days @@ -837,7 +845,8 @@ def edit_task(name=None, - 365 days :param str multiple_instances: Sets the policy that defines how the Task - Scheduler deals with multiple instances of the task. Valid values are: + Scheduler deals with multiple instances of the task. Valid values are: + - Parallel - Queue - No New Instance @@ -1019,8 +1028,8 @@ def delete_task(name, location='\\'): :param str name: The name of the task to delete. :param str location: A string value representing the location of the task. - Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + Default is '\\' which is the root for the task scheduler + (C:\Windows\System32\tasks). :return: True if successful, False if unsuccessful :rtype: bool @@ -1058,9 +1067,9 @@ def delete_folder(name, location='\\'): :param str name: The name of the folder to delete. - :param str location: A string value representing the location of the folder. - Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + :param str location: A string value representing the location of the + folder. Default is '\\' which is the root for the task scheduler + (C:\Windows\System32\tasks). :return: True if successful, False if unsuccessful :rtype: bool @@ -1100,8 +1109,8 @@ def run(name, location='\\'): :param str name: The name of the task to run. :param str location: A string value representing the location of the task. - Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + Default is '\\' which is the root for the task scheduler + (C:\Windows\System32\tasks). :return: True if successful, False if unsuccessful :rtype: bool @@ -1139,8 +1148,8 @@ def run_wait(name, location='\\'): :param str name: The name of the task to run. :param str location: A string value representing the location of the task. - Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + Default is '\\' which is the root for the task scheduler + (C:\Windows\System32\tasks). :return: True if successful, False if unsuccessful :rtype: bool @@ -1196,8 +1205,8 @@ def stop(name, location='\\'): :param str name: The name of the task to stop. :param str location: A string value representing the location of the task. - Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + Default is '\\' which is the root for the task scheduler + (C:\Windows\System32\tasks). :return: True if successful, False if unsuccessful :rtype: bool @@ -1235,15 +1244,17 @@ def status(name, location='\\'): :param str name: The name of the task for which to return the status :param str location: A string value representing the location of the task. - Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + Default is '\\' which is the root for the task scheduler + (C:\Windows\System32\tasks). :return: The current status of the task. Will be one of the following: + - Unknown - Disabled - Queued - Ready - Running + :rtype: string CLI Example: @@ -1275,8 +1286,8 @@ def info(name, location='\\'): :param str name: The name of the task for which to return the status :param str location: A string value representing the location of the task. - Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + Default is '\\' which is the root for the task scheduler + (C:\Windows\System32\tasks). :return: :rtype: dict @@ -1413,41 +1424,39 @@ def add_action(name=None, :param str name: The name of the task to which to add the action. :param str location: A string value representing the location of the task. - Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + Default is '\\' which is the root for the task scheduler + (C:\Windows\System32\tasks). :param str action_type: The type of action to add. There are three action - types. Each one requires its own set of Keyword Arguments (kwargs). Valid - values are: - - Execute - - Email - - Message + types. Each one requires its own set of Keyword Arguments (kwargs). Valid + values are: - **kwargs** + - Execute + - Email + - Message - Required kwargs for each value: + Required arguments for each action_type: - *Execute* - Execute a command or an executable. + **Execute** - Execute a command or an executable :param str cmd: (required) The command / executable to run. :param str arguments: (optional) Arguments to be passed to the command / - executable. To launch a script the first command will need to be the - interpreter for the script. For example, to run a vbscript you would - pass `cscript.exe` in the `cmd` parameter and pass the script in the - `arguments` parameter as follows: + executable. To launch a script the first command will need to be the + interpreter for the script. For example, to run a vbscript you would + pass `cscript.exe` in the `cmd` parameter and pass the script in the + `arguments` parameter as follows: - - ``cmd='cscript.exe' arguments='c:\scripts\myscript.vbs'`` + - ``cmd='cscript.exe' arguments='c:\scripts\myscript.vbs'`` - Batch files do not need an interpreter and may be passed to the cmd - parameter directly. + Batch files do not need an interpreter and may be passed to the cmd + parameter directly. :param str start_in: (optional) The current working directory for the - command. + command. - *Email* - Send and email. Requires ``server``, ``from``, and ``to`` or ``cc``. + **Email** - Send and email. Requires ``server``, ``from``, and ``to`` or + ``cc``. :param str from: The sender :param str reply_to: Who to reply to @@ -1458,12 +1467,12 @@ def add_action(name=None, :param str body: The Message Body of the email :param str server: The server used to send the email :param list attachments: A list of attachments. These will be the paths to - the files to attach. ie: - attachments=['C:\attachment1.txt', 'C:\attachment2.txt'] + the files to attach. ie: ``attachments="['C:\attachment1.txt', + 'C:\attachment2.txt']"`` - *Message* - Display a dialog box. The task must be set to "Run only when user is logged - on" in order for the dialog box to display. Both parameters are required. + **Message** - Display a dialog box. The task must be set to "Run only when + user is logged on" in order for the dialog box to display. Both parameters + are required. :param str title: The dialog box title. :param str message: The dialog box message body @@ -1633,15 +1642,16 @@ def add_trigger(name=None, delay=None, **kwargs): r''' - :param str name: The name of the task to which to add the trigger. :param str location: A string value representing the location of the task. - Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + Default is '\\' which is the root for the task scheduler + (C:\Windows\System32\tasks). + + :param str trigger_type: The type of trigger to create. This is defined + when the trigger is created and cannot be changed later. Options are as + follows: - :param str trigger_type: The type of trigger to create. This is defined when - the trigger is created and cannot be changed later. Options are as follows: - Event - Once - Daily @@ -1655,11 +1665,12 @@ def add_trigger(name=None, - OnSessionChange :param bool trigger_enabled: Boolean value that indicates whether the - trigger is enabled. + trigger is enabled. :param str start_date: The date when the trigger is activated. If no value - is passed, the current date will be used. Can be one of the following - formats: + is passed, the current date will be used. Can be one of the following + formats: + - %Y-%m-%d - %m-%d-%y - %m-%d-%Y @@ -1668,15 +1679,17 @@ def add_trigger(name=None, - %Y/%m/%d :param str start_time: The time when the trigger is activated. If no value - is passed, midnight will be used. Can be one of the following formats: + is passed, midnight will be used. Can be one of the following formats: + - %I:%M:%S %p - %I:%M %p - %H:%M:%S - %H:%M :param str end_date: The date when the trigger is deactivated. The trigger - cannot start the task after it is deactivated. Can be one of the following - formats: + cannot start the task after it is deactivated. Can be one of the + following formats: + - %Y-%m-%d - %m-%d-%y - %m-%d-%Y @@ -1685,15 +1698,17 @@ def add_trigger(name=None, - %Y/%m/%d :param str end_time: The time when the trigger is deactivated. If the this - is not passed with ``end_date`` it will be set to midnight. Can be one of - the following formats: + is not passed with ``end_date`` it will be set to midnight. Can be one + of the following formats: + - %I:%M:%S %p - %I:%M %p - %H:%M:%S - %H:%M :param str random_delay: The delay time that is randomly added to the start - time of the trigger. Valid values are: + time of the trigger. Valid values are: + - 30 seconds - 1 minute - 30 minutes @@ -1702,7 +1717,8 @@ def add_trigger(name=None, - 1 day :param str repeat_interval: The amount of time between each restart of the - task. Valid values are: + task. Valid values are: + - 5 minutes - 10 minutes - 15 minutes @@ -1710,7 +1726,8 @@ def add_trigger(name=None, - 1 hour :param str repeat_duration: How long the pattern is repeated. Valid values - are: + are: + - Indefinitely - 15 minutes - 30 minutes @@ -1719,11 +1736,12 @@ def add_trigger(name=None, - 1 day :param bool repeat_stop_at_duration_end: Boolean value that indicates if a - running instance of the task is stopped at the end of the repetition - pattern duration. + running instance of the task is stopped at the end of the repetition + pattern duration. :param str execution_time_limit: The maximum amount of time that the task - launched by the trigger is allowed to run. Valid values are: + launched by the trigger is allowed to run. Valid values are: + - 30 minutes - 1 hour - 2 hours @@ -1734,14 +1752,15 @@ def add_trigger(name=None, - 3 days (default) :param str delay: The time the trigger waits after its activation to start the task. - Valid values are: - - 15 seconds - - 30 seconds - - 1 minute - - 30 minutes - - 1 hour - - 8 hours - - 1 day + Valid values are: + + - 15 seconds + - 30 seconds + - 1 minute + - 30 minutes + - 1 hour + - 8 hours + - 1 day **kwargs** @@ -1749,65 +1768,72 @@ def add_trigger(name=None, being defined. They are as follows: *Event* - :param str subscription: An event definition in xml format that fires - the trigger. The easiest way to get this would is to create an event in - windows task scheduler and then copy the xml text. + + :param str subscription: An event definition in xml format that fires the + trigger. The easiest way to get this would is to create an event in + windows task scheduler and then copy the xml text. *Once* + No special parameters required. *Daily* + :param int days_interval: The interval between days in the schedule. An - interval of 1 produces a daily schedule. An interval of 2 produces an - every-other day schedule. If no interval is specified, 1 is used. Valid - entries are 1 - 999. + interval of 1 produces a daily schedule. An interval of 2 produces an + every-other day schedule. If no interval is specified, 1 is used. Valid + entries are 1 - 999. *Weekly* + :param int weeks_interval: The interval between weeks in the schedule. - An interval of 1 produces a weekly schedule. An interval of 2 produces - an every-other week schedule. If no interval is specified, 1 is used. - Valid entries are 1 - 52. + An interval of 1 produces a weekly schedule. An interval of 2 produces + an every-other week schedule. If no interval is specified, 1 is used. + Valid entries are 1 - 52. param list days_of_week: Sets the days of the week on which the task - runs. Should be a list. ie: ['Monday','Wednesday','Friday']. Valid - entries are the names of the days of the week. + runs. Should be a list. ie: ['Monday','Wednesday','Friday']. Valid + entries are the names of the days of the week. *Monthly* + :param list months_of_year: Sets the months of the year during which the - task runs. Should be a list. ie: ['January','July']. Valid entries are - the full names of all the months. + task runs. Should be a list. ie: ['January','July']. Valid entries are + the full names of all the months. :param list days_of_month: Sets the days of the month during which the - task runs. Should be a list. ie: [1, 15, 'Last']. Options are all days - of the month 1 - 31 and the word 'Last' to indicate the last day of the - month. + task runs. Should be a list. ie: [1, 15, 'Last']. Options are all days + of the month 1 - 31 and the word 'Last' to indicate the last day of the + month. :param bool last_day_of_month: Boolean value that indicates that the - task runs on the last day of the month regardless of the actual date of - that day. + task runs on the last day of the month regardless of the actual date of + that day. You can set the task to run on the last day of the month by either including the word 'Last' in the list of days, or setting the parameter 'last_day_of_month` equal to True. *MonthlyDay* + :param list months_of_year: Sets the months of the year during which the - task runs. Should be a list. ie: ['January','July']. Valid entries are - the full names of all the months. + task runs. Should be a list. ie: ['January','July']. Valid entries are + the full names of all the months. :param list weeks_of_month: Sets the weeks of the month during which the - task runs. Should be a list. ie: ['First','Third']. Valid options are: + task runs. Should be a list. ie: ['First','Third']. Valid options are: + - First - Second - Third - Fourth - :param bool last_week_of_month: Boolean value that indicates that the - task runs on the last week of the month. + :param bool last_week_of_month: Boolean value that indicates that the task + runs on the last week of the month. - :param list days_of_week: Sets the days of the week during which the - task runs. Should be a list. ie: ['Monday','Wednesday','Friday']. - Valid entries are the names of the days of the week. + :param list days_of_week: Sets the days of the week during which the task + runs. Should be a list. ie: ['Monday','Wednesday','Friday']. Valid + entries are the names of the days of the week. *OnIdle* No special parameters required. @@ -1822,13 +1848,15 @@ def add_trigger(name=None, No special parameters required. *OnSessionChange* + :param str session_user_name: Sets the user for the Terminal Server - session. When a session state change is detected for this user, a task - is started. To detect session status change for any user, do not pass - this parameter. + session. When a session state change is detected for this user, a task + is started. To detect session status change for any user, do not pass + this parameter. :param str state_change: Sets the kind of Terminal Server session change - that would trigger a task launch. Valid options are: + that would trigger a task launch. Valid options are: + - ConsoleConnect: When you connect to a user session (switch users) - ConsoleDisconnect: When you disconnect a user session (switch users) - RemoteConnect: When a user connects via Remote Desktop @@ -2135,8 +2163,8 @@ def clear_triggers(name, location='\\'): :param str name: The name of the task from which to clear all triggers. :param str location: A string value representing the location of the task. - Default is '\\' which is the root for the task scheduler - (C:\Windows\System32\tasks). + Default is '\\' which is the root for the task scheduler + (C:\Windows\System32\tasks). :return: True if successful, False if unsuccessful :rtype: bool diff --git a/salt/modules/win_timezone.py b/salt/modules/win_timezone.py index 4e99342aa8..8fe0ab9ff0 100644 --- a/salt/modules/win_timezone.py +++ b/salt/modules/win_timezone.py @@ -6,487 +6,224 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Python libs import logging -import re +from datetime import datetime # Import Salt libs -import salt.utils.path -import salt.utils.platform +from salt.exceptions import CommandExecutionError + +# Import 3rd party libs +try: + import pytz + HAS_PYTZ = True +except ImportError: + HAS_PYTZ = False log = logging.getLogger(__name__) -# Maybe put in a different file ... ? %-0 -# http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml -LINTOWIN = { - 'Africa/Abidjan': 'Greenwich Standard Time', - 'Africa/Accra': 'Greenwich Standard Time', - 'Africa/Addis_Ababa': 'E. Africa Standard Time', - 'Africa/Algiers': 'W. Central Africa Standard Time', - 'Africa/Asmera': 'E. Africa Standard Time', - 'Africa/Bamako': 'Greenwich Standard Time', - 'Africa/Bangui': 'W. Central Africa Standard Time', - 'Africa/Banjul': 'Greenwich Standard Time', - 'Africa/Bissau': 'Greenwich Standard Time', - 'Africa/Blantyre': 'South Africa Standard Time', - 'Africa/Brazzaville': 'W. Central Africa Standard Time', - 'Africa/Bujumbura': 'South Africa Standard Time', - 'Africa/Cairo': 'Egypt Standard Time', - 'Africa/Casablanca': 'Morocco Standard Time', - 'Africa/Conakry': 'Greenwich Standard Time', - 'Africa/Dakar': 'Greenwich Standard Time', - 'Africa/Dar_es_Salaam': 'E. Africa Standard Time', - 'Africa/Djibouti': 'E. Africa Standard Time', - 'Africa/Douala': 'W. Central Africa Standard Time', - 'Africa/El_Aaiun': 'Greenwich Standard Time', - 'Africa/Freetown': 'Greenwich Standard Time', - 'Africa/Gaborone': 'South Africa Standard Time', - 'Africa/Harare': 'South Africa Standard Time', - 'Africa/Johannesburg': 'South Africa Standard Time', - 'Africa/Juba': 'E. Africa Standard Time', - 'Africa/Kampala': 'E. Africa Standard Time', - 'Africa/Khartoum': 'E. Africa Standard Time', - 'Africa/Kigali': 'South Africa Standard Time', - 'Africa/Kinshasa': 'W. Central Africa Standard Time', - 'Africa/Lagos': 'W. Central Africa Standard Time', - 'Africa/Libreville': 'W. Central Africa Standard Time', - 'Africa/Lome': 'Greenwich Standard Time', - 'Africa/Luanda': 'W. Central Africa Standard Time', - 'Africa/Lubumbashi': 'South Africa Standard Time', - 'Africa/Lusaka': 'South Africa Standard Time', - 'Africa/Malabo': 'W. Central Africa Standard Time', - 'Africa/Maputo': 'South Africa Standard Time', - 'Africa/Maseru': 'South Africa Standard Time', - 'Africa/Mbabane': 'South Africa Standard Time', - 'Africa/Mogadishu': 'E. Africa Standard Time', - 'Africa/Monrovia': 'Greenwich Standard Time', - 'Africa/Nairobi': 'E. Africa Standard Time', - 'Africa/Ndjamena': 'W. Central Africa Standard Time', - 'Africa/Niamey': 'W. Central Africa Standard Time', - 'Africa/Nouakchott': 'Greenwich Standard Time', - 'Africa/Ouagadougou': 'Greenwich Standard Time', - 'Africa/Porto-Novo': 'W. Central Africa Standard Time', - 'Africa/Sao_Tome': 'Greenwich Standard Time', - 'Africa/Tripoli': 'W. Europe Standard Time', - 'Africa/Tunis': 'W. Central Africa Standard Time', - 'Africa/Windhoek': 'Namibia Standard Time', - 'America/Anchorage': 'Alaskan Standard Time', - 'America/Juneau': 'Alaskan Standard Time', - 'America/Nome': 'Alaskan Standard Time', - 'America/Sitka': 'Alaskan Standard Time', - 'America/Yakutat': 'Alaskan Standard Time', - 'America/Anguilla': 'SA Western Standard Time', - 'America/Antigua': 'SA Western Standard Time', - 'America/Aruba': 'SA Western Standard Time', - 'America/Asuncion': 'Paraguay Standard Time', - 'America/Bahia': 'Bahia Standard Time', - 'America/Barbados': 'SA Western Standard Time', - 'America/Belize': 'Central America Standard Time', - 'America/Blanc-Sablon': 'SA Western Standard Time', - 'America/Bogota': 'SA Pacific Standard Time', - 'America/Buenos_Aires': 'Argentina Standard Time', - 'America/Argentina/La_Rioja': 'Argentina Standard Time', - 'America/Argentina/Rio_Gallegos': 'Argentina Standard Time', - 'America/Argentina/Salta': 'Argentina Standard Time', - 'America/Argentina/San_Juan': 'Argentina Standard Time', - 'America/Argentina/San_Luis': 'Argentina Standard Time', - 'America/Argentina/Tucuman': 'Argentina Standard Time', - 'America/Argentina/Ushuaia': 'Argentina Standard Time', - 'America/Catamarca': 'Argentina Standard Time', - 'America/Cordoba': 'Argentina Standard Time', - 'America/Jujuy': 'Argentina Standard Time', - 'America/Mendoza': 'Argentina Standard Time', - 'America/Caracas': 'Venezuela Standard Time', - 'America/Cayenne': 'SA Eastern Standard Time', - 'America/Cayman': 'SA Pacific Standard Time', - 'America/Chicago': 'Central Standard Time', - 'America/Indiana/Knox': 'Central Standard Time', - 'America/Indiana/Tell_City': 'Central Standard Time', - 'America/Menominee': 'Central Standard Time', - 'America/North_Dakota/Beulah': 'Central Standard Time', - 'America/North_Dakota/Center': 'Central Standard Time', - 'America/North_Dakota/New_Salem': 'Central Standard Time', - 'America/Chihuahua': 'Mountain Standard Time (Mexico)', - 'America/Mazatlan': 'Mountain Standard Time (Mexico)', - 'America/Coral_Harbour': 'SA Pacific Standard Time', - 'America/Costa_Rica': 'Central America Standard Time', - 'America/Cuiaba': 'Central Brazilian Standard Time', - 'America/Campo_Grande': 'Central Brazilian Standard Time', - 'America/Curacao': 'SA Western Standard Time', - 'America/Danmarkshavn': 'UTC', - 'America/Dawson_Creek': 'US Mountain Standard Time', - 'America/Creston': 'US Mountain Standard Time', - 'America/Denver': 'Mountain Standard Time', - 'America/Boise': 'Mountain Standard Time', - 'America/Shiprock': 'Mountain Standard Time', - 'America/Dominica': 'SA Western Standard Time', - 'America/Edmonton': 'Mountain Standard Time', - 'America/Cambridge_Bay': 'Mountain Standard Time', - 'America/Inuvik': 'Mountain Standard Time', - 'America/Yellowknife': 'Mountain Standard Time', - 'America/El_Salvador': 'Central America Standard Time', - 'America/Fortaleza': 'SA Eastern Standard Time', - 'America/Belem': 'SA Eastern Standard Time', - 'America/Maceio': 'SA Eastern Standard Time', - 'America/Recife': 'SA Eastern Standard Time', - 'America/Santarem': 'SA Eastern Standard Time', - 'America/Godthab': 'Greenland Standard Time', - 'America/Grand_Turk': 'Eastern Standard Time', - 'America/Grenada': 'SA Western Standard Time', - 'America/Guadeloupe': 'SA Western Standard Time', - 'America/Guatemala': 'Central America Standard Time', - 'America/Guayaquil': 'SA Pacific Standard Time', - 'America/Guyana': 'SA Western Standard Time', - 'America/Halifax': 'Atlantic Standard Time', - 'America/Glace_Bay': 'Atlantic Standard Time', - 'America/Goose_Bay': 'Atlantic Standard Time', - 'America/Moncton': 'Atlantic Standard Time', - 'America/Hermosillo': 'US Mountain Standard Time', - 'America/Indianapolis': 'US Eastern Standard Time', - 'America/Indiana/Marengo': 'US Eastern Standard Time', - 'America/Indiana/Vevay': 'US Eastern Standard Time', - 'America/Jamaica': 'SA Pacific Standard Time', - 'America/Kralendijk': 'SA Western Standard Time', - 'America/La_Paz': 'SA Western Standard Time', - 'America/Lima': 'SA Pacific Standard Time', - 'America/Los_Angeles': 'Pacific Standard Time', - 'America/Lower_Princes': 'SA Western Standard Time', - 'America/Managua': 'Central America Standard Time', - 'America/Manaus': 'SA Western Standard Time', - 'America/Boa_Vista': 'SA Western Standard Time', - 'America/Eirunepe': 'SA Western Standard Time', - 'America/Porto_Velho': 'SA Western Standard Time', - 'America/Rio_Branco': 'SA Western Standard Time', - 'America/Marigot': 'SA Western Standard Time', - 'America/Martinique': 'SA Western Standard Time', - 'America/Matamoros': 'Central Standard Time', - 'America/Mexico_City': 'Central Standard Time (Mexico)', - 'America/Bahia_Banderas': 'Central Standard Time (Mexico)', - 'America/Cancun': 'Central Standard Time (Mexico)', - 'America/Merida': 'Central Standard Time (Mexico)', - 'America/Monterrey': 'Central Standard Time (Mexico)', - 'America/Montevideo': 'Montevideo Standard Time', - 'America/Montserrat': 'SA Western Standard Time', - 'America/Nassau': 'Eastern Standard Time', - 'America/New_York': 'Eastern Standard Time', - 'America/Detroit': 'Eastern Standard Time', - 'America/Indiana/Petersburg': 'Eastern Standard Time', - 'America/Indiana/Vincennes': 'Eastern Standard Time', - 'America/Indiana/Winamac': 'Eastern Standard Time', - 'America/Kentucky/Monticello': 'Eastern Standard Time', - 'America/Louisville': 'Eastern Standard Time', - 'America/Noronha': 'UTC-02', - 'America/Ojinaga': 'Mountain Standard Time', - 'America/Panama': 'SA Pacific Standard Time', - 'America/Paramaribo': 'SA Eastern Standard Time', - 'America/Phoenix': 'US Mountain Standard Time', - 'America/Port-au-Prince': 'SA Pacific Standard Time', - 'America/Port_of_Spain': 'SA Western Standard Time', - 'America/Puerto_Rico': 'SA Western Standard Time', - 'America/Regina': 'Canada Central Standard Time', - 'America/Swift_Current': 'Canada Central Standard Time', - 'America/Santa_Isabel': 'Pacific Standard Time (Mexico)', - 'America/Santiago': 'Pacific SA Standard Time', - 'America/Santo_Domingo': 'SA Western Standard Time', - 'America/Sao_Paulo': 'E. South America Standard Time', - 'America/Araguaina': 'E. South America Standard Time', - 'America/Scoresbysund': 'Azores Standard Time', - 'America/St_Barthelemy': 'SA Western Standard Time', - 'America/St_Johns': 'Newfoundland Standard Time', - 'America/St_Kitts': 'SA Western Standard Time', - 'America/St_Lucia': 'SA Western Standard Time', - 'America/St_Thomas': 'SA Western Standard Time', - 'America/St_Vincent': 'SA Western Standard Time', - 'America/Tegucigalpa': 'Central America Standard Time', - 'America/Thule': 'Atlantic Standard Time', - 'America/Tijuana': 'Pacific Standard Time', - 'America/Toronto': 'Eastern Standard Time', - 'America/Iqaluit': 'Eastern Standard Time', - 'America/Montreal': 'Eastern Standard Time', - 'America/Nipigon': 'Eastern Standard Time', - 'America/Pangnirtung': 'Eastern Standard Time', - 'America/Thunder_Bay': 'Eastern Standard Time', - 'America/Tortola': 'SA Western Standard Time', - 'America/Whitehorse': 'Pacific Standard Time', - 'America/Vancouver': 'Pacific Standard Time', - 'America/Dawson': 'Pacific Standard Time', - 'America/Winnipeg': 'Central Standard Time', - 'America/Rainy_River': 'Central Standard Time', - 'America/Rankin_Inlet': 'Central Standard Time', - 'America/Resolute': 'Central Standard Time', - 'Antarctica/Casey': 'W. Australia Standard Time', - 'Antarctica/Davis': 'SE Asia Standard Time', - 'Antarctica/DumontDUrville': 'West Pacific Standard Time', - 'Antarctica/Macquarie': 'Central Pacific Standard Time', - 'Antarctica/Mawson': 'West Asia Standard Time', - 'Antarctica/Palmer': 'Pacific SA Standard Time', - 'Antarctica/Rothera': 'SA Eastern Standard Time', - 'Antarctica/South_Pole': 'New Zealand Standard Time', - 'Antarctica/McMurdo': 'New Zealand Standard Time', - 'Antarctica/Syowa': 'E. Africa Standard Time', - 'Antarctica/Vostok': 'Central Asia Standard Time', - 'Arctic/Longyearbyen': 'W. Europe Standard Time', - 'Asia/Aden': 'Arab Standard Time', - 'Asia/Almaty': 'Central Asia Standard Time', - 'Asia/Qyzylorda': 'Central Asia Standard Time', - 'Asia/Amman': 'Jordan Standard Time', - 'Asia/Ashgabat': 'West Asia Standard Time', - 'Asia/Baghdad': 'Arabic Standard Time', - 'Asia/Bahrain': 'Arab Standard Time', - 'Asia/Baku': 'Azerbaijan Standard Time', - 'Asia/Bangkok': 'SE Asia Standard Time', - 'Asia/Beirut': 'Middle East Standard Time', - 'Asia/Bishkek': 'Central Asia Standard Time', - 'Asia/Brunei': 'Singapore Standard Time', - 'Asia/Calcutta': 'India Standard Time', - 'Asia/Colombo': 'Sri Lanka Standard Time', - 'Asia/Damascus': 'Syria Standard Time', - 'Asia/Dhaka': 'Bangladesh Standard Time', - 'Asia/Dili': 'Tokyo Standard Time', - 'Asia/Dubai': 'Arabian Standard Time', - 'Asia/Dushanbe': 'West Asia Standard Time', - 'Asia/Gaza': 'Egypt Standard Time', - 'Asia/Hebron': 'Egypt Standard Time', - 'Asia/Hong_Kong': 'China Standard Time', - 'Asia/Hovd': 'SE Asia Standard Time', - 'Asia/Irkutsk': 'North Asia East Standard Time', - 'Asia/Jakarta': 'SE Asia Standard Time', - 'Asia/Pontianak': 'SE Asia Standard Time', - 'Asia/Jayapura': 'Tokyo Standard Time', - 'Asia/Jerusalem': 'Israel Standard Time', - 'Asia/Kabul': 'Afghanistan Standard Time', - 'Asia/Karachi': 'Pakistan Standard Time', - 'Asia/Kathmandu': 'Nepal Standard Time', - 'Asia/Katmandu': 'Nepal Standard Time', - 'Asia/Krasnoyarsk': 'North Asia Standard Time', - 'Asia/Kuala_Lumpur': 'Singapore Standard Time', - 'Asia/Kuching': 'Singapore Standard Time', - 'Asia/Kuwait': 'Arab Standard Time', - 'Asia/Macau': 'China Standard Time', - 'Asia/Magadan': 'Magadan Standard Time', - 'Asia/Anadyr Asia/Kamchatka': 'Magadan Standard Time', - 'Asia/Kamchatka': 'Magadan Standard Time', - 'Asia/Makassar': 'Singapore Standard Time', - 'Asia/Manila': 'Singapore Standard Time', - 'Asia/Muscat': 'Arabian Standard Time', - 'Asia/Nicosia': 'E. Europe Standard Time', - 'Asia/Novosibirsk': 'N. Central Asia Standard Time', - 'Asia/Novokuznetsk': 'N. Central Asia Standard Time', - 'Asia/Omsk': 'N. Central Asia Standard Time', - 'Asia/Oral': 'West Asia Standard Time', - 'Asia/Aqtau': 'West Asia Standard Time', - 'Asia/Aqtobe': 'West Asia Standard Time', - 'Asia/Phnom_Penh': 'SE Asia Standard Time', - 'Asia/Pyongyang': 'Korea Standard Time', - 'Asia/Qatar': 'Arab Standard Time', - 'Asia/Rangoon': 'Myanmar Standard Time', - 'Asia/Riyadh': 'Arab Standard Time', - 'Asia/Saigon': 'SE Asia Standard Time', - 'Asia/Seoul': 'Korea Standard Time', - 'Asia/Shanghai': 'China Standard Time', - 'Asia/Chongqing': 'China Standard Time', - 'Asia/Harbin': 'China Standard Time', - 'Asia/Kashgar': 'China Standard Time', - 'Asia/Urumqi': 'China Standard Time', - 'Asia/Singapore': 'Singapore Standard Time', - 'Asia/Taipei': 'Taipei Standard Time', - 'Asia/Tashkent': 'West Asia Standard Time', - 'Asia/Samarkand': 'West Asia Standard Time', - 'Asia/Tbilisi': 'Georgian Standard Time', - 'Asia/Tehran': 'Iran Standard Time', - 'Asia/Thimphu': 'Bangladesh Standard Time', - 'Asia/Tokyo': 'Tokyo Standard Time', - 'Asia/Ulaanbaatar': 'Ulaanbaatar Standard Time', - 'Asia/Choibalsan': 'Ulaanbaatar Standard Time', - 'Asia/Vientiane': 'SE Asia Standard Time', - 'Asia/Vladivostok': 'Vladivostok Standard Time', - 'Asia/Ust-Nera': 'Vladivostok Standard Time', - 'Asia/Sakhalin': 'Vladivostok Standard Time', - 'Asia/Yakutsk': 'Yakutsk Standard Time', - 'Asia/Khandyga': 'Yakutsk Standard Time', - 'Asia/Yekaterinburg': 'Ekaterinburg Standard Time', - 'Asia/Yerevan': 'Caucasus Standard Time', - 'Atlantic/Azores': 'Azores Standard Time', - 'Atlantic/Bermuda': 'Atlantic Standard Time', - 'Atlantic/Canary': 'GMT Standard Time', - 'Atlantic/Cape_Verde': 'Cape Verde Standard Time', - 'Atlantic/Faeroe': 'GMT Standard Time', - 'Atlantic/Reykjavik': 'Greenwich Standard Time', - 'Atlantic/South_Georgia': 'UTC-02', - 'Atlantic/St_Helena': 'Greenwich Standard Time', - 'Atlantic/Stanley': 'SA Eastern Standard Time', - 'Australia/Adelaide': 'Cen. Australia Standard Time', - 'Australia/Broken_Hill': 'Cen. Australia Standard Time', - 'Australia/Brisbane': 'E. Australia Standard Time', - 'Australia/Lindeman': 'E. Australia Standard Time', - 'Australia/Darwin': 'AUS Central Standard Time', - 'Australia/Hobart': 'Tasmania Standard Time', - 'Australia/Currie': 'Tasmania Standard Time', - 'Australia/Perth': 'W. Australia Standard Time', - 'Australia/Sydney': 'AUS Eastern Standard Time', - 'Australia/Melbourne': 'AUS Eastern Standard Time', - 'CST6CDT': 'Central Standard Time', - 'EST5EDT': 'Eastern Standard Time', - 'Etc/UTC': 'UTC', - 'Etc/GMT': 'UTC', - 'Etc/GMT+1': 'Cape Verde Standard Time', - 'Etc/GMT+10': 'Hawaiian Standard Time', - 'Etc/GMT+11': 'UTC-11', - 'Etc/GMT+12': 'Dateline Standard Time', - 'Etc/GMT+2': 'UTC-02', - 'Etc/GMT+3': 'SA Eastern Standard Time', - 'Etc/GMT+4': 'SA Western Standard Time', - 'Etc/GMT+5': 'SA Pacific Standard Time', - 'Etc/GMT+6': 'Central America Standard Time', - 'Etc/GMT+7': 'US Mountain Standard Time', - 'Etc/GMT-1': 'W. Central Africa Standard Time', - 'Etc/GMT-10': 'West Pacific Standard Time', - 'Etc/GMT-11': 'Central Pacific Standard Time', - 'Etc/GMT-12': 'UTC+12', - 'Etc/GMT-13': 'Tonga Standard Time', - 'Etc/GMT-2': 'South Africa Standard Time', - 'Etc/GMT-3': 'E. Africa Standard Time', - 'Etc/GMT-4': 'Arabian Standard Time', - 'Etc/GMT-5': 'West Asia Standard Time', - 'Etc/GMT-6': 'Central Asia Standard Time', - 'Etc/GMT-7': 'SE Asia Standard Time', - 'Etc/GMT-8': 'Singapore Standard Time', - 'Etc/GMT-9': 'Tokyo Standard Time', - 'Europe/Amsterdam': 'W. Europe Standard Time', - 'Europe/Andorra': 'W. Europe Standard Time', - 'Europe/Athens': 'GTB Standard Time', - 'Europe/Belgrade': 'Central Europe Standard Time', - 'Europe/Berlin': 'W. Europe Standard Time', - 'Europe/Busingen': 'W. Europe Standard Time', - 'Europe/Bratislava': 'Central Europe Standard Time', - 'Europe/Brussels': 'Romance Standard Time', - 'Europe/Bucharest': 'GTB Standard Time', - 'Europe/Budapest': 'Central Europe Standard Time', - 'Europe/Chisinau': 'GTB Standard Time', - 'Europe/Copenhagen': 'Romance Standard Time', - 'Europe/Dublin': 'GMT Standard Time', - 'Europe/Gibraltar': 'W. Europe Standard Time', - 'Europe/Guernsey': 'GMT Standard Time', - 'Europe/Helsinki': 'FLE Standard Time', - 'Europe/Isle_of_Man': 'GMT Standard Time', - 'Europe/Istanbul': 'Turkey Standard Time', - 'Europe/Jersey': 'GMT Standard Time', - 'Europe/Kaliningrad': 'Kaliningrad Standard Time', - 'Europe/Kiev': 'FLE Standard Time', - 'Europe/Simferopol': 'FLE Standard Time', - 'Europe/Uzhgorod': 'FLE Standard Time', - 'Europe/Zaporozhye': 'FLE Standard Time', - 'Europe/Lisbon': 'GMT Standard Time', - 'Atlantic/Madeira': 'GMT Standard Time', - 'Europe/Ljubljana': 'Central Europe Standard Time', - 'Europe/London': 'GMT Standard Time', - 'Europe/Luxembourg': 'W. Europe Standard Time', - 'Europe/Madrid': 'Romance Standard Time', - 'Africa/Ceuta': 'Romance Standard Time', - 'Europe/Malta': 'W. Europe Standard Time', - 'Europe/Mariehamn': 'FLE Standard Time', - 'Europe/Minsk': 'Kaliningrad Standard Time', - 'Europe/Monaco': 'W. Europe Standard Time', - 'Europe/Moscow': 'Russian Standard Time', - 'Europe/Volgograd': 'Russian Standard Time', - 'Europe/Samara': 'Russian Standard Time', - 'Europe/Oslo': 'W. Europe Standard Time', - 'Europe/Paris': 'Romance Standard Time', - 'Europe/Podgorica': 'Central Europe Standard Time', - 'Europe/Prague': 'Central Europe Standard Time', - 'Europe/Riga': 'FLE Standard Time', - 'Europe/Rome': 'W. Europe Standard Time', - 'Europe/San_Marino': 'W. Europe Standard Time', - 'Europe/Sarajevo': 'Central European Standard Time', - 'Europe/Skopje': 'Central European Standard Time', - 'Europe/Sofia': 'FLE Standard Time', - 'Europe/Stockholm': 'W. Europe Standard Time', - 'Europe/Tallinn': 'FLE Standard Time', - 'Europe/Tirane': 'Central Europe Standard Time', - 'Europe/Vaduz': 'W. Europe Standard Time', - 'Europe/Vatican': 'W. Europe Standard Time', - 'Europe/Vienna': 'W. Europe Standard Time', - 'Europe/Vilnius': 'FLE Standard Time', - 'Europe/Warsaw': 'Central European Standard Time', - 'Europe/Zagreb': 'Central European Standard Time', - 'Europe/Zurich': 'W. Europe Standard Time', - 'Indian/Antananarivo': 'E. Africa Standard Time', - 'Indian/Chagos': 'Central Asia Standard Time', - 'Indian/Christmas': 'SE Asia Standard Time', - 'Indian/Cocos': 'Myanmar Standard Time', - 'Indian/Comoro': 'E. Africa Standard Time', - 'Indian/Kerguelen': 'West Asia Standard Time', - 'Indian/Mahe': 'Mauritius Standard Time', - 'Indian/Maldives': 'West Asia Standard Time', - 'Indian/Mauritius': 'Mauritius Standard Time', - 'Indian/Mayotte': 'E. Africa Standard Time', - 'Indian/Reunion': 'Mauritius Standard Time', - 'MST7MDT': 'Mountain Standard Time', - 'PST8PDT': 'Pacific Standard Time', - 'Pacific/Apia': 'Samoa Standard Time', - 'Pacific/Auckland': 'New Zealand Standard Time', - 'Pacific/Efate': 'Central Pacific Standard Time', - 'Pacific/Enderbury': 'Tonga Standard Time', - 'Pacific/Fakaofo': 'Tonga Standard Time', - 'Pacific/Fiji': 'Fiji Standard Time', - 'Pacific/Funafuti': 'UTC+12', - 'Pacific/Galapagos': 'Central America Standard Time', - 'Pacific/Guadalcanal': 'Central Pacific Standard Time', - 'Pacific/Guam': 'West Pacific Standard Time', - 'Pacific/Honolulu': 'Hawaiian Standard Time', - 'Pacific/Johnston': 'Hawaiian Standard Time', - 'Pacific/Majuro Pacific/Kwajalein': 'UTC+12', - 'Pacific/Midway': 'UTC-11', - 'Pacific/Nauru': 'UTC+12', - 'Pacific/Niue': 'UTC-11', - 'Pacific/Noumea': 'Central Pacific Standard Time', - 'Pacific/Pago_Pago': 'UTC-11', - 'Pacific/Palau': 'Tokyo Standard Time', - 'Pacific/Ponape': 'Central Pacific Standard Time', - 'Pacific/Kosrae': 'Central Pacific Standard Time', - 'Pacific/Port_Moresby': 'West Pacific Standard Time', - 'Pacific/Rarotonga': 'Hawaiian Standard Time', - 'Pacific/Saipan': 'West Pacific Standard Time', - 'Pacific/Tahiti': 'Hawaiian Standard Time', - 'Pacific/Tarawa': 'UTC+12', - 'Pacific/Tongatapu': 'Tonga Standard Time', - 'Pacific/Truk': 'West Pacific Standard Time', - 'Pacific/Wake': 'UTC+12', - 'Pacific/Wallis': 'UTC+12' - } - # Define the module's virtual name __virtualname__ = 'timezone' +class TzMapper(object): + def __init__(self, unix_to_win): + self.win_to_unix = {k.lower(): v for k, v in unix_to_win.items()} + self.unix_to_win = {v.lower(): k for k, v in unix_to_win.items()} + + def add(self, k, v): + self.unix_to_win[k.lower()] = v + self.win_to_unix[v.lower()] = k + + def remove(self, k): + self.win_to_unix.pop(self.unix_to_win.pop(k.lower()).lower()) + + def get_win(self, key, default=None): + return self.unix_to_win.get(key.lower(), default) + + def get_unix(self, key, default=None): + return self.win_to_unix.get(key.lower(), default) + + def list_win(self): + return sorted(self.unix_to_win.values()) + + def list_unix(self): + return sorted(self.win_to_unix.values()) + + +mapper = TzMapper({ + 'AUS Central Standard Time': 'Australia/Darwin', + 'AUS Eastern Standard Time': 'Australia/Sydney', + 'Afghanistan Standard Time': 'Asia/Kabul', + 'Alaskan Standard Time': 'America/Anchorage', + 'Aleutian Standard Time': 'America/Adak', + 'Altai Standard Time': 'Asia/Barnaul', + 'Arab Standard Time': 'Asia/Riyadh', + 'Arabian Standard Time': 'Asia/Dubai', + 'Arabic Standard Time': 'Asia/Baghdad', + 'Argentina Standard Time': 'America/Buenos_Aires', + 'Astrakhan Standard Time': 'Europe/Astrakhan', + 'Atlantic Standard Time': 'America/Halifax', + 'Aus Central W. Standard Time': 'Australia/Eucla', + 'Azerbaijan Standard Time': 'Asia/Baku', + 'Azores Standard Time': 'Atlantic/Azores', + 'Bahia Standard Time': 'America/Bahia', + 'Bangladesh Standard Time': 'Asia/Dhaka', + 'Belarus Standard Time': 'Europe/Minsk', + 'Bougainville Standard Time': 'Pacific/Bougainville', + 'Canada Central Standard Time': 'America/Regina', + 'Cape Verde Standard Time': 'Atlantic/Cape_Verde', + 'Caucasus Standard Time': 'Asia/Yerevan', + 'Cen. Australia Standard Time': 'Australia/Adelaide', + 'Central America Standard Time': 'America/Guatemala', + 'Central Asia Standard Time': 'Asia/Almaty', + 'Central Brazilian Standard Time': 'America/Cuiaba', + 'Central Europe Standard Time': 'Europe/Budapest', + 'Central European Standard Time': 'Europe/Warsaw', + 'Central Pacific Standard Time': 'Pacific/Guadalcanal', + 'Central Standard Time': 'America/Chicago', + 'Central Standard Time (Mexico)': 'America/Mexico_City', + 'Chatham Islands Standard Time': 'Pacific/Chatham', + 'China Standard Time': 'Asia/Shanghai', + 'Cuba Standard Time': 'America/Havana', + 'Dateline Standard Time': 'Etc/GMT+12', + 'E. Africa Standard Time': 'Africa/Nairobi', + 'E. Australia Standard Time': 'Australia/Brisbane', + 'E. Europe Standard Time': 'Europe/Chisinau', + 'E. South America Standard Time': 'America/Sao_Paulo', + 'Easter Island Standard Time': 'Pacific/Easter', + 'Eastern Standard Time': 'America/New_York', + 'Eastern Standard Time (Mexico)': 'America/Cancun', + 'Egypt Standard Time': 'Africa/Cairo', + 'Ekaterinburg Standard Time': 'Asia/Yekaterinburg', + 'FLE Standard Time': 'Europe/Kiev', + 'Fiji Standard Time': 'Pacific/Fiji', + 'GMT Standard Time': 'Europe/London', + 'GTB Standard Time': 'Europe/Bucharest', + 'Georgian Standard Time': 'Asia/Tbilisi', + 'Greenland Standard Time': 'America/Godthab', + 'Greenwich Standard Time': 'Atlantic/Reykjavik', + 'Haiti Standard Time': 'America/Port-au-Prince', + 'Hawaiian Standard Time': 'Pacific/Honolulu', + 'India Standard Time': 'Asia/Calcutta', + 'Iran Standard Time': 'Asia/Tehran', + 'Israel Standard Time': 'Asia/Jerusalem', + 'Jordan Standard Time': 'Asia/Amman', + 'Kaliningrad Standard Time': 'Europe/Kaliningrad', + 'Korea Standard Time': 'Asia/Seoul', + 'Libya Standard Time': 'Africa/Tripoli', + 'Line Islands Standard Time': 'Pacific/Kiritimati', + 'Lord Howe Standard Time': 'Australia/Lord_Howe', + 'Magadan Standard Time': 'Asia/Magadan', + 'Magallanes Standard Time': 'America/Punta_Arenas', + 'Marquesas Standard Time': 'Pacific/Marquesas', + 'Mauritius Standard Time': 'Indian/Mauritius', + 'Middle East Standard Time': 'Asia/Beirut', + 'Montevideo Standard Time': 'America/Montevideo', + 'Morocco Standard Time': 'Africa/Casablanca', + 'Mountain Standard Time': 'America/Denver', + 'Mountain Standard Time (Mexico)': 'America/Chihuahua', + 'Myanmar Standard Time': 'Asia/Rangoon', + 'N. Central Asia Standard Time': 'Asia/Novosibirsk', + 'Namibia Standard Time': 'Africa/Windhoek', + 'Nepal Standard Time': 'Asia/Katmandu', + 'New Zealand Standard Time': 'Pacific/Auckland', + 'Newfoundland Standard Time': 'America/St_Johns', + 'Norfolk Standard Time': 'Pacific/Norfolk', + 'North Asia East Standard Time': 'Asia/Irkutsk', + 'North Asia Standard Time': 'Asia/Krasnoyarsk', + 'North Korea Standard Time': 'Asia/Pyongyang', + 'Omsk Standard Time': 'Asia/Omsk', + 'Pacific SA Standard Time': 'America/Santiago', + 'Pacific Standard Time': 'America/Los_Angeles', + 'Pacific Standard Time (Mexico)': 'America/Tijuana', + 'Pakistan Standard Time': 'Asia/Karachi', + 'Paraguay Standard Time': 'America/Asuncion', + 'Romance Standard Time': 'Europe/Paris', + 'Russia Time Zone 10': 'Asia/Srednekolymsk', + 'Russia Time Zone 11': 'Asia/Kamchatka', + 'Russia Time Zone 3': 'Europe/Samara', + 'Russian Standard Time': 'Europe/Moscow', + 'SA Eastern Standard Time': 'America/Cayenne', + 'SA Pacific Standard Time': 'America/Bogota', + 'SA Western Standard Time': 'America/La_Paz', + 'SE Asia Standard Time': 'Asia/Bangkok', + 'Saint Pierre Standard Time': 'America/Miquelon', + 'Sakhalin Standard Time': 'Asia/Sakhalin', + 'Samoa Standard Time': 'Pacific/Apia', + 'Saratov Standard Time': 'Europe/Saratov', + 'Singapore Standard Time': 'Asia/Singapore', + 'South Africa Standard Time': 'Africa/Johannesburg', + 'Sri Lanka Standard Time': 'Asia/Colombo', + 'Syria Standard Time': 'Asia/Damascus', + 'Taipei Standard Time': 'Asia/Taipei', + 'Tasmania Standard Time': 'Australia/Hobart', + 'Tocantins Standard Time': 'America/Araguaina', + 'Tokyo Standard Time': 'Asia/Tokyo', + 'Tomsk Standard Time': 'Asia/Tomsk', + 'Tonga Standard Time': 'Pacific/Tongatapu', + 'Transbaikal Standard Time': 'Asia/Chita', + 'Turkey Standard Time': 'Europe/Istanbul', + 'Turks And Caicos Standard Time': 'America/Grand_Turk', + 'US Eastern Standard Time': 'America/Indianapolis', + 'US Mountain Standard Time': 'America/Phoenix', + 'UTC': 'Etc/GMT', + 'UTC+12': 'Etc/GMT-12', + 'UTC+13': 'Etc/GMT-13', + 'UTC-02': 'Etc/GMT+2', + 'UTC-08': 'Etc/GMT+8', + 'UTC-09': 'Etc/GMT+9', + 'UTC-11': 'Etc/GMT+11', + 'Ulaanbaatar Standard Time': 'Asia/Ulaanbaatar', + 'Venezuela Standard Time': 'America/Caracas', + 'Vladivostok Standard Time': 'Asia/Vladivostok', + 'W. Australia Standard Time': 'Australia/Perth', + 'W. Central Africa Standard Time': 'Africa/Lagos', + 'W. Europe Standard Time': 'Europe/Berlin', + 'W. Mongolia Standard Time': 'Asia/Hovd', + 'West Asia Standard Time': 'Asia/Tashkent', + 'West Bank Standard Time': 'Asia/Hebron', + 'West Pacific Standard Time': 'Pacific/Port_Moresby', + 'Yakutsk Standard Time': 'Asia/Yakutsk'}) + + def __virtual__(): ''' Only load on windows ''' - if salt.utils.platform.is_windows() and salt.utils.path.which('tzutil'): - return __virtualname__ - return (False, "Module win_timezone: tzutil not found or is not on Windows client") + if not __utils__['platform.is_windows'](): + return False, "Module win_timezone: Not on Windows client" + if not HAS_PYTZ: + return False, "Module win_timezone: pytz not found" + if not __utils__['path.which']('tzutil'): + return False, "Module win_timezone: tzutil not found" + return __virtualname__ def get_zone(): ''' Get current timezone (i.e. America/Denver) + Returns: + str: Timezone in unix format + CLI Example: .. code-block:: bash salt '*' timezone.get_zone ''' - winzone = __salt__['cmd.run'](['tzutil', '/g'], python_shell=False) - for key in LINTOWIN: - if LINTOWIN[key] == winzone: - return key - - return False + win_zone = __utils__['reg.read_value']( + hive='HKLM', + key='SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation', + vname='TimeZoneKeyName')['vdata'] + return mapper.get_unix(win_zone.lower(), 'Unknown') def get_offset(): ''' - Get current numeric timezone offset from UCT (i.e. -0700) + Get current numeric timezone offset from UTC (i.e. -0700) + + Returns: + str: Offset from UTC CLI Example: @@ -494,52 +231,44 @@ def get_offset(): salt '*' timezone.get_offset ''' - string = False - zone = __salt__['cmd.run'](['tzutil', '/g'], python_shell=False) - prev = '' - zone_list = __salt__['cmd.run'](['tzutil', '/l'], - python_shell=False, - output_loglevel='trace').splitlines() - for line in zone_list: - if zone == line: - string = prev - break - else: - prev = line - - if not string: - return False - - reg = re.search(r"\(UTC(.\d\d:\d\d)\) .*", string, re.M) - if not reg: - ret = '0000' - else: - ret = reg.group(1).replace(':', '') - - return ret + # http://craigglennie.com/programming/python/2013/07/21/working-with-timezones-using-Python-and-pytz-localize-vs-normalize/ + tz_object = pytz.timezone(get_zone()) + utc_time = pytz.utc.localize(datetime.utcnow()) + loc_time = utc_time.astimezone(tz_object) + norm_time = tz_object.normalize(loc_time) + return norm_time.strftime('%z') def get_zonecode(): ''' Get current timezone (i.e. PST, MDT, etc) + Returns: + str: An abbreviated timezone code + CLI Example: .. code-block:: bash salt '*' timezone.get_zonecode ''' - # Still not implemented on windows - return False + tz_object = pytz.timezone(get_zone()) + loc_time = tz_object.localize(datetime.utcnow()) + return loc_time.tzname() def set_zone(timezone): ''' - Unlinks, then symlinks /etc/localtime to the set timezone. + Sets the timezone using the tzutil. - The timezone is crucial to several system processes, each of which SHOULD - be restarted (for instance, whatever you system uses as its cron and - syslog daemons). This will not be magically done for you! + Args: + timezone (str): A valid timezone + + Returns: + bool: ``True`` if successful, otherwise ``False`` + + Raises: + CommandExecutionError: If invalid timezone is passed CLI Example: @@ -547,15 +276,40 @@ def set_zone(timezone): salt '*' timezone.set_zone 'America/Denver' ''' - cmd = ['tzutil', '/s', LINTOWIN[timezone]] - return __salt__['cmd.retcode'](cmd, python_shell=False) == 0 + # if it's one of the key's just use it + if timezone.lower() in mapper.win_to_unix: + win_zone = timezone + + elif timezone.lower() in mapper.unix_to_win: + # if it's one of the values, use the key + win_zone = mapper.get_win(timezone) + + else: + # Raise error because it's neither key nor value + raise CommandExecutionError('Invalid timezone passed: {0}'.format(timezone)) + + # Set the value + cmd = ['tzutil', '/s', win_zone] + res = __salt__['cmd.run_all'](cmd, python_shell=False) + if res['retcode']: + raise CommandExecutionError('tzutil encountered an error setting ' + 'timezone: {0}'.format(timezone), + info=res) + return zone_compare(timezone) def zone_compare(timezone): ''' - Checks the md5sum between the given timezone, and the one set in - /etc/localtime. Returns True if they match, and False if not. Mostly useful - for running state checks. + Compares the given timezone with the machine timezone. Mostly useful for + running state checks. + + Args: + timezone (str): + The timezone to compare. This can be in Windows or Unix format. Can + be any of the values returned by the ``timezone.list`` function + + Returns: + bool: ``True`` if they match, otherwise ``False`` Example: @@ -563,21 +317,68 @@ def zone_compare(timezone): salt '*' timezone.zone_compare 'America/Denver' ''' - cmd = ['tzutil', '/g'] - return __salt__['cmd.run'](cmd, python_shell=False) == LINTOWIN[timezone] + # if it's one of the key's just use it + if timezone.lower() in mapper.win_to_unix: + check_zone = timezone + + elif timezone.lower() in mapper.unix_to_win: + # if it's one of the values, use the key + check_zone = mapper.get_win(timezone) + + else: + # Raise error because it's neither key nor value + raise CommandExecutionError('Invalid timezone passed: {0}' + ''.format(timezone)) + + return get_zone() == mapper.get_unix(check_zone, 'Unknown') + + +def list(unix_style=True): + ''' + Return a list of Timezones that this module supports. These can be in either + Unix or Windows format. + + .. versionadded:: 2018.3.3 + + Args: + unix_style (bool): + ``True`` returns Unix-style timezones. ``False`` returns + Windows-style timezones. Default is ``True`` + + Returns: + list: A list of supported timezones + + CLI Example: + + .. code-block:: bash + + # Unix-style timezones + salt '*' timezone.list + + # Windows-style timezones + salt '*' timezone.list unix_style=False + ''' + if unix_style: + return mapper.list_unix() + else: + return mapper.list_win() def get_hwclock(): ''' Get current hardware clock setting (UTC or localtime) + .. note:: + The hardware clock is always local time on Windows so this will always + return "localtime" + CLI Example: .. code-block:: bash salt '*' timezone.get_hwclock ''' - # Need to search for a way to figure it out ... + # The hardware clock is always localtime on Windows return 'localtime' @@ -585,11 +386,15 @@ def set_hwclock(clock): ''' Sets the hardware clock to be either UTC or localtime + .. note:: + The hardware clock is always local time on Windows so this will always + return ``False`` + CLI Example: .. code-block:: bash salt '*' timezone.set_hwclock UTC ''' - # Need to search for a way to figure it out ... + # The hardware clock is always localtime on Windows return False diff --git a/salt/modules/win_wua.py b/salt/modules/win_wua.py index b37d7676ca..209dea20f8 100644 --- a/salt/modules/win_wua.py +++ b/salt/modules/win_wua.py @@ -4,8 +4,8 @@ Module for managing Windows Updates using the Windows Update Agent. List updates on the system using the following functions: -- :ref:`available` -- :ref:`list` +- :py:func:`win_wua.available ` +- :py:func:`win_wua.list ` This is an easy way to find additional information about updates available to to the system, such as the GUID, KB number, or description. @@ -13,27 +13,33 @@ to the system, such as the GUID, KB number, or description. Once you have the GUID or a KB number for the update you can get information about the update, download, install, or uninstall it using these functions: -- :ref:`get` -- :ref:`download` -- :ref:`install` -- :ref:`uninstall` +- :py:func:`win_wua.get ` +- :py:func:`win_wua.download ` +- :py:func:`win_wua.install ` +- :py:func:`win_wua.uninstall ` The get function expects a name in the form of a GUID, KB, or Title and should return information about a single update. The other functions accept either a single item or a list of items for downloading/installing/uninstalling a specific list of items. -The :ref:`list` and :ref:`get` functions are utility functions. In addition to -returning information about updates they can also download and install updates -by setting ``download=True`` or ``install=True``. So, with :ref:`list` for -example, you could run the function with the filters you want to see what is -available. Then just add ``install=True`` to install everything on that list. +The :py:func:`win_wua.list ` and +:py:func:`win_wua.get ` functions are utility +functions. In addition to returning information about updates they can also +download and install updates by setting ``download=True`` or ``install=True``. +So, with py:func:`win_wua.list ` for example, you +could run the function with the filters you want to see what is available. Then +just add ``install=True`` to install everything on that list. If you want to download, install, or uninstall specific updates, use -:ref:`download`, :ref:`install`, or :ref:`uninstall`. To update your system -with the latest updates use :ref:`list` and set ``install=True`` +:py:func:`win_wua.download `, +:py:func:`win_wua.install `, or +:py:func:`win_wua.uninstall `. To update your +system with the latest updates use :py:func:`win_wua.list +` and set ``install=True`` -You can also adjust the Windows Update settings using the :ref:`set_wu_settings` +You can also adjust the Windows Update settings using the +:py:func:`win_wua.set_wu_settings ` function. This function is only supported on the following operating systems: - Windows Vista / Server 2008 @@ -47,8 +53,7 @@ Group Policy using the ``lgpo`` module. .. versionadded:: 2015.8.0 -:depends: - - salt.utils.win_update +:depends: salt.utils.win_update ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function @@ -70,6 +75,10 @@ except ImportError: log = logging.getLogger(__name__) +__func_alias__ = { + 'list_': 'list', +} + def __virtual__(): ''' diff --git a/salt/modules/x509.py b/salt/modules/x509.py index cafbbe8cc7..a68cea6703 100644 --- a/salt/modules/x509.py +++ b/salt/modules/x509.py @@ -25,6 +25,7 @@ import sys # Import salt libs import salt.utils.files import salt.utils.path +import salt.utils.stringutils import salt.exceptions from salt.ext import six from salt.utils.odict import OrderedDict @@ -376,7 +377,7 @@ def _passphrase_callback(passphrase): Returns a callback function used to supply a passphrase for private keys ''' def f(*args): - return passphrase + return salt.utils.stringutils.to_str(passphrase) return f @@ -437,8 +438,7 @@ def get_pem_entry(text, pem_type=None): .. code-block:: bash - salt '*' x509.get_pem_entry "-----BEGIN CERTIFICATE REQUEST-----\\ - MIICyzCC Ar8CAQI...-----END CERTIFICATE REQUEST" + salt '*' x509.get_pem_entry "-----BEGIN CERTIFICATE REQUEST-----MIICyzCC Ar8CAQI...-----END CERTIFICATE REQUEST" ''' text = _text_or_file(text) # Replace encoded newlines @@ -757,9 +757,7 @@ def write_pem(text, path, overwrite=True, pem_type=None): .. code-block:: bash - salt '*' x509.write_pem \\ - "-----BEGIN CERTIFICATE-----MIIGMzCCBBugA..." \\ - path=/etc/pki/mycert.crt + salt '*' x509.write_pem "-----BEGIN CERTIFICATE-----MIIGMzCCBBugA..." path=/etc/pki/mycert.crt ''' with salt.utils.files.set_umask(0o077): text = get_pem_entry(text, pem_type=pem_type) @@ -925,12 +923,7 @@ def create_crl( # pylint: disable=too-many-arguments,too-many-locals .. code-block:: bash - salt '*' x509.create_crl path=/etc/pki/mykey.key \\ - signing_private_key=/etc/pki/ca.key \\ - signing_cert=/etc/pki/ca.crt \\ - revoked="{'compromized-web-key': \\ - {'certificate': '/etc/pki/certs/www1.crt', \\ - 'revocation_date': '2015-03-01 00:00:00'}}" + salt '*' x509.create_crl path=/etc/pki/mykey.key signing_private_key=/etc/pki/ca.key signing_cert=/etc/pki/ca.crt revoked="{'compromized-web-key': {'certificate': '/etc/pki/certs/www1.crt', 'revocation_date': '2015-03-01 00:00:00'}}" ''' # pyOpenSSL is required for dealing with CSLs. Importing inside these # functions because Client operations like creating CRLs shouldn't require @@ -953,7 +946,8 @@ def create_crl( # pylint: disable=too-many-arguments,too-many-locals rev_item['not_after'] = rev_cert['Not After'] serial_number = rev_item['serial_number'].replace(':', '') - serial_number = six.text_type(int(serial_number, 16)) + # OpenSSL bindings requires this to be a non-unicode string + serial_number = salt.utils.stringutils.to_str(serial_number) if 'not_after' in rev_item and not include_expired: not_after = datetime.datetime.strptime( @@ -974,7 +968,9 @@ def create_crl( # pylint: disable=too-many-arguments,too-many-locals rev.set_rev_date(rev_date) if 'reason' in rev_item: - rev.set_reason(rev_item['reason']) + # Same here for OpenSSL bindings and non-unicode strings + reason = salt.utils.stringutils.to_str(rev_item['reason']) + rev.set_reason(reason) crl.add_revoked(rev) @@ -1029,8 +1025,7 @@ def sign_remote_certificate(argdic, **kwargs): .. code-block:: bash - salt '*' x509.sign_remote_certificate argdic="{'public_key': \\ - '/etc/pki/www.key', 'signing_policy': 'www'}" __pub_id='www1' + salt '*' x509.sign_remote_certificate argdic="{'public_key': '/etc/pki/www.key', 'signing_policy': 'www'}" __pub_id='www1' ''' if 'signing_policy' not in argdic: return 'signing_policy must be specified' @@ -1219,7 +1214,7 @@ def create_certificate( extensions: The following arguments set X509v3 Extension values. If the value - starts with ``critical ``, the extension will be marked as critical. + starts with ``critical``, the extension will be marked as critical. Some special extensions are ``subjectKeyIdentifier`` and ``authorityKeyIdentifier``. @@ -1345,8 +1340,7 @@ def create_certificate( .. code-block:: bash - salt '*' x509.create_certificate path=/etc/pki/myca.crt \\ - signing_private_key='/etc/pki/myca.key' csr='/etc/pki/myca.csr'} + salt '*' x509.create_certificate path=/etc/pki/myca.crt signing_private_key='/etc/pki/myca.key' csr='/etc/pki/myca.csr'} ''' if not path and not text and \ @@ -1589,8 +1583,7 @@ def create_csr(path=None, text=False, **kwargs): .. code-block:: bash - salt '*' x509.create_csr path=/etc/pki/myca.csr \\ - public_key='/etc/pki/myca.key' CN='My Cert + salt '*' x509.create_csr path=/etc/pki/myca.csr public_key='/etc/pki/myca.key' CN='My Cert' ''' if not path and not text: diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py index 3f98abc117..f6c5e69aa7 100644 --- a/salt/modules/yumpkg.py +++ b/salt/modules/yumpkg.py @@ -54,6 +54,7 @@ import salt.utils.pkg.rpm import salt.utils.systemd import salt.utils.versions from salt.utils.versions import LooseVersion as _LooseVersion +import salt.utils.environment from salt.exceptions import ( CommandExecutionError, MinionError, SaltInvocationError ) @@ -136,18 +137,36 @@ def _get_hold(line, pattern=__HOLD_PATTERN, full=True): def _yum(): ''' - return yum or dnf depending on version + Determine package manager name (yum or dnf), + depending on the system version. ''' contextkey = 'yum_bin' if contextkey not in __context__: - if 'fedora' in __grains__['os'].lower() \ - and int(__grains__['osrelease']) >= 22: + if ('fedora' in __grains__['os'].lower() + and int(__grains__['osrelease']) >= 22): __context__[contextkey] = 'dnf' else: __context__[contextkey] = 'yum' return __context__[contextkey] +def _call_yum(args, **kwargs): + ''' + Call yum/dnf. + ''' + params = {'output_loglevel': 'trace', + 'python_shell': False, + 'env': salt.utils.environment.get_module_environment(globals())} + params.update(kwargs) + cmd = [] + if salt.utils.systemd.has_scope(__context__) and __salt__['config.get']('systemd.scope', True): + cmd.extend(['systemd-run', '--scope']) + cmd.append(_yum()) + cmd.extend(args) + + return __salt__['cmd.run_all'](cmd, **params) + + def _yum_pkginfo(output): ''' Parse yum/dnf output (which could contain irregular line breaks if package @@ -458,14 +477,11 @@ def latest_version(*names, **kwargs): cur_pkgs = list_pkgs(versions_as_list=True) # Get available versions for specified package(s) - cmd = [_yum(), '--quiet'] + cmd = ['--quiet'] cmd.extend(options) cmd.extend(['list', 'available']) cmd.extend(names) - out = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - ignore_retcode=True, - python_shell=False) + out = _call_yum(cmd, ignore_retcode=True) if out['retcode'] != 0: if out['stderr']: # Check first if this is just a matter of the packages being @@ -875,50 +891,35 @@ def list_repo_pkgs(*args, **kwargs): ) # Really old version of yum; does not even have --showduplicates option if yum_version and yum_version < _LooseVersion('3.2.13'): - cmd_prefix = ['yum', '--quiet'] + cmd_prefix = ['--quiet'] if cacheonly: cmd_prefix.append('-C') cmd_prefix.append('list') for pkg_src in ('installed', 'available'): # Check installed packages first - out = __salt__['cmd.run_all']( - cmd_prefix + [pkg_src], - output_loglevel='trace', - ignore_retcode=True, - python_shell=False - ) + out = _call_yum(cmd_prefix + [pkg_src], ignore_retcode=True) if out['retcode'] == 0: _parse_output(out['stdout'], strict=True) # The --showduplicates option is added in 3.2.13, but the # repository-packages subcommand is only in 3.4.3 and newer elif yum_version and yum_version < _LooseVersion('3.4.3'): - cmd_prefix = ['yum', '--quiet', '--showduplicates'] + cmd_prefix = ['--quiet', '--showduplicates'] if cacheonly: cmd_prefix.append('-C') cmd_prefix.append('list') for pkg_src in ('installed', 'available'): # Check installed packages first - out = __salt__['cmd.run_all']( - cmd_prefix + [pkg_src], - output_loglevel='trace', - ignore_retcode=True, - python_shell=False - ) + out = _call_yum(cmd_prefix + [pkg_src], ignore_retcode=True) if out['retcode'] == 0: _parse_output(out['stdout'], strict=True) else: for repo in repos: - cmd = [_yum(), '--quiet', '--showduplicates', - 'repository-packages', repo, 'list'] + cmd = ['--quiet', '--showduplicates', 'repository-packages', repo, 'list'] if cacheonly: cmd.append('-C') # Can't concatenate because args is a tuple, using list.extend() cmd.extend(args) - - out = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - ignore_retcode=True, - python_shell=False) + out = _call_yum(cmd, ignore_retcode=True) if out['retcode'] != 0 and 'Error:' in out['stdout']: continue _parse_output(out['stdout']) @@ -969,13 +970,10 @@ def list_upgrades(refresh=True, **kwargs): if salt.utils.data.is_true(refresh): refresh_db(check_update=False, **kwargs) - cmd = [_yum(), '--quiet'] + cmd = ['--quiet'] cmd.extend(options) cmd.extend(['list', 'upgrades' if _yum() == 'dnf' else 'updates']) - out = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - ignore_retcode=True, - python_shell=False) + out = _call_yum(cmd, ignore_retcode=True) if out['retcode'] != 0 and 'Error:' in out: return {} @@ -1100,30 +1098,25 @@ def refresh_db(**kwargs): 1: False, } + ret = True check_update_ = kwargs.pop('check_update', True) - options = _get_options(**kwargs) - clean_cmd = [_yum(), '--quiet', '--assumeyes', 'clean', 'expire-cache'] - update_cmd = [_yum(), '--quiet', '--assumeyes', 'check-update'] - - if __grains__.get('os_family') == 'RedHat' \ - and __grains__.get('osmajorrelease') == 7: - # This feature is disabled because it is not used by Salt and adds a - # lot of extra time to the command with large repos like EPEL - update_cmd.append('--setopt=autocheck_running_kernel=false') - + clean_cmd = ['--quiet', '--assumeyes', 'clean', 'expire-cache'] clean_cmd.extend(options) - update_cmd.extend(options) + _call_yum(clean_cmd, ignore_retcode=True) - __salt__['cmd.run'](clean_cmd, python_shell=False) if check_update_: - result = __salt__['cmd.retcode'](update_cmd, - output_loglevel='trace', - ignore_retcode=True, - python_shell=False) - return retcodes.get(result, False) - return True + update_cmd = ['--quiet', '--assumeyes', 'check-update'] + if (__grains__.get('os_family') == 'RedHat' + and __grains__.get('osmajorrelease') == 7): + # This feature is disabled because it is not used by Salt and adds a + # lot of extra time to the command with large repos like EPEL + update_cmd.append('--setopt=autocheck_running_kernel=false') + update_cmd.extend(options) + ret = retcodes.get(_call_yum(update_cmd, ignore_retcode=True)['retcode'], False) + + return ret def clean_metadata(**kwargs): @@ -1658,62 +1651,35 @@ def install(name=None, if targets: if pkg_type == 'advisory': targets = ["--advisory={0}".format(t) for t in targets] - cmd = [] - if salt.utils.systemd.has_scope(__context__) \ - and __salt__['config.get']('systemd.scope', True): - cmd.extend(['systemd-run', '--scope']) - cmd.extend([_yum(), '-y']) + cmd = ['-y'] if _yum() == 'dnf': cmd.extend(['--best', '--allowerasing']) _add_common_args(cmd) cmd.append('install' if pkg_type != 'advisory' else 'update') cmd.extend(targets) - out = __salt__['cmd.run_all']( - cmd, - output_loglevel='trace', - python_shell=False, - redirect_stderr=True - ) + out = _call_yum(cmd, ignore_retcode=False, redirect_stderr=True) if out['retcode'] != 0: errors.append(out['stdout']) targets = [] with _temporarily_unhold(to_downgrade, targets): if targets: - cmd = [] - if salt.utils.systemd.has_scope(__context__) \ - and __salt__['config.get']('systemd.scope', True): - cmd.extend(['systemd-run', '--scope']) - cmd.extend([_yum(), '-y']) + cmd = ['-y'] _add_common_args(cmd) cmd.append('downgrade') cmd.extend(targets) - out = __salt__['cmd.run_all']( - cmd, - output_loglevel='trace', - python_shell=False, - redirect_stderr=True - ) + out = _call_yum(cmd) if out['retcode'] != 0: errors.append(out['stdout']) targets = [] with _temporarily_unhold(to_reinstall, targets): if targets: - cmd = [] - if salt.utils.systemd.has_scope(__context__) \ - and __salt__['config.get']('systemd.scope', True): - cmd.extend(['systemd-run', '--scope']) - cmd.extend([_yum(), '-y']) + cmd = ['-y'] _add_common_args(cmd) cmd.append('reinstall') cmd.extend(targets) - out = __salt__['cmd.run_all']( - cmd, - output_loglevel='trace', - python_shell=False, - redirect_stderr=True - ) + out = _call_yum(cmd) if out['retcode'] != 0: errors.append(out['stdout']) @@ -1920,11 +1886,7 @@ def upgrade(name=None, # dictionary's keys. targets.extend(pkg_params) - cmd = [] - if salt.utils.systemd.has_scope(__context__) \ - and __salt__['config.get']('systemd.scope', True): - cmd.extend(['systemd-run', '--scope']) - cmd.extend([_yum(), '--quiet', '-y']) + cmd = ['--quiet', '-y'] cmd.extend(options) if skip_verify: cmd.append('--nogpgcheck') @@ -1940,10 +1902,7 @@ def upgrade(name=None, # for yum we have to use update instead of upgrade cmd.append('update' if not minimal else 'update-minimal') cmd.extend(targets) - - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) + result = _call_yum(cmd) __context__.pop('pkg.list_pkgs', None) new = list_pkgs() ret = salt.utils.data.compare_dicts(old, new) @@ -2048,18 +2007,7 @@ def remove(name=None, pkgs=None, **kwargs): # pylint: disable=W0613 if not targets: return {} - cmd = [] - if salt.utils.systemd.has_scope(__context__) \ - and __salt__['config.get']('systemd.scope', True): - cmd.extend(['systemd-run', '--scope']) - cmd.extend([_yum(), '-y', 'remove'] + targets) - - out = __salt__['cmd.run_all']( - [_yum(), '-y', 'remove'] + targets, - output_loglevel='trace', - python_shell=False - ) - + out = _call_yum(['-y', 'remove'] + targets) if out['retcode'] != 0 and out['stderr']: errors = [out['stderr']] else: @@ -2192,11 +2140,7 @@ def hold(name=None, pkgs=None, sources=None, normalize=True, **kwargs): # pylin ret[target]['comment'] = ('Package {0} is set to be held.' .format(target)) else: - out = __salt__['cmd.run_all']( - [_yum(), 'versionlock', target], - python_shell=False - ) - + out = _call_yum(['versionlock', target]) if out['retcode'] == 0: ret[target].update(result=True) ret[target]['comment'] = ('Package {0} is now being held.' @@ -2301,11 +2245,7 @@ def unhold(name=None, pkgs=None, sources=None, **kwargs): # pylint: disable=W06 ret[target]['comment'] = ('Package {0} is set to be unheld.' .format(target)) else: - out = __salt__['cmd.run_all']( - [_yum(), 'versionlock', 'delete'] + search_locks, - python_shell=False - ) - + out = _call_yum(['versionlock', 'delete'] + search_locks) if out['retcode'] == 0: ret[target].update(result=True) ret[target]['comment'] = ('Package {0} is no longer held.' diff --git a/salt/modules/zabbix.py b/salt/modules/zabbix.py index 1b7ffd6414..221d2ca8a0 100644 --- a/salt/modules/zabbix.py +++ b/salt/modules/zabbix.py @@ -333,8 +333,8 @@ def compare_params(defined, existing, return_old_value=False): :param defined: Zabbix object definition taken from sls file. :param existing: Existing Zabbix object taken from result of an API call. :param return_old_value: Default False. If True, returns dict("old"=old_val, "new"=new_val) for rollback purpose. - :return: Params that are different from existing object. Result extended by object ID can be passed directly to - Zabbix API update method. + :return: Params that are different from existing object. Result extended by + object ID can be passed directly to Zabbix API update method. ''' # Comparison of data types if not isinstance(defined, type(existing)): @@ -460,12 +460,16 @@ def apiinfo_version(**connection_args): def user_create(alias, passwd, usrgrps, **connection_args): ''' - Create new zabbix user. - NOTE: This function accepts all standard user properties: keyword argument names differ depending on your - zabbix version, see: https://www.zabbix.com/documentation/2.0/manual/appendix/api/user/definitions#user - .. versionadded:: 2016.3.0 + Create new zabbix user + + .. note:: + This function accepts all standard user properties: keyword argument + names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/2.0/manual/appendix/api/user/definitions#user + :param alias: user alias :param passwd: user's password :param usrgrps: user groups to add the user to @@ -615,12 +619,16 @@ def user_get(alias=None, userids=None, **connection_args): def user_update(userid, **connection_args): ''' - Update existing users. NOTE: This function accepts all standard user properties: keyword argument names differ - depending on your zabbix version, see: - https://www.zabbix.com/documentation/2.0/manual/appendix/api/user/definitions#user - .. versionadded:: 2016.3.0 + Update existing users + + .. note:: + This function accepts all standard user properties: keyword argument + names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/2.0/manual/appendix/api/user/definitions#user + :param userid: id of the user to update :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) :param _connection_password: Optional - zabbix password (can also be set in opts or pillar, see module's docstring) @@ -650,12 +658,16 @@ def user_update(userid, **connection_args): def user_getmedia(userids=None, **connection_args): ''' - Retrieve media according to the given parameters NOTE: This function accepts all standard usermedia.get properties: - keyword argument names differ depending on your zabbix version, see: - https://www.zabbix.com/documentation/3.2/manual/api/reference/usermedia/get - .. versionadded:: 2016.3.0 + Retrieve media according to the given parameters + + .. note:: + This function accepts all standard usermedia.get properties: keyword + argument names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/3.2/manual/api/reference/usermedia/get + :param userids: return only media that are used by the given users :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) @@ -803,12 +815,16 @@ def user_list(**connection_args): def usergroup_create(name, **connection_args): ''' - Create new user group. - NOTE: This function accepts all standard user group properties: keyword argument names differ depending on your - zabbix version, see: https://www.zabbix.com/documentation/2.0/manual/appendix/api/usergroup/definitions#user_group - .. versionadded:: 2016.3.0 + Create new user group + + .. note:: + This function accepts all standard user group properties: keyword + argument names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/2.0/manual/appendix/api/usergroup/definitions#user_group + :param name: name of the user group :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) :param _connection_password: Optional - zabbix password (can also be set in opts or pillar, see module's docstring) @@ -926,12 +942,16 @@ def usergroup_exists(name=None, node=None, nodeids=None, **connection_args): def usergroup_get(name=None, usrgrpids=None, userids=None, **connection_args): ''' - Retrieve user groups according to the given parameters. - NOTE: This function accepts all usergroup_get properties: keyword argument names differ depending on your zabbix - version, see: https://www.zabbix.com/documentation/2.4/manual/api/reference/usergroup/get - .. versionadded:: 2016.3.0 + Retrieve user groups according to the given parameters + + .. note:: + This function accepts all usergroup_get properties: keyword argument + names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/2.4/manual/api/reference/usergroup/get + :param name: names of the user groups :param usrgrpids: return only user groups with the given IDs :param userids: return only user groups that contain the given users @@ -977,12 +997,16 @@ def usergroup_get(name=None, usrgrpids=None, userids=None, **connection_args): def usergroup_update(usrgrpid, **connection_args): ''' - Update existing user group. - NOTE: This function accepts all standard user group properties: keyword argument names differ depending on your - zabbix version, see: https://www.zabbix.com/documentation/2.4/manual/api/reference/usergroup/object#user_group - .. versionadded:: 2016.3.0 + Update existing user group + + .. note:: + This function accepts all standard user group properties: keyword + argument names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/2.4/manual/api/reference/usergroup/object#user_group + :param usrgrpid: ID of the user group to update. :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) :param _connection_password: Optional - zabbix password (can also be set in opts or pillar, see module's docstring) @@ -1043,20 +1067,25 @@ def usergroup_list(**connection_args): def host_create(host, groups, interfaces, **connection_args): ''' - Create new host. - NOTE: This function accepts all standard host properties: keyword argument names differ depending on your - zabbix version, see: https://www.zabbix.com/documentation/2.4/manual/api/reference/host/object#host - .. versionadded:: 2016.3.0 + Create new host + + .. note:: + This function accepts all standard host properties: keyword argument + names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/2.4/manual/api/reference/host/object#host + :param host: technical name of the host :param groups: groupids of host groups to add the host to :param interfaces: interfaces to be created for the host :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) :param _connection_password: Optional - zabbix password (can also be set in opts or pillar, see module's docstring) :param _connection_url: Optional - url of zabbix frontend (can also be set in opts, pillar, see module's docstring) - :param visible_name: string with visible name of the host, use 'visible_name' instead of 'name' parameter - to not mess with value supplied from Salt sls file. + :param visible_name: string with visible name of the host, use + 'visible_name' instead of 'name' parameter to not mess with value + supplied from Salt sls file. return: ID of the created host. @@ -1196,12 +1225,16 @@ def host_exists(host=None, hostid=None, name=None, node=None, nodeids=None, **co def host_get(host=None, name=None, hostids=None, **connection_args): ''' - Retrieve hosts according to the given parameters. - NOTE: This function accepts all optional host.get parameters: keyword argument names differ depending on your - zabbix version, see: https://www.zabbix.com/documentation/2.4/manual/api/reference/host/get - .. versionadded:: 2016.3.0 + Retrieve hosts according to the given parameters + + .. note:: + This function accepts all optional host.get parameters: keyword + argument names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/2.4/manual/api/reference/host/get + :param host: technical name of the host :param name: visible name of the host :param hostids: ids of the hosts @@ -1242,19 +1275,26 @@ def host_get(host=None, name=None, hostids=None, **connection_args): def host_update(hostid, **connection_args): ''' - Update existing hosts. - NOTE: This function accepts all standard host and host.update properties: keyword argument names differ depending - on your zabbix version, see: https://www.zabbix.com/documentation/2.4/manual/api/reference/host/update - https://www.zabbix.com/documentation/2.4/manual/api/reference/host/object#host - .. versionadded:: 2016.3.0 + Update existing hosts + + .. note:: + This function accepts all standard host and host.update properties: + keyword argument names differ depending on your zabbix version, see the + documentation for `host objects`_ and the documentation for `updating + hosts`_. + + .. _`host objects`: https://www.zabbix.com/documentation/2.4/manual/api/reference/host/object#host + .. _`updating hosts`: https://www.zabbix.com/documentation/2.4/manual/api/reference/host/update + :param hostid: ID of the host to update :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) :param _connection_password: Optional - zabbix password (can also be set in opts or pillar, see module's docstring) :param _connection_url: Optional - url of zabbix frontend (can also be set in opts, pillar, see module's docstring) - :param visible_name: string with visible name of the host, use 'visible_name' instead of 'name' parameter - to not mess with value supplied from Salt sls file. + :param visible_name: string with visible name of the host, use + 'visible_name' instead of 'name' parameter to not mess with value + supplied from Salt sls file. :return: ID of the updated host. @@ -1402,12 +1442,16 @@ def host_list(**connection_args): def hostgroup_create(name, **connection_args): ''' - Create a host group. - NOTE: This function accepts all standard host group properties: keyword argument names differ depending on your - zabbix version, see: https://www.zabbix.com/documentation/2.4/manual/api/reference/hostgroup/object#host_group - .. versionadded:: 2016.3.0 + Create a host group + + .. note:: + This function accepts all standard host group properties: keyword + argument names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/2.4/manual/api/reference/hostgroup/object#host_group + :param name: name of the host group :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) :param _connection_password: Optional - zabbix password (can also be set in opts or pillar, see module's docstring) @@ -1532,12 +1576,16 @@ def hostgroup_exists(name=None, groupid=None, node=None, nodeids=None, **connect def hostgroup_get(name=None, groupids=None, hostids=None, **connection_args): ''' - Retrieve host groups according to the given parameters. - NOTE: This function accepts all standard hostgroup.get properities: keyword argument names differ depending on your - zabbix version, see: https://www.zabbix.com/documentation/2.2/manual/api/reference/hostgroup/get - .. versionadded:: 2016.3.0 + Retrieve host groups according to the given parameters + + .. note:: + This function accepts all standard hostgroup.get properities: keyword + argument names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/2.2/manual/api/reference/hostgroup/get + :param name: names of the host groups :param groupid: host group IDs :param node: name of the node the host groups must belong to @@ -1581,12 +1629,16 @@ def hostgroup_get(name=None, groupids=None, hostids=None, **connection_args): def hostgroup_update(groupid, name=None, **connection_args): ''' - Update existing hosts group. - NOTE: This function accepts all standard host group properties: keyword argument names differ depending on your - zabbix version, see: https://www.zabbix.com/documentation/2.4/manual/api/reference/hostgroup/object#host_group - .. versionadded:: 2016.3.0 + Update existing hosts group + + .. note:: + This function accepts all standard host group properties: keyword + argument names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/2.4/manual/api/reference/hostgroup/object#host_group + :param groupid: ID of the host group to update :param name: name of the host group :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) @@ -1650,15 +1702,23 @@ def hostgroup_list(**connection_args): def hostinterface_get(hostids, **connection_args): ''' - Retrieve host groups according to the given parameters. - NOTE: This function accepts all standard hostinterface.get properities: keyword argument names differ depending - on your zabbix version, see: https://www.zabbix.com/documentation/2.4/manual/api/reference/hostinterface/get - .. versionadded:: 2016.3.0 + Retrieve host groups according to the given parameters + + .. note:: + This function accepts all standard hostinterface.get properities: + keyword argument names differ depending on your zabbix version, see + here__. + + .. __: https://www.zabbix.com/documentation/2.4/manual/api/reference/hostinterface/get + :param hostids: Return only host interfaces used by the given hosts. + :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) + :param _connection_password: Optional - zabbix password (can also be set in opts or pillar, see module's docstring) + :param _connection_url: Optional - url of zabbix frontend (can also be set in opts, pillar, see module's docstring) :return: Array with host interfaces details, False if no convenient host interfaces found or on failure. @@ -1687,23 +1747,40 @@ def hostinterface_get(hostids, **connection_args): def hostinterface_create(hostid, ip_, dns='', main=1, if_type=1, useip=1, port=None, **connection_args): ''' - Create new host interface - NOTE: This function accepts all standard host group interface: keyword argument names differ depending - on your zabbix version, see: https://www.zabbix.com/documentation/3.0/manual/api/reference/hostinterface/object - .. versionadded:: 2016.3.0 + Create new host interface + + .. note:: + This function accepts all standard host group interface: keyword + argument names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/3.0/manual/api/reference/hostinterface/object + :param hostid: ID of the host the interface belongs to + :param ip_: IP address used by the interface + :param dns: DNS name used by the interface + :param main: whether the interface is used as default on the host (0 - not default, 1 - default) + :param port: port number used by the interface - :param if_type: Interface type (1 - agent; 2 - SNMP; 3 - IPMI; 4 - JMX) - :param useip: Whether the connection should be made via IP (0 - connect using host DNS name; 1 - connect using - host IP address for this host interface) - :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) - :param _connection_password: Optional - zabbix password (can also be set in opts or pillar, see module's docstring) - :param _connection_url: Optional - url of zabbix frontend (can also be set in opts, pillar, see module's docstring) + + :param type: Interface type (1 - agent; 2 - SNMP; 3 - IPMI; 4 - JMX) + + :param useip: Whether the connection should be made via IP (0 - connect + using host DNS name; 1 - connect using host IP address for this host + interface) + + :param _connection_user: Optional - zabbix user (can also be set in opts or + pillar, see module's docstring) + + :param _connection_password: Optional - zabbix password (can also be set in + opts or pillar, see module's docstring) + + :param _connection_url: Optional - url of zabbix frontend (can also be set + in opts, pillar, see module's docstring) :return: ID of the created host interface, False on failure. @@ -1774,15 +1851,22 @@ def hostinterface_delete(interfaceids, **connection_args): def hostinterface_update(interfaceid, **connection_args): ''' - Update host interface - NOTE: This function accepts all standard hostinterface: keyword argument names differ depending on your zabbix - version, see: https://www.zabbix.com/documentation/2.4/manual/api/reference/hostinterface/object#host_interface - .. versionadded:: 2016.3.0 + Update host interface + + .. note:: + This function accepts all standard hostinterface: keyword argument + names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/2.4/manual/api/reference/hostinterface/object#host_interface + :param interfaceid: ID of the hostinterface to update + :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) + :param _connection_password: Optional - zabbix password (can also be set in opts or pillar, see module's docstring) + :param _connection_url: Optional - url of zabbix frontend (can also be set in opts, pillar, see module's docstring) :return: ID of the updated host interface, False on failure. @@ -2138,9 +2222,13 @@ def mediatype_get(name=None, mediatypeids=None, **connection_args): def mediatype_create(name, mediatype, **connection_args): ''' - Create new mediatype. - NOTE: This function accepts all standard mediatype properties: keyword argument names differ depending on your - zabbix version, see: https://www.zabbix.com/documentation/3.0/manual/api/reference/mediatype/object + Create new mediatype + + .. note:: + This function accepts all standard mediatype properties: keyword + argument names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/3.0/manual/api/reference/mediatype/object :param mediatype: media type - 0: email, 1: script, 2: sms, 3: Jabber, 100: Ez Texting :param exec_path: exec path - Required for script and Ez Texting types, see Zabbix API docs @@ -2216,9 +2304,13 @@ def mediatype_delete(mediatypeids, **connection_args): def mediatype_update(mediatypeid, name=False, mediatype=False, **connection_args): ''' - Update existing mediatype. - NOTE: This function accepts all standard mediatype properties: keyword argument names differ depending on your - zabbix version, see: https://www.zabbix.com/documentation/3.0/manual/api/reference/mediatype/object + Update existing mediatype + + .. note:: + This function accepts all standard mediatype properties: keyword + argument names differ depending on your zabbix version, see here__. + + .. __: https://www.zabbix.com/documentation/3.0/manual/api/reference/mediatype/object :param mediatypeid: ID of the mediatype to update :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) diff --git a/salt/modules/zfs.py b/salt/modules/zfs.py index 70f2ca64cc..629b3f5bc5 100644 --- a/salt/modules/zfs.py +++ b/salt/modules/zfs.py @@ -923,7 +923,7 @@ def hold(tag, *snapshot, **kwargs): tag : string name of tag - *snapshot : string + snapshot : string name of snapshot(s) recursive : boolean specifies that a hold with the given tag is applied recursively to @@ -991,7 +991,7 @@ def release(tag, *snapshot, **kwargs): tag : string name of tag - *snapshot : string + snapshot : string name of snapshot(s) recursive : boolean recursively releases a hold with the given tag on the snapshots of @@ -1050,7 +1050,7 @@ def snapshot(*snapshot, **kwargs): ''' Creates snapshots with the given names. - *snapshot : string + snapshot : string name of snapshot(s) recursive : boolean recursively create snapshots of all descendent datasets. @@ -1104,9 +1104,9 @@ def set(*dataset, **kwargs): ''' Sets the property or list of properties to the given value(s) for each dataset. - *dataset : string + dataset : string name of snapshot(s), filesystem(s), or volume(s) - *properties : string + properties : string additional zfs properties pairs .. note:: @@ -1159,7 +1159,7 @@ def get(*dataset, **kwargs): ''' Displays properties for the given datasets. - *dataset : string + dataset : string name of snapshot(s), filesystem(s), or volume(s) properties : string comma-separated list of properties to list, defaults to all @@ -1180,7 +1180,6 @@ def get(*dataset, **kwargs): .. versionadded:: 2018.3.0 .. note:: - If no datasets are specified, then the command displays properties for all datasets on the system. diff --git a/salt/modules/zonecfg.py b/salt/modules/zonecfg.py index 5b48617fd2..456dfad9a9 100644 --- a/salt/modules/zonecfg.py +++ b/salt/modules/zonecfg.py @@ -578,7 +578,7 @@ def add_resource(zone, resource_type, **kwargs): name of zone resource_type : string type of resource - **kwargs : string|int|... + kwargs : string|int|... resource properties CLI Example: @@ -600,7 +600,7 @@ def update_resource(zone, resource_type, resource_selector, **kwargs): type of resource resource_selector : string unique resource identifier - **kwargs : string|int|... + kwargs : string|int|... resource properties .. note:: diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py index 1781432307..6e9d1456df 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py @@ -38,9 +38,11 @@ import salt.utils.files import salt.utils.functools import salt.utils.path import salt.utils.pkg +import salt.utils.pkg.rpm import salt.utils.stringutils import salt.utils.systemd from salt.utils.versions import LooseVersion +import salt.utils.environment from salt.exceptions import CommandExecutionError, MinionError, SaltInvocationError log = logging.getLogger(__name__) @@ -98,7 +100,7 @@ class _Zypper(object): self.__exit_code = 0 self.__call_result = dict() self.__error_msg = '' - self.__env = {'SALT_RUNNING': "1"} # Subject to change + self.__env = salt.utils.environment.get_module_environment(globals()) # Call config self.__xml = False @@ -714,24 +716,44 @@ def list_pkgs(versions_as_list=False, **kwargs): contextkey = 'pkg.list_pkgs' if contextkey not in __context__: - - cmd = ['rpm', '-qa', '--queryformat', ( - "%{NAME}_|-%{VERSION}_|-%{RELEASE}_|-%{ARCH}_|-" - "%|EPOCH?{%{EPOCH}}:{}|_|-%{INSTALLTIME}\\n")] ret = {} - for line in __salt__['cmd.run'](cmd, output_loglevel='trace', python_shell=False).splitlines(): - name, pkgver, rel, arch, epoch, install_time = line.split('_|-') - install_date = datetime.datetime.utcfromtimestamp(int(install_time)).isoformat() + "Z" - install_date_time_t = int(install_time) - - all_attr = {'epoch': epoch, 'version': pkgver, 'release': rel, 'arch': arch, - 'install_date': install_date, 'install_date_time_t': install_date_time_t} - __salt__['pkg_resource.add_pkg'](ret, name, all_attr) + cmd = ['rpm', '-qa', '--queryformat', + salt.utils.pkg.rpm.QUERYFORMAT.replace('%{REPOID}', '(none)') + '\n'] + output = __salt__['cmd.run'](cmd, + python_shell=False, + output_loglevel='trace') + for line in output.splitlines(): + pkginfo = salt.utils.pkg.rpm.parse_pkginfo( + line, + osarch=__grains__['osarch'] + ) + if pkginfo: + # see rpm version string rules available at https://goo.gl/UGKPNd + pkgver = pkginfo.version + epoch = '' + release = '' + if ':' in pkgver: + epoch, pkgver = pkgver.split(":", 1) + if '-' in pkgver: + pkgver, release = pkgver.split("-", 1) + all_attr = { + 'epoch': epoch, + 'version': pkgver, + 'release': release, + 'arch': pkginfo.arch, + 'install_date': pkginfo.install_date, + 'install_date_time_t': pkginfo.install_date_time_t + } + __salt__['pkg_resource.add_pkg'](ret, pkginfo.name, all_attr) + _ret = {} for pkgname in ret: - ret[pkgname] = sorted(ret[pkgname], key=lambda d: d['version']) + # Filter out GPG public keys packages + if pkgname.startswith('gpg-pubkey'): + continue + _ret[pkgname] = sorted(ret[pkgname], key=lambda d: d['version']) - __context__[contextkey] = ret + __context__[contextkey] = _ret return __salt__['pkg_resource.format_pkg_list']( __context__[contextkey], @@ -1350,14 +1372,6 @@ def install(name=None, _clean_cache() new = list_pkgs(attr=diff_attr) if not downloadonly else list_downloaded() - - # Handle packages which report multiple new versions - # (affects only kernel packages at this point) - for pkg_name in new: - pkg_data = new[pkg_name] - if isinstance(pkg_data, six.string_types): - new[pkg_name] = pkg_data.split(',')[-1] - ret = salt.utils.data.compare_dicts(old, new) if errors: diff --git a/salt/netapi/__init__.py b/salt/netapi/__init__.py index 0c080df72a..17bc1b621e 100644 --- a/salt/netapi/__init__.py +++ b/salt/netapi/__init__.py @@ -42,6 +42,11 @@ class NetapiClient(object): Note, this will return an invalid success if the master crashed or was not shut down cleanly. ''' + # Windows doesn't have IPC. Assume the master is running. + # At worse, it will error 500. + if salt.utils.platform.is_windows(): + return True + if self.opts['transport'] == 'tcp': ipc_file = 'publish_pull.ipc' else: diff --git a/salt/netapi/rest_cherrypy/app.py b/salt/netapi/rest_cherrypy/app.py index 4650fbef9b..84ca80f5e8 100644 --- a/salt/netapi/rest_cherrypy/app.py +++ b/salt/netapi/rest_cherrypy/app.py @@ -272,8 +272,8 @@ command: 3. Fill out the remaining parameters needed for the chosen client. The ``client`` field is a reference to the main Python classes used in Salt's -Python API. Read the full :ref:`client interfaces ` -documentation, but in short: +Python API. Read the full :ref:`Client APIs ` documentation, but +in short: * "local" uses :py:class:`LocalClient ` which sends commands to Minions. Equivalent to the ``salt`` CLI command. @@ -289,7 +289,7 @@ documentation, but in short: Most clients have variants like synchronous or asynchronous execution as well as others like batch execution. See the :ref:`full list of client interfaces -`. +`. Each client requires different arguments and sometimes has different syntax. For example, ``LocalClient`` requires the ``tgt`` argument because it forwards @@ -1203,7 +1203,7 @@ class LowDataAdapter(object): curl -i localhost:8000 - .. code-block:: http + .. code-block:: text GET / HTTP/1.1 Host: localhost:8000 @@ -1211,7 +1211,7 @@ class LowDataAdapter(object): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Type: application/json @@ -1255,7 +1255,7 @@ class LowDataAdapter(object): -H "Content-type: application/json" \\ -d '[{"client": "local", "tgt": "*", "fun": "test.ping"}]' - .. code-block:: http + .. code-block:: text POST / HTTP/1.1 Host: localhost:8000 @@ -1267,7 +1267,7 @@ class LowDataAdapter(object): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Length: 200 @@ -1315,7 +1315,7 @@ class Minions(LowDataAdapter): curl -i localhost:8000/minions/ms-3 - .. code-block:: http + .. code-block:: text GET /minions/ms-3 HTTP/1.1 Host: localhost:8000 @@ -1323,7 +1323,7 @@ class Minions(LowDataAdapter): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Length: 129005 @@ -1359,8 +1359,8 @@ class Minions(LowDataAdapter): :status 401: |401| :status 406: |406| - :term:`lowstate` data describing Salt commands must be sent in the - request body. The ``client`` option will be set to + Lowstate data describing Salt commands must be sent in the request + body. The ``client`` option will be set to :py:meth:`~salt.client.LocalClient.local_async`. **Example request:** @@ -1372,7 +1372,7 @@ class Minions(LowDataAdapter): -H "Accept: application/x-yaml" \\ -d '[{"tgt": "*", "fun": "status.diskusage"}]' - .. code-block:: http + .. code-block:: text POST /minions HTTP/1.1 Host: localhost:8000 @@ -1383,7 +1383,7 @@ class Minions(LowDataAdapter): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 202 Accepted Content-Length: 86 @@ -1436,7 +1436,7 @@ class Jobs(LowDataAdapter): curl -i localhost:8000/jobs - .. code-block:: http + .. code-block:: text GET /jobs HTTP/1.1 Host: localhost:8000 @@ -1444,7 +1444,7 @@ class Jobs(LowDataAdapter): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Length: 165 @@ -1465,7 +1465,7 @@ class Jobs(LowDataAdapter): curl -i localhost:8000/jobs/20121130104633606931 - .. code-block:: http + .. code-block:: text GET /jobs/20121130104633606931 HTTP/1.1 Host: localhost:8000 @@ -1473,7 +1473,7 @@ class Jobs(LowDataAdapter): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Length: 73 @@ -1558,7 +1558,7 @@ class Keys(LowDataAdapter): curl -i localhost:8000/keys - .. code-block:: http + .. code-block:: text GET /keys HTTP/1.1 Host: localhost:8000 @@ -1566,7 +1566,7 @@ class Keys(LowDataAdapter): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Length: 165 @@ -1587,7 +1587,7 @@ class Keys(LowDataAdapter): curl -i localhost:8000/keys/jerry - .. code-block:: http + .. code-block:: text GET /keys/jerry HTTP/1.1 Host: localhost:8000 @@ -1595,7 +1595,7 @@ class Keys(LowDataAdapter): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Length: 73 @@ -1672,14 +1672,14 @@ class Keys(LowDataAdapter): -d eauth=pam \ -o jerry-salt-keys.tar - .. code-block:: http + .. code-block:: text POST /keys HTTP/1.1 Host: localhost:8000 **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Length: 10240 @@ -1754,7 +1754,7 @@ class Login(LowDataAdapter): curl -i localhost:8000/login - .. code-block:: http + .. code-block:: text GET /login HTTP/1.1 Host: localhost:8000 @@ -1762,7 +1762,7 @@ class Login(LowDataAdapter): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Type: text/html @@ -1806,7 +1806,7 @@ class Login(LowDataAdapter): "eauth": "auto" }' - .. code-block:: http + .. code-block:: text POST / HTTP/1.1 Host: localhost:8000 @@ -1819,7 +1819,7 @@ class Login(LowDataAdapter): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Type: application/json @@ -1955,7 +1955,7 @@ class Token(LowDataAdapter): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Type: application/json @@ -2016,8 +2016,8 @@ class Run(LowDataAdapter): .. http:post:: /run - An array of :term:`lowstate` data describing Salt commands must be - sent in the request body. + An array of lowstate data describing Salt commands must be sent in + the request body. :status 200: |200| :status 400: |400| @@ -2054,7 +2054,7 @@ class Run(LowDataAdapter): "token": "" }]' - .. code-block:: http + .. code-block:: text POST /run HTTP/1.1 Host: localhost:8000 @@ -2066,7 +2066,7 @@ class Run(LowDataAdapter): **Example response:** - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Length: 73 @@ -2100,7 +2100,7 @@ class Run(LowDataAdapter): -d tgt='*' \\ -d fun='test.ping' - .. code-block:: http + .. code-block:: text POST /run HTTP/1.1 Host: localhost:8000 @@ -2112,7 +2112,7 @@ class Run(LowDataAdapter): **Example SSH response:** - .. code-block:: http + .. code-block:: text return: - silver: @@ -2212,7 +2212,7 @@ class Events(object): curl -NsS localhost:8000/events - .. code-block:: http + .. code-block:: text GET /events HTTP/1.1 Host: localhost:8000 @@ -2224,7 +2224,7 @@ class Events(object): clients to only watch for certain tags without having to deserialze the JSON object each time. - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Connection: keep-alive @@ -2410,7 +2410,7 @@ class WebsocketEndpoint(object): -H 'Sec-WebSocket-Key: '"$(echo -n $RANDOM | base64)" \\ localhost:8000/ws - .. code-block:: http + .. code-block:: text GET /ws HTTP/1.1 Connection: Upgrade @@ -2423,7 +2423,7 @@ class WebsocketEndpoint(object): **Example response**: - .. code-block:: http + .. code-block:: text HTTP/1.1 101 Switching Protocols Upgrade: websocket @@ -2582,7 +2582,7 @@ class Webhook(object): -d branch="${TRAVIS_BRANCH}" \ -d commit="${TRAVIS_COMMIT}" - .. seealso:: :ref:`events`, :ref:`reactor` + .. seealso:: :ref:`events`, :ref:`reactor ` ''' exposed = True tag_base = ['salt', 'netapi', 'hook'] @@ -2626,7 +2626,7 @@ class Webhook(object): -H 'Content-type: application/json' \\ -d '{"foo": "Foo!", "bar": "Bar!"}' - .. code-block:: http + .. code-block:: text POST /hook HTTP/1.1 Host: localhost:8000 @@ -2637,7 +2637,7 @@ class Webhook(object): **Example response**: - .. code-block:: http + .. code-block:: text HTTP/1.1 200 OK Content-Length: 14 diff --git a/salt/netapi/rest_tornado/saltnado.py b/salt/netapi/rest_tornado/saltnado.py index 320141cb81..696c943bc3 100644 --- a/salt/netapi/rest_tornado/saltnado.py +++ b/salt/netapi/rest_tornado/saltnado.py @@ -944,9 +944,11 @@ class SaltAPIHandler(BaseSaltAPIHandler): # pylint: disable=W0223 # Generate jid before triggering a job to subscribe all returns from minions chunk['jid'] = salt.utils.jid.gen_jid(self.application.opts) - # Subscribe returns from minions before firing a job - minions = self.ckminions.check_minions(chunk['tgt'], chunk.get('tgt_type', 'glob')).get('minions', list()) - future_minion_map = self.subscribe_minion_returns(chunk['jid'], minions) + # start listening for the event before we fire the job to avoid races + events = [ + self.application.event_listener.get_event(self, tag='salt/job/'+chunk['jid']), + self.application.event_listener.get_event(self, tag='syndic/job/'+chunk['jid']), + ] f_call = self._format_call_run_job_async(chunk) # fire a job off @@ -955,88 +957,91 @@ class SaltAPIHandler(BaseSaltAPIHandler): # pylint: disable=W0223 # if the job didn't publish, lets not wait around for nothing # TODO: set header?? if 'jid' not in pub_data: - for future in future_minion_map: + for future in events: try: future.set_result(None) except Exception: pass raise tornado.gen.Return('No minions matched the target. No command was sent, no jid was assigned.') + # Map of minion_id -> returned for all minions we think we need to wait on + minions = {m: False for m in pub_data['minions']} + + # minimum time required for return to complete. By default no waiting, if + # we are a syndic then we must wait syndic_wait at a minimum + min_wait_time = Future().set_result(True) + # wait syndic a while to avoid missing published events if self.application.opts['order_masters']: - yield tornado.gen.sleep(self.application.opts['syndic_wait']) + min_wait_time = tornado.gen.sleep(self.application.opts['syndic_wait']) # To ensure job_not_running and all_return are terminated by each other, communicate using a future - is_finished = Future() + is_finished = tornado.gen.sleep(self.application.opts['gather_job_timeout']) - job_not_running_future = self.job_not_running(pub_data['jid'], + # ping until the job is not running, while doing so, if we see new minions returning + # that they are running the job, add them to the list + tornado.ioloop.IOLoop.current().spawn_callback(self.job_not_running, pub_data['jid'], chunk['tgt'], f_call['kwargs']['tgt_type'], + minions, is_finished) - minion_returns_future = self.sanitize_minion_returns(future_minion_map, pub_data['minions'], is_finished) - - yield job_not_running_future - raise tornado.gen.Return((yield minion_returns_future)) - - def subscribe_minion_returns(self, jid, minions): - # Subscribe each minion event - future_minion_map = {} - for minion in minions: - tag = tagify([jid, 'ret', minion], 'job') - minion_future = self.application.event_listener.get_event(self, - tag=tag, - matcher=EventListener.exact_matcher) - future_minion_map[minion_future] = minion - return future_minion_map - - @tornado.gen.coroutine - def sanitize_minion_returns(self, future_minion_map, minions, is_finished): - ''' - Return a future which will complete once all returns are completed - (according to minions), or one of the passed in "finish_chunk_ret_future" completes - ''' - if minions is None: - minions = [] - - # Remove redundant minions - redundant_minion_futures = [future for future in future_minion_map.keys() if future_minion_map[future] not in minions] - for redundant_minion_future in redundant_minion_futures: - try: - redundant_minion_future.set_result(None) - except Exception: - pass - del future_minion_map[redundant_minion_future] + def more_todo(): + '''Check if there are any more minions we are waiting on returns from + ''' + return any(x is False for x in six.itervalues(minions)) + # here we want to follow the behavior of LocalClient.get_iter_returns + # namely we want to wait at least syndic_wait (assuming we are a syndic) + # and that there are no more jobs running on minions. We are allowed to exit + # early if gather_job_timeout has been exceeded chunk_ret = {} while True: - f = yield Any(list(future_minion_map.keys()) + [is_finished]) + to_wait = events+[is_finished] + if not min_wait_time.done(): + to_wait += [min_wait_time] + + def cancel_inflight_futures(): + for event in to_wait: + if not event.done(): + event.set_result(None) + f = yield Any(to_wait) try: # When finished entire routine, cleanup other futures and return result if f is is_finished: - for event in future_minion_map.keys(): - if not event.done(): - event.set_result(None) + cancel_inflight_futures() raise tornado.gen.Return(chunk_ret) + elif f is min_wait_time: + if not more_todo(): + cancel_inflight_futures() + raise tornado.gen.Return(chunk_ret) + continue f_result = f.result() - chunk_ret[f_result['data']['id']] = f_result['data']['return'] + # if this is a start, then we need to add it to the pile + if f_result['tag'].endswith('/new'): + for minion_id in f_result['data']['minions']: + if minion_id not in minions: + minions[minion_id] = False + else: + chunk_ret[f_result['data']['id']] = f_result['data']['return'] + # clear finished event future + minions[f_result['data']['id']] = True + + # if there are no more minions to wait for, then we are done + if not more_todo() and min_wait_time.done(): + cancel_inflight_futures() + raise tornado.gen.Return(chunk_ret) + except TimeoutException: pass - # clear finished event future - try: - minions.remove(future_minion_map[f]) - del future_minion_map[f] - except ValueError: - pass - - if not minions: - if not is_finished.done(): - is_finished.set_result(True) - raise tornado.gen.Return(chunk_ret) + if f == events[0]: + events[0] = self.application.event_listener.get_event(self, tag='salt/job/'+chunk['jid']) + else: + events[1] = self.application.event_listener.get_event(self, tag='syndic/job/'+chunk['jid']) @tornado.gen.coroutine - def job_not_running(self, jid, tgt, tgt_type, is_finished): + def job_not_running(self, jid, tgt, tgt_type, minions, is_finished): ''' Return a future which will complete once jid (passed in) is no longer running on tgt @@ -1062,8 +1067,6 @@ class SaltAPIHandler(BaseSaltAPIHandler): # pylint: disable=W0223 event = f.result() except TimeoutException: if not minion_running: - if not is_finished.done(): - is_finished.set_result(True) raise tornado.gen.Return(True) else: ping_pub_data = yield self.saltclients['local'](tgt, @@ -1077,6 +1080,8 @@ class SaltAPIHandler(BaseSaltAPIHandler): # pylint: disable=W0223 # Minions can return, we want to see if the job is running... if event['data'].get('return', {}) == {}: continue + if event['data']['id'] not in minions: + minions[event['data']['id']] = False minion_running = True @tornado.gen.coroutine diff --git a/salt/netapi/rest_wsgi.py b/salt/netapi/rest_wsgi.py index f9e54a1e62..81d23d02c0 100644 --- a/salt/netapi/rest_wsgi.py +++ b/salt/netapi/rest_wsgi.py @@ -115,7 +115,7 @@ Usage examples {"return": [{"ms--4": true, "ms--3": true, "ms--2": true, "ms--1": true, "ms--0": true}]} -:form lowstate: A list of :term:`lowstate` data appropriate for the +:form lowstate: A list of lowstate data appropriate for the :ref:`client ` interface you are calling. :status 200: success :status 401: authentication required diff --git a/salt/output/highstate.py b/salt/output/highstate.py index ecada63890..1f2f9452fa 100644 --- a/salt/output/highstate.py +++ b/salt/output/highstate.py @@ -11,35 +11,46 @@ Two configurations can be set to modify the highstate outputter. These values can be set in the master config to change the output of the ``salt`` command or set in the minion config to change the output of the ``salt-call`` command. -state_verbose: +state_verbose By default `state_verbose` is set to `True`, setting this to `False` will instruct the highstate outputter to omit displaying anything in green, this means that nothing with a result of True and no changes will not be printed state_output: The highstate outputter has six output modes, ``full``, ``terse``, ``mixed``, ``changes`` and ``filter`` + * The default is set to ``full``, which will display many lines of detailed information for each executed chunk. + * If ``terse`` is used, then the output is greatly simplified and shown in only one line. + * If ``mixed`` is used, then terse output will be used unless a state failed, in which case full output will be used. + * If ``changes`` is used, then terse output will be used if there was no error and no changes, otherwise full output will be used. + * If ``filter`` is used, then either or both of two different filters can be used: ``exclude`` or ``terse``. + * for ``exclude``, state.highstate expects a list of states to be excluded (or ``None``) followed by ``True`` for terse output or ``False`` for regular output. Because of parsing nuances, if only one of these is used, it must still contain a comma. For instance: `exclude=True,`. + * for ``terse``, state.highstate expects simply ``True`` or ``False``. + These can be set as such from the command line, or in the Salt config as `state_output_exclude` or `state_output_terse`, respectively. + The output modes have one modifier: + ``full_id``, ``terse_id``, ``mixed_id``, ``changes_id`` and ``filter_id`` If ``_id`` is used, then the corresponding form will be used, but the value for ``name`` will be drawn from the state ID. This is useful for cases where the name value might be very long and hard to read. + state_tabular: If `state_output` uses the terse output, set this to `True` for an aligned output format. If you wish to use a custom format, this can be set to a diff --git a/salt/output/overstatestage.py b/salt/output/overstatestage.py index 1dbb6cbcfc..8c4b11f0c4 100644 --- a/salt/output/overstatestage.py +++ b/salt/output/overstatestage.py @@ -3,8 +3,8 @@ Display clean output of an overstate stage ========================================== -This outputter is used to display :ref:`OverState ` stages, -and should not be called directly. +This outputter is used to display :ref:`Orchestrate Runner +` stages, and should not be called directly. ''' # Import python libs diff --git a/salt/output/table_out.py b/salt/output/table_out.py index 421d11e993..a71f21fa86 100644 --- a/salt/output/table_out.py +++ b/salt/output/table_out.py @@ -315,11 +315,11 @@ def output(ret, **kwargs): * nested_indent: integer, specify the left alignment. * has_header: boolean specifying if header should be displayed. Default: True. * row_delimiter: character to separate rows. Default: ``_``. - * delim: character to separate columns. Default: `` | ``. + * delim: character to separate columns. Default: ``" | "``. * justify: text alignment. Default: ``center``. * separate_rows: boolean specifying if row separator will be displayed between consecutive rows. Default: True. - * prefix: character at the beginning of the row. Default: ``| ``. - * suffix: character at the end of the row. Default: `` |``. + * prefix: character at the beginning of the row. Default: ``"| "``. + * suffix: character at the end of the row. Default: ``" |"``. * width: column max width. Default: ``50``. * rows_key: display the rows under a specific key. * labels_key: use the labels under a certain key. Otherwise will try to use the dictionary keys (if any). diff --git a/salt/pillar/__init__.py b/salt/pillar/__init__.py index 6f09871815..874dd85040 100644 --- a/salt/pillar/__init__.py +++ b/salt/pillar/__init__.py @@ -960,7 +960,7 @@ class Pillar(object): ) ) log.error( - 'Execption caught loading ext_pillar \'%s\':\n%s', + 'Exception caught loading ext_pillar \'%s\':\n%s', key, ''.join(traceback.format_tb(sys.exc_info()[2])) ) if ext: diff --git a/salt/pillar/consul_pillar.py b/salt/pillar/consul_pillar.py index d4ff2a4443..bf5de52053 100644 --- a/salt/pillar/consul_pillar.py +++ b/salt/pillar/consul_pillar.py @@ -134,10 +134,10 @@ import salt.utils.yaml # Import third party libs try: import consul - HAS_CONSUL = True - CONSUL_VERSION = consul.__version__ + if not hasattr(consul, '__version__'): + consul.__version__ = '0.1' # Some packages has no version, and so this pillar crashes on access to it. except ImportError: - HAS_CONSUL = False + consul = None __virtualname__ = 'consul' @@ -149,7 +149,7 @@ def __virtual__(): ''' Only return if python-consul is installed ''' - return __virtualname__ if HAS_CONSUL else False + return __virtualname__ if consul is not None else False def ext_pillar(minion_id, @@ -290,9 +290,9 @@ def get_conn(opts, profile): pillarenv = opts_merged.get('pillarenv') or 'base' params['dc'] = _resolve_datacenter(params['dc'], pillarenv) - if HAS_CONSUL: + if consul: # Sanity check. ACL Tokens are supported on python-consul 0.4.7 onwards only. - if CONSUL_VERSION < '0.4.7' and params.get('target'): + if consul.__version__ < '0.4.7' and params.get('target'): params.pop('target') return consul.Consul(**params) else: diff --git a/salt/pillar/file_tree.py b/salt/pillar/file_tree.py index cc3728e8fb..2b7c2fd52d 100644 --- a/salt/pillar/file_tree.py +++ b/salt/pillar/file_tree.py @@ -287,7 +287,7 @@ def ext_pillar(minion_id, Templating/rendering has been added. You can now specify a default render pipeline and a black- and whitelist of (dis)allowed renderers. - :param:`template` must be set to ``True`` for templating to happen. + ``template`` must be set to ``True`` for templating to happen. .. code-block:: yaml @@ -326,7 +326,7 @@ def ext_pillar(minion_id, .. warning:: Care should be exercised when enabling this option as it will - follow links that point outside of :param:`root_dir`. + follow links that point outside of ``root_dir``. .. warning:: @@ -354,7 +354,7 @@ def ext_pillar(minion_id, can now be a list of globs, allowing for more granular control over which pillar values keep their end-of-file newline. The globs match paths relative to the directories named for Minion IDs and - Nodegroup namess underneath the :param:`root_dir`. + Nodegroup namess underneath the ``root_dir``. .. code-block:: yaml diff --git a/salt/pillar/git_pillar.py b/salt/pillar/git_pillar.py index 1e2cc15a95..ec2e18e7f2 100644 --- a/salt/pillar/git_pillar.py +++ b/salt/pillar/git_pillar.py @@ -63,7 +63,7 @@ GitFS, as described :ref:`here `. used for git_pillar remotes. This is the reverse behavior from gitfs, where branches/tags make up your environments. - See :ref:`here ` for documentation on the + See :ref:`here ` for documentation on the git_pillar configuration options and their usage. Here is an example git_pillar configuration: @@ -163,7 +163,7 @@ instead of ``gitfs`` (e.g. :conf_master:`git_pillar_pubkey`, .. _GitPython: https://github.com/gitpython-developers/GitPython .. _pygit2: https://github.com/libgit2/pygit2 -.. _git-pillar-multiple-repos: +.. _git-pillar-multiple-remotes: How Multiple Remotes Are Handled ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/salt/pillar/vmware_pillar.py b/salt/pillar/vmware_pillar.py index d131bbd559..6687c60145 100644 --- a/salt/pillar/vmware_pillar.py +++ b/salt/pillar/vmware_pillar.py @@ -14,13 +14,14 @@ The pillar will return an empty dict if the 'os' or 'virtual' grain are not 'VMW Defaults ======== - The external pillar will search for Virtual Machines with the VM name matching the minion id. - Data will be returned into the 'vmware' pillar key. - The external pillar has a default set of properties to return for both VirtualMachine and HostSystem types. + +- The external pillar will search for Virtual Machines with the VM name matching the minion id. +- Data will be returned into the 'vmware' pillar key. +- The external pillar has a default set of properties to return for both VirtualMachine and HostSystem types. Configuring the VMWare pillar -============================ +============================= The required minimal configuration in the salt master ext_pillar setup: diff --git a/salt/proxy/cimc.py b/salt/proxy/cimc.py index c539559f5c..b64bfcbad1 100644 --- a/salt/proxy/cimc.py +++ b/salt/proxy/cimc.py @@ -5,7 +5,7 @@ Proxy Minion interface module for managing Cisco Integrated Management Controlle .. versionadded:: 2018.3.0 -:codeauthor: :email:`Spencer Ervin ` +:codeauthor: ``Spencer Ervin `` :maturity: new :depends: none :platform: unix diff --git a/salt/proxy/docker.py b/salt/proxy/docker.py new file mode 100644 index 0000000000..593785bb58 --- /dev/null +++ b/salt/proxy/docker.py @@ -0,0 +1,72 @@ +# -*- coding: utf-8 -*- +''' +Docker Proxy Minion + +.. versionadded: Fluorine + +:depends: docker + +This proxy minion is just a shim to the docker executor, which will use the +:py:func:`docker.call ` for everything except +state runs. + + +To configure the proxy minion: + +.. code-block:: yaml + + proxy: + proxytype: docker + name: festive_leakey + +It is also possible to just name the proxy minion the same name as the +container, and use grains to configure the proxy minion: + +.. code-block:: yaml + + proxy: + proxytype: docker + name: {{grains['id']}} + +name + + Name of the docker container +''' +from __future__ import absolute_import, unicode_literals + +__proxyenabled__ = ['docker'] +__virtualname__ = 'docker' + + +def __virtual__(): + if __opts__.get('proxy', {}).get('proxytype') != __virtualname__: + return False, 'Proxytype does not match: {0}'.format(__virtualname__) + return True + + +def module_executors(): + ''' + List of module executors to use for this Proxy Minion + ''' + return ['docker', ] + + +def init(opts): + ''' + Always initialize + ''' + __context__['initialized'] = True + + +def initialized(): + ''' + This should always be initialized + ''' + return __context__.get('initialized', False) + + +def shutdown(opts): + ''' + Nothing needs to be done to shutdown + ''' + __context__['initialized'] = False diff --git a/salt/proxy/fx2.py b/salt/proxy/fx2.py index b2b3dfd400..d3273e8ec1 100644 --- a/salt/proxy/fx2.py +++ b/salt/proxy/fx2.py @@ -327,7 +327,7 @@ def chconfig(cmd, *args, **kwargs): ''' # Strip the __pub_ keys...is there a better way to do this? - for k in kwargs: + for k in list(kwargs): if k.startswith('__pub_'): kwargs.pop(k) diff --git a/salt/proxy/napalm.py b/salt/proxy/napalm.py index 4ad29b614f..51ea4f4994 100644 --- a/salt/proxy/napalm.py +++ b/salt/proxy/napalm.py @@ -291,11 +291,12 @@ def call(method, *args, **kwargs): :param params: contains the mapping between the name and the values of the parameters needed to call the method :return: A dictionary with three keys: - * result (True/False): if the operation succeeded - * out (object): returns the object as-is from the call - * comment (string): provides more details in case the call failed - * traceback (string): complete traceback in case of exception. Please submit an issue including this traceback - on the `correct driver repo`_ and make sure to read the FAQ_ + - result (True/False): if the operation succeeded + - out (object): returns the object as-is from the call + - comment (string): provides more details in case the call failed + - traceback (string): complete traceback in case of exception. Please + submit an issue including this traceback on the `correct driver repo`_ + and make sure to read the FAQ_ .. _`correct driver repo`: https://github.com/napalm-automation/napalm/issues/new .. _FAQ: https://github.com/napalm-automation/napalm#faq diff --git a/salt/proxy/netmiko_px.py b/salt/proxy/netmiko_px.py new file mode 100644 index 0000000000..e9ac1809c7 --- /dev/null +++ b/salt/proxy/netmiko_px.py @@ -0,0 +1,322 @@ +# -*- coding: utf-8 -*- +''' +Netmiko +======= + +.. versionadded:: Fluorine + +Proxy module for managing network devices via +`Netmiko `_. + +:codeauthor: Mircea Ulinic & Kirk Byers +:maturity: new +:depends: netmiko +:platform: unix + +Dependencies +------------ + +The ``netmiko`` proxy modules requires Netmiko to be installed: ``pip install netmiko``. + +Pillar +------ + +The ``netmiko`` proxy configuration requires the following parameters in order +to connect to the network device: + +- ``device_type`` - Class selection based on device type. Supported options: + + - ``a10``: A10 Networks + - ``accedian``: Accedian Networks + - ``alcatel_aos``: Alcatel AOS + - ``alcatel_sros``: Alcatel SROS + - ``apresia_aeos``: Apresia AEOS + - ``arista_eos``: Arista EOS + - ``aruba_os``: Aruba + - ``avaya_ers``: Avaya ERS + - ``avaya_vsp``: Avaya VSP + - ``brocade_fastiron``: Brocade Fastiron + - ``brocade_netiron``: Brocade Netiron + - ``brocade_nos``: Brocade NOS + - ``brocade_vdx``: Brocade NOS + - ``brocade_vyos``: VyOS + - ``checkpoint_gaia``: Check Point GAiA + - ``calix_b6``: Calix B6 + - ``ciena_saos``: Ciena SAOS + - ``cisco_asa``: Cisco SA + - ``cisco_ios``: Cisco IOS + - ``cisco_nxos``: Cisco NX-oS + - ``cisco_s300``: Cisco S300 + - ``cisco_tp``: Cisco TpTcCe + - ``cisco_wlc``: Cisco WLC + - ``cisco_xe``: Cisco IOS + - ``cisco_xr``: Cisco XR + - ``coriant``: Coriant + - ``dell_force10``: Dell Force10 + - ``dell_os10``: Dell OS10 + - ``dell_powerconnect``: Dell PowerConnect + - ``eltex``: Eltex + - ``enterasys``: Enterasys + - ``extreme``: Extreme + - ``extreme_wing``: Extreme Wing + - ``f5_ltm``: F5 LTM + - ``fortinet``: Fortinet + - ``generic_termserver``: TerminalServer + - ``hp_comware``: HP Comware + - ``hp_procurve``: HP Procurve + - ``huawei``: Huawei + - ``huawei_vrpv8``: Huawei VRPV8 + - ``juniper``: Juniper Junos + - ``juniper_junos``: Juniper Junos + - ``linux``: Linux + - ``mellanox``: Mellanox + - ``mrv_optiswitch``: MrvOptiswitch + - ``netapp_cdot``: NetAppcDot + - ``netscaler``: Netscaler + - ``ovs_linux``: OvsLinux + - ``paloalto_panos``: PaloAlto Panos + - ``pluribus``: Pluribus + - ``quanta_mesh``: Quanta Mesh + - ``ruckus_fastiron``: Ruckus Fastiron + - ``ubiquiti_edge``: Ubiquiti Edge + - ``ubiquiti_edgeswitch``: Ubiquiti Edge + - ``vyatta_vyos``: VyOS + - ``vyos``: VyOS + - ``brocade_fastiron_telnet``: Brocade Fastiron over Telnet + - ``brocade_netiron_telnet``: Brocade Netiron over Telnet + - ``cisco_ios_telnet``: Cisco IOS over Telnet + - ``apresia_aeos_telnet``: Apresia AEOS over Telnet + - ``arista_eos_telnet``: Arista EOS over Telnet + - ``hp_procurve_telnet``: HP Procurve over Telnet + - ``hp_comware_telnet``: HP Comware over Telnet + - ``juniper_junos_telnet``: Juniper Junos over Telnet + - ``calix_b6_telnet``: Calix B6 over Telnet + - ``dell_powerconnect_telnet``: Dell PowerConnect over Telnet + - ``generic_termserver_telnet``: TerminalServer over Telnet + - ``extreme_telnet``: Extreme Networks over Telnet + - ``ruckus_fastiron_telnet``: Ruckus Fastiron over Telnet + - ``cisco_ios_serial``: Cisco IOS over serial port + +- ``ip`` - IP address of target device (not required if ``host`` is provided) + +- ``host`` - Hostname of target device (not required if ``ip`` is provided) + +- ``username`` - Username to authenticate against target device, if required + +- ``password`` - Password to authenticate against target device, if required + +- ``secret`` - The enable password if target device requires one + +- ``port`` - The destination port used to connect to the target device + +- ``global_delay_factor`` - Multiplication factor affecting Netmiko delays + (default: ``1``) + +- ``use_keys`` - Connect to target device using SSH keys (default: ``False``) + +- ``key_file`` - Filename path of the SSH key file to use + +- ``allow_agent`` - Enable use of SSH key-agent + +- ``ssh_strict`` - Automatically reject unknown SSH host keys (default: + ``False``, which means unknown SSH host keys will be accepted) + +- ``system_host_keys`` - Load host keys from the user's "known_hosts" file + (default: ``False``) + +- ``alt_host_keys`` - If ``True``, host keys will be loaded from the file + specified in ``alt_key_file`` (default: ``False``) + +- ``alt_key_file`` - SSH host key file to use (if ``alt_host_keys=True``) + +- ``ssh_config_file`` - File name of OpenSSH configuration file + +- ``timeout`` - Connection timeout, in seconds (default: ``90``) + +- ``session_timeout`` - Set a timeout for parallel requests, in seconds + (default: ``60``) + +- ``keepalive`` - Send SSH keepalive packets at a specific interval, in + seconds. Currently defaults to ``0``, for backwards compatibility (it will + not attempt to keep the connection alive using the KEEPALIVE packets). + +- ``default_enter`` - Character(s) to send to correspond to enter key (default: + ``\\n``) + +- ``response_return`` - Character(s) to use in normalized return data to + represent enter key (default: ``\\n``) + +- ``always_alive`` - In certain less dynamic environments, maintaining the + remote connection permanently open with the network device is not always + beneficial. In that case, the user can select to initialize the connection + only when needed, by setting this option to ``False``. By default this option + is set to ``True`` (maintains the connection with the remote network device) + +- ``multiprocessing`` - Overrides the :conf_minion:`multiprocessing` option, + per proxy minion, as the Netmiko communication channel is mainly SSH + (default: ``False``) + +Proxy Pillar Example +-------------------- + +.. code-block:: yaml + + proxy: + proxytype: netmiko + device_type: juniper_junos + host: router1.example.com + username: example + password: example + +.. code-block:: yaml + + proxy: + proxytype: netmiko + device_type: cisco_ios + ip: 1.2.3.4 + username: test + use_keys: true + secret: w3@k +''' +from __future__ import absolute_import + +# Import python stdlib +import logging + +# Import third party libs +try: + from netmiko import ConnectHandler + from netmiko.ssh_exception import NetMikoTimeoutException + from netmiko.ssh_exception import NetMikoAuthenticationException + HAS_NETMIKO = True +except ImportError: + HAS_NETMIKO = False + +# Import salt modules +try: + from salt.utils.args import clean_kwargs +except ImportError: + from salt.utils import clean_kwargs + +# ----------------------------------------------------------------------------- +# proxy properties +# ----------------------------------------------------------------------------- + +__proxyenabled__ = ['netmiko'] +# proxy name + +# ----------------------------------------------------------------------------- +# globals +# ----------------------------------------------------------------------------- + +__virtualname__ = 'netmiko' +log = logging.getLogger(__name__) +netmiko_device = {} + +# ----------------------------------------------------------------------------- +# propery functions +# ----------------------------------------------------------------------------- + + +def __virtual__(): + ''' + Proxy module available only if Netmiko is installed. + ''' + if not HAS_NETMIKO: + return False, 'The netmiko proxy module requires netmiko library to be installed.' + return __virtualname__ + +# ----------------------------------------------------------------------------- +# proxy functions +# ----------------------------------------------------------------------------- + + +def init(opts): + ''' + Open the connection to the network device + managed through netmiko. + ''' + proxy_dict = opts.get('proxy', {}) + opts['multiprocessing'] = proxy_dict.get('multiprocessing', False) + netmiko_connection_args = proxy_dict.copy() + netmiko_connection_args.pop('proxytype', None) + netmiko_device['always_alive'] = netmiko_connection_args.pop('always_alive', + opts.get('proxy_always_alive', True)) + try: + connection = ConnectHandler(**netmiko_connection_args) + netmiko_device['connection'] = connection + netmiko_device['initialized'] = True + netmiko_device['args'] = netmiko_connection_args + netmiko_device['up'] = True + if not netmiko_device['always_alive']: + netmiko_device['connection'].disconnect() + except NetMikoTimeoutException as t_err: + log.error('Unable to setup the netmiko connection', exc_info=True) + except NetMikoAuthenticationException as au_err: + log.error('Unable to setup the netmiko connection', exc_info=True) + return True + + +def alive(opts): + ''' + Return the connection status with the network device. + ''' + log.debug('Checking if %s is still alive', opts.get('id', '')) + if not netmiko_device['always_alive']: + return True + if ping() and initialized(): + return netmiko_device['connection'].remote_conn.transport.is_alive() + return False + + +def ping(): + ''' + Connection open successfully? + ''' + return netmiko_device.get('up', False) + + +def initialized(): + ''' + Connection finished initializing? + ''' + return netmiko_device.get('initialized', False) + + +def shutdown(opts): + ''' + Closes connection with the device. + ''' + return call('disconnect') + + +# ----------------------------------------------------------------------------- +# callable functions +# ----------------------------------------------------------------------------- + + +def conn(): + ''' + Return the connection object. + ''' + return netmiko_device.get('connection') + + +def args(): + ''' + Return the Netmiko device args. + ''' + return netmiko_device['args'] + + +def call(method, *args, **kwargs): + ''' + Calls an arbitrary netmiko method. + ''' + kwargs = clean_kwargs(**kwargs) + if not netmiko_device['always_alive']: + connection = ConnectHandler(**netmiko_device['args']) + ret = getattr(connection, method)(*args, **kwargs) + connection.disconnect() + return ret + return getattr(netmiko_device['connection'], method)(*args, **kwargs) diff --git a/salt/proxy/nxos.py b/salt/proxy/nxos.py index b29a68fe8c..d447e1adcd 100644 --- a/salt/proxy/nxos.py +++ b/salt/proxy/nxos.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -''' +r''' Proxy Minion for Cisco NX OS Switches .. versionadded: 2016.11.0 @@ -32,8 +32,46 @@ password (REQUIRED) password to use to login with prompt_name - (REQUIRED) The name in the prompt on the switch. By default, use your - devices hostname. + (REQUIRED, this or `prompt_regex` below, but not both) + The name in the prompt on the switch. Recommended to use your + device's hostname. + +prompt_regex + (REQUIRED, this or `prompt_name` above, but not both) + A regular expression that matches the prompt on the switch + and any other possible prompt at which you need the proxy minion + to continue sending input. This feature was specifically developed + for situations where the switch may ask for confirmation. `prompt_name` + above would not match these, and so the session would timeout. + + Example: + + .. code-block:: yaml + + dc01-switch-01#.*|\(y\/n\)\?.* + + This should match + + .. code-block:: shell + + dc01-switch-01# + + or + + .. code-block:: shell + + Flash complete. Reboot this switch (y/n)? [n] + + + If neither `prompt_name` nor `prompt_regex` is specified the prompt will be + defaulted to + + .. code-block:: shell + + .+#$ + + which should match any number of characters followed by a `#` at the end + of the line. This may be far too liberal for most installations. ssh_args Any extra args to use to connect to the switch. @@ -93,13 +131,22 @@ def init(opts=None): if opts is None: opts = __opts__ try: + this_prompt = None + if 'prompt_regex' in opts['proxy']: + this_prompt = opts['proxy']['prompt_regex'] + elif 'prompt_name' in opts['proxy']: + this_prompt = '{0}.*#'.format(opts['proxy']['prompt_name']) + else: + log.warning('nxos proxy configuration does not specify a prompt match.') + this_prompt = '.+#$' + DETAILS[_worker_name()] = SSHConnection( host=opts['proxy']['host'], username=opts['proxy']['username'], password=opts['proxy']['password'], key_accept=opts['proxy'].get('key_accept', False), ssh_args=opts['proxy'].get('ssh_args', ''), - prompt='{0}.*#'.format(opts['proxy']['prompt_name'])) + prompt=this_prompt) out, err = DETAILS[_worker_name()].sendline('terminal length 0') except TerminalException as e: diff --git a/salt/proxy/panos.py b/salt/proxy/panos.py index 5071ad7e92..4794038b1c 100644 --- a/salt/proxy/panos.py +++ b/salt/proxy/panos.py @@ -5,7 +5,7 @@ Proxy Minion interface module for managing Palo Alto firewall devices .. versionadded:: 2018.3.0 -:codeauthor: :email:`Spencer Ervin ` +:codeauthor: ``Spencer Ervin `` :maturity: new :depends: none :platform: unix @@ -212,6 +212,7 @@ import logging from salt._compat import ElementTree as ET import salt.exceptions import salt.utils.xmlutil as xml +from salt.ext import six # This must be present or the Salt loader won't load this module. __proxyenabled__ = ['panos'] @@ -319,6 +320,7 @@ def call(payload=None): decode_type='plain', decode=True, verify_ssl=False, + status=True, raise_error=True) elif DETAILS['method'] == 'dev_pass': # Pass credentials without the target declaration @@ -330,6 +332,7 @@ def call(payload=None): decode_type='plain', decode=True, verify_ssl=False, + status=True, raise_error=True) elif DETAILS['method'] == 'pan_key': # Pass the api key with the target declaration @@ -342,6 +345,7 @@ def call(payload=None): decode_type='plain', decode=True, verify_ssl=False, + status=True, raise_error=True) elif DETAILS['method'] == 'pan_pass': # Pass credentials with the target declaration @@ -355,6 +359,7 @@ def call(payload=None): decode_type='plain', decode=True, verify_ssl=False, + status=True, raise_error=True) except KeyError as err: raise salt.exceptions.CommandExecutionError("Did not receive a valid response from host.") @@ -362,6 +367,24 @@ def call(payload=None): if not r: raise salt.exceptions.CommandExecutionError("Did not receive a valid response from host.") + if six.text_type(r['status']) not in ['200', '201', '204']: + if six.text_type(r['status']) == '400': + raise salt.exceptions.CommandExecutionError( + "The server cannot process the request due to a client error.") + elif six.text_type(r['status']) == '401': + raise salt.exceptions.CommandExecutionError( + "The server cannot process the request because it lacks valid authentication " + "credentials for the target resource.") + elif six.text_type(r['status']) == '403': + raise salt.exceptions.CommandExecutionError( + "The server refused to authorize the request.") + elif six.text_type(r['status']) == '404': + raise salt.exceptions.CommandExecutionError( + "The requested resource could not be found.") + else: + raise salt.exceptions.CommandExecutionError( + "Did not receive a valid response from host.") + xmldata = ET.fromstring(r['text']) # If we are pulling the candidate configuration, we need to strip the dirtyId diff --git a/salt/renderers/hjson.py b/salt/renderers/hjson.py index b44734bbad..73c37c6534 100644 --- a/salt/renderers/hjson.py +++ b/salt/renderers/hjson.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- ''' -Hjson_ renderer for Salt +hjson renderer for Salt -.. _Hjson: http://laktak.github.io/hjson/ +See the hjson_ documentation for more information + +.. _hjson: http://laktak.github.io/hjson/ ''' from __future__ import absolute_import, print_function, unicode_literals diff --git a/salt/renderers/pass.py b/salt/renderers/pass.py index d660e32579..826610ef87 100644 --- a/salt/renderers/pass.py +++ b/salt/renderers/pass.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- ''' Pass Renderer for Salt +====================== pass_ is an encrypted on-disk password store. diff --git a/salt/renderers/py.py b/salt/renderers/py.py index 054afa3f58..8effd35cbe 100644 --- a/salt/renderers/py.py +++ b/salt/renderers/py.py @@ -1,11 +1,15 @@ # -*- coding: utf-8 -*- ''' Pure python state renderer +========================== + +To use this renderer, the SLS file should contain a function called ``run`` +which returns highstate data. -The SLS file should contain a function called ``run`` which returns high state -data. The highstate data is a dictionary containing identifiers as keys, and execution -dictionaries as values. For example the following state declaration in YAML:: +dictionaries as values. For example the following state declaration in YAML: + +.. code-block:: yaml common_packages: pkg.installed: @@ -13,8 +17,9 @@ dictionaries as values. For example the following state declaration in YAML:: - curl - vim +tranlastes to: -tranlastes to:: +.. code-block:: python {'common_packages': {'pkg.installed': [{'pkgs': ['curl', 'vim']}]}} @@ -31,7 +36,8 @@ execution functions, grains, pillar, etc. They are: python SLS file. To use a different environment, the environment should be set when executing the state. This can be done in a couple different ways: - - Using the ``saltenv`` argument on the salt CLI (i.e. ``salt '*' state.sls foo.bar.baz saltenv=env_name``). + - Using the ``saltenv`` argument on the salt CLI (i.e. ``salt '*' state.sls + foo.bar.baz saltenv=env_name``). - By adding a ``saltenv`` argument to an individual state within the SLS file. In other words, adding a line like this to the state's data structure: ``{'saltenv': 'env_name'}`` @@ -41,8 +47,10 @@ execution functions, grains, pillar, etc. They are: ``/srv/salt/foo/bar/baz.sls``, then ``__sls__`` in that file will be ``foo.bar.baz``. -The global contet `data` (same as context ``{{ data }}` ` for states written with Jinja + YAML. -The following YAML + Jinja state declaration:: +The global context ``data`` (same as context ``{{ data }}`` for states written +with Jinja + YAML). The following YAML + Jinja state declaration: + +.. code-block:: jinja {% if data['id'] == 'mysql1' %} highstate_run: @@ -50,11 +58,16 @@ The following YAML + Jinja state declaration:: - tgt: mysql1 {% endif %} -Translate to:: +translates to: + +.. code-block:: python if data['id'] == 'mysql1': return {'highstate_run': {'local.state.apply': [{'tgt': 'mysql1'}]}} +Full Example +------------ + .. code-block:: python :linenos: diff --git a/salt/renderers/pyobjects.py b/salt/renderers/pyobjects.py index 1ab8d7234c..242bc9e343 100644 --- a/salt/renderers/pyobjects.py +++ b/salt/renderers/pyobjects.py @@ -25,7 +25,8 @@ using the built-in Python renderer with the exception that pyobjects provides you with an object based interface for generating state data. Creating state data -^^^^^^^^^^^^^^^^^^^ +------------------- + Pyobjects takes care of creating an object for each of the available states on the minion. Each state is represented by an object that is the CamelCase version of its name (i.e. ``File``, ``Service``, ``User``, etc), and these @@ -41,7 +42,8 @@ Some examples: * ``ssh_known_hosts`` becomes ``SshKnownHosts`` Context Managers and requisites -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +------------------------------- + How about something a little more complex. Here we're going to get into the core of how to use pyobjects to write states. @@ -106,7 +108,7 @@ manager to automatically have their ``watch_in`` set to ``Service("my-service")``. Including and Extending -^^^^^^^^^^^^^^^^^^^^^^^ +----------------------- To include other states use the ``include()`` function. It takes one name per state to include. @@ -126,7 +128,8 @@ a state. Importing from other state files -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +-------------------------------- + Like any Python project that grows you will likely reach a point where you want to create reusability in your state tree and share objects between state files, Map Data (described below) is a perfect example of this. @@ -160,7 +163,8 @@ Caveats: Salt object -^^^^^^^^^^^ +----------- + In the spirit of the object interface for creating state data pyobjects also provides a simple object interface to the ``__salt__`` object. @@ -178,7 +182,8 @@ The following lines are functionally equivalent: ret = __salt__['cmd.run'](bar) Pillar, grain, mine & config data -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +--------------------------------- + Pyobjects provides shortcut functions for calling ``pillar.get``, ``grains.get``, ``mine.get`` & ``config.get`` on the ``__salt__`` object. This helps maintain the readability of your state files. @@ -207,7 +212,8 @@ The following pairs of lines are functionally equivalent: Map Data -^^^^^^^^ +-------- + When building complex states or formulas you often need a way of building up a map of data based on grain data. The most common use of this is tracking the package and service name differences between distributions. @@ -289,10 +295,8 @@ file ``samba/map.sls``, you could do the following. with Pkg.installed("samba", names=[Samba.server, Samba.client]): Service.running("samba", name=Samba.service) -TODO -^^^^ -* Interface for working with reactor files ''' +# TODO: Interface for working with reactor files # Import Python Libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/salt/returners/cassandra_cql_return.py b/salt/returners/cassandra_cql_return.py index 603826edc9..849c540c03 100644 --- a/salt/returners/cassandra_cql_return.py +++ b/salt/returners/cassandra_cql_return.py @@ -35,7 +35,7 @@ Return data to a cassandra server Use the following cassandra database schema: - .. code-block:: sql + .. code-block:: text CREATE KEYSPACE IF NOT EXISTS salt WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 1}; diff --git a/salt/returners/pgjsonb.py b/salt/returners/pgjsonb.py index ce8cc2673b..fec570f14f 100644 --- a/salt/returners/pgjsonb.py +++ b/salt/returners/pgjsonb.py @@ -9,7 +9,7 @@ Return data to a PostgreSQL server with json data stored in Pg's jsonb data type .. note:: There are three PostgreSQL returners. Any can function as an external - :ref:`master job cache `. but each has different + :ref:`master job cache `. but each has different features. SaltStack recommends :mod:`returners.pgjsonb ` if you are working with a version of PostgreSQL that has the appropriate native binary JSON types. @@ -64,11 +64,11 @@ Should you wish the returner data to be cleaned out every so often, set Setting it to ``0`` or leaving it unset will cause the data to stay in the tables. Should you wish to archive jobs in a different table for later processing, -set ``archive_jobs`` to True. Salt will create 3 archive tables +set ``archive_jobs`` to True. Salt will create 3 archive tables; - ``jids_archive`` -- ``salt_returns_archive` -- ``salt_events_archive` +- ``salt_returns_archive`` +- ``salt_events_archive`` and move the contents of ``jids``, ``salt_returns``, and ``salt_events`` that are more than ``keep_jobs`` hours old to these tables. @@ -189,6 +189,8 @@ log = logging.getLogger(__name__) # Define the module's virtual name __virtualname__ = 'pgjsonb' +PG_SAVE_LOAD_SQL = '''INSERT INTO jids (jid, load) VALUES (%(jid)s, %(load)s)''' + def __virtual__(): if not HAS_PG: @@ -257,6 +259,14 @@ def _get_serv(ret=None, commit=False): except psycopg2.OperationalError as exc: raise salt.exceptions.SaltMasterError('pgjsonb returner could not connect to database: {exc}'.format(exc=exc)) + if conn.server_version is not None and conn.server_version >= 90500: + global PG_SAVE_LOAD_SQL + PG_SAVE_LOAD_SQL = '''INSERT INTO jids + (jid, load) + VALUES (%(jid)s, %(load)s) + ON CONFLICT (jid) DO UPDATE + SET load=%(load)s''' + cursor = conn.cursor() try: @@ -317,13 +327,9 @@ def save_load(jid, load, minions=None): Save the load to the specified jid id ''' with _get_serv(commit=True) as cur: - - sql = '''INSERT INTO jids - (jid, load) - VALUES (%s, %s)''' - try: - cur.execute(sql, (jid, psycopg2.extras.Json(load))) + cur.execute(PG_SAVE_LOAD_SQL, + {'jid': jid, 'load': psycopg2.extras.Json(load)}) except psycopg2.IntegrityError: # https://github.com/saltstack/salt/issues/22171 # Without this try:except: we get tons of duplicate entry errors diff --git a/salt/returners/postgres.py b/salt/returners/postgres.py index 573de68ecf..36314cd2d3 100644 --- a/salt/returners/postgres.py +++ b/salt/returners/postgres.py @@ -4,7 +4,7 @@ Return data to a postgresql server .. note:: There are three PostgreSQL returners. Any can function as an external - :ref:`master job cache `. but each has different + :ref:`master job cache `. but each has different features. SaltStack recommends :mod:`returners.pgjsonb ` if you are working with a version of PostgreSQL that has the appropriate native binary JSON types. diff --git a/salt/roster/cache.py b/salt/roster/cache.py index 5dfd160891..f1c00c94e1 100644 --- a/salt/roster/cache.py +++ b/salt/roster/cache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' -The `cache` roster provides a flexible interface to the Salt Masters' minion cache +The ``cache`` roster provides a flexible interface to the Salt Masters' minion cache to access regular minions over ``salt-ssh``. .. versionadded:: 2017.7.0 diff --git a/salt/roster/flat.py b/salt/roster/flat.py index 808fdcc53e..abbac93191 100644 --- a/salt/roster/flat.py +++ b/salt/roster/flat.py @@ -42,6 +42,7 @@ def targets(tgt, tgt_type='glob', **kwargs): __opts__['renderer'], __opts__['renderer_blacklist'], __opts__['renderer_whitelist'], + mask_value='passw*', **kwargs) conditioned_raw = {} for minion in raw: diff --git a/salt/runners/bgp.py b/salt/runners/bgp.py index 08b4272b68..12bddf6663 100644 --- a/salt/runners/bgp.py +++ b/salt/runners/bgp.py @@ -60,19 +60,19 @@ Configuration Special fields: - ``vrf``: return the name of the VRF. - - ``connection_stats``: returning an output of the form - `` ///``, e.g. - ``Established 398/399/399/0`` similar to the usual output - from network devices. + - ``connection_stats``: returning an output of the form `` + ///``, e.g. ``Established + 398/399/399/0`` similar to the usual output from network devices. - ``interface_description``: matches the neighbor details with the - corresponding interface and returns its description. This will reuse - functionality from the :mod:`net runner `, - so the user needs to enable the mines as specified in the documentation. + corresponding interface and returns its description. This will reuse + functionality from the :mod:`net runner + `, so the user needs to enable the mines + as specified in the documentation. - ``interface_name``: matches the neighbor details with the - corresponding interface and returns the name. - Similar to ``interface_description``, this will reuse - functionality from the :mod:`net runner `, - so the user needs to enable the mines as specified in the documentation. + corresponding interface and returns the name. Similar to + ``interface_description``, this will reuse functionality from the + :mod:`net runner `, so the user needs to + enable the mines as specified in the documentation. display: ``True`` Display on the screen or return structured object? Default: ``True`` (return on the CLI). @@ -235,7 +235,7 @@ def neighbors(*asns, **kwargs): Arguments: - *asns + asns A list of AS numbers to search for. The runner will return only the neighbors of these AS numbers. diff --git a/salt/runners/cloud.py b/salt/runners/cloud.py index 9b84ccb1d6..6e32f8b82c 100644 --- a/salt/runners/cloud.py +++ b/salt/runners/cloud.py @@ -164,7 +164,7 @@ def action(func=None, instances, provider, instance, - **salt.utils.args.clean_kwargs(**kwargs) + salt.utils.args.clean_kwargs(**kwargs) ) except SaltCloudConfigError as err: log.error(err) diff --git a/salt/runners/jobs.py b/salt/runners/jobs.py index d4327e32e6..98f8929421 100644 --- a/salt/runners/jobs.py +++ b/salt/runners/jobs.py @@ -70,9 +70,10 @@ def active(display_progress=False): for jid in ret: returner = _get_returner((__opts__['ext_job_cache'], __opts__['master_job_cache'])) data = mminion.returners['{0}.get_jid'.format(returner)](jid) - for minion in data: - if minion not in ret[jid]['Returned']: - ret[jid]['Returned'].append(minion) + if data: + for minion in data: + if minion not in ret[jid]['Returned']: + ret[jid]['Returned'].append(minion) return ret @@ -133,15 +134,16 @@ def lookup_jid(jid, targeted_minions = data.get('Minions', []) returns = data.get('Result', {}) - for minion in returns: - if display_progress: - __jid_event__.fire_event({'message': minion}, 'progress') - if u'return' in returns[minion]: - if returned: - ret[minion] = returns[minion].get(u'return') - else: - if returned: - ret[minion] = returns[minion].get('return') + if returns: + for minion in returns: + if display_progress: + __jid_event__.fire_event({'message': minion}, 'progress') + if u'return' in returns[minion]: + if returned: + ret[minion] = returns[minion].get(u'return') + else: + if returned: + ret[minion] = returns[minion].get('return') if missing: for minion_id in (x for x in targeted_minions if x not in returns): ret[minion_id] = 'Minion did not return' @@ -545,6 +547,10 @@ def _format_job_instance(job): ''' Helper to format a job instance ''' + if not job: + ret = {'Error': 'Cannot contact returner or no job with this jid'} + return ret + ret = {'Function': job.get('fun', 'unknown-function'), 'Arguments': list(job.get('arg', [])), # unlikely but safeguard from invalid returns diff --git a/salt/runners/manage.py b/salt/runners/manage.py index 46aa966854..7b906874f2 100644 --- a/salt/runners/manage.py +++ b/salt/runners/manage.py @@ -201,9 +201,24 @@ def up(tgt='*', tgt_type='glob', timeout=None, gather_job_timeout=None): # pyli return ret -def list_state(subset=None, show_ipv4=False, state=None): +def _show_ip_migration(show_ip, show_ipv4): + if show_ipv4 is not None: + salt.utils.versions.warn_until( + 'Sodium', + 'The \'show_ipv4\' argument has been renamed to \'show_ip\' as' + 'it now also includes IPv6 addresses for IPv6-connected' + 'minions.' + ) + return show_ipv4 + return show_ip + + +def list_state(subset=None, show_ip=False, show_ipv4=None, state=None): ''' .. versionadded:: 2015.8.0 + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. Print a list of all minions that are up according to Salt's presence detection (no commands will be sent to minions) @@ -211,7 +226,7 @@ def list_state(subset=None, show_ipv4=False, state=None): subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. state : 'available' @@ -224,6 +239,7 @@ def list_state(subset=None, show_ipv4=False, state=None): salt-run manage.list_state ''' + show_ip = _show_ip_migration(show_ip, show_ipv4) conf_file = __opts__['conf_file'] opts = salt.config.client_config(conf_file) if opts['transport'] == 'raet': @@ -240,16 +256,19 @@ def list_state(subset=None, show_ipv4=False, state=None): # Always return 'present' for 0MQ for now # TODO: implement other states support for 0MQ ckminions = salt.utils.minions.CkMinions(__opts__) - minions = ckminions.connected_ids(show_ipv4=show_ipv4, subset=subset, include_localhost=True) + minions = ckminions.connected_ids(show_ip=show_ip, subset=subset) - connected = dict(minions) if show_ipv4 else sorted(minions) + connected = dict(minions) if show_ip else sorted(minions) return connected -def list_not_state(subset=None, show_ipv4=False, state=None): +def list_not_state(subset=None, show_ip=False, show_ipv4=None, state=None): ''' .. versionadded:: 2015.8.0 + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. Print a list of all minions that are NOT up according to Salt's presence detection (no commands will be sent to minions) @@ -257,7 +276,7 @@ def list_not_state(subset=None, show_ipv4=False, state=None): subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. state : 'available' @@ -270,7 +289,8 @@ def list_not_state(subset=None, show_ipv4=False, state=None): salt-run manage.list_not_state ''' - connected = list_state(subset=None, show_ipv4=show_ipv4, state=state) + show_ip = _show_ip_migration(show_ip, show_ipv4) + connected = list_state(subset=None, show_ip=show_ip, state=state) key = salt.key.get_key(__opts__) keys = key.list_keys() @@ -290,15 +310,19 @@ def list_not_state(subset=None, show_ipv4=False, state=None): return not_connected -def present(subset=None, show_ipv4=False): +def present(subset=None, show_ip=False, show_ipv4=None): ''' + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. + Print a list of all minions that are up according to Salt's presence detection (no commands will be sent to minions) subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. CLI Example: @@ -307,12 +331,16 @@ def present(subset=None, show_ipv4=False): salt-run manage.present ''' - return list_state(subset=subset, show_ipv4=show_ipv4) + show_ip = _show_ip_migration(show_ip, show_ipv4) + return list_state(subset=subset, show_ip=show_ip) -def not_present(subset=None, show_ipv4=False): +def not_present(subset=None, show_ip=False, show_ipv4=None): ''' .. versionadded:: 2015.5.0 + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. Print a list of all minions that are NOT up according to Salt's presence detection (no commands will be sent) @@ -320,7 +348,7 @@ def not_present(subset=None, show_ipv4=False): subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. CLI Example: @@ -329,12 +357,16 @@ def not_present(subset=None, show_ipv4=False): salt-run manage.not_present ''' - return list_not_state(subset=subset, show_ipv4=show_ipv4) + show_ip = _show_ip_migration(show_ip, show_ipv4) + return list_not_state(subset=subset, show_ip=show_ip) -def joined(subset=None, show_ipv4=False): +def joined(subset=None, show_ip=False, show_ipv4=None): ''' .. versionadded:: 2015.8.0 + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. Print a list of all minions that are up according to Salt's presence detection (no commands will be sent to minions) @@ -342,7 +374,7 @@ def joined(subset=None, show_ipv4=False): subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. CLI Example: @@ -351,12 +383,16 @@ def joined(subset=None, show_ipv4=False): salt-run manage.joined ''' - return list_state(subset=subset, show_ipv4=show_ipv4, state='joined') + show_ip = _show_ip_migration(show_ip, show_ipv4) + return list_state(subset=subset, show_ip=show_ip, state='joined') -def not_joined(subset=None, show_ipv4=False): +def not_joined(subset=None, show_ip=False, show_ipv4=None): ''' .. versionadded:: 2015.8.0 + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. Print a list of all minions that are NOT up according to Salt's presence detection (no commands will be sent) @@ -364,7 +400,7 @@ def not_joined(subset=None, show_ipv4=False): subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. CLI Example: @@ -373,12 +409,16 @@ def not_joined(subset=None, show_ipv4=False): salt-run manage.not_joined ''' - return list_not_state(subset=subset, show_ipv4=show_ipv4, state='joined') + show_ip = _show_ip_migration(show_ip, show_ipv4) + return list_not_state(subset=subset, show_ip=show_ip, state='joined') -def allowed(subset=None, show_ipv4=False): +def allowed(subset=None, show_ip=False, show_ipv4=None): ''' .. versionadded:: 2015.8.0 + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. Print a list of all minions that are up according to Salt's presence detection (no commands will be sent to minions) @@ -386,7 +426,7 @@ def allowed(subset=None, show_ipv4=False): subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. CLI Example: @@ -395,12 +435,16 @@ def allowed(subset=None, show_ipv4=False): salt-run manage.allowed ''' - return list_state(subset=subset, show_ipv4=show_ipv4, state='allowed') + show_ip = _show_ip_migration(show_ip, show_ipv4) + return list_state(subset=subset, show_ip=show_ip, state='allowed') -def not_allowed(subset=None, show_ipv4=False): +def not_allowed(subset=None, show_ip=False, show_ipv4=None): ''' .. versionadded:: 2015.8.0 + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. Print a list of all minions that are NOT up according to Salt's presence detection (no commands will be sent) @@ -408,7 +452,7 @@ def not_allowed(subset=None, show_ipv4=False): subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. CLI Example: @@ -417,12 +461,16 @@ def not_allowed(subset=None, show_ipv4=False): salt-run manage.not_allowed ''' - return list_not_state(subset=subset, show_ipv4=show_ipv4, state='allowed') + show_ip = _show_ip_migration(show_ip, show_ipv4) + return list_not_state(subset=subset, show_ip=show_ip, state='allowed') -def alived(subset=None, show_ipv4=False): +def alived(subset=None, show_ip=False, show_ipv4=None): ''' .. versionadded:: 2015.8.0 + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. Print a list of all minions that are up according to Salt's presence detection (no commands will be sent to minions) @@ -430,7 +478,7 @@ def alived(subset=None, show_ipv4=False): subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. CLI Example: @@ -439,12 +487,16 @@ def alived(subset=None, show_ipv4=False): salt-run manage.alived ''' - return list_state(subset=subset, show_ipv4=show_ipv4, state='alived') + show_ip = _show_ip_migration(show_ip, show_ipv4) + return list_state(subset=subset, show_ip=show_ip, state='alived') -def not_alived(subset=None, show_ipv4=False): +def not_alived(subset=None, show_ip=False, show_ipv4=None): ''' .. versionadded:: 2015.8.0 + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. Print a list of all minions that are NOT up according to Salt's presence detection (no commands will be sent) @@ -452,7 +504,7 @@ def not_alived(subset=None, show_ipv4=False): subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. CLI Example: @@ -461,12 +513,16 @@ def not_alived(subset=None, show_ipv4=False): salt-run manage.not_alived ''' - return list_not_state(subset=subset, show_ipv4=show_ipv4, state='alived') + show_ip = _show_ip_migration(show_ip, show_ipv4) + return list_not_state(subset=subset, show_ip=show_ip, state='alived') -def reaped(subset=None, show_ipv4=False): +def reaped(subset=None, show_ip=False, show_ipv4=None): ''' .. versionadded:: 2015.8.0 + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. Print a list of all minions that are up according to Salt's presence detection (no commands will be sent to minions) @@ -474,7 +530,7 @@ def reaped(subset=None, show_ipv4=False): subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. CLI Example: @@ -483,12 +539,16 @@ def reaped(subset=None, show_ipv4=False): salt-run manage.reaped ''' - return list_state(subset=subset, show_ipv4=show_ipv4, state='reaped') + show_ip = _show_ip_migration(show_ip, show_ipv4) + return list_state(subset=subset, show_ip=show_ip, state='reaped') -def not_reaped(subset=None, show_ipv4=False): +def not_reaped(subset=None, show_ip=False, show_ipv4=None): ''' .. versionadded:: 2015.8.0 + .. versionchanged:: Fluorine + The 'show_ipv4' argument has been renamed to 'show_ip' as it now + includes IPv6 addresses for IPv6-connected minions. Print a list of all minions that are NOT up according to Salt's presence detection (no commands will be sent) @@ -496,7 +556,7 @@ def not_reaped(subset=None, show_ipv4=False): subset : None Pass in a CIDR range to filter minions by IP address. - show_ipv4 : False + show_ip : False Also show the IP address each minion is connecting from. CLI Example: @@ -505,7 +565,8 @@ def not_reaped(subset=None, show_ipv4=False): salt-run manage.not_reaped ''' - return list_not_state(subset=subset, show_ipv4=show_ipv4, state='reaped') + show_ip = _show_ip_migration(show_ip, show_ipv4) + return list_not_state(subset=subset, show_ip=show_ip, state='reaped') def get_stats(estate=None, stack='road'): diff --git a/salt/runners/mattermost.py b/salt/runners/mattermost.py index 357e2f6829..647451bfe7 100644 --- a/salt/runners/mattermost.py +++ b/salt/runners/mattermost.py @@ -105,8 +105,11 @@ def post_message(message, :param api_url: The Mattermost api url, if not specified in the configuration. :param hook: The Mattermost hook, if not specified in the configuration. :return: Boolean if message was sent successfully. + CLI Example: + .. code-block:: bash + salt-run mattermost.post_message message='Build is done' ''' if not api_url: diff --git a/salt/runners/net.py b/salt/runners/net.py index 18afbf1b66..342d55e2e8 100644 --- a/salt/runners/net.py +++ b/salt/runners/net.py @@ -773,7 +773,7 @@ def find(addr, best=True, display=_DEFAULT_DISPLAY): when the saerching pattern is a valid IP Address or Network. display: ``True`` - Display on the screen or return structured object? Default: ``True``(return on the CLI). + Display on the screen or return structured object? Default: ``True`` (return on the CLI). CLI Example: diff --git a/salt/runners/reactor.py b/salt/runners/reactor.py index 556e4c6ee8..a78271c242 100644 --- a/salt/runners/reactor.py +++ b/salt/runners/reactor.py @@ -1,6 +1,17 @@ # -*- coding: utf-8 -*- ''' A convenience system to manage reactors + +Beginning in the 2017.7 release, the reactor runner requires that the reactor +system is running. This is accomplished one of two ways, either +by having reactors configured or by including ``reactor`` in the +engine configuration for the Salt master. + + .. code-block:: yaml + + engines: + - reactor + ''' # Import python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/salt/runners/state.py b/salt/runners/state.py index 4a7b28bd4c..d866dc8ef1 100644 --- a/salt/runners/state.py +++ b/salt/runners/state.py @@ -15,22 +15,38 @@ from salt.exceptions import SaltInvocationError LOGGER = logging.getLogger(__name__) -def set_pause(jid, state_id, duration=None): +def pause(jid, state_id=None, duration=None): ''' Set up a state id pause, this instructs a running state to pause at a given state id. This needs to pass in the jid of the running state and can optionally pass in a duration in seconds. ''' minion = salt.minion.MasterMinion(__opts__) - minion['state.set_pause'](jid, state_id, duration) + minion.functions['state.pause'](jid, state_id, duration) + +set_pause = salt.utils.functools.alias_function(pause, 'set_pause') -def rm_pause(jid, state_id, duration=None): +def resume(jid, state_id=None): ''' Remove a pause from a jid, allowing it to continue ''' minion = salt.minion.MasterMinion(__opts__) - minion['state.rm_pause'](jid, state_id) + minion.functions['state.resume'](jid, state_id) + +rm_pause = salt.utils.functools.alias_function(resume, 'rm_pause') + + +def soft_kill(jid, state_id=None): + ''' + Set up a state run to die before executing the given state id, + this instructs a running state to safely exit at a given + state id. This needs to pass in the jid of the running state. + If a state_id is not passed then the jid referenced will be safely exited + at the beginning of the next state run. + ''' + minion = salt.minion.MasterMinion(__opts__) + minion.functions['state.soft_kill'](jid, state_id) def orchestrate(mods, diff --git a/salt/sdb/cache.py b/salt/sdb/cache.py index 12ed559329..765f4d0eef 100644 --- a/salt/sdb/cache.py +++ b/salt/sdb/cache.py @@ -69,7 +69,7 @@ def set_(key, value, service=None, profile=None): # pylint: disable=W0613 ''' key, profile = _parse_key(key, profile) cache = salt.cache.Cache(__opts__) - cache.set(profile['bank'], key=key, value=value) + cache.store(profile['bank'], key, value) return get(key, service, profile) diff --git a/salt/sdb/env.py b/salt/sdb/env.py index fbd390d76c..99a1ac75cb 100644 --- a/salt/sdb/env.py +++ b/salt/sdb/env.py @@ -25,7 +25,7 @@ in your environment variables!! Example usage of sdb env module: -.. code-block:: yaml +.. code-block:: jinja set some env var: cmd.run: diff --git a/salt/sdb/redis_sdb.py b/salt/sdb/redis_sdb.py new file mode 100644 index 0000000000..02f7fe8041 --- /dev/null +++ b/salt/sdb/redis_sdb.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- +''' +Redis SDB module +================ + + .. versionadded:: Fluorine + +This module allows access to Redis using an ``sdb://`` URI. + +Like all SDB modules, the Redis module requires a configuration profile to +be configured in either the minion or master configuration file. This profile +requires very little. For example: + +.. code-block:: yaml + + sdb_redis: + driver: redis + host: 127.0.0.1 + port: 6379 + password: pass + db: 1 + +The ``driver`` refers to the Redis module, all other options are optional. +For option details see: https://redis-py.readthedocs.io/en/latest/. + +''' +from __future__ import absolute_import, print_function, unicode_literals + +try: + import redis + HAS_REDIS = True +except ImportError: + HAS_REDIS = False + + +__func_alias__ = { + 'set_': 'set' +} +__virtualname__ = 'redis' + + +def __virtual__(): + ''' + Module virtual name. + ''' + if not HAS_REDIS: + return (False, 'Please install python-redis to use this SDB module.') + return __virtualname__ + + +def set_(key, value, profile=None): + ''' + Set a value into the Redis SDB. + ''' + if not profile: + return False + redis_kwargs = profile.copy() + redis_kwargs.pop('driver') + redis_conn = redis.StrictRedis(**redis_kwargs) + return redis_conn.set(key, value) + + +def get(key, profile=None): + ''' + Get a value from the Redis SDB. + ''' + if not profile: + return False + redis_kwargs = profile.copy() + redis_kwargs.pop('driver') + redis_conn = redis.StrictRedis(**redis_kwargs) + return redis_conn.get(key) + + +def delete(key, profile=None): + ''' + Delete a key from the Redis SDB. + ''' + if not profile: + return False + redis_kwargs = profile.copy() + redis_kwargs.pop('driver') + redis_conn = redis.StrictRedis(**redis_kwargs) + return redis_conn.get(key) diff --git a/salt/state.py b/salt/state.py index 20eb282578..485669da2e 100644 --- a/salt/state.py +++ b/salt/state.py @@ -1866,6 +1866,9 @@ class State(object): '__lowstate__': immutabletypes.freeze(chunks) if chunks else {} } + if '__env__' in low: + inject_globals['__env__'] = six.text_type(low['__env__']) + if self.inject_globals: inject_globals.update(self.inject_globals) @@ -1899,11 +1902,6 @@ class State(object): # allow setting the OS environ also make use of the "env" # keyword argument, which is not a string inject_globals['__env__'] = six.text_type(cdata['kwargs']['env']) - elif '__env__' in low: - # The user is passing an alternative environment using - # __env__ which is also not the appropriate choice, still, - # handle it - inject_globals['__env__'] = six.text_type(low['__env__']) if '__env__' not in inject_globals: # Let's use the default environment @@ -2149,7 +2147,7 @@ class State(object): while True: if self.reconcile_procs(running): break - time.sleep(0.0001) + time.sleep(0.01) ret = dict(list(disabled.items()) + list(running.items())) return ret @@ -2345,7 +2343,7 @@ class State(object): while True: if self.reconcile_procs(run_dict): break - time.sleep(0.0001) + time.sleep(0.01) for chunk in chunks: tag = _gen_tag(chunk) @@ -3023,7 +3021,6 @@ class BaseHighState(object): 'top_file_merging_strategy set to \'same\', but no ' 'default_top configuration option was set' ) - self.opts['saltenv'] = self.opts['default_top'] if self.opts['saltenv']: contents = self.client.cache_file( diff --git a/salt/states/alternatives.py b/salt/states/alternatives.py index 9e9da26433..0b4f90700f 100644 --- a/salt/states/alternatives.py +++ b/salt/states/alternatives.py @@ -4,7 +4,7 @@ Configuration of the alternatives system Control the alternatives system -.. code-block:: yaml +.. code-block:: jinja {% set my_hadoop_conf = '/opt/hadoop/conf' %} @@ -70,9 +70,8 @@ def install(name, link, path, priority): 'changes': {}, 'comment': ''} - isinstalled = __salt__['alternatives.check_installed'](name, path) - if isinstalled: - ret['comment'] = 'Alternatives for {0} is already set to {1}'.format(name, path) + if __salt__['alternatives.check_exists'](name, path): + ret['comment'] = 'Alternative {0} for {1} is already registered'.format(path, name) else: if __opts__['test']: ret['comment'] = ( @@ -82,12 +81,15 @@ def install(name, link, path, priority): return ret out = __salt__['alternatives.install'](name, link, path, priority) - current = __salt__['alternatives.show_current'](name) - master_link = __salt__['alternatives.show_link'](name) - if current == path and master_link == link: - ret['comment'] = ( - 'Alternative for {0} set to path {1} with priority {2}' - ).format(name, current, priority) + if __salt__['alternatives.check_exists'](name, path): + if __salt__['alternatives.check_installed'](name, path): + ret['comment'] = ( + 'Alternative for {0} set to path {1} with priority {2}' + ).format(name, path, priority) + else: + ret['comment'] = ( + 'Alternative {0} for {1} registered with priority {2} and not set to default' + ).format(path, name, priority) ret['changes'] = {'name': name, 'link': link, 'path': path, diff --git a/salt/states/archive.py b/salt/states/archive.py index 6838b2202d..7cbbe11325 100644 --- a/salt/states/archive.py +++ b/salt/states/archive.py @@ -66,14 +66,28 @@ def _gen_checksum(path): def _checksum_file_path(path): - relpath = '.'.join((os.path.relpath(path, __opts__['cachedir']), 'hash')) - if re.match(r'..[/\\]', relpath): - # path is a local file - relpath = salt.utils.path.join( - 'local', - os.path.splitdrive(path)[-1].lstrip('/\\'), - ) - return salt.utils.path.join(__opts__['cachedir'], 'archive_hash', relpath) + try: + relpath = '.'.join((os.path.relpath(path, __opts__['cachedir']), 'hash')) + if re.match(r'..[/\\]', relpath): + # path is a local file + relpath = salt.utils.path.join( + 'local', + os.path.splitdrive(path)[-1].lstrip('/\\'), + ) + except ValueError as exc: + # The path is on a different drive (Windows) + if six.text_type(exc).startswith('path is on'): + drive, path = os.path.splitdrive(path) + relpath = salt.utils.path.join( + 'local', + drive.rstrip(':'), + path.lstrip('/\\'), + ) + else: + raise + ret = salt.utils.path.join(__opts__['cachedir'], 'archive_hash', relpath) + log.debug('Using checksum file %s for cached archive file %s', ret, path) + return ret def _update_checksum(path): diff --git a/salt/states/at.py b/salt/states/at.py index 2b7e547dce..85e4d1a2f6 100644 --- a/salt/states/at.py +++ b/salt/states/at.py @@ -26,6 +26,7 @@ def __virtual__(): def present(name, timespec, tag=None, user=None, job=None, unique_tag=False): ''' .. versionchanged:: 2017.7.0 + Add a job to queue. job : string @@ -127,6 +128,7 @@ def present(name, timespec, tag=None, user=None, job=None, unique_tag=False): def absent(name, jobid=None, **kwargs): ''' .. versionchanged:: 2017.7.0 + Remove a job from queue jobid: string|int @@ -138,7 +140,7 @@ def absent(name, jobid=None, **kwargs): runas : string Runs user-specified jobs - **kwags : * + kwargs Addition kwargs can be provided to filter jobs. See output of `at.jobcheck` for more. @@ -246,6 +248,7 @@ def absent(name, jobid=None, **kwargs): def watch(name, timespec, tag=None, user=None, job=None, unique_tag=False): ''' .. versionadded:: 2017.7.0 + Add an at job if trigger by watch job : string diff --git a/salt/states/boto3_elasticache.py b/salt/states/boto3_elasticache.py index 29cfa39d40..8d96bb7a9e 100644 --- a/salt/states/boto3_elasticache.py +++ b/salt/states/boto3_elasticache.py @@ -46,7 +46,6 @@ passed in as a dict, or as a string to pull from pillars or minion config: key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs region: us-east-1 -XXX FIXME .. code-block:: yaml Ensure myelasticache exists: @@ -60,6 +59,8 @@ XXX FIXME - keyid: GKTADJGHEIQSXMKKRBJ08H - key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs +.. code-block:: yaml + # Using a profile from pillars Ensure myelasticache exists: boto3_elasticache.present: @@ -71,6 +72,8 @@ XXX FIXME - region: us-east-1 - profile: myprofile +.. code-block:: yaml + # Passing in a profile Ensure myelasticache exists: boto3_elasticache.present: @@ -174,16 +177,24 @@ def cache_cluster_present(name, wait=900, security_groups=None, region=None, key security_groups One or more VPC security groups (names and/or IDs) associated with the cache cluster. - Note: This is additive with any sec groups provided via the SecurityGroupIds parameter - below. Use this parameter ONLY when you are creating a cluster in a VPC. + + .. note:: + This is additive with any sec groups provided via the + SecurityGroupIds parameter below. Use this parameter ONLY when you + are creating a cluster in a VPC. CacheClusterId The node group (shard) identifier. This parameter is stored as a lowercase string. + Constraints: - A name must contain from 1 to 20 alphanumeric characters or hyphens. - The first character must be a letter. - A name cannot end with a hyphen or contain two consecutive hyphens. - Note: In general this parameter is not needed, as 'name' is used if it's not provided. + + - A name must contain from 1 to 20 alphanumeric characters or hyphens. + - The first character must be a letter. + - A name cannot end with a hyphen or contain two consecutive hyphens. + + .. note:: + In general this parameter is not needed, as 'name' is used if it's + not provided. ReplicationGroupId The ID of the replication group to which this cache cluster should belong. If this @@ -193,22 +204,28 @@ def cache_cluster_present(name, wait=900, security_groups=None, region=None, key Multi-AZ enabled and the Availability Zone is not specified, the cache cluster is created in Availability Zones that provide the best spread of read replicas across Availability Zones. - Notes: This parameter is ONLY valid if the Engine parameter is redis. - Due to current limitations on Redis (cluster mode disabled), this parameter - is not supported on Redis (cluster mode enabled) replication groups. + + .. note: + This parameter is ONLY valid if the Engine parameter is redis. Due + to current limitations on Redis (cluster mode disabled), this + parameter is not supported on Redis (cluster mode enabled) + replication groups. AZMode Specifies whether the nodes in this Memcached cluster are created in a single Availability Zone or created across multiple Availability Zones in the cluster's - region. If the AZMode and PreferredAvailabilityZones are not specified, + region. If the AZMode and PreferredAvailabilityZones are not specified, ElastiCache assumes single-az mode. - Note: This parameter is ONLY supported for Memcached cache clusters. + + .. note:: + This parameter is ONLY supported for Memcached cache clusters. PreferredAvailabilityZone The EC2 Availability Zone in which the cache cluster is created. All nodes belonging to this Memcached cache cluster are placed in the preferred Availability Zone. If you want to create your nodes across multiple Availability Zones, use PreferredAvailabilityZones. + Default: System chosen Availability Zone. PreferredAvailabilityZones @@ -217,27 +234,38 @@ def cache_cluster_present(name, wait=900, security_groups=None, region=None, key must equal the value of NumCacheNodes. If you want all the nodes in the same Availability Zone, use PreferredAvailabilityZone instead, or repeat the Availability Zone multiple times in the list. - Note: This option is ONLY supported on Memcached. - Note: If you are creating your cache cluster in an Amazon VPC (recommended) you - can only locate nodes in Availability Zones that are associated with the - subnets in the selected subnet group. + Default: System chosen Availability Zones. + .. note:: + This option is ONLY supported on Memcached. + + If you are creating your cache cluster in an Amazon VPC + (recommended) you can only locate nodes in Availability Zones that + are associated with the subnets in the selected subnet group. + NumCacheNodes The initial (integer) number of cache nodes that the cache cluster has. - Notes: For clusters running Redis, this value must be 1. - For clusters running Memcached, this value must be between 1 and 20. + + .. note:: + For clusters running Redis, this value must be 1. + + For clusters running Memcached, this value must be between 1 and 20. CacheNodeType The compute and memory capacity of the nodes in the node group (shard). Valid node types (and pricing for them) are exhaustively described at https://aws.amazon.com/elasticache/pricing/ - Notes: All T2 instances must be created in a VPC - Redis backup/restore is not supported for Redis (cluster mode disabled) - T1 and T2 instances. Backup/restore is supported on Redis (cluster mode - enabled) T2 instances. - Redis Append-only files (AOF) functionality is not supported for T1 or - T2 instances. + + .. note:: + All T2 instances must be created in a VPC + + Redis backup/restore is not supported for Redis (cluster mode + disabled) T1 and T2 instances. Backup/restore is supported on Redis + (cluster mode enabled) T2 instances. + + Redis Append-only files (AOF) functionality is not supported for T1 + or T2 instances. Engine The name of the cache engine to be used for this cache cluster. Valid values for @@ -246,10 +274,12 @@ def cache_cluster_present(name, wait=900, security_groups=None, region=None, key EngineVersion The version number of the cache engine to be used for this cache cluster. To view the supported cache engine versions, use the DescribeCacheEngineVersions operation. - Note: You can upgrade to a newer engine version but you cannot downgrade to an - earlier engine version. If you want to use an earlier engine version, you - must delete the existing cache cluster or replication group and create it - anew with the earlier engine version. + + .. note:: + You can upgrade to a newer engine version but you cannot downgrade + to an earlier engine version. If you want to use an earlier engine + version, you must delete the existing cache cluster or replication + group and create it anew with the earlier engine version. CacheParameterGroupName The name of the parameter group to associate with this cache cluster. If this @@ -261,8 +291,9 @@ def cache_cluster_present(name, wait=900, security_groups=None, region=None, key The name of the Cache Subnet Group to be used for the cache cluster. Use this parameter ONLY when you are creating a cache cluster within a VPC. - Note: If you're going to launch your cluster in an Amazon VPC, you need to create - a subnet group before you start creating a cluster. + .. note:: + If you're going to launch your cluster in an Amazon VPC, you need + to create a subnet group before you start creating a cluster. CacheSecurityGroupNames A list of Cache Security Group names to associate with this cache cluster. Use @@ -282,29 +313,38 @@ def cache_cluster_present(name, wait=900, security_groups=None, region=None, key uniquely identifies a Redis RDB snapshot file stored in Amazon S3. The snapshot file is used to populate the node group (shard). The Amazon S3 object name in the ARN cannot contain any commas. - Note: This parameter is ONLY valid if the Engine parameter is redis. + + .. note:: + This parameter is ONLY valid if the Engine parameter is redis. SnapshotName The name of a Redis snapshot from which to restore data into the new node group (shard). The snapshot status changes to restoring while the new node group (shard) is being created. - Note: This parameter is ONLY valid if the Engine parameter is redis. + + .. note:: + This parameter is ONLY valid if the Engine parameter is redis. PreferredMaintenanceWindow Specifies the weekly time range during which maintenance on the cache cluster is permitted. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi (24H Clock UTC). The minimum maintenance window is a 60 minute period. Valid values for ddd are: sun, mon, tue, wed, thu, fri, sat + Example: sun:23:00-mon:01:30 Port The port number on which each of the cache nodes accepts connections. + Default: 6379 NotificationTopicArn The Amazon Resource Name (ARN) of the Amazon Simple Notification Service (SNS) topic to which notifications are sent. - Note: The Amazon SNS topic owner must be the same as the cache cluster owner. + + .. note:: + The Amazon SNS topic owner must be the same as the cache cluster + owner. AutoMinorVersionUpgrade This (boolean) parameter is currently disabled. @@ -312,22 +352,30 @@ def cache_cluster_present(name, wait=900, security_groups=None, region=None, key SnapshotRetentionLimit The number of days for which ElastiCache retains automatic snapshots before deleting them. - Note: This parameter is ONLY valid if the Engine parameter is redis. + Default: 0 (i.e., automatic backups are disabled for this cache cluster). + .. note:: + This parameter is ONLY valid if the Engine parameter is redis. + SnapshotWindow The daily time range (in UTC) during which ElastiCache begins taking a daily snapshot of your node group (shard). If you do not specify this parameter, ElastiCache automatically chooses an appropriate time range. - Note: This parameter is ONLY valid if the Engine parameter is redis. + Example: 05:00-09:00 + .. note:: + This parameter is ONLY valid if the Engine parameter is redis. + AuthToken The password used to access a password protected server. + Password constraints: - Must be only printable ASCII characters. - Must be at least 16 characters and no more than 128 characters in length. - Cannot contain any of the following characters: '/', '"', or "@". + + - Must be only printable ASCII characters. + - Must be at least 16 characters and no more than 128 characters in length. + - Cannot contain any of the following characters: '/', '"', or "@". CacheNodeIdsToRemove A list of cache node IDs to be removed. A node ID is a numeric identifier (0001, 0002, @@ -346,6 +394,7 @@ def cache_cluster_present(name, wait=900, security_groups=None, region=None, key NotificationTopicStatus The status of the SNS notification topic. Notifications are sent only if the status is active. + Valid values: active | inactive region @@ -358,8 +407,8 @@ def cache_cluster_present(name, wait=900, security_groups=None, region=None, key Access key to be used. profile - A dict with region, key and keyid, or a pillar key (string) - that contains a dict with region, key and keyid. + A dict with region, key and keyid, or a pillar key (string) that + contains a dict with region, key and keyid. ''' ret = {'name': name, 'result': True, 'comment': '', 'changes': {}} args = dict([(k, v) for k, v in args.items() if not k.startswith('_')]) @@ -565,16 +614,24 @@ def replication_group_present(name, wait=900, security_groups=None, region=None, security_groups One or more VPC security groups (names and/or IDs) associated with the cache cluster. - Note: This is additive with any sec groups provided via the SecurityGroupIds parameter - below. Use this parameter ONLY when you are creating a cluster in a VPC. + + .. note:: + This is additive with any sec groups provided via the + SecurityGroupIds parameter below. Use this parameter ONLY when you + are creating a cluster in a VPC. ReplicationGroupId The replication group identifier. This parameter is stored as a lowercase string. + Constraints: - A name must contain from 1 to 20 alphanumeric characters or hyphens. - The first character must be a letter. - A name cannot end with a hyphen or contain two consecutive hyphens. - Note: In general this parameter is not needed, as 'name' is used if it's not provided. + + - A name must contain from 1 to 20 alphanumeric characters or hyphens. + - The first character must be a letter. + - A name cannot end with a hyphen or contain two consecutive hyphens. + + .. note:: + In general this parameter is not needed, as 'name' is used if it's + not provided. ReplicationGroupDescription A user-created description for the replication group. @@ -588,14 +645,19 @@ def replication_group_present(name, wait=900, security_groups=None, region=None, Specifies whether a read-only replica is automatically promoted to read/write primary if the existing primary fails. If true, Multi-AZ is enabled for this replication group. If false, Multi-AZ is disabled for this replication group. - Notes: AutomaticFailoverEnabled must be enabled for Redis (cluster mode enabled) - replication groups. - ElastiCache Multi-AZ replication groups is not supported on: - Redis versions earlier than 2.8.6. - Redis (cluster mode disabled): T1 and T2 node types. Redis (cluster mode - enabled): T2 node types. + Default: False + .. note:: + AutomaticFailoverEnabled must be enabled for Redis (cluster mode + enabled) replication groups. + + ElastiCache Multi-AZ replication groups is not supported on: + + - Redis versions earlier than 2.8.6. + - Redis (cluster mode disabled): T1 and T2 node types. + - Redis (cluster mode enabled): T2 node types. + NumCacheClusters The number of clusters this replication group initially has. This parameter is not used if there is more than one node group (shard). You should use ReplicasPerNodeGroup instead. @@ -609,21 +671,24 @@ def replication_group_present(name, wait=900, security_groups=None, region=None, is not used if there is more than one node group (shard). You should use NodeGroupConfiguration instead. The number of Availability Zones listed must equal the value of NumCacheClusters. - Note: If you are creating your replication group in an Amazon VPC (recommended), you can - only locate cache clusters in Availability Zones associated with the subnets in the - selected subnet group. + Default: System chosen Availability Zones. + .. note:: + If you are creating your replication group in an Amazon VPC + (recommended), you can only locate cache clusters in Availability + Zones associated with the subnets in the selected subnet group. + NumNodeGroups - An optional parameter that specifies the number of node groups (shards) for this Redis - (cluster mode enabled) replication group. For Redis (cluster mode disabled) either omit - this parameter or set it to 1. + An optional parameter that specifies the number of node groups (shards) + for this Redis (cluster mode enabled) replication group. For Redis + (cluster mode disabled) either omit this parameter or set it to 1. + Default: 1 ReplicasPerNodeGroup - An optional parameter that specifies the number of replica nodes in each node group - (shard). - Valid values are: 0 to 5 + An optional parameter that specifies the number of replica nodes in + each node group (shard). Valid values are: 0 to 5 NodeGroupConfiguration A list of node group (shard) configuration options. Each node group (shard) configuration @@ -636,10 +701,13 @@ def replication_group_present(name, wait=900, security_groups=None, region=None, CacheNodeType The compute and memory capacity of the nodes in the node group (shard). See https://aws.amazon.com/elasticache/pricing/ for current sizing, prices, and constraints. - Notes: All T2 instances are created in an Amazon Virtual Private Cloud (Amazon VPC). - Backup/restore is not supported for Redis (cluster mode disabled) T1 and T2 instances. - Backup/restore is supported on Redis (cluster mode enabled) T2 instances. - Redis Append-only files (AOF) functionality is not supported for T1 or T2 instances. + + .. note: + All T2 instances are created in an Amazon Virtual Private Cloud + (Amazon VPC). Backup/restore is not supported for Redis (cluster + mode disabled) T1 and T2 instances. Backup/restore is supported on + Redis (cluster mode enabled) T2 instances. Redis Append-only files + (AOF) functionality is not supported for T1 or T2 instances. Engine The name of the cache engine to be used for the cache clusters in this replication group. @@ -648,27 +716,35 @@ def replication_group_present(name, wait=900, security_groups=None, region=None, The version number of the cache engine to be used for the cache clusters in this replication group. To view the supported cache engine versions, use the DescribeCacheEngineVersions operation. - Note: You can upgrade to a newer engine version but you cannot downgrade to an earlier - engine version. If you want to use an earlier engine version, you must delete the - existing cache cluster or replication group and create it anew with the earlier - engine version. + + .. note:: + You can upgrade to a newer engine version but you cannot downgrade + to an earlier engine version. If you want to use an earlier engine + version, you must delete the existing cache cluster or replication + group and create it anew with the earlier engine version. CacheParameterGroupName The name of the parameter group to associate with this replication group. If this argument is omitted, the default cache parameter group for the specified engine is used. - Notes: If you are running Redis version 3.2.4 or later, only one node group (shard), and - want to use a default parameter group, we recommend that you specify the parameter - group by name. - To create a Redis (cluster mode disabled) replication group, use - CacheParameterGroupName=default.redis3.2 - To create a Redis (cluster mode enabled) replication group, use - CacheParameterGroupName=default.redis3.2.cluster.on + + .. note:: + If you are running Redis version 3.2.4 or later, only one node + group (shard), and want to use a default parameter group, we + recommend that you specify the parameter group by name. + + To create a Redis (cluster mode disabled) replication group, use + CacheParameterGroupName=default.redis3.2 + + To create a Redis (cluster mode enabled) replication group, use + CacheParameterGroupName=default.redis3.2.cluster.on CacheSubnetGroupName The name of the cache subnet group to be used for the replication group. - Note: If you're going to launch your cluster in an Amazon VPC, you need to create a s - group before you start creating a cluster. For more information, see Subnets and - Subnet Groups. + + .. note:: + If you're going to launch your cluster in an Amazon VPC, you need + to create a s group before you start creating a cluster. For more + information, see Subnets and Subnet Groups. CacheSecurityGroupNames A list of cache security group names to associate with this replication group. @@ -687,7 +763,9 @@ def replication_group_present(name, wait=900, security_groups=None, region=None, These snapshot files are used to populate the replication group. The Amazon S3 object name in the ARN cannot contain any commas. The list must match the number of node groups (shards) in the replication group, which means you cannot repartition. - Note: This parameter is only valid if the Engine parameter is redis. + + .. note:: + This parameter is only valid if the Engine parameter is redis. SnapshotName The name of a snapshot from which to restore data into the new replication group. The @@ -699,6 +777,7 @@ def replication_group_present(name, wait=900, security_groups=None, region=None, specified as a range in the format ddd:hh24:mi-ddd:hh24:mi (24H Clock UTC). The minimum maintenance window is a 60 minute period. Valid values for ddd are: sun, mon, tue, wed, thu, fri, sat + Example: sun:23:00-mon:01:30 Port @@ -706,7 +785,9 @@ def replication_group_present(name, wait=900, security_groups=None, region=None, NotificationTopicArn The ARN of an SNS topic to which notifications are sent. - Note: The SNS topic owner must be the same as the cache cluster owner. + + .. note:: + The SNS topic owner must be the same as the cache cluster owner. AutoMinorVersionUpgrade This parameter is currently disabled. @@ -714,22 +795,29 @@ def replication_group_present(name, wait=900, security_groups=None, region=None, SnapshotRetentionLimit The number of days for which ElastiCache will retain automatic snapshots before deleting them. - Note: This parameter is only valid if the Engine parameter is redis . + Default: 0 (that is, automatic backups are disabled for this cache cluster). + .. note:: + This parameter is only valid if the Engine parameter is redis. + SnapshotWindow The daily time range (in UTC) during which ElastiCache begins taking a daily snapshot of your node group (shard). If you do not specify this parameter, ElastiCache automatically chooses an appropriate time range. - Note: This parameter is only valid if the Engine parameter is redis . + Example: 05:00-09:00 + .. note:: + This parameter is only valid if the Engine parameter is redis. + AuthToken The password used to access a password protected server. Password constraints: - Must be only printable ASCII characters. - Must be at least 16 characters and no more than 128 characters in length. - Cannot contain any of the following characters: '/', '"', or "@". + + - Must be only printable ASCII characters. + - Must be at least 16 characters and no more than 128 characters in length. + - Cannot contain any of the following characters: '/', '"', or "@". SnapshottingClusterId The cache cluster ID that is used as the daily snapshot source for the replication group. diff --git a/salt/states/boto3_route53.py b/salt/states/boto3_route53.py index d41774afc8..b9054e80ab 100644 --- a/salt/states/boto3_route53.py +++ b/salt/states/boto3_route53.py @@ -83,60 +83,6 @@ def __virtual__(): return 'boto3_route53' if 'boto3_route53.find_hosted_zone' in __salt__ else False -def _to_aws_encoding(instring): - ''' - A partial implememtation of the `AWS domain encoding`__ rules. The punycode section is - ignored for now, so you'll have to input any unicode characters already punycoded. - - .. __: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html - - The only breakage is that we don't permit ASCII 92 ('backslash') in domain names, even though - AWS seems to allow it, becuase it's used to introduce octal escapes, and I can't think of a - good way to allow it while still parsing those escapes. Imagine a domain name containing the - literal string '\134' - pathological to be sure, but allowed by AWS's rules. If someone - dislikes this restriction, feel free to update this function to correctly handle such madness. - - Oh, and the idea of allowing '.' (period) within a domain component (e.g. not as a separator, - but as part of a field) is as stupid it sounds, and is also not supported by these functions. - Again, if you can figure out a sensible way to make it work, more power too you. If you - REALLY need this, just embed '\056' directly in your strings. I can't promise it won't break - your DNS out in the real world though. - ''' - instring = instring.lower() # Always lowercase - send_as_is_get_the_same_back = list(range(97, 123)) # a-z is 97-122 inclusive - send_as_is_get_the_same_back += [ord(n) for n in ['0', '1', '2', '3', '4', '5', '6', '7', '8', - '9', '-', '_', '.']] - send_as_is_get_octal_back = [ord(n) for n in ['!', '"', '#', '$', '%', '&', "'", '(', ')', '*', - '+', ',', '/', '\\', ':', ';', '<', '=', '>', '?', - '@', '[', ']', '^', '`', '{', '|', '}']] - # Non-printable ASCII - AWS claims it's valid in DNS entries... YMMV - acceptable_points_which_must_be_octalized = list(range(0, 33)) # 0-32 inclusive - # "Extended ASCII" stuff - acceptable_points_which_must_be_octalized += list(range(127, 256)) # 127-255 inclusive - # ^^^ This, BTW, is incompatible with punycode as far as I can tell, since unicode only aligns - # with ASCII for the first 127 code-points... Oh well. - outlist = [] - for char in instring: - point = ord(char) - octal = '\\{:03o}'.format(point) - if point in send_as_is_get_the_same_back: - outlist += [char] - elif point in send_as_is_get_octal_back: - outlist += [char] - elif point in acceptable_points_which_must_be_octalized: - outlist += [octal] - else: - raise SaltInvocationError("Invalid Route53 domain character seen (octal {0}) in string " - "{1}. Do you need to punycode it?".format(octal, instring)) - ret = ''.join(outlist) - log.debug('Name after massaging is: %s', ret) - return ret - - -def _from_aws_encoding(string): # XXX TODO - pass - - def hosted_zone_present(name, Name=None, PrivateZone=False, CallerReference=None, Comment=None, VPCs=None, region=None, key=None, keyid=None, profile=None): @@ -186,7 +132,6 @@ def hosted_zone_present(name, Name=None, PrivateZone=False, bound account, in which case you'll need to provide an explicit value for VPCRegion. ''' Name = Name if Name else name - Name = _to_aws_encoding(Name) ret = {'name': name, 'result': True, 'comment': '', 'changes': {}} @@ -369,7 +314,6 @@ def hosted_zone_absent(name, Name=None, PrivateZone=False, ''' Name = Name if Name else name - Name = _to_aws_encoding(Name) ret = {'name': name, 'result': True, 'comment': '', 'changes': {}} @@ -448,21 +392,23 @@ def rr_present(name, HostedZoneId=None, DomainName=None, PrivateZone=False, Name ratio of a resource's weight to the total. Note the following: - - You must specify a value for the Weight element for every weighted resource record set. - - You can only specify one ResourceRecord per weighted resource record set. - - You can't create latency, failover, or geolocation resource record sets that have the - same values for the Name and Type elements as weighted resource record sets. - - You can create a maximum of 100 weighted resource record sets that have the same values - for the Name and Type elements. - - For weighted (but not weighted alias) resource record sets, if you set Weight to 0 for a - resource record set, Amazon Route 53 never responds to queries with the applicable value - for that resource record set. However, if you set Weight to 0 for all resource record - sets that have the same combination of DNS name and type, traffic is routed to all - resources with equal probability. The effect of setting Weight to 0 is different when - you associate health checks with weighted resource record sets. For more information, - see `Options for Configuring Amazon Route 53 Active-Active and Active-Passive Failover`__ - in the Amazon Route 53 Developer Guide. - .. __: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-configuring-options.html + + - You must specify a value for the Weight element for every weighted resource record set. + - You can only specify one ResourceRecord per weighted resource record set. + - You can't create latency, failover, or geolocation resource record sets that have the + same values for the Name and Type elements as weighted resource record sets. + - You can create a maximum of 100 weighted resource record sets that have the same values + for the Name and Type elements. + - For weighted (but not weighted alias) resource record sets, if you set Weight to 0 for a + resource record set, Amazon Route 53 never responds to queries with the applicable value + for that resource record set. However, if you set Weight to 0 for all resource record + sets that have the same combination of DNS name and type, traffic is routed to all + resources with equal probability. The effect of setting Weight to 0 is different when + you associate health checks with weighted resource record sets. For more information, + see `Options for Configuring Amazon Route 53 Active-Active and Active-Passive Failover`__ + in the Amazon Route 53 Developer Guide. + + .. __: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-configuring-options.html Region Valid for Latency-based resource record sets only. The Amazon EC2 Region where the resource @@ -476,6 +422,8 @@ def rr_present(name, HostedZoneId=None, DomainName=None, PrivateZone=False, Name queries from Africa to be routed to a web server with an IP address of 192.0.2.111, create a resource record set with a Type of A and a ContinentCode of AF. + .. code-block:: text + ContinentCode The two-letter code for the continent. Valid values: AF | AN | AS | EU | OC | NA | SA @@ -488,50 +436,54 @@ def rr_present(name, HostedZoneId=None, DomainName=None, PrivateZone=False, Name province in Canada. Notes - - Creating geolocation and geolocation alias resource record sets in private hosted zones - is not supported. - - If you create separate resource record sets for overlapping geographic regions (for - example, one resource record set for a continent and one for a country on the same - continent), priority goes to the smallest geographic region. This allows you to route - most queries for a continent to one resource and to route queries for a country on that - continent to a different resource. - - You can't create two geolocation resource record sets that specify the same geographic - location. - - The value * in the CountryCode element matches all geographic locations that aren't - specified in other geolocation resource record sets that have the same values for the - Name and Type elements. - - Geolocation works by mapping IP addresses to locations. However, some IP addresses - aren't mapped to geographic locations, so even if you create geolocation resource - record sets that cover all seven continents, Amazon Route 53 will receive some DNS - queries from locations that it can't identify. We recommend that you create a resource - record set for which the value of CountryCode is *, which handles both queries that - come from locations for which you haven't created geolocation resource record sets and - queries from IP addresses that aren't mapped to a location. If you don't create a * - resource record set, Amazon Route 53 returns a "no answer" response for queries from - those locations. - - You can't create non-geolocation resource record sets that have the same values for the - Name and Type elements as geolocation resource record sets. + + - Creating geolocation and geolocation alias resource record sets in private hosted zones + is not supported. + - If you create separate resource record sets for overlapping geographic regions (for + example, one resource record set for a continent and one for a country on the same + continent), priority goes to the smallest geographic region. This allows you to route + most queries for a continent to one resource and to route queries for a country on that + continent to a different resource. + - You can't create two geolocation resource record sets that specify the same geographic + location. + - The value ``*`` in the CountryCode element matches all geographic locations that aren't + specified in other geolocation resource record sets that have the same values for the + Name and Type elements. + - Geolocation works by mapping IP addresses to locations. However, some IP addresses + aren't mapped to geographic locations, so even if you create geolocation resource + record sets that cover all seven continents, Amazon Route 53 will receive some DNS + queries from locations that it can't identify. We recommend that you + create a resource record set for which the value of CountryCode is + ``*``, which handles both queries that come from locations for which you + haven't created geolocation resource record sets and queries from IP + addresses that aren't mapped to a location. If you don't create a ``*`` + resource record set, Amazon Route 53 returns a "no answer" response + for queries from those locations. + - You can't create non-geolocation resource record sets that have the same values for the + Name and Type elements as geolocation resource record sets. TTL The resource record cache time to live (TTL), in seconds. Note the following: - - If you're creating an alias resource record set, omit TTL. Amazon Route 53 uses the - value of TTL for the alias target. - - If you're associating this resource record set with a health check (if you're adding - a HealthCheckId element), we recommend that you specify a TTL of 60 seconds or less so - clients respond quickly to changes in health status. - - All of the resource record sets in a group of weighted, latency, geolocation, or - failover resource record sets must have the same value for TTL. - - If a group of weighted resource record sets includes one or more weighted alias - resource record sets for which the alias target is an ELB load balancer, we recommend - that you specify a TTL of 60 seconds for all of the non-alias weighted resource record - sets that have the same name and type. Values other than 60 seconds (the TTL for load - balancers) will change the effect of the values that you specify for Weight. + + - If you're creating an alias resource record set, omit TTL. Amazon Route 53 uses the + value of TTL for the alias target. + - If you're associating this resource record set with a health check (if you're adding + a HealthCheckId element), we recommend that you specify a TTL of 60 seconds or less so + clients respond quickly to changes in health status. + - All of the resource record sets in a group of weighted, latency, geolocation, or + failover resource record sets must have the same value for TTL. + - If a group of weighted resource record sets includes one or more weighted alias + resource record sets for which the alias target is an ELB load balancer, we recommend + that you specify a TTL of 60 seconds for all of the non-alias weighted resource record + sets that have the same name and type. Values other than 60 seconds (the TTL for load + balancers) will change the effect of the values that you specify for Weight. ResourceRecords A list, containing one or more values for the resource record. No single value can exceed 4,000 characters. For details on how to format values for different record types, see `Supported DNS Resource Record Types`__ in the Amazon Route 53 Developer Guide. + .. __: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ResourceRecordTypes.html Note: You can specify more than one value for all record types except CNAME and SOA. @@ -559,6 +511,7 @@ def rr_present(name, HostedZoneId=None, DomainName=None, PrivateZone=False, Name in their entirety) would be silly and counterproductive. If you need this feature, then Read The Fine Materials at the `Boto 3 Route 53 page`__ and/or the `AWS Route 53 docs`__ and suss them for yourself - I sure won't claim to understand them partcularly well. + .. __: http://boto3.readthedocs.io/en/latest/reference/services/route53.html#Route53.Client.change_resource_record_sets .. __: http://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html @@ -575,7 +528,6 @@ def rr_present(name, HostedZoneId=None, DomainName=None, PrivateZone=False, Name Dict, or pillar key pointing to a dict, containing AWS region/key/keyid. ''' Name = Name if Name else name - Name = _to_aws_encoding(Name) if Type is None: raise SaltInvocationError("'Type' is a required parameter when adding or updating" @@ -627,7 +579,7 @@ def rr_present(name, HostedZoneId=None, DomainName=None, PrivateZone=False, Name res = getattr(instance, instance_attr, None) if res: log.debug('Found %s %s for instance %s', instance_attr, res, instance.id) - fixed_rrs += [_to_aws_encoding(res)] + fixed_rrs += [__salt__['boto3_route53.aws_encode'](res)] else: ret['comment'] = 'Attribute {} not found on instance {}'.format(instance_attr, instance.id) @@ -780,7 +732,6 @@ def rr_absent(name, HostedZoneId=None, DomainName=None, PrivateZone=False, Dict, or pillar key pointing to a dict, containing AWS region/key/keyid. ''' Name = Name if Name else name - Name = _to_aws_encoding(Name) if Type is None: raise SaltInvocationError("'Type' is a required parameter when deleting resource records.") diff --git a/salt/states/boto_apigateway.py b/salt/states/boto_apigateway.py index 6cd5eb9230..47376e19ee 100644 --- a/salt/states/boto_apigateway.py +++ b/salt/states/boto_apigateway.py @@ -90,6 +90,9 @@ def present(name, api_name, swagger_file, stage_name, api_key_required, There may be multiple deployments for the API object, each deployment is tagged with a description (i.e. unique label) in pretty printed json format consisting of the following key/values. + + .. code-block:: text + { "api_name": api_name, "swagger_file": basename_of_swagger_file @@ -100,57 +103,60 @@ def present(name, api_name, swagger_file, stage_name, api_key_required, Please note that the name of the lambda function to be integrated will be derived via the provided lambda_funcname_format parameters: - the default lambda_funcname_format is a string with the following substitutable keys: - "{stage}_{api}_{resource}_{method}". The user can choose to reorder the known keys. + - the default lambda_funcname_format is a string with the following + substitutable keys: "{stage}_{api}_{resource}_{method}". The user can + choose to reorder the known keys. + - the stage key corresponds to the stage_name passed in. + - the api key corresponds to the api_name passed in. + - the resource corresponds to the resource path defined in the passed swagger file. + - the method corresponds to the method for a resource path defined in the passed swagger file. - the stage key corresponds to the stage_name passed in. - the api key corresponds to the api_name passed in. - the resource corresponds to the resource path defined in the passed swagger file. - the method corresponds to the method for a resource path defined in the passed swagger file. + For the default lambda_funcname_format, given the following input: - for the default lambda_funcname_format, given the following - input: - api_name = ' Test Service' - stage_name = 'alpha' - basePath = '/api' - path = '/a/{b}/c' - method = 'POST' + .. code-block:: python - we will end up with the following Lambda Function Name that will be looked up: - 'test_service_alpha_a_b_c_post' + api_name = ' Test Service' + stage_name = 'alpha' + basePath = '/api' + path = '/a/{b}/c' + method = 'POST' - The canconicalization of these input parameters is done in the following order: - 1) lambda_funcname_format is formatted with the input parameters as passed, - 2) resulting string is stripped for leading/trailing spaces, - 3) path parameter's curly braces are removed from the resource path, - 4) consecutive spaces and forward slashes in the paths are replaced with '_' - 5) consecutive '_' are replaced with '_' + We will end up with the following Lambda Function Name that will be looked + up: 'test_service_alpha_a_b_c_post' + + The canconicalization of these input parameters is done in the following order: + + 1. lambda_funcname_format is formatted with the input parameters as passed, + 2. resulting string is stripped for leading/trailing spaces, + 3. path parameter's curly braces are removed from the resource path, + 4. consecutive spaces and forward slashes in the paths are replaced with '_' + 5. consecutive '_' are replaced with '_' Please note that for error response handling, the swagger file must have an error response model with the following schema. The lambda functions should throw exceptions for any non successful responses. An optional pattern field can be specified in errorMessage field to aid the response mapping from Lambda to the proper error return status codes. - .. code-block:: yaml + .. code-block:: yaml - Error: - type: object - properties: - stackTrace: - type: array - items: - type: array - items: - type: string - description: call stack - errorType: - type: string - description: error type - errorMessage: - type: string - description: | - Error message, will be matched based on pattern. - If no pattern is specified, the default pattern used for response mapping will be +*. + Error: + type: object + properties: + stackTrace: + type: array + items: + type: array + items: + type: string + description: call stack + errorType: + type: string + description: error type + errorMessage: + type: string + description: | + Error message, will be matched based on pattern. + If no pattern is specified, the default pattern used for response mapping will be +*. name The name of the state definition @@ -178,12 +184,12 @@ def present(name, api_name, swagger_file, stage_name, api_key_required, integration purposes. The region determination is based on the following priority: - 1) lambda_region as passed in (is not None) - 2) if lambda_region is None, use the region as if a boto_lambda function were - executed without explicitly specifying lambda region. - 3) if region determined in (2) is different than the region used by - boto_apigateway functions, a final lookup will be attempted using the - boto_apigateway region. + 1. lambda_region as passed in (is not None) + 2. if lambda_region is None, use the region as if a boto_lambda + function were executed without explicitly specifying lambda region. + 3. if region determined in (2) is different than the region used by + boto_apigateway functions, a final lookup will be attempted using + the boto_apigateway region. stage_variables A dict with variables and their values, or a pillar key (string) that @@ -214,30 +220,35 @@ def present(name, api_name, swagger_file, stage_name, api_key_required, error_response_template String value that defines the response template mapping that should be applied in cases error occurs. - Refer to AWS documentation for details: - http://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-mapping-template-reference.html + Refer to AWS documentation for details: http://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-mapping-template-reference.html + If set to None, the following default value is used: - '#set($inputRoot = $input.path(\'$\'))\n' - '{\n' - ' "errorMessage" : "$inputRoot.errorMessage",\n' - ' "errorType" : "$inputRoot.errorType",\n' - ' "stackTrace" : [\n' - '#foreach($stackTrace in $inputRoot.stackTrace)\n' - ' [\n' - '#foreach($elem in $stackTrace)\n' - ' "$elem"\n' - '#if($foreach.hasNext),#end\n' - '#end\n' - ' ]\n' - '#if($foreach.hasNext),#end\n' - '#end\n' - ' ]\n' + + .. code-block:: text + + '#set($inputRoot = $input.path(\'$\'))\\n' + '{\\n' + ' "errorMessage" : "$inputRoot.errorMessage",\\n' + ' "errorType" : "$inputRoot.errorType",\\n' + ' "stackTrace" : [\\n' + '#foreach($stackTrace in $inputRoot.stackTrace)\\n' + ' [\\n' + '#foreach($elem in $stackTrace)\\n' + ' "$elem"\\n' + '#if($foreach.hasNext),#end\\n' + '#end\\n' + ' ]\\n' + '#if($foreach.hasNext),#end\\n' + '#end\\n' + ' ]\\n' .. versionadded:: 2017.7.0 response_template - String value that defines the response template mapping applied in case of success (including OPTIONS method) - If set to None, empty ({}) template is assumed, which will transfer response from the lambda function as is. + String value that defines the response template mapping applied in case + of success (including OPTIONS method) If set to None, empty ({}) + template is assumed, which will transfer response from the lambda + function as is. .. versionadded:: 2017.7.0 ''' diff --git a/salt/states/boto_cloudwatch_event.py b/salt/states/boto_cloudwatch_event.py index b5852b3efc..c576ae9db8 100644 --- a/salt/states/boto_cloudwatch_event.py +++ b/salt/states/boto_cloudwatch_event.py @@ -92,7 +92,7 @@ def present(name, Name=None, not provided. ScheduleExpression - The scheduling expression. For example, "cron(0 20 * * ? *)", + The scheduling expression. For example, ``cron(0 20 * * ? *)``, "rate(5 minutes)" EventPattern diff --git a/salt/states/boto_dynamodb.py b/salt/states/boto_dynamodb.py index 9e52ca6f49..c27ec28082 100644 --- a/salt/states/boto_dynamodb.py +++ b/salt/states/boto_dynamodb.py @@ -209,12 +209,15 @@ def present(name=None, table creation. Global secondary indexes (GSIs) are managed with some exceptions: - * If a GSI deletion is detected, a failure will occur (deletes should be + + - If a GSI deletion is detected, a failure will occur (deletes should be done manually in the AWS console). - * If multiple GSIs are added in a single Salt call, a failure will occur + + - If multiple GSIs are added in a single Salt call, a failure will occur (boto supports one creation at a time). Note that this only applies after table creation; multiple GSIs can be created during table creation. - * Updates to existing GSIs are limited to read/write capacity only + + - Updates to existing GSIs are limited to read/write capacity only (DynamoDB limitation). name diff --git a/salt/states/boto_ec2.py b/salt/states/boto_ec2.py index 032b328238..6623c5f522 100644 --- a/salt/states/boto_ec2.py +++ b/salt/states/boto_ec2.py @@ -665,8 +665,10 @@ def instance_present(name, instance_name=None, instance_id=None, image_id=None, instance_initiated_shutdown_behavior (string) – Specifies whether the instance stops or terminates on instance-initiated shutdown. Valid values are: - - 'stop' - - 'terminate' + + - 'stop' + - 'terminate' + placement_group (string) – If specified, this is the name of the placement group in which the instance(s) will be launched. @@ -715,22 +717,26 @@ def instance_present(name, instance_name=None, instance_id=None, image_id=None, attributes (dict) - Instance attributes and value to be applied to the instance. Available options are: - - instanceType - A valid instance type (m1.small) - - kernel - Kernel ID (None) - - ramdisk - Ramdisk ID (None) - - userData - Base64 encoded String (None) - - disableApiTermination - Boolean (true) - - instanceInitiatedShutdownBehavior - stop|terminate - - blockDeviceMapping - List of strings - ie: [‘/dev/sda=false’] - - sourceDestCheck - Boolean (true) - - groupSet - Set of Security Groups or IDs - - ebsOptimized - Boolean (false) - - sriovNetSupport - String - ie: ‘simple’ + + - instanceType - A valid instance type (m1.small) + - kernel - Kernel ID (None) + - ramdisk - Ramdisk ID (None) + - userData - Base64 encoded String (None) + - disableApiTermination - Boolean (true) + - instanceInitiatedShutdownBehavior - stop|terminate + - blockDeviceMapping - List of strings - ie: [‘/dev/sda=false’] + - sourceDestCheck - Boolean (true) + - groupSet - Set of Security Groups or IDs + - ebsOptimized - Boolean (false) + - sriovNetSupport - String - ie: ‘simple’ + target_state (string) - The desired target state of the instance. Available options are: - - running - - stopped + + - running + - stopped + Note that this option is currently UNIMPLEMENTED. public_ip: (string) - The IP of a previously allocated EIP address, which will be @@ -1017,7 +1023,6 @@ def instance_absent(name, instance_name=None, instance_id=None, - filters: vpc-id: vpc-abcdef12 - ''' ### TODO - Implement 'force' option?? Would automagically turn off ### 'disableApiTermination', as needed, before trying to delete. diff --git a/salt/states/boto_elasticsearch_domain.py b/salt/states/boto_elasticsearch_domain.py index 1a368e6c0f..3dab795e4e 100644 --- a/salt/states/boto_elasticsearch_domain.py +++ b/salt/states/boto_elasticsearch_domain.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' Manage Elasticsearch Domains -================= +============================ .. versionadded:: 2016.11.0 @@ -31,9 +31,9 @@ config: .. code-block:: yaml myprofile: - keyid: GKTADJGHEIQSXMKKRBJ08H - key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs - region: us-east-1 + keyid: GKTADJGHEIQSXMKKRBJ08H + key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs + region: us-east-1 .. code-block:: yaml @@ -60,12 +60,12 @@ config: AWS: "*" - Action: - "es:*" - - Resource: "arn:aws:es:*:111111111111:domain/mydomain/* + - Resource: "arn:aws:es:*:111111111111:domain/mydomain/*" - Condition: IpAddress: "aws:SourceIp": - - "127.0.0.1", - - "127.0.0.2", + - "127.0.0.1" + - "127.0.0.2" - SnapshotOptions: AutomatedSnapshotStartHour: 0 - AdvancedOptions: diff --git a/salt/states/boto_iam.py b/salt/states/boto_iam.py index ae0ac99016..81c6762ea5 100644 --- a/salt/states/boto_iam.py +++ b/salt/states/boto_iam.py @@ -313,7 +313,6 @@ def user_absent(name, delete_keys=True, delete_mfa_devices=True, delete_profile= def keys_present(name, number, save_dir, region=None, key=None, keyid=None, profile=None, save_format="{2}\n{0}\n{3}\n{1}\n"): ''' - .. versionadded:: 2015.8.0 Ensure the IAM access keys are present. @@ -342,9 +341,10 @@ def keys_present(name, number, save_dir, region=None, key=None, keyid=None, prof that contains a dict with region, key and keyid. save_format (dict) - Save format is repeated for each key. Default format is "{2}\n{0}\n{3}\n{1}\n", - where {0} and {1} are placeholders for new key_id and key respectively, - whereas {2} and {3} are "key_id-{number}" and 'key-{number}' strings kept for compatibility. + Save format is repeated for each key. Default format is + "{2}\\n{0}\\n{3}\\n{1}\\n", where {0} and {1} are placeholders for new + key_id and key respectively, whereas {2} and {3} are "key_id-{number}" + and 'key-{number}' strings kept for compatibility. ''' ret = {'name': name, 'result': True, 'comment': '', 'changes': {}} if not __salt__['boto_iam.get_user'](name, region, key, keyid, profile): @@ -1610,7 +1610,6 @@ def policy_absent(name, def saml_provider_present(name, saml_metadata_document, region=None, key=None, keyid=None, profile=None): ''' - .. versionadded:: 2016.11.0 Ensure the SAML provider with the specified name is present. @@ -1668,7 +1667,6 @@ def saml_provider_present(name, saml_metadata_document, region=None, key=None, k def saml_provider_absent(name, region=None, key=None, keyid=None, profile=None): ''' - .. versionadded:: 2016.11.0 Ensure the SAML provider with the specified name is absent. diff --git a/salt/states/boto_lambda.py b/salt/states/boto_lambda.py index 22834f8479..218d316822 100644 --- a/salt/states/boto_lambda.py +++ b/salt/states/boto_lambda.py @@ -154,14 +154,14 @@ def function_present(name, FunctionName, Runtime, Role, Handler, ZipFile=None, .. code-block:: yaml VpcConfig: - SecurityGroupNames: + SecurityGroupNames: - mysecgroup1 - mysecgroup2 - SecurityGroupIds: + SecurityGroupIds: - sg-abcdef1234 - SubnetNames: + SubnetNames: - mysubnet1 - SubnetIds: + SubnetIds: - subnet-1234abcd - subnet-abcd1234 @@ -178,11 +178,14 @@ def function_present(name, FunctionName, Runtime, Role, Handler, ZipFile=None, Environment The parent object that contains your environment's configuration settings. This is a dictionary of the form: - { - 'Variables': { - 'VariableName': 'VariableValue' + + .. code-block:: python + + { + 'Variables': { + 'VariableName': 'VariableValue' + } } - } .. versionadded:: 2017.7.0 diff --git a/salt/states/boto_rds.py b/salt/states/boto_rds.py index 921a23bd6a..f66014642a 100644 --- a/salt/states/boto_rds.py +++ b/salt/states/boto_rds.py @@ -64,7 +64,6 @@ config: - binlog_cache_size: 32768 - binlog_checksum: CRC32 - region: eu-west-1 -.. note:: :depends: boto3 diff --git a/salt/states/boto_route53.py b/salt/states/boto_route53.py index fb04410a7f..11a04284c0 100644 --- a/salt/states/boto_route53.py +++ b/salt/states/boto_route53.py @@ -345,16 +345,19 @@ def hosted_zone_present(name, domain_name=None, private_zone=False, caller_ref=N vpc_id=None, vpc_name=None, vpc_region=None, region=None, key=None, keyid=None, profile=None): ''' - Ensure a hosted zone exists with the given attributes. Note that most things cannot be - modified once a zone is created - it must be deleted and re-spun to update these attributes. - If you need the ability to update these attributes, please use the newer boto3_route53 - module instead: - - private_zone (AWS API limitation). - - comment (the appropriate call exists in the AWS API and in boto3, but has not, as of - this writing, been added to boto2). - - vpc_id (boto3 only) - - vpc_name (really just a pointer to vpc_id anyway). - - vpc_region (again, supported in boto3 but not boto2). + Ensure a hosted zone exists with the given attributes. Note that most + things cannot be modified once a zone is created - it must be deleted and + re-spun to update these attributes: + + - private_zone (AWS API limitation). + - comment (the appropriate call exists in the AWS API and in boto3, but has + not, as of this writing, been added to boto2). + - vpc_id (same story - we really need to rewrite this module with boto3) + - vpc_name (really just a pointer to vpc_id anyway). + - vpc_region (again, supported in boto3 but not boto2). + + If you need the ability to update these attributes, please use the newer + boto3_route53 module instead. name The name of the state definition. diff --git a/salt/states/boto_s3_bucket.py b/salt/states/boto_s3_bucket.py index c09668fe16..d6e57b7212 100644 --- a/salt/states/boto_s3_bucket.py +++ b/salt/states/boto_s3_bucket.py @@ -37,9 +37,9 @@ config: myprofile: keyid: GKTADJGHEIQSXMKKRBJ08H key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs - region: us-east-1 + region: us-east-1 -.. code-block:: yaml +.. code-block:: text Ensure bucket exists: boto_s3_bucket.present: diff --git a/salt/states/boto_vpc.py b/salt/states/boto_vpc.py index 38f82495dc..f771e16b35 100644 --- a/salt/states/boto_vpc.py +++ b/salt/states/boto_vpc.py @@ -34,60 +34,60 @@ config: .. code-block:: yaml myprofile: - keyid: GKTADJGHEIQSXMKKRBJ08H - key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs - region: us-east-1 + keyid: GKTADJGHEIQSXMKKRBJ08H + key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs + region: us-east-1 .. code-block:: yaml aws: - region: - us-east-1: - profile: - keyid: GKTADJGHEIQSXMKKRBJ08H - key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs - region: us-east-1 + region: + us-east-1: + profile: + keyid: GKTADJGHEIQSXMKKRBJ08H + key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs + region: us-east-1 -.. code-block:: yaml +.. code-block:: jinja Ensure VPC exists: - boto_vpc.present: - - name: myvpc - - cidr_block: 10.10.11.0/24 - - dns_hostnames: True - - region: us-east-1 - - keyid: GKTADJGHEIQSXMKKRBJ08H - - key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs + boto_vpc.present: + - name: myvpc + - cidr_block: 10.10.11.0/24 + - dns_hostnames: True + - region: us-east-1 + - keyid: GKTADJGHEIQSXMKKRBJ08H + - key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs Ensure subnet exists: - boto_vpc.subnet_present: - - name: mysubnet - - vpc_id: vpc-123456 - - cidr_block: 10.0.0.0/16 - - region: us-east-1 - - profile: myprofile + boto_vpc.subnet_present: + - name: mysubnet + - vpc_id: vpc-123456 + - cidr_block: 10.0.0.0/16 + - region: us-east-1 + - profile: myprofile {% set profile = salt['pillar.get']('aws:region:us-east-1:profile' ) %} Ensure internet gateway exists: - boto_vpc.internet_gateway_present: - - name: myigw - - vpc_name: myvpc - - profile: {{ profile }} + boto_vpc.internet_gateway_present: + - name: myigw + - vpc_name: myvpc + - profile: {{ profile }} Ensure route table exists: - boto_vpc.route_table_present: - - name: my_route_table - - vpc_id: vpc-123456 - - routes: - - destination_cidr_block: 0.0.0.0/0 - instance_id: i-123456 - - subnet_names: - - subnet1 - - subnet2 - - region: us-east-1 - - profile: - keyid: GKTADJGHEIQSXMKKRBJ08H - key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs + boto_vpc.route_table_present: + - name: my_route_table + - vpc_id: vpc-123456 + - routes: + - destination_cidr_block: 0.0.0.0/0 + instance_id: i-123456 + - subnet_names: + - subnet1 + - subnet2 + - region: us-east-1 + - profile: + keyid: GKTADJGHEIQSXMKKRBJ08H + key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs .. versionadded:: 2016.11.0 @@ -896,17 +896,17 @@ def route_table_present(name, vpc_name=None, vpc_id=None, routes=None, .. code-block:: yaml boto_vpc.route_table_present: - - name: my_route_table - - vpc_id: vpc-123456 - - routes: - - destination_cidr_block: 0.0.0.0/0 - internet_gateway_name: InternetGateway - - destination_cidr_block: 10.10.11.0/24 - instance_id: i-123456 - - destination_cidr_block: 10.10.12.0/24 - interface_id: eni-123456 - - destination_cidr_block: 10.10.13.0/24 - instance_name: mygatewayserver + - name: my_route_table + - vpc_id: vpc-123456 + - routes: + - destination_cidr_block: 0.0.0.0/0 + internet_gateway_name: InternetGateway + - destination_cidr_block: 10.10.11.0/24 + instance_id: i-123456 + - destination_cidr_block: 10.10.12.0/24 + interface_id: eni-123456 + - destination_cidr_block: 10.10.13.0/24 + instance_name: mygatewayserver - subnet_names: - subnet1 - subnet2 @@ -1307,7 +1307,7 @@ def nat_gateway_present(name, subnet_name=None, subnet_id=None, .. code-block:: yaml boto_vpc.nat_gateway_present: - - subnet_name: my-subnet + - subnet_name: my-subnet name Name of the state @@ -1489,12 +1489,12 @@ def accept_vpc_peering_connection(name=None, conn_id=None, conn_name=None, .. code-block:: yaml boto_vpc.accept_vpc_peering_connection: - - conn_name: salt_peering_connection + - conn_name: salt_peering_connection # usage with vpc peering connection id and region boto_vpc.accept_vpc_peering_connection: - - conn_id: pbx-1873d472 - - region: us-west-2 + - conn_id: pbx-1873d472 + - region: us-west-2 ''' log.debug('Called state to accept VPC peering connection') diff --git a/salt/states/cimc.py b/salt/states/cimc.py index 110d001156..61afafaf59 100644 --- a/salt/states/cimc.py +++ b/salt/states/cimc.py @@ -2,7 +2,7 @@ ''' A state module to manage Cisco UCS chassis devices. -:codeauthor: :email:`Spencer Ervin ` +:codeauthor: ``Spencer Ervin `` :maturity: new :depends: none :platform: unix @@ -14,7 +14,7 @@ This state module was designed to handle connections to a Cisco Unified Computin relies on the CIMC proxy module to interface with the device. .. seealso:: - :prox:`CIMC Proxy Module ` + :py:mod:`CIMC Proxy Module ` ''' diff --git a/salt/states/cmd.py b/salt/states/cmd.py index 2a93458ffb..bc68fe5b0a 100644 --- a/salt/states/cmd.py +++ b/salt/states/cmd.py @@ -12,7 +12,7 @@ A simple example to execute a command: .. code-block:: yaml # Store the current date in a file - date > /tmp/salt-run: + 'date > /tmp/salt-run': cmd.run Only run if another execution failed, in this case truncate syslog if there is @@ -20,7 +20,7 @@ no disk space: .. code-block:: yaml - > /var/log/messages: + '> /var/log/messages/: cmd.run: - unless: echo 'foo' > /tmp/.test && rm -f /tmp/.test @@ -37,7 +37,7 @@ touch /tmp/foo if it does not exist: .. code-block:: yaml - echo 'foo' | tee /tmp/bar > /tmp/baz: + "echo 'foo' | tee /tmp/bar > /tmp/baz": cmd.run: - creates: - /tmp/bar @@ -55,7 +55,7 @@ In situations like this try the following: run_installer: cmd.run: - - name: /tmp/installer.bin > /dev/null 2>&1 + - name: /tmp/installer.bin > /dev/null 2>&1 Salt determines whether the ``cmd`` state is successfully enforced based on the exit code returned by the command. If the command returns a zero exit code, then salt @@ -472,7 +472,7 @@ def wait(name, One can still use the existing $PATH by using a bit of Jinja: - .. code-block:: yaml + .. code-block:: jinja {% set current_path = salt['environ.get']('PATH', '/bin:/usr/bin') %} @@ -616,7 +616,7 @@ def wait_script(name, One can still use the existing $PATH by using a bit of Jinja: - .. code-block:: yaml + .. code-block:: jinja {% set current_path = salt['environ.get']('PATH', '/bin:/usr/bin') %} @@ -743,7 +743,7 @@ def run(name, One can still use the existing $PATH by using a bit of Jinja: - .. code-block:: yaml + .. code-block:: jinja {% set current_path = salt['environ.get']('PATH', '/bin:/usr/bin') %} @@ -1022,7 +1022,7 @@ def script(name, One can still use the existing $PATH by using a bit of Jinja: - .. code-block:: yaml + .. code-block:: jinja {% set current_path = salt['environ.get']('PATH', '/bin:/usr/bin') %} diff --git a/salt/states/dellchassis.py b/salt/states/dellchassis.py index 30a91fd874..ff8bbf06b0 100644 --- a/salt/states/dellchassis.py +++ b/salt/states/dellchassis.py @@ -92,7 +92,7 @@ data in pillar. Here's an example pillar structure: And to go with it, here's an example state that pulls the data from the pillar stated above: -.. code-block:: yaml +.. code-block:: jinja {% set details = pillar.get('proxy:chassis', {}) %} standup-step1: @@ -179,15 +179,16 @@ def blade_idrac(name, idrac_password=None, idrac_ipmi=None, Set parameters for iDRAC in a blade. :param idrac_password: Password to use to connect to the iDRACs directly - (idrac_ipmi and idrac_dnsname must be set directly on the iDRAC. They - can't be set through the CMC. If this password is present, use it - instead of the CMC password) + (idrac_ipmi and idrac_dnsname must be set directly on the iDRAC. They + can't be set through the CMC. If this password is present, use it + instead of the CMC password) :param idrac_ipmi: Enable/Disable IPMI over LAN :param idrac_ip: Set IP address for iDRAC :param idrac_netmask: Set netmask for iDRAC :param idrac_gateway: Set gateway for iDRAC - :param idrac_dhcp: Turn on DHCP for iDRAC (True turns on, False does nothing - becaause setting a static IP will disable DHCP). + :param idrac_dhcp: Turn on DHCP for iDRAC (True turns on, False does + nothing becaause setting a static IP will disable DHCP). + :return: A standard Salt changes dictionary NOTE: If any of the IP address settings is configured, all of ip, netmask, diff --git a/salt/states/docker_container.py b/salt/states/docker_container.py index 39ebbcbb17..6151187312 100644 --- a/salt/states/docker_container.py +++ b/salt/states/docker_container.py @@ -1033,7 +1033,7 @@ def running(name, labels Add metadata to the container. Labels can be set both with and without values, and labels with values can be passed either as ``key=value`` or - ``key: value `` pairs. For example, while the below would be very + ``key: value`` pairs. For example, while the below would be very confusing to read, it is technically valid, and demonstrates the different ways in which labels can be passed: @@ -1372,7 +1372,7 @@ def running(name, foo: docker_container.running: - - image: bar/baz:lates + - image: bar/baz:latest - privileged: True publish_all_ports (or *publish_all*) : False @@ -1614,7 +1614,7 @@ def running(name, - image: bar/baz:latest - userns_mode: host - volumes (or *volume) + volumes (or *volume*) List of directories to expose as volumes. Can be expressed as a comma-separated list or a YAML list. The below two examples are equivalent: @@ -2179,11 +2179,12 @@ def run(name, CLI Examples: .. code-block:: bash + salt myminion docker.run_container myuser/myimage command=/usr/local/bin/myscript.sh **USAGE EXAMPLE** - .. code-block:: yaml + .. code-block:: jinja {% set pkg_version = salt.pillar.get('pkg_version', '1.0-1') %} build_package: diff --git a/salt/states/docker_network.py b/salt/states/docker_network.py index 6742c00b73..21cf563c5f 100644 --- a/salt/states/docker_network.py +++ b/salt/states/docker_network.py @@ -299,7 +299,7 @@ def present(name, labels Add metadata to the network. Labels can be set both with and without values, and labels with values can be passed either as ``key=value`` or - ``key: value `` pairs. For example, while the below would be very + ``key: value`` pairs. For example, while the below would be very confusing to read, it is technically valid, and demonstrates the different ways in which labels can be passed: @@ -346,7 +346,7 @@ def present(name, get an error unless you have set up a fixed IPv6 subnet. Consult the `Docker IPv6 docs`_ for information on how to do this. - .. _`Doocker IPv6 docs`: https://docs.docker.com/engine/userguide/networking/default_network/ipv6/ + .. _`Docker IPv6 docs`: https://docs.docker.com/v17.09/engine/userguide/networking/default_network/ipv6/ attachable : False If ``True``, and the network is in the global scope, non-service diff --git a/salt/states/elasticsearch_index_template.py b/salt/states/elasticsearch_index_template.py index 8b1c199c42..10b42c4062 100644 --- a/salt/states/elasticsearch_index_template.py +++ b/salt/states/elasticsearch_index_template.py @@ -53,7 +53,7 @@ def present(name, definition): ''' .. versionadded:: 2015.8.0 .. versionchanged:: 2017.3.0 - Marked ``definition`` as required. + Marked ``definition`` as required. Ensure that the named index templat eis present. diff --git a/salt/states/esxi.py b/salt/states/esxi.py index f44533c1be..486d9df53e 100644 --- a/salt/states/esxi.py +++ b/salt/states/esxi.py @@ -1031,29 +1031,31 @@ def diskgroups_configured(name, diskgroups, erase_disks=False): ''' Configures the disk groups to use for vsan. - It will do the following: - (1) checks for if all disks in the diskgroup spec exist and errors if they - don't - (2) creates diskgroups with the correct disk configurations if diskgroup - (identified by the cache disk canonical name) doesn't exist - (3) adds extra capacity disks to the existing diskgroup + This function will do the following: - State input example - ------------------- + 1. Check whether or not all disks in the diskgroup spec exist, and raises + and errors if they do not. + + 2. Create diskgroups with the correct disk configurations if diskgroup + (identified by the cache disk canonical name) doesn't exist + + 3. Adds extra capacity disks to the existing diskgroup + + Example: .. code:: python - { - 'cache_scsi_addr': 'vmhba1:C0:T0:L0', - 'capacity_scsi_addrs': [ - 'vmhba2:C0:T0:L0', - 'vmhba3:C0:T0:L0', - 'vmhba4:C0:T0:L0', - ] - } + { + 'cache_scsi_addr': 'vmhba1:C0:T0:L0', + 'capacity_scsi_addrs': [ + 'vmhba2:C0:T0:L0', + 'vmhba3:C0:T0:L0', + 'vmhba4:C0:T0:L0', + ] + } name - Mandatory state name. + Mandatory state name diskgroups Disk group representation containing scsi disk addresses. @@ -1310,47 +1312,49 @@ def host_cache_configured(name, enabled, datastore, swap_size='100%', Configures the host cache used for swapping. It will do the following: - (1) checks if backing disk exists - (2) creates the VMFS datastore if doesn't exist (datastore partition will - be created and use the entire disk - (3) raises an error if dedicated_backing_disk is True and partitions - already exist on the backing disk - (4) configures host_cache to use a portion of the datastore for caching - (either a specific size or a percentage of the datastore) - State input examples - -------------------- + 1. Checks if backing disk exists + + 2. Creates the VMFS datastore if doesn't exist (datastore partition will be + created and use the entire disk) + + 3. Raises an error if ``dedicated_backing_disk`` is ``True`` and partitions + already exist on the backing disk + + 4. Configures host_cache to use a portion of the datastore for caching + (either a specific size or a percentage of the datastore) + + Examples Percentage swap size (can't be 100%) .. code:: python - { - 'enabled': true, - 'datastore': { - 'backing_disk_scsi_addr': 'vmhba0:C0:T0:L0', - 'vmfs_version': 5, - 'name': 'hostcache' - } - 'dedicated_backing_disk': false - 'swap_size': '98%', - } - - - .. code:: python + { + 'enabled': true, + 'datastore': { + 'backing_disk_scsi_addr': 'vmhba0:C0:T0:L0', + 'vmfs_version': 5, + 'name': 'hostcache' + } + 'dedicated_backing_disk': false + 'swap_size': '98%', + } Fixed sized swap size - { - 'enabled': true, - 'datastore': { - 'backing_disk_scsi_addr': 'vmhba0:C0:T0:L0', - 'vmfs_version': 5, - 'name': 'hostcache' - } - 'dedicated_backing_disk': true - 'swap_size': '10GiB', - } + .. code:: python + + { + 'enabled': true, + 'datastore': { + 'backing_disk_scsi_addr': 'vmhba0:C0:T0:L0', + 'vmfs_version': 5, + 'name': 'hostcache' + } + 'dedicated_backing_disk': true + 'swap_size': '10GiB', + } name Mandatory state name. diff --git a/salt/states/ethtool.py b/salt/states/ethtool.py index 28e83cd128..ffeec1157e 100644 --- a/salt/states/ethtool.py +++ b/salt/states/ethtool.py @@ -107,8 +107,6 @@ def coalesce(name, **kwargs): # Retreive changes to made for key, value in kwargs.items(): - if key in ['adaptive_rx', 'adaptive_tx']: - value = value and "on" or "off" if key in old and value != old[key]: new.update({key: value}) diff.append('{0}: {1}'.format(key, value)) diff --git a/salt/states/event.py b/salt/states/event.py index e5d756eab1..167e86571f 100644 --- a/salt/states/event.py +++ b/salt/states/event.py @@ -27,8 +27,8 @@ def send(name, ` execution module of the same name, with the additional argument: - :param show_changed: state will show as changed with the data - argument as the change value. If false, shows as unchanged. + :param show_changed: If ``True``, state will show as changed with the data + argument as the change value. If ``False``, shows as unchanged. Example: @@ -74,7 +74,7 @@ def wait(name, sfun=None): Example: - .. code-block:: yaml + .. code-block:: jinja # Stand up a new web server. apache: diff --git a/salt/states/file.py b/salt/states/file.py index d38aaae6dd..5e9e2a832e 100644 --- a/salt/states/file.py +++ b/salt/states/file.py @@ -13,7 +13,7 @@ jinja, mako, or wempy template, adding a dynamic component to file management. An example of :mod:`file.managed ` which makes use of the jinja templating system would look like this: -.. code-block:: yaml +.. code-block:: jinja /etc/http/conf/http.conf: file.managed: @@ -65,7 +65,7 @@ first file to be matched will be the one that is used. This allows you to have a default file on which to fall back if the desired file does not exist on the salt fileserver. Here's an example: -.. code-block:: yaml +.. code-block:: jinja /etc/foo.conf: file.managed: @@ -92,7 +92,7 @@ In this example ``foo.conf`` in the ``dev`` environment will be used instead. /etc/foo.conf: file.managed: - source: - - salt://foo.conf?saltenv=dev + - 'salt://foo.conf?saltenv=dev' - user: foo - group: users - mode: '0644' @@ -110,9 +110,8 @@ declarations. Each item in the ``names`` list receives its own individual state ``name`` and is converted into its own low-data structure. This is a convenient way to manage several files with similar attributes. -There is more documentation about this feature in the -:ref:`Names declaration` section of the - :ref:`Highstate docs`. +There is more documentation about this feature in the :ref:`Names declaration +` section of the :ref:`Highstate docs `. Special files can be managed via the ``mknod`` function. This function will create and enforce the permissions on a special file. The function supports the @@ -229,7 +228,7 @@ would look something like this: A more complex ``recurse`` example: -.. code-block:: yaml +.. code-block:: jinja {% set site_user = 'testuser' %} {% set site_name = 'test_site' %} @@ -679,13 +678,13 @@ def _error(ret, err_msg): def _check_directory(name, - user, - group, - recurse, - mode, - clean, - require, - exclude_pat, + user=None, + group=None, + recurse=False, + mode=None, + clean=False, + require=False, + exclude_pat=None, max_depth=None, follow_symlinks=False): ''' @@ -770,7 +769,7 @@ def _check_directory(name, def _check_directory_win(name, - win_owner, + win_owner=None, win_perms=None, win_deny_perms=None, win_inheritance=None, @@ -784,9 +783,10 @@ def _check_directory_win(name, changes = {name: {'directory': 'new'}} else: # Check owner - owner = salt.utils.win_dacl.get_owner(name) - if not owner.lower() == win_owner.lower(): - changes['owner'] = win_owner + if win_owner is not None: + owner = salt.utils.win_dacl.get_owner(name) + if not owner.lower() == win_owner.lower(): + changes['owner'] = win_owner # Check perms perms = salt.utils.win_dacl.get_permissions(name) @@ -962,33 +962,46 @@ def _check_touch(name, atime, mtime): def _get_symlink_ownership(path): - return ( - __salt__['file.get_user'](path, follow_symlinks=False), - __salt__['file.get_group'](path, follow_symlinks=False) - ) + if salt.utils.platform.is_windows(): + owner = salt.utils.win_dacl.get_owner(path) + return owner, owner + else: + return ( + __salt__['file.get_user'](path, follow_symlinks=False), + __salt__['file.get_group'](path, follow_symlinks=False) + ) -def _check_symlink_ownership(path, user, group): +def _check_symlink_ownership(path, user, group, win_owner): ''' Check if the symlink ownership matches the specified user and group ''' cur_user, cur_group = _get_symlink_ownership(path) - return (cur_user == user) and (cur_group == group) + if salt.utils.platform.is_windows(): + return win_owner == cur_user + else: + return (cur_user == user) and (cur_group == group) -def _set_symlink_ownership(path, user, group): +def _set_symlink_ownership(path, user, group, win_owner): ''' Set the ownership of a symlink and return a boolean indicating success/failure ''' - try: - __salt__['file.lchown'](path, user, group) - except OSError: - pass - return _check_symlink_ownership(path, user, group) + if salt.utils.platform.is_windows(): + try: + salt.utils.win_dacl.set_owner(path, win_owner) + except CommandExecutionError: + pass + else: + try: + __salt__['file.lchown'](path, user, group) + except OSError: + pass + return _check_symlink_ownership(path, user, group, win_owner) -def _symlink_check(name, target, force, user, group): +def _symlink_check(name, target, force, user, group, win_owner): ''' Check the symlink function ''' @@ -1007,7 +1020,7 @@ def _symlink_check(name, target, force, user, group): else: result = True msg = 'The symlink {0} is present'.format(name) - if not _check_symlink_ownership(name, user, group): + if not _check_symlink_ownership(name, user, group, win_owner): result = None pchanges['ownership'] = '{0}:{1}'.format(*_get_symlink_ownership(name)) msg += ( @@ -1231,6 +1244,57 @@ def _shortcut_check(name, 'should be. Did you mean to use force?'.format(name)), pchanges +def _makedirs(name, + user=None, + group=None, + dir_mode=None, + win_owner=None, + win_perms=None, + win_deny_perms=None, + win_inheritance=None): + ''' + Helper function for creating directories when the ``makedirs`` option is set + to ``True``. Handles Unix and Windows based systems + + .. versionadded:: 2017.7.8 + + Args: + name (str): The directory path to create + user (str): The linux user to own the directory + group (str): The linux group to own the directory + dir_mode (str): The linux mode to apply to the directory + win_owner (str): The Windows user to own the directory + win_perms (dict): A dictionary of grant permissions for Windows + win_deny_perms (dict): A dictionary of deny permissions for Windows + win_inheritance (bool): True to inherit permissions on Windows + + Returns: + bool: True if successful, otherwise False on Windows + str: Error messages on failure on Linux + None: On successful creation on Linux + + Raises: + CommandExecutionError: If the drive is not mounted on Windows + ''' + if salt.utils.platform.is_windows(): + # Make sure the drive is mapped before trying to create the + # path in windows + drive, path = os.path.splitdrive(name) + if not os.path.isdir(drive): + raise CommandExecutionError(drive) + win_owner = win_owner if win_owner else user + return __salt__['file.makedirs'](path=name, + owner=win_owner, + grant_perms=win_perms, + deny_perms=win_deny_perms, + inheritance=win_inheritance) + else: + return __salt__['file.makedirs'](path=name, + user=user, + group=group, + mode=dir_mode) + + def symlink( name, target, @@ -1240,6 +1304,10 @@ def symlink( user=None, group=None, mode=None, + win_owner=None, + win_perms=None, + win_deny_perms=None, + win_inheritance=None, **kwargs): ''' Create a symbolic link (symlink, soft link) @@ -1291,6 +1359,28 @@ def symlink( The default mode for new files and directories corresponds umask of salt process. For existing files and directories it's not enforced. + + win_owner : None + The owner of the symlink and directories if ``makedirs`` is True. If + this is not passed, ``user`` will be used. If ``user`` is not passed, + the account under which Salt is running will be used. + + .. versionadded:: 2017.7.7 + + win_perms : None + A dictionary containing permissions to grant + + .. versionadded:: 2017.7.7 + + win_deny_perms : None + A dictionary containing permissions to deny + + .. versionadded:: 2017.7.7 + + win_inheritance : None + True to inherit permissions from parent, otherwise False + + .. versionadded:: 2017.7.7 ''' name = os.path.expanduser(name) @@ -1319,10 +1409,16 @@ def symlink( if not user: user = 'SYSTEM' + # If win_owner is not passed, use user + if win_owner is None: + win_owner = user if user else None + + # Group isn't relevant to Windows, use win_perms/win_deny_perms if group is not None: log.warning( 'The group argument for {0} has been ignored as this ' - 'is a Windows system.'.format(name) + 'is a Windows system. Please use the `win_*` parameters to set ' + 'permissions in Windows.'.format(name) ) group = user @@ -1332,14 +1428,31 @@ def symlink( ) preflight_errors = [] - uid = __salt__['file.user_to_uid'](user) - gid = __salt__['file.group_to_gid'](group) + if salt.utils.platform.is_windows(): + # Make sure the passed owner exists + if not salt.utils.win_functions.get_sid_from_name(win_owner): + preflight_errors.append('User {0} does not exist'.format(win_owner)) - if uid == '': - preflight_errors.append('User {0} does not exist'.format(user)) + # Make sure users passed in win_perms exist + if win_perms: + for name_check in win_perms: + if not salt.utils.win_functions.get_sid_from_name(name_check): + preflight_errors.append('User {0} does not exist'.format(name_check)) - if gid == '': - preflight_errors.append('Group {0} does not exist'.format(group)) + # Make sure users passed in win_deny_perms exist + if win_deny_perms: + for name_check in win_deny_perms: + if not salt.utils.win_functions.get_sid_from_name(name_check): + preflight_errors.append('User {0} does not exist'.format(name_check)) + else: + uid = __salt__['file.user_to_uid'](user) + gid = __salt__['file.group_to_gid'](group) + + if uid == '': + preflight_errors.append('User {0} does not exist'.format(user)) + + if gid == '': + preflight_errors.append('Group {0} does not exist'.format(group)) if not os.path.isabs(name): preflight_errors.append( @@ -1356,47 +1469,77 @@ def symlink( target, force, user, - group) + group, + win_owner) + + if not os.path.isdir(os.path.dirname(name)): + if makedirs: + if __opts__['test']: + pcomment += '\n{0} will be created'.format(os.path.dirname(name)) + else: + try: + _makedirs(name=name, + user=user, + group=group, + dir_mode=mode, + win_owner=win_owner, + win_perms=win_perms, + win_deny_perms=win_deny_perms, + win_inheritance=win_inheritance) + except CommandExecutionError as exc: + return _error(ret, 'Drive {0} is not mapped'.format(exc.message)) + else: + if __opts__['test']: + pcomment += '\nDirectory {0} for symlink is not present' \ + ''.format(os.path.dirname(name)) + else: + return _error( + ret, + 'Directory {0} for symlink is not present'.format( + os.path.dirname(name) + ) + ) + if __opts__['test']: ret['result'] = presult ret['comment'] = pcomment return ret - if not os.path.isdir(os.path.dirname(name)): - if makedirs: - __salt__['file.makedirs']( - name, - user=user, - group=group, - mode=mode) - else: - return _error( - ret, - 'Directory {0} for symlink is not present'.format( - os.path.dirname(name) - ) - ) if __salt__['file.is_link'](name): # The link exists, verify that it matches the target if os.path.normpath(__salt__['file.readlink'](name)) != os.path.normpath(target): # The target is wrong, delete the link os.remove(name) else: - if _check_symlink_ownership(name, user, group): + if _check_symlink_ownership(name, user, group, win_owner): # The link looks good! - ret['comment'] = ('Symlink {0} is present and owned by ' - '{1}:{2}'.format(name, user, group)) - else: - if _set_symlink_ownership(name, user, group): - ret['comment'] = ('Set ownership of symlink {0} to ' + if salt.utils.platform.is_windows(): + ret['comment'] = ('Symlink {0} is present and owned by {1}' + ''.format(name, win_owner)) + else: + ret['comment'] = ('Symlink {0} is present and owned by ' '{1}:{2}'.format(name, user, group)) - ret['changes']['ownership'] = '{0}:{1}'.format(user, group) + else: + if _set_symlink_ownership(name, user, group, win_owner): + if salt.utils.platform.is_windows(): + ret['comment'] = ('Set ownership of symlink {0} to ' + '{1}'.format(name, win_owner)) + ret['changes']['ownership'] = win_owner + else: + ret['comment'] = ('Set ownership of symlink {0} to ' + '{1}:{2}'.format(name, user, group)) + ret['changes']['ownership'] = '{0}:{1}'.format(user, + group) else: ret['result'] = False - ret['comment'] += ( - 'Failed to set ownership of symlink {0} to ' - '{1}:{2}'.format(name, user, group) - ) + if salt.utils.platform.is_windows(): + ret['comment'] += ( + 'Failed to set ownership of symlink ' + '{0} to {1}'.format(name, win_owner)) + else: + ret['comment'] += ( + 'Failed to set ownership of symlink {0} to ' + '{1}:{2}'.format(name, user, group)) return ret elif os.path.isfile(name) or os.path.isdir(name): @@ -1460,8 +1603,8 @@ def symlink( '{1}'.format(name, target)) ret['changes']['new'] = name - if not _check_symlink_ownership(name, user, group): - if not _set_symlink_ownership(name, user, group): + if not _check_symlink_ownership(name, user, group, win_owner): + if not _set_symlink_ownership(name, user, group, win_owner): ret['result'] = False ret['comment'] += (', but was unable to set ownership to ' '{0}:{1}'.format(user, group)) @@ -1960,7 +2103,6 @@ def managed(name, -----END RSA PRIVATE KEY----- .. note:: - The private key above is shortened to keep the example brief, but shows how to do multiline string in YAML. The key is followed by a pipe character, and the mutliline string is indented two more @@ -2100,7 +2242,7 @@ def managed(name, - mode: 0440 - tmp_ext: '.conf' - contents: - - 'description "Salt Minion"'' + - 'description "Salt Minion"' - 'start on started mountall' - 'stop on shutdown' - 'respawn' @@ -2866,7 +3008,7 @@ def directory(name, create_config_dir: file.directory: - - name: C:\config\ + - name: 'C:\config\' - win_owner: Administrators - win_perms: # Basic Permissions @@ -3021,23 +3163,17 @@ def directory(name, # The parent directory does not exist, create them if makedirs: # Everything's good, create the parent Dirs - if salt.utils.platform.is_windows(): - # Make sure the drive is mapped before trying to create the - # path in windows - drive, path = os.path.splitdrive(name) - if not os.path.isdir(drive): - return _error( - ret, 'Drive {0} is not mapped'.format(drive)) - __salt__['file.makedirs']( - path=name, - owner=win_owner, - grant_perms=win_perms, - deny_perms=win_deny_perms, - inheritance=win_inheritance, - reset=win_perms_reset) - else: - __salt__['file.makedirs'](name, user=user, group=group, - mode=dir_mode) + try: + _makedirs(name=name, + user=user, + group=group, + dir_mode=dir_mode, + win_owner=win_owner, + win_perms=win_perms, + win_deny_perms=win_deny_perms, + win_inheritance=win_inheritance) + except CommandExecutionError as exc: + return _error(ret, 'Drive {0} is not mapped'.format(exc.message)) else: return _error( ret, 'No directory to create {0} in'.format(name)) @@ -3232,6 +3368,10 @@ def recurse(name, maxdepth=None, keep_symlinks=False, force_symlinks=False, + win_owner=None, + win_perms=None, + win_deny_perms=None, + win_inheritance=True, **kwargs): ''' Recurse through a subdirectory on the master and copy said subdirectory @@ -3345,7 +3485,7 @@ def recurse(name, is glob match; if prefixed with 'E@', then regexp match. Example: - .. code-block:: yaml + .. code-block:: text - include_pat: hello* :: glob matches 'hello01', 'hello02' ... but not 'otherhello' @@ -3362,7 +3502,7 @@ def recurse(name, list and preserve in the destination. Example: - .. code-block:: yaml + .. code-block:: text - exclude_pat: APPDATA* :: glob matches APPDATA.01, APPDATA.02,.. for exclusion @@ -3374,7 +3514,7 @@ def recurse(name, source path. Example: - .. code-block:: yaml + .. code-block:: text - maxdepth: 0 :: Only include files located in the source directory @@ -3391,6 +3531,28 @@ def recurse(name, If a file or directory is obstructing symlink creation it will be recursively removed so that symlink creation can proceed. This option is usually not needed except in special circumstances. + + win_owner : None + The owner of the symlink and directories if ``makedirs`` is True. If + this is not passed, ``user`` will be used. If ``user`` is not passed, + the account under which Salt is running will be used. + + .. versionadded:: 2017.7.7 + + win_perms : None + A dictionary containing permissions to grant + + .. versionadded:: 2017.7.7 + + win_deny_perms : None + A dictionary containing permissions to deny + + .. versionadded:: 2017.7.7 + + win_inheritance : None + True to inherit permissions from parent, otherwise False + + .. versionadded:: 2017.7.7 ''' if 'env' in kwargs: # "env" is not supported; Use "saltenv". @@ -3489,7 +3651,18 @@ def recurse(name, return _error( ret, 'The path {0} exists and is not a directory'.format(name)) if not __opts__['test']: - __salt__['file.makedirs_perms'](name, user, group, dir_mode) + if salt.utils.platform.is_windows(): + win_owner = win_owner if win_owner else user + __salt__['file.makedirs_perms'](path=name, + owner=win_owner, + grant_perms=win_perms, + deny_perms=win_deny_perms, + inheritance=win_inheritance) + else: + __salt__['file.makedirs_perms'](name=name, + user=user, + group=group, + mode=dir_mode) def add_comment(path, comment): comments = ret['comment'].setdefault(path, []) @@ -4040,10 +4213,10 @@ def replace(name, replaced, otherwise all occurrences will be replaced. flags - A list of flags defined in the :ref:`re module documentation - `. Each list item should be a string that will + A list of flags defined in the ``re`` module documentation from the + Python standard library. Each list item should be a string that will correlate to the human-friendly flag name. E.g., ``['IGNORECASE', - 'MULTILINE']``. Optionally, ``flags`` may be an int, with a value + 'MULTILINE']``. Optionally, ``flags`` may be an int, with a value corresponding to the XOR (``|``) of all the desired flags. Defaults to ``8`` (which equates to ``['MULTILINE']``). @@ -4125,7 +4298,7 @@ def replace(name, file.replace: # <...snip...> - pattern: | - CentOS \(2.6.32[^\n]+\n\s+root[^\n]+\n\)+ + CentOS \(2.6.32[^\\n]+\\n\s+root[^\\n]+\\n\)+ .. note:: @@ -4346,7 +4519,7 @@ def blockreplace( Example of usage with an accumulator and with a variable: - .. code-block:: yaml + .. code-block:: jinja {% set myvar = 42 %} hosts-config-block-{{ myvar }}: @@ -4832,12 +5005,12 @@ def append(name, /etc/motd: file: - - append - - template: jinja - - sources: - - salt://motd/devops-messages.tmpl - - salt://motd/hr-messages.tmpl - - salt://motd/general-messages.tmpl + - append + - template: jinja + - sources: + - salt://motd/devops-messages.tmpl + - salt://motd/hr-messages.tmpl + - salt://motd/general-messages.tmpl .. versionadded:: 0.9.5 ''' @@ -4871,10 +5044,16 @@ def append(name, if makedirs is True: dirname = os.path.dirname(name) if not __salt__['file.directory_exists'](dirname): - __salt__['file.makedirs'](name) - check_res, check_msg, ret['pchanges'] = _check_directory( - dirname, None, None, False, None, False, False, None - ) + try: + _makedirs(name=name) + except CommandExecutionError as exc: + return _error(ret, 'Drive {0} is not mapped'.format(exc.message)) + + if salt.utils.platform.is_windows(): + check_res, check_msg, ret['pchanges'] = _check_directory_win(dirname) + else: + check_res, check_msg, ret['pchanges'] = _check_directory(dirname) + if not check_res: return _error(ret, check_msg) @@ -4985,6 +5164,90 @@ def prepend(name, The text will not be prepended again if it already exists in the file. You may specify a single line of text or a list of lines to append. + name + The location of the file to append to. + + text + The text to be appended, which can be a single string or a list + of strings. + + makedirs + If the file is located in a path without a parent directory, + then the state will fail. If makedirs is set to True, then + the parent directories will be created to facilitate the + creation of the named file. Defaults to False. + + source + A single source file to append. This source file can be hosted on either + the salt master server, or on an HTTP or FTP server. Both HTTPS and + HTTP are supported as well as downloading directly from Amazon S3 + compatible URLs with both pre-configured and automatic IAM credentials + (see s3.get state documentation). File retrieval from Openstack Swift + object storage is supported via swift://container/object_path URLs + (see swift.get documentation). + + For files hosted on the salt file server, if the file is located on + the master in the directory named spam, and is called eggs, the source + string is salt://spam/eggs. + + If the file is hosted on an HTTP or FTP server, the source_hash argument + is also required. + + source_hash + This can be one of the following: + 1. a source hash string + 2. the URI of a file that contains source hash strings + + The function accepts the first encountered long unbroken alphanumeric + string of correct length as a valid hash, in order from most secure to + least secure: + + .. code-block:: text + + Type Length + ====== ====== + sha512 128 + sha384 96 + sha256 64 + sha224 56 + sha1 40 + md5 32 + + See the ``source_hash`` parameter description for :mod:`file.managed + ` function for more details and examples. + + template + The named templating engine will be used to render the appended-to file. + Defaults to ``jinja``. The following templates are supported: + + - :mod:`cheetah` + - :mod:`genshi` + - :mod:`jinja` + - :mod:`mako` + - :mod:`py` + - :mod:`wempy` + + sources + A list of source files to append. If the files are hosted on an HTTP or + FTP server, the source_hashes argument is also required. + + source_hashes + A list of source_hashes corresponding to the sources list specified in + the sources argument. + + defaults + Default context passed to the template. + + context + Overrides default context variables passed to the template. + + ignore_whitespace + .. versionadded:: 2015.8.4 + + Spaces and Tabs in text are ignored by default, when searching for the + appending content, one space or multiple tabs are the same for salt. + Set this option to ``False`` if you want to change this behavior. + Multi-line example: .. code-block:: yaml @@ -5025,12 +5288,12 @@ def prepend(name, /etc/motd: file: - - prepend - - template: jinja - - sources: - - salt://motd/devops-messages.tmpl - - salt://motd/hr-messages.tmpl - - salt://motd/general-messages.tmpl + - prepend + - template: jinja + - sources: + - salt://motd/devops-messages.tmpl + - salt://motd/hr-messages.tmpl + - salt://motd/general-messages.tmpl .. versionadded:: 2014.7.0 ''' @@ -5063,10 +5326,15 @@ def prepend(name, if makedirs is True: dirname = os.path.dirname(name) if not __salt__['file.directory_exists'](dirname): - __salt__['file.makedirs'](name) - check_res, check_msg, ret['pchanges'] = _check_directory( - dirname, None, None, False, None, False, False, None - ) + try: + _makedirs(name=name) + except CommandExecutionError as exc: + return _error(ret, 'Drive {0} is not mapped'.format(exc.message)) + + if salt.utils.platform.is_windows(): + check_res, check_msg, ret['pchanges'] = _check_directory_win(dirname) + else: + check_res, check_msg, ret['pchanges'] = _check_directory(dirname) if not check_res: return _error(ret, check_msg) @@ -5658,7 +5926,10 @@ def touch(name, atime=None, mtime=None, makedirs=False): return ret if makedirs: - __salt__['file.makedirs'](name) + try: + _makedirs(name=name) + except CommandExecutionError as exc: + return _error(ret, 'Drive {0} is not mapped'.format(exc.message)) if not os.path.isdir(os.path.dirname(name)): return _error( ret, 'Directory not present to touch file {0}'.format(name) @@ -5854,7 +6125,10 @@ def copy_(name, dname = os.path.dirname(name) if not os.path.isdir(dname): if makedirs: - __salt__['file.makedirs'](name) + try: + _makedirs(name=name) + except CommandExecutionError as exc: + return _error(ret, 'Drive {0} is not mapped'.format(exc.message)) else: return _error( ret, @@ -5951,7 +6225,10 @@ def rename(name, source, force=False, makedirs=False): dname = os.path.dirname(name) if not os.path.isdir(dname): if makedirs: - __salt__['file.makedirs'](name) + try: + _makedirs(name=name) + except CommandExecutionError as exc: + return _error(ret, 'Drive {0} is not mapped'.format(exc.message)) else: return _error( ret, @@ -6210,8 +6487,8 @@ def serialize(name, description: A package using naive versioning author: A confused individual dependencies: - express: >= 1.2.0 - optimist: >= 0.1.0 + express: '>= 1.2.0' + optimist: '>= 0.1.0' engine: node 0.4.1 - formatter: json @@ -6298,6 +6575,9 @@ def serialize(name, } if serializer_opts: + if not options.get(serializer_name, {}): + options[serializer_name] = {} + options.get(serializer_name, {}).update( salt.utils.data.repack_dictlist(serializer_opts) ) @@ -6312,7 +6592,12 @@ def serialize(name, 'result': False} with salt.utils.files.fopen(name, 'r') as fhr: - existing_data = __serializers__[deserializer_name](fhr, **options.get(serializer_name, {})) + try: + existing_data = __serializers__[deserializer_name](fhr, **options.get(serializer_name, {})) + except (TypeError, salt.serializers.DeserializationError): + log.debug('DeserializationError exception caught, trying to merge without serializer_opts: %s', options.get(serializer_name, {})) + fhr.seek(0) + existing_data = __serializers__[deserializer_name](fhr) if existing_data is not None: merged_data = salt.utils.dictupdate.merge_recurse(existing_data, dataset) @@ -6670,7 +6955,7 @@ def decode(name, Be careful with multi-line strings that the YAML indentation is correct. E.g., - .. code-block:: yaml + .. code-block:: jinja write_base64_encoded_string_to_a_file: file.decode: @@ -6864,9 +7149,10 @@ def shortcut( if not os.path.isdir(os.path.dirname(name)): if makedirs: - __salt__['file.makedirs']( - name, - user=user) + try: + _makedirs(name=name, user=user) + except CommandExecutionError as exc: + return _error(ret, 'Drive {0} is not mapped'.format(exc.message)) else: return _error( ret, @@ -6889,7 +7175,10 @@ def shortcut( time.sleep(1) # wait for asynchronous deletion if not os.path.isdir(os.path.dirname(backupname)): if makedirs: - os.makedirs(backupname) + try: + _makedirs(name=backupname) + except CommandExecutionError as exc: + return _error(ret, 'Drive {0} is not mapped'.format(exc.message)) else: return _error(ret, ( 'Directory does not exist for' diff --git a/salt/states/firewall.py b/salt/states/firewall.py index a35762f64e..bc1e5b5c71 100644 --- a/salt/states/firewall.py +++ b/salt/states/firewall.py @@ -28,7 +28,7 @@ def check(name, port=None, **kwargs): port The port to test the connection on - **kwargs + kwargs Additional parameters, parameters allowed are: proto (tcp or udp) family (ipv4 or ipv6) diff --git a/salt/states/git.py b/salt/states/git.py index a32d7914f1..b15c7e5bfb 100644 --- a/salt/states/git.py +++ b/salt/states/git.py @@ -179,6 +179,18 @@ def _fail(ret, msg, comments=None): return ret +def _already_cloned(ret, target, branch=None, comments=None): + ret['result'] = True + ret['comment'] = 'Repository already exists at {0}{1}'.format( + target, + ' and is checked out to branch \'{0}\''.format(branch) if branch else '' + ) + if comments: + ret['comment'] += '\n\nChanges already made: ' + ret['comment'] += _format_comments(comments) + return ret + + def _failed_fetch(ret, exc, comments=None): msg = ( 'Fetch failed. Set \'force_fetch\' to True to force the fetch if the ' @@ -2015,7 +2027,7 @@ def present(name, template If a new repository is initialized, this argument will specify an - alternate `template directory`_ + alternate template directory. .. versionadded:: 2015.8.0 @@ -2172,7 +2184,7 @@ def detached(name, .. versionadded:: 2016.3.0 Make sure a repository is cloned to the given target directory and is - a detached HEAD checkout of the commit ID resolved from ``ref``. + a detached HEAD checkout of the commit ID resolved from ``rev``. name Address of the remote repository. @@ -2675,6 +2687,202 @@ def detached(name, return ret +def cloned(name, + target=None, + branch=None, + user=None, + password=None, + identity=None, + https_user=None, + https_pass=None, + output_encoding=None): + ''' + .. versionadded:: 2018.3.2,Fluorine + + Ensure that a repository has been cloned to the specified target directory. + If not, clone that repository. No fetches will be performed once cloned. + + name + Address of the remote repository + + target + Name of the target directory where repository should be cloned + + branch + Remote branch to check out. If unspecified, the default branch (i.e. + the one to the remote HEAD points) will be checked out. + + .. note:: + The local branch name will match the remote branch name. If the + branch name is changed, then that branch will be checked out + locally, but keep in mind that remote repository will not be + fetched. If your use case requires that you keep the clone up to + date with the remote repository, then consider using + :py:func:`git.latest `. + + user + User under which to run git commands. By default, commands are run by + the user under which the minion is running. + + password + Windows only. Required when specifying ``user``. This parameter will be + ignored on non-Windows platforms. + + identity + Path to a private key to use for ssh URLs. Works the same way as in + :py:func:`git.latest `, see that state's + documentation for more information. + + https_user + HTTP Basic Auth username for HTTPS (only) clones + + https_pass + HTTP Basic Auth password for HTTPS (only) clones + + output_encoding + Use this option to specify which encoding to use to decode the output + from any git commands which are run. This should not be needed in most + cases. + + .. note:: + This should only be needed if the files in the repository were + created with filenames using an encoding other than UTF-8 to handle + Unicode characters. + ''' + ret = {'name': name, 'result': False, 'comment': '', 'changes': {}} + + if target is None: + ret['comment'] = '\'target\' argument is required' + return ret + elif not isinstance(target, six.string_types): + target = six.text_type(target) + + if not os.path.isabs(target): + ret['comment'] = '\'target\' path must be absolute' + return ret + + if branch is not None: + if not isinstance(branch, six.string_types): + branch = six.text_type(branch) + if not branch: + ret['comment'] = 'Invalid \'branch\' argument' + return ret + + if not os.path.exists(target): + need_clone = True + else: + try: + __salt__['git.status'](target, + user=user, + password=password, + output_encoding=output_encoding) + except Exception as exc: + ret['comment'] = six.text_type(exc) + return ret + else: + need_clone = False + + comments = [] + + def _clone_changes(ret): + ret['changes']['new'] = name + ' => ' + target + + def _branch_changes(ret, old, new): + ret['changes']['branch'] = {'old': old, 'new': new} + + if need_clone: + if __opts__['test']: + _clone_changes(ret) + comment = '{0} would be cloned to {1}{2}'.format( + name, + target, + ' with branch \'{0}\''.format(branch) + if branch is not None + else '' + ) + return _neutral_test(ret, comment) + clone_opts = ['--branch', branch] if branch is not None else None + try: + __salt__['git.clone'](target, + name, + opts=clone_opts, + user=user, + password=password, + identity=identity, + https_user=https_user, + https_pass=https_pass, + output_encoding=output_encoding) + except CommandExecutionError as exc: + msg = 'Clone failed: {0}'.format(_strip_exc(exc)) + return _fail(ret, msg, comments) + + comments.append( + '{0} cloned to {1}{2}'.format( + name, + target, + ' with branch \'{0}\''.format(branch) + if branch is not None + else '' + ) + ) + _clone_changes(ret) + ret['comment'] = _format_comments(comments) + ret['result'] = True + return ret + else: + if branch is None: + return _already_cloned(ret, target, branch, comments) + else: + current_branch = __salt__['git.current_branch']( + target, + user=user, + password=password, + output_encoding=output_encoding) + if current_branch == branch: + return _already_cloned(ret, target, branch, comments) + else: + if __opts__['test']: + _branch_changes(ret, current_branch, branch) + return _neutral_test( + ret, + 'Branch would be changed to \'{0}\''.format(branch)) + try: + __salt__['git.rev_parse']( + target, + rev=branch, + user=user, + password=password, + ignore_retcode=True, + output_encoding=output_encoding) + except CommandExecutionError: + # Local head does not exist, so we need to check out a new + # branch at the remote rev + checkout_rev = '/'.join(('origin', branch)) + checkout_opts = ['-b', branch] + else: + # Local head exists, so we just need to check it out + checkout_rev = branch + checkout_opts = None + + try: + __salt__['git.checkout']( + target, + rev=checkout_rev, + opts=checkout_opts, + user=user, + password=password, + output_encoding=output_encoding) + except CommandExecutionError as exc: + msg = 'Failed to change branch to \'{0}\': {1}'.format(branch, exc) + return _fail(ret, msg, comments) + else: + comments.append('Branch changed to \'{0}\''.format(branch)) + _branch_changes(ret, current_branch, branch) + ret['comment'] = _format_comments(comments) + ret['result'] = True + return ret + + def config_unset(name, value_regex=None, repo=None, diff --git a/salt/states/github.py b/salt/states/github.py index 997dc9d6a9..514accb14a 100644 --- a/salt/states/github.py +++ b/salt/states/github.py @@ -715,8 +715,8 @@ def repo_present( ret['result'] = None else: result = __salt__['github.add_team_repo'](name, team_name, - permission, - profile=profile) + profile=profile, + permission=permission) if result: ret['changes'][team_name] = team_change else: diff --git a/salt/states/grafana4_org.py b/salt/states/grafana4_org.py index 88e7648a57..cd8ee429bc 100644 --- a/salt/states/grafana4_org.py +++ b/salt/states/grafana4_org.py @@ -77,9 +77,12 @@ def present(name, users Optional - Dict of user/role associated with the org. Example: - users: - foo: Viewer - bar: Editor + + .. code-block:: yaml + + users: + foo: Viewer + bar: Editor theme Optional - Selected theme for the org. diff --git a/salt/states/grains.py b/salt/states/grains.py index 6b382c0937..ca3a0bc924 100644 --- a/salt/states/grains.py +++ b/salt/states/grains.py @@ -8,8 +8,7 @@ This state allows for grains to be set. Grains set or altered with this module are stored in the 'grains' file on the minions, By default, this file is located at: ``/etc/salt/grains`` -.. Note:: - +.. note:: This does **NOT** override any grains set in the minion config file. ''' @@ -97,7 +96,7 @@ def present(name, value, delimiter=DEFAULT_TARGET_DELIM, force=False): with,a,custom,delimiter: grains.present: - value: yay - - delimiter: , + - delimiter: ',' ''' name = re.sub(delimiter, DEFAULT_TARGET_DELIM, name) ret = {'name': name, @@ -332,7 +331,7 @@ def absent(name, .. code-block:: yaml grain_name: - grains.absent: [] + grains.absent ''' _non_existent = object() diff --git a/salt/states/ini_manage.py b/salt/states/ini_manage.py index 6817f6be97..3c3fff8cbd 100644 --- a/salt/states/ini_manage.py +++ b/salt/states/ini_manage.py @@ -15,6 +15,7 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt libs from salt.ext import six +from salt.utils.odict import OrderedDict __virtualname__ = 'ini' @@ -53,46 +54,79 @@ def options_present(name, sections=None, separator='=', strict=False): 'comment': 'No anomaly detected' } if __opts__['test']: - ret['result'] = True ret['comment'] = '' - for section in sections or {}: - section_name = ' in section ' + section if section != 'DEFAULT_IMPLICIT' else '' - try: - cur_section = __salt__['ini.get_section'](name, section, separator) - except IOError as err: - ret['comment'] = "{0}".format(err) - ret['result'] = False - return ret - for key in sections[section]: - cur_value = cur_section.get(key) - if cur_value == six.text_type(sections[section][key]): - ret['comment'] += 'Key {0}{1} unchanged.\n'.format(key, section_name) - continue - ret['comment'] += 'Changed key {0}{1}.\n'.format(key, section_name) - ret['result'] = None - if ret['comment'] == '': - ret['comment'] = 'No changes detected.' - return ret + # pylint: disable=too-many-nested-blocks try: changes = {} if sections: - for section_name, section_body in sections.items(): + options = {} + for sname, sbody in sections.items(): + if not isinstance(sbody, (dict, OrderedDict)): + options.update({sname: sbody}) + cur_ini = __salt__['ini.get_ini'](name, separator) + original_top_level_opts = {} + original_sections = {} + for key, val in cur_ini.items(): + if isinstance(val, (dict, OrderedDict)): + original_sections.update({key: val}) + else: + original_top_level_opts.update({key: val}) + if __opts__['test']: + for option in options: + if option in original_top_level_opts: + if six.text_type(original_top_level_opts[option]) == six.text_type(options[option]): + ret['comment'] += 'Unchanged key {0}.\n'.format(option) + else: + ret['comment'] += 'Changed key {0}.\n'.format(option) + ret['result'] = None + else: + ret['comment'] += 'Changed key {0}.\n'.format(option) + ret['result'] = None + else: + options_updated = __salt__['ini.set_option'](name, options, separator) + changes.update(options_updated) + if strict: + for opt_to_remove in set(original_top_level_opts).difference(options): + if __opts__['test']: + ret['comment'] += 'Removed key {0}.\n'.format(opt_to_remove) + ret['result'] = None + else: + __salt__['ini.remove_option'](name, None, opt_to_remove, separator) + changes.update({opt_to_remove: {'before': original_top_level_opts[opt_to_remove], + 'after': None}}) + for section_name, section_body in [(sname, sbody) for sname, sbody in sections.items() + if isinstance(sbody, (dict, OrderedDict))]: + section_descr = ' in section ' + section_name if section_name else '' changes[section_name] = {} if strict: - original = __salt__['ini.get_section'](name, section_name, separator) + original = cur_ini.get(section_name, {}) for key_to_remove in set(original.keys()).difference(section_body.keys()): - orig_value = __salt__['ini.get_option'](name, section_name, key_to_remove, separator) - __salt__['ini.remove_option'](name, section_name, key_to_remove, separator) - changes[section_name].update({key_to_remove: ''}) - changes[section_name].update({key_to_remove: {'before': orig_value, - 'after': None}}) - options_updated = __salt__['ini.set_option'](name, {section_name: section_body}, separator) - if options_updated: - changes[section_name].update(options_updated[section_name]) - if not changes[section_name]: - del changes[section_name] + orig_value = original_sections.get(section_name, {}).get(key_to_remove, '#-#-') + if __opts__['test']: + ret['comment'] += 'Deleted key {0}{1}.\n'.format(key_to_remove, section_descr) + ret['result'] = None + else: + __salt__['ini.remove_option'](name, section_name, key_to_remove, separator) + changes[section_name].update({key_to_remove: ''}) + changes[section_name].update({key_to_remove: {'before': orig_value, + 'after': None}}) + if __opts__['test']: + for option in section_body: + if six.text_type(section_body[option]) == \ + six.text_type(original_sections.get(section_name, {}).get(option, '#-#-')): + ret['comment'] += 'Unchanged key {0}{1}.\n'.format(option, section_descr) + else: + ret['comment'] += 'Changed key {0}{1}.\n'.format(option, section_descr) + ret['result'] = None + else: + options_updated = __salt__['ini.set_option'](name, {section_name: section_body}, separator) + if options_updated: + changes[section_name].update(options_updated[section_name]) + if not changes[section_name]: + del changes[section_name] else: - changes = __salt__['ini.set_option'](name, sections, separator) + if not __opts__['test']: + changes = __salt__['ini.set_option'](name, sections, separator) except (IOError, KeyError) as err: ret['comment'] = "{0}".format(err) ret['result'] = False @@ -102,10 +136,10 @@ def options_present(name, sections=None, separator='=', strict=False): ret['comment'] = 'Errors encountered. {0}'.format(changes['error']) ret['changes'] = {} else: - for name, body in changes.items(): + for ciname, body in changes.items(): if body: ret['comment'] = 'Changes take effect' - ret['changes'].update({name: changes[name]}) + ret['changes'].update({ciname: changes[ciname]}) return ret @@ -137,20 +171,31 @@ def options_absent(name, sections=None, separator='='): ret['result'] = True ret['comment'] = '' for section in sections or {}: - section_name = ' in section ' + section if section != 'DEFAULT_IMPLICIT' else '' + section_name = ' in section ' + section if section else '' try: cur_section = __salt__['ini.get_section'](name, section, separator) except IOError as err: ret['comment'] = "{0}".format(err) ret['result'] = False return ret - for key in sections[section]: - cur_value = cur_section.get(key) - if not cur_value: - ret['comment'] += 'Key {0}{1} does not exist.\n'.format(key, section_name) + except AttributeError: + cur_section = section + if isinstance(sections[section], (dict, OrderedDict)): + for key in sections[section]: + cur_value = cur_section.get(key) + if not cur_value: + ret['comment'] += 'Key {0}{1} does not exist.\n'.format(key, section_name) + continue + ret['comment'] += 'Deleted key {0}{1}.\n'.format(key, section_name) + ret['result'] = None + else: + option = section + if not __salt__['ini.get_option'](name, None, option, separator): + ret['comment'] += 'Key {0} does not exist.\n'.format(option) continue - ret['comment'] += 'Deleted key {0}{1}.\n'.format(key, section_name) + ret['comment'] += 'Deleted key {0}.\n'.format(option) ret['result'] = None + if ret['comment'] == '': ret['comment'] = 'No changes detected.' return ret @@ -168,6 +213,9 @@ def options_absent(name, sections=None, separator='='): if section not in ret['changes']: ret['changes'].update({section: {}}) ret['changes'][section].update({key: current_value}) + if not isinstance(sections[section], (dict, OrderedDict)): + ret['changes'].update({section: current_value}) + # break ret['comment'] = 'Changes take effect' return ret @@ -197,18 +245,16 @@ def sections_present(name, sections=None, separator='='): if __opts__['test']: ret['result'] = True ret['comment'] = '' + try: + cur_ini = __salt__['ini.get_ini'](name, separator) + except IOError as err: + ret['result'] = False + ret['comment'] = "{0}".format(err) + return ret for section in sections or {}: - try: - cur_section = __salt__['ini.get_section'](name, section, separator) - except IOError as err: - ret['result'] = False - ret['comment'] = "{0}".format(err) - return ret - if dict(sections[section]) == cur_section: + if section in cur_ini: ret['comment'] += 'Section unchanged {0}.\n'.format(section) continue - elif cur_section: - ret['comment'] += 'Changed existing section {0}.\n'.format(section) else: ret['comment'] += 'Created new section {0}.\n'.format(section) ret['result'] = None @@ -255,14 +301,14 @@ def sections_absent(name, sections=None, separator='='): if __opts__['test']: ret['result'] = True ret['comment'] = '' + try: + cur_ini = __salt__['ini.get_ini'](name, separator) + except IOError as err: + ret['result'] = False + ret['comment'] = "{0}".format(err) + return ret for section in sections or []: - try: - cur_section = __salt__['ini.get_section'](name, section, separator) - except IOError as err: - ret['result'] = False - ret['comment'] = "{0}".format(err) - return ret - if not cur_section: + if section not in cur_ini: ret['comment'] += 'Section {0} does not exist.\n'.format(section) continue ret['comment'] += 'Deleted section {0}.\n'.format(section) diff --git a/salt/states/junos.py b/salt/states/junos.py index 5fdbd8ee10..816f26f596 100644 --- a/salt/states/junos.py +++ b/salt/states/junos.py @@ -286,43 +286,45 @@ def install_config(name, **kwargs): description: Creating interface via SaltStack. - Parameters: - Required - * name: - Path where the configuration/template file is present. If the file has a \ - '*.conf' extension, - the content is treated as text format. If the file has a '*.xml' \ - extension, - the content is treated as XML format. If the file has a '*.set' \ - extension, - the content is treated as Junos OS 'set' commands.(default = None) - Optional - * kwargs: Keyworded arguments which can be provided like- - * template_vars: - The dictionary of data for the jinja variables present in the \ - jinja template - * timeout: - Set NETCONF RPC timeout. Can be used for commands which - take a while to execute. (default = 30 seconds) - * overwrite: - Set to True if you want this file is to completely replace the\ - configuration file. (default = False) - * replace: - Specify whether the configuration file uses "replace:" statements. - Those statements under the 'replace' tag will only be changed.\ - (default = False) - * comment: - Provide a comment to the commit. (default = None) - * confirm: - Provide time in minutes for commit confirmation. - If this option is specified, the commit will be rollbacked in \ - the given time unless the commit is confirmed. - * diffs_file: - Path to the file where the diff (difference in old configuration - and the committed configuration) will be stored.(default = None) - Note that the file will be stored on the proxy minion. To push the - files to the master use the salt's following execution module: \ - :py:func:`cp.push ` + name + Path where the configuration/template file is present. If the file has + a ``*.conf`` extension, the content is treated as text format. If the + file has a ``*.xml`` extension, the content is treated as XML format. If + the file has a ``*.set`` extension, the content is treated as Junos OS + ``set`` commands + + template_vars + The dictionary of data for the jinja variables present in the jinja + template + + timeout : 30 + Set NETCONF RPC timeout. Can be used for commands which take a while to + execute. + + overwrite : False + Set to ``True`` if you want this file is to completely replace the + configuration file. + + replace : False + Specify whether the configuration file uses "replace:" statements. Only + those statements under the 'replace' tag will be changed. + + comment + Provide a comment to the commit. (default = None) + + confirm + Provide time in minutes for commit confirmation. If this option is + specified, the commit will be rolled back in the given time unless the + commit is confirmed. + + diffs_file + Path to the file where the diff (difference in old configuration and the + committed configuration) will be stored. + + .. note:: + The file will be stored on the proxy minion. To push the files to the + master use :py:func:`cp.push `. + ''' ret = {'name': name, 'changes': {}, 'result': True, 'comment': ''} ret['changes'] = __salt__['junos.install_config'](name, **kwargs) @@ -404,7 +406,7 @@ def file_copy(name, dest=None, **kwargs): def lock(name): - """ + ''' Attempts an exclusive lock on the candidate configuration. This is a non-blocking call. @@ -418,14 +420,14 @@ def lock(name): lock the config: junos.lock - """ + ''' ret = {'name': name, 'changes': {}, 'result': True, 'comment': ''} ret['changes'] = __salt__['junos.lock']() return ret def unlock(name): - """ + ''' Unlocks the candidate configuration. .. code-block:: yaml @@ -433,14 +435,14 @@ def unlock(name): unlock the config: junos.unlock - """ + ''' ret = {'name': name, 'changes': {}, 'result': True, 'comment': ''} ret['changes'] = __salt__['junos.unlock']() return ret def load(name, **kwargs): - """ + ''' Loads the configuration provided onto the junos device. .. code-block:: yaml @@ -461,50 +463,47 @@ def load(name, **kwargs): description: Creating interface via SaltStack. - Parameters: - Required - * name: - Path where the configuration/template file is present. If the file has a \ - '*.conf' extension, - the content is treated as text format. If the file has a '*.xml' \ - extension, - the content is treated as XML format. If the file has a '*.set' \ - extension, - the content is treated as Junos OS 'set' commands.(default = None) - Optional - * kwargs: Keyworded arguments which can be provided like- - * overwrite: - Set to True if you want this file is to completely replace the\ - configuration file. (default = False) - * replace: - Specify whether the configuration file uses "replace:" statements. - Those statements under the 'replace' tag will only be changed.\ - (default = False) - * format: - Determines the format of the contents. - * update: - Compare a complete loaded configuration against - the candidate configuration. For each hierarchy level or - configuration object that is different in the two configurations, - the version in the loaded configuration replaces the version in the - candidate configuration. When the configuration is later committed, - only system processes that are affected by the changed configuration - elements parse the new configuration. This action is supported from - PyEZ 2.1 (default = False) - * template_vars: - Variables to be passed into the template processing engine in addition - to those present in __pillar__, __opts__, __grains__, etc. - You may reference these variables in your template like so: - {{ template_vars["var_name"] }} + name + Path where the configuration/template file is present. If the file has + a ``*.conf`` extension, the content is treated as text format. If the + file has a ``*.xml`` extension, the content is treated as XML format. If + the file has a ``*.set`` extension, the content is treated as Junos OS + ``set`` commands. - """ + overwrite : False + Set to ``True`` if you want this file is to completely replace the + configuration file. + + replace : False + Specify whether the configuration file uses "replace:" statements. + Only those statements under the 'replace' tag will be changed. + + format: + Determines the format of the contents. + + update : False + Compare a complete loaded configuration against the candidate + configuration. For each hierarchy level or configuration object that is + different in the two configurations, the version in the loaded + configuration replaces the version in the candidate configuration. When + the configuration is later committed, only system processes that are + affected by the changed configuration elements parse the new + configuration. This action is supported from PyEZ 2.1 (default = False) + + template_vars + Variables to be passed into the template processing engine in addition + to those present in __pillar__, __opts__, __grains__, etc. + You may reference these variables in your template like so: + {{ template_vars["var_name"] }} + + ''' ret = {'name': name, 'changes': {}, 'result': True, 'comment': ''} ret['changes'] = __salt__['junos.load'](name, **kwargs) return ret def commit_check(name): - """ + ''' Perform a commit check on the configuration. @@ -513,7 +512,7 @@ def commit_check(name): perform commit check: junos.commit_check - """ + ''' ret = {'name': name, 'changes': {}, 'result': True, 'comment': ''} ret['changes'] = __salt__['junos.commit_check']() return ret diff --git a/salt/states/libcloud_dns.py b/salt/states/libcloud_dns.py index 9f4e520fbe..b670fa23ed 100644 --- a/salt/states/libcloud_dns.py +++ b/salt/states/libcloud_dns.py @@ -2,7 +2,7 @@ ''' Manage DNS records and zones using libcloud - :codeauthor: :email:`Anthony Shaw ` + :codeauthor: Anthony Shaw .. versionadded:: 2016.11.0 diff --git a/salt/states/libcloud_loadbalancer.py b/salt/states/libcloud_loadbalancer.py index a3e2162f40..f7017f4f4a 100644 --- a/salt/states/libcloud_loadbalancer.py +++ b/salt/states/libcloud_loadbalancer.py @@ -5,7 +5,7 @@ Apache Libcloud Load Balancer State Manage load balancers using libcloud - :codeauthor: :email:`Anthony Shaw ` + :codeauthor: ``Anthony Shaw `` Apache Libcloud load balancer management for a full list of supported clouds, see http://libcloud.readthedocs.io/en/latest/loadbalancer/supported_providers.html diff --git a/salt/states/libcloud_storage.py b/salt/states/libcloud_storage.py index 1f43ab2a63..b5314fb4c4 100644 --- a/salt/states/libcloud_storage.py +++ b/salt/states/libcloud_storage.py @@ -5,7 +5,7 @@ Apache Libcloud Storage State Manage cloud storage using libcloud - :codeauthor: :email:`Anthony Shaw ` +:codeauthor: ``Anthony Shaw `` Apache Libcloud Storage (object/blob) management for a full list of supported clouds, see http://libcloud.readthedocs.io/en/latest/storage/supported_providers.html diff --git a/salt/states/linux_acl.py b/salt/states/linux_acl.py index 8e35bc24ea..9a9f4f05d0 100644 --- a/salt/states/linux_acl.py +++ b/salt/states/linux_acl.py @@ -338,18 +338,22 @@ def list_present(name, acl_type, acl_names=None, perms='', recurse=False, force= _origin_group = _current_perms.get('comment', {}).get('group', None) _origin_owner = _current_perms.get('comment', {}).get('owner', None) - _current_acl_types = list() + _current_acl_types = [] diff_perms = False for key in _current_perms[acl_type]: for current_acl_name in key.keys(): _current_acl_types.append(current_acl_name.encode('utf-8')) diff_perms = _octal_perms == key[current_acl_name]['octal'] if acl_type == 'user': - if _origin_owner: + try: _current_acl_types.remove(_origin_owner) + except ValueError: + pass else: - if _origin_group: + try: _current_acl_types.remove(_origin_group) + except ValueError: + pass diff_acls = set(_current_acl_types) ^ set(acl_names) if not diff_acls and diff_perms and not force: ret = {'name': name, diff --git a/salt/states/logadm.py b/salt/states/logadm.py index c1abf44891..ccc216e3eb 100644 --- a/salt/states/logadm.py +++ b/salt/states/logadm.py @@ -51,7 +51,8 @@ def rotate(name, **kwargs): name : string alias for entryname - **kwargs : boolean|string|int + + kwargs : boolean|string|int optional additional flags and parameters ''' diff --git a/salt/states/mac_package.py b/salt/states/mac_package.py index 58d22c1386..e3318303c0 100644 --- a/salt/states/mac_package.py +++ b/salt/states/mac_package.py @@ -16,11 +16,12 @@ Install any kind of pkg, dmg or app file on macOS: - dmg: True /mnt/xcode.dmg: - macpackage.installed: - - dmg: True - - app: True - - target: /Applications/Xcode.app - - version_check: xcodebuild -version=Xcode 7.1\n.*7B91b + macpackage.installed: + - dmg: True + - app: True + - target: /Applications/Xcode.app + - version_check: xcodebuild -version=Xcode 7.1\\n.*7B91b + ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/salt/states/msteams.py b/salt/states/msteams.py index d4d7059b4f..efd356a40a 100644 --- a/salt/states/msteams.py +++ b/salt/states/msteams.py @@ -1,17 +1,23 @@ # -*- coding: utf-8 -*- ''' Send a message card to Microsoft Teams -======================= +====================================== This state is useful for sending messages to Teams during state runs. + .. versionadded:: 2017.7.0 + .. code-block:: yaml + teams-message: msteams.post_card: - message: 'This state was executed successfully.' - hook_url: https://outlook.office.com/webhook/837 + The hook_url can be specified in the master or minion configuration like below: + .. code-block:: yaml + msteams: hook_url: https://outlook.office.com/webhook/837 ''' @@ -36,16 +42,22 @@ def post_card(name, title=None, theme_color=None): ''' - Send a message to a Microsft Teams channel. + Send a message to a Microsft Teams channel + .. code-block:: yaml + send-msteams-message: msteams.post_card: - message: 'This state was executed successfully.' - hook_url: https://outlook.office.com/webhook/837 + The following parameters are required: + message The message that is to be sent to the MS Teams channel. + The following parameters are optional: + hook_url The webhook URL given configured in Teams interface, if not specified in the configuration options of master or minion. diff --git a/salt/states/mysql_query.py b/salt/states/mysql_query.py index 8ee601d1bc..6425f8e6bd 100644 --- a/salt/states/mysql_query.py +++ b/salt/states/mysql_query.py @@ -364,9 +364,17 @@ def run(name, ) ) else: - output_file.write( - salt.utils.stringutils.to_str(query_result) - ) + if isinstance(query_result, six.text_type): + output_file.write( + salt.utils.stringutils.to_str(query_result) + ) + else: + for col, val in six.iteritems(query_result): + output_file.write( + salt.utils.stringutils.to_str( + '{0}:{1}\n'.format(col, val) + ) + ) else: ret['changes']['query'] = "Executed" diff --git a/salt/states/netacl.py b/salt/states/netacl.py index 1f1f4d069c..dcb8a2659f 100644 --- a/salt/states/netacl.py +++ b/salt/states/netacl.py @@ -166,13 +166,13 @@ def term(name, select a source just using the name, instead of specifying a destination_port and protocol. Allows the same options as ``source_service``. - **term_fields - Term attributes. - To see what fields are supported, please consult the list of supported keywords_. - Some platforms have few other optional_ keywords. + term_fields + Term attributes. To see what fields are supported, please consult the + list of supported keywords_. Some platforms have few other optional_ + keywords. - .. _keywords: https://github.com/google/capirca/wiki/Policy-format#keywords - .. _optional: https://github.com/google/capirca/wiki/Policy-format#optionally-supported-keywords + .. _keywords: https://github.com/google/capirca/wiki/Policy-format#keywords + .. _optional: https://github.com/google/capirca/wiki/Policy-format#optionally-supported-keywords .. note:: The following fields are accepted: @@ -297,8 +297,9 @@ def term(name, - bgpd .. note:: - The port fields ``source_port`` and ``destination_port`` can be used as above to select either - a single value, either a list of values, but also they can select port ranges. Example: + The port fields ``source_port`` and ``destination_port`` can be used as + above to select either a single value, either a list of values, but + also they can select port ranges. Example: .. code-block:: yaml @@ -316,7 +317,7 @@ def term(name, Output Example: - .. code-block:: yaml + .. code-block:: text edge01.bjm01: ---------- @@ -529,7 +530,7 @@ def filter(name, # pylint: disable=redefined-builtin Output Example: - .. code-block:: yaml + .. code-block:: text edge01.flw01: ---------- @@ -749,10 +750,10 @@ def managed(name, Output Example: - .. code-block:: yaml + .. code-block:: text edge01.bjm01: - ---------- + ------------- ID: netacl_example Function: netacl.managed Result: None diff --git a/salt/states/netconfig.py b/salt/states/netconfig.py index c0ecc38b2d..a15b831a9f 100644 --- a/salt/states/netconfig.py +++ b/salt/states/netconfig.py @@ -213,11 +213,11 @@ def managed(name, result after the template was rendered. .. note:: - This argument cannot be used directly on the command line. Instead, - it can be passed through the ``pillar`` variable when executing one - of the :ref:`salt.modules.state.sls` or :ref:`salt.modules.state.apply` - functions (see an example below). + it can be passed through the ``pillar`` variable when executing + either of the :py:func:`state.sls ` or + :py:func:`state.apply ` (see below for an + example). replace: False Load and replace the configuration. Default: ``False`` (will apply load merge). @@ -225,7 +225,7 @@ def managed(name, defaults: None Default variables/context passed to the template. - **template_vars + template_vars Dictionary with the arguments/context to be used when the template is rendered. Do not explicitly specify this argument. This represents any other variable that will be sent to the template rendering system. Please see an example below! In both ``ntp_peers_example_using_pillar`` and ``ntp_peers_example``, ``peers`` is sent as @@ -305,9 +305,12 @@ def managed(name, Raw output example (useful when the output is reused in other states/execution modules): - .. code-block:: python + .. code-block:: bash $ sudo salt --out=pprint 'juniper.device' state.sls router.config test=True debug=True + + .. code-block:: python + { 'juniper.device': { 'netconfig_|-ntp_peers_example_using_pillar_|-ntp_peers_example_using_pillar_|-managed': { diff --git a/salt/states/netntp.py b/salt/states/netntp.py index 6d8bfcbb37..0184b19039 100644 --- a/salt/states/netntp.py +++ b/salt/states/netntp.py @@ -3,6 +3,8 @@ Network NTP =========== +.. versionadded: 2016.11.0 + Manage the configuration of NTP peers and servers on the network devices through the NAPALM proxy. :codeauthor: Mircea Ulinic & Jerome Fleury @@ -12,16 +14,16 @@ Manage the configuration of NTP peers and servers on the network devices through Dependencies ------------ -- Requires netaddr_ to be installed: `pip install netaddr` to check if IP Addresses are correctly specified -- Requires dnspython_ to be installed: `pip install dnspython` to resolve the nameserver entities -(in case the user does not configure the peers/servers using their IP addresses) +- Requires netaddr_ to be installed: `pip install netaddr` to check if IP + Addresses are correctly specified +- Requires dnspython_ to be installed: `pip install dnspython` to resolve the + nameserver entities (in case the user does not configure the peers/servers + using their IP addresses) - :mod:`NAPALM proxy minion ` - :mod:`NTP operational and configuration management module ` .. _netaddr: https://pythonhosted.org/netaddr/ .. _dnspython: http://www.dnspython.org/ - -.. versionadded: 2016.11.0 ''' # Import Python libs diff --git a/salt/states/neutron_network.py b/salt/states/neutron_network.py index 05015f55a7..e9f2b8a0d0 100644 --- a/salt/states/neutron_network.py +++ b/salt/states/neutron_network.py @@ -61,12 +61,11 @@ def present(name, auth=None, **kwargs): Set the network administrative state to up. vlan - Vlan ID. Alias for - provider: - - physical_network: provider - - network_type: vlan - - segmentation_id: (vlan id) + Vlan ID. Alias for provider + - physical_network: provider + - network_type: vlan + - segmentation_id: (vlan id) ''' ret = {'name': name, 'changes': {}, diff --git a/salt/states/neutron_secgroup.py b/salt/states/neutron_secgroup.py index 0442e09e49..7859ac60df 100644 --- a/salt/states/neutron_secgroup.py +++ b/salt/states/neutron_secgroup.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' Management of OpenStack Neutron Security Groups -========================================= +=============================================== .. versionadded:: 2018.3.0 diff --git a/salt/states/neutron_secgroup_rule.py b/salt/states/neutron_secgroup_rule.py index 608cab657c..888969e90d 100644 --- a/salt/states/neutron_secgroup_rule.py +++ b/salt/states/neutron_secgroup_rule.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' Management of OpenStack Neutron Security Group Rules -========================================= +==================================================== .. versionadded:: 2018.3.0 diff --git a/salt/states/pagerduty_schedule.py b/salt/states/pagerduty_schedule.py index 20afae921d..8c9cc6f876 100644 --- a/salt/states/pagerduty_schedule.py +++ b/salt/states/pagerduty_schedule.py @@ -4,7 +4,7 @@ Manage PagerDuty schedules. Example: - .. code-block:: yaml +.. code-block:: yaml ensure test schedule: pagerduty_schedule.present: diff --git a/salt/states/pagerduty_service.py b/salt/states/pagerduty_service.py index e565f0c40c..fdfd502e5e 100644 --- a/salt/states/pagerduty_service.py +++ b/salt/states/pagerduty_service.py @@ -1,21 +1,18 @@ # -*- coding: utf-8 -*- ''' - Manage PagerDuty services Escalation policies can be referenced by pagerduty ID or by namea. For example: - .. code-block:: yaml +.. code-block:: yaml ensure test service pagerduty_service.present: - name: 'my service' - escalation_policy_id: 'my escalation policy' - type: nagios - [etc] - ''' @@ -42,27 +39,29 @@ def present(profile='pagerduty', subdomain=None, api_key=None, **kwargs): .. code-block:: yaml - # create a PagerDuty email service at test-email@DOMAIN.pagerduty.com - ensure generic email service exists: - pagerduty_service.present: - - name: my email service - - service: - description: "email service controlled by salt" - escalation_policy_id: "my escalation policy" - type: "generic_email" - service_key: "test-email" + # create a PagerDuty email service at test-email@DOMAIN.pagerduty.com + ensure generic email service exists: + pagerduty_service.present: + - name: my email service + - service: + description: "email service controlled by salt" + escalation_policy_id: "my escalation policy" + type: "generic_email" + service_key: "test-email" - # create a pagerduty service using cloudwatch integration - ensure my cloudwatch service exists: - pagerduty_service.present: - - name: my cloudwatch service - - service: - escalation_policy_id: "my escalation policy" - type: aws_cloudwatch - description: "my cloudwatch service controlled by salt" + .. code-block:: yaml + + # create a pagerduty service using cloudwatch integration + ensure my cloudwatch service exists: + pagerduty_service.present: + - name: my cloudwatch service + - service: + escalation_policy_id: "my escalation policy" + type: aws_cloudwatch + description: "my cloudwatch service controlled by salt" - TODO: aws_cloudwatch type should be integrated with boto_sns ''' + # TODO: aws_cloudwatch type should be integrated with boto_sns # for convenience, we accept id, name, or email for users # and we accept the id or name for schedules kwargs['service']['name'] = kwargs['name'] # make args mirror PD API structure diff --git a/salt/states/panos.py b/salt/states/panos.py index c10cb5fbc9..0bc3104106 100644 --- a/salt/states/panos.py +++ b/salt/states/panos.py @@ -2,7 +2,7 @@ ''' A state module to manage Palo Alto network devices. -:codeauthor: :email:`Spencer Ervin ` +:codeauthor: ``Spencer Ervin `` :maturity: new :depends: none :platform: unix @@ -64,7 +64,7 @@ The proxy['panos.is_required_version'] method will check if a panos device is cu greater than the passed version. For example, proxy['panos.is_required_version']('7.0.0') would match both 7.1.0 and 8.0.0. -.. code-block:: yaml +.. code-block:: jinja {% if proxy['panos.is_required_version']('8.0.0') %} panos/deviceconfig/system/motd-and-banner: @@ -79,7 +79,7 @@ greater than the passed version. For example, proxy['panos.is_required_version'] {% endif %} .. seealso:: - :prox:`Palo Alto Proxy Module ` + :py:mod:`Palo Alto Proxy Module ` ''' diff --git a/salt/states/pip_state.py b/salt/states/pip_state.py index 78fe23bc79..bbafaced63 100644 --- a/salt/states/pip_state.py +++ b/salt/states/pip_state.py @@ -193,6 +193,7 @@ def _check_if_installed(prefix, bin_env, env_vars, index_url, + extra_index_url, **kwargs): # result: None means the command failed to run # result: True means the package is installed @@ -235,7 +236,7 @@ def _check_if_installed(prefix, available_versions = __salt__['pip.list_all_versions']( prefix_realname, bin_env=bin_env, include_alpha=include_alpha, include_beta=include_beta, include_rc=include_rc, user=user, - cwd=cwd, index_url=index_url) + cwd=cwd, index_url=index_url, extra_index_url=extra_index_url) desired_version = '' if any(version_spec): for version in reversed(available_versions): @@ -732,7 +733,7 @@ def installed(name, out = _check_if_installed(prefix, state_pkg_name, version_spec, ignore_installed, force_reinstall, upgrade, user, cwd, bin_env, env_vars, - index_url, **kwargs) + index_url, extra_index_url, **kwargs) # If _check_if_installed result is None, something went wrong with # the command running. This way we keep stateful output. if out['result'] is None: diff --git a/salt/states/pkg.py b/salt/states/pkg.py index ed405cb6b5..aad87e3278 100644 --- a/salt/states/pkg.py +++ b/salt/states/pkg.py @@ -415,16 +415,6 @@ def _find_remove_targets(name=None, if __grains__['os'] == 'FreeBSD' and origin: cver = [k for k, v in six.iteritems(cur_pkgs) if v['origin'] == pkgname] - elif __grains__['os_family'] == 'Suse': - # On SUSE systems. Zypper returns packages without "arch" in name - try: - namepart, archpart = pkgname.rsplit('.', 1) - except ValueError: - cver = cur_pkgs.get(pkgname, []) - else: - if archpart in salt.utils.pkg.rpm.ARCHES + ("noarch",): - pkgname = namepart - cver = cur_pkgs.get(pkgname, []) else: cver = cur_pkgs.get(pkgname, []) @@ -854,17 +844,6 @@ def _verify_install(desired, new_pkgs, ignore_epoch=False, new_caps=None): cver = new_pkgs.get(pkgname.split('%')[0]) elif __grains__['os_family'] == 'Debian': cver = new_pkgs.get(pkgname.split('=')[0]) - elif __grains__['os_family'] == 'Suse': - # On SUSE systems. Zypper returns packages without "arch" in name - try: - namepart, archpart = pkgname.rsplit('.', 1) - except ValueError: - cver = new_pkgs.get(pkgname) - else: - if archpart in salt.utils.pkg.rpm.ARCHES + ("noarch",): - cver = new_pkgs.get(namepart) - else: - cver = new_pkgs.get(pkgname) else: cver = new_pkgs.get(pkgname) if not cver and pkgname in new_caps: diff --git a/salt/states/postgres_initdb.py b/salt/states/postgres_initdb.py index 2eacc4cf86..9ad83242d9 100644 --- a/salt/states/postgres_initdb.py +++ b/salt/states/postgres_initdb.py @@ -39,7 +39,9 @@ def present(name, auth='password', encoding='UTF8', locale=None, - runas=None): + runas=None, + waldir=None, + checksums=False): ''' Initialize the PostgreSQL data directory @@ -61,6 +63,19 @@ def present(name, locale The default locale for new databases + waldir + The transaction log (WAL) directory (default is to keep WAL + inside the data directory) + + .. versionadded:: Fluorine + + checksums + If True, the cluster will be created with data page checksums. + + .. note:: Data page checksums are supported since PostgreSQL 9.3. + + .. versionadded:: Fluorine + runas The system user the operation should be performed on behalf of ''' @@ -85,6 +100,8 @@ def present(name, auth=auth, encoding=encoding, locale=locale, + waldir=waldir, + checksums=checksums, runas=runas) if __salt__['postgres.datadir_init'](name, **kwargs): diff --git a/salt/states/postgres_tablespace.py b/salt/states/postgres_tablespace.py index db0bacc024..190d99180a 100644 --- a/salt/states/postgres_tablespace.py +++ b/salt/states/postgres_tablespace.py @@ -47,8 +47,8 @@ def present(name, db_user=None): ''' Ensure that the named tablespace is present with the specified properties. - For more information about all of these options see man - ``create_tablespace``(7). + For more information about all of these options run ``man 7 + create_tablespace``. name The name of the tablespace to create/manage. diff --git a/salt/states/probes.py b/salt/states/probes.py index 18ba05b90d..e621fb3536 100644 --- a/salt/states/probes.py +++ b/salt/states/probes.py @@ -255,10 +255,12 @@ def managed(name, probes, defaults=None): Ensure the networks device is configured as specified in the state SLS file. Probes not specified will be removed, while probes not confiured as expected will trigger config updates. - :param probes: Defines the probes as expected to be configured on the device. - In order to ease the configuration and avoid repeating the same parameters for each probe, - the next parameter (defaults) can be used, providing common characteristics. - :param defaults: Specifies common parameters for the probes. + :param probes: Defines the probes as expected to be configured on the + device. In order to ease the configuration and avoid repeating the + same parameters for each probe, the next parameter (defaults) can be + used, providing common characteristics. + + :param defaults: Specifies common parameters for the probes. SLS Example: @@ -290,16 +292,19 @@ def managed(name, probes, defaults=None): dictionary). All the other parameters will use the operating system defaults, if not provided: - * source: Specifies the source IP Address to be used during the tests. - If not specified will use the IP Address of the logical interface loopback0. - * target: Destination IP Address. - * probe_count: Total number of probes per test (1..15). System defaults: 1 on both JunOS & Cisco. - * probe_interval: Delay between tests (0..86400 seconds). System defaults: 3 on JunOS, 5 on Cisco. - * probe_type: Probe request type. Available options: + - ``source`` - Specifies the source IP Address to be used during the tests. If + not specified will use the IP Address of the logical interface loopback0. - * icmp-ping - * tcp-ping - * udp-ping + - ``target`` - Destination IP Address. + - ``probe_count`` - Total number of probes per test (1..15). System + defaults: 1 on both JunOS & Cisco. + - ``probe_interval`` - Delay between tests (0..86400 seconds). System + defaults: 3 on JunOS, 5 on Cisco. + - ``probe_type`` - Probe request type. Available options: + + - icmp-ping + - tcp-ping + - udp-ping Using the example configuration above, after running the state, on the device will be configured 4 probes, with the following properties: diff --git a/salt/states/reg.py b/salt/states/reg.py index 6b67c69a3d..b65d189af2 100644 --- a/salt/states/reg.py +++ b/salt/states/reg.py @@ -7,7 +7,6 @@ Many python developers think of registry keys as if they were python keys in a dictionary which is not the case. The windows registry is broken down into the following components: ------ Hives ----- @@ -19,14 +18,12 @@ This is the top level of the registry. They all begin with HKEY. - HKEY_USER (HKU) - HKEY_CURRENT_CONFIG ----- Keys ---- Hives contain keys. These are basically the folders beneath the hives. They can contain any number of subkeys. ------------------ Values or Entries ----------------- @@ -34,13 +31,12 @@ Values or Entries are the name/data pairs beneath the keys and subkeys. All keys have a default name/data pair. The name is ``(Default)`` with a displayed value of ``(value not set)``. The actual value is Null. -------- Example ------- The following example is taken from the windows startup portion of the registry: -.. code-block:: bash +.. code-block:: text [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Run] "RTHDVCPL"="\"C:\\Program Files\\Realtek\\Audio\\HDA\\RtkNGUI64.exe\" -s" @@ -56,13 +52,10 @@ Key and subkeys: ``SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run`` Value: - - There are 3 value names: - - `RTHDVCPL` - - `NvBackend` - - `BTMTrayAgent` - - Each value name has a corresponding value -:depends: - salt.utils.win_reg +- There are 3 value names: ``RTHDVCPL``, ``NvBackend``, and ``BTMTrayAgent`` +- Each value name has a corresponding value + ''' from __future__ import absolute_import, print_function, unicode_literals @@ -410,7 +403,7 @@ def key_absent(name, use_32bit_registry=False): CLI Example: The following example will delete the ``SOFTWARE\DeleteMe`` key in the - ``HKEY_LOCAL_MACHINE` hive including all its subkeys and value pairs. + ``HKEY_LOCAL_MACHINE`` hive including all its subkeys and value pairs. .. code-block:: yaml diff --git a/salt/states/saltmod.py b/salt/states/saltmod.py index 96ad35586f..f7d9b28c3f 100644 --- a/salt/states/saltmod.py +++ b/salt/states/saltmod.py @@ -551,6 +551,9 @@ def function( m_ret = mdata['ret'] m_func = (not fail_function and True) or __salt__[fail_function](m_ret) + if m_ret is False: + m_func = False + if not m_func: if minion not in fail_minions: fail.add(minion) diff --git a/salt/states/selinux.py b/salt/states/selinux.py index d9fb0d323b..91ed5c108c 100644 --- a/salt/states/selinux.py +++ b/salt/states/selinux.py @@ -85,8 +85,10 @@ def mode(name): ''' Verifies the mode SELinux is running in, can be set to enforcing, permissive, or disabled - Note: A change to or from disabled mode requires a system reboot. - You will need to perform this yourself. + + .. note:: + A change to or from disabled mode requires a system reboot. You will + need to perform this yourself. name The mode to run SELinux in, permissive, enforcing, or disabled. diff --git a/salt/states/smartos.py b/salt/states/smartos.py index 2e9611b463..2dba794ac0 100644 --- a/salt/states/smartos.py +++ b/salt/states/smartos.py @@ -71,6 +71,36 @@ Management of SmartOS Standalone Compute Nodes - dhcp vlan_id: 30 + docker.example.org: + smartos.vm_present: + - config: + auto_import: true + reprovision: true + - vmconfig: + image_uuid: emby/embyserver:latest + brand: lx + alias: mydockervm + quota: 5 + max_physical_memory: 1024 + tags: + label: 'my emby docker' + owner: 'sjorge' + resolvers: + - 172.16.1.1 + nics: + "82:1b:8e:49:e9:18": + nic_tag: trunk + mtu: 1500 + ips: + - 172.16.1.118/24 + vlan_id: 10 + filesystems: + "/config: + source: "/vmdata/emby_config" + type: lofs + options: + - nodevices + cleanup_images: smartos.image_vacuum @@ -86,6 +116,7 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Python libs import logging +import json import os # Import Salt libs @@ -117,6 +148,41 @@ def __virtual__(): ) +def _split_docker_uuid(uuid): + ''' + Split a smartos docker uuid into repo and tag + ''' + if uuid: + uuid = uuid.split(':') + if len(uuid) == 2: + tag = uuid[1] + repo = uuid[0] + if len(repo.split('/')) == 2: + return repo, tag + return None, None + + +def _is_uuid(uuid): + ''' + Check if uuid is a valid smartos uuid + + Example: e69a0918-055d-11e5-8912-e3ceb6df4cf8 + ''' + if uuid and list((len(x) for x in uuid.split('-'))) == [8, 4, 4, 4, 12]: + return True + return False + + +def _is_docker_uuid(uuid): + ''' + Check if uuid is a valid smartos docker uuid + + Example plexinc/pms-docker:plexpass + ''' + repo, tag = _split_docker_uuid(uuid) + return not (not repo and not tag) + + def _load_config(): ''' Loads and parses /usbkey/config @@ -207,6 +273,60 @@ def _get_instance_changes(current, state): return changed +def _copy_lx_vars(vmconfig): + # NOTE: documentation on dockerinit: https://github.com/joyent/smartos-live/blob/master/src/dockerinit/README.md + if 'image_uuid' in vmconfig: + # NOTE: retrieve tags and type from image + imgconfig = __salt__['imgadm.get'](vmconfig['image_uuid']).get('manifest', {}) + imgtype = imgconfig.get('type', 'zone-dataset') + imgtags = imgconfig.get('tags', {}) + + # NOTE: copy kernel_version (if not specified in vmconfig) + if 'kernel_version' not in vmconfig and 'kernel_version' in imgtags: + vmconfig['kernel_version'] = imgtags['kernel_version'] + + # NOTE: copy docker vars + if imgtype == 'docker': + vmconfig['docker'] = True + vmconfig['kernel_version'] = vmconfig.get('kernel_version', '4.3.0') + if 'internal_metadata' not in vmconfig: + vmconfig['internal_metadata'] = {} + + for var in imgtags.get('docker:config', {}): + val = imgtags['docker:config'][var] + var = 'docker:{0}'.format(var.lower()) + + # NOTE: skip empty values + if not val: + continue + + # NOTE: skip or merge user values + if var == 'docker:env': + try: + val_config = json.loads( + vmconfig['internal_metadata'].get(var, "") + ) + except ValueError as e: + val_config = [] + + for config_env_var in val_config if isinstance(val_config, list) else json.loads(val_config): + config_env_var = config_env_var.split('=') + for img_env_var in val: + if img_env_var.startswith('{0}='.format(config_env_var[0])): + val.remove(img_env_var) + val.append('='.join(config_env_var)) + elif var in vmconfig['internal_metadata']: + continue + + if isinstance(val, list): + # NOTE: string-encoded JSON arrays + vmconfig['internal_metadata'][var] = json.dumps(val) + else: + vmconfig['internal_metadata'][var] = val + + return vmconfig + + def config_present(name, value): ''' Ensure configuration property is set to value in /usbkey/config @@ -251,7 +371,7 @@ def config_present(name, value): config[name] = value # apply change if needed - if not __opts__['test'] and len(ret['changes']) > 0: + if not __opts__['test'] and ret['changes']: ret['result'] = _write_config(config) return ret @@ -286,12 +406,86 @@ def config_absent(name): ret['comment'] = 'property {0} is absent'.format(name) # apply change if needed - if not __opts__['test'] and len(ret['changes']) > 0: + if not __opts__['test'] and ret['changes']: ret['result'] = _write_config(config) return ret +def source_present(name, source_type='imgapi'): + ''' + Ensure an image source is present on the computenode + + name : string + source url + source_type : string + source type (imgapi or docker) + ''' + ret = {'name': name, + 'changes': {}, + 'result': None, + 'comment': ''} + + if name in __salt__['imgadm.sources'](): + # source is present + ret['result'] = True + ret['comment'] = 'image source {0} is present'.format(name) + else: + # add new source + if __opts__['test']: + res = {} + ret['result'] = True + else: + res = __salt__['imgadm.source_add'](name, source_type) + ret['result'] = (name in res) + + if ret['result']: + ret['comment'] = 'image source {0} added'.format(name) + ret['changes'][name] = 'added' + else: + ret['comment'] = 'image source {0} not added'.format(name) + if 'Error' in res: + ret['comment'] = '{0}: {1}'.format(ret['comment'], res['Error']) + + return ret + + +def source_absent(name): + ''' + Ensure an image source is absent on the computenode + + name : string + source url + ''' + ret = {'name': name, + 'changes': {}, + 'result': None, + 'comment': ''} + + if name not in __salt__['imgadm.sources'](): + # source is absent + ret['result'] = True + ret['comment'] = 'image source {0} is absent'.format(name) + else: + # remove source + if __opts__['test']: + res = {} + ret['result'] = True + else: + res = __salt__['imgadm.source_delete'](name) + ret['result'] = (name not in res) + + if ret['result']: + ret['comment'] = 'image source {0} deleted'.format(name) + ret['changes'][name] = 'deleted' + else: + ret['comment'] = 'image source {0} not deleted'.format(name) + if 'Error' in res: + ret['comment'] = '{0}: {1}'.format(ret['comment'], res['Error']) + + return ret + + def image_present(name): ''' Ensure image is present on the computenode @@ -304,21 +498,44 @@ def image_present(name): 'result': None, 'comment': ''} - if name in __salt__['imgadm.list'](): - # we're good + if _is_docker_uuid(name) and __salt__['imgadm.docker_to_uuid'](name): + # docker image was imported + ret['result'] = True + ret['comment'] = 'image {0} ({1}) is present'.format( + name, + __salt__['imgadm.docker_to_uuid'](name), + ) + elif name in __salt__['imgadm.list'](): + # image was already imported ret['result'] = True ret['comment'] = 'image {0} is present'.format(name) else: # add image - available_images = __salt__['imgadm.avail']() + if _is_docker_uuid(name): + # NOTE: we cannot query available docker images + available_images = [name] + else: + available_images = __salt__['imgadm.avail']() + if name in available_images: if __opts__['test']: ret['result'] = True + res = {} + if _is_docker_uuid(name): + res['00000000-0000-0000-0000-000000000000'] = name + else: + res[name] = available_images[name] else: - __salt__['imgadm.import'](name) - ret['result'] = (name in __salt__['imgadm.list']()) - ret['comment'] = 'image {0} installed'.format(name) - ret['changes'][name] = available_images[name] + res = __salt__['imgadm.import'](name) + if _is_uuid(name): + ret['result'] = (name in res) + elif _is_docker_uuid(name): + ret['result'] = __salt__['imgadm.docker_to_uuid'](name) is not None + if ret['result']: + ret['comment'] = 'image {0} imported'.format(name) + ret['changes'] = res + else: + ret['comment'] = 'image {0} was unable to be imported'.format(name) else: ret['result'] = False ret['comment'] = 'image {0} does not exists'.format(name) @@ -343,13 +560,19 @@ def image_absent(name): 'result': None, 'comment': ''} - if name not in __salt__['imgadm.list'](): - # we're good + uuid = None + if _is_uuid(name): + uuid = name + if _is_docker_uuid(name): + uuid = __salt__['imgadm.docker_to_uuid'](name) + + if not uuid or uuid not in __salt__['imgadm.list'](): + # image not imported ret['result'] = True ret['comment'] = 'image {0} is absent'.format(name) else: # check if image in use by vm - if name in __salt__['vmadm.list'](order='image_uuid'): + if uuid in __salt__['vmadm.list'](order='image_uuid'): ret['result'] = False ret['comment'] = 'image {0} currently in use by a vm'.format(name) else: @@ -357,9 +580,26 @@ def image_absent(name): if __opts__['test']: ret['result'] = True else: - __salt__['imgadm.delete'](name) - ret['result'] = name not in __salt__['imgadm.list']() - ret['comment'] = 'image {0} deleted'.format(name) + image = __salt__['imgadm.get'](uuid) + image_count = 0 + if image['manifest']['name'] == 'docker-layer': + # NOTE: docker images are made of multiple layers, loop over them + while image: + image_count += 1 + __salt__['imgadm.delete'](image['manifest']['uuid']) + if 'origin' in image['manifest']: + image = __salt__['imgadm.get'](image['manifest']['origin']) + else: + image = None + else: + # NOTE: normal images can just be delete + __salt__['imgadm.delete'](uuid) + + ret['result'] = uuid not in __salt__['imgadm.list']() + if image_count: + ret['comment'] = 'image {0} and {1} children deleted'.format(name, image_count) + else: + ret['comment'] = 'image {0} deleted'.format(name) ret['changes'][name] = None return ret @@ -368,6 +608,11 @@ def image_absent(name): def image_vacuum(name): ''' Delete images not in use or installed via image_present + + .. warning:: + + Only image_present states that are included via the + top file will be detected. ''' name = name.lower() ret = {'name': name, @@ -392,28 +637,50 @@ def image_vacuum(name): continue # keep images installed via image_present if 'name' in state: - images.append(state['name']) + if _is_uuid(state['name']): + images.append(state['name']) + elif _is_docker_uuid(state['name']): + state['name'] = __salt__['imgadm.docker_to_uuid'](state['name']) + if not state['name']: + continue + images.append(state['name']) # retrieve images in use by vms for image_uuid in __salt__['vmadm.list'](order='image_uuid'): - if image_uuid in images: - continue - images.append(image_uuid) + if image_uuid not in images: + images.append(image_uuid) # purge unused images ret['result'] = True for image_uuid in __salt__['imgadm.list'](): if image_uuid in images: continue - if image_uuid in __salt__['imgadm.delete'](image_uuid): - ret['changes'][image_uuid] = None - else: - ret['result'] = False - ret['comment'] = 'failed to delete images' - if ret['result'] and len(ret['changes']) == 0: + image = __salt__['imgadm.get'](image_uuid) + if image['manifest']['name'] == 'docker-layer': + # NOTE: docker images are made of multiple layers, loop over them + while image: + image_uuid = image['manifest']['uuid'] + if image_uuid in __salt__['imgadm.delete'](image_uuid): + ret['changes'][image_uuid] = None + else: + ret['result'] = False + ret['comment'] = 'failed to delete images' + if 'origin' in image['manifest']: + image = __salt__['imgadm.get'](image['manifest']['origin']) + else: + image = None + else: + # NOTE: normal images can just be delete + if image_uuid in __salt__['imgadm.delete'](image_uuid): + ret['changes'][image_uuid] = None + else: + ret['result'] = False + ret['comment'] = 'failed to delete images' + + if ret['result'] and not ret['changes']: ret['comment'] = 'no images deleted' - elif ret['result'] and len(ret['changes']) > 0: + elif ret['result'] and ret['changes']: ret['comment'] = 'images deleted' return ret @@ -433,11 +700,14 @@ def vm_present(name, vmconfig, config=None): .. note:: The following configuration properties can be toggled in the config parameter. - - kvm_reboot (true) - reboots of kvm zones if needed for a config update - - auto_import (false) - automatic importing of missing images - - reprovision (false) - reprovision on image_uuid changes + - kvm_reboot (true) - reboots of kvm zones if needed for a config update + - auto_import (false) - automatic importing of missing images + - auto_lx_vars (true) - copy kernel_version and docker:* variables from image + - reprovision (false) - reprovision on image_uuid changes + - enforce_tags (true) - false = add tags only, true = add, update, and remove tags + - enforce_routes (true) - false = add tags only, true = add, update, and remove routes + - enforce_internal_metadata (true) - false = add metadata only, true = add, update, and remove metadata - enforce_customer_metadata (true) - false = add metadata only, true = add, update, and remove metadata - - enforce_tags (true) - false = add tags only, true = add, update, and remove tags .. note:: @@ -457,6 +727,10 @@ def vm_present(name, vmconfig, config=None): e.g. disk0 will be the first disk added, disk1 the 2nd,... + .. versionchanged:: Fluorine + + Added support for docker image uuids, added auto_lx_vars configuration, documented some missing configuration options. + ''' name = name.lower() ret = {'name': name, @@ -469,7 +743,12 @@ def vm_present(name, vmconfig, config=None): config = { 'kvm_reboot': True, 'auto_import': False, + 'auto_lx_vars': True, 'reprovision': False, + 'enforce_tags': True, + 'enforce_routes': True, + 'enforce_internal_metadata': True, + 'enforce_customer_metadata': True, } config.update(state_config) log.debug('smartos.vm_present::%s::config - %s', name, config) @@ -493,6 +772,15 @@ def vm_present(name, vmconfig, config=None): 'filesystems' ] } + vmconfig_docker_keep = [ + 'docker:id', + 'docker:restartcount', + ] + vmconfig_docker_array = [ + 'docker:env', + 'docker:cmd', + 'docker:entrypoint', + ] # parse vmconfig vmconfig = _parse_vmconfig(vmconfig, vmconfig_type['instance']) @@ -502,6 +790,46 @@ def vm_present(name, vmconfig, config=None): if 'hostname' not in vmconfig: vmconfig['hostname'] = name + # prepare image_uuid + if 'image_uuid' in vmconfig: + # NOTE: lookup uuid from docker uuid (normal uuid's are passed throuhg unmodified) + # we must do this again if we end up importing a missing image later! + docker_uuid = __salt__['imgadm.docker_to_uuid'](vmconfig['image_uuid']) + vmconfig['image_uuid'] = docker_uuid if docker_uuid else vmconfig['image_uuid'] + + # NOTE: import image (if missing and allowed) + if vmconfig['image_uuid'] not in __salt__['imgadm.list'](): + if config['auto_import']: + if not __opts__['test']: + res = __salt__['imgadm.import'](vmconfig['image_uuid']) + vmconfig['image_uuid'] = __salt__['imgadm.docker_to_uuid'](vmconfig['image_uuid']) + if vmconfig['image_uuid'] not in res: + ret['result'] = False + ret['comment'] = 'failed to import image {0}'.format(vmconfig['image_uuid']) + else: + ret['result'] = False + ret['comment'] = 'image {0} not installed'.format(vmconfig['image_uuid']) + + # docker json-array handling + if 'internal_metadata' in vmconfig: + for var in vmconfig_docker_array: + if var not in vmconfig['internal_metadata']: + continue + if isinstance(vmconfig['internal_metadata'][var], list): + vmconfig['internal_metadata'][var] = json.dumps( + vmconfig['internal_metadata'][var] + ) + + # copy lx variables + if vmconfig['brand'] == 'lx' and config['auto_lx_vars']: + # NOTE: we can only copy the lx vars after the image has bene imported + vmconfig = _copy_lx_vars(vmconfig) + + # quick abort if things look wrong + # NOTE: use explicit check for false, otherwise None also matches! + if ret['result'] is False: + return ret + # check if vm exists if vmconfig['hostname'] in __salt__['vmadm.list'](order='hostname'): # update vm @@ -564,11 +892,20 @@ def vm_present(name, vmconfig, config=None): continue # enforcement - enforce = True - if 'enforce_{0}'.format(collection) in config: - enforce = config['enforce_{0}'.format(collection)] + enforce = config['enforce_{0}'.format(collection)] log.debug('smartos.vm_present::enforce_%s = %s', collection, enforce) + # dockerinit handling + if collection == 'internal_metadata' and vmconfig['state'].get('docker', False): + if 'internal_metadata' not in vmconfig['state']: + vmconfig['state']['internal_metadata'] = {} + + # preserve some docker specific metadata (added and needed by dockerinit) + for var in vmconfig_docker_keep: + val = vmconfig['current'].get(collection, {}).get(var, None) + if val is not None: + vmconfig['state']['internal_metadata'][var] = val + # process add and update for collection if collection in vmconfig['state'] and vmconfig['state'][collection] is not None: for prop in vmconfig['state'][collection]: @@ -627,21 +964,20 @@ def vm_present(name, vmconfig, config=None): update_cfg = {} # handle changes - if len(changed) > 0: - for prop in changed: - update_cfg[prop] = state_cfg[prop] + for prop in changed: + update_cfg[prop] = state_cfg[prop] # handle new properties for prop in state_cfg: # skip empty props like ips, options,.. - if isinstance(state_cfg[prop], (list)) and len(state_cfg[prop]) == 0: + if isinstance(state_cfg[prop], (list)) and not state_cfg[prop]: continue if prop not in current_cfg: update_cfg[prop] = state_cfg[prop] # update instance - if len(update_cfg) > 0: + if update_cfg: # create update_ array if 'update_{0}'.format(instance) not in vmconfig['changed']: vmconfig['changed']['update_{0}'.format(instance)] = [] @@ -684,7 +1020,7 @@ def vm_present(name, vmconfig, config=None): # update vm if we have pending changes kvm_needs_start = False - if not __opts__['test'] and len(vmconfig['changed']) > 0: + if not __opts__['test'] and vmconfig['changed']: # stop kvm if disk updates and kvm_reboot if vmconfig['current']['brand'] == 'kvm' and config['kvm_reboot']: if 'add_disks' in vmconfig['changed'] or \ @@ -707,7 +1043,7 @@ def vm_present(name, vmconfig, config=None): if __opts__['test']: ret['changes'][vmconfig['state']['hostname']] = vmconfig['changed'] - if vmconfig['state']['hostname'] in ret['changes'] and len(ret['changes'][vmconfig['state']['hostname']]) > 0: + if vmconfig['state']['hostname'] in ret['changes'] and ret['changes'][vmconfig['state']['hostname']]: ret['comment'] = 'vm {0} updated'.format(vmconfig['state']['hostname']) if config['kvm_reboot'] and vmconfig['current']['brand'] == 'kvm' and not __opts__['test']: if vmconfig['state']['hostname'] in __salt__['vmadm.list'](order='hostname', search='state=running'): @@ -718,18 +1054,9 @@ def vm_present(name, vmconfig, config=None): ret['changes'] = {} ret['comment'] = 'vm {0} is up to date'.format(vmconfig['state']['hostname']) + # reprovision (if required and allowed) if 'image_uuid' in vmconfig['current'] and vmconfig['reprovision_uuid'] != vmconfig['current']['image_uuid']: if config['reprovision']: - # check required image installed - if vmconfig['reprovision_uuid'] not in __salt__['imgadm.list'](): - if config['auto_import']: - # check if image is available - available_images = __salt__['imgadm.avail']() - if vmconfig['reprovision_uuid'] in available_images and not __opts__['test']: - # import image - __salt__['imgadm.import'](vmconfig['reprovision_uuid']) - - # reprovision rret = __salt__['vmadm.reprovision']( vm=vmconfig['state']['hostname'], key='hostname', @@ -737,15 +1064,9 @@ def vm_present(name, vmconfig, config=None): ) if not isinstance(rret, (bool)) and 'Error' in rret: ret['result'] = False - if vmconfig['reprovision_uuid'] not in __salt__['imgadm.list'](): - ret['comment'] = 'vm {0} updated, reprovision failed because images {1} not installed'.format( - vmconfig['state']['hostname'], - vmconfig['reprovision_uuid'] - ) - else: - ret['comment'] = 'vm {0} updated, reprovision failed'.format( - vmconfig['state']['hostname'] - ) + ret['comment'] = 'vm {0} updated, reprovision failed'.format( + vmconfig['state']['hostname'] + ) else: ret['comment'] = 'vm {0} updated and reprovisioned'.format(vmconfig['state']['hostname']) if vmconfig['state']['hostname'] not in ret['changes']: @@ -763,20 +1084,6 @@ def vm_present(name, vmconfig, config=None): else: # check required image installed ret['result'] = True - if 'image_uuid' in vmconfig and vmconfig['image_uuid'] not in __salt__['imgadm.list'](): - if config['auto_import']: - # check if image is available - available_images = __salt__['imgadm.avail']() - if vmconfig['image_uuid'] not in available_images: - ret['result'] = False - ret['comment'] = 'image {0} not available'.format(vmconfig['image_uuid']) - elif not __opts__['test']: - if vmconfig['image_uuid'] not in __salt__['imgadm.import'](vmconfig['image_uuid']): - ret['result'] = False - ret['comment'] = 'failed to import image {0}'.format(vmconfig['image_uuid']) - else: - ret['result'] = False - ret['comment'] = 'image {0} not installed'.format(vmconfig['image_uuid']) # disks need some special care if 'disks' in vmconfig: diff --git a/salt/states/smtp.py b/salt/states/smtp.py index 5eb48f2c0b..c4d88190d2 100644 --- a/salt/states/smtp.py +++ b/salt/states/smtp.py @@ -27,7 +27,13 @@ def __virtual__(): return 'smtp' if 'smtp.send_msg' in __salt__ else False -def send_msg(name, recipient, subject, sender=None, profile=None, use_ssl='True'): +def send_msg(name, + recipient, + subject, + sender=None, + profile=None, + use_ssl='True', + attachments=None): ''' Send a message via SMTP @@ -41,6 +47,9 @@ def send_msg(name, recipient, subject, sender=None, profile=None, use_ssl='True' - recipient: admin@example.com - sender: admin@example.com - use_ssl: True + - attachments: + - /var/log/syslog + - /var/log/messages name The message to send via SMTP @@ -68,11 +77,17 @@ def send_msg(name, recipient, subject, sender=None, profile=None, use_ssl='True' subject=subject, sender=sender, use_ssl=use_ssl, + attachments=attachments, ) if command: ret['result'] = True - ret['comment'] = 'Sent message to {0}: {1}'.format(recipient, name) + if attachments: + atts = ', '.join(attachments) + ret['comment'] = 'Sent message to {0} with attachments ({2}): {1}' \ + .format(recipient, name, atts) + else: + ret['comment'] = 'Sent message to {0}: {1}'.format(recipient, name) else: ret['result'] = False ret['comment'] = 'Unable to send message to {0}: {1}'.format(recipient, name) diff --git a/salt/states/sqlite3.py b/salt/states/sqlite3.py index 10d584b2cc..4d8ba2e9c7 100644 --- a/salt/states/sqlite3.py +++ b/salt/states/sqlite3.py @@ -1,18 +1,19 @@ # -*- coding: utf-8 -*- -""" +''' Management of SQLite3 databases =============================== +.. versionadded:: 2016.3.0 + :depends: - SQLite3 Python Module :configuration: See :py:mod:`salt.modules.sqlite3` for setup instructions -.. versionadded:: 2016.3.0 The sqlite3 module is used to create and manage sqlite3 databases and execute queries Here is an example of creating a table using sql statements: - .. code-block:: yaml +.. code-block:: yaml users: sqlite3.table_present: @@ -22,7 +23,7 @@ Here is an example of creating a table using sql statements: Here is an example of creating a table using yaml/jinja instead of sql: - .. code-block:: yaml +.. code-block:: yaml users: sqlite3.table_present: @@ -38,7 +39,7 @@ Here is an example of creating a table using yaml/jinja instead of sql: Here is an example of making sure a table is absent: - .. code-block:: yaml +.. code-block:: yaml badservers: sqlite3.table_absent: @@ -48,7 +49,7 @@ Here is an example of making sure a table is absent: Sometimes you would to have specific data in tables to be used by other services Here is an example of making sure rows with specific data exist: - .. code-block:: yaml +.. code-block:: yaml user_john_doe_xyz: sqlite3.row_present: @@ -68,7 +69,7 @@ Here is an example of making sure rows with specific data exist: Here is an example of removing a row from a table: - .. code-block:: yaml +.. code-block:: yaml user_john_doe_abc: sqlite3.row_absent: @@ -81,7 +82,7 @@ Here is an example of removing a row from a table: Note that there is no explicit state to perform random queries, however, this can be approximated with sqlite3's module functions and module.run: - .. code-block:: yaml +.. code-block:: yaml zone-delete: module.run: @@ -90,7 +91,7 @@ can be approximated with sqlite3's module functions and module.run: - sql: "DELETE FROM records WHERE id > {{ count[0] }} AND domain_id = {{ domain_id }}" - watch: - sqlite3: zone-insert-12 -""" +''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function @@ -107,14 +108,14 @@ except ImportError: def __virtual__(): - """ + ''' Only load if the sqlite3 module is available - """ + ''' return HAS_SQLITE3 def row_absent(name, db, table, where_sql, where_args=None): - """ + ''' Makes sure the specified row is absent in db. If multiple rows match where_sql, then the state will fail. @@ -132,7 +133,7 @@ def row_absent(name, db, table, where_sql, where_args=None): where_args The list parameters to substitute in where_sql - """ + ''' changes = {'name': name, 'changes': {}, 'result': None, @@ -197,7 +198,7 @@ def row_present(name, where_sql, where_args=None, update=False): - """ + ''' Checks to make sure the given row exists. If row exists and update is True then row will be updated with data. Otherwise it will leave existing row unmodified and check it against data. If the existing data @@ -228,7 +229,7 @@ def row_present(name, True will replace the existing row with data When False and the row exists and data does not equal the row data then the state will fail - """ + ''' changes = {'name': name, 'changes': {}, 'result': None, @@ -331,7 +332,7 @@ def row_present(name, def table_absent(name, db): - """ + ''' Make sure the specified table does not exist name @@ -339,7 +340,7 @@ def table_absent(name, db): db The name of the database file - """ + ''' changes = {'name': name, 'changes': {}, 'result': None, @@ -380,7 +381,7 @@ def table_absent(name, db): def table_present(name, db, schema, force=False): - """ + ''' Make sure the specified table exists with the specified schema name @@ -396,7 +397,7 @@ def table_present(name, db, schema, force=False): If the name of the table exists and force is set to False, the state will fail. If force is set to True, the existing table will be replaced with the new table - """ + ''' changes = {'name': name, 'changes': {}, 'result': None, diff --git a/salt/states/statuspage.py b/salt/states/statuspage.py index 3fd24bc4d5..0b5f773412 100644 --- a/salt/states/statuspage.py +++ b/salt/states/statuspage.py @@ -247,7 +247,7 @@ def create(name, api_url Custom API URL in case the user has a StatusPage service running in a custom environment. - **kwargs + kwargs Other params. SLS Example: diff --git a/salt/states/user.py b/salt/states/user.py index c5206a0c07..9ed7444436 100644 --- a/salt/states/user.py +++ b/salt/states/user.py @@ -448,7 +448,26 @@ def present(name, # hash_password is True, then hash it. if password and hash_password: log.debug('Hashing a clear text password') - password = __salt__['shadow.gen_password'](password) + # in case a password is already set, it will contain a Salt + # which should be re-used to generate the new hash, other- + # wise the Salt will be generated randomly, causing the + # hash to change each time and thereby making the + # user.present state non-idempotent. + algorithms = { + '1': 'md5', + '2a': 'blowfish', + '5': 'sha256', + '6': 'sha512', + } + try: + _, algo, shadow_salt, shadow_hash = __salt__['shadow.info'](name)['passwd'].split('$', 4) + if algo == '1': + log.warning('Using MD5 for hashing passwords is considered insecure!') + log.debug('Re-using existing shadow salt for hashing password using {}'.format(algorithms.get(algo))) + password = __salt__['shadow.gen_password'](password, crypt_salt=shadow_salt, algorithm=algorithms.get(algo)) + except ValueError: + log.info('No existing shadow salt found, defaulting to a randomly generated new one') + password = __salt__['shadow.gen_password'](password) if fullname is not None: fullname = salt.utils.data.decode(fullname) diff --git a/salt/states/vagrant.py b/salt/states/vagrant.py index 6b63616b6a..db5e15799a 100644 --- a/salt/states/vagrant.py +++ b/salt/states/vagrant.py @@ -3,8 +3,6 @@ r''' Manage Vagrant VMs ================== -.. index:: Vagrant state function - Manange execution of Vagrant virtual machines on Salt minions. Vagrant_ is a tool for building and managing virtual machine environments. diff --git a/salt/states/vault.py b/salt/states/vault.py index 893ffdfcf2..973ab68098 100644 --- a/salt/states/vault.py +++ b/salt/states/vault.py @@ -30,6 +30,7 @@ def policy_present(name, rules): .. code-block:: yaml + demo-policy: vault.policy_present: - name: foo/bar diff --git a/salt/states/virt.py b/salt/states/virt.py index da93ebe2fb..792ba0fe6c 100644 --- a/salt/states/virt.py +++ b/salt/states/virt.py @@ -158,14 +158,14 @@ def _virt_call(domain, function, section, comment, **kwargs): targeted_domains = fnmatch.filter(__salt__['virt.list_domains'](), domain) changed_domains = list() ignored_domains = list() - for domain in targeted_domains: + for targeted_domain in targeted_domains: try: - response = __salt__['virt.{0}'.format(function)](domain, **kwargs) + response = __salt__['virt.{0}'.format(function)](targeted_domain, **kwargs) if isinstance(response, dict): response = response['name'] - changed_domains.append({'domain': domain, function: response}) + changed_domains.append({'domain': targeted_domain, function: response}) except libvirt.libvirtError as err: - ignored_domains.append({'domain': domain, 'issue': six.text_type(err)}) + ignored_domains.append({'domain': targeted_domain, 'issue': six.text_type(err)}) if not changed_domains: ret['result'] = False ret['comment'] = 'No changes had happened' @@ -247,13 +247,17 @@ def running(name, **kwargs): __salt__['virt.start'](name) ret['changes'][name] = 'Domain started' ret['comment'] = 'Domain {0} started'.format(name) + else: + ret['comment'] = 'Domain {0} exists and is running'.format(name) except CommandExecutionError: kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__['virt.init'](name, cpu=cpu, mem=mem, image=image, **kwargs) ret['changes'][name] = 'Domain defined and started' ret['comment'] = 'Domain {0} defined and started'.format(name) - except libvirt.libvirtError: - ret['comment'] = 'Domain {0} exists and is running'.format(name) + except libvirt.libvirtError as err: + # Something bad happened when starting the VM, report it + ret['comment'] = six.text_type(err) + ret['result'] = False return ret @@ -333,7 +337,7 @@ def saved(name, suffix=None): return _virt_call(name, 'snapshot', 'saved', 'Snapshots has been taken', suffix=suffix) -def reverted(name, snapshot=None, cleanup=False): +def reverted(name, snapshot=None, cleanup=False): # pylint: disable=redefined-outer-name ''' .. deprecated:: 2016.3.0 diff --git a/salt/states/win_iis.py b/salt/states/win_iis.py index 2eb16bdc9e..e1ea140bf5 100644 --- a/salt/states/win_iis.py +++ b/salt/states/win_iis.py @@ -481,7 +481,7 @@ def container_setting(name, container, settings=None): :param str container: The type of IIS container. The container types are: AppPools, Sites, SslBindings :param str settings: A dictionary of the setting names and their values. - Example of usage for the ``AppPools`` container: + Example of usage for the ``AppPools`` container: .. code-block:: yaml @@ -779,19 +779,26 @@ def remove_vdir(name, site, app='/'): def set_app(name, site, settings=None): # pylint: disable=anomalous-backslash-in-string ''' + .. versionadded:: 2017.7.0 + Set the value of the setting for an IIS web application. + .. note:: - This function only configures existing app. - Params are case sensitive. + This function only configures existing app. Params are case sensitive. + :param str name: The IIS application. :param str site: The IIS site name. :param str settings: A dictionary of the setting names and their values. - :available settings: physicalPath: The physical path of the webapp. - : applicationPool: The application pool for the webapp. - : userName: "connectAs" user - : password: "connectAs" password for user + + Available settings: + + - ``physicalPath`` - The physical path of the webapp + - ``applicationPool`` - The application pool for the webapp + - ``userName`` "connectAs" user + - ``password`` "connectAs" password for user + :rtype: bool - .. versionadded:: 2017.7.0 + Example of usage: .. code-block:: yaml diff --git a/salt/states/win_lgpo.py b/salt/states/win_lgpo.py index 364e55abbf..182f728481 100644 --- a/salt/states/win_lgpo.py +++ b/salt/states/win_lgpo.py @@ -55,7 +55,7 @@ Multiple policy configuration - user_policy: Do not process the legacy run list: Enabled -.. code-block:: yaml +.. code-block:: text server_policy: lgpo.set: diff --git a/salt/states/win_wua.py b/salt/states/win_wua.py index 2b9e981516..5812fb3f96 100644 --- a/salt/states/win_wua.py +++ b/salt/states/win_wua.py @@ -410,18 +410,18 @@ def uptodate(name, # Update the system using the state defaults update_system: - wua.up_to_date + wua.uptodate # Update the drivers update_drivers: - wua.up_to_date: + wua.uptodate: - software: False - drivers: True - skip_reboot: False # Apply all critical updates update_critical: - wua.up_to_date: + wua.uptodate: - severities: - Critical ''' diff --git a/salt/states/x509.py b/salt/states/x509.py index 832f74168c..75f1fe5708 100644 --- a/salt/states/x509.py +++ b/salt/states/x509.py @@ -58,10 +58,10 @@ the mine where it can be easily retrieved by other minions. - source: salt://signing_policies.conf /etc/pki: - file.directory: [] + file.directory /etc/pki/issued_certs: - file.directory: [] + file.directory /etc/pki/ca.crt: x509.certificate_managed: @@ -123,10 +123,10 @@ handle properly formatting the text before writing the output. /srv/salt/cert.sls -.. code-block:: yaml +.. code-block:: jinja /usr/local/share/ca-certificates: - file.directory: [] + file.directory /usr/local/share/ca-certificates/intca.crt: x509.pem_managed: @@ -286,7 +286,7 @@ def private_key_managed(name, The jinja templating in this example ensures a private key is generated if the file doesn't exist and that a new private key is generated whenever the certificate that uses it is to be renewed. - .. code-block:: yaml + .. code-block:: jinja /etc/pki/www.key: x509.private_key_managed: @@ -331,7 +331,7 @@ def csr_managed(name, and public key. See above for valid properties. kwargs: - Any arguments supported by :state:`file.managed ` are supported. + Any arguments supported by :py:func:`file.managed ` are supported. Example: @@ -371,21 +371,27 @@ def certificate_managed(name, ''' Manage a Certificate - name: + name Path to the certificate - days_remaining: - The minimum number of days remaining when the certificate should be recreated. Default is 90. A - value of 0 disables automatic renewal. + days_remaining : 90 + The minimum number of days remaining when the certificate should be + recreated. A value of 0 disables automatic renewal. - managed_private_key: - Manages the private key corresponding to the certificate. All of the arguments supported by :state:`x509.private_key_managed ` are supported. If `name` is not speicified or is the same as the name of the certificate, the private key and certificate will be written together in the same file. + managed_private_key + Manages the private key corresponding to the certificate. All of the + arguments supported by :py:func:`x509.private_key_managed + ` are supported. If `name` is not + speicified or is the same as the name of the certificate, the private + key and certificate will be written together in the same file. append_certs: A list of certificates to be appended to the managed file. kwargs: - Any arguments supported by :mod:`x509.create_certificate ` or :state:`file.managed ` are supported. + Any arguments supported by :py:func:`x509.create_certificate + ` or :py:func:`file.managed + ` are supported. Examples: @@ -585,41 +591,42 @@ def crl_managed(name, ''' Manage a Certificate Revocation List - name: + name Path to the certificate - signing_private_key: + signing_private_key The private key that will be used to sign this crl. This is usually your CA's private key. - signing_private_key_passphrase: + signing_private_key_passphrase Passphrase to decrypt the private key. - signing_cert: + signing_cert The certificate of the authority that will be used to sign this crl. This is usually your CA's certificate. - revoked: + revoked A list of certificates to revoke. Must include either a serial number or a the certificate itself. Can optionally include the revocation date and notAfter date from the certificate. See example below for details. - days_valid: - The number of days the certificate should be valid for. Default is 100. + days_valid : 100 + The number of days the certificate should be valid for. - digest: - The digest to use for signing the CRL. - This has no effect on versions of pyOpenSSL less than 0.14 + digest + The digest to use for signing the CRL. This has no effect on versions + of pyOpenSSL less than 0.14. - days_remaining: - The crl should be automatically recreated if there are less than ``days_remaining`` - days until the crl expires. Set to 0 to disable automatic renewal. Default is 30. + days_remaining : 30 + The crl should be automatically recreated if there are less than + ``days_remaining`` days until the crl expires. Set to 0 to disable + automatic renewal. - include_expired: - Include expired certificates in the CRL. Default is ``False``. + include_expired : False + If ``True``, include expired certificates in the CRL. - kwargs: - Any arguments supported by :state:`file.managed ` are supported. + kwargs + Any arguments supported by :py:func:`file.managed ` are supported. Example: @@ -704,7 +711,7 @@ def pem_managed(name, The PEM formatted text to write. kwargs: - Any arguments supported by :state:`file.managed ` are supported. + Any arguments supported by :py:func:`file.managed ` are supported. ''' file_args, kwargs = _get_file_args(name, **kwargs) file_args['contents'] = __salt__['x509.get_pem_entry'](text=text) diff --git a/salt/states/zabbix_template.py b/salt/states/zabbix_template.py index fb6f12c933..2c74cc0446 100644 --- a/salt/states/zabbix_template.py +++ b/salt/states/zabbix_template.py @@ -380,8 +380,8 @@ def present(name, params, static_host_list=True, **kwargs): :param name: Zabbix Template name :param params: Additional parameters according to Zabbix API documentation - :param static_host_list: If hosts assigned to the template are controlled only by this state or can be also - assigned externally + :param static_host_list: If hosts assigned to the template are controlled + only by this state or can be also assigned externally :param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring) :param _connection_password: Optional - zabbix password (can also be set in opts or pillar, see module's docstring) :param _connection_url: Optional - url of zabbix frontend (can also be set in opts, pillar, see module's docstring) @@ -502,6 +502,8 @@ def present(name, params, static_host_list=True, **kwargs): ret = {'name': name, 'result': False, 'comment': '', 'changes': {}} params['host'] = name + del CHANGE_STACK[:] + # Divide template yaml definition into parts # - template definition itself # - simple template components diff --git a/salt/states/zone.py b/salt/states/zone.py index 78813de218..28d384a48e 100644 --- a/salt/states/zone.py +++ b/salt/states/zone.py @@ -266,16 +266,17 @@ def resource_present(name, resource_type, resource_selector_property, resource_s unique resource identifier resource_selector_value : string value for resource selection - **kwargs : string|int|... + kwargs : string|int|... resource properties .. warning:: - Both resource_selector_property and resource_selector_value must be provided, some properties - like ```name``` are already reserved by salt in there states. + Both resource_selector_property and resource_selector_value must be + provided, some properties like ``name`` are already reserved by salt in + states. .. note:: - You can set both resource_selector_property and resource_selector_value to None for - resources that do not require them. + You can set both resource_selector_property and resource_selector_value + to None for resources that do not require them. ''' ret = {'name': name, diff --git a/salt/syspaths.py b/salt/syspaths.py index e2c7d715cd..7c35bff53a 100644 --- a/salt/syspaths.py +++ b/salt/syspaths.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.syspaths diff --git a/salt/template.py b/salt/template.py index 46afadebeb..225c4f30e7 100644 --- a/salt/template.py +++ b/salt/template.py @@ -16,6 +16,7 @@ import salt.utils.data import salt.utils.files import salt.utils.stringio import salt.utils.versions +import salt.utils.sanitizers # Import 3rd-party libs from salt.ext import six @@ -43,6 +44,13 @@ def compile_template(template, ''' Take the path to a template and return the high data structure derived from the template. + + Helpers: + + :param mask_value: + Mask value for debugging purposes (prevent sensitive information etc) + example: "mask_value="pass*". All "passwd", "password", "pass" will + be masked (as text). ''' # if any error occurs, we return an empty dictionary @@ -107,10 +115,9 @@ def compile_template(template, # yaml, mako, or another engine which renders to a data # structure) we don't want to log this. if salt.utils.stringio.is_readable(ret): - log.debug( - 'Rendered data from file: %s:\n%s', - template, - salt.utils.data.decode(ret.read())) # pylint: disable=no-member + log.debug('Rendered data from file: %s:\n%s', template, + salt.utils.sanitizers.mask_args_value(salt.utils.data.decode(ret.read()), + kwargs.get('mask_value'))) # pylint: disable=no-member ret.seek(0) # pylint: disable=no-member # Preserve newlines from original template diff --git a/salt/templates/virt/libvirt_domain.jinja b/salt/templates/virt/libvirt_domain.jinja index c545528dbe..b35704f713 100644 --- a/salt/templates/virt/libvirt_domain.jinja +++ b/salt/templates/virt/libvirt_domain.jinja @@ -33,8 +33,23 @@ {% endfor %} - {% if enable_vnc %} - + {% if graphics %} + + + {% endif %} {% if serial_type == 'pty' %} diff --git a/salt/thorium/reg.py b/salt/thorium/reg.py index 65a022145d..2d85e77d2e 100644 --- a/salt/thorium/reg.py +++ b/salt/thorium/reg.py @@ -53,7 +53,7 @@ def list_(name, add, match, stamp=False, prune=0): If ``stamp`` is True, then the timestamp from the event will also be added if ``prune`` is set to an integer higher than ``0``, then only the last - ``prune`` values will be kept in the list. + ``prune`` values will be kept in the list. USAGE: diff --git a/salt/transport/ipc.py b/salt/transport/ipc.py index 108e62da1f..1b35d9653c 100644 --- a/salt/transport/ipc.py +++ b/salt/transport/ipc.py @@ -751,9 +751,9 @@ class IPCMessageSubscriber(IPCClient): # This will prevent this message from showing up: # '[ERROR ] Future exception was never retrieved: # StreamClosedError' - if self._read_sync_future is not None: + if self._read_sync_future is not None and self._read_sync_future.done(): self._read_sync_future.exception() - if self._read_stream_future is not None: + if self._read_stream_future is not None and self._read_stream_future.done(): self._read_stream_future.exception() def __del__(self): diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py index 8302c6b7ca..f771e413e7 100644 --- a/salt/transport/tcp.py +++ b/salt/transport/tcp.py @@ -913,10 +913,9 @@ class SaltMessageClient(object): # This happens because the logic is always waiting to read # the next message and the associated read future is marked # 'StreamClosedError' when the stream is closed. - self._read_until_future.exception() - if (not self._stream_return_future.done() and - self.io_loop != tornado.ioloop.IOLoop.current( - instance=False)): + if self._read_until_future.done(): + self._read_until_future.exception() + elif self.io_loop != tornado.ioloop.IOLoop.current(instance=False): self.io_loop.add_future( self._stream_return_future, lambda future: self.io_loop.stop() @@ -1162,7 +1161,7 @@ class Subscriber(object): self._closing = True if not self.stream.closed(): self.stream.close() - if self._read_until_future is not None: + if self._read_until_future is not None and self._read_until_future.done(): # This will prevent this message from showing up: # '[ERROR ] Future exception was never retrieved: # StreamClosedError' diff --git a/salt/utils/__init__.py b/salt/utils/__init__.py index b169749b55..230a1f23c9 100644 --- a/salt/utils/__init__.py +++ b/salt/utils/__init__.py @@ -16,6 +16,7 @@ from salt.defaults import DEFAULT_TARGET_DELIM # Import 3rd-party libs from salt.ext import six +import os # diff --git a/salt/utils/aws.py b/salt/utils/aws.py index 673eff60f8..29b96ef944 100644 --- a/salt/utils/aws.py +++ b/salt/utils/aws.py @@ -88,6 +88,8 @@ def creds(provider): # Declare globals global __AccessKeyId__, __SecretAccessKey__, __Token__, __Expiration__ + ret_credentials = () + # if id or key is 'use-instance-role-credentials', pull them from meta-data ## if needed if provider['id'] == IROLE_CODE or provider['key'] == IROLE_CODE: @@ -125,9 +127,18 @@ def creds(provider): __SecretAccessKey__ = data['SecretAccessKey'] __Token__ = data['Token'] __Expiration__ = data['Expiration'] - return __AccessKeyId__, __SecretAccessKey__, __Token__ + + ret_credentials = __AccessKeyId__, __SecretAccessKey__, __Token__ else: - return provider['id'], provider['key'], '' + ret_credentials = provider['id'], provider['key'], '' + + if provider.get('role_arn') is not None: + provider_shadow = provider.copy() + provider_shadow.pop("role_arn", None) + log.info("Assuming the role: %s", provider.get('role_arn')) + ret_credentials = assumed_creds(provider_shadow, role_arn=provider.get('role_arn'), location='us-east-1') + + return ret_credentials def sig2(method, endpoint, params, provider, aws_api_version): @@ -467,7 +478,7 @@ def query(params=None, setname=None, requesturl=None, location=None, log.debug('AWS Response Status Code: %s', result.status_code) log.trace( 'AWS Response Text: %s', - result.text.encode(result.encoding if result.encoding else 'utf-8') + result.text ) result.raise_for_status() break @@ -503,11 +514,7 @@ def query(params=None, setname=None, requesturl=None, location=None, return {'error': data}, requesturl return {'error': data} - response = result.text.encode( - result.encoding if result.encoding else 'utf-8' - ) - - root = ET.fromstring(response) + root = ET.fromstring(result.text) items = root[1] if return_root is True: items = root diff --git a/salt/utils/cloud.py b/salt/utils/cloud.py index dac59fddbc..f187ffa628 100644 --- a/salt/utils/cloud.py +++ b/salt/utils/cloud.py @@ -137,6 +137,64 @@ def __render_script(path, vm_=None, opts=None, minion=''): return six.text_type(fp_.read()) +def __ssh_gateway_config_dict(gateway): + ''' + Return a dictionary with gateway options. The result is used + to provide arguments to __ssh_gateway_arguments method. + ''' + extended_kwargs = {} + if gateway: + extended_kwargs['ssh_gateway'] = gateway['ssh_gateway'] + extended_kwargs['ssh_gateway_key'] = gateway['ssh_gateway_key'] + extended_kwargs['ssh_gateway_user'] = gateway['ssh_gateway_user'] + extended_kwargs['ssh_gateway_command'] = gateway['ssh_gateway_command'] + return extended_kwargs + + +def __ssh_gateway_arguments(kwargs): + ''' + Return ProxyCommand configuration string for ssh/scp command. + + All gateway options should not include quotes (' or "). To support + future user configuration, please make sure to update the dictionary + from __ssh_gateway_config_dict and get_ssh_gateway_config (ec2.py) + ''' + extended_arguments = "" + + ssh_gateway = kwargs.get('ssh_gateway', '') + ssh_gateway_port = 22 + if ':' in ssh_gateway: + ssh_gateway, ssh_gateway_port = ssh_gateway.split(':') + ssh_gateway_command = kwargs.get('ssh_gateway_command', 'nc -q0 %h %p') + + if ssh_gateway: + ssh_gateway_port = kwargs.get('ssh_gateway_port', ssh_gateway_port) + ssh_gateway_key = '-i {0}'.format(kwargs['ssh_gateway_key']) if 'ssh_gateway_key' in kwargs else '' + ssh_gateway_user = kwargs.get('ssh_gateway_user', 'root') + + # Setup ProxyCommand + extended_arguments = '-oProxyCommand="ssh {0} {1} {2} {3} {4}@{5} -p {6} {7}"'.format( + # Don't add new hosts to the host key database + '-oStrictHostKeyChecking=no', + # Set hosts key database path to /dev/null, i.e., non-existing + '-oUserKnownHostsFile=/dev/null', + # Don't re-use the SSH connection. Less failures. + '-oControlPath=none', + ssh_gateway_key, + ssh_gateway_user, + ssh_gateway, + ssh_gateway_port, + ssh_gateway_command + ) + + log.info( + 'Using SSH gateway %s@%s:%s %s', + ssh_gateway_user, ssh_gateway, ssh_gateway_port, ssh_gateway_command + ) + + return extended_arguments + + def has_winexe(): ''' True when winexe is found on the system @@ -1085,10 +1143,7 @@ def wait_for_passwd(host, port=22, ssh_timeout=15, username='root', 'known_hosts_file': known_hosts_file, 'ssh_timeout': ssh_timeout, 'hard_timeout': hard_timeout} - if gateway: - kwargs['ssh_gateway'] = gateway['ssh_gateway'] - kwargs['ssh_gateway_key'] = gateway['ssh_gateway_key'] - kwargs['ssh_gateway_user'] = gateway['ssh_gateway_user'] + kwargs.update(__ssh_gateway_config_dict(gateway)) if key_filename: if not os.path.isfile(key_filename): @@ -1423,10 +1478,7 @@ def deploy_script(host, 'sudo_password': sudo_password, 'sftp': opts.get('use_sftp', False) } - if gateway: - ssh_kwargs['ssh_gateway'] = gateway['ssh_gateway'] - ssh_kwargs['ssh_gateway_key'] = gateway['ssh_gateway_key'] - ssh_kwargs['ssh_gateway_user'] = gateway['ssh_gateway_user'] + ssh_kwargs.update(__ssh_gateway_config_dict(gateway)) if key_filename: log.debug('Using %s as the key_filename', key_filename) ssh_kwargs['key_filename'] = key_filename @@ -1866,10 +1918,7 @@ def run_inline_script(host, 'sudo_password': sudo_password, 'sftp': opts.get('use_sftp', False) } - if gateway: - ssh_kwargs['ssh_gateway'] = gateway['ssh_gateway'] - ssh_kwargs['ssh_gateway_key'] = gateway['ssh_gateway_key'] - ssh_kwargs['ssh_gateway_user'] = gateway['ssh_gateway_user'] + ssh_kwargs.update(__ssh_gateway_config_dict(gateway)) if key_filename: log.debug('Using %s as the key_filename', key_filename) ssh_kwargs['key_filename'] = key_filename @@ -2057,35 +2106,7 @@ def scp_file(dest_path, contents=None, kwargs=None, local_file=None): if 'port' in kwargs: ssh_args.append('-oPort={0}'.format(kwargs['port'])) - if 'ssh_gateway' in kwargs: - ssh_gateway = kwargs['ssh_gateway'] - ssh_gateway_port = 22 - ssh_gateway_key = '' - ssh_gateway_user = 'root' - if ':' in ssh_gateway: - ssh_gateway, ssh_gateway_port = ssh_gateway.split(':') - if 'ssh_gateway_port' in kwargs: - ssh_gateway_port = kwargs['ssh_gateway_port'] - if 'ssh_gateway_key' in kwargs: - ssh_gateway_key = '-i {0}'.format(kwargs['ssh_gateway_key']) - if 'ssh_gateway_user' in kwargs: - ssh_gateway_user = kwargs['ssh_gateway_user'] - - ssh_args.append( - # Setup ProxyCommand - '-oProxyCommand="ssh {0} {1} {2} {3} {4}@{5} -p {6} nc -q0 %h %p"'.format( - # Don't add new hosts to the host key database - '-oStrictHostKeyChecking=no', - # Set hosts key database path to /dev/null, i.e., non-existing - '-oUserKnownHostsFile=/dev/null', - # Don't re-use the SSH connection. Less failures. - '-oControlPath=none', - ssh_gateway_key, - ssh_gateway_user, - ssh_gateway, - ssh_gateway_port - ) - ) + ssh_args.append(__ssh_gateway_arguments(kwargs)) try: if socket.inet_pton(socket.AF_INET6, kwargs['hostname']): @@ -2192,35 +2213,7 @@ def sftp_file(dest_path, contents=None, kwargs=None, local_file=None): if 'port' in kwargs: ssh_args.append('-oPort={0}'.format(kwargs['port'])) - if 'ssh_gateway' in kwargs: - ssh_gateway = kwargs['ssh_gateway'] - ssh_gateway_port = 22 - ssh_gateway_key = '' - ssh_gateway_user = 'root' - if ':' in ssh_gateway: - ssh_gateway, ssh_gateway_port = ssh_gateway.split(':') - if 'ssh_gateway_port' in kwargs: - ssh_gateway_port = kwargs['ssh_gateway_port'] - if 'ssh_gateway_key' in kwargs: - ssh_gateway_key = '-i {0}'.format(kwargs['ssh_gateway_key']) - if 'ssh_gateway_user' in kwargs: - ssh_gateway_user = kwargs['ssh_gateway_user'] - - ssh_args.append( - # Setup ProxyCommand - '-oProxyCommand="ssh {0} {1} {2} {3} {4}@{5} -p {6} nc -q0 %h %p"'.format( - # Don't add new hosts to the host key database - '-oStrictHostKeyChecking=no', - # Set hosts key database path to /dev/null, i.e., non-existing - '-oUserKnownHostsFile=/dev/null', - # Don't re-use the SSH connection. Less failures. - '-oControlPath=none', - ssh_gateway_key, - ssh_gateway_user, - ssh_gateway, - ssh_gateway_port - ) - ) + ssh_args.append(__ssh_gateway_arguments(kwargs)) try: if socket.inet_pton(socket.AF_INET6, kwargs['hostname']): @@ -2354,39 +2347,7 @@ def root_cmd(command, tty, sudo, allow_failure=False, **kwargs): if 'ssh_timeout' in kwargs: ssh_args.extend(['-oConnectTimeout={0}'.format(kwargs['ssh_timeout'])]) - if 'ssh_gateway' in kwargs: - ssh_gateway = kwargs['ssh_gateway'] - ssh_gateway_port = 22 - ssh_gateway_key = '' - ssh_gateway_user = 'root' - if ':' in ssh_gateway: - ssh_gateway, ssh_gateway_port = ssh_gateway.split(':') - if 'ssh_gateway_port' in kwargs: - ssh_gateway_port = kwargs['ssh_gateway_port'] - if 'ssh_gateway_key' in kwargs: - ssh_gateway_key = '-i {0}'.format(kwargs['ssh_gateway_key']) - if 'ssh_gateway_user' in kwargs: - ssh_gateway_user = kwargs['ssh_gateway_user'] - - ssh_args.extend([ - # Setup ProxyCommand - '-oProxyCommand="ssh {0} {1} {2} {3} {4}@{5} -p {6} nc -q0 %h %p"'.format( - # Don't add new hosts to the host key database - '-oStrictHostKeyChecking=no', - # Set hosts key database path to /dev/null, i.e., non-existing - '-oUserKnownHostsFile=/dev/null', - # Don't re-use the SSH connection. Less failures. - '-oControlPath=none', - ssh_gateway_key, - ssh_gateway_user, - ssh_gateway, - ssh_gateway_port - ) - ]) - log.info( - 'Using SSH gateway %s@%s:%s', - ssh_gateway_user, ssh_gateway, ssh_gateway_port - ) + ssh_args.extend([__ssh_gateway_arguments(kwargs)]) if 'port' in kwargs: ssh_args.extend(['-p {0}'.format(kwargs['port'])]) diff --git a/salt/utils/context.py b/salt/utils/context.py index 112388683d..cb80c0cfca 100644 --- a/salt/utils/context.py +++ b/salt/utils/context.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` - :codeauthor: :email:`Thomas Jackson (jacksontj.89@gmail.com)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) + :codeauthor: Thomas Jackson (jacksontj.89@gmail.com) salt.utils.context diff --git a/salt/utils/data.py b/salt/utils/data.py index 5fe5b12523..cd10a85186 100644 --- a/salt/utils/data.py +++ b/salt/utils/data.py @@ -274,7 +274,7 @@ def encode(data, encoding=None, errors='strict', keep=False, @jinja_filter('json_decode_dict') # Remove this for Neon -@jinja_filter('json_encode_dict') +@jinja_filter('json_encode_dict') # Remove this for Neon def encode_dict(data, encoding=None, errors='strict', keep=False, preserve_dict_class=False, preserve_tuples=False): ''' @@ -327,7 +327,7 @@ def encode_dict(data, encoding=None, errors='strict', keep=False, @jinja_filter('json_decode_list') # Remove this for Neon -@jinja_filter('json_encode_list') +@jinja_filter('json_encode_list') # Remove this for Neon def encode_list(data, encoding=None, errors='strict', keep=False, preserve_dict_class=False, preserve_tuples=False): ''' diff --git a/salt/utils/environment.py b/salt/utils/environment.py new file mode 100644 index 0000000000..2bd37e17c4 --- /dev/null +++ b/salt/utils/environment.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +''' +Environment utilities. +''' +from __future__ import absolute_import, print_function, unicode_literals +import os + + +def get_module_environment(env=None, function=None): + ''' + Get module optional environment. + + To setup an environment option for a particular module, + add either pillar or config at the minion as follows: + + system-environment: + modules: + pkg: + _: + LC_ALL: en_GB.UTF-8 + FOO: bar + install: + HELLO: world + states: + pkg: + _: + LC_ALL: en_US.Latin-1 + NAME: Fred + + So this will export the environment to all the modules, + states, returnes etc. And calling this function with the globals() + in that context will fetch the environment for further reuse. + + Underscore '_' exports environment for all functions within the module. + If you want to specifially export environment only for one function, + specify it as in the example above "install". + + First will be fetched configuration, where virtual name goes first, + then the physical name of the module overrides the virtual settings. + Then pillar settings will override the configuration in the same order. + + :param env: + :param function: name of a particular function + :return: dict + ''' + result = {} + if not env: + env = {} + for env_src in [env.get('__opts__', {}), env.get('__pillar__', {})]: + fname = env.get('__file__', '') + physical_name = os.path.basename(fname).split('.')[0] + section = os.path.basename(os.path.dirname(fname)) + m_names = [env.get('__virtualname__')] + if physical_name not in m_names: + m_names.append(physical_name) + for m_name in m_names: + if not m_name: + continue + result.update(env_src.get('system-environment', {}).get( + section, {}).get(m_name, {}).get('_', {}).copy()) + if function is not None: + result.update(env_src.get('system-environment', {}).get( + section, {}).get(m_name, {}).get(function, {}).copy()) + + return result diff --git a/salt/utils/extend.py b/salt/utils/extend.py index a8838be6fb..cb12cc4973 100644 --- a/salt/utils/extend.py +++ b/salt/utils/extend.py @@ -10,7 +10,7 @@ directory. This tool uses Jinja2 for templating. This tool is accessed using `salt-extend` - :codeauthor: :email:`Anthony Shaw ` + :codeauthor: Anthony Shaw ''' # Import Python libs diff --git a/salt/utils/filebuffer.py b/salt/utils/filebuffer.py index 15acabbf56..d6a4264b4c 100644 --- a/salt/utils/filebuffer.py +++ b/salt/utils/filebuffer.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.utils.filebuffer diff --git a/salt/utils/functools.py b/salt/utils/functools.py index cd4769ebcf..e5c5835a35 100644 --- a/salt/utils/functools.py +++ b/salt/utils/functools.py @@ -56,6 +56,6 @@ def alias_function(fun, name, doc=None): orig_name = fun.__name__ alias_msg = ('\nThis function is an alias of ' '``{0}``.\n'.format(orig_name)) - alias_fun.__doc__ = alias_msg + fun.__doc__ + alias_fun.__doc__ = alias_msg + (fun.__doc__ or '') return alias_fun diff --git a/salt/utils/gitfs.py b/salt/utils/gitfs.py index 4831a20517..caf539080f 100644 --- a/salt/utils/gitfs.py +++ b/salt/utils/gitfs.py @@ -93,7 +93,7 @@ try: import git import gitdb GITPYTHON_VERSION = _LooseVersion(git.__version__) -except ImportError: +except Exception: GITPYTHON_VERSION = None try: @@ -476,6 +476,10 @@ class GitProvider(object): use_tags = 'tag' in self.ref_types ret = set() + if salt.utils.stringutils.is_hex(self.base): + # gitfs_base or per-saltenv 'base' may point to a commit ID, which + # would not show up in the refs. Make sure we include it. + ret.add('base') for ref in salt.utils.data.decode(refs): if ref.startswith('refs/'): ref = ref[5:] diff --git a/salt/utils/hashutils.py b/salt/utils/hashutils.py index ee01be7377..156c7a2ca1 100644 --- a/salt/utils/hashutils.py +++ b/salt/utils/hashutils.py @@ -14,6 +14,7 @@ import os # Import Salt libs from salt.ext import six import salt.utils.files +import salt.utils.platform import salt.utils.stringutils from salt.utils.decorators.jinja import jinja_filter @@ -28,7 +29,8 @@ def base64_b64encode(instr): newline ('\\n') characters in the encoded output. ''' return salt.utils.stringutils.to_unicode( - base64.b64encode(salt.utils.stringutils.to_bytes(instr)) + base64.b64encode(salt.utils.stringutils.to_bytes(instr)), + encoding='utf8' if salt.utils.platform.is_windows() else None ) @@ -39,7 +41,10 @@ def base64_b64decode(instr): ''' decoded = base64.b64decode(salt.utils.stringutils.to_bytes(instr)) try: - return salt.utils.stringutils.to_unicode(decoded) + return salt.utils.stringutils.to_unicode( + decoded, + encoding='utf8' if salt.utils.platform.is_windows() else None + ) except UnicodeDecodeError: return decoded @@ -53,7 +58,8 @@ def base64_encodestring(instr): at the end of the encoded string. ''' return salt.utils.stringutils.to_unicode( - base64.encodestring(salt.utils.stringutils.to_bytes(instr)) + base64.encodestring(salt.utils.stringutils.to_bytes(instr)), + encoding='utf8' if salt.utils.platform.is_windows() else None ) @@ -69,7 +75,10 @@ def base64_decodestring(instr): # PY2 decoded = base64.decodestring(b) try: - return salt.utils.stringutils.to_unicode(decoded) + return salt.utils.stringutils.to_unicode( + decoded, + encoding='utf8' if salt.utils.platform.is_windows() else None + ) except UnicodeDecodeError: return decoded diff --git a/salt/utils/http.py b/salt/utils/http.py index bc520a48af..6436629496 100644 --- a/salt/utils/http.py +++ b/salt/utils/http.py @@ -61,7 +61,7 @@ import salt.ext.six.moves.http_client import salt.ext.six.moves.http_cookiejar import salt.ext.six.moves.urllib.request as urllib_request from salt.ext.six.moves.urllib.error import URLError -from salt.ext.six.moves.urllib.parse import splitquery +from salt.ext.six.moves.urllib.parse import splitquery, urlparse from salt.ext.six.moves.urllib.parse import urlencode as _urlencode # pylint: enable=import-error,no-name-in-module @@ -500,6 +500,13 @@ def query(url, proxy_port = opts.get('proxy_port', None) proxy_username = opts.get('proxy_username', None) proxy_password = opts.get('proxy_password', None) + no_proxy = opts.get('no_proxy', []) + + # Since tornado doesnt support no_proxy, we'll always hand it empty proxies or valid ones + # except we remove the valid ones if a url has a no_proxy hostname in it + if urlparse(url_full).hostname in no_proxy: + proxy_host = None + proxy_port = None # We want to use curl_http if we have a proxy defined if proxy_host and proxy_port: diff --git a/salt/utils/immutabletypes.py b/salt/utils/immutabletypes.py index 8166793936..15c48443ca 100644 --- a/salt/utils/immutabletypes.py +++ b/salt/utils/immutabletypes.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.utils.immutabletypes diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py index 546f5b568d..4824c3d0fa 100644 --- a/salt/utils/jinja.py +++ b/salt/utils/jinja.py @@ -98,20 +98,51 @@ class SaltCacheLoader(BaseLoader): self.cached.append(template) def get_source(self, environment, template): - # checks for relative '..' paths - if '..' in template: - log.warning( - 'Discarded template path \'%s\', relative paths are ' - 'prohibited', template - ) - raise TemplateNotFound(template) + ''' + Salt-specific loader to find imported jinja files. - self.check_cache(template) + Jinja imports will be interpreted as originating from the top + of each of the directories in the searchpath when the template + name does not begin with './' or '../'. When a template name + begins with './' or '../' then the import will be relative to + the importing file. + + ''' + # FIXME: somewhere do seprataor replacement: '\\' => '/' + _template = template + if template.split('/', 1)[0] in ('..', '.'): + is_relative = True + else: + is_relative = False + # checks for relative '..' paths that step-out of file_roots + if is_relative: + # Starts with a relative path indicator + + if not environment or 'tpldir' not in environment.globals: + log.warning( + 'Relative path "%s" cannot be resolved without an environment', + template + ) + raise TemplateNotFound + base_path = environment.globals['tpldir'] + _template = os.path.normpath('/'.join((base_path, _template))) + if _template.split('/', 1)[0] == '..': + log.warning( + 'Discarded template path "%s": attempts to' + ' ascend outside of salt://', template + ) + raise TemplateNotFound(template) + + self.check_cache(_template) if environment and template: - tpldir = os.path.dirname(template).replace('\\', '/') + tpldir = os.path.dirname(_template).replace('\\', '/') + tplfile = _template + if is_relative: + tpldir = environment.globals.get('tpldir', tpldir) + tplfile = template tpldata = { - 'tplfile': template, + 'tplfile': tplfile, 'tpldir': '.' if tpldir == '' else tpldir, 'tpldot': tpldir.replace('/', '.'), } @@ -119,7 +150,7 @@ class SaltCacheLoader(BaseLoader): # pylint: disable=cell-var-from-loop for spath in self.searchpath: - filepath = os.path.join(spath, template) + filepath = os.path.join(spath, _template) try: with salt.utils.files.fopen(filepath, 'rb') as ifile: contents = ifile.read().decode(self.encoding) @@ -205,7 +236,7 @@ def skip_filter(data): ''' Suppress data output - .. code-balock:: yaml + .. code-block:: yaml {% my_string = "foo" %} @@ -278,6 +309,26 @@ def to_bool(val): return False +@jinja_filter('tojson') +def tojson(val, indent=None): + ''' + Implementation of tojson filter (only present in Jinja 2.9 and later). If + Jinja 2.9 or later is installed, then the upstream version of this filter + will be used. + ''' + options = {'ensure_ascii': True} + if indent is not None: + options['indent'] = indent + return ( + salt.utils.json.dumps( + val, **options + ).replace('<', '\\u003c') + .replace('>', '\\u003e') + .replace('&', '\\u0026') + .replace("'", '\\u0027') + ) + + @jinja_filter('quote') def quote(txt): ''' diff --git a/salt/utils/mac_utils.py b/salt/utils/mac_utils.py index 18be3e5e1d..dbd90d33ef 100644 --- a/salt/utils/mac_utils.py +++ b/salt/utils/mac_utils.py @@ -11,7 +11,11 @@ import subprocess import os import plistlib import time -import pwd +try: + import pwd +except ImportError: + # The pwd module is not available on all platforms + pass # Import Salt Libs import salt.modules.cmdmod @@ -120,6 +124,18 @@ def _run_all(cmd): return ret +def _check_launchctl_stderr(ret): + ''' + helper class to check the launchctl stderr. + launchctl does not always return bad exit code + if there is a failure + ''' + err = ret['stderr'].lower() + if 'service is disabled' in err: + return True + return False + + def execute_return_success(cmd): ''' Executes the passed command. Returns True if successful @@ -275,9 +291,10 @@ def launchctl(sub_cmd, *args, **kwargs): kwargs['python_shell'] = False kwargs = salt.utils.args.clean_kwargs(**kwargs) ret = __salt__['cmd.run_all'](cmd, **kwargs) + error = _check_launchctl_stderr(ret) # Raise an error or return successful result - if ret['retcode']: + if ret['retcode'] or error: out = 'Failed to {0} service:\n'.format(sub_cmd) out += 'stdout: {0}\n'.format(ret['stdout']) out += 'stderr: {0}\n'.format(ret['stderr']) diff --git a/salt/utils/memcached.py b/salt/utils/memcached.py index 78d39dc409..8e02317a24 100644 --- a/salt/utils/memcached.py +++ b/salt/utils/memcached.py @@ -110,7 +110,7 @@ def get_conn(opts, profile=None, host=None, port=None): def _check_stats(conn): ''' Helper function to check the stats data passed into it, and raise an - execption if none are returned. Otherwise, the stats are returned. + exception if none are returned. Otherwise, the stats are returned. ''' stats = conn.get_stats() if not stats: diff --git a/salt/utils/minions.py b/salt/utils/minions.py index 7a469f29e1..41660b725a 100644 --- a/salt/utils/minions.py +++ b/salt/utils/minions.py @@ -614,10 +614,23 @@ class CkMinions(object): return {'minions': list(minions), 'missing': []} - def connected_ids(self, subset=None, show_ipv4=False, include_localhost=False): + def connected_ids(self, subset=None, show_ip=False, show_ipv4=None, include_localhost=None): ''' Return a set of all connected minion ids, optionally within a subset ''' + if include_localhost is not None: + salt.utils.versions.warn_until( + 'Sodium', + 'The \'include_localhost\' argument is no longer required; any' + 'connected localhost minion will always be included.' + ) + if show_ipv4 is not None: + salt.utils.versions.warn_until( + 'Sodium', + 'The \'show_ipv4\' argument has been renamed to \'show_ip\' as' + 'it now also includes IPv6 addresses for IPv6-connected' + 'minions.' + ) minions = set() if self.opts.get('minion_data_cache', False): search = self.cache.list('minions') @@ -627,7 +640,11 @@ class CkMinions(object): if '127.0.0.1' in addrs: # Add in the address of a possible locally-connected minion. addrs.discard('127.0.0.1') - addrs.update(set(salt.utils.network.ip_addrs(include_loopback=include_localhost))) + addrs.update(set(salt.utils.network.ip_addrs(include_loopback=False))) + if '::1' in addrs: + # Add in the address of a possible locally-connected minion. + addrs.discard('::1') + addrs.update(set(salt.utils.network.ip_addrs6(include_loopback=False))) if subset: search = subset for id_ in search: @@ -643,16 +660,19 @@ class CkMinions(object): continue grains = mdata.get('grains', {}) for ipv4 in grains.get('ipv4', []): - if ipv4 == '127.0.0.1' and not include_localhost: - continue - if ipv4 == '0.0.0.0': - continue if ipv4 in addrs: - if show_ipv4: + if show_ip: minions.add((id_, ipv4)) else: minions.add(id_) break + for ipv6 in grains.get('ipv6', []): + if ipv6 in addrs: + if show_ip: + minions.add((id_, ipv6)) + else: + minions.add(id_) + break return minions def _all_minions(self, expr=None): diff --git a/salt/utils/napalm.py b/salt/utils/napalm.py index 43536fc9a3..a384000ac0 100644 --- a/salt/utils/napalm.py +++ b/salt/utils/napalm.py @@ -17,6 +17,7 @@ Utils for the NAPALM modules and proxy. # Import Python libs from __future__ import absolute_import, unicode_literals, print_function +import copy import traceback import logging import importlib @@ -26,6 +27,7 @@ from functools import wraps from salt.ext import six as six import salt.output import salt.utils.platform +import salt.utils.args # Import third party libs try: @@ -93,14 +95,14 @@ def virtual(opts, virtualname, filename): ''' Returns the __virtual__. ''' - if ((HAS_NAPALM and NAPALM_MAJOR >= 2) or HAS_NAPALM_BASE) and (is_proxy(opts) or is_minion(opts)): + if (HAS_NAPALM and NAPALM_MAJOR >= 2) or HAS_NAPALM_BASE: return virtualname else: return ( False, ( '"{vname}"" {filename} cannot be loaded: ' - 'NAPALM is not installed or not running in a (proxy) minion' + 'NAPALM is not installed: ``pip install napalm``' ).format( vname=virtualname, filename='({filename})'.format(filename=filename) @@ -129,7 +131,7 @@ def call(napalm_device, method, *args, **kwargs): * result (True/False): if the operation succeeded * out (object): returns the object as-is from the call * comment (string): provides more details in case the call failed - * traceback (string): complete traceback in case of exeception. \ + * traceback (string): complete traceback in case of exception. \ Please submit an issue including this traceback \ on the `correct driver repo`_ and make sure to read the FAQ_ @@ -255,15 +257,12 @@ def get_device_opts(opts, salt_obj=None): ''' network_device = {} # by default, look in the proxy config details - device_dict = opts.get('proxy', {}) or opts.get('napalm', {}) + device_dict = opts.get('proxy', {}) if is_proxy(opts) else opts.get('napalm', {}) if opts.get('proxy') or opts.get('napalm'): opts['multiprocessing'] = device_dict.get('multiprocessing', False) # Most NAPALM drivers are SSH-based, so multiprocessing should default to False. # But the user can be allows one to have a different value for the multiprocessing, which will # override the opts. - if salt_obj and not device_dict: - # get the connection details from the opts - device_dict = salt_obj['config.merge']('napalm') if not device_dict: # still not able to setup log.error('Incorrect minion config. Please specify at least the napalm driver name!') @@ -367,11 +366,12 @@ def proxy_napalm_wrap(func): # the execution modules will make use of this variable from now on # previously they were accessing the device properties through the __proxy__ object always_alive = opts.get('proxy', {}).get('always_alive', True) - if salt.utils.platform.is_proxy() and always_alive: - # if it is running in a proxy and it's using the default always alive behaviour, - # will get the cached copy of the network device + if is_proxy(opts) and always_alive: + # if it is running in a NAPALM Proxy and it's using the default + # always alive behaviour, will get the cached copy of the network + # device object which should preserve the connection. wrapped_global_namespace['napalm_device'] = proxy['napalm.get_device']() - elif salt.utils.platform.is_proxy() and not always_alive: + elif is_proxy(opts) and not always_alive: # if still proxy, but the user does not want the SSH session always alive # get a new device instance # which establishes a new connection @@ -398,10 +398,36 @@ def proxy_napalm_wrap(func): # otherwise we risk to open multiple sessions wrapped_global_namespace['napalm_device'] = kwargs['inherit_napalm_device'] else: - # if no proxy + # if not a NAPLAM proxy # thus it is running on a regular minion, directly on the network device + # or another flavour of Minion from where we can invoke arbitrary + # NAPALM commands # get __salt__ from func_globals + log.debug('Not running in a NAPALM Proxy Minion') _salt_obj = wrapped_global_namespace.get('__salt__') + napalm_opts = _salt_obj['config.get']('napalm', {}) + napalm_inventory = _salt_obj['config.get']('napalm_inventory', {}) + log.debug('NAPALM opts found in the Minion config') + log.debug(napalm_opts) + clean_kwargs = salt.utils.args.clean_kwargs(**kwargs) + napalm_opts.update(clean_kwargs) # no need for deeper merge + log.debug('Merging the found opts with the CLI args') + log.debug(napalm_opts) + host = napalm_opts.get('host') or napalm_opts.get('hostname') or\ + napalm_opts.get('fqdn') or napalm_opts.get('ip') + if host and napalm_inventory and isinstance(napalm_inventory, dict) and\ + host in napalm_inventory: + inventory_opts = napalm_inventory[host] + log.debug('Found %s in the NAPALM inventory:', host) + log.debug(inventory_opts) + napalm_opts.update(inventory_opts) + log.debug('Merging the config for %s with the details found in the napalm inventory:', host) + log.debug(napalm_opts) + opts = copy.deepcopy(opts) # make sure we don't override the original + # opts, but just inject the CLI args from the kwargs to into the + # object manipulated by ``get_device_opts`` to extract the + # connection details, then use then to establish the connection. + opts['napalm'] = napalm_opts if 'inherit_napalm_device' not in kwargs or ('inherit_napalm_device' in kwargs and not kwargs['inherit_napalm_device']): # try to open a new connection diff --git a/salt/utils/nb_popen.py b/salt/utils/nb_popen.py index 502257dd7d..00680ad71a 100644 --- a/salt/utils/nb_popen.py +++ b/salt/utils/nb_popen.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.utils.nb_popen diff --git a/salt/utils/network.py b/salt/utils/network.py index 2fc71b99dc..fa5003dfbd 100644 --- a/salt/utils/network.py +++ b/salt/utils/network.py @@ -148,14 +148,18 @@ def _generate_minion_id(): addr=hosts.first() or 'localhost (N/A)', message=socket.gaierror) ) # Universal method for everywhere (Linux, Slowlaris, Windows etc) - for f_name in ['/etc/hostname', '/etc/nodename', '/etc/hosts', - r'{win}\system32\drivers\etc\hosts'.format(win=os.getenv('WINDIR'))]: - if not os.path.exists(f_name): - continue - with salt.utils.files.fopen(f_name) as f_hdl: - for hst in (line.strip().split('#')[0].strip().split() or None for line in f_hdl.read().split(os.linesep)): - if hst and (hst[0][:4] in ['127.', '::1'] or len(hst) == 1): - hosts.extend(hst) + for f_name in ('/etc/hostname', '/etc/nodename', '/etc/hosts', + r'{win}\system32\drivers\etc\hosts'.format(win=os.getenv('WINDIR'))): + try: + with salt.utils.files.fopen(f_name) as f_hdl: + for line in f_hdl: + line = salt.utils.stringutils.to_unicode(line) + hst = line.strip().split('#')[0].strip().split() + if hst: + if hst[0][:4] in ('127.', '::1') or len(hst) == 1: + hosts.extend(hst) + except IOError: + pass # include public and private ipaddresses return hosts.extend([addr for addr in ip_addrs() @@ -1225,7 +1229,11 @@ def hex2ip(hex_ip, invert=False): else: ip.append("{0[0]}{0[1]}:{0[2]}{0[3]}".format(ip_part)) try: - return ipaddress.IPv6Address(":".join(ip)).compressed + address = ipaddress.IPv6Address(":".join(ip)) + if address.ipv4_mapped: + return str(address.ipv4_mapped) + else: + return address.compressed except ipaddress.AddressValueError as ex: log.error('hex2ip - ipv6 address error: {0}'.format(ex)) return hex_ip @@ -1278,7 +1286,11 @@ def active_tcp(): line = salt.utils.stringutils.to_unicode(line) if line.strip().startswith('sl'): continue - ret.update(_parse_tcp_line(line)) + iret = _parse_tcp_line(line) + sl = next(iter(iret)) + if iret[sl]['state'] == 1: # 1 is ESTABLISHED + del iret[sl]['state'] + ret[len(ret)] = iret[sl] return ret @@ -1316,7 +1328,7 @@ def _remotes_on(port, which_end): continue iret = _parse_tcp_line(line) sl = next(iter(iret)) - if iret[sl][which_end] == port: + if iret[sl][which_end] == port and iret[sl]['state'] == 1: # 1 is ESTABLISHED ret.add(iret[sl]['remote_addr']) if not proc_available: # Fallback to use OS specific tools @@ -1352,6 +1364,7 @@ def _parse_tcp_line(line): ret[sl]['local_port'] = int(l_port, 16) ret[sl]['remote_addr'] = hex2ip(r_addr, True) ret[sl]['remote_port'] = int(r_port, 16) + ret[sl]['state'] = int(comps[3], 16) return ret diff --git a/salt/utils/odict.py b/salt/utils/odict.py index 601b597e94..9c7b95ca1b 100644 --- a/salt/utils/odict.py +++ b/salt/utils/odict.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.utils.odict diff --git a/salt/utils/parsers.py b/salt/utils/parsers.py index 05de0b4a67..c654f033cd 100644 --- a/salt/utils/parsers.py +++ b/salt/utils/parsers.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.utils.parsers @@ -977,9 +977,17 @@ class DaemonMixIn(six.with_metaclass(MixInMeta, object)): # Log error only when running salt-master as a root user. # Otherwise this can be ignored, since salt-master is able to # overwrite the PIDfile on the next start. - if not os.getuid(): - logger.info('PIDfile could not be deleted: %s', six.text_type(self.config['pidfile'])) - logger.debug(six.text_type(err)) + err_msg = ('PIDfile could not be deleted: %s', + six.text_type(self.config['pidfile'])) + if salt.utils.platform.is_windows(): + user = salt.utils.win_functions.get_current_user() + if salt.utils.win_functions.is_admin(user): + logger.info(*err_msg) + logger.debug(six.text_type(err)) + else: + if not os.getuid(): + logger.info(*err_msg) + logger.debug(six.text_type(err)) def set_pidfile(self): from salt.utils.process import set_pidfile @@ -3023,6 +3031,12 @@ class SaltSSHOptionParser(six.with_metaclass(OptionParserMeta, dest='ssh_priv', help='Ssh private key file.' ) + auth_group.add_option( + '--priv-passwd', + dest='ssh_priv_passwd', + default='', + help='Passphrase for ssh private key file.' + ) auth_group.add_option( '-i', '--ignore-host-keys', diff --git a/salt/utils/saltclass.py b/salt/utils/saltclass.py index e5a0ae0bbd..e1dfd8bb10 100644 --- a/salt/utils/saltclass.py +++ b/salt/utils/saltclass.py @@ -206,10 +206,12 @@ def expand_classes_in_order(minion_dict, expanded_classes[klass] = {} # Merge newly found pillars into existing ones - dict_merge(salt_data['__pillar__'], expanded_classes[klass].get('pillars', {})) + new_pillars = expanded_classes[klass].get('pillars', {}) + if new_pillars: + dict_merge(salt_data['__pillar__'], new_pillars) # Now replace class element in classes_to_expand by expansion - if 'classes' in expanded_classes[klass]: + if expanded_classes[klass].get('classes'): l_id = classes_to_expand.index(klass) classes_to_expand[l_id:l_id] = expanded_classes[klass]['classes'] expand_classes_in_order(minion_dict, diff --git a/salt/utils/sanitizers.py b/salt/utils/sanitizers.py index 0344361157..826949d642 100644 --- a/salt/utils/sanitizers.py +++ b/salt/utils/sanitizers.py @@ -18,10 +18,12 @@ from __future__ import absolute_import, print_function, unicode_literals import re import os.path +import fnmatch # Import Salt libs from salt.ext import six from salt.exceptions import CommandExecutionError +import salt.utils.stringutils class InputSanitizer(object): @@ -62,3 +64,32 @@ class InputSanitizer(object): clean = InputSanitizer() + + +def mask_args_value(data, mask): + ''' + Mask a line in the data, which matches "mask". + + This can be used for cases where values in your roster file may contain + sensitive data such as IP addresses, passwords, user names, etc. + + Note that this works only when ``data`` is a single string (i.e. when the + data in the roster is formatted as ``key: value`` pairs in YAML syntax). + + :param data: String data, already rendered. + :param mask: Mask that matches a single line + + :return: + ''' + if not mask: + return data + + out = [] + for line in data.split(os.linesep): + if fnmatch.fnmatch(line.strip(), mask) and ':' in line: + key, value = line.split(':', 1) + out.append('{}: {}'.format(salt.utils.stringutils.to_unicode(key.strip()), '** hidden **')) + else: + out.append(line) + + return '\n'.join(out) diff --git a/salt/utils/schema.py b/salt/utils/schema.py index 95a8b1a3ff..e55285309a 100644 --- a/salt/utils/schema.py +++ b/salt/utils/schema.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` - :codeauthor: :email:`Alexandru Bleotu (alexandru.bleotu@morganstanley.com)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) + :codeauthor: Alexandru Bleotu (alexandru.bleotu@morganstanley.com) salt.utils.schema diff --git a/salt/utils/templates.py b/salt/utils/templates.py index 207b973a55..8e26475d81 100644 --- a/salt/utils/templates.py +++ b/salt/utils/templates.py @@ -357,8 +357,12 @@ def render_jinja_tmpl(tmplstr, context, tmplpath=None): jinja_env = jinja2.Environment(undefined=jinja2.StrictUndefined, **env_args) + tojson_filter = jinja_env.filters.get('tojson') jinja_env.tests.update(JinjaTest.salt_jinja_tests) jinja_env.filters.update(JinjaFilter.salt_jinja_filters) + if tojson_filter is not None: + # Use the existing tojson filter, if present (jinja2 >= 2.9) + jinja_env.filters['tojson'] = tojson_filter jinja_env.globals.update(JinjaGlobal.salt_jinja_globals) # globals diff --git a/salt/utils/thin.py b/salt/utils/thin.py index 3d2c6609a2..a867d1e70c 100644 --- a/salt/utils/thin.py +++ b/salt/utils/thin.py @@ -6,16 +6,15 @@ Generate the salt thin tarball from the installed python files # Import python libs from __future__ import absolute_import, print_function, unicode_literals -import os -import sys import copy -import shutil -import tarfile -import zipfile -import tempfile -import subprocess -import salt.utils.stringutils import logging +import os +import shutil +import subprocess +import sys +import tarfile +import tempfile +import zipfile # Import third party libs import jinja2 @@ -78,6 +77,12 @@ import salt.utils.stringutils import salt.exceptions import salt.version +if _six.PY2: + import concurrent +else: + concurrent = None + + log = logging.getLogger(__name__) @@ -259,7 +264,7 @@ def get_tops(extra_mods='', so_mods=''): :return: ''' tops = [] - for mod in [salt, jinja2, yaml, tornado, msgpack, certifi, singledispatch, + for mod in [salt, jinja2, yaml, tornado, msgpack, certifi, singledispatch, concurrent, singledispatch_helpers, ssl_match_hostname, markupsafe, backports_abc]: if mod: log.debug('Adding module to the tops: "%s"', mod.__name__) diff --git a/salt/utils/validate/path.py b/salt/utils/validate/path.py index 92611ccda0..6dc3ee8cb1 100644 --- a/salt/utils/validate/path.py +++ b/salt/utils/validate/path.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.utils.validate.path diff --git a/salt/utils/vmware.py b/salt/utils/vmware.py index 2e85546c7a..721f496bc3 100644 --- a/salt/utils/vmware.py +++ b/salt/utils/vmware.py @@ -89,7 +89,6 @@ import salt.utils.path import salt.utils.platform import salt.utils.stringutils - # Import Third Party Libs from salt.ext import six from salt.ext.six.moves.http_client import BadStatusLine # pylint: disable=E0611 @@ -119,8 +118,8 @@ def __virtual__(): ''' if HAS_PYVMOMI: return True - else: - return False, 'Missing dependency: The salt.utils.vmware module requires pyVmomi.' + + return False, 'Missing dependency: The salt.utils.vmware module requires pyVmomi.' def esxcli(host, user, pwd, cmd, protocol=None, port=None, esxi_host=None, credstore=None): @@ -227,8 +226,8 @@ def _get_service_instance(host, username, password, protocol, log.error('This may mean that a version of PyVmomi EARLIER than 6.0.0.2016.6 is installed.') log.error('We recommend updating to that version or later.') raise - except Exception as exc: - + except Exception as exc: # pylint: disable=broad-except + # pyVmomi's SmartConnect() actually raises Exception in some cases. default_msg = 'Could not connect to host \'{0}\'. ' \ 'Please check the debug log for more information.'.format(host) @@ -236,8 +235,6 @@ def _get_service_instance(host, username, password, protocol, if (isinstance(exc, vim.fault.HostConnectFault) and '[SSL: CERTIFICATE_VERIFY_FAILED]' in exc.msg) or \ '[SSL: CERTIFICATE_VERIFY_FAILED]' in six.text_type(exc): - - import ssl service_instance = SmartConnect( host=host, user=username, @@ -251,9 +248,9 @@ def _get_service_instance(host, username, password, protocol, log.exception(exc) err_msg = exc.msg if hasattr(exc, 'msg') else default_msg raise salt.exceptions.VMwareConnectionError(err_msg) - except Exception as exc: + except Exception as exc: # pylint: disable=broad-except + # pyVmomi's SmartConnect() actually raises Exception in some cases. if 'certificate verify failed' in six.text_type(exc): - import ssl context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) context.verify_mode = ssl.CERT_NONE try: @@ -362,7 +359,9 @@ def get_service_instance(host, username=None, password=None, protocol=None, service_instance = GetSi() if service_instance: stub = GetStub() - if salt.utils.platform.is_proxy() or (hasattr(stub, 'host') and stub.host != ':'.join([host, six.text_type(port)])): + if (salt.utils.platform.is_proxy() or + (hasattr(stub, 'host') and + stub.host != ':'.join([host, six.text_type(port)]))): # Proxies will fork and mess up the cached service instance. # If this is a proxy or we are connecting to a different host # invalidate the service instance to avoid a potential memory leak @@ -432,9 +431,9 @@ def get_new_service_instance_stub(service_instance, path, ns=None, Version of the new stub. Default value is None. ''' - #For python 2.7.9 and later, the defaul SSL conext has more strict - #connection handshaking rule. We may need turn of the hostname checking - #and client side cert verification + # For python 2.7.9 and later, the default SSL context has more strict + # connection handshaking rule. We may need turn off the hostname checking + # and the client side cert verification. context = None if sys.version_info[:3] > (2, 7, 8): context = ssl.create_default_context() @@ -669,56 +668,54 @@ def get_hardware_grains(service_instance): if get_inventory(service_instance).about.apiType == 'HostAgent': view = service_instance.content.viewManager.CreateContainerView(service_instance.RetrieveContent().rootFolder, [vim.HostSystem], True) - if view: - if view.view: - if len(view.view) > 0: - hw_grain_data['manufacturer'] = view.view[0].hardware.systemInfo.vendor - hw_grain_data['productname'] = view.view[0].hardware.systemInfo.model + if view and view.view: + hw_grain_data['manufacturer'] = view.view[0].hardware.systemInfo.vendor + hw_grain_data['productname'] = view.view[0].hardware.systemInfo.model - for _data in view.view[0].hardware.systemInfo.otherIdentifyingInfo: - if _data.identifierType.key == 'ServiceTag': - hw_grain_data['serialnumber'] = _data.identifierValue + for _data in view.view[0].hardware.systemInfo.otherIdentifyingInfo: + if _data.identifierType.key == 'ServiceTag': + hw_grain_data['serialnumber'] = _data.identifierValue - hw_grain_data['osfullname'] = view.view[0].summary.config.product.fullName - hw_grain_data['osmanufacturer'] = view.view[0].summary.config.product.vendor - hw_grain_data['osrelease'] = view.view[0].summary.config.product.version - hw_grain_data['osbuild'] = view.view[0].summary.config.product.build - hw_grain_data['os_family'] = view.view[0].summary.config.product.name - hw_grain_data['os'] = view.view[0].summary.config.product.name - hw_grain_data['mem_total'] = view.view[0].hardware.memorySize /1024/1024 - hw_grain_data['biosversion'] = view.view[0].hardware.biosInfo.biosVersion - hw_grain_data['biosreleasedate'] = view.view[0].hardware.biosInfo.releaseDate.date().strftime('%m/%d/%Y') - hw_grain_data['cpu_model'] = view.view[0].hardware.cpuPkg[0].description - hw_grain_data['kernel'] = view.view[0].summary.config.product.productLineId - hw_grain_data['num_cpu_sockets'] = view.view[0].hardware.cpuInfo.numCpuPackages - hw_grain_data['num_cpu_cores'] = view.view[0].hardware.cpuInfo.numCpuCores - hw_grain_data['num_cpus'] = hw_grain_data['num_cpu_sockets'] * hw_grain_data['num_cpu_cores'] - hw_grain_data['ip_interfaces'] = {} - hw_grain_data['ip4_interfaces'] = {} - hw_grain_data['ip6_interfaces'] = {} - hw_grain_data['hwaddr_interfaces'] = {} - for _vnic in view.view[0].configManager.networkSystem.networkConfig.vnic: - hw_grain_data['ip_interfaces'][_vnic.device] = [] - hw_grain_data['ip4_interfaces'][_vnic.device] = [] - hw_grain_data['ip6_interfaces'][_vnic.device] = [] + hw_grain_data['osfullname'] = view.view[0].summary.config.product.fullName + hw_grain_data['osmanufacturer'] = view.view[0].summary.config.product.vendor + hw_grain_data['osrelease'] = view.view[0].summary.config.product.version + hw_grain_data['osbuild'] = view.view[0].summary.config.product.build + hw_grain_data['os_family'] = view.view[0].summary.config.product.name + hw_grain_data['os'] = view.view[0].summary.config.product.name + hw_grain_data['mem_total'] = view.view[0].hardware.memorySize /1024/1024 + hw_grain_data['biosversion'] = view.view[0].hardware.biosInfo.biosVersion + hw_grain_data['biosreleasedate'] = view.view[0].hardware.biosInfo.releaseDate.date().strftime('%m/%d/%Y') + hw_grain_data['cpu_model'] = view.view[0].hardware.cpuPkg[0].description + hw_grain_data['kernel'] = view.view[0].summary.config.product.productLineId + hw_grain_data['num_cpu_sockets'] = view.view[0].hardware.cpuInfo.numCpuPackages + hw_grain_data['num_cpu_cores'] = view.view[0].hardware.cpuInfo.numCpuCores + hw_grain_data['num_cpus'] = hw_grain_data['num_cpu_sockets'] * hw_grain_data['num_cpu_cores'] + hw_grain_data['ip_interfaces'] = {} + hw_grain_data['ip4_interfaces'] = {} + hw_grain_data['ip6_interfaces'] = {} + hw_grain_data['hwaddr_interfaces'] = {} + for _vnic in view.view[0].configManager.networkSystem.networkConfig.vnic: + hw_grain_data['ip_interfaces'][_vnic.device] = [] + hw_grain_data['ip4_interfaces'][_vnic.device] = [] + hw_grain_data['ip6_interfaces'][_vnic.device] = [] - hw_grain_data['ip_interfaces'][_vnic.device].append(_vnic.spec.ip.ipAddress) - hw_grain_data['ip4_interfaces'][_vnic.device].append(_vnic.spec.ip.ipAddress) - if _vnic.spec.ip.ipV6Config: - hw_grain_data['ip6_interfaces'][_vnic.device].append(_vnic.spec.ip.ipV6Config.ipV6Address) - hw_grain_data['hwaddr_interfaces'][_vnic.device] = _vnic.spec.mac - hw_grain_data['host'] = view.view[0].configManager.networkSystem.dnsConfig.hostName - hw_grain_data['domain'] = view.view[0].configManager.networkSystem.dnsConfig.domainName - hw_grain_data['fqdn'] = '{0}{1}{2}'.format( - view.view[0].configManager.networkSystem.dnsConfig.hostName, - ('.' if view.view[0].configManager.networkSystem.dnsConfig.domainName else ''), - view.view[0].configManager.networkSystem.dnsConfig.domainName) + hw_grain_data['ip_interfaces'][_vnic.device].append(_vnic.spec.ip.ipAddress) + hw_grain_data['ip4_interfaces'][_vnic.device].append(_vnic.spec.ip.ipAddress) + if _vnic.spec.ip.ipV6Config: + hw_grain_data['ip6_interfaces'][_vnic.device].append(_vnic.spec.ip.ipV6Config.ipV6Address) + hw_grain_data['hwaddr_interfaces'][_vnic.device] = _vnic.spec.mac + hw_grain_data['host'] = view.view[0].configManager.networkSystem.dnsConfig.hostName + hw_grain_data['domain'] = view.view[0].configManager.networkSystem.dnsConfig.domainName + hw_grain_data['fqdn'] = '{0}{1}{2}'.format( + view.view[0].configManager.networkSystem.dnsConfig.hostName, + ('.' if view.view[0].configManager.networkSystem.dnsConfig.domainName else ''), + view.view[0].configManager.networkSystem.dnsConfig.domainName) - for _pnic in view.view[0].configManager.networkSystem.networkInfo.pnic: - hw_grain_data['hwaddr_interfaces'][_pnic.device] = _pnic.mac + for _pnic in view.view[0].configManager.networkSystem.networkInfo.pnic: + hw_grain_data['hwaddr_interfaces'][_pnic.device] = _pnic.mac - hw_grain_data['timezone'] = view.view[0].configManager.dateTimeSystem.dateTimeInfo.timeZone.name - view = None + hw_grain_data['timezone'] = view.view[0].configManager.dateTimeSystem.dateTimeInfo.timeZone.name + view = None return hw_grain_data @@ -947,9 +944,9 @@ def get_mors_with_properties(service_instance, object_type, property_list=None, content = get_content(*content_args, **content_kwargs) except BadStatusLine: content = get_content(*content_args, **content_kwargs) - except IOError as e: - if e.errno != errno.EPIPE: - raise e + except IOError as exc: + if exc.errno != errno.EPIPE: + raise exc content = get_content(*content_args, **content_kwargs) object_list = [] @@ -1029,6 +1026,8 @@ def get_network_adapter_type(adapter_type): elif adapter_type == 'e1000e': return vim.vm.device.VirtualE1000e() + raise ValueError('An unknown network adapter object type name.') + def get_network_adapter_object_type(adapter_object): ''' @@ -1048,6 +1047,8 @@ def get_network_adapter_object_type(adapter_object): if isinstance(adapter_object, vim.vm.device.VirtualE1000): return 'e1000' + raise ValueError('An unknown network adapter object type.') + def get_dvss(dc_ref, dvs_names=None, get_all_dvss=False): ''' @@ -1223,8 +1224,8 @@ def get_dvportgroups(parent_ref, portgroup_names=None, get_all_portgroups Return all portgroups in the parent. Default is False. ''' - if not (isinstance(parent_ref, vim.Datacenter) or - isinstance(parent_ref, vim.DistributedVirtualSwitch)): + if not (isinstance(parent_ref, + (vim.Datacenter, vim.DistributedVirtualSwitch))): raise salt.exceptions.ArgumentValueError( 'Parent has to be either a datacenter, ' 'or a distributed virtual switch') @@ -1554,7 +1555,7 @@ def add_license(service_instance, key, description, license_manager=None): label.value = description log.debug('Adding license \'%s\'', description) try: - license = license_manager.AddLicense(key, [label]) + vmware_license = license_manager.AddLicense(key, [label]) except vim.fault.NoPermission as exc: log.exception(exc) raise salt.exceptions.VMwareApiError( @@ -1566,7 +1567,7 @@ def add_license(service_instance, key, description, license_manager=None): except vmodl.RuntimeFault as exc: log.exception(exc) raise salt.exceptions.VMwareRuntimeError(exc.msg) - return license + return vmware_license def get_assigned_licenses(service_instance, entity_ref=None, entity_name=None, @@ -1709,9 +1710,10 @@ def assign_license(service_instance, license_key, license_name, log.trace('Assigning license to \'%s\'', entity_name) try: - license = license_assignment_manager.UpdateAssignedLicense( + vmware_license = license_assignment_manager.UpdateAssignedLicense( entity_id, - license_key) + license_key, + license_name) except vim.fault.NoPermission as exc: log.exception(exc) raise salt.exceptions.VMwareApiError( @@ -1723,7 +1725,7 @@ def assign_license(service_instance, license_key, license_name, except vmodl.RuntimeFault as exc: log.exception(exc) raise salt.exceptions.VMwareRuntimeError(exc.msg) - return license + return vmware_license def list_datacenters(service_instance): @@ -1836,7 +1838,7 @@ def get_cluster(dc_ref, cluster): container_ref=dc_ref, property_list=['name'], traversal_spec=traversal_spec) - if i['name'] == cluster] + if i['name'] == cluster] if not items: raise salt.exceptions.VMwareObjectRetrievalError( 'Cluster \'{0}\' was not found in datacenter ' @@ -2189,7 +2191,8 @@ def _get_partition_info(storage_system, device_path): return partition_infos[0] -def _get_new_computed_partition_spec(hostname, storage_system, device_path, +def _get_new_computed_partition_spec(storage_system, + device_path, partition_info): ''' Computes the new disk partition info when adding a new vmfs partition that @@ -2198,7 +2201,7 @@ def _get_new_computed_partition_spec(hostname, storage_system, device_path, ''' log.trace('Adding a partition at the end of the disk and getting the new ' 'computed partition spec') - #TODO implement support for multiple partitions + # TODO implement support for multiple partitions # We support adding a partition add the end of the disk with partitions free_partitions = [p for p in partition_info.layout.partition if p.type == 'none'] @@ -2282,7 +2285,10 @@ def create_vmfs_datastore(host_ref, datastore_name, disk_ref, target_disk.devicePath) log.trace('partition_info = %s', partition_info) new_partition_number, partition_spec = _get_new_computed_partition_spec( - hostname, storage_system, target_disk.devicePath, partition_info) + storage_system, + target_disk.devicePath, + partition_info + ) spec = vim.VmfsDatastoreCreateSpec( vmfs=vim.HostVmfsSpec( majorVersion=vmfs_major_version, @@ -2355,7 +2361,6 @@ def remove_datastore(service_instance, datastore_ref): datastore_ref, ['host', 'info', 'name']) ds_name = ds_props['name'] log.debug('Removing datastore \'%s\'', ds_name) - ds_info = ds_props['info'] ds_hosts = ds_props.get('host') if not ds_hosts: raise salt.exceptions.VMwareApiError( @@ -2417,7 +2422,6 @@ def get_hosts(service_instance, datacenter_name=None, host_names=None, if cluster_name: # Retrieval to test if cluster exists. Cluster existence only makes # sense if the datacenter has been specified - cluster = get_cluster(start_point, cluster_name) properties.append('parent') # Search for the objects @@ -2469,7 +2473,6 @@ def _get_scsi_address_to_lun_key_map(service_instance, hostname Name of the host. Default is None. ''' - map = {} if not hostname: hostname = get_managed_object_name(host_ref) if not storage_system: @@ -2582,8 +2585,8 @@ def get_scsi_address_to_lun_map(host_ref, storage_system=None, hostname=None): if not storage_system: storage_system = get_storage_system(si, host_ref, hostname) lun_ids_to_scsi_addr_map = \ - _get_scsi_address_to_lun_key_map(si, host_ref, storage_system, - hostname) + _get_scsi_address_to_lun_key_map(si, host_ref, storage_system, + hostname) luns_to_key_map = {d.key: d for d in get_all_luns(host_ref, storage_system, hostname)} return {scsi_addr: luns_to_key_map[lun_key] for scsi_addr, lun_key in @@ -2834,19 +2837,18 @@ def _check_disks_in_diskgroup(disk_group, cache_disk_id, capacity_disk_ids): raise salt.exceptions.ArgumentValueError( 'Incorrect diskgroup cache disk; got id: \'{0}\'; expected id: ' '\'{1}\''.format(disk_group.ssd.canonicalName, cache_disk_id)) - if sorted([d.canonicalName for d in disk_group.nonSsd]) != \ - sorted(capacity_disk_ids): - + non_ssd_disks = [d.canonicalName for d in disk_group.nonSsd] + if sorted(non_ssd_disks) != sorted(capacity_disk_ids): raise salt.exceptions.ArgumentValueError( 'Incorrect capacity disks; got ids: \'{0}\'; expected ids: \'{1}\'' - ''.format(sorted([d.canonicalName for d in disk_group.nonSsd]), + ''.format(sorted(non_ssd_disks), sorted(capacity_disk_ids))) log.trace('Checked disks in diskgroup with cache disk id \'%s\'', cache_disk_id) return True -#TODO Support host caches on multiple datastores +# TODO Support host caches on multiple datastores def get_host_cache(host_ref, host_cache_manager=None): ''' Returns a vim.HostScsiDisk if the host cache is configured on the specified @@ -2887,7 +2889,7 @@ def get_host_cache(host_ref, host_cache_manager=None): return results['cacheConfigurationInfo'][0] -#TODO Support host caches on multiple datastores +# TODO Support host caches on multiple datastores def configure_host_cache(host_ref, datastore_ref, swap_size_MiB, host_cache_manager=None): ''' @@ -3222,8 +3224,9 @@ def get_vm_by_property(service_instance, name, datacenter=None, vm_properties=No if not vm_formatted: raise salt.exceptions.VMwareObjectRetrievalError('The virtual machine was not found.') elif len(vm_formatted) > 1: - raise salt.exceptions.VMwareMultipleObjectsError('Multiple virtual machines were found with the ' - 'same name, please specify a container.') + raise salt.exceptions.VMwareMultipleObjectsError(' '.join([ + 'Multiple virtual machines were found with the' + 'same name, please specify a container.'])) return vm_formatted[0] @@ -3250,13 +3253,15 @@ def get_folder(service_instance, datacenter, placement, base_vm_name=None): if 'parent' in vm_props: folder_object = vm_props['parent'] else: - raise salt.exceptions.VMwareObjectRetrievalError('The virtual machine parent ' - 'object is not defined') + raise salt.exceptions.VMwareObjectRetrievalError(' '.join([ + 'The virtual machine parent', + 'object is not defined'])) elif 'folder' in placement: folder_objects = salt.utils.vmware.get_folders(service_instance, [placement['folder']], datacenter) if len(folder_objects) > 1: - raise salt.exceptions.VMwareMultipleObjectsError('Multiple instances are available of the ' - 'specified folder {0}'.format(placement['folder'])) + raise salt.exceptions.VMwareMultipleObjectsError(' '.join([ + 'Multiple instances are available of the', + 'specified folder {0}'.format(placement['folder'])])) folder_object = folder_objects[0] elif datacenter: datacenter_object = salt.utils.vmware.get_datacenter(service_instance, datacenter) @@ -3286,10 +3291,13 @@ def get_placement(service_instance, datacenter, placement=None): if 'host' in placement: host_objects = get_hosts(service_instance, datacenter_name=datacenter, host_names=[placement['host']]) if not host_objects: - raise salt.exceptions.VMwareObjectRetrievalError('The specified host {0} cannot be found.'.format(placement['host'])) + raise salt.exceptions.VMwareObjectRetrievalError(' '.join([ + 'The specified host', + '{0} cannot be found.'.format(placement['host'])])) try: - host_props = get_properties_of_managed_object(host_objects[0], - properties=['resourcePool']) + host_props = \ + get_properties_of_managed_object(host_objects[0], + properties=['resourcePool']) resourcepool_object = host_props['resourcePool'] except vmodl.query.InvalidProperty: traversal_spec = vmodl.query.PropertyCollector.TraversalSpec( @@ -3316,16 +3324,18 @@ def get_placement(service_instance, datacenter, placement=None): [placement['resourcepool']], datacenter_name=datacenter) if len(resourcepool_objects) > 1: - raise salt.exceptions.VMwareMultipleObjectsError('Multiple instances are available of the ' - 'specified host {}.'.format(placement['host'])) + raise salt.exceptions.VMwareMultipleObjectsError(' '.join([ + 'Multiple instances are available of the', + 'specified host {}.'.format(placement['host'])])) resourcepool_object = resourcepool_objects[0] res_props = get_properties_of_managed_object(resourcepool_object, properties=['parent']) if 'parent' in res_props: placement_object = res_props['parent'] else: - raise salt.exceptions.VMwareObjectRetrievalError('The resource pool\'s parent ' - 'object is not defined') + raise salt.exceptions.VMwareObjectRetrievalError(' '.join([ + 'The resource pool\'s parent', + 'object is not defined'])) elif 'cluster' in placement: datacenter_object = get_datacenter(service_instance, datacenter) cluster_object = get_cluster(datacenter_object, placement['cluster']) @@ -3334,12 +3344,14 @@ def get_placement(service_instance, datacenter, placement=None): if 'resourcePool' in clus_props: resourcepool_object = clus_props['resourcePool'] else: - raise salt.exceptions.VMwareObjectRetrievalError('The cluster\'s resource pool ' - 'object is not defined') + raise salt.exceptions.VMwareObjectRetrievalError(' '.join([ + 'The cluster\'s resource pool', + 'object is not defined'])) placement_object = cluster_object else: # We are checking the schema for this object, this exception should never be raised - raise salt.exceptions.VMwareObjectRetrievalError('Placement is not defined.') + raise salt.exceptions.VMwareObjectRetrievalError(' '.join([ + 'Placement is not defined.'])) return (resourcepool_object, placement_object) @@ -3409,8 +3421,9 @@ def power_cycle_vm(virtual_machine, action='on'): try: wait_for_task(task, get_managed_object_name(virtual_machine), task_name) except salt.exceptions.VMwareFileNotFoundError as exc: - raise salt.exceptions.VMwarePowerOnError('An error occurred during power ' - 'operation, a file was not found: {0}'.format(exc)) + raise salt.exceptions.VMwarePowerOnError(' '.join([ + 'An error occurred during power', + 'operation, a file was not found: {0}'.format(exc)])) return virtual_machine diff --git a/salt/utils/vt.py b/salt/utils/vt.py index fdc6fbeb40..7167117741 100644 --- a/salt/utils/vt.py +++ b/salt/utils/vt.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) salt.utils.vt diff --git a/salt/utils/win_functions.py b/salt/utils/win_functions.py index a57c526700..0a9bbf3b0e 100644 --- a/salt/utils/win_functions.py +++ b/salt/utils/win_functions.py @@ -119,7 +119,7 @@ def get_sid_from_name(name): return win32security.ConvertSidToStringSid(sid) -def get_current_user(): +def get_current_user(with_domain=True): ''' Gets the user executing the process @@ -136,6 +136,8 @@ def get_current_user(): user_name = 'SYSTEM' elif get_sid_from_name(test_user) == 'S-1-5-18': user_name = 'SYSTEM' + elif not with_domain: + user_name = win32api.GetUserName() except pywintypes.error as exc: raise CommandExecutionError( 'Failed to get current user: {0}'.format(exc)) diff --git a/salt/utils/win_update.py b/salt/utils/win_update.py index 963380f0df..6769607f9e 100644 --- a/salt/utils/win_update.py +++ b/salt/utils/win_update.py @@ -239,7 +239,8 @@ class WindowsUpdateAgent(object): # Error codes found at the following site: # https://msdn.microsoft.com/en-us/library/windows/desktop/hh968413(v=vs.85).aspx # https://technet.microsoft.com/en-us/library/cc720442(v=ws.10).aspx - fail_codes = {-2145124300: 'Download failed: 0x80240034', + fail_codes = {-2145107924: 'WinHTTP Send/Receive failed: 0x8024402C', + -2145124300: 'Download failed: 0x80240034', -2145124302: 'Invalid search criteria: 0x80240032', -2145124305: 'Cancelled by policy: 0x8024002F', -2145124307: 'Missing source: 0x8024002D', diff --git a/salt/utils/yamlloader.py b/salt/utils/yamlloader.py index 66f267c039..94cddc3d43 100644 --- a/salt/utils/yamlloader.py +++ b/salt/utils/yamlloader.py @@ -5,7 +5,6 @@ Custom YAML loading in Salt # Import python libs from __future__ import absolute_import, print_function, unicode_literals -import re import warnings import yaml # pylint: disable=blacklisted-import @@ -14,6 +13,8 @@ from yaml.constructor import ConstructorError try: yaml.Loader = yaml.CLoader yaml.Dumper = yaml.CDumper + yaml.SafeLoader = yaml.CSafeLoader + yaml.SafeDumper = yaml.CSafeDumper except Exception: pass @@ -116,58 +117,12 @@ class SaltYamlSafeLoader(yaml.SafeLoader): # an empty string. Change it to '0'. if node.value == '': node.value = '0' - elif node.tag == 'tag:yaml.org,2002:str': - # If any string comes in as a quoted unicode literal, eval it into - # the proper unicode string type. - if re.match(r'^u([\'"]).+\1$', node.value, flags=re.IGNORECASE): - node.value = eval(node.value, {}, {}) # pylint: disable=W0123 return super(SaltYamlSafeLoader, self).construct_scalar(node) def construct_yaml_str(self, node): value = self.construct_scalar(node) return salt.utils.stringutils.to_unicode(value) - def fetch_plain(self): - ''' - Handle unicode literal strings which appear inline in the YAML - ''' - orig_line = self.line - orig_column = self.column - orig_pointer = self.pointer - try: - return super(SaltYamlSafeLoader, self).fetch_plain() - except yaml.scanner.ScannerError as exc: - problem_line = self.line - problem_column = self.column - problem_pointer = self.pointer - if exc.problem == "found unexpected ':'": - # Reset to prior position - self.line = orig_line - self.column = orig_column - self.pointer = orig_pointer - if self.peek(0) == 'u': - # Might be a unicode literal string, check for 2nd char and - # call the appropriate fetch func if it's a quote - quote_char = self.peek(1) - if quote_char in ("'", '"'): - # Skip the "u" prefix by advancing the column and - # pointer by 1 - self.column += 1 - self.pointer += 1 - if quote_char == '\'': - return self.fetch_single() - else: - return self.fetch_double() - else: - # This wasn't a unicode literal string, so the caught - # exception was correct. Restore the old position and - # then raise the caught exception. - self.line = problem_line - self.column = problem_column - self.pointer = problem_pointer - # Raise the caught exception - raise exc - def flatten_mapping(self, node): merge = [] index = 0 diff --git a/salt/utils/zeromq.py b/salt/utils/zeromq.py index 85d21eedf3..8207b200fc 100644 --- a/salt/utils/zeromq.py +++ b/salt/utils/zeromq.py @@ -50,7 +50,11 @@ def install_zmq(): older version still need one. :return: ''' - if zmq and ZMQ_VERSION_INFO[0] < 17: + # The zmq module is mocked in Sphinx, so when we build the docs + # ZMQ_VERSION_INFO ends up being an empty tuple. Using a tuple comparison + # instead of checking the first element of ZMQ_VERSION_INFO will prevent an + # IndexError when this function is invoked during the docs build. + if zmq and ZMQ_VERSION_INFO < (17,): if tornado.version_info < (5,): zmq.eventloop.ioloop.install() diff --git a/salt/wheel/config.py b/salt/wheel/config.py index cf6d0bc0ad..a8a93c53e5 100644 --- a/salt/wheel/config.py +++ b/salt/wheel/config.py @@ -59,7 +59,7 @@ def update_config(file_name, yaml_contents): Example low data: - .. code-block:: yaml + .. code-block:: python data = { 'username': 'salt', diff --git a/salt/wheel/key.py b/salt/wheel/key.py index 2eb8674d34..837b189415 100644 --- a/salt/wheel/key.py +++ b/salt/wheel/key.py @@ -24,7 +24,7 @@ sample above and use the :py:class:`WheelClient` functions to show how they can be called from a Python interpreter. The wheel key functions can also be called via a ``salt`` command at the CLI -using the :ref:`saltutil execution module `. +using the :mod:`saltutil execution module `. ''' # Import python libs @@ -259,7 +259,7 @@ def reject_dict(match, include_accepted=False, include_denied=False): def key_str(match): - ''' + r''' Return information about the key. Returns a dictionary. match @@ -321,12 +321,12 @@ def finger_master(hash_type=None): def gen(id_=None, keysize=2048): - ''' + r''' Generate a key pair. No keys are stored on the master. A key pair is returned as a dict containing pub and priv keys. Returns a dictionary containing the the ``pub`` and ``priv`` keys with their generated values. - id_ + id\_ Set a name to generate a key pair for use with salt. If not specified, a random name will be specified. @@ -346,6 +346,7 @@ def gen(id_=None, keysize=2048): ... QH3/W74X1+WTBlx4R2KGLYBiH+bCCFEQ/Zvcu4Xp4bIOPtRKozEQ==\n -----END RSA PRIVATE KEY-----'} + ''' if id_ is None: id_ = hashlib.sha512(os.urandom(32)).hexdigest() @@ -371,12 +372,12 @@ def gen(id_=None, keysize=2048): def gen_accept(id_, keysize=2048, force=False): - ''' + r''' Generate a key pair then accept the public key. This function returns the key pair in a dict, only the public key is preserved on the master. Returns a dictionary. - id_ + id\_ The name of the minion for which to generate a key pair. keysize diff --git a/setup.py b/setup.py index 200ac80d0a..8fa215ecb9 100755 --- a/setup.py +++ b/setup.py @@ -29,6 +29,7 @@ from distutils.command.build import build from distutils.command.clean import clean from distutils.command.sdist import sdist from distutils.command.install_lib import install_lib +from distutils.version import LooseVersion # pylint: disable=blacklisted-module from ctypes.util import find_library # pylint: enable=E0611 @@ -73,7 +74,7 @@ else: # os.uname() not available on Windows. IS_SMARTOS_PLATFORM = os.uname()[0] == 'SunOS' and os.uname()[3].startswith('joyent_') -# Store a reference wether if we're running under Python 3 and above +# Store a reference whether if we're running under Python 3 and above IS_PY3 = sys.version_info > (3,) # Use setuptools only if the user opts-in by setting the USE_SETUPTOOLS env var @@ -145,10 +146,6 @@ def _parse_requirements_file(requirements_file): if IS_WINDOWS_PLATFORM: if 'libcloud' in line: continue - if 'm2crypto' in line.lower() and __saltstack_version__.info < (2015, 8): # pylint: disable=undefined-variable - # In Windows, we're installing M2CryptoWin{32,64} which comes - # compiled - continue if IS_PY3 and 'futures' in line.lower(): # Python 3 already has futures, installing it will only break # the current python installation whenever futures is imported @@ -313,12 +310,6 @@ if WITH_SETUPTOOLS: def run(self): if IS_WINDOWS_PLATFORM: - if __saltstack_version__.info < (2015, 8): # pylint: disable=undefined-variable - # Install M2Crypto first - self.distribution.salt_installing_m2crypto_windows = True - self.run_command('install-m2crypto-windows') - self.distribution.salt_installing_m2crypto_windows = None - # Download the required DLLs self.distribution.salt_download_windows_dlls = True self.run_command('download-windows-dlls') @@ -337,30 +328,6 @@ if WITH_SETUPTOOLS: develop.run(self) -class InstallM2CryptoWindows(Command): - - description = 'Install M2CryptoWindows' - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - if getattr(self.distribution, 'salt_installing_m2crypto_windows', None) is None: - print('This command is not meant to be called on it\'s own') - exit(1) - import platform - from pip.utils import call_subprocess - from pip.utils.logging import indent_log - platform_bits, _ = platform.architecture() - with indent_log(): - call_subprocess( - ['pip', 'install', '--egg', 'M2CryptoWin{0}'.format(platform_bits[:2])] - ) - - def uri_to_resource(resource_file): # ## Returns the URI for a resource # The basic case is that the resource is on saltstack.com @@ -398,12 +365,17 @@ class DownloadWindowsDlls(Command): print('This command is not meant to be called on it\'s own') exit(1) import platform - from pip.utils.logging import indent_log + import pip + # pip has moved many things to `_internal` starting with pip 10 + if LooseVersion(pip.__version__) < LooseVersion('10.0'): + from pip.utils.logging import indent_log + else: + from pip._internal.utils.logging import indent_log # pylint: disable=no-name-in-module platform_bits, _ = platform.architecture() url = 'https://repo.saltstack.com/windows/dependencies/{bits}/{fname}.dll' dest = os.path.join(os.path.dirname(sys.executable), '{fname}.dll') with indent_log(): - for fname in ('libeay32', 'ssleay32', 'libsodium', 'msvcr120'): + for fname in ('libeay32', 'ssleay32', 'msvcr120'): # See if the library is already on the system if find_library(fname): continue @@ -699,12 +671,6 @@ class Install(install): self.build_lib, 'salt', '_version.py' ) if IS_WINDOWS_PLATFORM: - if __saltstack_version__.info < (2015, 8): # pylint: disable=undefined-variable - # Install M2Crypto first - self.distribution.salt_installing_m2crypto_windows = True - self.run_command('install-m2crypto-windows') - self.distribution.salt_installing_m2crypto_windows = None - # Download the required DLLs self.distribution.salt_download_windows_dlls = True self.run_command('download-windows-dlls') @@ -848,8 +814,6 @@ class SaltDistribution(distutils.dist.Distribution): 'install_lib': InstallLib}) if IS_WINDOWS_PLATFORM: self.cmdclass.update({'download-windows-dlls': DownloadWindowsDlls}) - if __saltstack_version__.info < (2015, 8): # pylint: disable=undefined-variable - self.cmdclass.update({'install-m2crypto-windows': InstallM2CryptoWindows}) if WITH_SETUPTOOLS: self.cmdclass.update({'develop': Develop}) @@ -1124,13 +1088,14 @@ class SaltDistribution(distutils.dist.Distribution): 'wmi', 'site', 'psutil', + 'pytz', ]) elif IS_SMARTOS_PLATFORM: # we have them as requirements in pkg/smartos/esky/requirements.txt # all these should be safe to force include freezer_includes.extend([ 'cherrypy', - 'dateutils', + 'python-dateutil', 'pyghmi', 'croniter', 'mako', diff --git a/templates/test_module/tests/unit/modules/test_{{module_name}}.py b/templates/test_module/tests/unit/modules/test_{{module_name}}.py index 1c4d7aa3fb..db532d600c 100644 --- a/templates/test_module/tests/unit/modules/test_{{module_name}}.py +++ b/templates/test_module/tests/unit/modules/test_{{module_name}}.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`{{full_name}} <{{email}}>` + :codeauthor: {{full_name}} <{{email}}> ''' # Import Python Libs diff --git a/templates/test_state/tests/unit/states/test_{{module_name}}.py b/templates/test_state/tests/unit/states/test_{{module_name}}.py index f6dc67c397..f3e5ac87e2 100644 --- a/templates/test_state/tests/unit/states/test_{{module_name}}.py +++ b/templates/test_state/tests/unit/states/test_{{module_name}}.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`{{full_name}} <{{email}}>` + :codeauthor: {{full_name}} <{{email}}> ''' # Import Python Libs diff --git a/tests/conftest.py b/tests/conftest.py index 6997fc6569..44f8dbc326 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.conftest ~~~~~~~~~~~~~~ @@ -254,11 +254,13 @@ def pytest_runtest_setup(item): if destructive_tests_marker is not None: if item.config.getoption('--run-destructive') is False: pytest.skip('Destructive tests are disabled') + os.environ['DESTRUCTIVE_TESTS'] = six.text_type(item.config.getoption('--run-destructive')) expensive_tests_marker = item.get_marker('expensive_test') if expensive_tests_marker is not None: if item.config.getoption('--run-expensive') is False: pytest.skip('Expensive tests are disabled') + os.environ['EXPENSIVE_TESTS'] = six.text_type(item.config.getoption('--run-expensive')) skip_if_not_root_marker = item.get_marker('skip_if_not_root') if skip_if_not_root_marker is not None: diff --git a/tests/integration/cli/test_batch.py b/tests/integration/cli/test_batch.py index 1ca8049504..089d0a8eaa 100644 --- a/tests/integration/cli/test_batch.py +++ b/tests/integration/cli/test_batch.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/integration/cli/test_custom_module.py b/tests/integration/cli/test_custom_module.py index fb6bf5342e..ee18b0777c 100644 --- a/tests/integration/cli/test_custom_module.py +++ b/tests/integration/cli/test_custom_module.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Daniel Mizyrycki (mzdaniel@glidelink.net)` + :codeauthor: Daniel Mizyrycki (mzdaniel@glidelink.net) tests.integration.cli.custom_module diff --git a/tests/integration/cli/test_grains.py b/tests/integration/cli/test_grains.py index f0f14db5af..f4ab5159e8 100644 --- a/tests/integration/cli/test_grains.py +++ b/tests/integration/cli/test_grains.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Daniel Mizyrycki (mzdaniel@glidelink.net)` + :codeauthor: Daniel Mizyrycki (mzdaniel@glidelink.net) tests.integration.cli.grains diff --git a/tests/integration/cloud/providers/test_ec2.py b/tests/integration/cloud/providers/test_ec2.py index a552dffe0c..2157c403e0 100644 --- a/tests/integration/cloud/providers/test_ec2.py +++ b/tests/integration/cloud/providers/test_ec2.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python Libs @@ -24,7 +24,7 @@ from tests.support import win_installer INSTANCE_NAME = generate_random_name('CLOUD-TEST-') PROVIDER_NAME = 'ec2' HAS_WINRM = salt.utils.cloud.HAS_WINRM and salt.utils.cloud.HAS_SMB -TIMEOUT = 1000 +TIMEOUT = 1200 class EC2Test(ShellCase): @@ -118,7 +118,7 @@ class EC2Test(ShellCase): self.INSTALLER = self._ensure_installer() def override_profile_config(self, name, data): - conf_path = os.path.join(self.get_config_dir(), 'cloud.profiles.d', 'ec2.conf') + conf_path = os.path.join(self.config_dir, 'cloud.profiles.d', 'ec2.conf') with salt.utils.files.fopen(conf_path, 'r') as fp: conf = yaml.safe_load(fp) conf[name].update(data) @@ -132,7 +132,7 @@ class EC2Test(ShellCase): returned. ''' src = os.path.join(FILES, name) - dst = os.path.join(self.get_config_dir(), name) + dst = os.path.join(self.config_dir, name) with salt.utils.files.fopen(src, 'rb') as sfp: with salt.utils.files.fopen(dst, 'wb') as dfp: dfp.write(sfp.read()) diff --git a/tests/integration/cloud/providers/test_gce.py b/tests/integration/cloud/providers/test_gce.py index 902002ffc0..6a02ab26f2 100644 --- a/tests/integration/cloud/providers/test_gce.py +++ b/tests/integration/cloud/providers/test_gce.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` - :codeauthor: :email:`Tomas Sirny ` + :codeauthor: Nicole Thomas + :codeauthor: Tomas Sirny ''' # Import Python Libs diff --git a/tests/integration/cloud/providers/test_gogrid.py b/tests/integration/cloud/providers/test_gogrid.py index 344d62dcde..1cd4708ea0 100644 --- a/tests/integration/cloud/providers/test_gogrid.py +++ b/tests/integration/cloud/providers/test_gogrid.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python Libs diff --git a/tests/integration/cloud/providers/test_joyent.py b/tests/integration/cloud/providers/test_joyent.py index b8aaf3aff2..6fa6b5095c 100644 --- a/tests/integration/cloud/providers/test_joyent.py +++ b/tests/integration/cloud/providers/test_joyent.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python Libs diff --git a/tests/integration/cloud/providers/test_linode.py b/tests/integration/cloud/providers/test_linode.py index dd35580450..4645a5abef 100644 --- a/tests/integration/cloud/providers/test_linode.py +++ b/tests/integration/cloud/providers/test_linode.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python Libs diff --git a/tests/integration/cloud/providers/test_msazure.py b/tests/integration/cloud/providers/test_msazure.py index c02cabf5d2..9354a9b47a 100644 --- a/tests/integration/cloud/providers/test_msazure.py +++ b/tests/integration/cloud/providers/test_msazure.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python Libs diff --git a/tests/integration/cloud/providers/test_profitbricks.py b/tests/integration/cloud/providers/test_profitbricks.py index 7c4439127d..a0c0cf90fe 100644 --- a/tests/integration/cloud/providers/test_profitbricks.py +++ b/tests/integration/cloud/providers/test_profitbricks.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Ethan Devenport ` + :codeauthor: Ethan Devenport ''' # Import Python Libs diff --git a/tests/integration/cloud/providers/test_rackspace.py b/tests/integration/cloud/providers/test_rackspace.py index 94b7a5a5f1..ddf9ff1260 100644 --- a/tests/integration/cloud/providers/test_rackspace.py +++ b/tests/integration/cloud/providers/test_rackspace.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python Libs diff --git a/tests/integration/cloud/providers/test_vmware.py b/tests/integration/cloud/providers/test_vmware.py index 8680c68021..3d60cd624c 100644 --- a/tests/integration/cloud/providers/test_vmware.py +++ b/tests/integration/cloud/providers/test_vmware.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Megan Wilhite ` + :codeauthor: Megan Wilhite ''' # Import Python Libs diff --git a/tests/integration/files/conf/cloud.profiles.d/ec2.conf b/tests/integration/files/conf/cloud.profiles.d/ec2.conf index 1d3687db1f..eeec3219a9 100644 --- a/tests/integration/files/conf/cloud.profiles.d/ec2.conf +++ b/tests/integration/files/conf/cloud.profiles.d/ec2.conf @@ -1,12 +1,12 @@ ec2-test: provider: ec2-config image: ami-98aa1cf0 - size: m1.small + size: m1.large sh_username: ec2-user script_args: '-P -Z' ec2-win2012r2-test: provider: ec2-config - size: m1.small + size: m1.large image: ami-eb1ecd96 smb_port: 445 win_installer: '' @@ -19,7 +19,7 @@ ec2-win2012r2-test: deploy: True ec2-win2016-test: provider: ec2-config - size: m1.small + size: m1.large image: ami-ed14c790 smb_port: 445 win_installer: '' diff --git a/tests/integration/files/conf/minion b/tests/integration/files/conf/minion index b3295f2cea..371e9260d1 100644 --- a/tests/integration/files/conf/minion +++ b/tests/integration/files/conf/minion @@ -10,6 +10,7 @@ id: minion open_mode: True log_file: minion.log log_level_logfile: debug +log_fmt_console: '%(asctime)s,%(msecs)03d [%(levelname)-8s] %(message)s' pidfile: minion.pid # Give the minion extra attempts to find the master diff --git a/tests/integration/files/engines/runtests_engine.py b/tests/integration/files/engines/runtests_engine.py index ddb52d5c7f..a2390c6ddb 100644 --- a/tests/integration/files/engines/runtests_engine.py +++ b/tests/integration/files/engines/runtests_engine.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) :copyright: Copyright 2015 by the SaltStack Team, see AUTHORS for more details. :license: Apache 2.0, see LICENSE for more details. diff --git a/tests/integration/files/file/base/_modules/runtests_helpers.py b/tests/integration/files/file/base/_modules/runtests_helpers.py index 13f0d9067a..cce1a3f544 100644 --- a/tests/integration/files/file/base/_modules/runtests_helpers.py +++ b/tests/integration/files/file/base/_modules/runtests_helpers.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) runtests_helpers.py diff --git a/tests/integration/files/file/base/core.sls b/tests/integration/files/file/base/core.sls index eb2fdb1c58..2f8bfecd97 100644 --- a/tests/integration/files/file/base/core.sls +++ b/tests/integration/files/file/base/core.sls @@ -2,3 +2,4 @@ file: - managed - source: salt://testfile + - makedirs: true diff --git a/tests/integration/files/file/base/docker_non_root/Dockerfile b/tests/integration/files/file/base/docker_non_root/Dockerfile index 91f9919ba9..45cafbf511 100644 --- a/tests/integration/files/file/base/docker_non_root/Dockerfile +++ b/tests/integration/files/file/base/docker_non_root/Dockerfile @@ -1,4 +1,4 @@ -FROM opensuse/python:latest +FROM centos:latest RUN useradd -m daniel USER daniel diff --git a/tests/integration/files/file/base/jinja_filters/data_compare_dicts.sls b/tests/integration/files/file/base/jinja_filters/data_compare_dicts.sls index ab9877ff79..9e3ec2257e 100644 --- a/tests/integration/files/file/base/jinja_filters/data_compare_dicts.sls +++ b/tests/integration/files/file/base/jinja_filters/data_compare_dicts.sls @@ -3,4 +3,4 @@ {% set result = dict_one | compare_dicts(dict_two) %} -{% include 'jinja_filters/common.sls' %} +{% include 'jinja_filters/tojson.sls' %} diff --git a/tests/integration/files/file/base/jinja_filters/data_compare_lists.sls b/tests/integration/files/file/base/jinja_filters/data_compare_lists.sls index b5fd74ce21..cba9a2d119 100644 --- a/tests/integration/files/file/base/jinja_filters/data_compare_lists.sls +++ b/tests/integration/files/file/base/jinja_filters/data_compare_lists.sls @@ -3,4 +3,4 @@ {% set result = list_one | compare_lists(list_two) %} -{% include 'jinja_filters/common.sls' %} +{% include 'jinja_filters/tojson.sls' %} diff --git a/tests/integration/files/file/base/jinja_filters/data_mysql_to_dict.sls b/tests/integration/files/file/base/jinja_filters/data_mysql_to_dict.sls index 8cfa34c8a9..9686000f77 100644 --- a/tests/integration/files/file/base/jinja_filters/data_mysql_to_dict.sls +++ b/tests/integration/files/file/base/jinja_filters/data_mysql_to_dict.sls @@ -6,4 +6,4 @@ {% set result = test_mysql_output | mysql_to_dict('Info') %} -{% include 'jinja_filters/common.sls' %} +{% include 'jinja_filters/tojson.sls' %} diff --git a/tests/integration/files/file/base/jinja_filters/network_ipv4.sls b/tests/integration/files/file/base/jinja_filters/network_ipv4.sls index d3b48a1de0..47acd4ef4f 100644 --- a/tests/integration/files/file/base/jinja_filters/network_ipv4.sls +++ b/tests/integration/files/file/base/jinja_filters/network_ipv4.sls @@ -1,3 +1,3 @@ {% set result = ['127.0.0.1', '::1'] | ipv4() %} -{% include 'jinja_filters/common.sls' %} +{% include 'jinja_filters/tojson.sls' %} diff --git a/tests/integration/files/file/base/jinja_filters/network_network_hosts.sls b/tests/integration/files/file/base/jinja_filters/network_network_hosts.sls index 1da309ff6f..d46082faa6 100644 --- a/tests/integration/files/file/base/jinja_filters/network_network_hosts.sls +++ b/tests/integration/files/file/base/jinja_filters/network_network_hosts.sls @@ -1,3 +1,3 @@ {% set result = '192.168.1.0/30' | network_hosts() %} -{% include 'jinja_filters/common.sls' %} +{% include 'jinja_filters/tojson.sls' %} diff --git a/tests/integration/files/file/base/jinja_filters/tojson.sls b/tests/integration/files/file/base/jinja_filters/tojson.sls new file mode 100644 index 0000000000..122a84c514 --- /dev/null +++ b/tests/integration/files/file/base/jinja_filters/tojson.sls @@ -0,0 +1,4 @@ +test: + module.run: + - name: test.echo + - text: {{ result|tojson }} diff --git a/tests/integration/files/file/base/orch/issue30367/init.sls b/tests/integration/files/file/base/orch/issue30367/init.sls new file mode 100644 index 0000000000..a1e404b2be --- /dev/null +++ b/tests/integration/files/file/base/orch/issue30367/init.sls @@ -0,0 +1,4 @@ +deploy_check: + salt.function: + - name: test.false + - tgt: minion diff --git a/tests/integration/files/file/base/tojson/init.sls b/tests/integration/files/file/base/tojson/init.sls new file mode 100644 index 0000000000..bd81560a27 --- /dev/null +++ b/tests/integration/files/file/base/tojson/init.sls @@ -0,0 +1,7 @@ +{%- set data = '{"Der Zucker": "süß", "Die Webseite": "https://saltstack.com"}'|load_json -%} +{{ pillar['tojson-file'] }}: + file.managed: + - source: salt://tojson/template.jinja + - template: jinja + - context: + data: {{ data|tojson }} diff --git a/tests/integration/files/file/base/tojson/template.jinja b/tests/integration/files/file/base/tojson/template.jinja new file mode 100644 index 0000000000..f612e5b1b0 --- /dev/null +++ b/tests/integration/files/file/base/tojson/template.jinja @@ -0,0 +1,3 @@ +{%- for key in ('Die Webseite', 'Der Zucker') -%} +{{ key }} ist {{ data[key] }}. +{% endfor -%} diff --git a/tests/integration/files/file/base/win/repo-ng/7zip.sls b/tests/integration/files/file/base/win/repo-ng/7zip.sls new file mode 100644 index 0000000000..4b93665c5b --- /dev/null +++ b/tests/integration/files/file/base/win/repo-ng/7zip.sls @@ -0,0 +1,24 @@ +{% set versions = {'18':['05', '03', '01'], '16':['04', '03', '02', '00'], '9':['20']} %} + +7zip: +{% for major, subversions in versions.items() %} +{% for minor in subversions %} + '{{major}}.{{minor}}.00.0': + {% if grains['cpuarch'] == 'AMD64' %} + full_name: '7-Zip {{major}}.{{minor}} (x64 edition)' + installer: 'http://d.7-zip.org/a/7z{{major}}{{minor}}-x64.msi' + uninstaller: 'http://d.7-zip.org/a/7z{{major}}{{minor}}-x64.msi' + arch: x64 + {% else %} + full_name: '7-Zip {{major}}.{{minor}}' + installer: 'http://d.7-zip.org/a/7z{{major}}{{minor}}.msi' + uninstaller: 'http://d.7-zip.org/a/7z{{major}}{{minor}}.msi' + arch: x86 + {% endif %} + install_flags: '/qn /norestart' + uninstall_flags: '/qn /norestart' + msiexec: True + locale: en_US + reboot: False +{% endfor %} +{% endfor %} diff --git a/tests/integration/files/log_handlers/runtests_log_handler.py b/tests/integration/files/log_handlers/runtests_log_handler.py index 82e1509f72..983447d97a 100644 --- a/tests/integration/files/log_handlers/runtests_log_handler.py +++ b/tests/integration/files/log_handlers/runtests_log_handler.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) :copyright: Copyright 2016 by the SaltStack Team, see AUTHORS for more details. :license: Apache 2.0, see LICENSE for more details. diff --git a/tests/integration/files/saltclass/examples/classes/default/empty.yml b/tests/integration/files/saltclass/examples/classes/default/empty.yml new file mode 100644 index 0000000000..146d37d231 --- /dev/null +++ b/tests/integration/files/saltclass/examples/classes/default/empty.yml @@ -0,0 +1,4 @@ +# https://github.com/saltstack/salt/issues/48145 +classes: +states: +pillars: diff --git a/tests/integration/files/saltclass/examples/classes/default/init.yml b/tests/integration/files/saltclass/examples/classes/default/init.yml index 8f917b796f..834194cae5 100644 --- a/tests/integration/files/saltclass/examples/classes/default/init.yml +++ b/tests/integration/files/saltclass/examples/classes/default/init.yml @@ -1,6 +1,7 @@ classes: - default.users - default.motd + - default.empty states: - openssh diff --git a/tests/integration/loader/test_ext_modules.py b/tests/integration/loader/test_ext_modules.py index 077372a45b..997603c1f1 100644 --- a/tests/integration/loader/test_ext_modules.py +++ b/tests/integration/loader/test_ext_modules.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) integration.loader.ext_modules diff --git a/tests/integration/minion/test_pillar.py b/tests/integration/minion/test_pillar.py index efe0b5782e..89ecae0645 100644 --- a/tests/integration/minion/test_pillar.py +++ b/tests/integration/minion/test_pillar.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Erik Johnson ` + :codeauthor: Erik Johnson ''' # Import Python libs diff --git a/tests/integration/modules/test_archive.py b/tests/integration/modules/test_archive.py index 3f99952942..4301b9e3b0 100644 --- a/tests/integration/modules/test_archive.py +++ b/tests/integration/modules/test_archive.py @@ -183,6 +183,21 @@ class ArchiveTest(ModuleCase): self._tear_down() + @skipIf(not salt.utils.path.which('tar'), 'Cannot find tar executable') + def test_tar_list_unicode(self): + ''' + Validate using the tar function to extract archives + ''' + self._set_up(arch_fmt='tar', unicode_filename=True) + self.run_function('archive.tar', ['-cvf', self.arch], sources=self.src) + + # Test list archive + ret = self.run_function('archive.list', name=self.arch) + self.assertTrue(isinstance(ret, list), six.text_type(ret)) + self._assert_artifacts_in_ret(ret) + + self._tear_down() + @skipIf(not salt.utils.path.which('gzip'), 'Cannot find gzip executable') def test_gzip(self): ''' diff --git a/tests/integration/modules/test_beacons.py b/tests/integration/modules/test_beacons.py index 56e59aabe4..9cd11a7348 100644 --- a/tests/integration/modules/test_beacons.py +++ b/tests/integration/modules/test_beacons.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Justin Anderson ` + :codeauthor: Justin Anderson ''' # Python Libs diff --git a/tests/integration/modules/test_cmdmod.py b/tests/integration/modules/test_cmdmod.py index 5a5c24a776..1736f5eff2 100644 --- a/tests/integration/modules/test_cmdmod.py +++ b/tests/integration/modules/test_cmdmod.py @@ -12,7 +12,8 @@ from tests.support.case import ModuleCase from tests.support.helpers import ( destructiveTest, skip_if_binaries_missing, - skip_if_not_root + skip_if_not_root, + this_user, ) from tests.support.paths import TMP from tests.support.unit import skipIf @@ -280,12 +281,7 @@ class CMDModuleTest(ModuleCase): cmd = '''echo 'SELECT * FROM foo WHERE bar="baz"' ''' expected_result = 'SELECT * FROM foo WHERE bar="baz"' - try: - runas = os.getlogin() - except: # pylint: disable=W0702 - # On some distros (notably Gentoo) os.getlogin() fails - import pwd - runas = pwd.getpwuid(os.getuid())[0] + runas = this_user() result = self.run_function('cmd.run_stdout', [cmd], runas=runas).strip() @@ -373,3 +369,13 @@ class CMDModuleTest(ModuleCase): hide_output=True) self.assertEqual(out['stdout'], '') self.assertEqual(out['stderr'], '') + + def test_cmd_run_whoami(self): + ''' + test return of whoami + ''' + cmd = self.run_function('cmd.run', ['whoami']) + if salt.utils.platform.is_windows(): + self.assertIn('administrator', cmd) + else: + self.assertEqual('root', cmd) diff --git a/tests/integration/modules/test_darwin_sysctl.py b/tests/integration/modules/test_darwin_sysctl.py index d802f16d9e..5b99556dd6 100644 --- a/tests/integration/modules/test_darwin_sysctl.py +++ b/tests/integration/modules/test_darwin_sysctl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python Libs diff --git a/tests/integration/modules/test_dockermod.py b/tests/integration/modules/test_dockermod.py index 1209b9c178..2379f4404a 100644 --- a/tests/integration/modules/test_dockermod.py +++ b/tests/integration/modules/test_dockermod.py @@ -8,12 +8,11 @@ from __future__ import absolute_import, print_function, unicode_literals import functools import random import string -import tempfile +import sys # Import Salt Testing Libs from tests.support.unit import skipIf from tests.support.case import ModuleCase -from tests.support.paths import TMP from tests.support.helpers import destructiveTest from tests.support.mixins import SaltReturnAssertsMixin @@ -55,34 +54,46 @@ class DockerCallTestCase(ModuleCase, SaltReturnAssertsMixin): ''' # Create temp dir self.random_name = name - self.tmp_build_dir = tempfile.mkdtemp(dir=TMP) + self.image_tag = sys.version_info[0] - self.run_state('file.managed', - source='salt://docker_non_root/Dockerfile', - name='{0}/Dockerfile'.format(self.tmp_build_dir)) self.run_state('docker_image.present', - build=self.tmp_build_dir, - name=self.random_name) + tag=self.image_tag, + name='python') self.run_state('docker_container.running', name=self.random_name, - image=self.random_name) + image='python:{0}'.format(self.image_tag), + entrypoint='tail -f /dev/null') def tearDown(self): ''' teardown docker.call tests ''' - self.run_state('file.absent', - name=self.tmp_build_dir) self.run_state('docker_container.absent', name=self.random_name, force=True) self.run_state('docker_image.absent', - images=[self.random_name, 'docker.io/opensuse/python:latest'], + images=['python:{0}'.format(self.image_tag)], force=True) + delattr(self, 'random_name') + delattr(self, 'image_tag') def test_docker_call(self): ''' check that docker.call works, and works with a container not running as root ''' ret = self.run_function('docker.call', [self.random_name, 'test.ping']) - self.assertTrue(ret) + assert ret is True + + def test_docker_sls(self): + ''' + check that docker.sls works, and works with a container not running as root + ''' + ret = self.run_function('docker.apply', [self.random_name, 'core']) + self.assertSaltTrueReturn(ret) + + def test_docker_highstate(self): + ''' + check that docker.highstate works, and works with a container not running as root + ''' + ret = self.run_function('docker.apply', [self.random_name]) + self.assertSaltTrueReturn(ret) diff --git a/tests/integration/modules/test_event.py b/tests/integration/modules/test_event.py index a7d672051b..c3baefe2be 100644 --- a/tests/integration/modules/test_event.py +++ b/tests/integration/modules/test_event.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.integration.modules.event diff --git a/tests/integration/modules/test_mac_assistive.py b/tests/integration/modules/test_mac_assistive.py index cea1e82418..79df801641 100644 --- a/tests/integration/modules/test_mac_assistive.py +++ b/tests/integration/modules/test_mac_assistive.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python Libs diff --git a/tests/integration/modules/test_mac_brew.py b/tests/integration/modules/test_mac_brew.py index 694b9adc83..dbb09bd537 100644 --- a/tests/integration/modules/test_mac_brew.py +++ b/tests/integration/modules/test_mac_brew.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python Libs diff --git a/tests/integration/modules/test_mac_group.py b/tests/integration/modules/test_mac_group.py index d47231eb1a..9910412bf2 100644 --- a/tests/integration/modules/test_mac_group.py +++ b/tests/integration/modules/test_mac_group.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python Libs diff --git a/tests/integration/modules/test_mac_service.py b/tests/integration/modules/test_mac_service.py index 486a5d3f51..34ffa9d109 100644 --- a/tests/integration/modules/test_mac_service.py +++ b/tests/integration/modules/test_mac_service.py @@ -40,8 +40,10 @@ class MacServiceModuleTest(ModuleCase): ''' if self.SERVICE_ENABLED: self.run_function('service.start', [self.SERVICE_NAME]) + self.run_function('service.enable', [self.SERVICE_NAME]) else: self.run_function('service.stop', [self.SERVICE_NAME]) + self.run_function('service.disable', [self.SERVICE_NAME]) def test_show(self): ''' diff --git a/tests/integration/modules/test_mac_user.py b/tests/integration/modules/test_mac_user.py index bbc6239adb..dbf6ae4642 100644 --- a/tests/integration/modules/test_mac_user.py +++ b/tests/integration/modules/test_mac_user.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python Libs diff --git a/tests/integration/modules/test_pip.py b/tests/integration/modules/test_pip.py index 3ef8489683..ff29f0e7c9 100644 --- a/tests/integration/modules/test_pip.py +++ b/tests/integration/modules/test_pip.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.integration.modules.pip ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -431,6 +431,16 @@ class PipModuleTest(ModuleCase): pprint.pprint(ret) raise + @skipIf(not os.path.isfile('pip3'), 'test where pip3 is installed') + @skipIf(salt.utils.platform.is_windows(), 'test specific for linux usage of /bin/python') + def test_system_pip3(self): + self.run_function('pip.install', pkgs=['lazyimport==0.0.1'], bin_env='/bin/pip3') + ret1 = self.run_function('cmd.run', '/bin/pip3 freeze | grep lazyimport') + self.run_function('pip.uninstall', pkgs=['lazyimport'], bin_env='/bin/pip3') + ret2 = self.run_function('cmd.run', '/bin/pip3 freeze | grep lazyimport') + assert 'lazyimport==0.0.1' in ret1 + assert ret2 == '' + def tearDown(self): super(PipModuleTest, self).tearDown() if os.path.isdir(self.venv_test_dir): diff --git a/tests/integration/modules/test_pw_user.py b/tests/integration/modules/test_pw_user.py index 3dc8b693a1..d3a2d52561 100644 --- a/tests/integration/modules/test_pw_user.py +++ b/tests/integration/modules/test_pw_user.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.integration.modules.pw_user ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/integration/modules/test_saltutil.py b/tests/integration/modules/test_saltutil.py index a018340a1f..60b4e4fd3f 100644 --- a/tests/integration/modules/test_saltutil.py +++ b/tests/integration/modules/test_saltutil.py @@ -198,7 +198,18 @@ class SaltUtilSyncPillarTest(ModuleCase): ''')) self.run_function('saltutil.refresh_pillar') - self.run_function('test.sleep', [5]) + + pillar = False + timeout = time.time() + 30 + while not pillar: + post_pillar = self.run_function('pillar.raw') + try: + self.assertIn(pillar_key, post_pillar.get(pillar_key, 'didnotwork')) + pillar = True + except AssertionError: + if time.time() > timeout: + self.assertIn(pillar_key, post_pillar.get(pillar_key, 'didnotwork')) + continue post_pillar = self.run_function('pillar.raw') self.assertIn(pillar_key, post_pillar.get(pillar_key, 'didnotwork')) diff --git a/tests/integration/modules/test_service.py b/tests/integration/modules/test_service.py index ce4a47a78e..3de0bdd1a2 100644 --- a/tests/integration/modules/test_service.py +++ b/tests/integration/modules/test_service.py @@ -120,7 +120,7 @@ class ServiceModuleTest(ModuleCase): systemd = salt.utils.systemd.booted() # check service was not enabled - if systemd: + if systemd or salt.utils.platform.is_windows(): self.assertIn('ERROR', enable) else: self.assertFalse(enable) @@ -130,7 +130,11 @@ class ServiceModuleTest(ModuleCase): # currently upstart does not have a mechanism to report if disabling a service fails if does not exist self.assertTrue(self.run_function('service.disable', [srv_name])) else: - self.assertFalse(self.run_function('service.disable', [srv_name])) + if salt.utils.platform.is_windows(): + disable = self.run_function('service.disable', [srv_name]) + self.assertTrue('error' in disable.lower()) + else: + self.assertFalse(self.run_function('service.disable', [srv_name])) if salt.utils.platform.is_darwin(): self.assertFalse(self.run_function('service.disabled', [srv_name])) diff --git a/tests/integration/modules/test_win_dns_client.py b/tests/integration/modules/test_win_dns_client.py new file mode 100644 index 0000000000..33997d6ab4 --- /dev/null +++ b/tests/integration/modules/test_win_dns_client.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- + +# Import Python libs +from __future__ import absolute_import + +# Import Salt Testing libs +from tests.support.case import ModuleCase +from tests.support.unit import skipIf +from tests.support.helpers import destructiveTest + +# Import Salt libs +import salt.utils.platform + + +@skipIf(not salt.utils.platform.is_windows(), 'windows test only') +class WinDNSTest(ModuleCase): + ''' + Test for salt.modules.win_dns_client + ''' + @destructiveTest + def test_add_remove_dns(self): + ''' + Test add and removing a dns server + ''' + dns = '8.8.8.8' + interface = 'Ethernet' + # add dns server + self.assertTrue(self.run_function('win_dns_client.add_dns', [dns, interface], index=42)) + + srvs = self.run_function('win_dns_client.get_dns_servers', interface=interface) + self.assertIn(dns, srvs) + + # remove dns server + self.assertTrue(self.run_function('win_dns_client.rm_dns', [dns], interface=interface)) + + srvs = self.run_function('win_dns_client.get_dns_servers', interface=interface) + self.assertNotIn(dns, srvs) diff --git a/tests/integration/modules/test_win_servermanager.py b/tests/integration/modules/test_win_servermanager.py new file mode 100644 index 0000000000..c3290f80cd --- /dev/null +++ b/tests/integration/modules/test_win_servermanager.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +# Import Python libs +from __future__ import absolute_import + +# Import Salt Testing libs +from tests.support.case import ModuleCase +from tests.support.unit import skipIf + +# Import Salt libs +import salt.utils.platform + + +@skipIf(not salt.utils.platform.is_windows(), 'windows test only') +class WinServermanagerTest(ModuleCase): + ''' + Test for salt.modules.win_servermanager + ''' + def test_list_available(self): + ''' + Test list available features to install + ''' + cmd = self.run_function('win_servermanager.list_available') + self.assertIn('DNS', cmd) + self.assertIn('NetworkController', cmd) + self.assertIn('RemoteAccess', cmd) diff --git a/tests/integration/netapi/rest_tornado/test_app.py b/tests/integration/netapi/rest_tornado/test_app.py index 30fcba270a..a06f6c5d6a 100644 --- a/tests/integration/netapi/rest_tornado/test_app.py +++ b/tests/integration/netapi/rest_tornado/test_app.py @@ -264,7 +264,7 @@ class TestSaltAPIHandler(_SaltnadoIntegrationTestCase): 'fun': 'test.ping', } - self.application.opts['order_masters'] = [''] + self.application.opts['order_masters'] = True self.application.opts['syndic_wait'] = 5 response = self.fetch('/', diff --git a/tests/integration/netapi/test_client.py b/tests/integration/netapi/test_client.py index 2de5f7aa48..4d966a10fb 100644 --- a/tests/integration/netapi/test_client.py +++ b/tests/integration/netapi/test_client.py @@ -37,6 +37,18 @@ class NetapiClientTest(TestCase): ret = self.netapi.run(low) self.assertEqual(ret, {'minion': True, 'sub_minion': True, 'localhost': True}) + def test_local_batch(self): + low = {'client': 'local_batch', 'tgt': '*', 'fun': 'test.ping'} + low.update(self.eauth_creds) + + ret = self.netapi.run(low) + rets = [] + for _ret in ret: + rets.append(_ret) + self.assertIn({'localhost': True}, rets) + self.assertIn({'sub_minion': True}, rets) + self.assertIn({'minion': True}, rets) + def test_local_async(self): low = {'client': 'local_async', 'tgt': '*', 'fun': 'test.ping'} low.update(self.eauth_creds) diff --git a/tests/integration/output/test_output.py b/tests/integration/output/test_output.py index 36e9d74afe..c69448dad3 100644 --- a/tests/integration/output/test_output.py +++ b/tests/integration/output/test_output.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Salt Libs diff --git a/tests/integration/runners/test_runner_returns.py b/tests/integration/runners/test_runner_returns.py index df0c6ab127..92da6da013 100644 --- a/tests/integration/runners/test_runner_returns.py +++ b/tests/integration/runners/test_runner_returns.py @@ -30,7 +30,7 @@ class RunnerReturnsTest(ShellCase): ''' self.job_dir = os.path.join(self.master_opts['cachedir'], 'jobs') self.hash_type = self.master_opts['hash_type'] - self.master_d_dir = os.path.join(self.get_config_dir(), 'master.d') + self.master_d_dir = os.path.join(self.config_dir, 'master.d') try: os.makedirs(self.master_d_dir) except OSError as exc: diff --git a/tests/integration/runners/test_state.py b/tests/integration/runners/test_state.py index ee7e81b262..ea822e2657 100644 --- a/tests/integration/runners/test_state.py +++ b/tests/integration/runners/test_state.py @@ -20,7 +20,8 @@ from salt.ext.six.moves import queue from tests.support.case import ShellCase from tests.support.unit import skipIf from tests.support.paths import TMP -from tests.support.helpers import flaky +from tests.support.helpers import flaky, expensiveTest +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.utils.platform @@ -257,6 +258,33 @@ class StateRunnerTest(ShellCase): self.assertEqual(count('Succeeded: 1', ret), 1) self.assertEqual(count('Failed: 0', ret), 1) + def test_orchestrate_salt_function_return_false_failure(self): + ''' + Ensure that functions that only return False in the return + are flagged as failed when run as orchestrations. + + See https://github.com/saltstack/salt/issues/30367 + ''' + self.run_run('saltutil.sync_modules') + ret = salt.utils.json.loads( + '\n'.join( + self.run_run('state.orchestrate orch.issue30367 --out=json') + ) + ) + # Drill down to the changes dict + state_result = ret['data']['master']['salt_|-deploy_check_|-test.false_|-function']['result'] + func_ret = ret['data']['master']['salt_|-deploy_check_|-test.false_|-function']['changes'] + + self.assertEqual( + state_result, + False, + ) + + self.assertEqual( + func_ret, + {'out': 'highstate', 'ret': {'minion': False}} + ) + @skipIf(salt.utils.platform.is_windows(), '*NIX-only test') class OrchEventTest(ShellCase): @@ -265,7 +293,7 @@ class OrchEventTest(ShellCase): ''' def setUp(self): self.timeout = 60 - self.master_d_dir = os.path.join(self.get_config_dir(), 'master.d') + self.master_d_dir = os.path.join(self.config_dir, 'master.d') try: os.makedirs(self.master_d_dir) except OSError as exc: @@ -450,3 +478,67 @@ class OrchEventTest(ShellCase): self.assertTrue(received) del listener signal.alarm(0) + + @expensiveTest + def test_orchestration_soft_kill(self): + ''' + Test to confirm that the parallel state requisite works in orch + we do this by running 10 test.sleep's of 10 seconds, and insure it only takes roughly 10s + ''' + self.write_conf({ + 'fileserver_backend': ['roots'], + 'file_roots': { + 'base': [self.base_env], + }, + }) + + orch_sls = os.path.join(self.base_env, 'two_stage_orch_kill.sls') + + with salt.utils.files.fopen(orch_sls, 'w') as fp_: + fp_.write(textwrap.dedent(''' + stage_one: + test.succeed_without_changes + + stage_two: + test.fail_without_changes + ''')) + + listener = salt.utils.event.get_event( + 'master', + sock_dir=self.master_opts['sock_dir'], + transport=self.master_opts['transport'], + opts=self.master_opts) + + mock_jid = '20131219120000000000' + self.run_run('state.soft_kill {0} stage_two'.format(mock_jid)) + with patch('salt.utils.jid.gen_jid', MagicMock(return_value=mock_jid)): + jid = self.run_run_plus( + 'state.orchestrate', + 'two_stage_orch_kill', + __reload_config=True).get('jid') + + if jid is None: + raise Exception('jid missing from run_run_plus output') + + signal.signal(signal.SIGALRM, self.alarm_handler) + signal.alarm(self.timeout) + received = False + try: + while True: + event = listener.get_event(full=True) + if event is None: + continue + + # Ensure that stage_two of the state does not run + if event['tag'] == 'salt/run/{0}/ret'.format(jid): + received = True + # Don't wrap this in a try/except. We want to know if the + # data structure is different from what we expect! + ret = event['data']['return']['data']['master'] + self.assertNotIn('test_|-stage_two_|-stage_two_|-fail_without_changes', ret) + break + + finally: + self.assertTrue(received) + del listener + signal.alarm(0) diff --git a/tests/integration/shell/test_call.py b/tests/integration/shell/test_call.py index c712f04d84..eba30fd4cd 100644 --- a/tests/integration/shell/test_call.py +++ b/tests/integration/shell/test_call.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.integration.shell.call @@ -233,20 +233,17 @@ class CallTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin with salt.utils.files.fopen(minion_config_file, 'w') as fh_: salt.utils.yaml.safe_dump(minion_config, fh_, default_flow_style=False) - out = self.run_script( + _, timed_out = self.run_script( 'salt-call', '--config-dir {0} cmd.run "echo foo"'.format( config_dir ), timeout=timeout, + catch_timeout=True, ) try: - self.assertIn( - 'Process took more than {0} seconds to complete. ' - 'Process Killed!'.format(timeout), - out - ) + self.assertTrue(timed_out) except AssertionError: if os.path.isfile(minion_config_file): os.unlink(minion_config_file) @@ -378,7 +375,7 @@ class CallTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin _ = self.run_script( 'salt-call', '-c {0} --output-file={1} test.versions'.format( - self.get_config_dir(), + self.config_dir, output_file_append ), catch_stderr=True, @@ -391,7 +388,7 @@ class CallTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin self.run_script( 'salt-call', '-c {0} --output-file={1} --output-file-append test.versions'.format( - self.get_config_dir(), + self.config_dir, output_file_append ), catch_stderr=True, @@ -410,14 +407,17 @@ class CallTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin # Let's create an initial output file with some data self.run_script( 'salt-call', - '-c {0} --output-file={1} -g'.format( + '-c {0} --output-file={1} -l trace -g'.format( self.get_config_dir(), output_file ), catch_stderr=True, with_retcode=True ) - stat1 = os.stat(output_file) + try: + stat1 = os.stat(output_file) + except OSError: + self.fail('Failed to generate output file, see log for details') # Let's change umask os.umask(0o777) # pylint: disable=blacklisted-function @@ -425,13 +425,16 @@ class CallTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin self.run_script( 'salt-call', '-c {0} --output-file={1} --output-file-append -g'.format( - self.get_config_dir(), + self.config_dir, output_file ), catch_stderr=True, with_retcode=True ) - stat2 = os.stat(output_file) + try: + stat2 = os.stat(output_file) + except OSError: + self.fail('Failed to generate output file, see log for details') self.assertEqual(stat1.st_mode, stat2.st_mode) # Data was appeneded to file self.assertTrue(stat1.st_size < stat2.st_size) @@ -443,13 +446,16 @@ class CallTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin self.run_script( 'salt-call', '-c {0} --output-file={1} -g'.format( - self.get_config_dir(), + self.config_dir, output_file ), catch_stderr=True, with_retcode=True ) - stat3 = os.stat(output_file) + try: + stat3 = os.stat(output_file) + except OSError: + self.fail('Failed to generate output file, see log for details') # Mode must have changed since we're creating a new log file self.assertNotEqual(stat1.st_mode, stat3.st_mode) finally: diff --git a/tests/integration/shell/test_cloud.py b/tests/integration/shell/test_cloud.py index cd9132c187..ba963c4266 100644 --- a/tests/integration/shell/test_cloud.py +++ b/tests/integration/shell/test_cloud.py @@ -5,7 +5,7 @@ CLI related unit testing - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) ''' # Import Python libs diff --git a/tests/integration/shell/test_cp.py b/tests/integration/shell/test_cp.py index c10dbcf7e5..e96bfc6ed3 100644 --- a/tests/integration/shell/test_cp.py +++ b/tests/integration/shell/test_cp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.integration.shell.cp @@ -84,7 +84,7 @@ class CopyTest(ShellCase, ShellCaseCommonTestsMixin): pipes.quote(minion_testfile) )) - data = salt.utils.yaml.safe_load('\n'.join(ret)) + data = eval('\n'.join(ret), {}, {}) # pylint: disable=eval-used for part in six.itervalues(data): self.assertTrue(part[minion_testfile]) diff --git a/tests/integration/shell/test_key.py b/tests/integration/shell/test_key.py index b22b66eab8..79510cea1f 100644 --- a/tests/integration/shell/test_key.py +++ b/tests/integration/shell/test_key.py @@ -232,8 +232,8 @@ class KeyTest(ShellCase, ShellCaseCommonTestsMixin): test salt-key -l with wrong eauth ''' data = self.run_key('-l acc --eauth wrongeauth --username {0} --password {1}'.format(USERA, USERA_PWD)) - expect = ['The specified external authentication system "wrongeauth" is not available'] - self.assertEqual(data, expect) + expect = r"^The specified external authentication system \"wrongeauth\" is not available\tAvailable eauth types: auto, .*" + self.assertRegex("\t".join(data), expect) def test_list_un(self): ''' diff --git a/tests/integration/shell/test_master.py b/tests/integration/shell/test_master.py index 39acaec966..f6ada25020 100644 --- a/tests/integration/shell/test_master.py +++ b/tests/integration/shell/test_master.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.integration.shell.master @@ -101,7 +101,7 @@ class MasterTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMix finally: # Although the start-up should fail, call shutdown() to set the # internal _shutdown flag and avoid the registered atexit calls to - # cause timeout exeptions and respective traceback + # cause timeout exceptions and respective traceback master.shutdown() # pylint: disable=invalid-name @@ -131,7 +131,7 @@ class MasterTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMix finally: # Although the start-up should fail, call shutdown() to set the # internal _shutdown flag and avoid the registered atexit calls to - # cause timeout exeptions and respective traceback + # cause timeout exceptions and respective traceback master.shutdown() def test_exit_status_correct_usage(self): diff --git a/tests/integration/shell/test_matcher.py b/tests/integration/shell/test_matcher.py index f8094f1f4d..08915cb585 100644 --- a/tests/integration/shell/test_matcher.py +++ b/tests/integration/shell/test_matcher.py @@ -88,17 +88,21 @@ class MatchTest(ShellCase, ShellCaseCommonTestsMixin): data = self.run_salt("-C 'J%@knights%^(Lancelot|Galahad)$' test.ping") self.assertTrue(minion_in_returns('minion', data)) self.assertTrue(minion_in_returns('sub_minion', data)) - time.sleep(2) - data = self.run_salt("-C 'N@multiline_nodegroup' test.ping") - self.assertTrue(minion_in_returns('minion', data)) - self.assertTrue(minion_in_returns('sub_minion', data)) - time.sleep(2) - data = self.run_salt("-C 'N@multiline_nodegroup not sub_minion' test.ping") - self.assertTrue(minion_in_returns('minion', data)) - self.assertFalse(minion_in_returns('sub_minion', data)) - data = self.run_salt("-C 'N@multiline_nodegroup not @fakenodegroup not sub_minion' test.ping") - self.assertTrue(minion_in_returns('minion', data)) - self.assertFalse(minion_in_returns('sub_minion', data)) + # The multiline nodegroup tests are failing in develop. + # This needs to be fixed for Fluorine. @skipIf wasn't used, because + # the rest of the assertions above pass just fine, so we don't want + # to bypass the whole test. + # time.sleep(2) + # data = self.run_salt("-C 'N@multiline_nodegroup' test.ping") + # self.assertTrue(minion_in_returns('minion', data)) + # self.assertTrue(minion_in_returns('sub_minion', data)) + # time.sleep(2) + # data = self.run_salt("-C 'N@multiline_nodegroup not sub_minion' test.ping") + # self.assertTrue(minion_in_returns('minion', data)) + # self.assertFalse(minion_in_returns('sub_minion', data)) + # data = self.run_salt("-C 'N@multiline_nodegroup not @fakenodegroup not sub_minion' test.ping") + # self.assertTrue(minion_in_returns('minion', data)) + # self.assertFalse(minion_in_returns('sub_minion', data)) def test_nodegroup(self): ''' diff --git a/tests/integration/shell/test_minion.py b/tests/integration/shell/test_minion.py index fc6bda2d03..6f424e9ca6 100644 --- a/tests/integration/shell/test_minion.py +++ b/tests/integration/shell/test_minion.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.integration.shell.minion @@ -298,7 +298,7 @@ class MinionTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMix finally: # Although the start-up should fail, call shutdown() to set the # internal _shutdown flag and avoid the registered atexit calls to - # cause timeout exeptions and respective traceback + # cause timeout exceptions and respective traceback minion.shutdown() # pylint: disable=invalid-name @@ -328,7 +328,7 @@ class MinionTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMix finally: # Although the start-up should fail, call shutdown() to set the # internal _shutdown flag and avoid the registered atexit calls to - # cause timeout exeptions and respective traceback + # cause timeout exceptions and respective traceback minion.shutdown() def test_exit_status_correct_usage(self): diff --git a/tests/integration/shell/test_proxy.py b/tests/integration/shell/test_proxy.py index ad60de2404..af904a740c 100644 --- a/tests/integration/shell/test_proxy.py +++ b/tests/integration/shell/test_proxy.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Thayne Harbaugh (tharbaug@adobe.com)` + :codeauthor: Thayne Harbaugh (tharbaug@adobe.com) tests.integration.shell.proxy ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -55,7 +55,7 @@ class ProxyTest(testprogram.TestProgramCase): finally: # Although the start-up should fail, call shutdown() to set the # internal _shutdown flag and avoid the registered atexit calls to - # cause timeout exeptions and respective traceback + # cause timeout exceptions and respective traceback proxy.shutdown() def test_exit_status_unknown_user(self): @@ -85,7 +85,7 @@ class ProxyTest(testprogram.TestProgramCase): finally: # Although the start-up should fail, call shutdown() to set the # internal _shutdown flag and avoid the registered atexit calls to - # cause timeout exeptions and respective traceback + # cause timeout exceptions and respective traceback proxy.shutdown() # pylint: disable=invalid-name @@ -114,7 +114,7 @@ class ProxyTest(testprogram.TestProgramCase): finally: # Although the start-up should fail, call shutdown() to set the # internal _shutdown flag and avoid the registered atexit calls to - # cause timeout exeptions and respective traceback + # cause timeout exceptions and respective traceback proxy.shutdown() def test_exit_status_correct_usage(self): diff --git a/tests/integration/shell/test_runner.py b/tests/integration/shell/test_runner.py index 410a614c42..a04d0d5b1c 100644 --- a/tests/integration/shell/test_runner.py +++ b/tests/integration/shell/test_runner.py @@ -208,5 +208,5 @@ class RunTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin) ''' run_cmd = self.run_run('-a wrongeauth --username {0} --password {1}\ test.arg arg kwarg=kwarg1'.format(USERA, USERA_PWD)) - expect = ['The specified external authentication system "wrongeauth" is not available'] - self.assertEqual(expect, run_cmd) + expect = r"^The specified external authentication system \"wrongeauth\" is not available\tAvailable eauth types: auto, .*" + self.assertRegex("\t".join(run_cmd), expect) diff --git a/tests/integration/shell/test_saltcli.py b/tests/integration/shell/test_saltcli.py index 2509e252a9..1ba975e5a1 100644 --- a/tests/integration/shell/test_saltcli.py +++ b/tests/integration/shell/test_saltcli.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Thayne Harbaugh (tharbaug@adobe.com)` + :codeauthor: Thayne Harbaugh (tharbaug@adobe.com) tests.integration.shell.saltcli ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/integration/shell/test_syndic.py b/tests/integration/shell/test_syndic.py index 87eb055ebe..35d01895a5 100644 --- a/tests/integration/shell/test_syndic.py +++ b/tests/integration/shell/test_syndic.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.integration.shell.syndic @@ -106,7 +106,7 @@ class SyndicTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMix finally: # Although the start-up should fail, call shutdown() to set the # internal _shutdown flag and avoid the registered atexit calls to - # cause timeout exeptions and respective traceback + # cause timeout exceptions and respective traceback syndic.shutdown() # pylint: disable=invalid-name @@ -135,7 +135,7 @@ class SyndicTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMix finally: # Although the start-up should fail, call shutdown() to set the # internal _shutdown flag and avoid the registered atexit calls to - # cause timeout exeptions and respective traceback + # cause timeout exceptions and respective traceback syndic.shutdown() def test_exit_status_correct_usage(self): diff --git a/tests/integration/states/test_bower.py b/tests/integration/states/test_bower.py index 217dc1a521..6c01d90e14 100644 --- a/tests/integration/states/test_bower.py +++ b/tests/integration/states/test_bower.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Alexander Pyatkin {1}'.format(self.test_repo, target) + } + assert ret['comment'] == '{0} would be cloned to {1}'.format( + self.test_repo, + target + ) + + # Now actually run the state + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target) + ret = ret[next(iter(ret))] + assert ret['result'] is True + assert ret['changes'] == { + 'new': '{0} => {1}'.format(self.test_repo, target) + } + assert ret['comment'] == '{0} cloned to {1}'.format(self.test_repo, target) + + # Run the state again to test idempotence + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target) + ret = ret[next(iter(ret))] + assert ret['result'] is True + assert not ret['changes'] + assert ret['comment'] == 'Repository already exists at {0}'.format(target) + + # Run the state again to test idempotence (test mode) + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target, + test=True) + ret = ret[next(iter(ret))] + assert not ret['changes'] + assert ret['result'] is True + assert ret['comment'] == 'Repository already exists at {0}'.format(target) + + @with_tempdir(create=False) + def test_cloned_with_branch(self, target): + ''' + Test git.cloned state with branch provided + ''' + old_branch = 'master' + new_branch = 'develop' + bad_branch = 'thisbranchdoesnotexist' + + # Test mode + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target, + branch=old_branch, + test=True) + ret = ret[next(iter(ret))] + assert ret['result'] is None + assert ret['changes'] == { + 'new': '{0} => {1}'.format(self.test_repo, target) + } + assert ret['comment'] == ( + '{0} would be cloned to {1} with branch \'{2}\''.format( + self.test_repo, + target, + old_branch + ) + ) + + # Now actually run the state + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target, + branch=old_branch) + ret = ret[next(iter(ret))] + assert ret['result'] is True + assert ret['changes'] == { + 'new': '{0} => {1}'.format(self.test_repo, target) + } + assert ret['comment'] == ( + '{0} cloned to {1} with branch \'{2}\''.format( + self.test_repo, + target, + old_branch + ) + ) + + # Run the state again to test idempotence + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target, + branch=old_branch) + ret = ret[next(iter(ret))] + assert ret['result'] is True + assert not ret['changes'] + assert ret['comment'] == ( + 'Repository already exists at {0} ' + 'and is checked out to branch \'{1}\''.format(target, old_branch) + ) + + # Run the state again to test idempotence (test mode) + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target, + test=True, + branch=old_branch) + ret = ret[next(iter(ret))] + assert ret['result'] is True + assert not ret['changes'] + assert ret['comment'] == ( + 'Repository already exists at {0} ' + 'and is checked out to branch \'{1}\''.format(target, old_branch) + ) + + # Change branch (test mode) + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target, + branch=new_branch, + test=True) + ret = ret[next(iter(ret))] + assert ret['result'] is None + assert ret['changes'] == { + 'branch': {'old': old_branch, 'new': new_branch} + } + assert ret['comment'] == 'Branch would be changed to \'{0}\''.format( + new_branch + ) + + # Now really change the branch + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target, + branch=new_branch) + ret = ret[next(iter(ret))] + assert ret['result'] is True + assert ret['changes'] == { + 'branch': {'old': old_branch, 'new': new_branch} + } + assert ret['comment'] == 'Branch changed to \'{0}\''.format( + new_branch + ) + + # Change back to original branch. This tests that we don't attempt to + # checkout a new branch (i.e. git checkout -b) for a branch that exists + # locally, as that would fail. + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target, + branch=old_branch) + ret = ret[next(iter(ret))] + assert ret['result'] is True + assert ret['changes'] == { + 'branch': {'old': new_branch, 'new': old_branch} + } + assert ret['comment'] == 'Branch changed to \'{0}\''.format( + old_branch + ) + + # Test switching to a nonexistant branch. This should fail. + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target, + branch=bad_branch) + ret = ret[next(iter(ret))] + assert ret['result'] is False + assert not ret['changes'] + assert ret['comment'].startswith( + 'Failed to change branch to \'{0}\':'.format(bad_branch) + ) + + @with_tempdir(create=False) + def test_cloned_with_nonexistant_branch(self, target): + ''' + Test git.cloned state with a nonexistant branch provided + ''' + branch = 'thisbranchdoesnotexist' + + # Test mode + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target, + branch=branch, + test=True) + ret = ret[next(iter(ret))] + assert ret['result'] is None + assert ret['changes'] + assert ret['comment'] == ( + '{0} would be cloned to {1} with branch \'{2}\''.format( + self.test_repo, + target, + branch + ) + ) + + # Now actually run the state + ret = self.run_state( + 'git.cloned', + name=self.test_repo, + target=target, + branch=branch) + ret = ret[next(iter(ret))] + assert ret['result'] is False + assert not ret['changes'] + assert ret['comment'].startswith('Clone failed:') + assert 'not found in upstream origin' in ret['comment'] + @with_tempdir(create=False) def test_present(self, name): ''' diff --git a/tests/integration/states/test_match.py b/tests/integration/states/test_match.py index 64e5f83c22..e4abc174a6 100644 --- a/tests/integration/states/test_match.py +++ b/tests/integration/states/test_match.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.integration.states.match diff --git a/tests/integration/states/test_npm.py b/tests/integration/states/test_npm.py index 4c6bccb95f..f51b30b0e5 100644 --- a/tests/integration/states/test_npm.py +++ b/tests/integration/states/test_npm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Erik Johnson (erik@saltstack.com)` + :codeauthor: Erik Johnson (erik@saltstack.com) tests.integration.states.npm ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ''' diff --git a/tests/integration/states/test_pip_state.py b/tests/integration/states/test_pip_state.py index 6240c1f24f..987479c5bf 100644 --- a/tests/integration/states/test_pip_state.py +++ b/tests/integration/states/test_pip_state.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.integration.states.pip_state diff --git a/tests/integration/states/test_pkg.py b/tests/integration/states/test_pkg.py index daad7b0402..0182588173 100644 --- a/tests/integration/states/test_pkg.py +++ b/tests/integration/states/test_pkg.py @@ -40,7 +40,7 @@ _PKG_TARGETS = { 'FreeBSD': ['aalib', 'pth'], 'Suse': ['aalib', 'rpm-python'], 'MacOS': ['libpng', 'jpeg'], - 'Windows': ['firefox', '7zip'], + 'Windows': ['putty', '7zip'], } _PKG_CAP_TARGETS = { @@ -167,7 +167,6 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin): self.run_function('pkg.refresh_db') __testcontext__['refresh'] = True - @skipIf(salt.utils.platform.is_windows(), 'minion is windows') @requires_system_grains def test_pkg_001_installed(self, grains=None): ''' @@ -198,7 +197,6 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin): ret = self.run_state('pkg.removed', name=target) self.assertSaltTrueReturn(ret) - @skipIf(salt.utils.platform.is_windows(), 'minion is windows') @requires_system_grains def test_pkg_002_installed_with_version(self, grains=None): ''' @@ -246,7 +244,6 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin): ret = self.run_state('pkg.removed', name=target) self.assertSaltTrueReturn(ret) - @skipIf(salt.utils.platform.is_windows(), 'minion is windows') @requires_system_grains def test_pkg_003_installed_multipkg(self, grains=None): ''' @@ -268,17 +265,21 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin): # If this assert fails, we need to find new targets, this test needs to # be able to test successful installation of packages, so these # packages need to not be installed before we run the states below - self.assertFalse(any(version.values())) + try: + self.assertFalse(any(version.values())) + except AssertionError: + self.assertSaltTrueReturn(self.run_state('pkg.removed', name=None, pkgs=pkg_targets)) - ret = self.run_state('pkg.installed', - name=None, - pkgs=pkg_targets, - refresh=False) - self.assertSaltTrueReturn(ret) - ret = self.run_state('pkg.removed', name=None, pkgs=pkg_targets) - self.assertSaltTrueReturn(ret) + try: + ret = self.run_state('pkg.installed', + name=None, + pkgs=pkg_targets, + refresh=False) + self.assertSaltTrueReturn(ret) + finally: + ret = self.run_state('pkg.removed', name=None, pkgs=pkg_targets) + self.assertSaltTrueReturn(ret) - @skipIf(salt.utils.platform.is_windows(), 'minion is windows') @requires_system_grains def test_pkg_004_installed_multipkg_with_version(self, grains=None): ''' @@ -319,15 +320,16 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin): pkgs = [{pkg_targets[0]: version}, pkg_targets[1]] - ret = self.run_state('pkg.installed', - name=None, - pkgs=pkgs, - refresh=False) - self.assertSaltTrueReturn(ret) - ret = self.run_state('pkg.removed', name=None, pkgs=pkg_targets) - self.assertSaltTrueReturn(ret) + try: + ret = self.run_state('pkg.installed', + name=None, + pkgs=pkgs, + refresh=False) + self.assertSaltTrueReturn(ret) + finally: + ret = self.run_state('pkg.removed', name=None, pkgs=pkg_targets) + self.assertSaltTrueReturn(ret) - @skipIf(salt.utils.platform.is_windows(), 'minion is windows') @requires_system_grains def test_pkg_005_installed_32bit(self, grains=None): ''' @@ -364,7 +366,6 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin): ret = self.run_state('pkg.removed', name=target) self.assertSaltTrueReturn(ret) - @skipIf(salt.utils.platform.is_windows(), 'minion is windows') @requires_system_grains def test_pkg_006_installed_32bit_with_version(self, grains=None): ''' @@ -412,7 +413,6 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin): ret = self.run_state('pkg.removed', name=target) self.assertSaltTrueReturn(ret) - @skipIf(salt.utils.platform.is_windows(), 'minion is windows') @requires_system_grains def test_pkg_007_with_dot_in_pkgname(self, grains=None): ''' @@ -443,7 +443,6 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin): ret = self.run_state('pkg.removed', name=target) self.assertSaltTrueReturn(ret) - @skipIf(salt.utils.platform.is_windows(), 'minion is windows') @requires_system_grains def test_pkg_008_epoch_in_version(self, grains=None): ''' @@ -494,7 +493,6 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin): refresh=False) self.assertSaltTrueReturn(ret) - @skipIf(salt.utils.platform.is_windows(), 'minion is windows') @requires_salt_modules('pkg.info_installed') def test_pkg_010_latest_with_epoch_and_info_installed(self): ''' @@ -514,7 +512,6 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin): ret = self.run_function('pkg.info_installed', [package]) self.assertTrue(pkgquery in six.text_type(ret)) - @skipIf(salt.utils.platform.is_windows(), 'minion is windows') @requires_system_grains def test_pkg_011_latest(self, grains=None): ''' @@ -546,7 +543,6 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin): ret = self.run_state('pkg.removed', name=target) self.assertSaltTrueReturn(ret) - @skipIf(salt.utils.platform.is_windows(), 'minion is windows') @requires_system_grains def test_pkg_012_latest_only_upgrade(self, grains=None): ''' diff --git a/tests/integration/states/test_service.py b/tests/integration/states/test_service.py index f0d11813ad..ef01627efe 100644 --- a/tests/integration/states/test_service.py +++ b/tests/integration/states/test_service.py @@ -13,6 +13,7 @@ from tests.support.mixins import SaltReturnAssertsMixin # Import salt libs import salt.utils.path +import salt.utils.platform INIT_DELAY = 5 @@ -62,10 +63,15 @@ class ServiceTest(ModuleCase, SaltReturnAssertsMixin): ''' test service.running state module ''' - stop_service = self.run_function('service.stop', self.service_name) - self.assertTrue(stop_service) + if self.run_function('service.status', name=self.service_name): + stop_service = self.run_function('service.stop', name=self.service_name) + self.assertTrue(stop_service) self.check_service_status(self.stopped) + if salt.utils.platform.is_darwin(): + # make sure the service is enabled on macosx + enable = self.run_function('service.enable', name=self.service_name) + start_service = self.run_state('service.running', name=self.service_name) self.assertTrue(start_service) diff --git a/tests/integration/states/test_user.py b/tests/integration/states/test_user.py index 1bbfb8eaae..2dcaf9c4b7 100644 --- a/tests/integration/states/test_user.py +++ b/tests/integration/states/test_user.py @@ -12,7 +12,6 @@ from __future__ import absolute_import, print_function, unicode_literals import os import sys from random import randint -import grp # Import Salt Testing libs from tests.support.case import ModuleCase @@ -28,11 +27,18 @@ if salt.utils.platform.is_darwin(): GROUP = 'macuser' GID = randint(400, 500) NOGROUPGID = randint(400, 500) +elif salt.utils.platform.is_windows(): + USER = 'winuser' + GROUP = 'winuser' + GID = randint(400, 500) + NOGROUPGID = randint(400, 500) + grp = None else: USER = 'nobody' GROUP = 'nobody' GID = 'nobody' NOGROUPGID = 'nogroup' + import grp @destructiveTest @@ -41,8 +47,8 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin): ''' test for user absent ''' - user_name = 'salt_test' - user_home = '/var/lib/salt_test' + user_name = 'salt-test' + user_home = '/var/lib/{0}'.format(user_name) if not salt.utils.platform.is_windows() else os.path.join('tmp', user_name) def test_user_absent(self): ret = self.run_state('user.absent', name='unpossible') @@ -101,16 +107,23 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin): self.assertSaltTrueReturn(ret) ret = self.run_function('user.info', [self.user_name]) self.assertReturnNonEmptySaltType(ret) - group_name = grp.getgrgid(ret['gid']).gr_name - if not salt.utils.platform.is_darwin(): + if salt.utils.platform.is_windows(): + group_name = self.run_function('user.list_groups', [self.user_name]) + else: + group_name = grp.getgrgid(ret['gid']).gr_name + + if not salt.utils.platform.is_darwin() and not salt.utils.platform.is_windows(): self.assertTrue(os.path.isdir(self.user_home)) if grains['os_family'] in ('Suse',): self.assertEqual(group_name, 'users') elif grains['os_family'] == 'MacOS': self.assertEqual(group_name, 'staff') + elif salt.utils.platform.is_windows(): + self.assertEqual([], group_name) else: self.assertEqual(group_name, self.user_name) + @skipIf(salt.utils.platform.is_windows(), 'windows minion does not support gid_from_name') @requires_system_grains def test_user_present_gid_from_name_default(self, grains=None): ''' @@ -145,6 +158,7 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin): else: self.assertEqual(group_name, self.user_name) + @skipIf(salt.utils.platform.is_windows(), 'windows minion does not support gid_from_name') def test_user_present_gid_from_name(self): ''' This is a DESTRUCTIVE TEST it creates a new user on the on the minion. @@ -197,6 +211,7 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin): ) self.assertSaltTrueReturn(ret) + @skipIf(salt.utils.platform.is_windows(), 'windows minon does not support roomnumber or phone') def test_user_present_gecos(self): ''' This is a DESTRUCTIVE TEST it creates a new user on the on the minion. @@ -216,6 +231,7 @@ class UserTest(ModuleCase, SaltReturnAssertsMixin): ) self.assertSaltTrueReturn(ret) + @skipIf(salt.utils.platform.is_windows(), 'windows minon does not support roomnumber or phone') def test_user_present_gecos_none_fields(self): ''' This is a DESTRUCTIVE TEST it creates a new user on the on the minion. diff --git a/tests/integration/states/test_virtualenv.py b/tests/integration/states/test_virtualenv.py index 3db87fc2ef..b086062d32 100644 --- a/tests/integration/states/test_virtualenv.py +++ b/tests/integration/states/test_virtualenv.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.integration.states.virtualenv diff --git a/tests/integration/utils/test_thin.py b/tests/integration/utils/test_thin.py new file mode 100644 index 0000000000..f315d5fca5 --- /dev/null +++ b/tests/integration/utils/test_thin.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +from __future__ import absolute_import +import tarfile +import tempfile +import subprocess +import sys +import os + +from tests.support.unit import TestCase + +import salt.utils.files +import salt.utils.thin +try: + import virtualenv + HAS_VENV = True +except ImportError: + HAS_VENV = False + + +class TestThinDir(TestCase): + + def setUp(self): + self.tmpdir = tempfile.mkdtemp() + + def tearDown(self): + salt.utils.files.rm_rf(self.tmpdir) + + def test_thin_dir(self): + ''' + Test the thin dir to make sure salt-call can run + + Run salt call via a python in a new virtual environment to ensure + salt-call has all dependencies needed. + ''' + venv_dir = os.path.join(self.tmpdir, 'venv') + virtualenv.create_environment(venv_dir) + salt.utils.thin.gen_thin(self.tmpdir) + thin_dir = os.path.join(self.tmpdir, 'thin') + thin_archive = os.path.join(thin_dir, 'thin.tgz') + tar = tarfile.open(thin_archive) + tar.extractall(thin_dir) + tar.close() + bins = 'bin' + if sys.platform == 'win32': + bins = 'Scripts' + cmd = [ + os.path.join(venv_dir, bins, 'python'), + os.path.join(thin_dir, 'salt-call'), + '--version', + ] + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = proc.communicate() + proc.wait() + assert proc.returncode == 0, (stdout, stderr, proc.returncode) diff --git a/tests/minionswarm.py b/tests/minionswarm.py index 2b09cd6e96..edbf7d41f8 100644 --- a/tests/minionswarm.py +++ b/tests/minionswarm.py @@ -9,7 +9,6 @@ on a single system to test scale capabilities # Import Python Libs from __future__ import absolute_import, print_function import os -import pwd import time import signal import optparse @@ -29,6 +28,7 @@ import salt.utils.yaml # Import third party libs from salt.ext import six from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin +import tests.support.helpers OSES = [ @@ -148,7 +148,7 @@ def parse(): '-c', '--config-dir', default='', help=('Pass in a configuration directory containing base configuration.') ) - parser.add_option('-u', '--user', default=pwd.getpwuid(os.getuid()).pw_name) + parser.add_option('-u', '--user', default=tests.support.helpers.this_user()) options, _args = parser.parse_args() diff --git a/tests/support/case.py b/tests/support/case.py index 5a175fab6c..7d1b957811 100644 --- a/tests/support/case.py +++ b/tests/support/case.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) ==================================== @@ -98,10 +98,15 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): script_name ) ) - sfh.write( + contents = ( '#!{0}\n'.format(sys.executable) + '\n'.join(script_template).format(script_name.replace('salt-', '')) ) + sfh.write(contents) + log.debug( + 'Wrote the following contents to temp script %s:\n%s', + script_path, contents + ) st = os.stat(script_path) os.chmod(script_path, st.st_mode | stat.S_IEXEC) @@ -122,7 +127,7 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): data = '\n'.join(data) self.assertIn('minion', data) ''' - arg_str = '-c {0} -t {1} {2}'.format(self.get_config_dir(), timeout, arg_str) + arg_str = '-c {0} -t {1} {2}'.format(self.config_dir, timeout, arg_str) return self.run_script('salt', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, timeout=timeout) def run_ssh(self, arg_str, with_retcode=False, timeout=25, @@ -133,7 +138,7 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): arg_str = '{0} {1} -c {2} -i --priv {3} --roster-file {4} localhost {5} --out=json'.format( ' -W' if wipe else '', ' -r' if raw else '', - self.get_config_dir(), + self.config_dir, os.path.join(RUNTIME_VARS.TMP_CONF_DIR, 'key_test'), os.path.join(RUNTIME_VARS.TMP_CONF_DIR, 'roster'), arg_str @@ -151,7 +156,7 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): Execute salt-run ''' arg_str = '-c {0}{async_flag} -t {timeout} {1}'.format( - config_dir or self.get_config_dir(), + config_dir or self.config_dir, arg_str, timeout=timeout, async_flag=' --async' if async else '') @@ -207,7 +212,7 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): ''' Execute salt-key ''' - arg_str = '-c {0} {1}'.format(self.get_config_dir(), arg_str) + arg_str = '-c {0} {1}'.format(self.config_dir, arg_str) return self.run_script( 'salt-key', arg_str, @@ -219,12 +224,12 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): ''' Execute salt-cp ''' - arg_str = '--config-dir {0} {1}'.format(self.get_config_dir(), arg_str) + arg_str = '--config-dir {0} {1}'.format(self.config_dir, arg_str) return self.run_script('salt-cp', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr) def run_call(self, arg_str, with_retcode=False, catch_stderr=False, local=False): arg_str = '{0} --config-dir {1} {2}'.format('--local' if local else '', - self.get_config_dir(), arg_str) + self.config_dir, arg_str) return self.run_script('salt-call', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr) @@ -232,7 +237,7 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): ''' Execute salt-cloud ''' - arg_str = '-c {0} {1}'.format(self.get_config_dir(), arg_str) + arg_str = '-c {0} {1}'.format(self.config_dir, arg_str) return self.run_script('salt-cloud', arg_str, catch_stderr, timeout) def run_script(self, @@ -240,11 +245,18 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): arg_str, catch_stderr=False, with_retcode=False, + catch_timeout=False, # FIXME A timeout of zero or disabling timeouts may not return results! timeout=15, - raw=False): + raw=False, + log_output=None): ''' Execute a script with the given argument string + + The ``log_output`` argument is ternary, it can be True, False, or None. + If the value is boolean, then it forces the results to either be logged + or not logged. If it is None, then the return code of the subprocess + determines whether or not to log results. ''' script_path = self.get_script_path(script) if not os.path.isfile(script_path): @@ -288,6 +300,50 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): popen_kwargs['preexec_fn'] = detach_from_parent_group + def format_return(retcode, stdout, stderr=None, timed_out=False): + ''' + DRY helper to log script result if it failed, and then return the + desired output based on whether or not stderr was desired, and + wither or not a retcode was desired. + ''' + log_func = log.debug + if timed_out: + log.error( + 'run_script timed out after %d seconds (process killed)', + timeout + ) + log_func = log.error + + if log_output is True \ + or timed_out \ + or (log_output is None and retcode != 0): + log_func( + 'run_script results for: %s %s\n' + 'return code: %s\n' + 'stdout:\n' + '%s\n\n' + 'stderr:\n' + '%s', + script, arg_str, retcode, stdout, stderr + ) + + stdout = stdout or '' + stderr = stderr or '' + + if not raw: + stdout = stdout.splitlines() + stderr = stderr.splitlines() + + ret = [stdout] + if catch_stderr: + ret.append(stderr) + if with_retcode: + ret.append(retcode) + if catch_timeout: + ret.append(timed_out) + + return ret[0] if len(ret) == 1 else tuple(ret) + process = subprocess.Popen(cmd, **popen_kwargs) # Late import @@ -299,7 +355,12 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): while True: process.poll() time.sleep(0.1) - if datetime.now() > stop_at: + if datetime.now() <= stop_at: + # We haven't reached the timeout yet + if process.returncode is not None: + break + else: + # We've reached the timeout if term_sent is False: # Kill the process group since sending the term signal # would only terminate the shell, not the command @@ -326,23 +387,12 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): # If errno is not "no such process", raise raise - out = [ - 'Process took more than {0} seconds to complete. ' - 'Process Killed!'.format(timeout) - ] - if catch_stderr: - err = ['Process killed, unable to catch stderr output'] - if with_retcode: - return out, err, process.returncode - else: - return out, err - if with_retcode: - return out, process.returncode - else: - return out + return format_return( + process.returncode, + *process.communicate(), + timed_out=True + ) - if process.returncode is not None: - break tmp_file.seek(0) if sys.version_info >= (3,): @@ -377,25 +427,10 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): process.stdout.close() if process.stderr is not None: process.stderr.close() + # pylint: disable=maybe-no-member try: - if with_retcode: - if out is not None and err is not None: - if not raw: - return out.splitlines(), err.splitlines(), process.returncode - else: - return out, err, process.returncode - return out.splitlines(), [], process.returncode - else: - if out is not None and err is not None: - if not raw: - return out.splitlines(), err.splitlines() - else: - return out, err - if not raw: - return out.splitlines(), [] - else: - return out, [] + return format_return(process.returncode, out, err or '') finally: try: if os.path.exists(tmp_file.name): @@ -418,16 +453,7 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixin): process.stdout.close() try: - if with_retcode: - if not raw: - return out.splitlines(), process.returncode - else: - return out, process.returncode - else: - if not raw: - return out.splitlines() - else: - return out + return format_return(process.returncode, out) finally: try: if os.path.exists(tmp_file.name): @@ -463,7 +489,7 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi ''' Execute salt ''' - arg_str = '-c {0} {1}'.format(self.get_config_dir(), arg_str) + arg_str = '-c {0} -t {1} {2}'.format(self.config_dir, timeout, arg_str) ret = self.run_script('salt', arg_str, with_retcode=with_retcode, @@ -492,7 +518,7 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi arg_str = '{0} -ldebug{1} -c {2} -i --priv {3} --roster-file {4} --out=json localhost {5}'.format( ' -W' if wipe else '', ' -r' if raw else '', - self.get_config_dir(), + self.config_dir, os.path.join(RUNTIME_VARS.TMP_CONF_DIR, 'key_test'), os.path.join(RUNTIME_VARS.TMP_CONF_DIR, 'roster'), arg_str) @@ -509,7 +535,7 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi ''' Execute salt-run ''' - arg_str = '-c {0}{async_flag} -t {timeout} {1}'.format(config_dir or self.get_config_dir(), + arg_str = '-c {0}{async_flag} -t {timeout} {1}'.format(config_dir or self.config_dir, arg_str, timeout=timeout, async_flag=' --async' if async else '') @@ -565,7 +591,7 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi ''' Execute salt-key ''' - arg_str = '-c {0} {1}'.format(self.get_config_dir(), arg_str) + arg_str = '-c {0} {1}'.format(self.config_dir, arg_str) ret = self.run_script('salt-key', arg_str, catch_stderr=catch_stderr, @@ -580,7 +606,7 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi ''' # Note: not logging result of run_cp because it will log a bunch of # bytes which will not be very helpful. - arg_str = '--config-dir {0} {1}'.format(self.get_config_dir(), arg_str) + arg_str = '--config-dir {0} {1}'.format(self.config_dir, arg_str) return self.run_script('salt-cp', arg_str, with_retcode=with_retcode, @@ -592,7 +618,7 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi Execute salt-call. ''' arg_str = '{0} --config-dir {1} {2}'.format('--local' if local else '', - self.get_config_dir(), arg_str) + self.config_dir, arg_str) ret = self.run_script('salt-call', arg_str, with_retcode=with_retcode, @@ -605,7 +631,7 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi ''' Execute salt-cloud ''' - arg_str = '-c {0} {1}'.format(self.get_config_dir(), arg_str) + arg_str = '-c {0} {1}'.format(self.config_dir, arg_str) ret = self.run_script('salt-cloud', arg_str, catch_stderr, diff --git a/tests/support/helpers.py b/tests/support/helpers.py index bd6c9c1839..11dba33d21 100644 --- a/tests/support/helpers.py +++ b/tests/support/helpers.py @@ -59,8 +59,12 @@ from tests.support.paths import FILES, TMP import salt.utils.files import salt.utils.platform -log = logging.getLogger(__name__) +if salt.utils.platform.is_windows(): + import salt.utils.win_functions +else: + import pwd +log = logging.getLogger(__name__) HAS_SYMLINKS = None @@ -1159,7 +1163,6 @@ def skip_if_not_root(func): func.__unittest_skip__ = True func.__unittest_skip_why__ = 'You must be logged in as root to run this test' else: - import salt.utils.win_functions current_user = salt.utils.win_functions.get_current_user() if current_user != 'SYSTEM': if not salt.utils.win_functions.is_admin(current_user): @@ -1592,3 +1595,12 @@ def win32_kill_process_tree(pid, sig=signal.SIGTERM, include_parent=True, gone, alive = psutil.wait_procs(children, timeout=timeout, callback=on_terminate) return (gone, alive) + + +def this_user(): + ''' + Get the user associated with the current process. + ''' + if salt.utils.platform.is_windows(): + return salt.utils.win_functions.get_current_user(with_domain=False) + return pwd.getpwuid(os.getuid())[0] diff --git a/tests/support/mixins.py b/tests/support/mixins.py index 82c446c22c..d6c1125c4a 100644 --- a/tests/support/mixins.py +++ b/tests/support/mixins.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) ============= Class Mix-Ins @@ -171,10 +171,14 @@ class AdaptedConfigurationTestCaseMixin(object): ) return RUNTIME_VARS.RUNTIME_CONFIGS[config_for] - @staticmethod - def get_config_dir(): + @property + def config_dir(self): return RUNTIME_VARS.TMP_CONF_DIR + def get_config_dir(self): + log.warning('Use the config_dir attribute instead of calling get_config_dir()') + return self.config_dir + @staticmethod def get_config_file_path(filename): if filename == 'syndic_master': diff --git a/tests/support/mock.py b/tests/support/mock.py index da3d09480d..38b68bd5c4 100644 --- a/tests/support/mock.py +++ b/tests/support/mock.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.support.mock ~~~~~~~~~~~~~~~~~~ @@ -15,10 +15,15 @@ # pylint: disable=unused-import,function-redefined,blacklisted-module,blacklisted-external-module from __future__ import absolute_import +import collections +import copy +import errno +import fnmatch import sys # Import salt libs from salt.ext import six +import salt.utils.stringutils try: from mock import ( @@ -91,89 +96,420 @@ if NO_MOCK is False: NO_MOCK_REASON = 'you need to upgrade your mock version to >= 0.8.0' -# backport mock_open from the python 3 unittest.mock library so that we can -# mock read, readline, readlines, and file iteration properly +class MockFH(object): + def __init__(self, filename, read_data, *args, **kwargs): + self.filename = filename + self.read_data = read_data + try: + self.mode = args[0] + except IndexError: + self.mode = kwargs.get('mode', 'r') + self.binary_mode = 'b' in self.mode + self.read_mode = any(x in self.mode for x in ('r', '+')) + self.write_mode = any(x in self.mode for x in ('w', 'a', '+')) + self.empty_string = b'' if self.binary_mode else '' + self.call = MockCall(filename, *args, **kwargs) + self.read_data_iter = self._iterate_read_data(read_data) + self.read = Mock(side_effect=self._read) + self.readlines = Mock(side_effect=self._readlines) + self.readline = Mock(side_effect=self._readline) + self.write = Mock(side_effect=self._write) + self.writelines = Mock(side_effect=self._writelines) + self.close = Mock() + self.seek = Mock() + self.__loc = 0 + self.__read_data_ok = False -file_spec = None + def _iterate_read_data(self, read_data): + ''' + Helper for mock_open: + Retrieve lines from read_data via a generator so that separate calls to + readline, read, and readlines are properly interleaved + ''' + # Newline will always be a bytestring on PY2 because mock_open will have + # normalized it to one. + newline = b'\n' if isinstance(read_data, six.binary_type) else '\n' + read_data = [line + newline for line in read_data.split(newline)] -def _iterate_read_data(read_data): - # Helper for mock_open: - # Retrieve lines from read_data via a generator so that separate calls to - # readline, read, and readlines are properly interleaved - if six.PY3 and isinstance(read_data, six.binary_type): - data_as_list = ['{0}\n'.format(l.decode(__salt_system_encoding__)) for l in read_data.split(b'\n')] - else: - data_as_list = ['{0}\n'.format(l) for l in read_data.split('\n')] + if read_data[-1] == newline: + # If the last line ended in a newline, the list comprehension will have an + # extra entry that's just a newline. Remove this. + read_data = read_data[:-1] + else: + # If there wasn't an extra newline by itself, then the file being + # emulated doesn't have a newline to end the last line, so remove the + # newline that we added in the list comprehension. + read_data[-1] = read_data[-1][:-1] - if data_as_list[-1] == '\n': - # If the last line ended in a newline, the list comprehension will have an - # extra entry that's just a newline. Remove this. - data_as_list = data_as_list[:-1] - else: - # If there wasn't an extra newline by itself, then the file being - # emulated doesn't have a newline to end the last line remove the - # newline that our naive format() added - data_as_list[-1] = data_as_list[-1][:-1] - - for line in data_as_list: - yield line - - -def mock_open(mock=None, read_data=''): - """ - A helper function to create a mock to replace the use of `open`. It works - for `open` called directly or used as a context manager. - - The `mock` argument is the mock object to configure. If `None` (the - default) then a `MagicMock` will be created for you, with the API limited - to methods or attributes available on standard file handles. - - `read_data` is a string for the `read` methoddline`, and `readlines` of the - file handle to return. This is an empty string by default. - """ - def _readlines_side_effect(*args, **kwargs): - if handle.readlines.return_value is not None: - return handle.readlines.return_value - return list(_data) - - def _read_side_effect(*args, **kwargs): - if handle.read.return_value is not None: - return handle.read.return_value - return ''.join(_data) - - def _readline_side_effect(): - if handle.readline.return_value is not None: - while True: - yield handle.readline.return_value - for line in _data: + for line in read_data: yield line - global file_spec - if file_spec is None: - if six.PY3: - import _io - file_spec = list(set(dir(_io.TextIOWrapper)).union(set(dir(_io.BytesIO)))) + @property + def write_calls(self): + ''' + Return a list of all calls to the .write() mock + ''' + return [x[1][0] for x in self.write.mock_calls] + + @property + def writelines_calls(self): + ''' + Return a list of all calls to the .writelines() mock + ''' + return [x[1][0] for x in self.writelines.mock_calls] + + def tell(self): + return self.__loc + + def __check_read_data(self): + if not self.__read_data_ok: + if self.binary_mode: + if not isinstance(self.read_data, six.binary_type): + raise TypeError( + '{0} opened in binary mode, expected read_data to be ' + 'bytes, not {1}'.format( + self.filename, + type(self.read_data).__name__ + ) + ) + else: + if not isinstance(self.read_data, str): + raise TypeError( + '{0} opened in non-binary mode, expected read_data to ' + 'be str, not {1}'.format( + self.filename, + type(self.read_data).__name__ + ) + ) + # No need to repeat this the next time we check + self.__read_data_ok = True + + def _read(self, size=0): + self.__check_read_data() + if not self.read_mode: + raise IOError('File not open for reading') + if not isinstance(size, six.integer_types) or size < 0: + raise TypeError('a positive integer is required') + + joined = self.empty_string.join(self.read_data_iter) + if not size: + # read() called with no args, return everything + self.__loc += len(joined) + return joined else: - file_spec = file # pylint: disable=undefined-variable + # read() called with an explicit size. Return a slice matching the + # requested size, but before doing so, reset read_data to reflect + # what we read. + self.read_data_iter = self._iterate_read_data(joined[size:]) + ret = joined[:size] + self.__loc += len(ret) + return ret - if mock is None: - mock = MagicMock(name='open', spec=open) + def _readlines(self, size=None): # pylint: disable=unused-argument + # TODO: Implement "size" argument + self.__check_read_data() + if not self.read_mode: + raise IOError('File not open for reading') + ret = list(self.read_data_iter) + self.__loc += sum(len(x) for x in ret) + return ret - handle = MagicMock(spec=file_spec) - handle.__enter__.return_value = handle + def _readline(self, size=None): # pylint: disable=unused-argument + # TODO: Implement "size" argument + self.__check_read_data() + if not self.read_mode: + raise IOError('File not open for reading') + try: + ret = next(self.read_data_iter) + self.__loc += len(ret) + return ret + except StopIteration: + return self.empty_string - _data = _iterate_read_data(read_data) + def __iter__(self): + self.__check_read_data() + if not self.read_mode: + raise IOError('File not open for reading') + while True: + try: + ret = next(self.read_data_iter) + self.__loc += len(ret) + yield ret + except StopIteration: + break - handle.write.return_value = None - handle.read.return_value = None - handle.readline.return_value = None - handle.readlines.return_value = None + def _write(self, content): + if not self.write_mode: + raise IOError('File not open for writing') + if six.PY2: + if isinstance(content, six.text_type): + # encoding intentionally not specified to force a + # UnicodeEncodeError when non-ascii unicode type is passed + content.encode() + else: + content_type = type(content) + if self.binary_mode and content_type is not bytes: + raise TypeError( + 'a bytes-like object is required, not \'{0}\''.format( + content_type.__name__ + ) + ) + elif not self.binary_mode and content_type is not str: + raise TypeError( + 'write() argument must be str, not {0}'.format( + content_type.__name__ + ) + ) - # This is salt specific and not in the upstream mock - handle.read.side_effect = _read_side_effect - handle.readline.side_effect = _readline_side_effect() - handle.readlines.side_effect = _readlines_side_effect + def _writelines(self, lines): + if not self.write_mode: + raise IOError('File not open for writing') + for line in lines: + self._write(line) - mock.return_value = handle - return mock + def __enter__(self): + return self + + def __exit__(self, exc_type, exc_val, exc_tb): # pylint: disable=unused-argument + pass + + +class MockCall(object): + def __init__(self, *args, **kwargs): + self.args = args + self.kwargs = kwargs + + def __repr__(self): + # future lint: disable=blacklisted-function + ret = str('MockCall(') + for arg in self.args: + ret += repr(arg) + str(', ') + if not self.kwargs: + if self.args: + # Remove trailing ', ' + ret = ret[:-2] + else: + for key, val in six.iteritems(self.kwargs): + ret += str('{0}={1}').format( + salt.utils.stringutils.to_str(key), + repr(val) + ) + ret += str(')') + return ret + # future lint: enable=blacklisted-function + + def __str__(self): + return self.__repr__() + + def __eq__(self, other): + return self.args == other.args and self.kwargs == other.kwargs + + +class MockOpen(object): + r''' + This class can be used to mock the use of ``open()``. + + ``read_data`` is a string representing the contents of the file to be read. + By default, this is an empty string. + + Optionally, ``read_data`` can be a dictionary mapping ``fnmatch.fnmatch()`` + patterns to strings (or optionally, exceptions). This allows the mocked + filehandle to serve content for more than one file path. + + .. code-block:: python + + data = { + '/etc/foo.conf': textwrap.dedent("""\ + Foo + Bar + Baz + """), + '/etc/bar.conf': textwrap.dedent("""\ + A + B + C + """), + } + with patch('salt.utils.files.fopen', mock_open(read_data=data): + do stuff + + If the file path being opened does not match any of the glob expressions, + an IOError will be raised to simulate the file not existing. + + Passing ``read_data`` as a string is equivalent to passing it with a glob + expression of "*". That is to say, the below two invocations are + equivalent: + + .. code-block:: python + + mock_open(read_data='foo\n') + mock_open(read_data={'*': 'foo\n'}) + + Instead of a string representing file contents, ``read_data`` can map to an + exception, and that exception will be raised if a file matching that + pattern is opened: + + .. code-block:: python + + data = { + '/etc/*': IOError(errno.EACCES, 'Permission denied'), + '*': 'Hello world!\n', + } + with patch('salt.utils.files.fopen', mock_open(read_data=data)): + do stuff + + The above would raise an exception if any files within /etc are opened, but + would produce a mocked filehandle if any other file is opened. + + To simulate file contents changing upon subsequent opens, the file contents + can be a list of strings/exceptions. For example: + + .. code-block:: python + + data = { + '/etc/foo.conf': [ + 'before\n', + 'after\n', + ], + '/etc/bar.conf': [ + IOError(errno.ENOENT, 'No such file or directory', '/etc/bar.conf'), + 'Hey, the file exists now!', + ], + } + with patch('salt.utils.files.fopen', mock_open(read_data=data): + do stuff + + The first open of ``/etc/foo.conf`` would return "before\n" when read, + while the second would return "after\n" when read. For ``/etc/bar.conf``, + the first read would raise an exception, while the second would open + successfully and read the specified string. + + Expressions will be attempted in dictionary iteration order (the exception + being ``*`` which is tried last), so if a file path matches more than one + fnmatch expression then the first match "wins". If your use case calls for + overlapping expressions, then an OrderedDict can be used to ensure that the + desired matching behavior occurs: + + .. code-block:: python + + data = OrderedDict() + data['/etc/foo.conf'] = 'Permission granted!' + data['/etc/*'] = IOError(errno.EACCES, 'Permission denied') + data['*'] = '*': 'Hello world!\n' + with patch('salt.utils.files.fopen', mock_open(read_data=data): + do stuff + + The following attributes are tracked for the life of a mock object: + + * call_count - Tracks how many fopen calls were attempted + * filehandles - This is a dictionary mapping filenames to lists of MockFH + objects, representing the individual times that a given file was opened. + ''' + def __init__(self, read_data=''): + # If the read_data contains lists, we will be popping it. So, don't + # modify the original value passed. + read_data = copy.copy(read_data) + + # Normalize read_data, Python 2 filehandles should never produce unicode + # types on read. + if not isinstance(read_data, dict): + read_data = {'*': read_data} + + if six.PY2: + # .__class__() used here to preserve the dict class in the event that + # an OrderedDict was used. + new_read_data = read_data.__class__() + for key, val in six.iteritems(read_data): + try: + val = salt.utils.data.decode(val, to_str=True) + except TypeError: + if not isinstance(val, BaseException): + raise + new_read_data[key] = val + + read_data = new_read_data + del new_read_data + + self.read_data = read_data + self.filehandles = {} + self.calls = [] + self.call_count = 0 + + def __call__(self, name, *args, **kwargs): + ''' + Match the file being opened to the patterns in the read_data and spawn + a mocked filehandle with the corresponding file contents. + ''' + call = MockCall(name, *args, **kwargs) + self.calls.append(call) + self.call_count += 1 + for pat in self.read_data: + if pat == '*': + continue + if fnmatch.fnmatch(name, pat): + matched_pattern = pat + break + else: + # No non-glob match in read_data, fall back to '*' + matched_pattern = '*' + try: + matched_contents = self.read_data[matched_pattern] + try: + # Assuming that the value for the matching expression is a + # list, pop the first element off of it. + file_contents = matched_contents.pop(0) + except AttributeError: + # The value for the matching expression is a string (or exception) + file_contents = matched_contents + except IndexError: + # We've run out of file contents, abort! + raise RuntimeError( + 'File matching expression \'{0}\' opened more times than ' + 'expected'.format(matched_pattern) + ) + + try: + # Raise the exception if the matched file contents are an + # instance of an exception class. + raise file_contents + except TypeError: + # Contents were not an exception, so proceed with creating the + # mocked filehandle. + pass + + ret = MockFH(name, file_contents, *args, **kwargs) + self.filehandles.setdefault(name, []).append(ret) + return ret + except KeyError: + # No matching glob in read_data, treat this as a file that does + # not exist and raise the appropriate exception. + raise IOError(errno.ENOENT, 'No such file or directory', name) + + def write_calls(self, path=None): + ''' + Returns the contents passed to all .write() calls. Use `path` to narrow + the results to files matching a given pattern. + ''' + ret = [] + for filename, handles in six.iteritems(self.filehandles): + if path is None or fnmatch.fnmatch(filename, path): + for fh_ in handles: + ret.extend(fh_.write_calls) + return ret + + def writelines_calls(self, path=None): + ''' + Returns the contents passed to all .writelines() calls. Use `path` to + narrow the results to files matching a given pattern. + ''' + ret = [] + for filename, handles in six.iteritems(self.filehandles): + if path is None or fnmatch.fnmatch(filename, path): + for fh_ in handles: + ret.extend(fh_.writelines_calls) + return ret + + +# reimplement mock_open to support multiple filehandles +mock_open = MockOpen diff --git a/tests/support/parser/__init__.py b/tests/support/parser/__init__.py index dd601241a2..f8b5fd684b 100644 --- a/tests/support/parser/__init__.py +++ b/tests/support/parser/__init__.py @@ -5,7 +5,7 @@ Salt Tests CLI access classes - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) :copyright: Copyright 2013-2017 by the SaltStack Team, see AUTHORS for more details :license: Apache 2.0, see LICENSE for more details. ''' @@ -332,7 +332,7 @@ class SaltTestingParser(optparse.OptionParser): os.path.basename(fpath).startswith('test_'): self.options.name.append(fpath) continue - self.exit(status=1, msg='\'{}\' is not a valid test module'.format(fpath)) + self.exit(status=1, msg='\'{}\' is not a valid test module\n'.format(fpath)) print_header(u'', inline=True, width=self.options.output_columns) self.pre_execution_cleanup() diff --git a/tests/support/parser/cover.py b/tests/support/parser/cover.py index 05056d060f..cedf2e3876 100644 --- a/tests/support/parser/cover.py +++ b/tests/support/parser/cover.py @@ -5,7 +5,7 @@ Code coverage aware testing parser - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) :copyright: Copyright 2013 by the SaltStack Team, see AUTHORS for more details. :license: Apache 2.0, see LICENSE for more details. ''' diff --git a/tests/support/paths.py b/tests/support/paths.py index 7f7024ccab..934e7ec4de 100644 --- a/tests/support/paths.py +++ b/tests/support/paths.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) :copyright: Copyright 2017 by the SaltStack Team, see AUTHORS for more details. :license: Apache 2.0, see LICENSE for more details. diff --git a/tests/support/runtests.py b/tests/support/runtests.py index f2a896a7aa..2cc2139f6c 100644 --- a/tests/support/runtests.py +++ b/tests/support/runtests.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) .. _runtime_vars: @@ -49,7 +49,6 @@ # Import Python modules from __future__ import absolute_import, print_function import os -import sys import shutil import logging import multiprocessing @@ -58,6 +57,7 @@ import salt.utils.json # Import tests support libs import tests.support.paths as paths +import tests.support.helpers # Import 3rd-party libs from salt.ext import six @@ -104,12 +104,9 @@ try: except ImportError: pass -if sys.platform.startswith('win'): - import win32api # pylint: disable=import-error - RUNNING_TESTS_USER = win32api.GetUserName() -else: - import pwd - RUNNING_TESTS_USER = pwd.getpwuid(os.getuid()).pw_name + +RUNNING_TESTS_USER = tests.support.helpers.this_user() + log = logging.getLogger(__name__) diff --git a/tests/support/unit.py b/tests/support/unit.py index 423dcd8de2..70cd8b7891 100644 --- a/tests/support/unit.py +++ b/tests/support/unit.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) ============================ diff --git a/tests/support/win_installer.py b/tests/support/win_installer.py index 6aa139243f..4b979b6d44 100644 --- a/tests/support/win_installer.py +++ b/tests/support/win_installer.py @@ -29,7 +29,7 @@ def iter_installers(content): x = m.groups()[0] if not x.startswith(PREFIX): continue - if x.endswith('zip'): + if x.endswith(('zip', 'sha256')): continue if installer: if x != installer + '.md5': @@ -54,7 +54,8 @@ def latest_version(repo=REPO): ''' Return the latest version found on the salt repository webpage. ''' - for name, md5 in iter_installers(requests.get(repo).content): + content = requests.get(repo).content.decode('utf-8') + for name, md5 in iter_installers(content): pass return split_installer(name)[0] diff --git a/tests/support/xmlunit.py b/tests/support/xmlunit.py index 5c7d350a5f..b7640fb0e0 100644 --- a/tests/support/xmlunit.py +++ b/tests/support/xmlunit.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) :copyright: Copyright 2014 by the SaltStack Team, see AUTHORS for more details. :license: Apache 2.0, see LICENSE for more details. diff --git a/tests/unit/beacons/test_btmp_beacon.py b/tests/unit/beacons/test_btmp_beacon.py index b50499b822..0060a03532 100644 --- a/tests/unit/beacons/test_btmp_beacon.py +++ b/tests/unit/beacons/test_btmp_beacon.py @@ -2,8 +2,8 @@ # Python libs from __future__ import absolute_import +import datetime import logging -import sys # Salt testing libs from tests.support.unit import skipIf, TestCase @@ -12,13 +12,18 @@ from tests.support.mixins import LoaderModuleMockMixin # Salt libs import salt.beacons.btmp as btmp +from salt.ext import six + +# pylint: disable=import-error +try: + import dateutil.parser as dateutil_parser # pylint: disable=unused-import + _TIME_SUPPORTED = True +except ImportError: + _TIME_SUPPORTED = False + +raw = b'\x06\x00\x00\x00Nt\x00\x00ssh:notty\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00garet\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xdd\xc7\xc2Y\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +pack = (6, 29774, b'ssh:notty\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'\x00\x00\x00\x00', b'garet\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 0, 0, 0, 1505937373, 0, 0, 0, 0, 16777216) -if sys.version_info >= (3,): - raw = bytes('\x06\x00\x00\x00Nt\x00\x00ssh:notty\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00garet\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xdd\xc7\xc2Y\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'utf-8') - pack = (6, 29774, b'ssh:notty\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'\x00\x00\x00\x00', b'garet\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 0, 0, 0, 1505937373, 0, 0, 0, 0, 16777216) -else: - raw = b'\x06\x00\x00\x00Nt\x00\x00ssh:notty\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00garet\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xdd\xc7\xc2Y\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' - pack = (6, 29774, 'ssh:notty\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', '\x00\x00\x00\x00', 'garet\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', '::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 0, 0, 0, 1505937373, 0, 0, 0, 0, 16777216) log = logging.getLogger(__name__) @@ -59,10 +64,11 @@ class BTMPBeaconTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(ret, (True, 'Valid beacon configuration')) - with patch('salt.utils.files.fopen', mock_open()) as m_open: + with patch('salt.utils.files.fopen', mock_open(b'')) as m_open: ret = btmp.beacon(config) - m_open.assert_called_with(btmp.BTMP, 'rb') - self.assertEqual(ret, []) + call_args = next(six.itervalues(m_open.filehandles))[0].call.args + assert call_args == (btmp.BTMP, 'rb'), call_args + assert ret == [], ret def test_invalid_users(self): config = [{'users': ['gareth']}] @@ -124,11 +130,14 @@ class BTMPBeaconTestCase(TestCase, LoaderModuleMockMixin): ret = btmp.beacon(config) self.assertEqual(ret, _expected) + @skipIf(not _TIME_SUPPORTED, 'dateutil.parser is missing.') def test_match_time(self): with patch('salt.utils.files.fopen', mock_open(read_data=raw)): - with patch('time.time', - MagicMock(return_value=1506121200)): + mock_now = datetime.datetime(2017, 9, 22, 16, 0, 0, 0) + with patch('datetime.datetime', MagicMock()), \ + patch('datetime.datetime.now', + MagicMock(return_value=mock_now)): with patch('struct.unpack', MagicMock(return_value=pack)): config = [{'users': {'garet': {'time_range': {'end': '09-22-2017 5pm', diff --git a/tests/unit/beacons/test_status_beacon.py b/tests/unit/beacons/test_status_beacon.py index 9f47924a6c..0aba104902 100644 --- a/tests/unit/beacons/test_status_beacon.py +++ b/tests/unit/beacons/test_status_beacon.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) :copyright: Copyright 2017 by the SaltStack Team, see AUTHORS for more details. diff --git a/tests/unit/beacons/test_wtmp_beacon.py b/tests/unit/beacons/test_wtmp_beacon.py index 83c1b2f2a4..47b30163b0 100644 --- a/tests/unit/beacons/test_wtmp_beacon.py +++ b/tests/unit/beacons/test_wtmp_beacon.py @@ -2,8 +2,8 @@ # Python libs from __future__ import absolute_import +import datetime import logging -import sys # Salt testing libs from tests.support.unit import skipIf, TestCase @@ -12,13 +12,17 @@ from tests.support.mixins import LoaderModuleMockMixin # Salt libs import salt.beacons.wtmp as wtmp +from salt.ext import six -if sys.version_info >= (3,): - raw = bytes('\x07\x00\x00\x00H\x18\x00\x00pts/14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00s/14gareth\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x13I\xc5YZf\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'utf-8') - pack = (7, 6216, b'pts/14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b's/14', b'gareth\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 0, 0, 0, 1506101523, 353882, 0, 0, 0, 16777216) -else: - raw = b'\x07\x00\x00\x00H\x18\x00\x00pts/14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00s/14gareth\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x13I\xc5YZf\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' - pack = (7, 6216, 'pts/14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 's/14', 'gareth\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', '::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 0, 0, 0, 1506101523, 353882, 0, 0, 0, 16777216) +# pylint: disable=import-error +try: + import dateutil.parser as dateutil_parser # pylint: disable=unused-import + _TIME_SUPPORTED = True +except ImportError: + _TIME_SUPPORTED = False + +raw = b'\x07\x00\x00\x00H\x18\x00\x00pts/14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00s/14gareth\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x13I\xc5YZf\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' +pack = (7, 6216, b'pts/14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b's/14', b'gareth\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'::1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 0, 0, 0, 1506101523, 353882, 0, 0, 0, 16777216) log = logging.getLogger(__name__) @@ -60,10 +64,11 @@ class WTMPBeaconTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(ret, (True, 'Valid beacon configuration')) - with patch('salt.utils.files.fopen', mock_open()) as m_open: + with patch('salt.utils.files.fopen', mock_open(b'')) as m_open: ret = wtmp.beacon(config) - m_open.assert_called_with(wtmp.WTMP, 'rb') - self.assertEqual(ret, []) + call_args = next(six.itervalues(m_open.filehandles))[0].call.args + assert call_args == (wtmp.WTMP, 'rb'), call_args + assert ret == [], ret def test_invalid_users(self): config = [{'users': ['gareth']}] @@ -126,11 +131,14 @@ class WTMPBeaconTestCase(TestCase, LoaderModuleMockMixin): log.debug('{}'.format(ret)) self.assertEqual(ret, _expected) + @skipIf(not _TIME_SUPPORTED, 'dateutil.parser is missing.') def test_match_time(self): with patch('salt.utils.files.fopen', mock_open(read_data=raw)): - with patch('time.time', - MagicMock(return_value=1506121200)): + mock_now = datetime.datetime(2017, 9, 22, 16, 0, 0, 0) + with patch('datetime.datetime', MagicMock()), \ + patch('datetime.datetime.now', + MagicMock(return_value=mock_now)): with patch('struct.unpack', MagicMock(return_value=pack)): config = [{'users': {'gareth': {'time': {'end': '09-22-2017 5pm', diff --git a/tests/unit/cli/test_batch.py b/tests/unit/cli/test_batch.py index 9606df6b41..1ca413287f 100644 --- a/tests/unit/cli/test_batch.py +++ b/tests/unit/cli/test_batch.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import python libs diff --git a/tests/unit/cli/test_daemons.py b/tests/unit/cli/test_daemons.py index 7dcf429d73..b6b0cd4ecb 100644 --- a/tests/unit/cli/test_daemons.py +++ b/tests/unit/cli/test_daemons.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Bo Maryniuk ` + :codeauthor: Bo Maryniuk ''' # Import python libs diff --git a/tests/unit/cloud/clouds/test_ec2.py b/tests/unit/cloud/clouds/test_ec2.py index 86a0e322f1..63d4182ab9 100644 --- a/tests/unit/cloud/clouds/test_ec2.py +++ b/tests/unit/cloud/clouds/test_ec2.py @@ -2,22 +2,49 @@ # Import Python libs from __future__ import absolute_import, print_function, unicode_literals +import os +import tempfile # Import Salt Libs from salt.cloud.clouds import ec2 from salt.exceptions import SaltCloudSystemExit +import salt.utils.files # Import Salt Testing Libs from tests.support.unit import TestCase, skipIf +from tests.support.mixins import LoaderModuleMockMixin from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, PropertyMock +from tests.support.paths import TMP +from tests.unit.test_crypt import PRIVKEY_DATA + +PASS_DATA = ( + b'qOjCKDlBdcNEbJ/J8eRl7sH+bYIIm4cvHHY86gh2NEUnufFlFo0gGVTZR05Fj0cw3n/w7gR' + b'urNXz5JoeSIHVuNI3YTwzL9yEAaC0kuy8EbOlO2yx8yPGdfml9BRwOV7A6b8UFo9co4H7fz' + b'DdScMKU2yzvRYvp6N6Q2cJGBmPsemnXWWusb+1vZVWxcRAQmG3ogF6Z5rZSYAYH0N4rqJgH' + b'mQfzuyb+jrBvV/IOoV1EdO9jGSH9338aS47NjrmNEN/SpnS6eCWZUwwyHbPASuOvWiY4QH/' + b'0YZC6EGccwiUmt0ZOxIynk+tEyVPTkiS0V8RcZK6YKqMWHpKmPtLBzfuoA==' +) @skipIf(NO_MOCK, NO_MOCK_REASON) -class EC2TestCase(TestCase): +class EC2TestCase(TestCase, LoaderModuleMockMixin): ''' Unit TestCase for salt.cloud.clouds.ec2 module. ''' + def setUp(self): + super(EC2TestCase, self).setUp() + with tempfile.NamedTemporaryFile(dir=TMP, suffix='.pem', delete=True) as fp: + self.key_file = fp.name + + def tearDown(self): + super(EC2TestCase, self).tearDown() + if os.path.exists(self.key_file): + os.remove(self.key_file) + + def setup_loader_modules(self): + return {ec2: {'__opts__': {}}} + def test__validate_key_path_and_mode(self): # Key file exists @@ -38,3 +65,24 @@ class EC2TestCase(TestCase): with patch('os.path.exists', return_value=False): self.assertRaises( SaltCloudSystemExit, ec2._validate_key_path_and_mode, 'key_file') + + @patch('salt.cloud.clouds.ec2._get_node') + @patch('salt.cloud.clouds.ec2.get_location') + @patch('salt.cloud.clouds.ec2.get_provider') + @patch('salt.utils.aws.query') + def test_get_password_data(self, query, get_provider, get_location, _get_node): + query.return_value = [ + { + 'passwordData': PASS_DATA + } + ] + _get_node.return_value = {'instanceId': 'i-abcdef'} + get_location.return_value = 'us-west2' + get_provider.return_value = 'ec2' + with salt.utils.files.fopen(self.key_file, 'w') as fp: + fp.write(PRIVKEY_DATA) + ret = ec2.get_password_data( + name='i-abcddef', kwargs={'key_file': self.key_file}, call='action' + ) + assert ret['passwordData'] == PASS_DATA + assert ret['password'] == b'testp4ss!' diff --git a/tests/unit/cloud/clouds/test_joyent.py b/tests/unit/cloud/clouds/test_joyent.py index 620006cccd..050d5a750b 100644 --- a/tests/unit/cloud/clouds/test_joyent.py +++ b/tests/unit/cloud/clouds/test_joyent.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Eric Radman ` + :codeauthor: Eric Radman ''' # Import Salt Libs diff --git a/tests/unit/cloud/clouds/test_linode.py b/tests/unit/cloud/clouds/test_linode.py index 587150bdf5..e186dc9d82 100644 --- a/tests/unit/cloud/clouds/test_linode.py +++ b/tests/unit/cloud/clouds/test_linode.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Salt Libs diff --git a/tests/unit/cloud/clouds/test_nova.py b/tests/unit/cloud/clouds/test_nova.py index eafdaf1aa1..fd6c95a374 100644 --- a/tests/unit/cloud/clouds/test_nova.py +++ b/tests/unit/cloud/clouds/test_nova.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Bo Maryniuk ` + :codeauthor: Bo Maryniuk ''' # Import Python libs diff --git a/tests/unit/cloud/clouds/test_opennebula.py b/tests/unit/cloud/clouds/test_opennebula.py index 8cce76b2a9..dc57614b31 100644 --- a/tests/unit/cloud/clouds/test_opennebula.py +++ b/tests/unit/cloud/clouds/test_opennebula.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python libs diff --git a/tests/unit/cloud/clouds/test_saltify.py b/tests/unit/cloud/clouds/test_saltify.py index 4c6bce4d5e..fd12bdcae0 100644 --- a/tests/unit/cloud/clouds/test_saltify.py +++ b/tests/unit/cloud/clouds/test_saltify.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Alexander Schwartz ` + :codeauthor: Alexander Schwartz ''' # Import Python libs diff --git a/tests/unit/cloud/test_map_conf.py b/tests/unit/cloud/test_map_conf.py index ad61716aed..5d08ea17a5 100644 --- a/tests/unit/cloud/test_map_conf.py +++ b/tests/unit/cloud/test_map_conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Eric Radman ` + :codeauthor: Eric Radman ''' # Import Python libs diff --git a/tests/unit/config/schemas/test_ssh.py b/tests/unit/config/schemas/test_ssh.py index 34a767c2a1..be53b14203 100644 --- a/tests/unit/config/schemas/test_ssh.py +++ b/tests/unit/config/schemas/test_ssh.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.config.schemas.test_ssh ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -73,6 +73,13 @@ class RosterEntryConfigTest(TestCase): 'title': 'Private Key', 'minLength': 1 }, + 'priv_passwd': { + 'type': 'string', + 'description': 'Passphrase for private key file', + 'title': 'Private Key passphrase', + 'format': 'secret', + 'minLength': 1, + }, 'sudo': { 'default': False, 'type': 'boolean', @@ -116,6 +123,7 @@ class RosterEntryConfigTest(TestCase): 'user', 'passwd', 'priv', + 'priv_passwd', 'sudo', 'timeout', 'thin_dir', diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py index 088bd46d8c..3cf65cd184 100644 --- a/tests/unit/config/test_config.py +++ b/tests/unit/config/test_config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.config_test diff --git a/tests/unit/daemons/test_masterapi.py b/tests/unit/daemons/test_masterapi.py index 8ba0b04d2a..441bfd44e3 100644 --- a/tests/unit/daemons/test_masterapi.py +++ b/tests/unit/daemons/test_masterapi.py @@ -3,6 +3,7 @@ # Import Python libs from __future__ import absolute_import, print_function, unicode_literals from functools import wraps +import os import io import stat @@ -12,6 +13,7 @@ import salt.daemons.masterapi as masterapi import salt.utils.platform # Import Salt Testing Libs +from tests.support.paths import TMP_CONF_DIR from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, @@ -568,7 +570,7 @@ class RemoteFuncsTestCase(TestCase): ''' def setUp(self): - opts = salt.config.master_config(None) + opts = salt.config.master_config(os.path.join(TMP_CONF_DIR, 'master')) self.funcs = masterapi.RemoteFuncs(opts) self.funcs.cache = FakeCache() diff --git a/tests/unit/fileserver/test_fileclient.py b/tests/unit/fileserver/test_fileclient.py index 38db095b98..826be706df 100644 --- a/tests/unit/fileserver/test_fileclient.py +++ b/tests/unit/fileserver/test_fileclient.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place ` + :codeauthor: Mike Place ''' # Import Python libs from __future__ import absolute_import diff --git a/tests/unit/fileserver/test_gitfs.py b/tests/unit/fileserver/test_gitfs.py index e9535142e9..7e7a2a01cc 100644 --- a/tests/unit/fileserver/test_gitfs.py +++ b/tests/unit/fileserver/test_gitfs.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' -:codeauthor: :email:`Erik Johnson ` + :codeauthor: Erik Johnson ''' # Import Python libs @@ -15,7 +15,7 @@ import tornado.ioloop import logging import stat try: - import pwd + import pwd # pylint: disable=unused-import except ImportError: pass diff --git a/tests/unit/fileserver/test_map.py b/tests/unit/fileserver/test_map.py index 148fdc7359..d38e22c8e1 100644 --- a/tests/unit/fileserver/test_map.py +++ b/tests/unit/fileserver/test_map.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Joao Mesquita ` + :codeauthor: Joao Mesquita ''' # Import Python libs diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py index efbe14f0ec..91deab475f 100644 --- a/tests/unit/fileserver/test_roots.py +++ b/tests/unit/fileserver/test_roots.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place ` + :codeauthor: Mike Place ''' # Import Python libs @@ -185,10 +185,15 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix self.assertIn(UNICODE_DIRNAME, ret) def test_symlink_list(self): - if self.test_symlink_list_file_roots: - self.opts['file_roots'] = self.test_symlink_list_file_roots - ret = roots.symlink_list({'saltenv': 'base'}) - self.assertDictEqual(ret, {'dest_sym': 'source_sym'}) + orig_file_roots = self.opts['file_roots'] + try: + if self.test_symlink_list_file_roots: + self.opts['file_roots'] = self.test_symlink_list_file_roots + ret = roots.symlink_list({'saltenv': 'base'}) + self.assertDictEqual(ret, {'dest_sym': 'source_sym'}) + finally: + if self.test_symlink_list_file_roots: + self.opts['file_roots'] = orig_file_roots class RootsLimitTraversalTest(TestCase, AdaptedConfigurationTestCaseMixin): diff --git a/tests/unit/grains/os-releases/solaris-11.3 b/tests/unit/grains/os-releases/solaris-11.3 new file mode 100644 index 0000000000..f40e9e6ab2 --- /dev/null +++ b/tests/unit/grains/os-releases/solaris-11.3 @@ -0,0 +1,3 @@ + Oracle Solaris 11.3 SPARC + Copyright (c) 1983, 2017, Oracle and/or its affiliates. All rights reserved. + Assembled 05 October 2017 \ No newline at end of file diff --git a/tests/unit/grains/solaris/prtconf.s7-zone b/tests/unit/grains/solaris/prtconf.s7-zone new file mode 100644 index 0000000000..c75205128c --- /dev/null +++ b/tests/unit/grains/solaris/prtconf.s7-zone @@ -0,0 +1,24 @@ +System Configuration: Oracle Corporation sun4v +Memory size: 16384 Megabytes +System Peripherals (PROM Nodes): + +Node 0xfffffffff + scsi-initiator-id: 00000007 + idprom: 00000000.00000000.00000000.00000000.00000000.00000000.00000000.00000000 + pcie-ari-supported: + #priqs-per-pcibus: 00000010 + #priqs-per-cpu: 00000010 + priq-eq-sizes: 00000003 + non-ios-perf-counters: 'ORCL,sn-non-ios-pr' + ios-perf-counters: 'ORCL,sn-ios-pr' + storage-variant: '8dbp' + product-name: 'SPARC S7-2' + banner-name: 'SPARC S7-2' + name: 'ORCL,SPARC-S7-2' + stick-frequency: 3b9aca00 + hv-api-groups: 00000000.00000000.00000000.00000000.00000000.00000000.00000000.00000000.000000060.00000000.00000000 + breakpoint-trap: 0000007f + device_type: 'sun4v' + compatible: 'sun4v' + #address-cells: 00000002 + #size-cells: 00000002 \ No newline at end of file diff --git a/tests/unit/grains/solaris/prtconf.t5220-zone b/tests/unit/grains/solaris/prtconf.t5220-zone new file mode 100644 index 0000000000..2183291471 --- /dev/null +++ b/tests/unit/grains/solaris/prtconf.t5220-zone @@ -0,0 +1,16 @@ +System Configuration: Oracle Corporation sun4v +Memory size: 8192 Megabytes +System Peripherals (PROM Nodes): + +Node 0xffffffff + idprom: 11111111.11111111.00000000.11111111.00000000.00000000.00000000.00000000 + scsi-initiator-id: 00000007 + banner-name: 'SPARC Enterprise T5220' + name: 'SUNW,SPARC-Enterprise-T5220' + stick-frequency: 5458c3a0 + hv-api-groups: 00000000.00000000.00000000.00000000.00000000.00000000.00000000.00000000 + breakpoint-trap: 0000007f + device_type: 'sun4v' + compatible: 'sun4v' + #address-cells: 00000002 + #size-cells: 00000002 \ No newline at end of file diff --git a/tests/unit/grains/solaris/prtdiag.s7 b/tests/unit/grains/solaris/prtdiag.s7 new file mode 100644 index 0000000000..6f86dfdd9f --- /dev/null +++ b/tests/unit/grains/solaris/prtdiag.s7 @@ -0,0 +1,24 @@ +System Configuration: Oracle Corporation sun4v SPARC S7-2 +Memory size: 16384 Megabytes + +================================ Virtual CPUs ================================ + + +CPU ID Frequency Implementation Status +------ --------- ---------------------- ------- +0 4267 MHz SPARC-S7 on-line +1 4267 MHz SPARC-S7 on-line +2 4267 MHz SPARC-S7 on-line +3 4267 MHz SPARC-S7 on-line +4 4267 MHz SPARC-S7 on-line +5 4267 MHz SPARC-S7 on-line +6 4267 MHz SPARC-S7 on-line +7 4267 MHz SPARC-S7 on-line +8 4267 MHz SPARC-S7 on-line +9 4267 MHz SPARC-S7 on-line +10 4267 MHz SPARC-S7 on-line +11 4267 MHz SPARC-S7 on-line +12 4267 MHz SPARC-S7 on-line +13 4267 MHz SPARC-S7 on-line +14 4267 MHz SPARC-S7 on-line +15 4267 MHz SPARC-S7 on-line \ No newline at end of file diff --git a/tests/unit/grains/solaris/prtdiag.t5220 b/tests/unit/grains/solaris/prtdiag.t5220 new file mode 100644 index 0000000000..67cec311c1 --- /dev/null +++ b/tests/unit/grains/solaris/prtdiag.t5220 @@ -0,0 +1,16 @@ +System Configuration: Oracle Corporation sun4v SPARC Enterprise T5220 +Memory size: 8192 Megabytes + +================================ Virtual CPUs ================================ + + +CPU ID Frequency Implementation Status +------ --------- ---------------------- ------- +0 1415 MHz SUNW,UltraSPARC-T2 on-line +1 1415 MHz SUNW,UltraSPARC-T2 on-line +2 1415 MHz SUNW,UltraSPARC-T2 on-line +3 1415 MHz SUNW,UltraSPARC-T2 on-line +4 1415 MHz SUNW,UltraSPARC-T2 on-line +5 1415 MHz SUNW,UltraSPARC-T2 on-line +6 1415 MHz SUNW,UltraSPARC-T2 on-line +7 1415 MHz SUNW,UltraSPARC-T2 on-line \ No newline at end of file diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py index b92333442b..1bc22eaec3 100644 --- a/tests/unit/grains/test_core.py +++ b/tests/unit/grains/test_core.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Erik Johnson ` + :codeauthor: Erik Johnson ''' # Import Python libs @@ -8,6 +8,7 @@ from __future__ import absolute_import, print_function, unicode_literals import logging import os import socket +import textwrap # Import Salt Testing Libs try: @@ -30,6 +31,7 @@ import salt.utils.dns import salt.utils.files import salt.utils.network import salt.utils.platform +import salt.utils.path import salt.grains.core as core # Import 3rd-party libs @@ -52,6 +54,7 @@ IP6_ADD1 = '2001:4860:4860::8844' IP6_ADD2 = '2001:4860:4860::8888' IP6_ADD_SCOPE = 'fe80::6238:e0ff:fe06:3f6b%enp2s0' OS_RELEASE_DIR = os.path.join(os.path.dirname(__file__), "os-releases") +SOLARIS_DIR = os.path.join(os.path.dirname(__file__), 'solaris') @skipIf(NO_MOCK, NO_MOCK_REASON) @@ -67,10 +70,11 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): def test_parse_etc_os_release(self, path_isfile_mock): path_isfile_mock.side_effect = lambda x: x == "/usr/lib/os-release" with salt.utils.files.fopen(os.path.join(OS_RELEASE_DIR, "ubuntu-17.10")) as os_release_file: - os_release_content = os_release_file.readlines() - with patch("salt.utils.files.fopen", mock_open()) as os_release_file: - os_release_file.return_value.__iter__.return_value = os_release_content - os_release = core._parse_os_release(["/etc/os-release", "/usr/lib/os-release"]) + os_release_content = os_release_file.read() + with patch("salt.utils.files.fopen", mock_open(read_data=os_release_content)): + os_release = core._parse_os_release( + '/etc/os-release', + '/usr/lib/os-release') self.assertEqual(os_release, { "NAME": "Ubuntu", "VERSION": "17.10 (Artful Aardvark)", @@ -86,10 +90,9 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): "UBUNTU_CODENAME": "artful", }) - @patch("os.path.isfile") - def test_missing_os_release(self, path_isfile_mock): - path_isfile_mock.return_value = False - os_release = core._parse_os_release(["/etc/os-release", "/usr/lib/os-release"]) + def test_missing_os_release(self): + with patch('salt.utils.files.fopen', mock_open(read_data={})): + os_release = core._parse_os_release('/etc/os-release', '/usr/lib/os-release') self.assertEqual(os_release, {}) @skipIf(not salt.utils.platform.is_linux(), 'System is not Linux') @@ -102,7 +105,7 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): } _path_isfile_map = {} _cmd_run_map = { - 'dpkg --print-architecture': 'amd64' + 'dpkg --print-architecture': 'amd64', } path_exists_mock = MagicMock(side_effect=lambda x: _path_exists_map[x]) @@ -125,60 +128,35 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): raise ImportError('No module named lsb_release') return orig_import(name, *args) - # Skip the first if statement + # - Skip the first if statement + # - Skip the selinux/systemd stuff (not pertinent) + # - Skip the init grain compilation (not pertinent) + # - Ensure that lsb_release fails to import + # - Skip all the /etc/*-release stuff (not pertinent) + # - Mock linux_distribution to give us the OS name that we want + # - Make a bunch of functions return empty dicts, we don't care about + # these grains for the purposes of this test. + # - Mock the osarch + distro_mock = MagicMock(return_value=('Debian GNU/Linux', '8.3', '')) with patch.object(salt.utils.platform, 'is_proxy', - MagicMock(return_value=False)): - # Skip the selinux/systemd stuff (not pertinent) - with patch.object(core, '_linux_bin_exists', - MagicMock(return_value=False)): - # Skip the init grain compilation (not pertinent) - with patch.object(os.path, 'exists', path_exists_mock): - # Ensure that lsb_release fails to import - with patch('{0}.__import__'.format(built_in), - side_effect=_import_mock): - # Skip all the /etc/*-release stuff (not pertinent) - with patch.object(os.path, 'isfile', path_isfile_mock): - # Mock linux_distribution to give us the OS name - # that we want. - distro_mock = MagicMock( - return_value=('Debian GNU/Linux', '8.3', '') - ) - with patch.object( - core, - 'linux_distribution', - distro_mock): - # Make a bunch of functions return empty dicts, - # we don't care about these grains for the - # purposes of this test. - with patch.object( - core, - '_linux_cpudata', - empty_mock): - with patch.object( - core, - '_linux_gpu_data', - empty_mock): - with patch.object( - core, - '_memdata', - empty_mock): - with patch.object( - core, - '_hw_data', - empty_mock): - with patch.object( - core, - '_virtual', - empty_mock): - with patch.object( - core, - '_ps', - empty_mock): - # Mock the osarch - with patch.dict( - core.__salt__, - {'cmd.run': cmd_run_mock}): - os_grains = core.os_data() + MagicMock(return_value=False)), \ + patch.object(core, '_linux_bin_exists', + MagicMock(return_value=False)), \ + patch.object(os.path, 'exists', path_exists_mock), \ + patch('{0}.__import__'.format(built_in), side_effect=_import_mock), \ + patch.object(os.path, 'isfile', path_isfile_mock), \ + patch.object(core, '_parse_lsb_release', empty_mock), \ + patch.object(core, '_parse_os_release', empty_mock), \ + patch.object(core, '_parse_lsb_release', empty_mock), \ + patch.object(core, 'linux_distribution', distro_mock), \ + patch.object(core, '_linux_cpudata', empty_mock), \ + patch.object(core, '_linux_gpu_data', empty_mock), \ + patch.object(core, '_memdata', empty_mock), \ + patch.object(core, '_hw_data', empty_mock), \ + patch.object(core, '_virtual', empty_mock), \ + patch.object(core, '_ps', empty_mock), \ + patch.dict(core.__salt__, {'cmd.run': cmd_run_mock}): + os_grains = core.os_data() self.assertEqual(os_grains.get('os_family'), 'Debian') @@ -216,33 +194,34 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): raise ImportError('No module named lsb_release') return orig_import(name, *args) - # Skip the first if statement + distro_mock = MagicMock( + return_value=('SUSE Linux Enterprise Server ', '12', 'x86_64') + ) + + # - Skip the first if statement + # - Skip the selinux/systemd stuff (not pertinent) + # - Skip the init grain compilation (not pertinent) + # - Ensure that lsb_release fails to import + # - Skip all the /etc/*-release stuff (not pertinent) + # - Mock linux_distribution to give us the OS name that we want + # - Mock the osarch with patch.object(salt.utils.platform, 'is_proxy', - MagicMock(return_value=False)): - # Skip the selinux/systemd stuff (not pertinent) - with patch.object(core, '_linux_bin_exists', - MagicMock(return_value=False)): - # Skip the init grain compilation (not pertinent) - with patch.object(os.path, 'exists', path_exists_mock): - # Ensure that lsb_release fails to import - with patch('{0}.__import__'.format(built_in), - side_effect=_import_mock): - # Skip all the /etc/*-release stuff (not pertinent) - with patch.object(os.path, 'isfile', MagicMock(return_value=False)): - with patch.object(core, '_parse_os_release', os_release_mock): - # Mock linux_distribution to give us the OS - # name that we want. - distro_mock = MagicMock( - return_value=('SUSE Linux Enterprise Server ', '12', 'x86_64') - ) - with patch.object(core, 'linux_distribution', distro_mock): - with patch.object(core, '_linux_gpu_data', empty_mock): - with patch.object(core, '_hw_data', empty_mock): - with patch.object(core, '_linux_cpudata', empty_mock): - with patch.object(core, '_virtual', empty_mock): - # Mock the osarch - with patch.dict(core.__salt__, {'cmd.run': osarch_mock}): - os_grains = core.os_data() + MagicMock(return_value=False)), \ + patch.object(core, '_linux_bin_exists', + MagicMock(return_value=False)), \ + patch.object(os.path, 'exists', path_exists_mock), \ + patch('{0}.__import__'.format(built_in), + side_effect=_import_mock), \ + patch.object(os.path, 'isfile', MagicMock(return_value=False)), \ + patch.object(core, '_parse_os_release', os_release_mock), \ + patch.object(core, '_parse_lsb_release', empty_mock), \ + patch.object(core, 'linux_distribution', distro_mock), \ + patch.object(core, '_linux_gpu_data', empty_mock), \ + patch.object(core, '_hw_data', empty_mock), \ + patch.object(core, '_linux_cpudata', empty_mock), \ + patch.object(core, '_virtual', empty_mock), \ + patch.dict(core.__salt__, {'cmd.run': osarch_mock}): + os_grains = core.os_data() self.assertEqual(os_grains.get('os_family'), 'Suse') self.assertEqual(os_grains.get('os'), 'SUSE') @@ -253,7 +232,8 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): osarch_mock = MagicMock(return_value="amd64") if os_release_filename: os_release_data = core._parse_os_release( - [os.path.join(OS_RELEASE_DIR, os_release_filename)]) + os.path.join(OS_RELEASE_DIR, os_release_filename) + ) else: os_release_data = os_release_map.get('os_release_file', {}) os_release_mock = MagicMock(return_value=os_release_data) @@ -269,35 +249,34 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): raise ImportError('No module named lsb_release') return orig_import(name, *args) - # Skip the first if statement - with patch.object(salt.utils.platform, 'is_proxy', - MagicMock(return_value=False)): - # Skip the selinux/systemd stuff (not pertinent) - with patch.object(core, '_linux_bin_exists', - MagicMock(return_value=False)): - # Skip the init grain compilation (not pertinent) - with patch.object(os.path, 'exists', path_isfile_mock): - # Ensure that lsb_release fails to import - with patch('{0}.__import__'.format(built_in), - side_effect=_import_mock): - # Skip all the /etc/*-release stuff (not pertinent) - with patch.object(os.path, 'isfile', path_isfile_mock): - with patch.object(core, '_parse_os_release', os_release_mock): - # Mock linux_distribution to give us the OS - # name that we want. - distro_mock = MagicMock( - return_value=os_release_map['linux_distribution'] - ) - with patch('salt.utils.files.fopen', mock_open()) as suse_release_file: - suse_release_file.return_value.__iter__.return_value = \ - os_release_map.get('suse_release_file', '').splitlines() - with patch.object(core, 'linux_distribution', distro_mock): - with patch.object(core, '_linux_gpu_data', empty_mock): - with patch.object(core, '_linux_cpudata', empty_mock): - with patch.object(core, '_virtual', empty_mock): - # Mock the osarch - with patch.dict(core.__salt__, {'cmd.run': osarch_mock}): - os_grains = core.os_data() + suse_release_file = os_release_map.get('suse_release_file') + + file_contents = {'/proc/1/cmdline': ''} + if suse_release_file: + file_contents['/etc/SuSE-release'] = suse_release_file + + # - Skip the first if statement + # - Skip the selinux/systemd stuff (not pertinent) + # - Skip the init grain compilation (not pertinent) + # - Ensure that lsb_release fails to import + # - Skip all the /etc/*-release stuff (not pertinent) + # - Mock linux_distribution to give us the OS name that we want + # - Mock the osarch + distro_mock = MagicMock(return_value=os_release_map['linux_distribution']) + with patch.object(salt.utils.platform, 'is_proxy', MagicMock(return_value=False)), \ + patch.object(core, '_linux_bin_exists', MagicMock(return_value=False)), \ + patch.object(os.path, 'exists', path_isfile_mock), \ + patch('{0}.__import__'.format(built_in), side_effect=_import_mock), \ + patch.object(os.path, 'isfile', path_isfile_mock), \ + patch.object(core, '_parse_os_release', os_release_mock), \ + patch.object(core, '_parse_lsb_release', empty_mock), \ + patch('salt.utils.files.fopen', mock_open(read_data=file_contents)), \ + patch.object(core, 'linux_distribution', distro_mock), \ + patch.object(core, '_linux_gpu_data', empty_mock), \ + patch.object(core, '_linux_cpudata', empty_mock), \ + patch.object(core, '_virtual', empty_mock), \ + patch.dict(core.__salt__, {'cmd.run': osarch_mock}): + os_grains = core.os_data() grains = {k: v for k, v in os_grains.items() if k in set(["os", "os_family", "osfullname", "oscodename", "osfinger", @@ -316,10 +295,11 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): Test if OS grains are parsed correctly in SLES 11 SP3 ''' _os_release_map = { - 'suse_release_file': '''SUSE Linux Enterprise Server 11 (x86_64) -VERSION = 11 -PATCHLEVEL = 3 -''', + 'suse_release_file': textwrap.dedent(''' + SUSE Linux Enterprise Server 11 (x86_64) + VERSION = 11 + PATCHLEVEL = 3 + '''), 'files': ["/etc/SuSE-release"], } expectation = { @@ -567,87 +547,13 @@ PATCHLEVEL = 3 ''' Test memdata on Linux systems ''' - _path_exists_map = { - '/proc/1/cmdline': False, - '/proc/meminfo': True - } - _path_isfile_map = { - '/proc/meminfo': True - } - _cmd_run_map = { - 'dpkg --print-architecture': 'amd64', - 'rpm --eval %{_host_cpu}': 'x86_64' - } - - path_exists_mock = MagicMock(side_effect=lambda x: _path_exists_map[x]) - path_isfile_mock = MagicMock( - side_effect=lambda x: _path_isfile_map.get(x, False) - ) - cmd_run_mock = MagicMock( - side_effect=lambda x: _cmd_run_map[x] - ) - empty_mock = MagicMock(return_value={}) - - _proc_meminfo_file = '''MemTotal: 16277028 kB -SwapTotal: 4789244 kB''' - - orig_import = __import__ - if six.PY2: - built_in = '__builtin__' - else: - built_in = 'builtins' - - def _import_mock(name, *args): - if name == 'lsb_release': - raise ImportError('No module named lsb_release') - return orig_import(name, *args) - - # Skip the first if statement - with patch.object(salt.utils.platform, 'is_proxy', - MagicMock(return_value=False)): - # Skip the selinux/systemd stuff (not pertinent) - with patch.object(core, '_linux_bin_exists', - MagicMock(return_value=False)): - # Skip the init grain compilation (not pertinent) - with patch.object(os.path, 'exists', path_exists_mock): - # Ensure that lsb_release fails to import - with patch('{0}.__import__'.format(built_in), - side_effect=_import_mock): - # Skip all the /etc/*-release stuff (not pertinent) - with patch.object(os.path, 'isfile', path_isfile_mock): - # Make a bunch of functions return empty dicts, - # we don't care about these grains for the - # purposes of this test. - with patch.object( - core, - '_linux_cpudata', - empty_mock): - with patch.object( - core, - '_linux_gpu_data', - empty_mock): - with patch('salt.utils.files.fopen', mock_open()) as _proc_meminfo: - _proc_meminfo.return_value.__iter__.return_value = _proc_meminfo_file.splitlines() - with patch.object( - core, - '_hw_data', - empty_mock): - with patch.object( - core, - '_virtual', - empty_mock): - with patch.object( - core, - '_ps', - empty_mock): - # Mock the osarch - with patch.dict( - core.__salt__, - {'cmd.run': cmd_run_mock}): - os_grains = core.os_data() - - self.assertEqual(os_grains.get('mem_total'), 15895) - self.assertEqual(os_grains.get('swap_total'), 4676) + _proc_meminfo = textwrap.dedent('''\ + MemTotal: 16277028 kB + SwapTotal: 4789244 kB''') + with patch('salt.utils.files.fopen', mock_open(read_data=_proc_meminfo)): + memdata = core._linux_memdata() + self.assertEqual(memdata.get('mem_total'), 15895) + self.assertEqual(memdata.get('swap_total'), 4676) @skipIf(salt.utils.platform.is_windows(), 'System is Windows') def test_bsd_memdata(self): @@ -901,3 +807,129 @@ SwapTotal: 4789244 kB''' osdata = {'kernel': 'test', } ret = core._virtual(osdata) self.assertEqual(ret['virtual'], virt) + + def test_solaris_sparc_s7zone(self): + ''' + verify productname grain for s7 zone + ''' + expectation = { + 'productname': 'SPARC S7-2', + 'product': 'SPARC S7-2', + } + with salt.utils.files.fopen(os.path.join(SOLARIS_DIR, 'prtconf.s7-zone')) as sparc_return_data: + this_sparc_return_data = '\n'.join(sparc_return_data.readlines()) + this_sparc_return_data += '\n' + self._check_solaris_sparc_productname_grains(this_sparc_return_data, expectation) + + def test_solaris_sparc_s7(self): + ''' + verify productname grain for s7 + ''' + expectation = { + 'productname': 'SPARC S7-2', + 'product': 'SPARC S7-2', + } + with salt.utils.files.fopen(os.path.join(SOLARIS_DIR, 'prtdiag.s7')) as sparc_return_data: + this_sparc_return_data = '\n'.join(sparc_return_data.readlines()) + this_sparc_return_data += '\n' + self._check_solaris_sparc_productname_grains(this_sparc_return_data, expectation) + + def test_solaris_sparc_t5220(self): + ''' + verify productname grain for t5220 + ''' + expectation = { + 'productname': 'SPARC Enterprise T5220', + 'product': 'SPARC Enterprise T5220', + } + with salt.utils.files.fopen(os.path.join(SOLARIS_DIR, 'prtdiag.t5220')) as sparc_return_data: + this_sparc_return_data = '\n'.join(sparc_return_data.readlines()) + this_sparc_return_data += '\n' + self._check_solaris_sparc_productname_grains(this_sparc_return_data, expectation) + + def test_solaris_sparc_t5220zone(self): + ''' + verify productname grain for t5220 zone + ''' + expectation = { + 'productname': 'SPARC Enterprise T5220', + 'product': 'SPARC Enterprise T5220', + } + with salt.utils.files.fopen(os.path.join(SOLARIS_DIR, 'prtconf.t5220-zone')) as sparc_return_data: + this_sparc_return_data = '\n'.join(sparc_return_data.readlines()) + this_sparc_return_data += '\n' + self._check_solaris_sparc_productname_grains(this_sparc_return_data, expectation) + + def _check_solaris_sparc_productname_grains(self, prtdata, expectation): + ''' + verify product grains on solaris sparc + ''' + import platform + path_isfile_mock = MagicMock(side_effect=lambda x: x in ['/etc/release']) + with salt.utils.files.fopen(os.path.join(OS_RELEASE_DIR, "solaris-11.3")) as os_release_file: + os_release_content = os_release_file.readlines() + uname_mock = MagicMock(return_value=( + 'SunOS', 'testsystem', '5.11', '11.3', 'sunv4', 'sparc' + )) + with patch.object(platform, 'uname', uname_mock), \ + patch.object(salt.utils.platform, 'is_proxy', + MagicMock(return_value=False)), \ + patch.object(salt.utils.platform, 'is_linux', + MagicMock(return_value=False)), \ + patch.object(salt.utils.platform, 'is_windows', + MagicMock(return_value=False)), \ + patch.object(salt.utils.platform, 'is_smartos', + MagicMock(return_value=False)), \ + patch.object(salt.utils.path, 'which_bin', + MagicMock(return_value=None)), \ + patch.object(os.path, 'isfile', path_isfile_mock), \ + patch('salt.utils.files.fopen', + mock_open(read_data=os_release_content)) as os_release_file, \ + patch.object(core, '_sunos_cpudata', + MagicMock(return_value={ + 'cpuarch': 'sparcv9', + 'num_cpus': '1', + 'cpu_model': 'MOCK_CPU_MODEL', + 'cpu_flags': []})), \ + patch.object(core, '_memdata', + MagicMock(return_value={'mem_total': 16384})), \ + patch.object(core, '_virtual', + MagicMock(return_value={})), \ + patch.object(core, '_ps', MagicMock(return_value={})), \ + patch.object(salt.utils.path, 'which', + MagicMock(return_value=True)), \ + patch.dict(core.__salt__, + {'cmd.run': MagicMock(return_value=prtdata)}): + os_grains = core.os_data() + grains = {k: v for k, v in os_grains.items() + if k in set(['product', 'productname'])} + self.assertEqual(grains, expectation) + + @patch('os.path.isfile') + @patch('os.path.isdir') + def test_core_virtual_unicode(self, mock_file, mock_dir): + ''' + test virtual grain with unicode character in product_name file + ''' + def path_side_effect(path): + if path == '/sys/devices/virtual/dmi/id/product_name': + return True + return False + + virt = 'kvm' + mock_file.side_effect = path_side_effect + mock_dir.side_effect = path_side_effect + with patch.object(salt.utils.platform, 'is_windows', + MagicMock(return_value=False)): + with patch.object(salt.utils.path, 'which', + MagicMock(return_value=True)): + with patch.dict(core.__salt__, {'cmd.run_all': + MagicMock(return_value={'pid': 78, + 'retcode': 0, + 'stderr': '', + 'stdout': virt})}): + with patch('salt.utils.files.fopen', + mock_open(read_data='嗨')): + osdata = {'kernel': 'Linux', } + ret = core._virtual(osdata) + self.assertEqual(ret['virtual'], virt) diff --git a/tests/unit/grains/test_fibre_channel.py b/tests/unit/grains/test_fibre_channel.py index 4b75c1d73b..4481079c5e 100644 --- a/tests/unit/grains/test_fibre_channel.py +++ b/tests/unit/grains/test_fibre_channel.py @@ -32,20 +32,14 @@ class FibreChannelGrainsTestCase(TestCase): cmd_run_mock = MagicMock(return_value=wwns) with patch('salt.modules.cmdmod.powershell', cmd_run_mock): ret = fibre_channel._windows_wwns() - self.assertEqual(ret, wwns) + assert ret == wwns, ret def test_linux_fibre_channel_wwns_grains(self): - def multi_mock_open(*file_contents): - mock_files = [mock_open(read_data=content).return_value for content in file_contents] - mock_opener = mock_open() - mock_opener.side_effect = mock_files - - return mock_opener - + contents = ['0x500143802426baf4', '0x500143802426baf5'] files = ['file1', 'file2'] - with patch('glob.glob', MagicMock(return_value=files)): - with patch('salt.utils.files.fopen', multi_mock_open('0x500143802426baf4', '0x500143802426baf5')): - ret = fibre_channel._linux_wwns() + with patch('glob.glob', MagicMock(return_value=files)), \ + patch('salt.utils.files.fopen', mock_open(read_data=contents)): + ret = fibre_channel._linux_wwns() - self.assertEqual(ret, ['500143802426baf4', '500143802426baf5']) + assert ret == ['500143802426baf4', '500143802426baf5'], ret diff --git a/tests/unit/grains/test_iscsi.py b/tests/unit/grains/test_iscsi.py index 9ca4ad4809..2f4ccc8b85 100644 --- a/tests/unit/grains/test_iscsi.py +++ b/tests/unit/grains/test_iscsi.py @@ -5,6 +5,7 @@ # Import Python libs from __future__ import absolute_import, print_function, unicode_literals import os +import textwrap # Import Salt Testing Libs from tests.support.unit import TestCase, skipIf @@ -51,15 +52,16 @@ class IscsiGrainsTestCase(TestCase): ['iqn.localhost.hostid.7f000001']) def test_linux_iscsi_iqn_grains(self): - _iscsi_file = '## DO NOT EDIT OR REMOVE THIS FILE!\n' \ - '## If you remove this file, the iSCSI daemon will not start.\n' \ - '## If you change the InitiatorName, existing access control lists\n' \ - '## may reject this initiator. The InitiatorName must be unique\n' \ - '## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames.\n' \ - 'InitiatorName=iqn.1993-08.org.debian:01:d12f7aba36\n' + _iscsi_file = textwrap.dedent('''\ + ## DO NOT EDIT OR REMOVE THIS FILE! + ## If you remove this file, the iSCSI daemon will not start. + ## If you change the InitiatorName, existing access control lists + ## may reject this initiator. The InitiatorName must be unique + ## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames. + InitiatorName=iqn.1993-08.org.debian:01:d12f7aba36 + ''') - with patch('salt.utils.files.fopen', mock_open()) as iscsi_initiator_file: - iscsi_initiator_file.return_value.__iter__.return_value = _iscsi_file.splitlines() + with patch('salt.utils.files.fopen', mock_open(read_data=_iscsi_file)): iqn = iscsi._linux_iqn() assert isinstance(iqn, list) diff --git a/tests/unit/modules/test_aliases.py b/tests/unit/modules/test_aliases.py index 80eeba8c23..21cb020062 100644 --- a/tests/unit/modules/test_aliases.py +++ b/tests/unit/modules/test_aliases.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import python libs diff --git a/tests/unit/modules/test_alternatives.py b/tests/unit/modules/test_alternatives.py index ec3bc325c3..a79d1ce88d 100644 --- a/tests/unit/modules/test_alternatives.py +++ b/tests/unit/modules/test_alternatives.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.modules.alternatives_test diff --git a/tests/unit/modules/test_apache.py b/tests/unit/modules/test_apache.py index 61731c5494..cd1e21e4a1 100644 --- a/tests/unit/modules/test_apache.py +++ b/tests/unit/modules/test_apache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_aptpkg.py b/tests/unit/modules/test_aptpkg.py index 5117fa320a..1e963ee5db 100644 --- a/tests/unit/modules/test_aptpkg.py +++ b/tests/unit/modules/test_aptpkg.py @@ -21,6 +21,11 @@ from salt.ext import six from salt.exceptions import CommandExecutionError, SaltInvocationError import salt.modules.aptpkg as aptpkg +try: + import pytest +except ImportError: + pytest = None + APT_KEY_LIST = r''' pub:-:1024:17:46181433FBB75451:1104433784:::-:::scSC: @@ -273,7 +278,7 @@ class AptPkgTestCase(TestCase, LoaderModuleMockMixin): 'stdout': APT_Q_UPDATE }) with patch('salt.utils.pkg.clear_rtag', MagicMock()): - with patch.dict(aptpkg.__salt__, {'cmd.run_all': mock}): + with patch.dict(aptpkg.__salt__, {'cmd.run_all': mock, 'config.get': MagicMock(return_value=False)}): self.assertEqual(aptpkg.refresh_db(), refresh_db) def test_refresh_db_failed(self): @@ -286,7 +291,7 @@ class AptPkgTestCase(TestCase, LoaderModuleMockMixin): 'stdout': APT_Q_UPDATE_ERROR }) with patch('salt.utils.pkg.clear_rtag', MagicMock()): - with patch.dict(aptpkg.__salt__, {'cmd.run_all': mock}): + with patch.dict(aptpkg.__salt__, {'cmd.run_all': mock, 'config.get': MagicMock(return_value=False)}): self.assertRaises(CommandExecutionError, aptpkg.refresh_db, **kwargs) def test_autoremove(self): @@ -298,14 +303,14 @@ class AptPkgTestCase(TestCase, LoaderModuleMockMixin): patch_kwargs = { '__salt__': { 'config.get': MagicMock(return_value=True), - 'cmd.run': MagicMock(return_value=AUTOREMOVE) + 'cmd.run_all': MagicMock(return_value=MagicMock(return_value=AUTOREMOVE)) } } with patch.multiple(aptpkg, **patch_kwargs): - self.assertEqual(aptpkg.autoremove(), dict()) - self.assertEqual(aptpkg.autoremove(purge=True), dict()) - self.assertEqual(aptpkg.autoremove(list_only=True), list()) - self.assertEqual(aptpkg.autoremove(list_only=True, purge=True), list()) + assert aptpkg.autoremove() == {} + assert aptpkg.autoremove(purge=True) == {} + assert aptpkg.autoremove(list_only=True) == [] + assert aptpkg.autoremove(list_only=True, purge=True) == [] def test_remove(self): ''' @@ -464,3 +469,48 @@ class AptPkgTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(aptpkg.show('foo*', refresh=True), {}) self.assert_called_once(refresh_mock) refresh_mock.reset_mock() + + +@skipIf(pytest is None, 'PyTest is missing') +class AptUtilsTestCase(TestCase, LoaderModuleMockMixin): + ''' + apt utils test case + ''' + def setup_loader_modules(self): + return {aptpkg: {}} + + def test_call_apt_default(self): + ''' + Call default apt. + :return: + ''' + with patch.dict(aptpkg.__salt__, {'cmd.run_all': MagicMock(), 'config.get': MagicMock(return_value=False)}): + aptpkg._call_apt(['apt-get', 'install', 'emacs']) # pylint: disable=W0106 + aptpkg.__salt__['cmd.run_all'].assert_called_once_with( + ['apt-get', 'install', 'emacs'], env={}, + output_loglevel='trace', python_shell=False) + + @patch('salt.utils.systemd.has_scope', MagicMock(return_value=True)) + def test_call_apt_in_scope(self): + ''' + Call apt within the scope. + :return: + ''' + with patch.dict(aptpkg.__salt__, {'cmd.run_all': MagicMock(), 'config.get': MagicMock(return_value=True)}): + aptpkg._call_apt(['apt-get', 'purge', 'vim']) # pylint: disable=W0106 + aptpkg.__salt__['cmd.run_all'].assert_called_once_with( + ['systemd-run', '--scope', 'apt-get', 'purge', 'vim'], env={}, + output_loglevel='trace', python_shell=False) + + def test_call_apt_with_kwargs(self): + ''' + Call apt with the optinal keyword arguments. + :return: + ''' + with patch.dict(aptpkg.__salt__, {'cmd.run_all': MagicMock(), 'config.get': MagicMock(return_value=False)}): + aptpkg._call_apt(['dpkg', '-l', 'python'], + python_shell=True, output_loglevel='quiet', ignore_retcode=False, + username='Darth Vader') # pylint: disable=W0106 + aptpkg.__salt__['cmd.run_all'].assert_called_once_with( + ['dpkg', '-l', 'python'], env={}, ignore_retcode=False, + output_loglevel='quiet', python_shell=True, username='Darth Vader') diff --git a/tests/unit/modules/test_archive.py b/tests/unit/modules/test_archive.py index 8c47cc8174..66e7da93c9 100644 --- a/tests/unit/modules/test_archive.py +++ b/tests/unit/modules/test_archive.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.modules.archive_test diff --git a/tests/unit/modules/test_at.py b/tests/unit/modules/test_at.py index 71d4deb8c1..d8b1ebf86a 100644 --- a/tests/unit/modules/test_at.py +++ b/tests/unit/modules/test_at.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_augeas_cfg.py b/tests/unit/modules/test_augeas_cfg.py index 0090cae438..4ec3c2409d 100644 --- a/tests/unit/modules/test_augeas_cfg.py +++ b/tests/unit/modules/test_augeas_cfg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_bluez.py b/tests/unit/modules/test_bluez.py index d60622d7a3..75d1f8a9ba 100644 --- a/tests/unit/modules/test_bluez.py +++ b/tests/unit/modules/test_bluez.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python libs diff --git a/tests/unit/modules/test_bower.py b/tests/unit/modules/test_bower.py index cd60b35b64..1daa650eed 100644 --- a/tests/unit/modules/test_bower.py +++ b/tests/unit/modules/test_bower.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Alexander Pyatkin ` + :codeauthor: Alexander Pyatkin ''' # Import Python Libs diff --git a/tests/unit/modules/test_bridge.py b/tests/unit/modules/test_bridge.py index 1e52be8e60..53ea4cd1c0 100644 --- a/tests/unit/modules/test_bridge.py +++ b/tests/unit/modules/test_bridge.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_btrfs.py b/tests/unit/modules/test_btrfs.py index a2a227e6eb..ebd28a6451 100644 --- a/tests/unit/modules/test_btrfs.py +++ b/tests/unit/modules/test_btrfs.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_cassandra.py b/tests/unit/modules/test_cassandra.py index 410d24c74d..9bba531c66 100644 --- a/tests/unit/modules/test_cassandra.py +++ b/tests/unit/modules/test_cassandra.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/modules/test_chef.py b/tests/unit/modules/test_chef.py index f1c09a2f40..c85a7e91a2 100644 --- a/tests/unit/modules/test_chef.py +++ b/tests/unit/modules/test_chef.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_cmdmod.py b/tests/unit/modules/test_cmdmod.py index 1c64ca7431..8b04909317 100644 --- a/tests/unit/modules/test_cmdmod.py +++ b/tests/unit/modules/test_cmdmod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import python libs diff --git a/tests/unit/modules/test_composer.py b/tests/unit/modules/test_composer.py index 6fba4a976a..774ff604b3 100644 --- a/tests/unit/modules/test_composer.py +++ b/tests/unit/modules/test_composer.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_cp.py b/tests/unit/modules/test_cp.py index b81906c781..a4bc22f132 100644 --- a/tests/unit/modules/test_cp.py +++ b/tests/unit/modules/test_cp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`jmoney ` + :codeauthor: jmoney ''' # Import Python libs @@ -131,23 +131,27 @@ class CpTestCase(TestCase, LoaderModuleMockMixin): ''' Test if push works with good posix path. ''' + filename = '/saltines/test.file' with patch('salt.modules.cp.os.path', MagicMock(isfile=Mock(return_value=True), wraps=cp.os.path)), \ patch.multiple('salt.modules.cp', _auth=MagicMock(**{'return_value.gen_token.return_value': 'token'}), __opts__={'id': 'abc', 'file_buffer_size': 10}), \ - patch('salt.utils.files.fopen', mock_open(read_data=b'content')), \ + patch('salt.utils.files.fopen', mock_open(read_data=b'content')) as m_open, \ patch('salt.transport.Channel.factory', MagicMock()): - response = cp.push('/saltines/test.file') - self.assertEqual(response, True) - self.assertEqual(salt.utils.files.fopen().read.call_count, 2) # pylint: disable=resource-leakage + response = cp.push(filename) + assert response, response + num_opens = len(m_open.filehandles[filename]) + assert num_opens == 1, num_opens + fh_ = m_open.filehandles[filename][0] + assert fh_.read.call_count == 2, fh_.read.call_count salt.transport.Channel.factory({}).send.assert_called_once_with( dict( - loc=salt.utils.files.fopen().tell(), # pylint: disable=resource-leakage + loc=fh_.tell(), # pylint: disable=resource-leakage cmd='_file_recv', tok='token', path=['saltines', 'test.file'], - data='', # data is empty here because load['data'] is overwritten + data=b'', # data is empty here because load['data'] is overwritten id='abc' ) ) diff --git a/tests/unit/modules/test_cpan.py b/tests/unit/modules/test_cpan.py index 30d9e336fd..3841e15684 100644 --- a/tests/unit/modules/test_cpan.py +++ b/tests/unit/modules/test_cpan.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_cron.py b/tests/unit/modules/test_cron.py index 9a75347703..92d1ff3359 100644 --- a/tests/unit/modules/test_cron.py +++ b/tests/unit/modules/test_cron.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place ` + :codeauthor: Mike Place ''' # Import python libs @@ -13,7 +13,7 @@ from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch, call # Import Salt libs import salt.modules.cron as cron -from salt.ext.six.moves import builtins, StringIO +from salt.ext.six.moves import builtins, range, StringIO STUB_USER = 'root' STUB_PATH = '/tmp' @@ -32,6 +32,12 @@ TEST_VAR="a string with plenty of spaces" # SALT_CRON_IDENTIFIER:echo "must be double spaced" 11 * * * * echo "must be double spaced" """ +STUB_AT_SIGN = """ +# Lines below here are managed by Salt, do not edit +# SALT_CRON_IDENTIFIER:echo "cron with @ sign" +@daily echo "cron with @ sign" +@daily +""" L = '# Lines below here are managed by Salt, do not edit\n' @@ -545,6 +551,21 @@ class CronTestCase(TestCase, LoaderModuleMockMixin): 'special': []} self.assertEqual(eret, ret) + def test_cron_at_sign(self): + with patch.dict(cron.__grains__, {'os': None}), \ + patch('salt.modules.cron.raw_cron', + MagicMock(return_value=STUB_AT_SIGN)): + ret = cron.list_tab('root') + eret = {'crons': [], + 'env': [], + 'pre': [''], + 'special': [{u'cmd': u'echo "cron with @ sign"', + u'comment': u'', + u'commented': False, + u'identifier': u'echo "cron with @ sign"', + u'spec': u'@daily'}]} + self.assertDictEqual(eret, ret) + def test__load_tab(self): with patch.dict(cron.__grains__, {'os_family': 'Solaris'}), \ patch('salt.modules.cron.raw_cron', @@ -935,7 +956,17 @@ class PsTestCase(TestCase, LoaderModuleMockMixin): month=STUB_CRON_TIMESTAMP['month']) self.assertDictEqual(ret, STUB_CRON_TIMESTAMP) - ## FIXME: More sophisticated _get_cron_date_time checks should be added here. + def test__get_cron_date_time_daymonth_max(self): + ret = cron._get_cron_date_time(minute='random', + hour='random', + daymonth='random', + dayweek='random', + month='random') + self.assertTrue(int(ret['minute']) in range(0, 60)) + self.assertTrue(int(ret['hour']) in range(0, 24)) + self.assertTrue(int(ret['daymonth']) in range(1, 32)) + self.assertTrue(int(ret['dayweek']) in range(0, 8)) + self.assertTrue(int(ret['month']) in range(1, 13)) def test_set_job(self): with patch.dict(cron.__grains__, {'os': None}), \ @@ -953,6 +984,33 @@ class PsTestCase(TestCase, LoaderModuleMockMixin): '1 2 3 4 5 /bin/echo NOT A DROID\n']) cron._write_cron_lines.call_args.assert_called_with(expected_call) + def test_rm_special(self): + with patch.dict(cron.__grains__, {'os': None}), \ + patch('salt.modules.cron._write_cron_lines', + new=MagicMock(return_value={'retcode': False})), \ + patch('salt.modules.cron.raw_cron', + new=MagicMock(return_value=STUB_AT_SIGN)): + ret = cron.rm_special('root', 'echo "cron with @ sign"', special='@daily', identifier='echo "cron with @ sign"') + self.assertEqual('removed', ret) + + def test_rm_special_default_special(self): + with patch.dict(cron.__grains__, {'os': None}), \ + patch('salt.modules.cron._write_cron_lines', + new=MagicMock(return_value={'retcode': False})), \ + patch('salt.modules.cron.raw_cron', + new=MagicMock(return_value=STUB_AT_SIGN)): + ret = cron.rm_special('root', 'echo "cron with @ sign"', identifier='echo "cron with @ sign"') + self.assertEqual('removed', ret) + + def test_rm_special_absent(self): + with patch.dict(cron.__grains__, {'os': None}), \ + patch('salt.modules.cron._write_cron_lines', + new=MagicMock(return_value={'retcode': False})), \ + patch('salt.modules.cron.raw_cron', + new=MagicMock(return_value=STUB_AT_SIGN)): + ret = cron.rm_special('root', 'echo "there is no job"', identifier='echo "there is no job"') + self.assertEqual('absent', ret) + def test_rm_job_is_absent(self): with patch.dict(cron.__grains__, {'os': None}), \ patch('salt.modules.cron._write_cron_lines', diff --git a/tests/unit/modules/test_daemontools.py b/tests/unit/modules/test_daemontools.py index b0d33a84c8..65728b1ec1 100644 --- a/tests/unit/modules/test_daemontools.py +++ b/tests/unit/modules/test_daemontools.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_data.py b/tests/unit/modules/test_data.py index ce7eab6111..6d5307cb87 100644 --- a/tests/unit/modules/test_data.py +++ b/tests/unit/modules/test_data.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_ddns.py b/tests/unit/modules/test_ddns.py index fb2a19898e..74e6e12067 100644 --- a/tests/unit/modules/test_ddns.py +++ b/tests/unit/modules/test_ddns.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_deb_apache.py b/tests/unit/modules/test_deb_apache.py index 00e2f2719a..ab0fca3c0b 100644 --- a/tests/unit/modules/test_deb_apache.py +++ b/tests/unit/modules/test_deb_apache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_debconfmod.py b/tests/unit/modules/test_debconfmod.py index 2b35e0fc9a..d230578718 100644 --- a/tests/unit/modules/test_debconfmod.py +++ b/tests/unit/modules/test_debconfmod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_debian_ip.py b/tests/unit/modules/test_debian_ip.py index 3bf86a3dab..448ae44a69 100644 --- a/tests/unit/modules/test_debian_ip.py +++ b/tests/unit/modules/test_debian_ip.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_debian_service.py b/tests/unit/modules/test_debian_service.py index b143fa9586..bdfa580160 100644 --- a/tests/unit/modules/test_debian_service.py +++ b/tests/unit/modules/test_debian_service.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_defaults.py b/tests/unit/modules/test_defaults.py index 2c36918bee..50707ca592 100644 --- a/tests/unit/modules/test_defaults.py +++ b/tests/unit/modules/test_defaults.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_devmap.py b/tests/unit/modules/test_devmap.py index 2ebdd80419..9b348ec58c 100644 --- a/tests/unit/modules/test_devmap.py +++ b/tests/unit/modules/test_devmap.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_dig.py b/tests/unit/modules/test_dig.py index 377f54863f..10331fcf49 100644 --- a/tests/unit/modules/test_dig.py +++ b/tests/unit/modules/test_dig.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python libs diff --git a/tests/unit/modules/test_disk.py b/tests/unit/modules/test_disk.py index b21bbfedf8..d6d1253a30 100644 --- a/tests/unit/modules/test_disk.py +++ b/tests/unit/modules/test_disk.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_djangomod.py b/tests/unit/modules/test_djangomod.py index ba7151b7cd..52489c96b2 100644 --- a/tests/unit/modules/test_djangomod.py +++ b/tests/unit/modules/test_djangomod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_dnsmasq.py b/tests/unit/modules/test_dnsmasq.py index 8b98aaa7bf..55080c68f3 100644 --- a/tests/unit/modules/test_dnsmasq.py +++ b/tests/unit/modules/test_dnsmasq.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals import os +import textwrap # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin @@ -20,7 +21,6 @@ from tests.support.mock import ( # Import Salt Libs from salt.exceptions import CommandExecutionError import salt.modules.dnsmasq as dnsmasq -import salt.utils.stringutils @skipIf(NO_MOCK, NO_MOCK_REASON) @@ -98,13 +98,14 @@ class DnsmasqTestCase(TestCase, LoaderModuleMockMixin): test for generic function for parsing dnsmasq files including includes. ''' with patch('os.path.isfile', MagicMock(return_value=True)): - text_file_data = salt.utils.stringutils.to_str( - '\n'.join(["line here", "second line", "A=B", "#"])) + text_file_data = textwrap.dedent('''\ + line here + second line + A=B + #''') with patch('salt.utils.files.fopen', - mock_open(read_data=text_file_data), - create=True) as m: - m.return_value.__iter__.return_value = text_file_data.splitlines() + mock_open(read_data=text_file_data)): self.assertDictEqual(dnsmasq._parse_dnamasq('filename'), {'A': 'B', - 'unparsed': ['line here', - 'second line']}) + 'unparsed': ['line here\n', + 'second line\n']}) diff --git a/tests/unit/modules/test_dnsutil.py b/tests/unit/modules/test_dnsutil.py index b308c98bd4..0111c2d219 100644 --- a/tests/unit/modules/test_dnsutil.py +++ b/tests/unit/modules/test_dnsutil.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import python libs @@ -13,7 +13,6 @@ from tests.support.mock import ( MagicMock, patch, mock_open, - call, NO_MOCK, NO_MOCK_REASON ) @@ -51,24 +50,23 @@ mock_soa_zone = salt.utils.stringutils.to_str( '1 PTR localhost.') if NO_MOCK is False: - mock_calls_list = [ - call.read(), - call.write(salt.utils.stringutils.to_str('##\n')), - call.write(salt.utils.stringutils.to_str('# Host Database\n')), - call.write(salt.utils.stringutils.to_str('#\n')), - call.write(salt.utils.stringutils.to_str('# localhost is used to configure the ' - 'loopback interface\n')), - call.write(salt.utils.stringutils.to_str('# when the system is booting. Do not ' - 'change this entry.\n')), - call.write(salt.utils.stringutils.to_str('##\n')), - call.write(salt.utils.stringutils.to_str('127.0.0.1 localhost')), - call.write(salt.utils.stringutils.to_str('\n')), - call.write(salt.utils.stringutils.to_str('255.255.255.255 broadcasthost')), - call.write(salt.utils.stringutils.to_str('\n')), - call.write(salt.utils.stringutils.to_str('::1 localhost')), - call.write(salt.utils.stringutils.to_str('\n')), - call.write(salt.utils.stringutils.to_str('fe80::1%lo0 localhost')), - call.write(salt.utils.stringutils.to_str('\n'))] + mock_writes_list = salt.utils.data.decode([ + '##\n', + '# Host Database\n', + '#\n', + '# localhost is used to configure the loopback interface\n', + '# when the system is booting. Do not change this entry.\n', + '##\n', + '127.0.0.1 localhost', + '\n', + '255.255.255.255 broadcasthost', + '\n', + '::1 localhost', + '\n', + 'fe80::1%lo0 localhost', + '\n' + ], to_str=True +) @skipIf(NO_MOCK, NO_MOCK_REASON) @@ -84,18 +82,21 @@ class DNSUtilTestCase(TestCase): with patch('salt.utils.files.fopen', mock_open(read_data=mock_hosts_file)) as m_open, \ patch('salt.modules.dnsutil.parse_hosts', MagicMock(return_value=mock_hosts_file_rtn)): dnsutil.hosts_append('/etc/hosts', '127.0.0.1', 'ad1.yuk.co,ad2.yuk.co') - helper_open = m_open() - helper_open.write.assert_called_once_with( - salt.utils.stringutils.to_str('\n127.0.0.1 ad1.yuk.co ad2.yuk.co')) + writes = m_open.write_calls() + # We should have called .write() only once, with the expected + # content + num_writes = len(writes) + assert num_writes == 1, num_writes + expected = salt.utils.stringutils.to_str('\n127.0.0.1 ad1.yuk.co ad2.yuk.co') + assert writes[0] == expected, writes[0] def test_hosts_remove(self): to_remove = 'ad1.yuk.co' new_mock_file = mock_hosts_file + '\n127.0.0.1 ' + to_remove + '\n' with patch('salt.utils.files.fopen', mock_open(read_data=new_mock_file)) as m_open: dnsutil.hosts_remove('/etc/hosts', to_remove) - helper_open = m_open() - calls_list = helper_open.method_calls - self.assertEqual(calls_list, mock_calls_list) + writes = m_open.write_calls() + assert writes == mock_writes_list, writes @skipIf(True, 'Waiting on bug report fixes') def test_parse_zone(self): diff --git a/tests/unit/modules/test_dockermod.py b/tests/unit/modules/test_dockermod.py index 4ca4ff931b..97cb17662c 100644 --- a/tests/unit/modules/test_dockermod.py +++ b/tests/unit/modules/test_dockermod.py @@ -166,6 +166,7 @@ class DockerTestCase(TestCase, LoaderModuleMockMixin): with patch.dict(docker_mod.__salt__, {'mine.send': mine_send, 'container_resource.run': MagicMock(), + 'config.get': MagicMock(return_value=True), 'cp.cache_file': MagicMock(return_value=False)}): with patch.dict(docker_mod.__utils__, {'docker.get_client_args': client_args_mock}): @@ -174,6 +175,44 @@ class DockerTestCase(TestCase, LoaderModuleMockMixin): mine_send.assert_called_with('docker.ps', verbose=True, all=True, host=True) + def test_update_mine(self): + ''' + Test the docker.update_mine config option + ''' + def config_get_disabled(val, default): + return {'base_url': docker_mod.NOTSET, + 'version': docker_mod.NOTSET, + 'docker.url': docker_mod.NOTSET, + 'docker.version': docker_mod.NOTSET, + 'docker.machine': docker_mod.NOTSET, + 'docker.update_mine': False}[val] + + def config_get_enabled(val, default): + return {'base_url': docker_mod.NOTSET, + 'version': docker_mod.NOTSET, + 'docker.url': docker_mod.NOTSET, + 'docker.version': docker_mod.NOTSET, + 'docker.machine': docker_mod.NOTSET, + 'docker.update_mine': True}[val] + + mine_mock = Mock() + dunder_salt = { + 'config.get': MagicMock(side_effect=config_get_disabled), + 'mine.send': mine_mock, + } + with patch.dict(docker_mod.__salt__, dunder_salt), \ + patch.dict(docker_mod.__context__, {'docker.client': Mock()}), \ + patch.object(docker_mod, 'state', MagicMock(return_value='stopped')): + docker_mod.stop('foo', timeout=1) + mine_mock.assert_not_called() + + with patch.dict(docker_mod.__salt__, dunder_salt), \ + patch.dict(docker_mod.__context__, {'docker.client': Mock()}), \ + patch.object(docker_mod, 'state', MagicMock(return_value='stopped')): + dunder_salt['config.get'].side_effect = config_get_enabled + docker_mod.stop('foo', timeout=1) + self.assert_called_once(mine_mock) + @skipIf(_docker_py_version() < (1, 5, 0), 'docker module must be installed to run this test or is too old. >=1.5.0') def test_list_networks(self, *args): diff --git a/tests/unit/modules/test_dpkg.py b/tests/unit/modules/test_dpkg.py index fcfa7caf77..5d36dd1c79 100644 --- a/tests/unit/modules/test_dpkg.py +++ b/tests/unit/modules/test_dpkg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_drac.py b/tests/unit/modules/test_drac.py index 39a02e83ff..650efe7832 100644 --- a/tests/unit/modules/test_drac.py +++ b/tests/unit/modules/test_drac.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_drbd.py b/tests/unit/modules/test_drbd.py index 0965b430df..8df23540ea 100644 --- a/tests/unit/modules/test_drbd.py +++ b/tests/unit/modules/test_drbd.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_elasticsearch.py b/tests/unit/modules/test_elasticsearch.py index 04e19b2633..3483c71974 100644 --- a/tests/unit/modules/test_elasticsearch.py +++ b/tests/unit/modules/test_elasticsearch.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Lukas Raska ` + :codeauthor: Lukas Raska ''' # Import Python Libs diff --git a/tests/unit/modules/test_environ.py b/tests/unit/modules/test_environ.py index c7948c4047..be62347cbd 100644 --- a/tests/unit/modules/test_environ.py +++ b/tests/unit/modules/test_environ.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_etcd_mod.py b/tests/unit/modules/test_etcd_mod.py index cbcb98df2f..2758e923a1 100644 --- a/tests/unit/modules/test_etcd_mod.py +++ b/tests/unit/modules/test_etcd_mod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_event.py b/tests/unit/modules/test_event.py index 516aba8cde..1f8c761667 100644 --- a/tests/unit/modules/test_event.py +++ b/tests/unit/modules/test_event.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_extfs.py b/tests/unit/modules/test_extfs.py index a2a1468de6..09d1e88377 100644 --- a/tests/unit/modules/test_extfs.py +++ b/tests/unit/modules/test_extfs.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_file.py b/tests/unit/modules/test_file.py index 8a688c42d2..a7640554b7 100644 --- a/tests/unit/modules/test_file.py +++ b/tests/unit/modules/test_file.py @@ -8,10 +8,11 @@ import tempfile import textwrap # Import Salt Testing libs +from tests.support.helpers import with_tempfile from tests.support.mixins import LoaderModuleMockMixin from tests.support.paths import TMP from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, Mock, patch, mock_open +from tests.support.mock import MagicMock, Mock, patch, mock_open, DEFAULT try: import pytest @@ -22,13 +23,14 @@ except ImportError: from salt.ext import six import salt.config import salt.loader +import salt.utils.data import salt.utils.files import salt.utils.platform import salt.utils.stringutils import salt.modules.file as filemod import salt.modules.config as configmod import salt.modules.cmdmod as cmdmod -from salt.exceptions import CommandExecutionError +from salt.exceptions import CommandExecutionError, SaltInvocationError from salt.utils.jinja import SaltCacheLoader SED_CONTENT = '''test @@ -39,6 +41,10 @@ here ''' +class DummyStat(object): + st_size = 123 + + class FileReplaceTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): @@ -218,6 +224,88 @@ class FileReplaceTestCase(TestCase, LoaderModuleMockMixin): filemod.replace(self.tfile.name, r'Etiam', 123) +class FileCommentLineTestCase(TestCase, LoaderModuleMockMixin): + def setup_loader_modules(self): + return { + filemod: { + '__salt__': { + 'config.manage_mode': configmod.manage_mode, + 'cmd.run': cmdmod.run, + 'cmd.run_all': cmdmod.run_all + }, + '__opts__': { + 'test': False, + 'file_roots': {'base': 'tmp'}, + 'pillar_roots': {'base': 'tmp'}, + 'cachedir': 'tmp', + 'grains': {}, + }, + '__grains__': {'kernel': 'Linux'}, + '__utils__': {'files.is_text': MagicMock(return_value=True)}, + } + } + + MULTILINE_STRING = textwrap.dedent('''\ + Lorem + ipsum + #dolor + ''') + + MULTILINE_STRING = os.linesep.join(MULTILINE_STRING.splitlines()) + + def setUp(self): + self.tfile = tempfile.NamedTemporaryFile(delete=False, mode='w+') + self.tfile.write(self.MULTILINE_STRING) + self.tfile.close() + + def tearDown(self): + os.remove(self.tfile.name) + del self.tfile + + def test_comment_line(self): + filemod.comment_line(self.tfile.name, + '^ipsum') + + with salt.utils.files.fopen(self.tfile.name, 'r') as fp: + filecontent = fp.read() + self.assertIn('#ipsum', filecontent) + + def test_comment(self): + filemod.comment(self.tfile.name, + '^ipsum') + + with salt.utils.files.fopen(self.tfile.name, 'r') as fp: + filecontent = fp.read() + self.assertIn('#ipsum', filecontent) + + def test_comment_different_character(self): + filemod.comment_line(self.tfile.name, + '^ipsum', + '//') + + with salt.utils.files.fopen(self.tfile.name, 'r') as fp: + filecontent = fp.read() + self.assertIn('//ipsum', filecontent) + + def test_comment_not_found(self): + filemod.comment_line(self.tfile.name, + '^sit') + + with salt.utils.files.fopen(self.tfile.name, 'r') as fp: + filecontent = fp.read() + self.assertNotIn('#sit', filecontent) + self.assertNotIn('sit', filecontent) + + def test_uncomment(self): + filemod.uncomment(self.tfile.name, + 'dolor') + + with salt.utils.files.fopen(self.tfile.name, 'r') as fp: + filecontent = fp.read() + self.assertIn('dolor', filecontent) + self.assertNotIn('#dolor', filecontent) + + class FileBlockReplaceTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): return { @@ -517,6 +605,87 @@ class FileBlockReplaceTestCase(TestCase, LoaderModuleMockMixin): ) +class FileGrepTestCase(TestCase, LoaderModuleMockMixin): + def setup_loader_modules(self): + return { + filemod: { + '__salt__': { + 'config.manage_mode': configmod.manage_mode, + 'cmd.run': cmdmod.run, + 'cmd.run_all': cmdmod.run_all + }, + '__opts__': { + 'test': False, + 'file_roots': {'base': 'tmp'}, + 'pillar_roots': {'base': 'tmp'}, + 'cachedir': 'tmp', + 'grains': {}, + }, + '__grains__': {'kernel': 'Linux'}, + '__utils__': {'files.is_text': MagicMock(return_value=True)}, + } + } + + MULTILINE_STRING = textwrap.dedent('''\ + Lorem ipsum dolor sit amet, consectetur + adipiscing elit. Nam rhoncus enim ac + bibendum vulputate. + ''') + + MULTILINE_STRING = os.linesep.join(MULTILINE_STRING.splitlines()) + + def setUp(self): + self.tfile = tempfile.NamedTemporaryFile(delete=False, mode='w+') + self.tfile.write(self.MULTILINE_STRING) + self.tfile.close() + + def tearDown(self): + os.remove(self.tfile.name) + del self.tfile + + def test_grep_query_exists(self): + result = filemod.grep(self.tfile.name, + 'Lorem ipsum') + + self.assertTrue(result, None) + self.assertTrue(result['retcode'] == 0) + self.assertTrue(result['stdout'] == 'Lorem ipsum dolor sit amet, consectetur') + self.assertTrue(result['stderr'] == '') + + def test_grep_query_not_exists(self): + result = filemod.grep(self.tfile.name, + 'Lorem Lorem') + + self.assertTrue(result['retcode'] == 1) + self.assertTrue(result['stdout'] == '') + self.assertTrue(result['stderr'] == '') + + def test_grep_query_exists_with_opt(self): + result = filemod.grep(self.tfile.name, + 'Lorem ipsum', + '-i') + + self.assertTrue(result, None) + self.assertTrue(result['retcode'] == 0) + self.assertTrue(result['stdout'] == 'Lorem ipsum dolor sit amet, consectetur') + self.assertTrue(result['stderr'] == '') + + def test_grep_query_not_exists_opt(self): + result = filemod.grep(self.tfile.name, + 'Lorem Lorem', + '-v') + + self.assertTrue(result['retcode'] == 0) + self.assertTrue(result['stdout'] == FileGrepTestCase.MULTILINE_STRING) + self.assertTrue(result['stderr'] == '') + + def test_grep_query_too_many_opts(self): + with self.assertRaisesRegex(SaltInvocationError, '^Passing multiple command line arg') as cm: + result = filemod.grep(self.tfile.name, + 'Lorem Lorem', + '-i -b2') + + class FileModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): return { @@ -916,6 +1085,19 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): } } + @staticmethod + def _get_body(content): + ''' + The body is written as bytestrings or strings depending on platform. + This func accepts a string of content and returns the appropriate list + of strings back. + ''' + ret = content.splitlines(True) + if six.PY2 and salt.utils.platform.is_windows(): + return salt.utils.data.encode_list(ret) + else: + return salt.utils.data.decode_list(ret, to_str=True) + @patch('os.path.realpath', MagicMock()) @patch('os.path.isfile', MagicMock(return_value=True)) def test_delete_line_in_empty_file(self): @@ -1013,10 +1195,8 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): self.assertEqual( filemod._starts_till(src=src, probe='and here is something'), -1) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_insert_after_no_pattern(self): + @with_tempfile() + def test_line_insert_after_no_pattern(self, name): ''' Test for file.line for insertion after specific line, using no pattern. @@ -1035,19 +1215,27 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): ' - /srv/custom' ]) cfg_content = '- /srv/custom' - files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content=cfg_content, after='- /srv/salt', mode='insert') - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_insert_after_pattern(self): + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', mock_open()) as atomic_open_mock: + filemod.line(name, content=cfg_content, after='- /srv/salt', mode='insert') + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) + + @with_tempfile() + def test_line_insert_after_pattern(self, name): ''' Test for file.line for insertion after specific line, using pattern. @@ -1076,20 +1264,67 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): ' custom:', ' - /srv/custom' ]) + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) for after_line in ['file_r.*', '.*roots']: - files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content=cfg_content, after=after_line, mode='insert', indent=False) - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', + mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', + mock_open()) as atomic_open_mock: + filemod.line(name, content=cfg_content, after=after_line, mode='insert', indent=False) + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + # We passed cfg_content with a newline in the middle, so it + # will be written as two lines in the same element of the list + # passed to .writelines() + expected[3] = expected[3] + expected.pop(4) + assert writelines_content[0] == expected, (writelines_content[0], expected) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_insert_before(self): + @with_tempfile() + def test_line_insert_multi_line_content_after_unicode(self, name): + ''' + Test for file.line for insertion after specific line with Unicode + + See issue #48113 + :return: + ''' + file_content = 'This is a line\nThis is another line' + file_modified = salt.utils.stringutils.to_str('This is a line\n' + 'This is another line\n' + 'This is a line with unicode Ŷ') + cfg_content = "This is a line with unicode Ŷ" + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) + for after_line in ['This is another line']: + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', + mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', + mock_open()) as atomic_open_mock: + filemod.line(name, content=cfg_content, after=after_line, mode='insert', indent=False) + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) + + @with_tempfile() + def test_line_insert_before(self, name): ''' Test for file.line for insertion before specific line, using pattern and no patterns. @@ -1110,15 +1345,27 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): ' - /srv/sugar' ]) cfg_content = '- /srv/custom' + + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) for before_line in ['/srv/salt', '/srv/sa.*t']: - files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content=cfg_content, before=before_line, mode='insert') - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', + mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', + mock_open()) as atomic_open_mock: + filemod.line(name, content=cfg_content, before=before_line, mode='insert') + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) @patch('os.path.realpath', MagicMock()) @patch('os.path.isfile', MagicMock(return_value=True)) @@ -1146,10 +1393,8 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): self.assertEqual(cm.exception.strerror, 'Found more than expected occurrences in "before" expression') - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_insert_before_after(self): + @with_tempfile() + def test_line_insert_before_after(self, name): ''' Test for file.line for insertion before specific line, using pattern and no patterns. @@ -1172,20 +1417,30 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): ' - /srv/sugar' ]) cfg_content = '- /srv/coriander' - for b_line, a_line in [('/srv/sugar', '/srv/salt')]: - files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content=cfg_content, before=b_line, after=a_line, mode='insert') - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_insert_start(self): + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) + for b_line, a_line in [('/srv/sugar', '/srv/salt')]: + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', + mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', + mock_open()) as atomic_open_mock: + filemod.line(name, content=cfg_content, before=b_line, after=a_line, mode='insert') + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) + + @with_tempfile() + def test_line_insert_start(self, name): ''' Test for file.line for insertion at the beginning of the file :return: @@ -1204,19 +1459,29 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): ' - /srv/salt', ' - /srv/sugar' ]) - files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content=cfg_content, location='start', mode='insert') - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_insert_end(self): + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', + mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', + mock_open()) as atomic_open_mock: + filemod.line(name, content=cfg_content, location='start', mode='insert') + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) + + @with_tempfile() + def test_line_insert_end(self, name): ''' Test for file.line for insertion at the end of the file (append) :return: @@ -1235,19 +1500,29 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): ' - /srv/sugar', ' ' + cfg_content ]) - files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content=cfg_content, location='end', mode='insert') - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_insert_ensure_before(self): + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', + mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', + mock_open()) as atomic_open_mock: + filemod.line(name, content=cfg_content, location='end', mode='insert') + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) + + @with_tempfile() + def test_line_insert_ensure_before(self, name): ''' Test for file.line for insertion ensuring the line is before :return: @@ -1264,19 +1539,29 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): cfg_content, 'exit 0' ]) - files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content=cfg_content, before='exit 0', mode='ensure') - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_insert_ensure_before_first_line(self): + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', + mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', + mock_open()) as atomic_open_mock: + filemod.line(name, content=cfg_content, before='exit 0', mode='ensure') + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) + + @with_tempfile() + def test_line_insert_ensure_before_first_line(self, name): ''' Test for file.line for insertion ensuring the line is before first line :return: @@ -1291,19 +1576,29 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): '/etc/init.d/someservice restart', 'exit 0' ]) - files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content=cfg_content, before='/etc/init.d/someservice restart', mode='ensure') - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_insert_ensure_after(self): + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', + mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', + mock_open()) as atomic_open_mock: + filemod.line(name, content=cfg_content, before='/etc/init.d/someservice restart', mode='ensure') + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) + + @with_tempfile() + def test_line_insert_ensure_after(self, name): ''' Test for file.line for insertion ensuring the line is after :return: @@ -1318,19 +1613,29 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): '/etc/init.d/someservice restart', cfg_content ]) - files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content=cfg_content, after='/etc/init.d/someservice restart', mode='ensure') - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_insert_ensure_beforeafter_twolines(self): + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', + mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', + mock_open()) as atomic_open_mock: + filemod.line(name, content=cfg_content, after='/etc/init.d/someservice restart', mode='ensure') + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) + + @with_tempfile() + def test_line_insert_ensure_beforeafter_twolines(self, name): ''' Test for file.line for insertion ensuring the line is between two lines :return: @@ -1344,23 +1649,33 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): # pylint: enable=W1401 after, before = file_content.split(os.linesep) file_modified = os.linesep.join([after, cfg_content, before]) - for (_after, _before) in [(after, before), ('NAME_.*', 'SKEL_.*')]: - files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content=cfg_content, after=_after, before=_before, mode='ensure') - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_insert_ensure_beforeafter_twolines_exists(self): + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) + for (_after, _before) in [(after, before), ('NAME_.*', 'SKEL_.*')]: + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', + mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', + mock_open()) as atomic_open_mock: + filemod.line(name, content=cfg_content, after=_after, before=_before, mode='ensure') + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) + + @with_tempfile() + def test_line_insert_ensure_beforeafter_twolines_exists(self, name): ''' - Test for file.line for insertion ensuring the line is between two lines where content already exists - :return: + Test for file.line for insertion ensuring the line is between two lines + where content already exists ''' cfg_content = 'EXTRA_GROUPS="dialout"' # pylint: disable=W1401 @@ -1371,24 +1686,28 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): ]) # pylint: enable=W1401 after, before = file_content.split(os.linesep)[0], file_content.split(os.linesep)[2] + + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) for (_after, _before) in [(after, before), ('NAME_.*', 'SKEL_.*')]: - files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - result = filemod.line('foo', content=cfg_content, after=_after, before=_before, mode='ensure') - self.assertEqual(len(atomic_opener().write.call_args_list), 0) - self.assertEqual(result, False) + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', + mock_open(read_data=file_content)), \ + patch('salt.utils.atomicfile.atomic_open', + mock_open()) as atomic_open_mock: + result = filemod.line('foo', content=cfg_content, after=_after, before=_before, mode='ensure') + # We should not have opened the file + assert not atomic_open_mock.filehandles + # No changes should have been made + assert result is False @patch('os.path.realpath', MagicMock()) @patch('os.path.isfile', MagicMock(return_value=True)) @patch('os.stat', MagicMock()) def test_line_insert_ensure_beforeafter_rangelines(self): ''' - Test for file.line for insertion ensuring the line is between two lines within the range. - This expected to bring no changes. - - :return: + Test for file.line for insertion ensuring the line is between two lines + within the range. This expected to bring no changes. ''' cfg_content = 'EXTRA_GROUPS="dialout cdrom floppy audio video plugdev users"' # pylint: disable=W1401 @@ -1407,10 +1726,8 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): 'Found more than one line between boundaries "before" and "after"', six.text_type(cmd_err)) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_delete(self): + @with_tempfile() + def test_line_delete(self, name): ''' Test for file.line for deletion of specific line :return: @@ -1428,20 +1745,29 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): ' - /srv/salt', ' - /srv/sugar' ]) + + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) for content in ['/srv/pepper', '/srv/pepp*', '/srv/p.*', '/sr.*pe.*']: files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content=content, mode='delete') - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', files_fopen), \ + patch('salt.utils.atomicfile.atomic_open', mock_open()) as atomic_open_mock: + filemod.line(name, content=content, mode='delete') + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) - @patch('os.path.realpath', MagicMock()) - @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.stat', MagicMock()) - def test_line_replace(self): + @with_tempfile() + def test_line_replace(self, name): ''' Test for file.line for replacement of specific line :return: @@ -1460,15 +1786,26 @@ class FilemodLineTests(TestCase, LoaderModuleMockMixin): ' - /srv/natrium-chloride', ' - /srv/sugar' ]) + + isfile_mock = MagicMock(side_effect=lambda x: True if x == name else DEFAULT) for match in ['/srv/pepper', '/srv/pepp*', '/srv/p.*', '/sr.*pe.*']: files_fopen = mock_open(read_data=file_content) - with patch('salt.utils.files.fopen', files_fopen): - atomic_opener = mock_open() - with patch('salt.utils.atomicfile.atomic_open', atomic_opener): - filemod.line('foo', content='- /srv/natrium-chloride', match=match, mode='replace') - self.assertEqual(len(atomic_opener().write.call_args_list), 1) - self.assertEqual(atomic_opener().write.call_args_list[0][0][0], - file_modified) + with patch('os.path.isfile', isfile_mock), \ + patch('os.stat', MagicMock(return_value=DummyStat())), \ + patch('salt.utils.files.fopen', files_fopen), \ + patch('salt.utils.atomicfile.atomic_open', mock_open()) as atomic_open_mock: + filemod.line(name, content='- /srv/natrium-chloride', match=match, mode='replace') + handles = atomic_open_mock.filehandles[name] + # We should only have opened the file once + open_count = len(handles) + assert open_count == 1, open_count + # We should only have invoked .writelines() once... + writelines_content = handles[0].writelines_calls + writelines_count = len(writelines_content) + assert writelines_count == 1, writelines_count + # ... with the updated content + expected = self._get_body(file_modified) + assert writelines_content[0] == expected, (writelines_content[0], expected) class FileBasicsTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/modules/test_firewalld.py b/tests/unit/modules/test_firewalld.py index 7c45ce6ad2..1d61122f47 100644 --- a/tests/unit/modules/test_firewalld.py +++ b/tests/unit/modules/test_firewalld.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_genesis.py b/tests/unit/modules/test_genesis.py index 19b57503aa..d9de521ee8 100644 --- a/tests/unit/modules/test_genesis.py +++ b/tests/unit/modules/test_genesis.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_git.py b/tests/unit/modules/test_git.py index 80763965f6..a70714df57 100644 --- a/tests/unit/modules/test_git.py +++ b/tests/unit/modules/test_git.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Erik Johnson ` + :codeauthor: Erik Johnson ''' # Import Python libs diff --git a/tests/unit/modules/test_glusterfs.py b/tests/unit/modules/test_glusterfs.py index 18b932a5a9..6486f1261a 100644 --- a/tests/unit/modules/test_glusterfs.py +++ b/tests/unit/modules/test_glusterfs.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` - :codeauthor: :email:`Joe Julian ` + :codeauthor: Jayesh Kariya + :codeauthor: Joe Julian ''' # Import Python libs @@ -777,7 +777,7 @@ class GlusterfsTestCase(TestCase, LoaderModuleMockMixin): with patch.dict(glusterfs.__salt__, {'cmd.run': mock_version}): self.assertFalse(glusterfs.get_max_op_version()[0]) - with patch.object(glusterfs, '_get_version', return_value=[3, 12, 0]): + with patch.object(glusterfs, '_get_version', return_value=(3, 12, 0)): with patch.dict(glusterfs.__salt__, {'cmd.run': mock_xml}): self.assertEqual(glusterfs.get_max_op_version(), '31200') diff --git a/tests/unit/modules/test_gnomedesktop.py b/tests/unit/modules/test_gnomedesktop.py index 30bba6caa5..70385ad957 100644 --- a/tests/unit/modules/test_gnomedesktop.py +++ b/tests/unit/modules/test_gnomedesktop.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_groupadd.py b/tests/unit/modules/test_groupadd.py index 00f5e208c3..8e0e64749a 100644 --- a/tests/unit/modules/test_groupadd.py +++ b/tests/unit/modules/test_groupadd.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_grub_legacy.py b/tests/unit/modules/test_grub_legacy.py index dc0e515466..ed4cfc4255 100644 --- a/tests/unit/modules/test_grub_legacy.py +++ b/tests/unit/modules/test_grub_legacy.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals +import errno # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin @@ -43,15 +44,13 @@ class GrublegacyTestCase(TestCase, LoaderModuleMockMixin): ''' Test for Parse GRUB conf file ''' - mock = MagicMock(side_effect=IOError('foo')) - with patch('salt.utils.files.fopen', mock): - with patch.object(grub_legacy, '_detect_conf', return_value='A'): - self.assertRaises(CommandExecutionError, grub_legacy.conf) + file_data = IOError(errno.EACCES, 'Permission denied') + with patch('salt.utils.files.fopen', mock_open(read_data=file_data)), \ + patch.object(grub_legacy, '_detect_conf', return_value='A'): + self.assertRaises(CommandExecutionError, grub_legacy.conf) file_data = salt.utils.stringutils.to_str('\n'.join(['#', 'A B C D,E,F G H'])) - with patch('salt.utils.files.fopen', - mock_open(read_data=file_data), create=True) as f_mock: - f_mock.return_value.__iter__.return_value = file_data.splitlines() - with patch.object(grub_legacy, '_detect_conf', return_value='A'): - self.assertEqual(grub_legacy.conf(), - {'A': 'B C D,E,F G H', 'stanzas': []}) + with patch('salt.utils.files.fopen', mock_open(read_data=file_data)), \ + patch.object(grub_legacy, '_detect_conf', return_value='A'): + conf = grub_legacy.conf() + assert conf == {'A': 'B C D,E,F G H', 'stanzas': []}, conf diff --git a/tests/unit/modules/test_guestfs.py b/tests/unit/modules/test_guestfs.py index a416d8cb21..064b9e6cc3 100644 --- a/tests/unit/modules/test_guestfs.py +++ b/tests/unit/modules/test_guestfs.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_hadoop.py b/tests/unit/modules/test_hadoop.py index 4be21d6b18..423a85ceec 100644 --- a/tests/unit/modules/test_hadoop.py +++ b/tests/unit/modules/test_hadoop.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_haproxyconn.py b/tests/unit/modules/test_haproxyconn.py index e69bd0fed7..92fe1b1cd9 100644 --- a/tests/unit/modules/test_haproxyconn.py +++ b/tests/unit/modules/test_haproxyconn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_hg.py b/tests/unit/modules/test_hg.py index 4f74fa5453..6843f4d306 100644 --- a/tests/unit/modules/test_hg.py +++ b/tests/unit/modules/test_hg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_hipchat.py b/tests/unit/modules/test_hipchat.py index 7d2c7d1585..b31be8c933 100644 --- a/tests/unit/modules/test_hipchat.py +++ b/tests/unit/modules/test_hipchat.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_hosts.py b/tests/unit/modules/test_hosts.py index 7ddec9824e..6517ddc32e 100644 --- a/tests/unit/modules/test_hosts.py +++ b/tests/unit/modules/test_hosts.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs @@ -114,7 +114,7 @@ class HostsTestCase(TestCase, LoaderModuleMockMixin): with patch('salt.modules.hosts.__get_hosts_filename', MagicMock(return_value='/etc/hosts')), \ patch('os.path.isfile', MagicMock(return_value=True)), \ - patch('salt.utils.files.fopen', mock_open()): + patch('salt.utils.files.fopen', mock_open(b'')): mock_opt = MagicMock(return_value=None) with patch.dict(hosts.__salt__, {'config.option': mock_opt}): self.assertTrue(hosts.set_host('10.10.10.10', 'Salt1')) @@ -212,7 +212,7 @@ class HostsTestCase(TestCase, LoaderModuleMockMixin): ''' Tests if specified host entry gets removed from the hosts file ''' - with patch('salt.utils.files.fopen', mock_open()), \ + with patch('salt.utils.files.fopen', mock_open(b'')), \ patch('salt.modules.hosts.__get_hosts_filename', MagicMock(return_value='/etc/hosts')), \ patch('salt.modules.hosts.has_pair', diff --git a/tests/unit/modules/test_htpasswd.py b/tests/unit/modules/test_htpasswd.py index 40aaa4da0f..ee4c1bee7d 100644 --- a/tests/unit/modules/test_htpasswd.py +++ b/tests/unit/modules/test_htpasswd.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_http.py b/tests/unit/modules/test_http.py index 4eb1011de3..088382dd42 100644 --- a/tests/unit/modules/test_http.py +++ b/tests/unit/modules/test_http.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_ilo.py b/tests/unit/modules/test_ilo.py index d8257db3ce..c289b584ed 100644 --- a/tests/unit/modules/test_ilo.py +++ b/tests/unit/modules/test_ilo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_incron.py b/tests/unit/modules/test_incron.py index 22c9e707a3..6babf032f5 100644 --- a/tests/unit/modules/test_incron.py +++ b/tests/unit/modules/test_incron.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_influx08.py b/tests/unit/modules/test_influx08.py index 1913042290..2720e241bd 100644 --- a/tests/unit/modules/test_influx08.py +++ b/tests/unit/modules/test_influx08.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_ini_manage.py b/tests/unit/modules/test_ini_manage.py index c5dd5422fb..0c372baf21 100644 --- a/tests/unit/modules/test_ini_manage.py +++ b/tests/unit/modules/test_ini_manage.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- - +''' +Testing ini_manage exec module. +''' # Import python libs from __future__ import absolute_import, print_function, unicode_literals import os @@ -15,6 +17,9 @@ import salt.modules.ini_manage as ini class IniManageTestCase(TestCase): + ''' + Testing ini_manage exec module. + ''' TEST_FILE_CONTENT = os.linesep.join([ '# Comment on the first line', @@ -54,6 +59,9 @@ class IniManageTestCase(TestCase): os.remove(self.tfile.name) def test_get_option(self): + ''' + Test get_option method. + ''' self.assertEqual( ini.get_option(self.tfile.name, 'main', 'test1'), 'value 1') @@ -71,23 +79,46 @@ class IniManageTestCase(TestCase): '') def test_get_section(self): + ''' + Test get_section method. + ''' self.assertEqual( ini.get_section(self.tfile.name, 'SectionB'), {'test1': 'value 1B', 'test3': 'value 3B'}) def test_remove_option(self): + ''' + Test remove_option method. + ''' self.assertEqual( ini.remove_option(self.tfile.name, 'SectionB', 'test1'), 'value 1B') self.assertIsNone(ini.get_option(self.tfile.name, 'SectionB', 'test1')) def test_remove_section(self): + ''' + Test remove_section method. + ''' self.assertEqual( ini.remove_section(self.tfile.name, 'SectionB'), {'test1': 'value 1B', 'test3': 'value 3B'}) self.assertEqual(ini.get_section(self.tfile.name, 'SectionB'), {}) + def test_get_ini(self): + ''' + Test get_ini method. + ''' + self.assertEqual( + dict(ini.get_ini(self.tfile.name)), { + 'SectionC': {'empty_option': ''}, + 'SectionB': {'test1': 'value 1B', 'test3': 'value 3B'}, + 'main': {'test1': 'value 1', 'test2': 'value 2'}, + 'option2': 'main2', 'option1': 'main1'}) + def test_set_option(self): + ''' + Test set_option method. + ''' result = ini.set_option(self.tfile.name, { 'SectionB': { 'test3': 'new value 3B', @@ -101,12 +132,9 @@ class IniManageTestCase(TestCase): 'SectionB': {'test3': {'after': 'new value 3B', 'before': 'value 3B'}, 'test_set_option': {'after': 'test_set_value', - 'before': None} - }, + 'before': None}}, 'SectionD': {'after': {'test_set_option2': 'test_set_value1'}, - 'before': None - } - }) + 'before': None}}) # Check existing option updated self.assertEqual( ini.get_option(self.tfile.name, 'SectionB', 'test3'), @@ -116,16 +144,22 @@ class IniManageTestCase(TestCase): ini.get_option(self.tfile.name, 'SectionD', 'test_set_option2'), 'test_set_value1') - def test_empty_value_preserved_after_edit(self): + def test_empty_value(self): + ''' + Test empty value preserved after edit + ''' ini.set_option(self.tfile.name, { 'SectionB': {'test3': 'new value 3B'}, }) - with salt.utils.files.fopen(self.tfile.name, 'r') as fp: - file_content = salt.utils.stringutils.to_unicode(fp.read()) + with salt.utils.files.fopen(self.tfile.name, 'r') as fp_: + file_content = salt.utils.stringutils.to_unicode(fp_.read()) expected = '{0}{1}{0}'.format(os.linesep, 'empty_option = ') self.assertIn(expected, file_content, 'empty_option was not preserved') - def test_empty_lines_preserved_after_edit(self): + def test_empty_lines(self): + ''' + Test empty lines preserved after edit + ''' ini.set_option(self.tfile.name, { 'SectionB': {'test3': 'new value 3B'}, }) @@ -155,12 +189,15 @@ class IniManageTestCase(TestCase): 'empty_option = ', '' ]) - with salt.utils.files.fopen(self.tfile.name, 'r') as fp: - file_content = salt.utils.stringutils.to_unicode(fp.read()) + with salt.utils.files.fopen(self.tfile.name, 'r') as fp_: + file_content = salt.utils.stringutils.to_unicode(fp_.read()) self.assertEqual(expected, file_content) - def test_empty_lines_preserved_after_multiple_edits(self): + def test_empty_lines_multiple_edits(self): + ''' + Test empty lines preserved after multiple edits + ''' ini.set_option(self.tfile.name, { 'SectionB': {'test3': 'this value will be edited two times'}, }) - self.test_empty_lines_preserved_after_edit() + self.test_empty_lines() diff --git a/tests/unit/modules/test_inspect_collector.py b/tests/unit/modules/test_inspect_collector.py index 1a545fcac0..2c4ee4177d 100644 --- a/tests/unit/modules/test_inspect_collector.py +++ b/tests/unit/modules/test_inspect_collector.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ''' - :codeauthor: :email:`Bo Maryniuk ` + :codeauthor: Bo Maryniuk ''' # Import Python Libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_inspect_fsdb.py b/tests/unit/modules/test_inspect_fsdb.py index dcbc82a493..366c621c6e 100644 --- a/tests/unit/modules/test_inspect_fsdb.py +++ b/tests/unit/modules/test_inspect_fsdb.py @@ -15,7 +15,7 @@ # limitations under the License. ''' - :codeauthor: :email:`Bo Maryniuk ` + :codeauthor: Bo Maryniuk ''' # Import Python Libs diff --git a/tests/unit/modules/test_introspect.py b/tests/unit/modules/test_introspect.py index b5ce0b65d8..30df0bd9ad 100644 --- a/tests/unit/modules/test_introspect.py +++ b/tests/unit/modules/test_introspect.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_ipset.py b/tests/unit/modules/test_ipset.py index 221fd5acb4..b20bae2ef9 100644 --- a/tests/unit/modules/test_ipset.py +++ b/tests/unit/modules/test_ipset.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_iptables.py b/tests/unit/modules/test_iptables.py index 047634a46d..8102219025 100644 --- a/tests/unit/modules/test_iptables.py +++ b/tests/unit/modules/test_iptables.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_junos.py b/tests/unit/modules/test_junos.py index 5511e25528..58d1418158 100644 --- a/tests/unit/modules/test_junos.py +++ b/tests/unit/modules/test_junos.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rajvi Dhimar ` + :codeauthor: Rajvi Dhimar ''' # Import python libs from __future__ import absolute_import, print_function, unicode_literals @@ -20,6 +20,8 @@ try: from jnpr.junos.utils.config import Config from jnpr.junos.utils.sw import SW from jnpr.junos.device import Device + from jnpr.junos.device import Device + import jxmlease # pylint: disable=unused-import HAS_JUNOS = True except ImportError: HAS_JUNOS = False @@ -28,7 +30,7 @@ except ImportError: import salt.modules.junos as junos -@skipIf(not HAS_JUNOS, 'Install junos-eznc to be able to run this test.') +@skipIf(not HAS_JUNOS, 'The junos-eznc and jxmlease modules are required') class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin): def setup_loader_modules(self): @@ -383,7 +385,7 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin): ret['out'] = True self.assertEqual(junos.commit(), ret) - def test_commit_raise_commit_check_exeception(self): + def test_commit_raise_commit_check_exception(self): with patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check: mock_commit_check.side_effect = self.raise_exception ret = dict() @@ -501,7 +503,7 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin): 'confirm': 2, '__pub_fun': 'junos.rollback', '__pub_jid': '20170221184518526067', '__pub_tgt': 'mac_min', '__pub_tgt_type': 'glob', '__pub_ret': ''} - junos.rollback(2, **args) + junos.rollback(id=2, **args) mock_rollback.assert_called_with(2) mock_commit.assert_called_with(confirm=2) @@ -646,7 +648,7 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin): def test_diff_with_arg(self): with patch('jnpr.junos.utils.config.Config.diff') as mock_diff: - junos.diff(2) + junos.diff(id=2) mock_diff.assert_called_with(rb_id=2) def test_diff_exception(self): @@ -702,7 +704,7 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin): def test_cli_with_format_as_empty_string(self): with patch('jnpr.junos.device.Device.cli') as mock_cli: - junos.cli('show version', '') + junos.cli('show version', format='') mock_cli.assert_called_with('show version', 'text', warning=False) def test_cli(self): @@ -1471,29 +1473,26 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin): with patch('jnpr.junos.device.Device.execute') as mock_execute: mock_execute.return_value = etree.XML( 'text rpc reply') - m = mock_open() - with patch('salt.utils.files.fopen', m, create=True): - junos.rpc('get-chassis-inventory', '/path/to/file', 'text') - handle = m() - handle.write.assert_called_with('text rpc reply') + with patch('salt.utils.files.fopen', mock_open(), create=True) as m_open: + junos.rpc('get-chassis-inventory', '/path/to/file', format='text') + writes = m_open.write_calls() + assert writes == ['text rpc reply'], writes def test_rpc_write_file_format_json(self): with patch('jnpr.junos.device.Device.execute') as mock_execute, \ patch('salt.utils.json.dumps') as mock_dumps: mock_dumps.return_value = 'json rpc reply' - m = mock_open() - with patch('salt.utils.files.fopen', m, create=True): + with patch('salt.utils.files.fopen', mock_open(), create=True) as m_open: junos.rpc('get-chassis-inventory', '/path/to/file', format='json') - handle = m() - handle.write.assert_called_with('json rpc reply') + writes = m_open.write_calls() + assert writes == ['json rpc reply'], writes def test_rpc_write_file(self): with patch('salt.modules.junos.jxmlease.parse') as mock_parse, \ patch('salt.modules.junos.etree.tostring') as mock_tostring, \ patch('jnpr.junos.device.Device.execute') as mock_execute: mock_tostring.return_value = 'xml rpc reply' - m = mock_open() - with patch('salt.utils.files.fopen', m, create=True): + with patch('salt.utils.files.fopen', mock_open(), create=True) as m_open: junos.rpc('get-chassis-inventory', '/path/to/file') - handle = m() - handle.write.assert_called_with('xml rpc reply') + writes = m_open.write_calls() + assert writes == ['xml rpc reply'], writes diff --git a/tests/unit/modules/test_key.py b/tests/unit/modules/test_key.py index d3b93e05d7..3f718ee5ce 100644 --- a/tests/unit/modules/test_key.py +++ b/tests/unit/modules/test_key.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_keyboard.py b/tests/unit/modules/test_keyboard.py index 9fcbde4a34..682ba3eed8 100644 --- a/tests/unit/modules/test_keyboard.py +++ b/tests/unit/modules/test_keyboard.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_keystone.py b/tests/unit/modules/test_keystone.py index f24da91931..dcf91b96f5 100644 --- a/tests/unit/modules/test_keystone.py +++ b/tests/unit/modules/test_keystone.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_kmod.py b/tests/unit/modules/test_kmod.py index 810338b45d..4bb799539b 100644 --- a/tests/unit/modules/test_kmod.py +++ b/tests/unit/modules/test_kmod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_kubernetes.py b/tests/unit/modules/test_kubernetes.py index 4cdcf6036a..8418dc98cd 100644 --- a/tests/unit/modules/test_kubernetes.py +++ b/tests/unit/modules/test_kubernetes.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jochen Breuer ` + :codeauthor: Jochen Breuer ''' # Import Python Libs diff --git a/tests/unit/modules/test_launchctl.py b/tests/unit/modules/test_launchctl.py index 169d975330..346e005443 100644 --- a/tests/unit/modules/test_launchctl.py +++ b/tests/unit/modules/test_launchctl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_ldapmod.py b/tests/unit/modules/test_ldapmod.py index ec7bf7ac45..16652345df 100644 --- a/tests/unit/modules/test_ldapmod.py +++ b/tests/unit/modules/test_ldapmod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import python libs diff --git a/tests/unit/modules/test_libcloud_dns.py b/tests/unit/modules/test_libcloud_dns.py index 8be3d983a7..8a1623d90e 100644 --- a/tests/unit/modules/test_libcloud_dns.py +++ b/tests/unit/modules/test_libcloud_dns.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Anthony Shaw ` + :codeauthor: Anthony Shaw ''' # Import Python Libs diff --git a/tests/unit/modules/test_linux_lvm.py b/tests/unit/modules/test_linux_lvm.py index d46e74c57d..d06049a78c 100644 --- a/tests/unit/modules/test_linux_lvm.py +++ b/tests/unit/modules/test_linux_lvm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_linux_sysctl.py b/tests/unit/modules/test_linux_sysctl.py index 0c06b83c0f..2ff34c8d89 100644 --- a/tests/unit/modules/test_linux_sysctl.py +++ b/tests/unit/modules/test_linux_sysctl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`jmoney ` + :codeauthor: jmoney ''' # Import Python libs @@ -101,6 +101,7 @@ class LinuxSysctlTestCase(TestCase, LoaderModuleMockMixin): ''' Tests successful add of config file when previously not one ''' + config = '/etc/sysctl.conf' with patch('os.path.isfile', MagicMock(return_value=False)), \ patch('os.path.exists', MagicMock(return_value=True)): asn_cmd = {'pid': 1337, 'retcode': 0, 'stderr': '', @@ -110,18 +111,20 @@ class LinuxSysctlTestCase(TestCase, LoaderModuleMockMixin): sys_cmd = 'systemd 208\n+PAM +LIBWRAP' mock_sys_cmd = MagicMock(return_value=sys_cmd) - with patch('salt.utils.files.fopen', mock_open()) as m_open: - with patch.dict(linux_sysctl.__context__, {'salt.utils.systemd.version': 232}): - with patch.dict(linux_sysctl.__salt__, - {'cmd.run_stdout': mock_sys_cmd, - 'cmd.run_all': mock_asn_cmd}): - with patch.dict(systemd.__context__, - {'salt.utils.systemd.booted': True, - 'salt.utils.systemd.version': 232}): - linux_sysctl.persist('net.ipv4.ip_forward', 1) - helper_open = m_open() - helper_open.write.assert_called_once_with( - '#\n# Kernel sysctl configuration\n#\n') + with patch('salt.utils.files.fopen', mock_open()) as m_open, \ + patch.dict(linux_sysctl.__context__, + {'salt.utils.systemd.version': 232}), \ + patch.dict(linux_sysctl.__salt__, + {'cmd.run_stdout': mock_sys_cmd, + 'cmd.run_all': mock_asn_cmd}), \ + patch.dict(systemd.__context__, + {'salt.utils.systemd.booted': True, + 'salt.utils.systemd.version': 232}): + linux_sysctl.persist('net.ipv4.ip_forward', 1, config=config) + writes = m_open.write_calls() + assert writes == [ + '#\n# Kernel sysctl configuration\n#\n' + ], writes def test_persist_read_conf_success(self): ''' diff --git a/tests/unit/modules/test_localemod.py b/tests/unit/modules/test_localemod.py index e76c1104a5..8534b649f6 100644 --- a/tests/unit/modules/test_localemod.py +++ b/tests/unit/modules/test_localemod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_locate.py b/tests/unit/modules/test_locate.py index 9293fbbddd..d595c22e75 100644 --- a/tests/unit/modules/test_locate.py +++ b/tests/unit/modules/test_locate.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_logadm.py b/tests/unit/modules/test_logadm.py index adc77f0d15..c51564cd99 100644 --- a/tests/unit/modules/test_logadm.py +++ b/tests/unit/modules/test_logadm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_logrotate.py b/tests/unit/modules/test_logrotate.py index f3271c27bd..4ecb57039c 100644 --- a/tests/unit/modules/test_logrotate.py +++ b/tests/unit/modules/test_logrotate.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_lvs.py b/tests/unit/modules/test_lvs.py index fe1633e692..24d8552787 100644 --- a/tests/unit/modules/test_lvs.py +++ b/tests/unit/modules/test_lvs.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python Libs diff --git a/tests/unit/modules/test_mac_brew.py b/tests/unit/modules/test_mac_brew.py index 2244568e68..4bf094a973 100644 --- a/tests/unit/modules/test_mac_brew.py +++ b/tests/unit/modules/test_mac_brew.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python libs diff --git a/tests/unit/modules/test_mac_group.py b/tests/unit/modules/test_mac_group.py index dbe9b9b67a..853adaa189 100644 --- a/tests/unit/modules/test_mac_group.py +++ b/tests/unit/modules/test_mac_group.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import python libs diff --git a/tests/unit/modules/test_mac_service.py b/tests/unit/modules/test_mac_service.py index 404471a5fe..aaa0dcdb56 100644 --- a/tests/unit/modules/test_mac_service.py +++ b/tests/unit/modules/test_mac_service.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Megan Wilhite` + :codeauthor: Megan Wilhite ''' # Import Python libs diff --git a/tests/unit/modules/test_mac_sysctl.py b/tests/unit/modules/test_mac_sysctl.py index 46d9e8eacd..c1e889b5a6 100644 --- a/tests/unit/modules/test_mac_sysctl.py +++ b/tests/unit/modules/test_mac_sysctl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python libs @@ -17,9 +17,9 @@ from tests.support.mock import ( MagicMock, mock_open, patch, - call, NO_MOCK, - NO_MOCK_REASON + NO_MOCK_REASON, + DEFAULT ) @@ -67,9 +67,9 @@ class DarwinSysctlTestCase(TestCase, LoaderModuleMockMixin): ''' Tests adding of config file failure ''' - with patch('salt.utils.files.fopen', mock_open()) as m_open, \ + read_data = IOError(13, 'Permission denied', '/file') + with patch('salt.utils.files.fopen', mock_open(read_data=read_data)), \ patch('os.path.isfile', MagicMock(return_value=False)): - m_open.side_effect = IOError(13, 'Permission denied', '/file') self.assertRaises(CommandExecutionError, mac_sysctl.persist, 'net.inet.icmp.icmplim', @@ -77,24 +77,45 @@ class DarwinSysctlTestCase(TestCase, LoaderModuleMockMixin): def test_persist_no_conf_success(self): ''' - Tests successful add of config file when previously not one + Tests successful add of config file when it did not already exist ''' + config = '/etc/sysctl.conf' + isfile_mock = MagicMock( + side_effect=lambda x: False if x == config else DEFAULT + ) with patch('salt.utils.files.fopen', mock_open()) as m_open, \ - patch('os.path.isfile', MagicMock(return_value=False)): - mac_sysctl.persist('net.inet.icmp.icmplim', 50) - helper_open = m_open() - helper_open.write.assert_called_once_with( - '#\n# Kernel sysctl configuration\n#\n') + patch('os.path.isfile', isfile_mock): + mac_sysctl.persist('net.inet.icmp.icmplim', 50, config=config) + # We only should have opened the one file + num_handles = len(m_open.filehandles) + assert num_handles == 1, num_handles + writes = m_open.write_calls() + # We should have called .write() only once, with the expected + # content + num_writes = len(writes) + assert num_writes == 1, num_writes + assert writes[0] == '#\n# Kernel sysctl configuration\n#\n', writes[0] def test_persist_success(self): ''' Tests successful write to existing sysctl file ''' + config = '/etc/sysctl.conf' to_write = '#\n# Kernel sysctl configuration\n#\n' - m_calls_list = [call.writelines(['net.inet.icmp.icmplim=50', '\n'])] + writelines_calls = [[ + '#\n', + '# Kernel sysctl configuration\n', + '#\n', + 'net.inet.icmp.icmplim=50\n', + ]] + isfile_mock = MagicMock( + side_effect=lambda x: True if x == config else DEFAULT + ) with patch('salt.utils.files.fopen', mock_open(read_data=to_write)) as m_open, \ - patch('os.path.isfile', MagicMock(return_value=True)): - mac_sysctl.persist('net.inet.icmp.icmplim', 50, config=to_write) - helper_open = m_open() - calls_list = helper_open.method_calls - self.assertEqual(calls_list, m_calls_list) + patch('os.path.isfile', isfile_mock): + mac_sysctl.persist('net.inet.icmp.icmplim', 50, config=config) + # We only should have opened the one file + num_handles = len(m_open.filehandles) + assert num_handles == 1, num_handles + writes = m_open.writelines_calls() + assert writes == writelines_calls, writes diff --git a/tests/unit/modules/test_mac_user.py b/tests/unit/modules/test_mac_user.py index 022b5f020d..3ecde7f6d7 100644 --- a/tests/unit/modules/test_mac_user.py +++ b/tests/unit/modules/test_mac_user.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/modules/test_mdadm.py b/tests/unit/modules/test_mdadm.py index 383ade92c0..c7828b9bdc 100644 --- a/tests/unit/modules/test_mdadm.py +++ b/tests/unit/modules/test_mdadm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Ted Strzalkowski (tedski@gmail.com)` + :codeauthor: Ted Strzalkowski (tedski@gmail.com) tests.unit.modules.mdadm_test diff --git a/tests/unit/modules/test_memcached.py b/tests/unit/modules/test_memcached.py index 675f41cdbc..9156645cb6 100644 --- a/tests/unit/modules/test_memcached.py +++ b/tests/unit/modules/test_memcached.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_mine.py b/tests/unit/modules/test_mine.py index 3859d0b6b6..9e5faf50bc 100644 --- a/tests/unit/modules/test_mine.py +++ b/tests/unit/modules/test_mine.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python Libs diff --git a/tests/unit/modules/test_mod_random.py b/tests/unit/modules/test_mod_random.py index 49dcbb79df..6e5c05a0a6 100644 --- a/tests/unit/modules/test_mod_random.py +++ b/tests/unit/modules/test_mod_random.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python Libs diff --git a/tests/unit/modules/test_modjk.py b/tests/unit/modules/test_modjk.py index c0e8462ab7..f71ed54fb0 100644 --- a/tests/unit/modules/test_modjk.py +++ b/tests/unit/modules/test_modjk.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_monit.py b/tests/unit/modules/test_monit.py index c78772989c..a27b8d40e7 100644 --- a/tests/unit/modules/test_monit.py +++ b/tests/unit/modules/test_monit.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python Libs diff --git a/tests/unit/modules/test_moosefs.py b/tests/unit/modules/test_moosefs.py index 91b2e577cd..537f254ed4 100644 --- a/tests/unit/modules/test_moosefs.py +++ b/tests/unit/modules/test_moosefs.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_mount.py b/tests/unit/modules/test_mount.py index 73701b2d07..fed7bd451b 100644 --- a/tests/unit/modules/test_mount.py +++ b/tests/unit/modules/test_mount.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals @@ -87,20 +87,19 @@ class MountTestCase(TestCase, LoaderModuleMockMixin): with patch.object(os.path, 'isfile', mock): self.assertEqual(mount.fstab(), {}) + file_data = '\n'.join(['#', 'A B C D,E,F G H']) mock = MagicMock(return_value=True) - with patch.dict(mount.__grains__, {'kernel': ''}): - with patch.object(os.path, 'isfile', mock): - file_data = '\n'.join(['#', - 'A B C D,E,F G H']) - with patch('salt.utils.files.fopen', - mock_open(read_data=file_data), - create=True) as m: - m.return_value.__iter__.return_value = file_data.splitlines() - self.assertEqual(mount.fstab(), {'B': {'device': 'A', - 'dump': 'G', - 'fstype': 'C', - 'opts': ['D', 'E', 'F'], - 'pass': 'H'}}) + with patch.dict(mount.__grains__, {'kernel': ''}), \ + patch.object(os.path, 'isfile', mock), \ + patch('salt.utils.files.fopen', mock_open(read_data=file_data)): + fstab = mount.fstab() + assert fstab == { + 'B': {'device': 'A', + 'dump': 'G', + 'fstype': 'C', + 'opts': ['D', 'E', 'F'], + 'pass': 'H'} + }, fstab def test_vfstab(self): ''' @@ -110,21 +109,23 @@ class MountTestCase(TestCase, LoaderModuleMockMixin): with patch.object(os.path, 'isfile', mock): self.assertEqual(mount.vfstab(), {}) + file_data = textwrap.dedent('''\ + # + swap - /tmp tmpfs - yes size=2048m + ''') mock = MagicMock(return_value=True) - with patch.dict(mount.__grains__, {'kernel': 'SunOS'}): - with patch.object(os.path, 'isfile', mock): - file_data = '\n'.join(['#', - 'swap - /tmp tmpfs - yes size=2048m']) - with patch('salt.utils.files.fopen', - mock_open(read_data=file_data), - create=True) as m: - m.return_value.__iter__.return_value = file_data.splitlines() - self.assertEqual(mount.fstab(), {'/tmp': {'device': 'swap', - 'device_fsck': '-', - 'fstype': 'tmpfs', - 'mount_at_boot': 'yes', - 'opts': ['size=2048m'], - 'pass_fsck': '-'}}) + with patch.dict(mount.__grains__, {'kernel': 'SunOS'}), \ + patch.object(os.path, 'isfile', mock), \ + patch('salt.utils.files.fopen', mock_open(read_data=file_data)): + vfstab = mount.vfstab() + assert vfstab == { + '/tmp': {'device': 'swap', + 'device_fsck': '-', + 'fstype': 'tmpfs', + 'mount_at_boot': 'yes', + 'opts': ['size=2048m'], + 'pass_fsck': '-'} + }, vfstab def test_rm_fstab(self): ''' @@ -274,30 +275,36 @@ class MountTestCase(TestCase, LoaderModuleMockMixin): Return a dict containing information on active swap ''' - file_data = '\n'.join(['Filename Type Size Used Priority', - '/dev/sda1 partition 31249404 4100 -1']) + file_data = textwrap.dedent('''\ + Filename Type Size Used Priority + /dev/sda1 partition 31249404 4100 -1 + ''') with patch.dict(mount.__grains__, {'os': '', 'kernel': ''}): - with patch('salt.utils.files.fopen', - mock_open(read_data=file_data), - create=True) as m: - m.return_value.__iter__.return_value = file_data.splitlines() + with patch('salt.utils.files.fopen', mock_open(read_data=file_data)): + swaps = mount.swaps() + assert swaps == { + '/dev/sda1': { + 'priority': '-1', + 'size': '31249404', + 'type': 'partition', + 'used': '4100'} + }, swaps - self.assertDictEqual(mount.swaps(), {'/dev/sda1': - {'priority': '-1', - 'size': '31249404', - 'type': 'partition', - 'used': '4100'}}) - - file_data = '\n'.join(['Device Size Used Unknown Unknown Priority', - '/dev/sda1 31249404 4100 unknown unknown -1']) + file_data = textwrap.dedent('''\ + Device Size Used Unknown Unknown Priority + /dev/sda1 31249404 4100 unknown unknown -1 + ''') mock = MagicMock(return_value=file_data) - with patch.dict(mount.__grains__, {'os': 'OpenBSD', 'kernel': 'OpenBSD'}): - with patch.dict(mount.__salt__, {'cmd.run_stdout': mock}): - self.assertDictEqual(mount.swaps(), {'/dev/sda1': - {'priority': '-1', - 'size': '31249404', - 'type': 'partition', - 'used': '4100'}}) + with patch.dict(mount.__grains__, {'os': 'OpenBSD', 'kernel': 'OpenBSD'}), \ + patch.dict(mount.__salt__, {'cmd.run_stdout': mock}): + swaps = mount.swaps() + assert swaps == { + '/dev/sda1': { + 'priority': '-1', + 'size': '31249404', + 'type': 'partition', + 'used': '4100'} + }, swaps def test_swapon(self): ''' diff --git a/tests/unit/modules/test_munin.py b/tests/unit/modules/test_munin.py index db33f2263a..e1bc601c20 100644 --- a/tests/unit/modules/test_munin.py +++ b/tests/unit/modules/test_munin.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_mysql.py b/tests/unit/modules/test_mysql.py index 3208db31bd..1f0bac7e22 100644 --- a/tests/unit/modules/test_mysql.py +++ b/tests/unit/modules/test_mysql.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place (mp@saltstack.com)` + :codeauthor: Mike Place (mp@saltstack.com) tests.unit.modules.mysql @@ -54,10 +54,12 @@ class MySQLTestCase(TestCase, LoaderModuleMockMixin): # test_user_create_when_user_exists(self): # ensure we don't try to create a user when one already exists - with patch.object(mysql, 'user_exists', MagicMock(return_value=True)): - with patch.dict(mysql.__salt__, {'config.option': MagicMock()}): - ret = mysql.user_create('testuser') - self.assertEqual(False, ret) + # mock the version of MySQL + with patch.object(mysql, 'version', MagicMock(return_value='8.0.10')): + with patch.object(mysql, 'user_exists', MagicMock(return_value=True)): + with patch.dict(mysql.__salt__, {'config.option': MagicMock()}): + ret = mysql.user_create('testuser') + self.assertEqual(False, ret) def test_user_create(self): ''' diff --git a/tests/unit/modules/test_nagios.py b/tests/unit/modules/test_nagios.py index cbd7741c92..0ebb5026f6 100644 --- a/tests/unit/modules/test_nagios.py +++ b/tests/unit/modules/test_nagios.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python Libs from __future__ import absolute_import diff --git a/tests/unit/modules/test_napalm_network.py b/tests/unit/modules/test_napalm_network.py index 596f7828f0..5fc0e362c8 100644 --- a/tests/unit/modules/test_napalm_network.py +++ b/tests/unit/modules/test_napalm_network.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Anthony Shaw ` + :codeauthor: Anthony Shaw ''' # Import Python Libs diff --git a/tests/unit/modules/test_netscaler.py b/tests/unit/modules/test_netscaler.py index 67d09d1879..ad79c3797e 100644 --- a/tests/unit/modules/test_netscaler.py +++ b/tests/unit/modules/test_netscaler.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_network.py b/tests/unit/modules/test_network.py index 865f15f3e3..d616d8b2ba 100644 --- a/tests/unit/modules/test_network.py +++ b/tests/unit/modules/test_network.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs @@ -230,16 +230,14 @@ class NetworkTestCase(TestCase, LoaderModuleMockMixin): Test for Modify hostname ''' self.assertFalse(network.mod_hostname(None)) + file_d = '\n'.join(['#', 'A B C D,E,F G H']) - with patch.object(salt.utils.path, 'which', return_value='hostname'): - with patch.dict(network.__salt__, - {'cmd.run': MagicMock(return_value=None)}): - file_d = '\n'.join(['#', 'A B C D,E,F G H']) - with patch('salt.utils.files.fopen', mock_open(read_data=file_d), - create=True) as mfi: - mfi.return_value.__iter__.return_value = file_d.splitlines() - with patch.dict(network.__grains__, {'os_family': 'A'}): - self.assertTrue(network.mod_hostname('hostname')) + with patch.object(salt.utils.path, 'which', return_value='hostname'), \ + patch.dict(network.__salt__, + {'cmd.run': MagicMock(return_value=None)}), \ + patch.dict(network.__grains__, {'os_family': 'A'}), \ + patch('salt.utils.files.fopen', mock_open(read_data=file_d)): + self.assertTrue(network.mod_hostname('hostname')) def test_connect(self): ''' diff --git a/tests/unit/modules/test_neutron.py b/tests/unit/modules/test_neutron.py index 1311446b39..8e303cf187 100644 --- a/tests/unit/modules/test_neutron.py +++ b/tests/unit/modules/test_neutron.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_nfs3.py b/tests/unit/modules/test_nfs3.py index 80cdd80cbc..6fa010d8ee 100644 --- a/tests/unit/modules/test_nfs3.py +++ b/tests/unit/modules/test_nfs3.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs @@ -10,6 +10,7 @@ from __future__ import absolute_import, print_function, unicode_literals from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf from tests.support.mock import ( + MagicMock, mock_open, patch, NO_MOCK, @@ -32,21 +33,21 @@ class NfsTestCase(TestCase, LoaderModuleMockMixin): ''' Test for List configured exports ''' - file_d = '\n'.join(['A B1(23']) - with patch('salt.utils.files.fopen', - mock_open(read_data=file_d), create=True) as mfi: - mfi.return_value.__iter__.return_value = file_d.splitlines() - self.assertDictEqual(nfs3.list_exports(), - {'A': [{'hosts': 'B1', 'options': ['23']}]}) + with patch('salt.utils.files.fopen', mock_open(read_data='A B1(23')): + exports = nfs3.list_exports() + assert exports == {'A': [{'hosts': 'B1', 'options': ['23']}]}, exports def test_del_export(self): ''' Test for Remove an export ''' - with patch.object(nfs3, - 'list_exports', - return_value={'A': - [{'hosts': - ['B1'], 'options': ['23']}]}): - with patch.object(nfs3, '_write_exports', return_value=None): - self.assertDictEqual(nfs3.del_export(path='A'), {}) + list_exports_mock = MagicMock(return_value={ + 'A': [ + {'hosts': ['B1'], + 'options': ['23']}, + ], + }) + with patch.object(nfs3, 'list_exports', list_exports_mock), \ + patch.object(nfs3, '_write_exports', MagicMock(return_value=None)): + result = nfs3.del_export(path='A') + assert result == {}, result diff --git a/tests/unit/modules/test_nftables.py b/tests/unit/modules/test_nftables.py index 437b6360a8..366920a51b 100644 --- a/tests/unit/modules/test_nftables.py +++ b/tests/unit/modules/test_nftables.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_nova.py b/tests/unit/modules/test_nova.py index 0824225d90..56197ddba2 100644 --- a/tests/unit/modules/test_nova.py +++ b/tests/unit/modules/test_nova.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/modules/test_npm.py b/tests/unit/modules/test_npm.py index d777dd3aca..eaf133953f 100644 --- a/tests/unit/modules/test_npm.py +++ b/tests/unit/modules/test_npm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_openbsdpkg.py b/tests/unit/modules/test_openbsdpkg.py index 2df4e5255e..fe607b7db4 100644 --- a/tests/unit/modules/test_openbsdpkg.py +++ b/tests/unit/modules/test_openbsdpkg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Eric Radman ` + :codeauthor: Eric Radman ''' # Import Python Libs diff --git a/tests/unit/modules/test_openstack_config.py b/tests/unit/modules/test_openstack_config.py index 413225a7c1..0e1c2e6c43 100644 --- a/tests/unit/modules/test_openstack_config.py +++ b/tests/unit/modules/test_openstack_config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_oracle.py b/tests/unit/modules/test_oracle.py index 0821e6ecfb..6672a282ee 100644 --- a/tests/unit/modules/test_oracle.py +++ b/tests/unit/modules/test_oracle.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/modules/test_osquery.py b/tests/unit/modules/test_osquery.py index f79c54a240..50052ecd75 100644 --- a/tests/unit/modules/test_osquery.py +++ b/tests/unit/modules/test_osquery.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Gareth J. Greenaway ` + :codeauthor: Gareth J. Greenaway ''' # Import Python Libs diff --git a/tests/unit/modules/test_pacman.py b/tests/unit/modules/test_pacman.py index 6e3559871e..ae842483b2 100644 --- a/tests/unit/modules/test_pacman.py +++ b/tests/unit/modules/test_pacman.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Eric Vz ` + :codeauthor: Eric Vz ''' # Import Python Libs diff --git a/tests/unit/modules/test_pagerduty.py b/tests/unit/modules/test_pagerduty.py index 446e421992..721cebf667 100644 --- a/tests/unit/modules/test_pagerduty.py +++ b/tests/unit/modules/test_pagerduty.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/modules/test_pam.py b/tests/unit/modules/test_pam.py index d2328230fb..780463996e 100644 --- a/tests/unit/modules/test_pam.py +++ b/tests/unit/modules/test_pam.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_parted.py b/tests/unit/modules/test_parted.py index 695af5b41d..0bf9bd5305 100644 --- a/tests/unit/modules/test_parted.py +++ b/tests/unit/modules/test_parted.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Dave Rawks (dave@pandora.com)` + :codeauthor: Dave Rawks (dave@pandora.com) tests.unit.modules.parted_test diff --git a/tests/unit/modules/test_pecl.py b/tests/unit/modules/test_pecl.py index be7b5b4382..adc16c95d3 100644 --- a/tests/unit/modules/test_pecl.py +++ b/tests/unit/modules/test_pecl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_pkg_resource.py b/tests/unit/modules/test_pkg_resource.py index dd3ae9a1ac..b6d90cc92c 100644 --- a/tests/unit/modules/test_pkg_resource.py +++ b/tests/unit/modules/test_pkg_resource.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/modules/test_pkgutil.py b/tests/unit/modules/test_pkgutil.py index aff5b2c517..462b3c5c44 100644 --- a/tests/unit/modules/test_pkgutil.py +++ b/tests/unit/modules/test_pkgutil.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_portage_config.py b/tests/unit/modules/test_portage_config.py index 86b4ef0c62..c9f642422a 100644 --- a/tests/unit/modules/test_portage_config.py +++ b/tests/unit/modules/test_portage_config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Ryan Lewis (ryansname@gmail.com)` + :codeauthor: Ryan Lewis (ryansname@gmail.com) tests.unit.modules.portage_flags ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/unit/modules/test_postfix.py b/tests/unit/modules/test_postfix.py index d4c4f0b961..5eac52ae52 100644 --- a/tests/unit/modules/test_postfix.py +++ b/tests/unit/modules/test_postfix.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_postgres.py b/tests/unit/modules/test_postgres.py index 3aac392218..03fb7fddfd 100644 --- a/tests/unit/modules/test_postgres.py +++ b/tests/unit/modules/test_postgres.py @@ -1479,3 +1479,21 @@ class PostgresTestCase(TestCase, LoaderModuleMockMixin): name = '/var/lib/pgsql/data' ret = postgres.datadir_exists(name) self.assertTrue(ret) + + def test_pg_is_older_ext_ver(self): + ''' + Test Checks if postgres extension version string is older + ''' + self.assertTrue(postgres._pg_is_older_ext_ver('8.5', '9.5')) + self.assertTrue(postgres._pg_is_older_ext_ver('8.5', '8.6')) + self.assertTrue(postgres._pg_is_older_ext_ver('8.5.2', '8.5.3')) + self.assertFalse(postgres._pg_is_older_ext_ver('9.5', '8.5')) + self.assertTrue(postgres._pg_is_older_ext_ver('9.5', '9.6')) + self.assertTrue(postgres._pg_is_older_ext_ver('9.5.0', '9.5.1')) + self.assertTrue(postgres._pg_is_older_ext_ver('9.5', '9.5.1')) + self.assertFalse(postgres._pg_is_older_ext_ver('9.5.1', '9.5')) + self.assertFalse(postgres._pg_is_older_ext_ver('9.5b', '9.5a')) + self.assertTrue(postgres._pg_is_older_ext_ver('10a', '10b')) + self.assertTrue(postgres._pg_is_older_ext_ver('1.2.3.4', '1.2.3.5')) + self.assertTrue(postgres._pg_is_older_ext_ver('10dev', '10next')) + self.assertFalse(postgres._pg_is_older_ext_ver('10next', '10dev')) diff --git a/tests/unit/modules/test_poudriere.py b/tests/unit/modules/test_poudriere.py index b07d7b3543..f123f35f07 100644 --- a/tests/unit/modules/test_poudriere.py +++ b/tests/unit/modules/test_poudriere.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_powerpath.py b/tests/unit/modules/test_powerpath.py index d9473a0c15..d16a020b6d 100644 --- a/tests/unit/modules/test_powerpath.py +++ b/tests/unit/modules/test_powerpath.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_ps.py b/tests/unit/modules/test_ps.py index 25179aa144..babc20ea91 100644 --- a/tests/unit/modules/test_ps.py +++ b/tests/unit/modules/test_ps.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place ` + :codeauthor: Mike Place ''' # Import Python libs diff --git a/tests/unit/modules/test_publish.py b/tests/unit/modules/test_publish.py index 736f112a7e..05fefa9130 100644 --- a/tests/unit/modules/test_publish.py +++ b/tests/unit/modules/test_publish.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_puppet.py b/tests/unit/modules/test_puppet.py index a4458472cc..57a0f4070e 100644 --- a/tests/unit/modules/test_puppet.py +++ b/tests/unit/modules/test_puppet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python libs @@ -140,8 +140,9 @@ class PuppetTestCase(TestCase, LoaderModuleMockMixin): mock_open(read_data="resources: 1")): self.assertDictEqual(puppet.summary(), {'resources': 1}) - with patch('salt.utils.files.fopen', mock_open()) as m_open: - m_open.side_effect = IOError(13, 'Permission denied:', '/file') + permission_error = IOError(os.errno.EACCES, 'Permission denied:', '/file') + with patch('salt.utils.files.fopen', + mock_open(read_data=permission_error)) as m_open: self.assertRaises(CommandExecutionError, puppet.summary) def test_plugin_sync(self): diff --git a/tests/unit/modules/test_pw_group.py b/tests/unit/modules/test_pw_group.py index 01ea47621e..5a67ed34d5 100644 --- a/tests/unit/modules/test_pw_group.py +++ b/tests/unit/modules/test_pw_group.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_pw_user.py b/tests/unit/modules/test_pw_user.py index b549aaac83..019e070f31 100644 --- a/tests/unit/modules/test_pw_user.py +++ b/tests/unit/modules/test_pw_user.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python libs diff --git a/tests/unit/modules/test_pyenv.py b/tests/unit/modules/test_pyenv.py index 7b9ff76ecf..38d99e7f39 100644 --- a/tests/unit/modules/test_pyenv.py +++ b/tests/unit/modules/test_pyenv.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_qemu_img.py b/tests/unit/modules/test_qemu_img.py index 8600f9a0dd..dd14c9701b 100644 --- a/tests/unit/modules/test_qemu_img.py +++ b/tests/unit/modules/test_qemu_img.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rupesh Tare ` + :codeauthor: Rupesh Tare ''' # Import Python Libs diff --git a/tests/unit/modules/test_qemu_nbd.py b/tests/unit/modules/test_qemu_nbd.py index fb39f786f4..7a39a3f58b 100644 --- a/tests/unit/modules/test_qemu_nbd.py +++ b/tests/unit/modules/test_qemu_nbd.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_rabbitmq.py b/tests/unit/modules/test_rabbitmq.py index 40116f592d..408f866c1d 100644 --- a/tests/unit/modules/test_rabbitmq.py +++ b/tests/unit/modules/test_rabbitmq.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs @@ -378,7 +378,7 @@ class RabbitmqTestCase(TestCase, LoaderModuleMockMixin): self.assertDictEqual(rabbitmq.list_queues_vhost('consumers'), {'saltstack': ['0'], 'celeryev.234-234': ['10']}) - # 'list_policies' function tests: 1 + # 'list_policies' function tests: 3 def test_list_policies(self): ''' @@ -386,7 +386,31 @@ class RabbitmqTestCase(TestCase, LoaderModuleMockMixin): and name based on the data returned from rabbitmqctl list_policies. ''' mock_run = MagicMock(return_value={'retcode': 0, 'stdout': 'saltstack', 'stderr': ''}) - with patch.dict(rabbitmq.__salt__, {'cmd.run_all': mock_run}): + mock_pkg = MagicMock(return_value='3.7') + with patch.dict(rabbitmq.__salt__, {'cmd.run_all': mock_run, 'pkg.version': mock_pkg}), \ + patch.dict(rabbitmq.__grains__, {'os_family': ''}): + self.assertDictEqual(rabbitmq.list_policies(), {}) + + def test_list_policies_freebsd(self): + ''' + Test if it return a dictionary of policies nested by vhost + and name based on the data returned from rabbitmqctl list_policies. + ''' + mock_run = MagicMock(return_value={'retcode': 0, 'stdout': 'saltstack', 'stderr': ''}) + mock_pkg = MagicMock(return_value='3.7') + with patch.dict(rabbitmq.__salt__, {'cmd.run_all': mock_run, 'pkg.version': mock_pkg}), \ + patch.dict(rabbitmq.__grains__, {'os_family': 'FreeBSD'}): + self.assertDictEqual(rabbitmq.list_policies(), {}) + + def test_list_policies_old_version(self): + ''' + Test if it return a dictionary of policies nested by vhost + and name based on the data returned from rabbitmqctl list_policies. + ''' + mock_run = MagicMock(return_value={'retcode': 0, 'stdout': 'saltstack', 'stderr': ''}) + mock_pkg = MagicMock(return_value='3.0') + with patch.dict(rabbitmq.__salt__, {'cmd.run_all': mock_run, 'pkg.version': mock_pkg}), \ + patch.dict(rabbitmq.__grains__, {'os_family': ''}): self.assertDictEqual(rabbitmq.list_policies(), {}) # 'set_policy' function tests: 1 @@ -420,7 +444,9 @@ class RabbitmqTestCase(TestCase, LoaderModuleMockMixin): based on rabbitmqctl list_policies. ''' mock_run = MagicMock(return_value={'retcode': 0, 'stdout': 'saltstack', 'stderr': ''}) - with patch.dict(rabbitmq.__salt__, {'cmd.run_all': mock_run}): + mock_pkg = MagicMock(return_value='3.0') + with patch.dict(rabbitmq.__salt__, {'cmd.run_all': mock_run, 'pkg.version': mock_pkg}), \ + patch.dict(rabbitmq.__grains__, {'os_family': ''}): self.assertFalse(rabbitmq.policy_exists('/', 'HA')) # 'list_available_plugins' function tests: 2 diff --git a/tests/unit/modules/test_raet_publish.py b/tests/unit/modules/test_raet_publish.py index 84e8e16b3a..9c1430880e 100644 --- a/tests/unit/modules/test_raet_publish.py +++ b/tests/unit/modules/test_raet_publish.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_random_org.py b/tests/unit/modules/test_random_org.py index 98afaf800e..1ea6d3b44c 100644 --- a/tests/unit/modules/test_random_org.py +++ b/tests/unit/modules/test_random_org.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_rbenv.py b/tests/unit/modules/test_rbenv.py index e1c502d9c9..32397f040b 100644 --- a/tests/unit/modules/test_rbenv.py +++ b/tests/unit/modules/test_rbenv.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_rdp.py b/tests/unit/modules/test_rdp.py index 714bff6d1d..40c68e711c 100644 --- a/tests/unit/modules/test_rdp.py +++ b/tests/unit/modules/test_rdp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_redismod.py b/tests/unit/modules/test_redismod.py index e8a028f1fe..5888fe972c 100644 --- a/tests/unit/modules/test_redismod.py +++ b/tests/unit/modules/test_redismod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_ret.py b/tests/unit/modules/test_ret.py index ccefd6d7f3..690333bcff 100644 --- a/tests/unit/modules/test_ret.py +++ b/tests/unit/modules/test_ret.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_rh_ip.py b/tests/unit/modules/test_rh_ip.py index 769e18e386..78694de51c 100644 --- a/tests/unit/modules/test_rh_ip.py +++ b/tests/unit/modules/test_rh_ip.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/modules/test_rh_service.py b/tests/unit/modules/test_rh_service.py index 31ae80fc4f..b9699ac8ff 100644 --- a/tests/unit/modules/test_rh_service.py +++ b/tests/unit/modules/test_rh_service.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_riak.py b/tests/unit/modules/test_riak.py index e993aab7e3..63f40ba1f5 100644 --- a/tests/unit/modules/test_riak.py +++ b/tests/unit/modules/test_riak.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_rpm.py b/tests/unit/modules/test_rpm.py index 6097b7d849..4b642665ca 100644 --- a/tests/unit/modules/test_rpm.py +++ b/tests/unit/modules/test_rpm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_rsync.py b/tests/unit/modules/test_rsync.py index 9624769bd4..7ff967dacf 100644 --- a/tests/unit/modules/test_rsync.py +++ b/tests/unit/modules/test_rsync.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_s3.py b/tests/unit/modules/test_s3.py index 6ae218663c..470bfbd92a 100644 --- a/tests/unit/modules/test_s3.py +++ b/tests/unit/modules/test_s3.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/modules/test_s6.py b/tests/unit/modules/test_s6.py index e1a39e49a8..f5174ffec3 100644 --- a/tests/unit/modules/test_s6.py +++ b/tests/unit/modules/test_s6.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Marek Skrobacki ` + :codeauthor: Marek Skrobacki ''' # Import Python Libs diff --git a/tests/unit/modules/test_saltcloudmod.py b/tests/unit/modules/test_saltcloudmod.py index 3ec8f86bed..3e480101fa 100644 --- a/tests/unit/modules/test_saltcloudmod.py +++ b/tests/unit/modules/test_saltcloudmod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python libs diff --git a/tests/unit/modules/test_schedule.py b/tests/unit/modules/test_schedule.py index ba6397aa50..f3e68f4b28 100644 --- a/tests/unit/modules/test_schedule.py +++ b/tests/unit/modules/test_schedule.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_scsi.py b/tests/unit/modules/test_scsi.py index 60ee15c804..0004ce4388 100644 --- a/tests/unit/modules/test_scsi.py +++ b/tests/unit/modules/test_scsi.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_sdb.py b/tests/unit/modules/test_sdb.py index 927a94f571..6c51f45ef3 100644 --- a/tests/unit/modules/test_sdb.py +++ b/tests/unit/modules/test_sdb.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_seed.py b/tests/unit/modules/test_seed.py index 935a4ff071..c9246412f8 100644 --- a/tests/unit/modules/test_seed.py +++ b/tests/unit/modules/test_seed.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/modules/test_sensors.py b/tests/unit/modules/test_sensors.py index 11a8fad864..5db8d53482 100644 --- a/tests/unit/modules/test_sensors.py +++ b/tests/unit/modules/test_sensors.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_serverdensity_device.py b/tests/unit/modules/test_serverdensity_device.py index ba2b5c09ee..9ab1e7849b 100644 --- a/tests/unit/modules/test_serverdensity_device.py +++ b/tests/unit/modules/test_serverdensity_device.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_service.py b/tests/unit/modules/test_service.py index 4d65223a53..a182eade58 100644 --- a/tests/unit/modules/test_service.py +++ b/tests/unit/modules/test_service.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals @@ -32,8 +32,7 @@ class ServiceTestCase(TestCase, LoaderModuleMockMixin): Test to start the specified service ''' with patch.object(os.path, 'join', return_value='A'): - with patch.dict(service.__salt__, {'service.run': - MagicMock(return_value=True)}): + with patch.object(service, 'run', MagicMock(return_value=True)): self.assertTrue(service.start('name')) def test_stop(self): @@ -41,8 +40,7 @@ class ServiceTestCase(TestCase, LoaderModuleMockMixin): Test to stop the specified service ''' with patch.object(os.path, 'join', return_value='A'): - with patch.dict(service.__salt__, {'service.run': - MagicMock(return_value=True)}): + with patch.object(service, 'run', MagicMock(return_value=True)): self.assertTrue(service.stop('name')) def test_restart(self): @@ -50,8 +48,7 @@ class ServiceTestCase(TestCase, LoaderModuleMockMixin): Test to restart the specified service ''' with patch.object(os.path, 'join', return_value='A'): - with patch.dict(service.__salt__, {'service.run': - MagicMock(return_value=True)}): + with patch.object(service, 'run', MagicMock(return_value=True)): self.assertTrue(service.restart('name')) def test_status(self): @@ -69,8 +66,7 @@ class ServiceTestCase(TestCase, LoaderModuleMockMixin): Test to restart the specified service ''' with patch.object(os.path, 'join', return_value='A'): - with patch.dict(service.__salt__, {'service.run': - MagicMock(return_value=True)}): + with patch.object(service, 'run', MagicMock(return_value=True)): self.assertTrue(service.reload_('name')) def test_run(self): @@ -78,8 +74,7 @@ class ServiceTestCase(TestCase, LoaderModuleMockMixin): Test to run the specified service ''' with patch.object(os.path, 'join', return_value='A'): - with patch.dict(service.__salt__, {'cmd.retcode': - MagicMock(return_value=False)}): + with patch.object(service, 'run', MagicMock(return_value=True)): self.assertTrue(service.run('name', 'action')) def test_available(self): diff --git a/tests/unit/modules/test_servicenow.py b/tests/unit/modules/test_servicenow.py index 0dba360cda..5853b26763 100644 --- a/tests/unit/modules/test_servicenow.py +++ b/tests/unit/modules/test_servicenow.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Anthony Shaw ` + :codeauthor: Anthony Shaw ''' # Import Python Libs diff --git a/tests/unit/modules/test_shadow.py b/tests/unit/modules/test_shadow.py index f23db3ea8e..edb255f593 100644 --- a/tests/unit/modules/test_shadow.py +++ b/tests/unit/modules/test_shadow.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Erik Johnson ` + :codeauthor: Erik Johnson ''' # Import Pytohn libs diff --git a/tests/unit/modules/test_smf.py b/tests/unit/modules/test_smf.py index eb69051f24..d8b88aee02 100644 --- a/tests/unit/modules/test_smf.py +++ b/tests/unit/modules/test_smf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_smtp.py b/tests/unit/modules/test_smtp.py index 0a60fc5c7d..473d9ed94c 100644 --- a/tests/unit/modules/test_smtp.py +++ b/tests/unit/modules/test_smtp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_snapper.py b/tests/unit/modules/test_snapper.py index 3d25d3d4c3..67fa8dca3a 100644 --- a/tests/unit/modules/test_snapper.py +++ b/tests/unit/modules/test_snapper.py @@ -358,13 +358,14 @@ class SnapperTestCase(TestCase, LoaderModuleMockMixin): patch('os.path.isfile', MagicMock(side_effect=[True, True, False, True])), \ patch('os.path.isdir', MagicMock(return_value=False)), \ patch('salt.modules.snapper.snapper.ListConfigs', MagicMock(return_value=DBUS_RET['ListConfigs'])): - fopen_effect = [ - mock_open(read_data=FILE_CONTENT["/tmp/foo"]['pre']).return_value, - mock_open(read_data=FILE_CONTENT["/tmp/foo"]['post']).return_value, - mock_open(read_data=FILE_CONTENT["/tmp/foo2"]['post']).return_value, - ] - with patch('salt.utils.files.fopen') as fopen_mock: - fopen_mock.side_effect = fopen_effect + contents = { + '*/tmp/foo': [ + FILE_CONTENT['/tmp/foo']['pre'], + FILE_CONTENT['/tmp/foo']['post'], + ], + '*/tmp/foo2': FILE_CONTENT['/tmp/foo2']['post'], + } + with patch('salt.utils.files.fopen', mock_open(read_data=contents)): module_ret = { "/tmp/foo": MODULE_RET['DIFF']["/tmp/foo"], "/tmp/foo2": MODULE_RET['DIFF']["/tmp/foo2"], @@ -387,12 +388,7 @@ class SnapperTestCase(TestCase, LoaderModuleMockMixin): "f18f971f1517449208a66589085ddd3723f7f6cefb56c141e3d97ae49e1d87fa", ]) }): - fopen_effect = [ - mock_open(read_data="dummy binary").return_value, - mock_open(read_data="dummy binary").return_value, - ] - with patch('salt.utils.files.fopen') as fopen_mock: - fopen_mock.side_effect = fopen_effect + with patch('salt.utils.files.fopen', mock_open(read_data='dummy binary')): module_ret = { "/tmp/foo3": MODULE_RET['DIFF']["/tmp/foo3"], } diff --git a/tests/unit/modules/test_solr.py b/tests/unit/modules/test_solr.py index 29d04796cf..0f43700a99 100644 --- a/tests/unit/modules/test_solr.py +++ b/tests/unit/modules/test_solr.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_sqlite3.py b/tests/unit/modules/test_sqlite3.py index 8d2f9cd514..3bd3118c64 100644 --- a/tests/unit/modules/test_sqlite3.py +++ b/tests/unit/modules/test_sqlite3.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_state.py b/tests/unit/modules/test_state.py index 8fb47b9a5d..3b3c159576 100644 --- a/tests/unit/modules/test_state.py +++ b/tests/unit/modules/test_state.py @@ -1,16 +1,22 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals +import copy import os +import shutil +import tempfile +import textwrap # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin +from tests.support.paths import TMP, TMP_CONF_DIR from tests.support.unit import TestCase, skipIf from tests.support.mock import ( + Mock, MagicMock, patch, mock_open, @@ -21,6 +27,9 @@ from tests.support.mock import ( # Import Salt Libs import salt.config import salt.loader +import salt.state +import salt.utils.files +import salt.utils.json import salt.utils.hashutils import salt.utils.odict import salt.utils.platform @@ -350,6 +359,7 @@ class StateTestCase(TestCase, LoaderModuleMockMixin): '__utils__': utils, '__salt__': { 'config.get': config.get, + 'config.option': MagicMock(return_value=''), } }, config: { @@ -804,28 +814,25 @@ class StateTestCase(TestCase, LoaderModuleMockMixin): "whitelist=sls1.sls", pillar="A") - mock = MagicMock(return_value=True) - with patch.dict(state.__salt__, - {'config.option': mock}): - mock = MagicMock(return_value="A") + mock = MagicMock(return_value="A") + with patch.object(state, '_filter_running', + mock): + mock = MagicMock(return_value=True) with patch.object(state, '_filter_running', mock): mock = MagicMock(return_value=True) - with patch.object(state, '_filter_running', + with patch.object(salt.payload, 'Serial', mock): - mock = MagicMock(return_value=True) - with patch.object(salt.payload, 'Serial', - mock): - with patch.object(os.path, - 'join', mock): - with patch.object( - state, - '_set' - '_retcode', - mock): - self.assertTrue(state. - highstate - (arg)) + with patch.object(os.path, + 'join', mock): + with patch.object( + state, + '_set' + '_retcode', + mock): + self.assertTrue(state. + highstate + (arg)) def test_clear_request(self): ''' @@ -945,7 +952,7 @@ class StateTestCase(TestCase, LoaderModuleMockMixin): mock): with patch( 'salt.utils.files.fopen', - mock_open()): + mock_open(b'')): self.assertTrue( state.sls(arg, None, @@ -966,17 +973,11 @@ class StateTestCase(TestCase, LoaderModuleMockMixin): MockState.HighState.flag = False mock = MagicMock(return_value=True) - with patch.dict(state.__salt__, - {'config.option': - mock}): - mock = MagicMock(return_value= - True) - with patch.object( - state, - '_filter_' - 'running', - mock): - self.sub_test_sls() + with patch.object(state, + '_filter_' + 'running', + mock): + self.sub_test_sls() def test_get_test_value(self): ''' @@ -1059,6 +1060,75 @@ class StateTestCase(TestCase, LoaderModuleMockMixin): None, True)) + def test_sls_sync(self): + ''' + Test test.sls with the sync argument + + We're only mocking the sync functions we expect to sync. If any other + sync functions are run then they will raise a KeyError, which we want + as it will tell us that we are syncing things we shouldn't. + ''' + mock_empty_list = MagicMock(return_value=[]) + with patch.object(state, 'running', mock_empty_list), \ + patch.object(state, '_disabled', mock_empty_list), \ + patch.object(state, '_get_pillar_errors', mock_empty_list): + + sync_mocks = { + 'saltutil.sync_modules': Mock(), + 'saltutil.sync_states': Mock(), + } + with patch.dict(state.__salt__, sync_mocks): + state.sls('foo', sync_mods='modules,states') + + for key in sync_mocks: + call_count = sync_mocks[key].call_count + expected = 1 + assert call_count == expected, \ + '{0} called {1} time(s) (expected: {2})'.format( + key, call_count, expected + ) + + # Test syncing all + sync_mocks = {'saltutil.sync_all': Mock()} + with patch.dict(state.__salt__, sync_mocks): + state.sls('foo', sync_mods='all') + + for key in sync_mocks: + call_count = sync_mocks[key].call_count + expected = 1 + assert call_count == expected, \ + '{0} called {1} time(s) (expected: {2})'.format( + key, call_count, expected + ) + + # sync_mods=True should be interpreted as sync_mods=all + sync_mocks = {'saltutil.sync_all': Mock()} + with patch.dict(state.__salt__, sync_mocks): + state.sls('foo', sync_mods=True) + + for key in sync_mocks: + call_count = sync_mocks[key].call_count + expected = 1 + assert call_count == expected, \ + '{0} called {1} time(s) (expected: {2})'.format( + key, call_count, expected + ) + + # Test syncing all when "all" is passed along with module types. + # This tests that we *only* run a sync_all and avoid unnecessary + # extra syncing. + sync_mocks = {'saltutil.sync_all': Mock()} + with patch.dict(state.__salt__, sync_mocks): + state.sls('foo', sync_mods='modules,all') + + for key in sync_mocks: + call_count = sync_mocks[key].call_count + expected = 1 + assert call_count == expected, \ + '{0} called {1} time(s) (expected: {2})'.format( + key, call_count, expected + ) + def test_pkg(self): ''' Test to execute a packaged state run @@ -1232,3 +1302,300 @@ class StateTestCase(TestCase, LoaderModuleMockMixin): ({'force': False}, errors), ({}, errors)]: assert res == state._get_pillar_errors(kwargs=opts, pillar=ext_pillar) + + +class TopFileMergingCase(TestCase, LoaderModuleMockMixin): + + def setup_loader_modules(self): + return { + state: { + '__opts__': salt.config.minion_config( + os.path.join(TMP_CONF_DIR, 'minion') + ), + '__salt__': { + 'saltutil.is_running': MagicMock(return_value=[]), + }, + }, + } + + def setUp(self): + self.cachedir = tempfile.mkdtemp(dir=TMP) + self.fileserver_root = tempfile.mkdtemp(dir=TMP) + self.addCleanup(shutil.rmtree, self.cachedir, ignore_errors=True) + self.addCleanup(shutil.rmtree, self.fileserver_root, ignore_errors=True) + + self.saltenvs = ['base', 'foo', 'bar', 'baz'] + self.saltenv_roots = { + x: os.path.join(self.fileserver_root, x) + for x in ('base', 'foo', 'bar', 'baz') + } + self.base_top_file = os.path.join(self.saltenv_roots['base'], 'top.sls') + self.dunder_opts = salt.utils.yaml.safe_load( + textwrap.dedent('''\ + file_client: local + default_top: base + + file_roots: + base: + - {base} + foo: + - {foo} + bar: + - {bar} + baz: + - {baz} + '''.format(**self.saltenv_roots) + ) + ) + self.dunder_opts['env_order'] = self.saltenvs + + # Write top files for all but the "baz" environment + for saltenv in self.saltenv_roots: + os.makedirs(self.saltenv_roots[saltenv]) + if saltenv == 'baz': + continue + top_file = os.path.join(self.saltenv_roots[saltenv], 'top.sls') + with salt.utils.files.fopen(top_file, 'w') as fp_: + # Add a section for every environment to each top file, with + # the SLS target prefixed with the current saltenv. + for env_name in self.saltenvs: + fp_.write(textwrap.dedent('''\ + {env_name}: + '*': + - {saltenv}_{env_name} + '''.format(env_name=env_name, saltenv=saltenv))) + + def show_top(self, **kwargs): + local_opts = copy.deepcopy(self.dunder_opts) + local_opts.update(kwargs) + with patch.dict(state.__opts__, local_opts), \ + patch.object(salt.state.State, '_gather_pillar', + MagicMock(return_value={})): + ret = state.show_top() + # Lazy way of converting ordered dicts to regular dicts. We don't + # care about dict ordering for these tests. + return salt.utils.json.loads(salt.utils.json.dumps(ret)) + + def use_limited_base_top_file(self): + ''' + Overwrites the base top file so that it only contains sections for its + own saltenv. + ''' + with salt.utils.files.fopen(self.base_top_file, 'w') as fp_: + fp_.write(textwrap.dedent('''\ + base: + '*': + - base_base + ''')) + + def test_merge_strategy_merge(self): + ''' + Base overrides everything + ''' + ret = self.show_top(top_file_merging_strategy='merge') + assert ret == { + 'base': ['base_base'], + 'foo': ['base_foo'], + 'bar': ['base_bar'], + 'baz': ['base_baz'], + }, ret + + def test_merge_strategy_merge_limited_base(self): + ''' + Test with a "base" top file containing only a "base" section. The "baz" + saltenv should not be in the return data because that env doesn't have + its own top file and there will be no "baz" section in the "base" env's + top file. + + Next, append a "baz" section to the rewritten top file and we should + get results for that saltenv in the return data. + ''' + self.use_limited_base_top_file() + ret = self.show_top(top_file_merging_strategy='merge') + assert ret == { + 'base': ['base_base'], + 'foo': ['foo_foo'], + 'bar': ['bar_bar'], + }, ret + + # Add a "baz" section + with salt.utils.files.fopen(self.base_top_file, 'a') as fp_: + fp_.write(textwrap.dedent('''\ + baz: + '*': + - base_baz + ''')) + + ret = self.show_top(top_file_merging_strategy='merge') + assert ret == { + 'base': ['base_base'], + 'foo': ['foo_foo'], + 'bar': ['bar_bar'], + 'baz': ['base_baz'], + }, ret + + def test_merge_strategy_merge_state_top_saltenv_base(self): + ''' + This tests with state_top_saltenv=base, which should pull states *only* + from the base saltenv. + ''' + ret = self.show_top( + top_file_merging_strategy='merge', + state_top_saltenv='base') + assert ret == { + 'base': ['base_base'], + 'foo': ['base_foo'], + 'bar': ['base_bar'], + 'baz': ['base_baz'], + }, ret + + def test_merge_strategy_merge_state_top_saltenv_foo(self): + ''' + This tests with state_top_saltenv=foo, which should pull states *only* + from the foo saltenv. Since that top file is only authoritative for + its own saltenv, *only* the foo saltenv's matches from the foo top file + should be in the return data. + ''' + ret = self.show_top( + top_file_merging_strategy='merge', + state_top_saltenv='foo') + assert ret == {'foo': ['foo_foo']}, ret + + def test_merge_strategy_merge_all(self): + ''' + Include everything in every top file + ''' + ret = self.show_top(top_file_merging_strategy='merge_all') + assert ret == { + 'base': ['base_base', 'foo_base', 'bar_base'], + 'foo': ['base_foo', 'foo_foo', 'bar_foo'], + 'bar': ['base_bar', 'foo_bar', 'bar_bar'], + 'baz': ['base_baz', 'foo_baz', 'bar_baz'], + }, ret + + def test_merge_strategy_merge_all_alternate_env_order(self): + ''' + Use an alternate env_order. This should change the order in which the + SLS targets appear in the result. + ''' + ret = self.show_top( + top_file_merging_strategy='merge_all', + env_order=['bar', 'foo', 'base']) + assert ret == { + 'base': ['bar_base', 'foo_base', 'base_base'], + 'foo': ['bar_foo', 'foo_foo', 'base_foo'], + 'bar': ['bar_bar', 'foo_bar', 'base_bar'], + 'baz': ['bar_baz', 'foo_baz', 'base_baz'], + }, ret + + def test_merge_strategy_merge_all_state_top_saltenv_base(self): + ''' + This tests with state_top_saltenv=base, which should pull states *only* + from the base saltenv. Since we are using the "merge_all" strategy, all + the states from that top file should be in the return data. + ''' + ret = self.show_top( + top_file_merging_strategy='merge_all', + state_top_saltenv='base') + assert ret == { + 'base': ['base_base'], + 'foo': ['base_foo'], + 'bar': ['base_bar'], + 'baz': ['base_baz'], + }, ret + + def test_merge_strategy_merge_all_state_top_saltenv_foo(self): + ''' + This tests with state_top_saltenv=foo, which should pull states *only* + from the foo saltenv. Since we are using the "merge_all" strategy, all + the states from that top file should be in the return data. + ''' + ret = self.show_top( + top_file_merging_strategy='merge_all', + state_top_saltenv='foo') + assert ret == { + 'base': ['foo_base'], + 'foo': ['foo_foo'], + 'bar': ['foo_bar'], + 'baz': ['foo_baz'], + }, ret + + def test_merge_strategy_same(self): + ''' + Each env should get its SLS targets from its own top file, with the + "baz" env pulling from "base" since default_top=base and there is no + top file in the "baz" saltenv. + ''' + ret = self.show_top(top_file_merging_strategy='same') + assert ret == { + 'base': ['base_base'], + 'foo': ['foo_foo'], + 'bar': ['bar_bar'], + 'baz': ['base_baz'], + }, ret + + def test_merge_strategy_same_limited_base(self): + ''' + Each env should get its SLS targets from its own top file, with the + "baz" env pulling from "base" since default_top=base and there is no + top file in the "baz" saltenv. + ''' + self.use_limited_base_top_file() + ret = self.show_top(top_file_merging_strategy='same') + assert ret == { + 'base': ['base_base'], + 'foo': ['foo_foo'], + 'bar': ['bar_bar'], + }, ret + + def test_merge_strategy_same_default_top_foo(self): + ''' + Each env should get its SLS targets from its own top file, with the + "baz" env pulling from "foo" since default_top=foo and there is no top + file in the "baz" saltenv. + ''' + ret = self.show_top( + top_file_merging_strategy='same', + default_top='foo') + assert ret == { + 'base': ['base_base'], + 'foo': ['foo_foo'], + 'bar': ['bar_bar'], + 'baz': ['foo_baz'], + }, ret + + def test_merge_strategy_same_state_top_saltenv_base(self): + ''' + Test the state_top_saltenv parameter to load states exclusively from + the base saltenv, with the "same" merging strategy. This should + result in just the base environment's states from the base top file + being in the merged result. + ''' + ret = self.show_top( + top_file_merging_strategy='same', + state_top_saltenv='base') + assert ret == {'base': ['base_base']}, ret + + def test_merge_strategy_same_state_top_saltenv_foo(self): + ''' + Test the state_top_saltenv parameter to load states exclusively from + the foo saltenv, with the "same" merging strategy. This should + result in just the foo environment's states from the foo top file + being in the merged result. + ''' + ret = self.show_top( + top_file_merging_strategy='same', + state_top_saltenv='foo') + assert ret == {'foo': ['foo_foo']}, ret + + def test_merge_strategy_same_state_top_saltenv_baz(self): + ''' + Test the state_top_saltenv parameter to load states exclusively from + the baz saltenv, with the "same" merging strategy. This should + result in an empty dictionary since there is no top file in that + environment. + ''' + ret = self.show_top( + top_file_merging_strategy='same', + state_top_saltenv='baz') + assert ret == {}, ret diff --git a/tests/unit/modules/test_supervisord.py b/tests/unit/modules/test_supervisord.py index 9145f664e4..4e61307ee9 100644 --- a/tests/unit/modules/test_supervisord.py +++ b/tests/unit/modules/test_supervisord.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_svn.py b/tests/unit/modules/test_svn.py index 3dfda38277..5f94507b85 100644 --- a/tests/unit/modules/test_svn.py +++ b/tests/unit/modules/test_svn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/modules/test_swift.py b/tests/unit/modules/test_swift.py index b2de63d996..d8e78e061a 100644 --- a/tests/unit/modules/test_swift.py +++ b/tests/unit/modules/test_swift.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_sysbench.py b/tests/unit/modules/test_sysbench.py index d11d2dd48b..d0a82636ae 100644 --- a/tests/unit/modules/test_sysbench.py +++ b/tests/unit/modules/test_sysbench.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_sysmod.py b/tests/unit/modules/test_sysmod.py index 688e9e7287..4fd86bcef4 100644 --- a/tests/unit/modules/test_sysmod.py +++ b/tests/unit/modules/test_sysmod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' -:codeauthor: :email:`Jayesh Kariya ` +:codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_system.py b/tests/unit/modules/test_system.py index 92a5940e9a..af32b3cae8 100644 --- a/tests/unit/modules/test_system.py +++ b/tests/unit/modules/test_system.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/modules/test_systemd.py b/tests/unit/modules/test_systemd.py index 12a7e7fa0d..75c727bd49 100644 --- a/tests/unit/modules/test_systemd.py +++ b/tests/unit/modules/test_systemd.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python libs diff --git a/tests/unit/modules/test_timezone.py b/tests/unit/modules/test_timezone.py index e2560ad7ff..37d19ff108 100644 --- a/tests/unit/modules/test_timezone.py +++ b/tests/unit/modules/test_timezone.py @@ -24,7 +24,7 @@ import salt.utils.platform import salt.utils.stringutils GET_ZONE_FILE = 'salt.modules.timezone._get_zone_file' -GET_ETC_LOCALTIME_PATH = 'salt.modules.timezone._get_etc_localtime_path' +GET_LOCALTIME_PATH = 'salt.modules.timezone._get_localtime_path' @skipIf(NO_MOCK, NO_MOCK_REASON) @@ -49,7 +49,7 @@ class TimezoneTestCase(TestCase, LoaderModuleMockMixin): zone_path = self.create_tempfile_with_contents('a') with patch(GET_ZONE_FILE, lambda p: zone_path.name): - with patch(GET_ETC_LOCALTIME_PATH, lambda: etc_localtime.name): + with patch(GET_LOCALTIME_PATH, lambda: etc_localtime.name): self.assertTrue(timezone.zone_compare('foo')) @@ -57,7 +57,7 @@ class TimezoneTestCase(TestCase, LoaderModuleMockMixin): etc_localtime = self.create_tempfile_with_contents('a') with patch(GET_ZONE_FILE, lambda p: '/foopath/nonexistent'): - with patch(GET_ETC_LOCALTIME_PATH, lambda: etc_localtime.name): + with patch(GET_LOCALTIME_PATH, lambda: etc_localtime.name): self.assertRaises(SaltInvocationError, timezone.zone_compare, 'foo') @@ -66,13 +66,13 @@ class TimezoneTestCase(TestCase, LoaderModuleMockMixin): zone_path = self.create_tempfile_with_contents('b') with patch(GET_ZONE_FILE, lambda p: zone_path.name): - with patch(GET_ETC_LOCALTIME_PATH, lambda: etc_localtime.name): + with patch(GET_LOCALTIME_PATH, lambda: etc_localtime.name): self.assertFalse(timezone.zone_compare('foo')) def test_missing_localtime(self): with patch(GET_ZONE_FILE, lambda p: '/nonexisting'): - with patch(GET_ETC_LOCALTIME_PATH, lambda: '/also-missing'): + with patch(GET_LOCALTIME_PATH, lambda: '/also-missing'): self.assertRaises(CommandExecutionError, timezone.zone_compare, 'foo') def create_tempfile_with_contents(self, contents): @@ -203,13 +203,11 @@ class TimezoneModuleTestCase(TestCase, LoaderModuleMockMixin): :return: ''' with patch.dict(timezone.__grains__, {'os_family': ['Gentoo']}): - _fopen = mock_open() - with patch('salt.utils.files.fopen', _fopen): + with patch('salt.utils.files.fopen', mock_open()) as m_open: assert timezone.set_zone(self.TEST_TZ) - name, args, kwargs = _fopen.mock_calls[0] - assert args == ('/etc/timezone', 'w') - name, args, kwargs = _fopen.return_value.__enter__.return_value.write.mock_calls[0] - assert args == ('UTC',) + fh_ = m_open.filehandles['/etc/timezone'][0] + assert fh_.call.args == ('/etc/timezone', 'w'), fh_.call.args + assert fh_.write_calls == ['UTC', '\n'], fh_.write_calls @skipIf(salt.utils.platform.is_windows(), 'os.symlink not available in Windows') @patch('salt.utils.path.which', MagicMock(return_value=False)) @@ -222,13 +220,11 @@ class TimezoneModuleTestCase(TestCase, LoaderModuleMockMixin): :return: ''' with patch.dict(timezone.__grains__, {'os_family': ['Debian']}): - _fopen = mock_open() - with patch('salt.utils.files.fopen', _fopen): + with patch('salt.utils.files.fopen', mock_open()) as m_open: assert timezone.set_zone(self.TEST_TZ) - name, args, kwargs = _fopen.mock_calls[0] - assert args == ('/etc/timezone', 'w') - name, args, kwargs = _fopen.return_value.__enter__.return_value.write.mock_calls[0] - assert args == ('UTC',) + fh_ = m_open.filehandles['/etc/timezone'][0] + assert fh_.call.args == ('/etc/timezone', 'w'), fh_.call.args + assert fh_.write_calls == ['UTC', '\n'], fh_.write_calls @skipIf(salt.utils.platform.is_windows(), 'os.symlink not available in Windows') @patch('salt.utils.path.which', MagicMock(return_value=True)) @@ -325,6 +321,21 @@ class TimezoneModuleTestCase(TestCase, LoaderModuleMockMixin): with patch.dict(timezone.__grains__, {'os_family': ['AIX']}): assert timezone.get_hwclock() == hwclock + @skipIf(salt.utils.platform.is_windows(), 'os.symlink not available in Windows') + @patch('salt.utils.path.which', MagicMock(return_value=True)) + def test_set_hwclock_timedatectl(self): + ''' + Test set hwclock with timedatectl + :return: + ''' + timezone.set_hwclock('UTC') + name, args, kwargs = timezone.__salt__['cmd.retcode'].mock_calls[0] + assert args == (['timedatectl', 'set-local-rtc', 'false'],) + + timezone.set_hwclock('localtime') + name, args, kwargs = timezone.__salt__['cmd.retcode'].mock_calls[1] + assert args == (['timedatectl', 'set-local-rtc', 'true'],) + @skipIf(salt.utils.platform.is_windows(), 'os.symlink not available in Windows') @patch('salt.utils.path.which', MagicMock(return_value=False)) @patch('os.path.exists', MagicMock(return_value=True)) diff --git a/tests/unit/modules/test_tls.py b/tests/unit/modules/test_tls.py index 2c95379923..1765b99402 100644 --- a/tests/unit/modules/test_tls.py +++ b/tests/unit/modules/test_tls.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Joe Julian ` + :codeauthor: Joe Julian ''' # Import the future from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/modules/test_twilio_notify.py b/tests/unit/modules/test_twilio_notify.py index 20701e2bc5..c8c2f9fafc 100644 --- a/tests/unit/modules/test_twilio_notify.py +++ b/tests/unit/modules/test_twilio_notify.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_udev.py b/tests/unit/modules/test_udev.py index 242b0d0ac5..45b17f2c34 100644 --- a/tests/unit/modules/test_udev.py +++ b/tests/unit/modules/test_udev.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pablo Suárez Hdez. ` + :codeauthor: Pablo Suárez Hdez. ''' # Import Python Libs diff --git a/tests/unit/modules/test_useradd.py b/tests/unit/modules/test_useradd.py index e79c78c663..18da8d8ce8 100644 --- a/tests/unit/modules/test_useradd.py +++ b/tests/unit/modules/test_useradd.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs diff --git a/tests/unit/modules/test_varnish.py b/tests/unit/modules/test_varnish.py index 1ec5c28704..6ce6c8b2df 100644 --- a/tests/unit/modules/test_varnish.py +++ b/tests/unit/modules/test_varnish.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/modules/test_virt.py b/tests/unit/modules/test_virt.py index a479ccb82e..e01fd873c3 100644 --- a/tests/unit/modules/test_virt.py +++ b/tests/unit/modules/test_virt.py @@ -1,9 +1,14 @@ # -*- coding: utf-8 -*- +''' +virt execution module unit tests +''' + +# pylint: disable=3rd-party-module-not-gated # Import python libs from __future__ import absolute_import, print_function, unicode_literals import re -import os +import datetime # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin @@ -16,46 +21,93 @@ import salt.modules.virt as virt import salt.modules.config as config from salt._compat import ElementTree as ET import salt.config +from salt.exceptions import CommandExecutionError # Import third party libs from salt.ext import six -class LibvirtMock(MagicMock): +# pylint: disable=invalid-name,protected-access,attribute-defined-outside-init,too-many-public-methods,unused-argument + + +class LibvirtMock(MagicMock): # pylint: disable=too-many-ancestors + ''' + Libvirt library mock + ''' class libvirtError(Exception): - pass + ''' + libvirtError mock + ''' @skipIf(NO_MOCK, NO_MOCK_REASON) class VirtTestCase(TestCase, LoaderModuleMockMixin): + ''' + Test cases for salt.module.virt + ''' def setup_loader_modules(self): self.mock_libvirt = LibvirtMock() self.mock_conn = MagicMock() self.mock_libvirt.openAuth.return_value = self.mock_conn + self.mock_popen = MagicMock() self.addCleanup(delattr, self, 'mock_libvirt') self.addCleanup(delattr, self, 'mock_conn') + self.addCleanup(delattr, self, 'mock_popen') + mock_subprocess = MagicMock() + mock_subprocess.Popen.return_value = self.mock_popen # pylint: disable=no-member loader_globals = { '__salt__': { 'config.get': config.get, 'config.option': config.option, }, - 'libvirt': self.mock_libvirt + 'libvirt': self.mock_libvirt, + 'subprocess': mock_subprocess } return {virt: loader_globals, config: loader_globals} def set_mock_vm(self, name, xml): - self.mock_conn.listDefinedDomains.return_value = [name] + ''' + Define VM to use in tests + ''' + self.mock_conn.listDefinedDomains.return_value = [name] # pylint: disable=no-member mock_domain = MagicMock() - self.mock_conn.lookupByName.return_value = mock_domain - mock_domain.XMLDesc.return_value = xml + self.mock_conn.lookupByName.return_value = mock_domain # pylint: disable=no-member + mock_domain.XMLDesc.return_value = xml # pylint: disable=no-member # Return state as shutdown - mock_domain.info.return_value = [4, 0, 0, 0] + mock_domain.info.return_value = [4, 0, 0, 0] # pylint: disable=no-member + + def test_disk_profile_merge(self): + ''' + Test virt._disk_profile() when merging with user-defined disks + ''' + userdisks = [{'name': 'data', 'size': 16384, 'format': 'raw'}] + + disks = virt._disk_profile('default', 'kvm', userdisks, 'myvm', image='/path/to/image') + self.assertEqual( + [{'name': 'system', + 'size': 8192, + 'format': 'qcow2', + 'model': 'virtio', + 'filename': 'myvm_system.qcow2', + 'image': '/path/to/image', + 'source_file': '/srv/salt-images/myvm_system.qcow2'}, + {'name': 'data', + 'size': 16384, + 'format': 'raw', + 'model': 'virtio', + 'filename': 'myvm_data.raw', + 'source_file': '/srv/salt-images/myvm_data.raw'}], + disks + ) def test_boot_default_dev(self): - diskp = virt._disk_profile('default', 'kvm') + ''' + Test virt._gen_xml() default boot device + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') nicp = virt._nic_profile('default', 'kvm') xml_data = virt._gen_xml( 'hello', @@ -69,7 +121,10 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(root.find('os/boot').attrib['dev'], 'hd') def test_boot_custom_dev(self): - diskp = virt._disk_profile('default', 'kvm') + ''' + Test virt._gen_xml() custom boot device + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') nicp = virt._nic_profile('default', 'kvm') xml_data = virt._gen_xml( 'hello', @@ -84,7 +139,10 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(root.find('os/boot').attrib['dev'], 'cdrom') def test_boot_multiple_devs(self): - diskp = virt._disk_profile('default', 'kvm') + ''' + Test virt._gen_xml() multiple boot devices + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') nicp = virt._nic_profile('default', 'kvm') xml_data = virt._gen_xml( 'hello', @@ -100,7 +158,10 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertTrue(len(devs) == 2) def test_gen_xml_for_serial_console(self): - diskp = virt._disk_profile('default', 'kvm') + ''' + Test virt._gen_xml() serial console + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') nicp = virt._nic_profile('default', 'kvm') xml_data = virt._gen_xml( 'hello', @@ -117,7 +178,10 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(root.find('devices/console').attrib['type'], 'pty') def test_gen_xml_for_telnet_console(self): - diskp = virt._disk_profile('default', 'kvm') + ''' + Test virt._gen_xml() telnet console + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') nicp = virt._nic_profile('default', 'kvm') xml_data = virt._gen_xml( 'hello', @@ -136,7 +200,10 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(root.find('devices/console/source').attrib['service'], '22223') def test_gen_xml_for_telnet_console_unspecified_port(self): - diskp = virt._disk_profile('default', 'kvm') + ''' + Test virt._gen_xml() telnet console without any specified port + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') nicp = virt._nic_profile('default', 'kvm') xml_data = virt._gen_xml( 'hello', @@ -154,7 +221,10 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertIsInstance(int(root.find('devices/console/source').attrib['service']), int) def test_gen_xml_for_serial_no_console(self): - diskp = virt._disk_profile('default', 'kvm') + ''' + Test virt._gen_xml() with no serial console + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') nicp = virt._nic_profile('default', 'kvm') xml_data = virt._gen_xml( 'hello', @@ -171,7 +241,10 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(root.find('devices/console'), None) def test_gen_xml_for_telnet_no_console(self): - diskp = virt._disk_profile('default', 'kvm') + ''' + Test virt._gen_xml() with no telnet console + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') nicp = virt._nic_profile('default', 'kvm') xml_data = virt._gen_xml( 'hello', @@ -187,32 +260,131 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(root.find('devices/serial').attrib['type'], 'tcp') self.assertEqual(root.find('devices/console'), None) + def test_gen_xml_nographics_default(self): + ''' + Test virt._gen_xml() with default no graphics device + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') + nicp = virt._nic_profile('default', 'kvm') + xml_data = virt._gen_xml( + 'hello', + 1, + 512, + diskp, + nicp, + 'kvm' + ) + root = ET.fromstring(xml_data) + self.assertIsNone(root.find('devices/graphics')) + + def test_gen_xml_vnc_default(self): + ''' + Test virt._gen_xml() with default vnc graphics device + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') + nicp = virt._nic_profile('default', 'kvm') + xml_data = virt._gen_xml( + 'hello', + 1, + 512, + diskp, + nicp, + 'kvm', + graphics={'type': 'vnc', 'port': 1234, 'tlsPort': 5678, + 'listen': {'type': 'address', 'address': 'myhost'}}, + ) + root = ET.fromstring(xml_data) + self.assertEqual(root.find('devices/graphics').attrib['type'], 'vnc') + self.assertEqual(root.find('devices/graphics').attrib['autoport'], 'no') + self.assertEqual(root.find('devices/graphics').attrib['port'], '1234') + self.assertFalse('tlsPort' in root.find('devices/graphics').attrib) + self.assertEqual(root.find('devices/graphics').attrib['listen'], 'myhost') + self.assertEqual(root.find('devices/graphics/listen').attrib['type'], 'address') + self.assertEqual(root.find('devices/graphics/listen').attrib['address'], 'myhost') + + def test_gen_xml_spice_default(self): + ''' + Test virt._gen_xml() with default spice graphics device + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') + nicp = virt._nic_profile('default', 'kvm') + xml_data = virt._gen_xml( + 'hello', + 1, + 512, + diskp, + nicp, + 'kvm', + graphics={'type': 'spice'}, + ) + root = ET.fromstring(xml_data) + self.assertEqual(root.find('devices/graphics').attrib['type'], 'spice') + self.assertEqual(root.find('devices/graphics').attrib['autoport'], 'yes') + self.assertEqual(root.find('devices/graphics').attrib['listen'], '0.0.0.0') + self.assertEqual(root.find('devices/graphics/listen').attrib['type'], 'address') + self.assertEqual(root.find('devices/graphics/listen').attrib['address'], '0.0.0.0') + + def test_gen_xml_spice(self): + ''' + Test virt._gen_xml() with spice graphics device + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') + nicp = virt._nic_profile('default', 'kvm') + xml_data = virt._gen_xml( + 'hello', + 1, + 512, + diskp, + nicp, + 'kvm', + graphics={'type': 'spice', 'port': 1234, 'tls_port': 5678, 'listen': {'type': 'none'}}, + ) + root = ET.fromstring(xml_data) + self.assertEqual(root.find('devices/graphics').attrib['type'], 'spice') + self.assertEqual(root.find('devices/graphics').attrib['autoport'], 'no') + self.assertEqual(root.find('devices/graphics').attrib['port'], '1234') + self.assertEqual(root.find('devices/graphics').attrib['tlsPort'], '5678') + self.assertFalse('listen' in root.find('devices/graphics').attrib) + self.assertEqual(root.find('devices/graphics/listen').attrib['type'], 'none') + self.assertFalse('address' in root.find('devices/graphics/listen').attrib) + def test_default_disk_profile_hypervisor_esxi(self): + ''' + Test virt._disk_profile() default ESXi profile + ''' mock = MagicMock(return_value={}) - with patch.dict(virt.__salt__, {'config.get': mock}): - ret = virt._disk_profile('nonexistent', 'esxi') + with patch.dict(virt.__salt__, {'config.get': mock}): # pylint: disable=no-member + ret = virt._disk_profile('nonexistent', 'vmware') self.assertTrue(len(ret) == 1) - self.assertIn('system', ret[0]) - system = ret[0]['system'] + found = [disk for disk in ret if disk['name'] == 'system'] + self.assertTrue(bool(found)) + system = found[0] self.assertEqual(system['format'], 'vmdk') self.assertEqual(system['model'], 'scsi') self.assertTrue(int(system['size']) >= 1) def test_default_disk_profile_hypervisor_kvm(self): + ''' + Test virt._disk_profile() default KVM profile + ''' mock = MagicMock(return_value={}) - with patch.dict(virt.__salt__, {'config.get': mock}): + with patch.dict(virt.__salt__, {'config.get': mock}): # pylint: disable=no-member ret = virt._disk_profile('nonexistent', 'kvm') self.assertTrue(len(ret) == 1) - self.assertIn('system', ret[0]) - system = ret[0]['system'] + found = [disk for disk in ret if disk['name'] == 'system'] + self.assertTrue(bool(found)) + system = found[0] self.assertEqual(system['format'], 'qcow2') self.assertEqual(system['model'], 'virtio') self.assertTrue(int(system['size']) >= 1) def test_default_nic_profile_hypervisor_esxi(self): + ''' + Test virt._nic_profile() default ESXi profile + ''' mock = MagicMock(return_value={}) - with patch.dict(virt.__salt__, {'config.get': mock}): - ret = virt._nic_profile('nonexistent', 'esxi') + with patch.dict(virt.__salt__, {'config.get': mock}): # pylint: disable=no-member + ret = virt._nic_profile('nonexistent', 'vmware') self.assertTrue(len(ret) == 1) eth0 = ret[0] self.assertEqual(eth0['name'], 'eth0') @@ -221,8 +393,11 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(eth0['model'], 'e1000') def test_default_nic_profile_hypervisor_kvm(self): + ''' + Test virt._nic_profile() default KVM profile + ''' mock = MagicMock(return_value={}) - with patch.dict(virt.__salt__, {'config.get': mock}): + with patch.dict(virt.__salt__, {'config.get': mock}): # pylint: disable=no-member ret = virt._nic_profile('nonexistent', 'kvm') self.assertTrue(len(ret) == 1) eth0 = ret[0] @@ -231,24 +406,22 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(eth0['source'], 'br0') self.assertEqual(eth0['model'], 'virtio') - def test_gen_vol_xml_for_kvm(self): - xml_data = virt._gen_vol_xml('vmname', 'system', 8192, 'kvm') + def test_gen_vol_xml(self): + ''' + Test virt._get_vol_xml() + ''' + xml_data = virt._gen_vol_xml('vmname', 'system', 'qcow2', 8192, '/path/to/image/') root = ET.fromstring(xml_data) self.assertEqual(root.find('name').text, 'vmname/system.qcow2') self.assertEqual(root.find('key').text, 'vmname/system') self.assertEqual(root.find('capacity').attrib['unit'], 'KiB') self.assertEqual(root.find('capacity').text, six.text_type(8192 * 1024)) - def test_gen_vol_xml_for_esxi(self): - xml_data = virt._gen_vol_xml('vmname', 'system', 8192, 'esxi') - root = ET.fromstring(xml_data) - self.assertEqual(root.find('name').text, 'vmname/system.vmdk') - self.assertEqual(root.find('key').text, 'vmname/system') - self.assertEqual(root.find('capacity').attrib['unit'], 'KiB') - self.assertEqual(root.find('capacity').text, six.text_type(8192 * 1024)) - def test_gen_xml_for_kvm_default_profile(self): - diskp = virt._disk_profile('default', 'kvm') + ''' + Test virt._gen_xml(), KVM default profile case + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') nicp = virt._nic_profile('default', 'kvm') xml_data = virt._gen_xml( 'hello', @@ -269,7 +442,7 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): disk = disks[0] root_dir = salt.config.DEFAULT_MINION_OPTS.get('root_dir') self.assertTrue(disk.find('source').attrib['file'].startswith(root_dir)) - self.assertTrue(os.path.join('hello', 'system') in disk.find('source').attrib['file']) + self.assertTrue('hello_system' in disk.find('source').attrib['file']) self.assertEqual(disk.find('target').attrib['dev'], 'vda') self.assertEqual(disk.find('target').attrib['bus'], 'virtio') self.assertEqual(disk.find('driver').attrib['name'], 'qemu') @@ -287,15 +460,18 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): re.match('^([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$', mac, re.I)) def test_gen_xml_for_esxi_default_profile(self): - diskp = virt._disk_profile('default', 'esxi') - nicp = virt._nic_profile('default', 'esxi') + ''' + Test virt._gen_xml(), ESXi/vmware default profile case + ''' + diskp = virt._disk_profile('default', 'vmware', [], 'hello') + nicp = virt._nic_profile('default', 'vmware') xml_data = virt._gen_xml( 'hello', 1, 512, diskp, nicp, - 'esxi', + 'vmware', ) root = ET.fromstring(xml_data) self.assertEqual(root.attrib['type'], 'vmware') @@ -307,7 +483,7 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(len(disks), 1) disk = disks[0] self.assertTrue('[0]' in disk.find('source').attrib['file']) - self.assertTrue(os.path.join('hello', 'system') in disk.find('source').attrib['file']) + self.assertTrue('hello_system' in disk.find('source').attrib['file']) self.assertEqual(disk.find('target').attrib['dev'], 'sda') self.assertEqual(disk.find('target').attrib['bus'], 'scsi') self.assertEqual(disk.find('address').attrib['unit'], '0') @@ -324,43 +500,32 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): re.match('^([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$', mac, re.I)) def test_gen_xml_for_esxi_custom_profile(self): - diskp_yaml = ''' -- first: - size: 8192 - format: vmdk - model: scsi - pool: datastore1 -- second: - size: 4096 - format: vmdk # FIX remove line, currently test fails - model: scsi # FIX remove line, currently test fails - pool: datastore2 -''' - nicp_yaml = ''' -- type: bridge - name: eth1 - source: ONENET - model: e1000 - mac: '00:00:00:00:00:00' -- name: eth2 - type: bridge - source: TWONET - model: e1000 - mac: '00:00:00:00:00:00' -''' - with patch('salt.modules.virt._nic_profile') as nic_profile, \ - patch('salt.modules.virt._disk_profile') as disk_profile: - disk_profile.return_value = salt.utils.yaml.safe_load(diskp_yaml) - nic_profile.return_value = salt.utils.yaml.safe_load(nicp_yaml) - diskp = virt._disk_profile('noeffect', 'esxi') - nicp = virt._nic_profile('noeffect', 'esxi') + ''' + Test virt._gen_xml(), ESXi/vmware custom profile case + ''' + disks = { + 'noeffect': [ + {'first': {'size': 8192, 'pool': 'datastore1'}}, + {'second': {'size': 4096, 'pool': 'datastore2'}} + ] + } + nics = { + 'noeffect': [ + {'name': 'eth1', 'source': 'ONENET'}, + {'name': 'eth2', 'source': 'TWONET'} + ] + } + with patch.dict(virt.__salt__, # pylint: disable=no-member + {'config.get': MagicMock(side_effect=[disks, nics])}): + diskp = virt._disk_profile('noeffect', 'vmware', [], 'hello') + nicp = virt._nic_profile('noeffect', 'vmware') xml_data = virt._gen_xml( 'hello', 1, 512, diskp, nicp, - 'esxi', + 'vmware', ) root = ET.fromstring(xml_data) self.assertEqual(root.attrib['type'], 'vmware') @@ -371,35 +536,24 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertTrue(len(root.findall('.//interface')) == 2) def test_gen_xml_for_kvm_custom_profile(self): - diskp_yaml = ''' -- first: - size: 8192 - format: qcow2 - model: virtio - pool: /var/lib/images -- second: - size: 4096 - format: qcow2 # FIX remove line, currently test fails - model: virtio # FIX remove line, currently test fails - pool: /var/lib/images -''' - nicp_yaml = ''' -- type: bridge - name: eth1 - source: b2 - model: virtio - mac: '00:00:00:00:00:00' -- name: eth2 - type: bridge - source: b2 - model: virtio - mac: '00:00:00:00:00:00' -''' - with patch('salt.modules.virt._nic_profile') as nic_profile, \ - patch('salt.modules.virt._disk_profile') as disk_profile: - disk_profile.return_value = salt.utils.yaml.safe_load(diskp_yaml) - nic_profile.return_value = salt.utils.yaml.safe_load(nicp_yaml) - diskp = virt._disk_profile('noeffect', 'kvm') + ''' + Test virt._gen_xml(), KVM custom profile case + ''' + disks = { + 'noeffect': [ + {'first': {'size': 8192, 'pool': '/var/lib/images'}}, + {'second': {'size': 4096, 'pool': '/var/lib/images'}} + ] + } + nics = { + 'noeffect': [ + {'name': 'eth1', 'source': 'b2'}, + {'name': 'eth2', 'source': 'b2'} + ] + } + with patch.dict(virt.__salt__, {'config.get': MagicMock(side_effect=[ # pylint: disable=no-member + disks, nics])}): + diskp = virt._disk_profile('noeffect', 'kvm', [], 'hello') nicp = virt._nic_profile('noeffect', 'kvm') xml_data = virt._gen_xml( 'hello', @@ -417,16 +571,68 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertTrue(len(root.findall('.//disk')) == 2) self.assertTrue(len(root.findall('.//interface')) == 2) + @patch('salt.modules.virt.pool_info', return_value={'target_path': '/pools/default'}) + def test_disk_profile_kvm_disk_pool(self, mock_poolinfo): + ''' + Test virt._gen_xml(), KVM case with pools defined. + ''' + disks = { + 'noeffect': [ + {'first': {'size': 8192, 'pool': 'default'}}, + {'second': {'size': 4096}} + ] + } + with patch.dict(virt.__salt__, {'config.get': MagicMock(side_effect=[ # pylint: disable=no-member + disks, "/default/path/"])}): + diskp = virt._disk_profile('noeffect', 'kvm', [], 'hello') + + self.assertEqual(len(diskp), 2) + self.assertTrue(diskp[0]['source_file'].startswith('/pools/default/')) + self.assertTrue(diskp[1]['source_file'].startswith('/default/path/')) + + @patch('salt.modules.virt.pool_info', return_value={}) + def test_disk_profile_kvm_disk_pool_notfound(self, mock_poolinfo): + ''' + Test virt._gen_xml(), KVM case with pools defined. + ''' + disks = { + 'noeffect': [ + {'first': {'size': 8192, 'pool': 'default'}}, + ] + } + with patch.dict(virt.__salt__, {'config.get': MagicMock(side_effect=[ # pylint: disable=no-member + disks, "/default/path/"])}): + with self.assertRaises(CommandExecutionError): + virt._disk_profile('noeffect', 'kvm', [], 'hello') + + @patch('salt.modules.virt.pool_info', return_value={'target_path': '/dev/disk/by-path'}) + def test_disk_profile_kvm_disk_pool_invalid(self, mock_poolinfo): + ''' + Test virt._gen_xml(), KVM case with pools defined. + ''' + disks = { + 'noeffect': [ + {'first': {'size': 8192, 'pool': 'default'}}, + ] + } + with patch.dict(virt.__salt__, {'config.get': MagicMock(side_effect=[ # pylint: disable=no-member + disks, "/default/path/"])}): + with self.assertRaises(CommandExecutionError): + virt._disk_profile('noeffect', 'kvm', [], 'hello') + def test_controller_for_esxi(self): - diskp = virt._disk_profile('default', 'esxi') - nicp = virt._nic_profile('default', 'esxi') + ''' + Test virt._gen_xml() generated device controller for ESXi/vmware + ''' + diskp = virt._disk_profile('default', 'vmware', [], 'hello') + nicp = virt._nic_profile('default', 'vmware') xml_data = virt._gen_xml( 'hello', 1, 512, diskp, nicp, - 'esxi' + 'vmware' ) root = ET.fromstring(xml_data) controllers = root.findall('.//devices/controller') @@ -435,7 +641,10 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(controller.attrib['model'], 'lsilogic') def test_controller_for_kvm(self): - diskp = virt._disk_profile('default', 'kvm') + ''' + Test virt._gen_xml() generated device controller for KVM + ''' + diskp = virt._disk_profile('default', 'kvm', [], 'hello') nicp = virt._nic_profile('default', 'kvm') xml_data = virt._gen_xml( 'hello', @@ -453,7 +662,9 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertTrue("mac address='52:54:00" in xml_data) def test_mixed_dict_and_list_as_profile_objects(self): - + ''' + Test virt._nic_profile with mixed dictionaries and lists as input. + ''' yaml_config = ''' virt: nic: @@ -478,7 +689,7 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): model: virtio ''' mock_config = salt.utils.yaml.safe_load(yaml_config) - with patch.dict(salt.modules.config.__opts__, mock_config): + with patch.dict(salt.modules.config.__opts__, mock_config): # pylint: disable=no-member for name in six.iterkeys(mock_config['virt']['nic']): profile = salt.modules.virt._nic_profile(name, 'kvm') @@ -493,9 +704,12 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertIn('mac', interface_attrs) self.assertTrue( re.match('^([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$', - interface_attrs['mac'], re.I)) + interface_attrs['mac'], re.I)) def test_get_graphics(self): + ''' + Test virt.get_graphics() + ''' xml = ''' test-vm @@ -513,6 +727,9 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual('0.0.0.0', graphics['listen']) def test_get_nics(self): + ''' + Test virt.get_nics() + ''' xml = ''' test-vm @@ -532,9 +749,131 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual('bridge', nic['type']) self.assertEqual('ac:de:48:b6:8b:59', nic['mac']) - @patch('subprocess.Popen') - @patch('subprocess.Popen.communicate', return_value="") - def test_get_disks(self, mock_communicate, mock_popen): + def test_parse_qemu_img_info(self): + ''' + Make sure that qemu-img info output is properly parsed + ''' + qemu_infos = '''[{ + "snapshots": [ + { + "vm-clock-nsec": 0, + "name": "first-snap", + "date-sec": 1528877587, + "date-nsec": 380589000, + "vm-clock-sec": 0, + "id": "1", + "vm-state-size": 1234 + }, + { + "vm-clock-nsec": 0, + "name": "second snap", + "date-sec": 1528877592, + "date-nsec": 933509000, + "vm-clock-sec": 0, + "id": "2", + "vm-state-size": 4567 + } + ], + "virtual-size": 25769803776, + "filename": "/disks/test.qcow2", + "cluster-size": 65536, + "format": "qcow2", + "actual-size": 217088, + "format-specific": { + "type": "qcow2", + "data": { + "compat": "1.1", + "lazy-refcounts": false, + "refcount-bits": 16, + "corrupt": false + } + }, + "full-backing-filename": "/disks/mybacking.qcow2", + "backing-filename": "mybacking.qcow2", + "dirty-flag": false + }, + { + "virtual-size": 25769803776, + "filename": "/disks/mybacking.qcow2", + "cluster-size": 65536, + "format": "qcow2", + "actual-size": 393744384, + "format-specific": { + "type": "qcow2", + "data": { + "compat": "1.1", + "lazy-refcounts": false, + "refcount-bits": 16, + "corrupt": false + } + }, + "full-backing-filename": "/disks/root.qcow2", + "backing-filename": "root.qcow2", + "dirty-flag": false + }, + { + "virtual-size": 25769803776, + "filename": "/disks/root.qcow2", + "cluster-size": 65536, + "format": "qcow2", + "actual-size": 196872192, + "format-specific": { + "type": "qcow2", + "data": { + "compat": "1.1", + "lazy-refcounts": false, + "refcount-bits": 16, + "corrupt": false + } + }, + "dirty-flag": false + }]''' + + self.assertEqual( + { + 'file': '/disks/test.qcow2', + 'file format': 'qcow2', + 'backing file': { + 'file': '/disks/mybacking.qcow2', + 'file format': 'qcow2', + 'disk size': 393744384, + 'virtual size': 25769803776, + 'cluster size': 65536, + 'backing file': { + 'file': '/disks/root.qcow2', + 'file format': 'qcow2', + 'disk size': 196872192, + 'virtual size': 25769803776, + 'cluster size': 65536, + } + }, + 'disk size': 217088, + 'virtual size': 25769803776, + 'cluster size': 65536, + 'snapshots': [ + { + 'id': '1', + 'tag': 'first-snap', + 'vmsize': 1234, + 'date': datetime.datetime.fromtimestamp( + float("{}.{}".format(1528877587, 380589000))).isoformat(), + 'vmclock': '00:00:00' + }, + { + 'id': '2', + 'tag': 'second snap', + 'vmsize': 4567, + 'date': datetime.datetime.fromtimestamp( + float("{}.{}".format(1528877592, 933509000))).isoformat(), + 'vmclock': '00:00:00' + } + ], + }, virt._parse_qemu_img_info(qemu_infos)) + + def test_get_disks(self): + ''' + Test virt.get_disks() + ''' xml = ''' test-vm @@ -554,20 +893,61 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): ''' self.set_mock_vm("test-vm", xml) + qemu_infos = '''[{ + "virtual-size": 25769803776, + "filename": "/disks/test.qcow2", + "cluster-size": 65536, + "format": "qcow2", + "actual-size": 217088, + "format-specific": { + "type": "qcow2", + "data": { + "compat": "1.1", + "lazy-refcounts": false, + "refcount-bits": 16, + "corrupt": false + } + }, + "full-backing-filename": "/disks/mybacking.qcow2", + "backing-filename": "mybacking.qcow2", + "dirty-flag": false + }, + { + "virtual-size": 25769803776, + "filename": "/disks/mybacking.qcow2", + "cluster-size": 65536, + "format": "qcow2", + "actual-size": 393744384, + "format-specific": { + "type": "qcow2", + "data": { + "compat": "1.1", + "lazy-refcounts": false, + "refcount-bits": 16, + "corrupt": false + } + }, + "dirty-flag": false + }]''' + + self.mock_popen.communicate.return_value = [qemu_infos] # pylint: disable=no-member disks = virt.get_disks('test-vm') - disk = disks[list(disks)[0]] + disk = disks.get('vda') self.assertEqual('/disks/test.qcow2', disk['file']) self.assertEqual('disk', disk['type']) - cdrom = disks[list(disks)[1]] + self.assertEqual('/disks/mybacking.qcow2', disk['backing file']['file']) + cdrom = disks.get('hda') self.assertEqual('/disks/test-cdrom.iso', cdrom['file']) self.assertEqual('cdrom', cdrom['type']) + self.assertFalse('backing file' in cdrom.keys()) - @patch('subprocess.Popen') - @patch('subprocess.Popen.communicate', return_value="") @patch('salt.modules.virt.stop', return_value=True) @patch('salt.modules.virt.undefine') @patch('os.remove') - def test_purge_default(self, mock_remove, mock_undefine, mock_stop, mock_communicate, mock_popen): + def test_purge_default(self, mock_remove, mock_undefine, mock_stop): + ''' + Test virt.purge() with default parameters + ''' xml = ''' test-vm @@ -587,18 +967,38 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): ''' self.set_mock_vm("test-vm", xml) + qemu_infos = '''[{ + "virtual-size": 25769803776, + "filename": "/disks/test.qcow2", + "cluster-size": 65536, + "format": "qcow2", + "actual-size": 217088, + "format-specific": { + "type": "qcow2", + "data": { + "compat": "1.1", + "lazy-refcounts": false, + "refcount-bits": 16, + "corrupt": false + } + }, + "dirty-flag": false + }]''' + + self.mock_popen.communicate.return_value = [qemu_infos] # pylint: disable=no-member + res = virt.purge('test-vm') self.assertTrue(res) mock_remove.assert_any_call('/disks/test.qcow2') mock_remove.assert_any_call('/disks/test-cdrom.iso') - @patch('subprocess.Popen') - @patch('subprocess.Popen.communicate', return_value="") @patch('salt.modules.virt.stop', return_value=True) @patch('salt.modules.virt.undefine') @patch('os.remove') - def test_purge_noremovable(self, mock_remove, mock_undefine, mock_stop, mock_communicate, mock_popen): - + def test_purge_noremovable(self, mock_remove, mock_undefine, mock_stop): + ''' + Test virt.purge(removables=False) + ''' xml = ''' test-vm @@ -624,12 +1024,290 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): ''' self.set_mock_vm("test-vm", xml) + qemu_infos = '''[{ + "virtual-size": 25769803776, + "filename": "/disks/test.qcow2", + "cluster-size": 65536, + "format": "qcow2", + "actual-size": 217088, + "format-specific": { + "type": "qcow2", + "data": { + "compat": "1.1", + "lazy-refcounts": false, + "refcount-bits": 16, + "corrupt": false + } + }, + "dirty-flag": false + }]''' + + self.mock_popen.communicate.return_value = [qemu_infos] # pylint: disable=no-member + res = virt.purge('test-vm', removables=False) self.assertTrue(res) mock_remove.assert_called_once() mock_remove.assert_any_call('/disks/test.qcow2') + def test_capabilities(self): + ''' + Test the virt.capabilities parsing + ''' + xml = ''' + + + 44454c4c-3400-105a-8033-b3c04f4b344a + + x86_64 + Nehalem + Intel + + + + + + + + + + + + + + + + + tcp + rdma + + + + + + 12367120 + 3091780 + 0 + + + + + + + + + + + + + + + + + + + + + apparmor + 0 + + + dac + 0 + +487:+486 + +487:+486 + + + + + hvm + + 32 + /usr/bin/qemu-system-i386 + pc-i440fx-2.6 + pc + pc-0.12 + + + /usr/bin/qemu-kvm + pc-i440fx-2.6 + pc + pc-0.12 + + + + + + + + + + + + + + + hvm + + 64 + /usr/bin/qemu-system-x86_64 + pc-i440fx-2.6 + pc + pc-0.12 + + + /usr/bin/qemu-kvm + pc-i440fx-2.6 + pc + pc-0.12 + + + + + + + + + + + + + ''' + self.mock_conn.getCapabilities.return_value = xml # pylint: disable=no-member + caps = virt.capabilities() + + expected = { + 'host': { + 'uuid': '44454c4c-3400-105a-8033-b3c04f4b344a', + 'cpu': { + 'arch': 'x86_64', + 'model': 'Nehalem', + 'vendor': 'Intel', + 'microcode': '25', + 'sockets': 1, + 'cores': 4, + 'threads': 2, + 'features': ['vme', 'ds', 'acpi'], + 'pages': [{'size': '4 KiB'}, {'size': '2048 KiB'}] + }, + 'power_management': ['suspend_mem', 'suspend_disk', 'suspend_hybrid'], + 'migration': { + 'live': True, + 'transports': ['tcp', 'rdma'] + }, + 'topology': { + 'cells': [ + { + 'id': 0, + 'memory': '12367120 KiB', + 'pages': [ + {'size': '4 KiB', 'available': 3091780}, + {'size': '2048 KiB', 'available': 0} + ], + 'distances': { + 0: 10, + }, + 'cpus': [ + {'id': 0, 'socket_id': 0, 'core_id': 0, 'siblings': '0,4'}, + {'id': 1, 'socket_id': 0, 'core_id': 1, 'siblings': '1,5'}, + {'id': 2, 'socket_id': 0, 'core_id': 2, 'siblings': '2,6'}, + {'id': 3, 'socket_id': 0, 'core_id': 3, 'siblings': '3,7'}, + {'id': 4, 'socket_id': 0, 'core_id': 0, 'siblings': '0,4'}, + {'id': 5, 'socket_id': 0, 'core_id': 1, 'siblings': '1,5'}, + {'id': 6, 'socket_id': 0, 'core_id': 2, 'siblings': '2,6'}, + {'id': 7, 'socket_id': 0, 'core_id': 3, 'siblings': '3,7'} + ] + } + ] + }, + 'cache': { + 'banks': [ + {'id': 0, 'level': 3, 'type': 'both', 'size': '8 MiB', 'cpus': '0-7'} + ] + }, + 'security': [ + {'model': 'apparmor', 'doi': '0', 'baselabels': []}, + {'model': 'dac', 'doi': '0', 'baselabels': [ + {'type': 'kvm', 'label': '+487:+486'}, + {'type': 'qemu', 'label': '+487:+486'} + ]} + ] + }, + 'guests': [ + { + 'os_type': 'hvm', + 'arch': { + 'name': 'i686', + 'wordsize': 32, + 'emulator': '/usr/bin/qemu-system-i386', + 'machines': { + 'pc-i440fx-2.6': {'maxcpus': 255, 'alternate_names': ['pc']}, + 'pc-0.12': {'maxcpus': 255, 'alternate_names': []} + }, + 'domains': { + 'qemu': { + 'emulator': None, + 'machines': {} + }, + 'kvm': { + 'emulator': '/usr/bin/qemu-kvm', + 'machines': { + 'pc-i440fx-2.6': {'maxcpus': 255, 'alternate_names': ['pc']}, + 'pc-0.12': {'maxcpus': 255, 'alternate_names': []} + } + } + } + }, + 'features': { + 'cpuselection': {'default': True, 'toggle': False}, + 'deviceboot': {'default': True, 'toggle': False}, + 'disksnapshot': {'default': True, 'toggle': False}, + 'acpi': {'default': True, 'toggle': True}, + 'apic': {'default': True, 'toggle': False}, + 'pae': {'default': True, 'toggle': False}, + 'nonpae': {'default': True, 'toggle': False} + } + }, + { + 'os_type': 'hvm', + 'arch': { + 'name': 'x86_64', + 'wordsize': 64, + 'emulator': '/usr/bin/qemu-system-x86_64', + 'machines': { + 'pc-i440fx-2.6': {'maxcpus': 255, 'alternate_names': ['pc']}, + 'pc-0.12': {'maxcpus': 255, 'alternate_names': []} + }, + 'domains': { + 'qemu': { + 'emulator': None, + 'machines': {} + }, + 'kvm': { + 'emulator': '/usr/bin/qemu-kvm', + 'machines': { + 'pc-i440fx-2.6': {'maxcpus': 255, 'alternate_names': ['pc']}, + 'pc-0.12': {'maxcpus': 255, 'alternate_names': []} + } + } + } + }, + 'features': { + 'cpuselection': {'default': True, 'toggle': False}, + 'deviceboot': {'default': True, 'toggle': False}, + 'disksnapshot': {'default': True, 'toggle': False}, + 'acpi': {'default': True, 'toggle': True}, + 'apic': {'default': True, 'toggle': False} + } + } + ] + } + + self.assertEqual(expected, caps) + def test_network(self): + ''' + Test virt._get_net_xml() + ''' xml_data = virt._gen_net_xml('network', 'main', 'bridge', 'openvswitch') root = ET.fromstring(xml_data) self.assertEqual(root.find('name').text, 'network') @@ -637,7 +1315,184 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(root.find('forward').attrib['mode'], 'bridge') self.assertEqual(root.find('virtualport').attrib['type'], 'openvswitch') + def test_domain_capabilities(self): + ''' + Test the virt.domain_capabilities parsing + ''' + xml = ''' + + /usr/bin/qemu-system-aarch64 + kvm + virt-2.12 + aarch64 + + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/AAVMF/AAVMF32_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + + + + + sample-cpu + ACME + + + + + pxa262 + pxa270-a0 + arm1136 + + + + + + disk + cdrom + floppy + lun + + + fdc + scsi + virtio + usb + sata + + + + + sdl + vnc + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + kvm + vfio + + + + + + + 3 + + + + + + ''' + + self.mock_conn.getDomainCapabilities.return_value = xml # pylint: disable=no-member + caps = virt.domain_capabilities() + + expected = { + 'emulator': '/usr/bin/qemu-system-aarch64', + 'domain': 'kvm', + 'machine': 'virt-2.12', + 'arch': 'aarch64', + 'max_vcpus': 255, + 'iothreads': True, + 'os': { + 'loader': { + 'type': ['rom', 'pflash'], + 'readonly': ['yes', 'no'], + 'values': [ + '/usr/share/AAVMF/AAVMF_CODE.fd', + '/usr/share/AAVMF/AAVMF32_CODE.fd', + '/usr/share/OVMF/OVMF_CODE.fd' + ] + } + }, + 'cpu': { + 'host-passthrough': True, + 'host-model': { + 'model': { + 'name': 'sample-cpu', + 'fallback': 'forbid' + }, + 'vendor': 'ACME', + 'features': { + 'vme': 'require', + 'ss': 'require' + } + }, + 'custom': { + 'models': { + 'pxa262': 'unknown', + 'pxa270-a0': 'yes', + 'arm1136': 'no' + } + } + }, + 'devices': { + 'disk': { + 'diskDevice': ['disk', 'cdrom', 'floppy', 'lun'], + 'bus': ['fdc', 'scsi', 'virtio', 'usb', 'sata'], + }, + 'graphics': { + 'type': ['sdl', 'vnc'] + }, + 'video': { + 'modelType': ['vga', 'virtio'] + }, + 'hostdev': { + 'mode': ['subsystem'], + 'startupPolicy': ['default', 'mandatory', 'requisite', 'optional'], + 'subsysType': ['usb', 'pci', 'scsi'], + 'capsType': [], + 'pciBackend': ['default', 'kvm', 'vfio'] + } + }, + 'features': { + 'gic': { + 'version': ['3'] + }, + 'vmcoreinfo': {} + } + } + + self.assertEqual(expected, caps) + def test_network_tag(self): + ''' + Test virt._get_net_xml() with VLAN tag + ''' xml_data = virt._gen_net_xml('network', 'main', 'bridge', 'openvswitch', 1001) root = ET.fromstring(xml_data) self.assertEqual(root.find('name').text, 'network') @@ -646,7 +1501,86 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(root.find('virtualport').attrib['type'], 'openvswitch') self.assertEqual(root.find('vlan/tag').attrib['id'], '1001') + def test_list_networks(self): + ''' + Test virt.list_networks() + ''' + names = ['net1', 'default', 'net2'] + net_mocks = [MagicMock(), MagicMock(), MagicMock()] + for i, value in enumerate(names): + net_mocks[i].name.return_value = value + + self.mock_conn.listAllNetworks.return_value = net_mocks # pylint: disable=no-member + actual = virt.list_networks() + self.assertEqual(names, actual) + + def test_network_info(self): + ''' + Test virt.network_info() + ''' + self.mock_libvirt.VIR_IP_ADDR_TYPE_IPV4 = 0 + self.mock_libvirt.VIR_IP_ADDR_TYPE_IPV6 = 1 + + net_mock = MagicMock() + + # pylint: disable=no-member + net_mock.UUIDString.return_value = 'some-uuid' + net_mock.bridgeName.return_value = 'br0' + net_mock.autostart.return_value = True + net_mock.isActive.return_value = False + net_mock.isPersistent.return_value = True + net_mock.DHCPLeases.return_value = [ + { + 'iface': 'virbr0', + 'expirytime': 1527757552, + 'type': 0, + 'mac': '52:54:00:01:71:bd', + 'ipaddr': '192.168.122.45', + 'prefix': 24, + 'hostname': 'py3-test', + 'clientid': '01:52:54:00:01:71:bd', + 'iaid': None + } + ] + self.mock_conn.networkLookupByName.return_value = net_mock + # pylint: enable=no-member + + net = virt.network_info('foo') + self.assertEqual({ + 'uuid': 'some-uuid', + 'bridge': 'br0', + 'autostart': True, + 'active': False, + 'persistent': True, + 'leases': [ + { + 'iface': 'virbr0', + 'expirytime': 1527757552, + 'type': 'ipv4', + 'mac': '52:54:00:01:71:bd', + 'ipaddr': '192.168.122.45', + 'prefix': 24, + 'hostname': 'py3-test', + 'clientid': '01:52:54:00:01:71:bd', + 'iaid': None + } + ]}, net) + + def test_network_info_notfound(self): + ''' + Test virt.network_info() when the network can't be found + ''' + # pylint: disable=no-member + self.mock_conn.networkLookupByName.side_effect = \ + self.mock_libvirt.libvirtError("Network not found") + # pylint: enable=no-member + net = virt.network_info('foo') + self.assertEqual({}, net) + def test_pool(self): + ''' + Test virt._gen_pool_xml() + ''' xml_data = virt._gen_pool_xml('pool', 'logical', 'base') root = ET.fromstring(xml_data) self.assertEqual(root.find('name').text, 'pool') @@ -654,9 +1588,90 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(root.find('target/path').text, '/dev/base') def test_pool_with_source(self): + ''' + Test virt._gen_pool_xml() with a source device + ''' xml_data = virt._gen_pool_xml('pool', 'logical', 'base', 'sda') root = ET.fromstring(xml_data) self.assertEqual(root.find('name').text, 'pool') self.assertEqual(root.attrib['type'], 'logical') self.assertEqual(root.find('target/path').text, '/dev/base') self.assertEqual(root.find('source/device').attrib['path'], '/dev/sda') + + def test_list_pools(self): + ''' + Test virt.list_pools() + ''' + names = ['pool1', 'default', 'pool2'] + pool_mocks = [MagicMock(), MagicMock(), MagicMock()] + for i, value in enumerate(names): + pool_mocks[i].name.return_value = value + + self.mock_conn.listAllStoragePools.return_value = pool_mocks # pylint: disable=no-member + actual = virt.list_pools() + self.assertEqual(names, actual) + + def test_pool_info(self): + ''' + Test virt.pool_info() + ''' + # pylint: disable=no-member + pool_mock = MagicMock() + pool_mock.UUIDString.return_value = 'some-uuid' + pool_mock.info.return_value = [0, 1234, 5678, 123] + pool_mock.autostart.return_value = True + pool_mock.isPersistent.return_value = True + pool_mock.XMLDesc.return_value = ''' + default + d92682d0-33cf-4e10-9837-a216c463e158 + 854374301696 + 596275986432 + 258098315264 + + + + /srv/vms + + 0755 + 0 + 0 + + +''' + self.mock_conn.storagePoolLookupByName.return_value = pool_mock + # pylint: enable=no-member + + pool = virt.pool_info('foo') + self.assertEqual({ + 'uuid': 'some-uuid', + 'state': 'inactive', + 'capacity': 1234, + 'allocation': 5678, + 'free': 123, + 'autostart': True, + 'persistent': True, + 'type': 'dir', + 'target_path': '/srv/vms'}, pool) + + def test_pool_info_notfound(self): + ''' + Test virt.pool_info() when the pool can't be found + ''' + # pylint: disable=no-member + self.mock_conn.storagePoolLookupByName.side_effect = \ + self.mock_libvirt.libvirtError("Pool not found") + # pylint: enable=no-member + pool = virt.pool_info('foo') + self.assertEqual({}, pool) + + def test_pool_list_volumes(self): + ''' + Test virt.pool_list_volumes + ''' + names = ['volume1', 'volume2'] + mock_pool = MagicMock() + # pylint: disable=no-member + mock_pool.listVolumes.return_value = names + self.mock_conn.storagePoolLookupByName.return_value = mock_pool + # pylint: enable=no-member + self.assertEqual(names, virt.pool_list_volumes('default')) diff --git a/tests/unit/modules/test_virtualenv.py b/tests/unit/modules/test_virtualenv.py index ecdefaf582..1c982e91c6 100644 --- a/tests/unit/modules/test_virtualenv.py +++ b/tests/unit/modules/test_virtualenv.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.modules.virtualenv_test diff --git a/tests/unit/modules/test_vsphere.py b/tests/unit/modules/test_vsphere.py index 00b23df393..916c09d2c6 100644 --- a/tests/unit/modules/test_vsphere.py +++ b/tests/unit/modules/test_vsphere.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` - :codeauthor: :email:`Alexandru Bleotu ` + :codeauthor: Nicole Thomas + :codeauthor: Alexandru Bleotu Tests for functions in salt.modules.vsphere ''' diff --git a/tests/unit/modules/test_win_autoruns.py b/tests/unit/modules/test_win_autoruns.py index bff3c60402..011647e3b6 100644 --- a/tests/unit/modules/test_win_autoruns.py +++ b/tests/unit/modules/test_win_autoruns.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_win_disk.py b/tests/unit/modules/test_win_disk.py index 7a3a500530..7bcc27f68f 100644 --- a/tests/unit/modules/test_win_disk.py +++ b/tests/unit/modules/test_win_disk.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_win_dns_client.py b/tests/unit/modules/test_win_dns_client.py index fb38725ffe..c417120f67 100644 --- a/tests/unit/modules/test_win_dns_client.py +++ b/tests/unit/modules/test_win_dns_client.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs @@ -20,6 +20,7 @@ from tests.support.mock import ( # Import Salt Libs import salt.modules.win_dns_client as win_dns_client +import salt.utils.stringutils try: import wmi @@ -73,7 +74,9 @@ class WinDnsClientTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): # wmi and pythoncom modules are platform specific... - mock_pythoncom = types.ModuleType('pythoncom') + mock_pythoncom = types.ModuleType( + salt.utils.stringutils.to_str('pythoncom') + ) sys_modules_patcher = patch.dict('sys.modules', {'pythoncom': mock_pythoncom}) sys_modules_patcher.start() diff --git a/tests/unit/modules/test_win_file.py b/tests/unit/modules/test_win_file.py index f910adc9cd..abfe61adbc 100644 --- a/tests/unit/modules/test_win_file.py +++ b/tests/unit/modules/test_win_file.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' -:codeauthor: :email:`Shane Lee ` +:codeauthor: Shane Lee ''' # Import Python Libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/modules/test_win_groupadd.py b/tests/unit/modules/test_win_groupadd.py index 3ec58fc5bc..93b13f3eba 100644 --- a/tests/unit/modules/test_win_groupadd.py +++ b/tests/unit/modules/test_win_groupadd.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_win_ip.py b/tests/unit/modules/test_win_ip.py index 1aae92248f..f63c1f1ebc 100644 --- a/tests/unit/modules/test_win_ip.py +++ b/tests/unit/modules/test_win_ip.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_win_network.py b/tests/unit/modules/test_win_network.py index 018cee27e3..411b5f9cf8 100644 --- a/tests/unit/modules/test_win_network.py +++ b/tests/unit/modules/test_win_network.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_win_ntp.py b/tests/unit/modules/test_win_ntp.py index 4534c511be..e099008a58 100644 --- a/tests/unit/modules/test_win_ntp.py +++ b/tests/unit/modules/test_win_ntp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_win_path.py b/tests/unit/modules/test_win_path.py index 5986294dc9..891a131497 100644 --- a/tests/unit/modules/test_win_path.py +++ b/tests/unit/modules/test_win_path.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/modules/test_win_service.py b/tests/unit/modules/test_win_service.py index 6e2051dc16..30b6b3b172 100644 --- a/tests/unit/modules/test_win_service.py +++ b/tests/unit/modules/test_win_service.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/modules/test_win_shadow.py b/tests/unit/modules/test_win_shadow.py index 9dc7f84f19..b0548bc481 100644 --- a/tests/unit/modules/test_win_shadow.py +++ b/tests/unit/modules/test_win_shadow.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_win_snmp.py b/tests/unit/modules/test_win_snmp.py index 5cd2f45efc..f60a0515db 100644 --- a/tests/unit/modules/test_win_snmp.py +++ b/tests/unit/modules/test_win_snmp.py @@ -11,6 +11,7 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Libs import salt.modules.win_snmp as win_snmp +from salt.exceptions import CommandExecutionError # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin @@ -70,19 +71,47 @@ class WinSnmpTestCase(TestCase, LoaderModuleMockMixin): ''' Test - Get the current accepted SNMP community names and their permissions. ''' - mock_value = MagicMock(return_value=[{'vdata': 16, - 'vname': 'TestCommunity'}]) - with patch.dict(win_snmp.__salt__, {'reg.list_values': mock_value}): + mock_ret = MagicMock(return_value=[{'vdata': 16, + 'vname': 'TestCommunity'}]) + mock_false = MagicMock(return_value=False) + with patch.dict(win_snmp.__salt__, {'reg.list_values': mock_ret, + 'reg.key_exists': mock_false}): self.assertEqual(win_snmp.get_community_names(), COMMUNITY_NAMES) + def test_get_community_names_gpo(self): + ''' + Test - Get the current accepted SNMP community names and their permissions. + ''' + mock_ret = MagicMock(return_value=[{'vdata': 'TestCommunity', + 'vname': 1}]) + mock_false = MagicMock(return_value=True) + with patch.dict(win_snmp.__salt__, {'reg.list_values': mock_ret, + 'reg.key_exists': mock_false}): + self.assertEqual(win_snmp.get_community_names(), + {'TestCommunity': 'Managed by GPO'}) + def test_set_community_names(self): ''' Test - Manage the SNMP accepted community names and their permissions. ''' - mock_value = MagicMock(return_value=True) + mock_true = MagicMock(return_value=True) kwargs = {'communities': COMMUNITY_NAMES} - with patch.dict(win_snmp.__salt__, {'reg.set_value': mock_value}), \ + mock_false = MagicMock(return_value=False) + with patch.dict(win_snmp.__salt__, {'reg.set_value': mock_true, + 'reg.key_exists': mock_false}), \ patch('salt.modules.win_snmp.get_community_names', MagicMock(return_value=COMMUNITY_NAMES)): self.assertTrue(win_snmp.set_community_names(**kwargs)) + + def test_set_community_names_gpo(self): + ''' + Test - Manage the SNMP accepted community names and their permissions. + ''' + mock_true = MagicMock(return_value=True) + kwargs = {'communities': COMMUNITY_NAMES} + with patch.dict(win_snmp.__salt__, {'reg.set_value': mock_true, + 'reg.key_exists': mock_true}), \ + patch('salt.modules.win_snmp.get_community_names', + MagicMock(return_value=COMMUNITY_NAMES)): + self.assertRaises(CommandExecutionError, win_snmp.set_community_names, **kwargs) diff --git a/tests/unit/modules/test_win_status.py b/tests/unit/modules/test_win_status.py index 939ecc3d74..314467023e 100644 --- a/tests/unit/modules/test_win_status.py +++ b/tests/unit/modules/test_win_status.py @@ -146,11 +146,7 @@ class TestProcsWMIGetOwnerErrorsAreLogged(TestProcsBase): def test_error_logged_if_process_get_owner_fails(self): with patch('salt.modules.win_status.log') as log: self.call_procs() - log.warning.assert_called_once_with(ANY) - self.assertIn( - str(self.expected_error_code), - log.warning.call_args[0][0] - ) + log.warning.assert_called_once_with(ANY, ANY, self.expected_error_code) class TestEmptyCommandLine(TestProcsBase): diff --git a/tests/unit/modules/test_win_system.py b/tests/unit/modules/test_win_system.py index a626787053..a34c148276 100644 --- a/tests/unit/modules/test_win_system.py +++ b/tests/unit/modules/test_win_system.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/modules/test_win_timezone.py b/tests/unit/modules/test_win_timezone.py index 7e6d7d95ed..68c20bd306 100644 --- a/tests/unit/modules/test_win_timezone.py +++ b/tests/unit/modules/test_win_timezone.py @@ -1,14 +1,13 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' - # Import Python Libs from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase +from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch @@ -18,6 +17,7 @@ from tests.support.mock import ( import salt.modules.win_timezone as win_timezone +@skipIf(not win_timezone.HAS_PYTZ, 'This test requires pytz') class WinTimezoneTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_timezone @@ -31,12 +31,13 @@ class WinTimezoneTestCase(TestCase, LoaderModuleMockMixin): ''' Test if it get current timezone (i.e. Asia/Calcutta) ''' - mock_cmd = MagicMock(side_effect=['India Standard Time', - 'Indian Standard Time']) - with patch.dict(win_timezone.__salt__, {'cmd.run': mock_cmd}): + mock_read = MagicMock(side_effect=[{'vdata': 'India Standard Time'}, + {'vdata': 'Indian Standard Time'}]) + + with patch.dict(win_timezone.__utils__, {'reg.read_value': mock_read}): self.assertEqual(win_timezone.get_zone(), 'Asia/Calcutta') - self.assertFalse(win_timezone.get_zone()) + self.assertEqual(win_timezone.get_zone(), 'Unknown') # 'get_offset' function tests: 1 @@ -44,15 +45,15 @@ class WinTimezoneTestCase(TestCase, LoaderModuleMockMixin): ''' Test if it get current numeric timezone offset from UCT (i.e. +0530) ''' - time = ('(UTC+05:30) Chennai, Kolkata, Mumbai, \ - New Delhi\nIndia Standard Time') - mock_cmd = MagicMock(side_effect=['India Standard Time', time]) - with patch.dict(win_timezone.__salt__, {'cmd.run': mock_cmd}): - self.assertEqual(win_timezone.get_offset(), '+0530') + # time = ('(UTC+05:30) Chennai, Kolkata, Mumbai, \ + # New Delhi\nIndia Standard Time') + # mock_cmd = MagicMock(side_effect=['India Standard Time', time]) + # with patch.dict(win_timezone.__salt__, {'cmd.run': mock_cmd}): - mock_cmd = MagicMock(return_value='India Standard Time') - with patch.dict(win_timezone.__salt__, {'cmd.run': mock_cmd}): - self.assertFalse(win_timezone.get_offset()) + mock_read = MagicMock(return_value={'vdata': 'India Standard Time'}) + + with patch.dict(win_timezone.__utils__, {'reg.read_value': mock_read}): + self.assertEqual(win_timezone.get_offset(), '+0530') # 'get_zonecode' function tests: 1 @@ -60,7 +61,10 @@ class WinTimezoneTestCase(TestCase, LoaderModuleMockMixin): ''' Test if it get current timezone (i.e. PST, MDT, etc) ''' - self.assertFalse(win_timezone.get_zonecode()) + mock_read = MagicMock(return_value={'vdata': 'India Standard Time'}) + + with patch.dict(win_timezone.__utils__, {'reg.read_value': mock_read}): + self.assertEqual(win_timezone.get_zonecode(), 'IST') # 'set_zone' function tests: 1 @@ -68,8 +72,15 @@ class WinTimezoneTestCase(TestCase, LoaderModuleMockMixin): ''' Test if it unlinks, then symlinks /etc/localtime to the set timezone. ''' - mock_cmd = MagicMock(return_value=0) - with patch.dict(win_timezone.__salt__, {'cmd.retcode': mock_cmd}): + mock_cmd = MagicMock(return_value={'pid': 78, + 'retcode': 0, + 'stderr': '', + 'stdout': ''}) + mock_read = MagicMock(return_value={'vdata': 'India Standard Time'}) + + with patch.dict(win_timezone.__salt__, {'cmd.run_all': mock_cmd}), \ + patch.dict(win_timezone.__utils__, {'reg.read_value': mock_read}): + self.assertTrue(win_timezone.set_zone('Asia/Calcutta')) # 'zone_compare' function tests: 1 @@ -80,8 +91,9 @@ class WinTimezoneTestCase(TestCase, LoaderModuleMockMixin): the one set in /etc/localtime. Returns True if they match, and False if not. Mostly useful for running state checks. ''' - mock_cmd = MagicMock(return_value='India Standard Time') - with patch.dict(win_timezone.__salt__, {'cmd.run': mock_cmd}): + mock_read = MagicMock(return_value={'vdata': 'India Standard Time'}) + + with patch.dict(win_timezone.__utils__, {'reg.read_value': mock_read}): self.assertTrue(win_timezone.zone_compare('Asia/Calcutta')) # 'get_hwclock' function tests: 1 diff --git a/tests/unit/modules/test_x509.py b/tests/unit/modules/test_x509.py index 98fc84146e..1b1ac5c2bc 100644 --- a/tests/unit/modules/test_x509.py +++ b/tests/unit/modules/test_x509.py @@ -17,6 +17,8 @@ # Import Salt Testing Libs from __future__ import absolute_import, print_function, unicode_literals +import os +import tempfile try: import pytest @@ -33,6 +35,8 @@ from tests.support.mock import ( ) from salt.modules import x509 +import salt.utils.stringutils +import salt.utils.files try: import M2Crypto # pylint: disable=unused-import @@ -67,12 +71,11 @@ class X509TestCase(TestCase, LoaderModuleMockMixin): subj = FakeSubject() x509._parse_subject(subj) - x509.log.trace.assert_called_once() assert x509.log.trace.call_args[0][0] == "Missing attribute '%s'. Error: %s" assert x509.log.trace.call_args[0][1] == list(subj.nid.keys())[0] assert isinstance(x509.log.trace.call_args[0][2], TypeError) - @skipIf(not HAS_M2CRYPTO, 'Skipping, M2Crypt is unavailble') + @skipIf(not HAS_M2CRYPTO, 'Skipping, M2Crypto is unavailble') def test_get_pem_entry(self): ''' Test private function _parse_subject(subject) it handles a missing fields @@ -98,7 +101,7 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== ret = x509.get_pem_entry(ca_key) self.assertEqual(ret, ca_key) - @skipIf(not HAS_M2CRYPTO, 'Skipping, M2Crypt is unavailble') + @skipIf(not HAS_M2CRYPTO, 'Skipping, M2Crypto is unavailble') def test_get_private_key_size(self): ''' Test private function _parse_subject(subject) it handles a missing fields @@ -125,7 +128,17 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== ret = x509.get_private_key_size(ca_key) self.assertEqual(ret, 1024) - @skipIf(not HAS_M2CRYPTO, 'Skipping, M2Crypt is unavailble') + @skipIf(not HAS_M2CRYPTO, 'Skipping, M2Crypto is unavailble') + def test_create_key(self): + ''' + Test that x509.create_key returns a private key + :return: + ''' + ret = x509.create_private_key(text=True, + passphrase='super_secret_passphrase') + self.assertIn(b'BEGIN RSA PRIVATE KEY', ret) + + @skipIf(not HAS_M2CRYPTO, 'Skipping, M2Crypto is unavailble') def test_create_certificate(self): ''' Test private function _parse_subject(subject) it handles a missing fields @@ -164,3 +177,168 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== days_valid=3650, days_remaining=0) self.assertIn(b'BEGIN CERTIFICATE', ret) + + @skipIf(not HAS_M2CRYPTO, 'Skipping, M2Crypto is unavailble') + def test_create_crl(self): + ca_key = ''' +-----BEGIN RSA PRIVATE KEY----- +MIICWwIBAAKBgQCjdjbgL4kQ8Lu73xeRRM1q3C3K3ptfCLpyfw38LRnymxaoJ6ls +pNSx2dU1uJ89YKFlYLo1QcEk4rJ2fdIjarV0kuNCY3rC8jYUp9BpAU5Z6p9HKeT1 +2rTPH81JyjbQDR5PyfCyzYOQtpwpB4zIUUK/Go7tTm409xGKbbUFugJNgQIDAQAB +AoGAF24we34U1ZrMLifSRv5nu3OIFNZHyx2DLDpOFOGaII5edwgIXwxZeIzS5Ppr +yO568/8jcdLVDqZ4EkgCwRTgoXRq3a1GLHGFmBdDNvWjSTTMLoozuM0t2zjRmIsH +hUd7tnai9Lf1Bp5HlBEhBU2gZWk+SXqLvxXe74/+BDAj7gECQQDRw1OPsrgTvs3R +3MNwX6W8+iBYMTGjn6f/6rvEzUs/k6rwJluV7n8ISNUIAxoPy5g5vEYK6Ln/Ttc7 +u0K1KNlRAkEAx34qcxjuswavL3biNGE+8LpDJnJx1jaNWoH+ObuzYCCVMusdT2gy +kKuq9ytTDgXd2qwZpIDNmscvReFy10glMQJAXebMz3U4Bk7SIHJtYy7OKQzn0dMj +35WnRV81c2Jbnzhhu2PQeAvt/i1sgEuzLQL9QEtSJ6wLJ4mJvImV0TdaIQJAAYyk +TcKK0A8kOy0kMp3yvDHmJZ1L7wr7bBGIZPBlQ0Ddh8i1sJExm1gJ+uN2QKyg/XrK +tDFf52zWnCdVGgDwcQJALW/WcbSEK+JVV6KDJYpwCzWpKIKpBI0F6fdCr1G7Xcwj +c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== +-----END RSA PRIVATE KEY----- +''' + + ca_cert = x509.create_certificate(text=True, + signing_private_key=ca_key, + CN='Redacted Root CA', + O='Redacted', + C='BE', + ST='Antwerp', + L='Local Town', + Email='certadm@example.org', + basicConstraints="critical CA:true", + keyUsage="critical cRLSign, keyCertSign", + subjectKeyIdentifier='hash', + authorityKeyIdentifier='keyid,issuer:always', + days_valid=3650, + days_remaining=0) + + with tempfile.NamedTemporaryFile('w+', delete=False) as ca_key_file: + ca_key_file.write(ca_key) + ca_key_file.flush() + + with tempfile.NamedTemporaryFile('w+', delete=False) as ca_cert_file: + ca_cert_file.write(ca_cert) + ca_cert_file.flush() + + with tempfile.NamedTemporaryFile('w+', delete=False) as ca_crl_file: + x509.create_crl(path=ca_crl_file.name, + text=False, + signing_private_key=ca_key_file.name, + signing_private_key_passphrase=None, + signing_cert=ca_cert_file.name, + revoked=None, + include_expired=False, + days_valid=100, + digest='sha512') + + with salt.utils.files.fopen(ca_crl_file.name, 'r') as crl_file: + crl = crl_file.read() + + os.remove(ca_key_file.name) + os.remove(ca_cert_file.name) + os.remove(ca_crl_file.name) + + # Ensure that a CRL was actually created + self.assertIn(b'BEGIN X509 CRL', crl) + + @skipIf(not HAS_M2CRYPTO, 'Skipping, M2Crypto is unavailble') + def test_revoke_certificate_with_crl(self): + ca_key = ''' +-----BEGIN RSA PRIVATE KEY----- +MIICWwIBAAKBgQCjdjbgL4kQ8Lu73xeRRM1q3C3K3ptfCLpyfw38LRnymxaoJ6ls +pNSx2dU1uJ89YKFlYLo1QcEk4rJ2fdIjarV0kuNCY3rC8jYUp9BpAU5Z6p9HKeT1 +2rTPH81JyjbQDR5PyfCyzYOQtpwpB4zIUUK/Go7tTm409xGKbbUFugJNgQIDAQAB +AoGAF24we34U1ZrMLifSRv5nu3OIFNZHyx2DLDpOFOGaII5edwgIXwxZeIzS5Ppr +yO568/8jcdLVDqZ4EkgCwRTgoXRq3a1GLHGFmBdDNvWjSTTMLoozuM0t2zjRmIsH +hUd7tnai9Lf1Bp5HlBEhBU2gZWk+SXqLvxXe74/+BDAj7gECQQDRw1OPsrgTvs3R +3MNwX6W8+iBYMTGjn6f/6rvEzUs/k6rwJluV7n8ISNUIAxoPy5g5vEYK6Ln/Ttc7 +u0K1KNlRAkEAx34qcxjuswavL3biNGE+8LpDJnJx1jaNWoH+ObuzYCCVMusdT2gy +kKuq9ytTDgXd2qwZpIDNmscvReFy10glMQJAXebMz3U4Bk7SIHJtYy7OKQzn0dMj +35WnRV81c2Jbnzhhu2PQeAvt/i1sgEuzLQL9QEtSJ6wLJ4mJvImV0TdaIQJAAYyk +TcKK0A8kOy0kMp3yvDHmJZ1L7wr7bBGIZPBlQ0Ddh8i1sJExm1gJ+uN2QKyg/XrK +tDFf52zWnCdVGgDwcQJALW/WcbSEK+JVV6KDJYpwCzWpKIKpBI0F6fdCr1G7Xcwj +c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== +-----END RSA PRIVATE KEY----- +''' + # Issue the CA certificate (self-signed) + ca_cert = x509.create_certificate(text=True, + signing_private_key=ca_key, + CN='Redacted Root CA', + O='Redacted', + C='BE', + ST='Antwerp', + L='Local Town', + Email='certadm@example.org', + basicConstraints="critical CA:true", + keyUsage="critical cRLSign, keyCertSign", + subjectKeyIdentifier='hash', + authorityKeyIdentifier='keyid,issuer:always', + days_valid=3650, + days_remaining=0) + + # Sign a client certificate with the CA + server_cert = x509.create_certificate(text=True, + signing_private_key=ca_key, + signing_cert=ca_cert, + CN='Redacted Normal Certificate', + O='Redacted', + C='BE', + ST='Antwerp', + L='Local Town', + Email='certadm@example.org', + basicConstraints="critical CA:false", + keyUsage="critical keyEncipherment", + subjectKeyIdentifier='hash', + authorityKeyIdentifier='keyid,issuer:always', + days_valid=365, + days_remaining=0) + + # Save CA cert + key and server cert to disk as PEM files + with tempfile.NamedTemporaryFile('w+', delete=False) as ca_key_file: + ca_key_file.write(ca_key) + ca_key_file.flush() + + with tempfile.NamedTemporaryFile('w+', delete=False) as ca_cert_file: + ca_cert_file.write(ca_cert) + ca_cert_file.flush() + + with tempfile.NamedTemporaryFile('w+', delete=False) as server_cert_file: + server_cert_file.write(server_cert) + server_cert_file.flush() + + # Revoke server CRL + revoked = [ + { + 'certificate': server_cert_file.name, + 'revocation_date': '2015-03-01 00:00:00' + } + ] + with tempfile.NamedTemporaryFile('w+', delete=False) as ca_crl_file: + x509.create_crl(path=ca_crl_file.name, + text=False, + signing_private_key=ca_key_file.name, + signing_private_key_passphrase=None, + signing_cert=ca_cert_file.name, + revoked=revoked, + include_expired=False, + days_valid=100, + digest='sha512') + + # Retrieve serial number from server certificate + server_cert_details = x509.read_certificate(server_cert_file.name) + serial_number = server_cert_details['Serial Number'].replace(':', '') + serial_number = salt.utils.stringutils.to_str(serial_number) + + # Retrieve CRL as text + crl = M2Crypto.X509.load_crl(ca_crl_file.name).as_text() + + # Cleanup + os.remove(ca_key_file.name) + os.remove(ca_cert_file.name) + os.remove(ca_crl_file.name) + os.remove(server_cert_file.name) + + # Ensure that the correct server cert serial is amongst + # the revoked certificates + self.assertIn(serial_number, crl) diff --git a/tests/unit/modules/test_xapi.py b/tests/unit/modules/test_xapi.py index e39b4f7e0c..d4cf412c26 100644 --- a/tests/unit/modules/test_xapi.py +++ b/tests/unit/modules/test_xapi.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/modules/test_yumpkg.py b/tests/unit/modules/test_yumpkg.py index c2bcaa5a1f..9a2c8b9f4c 100644 --- a/tests/unit/modules/test_yumpkg.py +++ b/tests/unit/modules/test_yumpkg.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- # Import Python Libs -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals, print_function import os -import sys # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin @@ -21,6 +20,11 @@ from salt.exceptions import CommandExecutionError import salt.modules.yumpkg as yumpkg import salt.modules.pkg_resource as pkg_resource +try: + import pytest +except ImportError: + pytest = None + LIST_REPOS = { 'base': { 'file': '/etc/yum.repos.d/CentOS-Base.repo', @@ -239,7 +243,7 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): # with fromrepo cmd = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd}): + with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd, 'config.get': MagicMock(return_value=False)}): yumpkg.latest_version( 'foo', refresh=False, @@ -247,14 +251,14 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): branch='foo') cmd.assert_called_once_with( ['yum', '--quiet', '--disablerepo=*', '--enablerepo=good', - '--branch=foo', 'list', 'available', 'foo'], + '--branch=foo', 'list', 'available', 'foo'], env={}, ignore_retcode=True, output_loglevel='trace', python_shell=False) # without fromrepo cmd = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd}): + with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd, 'config.get': MagicMock(return_value=False)}): yumpkg.latest_version( 'foo', refresh=False, @@ -263,11 +267,29 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): branch='foo') cmd.assert_called_once_with( ['yum', '--quiet', '--disablerepo=bad', '--enablerepo=good', - '--branch=foo', 'list', 'available', 'foo'], + '--branch=foo', 'list', 'available', 'foo'], env={}, ignore_retcode=True, output_loglevel='trace', python_shell=False) + # without fromrepo, but within the scope + cmd = MagicMock(return_value={'retcode': 0, 'stdout': ''}) + with patch('salt.utils.systemd.has_scope', MagicMock(return_value=True)): + with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd, + 'config.get': MagicMock(return_value=True)}): + yumpkg.latest_version( + 'foo', + refresh=False, + enablerepo='good', + disablerepo='bad', + branch='foo') + cmd.assert_called_once_with( + ['systemd-run', '--scope', 'yum', '--quiet', '--disablerepo=bad', '--enablerepo=good', + '--branch=foo', 'list', 'available', 'foo'], env={}, + ignore_retcode=True, + output_loglevel='trace', + python_shell=False) + def test_list_repo_pkgs_with_options(self): ''' Test list_repo_pkgs with and without fromrepo @@ -281,7 +303,8 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): list_repos_mock = MagicMock(return_value=LIST_REPOS) kwargs = {'output_loglevel': 'trace', 'ignore_retcode': True, - 'python_shell': False} + 'python_shell': False, + 'env': {}} with patch.object(yumpkg, 'list_repos', list_repos_mock): @@ -290,52 +313,44 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): with patch.dict(yumpkg.__salt__, {'cmd.run': really_old_yum}): cmd = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd}): + with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd, 'config.get': MagicMock(return_value=False)}): yumpkg.list_repo_pkgs('foo') # We should have called cmd.run_all twice - self.assertEqual(len(cmd.mock_calls), 2) + assert len(cmd.mock_calls) == 2 # Check args from first call - self.assertEqual( - cmd.mock_calls[1][1], - (['yum', '--quiet', 'list', 'available'],) - ) + assert cmd.mock_calls[1][1] == (['yum', '--quiet', 'list', 'available'],) + # Check kwargs from first call - self.assertEqual(cmd.mock_calls[1][2], kwargs) + assert cmd.mock_calls[1][2] == kwargs # Check args from second call - self.assertEqual( - cmd.mock_calls[0][1], - (['yum', '--quiet', 'list', 'installed'],) - ) + assert cmd.mock_calls[0][1] == (['yum', '--quiet', 'list', 'installed'],) + # Check kwargs from second call - self.assertEqual(cmd.mock_calls[0][2], kwargs) + assert cmd.mock_calls[0][2] == kwargs # Test with really old yum. The fromrepo argument has no effect on # the yum commands we'd run. with patch.dict(yumpkg.__salt__, {'cmd.run': older_yum}): cmd = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd}): + with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd, 'config.get': MagicMock(return_value=False)}): yumpkg.list_repo_pkgs('foo') # We should have called cmd.run_all twice - self.assertEqual(len(cmd.mock_calls), 2) + assert len(cmd.mock_calls) == 2 # Check args from first call - self.assertEqual( - cmd.mock_calls[1][1], - (['yum', '--quiet', '--showduplicates', 'list', 'available'],) - ) + assert cmd.mock_calls[1][1] == (['yum', '--quiet', '--showduplicates', 'list', 'available'],) + # Check kwargs from first call - self.assertEqual(cmd.mock_calls[1][2], kwargs) + assert cmd.mock_calls[1][2] == kwargs # Check args from second call - self.assertEqual( - cmd.mock_calls[0][1], - (['yum', '--quiet', '--showduplicates', 'list', 'installed'],) - ) + assert cmd.mock_calls[0][1] == (['yum', '--quiet', '--showduplicates', 'list', 'installed'],) + # Check kwargs from second call - self.assertEqual(cmd.mock_calls[0][2], kwargs) + assert cmd.mock_calls[0][2] == kwargs # Test with newer yum. We should run one yum command per repo, so # fromrepo would limit how many calls we make. @@ -344,19 +359,16 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): # When fromrepo is used, we would only run one yum command, for # that specific repo. cmd = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd}): + with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd, 'config.get': MagicMock(return_value=False)}): yumpkg.list_repo_pkgs('foo', fromrepo='base') # We should have called cmd.run_all once - self.assertEqual(len(cmd.mock_calls), 1) + assert len(cmd.mock_calls) == 1 # Check args - self.assertEqual( - cmd.mock_calls[0][1], - (['yum', '--quiet', '--showduplicates', - 'repository-packages', 'base', 'list', 'foo'],) - ) + assert cmd.mock_calls[0][1] == (['yum', '--quiet', '--showduplicates', + 'repository-packages', 'base', 'list', 'foo'],) # Check kwargs - self.assertEqual(cmd.mock_calls[0][2], kwargs) + assert cmd.mock_calls[0][2] == kwargs # Test enabling base-source and disabling updates. We should # get two calls, one for each enabled repo. Because dict @@ -365,26 +377,22 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): # mean that we will have to check both the first and second # mock call both times. cmd = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd}): + with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd, 'config.get': MagicMock(return_value=False)}): yumpkg.list_repo_pkgs( 'foo', enablerepo='base-source', disablerepo='updates') # We should have called cmd.run_all twice - self.assertEqual(len(cmd.mock_calls), 2) + assert len(cmd.mock_calls) == 2 for repo in ('base', 'base-source'): for index in (0, 1): try: # Check args - self.assertEqual( - cmd.mock_calls[index][1], - (['yum', '--quiet', '--showduplicates', - 'repository-packages', repo, 'list', - 'foo'],) - ) + assert cmd.mock_calls[index][1] == (['yum', '--quiet', '--showduplicates', + 'repository-packages', repo, 'list', 'foo'],) # Check kwargs - self.assertEqual(cmd.mock_calls[index][2], kwargs) + assert cmd.mock_calls[index][2] == kwargs break except AssertionError: continue @@ -398,21 +406,21 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): with patch.dict(yumpkg.__context__, {'yum_bin': 'dnf'}): # with fromrepo cmd = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd}): + with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd, 'config.get': MagicMock(return_value=False)}): yumpkg.list_upgrades( refresh=False, fromrepo='good', branch='foo') cmd.assert_called_once_with( ['dnf', '--quiet', '--disablerepo=*', '--enablerepo=good', - '--branch=foo', 'list', 'upgrades'], + '--branch=foo', 'list', 'upgrades'], env={}, output_loglevel='trace', ignore_retcode=True, python_shell=False) # without fromrepo cmd = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd}): + with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd, 'config.get': MagicMock(return_value=False)}): yumpkg.list_upgrades( refresh=False, enablerepo='good', @@ -420,7 +428,7 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): branch='foo') cmd.assert_called_once_with( ['dnf', '--quiet', '--disablerepo=bad', '--enablerepo=good', - '--branch=foo', 'list', 'upgrades'], + '--branch=foo', 'list', 'upgrades'], env={}, output_loglevel='trace', ignore_retcode=True, python_shell=False) @@ -431,21 +439,21 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): ''' # with fromrepo cmd = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd}): + with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd, 'config.get': MagicMock(return_value=False)}): yumpkg.list_upgrades( refresh=False, fromrepo='good', branch='foo') cmd.assert_called_once_with( ['yum', '--quiet', '--disablerepo=*', '--enablerepo=good', - '--branch=foo', 'list', 'updates'], + '--branch=foo', 'list', 'updates'], env={}, output_loglevel='trace', ignore_retcode=True, python_shell=False) # without fromrepo cmd = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd}): + with patch.dict(yumpkg.__salt__, {'cmd.run_all': cmd, 'config.get': MagicMock(return_value=False)}): yumpkg.list_upgrades( refresh=False, enablerepo='good', @@ -453,7 +461,7 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): branch='foo') cmd.assert_called_once_with( ['yum', '--quiet', '--disablerepo=bad', '--enablerepo=good', - '--branch=foo', 'list', 'updates'], + '--branch=foo', 'list', 'updates'], env={}, output_loglevel='trace', ignore_retcode=True, python_shell=False) @@ -466,81 +474,76 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): # then a separate cmd.retcode to check for updates. # with fromrepo - clean_cmd = Mock() - update_cmd = MagicMock(return_value=0) - with patch.dict(yumpkg.__salt__, {'cmd.run': clean_cmd, - 'cmd.retcode': update_cmd}): + yum_call = MagicMock() + with patch.dict(yumpkg.__salt__, {'cmd.run_all': yum_call, 'config.get': MagicMock(return_value=False)}): yumpkg.refresh_db( check_update=True, fromrepo='good', branch='foo') - clean_cmd.assert_called_once_with( - ['yum', '--quiet', '--assumeyes', 'clean', 'expire-cache', '--disablerepo=*', - '--enablerepo=good', '--branch=foo'], - python_shell=False) - update_cmd.assert_called_once_with( - ['yum', '--quiet', '--assumeyes', 'check-update', - '--setopt=autocheck_running_kernel=false', '--disablerepo=*', - '--enablerepo=good', '--branch=foo'], - output_loglevel='trace', - ignore_retcode=True, - python_shell=False) + + assert yum_call.call_count == 2 + yum_call.assert_any_call(['yum', '--quiet', '--assumeyes', 'clean', 'expire-cache', '--disablerepo=*', + '--enablerepo=good', '--branch=foo'], + env={}, ignore_retcode=True, output_loglevel='trace', python_shell=False) + yum_call.assert_any_call(['yum', '--quiet', '--assumeyes', 'check-update', + '--setopt=autocheck_running_kernel=false', '--disablerepo=*', + '--enablerepo=good', '--branch=foo'], + output_loglevel='trace', env={}, + ignore_retcode=True, + python_shell=False) # without fromrepo - clean_cmd = Mock() - update_cmd = MagicMock(return_value=0) - with patch.dict(yumpkg.__salt__, {'cmd.run': clean_cmd, - 'cmd.retcode': update_cmd}): + yum_call = MagicMock() + with patch.dict(yumpkg.__salt__, {'cmd.run_all': yum_call, 'config.get': MagicMock(return_value=False)}): yumpkg.refresh_db( check_update=True, enablerepo='good', disablerepo='bad', branch='foo') - clean_cmd.assert_called_once_with( - ['yum', '--quiet', '--assumeyes', 'clean', 'expire-cache', '--disablerepo=bad', - '--enablerepo=good', '--branch=foo'], - python_shell=False) - update_cmd.assert_called_once_with( - ['yum', '--quiet', '--assumeyes', 'check-update', - '--setopt=autocheck_running_kernel=false', '--disablerepo=bad', - '--enablerepo=good', '--branch=foo'], - output_loglevel='trace', - ignore_retcode=True, - python_shell=False) + assert yum_call.call_count == 2 + yum_call.assert_any_call( + ['yum', '--quiet', '--assumeyes', 'clean', 'expire-cache', '--disablerepo=bad', '--enablerepo=good', + '--branch=foo'], env={}, ignore_retcode=True, output_loglevel='trace', python_shell=False) + yum_call.assert_any_call( + ['yum', '--quiet', '--assumeyes', 'check-update', '--setopt=autocheck_running_kernel=false', + '--disablerepo=bad', '--enablerepo=good', '--branch=foo'], + output_loglevel='trace', env={}, ignore_retcode=True, python_shell=False) # With check_update=False we will just do a cmd.run for the clean_cmd # with fromrepo - clean_cmd = Mock() - with patch.dict(yumpkg.__salt__, {'cmd.run': clean_cmd}): + yum_call = MagicMock() + with patch.dict(yumpkg.__salt__, {'cmd.run_all': yum_call, 'config.get': MagicMock(return_value=False)}): yumpkg.refresh_db( check_update=False, fromrepo='good', branch='foo') - clean_cmd.assert_called_once_with( - ['yum', '--quiet', '--assumeyes', 'clean', 'expire-cache', '--disablerepo=*', - '--enablerepo=good', '--branch=foo'], - python_shell=False) + assert yum_call.call_count == 1 + yum_call.assert_called_once_with( + ['yum', '--quiet', '--assumeyes', 'clean', 'expire-cache', + '--disablerepo=*', '--enablerepo=good', '--branch=foo'], + env={}, output_loglevel='trace', ignore_retcode=True, python_shell=False) # without fromrepo - clean_cmd = Mock() - with patch.dict(yumpkg.__salt__, {'cmd.run': clean_cmd}): + yum_call = MagicMock() + with patch.dict(yumpkg.__salt__, {'cmd.run_all': yum_call, 'config.get': MagicMock(return_value=False)}): yumpkg.refresh_db( check_update=False, enablerepo='good', disablerepo='bad', branch='foo') - clean_cmd.assert_called_once_with( - ['yum', '--quiet', '--assumeyes', 'clean', 'expire-cache', '--disablerepo=bad', - '--enablerepo=good', '--branch=foo'], - python_shell=False) + assert yum_call.call_count == 1 + yum_call.assert_called_once_with( + ['yum', '--quiet', '--assumeyes', 'clean', 'expire-cache', + '--disablerepo=bad', '--enablerepo=good', '--branch=foo'], + env={}, output_loglevel='trace', ignore_retcode=True, python_shell=False) def test_install_with_options(self): parse_targets = MagicMock(return_value=({'foo': None}, 'repository')) with patch.object(yumpkg, 'list_pkgs', MagicMock(return_value={})), \ patch.object(yumpkg, 'list_holds', MagicMock(return_value=[])), \ patch.dict(yumpkg.__salt__, {'pkg_resource.parse_targets': parse_targets}), \ - patch('salt.utils.systemd.has_scope', MagicMock(return_value=False)): + patch('salt.utils.systemd.has_scope', MagicMock(return_value=False)): # with fromrepo cmd = MagicMock(return_value={'retcode': 0}) @@ -553,9 +556,10 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): cmd.assert_called_once_with( ['yum', '-y', '--disablerepo=*', '--enablerepo=good', '--branch=foo', '--setopt', 'obsoletes=0', - '--setopt', 'plugins=0', 'install', 'foo'], + '--setopt', 'plugins=0', 'install', 'foo'], env={}, output_loglevel='trace', python_shell=False, + ignore_retcode=False, redirect_stderr=True) # without fromrepo @@ -570,10 +574,12 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): cmd.assert_called_once_with( ['yum', '-y', '--disablerepo=bad', '--enablerepo=good', '--branch=foo', '--setopt', 'obsoletes=0', - '--setopt', 'plugins=0', 'install', 'foo'], + '--setopt', 'plugins=0', 'install', 'foo'], env={}, output_loglevel='trace', python_shell=False, - redirect_stderr=True) + ignore_retcode=False, + redirect_stderr=True, + ) def test_upgrade_with_options(self): with patch.object(yumpkg, 'list_pkgs', MagicMock(return_value={})), \ @@ -592,7 +598,7 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): ['yum', '--quiet', '-y', '--disablerepo=*', '--enablerepo=good', '--branch=foo', '--setopt', 'obsoletes=0', '--setopt', 'plugins=0', - '--exclude=kernel*', 'upgrade'], + '--exclude=kernel*', 'upgrade'], env={}, output_loglevel='trace', python_shell=False) @@ -610,7 +616,7 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): ['yum', '--quiet', '-y', '--disablerepo=bad', '--enablerepo=good', '--branch=foo', '--setopt', 'obsoletes=0', '--setopt', 'plugins=0', - '--exclude=kernel*', 'upgrade'], + '--exclude=kernel*', 'upgrade'], env={}, output_loglevel='trace', python_shell=False) @@ -664,9 +670,65 @@ class YumTestCase(TestCase, LoaderModuleMockMixin): for info in pkg_info_list: self.assertTrue(info['arch'] in ('x86_64', 'i686')) + @skipIf(not yumpkg.HAS_YUM, 'Could not import yum') def test_yum_base_error(self): - if not yumpkg.HAS_YUM: - sys.modules['yum'] = Mock() with patch('yum.YumBase') as mock_yum_yumbase: mock_yum_yumbase.side_effect = CommandExecutionError - self.assertRaises(CommandExecutionError, yumpkg._get_yum_config) + with pytest.raises(CommandExecutionError): + yumpkg._get_yum_config() + + +@skipIf(pytest is None, 'PyTest is missing') +class YumUtilsTestCase(TestCase, LoaderModuleMockMixin): + ''' + Yum/Dnf utils tests. + ''' + def setup_loader_modules(self): + return { + yumpkg: { + '__context__': { + 'yum_bin': 'fake-yum', + }, + '__grains__': { + 'osarch': 'x86_64', + 'os_family': 'RedHat', + 'osmajorrelease': 7, + }, + } + } + + def test_call_yum_default(self): + ''' + Call default Yum/Dnf. + :return: + ''' + with patch.dict(yumpkg.__salt__, {'cmd.run_all': MagicMock(), 'config.get': MagicMock(return_value=False)}): + yumpkg._call_yum(['-y', '--do-something']) # pylint: disable=W0106 + yumpkg.__salt__['cmd.run_all'].assert_called_once_with( + ['fake-yum', '-y', '--do-something'], env={}, + output_loglevel='trace', python_shell=False) + + @patch('salt.utils.systemd.has_scope', MagicMock(return_value=True)) + def test_call_yum_in_scope(self): + ''' + Call Yum/Dnf within the scope. + :return: + ''' + with patch.dict(yumpkg.__salt__, {'cmd.run_all': MagicMock(), 'config.get': MagicMock(return_value=True)}): + yumpkg._call_yum(['-y', '--do-something']) # pylint: disable=W0106 + yumpkg.__salt__['cmd.run_all'].assert_called_once_with( + ['systemd-run', '--scope', 'fake-yum', '-y', '--do-something'], env={}, + output_loglevel='trace', python_shell=False) + + def test_call_yum_with_kwargs(self): + ''' + Call Yum/Dnf with the optinal keyword arguments. + :return: + ''' + with patch.dict(yumpkg.__salt__, {'cmd.run_all': MagicMock(), 'config.get': MagicMock(return_value=False)}): + yumpkg._call_yum(['-y', '--do-something'], + python_shell=True, output_loglevel='quiet', ignore_retcode=False, + username='Darth Vader') # pylint: disable=W0106 + yumpkg.__salt__['cmd.run_all'].assert_called_once_with( + ['fake-yum', '-y', '--do-something'], env={}, ignore_retcode=False, + output_loglevel='quiet', python_shell=True, username='Darth Vader') diff --git a/tests/unit/modules/test_znc.py b/tests/unit/modules/test_znc.py index 13437f6814..16178b5c5e 100644 --- a/tests/unit/modules/test_znc.py +++ b/tests/unit/modules/test_znc.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/modules/test_zypper.py b/tests/unit/modules/test_zypper.py index 6eccee568b..8cde31a26e 100644 --- a/tests/unit/modules/test_zypper.py +++ b/tests/unit/modules/test_zypper.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Bo Maryniuk ` + :codeauthor: Bo Maryniuk ''' # Import Python Libs @@ -113,6 +113,7 @@ class ZypperTestCase(TestCase, LoaderModuleMockMixin): self.assertIn(pkg, upgrades) self.assertEqual(upgrades[pkg], version) + @patch('salt.utils.environment.get_module_environment', MagicMock(return_value={'SALT_RUNNING': "1"})) def test_zypper_caller(self): ''' Test Zypper caller. @@ -475,7 +476,7 @@ class ZypperTestCase(TestCase, LoaderModuleMockMixin): with patch('salt.modules.zypper.list_pkgs', MagicMock(side_effect=[ {"kernel-default": "3.12.49-11.1"}, {"kernel-default": "3.12.49-11.1,3.12.51-60.20.2"}])): ret = zypper.install('kernel-default', '--auto-agree-with-licenses') - self.assertDictEqual(ret, {"kernel-default": {"old": "3.12.49-11.1", "new": "3.12.51-60.20.2"}}) + self.assertDictEqual(ret, {"kernel-default": {"old": "3.12.49-11.1", "new": "3.12.49-11.1,3.12.51-60.20.2"}}) def test_upgrade_failure(self): ''' @@ -540,27 +541,36 @@ Repository 'DUMMY' not found by its alias, number, or URI. data.setdefault(key, []).append(value) rpm_out = [ - 'protobuf-java_|-2.6.1_|-3.1.develHead_|-noarch_|-_|-1499257756', - 'yast2-ftp-server_|-3.1.8_|-8.1_|-x86_64_|-_|-1499257798', - 'jose4j_|-0.4.4_|-2.1.develHead_|-noarch_|-_|-1499257756', - 'apache-commons-cli_|-1.2_|-1.233_|-noarch_|-_|-1498636510', - 'jakarta-commons-discovery_|-0.4_|-129.686_|-noarch_|-_|-1498636511', - 'susemanager-build-keys-web_|-12.0_|-5.1.develHead_|-noarch_|-_|-1498636510', + 'protobuf-java_|-(none)_|-2.6.1_|-3.1.develHead_|-noarch_|-(none)_|-1499257756', + 'yast2-ftp-server_|-(none)_|-3.1.8_|-8.1_|-x86_64_|-(none)_|-1499257798', + 'jose4j_|-(none)_|-0.4.4_|-2.1.develHead_|-noarch_|-(none)_|-1499257756', + 'apache-commons-cli_|-(none)_|-1.2_|-1.233_|-noarch_|-(none)_|-1498636510', + 'jakarta-commons-discovery_|-(none)_|-0.4_|-129.686_|-noarch_|-(none)_|-1498636511', + 'susemanager-build-keys-web_|-(none)_|-12.0_|-5.1.develHead_|-noarch_|-(none)_|-1498636510', + 'gpg-pubkey_|-(none)_|-39db7c82_|-5847eb1f_|-(none)_|-(none)_|-1519203802', + 'gpg-pubkey_|-(none)_|-8a7c64f9_|-5aaa93ca_|-(none)_|-(none)_|-1529925595', + 'kernel-default_|-(none)_|-4.4.138_|-94.39.1_|-x86_64_|-(none)_|-1529936067', + 'kernel-default_|-(none)_|-4.4.73_|-5.1_|-x86_64_|-(none)_|-1503572639', + 'perseus-dummy_|-(none)_|-1.1_|-1.1_|-i586_|-(none)_|-1529936062', ] - with patch.dict(zypper.__salt__, {'cmd.run': MagicMock(return_value=os.linesep.join(rpm_out))}), \ + with patch.dict(zypper.__grains__, {'osarch': 'x86_64'}), \ + patch.dict(zypper.__salt__, {'cmd.run': MagicMock(return_value=os.linesep.join(rpm_out))}), \ patch.dict(zypper.__salt__, {'pkg_resource.add_pkg': _add_data}), \ patch.dict(zypper.__salt__, {'pkg_resource.format_pkg_list': pkg_resource.format_pkg_list}), \ patch.dict(zypper.__salt__, {'pkg_resource.stringify': MagicMock()}): pkgs = zypper.list_pkgs(versions_as_list=True) + self.assertFalse(pkgs.get('gpg-pubkey', False)) for pkg_name, pkg_version in { - 'jakarta-commons-discovery': '0.4-129.686', - 'yast2-ftp-server': '3.1.8-8.1', - 'protobuf-java': '2.6.1-3.1.develHead', - 'susemanager-build-keys-web': '12.0-5.1.develHead', - 'apache-commons-cli': '1.2-1.233', - 'jose4j': '0.4.4-2.1.develHead'}.items(): + 'jakarta-commons-discovery': ['0.4-129.686'], + 'yast2-ftp-server': ['3.1.8-8.1'], + 'protobuf-java': ['2.6.1-3.1.develHead'], + 'susemanager-build-keys-web': ['12.0-5.1.develHead'], + 'apache-commons-cli': ['1.2-1.233'], + 'kernel-default': ['4.4.138-94.39.1', '4.4.73-5.1'], + 'perseus-dummy.i586': ['1.1-1.1'], + 'jose4j': ['0.4.4-2.1.develHead']}.items(): self.assertTrue(pkgs.get(pkg_name)) - self.assertEqual(pkgs[pkg_name], [pkg_version]) + self.assertEqual(pkgs[pkg_name], pkg_version) def test_list_pkgs_with_attr(self): ''' @@ -572,57 +582,82 @@ Repository 'DUMMY' not found by its alias, number, or URI. data.setdefault(key, []).append(value) rpm_out = [ - 'protobuf-java_|-2.6.1_|-3.1.develHead_|-noarch_|-_|-1499257756', - 'yast2-ftp-server_|-3.1.8_|-8.1_|-x86_64_|-_|-1499257798', - 'jose4j_|-0.4.4_|-2.1.develHead_|-noarch_|-_|-1499257756', - 'apache-commons-cli_|-1.2_|-1.233_|-noarch_|-_|-1498636510', - 'jakarta-commons-discovery_|-0.4_|-129.686_|-noarch_|-_|-1498636511', - 'susemanager-build-keys-web_|-12.0_|-5.1.develHead_|-noarch_|-_|-1498636510', + 'protobuf-java_|-(none)_|-2.6.1_|-3.1.develHead_|-noarch_|-(none)_|-1499257756', + 'yast2-ftp-server_|-(none)_|-3.1.8_|-8.1_|-x86_64_|-(none)_|-1499257798', + 'jose4j_|-(none)_|-0.4.4_|-2.1.develHead_|-noarch_|-(none)_|-1499257756', + 'apache-commons-cli_|-(none)_|-1.2_|-1.233_|-noarch_|-(none)_|-1498636510', + 'jakarta-commons-discovery_|-(none)_|-0.4_|-129.686_|-noarch_|-(none)_|-1498636511', + 'susemanager-build-keys-web_|-(none)_|-12.0_|-5.1.develHead_|-noarch_|-(none)_|-1498636510', + 'gpg-pubkey_|-(none)_|-39db7c82_|-5847eb1f_|-(none)_|-(none)_|-1519203802', + 'gpg-pubkey_|-(none)_|-8a7c64f9_|-5aaa93ca_|-(none)_|-(none)_|-1529925595', + 'kernel-default_|-(none)_|-4.4.138_|-94.39.1_|-x86_64_|-(none)_|-1529936067', + 'kernel-default_|-(none)_|-4.4.73_|-5.1_|-x86_64_|-(none)_|-1503572639', + 'perseus-dummy_|-(none)_|-1.1_|-1.1_|-i586_|-(none)_|-1529936062', ] with patch.dict(zypper.__salt__, {'cmd.run': MagicMock(return_value=os.linesep.join(rpm_out))}), \ + patch.dict(zypper.__grains__, {'osarch': 'x86_64'}), \ patch.dict(zypper.__salt__, {'pkg_resource.add_pkg': _add_data}), \ patch.dict(zypper.__salt__, {'pkg_resource.format_pkg_list': pkg_resource.format_pkg_list}), \ patch.dict(zypper.__salt__, {'pkg_resource.stringify': MagicMock()}): pkgs = zypper.list_pkgs(attr=['epoch', 'release', 'arch', 'install_date_time_t']) + self.assertFalse(pkgs.get('gpg-pubkey', False)) for pkg_name, pkg_attr in { - 'jakarta-commons-discovery': { + 'jakarta-commons-discovery': [{ 'version': '0.4', 'release': '129.686', 'arch': 'noarch', 'install_date_time_t': 1498636511, - }, - 'yast2-ftp-server': { + }], + 'yast2-ftp-server': [{ 'version': '3.1.8', 'release': '8.1', 'arch': 'x86_64', 'install_date_time_t': 1499257798, - }, - 'protobuf-java': { + }], + 'protobuf-java': [{ 'version': '2.6.1', 'release': '3.1.develHead', 'install_date_time_t': 1499257756, 'arch': 'noarch', - }, - 'susemanager-build-keys-web': { + }], + 'susemanager-build-keys-web': [{ 'version': '12.0', 'release': '5.1.develHead', 'arch': 'noarch', 'install_date_time_t': 1498636510, - }, - 'apache-commons-cli': { + }], + 'apache-commons-cli': [{ 'version': '1.2', 'release': '1.233', 'arch': 'noarch', 'install_date_time_t': 1498636510, + }], + 'kernel-default': [{ + 'version': '4.4.138', + 'release': '94.39.1', + 'arch': 'x86_64', + 'install_date_time_t': 1529936067 }, - 'jose4j': { + { + 'version': '4.4.73', + 'release': '5.1', + 'arch': 'x86_64', + 'install_date_time_t': 1503572639, + }], + 'perseus-dummy.i586': [{ + 'version': '1.1', + 'release': '1.1', + 'arch': 'i586', + 'install_date_time_t': 1529936062, + }], + 'jose4j': [{ 'arch': 'noarch', 'version': '0.4.4', 'release': '2.1.develHead', 'install_date_time_t': 1499257756, - }}.items(): + }]}.items(): self.assertTrue(pkgs.get(pkg_name)) - self.assertEqual(pkgs[pkg_name], [pkg_attr]) + self.assertEqual(pkgs[pkg_name], pkg_attr) def test_list_patches(self): ''' diff --git a/tests/unit/pillar/test_consul.py b/tests/unit/pillar/test_consul.py index 4945416ffe..99754c6cac 100644 --- a/tests/unit/pillar/test_consul.py +++ b/tests/unit/pillar/test_consul.py @@ -38,7 +38,7 @@ SIMPLE_DICT = {'key1': {'key2': 'val1'}} @skipIf(NO_MOCK, NO_MOCK_REASON) -@skipIf(not consul_pillar.HAS_CONSUL, 'python-consul module not installed') +@skipIf(not consul_pillar.consul, 'python-consul module not installed') class ConsulPillarTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.pillar.consul_pillar diff --git a/tests/unit/pillar/test_saltclass.py b/tests/unit/pillar/test_saltclass.py index ec1b256990..7e51e825f8 100644 --- a/tests/unit/pillar/test_saltclass.py +++ b/tests/unit/pillar/test_saltclass.py @@ -32,12 +32,9 @@ class SaltclassPillarTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): return {saltclass: {'__opts__': fake_opts, '__salt__': fake_salt, - '__grains__': fake_grains - }} + '__grains__': fake_grains}} def _runner(self, expected_ret): - full_ret = {} - parsed_ret = [] try: full_ret = saltclass.ext_pillar(fake_minion_id, fake_pillar, fake_args) parsed_ret = full_ret['__saltclass__']['classes'] @@ -48,5 +45,5 @@ class SaltclassPillarTestCase(TestCase, LoaderModuleMockMixin): self.assertListEqual(parsed_ret, expected_ret) def test_succeeds(self): - ret = ['default.users', 'default.motd', 'default', 'roles.app'] + ret = ['default.users', 'default.motd', 'default.empty', 'default', 'roles.app'] self._runner(ret) diff --git a/tests/unit/returners/test_smtp_return.py b/tests/unit/returners/test_smtp_return.py index 1d1065613e..03fc3615c8 100644 --- a/tests/unit/returners/test_smtp_return.py +++ b/tests/unit/returners/test_smtp_return.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place (mp@saltstack.com)` + :codeauthor: Mike Place (mp@saltstack.com) tests.unit.returners.smtp_return_test diff --git a/tests/unit/roster/test_sshconfig.py b/tests/unit/roster/test_sshconfig.py index 7d074dd863..77a6a06a50 100644 --- a/tests/unit/roster/test_sshconfig.py +++ b/tests/unit/roster/test_sshconfig.py @@ -1,11 +1,16 @@ # -*- coding: utf-8 -*- # Import Python libs -from __future__ import absolute_import +from __future__ import absolute_import, print_function, unicode_literals import collections # Import Salt Testing Libs -from tests.support import mock +from tests.support.mock import ( + mock_open, + NO_MOCK, + NO_MOCK_REASON, + patch +) from tests.support import mixins from tests.support.unit import skipIf, TestCase @@ -62,26 +67,23 @@ _ABC_GLOB = { } -@skipIf(mock.NO_MOCK, mock.NO_MOCK_REASON) +@skipIf(NO_MOCK, NO_MOCK_REASON) class SSHConfigRosterTestCase(TestCase, mixins.LoaderModuleMockMixin): - @classmethod - def setUpClass(cls): - cls.mock_fp = mock_fp = mock.mock_open(read_data=_SAMPLE_SSH_CONFIG) + def setUp(self): + self.mock_fp = mock_open(read_data=_SAMPLE_SSH_CONFIG) def setup_loader_modules(self): return {sshconfig: {}} def test_all(self): - with mock.patch('salt.utils.files.fopen', self.mock_fp): - with mock.patch('salt.roster.sshconfig._get_ssh_config_file'): - self.mock_fp.return_value.__iter__.return_value = _SAMPLE_SSH_CONFIG.splitlines() + with patch('salt.utils.files.fopen', self.mock_fp): + with patch('salt.roster.sshconfig._get_ssh_config_file'): targets = sshconfig.targets('*') self.assertEqual(targets, _ALL) def test_abc_glob(self): - with mock.patch('salt.utils.files.fopen', self.mock_fp): - with mock.patch('salt.roster.sshconfig._get_ssh_config_file'): - self.mock_fp.return_value.__iter__.return_value = _SAMPLE_SSH_CONFIG.splitlines() + with patch('salt.utils.files.fopen', self.mock_fp): + with patch('salt.roster.sshconfig._get_ssh_config_file'): targets = sshconfig.targets('abc*') self.assertEqual(targets, _ABC_GLOB) diff --git a/tests/unit/ssh/test_ssh.py b/tests/unit/ssh/test_ssh.py index b80483b0b7..2be83f3599 100644 --- a/tests/unit/ssh/test_ssh.py +++ b/tests/unit/ssh/test_ssh.py @@ -31,7 +31,7 @@ class SSHPasswordTests(ShellCase): opts['selected_target_option'] = 'glob' opts['tgt'] = 'localhost' opts['arg'] = [] - roster = os.path.join(self.get_config_dir(), 'roster') + roster = os.path.join(self.config_dir, 'roster') handle_ssh_ret = [ {'localhost': {'retcode': 255, 'stderr': u'Permission denied (publickey).\r\n', 'stdout': ''}}, ] diff --git a/tests/unit/ssh/test_ssh_single.py b/tests/unit/ssh/test_ssh_single.py index 68970ac093..a91d98ede9 100644 --- a/tests/unit/ssh/test_ssh_single.py +++ b/tests/unit/ssh/test_ssh_single.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Eric Radman ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals @@ -49,16 +49,18 @@ class AlternativesTestCase(TestCase, LoaderModuleMockMixin): bad_link = '/bin/pager' err = 'the primary link for {0} must be {1}'.format(name, link) - mock = MagicMock(side_effect=[True, False, False, False]) - mock_out = MagicMock(side_effect=['', err]) + mock_cinst = MagicMock(side_effect=[True, False]) + mock_cexist = MagicMock(side_effect=[True, False, False, True, False, False, False, True]) + mock_out = MagicMock(side_effect=['', err, '']) mock_path = MagicMock(return_value=path) mock_link = MagicMock(return_value=link) with patch.dict(alternatives.__salt__, - {'alternatives.check_installed': mock, + {'alternatives.check_installed': mock_cinst, + 'alternatives.check_exists': mock_cexist, 'alternatives.install': mock_out, 'alternatives.show_current': mock_path, 'alternatives.show_link': mock_link}): - comt = 'Alternatives for {0} is already set to {1}'.format(name, path) + comt = 'Alternative {0} for {1} is already registered'.format(path, name) ret.update({'comment': comt, 'result': True}) self.assertDictEqual(alternatives.install(name, link, path, priority), ret) @@ -84,6 +86,14 @@ class AlternativesTestCase(TestCase, LoaderModuleMockMixin): self.assertDictEqual(alternatives.install(name, bad_link, path, priority), ret) + comt = 'Alternative {0} for {1} registered with priority {2} and not set to default'.format(path, name, priority) + ret.update({'comment': comt, 'result': True, + 'changes': {'name': name, 'link': link, 'path': path, + 'priority': priority}, 'link': link}) + with patch.dict(alternatives.__opts__, {'test': False}): + self.assertDictEqual(alternatives.install(name, link, path, + priority), ret) + # 'remove' function tests: 1 def test_remove(self): diff --git a/tests/unit/states/test_apache.py b/tests/unit/states/test_apache.py index 713045e17b..798d0254d8 100644 --- a/tests/unit/states/test_apache.py +++ b/tests/unit/states/test_apache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_apache_module.py b/tests/unit/states/test_apache_module.py index 0544789abd..9421cbe1ac 100644 --- a/tests/unit/states/test_apache_module.py +++ b/tests/unit/states/test_apache_module.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_apt.py b/tests/unit/states/test_apt.py index c4a06a367f..96011cc460 100644 --- a/tests/unit/states/test_apt.py +++ b/tests/unit/states/test_apt.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_archive.py b/tests/unit/states/test_archive.py index 57957f6e18..03d3c7d185 100644 --- a/tests/unit/states/test_archive.py +++ b/tests/unit/states/test_archive.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Alexander Schwartz ` + :codeauthor: Alexander Schwartz ''' # Import python libs diff --git a/tests/unit/states/test_artifactory.py b/tests/unit/states/test_artifactory.py index 706ec410a4..3e095b8c54 100644 --- a/tests/unit/states/test_artifactory.py +++ b/tests/unit/states/test_artifactory.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_at.py b/tests/unit/states/test_at.py index 98271ea44c..4a4b75954c 100644 --- a/tests/unit/states/test_at.py +++ b/tests/unit/states/test_at.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_augeas.py b/tests/unit/states/test_augeas.py index 26328c1764..269cfb2cb0 100644 --- a/tests/unit/states/test_augeas.py +++ b/tests/unit/states/test_augeas.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` - :codeauthor: :email:`Andrew Colin Kissa ` + :codeauthor: Jayesh Kariya + :codeauthor: Andrew Colin Kissa ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_aws_sqs.py b/tests/unit/states/test_aws_sqs.py index a93d73a059..63f2f61e9f 100644 --- a/tests/unit/states/test_aws_sqs.py +++ b/tests/unit/states/test_aws_sqs.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_blockdev.py b/tests/unit/states/test_blockdev.py index b98e62ef9b..cdd13d9fb2 100644 --- a/tests/unit/states/test_blockdev.py +++ b/tests/unit/states/test_blockdev.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_boto_asg.py b/tests/unit/states/test_boto_asg.py index 3a6406ee48..ab55b1bb0e 100644 --- a/tests/unit/states/test_boto_asg.py +++ b/tests/unit/states/test_boto_asg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_boto_cloudwatch_alarm.py b/tests/unit/states/test_boto_cloudwatch_alarm.py index 31a37fa961..a9ffd13a8a 100644 --- a/tests/unit/states/test_boto_cloudwatch_alarm.py +++ b/tests/unit/states/test_boto_cloudwatch_alarm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_boto_dynamodb.py b/tests/unit/states/test_boto_dynamodb.py index dae9b4aff8..a4c02e67fd 100644 --- a/tests/unit/states/test_boto_dynamodb.py +++ b/tests/unit/states/test_boto_dynamodb.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_boto_ec2.py b/tests/unit/states/test_boto_ec2.py index 45a84e7f0a..0f6408475e 100644 --- a/tests/unit/states/test_boto_ec2.py +++ b/tests/unit/states/test_boto_ec2.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_boto_elasticache.py b/tests/unit/states/test_boto_elasticache.py index b30ecd15e1..5ee6145d9e 100644 --- a/tests/unit/states/test_boto_elasticache.py +++ b/tests/unit/states/test_boto_elasticache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_boto_elb.py b/tests/unit/states/test_boto_elb.py index 3af6430316..87291ef180 100644 --- a/tests/unit/states/test_boto_elb.py +++ b/tests/unit/states/test_boto_elb.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_boto_iam_role.py b/tests/unit/states/test_boto_iam_role.py index f0b4d11085..b9789e3bf8 100644 --- a/tests/unit/states/test_boto_iam_role.py +++ b/tests/unit/states/test_boto_iam_role.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_boto_lc.py b/tests/unit/states/test_boto_lc.py index 12ba71afd5..61401b9b14 100644 --- a/tests/unit/states/test_boto_lc.py +++ b/tests/unit/states/test_boto_lc.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_boto_route53.py b/tests/unit/states/test_boto_route53.py index 6e84014693..808b569703 100644 --- a/tests/unit/states/test_boto_route53.py +++ b/tests/unit/states/test_boto_route53.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_boto_sns.py b/tests/unit/states/test_boto_sns.py index 098295a217..0d33ab22a4 100644 --- a/tests/unit/states/test_boto_sns.py +++ b/tests/unit/states/test_boto_sns.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_boto_sqs.py b/tests/unit/states/test_boto_sqs.py index f1bb383e13..b2d51706a3 100644 --- a/tests/unit/states/test_boto_sqs.py +++ b/tests/unit/states/test_boto_sqs.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_bower.py b/tests/unit/states/test_bower.py index 22cc9fde7e..d591643ae6 100644 --- a/tests/unit/states/test_bower.py +++ b/tests/unit/states/test_bower.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Alexander Pyatkin ` + :codeauthor: Alexander Pyatkin ''' # Import Python Libs diff --git a/tests/unit/states/test_chef.py b/tests/unit/states/test_chef.py index a128d1eb34..79861156dd 100644 --- a/tests/unit/states/test_chef.py +++ b/tests/unit/states/test_chef.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_cloud.py b/tests/unit/states/test_cloud.py index bc309b550c..26bc9cb634 100644 --- a/tests/unit/states/test_cloud.py +++ b/tests/unit/states/test_cloud.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_cmd.py b/tests/unit/states/test_cmd.py index 373b0ce7f6..5c5ddb6804 100644 --- a/tests/unit/states/test_cmd.py +++ b/tests/unit/states/test_cmd.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_composer.py b/tests/unit/states/test_composer.py index 212f0d6fd8..649194702e 100644 --- a/tests/unit/states/test_composer.py +++ b/tests/unit/states/test_composer.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_cron.py b/tests/unit/states/test_cron.py index 1af13ffe8d..d399d628e5 100644 --- a/tests/unit/states/test_cron.py +++ b/tests/unit/states/test_cron.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place ` + :codeauthor: Mike Place ''' # Import python libs diff --git a/tests/unit/states/test_ddns.py b/tests/unit/states/test_ddns.py index d2a90678f9..7b37350355 100644 --- a/tests/unit/states/test_ddns.py +++ b/tests/unit/states/test_ddns.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_debconfmod.py b/tests/unit/states/test_debconfmod.py index 08f5e73e06..3951ae54d7 100644 --- a/tests/unit/states/test_debconfmod.py +++ b/tests/unit/states/test_debconfmod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_drac.py b/tests/unit/states/test_drac.py index 89973dab01..daacd63e98 100644 --- a/tests/unit/states/test_drac.py +++ b/tests/unit/states/test_drac.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_elasticsearch.py b/tests/unit/states/test_elasticsearch.py index c32cdb7a56..19882c23b8 100644 --- a/tests/unit/states/test_elasticsearch.py +++ b/tests/unit/states/test_elasticsearch.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Lukas Raska ` + :codeauthor: Lukas Raska ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_eselect.py b/tests/unit/states/test_eselect.py index 6e0198c752..782a02ebdc 100644 --- a/tests/unit/states/test_eselect.py +++ b/tests/unit/states/test_eselect.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_event.py b/tests/unit/states/test_event.py index 7d518efdea..7b3e1246a4 100644 --- a/tests/unit/states/test_event.py +++ b/tests/unit/states/test_event.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_file.py b/tests/unit/states/test_file.py index bb5955c208..c0b4cef469 100644 --- a/tests/unit/states/test_file.py +++ b/tests/unit/states/test_file.py @@ -252,15 +252,24 @@ class TestFileState(TestCase, LoaderModuleMockMixin): with patch.object(os.path, 'isdir', mock_t): with patch.object(os.path, 'exists', mock_f): with patch.object(os.path, 'lexists', mock_t): - comt = ('File exists where the backup target SALT' - ' should go') + comt = ( + 'Symlink & backup dest exists and Force not ' + 'set. {0} -> {1} - backup: {2}'.format( + name, + target, + os.path.join(test_dir, 'SALT') + ) + ) ret.update({'comment': comt, 'result': False, 'pchanges': {'new': name}}) - self.assertDictEqual(filestate.symlink - (name, target, user=user, - group=group, backupname='SALT'), - ret) + self.assertDictEqual( + filestate.symlink( + name, target, user=user, + group=group, backupname='SALT' + ), + ret + ) with patch.dict(filestate.__salt__, {'config.manage_mode': mock_t, 'file.user_to_uid': mock_uid, @@ -270,17 +279,19 @@ class TestFileState(TestCase, LoaderModuleMockMixin): 'user.info': mock_empty, 'user.current': mock_user}): with patch.dict(filestate.__opts__, {'test': False}): - with patch.object(os.path, 'isabs', mock_t): - with patch.object(os.path, 'isabs', mock_f): - comt = ('Backupname must be an absolute path ' - 'or a file name: {0}').format('tmp/SALT') - ret.update({'comment': comt, - 'result': False, - 'pchanges': {'new': name}}) - self.assertDictEqual(filestate.symlink - (name, target, user=user, - group=group, backupname='tmp/SALT'), - ret) + with patch.object(os.path, 'isfile', mock_t): + comt = ('Backupname must be an absolute path ' + 'or a file name: {0}').format('tmp/SALT') + ret.update({'comment': comt, + 'result': False, + 'pchanges': {'new': name}}) + self.assertDictEqual( + filestate.symlink( + name, target, user=user, + group=group, backupname='tmp/SALT' + ), + ret + ) with patch.dict(filestate.__salt__, {'config.manage_mode': mock_t, 'file.user_to_uid': mock_uid, diff --git a/tests/unit/states/test_glusterfs.py b/tests/unit/states/test_glusterfs.py index 472a30bbe2..c1a91ca61d 100644 --- a/tests/unit/states/test_glusterfs.py +++ b/tests/unit/states/test_glusterfs.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_gnomedesktop.py b/tests/unit/states/test_gnomedesktop.py index 70cce89d9d..2e270a8ab3 100644 --- a/tests/unit/states/test_gnomedesktop.py +++ b/tests/unit/states/test_gnomedesktop.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_grafana.py b/tests/unit/states/test_grafana.py index bbad98909e..e39cd7823d 100644 --- a/tests/unit/states/test_grafana.py +++ b/tests/unit/states/test_grafana.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_group.py b/tests/unit/states/test_group.py index a1b9b93026..b91cc5e5b5 100644 --- a/tests/unit/states/test_group.py +++ b/tests/unit/states/test_group.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_hg.py b/tests/unit/states/test_hg.py index 61e5883ae1..0eb00d4d8d 100644 --- a/tests/unit/states/test_hg.py +++ b/tests/unit/states/test_hg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_hipchat.py b/tests/unit/states/test_hipchat.py index eecff6f4c2..722433a4af 100644 --- a/tests/unit/states/test_hipchat.py +++ b/tests/unit/states/test_hipchat.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_host.py b/tests/unit/states/test_host.py index 5909dbf237..5781e94f72 100644 --- a/tests/unit/states/test_host.py +++ b/tests/unit/states/test_host.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_htpasswd.py b/tests/unit/states/test_htpasswd.py index 02e6484728..286d4de190 100644 --- a/tests/unit/states/test_htpasswd.py +++ b/tests/unit/states/test_htpasswd.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Alexander Pyatkin ` + :codeauthor: Alexander Pyatkin ''' # Import Python Libs diff --git a/tests/unit/states/test_http.py b/tests/unit/states/test_http.py index ebd6767a7f..68dcc97174 100644 --- a/tests/unit/states/test_http.py +++ b/tests/unit/states/test_http.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_incron.py b/tests/unit/states/test_incron.py index 3595951694..4fc4983603 100644 --- a/tests/unit/states/test_incron.py +++ b/tests/unit/states/test_incron.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_influxdb08_database.py b/tests/unit/states/test_influxdb08_database.py index a843c3c829..21ee2472dd 100644 --- a/tests/unit/states/test_influxdb08_database.py +++ b/tests/unit/states/test_influxdb08_database.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_influxdb08_user.py b/tests/unit/states/test_influxdb08_user.py index 2b7733a208..ebc596c16c 100644 --- a/tests/unit/states/test_influxdb08_user.py +++ b/tests/unit/states/test_influxdb08_user.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_ini_manage.py b/tests/unit/states/test_ini_manage.py index 3ebc2359b6..bbfa4cbc7f 100644 --- a/tests/unit/states/test_ini_manage.py +++ b/tests/unit/states/test_ini_manage.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals @@ -17,6 +17,8 @@ from tests.support.mock import ( # Import Salt Libs import salt.states.ini_manage as ini_manage +# pylint: disable=no-member + @skipIf(NO_MOCK, NO_MOCK_REASON) class IniManageTestCase(TestCase, LoaderModuleMockMixin): @@ -40,7 +42,7 @@ class IniManageTestCase(TestCase, LoaderModuleMockMixin): 'changes': {}} with patch.dict(ini_manage.__opts__, {'test': True}): - comt = 'No changes detected.' + comt = '' ret.update({'comment': comt, 'result': True}) self.assertDictEqual(ini_manage.options_present(name), ret) @@ -61,7 +63,7 @@ class IniManageTestCase(TestCase, LoaderModuleMockMixin): changes = {'mysection': {'first': 'who is on', 'second': 'what is on', 'third': {'after': None, 'before': "I don't know"}}} - with patch.dict(ini_manage.__salt__, {'ini.get_section': MagicMock(return_value=original['mysection'])}): + with patch.dict(ini_manage.__salt__, {'ini.get_ini': MagicMock(return_value=original)}): with patch.dict(ini_manage.__salt__, {'ini.remove_option': MagicMock(return_value='third')}): with patch.dict(ini_manage.__salt__, {'ini.get_option': MagicMock(return_value="I don't know")}): with patch.dict(ini_manage.__salt__, {'ini.set_option': MagicMock(return_value=desired)}): @@ -107,9 +109,10 @@ class IniManageTestCase(TestCase, LoaderModuleMockMixin): 'changes': {}} with patch.dict(ini_manage.__opts__, {'test': True}): - comt = 'No changes detected.' - ret.update({'comment': comt, 'result': True}) - self.assertDictEqual(ini_manage.sections_present(name), ret) + with patch.dict(ini_manage.__salt__, {'ini.get_ini': MagicMock(return_value=None)}): + comt = 'No changes detected.' + ret.update({'comment': comt, 'result': True}) + self.assertDictEqual(ini_manage.sections_present(name), ret) changes = {'first': 'who is on', 'second': 'what is on', @@ -134,9 +137,10 @@ class IniManageTestCase(TestCase, LoaderModuleMockMixin): 'changes': {}} with patch.dict(ini_manage.__opts__, {'test': True}): - comt = 'No changes detected.' - ret.update({'comment': comt, 'result': True}) - self.assertDictEqual(ini_manage.sections_absent(name), ret) + with patch.dict(ini_manage.__salt__, {'ini.get_ini': MagicMock(return_value=None)}): + comt = 'No changes detected.' + ret.update({'comment': comt, 'result': True}) + self.assertDictEqual(ini_manage.sections_absent(name), ret) with patch.dict(ini_manage.__opts__, {'test': False}): comt = ('No anomaly detected') diff --git a/tests/unit/states/test_ipmi.py b/tests/unit/states/test_ipmi.py index 395ac89add..2b4047d8c3 100644 --- a/tests/unit/states/test_ipmi.py +++ b/tests/unit/states/test_ipmi.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_ipset.py b/tests/unit/states/test_ipset.py index 108d117d47..0a549db376 100644 --- a/tests/unit/states/test_ipset.py +++ b/tests/unit/states/test_ipset.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_iptables.py b/tests/unit/states/test_iptables.py index daf30b2a74..ff96e29d1d 100644 --- a/tests/unit/states/test_iptables.py +++ b/tests/unit/states/test_iptables.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_keyboard.py b/tests/unit/states/test_keyboard.py index dd45e616dd..c1d171d02c 100644 --- a/tests/unit/states/test_keyboard.py +++ b/tests/unit/states/test_keyboard.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_keystone.py b/tests/unit/states/test_keystone.py index 6c1bfdf682..81b0b3edf0 100644 --- a/tests/unit/states/test_keystone.py +++ b/tests/unit/states/test_keystone.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_kmod.py b/tests/unit/states/test_kmod.py index 87729ff3ba..6144e79ff4 100644 --- a/tests/unit/states/test_kmod.py +++ b/tests/unit/states/test_kmod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_layman.py b/tests/unit/states/test_layman.py index d7da4ddfbf..5e446e9c36 100644 --- a/tests/unit/states/test_layman.py +++ b/tests/unit/states/test_layman.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_libcloud_dns.py b/tests/unit/states/test_libcloud_dns.py index ed746a433c..9ff794d4d5 100644 --- a/tests/unit/states/test_libcloud_dns.py +++ b/tests/unit/states/test_libcloud_dns.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Anthony Shaw ` + :codeauthor: Anthony Shaw ''' # Import Python Libs diff --git a/tests/unit/states/test_libvirt.py b/tests/unit/states/test_libvirt.py index 7ac641dcc3..c97f4aad4a 100644 --- a/tests/unit/states/test_libvirt.py +++ b/tests/unit/states/test_libvirt.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' +# pylint: disable=3rd-party-module-not-gated + # Import Python libs from __future__ import absolute_import, print_function, unicode_literals import tempfile @@ -23,13 +25,29 @@ import salt.states.virt as virt import salt.utils.files +class LibvirtMock(MagicMock): # pylint: disable=too-many-ancestors + ''' + libvirt library mockup + ''' + + class libvirtError(Exception): # pylint: disable=invalid-name + ''' + libvirt error mockup + ''' + + @skipIf(NO_MOCK, NO_MOCK_REASON) class LibvirtTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.libvirt ''' def setup_loader_modules(self): - return {virt: {}} + self.mock_libvirt = LibvirtMock() # pylint: disable=attribute-defined-outside-init + self.addCleanup(delattr, self, 'mock_libvirt') + loader_globals = { + 'libvirt': self.mock_libvirt + } + return {virt: loader_globals} @classmethod def setUpClass(cls): @@ -56,17 +74,17 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin): mock = MagicMock(side_effect=[[], ['libvirt.servercert.pem'], {'libvirt.servercert.pem': 'A'}]) - with patch.dict(virt.__salt__, {'pillar.ext': mock}): + with patch.dict(virt.__salt__, {'pillar.ext': mock}): # pylint: disable=no-member comt = ('All keys are correct') ret.update({'comment': comt}) self.assertDictEqual(virt.keys(name, basepath=self.pki_dir), ret) - with patch.dict(virt.__opts__, {'test': True}): + with patch.dict(virt.__opts__, {'test': True}): # pylint: disable=no-member comt = ('Libvirt keys are set to be updated') ret.update({'comment': comt, 'result': None}) self.assertDictEqual(virt.keys(name, basepath=self.pki_dir), ret) - with patch.dict(virt.__opts__, {'test': False}): + with patch.dict(virt.__opts__, {'test': False}): # pylint: disable=no-member with patch.object(salt.utils.files, 'fopen', MagicMock(mock_open())): comt = ('Updated libvirt certs and keys') ret.update({'comment': comt, 'result': True, @@ -87,21 +105,21 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin): mock = MagicMock(side_effect=[[], ['libvirt.servercert.pem'], {'libvirt.servercert.pem': 'A'}]) - with patch.dict(virt.__salt__, {'pillar.ext': mock}): + with patch.dict(virt.__salt__, {'pillar.ext': mock}): # pylint: disable=no-member comt = ('All keys are correct') ret.update({'comment': comt}) self.assertDictEqual(virt.keys(name, basepath=self.pki_dir, expiration_days=700), ret) - with patch.dict(virt.__opts__, {'test': True}): + with patch.dict(virt.__opts__, {'test': True}): # pylint: disable=no-member comt = ('Libvirt keys are set to be updated') ret.update({'comment': comt, 'result': None}) self.assertDictEqual(virt.keys(name, basepath=self.pki_dir, expiration_days=700), ret) - with patch.dict(virt.__opts__, {'test': False}): + with patch.dict(virt.__opts__, {'test': False}): # pylint: disable=no-member with patch.object(salt.utils.files, 'fopen', MagicMock(mock_open())): comt = ('Updated libvirt certs and keys') ret.update({'comment': comt, 'result': True, @@ -124,21 +142,21 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin): mock = MagicMock(side_effect=[[], ['libvirt.servercert.pem'], {'libvirt.servercert.pem': 'A'}]) - with patch.dict(virt.__salt__, {'pillar.ext': mock}): + with patch.dict(virt.__salt__, {'pillar.ext': mock}): # pylint: disable=no-member comt = ('All keys are correct') ret.update({'comment': comt}) self.assertDictEqual(virt.keys(name, basepath=self.pki_dir, st='California'), ret) - with patch.dict(virt.__opts__, {'test': True}): + with patch.dict(virt.__opts__, {'test': True}): # pylint: disable=no-member comt = ('Libvirt keys are set to be updated') ret.update({'comment': comt, 'result': None}) self.assertDictEqual(virt.keys(name, basepath=self.pki_dir, st='California'), ret) - with patch.dict(virt.__opts__, {'test': False}): + with patch.dict(virt.__opts__, {'test': False}): # pylint: disable=no-member with patch.object(salt.utils.files, 'fopen', MagicMock(mock_open())): comt = ('Updated libvirt certs and keys') ret.update({'comment': comt, 'result': True, @@ -161,7 +179,7 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin): mock = MagicMock(side_effect=[[], ['libvirt.servercert.pem'], {'libvirt.servercert.pem': 'A'}]) - with patch.dict(virt.__salt__, {'pillar.ext': mock}): + with patch.dict(virt.__salt__, {'pillar.ext': mock}): # pylint: disable=no-member comt = ('All keys are correct') ret.update({'comment': comt}) self.assertDictEqual(virt.keys(name, @@ -172,7 +190,7 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin): organization='SaltStack', expiration_days=700), ret) - with patch.dict(virt.__opts__, {'test': True}): + with patch.dict(virt.__opts__, {'test': True}): # pylint: disable=no-member comt = ('Libvirt keys are set to be updated') ret.update({'comment': comt, 'result': None}) self.assertDictEqual(virt.keys(name, @@ -183,7 +201,7 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin): organization='SaltStack', expiration_days=700), ret) - with patch.dict(virt.__opts__, {'test': False}): + with patch.dict(virt.__opts__, {'test': False}): # pylint: disable=no-member with patch.object(salt.utils.files, 'fopen', MagicMock(mock_open())): comt = ('Updated libvirt certs and keys') ret.update({'comment': comt, 'result': True, @@ -195,3 +213,26 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin): locality='Los_Angeles', organization='SaltStack', expiration_days=700), ret) + + def test_running(self): + ''' + running state test cases. + ''' + ret = {'name': 'myvm', + 'changes': {}, + 'result': True, + 'comment': 'myvm is running'} + with patch.dict(virt.__salt__, { # pylint: disable=no-member + 'virt.vm_state': MagicMock(return_value='stopped'), + 'virt.start': MagicMock(return_value=0) + }): + ret.update({'changes': {'myvm': 'Domain started'}, + 'comment': 'Domain myvm started'}) + self.assertDictEqual(virt.running('myvm'), ret) + + with patch.dict(virt.__salt__, { # pylint: disable=no-member + 'virt.vm_state': MagicMock(return_value='stopped'), + 'virt.start': MagicMock(side_effect=[self.mock_libvirt.libvirtError('libvirt error msg')]) + }): + ret.update({'changes': {}, 'result': False, 'comment': 'libvirt error msg'}) + self.assertDictEqual(virt.running('myvm'), ret) diff --git a/tests/unit/states/test_linux_acl.py b/tests/unit/states/test_linux_acl.py index 07684d755b..04de066f71 100644 --- a/tests/unit/states/test_linux_acl.py +++ b/tests/unit/states/test_linux_acl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_locale.py b/tests/unit/states/test_locale.py index fb6b1e626a..765cf9414d 100644 --- a/tests/unit/states/test_locale.py +++ b/tests/unit/states/test_locale.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_lvm.py b/tests/unit/states/test_lvm.py index 7daba4cdce..1e1e687ff4 100644 --- a/tests/unit/states/test_lvm.py +++ b/tests/unit/states/test_lvm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_lvs_server.py b/tests/unit/states/test_lvs_server.py index adccc889d0..1707acc7aa 100644 --- a/tests/unit/states/test_lvs_server.py +++ b/tests/unit/states/test_lvs_server.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_lvs_service.py b/tests/unit/states/test_lvs_service.py index 23384fc31c..fb251dac2b 100644 --- a/tests/unit/states/test_lvs_service.py +++ b/tests/unit/states/test_lvs_service.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_lxc.py b/tests/unit/states/test_lxc.py index 1d16dfe5ea..2b0a8e2c10 100644 --- a/tests/unit/states/test_lxc.py +++ b/tests/unit/states/test_lxc.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_makeconf.py b/tests/unit/states/test_makeconf.py index 69620f8021..76d28528d8 100644 --- a/tests/unit/states/test_makeconf.py +++ b/tests/unit/states/test_makeconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import diff --git a/tests/unit/states/test_mdadm.py b/tests/unit/states/test_mdadm.py index 3e0cbdf7ea..5eae1f9fad 100644 --- a/tests/unit/states/test_mdadm.py +++ b/tests/unit/states/test_mdadm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_memcached.py b/tests/unit/states/test_memcached.py index adb4b368cb..cb69f9ee15 100644 --- a/tests/unit/states/test_memcached.py +++ b/tests/unit/states/test_memcached.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import diff --git a/tests/unit/states/test_modjk.py b/tests/unit/states/test_modjk.py index 5f4d091b57..ce7c379dd7 100644 --- a/tests/unit/states/test_modjk.py +++ b/tests/unit/states/test_modjk.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_modjk_worker.py b/tests/unit/states/test_modjk_worker.py index cf3bd708e0..5ac1c6a8e3 100644 --- a/tests/unit/states/test_modjk_worker.py +++ b/tests/unit/states/test_modjk_worker.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_module.py b/tests/unit/states/test_module.py index bf4ddcc5b4..b505e85b90 100644 --- a/tests/unit/states/test_module.py +++ b/tests/unit/states/test_module.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas (nicole@saltstack.com)` + :codeauthor: Nicole Thomas (nicole@saltstack.com) ''' # Import Python Libs diff --git a/tests/unit/states/test_mongodb_database.py b/tests/unit/states/test_mongodb_database.py index 1f318aa44d..5d64ba6a68 100644 --- a/tests/unit/states/test_mongodb_database.py +++ b/tests/unit/states/test_mongodb_database.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_mongodb_user.py b/tests/unit/states/test_mongodb_user.py index a162b9fcea..12f9b249ad 100644 --- a/tests/unit/states/test_mongodb_user.py +++ b/tests/unit/states/test_mongodb_user.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_mount.py b/tests/unit/states/test_mount.py index ec617b4b4c..d71f5fb034 100644 --- a/tests/unit/states/test_mount.py +++ b/tests/unit/states/test_mount.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_mysql_grants.py b/tests/unit/states/test_mysql_grants.py index 81ed29340b..12972dab7d 100644 --- a/tests/unit/states/test_mysql_grants.py +++ b/tests/unit/states/test_mysql_grants.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_mysql_query.py b/tests/unit/states/test_mysql_query.py index 93b7955cc9..5c32e4d1b6 100644 --- a/tests/unit/states/test_mysql_query.py +++ b/tests/unit/states/test_mysql_query.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_mysql_user.py b/tests/unit/states/test_mysql_user.py index 0011eece98..972d87cdbc 100644 --- a/tests/unit/states/test_mysql_user.py +++ b/tests/unit/states/test_mysql_user.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_network.py b/tests/unit/states/test_network.py index 55277bb0f8..e086c5fb0f 100644 --- a/tests/unit/states/test_network.py +++ b/tests/unit/states/test_network.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_nftables.py b/tests/unit/states/test_nftables.py index 98b67801f8..99d3d87e2c 100644 --- a/tests/unit/states/test_nftables.py +++ b/tests/unit/states/test_nftables.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_npm.py b/tests/unit/states/test_npm.py index 64ff71d7ba..3bfb4bc4d8 100644 --- a/tests/unit/states/test_npm.py +++ b/tests/unit/states/test_npm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_ntp.py b/tests/unit/states/test_ntp.py index 610329a048..5c10110941 100644 --- a/tests/unit/states/test_ntp.py +++ b/tests/unit/states/test_ntp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_openstack_config.py b/tests/unit/states/test_openstack_config.py index f0d38a8ea7..5ae0f83d62 100644 --- a/tests/unit/states/test_openstack_config.py +++ b/tests/unit/states/test_openstack_config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_pagerduty.py b/tests/unit/states/test_pagerduty.py index 6342c24dc2..18a16c9ab2 100644 --- a/tests/unit/states/test_pagerduty.py +++ b/tests/unit/states/test_pagerduty.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_pecl.py b/tests/unit/states/test_pecl.py index bd3e9a52e5..8f1dff940f 100644 --- a/tests/unit/states/test_pecl.py +++ b/tests/unit/states/test_pecl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_pip_state.py b/tests/unit/states/test_pip_state.py index a51453efcf..689182d685 100644 --- a/tests/unit/states/test_pip_state.py +++ b/tests/unit/states/test_pip_state.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.states.pip_test diff --git a/tests/unit/states/test_pkgng.py b/tests/unit/states/test_pkgng.py index 98f507e6fb..25398ec266 100644 --- a/tests/unit/states/test_pkgng.py +++ b/tests/unit/states/test_pkgng.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import diff --git a/tests/unit/states/test_portage_config.py b/tests/unit/states/test_portage_config.py index 4858363161..1138939f4b 100644 --- a/tests/unit/states/test_portage_config.py +++ b/tests/unit/states/test_portage_config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_ports.py b/tests/unit/states/test_ports.py index aa7fceba08..3dbdfdbee4 100644 --- a/tests/unit/states/test_ports.py +++ b/tests/unit/states/test_ports.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_postgres_cluster.py b/tests/unit/states/test_postgres_cluster.py index 4bb36f3fcd..9bf6b3b1e2 100644 --- a/tests/unit/states/test_postgres_cluster.py +++ b/tests/unit/states/test_postgres_cluster.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Logilab ` + :codeauthor: Logilab ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_postgres_database.py b/tests/unit/states/test_postgres_database.py index 9f6a3ac3f4..7688787c89 100644 --- a/tests/unit/states/test_postgres_database.py +++ b/tests/unit/states/test_postgres_database.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_postgres_extension.py b/tests/unit/states/test_postgres_extension.py index 147061c7d5..f8bb340ece 100644 --- a/tests/unit/states/test_postgres_extension.py +++ b/tests/unit/states/test_postgres_extension.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_postgres_group.py b/tests/unit/states/test_postgres_group.py index ebdb9ae98d..8948c01a21 100644 --- a/tests/unit/states/test_postgres_group.py +++ b/tests/unit/states/test_postgres_group.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_postgres_initdb.py b/tests/unit/states/test_postgres_initdb.py index 758ef8ab43..9c8088ad03 100644 --- a/tests/unit/states/test_postgres_initdb.py +++ b/tests/unit/states/test_postgres_initdb.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Andrew Colin Kissa ` + :codeauthor: Andrew Colin Kissa ''' from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_postgres_language.py b/tests/unit/states/test_postgres_language.py index 64c9607c13..7a269f9afd 100644 --- a/tests/unit/states/test_postgres_language.py +++ b/tests/unit/states/test_postgres_language.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Andrew Colin Kissa ` + :codeauthor: Andrew Colin Kissa ''' from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_postgres_privileges.py b/tests/unit/states/test_postgres_privileges.py index 1b11b42ed9..ab2dd2d1ab 100644 --- a/tests/unit/states/test_postgres_privileges.py +++ b/tests/unit/states/test_postgres_privileges.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Andrew Colin Kissa ` + :codeauthor: Andrew Colin Kissa ''' from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_postgres_schema.py b/tests/unit/states/test_postgres_schema.py index 608b6b7f23..082135d151 100644 --- a/tests/unit/states/test_postgres_schema.py +++ b/tests/unit/states/test_postgres_schema.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_postgres_user.py b/tests/unit/states/test_postgres_user.py index 1be001cd6f..75b6525b28 100644 --- a/tests/unit/states/test_postgres_user.py +++ b/tests/unit/states/test_postgres_user.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_powerpath.py b/tests/unit/states/test_powerpath.py index 6fcd2a5c18..4f253fe3bd 100644 --- a/tests/unit/states/test_powerpath.py +++ b/tests/unit/states/test_powerpath.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_process.py b/tests/unit/states/test_process.py index c88b62550a..f46005e22a 100644 --- a/tests/unit/states/test_process.py +++ b/tests/unit/states/test_process.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_pyenv.py b/tests/unit/states/test_pyenv.py index e758eb48ba..67248bcdce 100644 --- a/tests/unit/states/test_pyenv.py +++ b/tests/unit/states/test_pyenv.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_pyrax_queues.py b/tests/unit/states/test_pyrax_queues.py index b0c8486447..ede7ee218f 100644 --- a/tests/unit/states/test_pyrax_queues.py +++ b/tests/unit/states/test_pyrax_queues.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_quota.py b/tests/unit/states/test_quota.py index b6ba054a2c..9e30d2d6f0 100644 --- a/tests/unit/states/test_quota.py +++ b/tests/unit/states/test_quota.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_rabbitmq_cluster.py b/tests/unit/states/test_rabbitmq_cluster.py index 3417bc5168..98e4047aa0 100644 --- a/tests/unit/states/test_rabbitmq_cluster.py +++ b/tests/unit/states/test_rabbitmq_cluster.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_rabbitmq_plugin.py b/tests/unit/states/test_rabbitmq_plugin.py index 8b1ce417cd..7a3a9a5ae8 100644 --- a/tests/unit/states/test_rabbitmq_plugin.py +++ b/tests/unit/states/test_rabbitmq_plugin.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_rabbitmq_policy.py b/tests/unit/states/test_rabbitmq_policy.py index 36c35a3278..9707b5ceb4 100644 --- a/tests/unit/states/test_rabbitmq_policy.py +++ b/tests/unit/states/test_rabbitmq_policy.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_rabbitmq_vhost.py b/tests/unit/states/test_rabbitmq_vhost.py index 73b4631df5..550f4a0846 100644 --- a/tests/unit/states/test_rabbitmq_vhost.py +++ b/tests/unit/states/test_rabbitmq_vhost.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_rbenv.py b/tests/unit/states/test_rbenv.py index b381c645db..03cfb06165 100644 --- a/tests/unit/states/test_rbenv.py +++ b/tests/unit/states/test_rbenv.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_rdp.py b/tests/unit/states/test_rdp.py index b296154727..6600570676 100644 --- a/tests/unit/states/test_rdp.py +++ b/tests/unit/states/test_rdp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_redismod.py b/tests/unit/states/test_redismod.py index 3a34e7645b..5e8cac6233 100644 --- a/tests/unit/states/test_redismod.py +++ b/tests/unit/states/test_redismod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_reg.py b/tests/unit/states/test_reg.py index 8f2ca06e5e..5b9bb0d50f 100644 --- a/tests/unit/states/test_reg.py +++ b/tests/unit/states/test_reg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals @@ -48,8 +48,10 @@ class RegTestCase(TestCase, LoaderModuleMockMixin): {'vdata': 'a', 'success': True}, {'vdata': 'a', 'success': True}]) mock_t = MagicMock(return_value=True) + mock_cast = MagicMock(return_value=vdata) with patch.dict(reg.__utils__, {'reg.read_value': mock_read, - 'reg.set_value': mock_t}): + 'reg.set_value': mock_t, + 'reg.cast_vdata': mock_cast}): self.assertDictEqual(reg.present(name, vname=vname, vdata=vdata), ret) diff --git a/tests/unit/states/test_saltmod.py b/tests/unit/states/test_saltmod.py index 2703cc079f..3b214d6fe6 100644 --- a/tests/unit/states/test_saltmod.py +++ b/tests/unit/states/test_saltmod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_schedule.py b/tests/unit/states/test_schedule.py index e7839b82ff..156e0db3f1 100644 --- a/tests/unit/states/test_schedule.py +++ b/tests/unit/states/test_schedule.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_selinux.py b/tests/unit/states/test_selinux.py index df6fb46aef..04b47f6b21 100644 --- a/tests/unit/states/test_selinux.py +++ b/tests/unit/states/test_selinux.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_serverdensity_device.py b/tests/unit/states/test_serverdensity_device.py index 53bfea1669..d75d77ef71 100644 --- a/tests/unit/states/test_serverdensity_device.py +++ b/tests/unit/states/test_serverdensity_device.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_service.py b/tests/unit/states/test_service.py index 1ec2e1e64f..49803ee96b 100644 --- a/tests/unit/states/test_service.py +++ b/tests/unit/states/test_service.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_slack.py b/tests/unit/states/test_slack.py index 02e39765ed..51b8fb99b3 100644 --- a/tests/unit/states/test_slack.py +++ b/tests/unit/states/test_slack.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_smtp.py b/tests/unit/states/test_smtp.py index 64b7ebf699..d05c6d665c 100644 --- a/tests/unit/states/test_smtp.py +++ b/tests/unit/states/test_smtp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_splunk_search.py b/tests/unit/states/test_splunk_search.py index 682a4aa118..62a5a59615 100644 --- a/tests/unit/states/test_splunk_search.py +++ b/tests/unit/states/test_splunk_search.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_ssh_auth.py b/tests/unit/states/test_ssh_auth.py index 9919aa243a..57a7cc99af 100644 --- a/tests/unit/states/test_ssh_auth.py +++ b/tests/unit/states/test_ssh_auth.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_ssh_known_hosts.py b/tests/unit/states/test_ssh_known_hosts.py index e32e489b0f..2fa555c2fb 100644 --- a/tests/unit/states/test_ssh_known_hosts.py +++ b/tests/unit/states/test_ssh_known_hosts.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_status.py b/tests/unit/states/test_status.py index 363fb4d43d..f82e964b93 100644 --- a/tests/unit/states/test_status.py +++ b/tests/unit/states/test_status.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals diff --git a/tests/unit/states/test_supervisord.py b/tests/unit/states/test_supervisord.py index c4a4f010a9..5720e3d7e3 100644 --- a/tests/unit/states/test_supervisord.py +++ b/tests/unit/states/test_supervisord.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_svn.py b/tests/unit/states/test_svn.py index 9b40a6c854..d80855667b 100644 --- a/tests/unit/states/test_svn.py +++ b/tests/unit/states/test_svn.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_sysctl.py b/tests/unit/states/test_sysctl.py index 664dfc1120..0aa532e2f7 100644 --- a/tests/unit/states/test_sysctl.py +++ b/tests/unit/states/test_sysctl.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/states/test_sysrc.py b/tests/unit/states/test_sysrc.py index 7d80c6ec76..946d624c25 100644 --- a/tests/unit/states/test_sysrc.py +++ b/tests/unit/states/test_sysrc.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_test.py b/tests/unit/states/test_test.py index 3615da4b76..c36bd0aa91 100644 --- a/tests/unit/states/test_test.py +++ b/tests/unit/states/test_test.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_timezone.py b/tests/unit/states/test_timezone.py index 2b2970fb67..0d5d3eaa66 100644 --- a/tests/unit/states/test_timezone.py +++ b/tests/unit/states/test_timezone.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_tomcat.py b/tests/unit/states/test_tomcat.py index c578739c21..d3b5b9aaa3 100644 --- a/tests/unit/states/test_tomcat.py +++ b/tests/unit/states/test_tomcat.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_user.py b/tests/unit/states/test_user.py index a295ef656f..9a6effe0ab 100644 --- a/tests/unit/states/test_user.py +++ b/tests/unit/states/test_user.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_vbox_guest.py b/tests/unit/states/test_vbox_guest.py index f83132bd31..e983144296 100644 --- a/tests/unit/states/test_vbox_guest.py +++ b/tests/unit/states/test_vbox_guest.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_virtualenv_mod.py b/tests/unit/states/test_virtualenv_mod.py index a2989d81ec..e0721c1565 100644 --- a/tests/unit/states/test_virtualenv_mod.py +++ b/tests/unit/states/test_virtualenv_mod.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_win_dns_client.py b/tests/unit/states/test_win_dns_client.py index 7651956502..a8552c0467 100644 --- a/tests/unit/states/test_win_dns_client.py +++ b/tests/unit/states/test_win_dns_client.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_win_network.py b/tests/unit/states/test_win_network.py index 16a2e77d66..ede9a897a0 100644 --- a/tests/unit/states/test_win_network.py +++ b/tests/unit/states/test_win_network.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_win_servermanager.py b/tests/unit/states/test_win_servermanager.py index 95f90f9cbd..77fb3c1a0f 100644 --- a/tests/unit/states/test_win_servermanager.py +++ b/tests/unit/states/test_win_servermanager.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_win_system.py b/tests/unit/states/test_win_system.py index 301950653e..f18ea32baa 100644 --- a/tests/unit/states/test_win_system.py +++ b/tests/unit/states/test_win_system.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_winrepo.py b/tests/unit/states/test_winrepo.py index f0e9aef8ae..47fe6d5c6a 100644 --- a/tests/unit/states/test_winrepo.py +++ b/tests/unit/states/test_winrepo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_xmpp.py b/tests/unit/states/test_xmpp.py index f31b94e580..ee33587a35 100644 --- a/tests/unit/states/test_xmpp.py +++ b/tests/unit/states/test_xmpp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Rahul Handay ` + :codeauthor: Rahul Handay ''' # Import Python Libs diff --git a/tests/unit/states/test_zk_concurrency.py b/tests/unit/states/test_zk_concurrency.py index 3ec441c6e5..278320b541 100644 --- a/tests/unit/states/test_zk_concurrency.py +++ b/tests/unit/states/test_zk_concurrency.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python libs from __future__ import absolute_import, unicode_literals, print_function diff --git a/tests/unit/templates/files/rescape b/tests/unit/templates/files/rescape new file mode 100644 index 0000000000..d77a94dcf0 --- /dev/null +++ b/tests/unit/templates/files/rescape @@ -0,0 +1 @@ +FAILURE diff --git a/tests/unit/templates/files/test/relative/rescape b/tests/unit/templates/files/test/relative/rescape new file mode 100644 index 0000000000..4c18d6dc42 --- /dev/null +++ b/tests/unit/templates/files/test/relative/rescape @@ -0,0 +1 @@ +{% import '../../rescape' as xfail -%} diff --git a/tests/unit/templates/files/test/relative/rhello b/tests/unit/templates/files/test/relative/rhello new file mode 100644 index 0000000000..beab248763 --- /dev/null +++ b/tests/unit/templates/files/test/relative/rhello @@ -0,0 +1,2 @@ +{% from './rmacro' import rmacro with context -%} +{{ rmacro('Hey') ~ rmacro(a|default('a'), b|default('b')) }} diff --git a/tests/unit/templates/files/test/relative/rmacro b/tests/unit/templates/files/test/relative/rmacro new file mode 100644 index 0000000000..0827c4540f --- /dev/null +++ b/tests/unit/templates/files/test/relative/rmacro @@ -0,0 +1,4 @@ +{% from '../macro' import mymacro with context %} +{% macro rmacro(greeting, greetee='world') -%} +{{ mymacro(greeting, greetee) }} +{%- endmacro %} diff --git a/tests/unit/templates/test_jinja.py b/tests/unit/templates/test_jinja.py index b06f74010a..3cb1f595ce 100644 --- a/tests/unit/templates/test_jinja.py +++ b/tests/unit/templates/test_jinja.py @@ -170,6 +170,23 @@ class TestSaltCacheLoader(TestCase): self.assertEqual(fc.requests[0]['path'], 'salt://hello_import') self.assertEqual(fc.requests[1]['path'], 'salt://macro') + def test_relative_import(self): + ''' + You can import using relative paths + issue-13889 + ''' + fc, jinja = self.get_test_saltenv() + tmpl = jinja.get_template('relative/rhello') + result = tmpl.render() + self.assertEqual(result, 'Hey world !a b !') + assert len(fc.requests) == 3 + self.assertEqual(fc.requests[0]['path'], 'salt://relative/rhello') + self.assertEqual(fc.requests[1]['path'], 'salt://relative/rmacro') + self.assertEqual(fc.requests[2]['path'], 'salt://macro') + # This must fail when rendered: attempts to import from outside file root + template = jinja.get_template('relative/rescape') + self.assertRaises(exceptions.TemplateNotFound, template.render) + def test_include(self): ''' You can also include a template that imports and uses macros @@ -732,7 +749,7 @@ class TestCustomExtensions(TestCase): '{{ document.foo }}').render(document="{foo: it works}") self.assertEqual(rendered, "it works") - with self.assertRaises(exceptions.TemplateRuntimeError): + with self.assertRaises((TypeError, exceptions.TemplateRuntimeError)): env.from_string('{% set document = document|load_yaml %}' '{{ document.foo }}').render(document={"foo": "it works"}) diff --git a/tests/unit/test_auth.py b/tests/unit/test_auth.py index 2194dd67cd..5d88e82077 100644 --- a/tests/unit/test_auth.py +++ b/tests/unit/test_auth.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place ` + :codeauthor: Mike Place ''' # Import pytohn libs diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py index f38eabb073..08f27f5bd5 100644 --- a/tests/unit/test_client.py +++ b/tests/unit/test_client.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place ` + :codeauthor: Mike Place ''' # Import python libs diff --git a/tests/unit/test_crypt.py b/tests/unit/test_crypt.py index 9499fd9fd5..a6d138fc9c 100644 --- a/tests/unit/test_crypt.py +++ b/tests/unit/test_crypt.py @@ -8,7 +8,14 @@ import shutil # salt testing libs from tests.support.unit import TestCase, skipIf -from tests.support.mock import patch, call, mock_open, NO_MOCK, NO_MOCK_REASON, MagicMock +from tests.support.mock import( + patch, + mock_open, + NO_MOCK, + NO_MOCK_REASON, + MagicMock, + MockCall, +) # salt libs from salt.ext import six @@ -96,19 +103,23 @@ SIG = ( @skipIf(HAS_M2, 'm2crypto is used by salt.crypt if installed') class CryptTestCase(TestCase): def test_gen_keys(self): + open_priv_wb = MockCall('/keydir{0}keyname.pem'.format(os.sep), 'wb+') + open_pub_wb = MockCall('/keydir{0}keyname.pub'.format(os.sep), 'wb+') + with patch.multiple(os, umask=MagicMock(), chmod=MagicMock(), access=MagicMock(return_value=True)): - with patch('salt.utils.files.fopen', mock_open()): - open_priv_wb = call('/keydir{0}keyname.pem'.format(os.sep), 'wb+') - open_pub_wb = call('/keydir{0}keyname.pub'.format(os.sep), 'wb+') - with patch('os.path.isfile', return_value=True): - self.assertEqual(crypt.gen_keys('/keydir', 'keyname', 2048), '/keydir{0}keyname.pem'.format(os.sep)) - self.assertNotIn(open_priv_wb, salt.utils.files.fopen.mock_calls) - self.assertNotIn(open_pub_wb, salt.utils.files.fopen.mock_calls) - with patch('os.path.isfile', return_value=False): - with patch('salt.utils.files.fopen', mock_open()): - crypt.gen_keys('/keydir', 'keyname', 2048) - salt.utils.files.fopen.assert_has_calls([open_priv_wb, open_pub_wb], any_order=True) + with patch('salt.utils.files.fopen', mock_open()) as m_open, \ + patch('os.path.isfile', return_value=True): + result = crypt.gen_keys('/keydir', 'keyname', 2048) + assert result == '/keydir{0}keyname.pem'.format(os.sep), result + assert open_priv_wb not in m_open.calls + assert open_pub_wb not in m_open.calls + + with patch('salt.utils.files.fopen', mock_open()) as m_open, \ + patch('os.path.isfile', return_value=False): + crypt.gen_keys('/keydir', 'keyname', 2048) + assert open_priv_wb in m_open.calls + assert open_pub_wb in m_open.calls @patch('os.umask', MagicMock()) @patch('os.chmod', MagicMock()) @@ -116,17 +127,23 @@ class CryptTestCase(TestCase): @patch('os.access', MagicMock(return_value=True)) def test_gen_keys_with_passphrase(self): key_path = os.path.join(os.sep, 'keydir') - with patch('salt.utils.files.fopen', mock_open()): - open_priv_wb = call(os.path.join(key_path, 'keyname.pem'), 'wb+') - open_pub_wb = call(os.path.join(key_path, 'keyname.pub'), 'wb+') - with patch('os.path.isfile', return_value=True): - self.assertEqual(crypt.gen_keys(key_path, 'keyname', 2048, passphrase='password'), os.path.join(key_path, 'keyname.pem')) - self.assertNotIn(open_priv_wb, salt.utils.files.fopen.mock_calls) - self.assertNotIn(open_pub_wb, salt.utils.files.fopen.mock_calls) - with patch('os.path.isfile', return_value=False): - with patch('salt.utils.files.fopen', mock_open()): - crypt.gen_keys(key_path, 'keyname', 2048) - salt.utils.files.fopen.assert_has_calls([open_priv_wb, open_pub_wb], any_order=True) + open_priv_wb = MockCall(os.path.join(key_path, 'keyname.pem'), 'wb+') + open_pub_wb = MockCall(os.path.join(key_path, 'keyname.pub'), 'wb+') + + with patch('salt.utils.files.fopen', mock_open()) as m_open, \ + patch('os.path.isfile', return_value=True): + self.assertEqual(crypt.gen_keys(key_path, 'keyname', 2048, passphrase='password'), os.path.join(key_path, 'keyname.pem')) + result = crypt.gen_keys(key_path, 'keyname', 2048, + passphrase='password') + assert result == os.path.join(key_path, 'keyname.pem'), result + assert open_priv_wb not in m_open.calls + assert open_pub_wb not in m_open.calls + + with patch('salt.utils.files.fopen', mock_open()) as m_open, \ + patch('os.path.isfile', return_value=False): + crypt.gen_keys(key_path, 'keyname', 2048) + assert open_priv_wb in m_open.calls + assert open_pub_wb in m_open.calls def test_sign_message(self): key = RSA.importKey(PRIVKEY_DATA) diff --git a/tests/unit/test_doc.py b/tests/unit/test_doc.py index 4cd4caeb96..2e14e68cd1 100644 --- a/tests/unit/test_doc.py +++ b/tests/unit/test_doc.py @@ -59,9 +59,11 @@ class DocTestCase(TestCase): key, val = regex.split(line, 1) # Don't test man pages, this file, - # the page that documents to not use ":doc:", or - # the doc/conf.py file + # the tox virtualenv files, the page + # that documents to not use ":doc:", + # or the doc/conf.py file if 'man' in key \ + or '.tox/' in key \ or key.endswith('test_doc.py') \ or key.endswith(os.sep.join(['doc', 'conf.py'])) \ or key.endswith(os.sep.join(['conventions', 'documentation.rst'])) \ diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py index aeef062b1c..501ace8cc5 100644 --- a/tests/unit/test_log.py +++ b/tests/unit/test_log.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.log_test diff --git a/tests/unit/test_minion.py b/tests/unit/test_minion.py index 140a6924e0..808bc78fa2 100644 --- a/tests/unit/test_minion.py +++ b/tests/unit/test_minion.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place ` + :codeauthor: Mike Place ''' # Import python libs @@ -230,10 +230,10 @@ class MinionTestCase(TestCase, AdaptedConfigurationTestCaseMixin): try: # mock gen.sleep to throw a special Exception when called, so that we detect it - class SleepCalledEception(Exception): + class SleepCalledException(Exception): """Thrown when sleep is called""" pass - tornado.gen.sleep.return_value.set_exception(SleepCalledEception()) + tornado.gen.sleep.return_value.set_exception(SleepCalledException()) # up until process_count_max: gen.sleep does not get called, processes are started normally for i in range(process_count_max): @@ -248,7 +248,7 @@ class MinionTestCase(TestCase, AdaptedConfigurationTestCaseMixin): mock_data = {'fun': 'foo.bar', 'jid': process_count_max + 1} - self.assertRaises(SleepCalledEception, + self.assertRaises(SleepCalledException, lambda: io_loop.run_sync(lambda: minion._handle_decoded_payload(mock_data))) self.assertEqual(salt.utils.process.SignalHandlingMultiprocessingProcess.start.call_count, process_count_max) diff --git a/tests/unit/test_mock.py b/tests/unit/test_mock.py new file mode 100644 index 0000000000..96c86599b7 --- /dev/null +++ b/tests/unit/test_mock.py @@ -0,0 +1,785 @@ +# -*- coding: utf-8 -*- +''' +Tests for our mock_open helper +''' +# Import Python Libs +from __future__ import absolute_import, unicode_literals, print_function +import errno +import logging +import textwrap + +# Import Salt libs +import salt.utils.data +import salt.utils.files +import salt.utils.stringutils +from salt.ext import six + +# Import Salt Testing Libs +from tests.support.mock import patch, mock_open, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase, skipIf + +log = logging.getLogger(__name__) + + +class MockOpenMixin(object): + def _get_values(self, binary=False, multifile=False, split=False): + if split: + questions = (self.questions_bytes_lines if binary + else self.questions_str_lines) + answers = (self.answers_bytes_lines if binary + else self.answers_str_lines) + else: + questions = self.questions_bytes if binary else self.questions_str + answers = self.answers_bytes if binary else self.answers_str + mode = 'rb' if binary else 'r' + if multifile: + read_data = self.contents_bytes if binary else self.contents + else: + read_data = self.questions_bytes if binary else self.questions + return questions, answers, mode, read_data + + def _test_read(self, binary=False, multifile=False): + questions, answers, mode, read_data = \ + self._get_values(binary=binary, multifile=multifile) + + with patch('salt.utils.files.fopen', mock_open(read_data=read_data)): + with salt.utils.files.fopen('foo.txt', mode) as self.fh: + result = self.fh.read() + assert result == questions, result + + if multifile: + with salt.utils.files.fopen('bar.txt', mode) as self.fh2: + result = self.fh2.read() + assert result == answers, result + + with salt.utils.files.fopen('baz.txt', mode) as self.fh3: + result = self.fh3.read() + assert result == answers, result + + try: + with salt.utils.files.fopen('helloworld.txt'): + raise Exception('No patterns should have matched') + except IOError: + # An IOError is expected here + pass + + def _test_read_explicit_size(self, binary=False, multifile=False): + questions, answers, mode, read_data = \ + self._get_values(binary=binary, multifile=multifile) + + with patch('salt.utils.files.fopen', mock_open(read_data=read_data)): + with salt.utils.files.fopen('foo.txt', mode) as self.fh: + # Read 10 bytes + result = self.fh.read(10) + assert result == questions[:10], result + # Read another 10 bytes + result = self.fh.read(10) + assert result == questions[10:20], result + # Read the rest + result = self.fh.read() + assert result == questions[20:], result + + if multifile: + with salt.utils.files.fopen('bar.txt', mode) as self.fh2: + # Read 10 bytes + result = self.fh2.read(10) + assert result == answers[:10], result + # Read another 10 bytes + result = self.fh2.read(10) + assert result == answers[10:20], result + # Read the rest + result = self.fh2.read() + assert result == answers[20:], result + + with salt.utils.files.fopen('baz.txt', mode) as self.fh3: + # Read 10 bytes + result = self.fh3.read(10) + assert result == answers[:10], result + # Read another 10 bytes + result = self.fh3.read(10) + assert result == answers[10:20], result + # Read the rest + result = self.fh3.read() + assert result == answers[20:], result + + try: + with salt.utils.files.fopen('helloworld.txt'): + raise Exception('No globs should have matched') + except IOError: + # An IOError is expected here + pass + + def _test_read_explicit_size_larger_than_file_size(self, + binary=False, + multifile=False): + questions, answers, mode, read_data = \ + self._get_values(binary=binary, multifile=multifile) + + with patch('salt.utils.files.fopen', mock_open(read_data=read_data)): + with salt.utils.files.fopen('foo.txt', mode) as self.fh: + result = self.fh.read(999999) + assert result == questions, result + + if multifile: + with salt.utils.files.fopen('bar.txt', mode) as self.fh2: + result = self.fh2.read(999999) + assert result == answers, result + + with salt.utils.files.fopen('baz.txt', mode) as self.fh3: + result = self.fh3.read(999999) + assert result == answers, result + + try: + with salt.utils.files.fopen('helloworld.txt'): + raise Exception('No globs should have matched') + except IOError: + # An IOError is expected here + pass + + def _test_read_for_loop(self, binary=False, multifile=False): + questions, answers, mode, read_data = \ + self._get_values(binary=binary, multifile=multifile, split=True) + + with patch('salt.utils.files.fopen', mock_open(read_data=read_data)): + with salt.utils.files.fopen('foo.txt', mode) as self.fh: + index = 0 + for line in self.fh: + assert line == questions[index], \ + 'Line {0}: {1}'.format(index, line) + index += 1 + + if multifile: + with salt.utils.files.fopen('bar.txt', mode) as self.fh2: + index = 0 + for line in self.fh2: + assert line == answers[index], \ + 'Line {0}: {1}'.format(index, line) + index += 1 + + with salt.utils.files.fopen('baz.txt', mode) as self.fh3: + index = 0 + for line in self.fh3: + assert line == answers[index], \ + 'Line {0}: {1}'.format(index, line) + index += 1 + + try: + with salt.utils.files.fopen('helloworld.txt'): + raise Exception('No globs should have matched') + except IOError: + # An IOError is expected here + pass + + def _test_read_readline(self, binary=False, multifile=False): + questions, answers, mode, read_data = \ + self._get_values(binary=binary, multifile=multifile, split=True) + + with patch('salt.utils.files.fopen', mock_open(read_data=read_data)): + with salt.utils.files.fopen('foo.txt', mode) as self.fh: + size = 8 + result = self.fh.read(size) + assert result == questions[0][:size], result + # Use .readline() to read the remainder of the line + result = self.fh.readline() + assert result == questions[0][size:], result + # Read and check the other two lines + result = self.fh.readline() + assert result == questions[1], result + result = self.fh.readline() + assert result == questions[2], result + + if multifile: + with salt.utils.files.fopen('bar.txt', mode) as self.fh2: + size = 20 + result = self.fh2.read(size) + assert result == answers[0][:size], result + # Use .readline() to read the remainder of the line + result = self.fh2.readline() + assert result == answers[0][size:], result + # Read and check the other two lines + result = self.fh2.readline() + assert result == answers[1], result + result = self.fh2.readline() + assert result == answers[2], result + + with salt.utils.files.fopen('baz.txt', mode) as self.fh3: + size = 20 + result = self.fh3.read(size) + assert result == answers[0][:size], result + # Use .readline() to read the remainder of the line + result = self.fh3.readline() + assert result == answers[0][size:], result + # Read and check the other two lines + result = self.fh3.readline() + assert result == answers[1], result + result = self.fh3.readline() + assert result == answers[2], result + + try: + with salt.utils.files.fopen('helloworld.txt'): + raise Exception('No globs should have matched') + except IOError: + # An IOError is expected here + pass + + def _test_readline_readlines(self, binary=False, multifile=False): + questions, answers, mode, read_data = \ + self._get_values(binary=binary, multifile=multifile, split=True) + + with patch('salt.utils.files.fopen', mock_open(read_data=read_data)): + with salt.utils.files.fopen('foo.txt', mode) as self.fh: + # Read the first line + result = self.fh.readline() + assert result == questions[0], result + # Use .readlines() to read the remainder of the file + result = self.fh.readlines() + assert result == questions[1:], result + + if multifile: + with salt.utils.files.fopen('bar.txt', mode) as self.fh2: + # Read the first line + result = self.fh2.readline() + assert result == answers[0], result + # Use .readlines() to read the remainder of the file + result = self.fh2.readlines() + assert result == answers[1:], result + + with salt.utils.files.fopen('baz.txt', mode) as self.fh3: + # Read the first line + result = self.fh3.readline() + assert result == answers[0], result + # Use .readlines() to read the remainder of the file + result = self.fh3.readlines() + assert result == answers[1:], result + + try: + with salt.utils.files.fopen('helloworld.txt'): + raise Exception('No globs should have matched') + except IOError: + # An IOError is expected here + pass + + def _test_readlines_multifile(self, binary=False, multifile=False): + questions, answers, mode, read_data = \ + self._get_values(binary=binary, multifile=multifile, split=True) + + with patch('salt.utils.files.fopen', mock_open(read_data=read_data)): + with salt.utils.files.fopen('foo.txt', mode) as self.fh: + result = self.fh.readlines() + assert result == questions, result + + if multifile: + with salt.utils.files.fopen('bar.txt', mode) as self.fh2: + result = self.fh2.readlines() + assert result == answers, result + + with salt.utils.files.fopen('baz.txt', mode) as self.fh3: + result = self.fh3.readlines() + assert result == answers, result + + try: + with salt.utils.files.fopen('helloworld.txt'): + raise Exception('No globs should have matched') + except IOError: + # An IOError is expected here + pass + + +@skipIf(NO_MOCK, NO_MOCK_REASON) +class MockOpenTestCase(TestCase, MockOpenMixin): + ''' + Tests for our mock_open helper to ensure that it behaves as closely as + possible to a real filehandle. + ''' + + # Cyrllic characters used to test unicode handling + questions = textwrap.dedent('''\ + Шнат is your name? + Шнат is your quest? + Шнат is the airspeed velocity of an unladen swallow? + ''') + + answers = textwrap.dedent('''\ + It is Аятнця, King of the Britons. + To seek тне Holy Grail. + Шнат do you mean? An African or European swallow? + ''') + + @classmethod + def setUpClass(cls): + cls.questions_lines = cls.questions.splitlines(True) + cls.answers_lines = cls.answers.splitlines(True) + + cls.questions_str = salt.utils.stringutils.to_str(cls.questions) + cls.answers_str = salt.utils.stringutils.to_str(cls.answers) + cls.questions_str_lines = cls.questions_str.splitlines(True) + cls.answers_str_lines = cls.answers_str.splitlines(True) + + cls.questions_bytes = salt.utils.stringutils.to_bytes(cls.questions) + cls.answers_bytes = salt.utils.stringutils.to_bytes(cls.answers) + cls.questions_bytes_lines = cls.questions_bytes.splitlines(True) + cls.answers_bytes_lines = cls.answers_bytes.splitlines(True) + + # When this is used as the read_data, Python 2 should normalize + # cls.questions and cls.answers to str types. + cls.contents = {'foo.txt': cls.questions, + 'b*.txt': cls.answers} + cls.contents_bytes = {'foo.txt': cls.questions_bytes, + 'b*.txt': cls.answers_bytes} + + cls.read_data_as_list = [ + 'foo', 'bar', 'спам', + IOError(errno.EACCES, 'Permission denied') + ] + cls.normalized_read_data_as_list = salt.utils.data.decode( + cls.read_data_as_list, + to_str=True + ) + cls.read_data_as_list_bytes = salt.utils.data.encode(cls.read_data_as_list) + + def tearDown(self): + ''' + Each test should read the entire contents of the mocked filehandle(s). + This confirms that the other read functions return empty strings/lists, + to simulate being at EOF. + ''' + for handle_name in ('fh', 'fh2', 'fh3'): + try: + fh = getattr(self, handle_name) + except AttributeError: + continue + log.debug('Running tearDown tests for self.%s', handle_name) + try: + result = fh.read(5) + assert not result, result + result = fh.read() + assert not result, result + result = fh.readline() + assert not result, result + result = fh.readlines() + assert not result, result + # Last but not least, try to read using a for loop. This should not + # read anything as we should hit EOF immediately, before the generator + # in the mocked filehandle has a chance to yield anything. So the + # exception will only be raised if we aren't at EOF already. + for line in fh: + raise Exception( + 'Instead of EOF, read the following from {0}: {1}'.format( + handle_name, + line + ) + ) + except IOError as exc: + if six.text_type(exc) != 'File not open for reading': + raise + del fh + + def test_read(self): + ''' + Test reading the entire file + ''' + self._test_read(binary=False, multifile=False) + self._test_read(binary=True, multifile=False) + self._test_read(binary=False, multifile=True) + self._test_read(binary=True, multifile=True) + + def test_read_explicit_size(self): + ''' + Test reading with explicit sizes + ''' + self._test_read_explicit_size(binary=False, multifile=False) + self._test_read_explicit_size(binary=True, multifile=False) + self._test_read_explicit_size(binary=False, multifile=True) + self._test_read_explicit_size(binary=True, multifile=True) + + def test_read_explicit_size_larger_than_file_size(self): + ''' + Test reading with an explicit size larger than the size of read_data. + This ensures that we just return the contents up until EOF and that we + don't raise any errors due to the desired size being larger than the + mocked file's size. + ''' + self._test_read_explicit_size_larger_than_file_size( + binary=False, multifile=False) + self._test_read_explicit_size_larger_than_file_size( + binary=True, multifile=False) + self._test_read_explicit_size_larger_than_file_size( + binary=False, multifile=True) + self._test_read_explicit_size_larger_than_file_size( + binary=True, multifile=True) + + def test_read_for_loop(self): + ''' + Test reading the contents of the file line by line in a for loop + ''' + self._test_read_for_loop(binary=False, multifile=False) + self._test_read_for_loop(binary=True, multifile=False) + self._test_read_for_loop(binary=False, multifile=True) + self._test_read_for_loop(binary=True, multifile=True) + + def test_read_readline(self): + ''' + Test reading part of a line using .read(), then reading the rest of the + line (and subsequent lines) using .readline(). + ''' + self._test_read_readline(binary=False, multifile=False) + self._test_read_readline(binary=True, multifile=False) + self._test_read_readline(binary=False, multifile=True) + self._test_read_readline(binary=True, multifile=True) + + def test_readline_readlines(self): + ''' + Test reading the first line using .readline(), then reading the rest of + the file using .readlines(). + ''' + self._test_readline_readlines(binary=False, multifile=False) + self._test_readline_readlines(binary=True, multifile=False) + self._test_readline_readlines(binary=False, multifile=True) + self._test_readline_readlines(binary=True, multifile=True) + + def test_readlines(self): + ''' + Test reading the entire file using .readlines + ''' + self._test_readlines_multifile(binary=False, multifile=False) + self._test_readlines_multifile(binary=True, multifile=False) + self._test_readlines_multifile(binary=False, multifile=True) + self._test_readlines_multifile(binary=True, multifile=True) + + def test_read_data_converted_to_dict(self): + ''' + Test that a non-dict value for read_data is converted to a dict mapping + '*' to that value. + ''' + contents = 'спам' + normalized = salt.utils.stringutils.to_str(contents) + with patch('salt.utils.files.fopen', + mock_open(read_data=contents)) as m_open: + assert m_open.read_data == {'*': normalized}, m_open.read_data + + with patch('salt.utils.files.fopen', + mock_open(read_data=self.read_data_as_list)) as m_open: + assert m_open.read_data == { + '*': self.normalized_read_data_as_list, + }, m_open.read_data + + def test_read_data_list(self): + ''' + Test read_data when it is a list + ''' + with patch('salt.utils.files.fopen', + mock_open(read_data=self.read_data_as_list)): + for value in self.normalized_read_data_as_list: + try: + with salt.utils.files.fopen('foo.txt') as self.fh: + result = self.fh.read() + assert result == value, result + except IOError: + # Only raise the caught exception if it wasn't expected + # (i.e. if value is not an exception) + if not isinstance(value, IOError): + raise + + def test_read_data_list_bytes(self): + ''' + Test read_data when it is a list and the value is a bytestring + ''' + with patch('salt.utils.files.fopen', + mock_open(read_data=self.read_data_as_list_bytes)): + for value in self.read_data_as_list_bytes: + try: + with salt.utils.files.fopen('foo.txt', 'rb') as self.fh: + result = self.fh.read() + assert result == value, result + except IOError: + # Only raise the caught exception if it wasn't expected + # (i.e. if value is not an exception) + if not isinstance(value, IOError): + raise + + def test_tell(self): + ''' + Test the implementation of tell + ''' + with patch('salt.utils.files.fopen', + mock_open(read_data=self.contents)): + # Try with reading explicit sizes and then reading the rest of the + # file. + with salt.utils.files.fopen('foo.txt') as self.fh: + self.fh.read(5) + loc = self.fh.tell() + assert loc == 5, loc + self.fh.read(12) + loc = self.fh.tell() + assert loc == 17, loc + self.fh.read() + loc = self.fh.tell() + assert loc == len(self.questions_str), loc + + # Try reading way more content then actually exists in the file, + # tell() should return a value equal to the length of the content + with salt.utils.files.fopen('foo.txt') as self.fh: + self.fh.read(999999) + loc = self.fh.tell() + assert loc == len(self.questions_str), loc + + # Try reading a few bytes using .read(), then the rest of the line + # using .readline(), then the rest of the file using .readlines(), + # and check the location after each read. + with salt.utils.files.fopen('foo.txt') as self.fh: + # Read a few bytes + self.fh.read(5) + loc = self.fh.tell() + assert loc == 5, loc + # Read the rest of the line. Location should then be at the end + # of the first line. + self.fh.readline() + loc = self.fh.tell() + assert loc == len(self.questions_str_lines[0]), loc + # Read the rest of the file using .readlines() + self.fh.readlines() + loc = self.fh.tell() + assert loc == len(self.questions_str), loc + + # Check location while iterating through the filehandle + with salt.utils.files.fopen('foo.txt') as self.fh: + index = 0 + for _ in self.fh: + index += 1 + loc = self.fh.tell() + assert loc == sum( + len(x) for x in self.questions_str_lines[:index] + ), loc + + def test_write(self): + ''' + Test writing to a filehandle using .write() + ''' + # Test opening for non-binary writing + with patch('salt.utils.files.fopen', mock_open()): + with salt.utils.files.fopen('foo.txt', 'w') as self.fh: + for line in self.questions_str_lines: + self.fh.write(line) + assert self.fh.write_calls == self.questions_str_lines, self.fh.write_calls + + # Test opening for binary writing using "wb" + with patch('salt.utils.files.fopen', mock_open(read_data=b'')): + with salt.utils.files.fopen('foo.txt', 'wb') as self.fh: + for line in self.questions_bytes_lines: + self.fh.write(line) + assert self.fh.write_calls == self.questions_bytes_lines, self.fh.write_calls + + # Test opening for binary writing using "ab" + with patch('salt.utils.files.fopen', mock_open(read_data=b'')): + with salt.utils.files.fopen('foo.txt', 'ab') as self.fh: + for line in self.questions_bytes_lines: + self.fh.write(line) + assert self.fh.write_calls == self.questions_bytes_lines, self.fh.write_calls + + # Test opening for read-and-write using "r+b" + with patch('salt.utils.files.fopen', mock_open(read_data=b'')): + with salt.utils.files.fopen('foo.txt', 'r+b') as self.fh: + for line in self.questions_bytes_lines: + self.fh.write(line) + assert self.fh.write_calls == self.questions_bytes_lines, self.fh.write_calls + + # Test trying to write str types to a binary filehandle + with patch('salt.utils.files.fopen', mock_open(read_data=b'')): + with salt.utils.files.fopen('foo.txt', 'wb') as self.fh: + try: + self.fh.write('foo\n') + except TypeError: + # This exception is expected on Python 3 + if not six.PY3: + raise + else: + # This write should work fine on Python 2 + if six.PY3: + raise Exception( + 'Should not have been able to write a str to a ' + 'binary filehandle' + ) + + if six.PY2: + # Try with non-ascii unicode. Note that the write above + # should work because the mocked filehandle should attempt + # a .encode() to convert it to a str type. But when writing + # a string with non-ascii unicode, it should raise a + # UnicodeEncodeError, which is what we are testing here. + try: + self.fh.write(self.questions) + except UnicodeEncodeError: + pass + else: + raise Exception( + 'Should not have been able to write non-ascii ' + 'unicode to a binary filehandle' + ) + + # Test trying to write bytestrings to a non-binary filehandle + with patch('salt.utils.files.fopen', mock_open()): + with salt.utils.files.fopen('foo.txt', 'w') as self.fh: + try: + self.fh.write(b'foo\n') + except TypeError: + # This exception is expected on Python 3 + if not six.PY3: + raise + else: + # This write should work fine on Python 2 + if six.PY3: + raise Exception( + 'Should not have been able to write a bytestring ' + 'to a non-binary filehandle' + ) + + if six.PY2: + # Try with non-ascii unicode. Note that the write above + # should work because the mocked filehandle should attempt + # a .encode() to convert it to a str type. But when writing + # a string with non-ascii unicode, it should raise a + # UnicodeEncodeError, which is what we are testing here. + try: + self.fh.write(self.questions) + except UnicodeEncodeError: + pass + else: + raise Exception( + 'Should not have been able to write non-ascii ' + 'unicode to a binary filehandle' + ) + + def test_writelines(self): + ''' + Test writing to a filehandle using .writelines() + ''' + # Test opening for non-binary writing + with patch('salt.utils.files.fopen', mock_open()): + with salt.utils.files.fopen('foo.txt', 'w') as self.fh: + self.fh.writelines(self.questions_str_lines) + assert self.fh.writelines_calls == [self.questions_str_lines], self.fh.writelines_calls + + # Test opening for binary writing using "wb" + with patch('salt.utils.files.fopen', mock_open(read_data=b'')): + with salt.utils.files.fopen('foo.txt', 'wb') as self.fh: + self.fh.writelines(self.questions_bytes_lines) + assert self.fh.writelines_calls == [self.questions_bytes_lines], self.fh.writelines_calls + + # Test opening for binary writing using "ab" + with patch('salt.utils.files.fopen', mock_open(read_data=b'')): + with salt.utils.files.fopen('foo.txt', 'ab') as self.fh: + self.fh.writelines(self.questions_bytes_lines) + assert self.fh.writelines_calls == [self.questions_bytes_lines], self.fh.writelines_calls + + # Test opening for read-and-write using "r+b" + with patch('salt.utils.files.fopen', mock_open(read_data=b'')): + with salt.utils.files.fopen('foo.txt', 'r+b') as self.fh: + self.fh.writelines(self.questions_bytes_lines) + assert self.fh.writelines_calls == [self.questions_bytes_lines], self.fh.writelines_calls + + # Test trying to write str types to a binary filehandle + with patch('salt.utils.files.fopen', mock_open(read_data=b'')): + with salt.utils.files.fopen('foo.txt', 'wb') as self.fh: + try: + self.fh.writelines(['foo\n']) + except TypeError: + # This exception is expected on Python 3 + if not six.PY3: + raise + else: + # This write should work fine on Python 2 + if six.PY3: + raise Exception( + 'Should not have been able to write a str to a ' + 'binary filehandle' + ) + + if six.PY2: + # Try with non-ascii unicode. Note that the write above + # should work because the mocked filehandle should attempt + # a .encode() to convert it to a str type. But when writing + # a string with non-ascii unicode, it should raise a + # UnicodeEncodeError, which is what we are testing here. + try: + self.fh.writelines(self.questions_lines) + except UnicodeEncodeError: + pass + else: + raise Exception( + 'Should not have been able to write non-ascii ' + 'unicode to a binary filehandle' + ) + + # Test trying to write bytestrings to a non-binary filehandle + with patch('salt.utils.files.fopen', mock_open()): + with salt.utils.files.fopen('foo.txt', 'w') as self.fh: + try: + self.fh.write([b'foo\n']) + except TypeError: + # This exception is expected on Python 3 + if not six.PY3: + raise + else: + # This write should work fine on Python 2 + if six.PY3: + raise Exception( + 'Should not have been able to write a bytestring ' + 'to a non-binary filehandle' + ) + + if six.PY2: + # Try with non-ascii unicode. Note that the write above + # should work because the mocked filehandle should attempt + # a .encode() to convert it to a str type. But when writing + # a string with non-ascii unicode, it should raise a + # UnicodeEncodeError, which is what we are testing here. + try: + self.fh.writelines(self.questions_lines) + except UnicodeEncodeError: + pass + else: + raise Exception( + 'Should not have been able to write non-ascii ' + 'unicode to a binary filehandle' + ) + + def test_open(self): + ''' + Test that opening a file for binary reading with string read_data + fails, and that the same thing happens for non-binary filehandles and + bytestring read_data. + + NOTE: This test should always pass on PY2 since MockOpen will normalize + unicode types to str types. + ''' + try: + with patch('salt.utils.files.fopen', mock_open()): + try: + with salt.utils.files.fopen('foo.txt', 'rb') as self.fh: + self.fh.read() + except TypeError: + pass + else: + if six.PY3: + raise Exception( + 'Should not have been able open for binary read with ' + 'non-bytestring read_data' + ) + + with patch('salt.utils.files.fopen', mock_open(read_data=b'')): + try: + with salt.utils.files.fopen('foo.txt', 'r') as self.fh2: + self.fh2.read() + except TypeError: + pass + else: + if six.PY3: + raise Exception( + 'Should not have been able open for non-binary read ' + 'with bytestring read_data' + ) + finally: + # Make sure we destroy the filehandles before the teardown, as they + # will also try to read and this will generate another exception + delattr(self, 'fh') + delattr(self, 'fh2') diff --git a/tests/unit/test_payload.py b/tests/unit/test_payload.py index 439354f677..2224687aae 100644 --- a/tests/unit/test_payload.py +++ b/tests/unit/test_payload.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.payload_test diff --git a/tests/unit/test_pillar.py b/tests/unit/test_pillar.py index 073a639c9c..70f25d3c44 100644 --- a/tests/unit/test_pillar.py +++ b/tests/unit/test_pillar.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` - :codeauthor: :email:`Alexandru Bleotu (alexandru.bleotu@morganstanley.com)` - + :codeauthor: Pedro Algarvio (pedro@algarvio.me) + :codeauthor: Alexandru Bleotu (alexandru.bleotu@morganstanley.com) tests.unit.pillar_test ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/unit/test_state.py b/tests/unit/test_state.py index 6e6ea06704..d6555a03bb 100644 --- a/tests/unit/test_state.py +++ b/tests/unit/test_state.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Python libs from __future__ import absolute_import, print_function, unicode_literals -import copy import os import shutil import tempfile @@ -24,7 +23,7 @@ from tests.support.paths import BASE_FILES # Import Salt libs import salt.exceptions import salt.state -from salt.utils.odict import OrderedDict, DefaultOrderedDict +from salt.utils.odict import OrderedDict from salt.utils.decorators import state as statedecorators try: @@ -173,341 +172,6 @@ class HighStateTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertEqual(ret, [('somestuff', 'cmd')]) -class TopFileMergeTestCase(TestCase, AdaptedConfigurationTestCaseMixin): - ''' - Test various merge strategies for multiple tops files collected from - multiple environments. Various options correspond to merge strategies - which can be set by the user with the top_file_merging_strategy config - option. - ''' - def setUp(self): - ''' - Create multiple top files for use in each test. Envs within self.tops - should be defined in the same order as this ordering will affect - ordering in merge_tops. The envs in each top file are defined in the - same order as self.env_order. This is no accident; it was done this way - in order to produce the proper deterministic results to match the - tests. Changing anything created in this func will affect the tests, as - they would affect ordering in states in real life. So, don't change any - of this unless you know what you're doing. If a test is failing, it is - likely due to incorrect logic in merge_tops. - ''' - self.env_order = ['base', 'foo', 'bar', 'baz'] - self.addCleanup(delattr, self, 'env_order') - self.tops = { - 'base': OrderedDict([ - ('base', OrderedDict([('*', ['base_base'])])), - ('foo', OrderedDict([('*', ['base_foo'])])), - ('bar', OrderedDict([('*', ['base_bar'])])), - ('baz', OrderedDict([('*', ['base_baz'])])), - ]), - 'foo': OrderedDict([ - ('base', OrderedDict([('*', ['foo_base'])])), - ('foo', OrderedDict([('*', ['foo_foo'])])), - ('bar', OrderedDict([('*', ['foo_bar'])])), - ('baz', OrderedDict([('*', ['foo_baz'])])), - ]), - 'bar': OrderedDict([ - ('base', OrderedDict([('*', ['bar_base'])])), - ('foo', OrderedDict([('*', ['bar_foo'])])), - ('bar', OrderedDict([('*', ['bar_bar'])])), - ('baz', OrderedDict([('*', ['bar_baz'])])), - ]), - # Empty environment - 'baz': OrderedDict() - } - self.addCleanup(delattr, self, 'tops') - - # Version without the other envs defined in the base top file - self.tops_limited_base = copy.deepcopy(self.tops) - self.tops_limited_base['base'] = OrderedDict([ - ('base', OrderedDict([('*', ['base_base'])])), - ]) - self.addCleanup(delattr, self, 'tops_limited_base') - - def highstate(self, **opts): - root_dir = tempfile.mkdtemp(dir=integration.TMP) - state_tree_dir = os.path.join(root_dir, 'state_tree') - cache_dir = os.path.join(root_dir, 'cachedir') - overrides = {} - overrides['root_dir'] = root_dir - overrides['state_events'] = False - overrides['id'] = 'match' - overrides['file_client'] = 'local' - overrides['file_roots'] = dict(base=[state_tree_dir]) - overrides['cachedir'] = cache_dir - overrides['test'] = False - overrides['default_top'] = 'base' - overrides.update(opts) - return salt.state.HighState(self.get_temp_config('minion', **overrides)) - - def get_tops(self, tops=None, env_order=None, state_top_saltenv=None): - ''' - A test helper to emulate salt.state.HighState.get_tops() but just to - construct an appropriate data structure for top files from multiple - environments - ''' - if tops is None: - tops = self.tops - - if state_top_saltenv: - append_order = [state_top_saltenv] - elif env_order: - append_order = env_order - else: - append_order = self.env_order - - ret = DefaultOrderedDict(list) - for env in append_order: - item = tops[env] - if env_order: - for remove in [x for x in self.env_order if x not in env_order]: - # Remove this env from the tops from the tops since this - # env is not part of env_order. - item.pop(remove) - ret[env].append(tops[env]) - return ret - - def test_merge_tops_merge(self): - ''' - Test the default merge strategy for top files, in an instance where the - base top file contains sections for all envs and the other envs' top - files are therefore ignored. - ''' - merged_tops = self.highstate().merge_tops(self.get_tops()) - - expected_merge = DefaultOrderedDict(OrderedDict) - for env in self.env_order: - expected_merge[env]['*'] = ['base_{0}'.format(env)] - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_merge_limited_base(self): - ''' - Test the default merge strategy for top files when the base environment - only defines states for itself. - ''' - tops = self.get_tops(tops=self.tops_limited_base) - merged_tops = self.highstate().merge_tops(tops) - - # No baz in the expected results because baz has no top file - expected_merge = DefaultOrderedDict(OrderedDict) - for env in self.env_order[:-1]: - expected_merge[env]['*'] = ['_'.join((env, env))] - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_merge_state_top_saltenv_base(self): - ''' - Test the 'state_top_saltenv' parameter to load states exclusively from - the 'base' saltenv, with the default merging strategy. This should - result in all states from the 'base' top file being in the merged - result. - ''' - env = 'base' - tops = self.get_tops(state_top_saltenv=env) - merged_tops = self.highstate().merge_tops(tops) - - expected_merge = DefaultOrderedDict(OrderedDict) - for env2 in self.env_order: - expected_merge[env2]['*'] = ['_'.join((env, env2))] - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_merge_state_top_saltenv_foo(self): - ''' - Test the 'state_top_saltenv' parameter to load states exclusively from - the 'foo' saltenv, with the default merging strategy. This should - result in just the 'foo' environment's states from the 'foo' top file - being in the merged result. - ''' - env = 'foo' - tops = self.get_tops(state_top_saltenv=env) - merged_tops = self.highstate().merge_tops(tops) - - expected_merge = DefaultOrderedDict(OrderedDict) - expected_merge[env]['*'] = ['_'.join((env, env))] - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_merge_all(self): - ''' - Test the merge_all strategy - ''' - tops = self.get_tops() - merged_tops = self.highstate( - top_file_merging_strategy='merge_all').merge_tops(tops) - - expected_merge = DefaultOrderedDict(OrderedDict) - for env in self.env_order: - states = [] - for top_env in self.env_order: - if top_env in tops[top_env][0]: - states.extend(tops[top_env][0][env]['*']) - expected_merge[env]['*'] = states - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_merge_all_with_env_order(self): - ''' - Test an altered env_order with the 'merge_all' strategy. - ''' - env_order = ['bar', 'foo', 'base'] - tops = self.get_tops(env_order=env_order) - merged_tops = self.highstate( - top_file_merging_strategy='merge_all', - env_order=env_order).merge_tops(tops) - - expected_merge = DefaultOrderedDict(OrderedDict) - for env in [x for x in self.env_order if x in env_order]: - states = [] - for top_env in env_order: - states.extend(tops[top_env][0][env]['*']) - expected_merge[env]['*'] = states - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_merge_all_state_top_saltenv_base(self): - ''' - Test the 'state_top_saltenv' parameter to load states exclusively from - the 'base' saltenv, with the 'merge_all' merging strategy. This should - result in all states from the 'base' top file being in the merged - result. - ''' - env = 'base' - tops = self.get_tops(state_top_saltenv=env) - merged_tops = self.highstate( - top_file_merging_strategy='merge_all').merge_tops(tops) - - expected_merge = DefaultOrderedDict(OrderedDict) - for env2 in self.env_order: - expected_merge[env2]['*'] = ['_'.join((env, env2))] - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_merge_all_state_top_saltenv_foo(self): - ''' - Test the 'state_top_saltenv' parameter to load states exclusively from - the 'foo' saltenv, with the 'merge_all' merging strategy. This should - result in all the states from the 'foo' top file being in the merged - result. - ''' - env = 'foo' - tops = self.get_tops(state_top_saltenv=env) - merged_tops = self.highstate( - top_file_merging_strategy='merge_all').merge_tops(tops) - - expected_merge = DefaultOrderedDict(OrderedDict) - for env2 in self.env_order: - expected_merge[env2]['*'] = ['_'.join((env, env2))] - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_same_with_default_top(self): - ''' - Test to see if the top file that corresponds to the requested env is - the one that is used by the state system. Also test the 'default_top' - option for env 'baz', which has no top file and should pull its states - from the 'foo' top file. - ''' - merged_tops = self.highstate( - top_file_merging_strategy='same', - default_top='foo').merge_tops(self.get_tops()) - - expected_merge = DefaultOrderedDict(OrderedDict) - for env in self.env_order[:-1]: - expected_merge[env]['*'] = ['_'.join((env, env))] - # The 'baz' env should be using the foo top file because baz lacks a - # top file, and default_top has been seet to 'foo' - expected_merge['baz']['*'] = ['foo_baz'] - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_same_without_default_top(self): - ''' - Test to see if the top file that corresponds to the requested env is - the one that is used by the state system. default_top will not be set - (falling back to 'base'), so the 'baz' environment should pull its - states from the 'base' top file. - ''' - merged_tops = self.highstate( - top_file_merging_strategy='same').merge_tops(self.get_tops()) - - expected_merge = DefaultOrderedDict(OrderedDict) - for env in self.env_order[:-1]: - expected_merge[env]['*'] = ['_'.join((env, env))] - # The 'baz' env should be using the foo top file because baz lacks a - # top file, and default_top == 'base' - expected_merge['baz']['*'] = ['base_baz'] - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_same_limited_base_without_default_top(self): - ''' - Test to see if the top file that corresponds to the requested env is - the one that is used by the state system. default_top will not be set - (falling back to 'base'), and since we are using a limited base top - file, the 'baz' environment should not appear in the merged tops. - ''' - tops = self.get_tops(tops=self.tops_limited_base) - merged_tops = \ - self.highstate(top_file_merging_strategy='same').merge_tops(tops) - - expected_merge = DefaultOrderedDict(OrderedDict) - for env in self.env_order[:-1]: - expected_merge[env]['*'] = ['_'.join((env, env))] - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_same_state_top_saltenv_base(self): - ''' - Test the 'state_top_saltenv' parameter to load states exclusively from - the 'base' saltenv, with the 'same' merging strategy. This should - result in just the 'base' environment's states from the 'base' top file - being in the merged result. - ''' - env = 'base' - tops = self.get_tops(state_top_saltenv=env) - merged_tops = self.highstate( - top_file_merging_strategy='same').merge_tops(tops) - - expected_merge = DefaultOrderedDict(OrderedDict) - expected_merge[env]['*'] = ['_'.join((env, env))] - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_same_state_top_saltenv_foo(self): - ''' - Test the 'state_top_saltenv' parameter to load states exclusively from - the 'foo' saltenv, with the 'same' merging strategy. This should - result in just the 'foo' environment's states from the 'foo' top file - being in the merged result. - ''' - env = 'foo' - tops = self.get_tops(state_top_saltenv=env) - merged_tops = self.highstate( - top_file_merging_strategy='same').merge_tops(tops) - - expected_merge = DefaultOrderedDict(OrderedDict) - expected_merge[env]['*'] = ['_'.join((env, env))] - - self.assertEqual(merged_tops, expected_merge) - - def test_merge_tops_same_state_top_saltenv_baz(self): - ''' - Test the 'state_top_saltenv' parameter to load states exclusively from - the 'baz' saltenv, with the 'same' merging strategy. This should - result in an empty dictionary since this environment has not top file. - ''' - tops = self.get_tops(state_top_saltenv='baz') - merged_tops = self.highstate( - top_file_merging_strategy='same').merge_tops(tops) - - expected_merge = DefaultOrderedDict(OrderedDict) - - self.assertEqual(merged_tops, expected_merge) - - @skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(pytest is None, 'PyTest is missing') class StateReturnsTestCase(TestCase): diff --git a/tests/unit/test_version.py b/tests/unit/test_version.py index 89c0886ee1..afe9051e25 100644 --- a/tests/unit/test_version.py +++ b/tests/unit/test_version.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.version_test diff --git a/tests/unit/test_zypp_plugins.py b/tests/unit/test_zypp_plugins.py index c3afe1c306..e4d37a661b 100644 --- a/tests/unit/test_zypp_plugins.py +++ b/tests/unit/test_zypp_plugins.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Bo Maryniuk ` + :codeauthor: Bo Maryniuk ''' # Import Python Libs diff --git a/tests/unit/transport/test_ipc.py b/tests/unit/transport/test_ipc.py index 31bf5d807c..942ac8fc6c 100644 --- a/tests/unit/transport/test_ipc.py +++ b/tests/unit/transport/test_ipc.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place ` + :codeauthor: Mike Place ''' # Import python libs diff --git a/tests/unit/transport/test_tcp.py b/tests/unit/transport/test_tcp.py index 17fe0825d7..f9faf731cc 100644 --- a/tests/unit/transport/test_tcp.py +++ b/tests/unit/transport/test_tcp.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Thomas Jackson ` + :codeauthor: Thomas Jackson ''' # Import python libs diff --git a/tests/unit/transport/test_zeromq.py b/tests/unit/transport/test_zeromq.py index ccb337462e..57d54d58fa 100644 --- a/tests/unit/transport/test_zeromq.py +++ b/tests/unit/transport/test_zeromq.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Thomas Jackson ` + :codeauthor: Thomas Jackson ''' # Import python libs diff --git a/tests/unit/utils/test_cloud.py b/tests/unit/utils/test_cloud.py index d9af9ad992..101a8a5b01 100644 --- a/tests/unit/utils/test_cloud.py +++ b/tests/unit/utils/test_cloud.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.utils.cloud_test diff --git a/tests/unit/utils/test_context.py b/tests/unit/utils/test_context.py index ea8ea6da1f..2ec00f6666 100644 --- a/tests/unit/utils/test_context.py +++ b/tests/unit/utils/test_context.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Mike Place ` + :codeauthor: Mike Place ''' # Import python libraries diff --git a/tests/unit/utils/test_decorators.py b/tests/unit/utils/test_decorators.py index 89da8df2c4..b4e3a68686 100644 --- a/tests/unit/utils/test_decorators.py +++ b/tests/unit/utils/test_decorators.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Bo Maryniuk (bo@suse.de)` + :codeauthor: Bo Maryniuk (bo@suse.de) unit.utils.decorators_test ''' diff --git a/tests/unit/utils/test_environment.py b/tests/unit/utils/test_environment.py new file mode 100644 index 0000000000..8305d7933f --- /dev/null +++ b/tests/unit/utils/test_environment.py @@ -0,0 +1,200 @@ +# coding=utf-8 +''' +Test case for utils/__init__.py +''' +from __future__ import unicode_literals, print_function, absolute_import +from tests.support.unit import TestCase, skipIf +import salt.utils.environment + +try: + import pytest +except ImportError: + pytest = None + + +@skipIf(pytest is None, 'PyTest is missing') +class UtilsTestCase(TestCase): + ''' + Test case for utils/__init__.py + ''' + def test_get_module_environment_empty(self): + ''' + Test for salt.utils.get_module_environment + Test if empty globals returns to an empty environment + with the correct type. + :return: + ''' + out = salt.utils.environment.get_module_environment({}) + assert out == {} + assert isinstance(out, dict) + + def test_get_module_environment_opts(self): + ''' + Test for salt.utils.get_module_environment + Test if __opts__ are visible. + :return: + ''' + expectation = {'message': 'Melting hard drives'} + _globals = { + '__opts__': { + 'system-environment': { + 'modules': { + 'system': { + '_': expectation, + }, + }, + }, + }, + '__file__': '/daemons/loose/modules/system.py', + } + assert salt.utils.environment.get_module_environment(_globals) == expectation + + def test_get_module_environment_pillars(self): + ''' + Test for salt.utils.get_module_environment + Test if __pillar__ is visible. + :return: + ''' + expectation = {'message': 'The CPU has shifted, and become decentralized.'} + _globals = { + '__opts__': { + 'system-environment': { + 'electric': { + 'interference': { + '_': expectation, + }, + }, + }, + }, + '__file__': '/piezo/electric/interference.py', + } + assert salt.utils.environment.get_module_environment(_globals) == expectation + + def test_get_module_environment_pillar_override(self): + ''' + Test for salt.utils.get_module_environment + Test if __pillar__ is overriding __opts__. + :return: + ''' + expectation = {'msg': 'The CPU has shifted, and become decentralized.'} + _globals = { + '__opts__': { + 'system-environment': { + 'electric': { + 'interference': { + '_': {'msg': 'Trololo!'}, + }, + }, + }, + }, + '__pillar__': { + 'system-environment': { + 'electric': { + 'interference': { + '_': expectation, + }, + }, + }, + }, + '__file__': '/piezo/electric/interference.py', + } + assert salt.utils.environment.get_module_environment(_globals) == expectation + + def test_get_module_environment_sname_found(self): + ''' + Test for salt.utils.get_module_environment + Section name and module name are found. + :return: + ''' + expectation = {'msg': 'All operators are on strike due to broken coffee machine!'} + _globals = { + '__opts__': { + 'system-environment': { + 'jumping': { + 'interference': { + '_': expectation, + }, + }, + }, + }, + '__file__': '/route/flapping/at_the_nap.py', + } + assert salt.utils.environment.get_module_environment(_globals) == {} + + _globals['__file__'] = '/route/jumping/interference.py' + assert salt.utils.environment.get_module_environment(_globals) == expectation + + def test_get_module_environment_mname_found(self): + ''' + Test for salt.utils.get_module_environment + Module name is found. + + :return: + ''' + expectation = {'msg': 'All operators are on strike due to broken coffee machine!'} + _globals = { + '__pillar__': { + 'system-environment': { + 'jumping': { + 'nonsense': { + '_': expectation, + }, + }, + }, + }, + '__file__': '/route/jumping/interference.py', + } + assert salt.utils.environment.get_module_environment(_globals) == {} + _globals['__pillar__']['system-environment']['jumping']['interference'] = {} + _globals['__pillar__']['system-environment']['jumping']['interference']['_'] = expectation + assert salt.utils.environment.get_module_environment(_globals) == expectation + + def test_get_module_environment_vname_found(self): + ''' + Test for salt.utils.get_module_environment + Virtual name is found. + + :return: + ''' + expectation = {'msg': 'All operators are on strike due to broken coffee machine!'} + _globals = { + '__virtualname__': 'nonsense', + '__pillar__': { + 'system-environment': { + 'jumping': { + 'nonsense': { + '_': expectation, + }, + }, + }, + }, + '__file__': '/route/jumping/translation.py', + } + assert salt.utils.environment.get_module_environment(_globals) == expectation + + def test_get_module_environment_vname_overridden(self): + ''' + Test for salt.utils.get_module_environment + Virtual namespace overridden. + + :return: + ''' + expectation = {'msg': 'New management.'} + _globals = { + '__virtualname__': 'nonsense', + '__pillar__': { + 'system-environment': { + 'funny': { + 'translation': { + '_': expectation, + }, + 'nonsense': { + '_': {'msg': 'This is wrong'}, + }, + }, + }, + }, + '__file__': '/lost/in/funny/translation.py', + } + + assert salt.utils.environment.get_module_environment(_globals) == expectation diff --git a/tests/unit/utils/test_etcd_util.py b/tests/unit/utils/test_etcd_util.py index 4911fa7b42..ce7f58b97f 100644 --- a/tests/unit/utils/test_etcd_util.py +++ b/tests/unit/utils/test_etcd_util.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Jayesh Kariya ` + :codeauthor: Jayesh Kariya ''' # Import Python Libs diff --git a/tests/unit/utils/test_event.py b/tests/unit/utils/test_event.py index 3ee1be40f1..d93e0b94f8 100644 --- a/tests/unit/utils/test_event.py +++ b/tests/unit/utils/test_event.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.utils.event_test diff --git a/tests/unit/utils/test_filebuffer.py b/tests/unit/utils/test_filebuffer.py index 9e1c9d6ad8..c3147ff1af 100644 --- a/tests/unit/utils/test_filebuffer.py +++ b/tests/unit/utils/test_filebuffer.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.utils.filebuffer_test diff --git a/tests/unit/utils/test_http.py b/tests/unit/utils/test_http.py index 8914984c11..ab40c2a144 100644 --- a/tests/unit/utils/test_http.py +++ b/tests/unit/utils/test_http.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import Salt Libs diff --git a/tests/unit/utils/test_immutabletypes.py b/tests/unit/utils/test_immutabletypes.py index ec2c1d432a..e6f3f0938c 100644 --- a/tests/unit/utils/test_immutabletypes.py +++ b/tests/unit/utils/test_immutabletypes.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.utils.immutabletypes diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py new file mode 100644 index 0000000000..5e993d8890 --- /dev/null +++ b/tests/unit/utils/test_jinja.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +''' +Tests for salt.utils.jinja +''' +# Import Python libs +from __future__ import absolute_import, unicode_literals, print_function + +# Import Salt libs +import salt.utils.jinja +from tests.support.unit import TestCase + + +class JinjaTestCase(TestCase): + def test_tojson(self): + ''' + Test the tojson filter for those using Jinja < 2.9. Non-ascii unicode + content should be dumped with ensure_ascii=True. + ''' + data = {'Non-ascii words': ['süß', 'спам', 'яйца']} + result = salt.utils.jinja.tojson(data) + expected = '{"Non-ascii words": ["s\\u00fc\\u00df", "\\u0441\\u043f\\u0430\\u043c", "\\u044f\\u0439\\u0446\\u0430"]}' + assert result == expected, result diff --git a/tests/unit/utils/test_kwarg_regex.py b/tests/unit/utils/test_kwarg_regex.py index 1b6838db10..2d11816093 100644 --- a/tests/unit/utils/test_kwarg_regex.py +++ b/tests/unit/utils/test_kwarg_regex.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) unit.utils.kwarg_regex_test diff --git a/tests/unit/utils/test_network.py b/tests/unit/utils/test_network.py index 0e2c45b17c..b3b38087cc 100644 --- a/tests/unit/utils/test_network.py +++ b/tests/unit/utils/test_network.py @@ -3,11 +3,18 @@ from __future__ import absolute_import, unicode_literals, print_function import logging import socket +import textwrap # Import Salt Testing libs from tests.support.unit import skipIf from tests.support.unit import TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.mock import ( + MagicMock, + mock_open, + patch, + NO_MOCK, + NO_MOCK_REASON, +) # Import salt libs import salt.utils.network as network @@ -147,6 +154,20 @@ class NetworkTestCase(TestCase): def test_generate_minion_id(self): self.assertTrue(network.generate_minion_id()) + def test__generate_minion_id_with_unicode_in_etc_hosts(self): + ''' + Test that unicode in /etc/hosts doesn't raise an error when + _generate_minion_id() helper is called to gather the hosts. + ''' + content = textwrap.dedent('''\ + # 以下为主机名解析 + ## ccc + 127.0.0.1 localhost thisismyhostname # 本机 + ''') + fopen_mock = mock_open(read_data={'/etc/hosts': content}) + with patch('salt.utils.files.fopen', fopen_mock): + assert 'thisismyhostname' in network._generate_minion_id() + def test_is_ip(self): self.assertTrue(network.is_ip('10.10.0.3')) self.assertFalse(network.is_ip('0.9.800.1000')) @@ -209,6 +230,10 @@ class NetworkTestCase(TestCase): def test_hex2ip(self): self.assertEqual(network.hex2ip('0x4A7D2B63'), '74.125.43.99') self.assertEqual(network.hex2ip('0x4A7D2B63', invert=True), '99.43.125.74') + self.assertEqual(network.hex2ip('00000000000000000000FFFF7F000001'), '127.0.0.1') + self.assertEqual(network.hex2ip('0000000000000000FFFF00000100007F', invert=True), '127.0.0.1') + self.assertEqual(network.hex2ip('20010DB8000000000000000000000000'), '2001:db8::') + self.assertEqual(network.hex2ip('B80D0120000000000000000000000000', invert=True), '2001:db8::') def test_interfaces_ifconfig_linux(self): interfaces = network._interfaces_ifconfig(LINUX) @@ -320,8 +345,7 @@ class NetworkTestCase(TestCase): patch('socket.gethostname', MagicMock(return_value='hostname')), \ patch('socket.getfqdn', MagicMock(return_value='hostname.domainname.blank')), \ patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'attrname', ('127.0.1.1', 0))])), \ - patch('salt.utils.files.fopen', MagicMock(return_value=False)), \ - patch('os.path.exists', MagicMock(return_value=False)), \ + patch('salt.utils.files.fopen', mock_open()), \ patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '5.6.7.8'])): self.assertEqual(network._generate_minion_id(), ['hostname.domainname.blank', 'nodename', 'hostname', '1.2.3.4', '5.6.7.8']) @@ -336,8 +360,7 @@ class NetworkTestCase(TestCase): patch('socket.gethostname', MagicMock(return_value='127')), \ patch('socket.getfqdn', MagicMock(return_value='127.domainname.blank')), \ patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'attrname', ('127.0.1.1', 0))])), \ - patch('salt.utils.files.fopen', MagicMock(return_value=False)), \ - patch('os.path.exists', MagicMock(return_value=False)), \ + patch('salt.utils.files.fopen', mock_open()), \ patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '5.6.7.8'])): self.assertEqual(network._generate_minion_id(), ['127.domainname.blank', '127', '1.2.3.4', '5.6.7.8']) @@ -352,8 +375,7 @@ class NetworkTestCase(TestCase): patch('socket.gethostname', MagicMock(return_value='127890')), \ patch('socket.getfqdn', MagicMock(return_value='127890.domainname.blank')), \ patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'attrname', ('127.0.1.1', 0))])), \ - patch('salt.utils.files.fopen', MagicMock(return_value=False)), \ - patch('os.path.exists', MagicMock(return_value=False)), \ + patch('salt.utils.files.fopen', mock_open()), \ patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '5.6.7.8'])): self.assertEqual(network._generate_minion_id(), ['127890.domainname.blank', '127890', '1.2.3.4', '5.6.7.8']) @@ -368,8 +390,7 @@ class NetworkTestCase(TestCase): patch('socket.gethostname', MagicMock(return_value='hostname')), \ patch('socket.getfqdn', MagicMock(return_value='hostname')), \ patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'hostname', ('127.0.1.1', 0))])), \ - patch('salt.utils.files.fopen', MagicMock(return_value=False)), \ - patch('os.path.exists', MagicMock(return_value=False)), \ + patch('salt.utils.files.fopen', mock_open()), \ patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '1.2.3.4', '1.2.3.4'])): self.assertEqual(network._generate_minion_id(), ['hostname', '1.2.3.4']) @@ -384,8 +405,7 @@ class NetworkTestCase(TestCase): patch('socket.gethostname', MagicMock(return_value='hostname')), \ patch('socket.getfqdn', MagicMock(return_value='')), \ patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'hostname', ('127.0.1.1', 0))])), \ - patch('salt.utils.files.fopen', MagicMock(return_value=False)), \ - patch('os.path.exists', MagicMock(return_value=False)), \ + patch('salt.utils.files.fopen', mock_open()), \ patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '1.2.3.4', '1.2.3.4'])): self.assertEqual(network.generate_minion_id(), 'very.long.and.complex.domain.name') @@ -399,8 +419,7 @@ class NetworkTestCase(TestCase): patch('socket.gethostname', MagicMock(return_value='pick.me')), \ patch('socket.getfqdn', MagicMock(return_value='hostname.domainname.blank')), \ patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'hostname', ('127.0.1.1', 0))])), \ - patch('salt.utils.files.fopen', MagicMock(return_value=False)), \ - patch('os.path.exists', MagicMock(return_value=False)), \ + patch('salt.utils.files.fopen', mock_open()), \ patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '1.2.3.4', '1.2.3.4'])): self.assertEqual(network.generate_minion_id(), 'hostname.domainname.blank') @@ -414,8 +433,7 @@ class NetworkTestCase(TestCase): patch('socket.gethostname', MagicMock(return_value='ip6-loopback')), \ patch('socket.getfqdn', MagicMock(return_value='ip6-localhost')), \ patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'localhost', ('127.0.1.1', 0))])), \ - patch('salt.utils.files.fopen', MagicMock(return_value=False)), \ - patch('os.path.exists', MagicMock(return_value=False)), \ + patch('salt.utils.files.fopen', mock_open()), \ patch('salt.utils.network.ip_addrs', MagicMock(return_value=['127.0.0.1', '::1', 'fe00::0', 'fe02::1', '1.2.3.4'])): self.assertEqual(network.generate_minion_id(), '1.2.3.4') @@ -429,8 +447,7 @@ class NetworkTestCase(TestCase): patch('socket.gethostname', MagicMock(return_value='ip6-loopback')), \ patch('socket.getfqdn', MagicMock(return_value='ip6-localhost')), \ patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'localhost', ('127.0.1.1', 0))])), \ - patch('salt.utils.files.fopen', MagicMock(return_value=False)), \ - patch('os.path.exists', MagicMock(return_value=False)), \ + patch('salt.utils.files.fopen', mock_open()), \ patch('salt.utils.network.ip_addrs', MagicMock(return_value=['127.0.0.1', '::1', 'fe00::0', 'fe02::1'])): self.assertEqual(network.generate_minion_id(), 'localhost') @@ -444,8 +461,7 @@ class NetworkTestCase(TestCase): patch('socket.gethostname', MagicMock(return_value='ip6-loopback')), \ patch('socket.getfqdn', MagicMock(return_value='pick.me')), \ patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'localhost', ('127.0.1.1', 0))])), \ - patch('salt.utils.files.fopen', MagicMock(return_value=False)), \ - patch('os.path.exists', MagicMock(return_value=False)), \ + patch('salt.utils.files.fopen', mock_open()), \ patch('salt.utils.network.ip_addrs', MagicMock(return_value=['127.0.0.1', '::1', 'fe00::0', 'fe02::1'])): self.assertEqual(network.generate_minion_id(), 'pick.me') @@ -459,8 +475,7 @@ class NetworkTestCase(TestCase): patch('socket.gethostname', MagicMock(return_value='ip6-loopback')), \ patch('socket.getfqdn', MagicMock(return_value='ip6-localhost')), \ patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'pick.me', ('127.0.1.1', 0))])), \ - patch('salt.utils.files.fopen', MagicMock(return_value=False)), \ - patch('os.path.exists', MagicMock(return_value=False)), \ + patch('salt.utils.files.fopen', mock_open()), \ patch('salt.utils.network.ip_addrs', MagicMock(return_value=['127.0.0.1', '::1', 'fe00::0', 'fe02::1'])): self.assertEqual(network.generate_minion_id(), 'pick.me') @@ -474,8 +489,7 @@ class NetworkTestCase(TestCase): patch('socket.gethostname', MagicMock(return_value='ip6-loopback')), \ patch('socket.getfqdn', MagicMock(return_value='ip6-localhost')), \ patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'localhost', ('127.0.1.1', 0))])), \ - patch('salt.utils.files.fopen', MagicMock(return_value=False)), \ - patch('os.path.exists', MagicMock(return_value=False)), \ + patch('salt.utils.files.fopen', mock_open()), \ patch('salt.utils.network.ip_addrs', MagicMock(return_value=['127.0.0.1', '::1', 'fe00::0', 'fe02::1', '1.2.3.4'])): self.assertEqual(network.generate_minion_id(), '1.2.3.4') diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py index eb88197e84..36b14a0072 100644 --- a/tests/unit/utils/test_parsers.py +++ b/tests/unit/utils/test_parsers.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Denys Havrysh ` + :codeauthor: Denys Havrysh ''' # Import python libs @@ -1036,30 +1036,44 @@ class DaemonMixInTestCase(TestCase): @patch('os.unlink', MagicMock(side_effect=OSError())) @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.getuid', MagicMock(return_value=0)) @patch('salt.utils.parsers.logger', MagicMock()) def test_pid_deleted_oserror_as_root(self): ''' PIDfile deletion with exception, running as root. ''' - self.daemon_mixin._mixin_before_exit() - assert salt.utils.parsers.os.unlink.call_count == 1 - salt.utils.parsers.logger.info.assert_called_with('PIDfile could not be deleted: %s', - format(self.daemon_mixin.config['pidfile'])) - salt.utils.parsers.logger.debug.assert_called() + if salt.utils.platform.is_windows(): + patch_args = ('salt.utils.win_functions.is_admin', + MagicMock(return_value=True)) + else: + patch_args = ('os.getuid', MagicMock(return_value=0)) + + with patch(*patch_args): + self.daemon_mixin._mixin_before_exit() + assert salt.utils.parsers.os.unlink.call_count == 1 + salt.utils.parsers.logger.info.assert_called_with( + 'PIDfile could not be deleted: %s', + format(self.daemon_mixin.config['pidfile']) + ) + salt.utils.parsers.logger.debug.assert_called() @patch('os.unlink', MagicMock(side_effect=OSError())) @patch('os.path.isfile', MagicMock(return_value=True)) - @patch('os.getuid', MagicMock(return_value=1000)) @patch('salt.utils.parsers.logger', MagicMock()) def test_pid_deleted_oserror_as_non_root(self): ''' PIDfile deletion with exception, running as non-root. ''' - self.daemon_mixin._mixin_before_exit() - assert salt.utils.parsers.os.unlink.call_count == 1 - salt.utils.parsers.logger.info.assert_not_called() - salt.utils.parsers.logger.debug.assert_not_called() + if salt.utils.platform.is_windows(): + patch_args = ('salt.utils.win_functions.is_admin', + MagicMock(return_value=False)) + else: + patch_args = ('os.getuid', MagicMock(return_value=1000)) + + with patch(*patch_args): + self.daemon_mixin._mixin_before_exit() + assert salt.utils.parsers.os.unlink.call_count == 1 + salt.utils.parsers.logger.info.assert_not_called() + salt.utils.parsers.logger.debug.assert_not_called() # Hide the class from unittest framework when it searches for TestCase classes in the module diff --git a/tests/unit/utils/test_path.py b/tests/unit/utils/test_path.py index 4af0629700..c26bb109c0 100644 --- a/tests/unit/utils/test_path.py +++ b/tests/unit/utils/test_path.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.utils.salt.utils.path.join_test diff --git a/tests/unit/utils/test_runtime_whitespace_regex.py b/tests/unit/utils/test_runtime_whitespace_regex.py index 62474dab07..6fc617325e 100644 --- a/tests/unit/utils/test_runtime_whitespace_regex.py +++ b/tests/unit/utils/test_runtime_whitespace_regex.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.utils.runtime_whitespace_regex_test diff --git a/tests/unit/utils/test_sanitizers.py b/tests/unit/utils/test_sanitizers.py index 1f2410c2fe..51f2219c31 100644 --- a/tests/unit/utils/test_sanitizers.py +++ b/tests/unit/utils/test_sanitizers.py @@ -5,7 +5,7 @@ from __future__ import absolute_import, print_function, unicode_literals from salt.ext.six import text_type as text # Import Salt Libs -from salt.utils.sanitizers import clean +from salt.utils.sanitizers import clean, mask_args_value # Import Salt Testing Libs from tests.support.unit import TestCase, skipIf @@ -47,3 +47,19 @@ class SanitizersTestCase(TestCase): assert response == 'somedubioushostname' test_sanitized_id = test_sanitized_hostname + + def test_value_masked(self): + ''' + Test if the values are masked. + :return: + ''' + out = mask_args_value('quantum: fluctuations', 'quant*') + assert out == 'quantum: ** hidden **' + + def test_value_not_masked(self): + ''' + Test if the values are not masked. + :return: + ''' + out = mask_args_value('quantum fluctuations', 'quant*') + assert out == 'quantum fluctuations' diff --git a/tests/unit/utils/test_schedule.py b/tests/unit/utils/test_schedule.py index 9d84501728..229cf16fa3 100644 --- a/tests/unit/utils/test_schedule.py +++ b/tests/unit/utils/test_schedule.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Nicole Thomas ` + :codeauthor: Nicole Thomas ''' # Import python libs diff --git a/tests/unit/utils/test_thin.py b/tests/unit/utils/test_thin.py index be53308006..11c0fe5cfa 100644 --- a/tests/unit/utils/test_thin.py +++ b/tests/unit/utils/test_thin.py @@ -280,6 +280,7 @@ class SSHThinTestCase(TestCase): @patch('salt.utils.thin.ssl_match_hostname', type(str('ssl_match_hostname'), (), {'__file__': '/site-packages/ssl_mh'})) @patch('salt.utils.thin.markupsafe', type(str('markupsafe'), (), {'__file__': '/site-packages/markupsafe'})) @patch('salt.utils.thin.backports_abc', type(str('backports_abc'), (), {'__file__': '/site-packages/backports_abc'})) + @patch('salt.utils.thin.concurrent', type(str('concurrent'), (), {'__file__': '/site-packages/concurrent'})) @patch('salt.utils.thin.log', MagicMock()) def test_get_tops(self): ''' @@ -289,7 +290,7 @@ class SSHThinTestCase(TestCase): base_tops = ['/site-packages/salt', '/site-packages/jinja2', '/site-packages/yaml', '/site-packages/tornado', '/site-packages/msgpack', '/site-packages/certifi', '/site-packages/sdp', '/site-packages/sdp_hlp', '/site-packages/ssl_mh', - '/site-packages/markupsafe', '/site-packages/backports_abc'] + '/site-packages/markupsafe', '/site-packages/backports_abc', '/site-packages/concurrent'] tops = thin.get_tops() assert len(tops) == len(base_tops) @@ -306,6 +307,7 @@ class SSHThinTestCase(TestCase): @patch('salt.utils.thin.ssl_match_hostname', type(str('ssl_match_hostname'), (), {'__file__': '/site-packages/ssl_mh'})) @patch('salt.utils.thin.markupsafe', type(str('markupsafe'), (), {'__file__': '/site-packages/markupsafe'})) @patch('salt.utils.thin.backports_abc', type(str('backports_abc'), (), {'__file__': '/site-packages/backports_abc'})) + @patch('salt.utils.thin.concurrent', type(str('concurrent'), (), {'__file__': '/site-packages/concurrent'})) @patch('salt.utils.thin.log', MagicMock()) def test_get_tops_extra_mods(self): ''' @@ -314,7 +316,7 @@ class SSHThinTestCase(TestCase): ''' base_tops = ['/site-packages/salt', '/site-packages/jinja2', '/site-packages/yaml', '/site-packages/tornado', '/site-packages/msgpack', '/site-packages/certifi', - '/site-packages/sdp', '/site-packages/sdp_hlp', '/site-packages/ssl_mh', + '/site-packages/sdp', '/site-packages/sdp_hlp', '/site-packages/ssl_mh', '/site-packages/concurrent', '/site-packages/markupsafe', '/site-packages/backports_abc', '/custom/foo', '/custom/bar.py'] builtins = sys.version_info.major == 3 and 'builtins' or '__builtin__' with patch('{}.__import__'.format(builtins), @@ -335,6 +337,7 @@ class SSHThinTestCase(TestCase): @patch('salt.utils.thin.ssl_match_hostname', type(str('ssl_match_hostname'), (), {'__file__': '/site-packages/ssl_mh'})) @patch('salt.utils.thin.markupsafe', type(str('markupsafe'), (), {'__file__': '/site-packages/markupsafe'})) @patch('salt.utils.thin.backports_abc', type(str('backports_abc'), (), {'__file__': '/site-packages/backports_abc'})) + @patch('salt.utils.thin.concurrent', type(str('concurrent'), (), {'__file__': '/site-packages/concurrent'})) @patch('salt.utils.thin.log', MagicMock()) def test_get_tops_so_mods(self): ''' @@ -343,7 +346,7 @@ class SSHThinTestCase(TestCase): ''' base_tops = ['/site-packages/salt', '/site-packages/jinja2', '/site-packages/yaml', '/site-packages/tornado', '/site-packages/msgpack', '/site-packages/certifi', - '/site-packages/sdp', '/site-packages/sdp_hlp', '/site-packages/ssl_mh', + '/site-packages/sdp', '/site-packages/sdp_hlp', '/site-packages/ssl_mh', '/site-packages/concurrent', '/site-packages/markupsafe', '/site-packages/backports_abc', '/custom/foo.so', '/custom/bar.so'] builtins = sys.version_info.major == 3 and 'builtins' or '__builtin__' with patch('{}.__import__'.format(builtins), diff --git a/tests/unit/utils/test_vt.py b/tests/unit/utils/test_vt.py index f046b97893..678260da5c 100644 --- a/tests/unit/utils/test_vt.py +++ b/tests/unit/utils/test_vt.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)` + :codeauthor: Pedro Algarvio (pedro@algarvio.me) tests.unit.utils.vt_test diff --git a/tests/unit/utils/test_which.py b/tests/unit/utils/test_which.py index df2090bd01..46120b2858 100644 --- a/tests/unit/utils/test_which.py +++ b/tests/unit/utils/test_which.py @@ -51,14 +51,14 @@ class TestWhich(TestCase): True ] # Let's patch os.environ to provide a custom PATH variable - with patch.dict(os.environ, {'PATH': '/bin', + with patch.dict(os.environ, {'PATH': os.sep + 'bin', 'PATHEXT': '.COM;.EXE;.BAT;.CMD'}): # Let's also patch is_windows to return True with patch('salt.utils.platform.is_windows', lambda: True): with patch('os.path.isfile', lambda x: True): self.assertEqual( salt.utils.path.which('this-binary-exists-under-windows'), - os.path.join('/bin', 'this-binary-exists-under-windows.EXE') + os.path.join(os.sep + 'bin', 'this-binary-exists-under-windows.EXE') ) def test_missing_binary_in_windows(self): @@ -73,7 +73,7 @@ class TestWhich(TestCase): False, False, False, False, False ] # Let's patch os.environ to provide a custom PATH variable - with patch.dict(os.environ, {'PATH': '/bin'}): + with patch.dict(os.environ, {'PATH': os.sep + 'bin'}): # Let's also patch is_widows to return True with patch('salt.utils.platform.is_windows', lambda: True): self.assertEqual( @@ -101,7 +101,7 @@ class TestWhich(TestCase): True ] # Let's patch os.environ to provide a custom PATH variable - with patch.dict(os.environ, {'PATH': '/bin', + with patch.dict(os.environ, {'PATH': os.sep + 'bin', 'PATHEXT': '.COM;.EXE;.BAT;.CMD;.VBS;' '.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY'}): # Let's also patch is_windows to return True @@ -109,5 +109,5 @@ class TestWhich(TestCase): with patch('os.path.isfile', lambda x: True): self.assertEqual( salt.utils.path.which('this-binary-exists-under-windows'), - os.path.join('/bin', 'this-binary-exists-under-windows.CMD') + os.path.join(os.sep + 'bin', 'this-binary-exists-under-windows.CMD') ) diff --git a/tests/unit/utils/test_yamlloader.py b/tests/unit/utils/test_yamlloader.py index aa25ec472c..4222b30260 100644 --- a/tests/unit/utils/test_yamlloader.py +++ b/tests/unit/utils/test_yamlloader.py @@ -138,29 +138,6 @@ class YamlLoaderTestCase(TestCase): v2: beta v2: betabeta''')) - def test_yaml_with_unicode_literals(self): - ''' - Test proper loading of unicode literals - ''' - self.assert_matches( - self.render_yaml(textwrap.dedent('''\ - foo: - a: Д - b: {'a': u'\\u0414'}''')), - {'foo': {'a': u'\u0414', 'b': {'a': u'\u0414'}}} - ) - - def test_yaml_with_colon_in_inline_dict(self): - ''' - Test proper loading of unicode literal strings in inline dicts - ''' - self.assert_matches( - self.render_yaml(textwrap.dedent('''\ - foo: - b: {u'c': u'https://foo.com'}''')), - {'foo': {'b': {'c': 'https://foo.com'}}} - ) - def test_yaml_with_plain_scalars(self): ''' Test that plain (i.e. unqoted) string and non-string scalars are diff --git a/tests/unit/utils/vmware/test_cluster.py b/tests/unit/utils/vmware/test_cluster.py index 563195bace..fbde190b7b 100644 --- a/tests/unit/utils/vmware/test_cluster.py +++ b/tests/unit/utils/vmware/test_cluster.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' -:codeauthor: :email:`Alexandru Bleotu ` +:codeauthor: Alexandru Bleotu Tests for cluster related functions in salt.utils.vmware ''' diff --git a/tests/unit/utils/vmware/test_common.py b/tests/unit/utils/vmware/test_common.py index fc5f7a9ab4..74f07893bb 100644 --- a/tests/unit/utils/vmware/test_common.py +++ b/tests/unit/utils/vmware/test_common.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Alexandru Bleotu ` + :codeauthor: Alexandru Bleotu Tests for common functions in salt.utils.vmware ''' diff --git a/tests/unit/utils/vmware/test_connection.py b/tests/unit/utils/vmware/test_connection.py index 388a181b57..6a59ffd7eb 100644 --- a/tests/unit/utils/vmware/test_connection.py +++ b/tests/unit/utils/vmware/test_connection.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Alexandru Bleotu ` + :codeauthor: Alexandru Bleotu Tests for connections related functions in salt.utils.vmware ''' diff --git a/tests/unit/utils/vmware/test_datacenter.py b/tests/unit/utils/vmware/test_datacenter.py index 18f31e5a57..4ff5e51b3c 100644 --- a/tests/unit/utils/vmware/test_datacenter.py +++ b/tests/unit/utils/vmware/test_datacenter.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' -:codeauthor: :email:`Alexandru Bleotu ` +:codeauthor: Alexandru Bleotu Tests for datacenter related functions in salt.utils.vmware ''' diff --git a/tests/unit/utils/vmware/test_host.py b/tests/unit/utils/vmware/test_host.py index 21ae4ce3ce..f9a8025c0a 100644 --- a/tests/unit/utils/vmware/test_host.py +++ b/tests/unit/utils/vmware/test_host.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ''' - :codeauthor: :email:`Alexandru Bleotu ` + :codeauthor: Alexandru Bleotu Tests for host functions in salt.utils.vmware ''' @@ -105,7 +105,6 @@ class GetHostsTestCase(TestCase): self.mock_si, datacenter_name='fake_datacenter', cluster_name='fake_cluster') mock_get_dc.assert_called_once_with(self.mock_si, 'fake_datacenter') - mock_get_cl.assert_called_once_with(mock_dc, 'fake_cluster') mock_get_mors.assert_called_once_with(self.mock_si, vim.HostSystem, container_ref=mock_dc, diff --git a/tests/unit/utils/vmware/test_license.py b/tests/unit/utils/vmware/test_license.py index 6f09fcb08d..d8da575c83 100644 --- a/tests/unit/utils/vmware/test_license.py +++ b/tests/unit/utils/vmware/test_license.py @@ -614,7 +614,7 @@ class AssignLicenseTestCase(TestCase): 'fake_license_name', entity_name='fake_entity_name') self.mock_update_assigned_license.assert_called_once_with( - self.mock_ent_id, self.mock_lic_key) + self.mock_ent_id, self.mock_lic_key, 'fake_license_name') def test_update_assigned_licenses_call_with_entity(self): salt.utils.vmware.assign_license(self.mock_si, @@ -623,7 +623,7 @@ class AssignLicenseTestCase(TestCase): self.mock_entity_ref, 'fake_entity_name') self.mock_update_assigned_license.assert_called_once_with( - self.mock_moid, self.mock_lic_key) + self.mock_moid, self.mock_lic_key, 'fake_license_name') def test_update_assigned_licenses_raises_no_permission(self): exc = vim.fault.NoPermission() diff --git a/tests/whitelist.txt b/tests/whitelist.txt index 78ba360301..9e414adfa6 100644 --- a/tests/whitelist.txt +++ b/tests/whitelist.txt @@ -29,6 +29,7 @@ integration.modules.test_sysmod integration.modules.test_system integration.modules.test_test integration.modules.test_useradd +integration.modules.test_win_dns_client integration.reactor.test_reactor integration.renderers.test_pydsl integration.returners.test_librato_return @@ -38,8 +39,10 @@ integration.runners.test_salt integration.sdb.test_env integration.states.test_host integration.states.test_pip_state +integration.states.test_pkg integration.states.test_reg integration.states.test_renderers +integration.states.test_user integration.utils.testprogram integration.wheel.test_client integration.wheel.test_key diff --git a/tox.ini b/tox.ini index 52b026a299..e4939987e7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,12 @@ [tox] -envlist = py27,py34,py35,py36 +envlist = py27,py3 [testenv] -sitepackages = True -deps = - py27,pylint: -r{toxinidir}/requirements/dev_python27.txt - py34,py35,py36: -r{toxinidir}/requirements/dev_python34.txt -commands = - py27: python2 {toxinidir}/tests/runtests.py {posargs:-v --run-destructive} - py34,py35,py36: python3 {toxinidir}/tests/runtests.py {posargs:-v --run-destructive} +deps = -r{toxinidir}/requirements/tests.txt +commands = pytest --rootdir {toxinidir} {posargs} +passenv = LANG HOME -[testenv:pylint] -basepython = python2.7 -commands = pylint --rcfile={toxinidir}/.testing.pylintrc --disable=W1307 {posargs:setup.py salt/} - pylint --rcfile={toxinidir}/.testing.pylintrc --disable=W0232,E1002,W1307 {posargs:tests/} +[pytest] +addopts = --log-file /tmp/salt-runtests.log --no-print-logs --ssh-tests -ra -sv +testpaths = tests +norecursedirs = tests/kitchen