valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,366 Commits 24 Branches 182 Tags 341 MiB
efef4f6a9b
Commit Graph

85366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
efef4f6a9b Reduce the number of days an issue is stale by 15 2017-09-01 17:05:16 -04:00
Mike Place
0e262b8c0d Merge pull request #43253 from rallytime/utils-color-moves 
Move get_colors and get_color_theme to salt.utils.color.py
 2017-09-01 12:44:40 -06:00
Mike Place
24962587bc Merge pull request #43269 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-01 12:12:36 -06:00
Nicole Thomas
390ea9e2da Merge pull request #43065 from wcannon/develop 
saltcheck module
 2017-09-01 11:48:24 -04:00
Nicole Thomas
0d1b715b97 Merge pull request #43236 from akurach/patch-1 
Update __init__.py
 2017-08-31 11:25:31 -04:00
Nicole Thomas
d1e59e752d Merge pull request #43281 from brejoc/fix_for_install_time_rh2 
Checking install_time for '(none)' value
 2017-08-31 10:19:07 -04:00
wcannon
2a484fc46f Merge branch 'develop' into develop 2017-08-31 09:01:41 -05:00
Nicole Thomas
46cd87d815 Merge pull request #43225 from lomeroe/fix_43166_develop 
fix issues in PR #43116
 2017-08-31 09:43:56 -04:00
Jochen Breuer
7aeed33575
Checking install_time for '(none)' value 
RedHat systems might in some cases return '(none)' as install_time,
which would cause a ValueError.

We are checking for '(none)' now. install_date and install_date_time
are being set to None in that case.
 2017-08-31 09:48:07 +02:00
William Cannon
58eef3dc2c fixed dunder usage problem in unit test 2017-08-30 17:00:27 -05:00
wcannon
c080b263d5 Merge branch 'develop' into develop 2017-08-30 15:54:57 -05:00
William Cannon
a3bbe160fc uncommented salt.utils import 2017-08-30 15:45:46 -05:00
Nicole Thomas
654ff158b9 Merge pull request #43248 from treba123/patch-3 
Add **kwargs to some file states
 2017-08-30 16:30:27 -04:00
Nicole Thomas
b72718ee82 Merge pull request #42811 from hibbert/allow_creation_token_boto_efs/develop 
develop: Allow creation_token to be passed into create_file_system an…
 2017-08-30 16:02:18 -04:00
Nicole Thomas
e2f4d5b1bf Merge pull request #43243 from treba123/patch-1 
Add **kwargs to mount.mounted state
 2017-08-30 16:01:52 -04:00
Nicole Thomas
0bf860ad1d Merge pull request #43245 from treba123/patch-2 
Add **kwargs to salt.state state
 2017-08-30 15:40:15 -04:00
Nicole Thomas
237e5ce697 Merge pull request #43250 from rallytime/utils-path-fixes 
Update some salt.utils.x paths for moved util functions
 2017-08-30 15:09:02 -04:00
Nicole Thomas
7c979c8e17 Merge pull request #43264 from mkoderer/fix_bigip_doc 
Fix bigip documentation for delete_pool_member
 2017-08-30 15:07:20 -04:00
rallytime
14f5e5e023 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/augeas_cfg.py
  - salt/modules/inspectlib/collector.py
 2017-08-30 12:16:28 -04:00
Nicole Thomas
523c10a4df Merge branch 'develop' into allow_creation_token_boto_efs/develop 2017-08-30 12:05:21 -04:00
Nicole Thomas
a972c4fb8c Merge pull request #42840 from StreetHawkInc/update_azurearm 
Update salt-cloud azurearm to work with latest sdk
 2017-08-30 12:01:34 -04:00
Robert Mader
fe457a806a Merge branch 'develop' into patch-1 2017-08-30 17:54:21 +02:00
Robert Mader
f38dc9bf1a Merge branch 'develop' into patch-2 2017-08-30 17:54:03 +02:00
Robert Mader
b8db277e51 Merge branch 'develop' into patch-3 2017-08-30 17:53:50 +02:00
Nicole Thomas
ec1bedc646 Merge pull request #43254 from twangboy/win_fix_test_inspect_collector 
Fix `unit.modules.test_inspect_collector` on Windows
 2017-08-30 11:46:07 -04:00
Nicole Thomas
4241816423 Merge pull request #43237 from timka/patch-2 
.utils.aws.get_location() expects a dict
 2017-08-30 10:48:17 -04:00
Nicole Thomas
1fc7307735 Merge pull request #43255 from gtmanfred/2017.7 
always return a dict object
 2017-08-30 10:47:14 -04:00
Nicole Thomas
0798d851d2 Merge pull request #43210 from m03/add-aptly-exec-module 
Add aptly execution module
 2017-08-30 10:29:26 -04:00
Nicole Thomas
97f91ef8f2 Merge branch 'develop' into fix_43166_develop 2017-08-30 10:27:51 -04:00
Nicole Thomas
fa904ee225 Merge pull request #43229 from twangboy/win_fix_pkg.install-2017.7 
Bring changes from #43228 to 2017.7
 2017-08-30 10:26:55 -04:00
Marc Koderer
784a5ca036 Fix bigip documentation for delete_pool_member 
Signed-off-by: Marc Koderer <marc.koderer@sap.com>
 2017-08-30 16:26:26 +02:00
Nicole Thomas
f6926bf95c Merge branch 'develop' into patch-1 2017-08-30 10:20:11 -04:00
Nicole Thomas
fbfbe31687 Lint: use salt.utils.versions instead of distutils.version for LooseVersion 2017-08-30 10:02:39 -04:00
Nicole Thomas
291c296d64 Merge pull request #43249 from dylwhich/develop 
Fix scope of targets in .modules.pacman.install()
 2017-08-30 09:57:39 -04:00
Nicole Thomas
25666f88f7 Merge pull request #43251 from twangboy/win_skip_test_groupadd 
Skips `unit.modules.test_groupadd` on Windows
 2017-08-30 09:56:36 -04:00
rallytime
29a763ffcb Lint: Remove extra space 2017-08-30 09:38:39 -04:00
Nicole Thomas
a8e09629b2 Merge pull request #43256 from twangboy/win_skip_mac_tests 
Skip mac tests for user and group
 2017-08-30 09:18:11 -04:00
Robert Mader
a7c678c621 Merge branch 'develop' into patch-2 2017-08-30 10:54:58 +02:00
Robert Mader
39898636a8 Merge branch 'develop' into patch-1 2017-08-30 10:54:47 +02:00
Robert Mader
d873d39354 Merge branch 'develop' into patch-3 2017-08-30 10:54:44 +02:00
Kurach Alexander
be4fd035a4 Merge branch 'develop' into patch-1 2017-08-30 08:30:55 +03:00
Daniel Wallace
83b0bab34b opt_args needs to be a dict 
For napalm grains, otherwise there is an exception during bootup
 2017-08-29 18:44:21 -06:00
twangboy
cec627a60b Skip mac tests for user and group 
They use grp and pwd
 2017-08-29 16:28:12 -06:00
twangboy
b401340e6c Fix unit.modules.test_inspect_collector on Windows 
Uses os.sep instead of unix-style paths in the test
Uses salt.utils.path.islink() to detect symlinks instead of
os.path.islink(). os.path.islink() does not correctly detect symlinks in
Windows
Put grp and pwd imports inside a try/except block
 2017-08-29 15:59:08 -06:00
rallytime
26f52bd2b8 Move get_colors and get_color_theme to salt.utils.color.py 
Moves the `get_colors` and `get_color_theme` out of `salt.utils.py`
and into a new file named `salt.utils.color.py`.

This PR moves the original functions, adds a deprecation warning to
the old function paths, and updates any references to the functions
in Salt code to the new location. This includes moving a test as well.
 2017-08-29 17:33:01 -04:00
twangboy
5185071d5a Skips unit.modules.test_groupadd on Windows 
There is a test_win_groupadd modules for testing the win_groupadd module
on Windows.
 2017-08-29 14:29:50 -06:00
rallytime
26410c662f Update some salt.utils.x paths for moved util functions 
Through merge forwards, some of the old-style paths have made their
way into develop. This PR corrects some of these instances on the more
popular functions.
 2017-08-29 16:24:47 -04:00
Dylan Whichard
2aebbe304a Fix scope of targets in .modules.pacman.install() 2017-08-29 16:17:03 -04:00
twangboy
e007a1c26e Fix regex, add . 2017-08-29 13:57:28 -06:00
wcannon
eccd7a6d76 adding an assertion in check list 2017-08-29 14:31:05 -05:00