Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Don't merge] Ignore this: wrong target branch. #33895

This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 25, 2016

  1. Configuration menu
    Copy the full SHA
    d1e210f View commit details
    Browse the repository at this point in the history
  2. Merge pull request saltstack#33480 from jfindlay/service_doc

    states.service: minor doc updates
    Mike Place committed May 25, 2016
    Configuration menu
    Copy the full SHA
    ede232f View commit details
    Browse the repository at this point in the history
  3. Merge pull request saltstack#33482 from rallytime/pillar-opts-docs

    Add pillar_opts docs to master.rst
    Mike Place committed May 25, 2016
    Configuration menu
    Copy the full SHA
    f72ec14 View commit details
    Browse the repository at this point in the history
  4. Merge pull request saltstack#33490 from rallytime/fix-16319

    Document the postgres.psql_query function
    Mike Place committed May 25, 2016
    Configuration menu
    Copy the full SHA
    2394cdc View commit details
    Browse the repository at this point in the history
  5. Merge pull request saltstack#33481 from rallytime/fix-33423

    Fix docs about etcd config options and add pillar_opts doc
    Mike Place committed May 25, 2016
    Configuration menu
    Copy the full SHA
    56ea979 View commit details
    Browse the repository at this point in the history
  6. Merge pull request saltstack#33487 from jtand/glance_doc_fixes

    Add docstring examples to glance.py and nova.py [2015.8]
    Mike Place committed May 25, 2016
    Configuration menu
    Copy the full SHA
    70eb7b6 View commit details
    Browse the repository at this point in the history
  7. Merge pull request saltstack#33465 from meaksh/check-if-job-returns-s…

    …uccessfully-2015.8
    
    jobs.exit_success allow to check if a job has executed and exit successfully
    Mike Place committed May 25, 2016
    Configuration menu
    Copy the full SHA
    3bfb6bf View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    cfc07f7 View commit details
    Browse the repository at this point in the history
  9. Merge pull request saltstack#33076 from cachedout/win_grains

    Avoid second grains load on windows multiprocessing
    Mike Place committed May 25, 2016
    Configuration menu
    Copy the full SHA
    4cf40da View commit details
    Browse the repository at this point in the history
  10. Merge pull request saltstack#33474 from cachedout/issue_29451

    Fix diskusage beacon
    Mike Place committed May 25, 2016
    Configuration menu
    Copy the full SHA
    e9b648e View commit details
    Browse the repository at this point in the history
  11. Merge pull request saltstack#33486 from jtand/2015.5

    Add docstring examples to glance.py [2015.5]
    Mike Place committed May 25, 2016
    Configuration menu
    Copy the full SHA
    6f7fda0 View commit details
    Browse the repository at this point in the history
  12. Merge pull request saltstack#33503 from rallytime/fix-15252

    Add docs about minion config file in standalone minion docs
    Mike Place committed May 25, 2016
    Configuration menu
    Copy the full SHA
    ee76be3 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    7d78e5d View commit details
    Browse the repository at this point in the history
  14. Merge pull request saltstack#33505 from twangboy/fix_build_script

    Fix build script where pip didn't work
    Mike Place committed May 25, 2016
    Configuration menu
    Copy the full SHA
    a43ffad View commit details
    Browse the repository at this point in the history
  15. Merge branch '2015.5' into '2015.8'

    Conflicts:
      - doc/ref/configuration/master.rst
      - doc/ref/configuration/minion.rst
    rallytime committed May 25, 2016
    Configuration menu
    Copy the full SHA
    03b0c97 View commit details
    Browse the repository at this point in the history
  16. Merge pull request saltstack#33507 from rallytime/merge-2015.8

    [2015.8] Merge forward from 2015.5 to 2015.8
    Nicole Thomas committed May 25, 2016
    Configuration menu
    Copy the full SHA
    5a6b037 View commit details
    Browse the repository at this point in the history
  17. Merge branch '2015.8' into '2106.3'

    Conflicts:
      - salt/beacons/__init__.py
      - salt/modules/saltutil.py
      - salt/modules/zypper.py
      - salt/states/grains.py
      - salt/states/pkgrepo.py
      - salt/states/service.py
    rallytime committed May 25, 2016
    Configuration menu
    Copy the full SHA
    a5e0141 View commit details
    Browse the repository at this point in the history
  18. Handle system architecture

    Salt Admin authored and Salt Admin committed May 25, 2016
    Configuration menu
    Copy the full SHA
    7844059 View commit details
    Browse the repository at this point in the history
  19. Merge pull request saltstack#33508 from rallytime/merge-2016.3

    [2016.3] Merge forward from 2015.8 to 2016.3
    Nicole Thomas committed May 25, 2016
    Configuration menu
    Copy the full SHA
    9199101 View commit details
    Browse the repository at this point in the history
  20. Add a section to the jinja docs about escaping jinja

    rallytime committed May 25, 2016
    Configuration menu
    Copy the full SHA
    81c1471 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    a424c38 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2016

  1. Configuration menu
    Copy the full SHA
    42e358a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    77a4f5b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9abf8f4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    58492c2 View commit details
    Browse the repository at this point in the history
  5. modules.mac_brew.latest_version: refactor to use standard methods

    Also fix an error in the `pkg.latest` state function caused by a
    difference in how brew reports versions for uninstalled vs installed
    packages.
    jfindlay committed May 26, 2016
    Configuration menu
    Copy the full SHA
    fa3ec8a View commit details
    Browse the repository at this point in the history
  6. modules.mac_brew int tests: move decorators to class

    Also remove unneeded system grains code.
    jfindlay committed May 26, 2016
    Configuration menu
    Copy the full SHA
    be381e0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    8789c2d View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0ed3598 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    2781377 View commit details
    Browse the repository at this point in the history
  10. lint issue fixed

    meaksh committed May 26, 2016
    Configuration menu
    Copy the full SHA
    eaaef25 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    c738a0d View commit details
    Browse the repository at this point in the history
  12. Merge pull request saltstack#33519 from jacobhammons/2016.3.0rel

    New doc site layout, 2016.3.0 release note known issue additions
    Mike Place committed May 26, 2016
    Configuration menu
    Copy the full SHA
    518713f View commit details
    Browse the repository at this point in the history
  13. Merge pull request saltstack#33520 from jacobhammons/release-notes.8

    Updated version numbers in the docs for the 2016.3.0 release
    Mike Place committed May 26, 2016
    Configuration menu
    Copy the full SHA
    fabc15e View commit details
    Browse the repository at this point in the history
  14. Merge pull request saltstack#33522 from jfindlay/mac_pkg

    rework modules.mac_brew.latest_version to work around brew version inconsistency
    Mike Place committed May 26, 2016
    Configuration menu
    Copy the full SHA
    0bc881b View commit details
    Browse the repository at this point in the history
  15. Merge pull request saltstack#33513 from rallytime/fix-33319

    Add a section to the jinja docs about escaping jinja
    Mike Place committed May 26, 2016
    Configuration menu
    Copy the full SHA
    e2d0c4a View commit details
    Browse the repository at this point in the history
  16. Merge pull request saltstack#33501 from meaksh/zypper-download-check-…

    …signature-2015.8
    
    unit tests for rpm.checksum() and zypper.download()
    Mike Place committed May 26, 2016
    Configuration menu
    Copy the full SHA
    d052908 View commit details
    Browse the repository at this point in the history
  17. Merge pull request saltstack#33509 from twangboy/fix_arch

    Detect System Architecture for Mac Build
    Mike Place committed May 26, 2016
    Configuration menu
    Copy the full SHA
    3a95f8a View commit details
    Browse the repository at this point in the history
  18. Fix for saltstack#33530

    thatch45 committed May 26, 2016
    Configuration menu
    Copy the full SHA
    b906859 View commit details
    Browse the repository at this point in the history
  19. Refs saltstack#33543

    jacobhammons committed May 26, 2016
    Configuration menu
    Copy the full SHA
    65df3a6 View commit details
    Browse the repository at this point in the history
  20. Fix crashing Maintenence process

    The first time through the loop we deleted the dir and then stack
    traced the second time through the loop if we hit the other conditional.
    
    Resolves saltstack#33544
    Mike Place committed May 26, 2016
    Configuration menu
    Copy the full SHA
    fe7ee7a View commit details
    Browse the repository at this point in the history
  21. Merge pull request saltstack#33550 from saltstack/jacobhammons-patch-1

    Fixes display of thorium docs
    Mike Place committed May 26, 2016
    Configuration menu
    Copy the full SHA
    5287a1b View commit details
    Browse the repository at this point in the history
  22. Merge pull request saltstack#33538 from alprs/fix-cmd_user_runas_depr…

    …ecation_bug
    
    Fix a KeyError if group is provided but not user in cmd states
    Mike Place committed May 26, 2016
    Configuration menu
    Copy the full SHA
    4831c6a View commit details
    Browse the repository at this point in the history
  23. Merge pull request saltstack#33555 from cachedout/issue_33544

    Fix crashing Maintenence process
    Mike Place committed May 26, 2016
    Configuration menu
    Copy the full SHA
    58d89d6 View commit details
    Browse the repository at this point in the history
  24. Merge pull request saltstack#33549 from thatch45/33530

    Mike Place committed May 26, 2016
    Configuration menu
    Copy the full SHA
    71145dd View commit details
    Browse the repository at this point in the history

Commits on May 27, 2016

  1. Fix saltstack#33565

    Tom LAREDO committed May 27, 2016
    Configuration menu
    Copy the full SHA
    9f7d81e View commit details
    Browse the repository at this point in the history
  2. Call zypper refresh after adding/modifying a repository

    Calling `zypper --gpg-auto-import-keys refresh` is required after
    adding/modifying a repository because `--gpg-auto-import-keys` doesn't
    do anything when called with `zypper ar` or `zypper mr`.
    Without calling `zypper --gpg-auto-import-keys refresh` here, calling
    `zypper ref` after adding/removing would still ask for
    accepting/rejecting the gpg key.
    Mihai Dinca committed May 27, 2016
    Configuration menu
    Copy the full SHA
    c7ae590 View commit details
    Browse the repository at this point in the history
  3. Merge pull request saltstack#33576 from rodacom/2016.3

    Fix saltstack#33565 (typo causes invalid syntax)
    Mike Place committed May 27, 2016
    Configuration menu
    Copy the full SHA
    afd3c1b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1ae7dd7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    193583b View commit details
    Browse the repository at this point in the history
  6. Add missing import

    twangboy committed May 27, 2016
    Configuration menu
    Copy the full SHA
    72ebf26 View commit details
    Browse the repository at this point in the history
  7. Add restart needed

    twangboy committed May 27, 2016
    Configuration menu
    Copy the full SHA
    6e478cb View commit details
    Browse the repository at this point in the history
  8. Fix restart_needed

    twangboy committed May 27, 2016
    Configuration menu
    Copy the full SHA
    8ebe99e View commit details
    Browse the repository at this point in the history
  9. Fix changes

    twangboy committed May 27, 2016
    Configuration menu
    Copy the full SHA
    56a6f6b View commit details
    Browse the repository at this point in the history
  10. Fix unit tests

    twangboy committed May 27, 2016
    Configuration menu
    Copy the full SHA
    79bc719 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    62a6bde View commit details
    Browse the repository at this point in the history
  12. Merge pull request saltstack#33558 from twangboy/fix_win_servermanager

    Fix win servermanager
    Mike Place committed May 27, 2016
    Configuration menu
    Copy the full SHA
    b47182e View commit details
    Browse the repository at this point in the history

Commits on May 28, 2016

  1. Configuration menu
    Copy the full SHA
    1620b8c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c85e03e View commit details
    Browse the repository at this point in the history
  3. add no-wheel, instructions were failing for someone testing due to wh…

    …eel being used nog producing an egg
    sjorge committed May 28, 2016
    Configuration menu
    Copy the full SHA
    1064102 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8bf0290 View commit details
    Browse the repository at this point in the history
  5. Ignore cdroms in disks grain

    kev009 committed May 28, 2016
    Configuration menu
    Copy the full SHA
    e452ec5 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2016

  1. Merge pull request saltstack#33603 from sjorge/2016.3-smartos-esky

    allow esky packages to be build on base64 2015Q4
    Mike Place committed May 29, 2016
    Configuration menu
    Copy the full SHA
    e9a0c93 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fb13852 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2016

  1. Configuration menu
    Copy the full SHA
    c6c3ff0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    180099a View commit details
    Browse the repository at this point in the history
  3. Update test method names to pass pylint

    Mihai Dinca committed May 30, 2016
    Configuration menu
    Copy the full SHA
    1d5d6d7 View commit details
    Browse the repository at this point in the history
  4. Reduce dicts and lists to one line where possible

    Mihai Dinca committed May 30, 2016
    Configuration menu
    Copy the full SHA
    80bfbe5 View commit details
    Browse the repository at this point in the history
  5. Reverse if conditions and rename variable

    Mihai Dinca committed May 30, 2016
    Configuration menu
    Copy the full SHA
    ced75e8 View commit details
    Browse the repository at this point in the history
  6. Assert only gpgautoimport: True works

    Mihai Dinca committed May 30, 2016
    Configuration menu
    Copy the full SHA
    42d8d41 View commit details
    Browse the repository at this point in the history
  7. Improve zypper_patcher_config looks

    Mihai Dinca committed May 30, 2016
    Configuration menu
    Copy the full SHA
    1d3769c View commit details
    Browse the repository at this point in the history
  8. DRY test

    Mihai Dinca committed May 30, 2016
    Configuration menu
    Copy the full SHA
    788730e View commit details
    Browse the repository at this point in the history

Commits on May 31, 2016

  1. Merge branch '2015.8' into '2016.3'

    Conflicts:
      -   -   -   -   -   -   -   -   - doc/conf.py
    Nicole Thomas committed May 31, 2016
    Configuration menu
    Copy the full SHA
    74a7b78 View commit details
    Browse the repository at this point in the history
  2. Use correct state name in libvirt formula doc (saltstack#33631)

    The state module for libvirt has been renamed to 'virt' from
    'libvirt' in 2016.3 and these references to the old name have not been
    updated.
    wwentland authored and Nicole Thomas committed May 31, 2016
    Configuration menu
    Copy the full SHA
    259529e View commit details
    Browse the repository at this point in the history
  3. Merge pull request saltstack#33604 from kev009/fix-33578

    Fix saltstack#33578 disks grain
    Mike Place committed May 31, 2016
    Configuration menu
    Copy the full SHA
    44e8c9e View commit details
    Browse the repository at this point in the history
  4. Merge pull request saltstack#33606 from danslimmon/ini-optionsabsent-…

    …33590
    
    Fixed ini.options_absent. Resolves saltstack#33590.
    Mike Place committed May 31, 2016
    Configuration menu
    Copy the full SHA
    23506f8 View commit details
    Browse the repository at this point in the history
  5. Merge pull request saltstack#33615 from danslimmon/mysql-traceback-33582

    Fix crash on unconnectable MySQL server (resolves saltstack#33582)
    Mike Place committed May 31, 2016
    Configuration menu
    Copy the full SHA
    5049893 View commit details
    Browse the repository at this point in the history
  6. Back-port saltstack#33613 to 2016.3 (saltstack#33638)

    * Updated apache_module for backward compatible.
    
    [This](saltstack@f3a2b27) introduced
    a change of functions names that break this module when using Beryllium or older and upgrading to Boron.
    Added here a deprecated warning in to order to advice users to migrate to new functions names. Also
    documentation updated since was not updated in the original commit.
    
    * Move warnutil from Carbon to Nitrogen
    
    Let's give people a little more time to update their states.
    Nicole Thomas committed May 31, 2016
    Configuration menu
    Copy the full SHA
    b7230bd View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    17306bf View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9b0eb85 View commit details
    Browse the repository at this point in the history
  9. Fix zypper test

    rallytime committed May 31, 2016
    Configuration menu
    Copy the full SHA
    cd05d2b View commit details
    Browse the repository at this point in the history
  10. Merge pull request saltstack#33637 from rallytime/merge-2016.3

    [2016.3] Merge forward from 2015.8 to 2016.3
    Nicole Thomas committed May 31, 2016
    Configuration menu
    Copy the full SHA
    b379dc5 View commit details
    Browse the repository at this point in the history
  11. test.integration: use hard /tmp on MacOS

    Otherwise, the tests will not work as `$TMPDIR` produces a path that is
    too long for unix sockets on the platform.
    jfindlay committed May 31, 2016
    Configuration menu
    Copy the full SHA
    8295b48 View commit details
    Browse the repository at this point in the history
  12. tests.runtests: use globally-determined tempdir

    This way, the the test logs will use the same temp dir as the rest of
    the test suite.  On MacOS, for example, `$TMPDIR` is set to a path that
    is too long for unix sockets on the system, so the `SYS_TEMP_DIR` is set
    to `/tmp` to override this.
    jfindlay committed May 31, 2016
    Configuration menu
    Copy the full SHA
    c53a727 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    4ad80d2 View commit details
    Browse the repository at this point in the history
  14. Restore grains context to renderers

    We were missing the proper grains dictionary in the renderer context. This restores it.
    
    Closes saltstack#33614
    Mike Place committed May 31, 2016
    Configuration menu
    Copy the full SHA
    4e18ff7 View commit details
    Browse the repository at this point in the history
  15. Lower the log level for failed auths

    Since failed auths are most often due to key rotation, they should be
    logged as debug messages rather than errors.
    terminalmage committed May 31, 2016
    Configuration menu
    Copy the full SHA
    4118416 View commit details
    Browse the repository at this point in the history
  16. Fix indentation error in minion.py

    Mike Place committed May 31, 2016
    Configuration menu
    Copy the full SHA
    8259d40 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2016

  1. Handle non-ascii package names in state.format_log

    rallytime committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    ae332d1 View commit details
    Browse the repository at this point in the history
  2. Merge pull request saltstack#33656 from cachedout/fix_33076

    Fix indentation error in minion.py
    Mike Place committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    9603cd3 View commit details
    Browse the repository at this point in the history
  3. Merge pull request saltstack#33646 from jfindlay/mac_tests

    Fix more tmp paths on MacOS
    Mike Place committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    e92d6e2 View commit details
    Browse the repository at this point in the history
  4. Merge pull request saltstack#33652 from terminalmage/zh723

    Lower the log level for failed auths
    Mike Place committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    7bce4ec View commit details
    Browse the repository at this point in the history
  5. Merge pull request saltstack#33648 from terminalmage/issue33529

    salt.modules.pkgng: Fix incorrect usage of _pkg()
    Mike Place committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    d566ec4 View commit details
    Browse the repository at this point in the history
  6. Pass kwargs to cmd.run

    twangboy committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    4272afe View commit details
    Browse the repository at this point in the history
  7. Track down more unicode instances and add a test

    rallytime committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    9729aed View commit details
    Browse the repository at this point in the history
  8. Only compile the template contents if they evaluate to True

    When getting all the top files for the various environments, those
    environments without a top file will return ``False`` when we attempt to
    cache the file. Passing a boolean to ``compile_template()`` will result
    in an error being logged, since we are invoking the function incorrectly
    (it expects the template data to be a string).
    
    Since a ``False`` return from caching the file means that it does not
    exist, this commit will only run ``compile_template()`` when the
    contents evaluate to ``True``.
    
    Resolves saltstack#33424.
    terminalmage committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    5eb1b3c View commit details
    Browse the repository at this point in the history
  9. Make tornado raise error configurable (saltstack#32942)

    onorua authored and rallytime committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    09751ec View commit details
    Browse the repository at this point in the history
  10. first go at having requests use streaming for get/put requests

    lomeroe authored and rallytime committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    4a9b23f View commit details
    Browse the repository at this point in the history
  11. use requests streaming for uploads/downloads to file (return_bin unch…

    …anged)
    
    allows downloading files larger than amount of memory (non-stream reads into memory before writing to disk or uploading)
    lomeroe authored and rallytime committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    45143a5 View commit details
    Browse the repository at this point in the history
  12. Merge pull request saltstack#33677 from twangboy/fix_runas

    Pass kwargs to cmd.run
    Mike Place committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    9571dad View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    ef885c1 View commit details
    Browse the repository at this point in the history
  14. Revert "Track down more unicode instances and add a test"

    This reverts commit 9729aed.
    
    This isn't the right approach here. This fix needs to be more narrow.
    rallytime committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    e680974 View commit details
    Browse the repository at this point in the history
  15. Integration test for gem module

    Justin Anderson committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    5b23b91 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    2b5035f View commit details
    Browse the repository at this point in the history
  17. Merge pull request saltstack#33396 from babilen/issue-33393

    Issue 33393
    Mike Place committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    13537c4 View commit details
    Browse the repository at this point in the history
  18. Merge pull request saltstack#33681 from rallytime/bp-33599

    Back-port saltstack#33599 to 2015.8
    Mike Place committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    069ee15 View commit details
    Browse the repository at this point in the history
  19. Fixed typo, uninstalled to uninstall

    Justin Anderson committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    37bc3ad View commit details
    Browse the repository at this point in the history
  20. Fixed typos, and added destructiveTest decorator

    Justin Anderson committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    134e1fa View commit details
    Browse the repository at this point in the history
  21. Removed artifact from testing

    Justin Anderson committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    9d437bd View commit details
    Browse the repository at this point in the history
  22. Merge pull request saltstack#33680 from rallytime/bp-32942

    Back-port saltstack#32942 to 2016.3
    Mike Place committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    c725854 View commit details
    Browse the repository at this point in the history
  23. Merge pull request saltstack#33581 from dincamihai/2015.8

    Call zypper refresh after adding/modifying a repository
    Mike Place committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    5e022ff View commit details
    Browse the repository at this point in the history
  24. Merge pull request saltstack#33685 from jfindlay/get_url_test

    modules.cp.get_url: add test for https://
    Mike Place committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    c8dc70b View commit details
    Browse the repository at this point in the history
  25. Append empty dictionaries for saltenvs with no top file

    Rather than excluding them from the get_tops() return data at all, just
    populate them with empty dictionaries. This makes it easier to unit test
    things like merge order, while still being functionally the same as
    exlcluding the saltenv from get_tops() altogether.
    terminalmage committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    9da40c4 View commit details
    Browse the repository at this point in the history
  26. Refactored tests to not use return messages

    Justin Anderson committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    210aceb View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    b0af323 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    4775e6b View commit details
    Browse the repository at this point in the history
  29. Fix lint and tests

    twangboy committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    6c7b216 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2016

  1. Update mac native package for upcoming release

    This solves an issue where the package `resources` and package `scripts` were being added to the root of the install drive.
    
    Change Spelling for:
    * xCode to XCode
    * and capitalize Command Line Tools
    
    to match Apple's offical documentation.
    
    Ref: https://developer.apple.com/xcode/
    and https://developer.apple.com/library/ios/technotes/tn2339/_index.html
    Clayton Burlison committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    b483d1d View commit details
    Browse the repository at this point in the history
  2. Fix a bug when creating a new VM and changing the network info

    - This commit fixes a small bug where the network adapter won't be connected at startup of the VM and therefore can never be contacted by the salt master, the fix is to just simply apply the same config changes once the clone is completed
    opdude committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    7834aed View commit details
    Browse the repository at this point in the history
  3. Fix a bug with self signed certificates and creating a new VM

    - Removed the GetConnection call as all this does is cause connections that are connected with the overrides for "CERTIFICATE_VERIFY_FAILED" to not be able to connect the 2nd time the si is fetched
    opdude committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    64e9334 View commit details
    Browse the repository at this point in the history
  4. Remove explicit PW column default from mysql_user (saltstack#33690)

    Neil Williamson authored and Nicole Thomas committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    778b290 View commit details
    Browse the repository at this point in the history
  5. Undo __repr__() and __str__() parts of d5a7dcc (saltstack#33688)

    The repr string formatting flag is required here.
    
    Resolves saltstack#33532.
    Erik Johnson authored and Nicole Thomas committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    377556a View commit details
    Browse the repository at this point in the history
  6. Add unit test for format_log change

    rallytime committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    a580d1c View commit details
    Browse the repository at this point in the history
  7. backport saltstack#33599 to 2016.3 (saltstack#33682)

    lomeroe authored and Nicole Thomas committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    e87c310 View commit details
    Browse the repository at this point in the history
  8. Merge branch '2015.8' into '2016.3'

    Conflicts:
      - salt/utils/aws.py
      - salt/utils/s3.py
    rallytime committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    b7accb0 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a53dc19 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    8621f5b View commit details
    Browse the repository at this point in the history
  11. Add check for gem binary

    Justin Anderson committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    c97f331 View commit details
    Browse the repository at this point in the history
  12. A couple lint fixes

    Justin Anderson committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    91db411 View commit details
    Browse the repository at this point in the history
  13. Merge pull request saltstack#33710 from rallytime/merge-2016.3

    [2016.3] Merge forward from 2015.8 to 2016.3
    Mike Place committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    78966f5 View commit details
    Browse the repository at this point in the history
  14. Removed redundancies

    Justin Anderson committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    400a71e View commit details
    Browse the repository at this point in the history
  15. Merge pull request saltstack#33679 from terminalmage/issue33424

    Only compile the template contents if they evaluate to True
    Mike Place committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    996ff56 View commit details
    Browse the repository at this point in the history
  16. Merge pull request saltstack#33696 from clburlison/2016.3-pkg-fix

    Update mac native package for upcoming release
    Mike Place committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    1d6582b View commit details
    Browse the repository at this point in the history
  17. Merge pull request saltstack#33659 from danslimmon/dockerng-dryrun-33632

    Added test mode to states.dockerng. Resolves saltstack#33632.
    Mike Place committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    d3253ef View commit details
    Browse the repository at this point in the history
  18. Merge pull request saltstack#33654 from twangboy/fix_win_servermanager

    Fix win servermanager
    Mike Place committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    8a566ff View commit details
    Browse the repository at this point in the history
  19. Update test to correct iteration

    rallytime committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    59bd51f View commit details
    Browse the repository at this point in the history
  20. Merge pull request saltstack#33562 from jfindlay/apache_funcs

    states.apache_*: readd and deprecate enable and disable
    Mike Place committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    5f4c690 View commit details
    Browse the repository at this point in the history
  21. Fix incorrect args passed to timezone.set_hwclock

    On Gentoo, we should check the value passed in to timezone.set_hwclock
    and only allow 'UTC' or 'localtime' for argument. If incorrect value is
    passed in, it could subsequently fry the important config file.
    
    There is another closely related issue on Gentoo. The value to set
    'clock' variable in the config file is either 'UTC' or 'local'. In case
    of localtime arg, we should convert the value of 'localtime' to 'local'
    when setting that 'clock' variable.
    sacren authored and rallytime committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    a411467 View commit details
    Browse the repository at this point in the history
  22. Fix speed issue

    Erik Johnson pointed out the speed issue with compelling numbers:
    
    >>> import timeit
    >>> t1 = timeit.Timer('clock == "localtime"', 'clock = "localtime"')
    >>> t2 = timeit.Timer('clock.__eq__("localtime")', 'clock = "localtime"')
    >>> t1.repeat()
    [0.061421871185302734, 0.0285952091217041, 0.026736021041870117]
    >>> t2.repeat()
    [0.1310901641845703, 0.09536910057067871, 0.09479284286499023]
    
    I'll absolutely fix it by using the simple '==' operator.
    
    Thank you!
    sacren authored and rallytime committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    a6a4461 View commit details
    Browse the repository at this point in the history
  23. Create missing jid dir if it doesn't exist (saltstack#33653)

    Mike Place authored and Nicole Thomas committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    56c0a42 View commit details
    Browse the repository at this point in the history
  24. Catch oserror for race condition

    Mike Place committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    21b7123 View commit details
    Browse the repository at this point in the history
  25. Fixed salt.util import. Added status check to make sure external reso…

    …urce is available
    Justin Anderson committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    2f36f34 View commit details
    Browse the repository at this point in the history
  26. Change to just surround the mkdir

    Mike Place committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    635efa2 View commit details
    Browse the repository at this point in the history
  27. Made more pythonic

    Justin Anderson committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    86f59b3 View commit details
    Browse the repository at this point in the history
  28. states.test.configurable_test_state test mode

    Make `configurable_test_state` configurable even in test mode and return
    the correct result in test mode as per
    https://docs.saltstack.com/en/latest/ref/states/writing.html#return-data.
    jfindlay committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    f06ff1a View commit details
    Browse the repository at this point in the history
  29. states.test.configurable_test_state: refactor change_data

    Also adjust continued string indentation.
    jfindlay committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    c2d0679 View commit details
    Browse the repository at this point in the history
  30. check rabbitmq version and use different api to validate a users pass…

    …word
    glomium authored and rallytime committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    f851893 View commit details
    Browse the repository at this point in the history
  31. pylint W0141, W0702

    glomium authored and rallytime committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    77a51a0 View commit details
    Browse the repository at this point in the history
  32. Add exclude option

    twangboy committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    50bd76e View commit details
    Browse the repository at this point in the history
  33. Add exclude option to state

    twangboy committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    9870479 View commit details
    Browse the repository at this point in the history
  34. Fix git_pillar edge case for remote repos without a master branch

    When the remote repository does not have a master branch, on the initial
    checkout there will be no ref in refs/remotes/origin for this branch,
    leading to an error being logged and the checkout failing.
    
    Instead of failing the checkout, in these cases we'll create the initial
    local HEAD based on the ref we will eventually check out, since we know
    for a fact that this ref exists.
    
    Resolves saltstack#33725
    terminalmage committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    d8ba7ed View commit details
    Browse the repository at this point in the history
  35. Removed extra :

    Justin Anderson committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    0cb1bfa View commit details
    Browse the repository at this point in the history
  36. Fix docstring

    twangboy committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    2de91d1 View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    87e018a View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2016

  1. Configuration menu
    Copy the full SHA
    636f4c0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    646bc42 View commit details
    Browse the repository at this point in the history
  3. one line is better

    meaksh committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    3bbc5ae View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    134e4a9 View commit details
    Browse the repository at this point in the history
  5. Fixed lint error

    Justin committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    504df9a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ba815db View commit details
    Browse the repository at this point in the history
  7. test_members cleanup

    meaksh committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    bf27e5d View commit details
    Browse the repository at this point in the history
  8. pylint fix

    meaksh committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    ab73841 View commit details
    Browse the repository at this point in the history
  9. ubuntu doesn't install default gems when ruby is installed

    Justin Anderson committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    ff2dae1 View commit details
    Browse the repository at this point in the history
  10. Merge pull request saltstack#33745 from eliasp/2016.3-typo-privilages…

    …-privileges
    
    Typo (`privilages` → `privileges`)
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    e08c685 View commit details
    Browse the repository at this point in the history
  11. Merge pull request saltstack#33748 from ticosax/adjust-api-version-ho…

    …st-config
    
    HostConfig has been introduced by docker api version 1.15
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    c2b9707 View commit details
    Browse the repository at this point in the history
  12. Merge pull request saltstack#33743 from vutny/drop-debian-community-r…

    …epo-doc
    
    Debian installation docs: drop section about community-maintained repo
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    6c150d8 View commit details
    Browse the repository at this point in the history
  13. Merge pull request saltstack#33729 from twangboy/fix_win_servermanager

    Add exclude option to win_servermanager
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    1cf8fe3 View commit details
    Browse the repository at this point in the history
  14. Merge pull request saltstack#33728 from jfindlay/test_state_test

    Make `configurable_test_state` configurable in test mode
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    015e50c View commit details
    Browse the repository at this point in the history
  15. Merge pull request saltstack#33727 from terminalmage/issue33725

    Fix git_pillar edge case for remote repos without a master branch
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    b07701f View commit details
    Browse the repository at this point in the history
  16. Merge pull request saltstack#33723 from rallytime/bp-33641

    Back-port saltstack#33641 to 2016.3
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    56eab36 View commit details
    Browse the repository at this point in the history
  17. Merge pull request saltstack#33718 from rallytime/bp-33700

    Back-port saltstack#33700 to 2015.8
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    2c450a7 View commit details
    Browse the repository at this point in the history
  18. Merge pull request saltstack#33712 from meaksh/fix-for-groupadd-modul…

    …e-failures-in-SLE11-2015.8
    
    Fix for groupadd execution module failures in SLES11 systems
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    11e39e7 View commit details
    Browse the repository at this point in the history
  19. Merge pull request saltstack#33670 from rallytime/fix-33605

    Handle non-ascii package names in state.format_log
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    a5684ed View commit details
    Browse the repository at this point in the history
  20. Merge pull request saltstack#33719 from cachedout/fixup_33653

    Catch oserror for race condition
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    47d668e View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    500d4cc View commit details
    Browse the repository at this point in the history
  22. Merge pull request saltstack#33757 from cachedout/state_set_doc

    Reminder not to return non-serializable data from states
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    daf462e View commit details
    Browse the repository at this point in the history
  23. Better fix

    Just use opts grains int he loader and fall back to empty dict
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    7b50e17 View commit details
    Browse the repository at this point in the history
  24. Catch no minions exception in batch mode

    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    15a39f8 View commit details
    Browse the repository at this point in the history
  25. Fix whitespace

    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    5518e1d View commit details
    Browse the repository at this point in the history
  26. Merge pull request saltstack#33651 from cachedout/issue_33614

    Restore grains context to renderers
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    a8d9221 View commit details
    Browse the repository at this point in the history
  27. Insert --no-refresh before install in Zypper.

    Instead of appending --no-refresh after install, this will insert --no--refresh as
    the first element of the list.
    abednarik committed Jun 3, 2016
    1 Configuration menu
    Copy the full SHA
    7c909a1 View commit details
    Browse the repository at this point in the history
  28. Merge instead of update pillar overrides

    An earlier commit (made in develop the 2015.8 release branch was
    created) added the ability to decrypt CLI pillar overrides. As this was
    an entirely new block of code in the 2016.3 release branch, when a CLI
    pillar override issue was fixed in 2015.8, the fix did not make it to
    2016.3.
    
    This commit fixes this issue by merging the CLI pillar data instead of
    using dict.update().
    
    Resolves saltstack#33647.
    terminalmage committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    914003c View commit details
    Browse the repository at this point in the history
  29. Merge pull request saltstack#33759 from cachedout/issue_31219

    Catch no minions exception in batch mode
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    c749aea View commit details
    Browse the repository at this point in the history
  30. Update documentation

    twangboy committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    3650784 View commit details
    Browse the repository at this point in the history
  31. Add additional functions

    twangboy committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    c662105 View commit details
    Browse the repository at this point in the history
  32. Add get functions

    twangboy committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    00c24ab View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2016

  1. Configuration menu
    Copy the full SHA
    ea3498a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f87bc34 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    35b84f1 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2016

  1. Fix minor docstring issue of arg being missing

    The network.get_bufsize function requires an interface for arg. In the
    example that part is missing. Add arbitrary 'eth0' for clarity.
    sacren committed Jun 5, 2016
    Configuration menu
    Copy the full SHA
    c1fd830 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b8c0dd5 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2016

  1. Merge pull request saltstack#33777 from sodium-chloride/2015.8-2016-0…

    …604-1939
    
    Fix minor docstring issue of arg being missing
    Mike Place committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    bb4194b View commit details
    Browse the repository at this point in the history
  2. Merge pull request saltstack#33772 from danslimmon/trough-through

    Fixed spelling of "through"
    Mike Place committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    b37a862 View commit details
    Browse the repository at this point in the history
  3. Merge pull request saltstack#33764 from terminalmage/issue33647

    Merge instead of update pillar overrides
    Mike Place committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    306848a View commit details
    Browse the repository at this point in the history
  4. Merge pull request saltstack#33763 from abednarik/abednarik_zypper_no…

    …_refresh_fix
    
    Insert --no-refresh before install in Zypper.
    Mike Place committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    a92e155 View commit details
    Browse the repository at this point in the history
  5. Merge pull request saltstack#33776 from danslimmon/s3-bucket-idempote…

    …ncy-33754
    
    Fixed ACL user comparison. Resolves saltstack#33754.
    Mike Place committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    94f98b4 View commit details
    Browse the repository at this point in the history
  6. Merge pull request saltstack#33691 from jtand/gem_integration_test

    Gem integration test
    Mike Place committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    7fdfbe9 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d210a92 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    90aee79 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    90a4ee3 View commit details
    Browse the repository at this point in the history
  10. Add state functions

    twangboy committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    fbdd28f View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    7e6382a View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    946371b View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    da8562d View commit details
    Browse the repository at this point in the history
  14. Add restart option

    twangboy committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    6510e0a View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    d9b848c View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    10458d8 View commit details
    Browse the repository at this point in the history
  17. Work around upstream cherrypy bug

    Mike Place committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    1b537d4 View commit details
    Browse the repository at this point in the history
  18. Fix typos

    twangboy committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    b8ee89f View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    7ff7050 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    6af47d2 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    a32774c View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    0c069dd View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. Fix some lint errors

    twangboy committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    b574947 View commit details
    Browse the repository at this point in the history
  2. Fix unit tests for module

    twangboy committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    60f856f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f7c19a1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f13f914 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8ff5906 View commit details
    Browse the repository at this point in the history
  6. Merge pull request saltstack#33770 from jfindlay/service_tests

    service state integration tests
    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    c30d8a8 View commit details
    Browse the repository at this point in the history
  7. Merge pull request saltstack#33806 from cachedout/cherrypy_1444

    Work around upstream cherrypy bug
    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    a84588c View commit details
    Browse the repository at this point in the history
  8. Merge pull request saltstack#33808 from jfindlay/gem_tests

    fix some problems with the gem module integration tests
    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    3984b65 View commit details
    Browse the repository at this point in the history
  9. Merge pull request saltstack#33805 from jfindlay/pkg_tests

    states.pkg int tests: skip if pkg mgr unavailable
    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    1db559a View commit details
    Browse the repository at this point in the history
  10. Merge pull request saltstack#33767 from amontalban/2016.3

    Fix saltstack#33604 implementation when 'geom disk list' does not output rotat…
    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    3e48b70 View commit details
    Browse the repository at this point in the history
  11. Restore deafault log level to warning

    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    52f1f77 View commit details
    Browse the repository at this point in the history
  12. Add missing unit tests

    twangboy committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    8d66fac View commit details
    Browse the repository at this point in the history
  13. Merge pull request saltstack#33821 from cachedout/issue_33818

    Restore deafault log level to warning
    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    3f6d06a View commit details
    Browse the repository at this point in the history
  14. Fix broken locate.locate function

    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    9d36f1e View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    421dc97 View commit details
    Browse the repository at this point in the history
  16. Fix some more lint

    twangboy committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    9be45fe View commit details
    Browse the repository at this point in the history
  17. Fixing more stupid unit tests

    This time win_servermanager
    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    453fb1a View commit details
    Browse the repository at this point in the history
  18. Merge pull request saltstack#33836 from cachedout/fix_winserver_manag…

    …er_test
    
    Fixing more stupid unit tests
    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    cda032d View commit details
    Browse the repository at this point in the history
  19. Fix another unit test stacktrace in pkg_resource

    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    435547a View commit details
    Browse the repository at this point in the history
  20. Remove matcher tests

    These all assert directly against mock objects. They're pointless.
    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    6297448 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2016

  1. Configuration menu
    Copy the full SHA
    0d40e1c View commit details
    Browse the repository at this point in the history
  2. Merge pull request saltstack#33840 from cachedout/remove_matcher_unit…

    …_tests
    
    Remove matcher tests
    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    5f081ef View commit details
    Browse the repository at this point in the history
  3. Merge pull request saltstack#33839 from cachedout/fix_pkgresource_tes…

    …t_stacktrace
    
    Fix another unit test stacktrace in pkg_resource
    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    f7b3d0e View commit details
    Browse the repository at this point in the history
  4. Merge pull request saltstack#33827 from cachedout/issue_33810

    Fix broken locate.locate function
    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    ec09095 View commit details
    Browse the repository at this point in the history
  5. Merge pull request saltstack#33851 from ticosax/fix-entrypoint-support

    [dockerng] Add support for edge case when `Cmd` and `Entrypoint` can't be blanked
    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    f546e47 View commit details
    Browse the repository at this point in the history
  6. Merge pull request saltstack#33771 from twangboy/win_dism

    Additional functionality to win_dism.py
    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    01aaf3e View commit details
    Browse the repository at this point in the history
  7. Merge pull request saltstack#33698 from Unity-Technologies/vsphere-fixes

    Vsphere fixes
    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    a3202f1 View commit details
    Browse the repository at this point in the history
  8. Allow socket closes when the socket is disconnected

    This prevents stacktraces when the master is signaled for a shutdown
    but the sockets are already disconnected.
    
    Closes saltstack#33843
    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    7a46360 View commit details
    Browse the repository at this point in the history
  9. Correct silly mistake

    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    e7de99d View commit details
    Browse the repository at this point in the history
  10. Set master and cloud to log level warning (saltstack#33861)

    Mike Place authored and Nicole Thomas committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    b183a36 View commit details
    Browse the repository at this point in the history
  11. Merge branch '2015.8' into '2016.3'

    Conflicts:
      - salt/cli/salt.py
      - salt/modules/groupadd.py
      - salt/states/service.py
    rallytime committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    c5b4ec0 View commit details
    Browse the repository at this point in the history
  12. Use errno

    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    2c88e22 View commit details
    Browse the repository at this point in the history
  13. Merge pull request saltstack#33860 from cachedout/issue_33843

    Allow socket closes when the socket is disconnected
    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    669aa92 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    595d4f2 View commit details
    Browse the repository at this point in the history
  15. Merge pull request saltstack#33866 from rallytime/merge-2016.3

    [2016.3] Merge forward from 2015.8 to 2016.3
    Nicole Thomas committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    be20ce1 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    06f2499 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2016

  1. Don't deep copy context dict values.

    Dmitry Kuzmenko committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    8e34d0a View commit details
    Browse the repository at this point in the history