valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,030 Commits 24 Branches 182 Tags 341 MiB
0ca7539e21
Commit Graph

83030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
cc07664a9f Replace Nitrogen with 2017.7.0 in remain directories 2017-06-14 12:18:37 -06:00
Erik Johnson
5c970d81e5 Fix runtests_helpers.modules_available when multiple modules passed 
tests.support.helpers passes the single-asterisk tuple of args as
individual arguments to runtest_helpers.modules_available. This breaks
tests which pass more than one argument to the requires_salt_modules
decorator.

This has been fixed by making runtests_helpers.modules_available accept
an arbitrary number of args via using a single-asterisk.
 2017-06-14 13:16:30 -05:00
rallytime
00ecda1002 Replace Nitrogen references with 2017.7.0 in modules/* 2017-06-14 12:14:27 -06:00
Erik Johnson
23634a305b Fix runtests_helpers.modules_available when multiple modules passed 
tests.support.helpers passes the single-asterisk tuple of args as
individual arguments to runtest_helpers.modules_available. This breaks
tests which pass more than one argument to the requires_salt_modules
decorator.

This has been fixed by making runtests_helpers.modules_available accept
an arbitrary number of args via using a single-asterisk.
 2017-06-14 13:12:27 -05:00
rallytime
67368b07da Replace Nitrogen with 2017.7.0 for the following directories: 
- netapi
- output
- pillar
- proxy
- renderers
- returners
- roser
- runners
- sdb
 2017-06-14 11:59:55 -06:00
rallytime
b0145578bf Update Nitrogen references to 2017.7.0 for states, utils, tests directory 
Also updated version.py with release tuple
 2017-06-14 11:54:27 -06:00
garethgreenaway
54dcbcadb3 Merge branch 'develop' into 41618_runner_return_event_bad_function 2017-06-14 10:46:46 -07:00
Erik Johnson
d3ef32e1c3 Use salt.utils.pkg.split_comparison to get comparsion prefix 2017-06-14 12:42:43 -05:00
twangboy
795a1aab4f Add instructions for Windows Firewall 2017-06-14 11:42:00 -06:00
Erik Johnson
3fae948fdf salt.utils.pkg: add functions for matching a version comparison expression 2017-06-14 12:41:30 -05:00
Gareth J. Greenaway
efa3c8e653 removing unneeded comments 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
78052ff00e Updating the unit test for libvirt to include coverage for new options 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
95b9973a5d removing rogue space 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
61b644de7d Fixing lint errors 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
0bcdb6b246 Moving expiration_days to previous line 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
2ceb40b8a9 Removing rogue parens. 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
02ae3c63b1 Adding versionadded tags 2017-06-14 10:40:06 -07:00
Gareth J. Greenaway
89bdc50f4e Adding the ability to configure some options when generating libvirt keys, particularly the number of days that the certificates will be valid for. 2017-06-14 10:40:06 -07:00
Erik Johnson
dfb22f0841 pkg.installed: Pass ignore_epoch to pkg.install 2017-06-14 12:37:16 -05:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -06:00
Erik Johnson
d1990a5822 Fix ImportError in boto3_sns module 
This module attempts to import jmespath which is not a dependency and is
not in the stdlib. This commit gates this behind a try/except to
prevent an ImportError from being logged.
 2017-06-14 12:31:36 -05:00
Mike Place
b095ce8798 Merge pull request #41278 from jettero/mongodb-grant/set-roles 
combine mongodb_user/mongodb_database and add role grant/set methods
 2017-06-14 12:31:30 -05:00
Mike Place
bacdf4e9eb Merge pull request #41449 from sebw/svn-bug-41022 
Fix state "svn.latest" diff output in test mode
 2017-06-14 12:28:23 -05:00
garethgreenaway
203ec6730f Merge pull request #41723 from rallytime/libcloud-support 
Support apache-libcloud work-around for issue #32743 for versions older than 2.0.0
 2017-06-14 10:13:38 -07:00
Erik Johnson
585145f4b3 parse_targets: include version in packed return data 2017-06-14 11:53:17 -05:00
Mike Place
62dbf5083c Merge pull request #41655 from Enquier/nova-cloud-set_ip_address 
Allow Nova cloud module to set a specific floating ip address
 2017-06-14 11:44:04 -05:00
garethgreenaway
8e13818833 Merge branch 'develop' into 41618_runner_return_event_bad_function 2017-06-14 08:57:29 -07:00
Mike Place
9e6eda8446 Merge pull request #41729 from bodhi-space/infra5027 
INFRA-5027 - fix tagging for managed instances
 2017-06-14 10:56:30 -05:00
Mike Place
3babe2a049 Merge pull request #41727 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-06-14 10:44:39 -05:00
rallytime
1e9a06000b Bump version check down to 1.4.0 and use distutils.version lib 2017-06-14 09:30:22 -06:00
Nicole Thomas
82eab84883 Merge pull request #41731 from terminalmage/docs 
Clarify that archive_format is required pre-2016.11.0
 2017-06-14 09:05:20 -06:00
Erik Johnson
d3f4ea1a84 Clarify that archive_format is required pre-2016.11.0 
This makes it more clear that the archive_format can only be left off if
you are running 2016.11.0 or newer.
 2017-06-13 22:51:24 -05:00
Tom Williams
99bf787b02 INFRA-5027 - if pylint not happy, ain't nobody happy... 2017-06-13 18:33:29 -04:00
Gareth J. Greenaway
6438af5451 Swapping out low['fun'] for self.opts['fun'] since we can't rely on low. 2017-06-13 15:32:50 -07:00
Gareth J. Greenaway
fdd6a2ff09 Adding retcode and fun_args to the event data. 2017-06-13 15:32:50 -07:00
Gareth J. Greenaway
52070d7fbf Fire back the contents of the exception since it is most likely the string we'll want. 2017-06-13 15:32:49 -07:00
Gareth J. Greenaway
83dbb1a5e8 Swapping comment for return to be more aligned with the events returned for minior errors 2017-06-13 15:32:49 -07:00
Gareth J. Greenaway
aa3e33bb32 Shuffling things around and adding the ability to return an event on the event bus when a runner function is unavailale 2017-06-13 15:32:49 -07:00
Loren Gordon
6e35673fe3 Preserves order when removing duplicates 2017-06-13 17:45:08 -04:00
Loren Gordon
18eda7084c Updates list merge tests to check for sorted, unique lists 2017-06-13 17:45:08 -04:00
Loren Gordon
74bf91f99e Sorts the list when removing duplicates 2017-06-13 17:45:08 -04:00
Loren Gordon
26a4b1b17f Adds pillar.get param to control list merge/overwrite behavior 
Previously, `pillar.get` would always default list merge behavior
based on the value of the opt `pillar_merge_lists`. This isn't
always desirable, particularly when creating a dictionary of
default values in a state and merging those defaults with a pillar
key. Sometimes you want a list in pillar to overwrite the default.

This patch adds a param `deep_merge_lists` that allows a user to
specify whether lists within the returned dictionary should be
merged with or overwrite lists within the `default` dictionary.

If unspecified, the new param defaults to the prior behavior.
 2017-06-13 17:45:08 -04:00
Loren Gordon
ed04bae94c Removes duplicate values when merging lists 
Fixes #39918
 2017-06-13 17:44:53 -04:00
Tom Williams
69a0df8494 INFRA-5027 - fix tagging for managed instances 2017-06-13 17:30:34 -04:00
Mike Place
b6d27beac2 Merge pull request #41663 from skizunov/develop3 
Don't invoke lspci if enable_lspci is False
 2017-06-13 16:19:42 -05:00
Mike Place
10b68e9375 Merge pull request #41698 from rallytime/flaky-decorator-tcp-test 
Add flaky decorator to test_badload in tcp unit tests
 2017-06-13 16:13:44 -05:00
Mike Place
6f392c5301 Merge pull request #41671 from markuskramerIgitt/develop 
Don't open the logfile in vain
 2017-06-13 16:10:22 -05:00
rallytime
74d9a36d5a Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - pkg/salt-proxy@.service
  - salt/modules/npm.py
  - salt/modules/parted.py
  - tests/integration/modules/test_libcloud_dns.py
 2017-06-13 15:01:51 -06:00
Mike Place
ea174c98bd Merge pull request #41682 from rallytime/update-stale-config 
Reduce the number of days an issue is stale by 25
 2017-06-13 15:31:15 -05:00
Mike Place
2eb514b657 Merge pull request #41684 from bodhi-space/infra4909 
INFRA-4909 - fix occasional stacktraces when resolving subnet group names
 2017-06-13 15:22:38 -05:00