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
75,872 Commits 24 Branches 182 Tags 341 MiB
036f36dc9b
Commit Graph

75872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ethan Moore
c3aaa536f3 _in_range_inclusive class method incorrectly called isinstance 2017-01-31 20:40:41 +00:00
Ethan Moore
ce263f9372 set_computer_policy and set_user_policy call "set" by the original function name (set) instead of the aliased function name set_ 2017-01-31 20:39:56 +00:00
Ethan Moore
ff7d74bfb0 correct tool extension guid for user registry policies 2017-01-31 20:39:55 +00:00
Ethan Moore
08f0078ef3 spelling correction 2017-01-31 20:39:54 +00:00
Ethan Moore
5fc40485f7 add updating gpt.ini file when ADM template policies are modified (gpt.ini file must exist with proper data for ADM policies to apply) 2017-01-31 20:39:53 +00:00
Mike Place
9836d7dd29 Merge pull request #39076 from terminalmage/pr-38705 
Re-submit PR #38705 against 2016.11 branch
 2017-01-31 13:11:55 -07:00
Mike Place
86b4b77bfe Merge pull request #39058 from sergeizv/fix-lvm-fullversion 
Fix salt.modules.linux_lvm.fullversion
 2017-01-31 12:01:12 -07:00
Mike Place
721b245f90 Merge pull request #39066 from techhat/issue39051 
127.0.0.0/8 is all loopback
 2017-01-31 11:43:21 -07:00
Mike Place
c54d9f4e2a Merge pull request #39071 from sergeizv/fix-lvm-pvcreate 
Fix modules.linux_lvm.pvcreate on existing LVM PVs
 2017-01-31 11:36:53 -07:00
Nasenbaer
15db8d47ed Fix for #38704 archive extracted and dockerio states 
Do not run file managed as state.single as this conflicts (and fails)
when additional state runs are already scheduled.
 2017-01-31 11:51:04 -06:00
Nicole Thomas
122422bc08 Bump openstack deprecation notice to Oxygen (#39067) 
I spoke with @gtmanfred and this isn't ready to be removed just yet,
so we're bumping the removal to Oxygen.
 2017-01-31 10:21:13 -07:00
Sergei Zviagintsev
f1e3e86e6a Fix modules.linux_lvm.pvcreate on existing LVM PVs 
If all the devices submitted to pvcreate() are already initialized as
LVM physical volumes and override is True (which is default), pvcreate()
should return True and no futher actions should be made. The
'not cmd[1:]' check which is suited for this scenario is incorrect, as
we previously filled the 'cmd' list with two elements and thus the
condition would be always False. This would cause pvcreate() to call the
pvcreate executable with no arguments if all the submitted devices are
already initialized as LVM PVs.

Fixes #39070
 2017-01-31 17:57:57 +01:00
Sergei Zviagintsev
0f84ca2487 Add test for modules.linux_lvm.pvcreate on existing LVM PVs 
If all the devices submitted to pvcreate() are already initialized as
LVM physical volumes, pvcreate() should return True and no futher
actions should be made.
 2017-01-31 17:57:21 +01:00
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
Joseph Hall
ea43bb8101 127.0.0.0/8 is all loopback 2017-01-31 09:07:46 -07: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
Sergei Zviagintsev
e46c89f9ed Fix salt.modules.linux_lvm.fullversion 
Due to an indentation error fullversion() returns only the last string
of 'lvm version' output. Fix it.

Fixes #39057
 2017-01-31 16:26:08 +01:00
Sergei Zviagintsev
fb7ef99838 Fix mock emulating lvm version 
'lvm version' produces multiline output whereas test_version and
test_fullversion use mocks with single-line output. Use real-life
'lvm version' output in those mocks instead.
 2017-01-31 16:22:38 +01: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