valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,804 Commits 24 Branches 182 Tags 341 MiB
3967992bfd
Commit Graph

75804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergei Zviagintsev
3967992bfd Fix test for modules.linux_lvm.pvcreate 
pvdisplay() would be called by pvcreate() twice: firstly to check
whether a device is already initialized for use by LVM and then to
ensure that the pvcreate executable did its job correctly. The test
replaces pvdisplay() with a mock that always returns True and thus
pvcreate() would think that a specified device is already initialized
and exit. In the other words, instead of testing physical volume
initialization the test simulates a case with all the submitted
devices already initialized.

Fix it by replacing pvdisplay with a mock that returns False on the
first call (thus pvcreate thinks that a device is not a PV yet) and True
on the second call (after the pvcreate executable is called).
 2017-01-31 17:49:28 +01:00
Nicole Thomas
88b171f863 Merge pull request #39048 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-31 08:55:48 -07:00
C. R. Oldham
92a542fa21 Add CLI Examples so tests will pass (#39035) 
* Add CLI Examples so tests will pass

* Add CLI Examples so tests will pass
 2017-01-30 17:04:30 -07:00
rallytime
b2b3989773 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/engines/__init__.py
  - salt/loader.py
 2017-01-30 16:58:31 -07:00
Nicole Thomas
a24af5ac46 Merge pull request #39047 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2017-01-30 16:48:13 -07:00
rallytime
b732a1f646 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2017-01-30 16:45:16 -07:00
Nicole Thomas
56ccae6ff7 Add 2015.8.14 release notes file (#39046) 2017-01-30 16:44:00 -07:00
Nicole Thomas
fef1b1133d Add 2016.3.6 release notes file (#39045) 2017-01-30 16:43:50 -07:00
Nicole Thomas
0943872fab Add 2016.11.3 release notes file (#39044) 2017-01-30 16:43:40 -07:00
Nicole Thomas
7c43f4ac32 [2016.3] Update release numbers for doc build (#39042) 2017-01-30 15:52:33 -07:00
Nicole Thomas
27081d6520 [2016.11] Update release numbers for doc build (#39040) 2017-01-30 15:51:09 -07:00
Nicole Thomas
424e68436e Update 2016.11.2 release notes (#39039) 2017-01-30 15:40:00 -07:00
Nicole Thomas
ff324599d5 Update 2016.3.5 release notes (#39038) 2017-01-30 15:39:47 -07:00
Nicole Thomas
5943fe65d3 Update 2015.8.13 release notes (#39037) 2017-01-30 15:39:33 -07:00
Mike Place
5b09dc4198 Merge pull request #39028 from terminalmage/clarify-delimiter-argument 
Clarify delimiter argument
 2017-01-30 11:20:25 -07:00
Nicole Thomas
1ff359fa58 Add CLI Example for rest_sample_utils.get_test_string function (#39030) 
Fixes test_valid_doc test that is failing on 2016.11
 2017-01-30 10:34:25 -07:00
C. R. Oldham
f13fb9ef1e Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ availability in proxies. (#38899) 2017-01-30 10:32:23 -07:00
C. R. Oldham
a7fc02e196 Ungate the status.py module and raise unsupported errors in functions not executeable on Windows. (#39005) 2017-01-30 09:21:12 -07:00
Erik Johnson
f29ef071f3 Clarify delimiter argument 
This makes the usage of the delimiter argument in pillar.get/grains.get
more clear.
 2017-01-30 10:15:48 -06:00
Erik Johnson
e70904c480 Merge pull request #39012 from terminalmage/invalid-lexer 
Fix "invalid lexer" errors in docs build
 2017-01-28 00:47:44 -06:00
Erik Johnson
868001baac Fix "invalid lexer" errors in docs build 2017-01-28 00:46:36 -06:00
Nicole Thomas
cea0f32936 Merge pull request #39003 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-27 17:09:09 -07:00
rallytime
76e95087fd Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-27 11:52:03 -07:00
Mike Place
58543d5cbf Merge pull request #38908 from bobrik/show-changes-for-serialize 
Deprecate show_diff for file.serialize to mimic file.managed, closes #38853
 2017-01-27 10:15:36 -07:00
Mike Place
da96221741 Merge pull request #38951 from DSRCorporation/bugs/37938_fix_depends_decorator_memleak 
Keep the only one record per module-function in depends decorator.
 2017-01-27 10:05:42 -07:00
Mike Place
4b75dfac95 Merge pull request #38978 from sjorge/2016.11-bootstrap 
fixes saltstack/salt-bootstrap#1021
 2017-01-27 10:05:09 -07:00
Mike Place
85165edb70 Merge pull request #38982 from rallytime/fix-34780 
Set response when using "GET" method in s3 utils
 2017-01-27 10:04:47 -07:00
Mike Place
cfdbc99e12 Merge pull request #38989 from alprs/docfix-state_pt3_environ 
Documentation: fix SLS in environment variable examples
 2017-01-27 10:00:07 -07:00
Mike Place
b40f369d98 Merge pull request #38991 from isbm/isbm-zypper-state-unknown-pkg-crash 
Isbm zypper state unknown pkg crash
 2017-01-27 09:59:37 -07:00
Mike Place
55e4d2572e Merge pull request #39000 from rallytime/skip-badload-test 
Skip the test_badload test until Jenkins move is complete
 2017-01-27 09:58:20 -07:00
Mike Place
fe054eb772 Merge pull request #38995 from terminalmage/fix-pillar.item-docstring 
Fix pillar.item docstring
 2017-01-27 09:57:59 -07:00
rallytime
4b3ff0fe0f Skip the test_badload test until Jenkins move is complete 
Once this happens, we need to re-enable the test. The move over
should also allow us to upgrade the version of salt-testing that
is applied to the test VMs. Once this is complete, we can apply
the `@flaky` decorator to this test. (salt-testing must be a
version newer than the September release.)
 2017-01-27 09:51:30 -07:00
Erik Johnson
06d094dd8f Fix pillar.item docstring 
The documentation was incorrectly suggesting that this function supports
pillar override data on the CLI.

Also, this commit changes the default target delimiter from a hard-coded
value to salt.defaults.DEFAULT_TARGET_DELIM. This change is functionally
neutral but will help to future-proof this code in the unlikely event
that we ever change the default target delimiter.
 2017-01-27 09:00:07 -06:00
Bo Maryniuk
35f620e1c8 Prevent crash on unknown to the repo package 2017-01-27 14:31:50 +01:00
Andreas Lutro
52a9ad1c60 fix SLS in environment variable examples 2017-01-27 11:19:04 +01:00
Dmitry Kuzmenko
0b18f34678 Keep the only one record per module-function in depends decorator. 2017-01-27 11:09:08 +03:00
rallytime
1583c5579a Set response when using "GET" method in s3 utils 
Fixes #34780
 2017-01-26 16:21:14 -07:00
Nicole Thomas
3e76662166 Merge pull request #38979 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-26 15:56:12 -07:00
rallytime
fdaa5ac1b0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/master.py
  - salt/pillar/__init__.py
  - salt/utils/__init__.py
 2017-01-26 14:09:37 -07:00
Super-User
26eb35f99d fixes salt/salt-bootstrap#1021 2017-01-26 21:22:34 +01:00
Mike Place
0660cc3cf2 Merge pull request #38937 from HashBangDev/fix-smtp-ret-require-gnupg 
Fix smtp ret require gnupg
 2017-01-26 13:08:15 -07:00
Mike Place
d947c5c449 Merge pull request #38955 from techhat/issue38816 
Do a better job at error detection in runners
 2017-01-26 13:00:17 -07:00
Mike Place
e0af212c1b Remove unnecessary blank lines 
Needed for lint check
 2017-01-26 12:25:57 -07:00
Mike Place
04a5b05c36 Merge pull request #38953 from thatch45/thorium_keyfix 
fix an issue where thorium would remove keys of reattaching minions
 2017-01-26 12:15:58 -07:00
Thomas S Hatch
68e96b11ac This is faster and cleaner 2017-01-26 12:13:06 -07:00
Mike Place
399556b9fe Remove trailing whitespace 
Needed for lint check
 2017-01-26 12:12:22 -07:00
Mike Place
b66b6f6423 Merge pull request #38950 from mbom2004/2016.3 
Fixed Logstash Engine in file logstash.py
 2017-01-26 12:10:06 -07:00
Nicole Thomas
a6c6e47842 Handle changing "is_default" value in moto package for boto test mock (#38973) 2017-01-26 12:05:30 -07:00
Nicole Thomas
6b28a587e1 Add CLI Example for rest_sample_utils.get_test_string function (#38972) 
Fixes test_valid_doc test that is failing on 2016.11
 2017-01-26 12:04:38 -07:00
Mike Place
b965b5dcc2 Merge pull request #38952 from terminalmage/zd1168 
Make the ext_pillars available to pillar.ext tunable
 2017-01-26 12:01:55 -07:00