-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Commits on Jun 1, 2016
-
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.
Configuration menu - View commit details
-
Copy full SHA for 5eb1b3c - Browse repository at this point
Copy the full SHA 5eb1b3cView commit details -
Integration test for gem module
Justin Anderson committedJun 1, 2016 Configuration menu - View commit details
-
Copy full SHA for 5b23b91 - Browse repository at this point
Copy the full SHA 5b23b91View commit details -
Fixed typo, uninstalled to uninstall
Justin Anderson committedJun 1, 2016 Configuration menu - View commit details
-
Copy full SHA for 37bc3ad - Browse repository at this point
Copy the full SHA 37bc3adView commit details -
Fixed typos, and added destructiveTest decorator
Justin Anderson committedJun 1, 2016 Configuration menu - View commit details
-
Copy full SHA for 134e1fa - Browse repository at this point
Copy the full SHA 134e1faView commit details -
Justin Anderson committed
Jun 1, 2016 Configuration menu - View commit details
-
Copy full SHA for 9d437bd - Browse repository at this point
Copy the full SHA 9d437bdView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 9da40c4 - Browse repository at this point
Copy the full SHA 9da40c4View commit details -
Refactored tests to not use return messages
Justin Anderson committedJun 1, 2016 Configuration menu - View commit details
-
Copy full SHA for 210aceb - Browse repository at this point
Copy the full SHA 210acebView commit details -
Configuration menu - View commit details
-
Copy full SHA for b0af323 - Browse repository at this point
Copy the full SHA b0af323View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4775e6b - Browse repository at this point
Copy the full SHA 4775e6bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6c7b216 - Browse repository at this point
Copy the full SHA 6c7b216View commit details
Commits on Jun 2, 2016
-
Configuration menu - View commit details
-
Copy full SHA for a53dc19 - Browse repository at this point
Copy the full SHA a53dc19View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8621f5b - Browse repository at this point
Copy the full SHA 8621f5bView commit details -
Justin Anderson committed
Jun 2, 2016 Configuration menu - View commit details
-
Copy full SHA for c97f331 - Browse repository at this point
Copy the full SHA c97f331View commit details -
Justin Anderson committed
Jun 2, 2016 Configuration menu - View commit details
-
Copy full SHA for 91db411 - Browse repository at this point
Copy the full SHA 91db411View commit details -
Justin Anderson committed
Jun 2, 2016 Configuration menu - View commit details
-
Copy full SHA for 400a71e - Browse repository at this point
Copy the full SHA 400a71eView commit details -
Merge pull request saltstack#33679 from terminalmage/issue33424
Only compile the template contents if they evaluate to True
Mike Place committedJun 2, 2016 Configuration menu - View commit details
-
Copy full SHA for 996ff56 - Browse repository at this point
Copy the full SHA 996ff56View commit details -
Merge pull request saltstack#33654 from twangboy/fix_win_servermanager
Fix win servermanager
Mike Place committedJun 2, 2016 Configuration menu - View commit details
-
Copy full SHA for 8a566ff - Browse repository at this point
Copy the full SHA 8a566ffView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for a411467 - Browse repository at this point
Copy the full SHA a411467View commit details -
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!
Configuration menu - View commit details
-
Copy full SHA for a6a4461 - Browse repository at this point
Copy the full SHA a6a4461View commit details -
Create missing jid dir if it doesn't exist (saltstack#33653)
Closes saltstack#33554
Mike Place authored and Nicole Thomas committedJun 2, 2016 Configuration menu - View commit details
-
Copy full SHA for 56c0a42 - Browse repository at this point
Copy the full SHA 56c0a42View commit details -
Configuration menu - View commit details
-
Copy full SHA for 21b7123 - Browse repository at this point
Copy the full SHA 21b7123View commit details -
Fixed salt.util import. Added status check to make sure external reso…
…urce is available
Justin Anderson committedJun 2, 2016 Configuration menu - View commit details
-
Copy full SHA for 2f36f34 - Browse repository at this point
Copy the full SHA 2f36f34View commit details -
Change to just surround the mkdir
Mike Place committedJun 2, 2016 Configuration menu - View commit details
-
Copy full SHA for 635efa2 - Browse repository at this point
Copy the full SHA 635efa2View commit details -
Justin Anderson committed
Jun 2, 2016 Configuration menu - View commit details
-
Copy full SHA for 86f59b3 - Browse repository at this point
Copy the full SHA 86f59b3View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for f06ff1a - Browse repository at this point
Copy the full SHA f06ff1aView commit details -
states.test.configurable_test_state: refactor change_data
Also adjust continued string indentation.
Configuration menu - View commit details
-
Copy full SHA for c2d0679 - Browse repository at this point
Copy the full SHA c2d0679View commit details -
Configuration menu - View commit details
-
Copy full SHA for 50bd76e - Browse repository at this point
Copy the full SHA 50bd76eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9870479 - Browse repository at this point
Copy the full SHA 9870479View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for d8ba7ed - Browse repository at this point
Copy the full SHA d8ba7edView commit details -
Justin Anderson committed
Jun 2, 2016 Configuration menu - View commit details
-
Copy full SHA for 0cb1bfa - Browse repository at this point
Copy the full SHA 0cb1bfaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2de91d1 - Browse repository at this point
Copy the full SHA 2de91d1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 87e018a - Browse repository at this point
Copy the full SHA 87e018aView commit details
Commits on Jun 3, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 3bbc5ae - Browse repository at this point
Copy the full SHA 3bbc5aeView commit details -
Justin committed
Jun 3, 2016 Configuration menu - View commit details
-
Copy full SHA for 504df9a - Browse repository at this point
Copy the full SHA 504df9aView commit details -
Configuration menu - View commit details
-
Copy full SHA for ba815db - Browse repository at this point
Copy the full SHA ba815dbView commit details -
Configuration menu - View commit details
-
Copy full SHA for bf27e5d - Browse repository at this point
Copy the full SHA bf27e5dView commit details -
Configuration menu - View commit details
-
Copy full SHA for ab73841 - Browse repository at this point
Copy the full SHA ab73841View commit details -
ubuntu doesn't install default gems when ruby is installed
Justin Anderson committedJun 3, 2016 Configuration menu - View commit details
-
Copy full SHA for ff2dae1 - Browse repository at this point
Copy the full SHA ff2dae1View commit details -
Merge pull request saltstack#33743 from vutny/drop-debian-community-r…
…epo-doc Debian installation docs: drop section about community-maintained repo
Mike Place committedJun 3, 2016 Configuration menu - View commit details
-
Copy full SHA for 6c150d8 - Browse repository at this point
Copy the full SHA 6c150d8View commit details -
Merge pull request saltstack#33729 from twangboy/fix_win_servermanager
Add exclude option to win_servermanager
Mike Place committedJun 3, 2016 Configuration menu - View commit details
-
Copy full SHA for 1cf8fe3 - Browse repository at this point
Copy the full SHA 1cf8fe3View commit details -
Merge pull request saltstack#33728 from jfindlay/test_state_test
Make `configurable_test_state` configurable in test mode
Mike Place committedJun 3, 2016 Configuration menu - View commit details
-
Copy full SHA for 015e50c - Browse repository at this point
Copy the full SHA 015e50cView commit details -
Merge pull request saltstack#33727 from terminalmage/issue33725
Fix git_pillar edge case for remote repos without a master branch
Mike Place committedJun 3, 2016 Configuration menu - View commit details
-
Copy full SHA for b07701f - Browse repository at this point
Copy the full SHA b07701fView commit details -
Merge pull request saltstack#33718 from rallytime/bp-33700
Back-port saltstack#33700 to 2015.8
Mike Place committedJun 3, 2016 Configuration menu - View commit details
-
Copy full SHA for 2c450a7 - Browse repository at this point
Copy the full SHA 2c450a7View commit details -
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 committedJun 3, 2016 Configuration menu - View commit details
-
Copy full SHA for 11e39e7 - Browse repository at this point
Copy the full SHA 11e39e7View commit details -
Merge pull request saltstack#33719 from cachedout/fixup_33653
Catch oserror for race condition
Mike Place committedJun 3, 2016 Configuration menu - View commit details
-
Copy full SHA for 47d668e - Browse repository at this point
Copy the full SHA 47d668eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 15a39f8 - Browse repository at this point
Copy the full SHA 15a39f8View commit details -
Merge pull request saltstack#33759 from cachedout/issue_31219
Catch no minions exception in batch mode
Mike Place committedJun 3, 2016 Configuration menu - View commit details
-
Copy full SHA for c749aea - Browse repository at this point
Copy the full SHA c749aeaView commit details
Commits on Jun 5, 2016
-
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.
Configuration menu - View commit details
-
Copy full SHA for c1fd830 - Browse repository at this point
Copy the full SHA c1fd830View commit details
Commits on Jun 6, 2016
-
Merge pull request saltstack#33777 from sodium-chloride/2015.8-2016-0…
…604-1939 Fix minor docstring issue of arg being missing
Mike Place committedJun 6, 2016 Configuration menu - View commit details
-
Copy full SHA for bb4194b - Browse repository at this point
Copy the full SHA bb4194bView commit details -
Merge pull request saltstack#33691 from jtand/gem_integration_test
Gem integration test
Mike Place committedJun 6, 2016 Configuration menu - View commit details
-
Copy full SHA for 7fdfbe9 - Browse repository at this point
Copy the full SHA 7fdfbe9View commit details -
Configuration menu - View commit details
-
Copy full SHA for d210a92 - Browse repository at this point
Copy the full SHA d210a92View commit details -
Configuration menu - View commit details
-
Copy full SHA for 90aee79 - Browse repository at this point
Copy the full SHA 90aee79View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6af47d2 - Browse repository at this point
Copy the full SHA 6af47d2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0c069dd - Browse repository at this point
Copy the full SHA 0c069ddView commit details
Commits on Jun 7, 2016
-
Configuration menu - View commit details
-
Copy full SHA for f7c19a1 - Browse repository at this point
Copy the full SHA f7c19a1View commit details -
Configuration menu - View commit details
-
Copy full SHA for f13f914 - Browse repository at this point
Copy the full SHA f13f914View commit details -
Merge pull request saltstack#33770 from jfindlay/service_tests
service state integration tests
Mike Place committedJun 7, 2016 Configuration menu - View commit details
-
Copy full SHA for c30d8a8 - Browse repository at this point
Copy the full SHA c30d8a8View commit details -
Merge pull request saltstack#33808 from jfindlay/gem_tests
fix some problems with the gem module integration tests
Mike Place committedJun 7, 2016 Configuration menu - View commit details
-
Copy full SHA for 3984b65 - Browse repository at this point
Copy the full SHA 3984b65View commit details -
Merge pull request saltstack#33805 from jfindlay/pkg_tests
states.pkg int tests: skip if pkg mgr unavailable
Mike Place committedJun 7, 2016 Configuration menu - View commit details
-
Copy full SHA for 1db559a - Browse repository at this point
Copy the full SHA 1db559aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9d36f1e - Browse repository at this point
Copy the full SHA 9d36f1eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 453fb1a - Browse repository at this point
Copy the full SHA 453fb1aView commit details -
Merge pull request saltstack#33836 from cachedout/fix_winserver_manag…
…er_test Fixing more stupid unit tests
Mike Place committedJun 7, 2016 Configuration menu - View commit details
-
Copy full SHA for cda032d - Browse repository at this point
Copy the full SHA cda032dView commit details -
Fix another unit test stacktrace in pkg_resource
Mike Place committedJun 7, 2016 Configuration menu - View commit details
-
Copy full SHA for 435547a - Browse repository at this point
Copy the full SHA 435547aView commit details -
These all assert directly against mock objects. They're pointless.
Mike Place committedJun 7, 2016 Configuration menu - View commit details
-
Copy full SHA for 6297448 - Browse repository at this point
Copy the full SHA 6297448View commit details
Commits on Jun 8, 2016
-
Merge pull request saltstack#33840 from cachedout/remove_matcher_unit…
…_tests Remove matcher tests
Mike Place committedJun 8, 2016 Configuration menu - View commit details
-
Copy full SHA for 5f081ef - Browse repository at this point
Copy the full SHA 5f081efView commit details -
Merge pull request saltstack#33839 from cachedout/fix_pkgresource_tes…
…t_stacktrace Fix another unit test stacktrace in pkg_resource
Mike Place committedJun 8, 2016 Configuration menu - View commit details
-
Copy full SHA for f7b3d0e - Browse repository at this point
Copy the full SHA f7b3d0eView commit details -
Merge pull request saltstack#33827 from cachedout/issue_33810
Fix broken locate.locate function
Mike Place committedJun 8, 2016 Configuration menu - View commit details
-
Copy full SHA for ec09095 - Browse repository at this point
Copy the full SHA ec09095View commit details -
Merge branch '2015.8' into '2016.3'
Conflicts: - salt/cli/salt.py - salt/modules/groupadd.py - salt/states/service.py
rallytime committedJun 8, 2016 Configuration menu - View commit details
-
Copy full SHA for c5b4ec0 - Browse repository at this point
Copy the full SHA c5b4ec0View commit details -
Fixup new groupadd tests for syntax change in 2016.3
rallytime committedJun 8, 2016 Configuration menu - View commit details
-
Copy full SHA for 595d4f2 - Browse repository at this point
Copy the full SHA 595d4f2View commit details