Permalink
Commits on Sep 26, 2016
  1. Merge pull request #36525 from cachedout/cache_pillar_rend

    Avoid disk hit for renderer generation on pillar instantiation
    cachedout committed on GitHub Sep 26, 2016
  2. Merge pull request #36571 from cachedout/2016_3_develop

    Merge 2016.3 into develop
    cachedout committed on GitHub Sep 26, 2016
  3. Merge branch '2016.3' into 2016_3_develop

    cachedout committed Sep 26, 2016
  4. Merge pull request #36336 from lomeroe/win_lgpo_policy_adds

    add additional static policies to computer configuration policy class
    cachedout committed on GitHub Sep 26, 2016
  5. Merge pull request #36511 from alexbleotu/wait_for_task_update-gh

    Wait for task update gh
    cachedout committed on GitHub Sep 26, 2016
  6. Merge pull request #36495 from cro/zypper_fix

    Fix pkg.upgrade for zypper
    cachedout committed on GitHub Sep 26, 2016
  7. Merge pull request #36539 from jfindlay/arch_perms

    Prefer archive.cmd_unzip
    cachedout committed on GitHub Sep 26, 2016
  8. Merge pull request #36552 from aneeshusa/finalize-archive_user-remova…

    …l-in-archive.extracted
    
    archive.extracted: Use `user`/`group`, not `archive_user`
    cachedout committed on GitHub Sep 26, 2016
  9. Merge pull request #36558 from vodik/develop

    Fix lineterminator on kapacitor diffs
    cachedout committed on GitHub Sep 26, 2016
  10. Merge pull request #36536 from elainearbaugh/issue-36451-fix-trust-key

    fixed bug where gpg.trust_key calls get_key for current user, not input user
    cachedout committed on GitHub Sep 26, 2016
  11. Merge pull request #36509 from alexbleotu/get_root_folder-gh

    Get root folder gh
    cachedout committed on GitHub Sep 26, 2016
  12. Merge pull request #36523 from silenius/develop

    add rpad_ipv4_network
    cachedout committed on GitHub Sep 26, 2016
  13. Merge pull request #36546 from rallytime/fix-36514

    Mercurial Module: Pass the identity_path portion as own arg
    cachedout committed on GitHub Sep 26, 2016
  14. Merge pull request #36524 from homolkad/add-heat-execution-state-module

    Adding openstack heat module execution and state
    cachedout committed on GitHub Sep 26, 2016
  15. Merge pull request #36555 from DSRCorporation/bugs/35480_master_shutdown

    Bugs/35480 master shutdown
    cachedout committed on GitHub Sep 26, 2016
  16. Merge pull request #36563 from beezz/docs/rst-table-formatting-logging

    Fix rst table syntax in logging documentation section
    cachedout committed on GitHub Sep 26, 2016
  17. Merge pull request #36566 from s0undt3ch/develop

    Python 3 module reload compatability
    cachedout committed on GitHub Sep 26, 2016
  18. Merge pull request #36567 from Paulche/patch-1

    Fix typo in postgres_user.py
    cachedout committed on GitHub Sep 26, 2016
Commits on Sep 25, 2016
  1. Fix typo in postgres_user.py

    Paulche committed on GitHub Sep 25, 2016
  2. Python 3 module reload compatability

    s0undt3ch committed Sep 25, 2016
  3. Fix rst table syntax in logging docs section

    Signed-off-by: Michal Kuffa <michal.kuffa@gmail.com>
    beezz committed Sep 25, 2016
Commits on Sep 24, 2016
  1. Fix lineterminator on kapacitor diffs

    vodik committed Sep 24, 2016
  2. Wait for kill in ProcessManager should be greater in main process tha…

    …n in subprocess.
    
    Or it would kill subprocess before it killed his children.
    DmitryKuzmenko committed Sep 24, 2016
  3. Don't set the `daemon` flag for LoggingQueue process.

    Because the ProcessManager already manages the LoggingQueue lifecycle.
    DmitryKuzmenko committed Sep 24, 2016
  4. archive.extracted: Use `user`/`group`, not `archive_user`

    Ensure that any created parent directories are made with `user`/`group`
    perms, not as the `archive_user` user. This also allows setting the
    group for these dirs instead of defaulting to `root`.
    
    The `archive_user` argument to archive.extracted has been deprecated
    since version 2014.7.2, and supplanted by the `user` parameter in
    2015.8.0, with a logged warning until Boron. Now that 2016.3.0 is out,
    complete the deprecation by:
    - no longer silently using `archive_user` in `archive.extracted`,
      preferring instead `user` and `group`,
    - no longer accepted `archive_user` as an argument.
    
    Also update man page.
    aneeshusa committed Sep 24, 2016
Commits on Sep 23, 2016
  1. Mercurial Module: Pass the identity_path portion as own arg

    Fixes #36514
    rallytime committed Sep 23, 2016
  2. Merge pull request #36542 from rallytime/merge-2016.3

    [2016.3] Merge forward from 2015.8 to 2016.3
    rallytime committed on GitHub Sep 23, 2016
  3. Merge branch '2015.8' into '2016.3'

    No conflicts.
    rallytime committed Sep 23, 2016
  4. Fixup the rabbitmq_user state test failure (#36541)

    rallytime committed on GitHub Sep 23, 2016
  5. Back-port #36435 to 2016.3 (#36532)

    * Added "none" option for pillar_source_merging_strategy
    
    * added none to merging strategy in dictupdate so we no longer log warnings when it is selected
    
    * Updated documentation
    
    * fix for when pillar_source_merging_strategy is not set
    
    * Fix looking up pillar data when merging is set to "none" and no saltenv was passed
    
    * Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry
    
    * Let's not break when no merging strategy is passed
    
    * Capitalisation
    
    * Update on doc
    rallytime committed on GitHub Sep 23, 2016
  6. Wrap the entire GrainsAppendTestCase class with destructiveTest (#36537)

    Since all pieces of the GrainsAppendTestCase are destructive, let's
    just wrap the whole class test case.
    
    Because the tests themselves as well as the `tearDown` function were
    wrapped in a @destructiveTest decorator, some test errors were printing
    in the test output when --run-destructive isn't passed at the CLI.
    
    This fixes those test errors.
    rallytime committed on GitHub Sep 23, 2016
  7. states.archive: use archive.cmd_unzip when possible

    cmd_unzip is preferable as python's zip module does not preserve
    permissions or mtimes.  See https://bugs.python.org/issue15795.
    jfindlay committed Sep 23, 2016
  8. Per issue 36451, fixed bug where gpg.trust_key calls get_key for

    the current user, not the input user
    elainearbaugh committed Sep 23, 2016