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

[2016.3] Merge forward from 2015.8 to 2016.3 #33866

Merged
merged 69 commits into from
Jun 8, 2016

Commits on Jun 1, 2016

  1. 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
  2. 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
  3. 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
  4. 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
  5. 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
  6. 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
  7. 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
  8. Configuration menu
    Copy the full SHA
    b0af323 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    4775e6b View commit details
    Browse the repository at this point in the history
  10. 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. Configuration menu
    Copy the full SHA
    a53dc19 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8621f5b View commit details
    Browse the repository at this point in the history
  3. 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
  4. 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
  5. 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
  6. 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
  7. 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
  8. 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
  9. 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
  10. 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
  11. 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
  12. 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
  13. 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
  14. 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
  15. 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
  16. 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
  17. 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
  18. 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
  19. 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
  20. 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
  21. 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
  22. 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. 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
  2. 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
  3. Configuration menu
    Copy the full SHA
    ba815db View commit details
    Browse the repository at this point in the history
  4. 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
  5. 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
  6. 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
  7. 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
  8. 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
  9. 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
  10. 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
  11. 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
  12. 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
  13. 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
  14. 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
  15. 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

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

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#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
  3. Configuration menu
    Copy the full SHA
    d210a92 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    90aee79 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6af47d2 View commit details
    Browse the repository at this point in the history
  6. 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. Configuration menu
    Copy the full SHA
    f7c19a1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f13f914 View commit details
    Browse the repository at this point in the history
  3. 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
  4. 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
  5. 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
  6. 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
  7. 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
  8. 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
  9. 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
  10. 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. 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
  2. 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
  3. 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
  4. 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
  5. Configuration menu
    Copy the full SHA
    595d4f2 View commit details
    Browse the repository at this point in the history