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,286 Commits 24 Branches 182 Tags 341 MiB
7b0a7432f4
Commit Graph

85286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Silvio Moioli
7b0a7432f4 test_zypper: adapt to new supported attrs 2017-08-31 16:21:26 +02:00
Silvio Moioli
66ecab63c6 yumpkg: support epoch and release as separate attrs in list_pkgs 2017-08-31 16:21:26 +02:00
Silvio Moioli
19c683b6f9 zypper: support epoch and release as separate attrs in list_pkgs 2017-08-31 16:21:26 +02: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
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
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
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
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
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
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
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
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
Nicole Thomas
a4856372ca Merge pull request #43230 from mephi42/identity-service-type 
salt.utils.openstack.nova: make identity service type configurable
 2017-08-29 15:02:30 -04:00
Robert Mader
20a9ae10ed Add **kwargs to some file states 
This silences an error message when using prereq with some file state.

See #29463 and #37090
 2017-08-29 18:13:27 +02:00
Robert Mader
ae7609b8b2 Also add **kwargs to unmounted, same story 2017-08-29 18:05:40 +02:00
Nicole Thomas
e6aba8a7c2 Merge branch 'develop' into add-aptly-exec-module 2017-08-29 11:24:37 -04:00
Robert Mader
3444423c25 Add **kwargs to salt.state state 
This silences an error message when using prereq with the salt.state state.

See #29463 and #37090
 2017-08-29 16:34:02 +02:00
Robert Mader
7ea8524621 Add **kwargs to mount.mounted state 
This silences an error message when using prereq with the mount.mounted state. See #29463
 2017-08-29 15:14:07 +02:00
Timur
8f43da10bb .utils.aws.get_location() expects a dict 
… as it's `provider` argument.
 2017-08-29 14:05:38 +03:00
mephi42
589a1e90f2 salt.utils.openstack.nova: make identity service type configurable 
At my $DAYJOB, OpenStack catalog contains identity endpoints v2 and v3.
In order to differentiate between them, admins came up with identityv3
service type. This patch allows me to write:

    provider-id:
        driver: nova
        identity_service_type: identityv3

to make use of identityv3 endpoint in this setup.
 2017-08-29 00:18:13 +02:00
Mike Place
c6664291ce Merge pull request #43206 from rallytime/tkwilliams-boto-mentionbot 
Always notify tkwilliams when changes occur on boto files
 2017-08-28 13:26:17 -06:00
Mike Place
d685cfe4b3 Merge pull request #43214 from brejoc/fix_for_install_time_rh 
Checking install_time for None value
 2017-08-28 11:14:37 -06:00
Mike Place
d6d68d97ad Merge pull request #43218 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-28 11:10:53 -06:00
Mike Place
7ee18ee9f9 Merge pull request #43219 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 25
 2017-08-28 11:08:42 -06:00
m03
4516e13112 Leverage stringutils 2017-08-28 08:55:12 -07:00
lomeroe
b6c25978ff correcting bad format statement in search for policy to be disabled (fix 
for #43166)
verify that file exists before attempting to remove (fix for commits
from #39773)
 2017-08-28 10:13:10 -05:00
rallytime
a8b786d0f2 Reduce the number of days an issue is stale by 25 2017-08-28 09:38:37 -04:00
rallytime
6fad40454a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/utils/napalm.py
 2017-08-28 09:28:41 -04:00
Nicole Thomas
448086d2cb Merge pull request #43074 from twellspring/boto_elbv2_updates 
Boto elbv2 updates
 2017-08-28 09:24:45 -04:00
Nicole Thomas
9dbdb7c7d8 Merge pull request #43209 from eliezerlp/develop 
Remove references to SaltConf16 and generalize related README
 2017-08-28 09:09:10 -04:00
Jochen Breuer
7071e3425c
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-28 13:55:22 +02:00
m03
2ae911fa5e Improved list_repos functionality 2017-08-28 01:04:39 -07:00
m03
3c6f4d4a1a Add aptly execution module 2017-08-28 00:13:13 -07:00