valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,308 Commits 24 Branches 182 Tags 341 MiB
8e3e897ee2
Commit Graph

83308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
8e3e897ee2 Fix unit.modules.test_parted for Windows 
Mock salt.utils.is_windows to be False so that the __virtual__ tests
will run
 2017-09-07 15:27:11 -06:00
Nicole Thomas
f959113694 Merge pull request #43372 from skizunov/develop5 
Fix system.set_system_time when no hw clock is present
 2017-09-07 13:45:32 -04:00
Nicole Thomas
6d13535ed0 Merge pull request #43193 from jettero/template-dne-again 
Prevent spurious "Template does not exist" error
 2017-09-06 16:16:57 -04:00
Nicole Thomas
cde8aed2cf Merge branch '2017.7' into template-dne-again 2017-09-06 14:04:58 -04:00
Sergey Kizunov
281e471853 Fix system.set_system_time when no hw clock is present 
If a hardware clock is not present, then the `cmd.run_all` call in
`has_settable_hwclock` will return a non-zero retcode. If
`ignore_retcode` is not set to True in that call, then it will set
`__context__['retcode']` to that code which will cause the job to
appear as if it failed (due to non-zero retcode) even though it
didn't really fail.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-06 11:45:02 -05:00
Nicole Thomas
015cbc57d9 Merge pull request #43159 from jubrad/bp-43018 
Bp 43018
 2017-09-05 18:29:15 -04:00
Mike Place
6e1b541b46 Merge pull request #43232 from terminalmage/gitfs-inheritance 
Improve inheritance in salt.utils.gitfs
 2017-09-05 14:37:05 -06:00
Mike Place
086b220091 Merge pull request #43238 from s0undt3ch/2017.7 
Include the line number by default on the log file format
 2017-09-05 14:31:53 -06:00
Mike Place
09dc58cde5 Merge pull request #43294 from twangboy/win_build_scripts 
Win build scripts
 2017-09-05 14:12:53 -06:00
Mike Place
21ab306ef4 Merge pull request #43322 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-05 12:21:25 -06:00
Nicole Thomas
62429c547d Merge pull request #43324 from twangboy/fix_unit.modules.test_chef 
Fix `unit.modules.test_chef` for Windows
 2017-09-05 12:40:10 -04:00
twangboy
5bd5ea042a Fix unit.modules.test_chef for Windows 
Mocks the __opts__ to contain cachedir
 2017-09-01 14:49:50 -06:00
rallytime
b1062f8c15 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-01 16:21:34 -04:00
Mike Place
367668a0a3 Merge pull request #43268 from rallytime/bp-43237 
Back-port #43237 to 2017.7
 2017-09-01 12:17:12 -06:00
Mike Place
02504dd363 Merge pull request #43270 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-01 12:09:45 -06:00
Mike Place
ece0e393ef Merge pull request #43283 from DSRCorporation/bugs/42459_broken_ldap_groups 
Fix ldap token groups auth.
 2017-09-01 11:49:45 -06:00
Mike Place
02867fdcd2 Merge pull request #43277 from rallytime/owners-file 
Add CODEOWNERS file
 2017-09-01 10:56:52 -06:00
Nicole Thomas
1c1c484479 Merge pull request #43312 from lordcirth/fix-cron-docs 
cron docs: Remind user to use quotes for special strings
 2017-09-01 12:24:15 -04:00
Nicole Thomas
4f023c4cb6 Merge pull request #43149 from BenoitKnecht/2017.7.1 
Fix iptables.get_rules when rules contain --nfmask or --ctmask
 2017-09-01 11:57:04 -04:00
Nicole Thomas
cf2b75bb86 Merge pull request #43265 from gtmanfred/2017.7 
make sure meta-data grains work on ec2
 2017-09-01 11:31:12 -04:00
Nathan Fish
ec94a13750 cron docs: Remind user to use quotes for special strings 
Otherwise @ signs are stripped.
https://github.com/saltstack/salt/issues/2896
 2017-09-01 10:20:46 -05:00
Nicole Thomas
618b221895 Merge pull request #43299 from twangboy/win_fix_netapi_cherrypy 
Fix `unit.netapi.rest_cherrypy.test_tools` for Windows
 2017-09-01 11:13:42 -04:00
Nicole Thomas
0d1ed4b750 Merge pull request #43290 from lordcirth/fix-file-path-docs 
Clarify file.py docs
 2017-09-01 10:30:03 -04:00
Nicole Thomas
fd74acb603 Merge branch '2017.7' into win_fix_netapi_cherrypy 2017-09-01 09:10:51 -04:00
Nicole Thomas
aee654da92 Merge pull request #43300 from twangboy/win_fix_netapi_rest_tornado 
Fix `unit.netapi.rest_tornado.test_handlers` for Windows
 2017-09-01 09:10:10 -04:00
twangboy
c93d2ed386 Use os.sep instead of '/' 2017-08-31 17:01:14 -06:00
twangboy
3fbf24b91a Use os.sep instead of '/' 2017-08-31 16:56:58 -06:00
twangboy
9979ccb613 Remove Py2 and Py3 in the same run 2017-08-31 14:15:06 -06:00
Nathan Fish
14a4591854 file.py docs: correct group and mode 2017-08-31 13:59:07 -05:00
Nathan Fish
d4214ca283 file.py docs: specify absolute paths 2017-08-31 13:44:12 -05:00
twangboy
a5d9f85db6 Modifications to build scripts 
Py3 installs to c:\python35
Quote the path to the python install directory
Fix spellings in comments
Move pywin32 dlls to site-packages/win32 instead of python root
Remove pywin32 postinstall and testing scripts
Add passive switch to py3 uninstall
 2017-08-31 11:41:13 -06:00
Dmitry Kuzmenko
3ad6911210 Fix for tests: don't require 'groups' in the eauth token. 2017-08-31 20:39:35 +03:00
Dmitry Kuzmenko
1f104cf85b Fix ldap token groups auth. 2017-08-31 16:52:44 +03:00
Nicole Thomas
aed2975979 Merge pull request #43278 from gtmanfred/virtualbox 
bootstrap can come from dunders
 2017-08-31 09:31:19 -04:00
rallytime
2b4da0f0e7 Add CODEOWNERS file 2017-08-31 09:28:47 -04:00
Daniel Wallace
c4ae2de30f bootstrap can come from dunders 2017-08-30 20:38:50 -06:00
Nicole Thomas
26ff89539e Merge pull request #43274 from terminalmage/fix-int-types 
Use six.integer_types instead of int
 2017-08-30 17:32:42 -04:00
Nicole Thomas
479e0e06ac Merge pull request #42975 from brejoc/tests-for-kubernetes-module 
Added unit tests for Kubernetes module
 2017-08-30 16:30:15 -04:00
Nicole Thomas
ca7df1d4cf Merge pull request #43176 from terminalmage/issue42935 
docker_image states: Handle Hub images prefixed with "docker.io/"
 2017-08-30 16:08:13 -04:00
Erik Johnson
d533877743 Use six.integer_types instead of int 
This catches longs on PY2.
 2017-08-30 14:35:04 -05:00
Nicole Thomas
fdad9177b5 Merge branch '2017.7' into tests-for-kubernetes-module 2017-08-30 14:47:37 -04:00
Nicole Thomas
26ff8088cb Merge pull request #43266 from gtmanfred/virtualbox 
switch virtualbox cloud driver to use __utils__
 2017-08-30 14:36:19 -04:00
Nicole Thomas
cf21f91fb2 Merge pull request #43271 from twangboy/win_fix_pkg.install 
Fix minor formatting issue
 2017-08-30 14:35:11 -04:00
Nicole Thomas
ee209b144c Merge pull request #43073 from Mapel88/patch-2 
Fix bug #42936 - win_iis module container settings
 2017-08-30 14:34:36 -04:00
twangboy
91b062f564 Fix formatting issue, spaces surrounding + 2017-08-30 10:41:21 -06:00
Daniel Wallace
382bf92de7 switch virtualbox cloud driver to use __utils__ 2017-08-30 10:29:48 -06:00
rallytime
f8b025f6dc Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
 2017-08-30 12:18:19 -04:00
Timur
047ad07da4 .utils.aws.get_location() expects a dict 
… as it's `provider` argument.
 2017-08-30 12:12:36 -04: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
Daniel Wallace
04dd8ebedb make sure meta-data grains work on ec2 
We need to add on '/' for the end of the directories under latest.

Then we should load anything that appears that we can that is json.  The try
except block is slightly faster than checking if the line starts with '{'
 2017-08-30 09:05:34 -06:00