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
69,465 Commits 24 Branches 182 Tags 341 MiB
cc4d958557
Commit Graph

69465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
297a12c387 Fix misspelling of "occurred" in log messages/exceptions (#36270) 2016-09-13 12:33:41 -06:00
Nicole Thomas
d634fd8628 Merge pull request #36264 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-13 12:25:41 -06:00
Aditya Kulkarni
dd670bd18f Fix lint error and add try except 2016-09-13 10:30:28 -04:00
rallytime
f603757b55 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/mount_test.py
  - tests/unit/states/file_test.py
 2016-09-13 08:21:48 -06:00
Mike Place
de06116075 Merge pull request #35688 from cachedout/issue_33525 
Splat serializer default configs into the serializer kwargs
 2016-09-13 18:21:46 +09:00
Mike Place
4910e8191c Provide fallback for serializers without opts 2016-09-13 17:03:11 +09:00
Mike Place
d9d477ed45 Merge pull request #36025 from cloudflare/CF-FIX-36021 
Potential fix for #36021
 2016-09-13 16:46:41 +09:00
Mike Place
931486ba35 Merge pull request #36096 from twangboy/update_setup 
[WIP] Add additional required dll's for Windows
 2016-09-13 16:45:33 +09:00
Mike Place
b0dd6ff5c8 Merge pull request #36244 from terminalmage/gen-back-bug 
salt.fileserver.Fileserver: Don't try to split a list in _gen_back
 2016-09-13 09:53:16 +09:00
Mike Place
dcc9380996 Merge pull request #36245 from terminalmage/roots-bug 
roots backend: Don't include '.' or '..' in empty_dirs
 2016-09-13 09:52:14 +09:00
Erik Johnson
75d4997b70 roots backend: Don't include '.' or '..' in empty_dirs 2016-09-12 16:09:46 -05:00
Erik Johnson
363b21fd9b salt.fileserver.Fileserver: Don't try to split a list in _gen_back 
This fixes a bug which causes backends passed as a python list to be
converted to a ``str`` (specifically a ``unicode`` type in PY2) and then
split, resulting in a backend that will never match anything.

This only affects runner and Salt Python API usage in which the
"backend" param to fileserver runner funcs is passed as a Python list.
 2016-09-12 15:43:39 -05:00
Aditya Kulkarni
d96981639b Add ability to clone from a snapshot to salt-cloud vmware driver 2016-09-12 14:49:20 -04:00
Pablo Suárez Hernández
fdf40907b7 Some unit tests fixes (#36227) 
* Prevent tests failures if boto does not exists

* Prevent tests failure if /etc/fstab does not exists
 2016-09-12 11:43:12 -06:00
Daniel Hobley
449c29897c Fix timezones states on OS X (#36183) 
* Fix timezones states on OS X

- This function was missing but required by the timezone states

* Added stand in functions for hwclock on OS X

- This fixes the timezone states which tries to use these functions
 2016-09-12 11:42:26 -06:00
Nicole Thomas
fcbebb40c3 Merge pull request #36235 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-12 11:40:42 -06:00
Erik Johnson
7b96197c5e Merge pull request #36137 from cachedout/issue_35423 
Allow highstate outputter to show all results
 2016-09-12 11:37:49 -05:00
rallytime
99dcf84b62 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-12 10:09:43 -06:00
Mike Place
1b12940a1f Docs clarification for module sync and state.apply (#36217) 
Closes #35340
 2016-09-12 08:42:12 -06:00
Mike Place
6ebe655e17 Merge pull request #36184 from DSRCorporation/bugs/35480_master_shutdown 
Disable signal handling while handling signal
 2016-09-12 07:59:08 +09:00
Mike Place
4e9490eebe Merge pull request #36214 from vutny/postgres-extension-doc 
`postgres_extension` state module: fix docstrings
 2016-09-12 07:58:29 +09:00
Denys Havrysh
5fe548f043 postgres_extension state module: fix docstrings 2016-09-11 23:17:40 +03:00
Mike Place
f11f093f8c Merge pull request #36203 from xiaoanyunfei/logowner 
fix owner of MultiprocessingLoggingQueue
 2016-09-11 18:15:15 +09:00
Mike Place
5b7b96c0b7 Merge pull request #36205 from vutny/postgres-tablespace-doc 
Add missing `maintenance_db` kwarg to `postgres_tablespace.present` doc
 2016-09-11 18:14:14 +09:00
Denys Havrysh
78296b90d8 Add missing maintenance_db kwarg to postgres_tablespace.present docstring 2016-09-10 12:20:40 +03:00
xiaoanyunfei
74dc90c7bb cancle pr last 2016-09-10 10:04:22 +08:00
xiaoanyunfei
90e4a25dd0 Merge branch 'logowner' of https://github.com/xiaoanyunfei/salt into logowner 2016-09-10 10:02:00 +08:00
xiaoanyunfei
ffd87b2f2f fix logqueue owner 2016-09-10 09:57:29 +08:00
xiaofei.sun
bd61b88fc8 fix log owner 2016-09-10 09:37:53 +08:00
xiaofei.sun
58160ed6c0 Merge branch '2016.3' of github.com:saltstack/salt into 2016.3 2016-09-10 09:06:21 +08:00
Thomas S Hatch
e13d61f06a skip all failhards if test=True 2016-09-09 16:09:33 -06:00
Thomas S Hatch
b586ed75bd if the backend stack traces when it should return an empty string (#36193) 2016-09-09 13:14:36 -06:00
Nicole Thomas
f035121291 Merge pull request #36188 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-09 12:59:20 -06:00
Nicole Thomas
6a5f7cb346 Ignore states that do not have a numeric jid, i.e. 'req' (#36185) 2016-09-09 11:28:48 -06:00
rallytime
521a7b2470 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/opennebula.py
 2016-09-09 09:53:02 -06:00
t2b
d4628f3c6b Allow additional kwargs in states.dockerng.image_present (#36156) 
Fixes #31513
 2016-09-09 09:32:38 -06:00
Dmitry Kuzmenko
229504efef Removed unused import. 2016-09-09 15:29:03 +03:00
Dmitry Kuzmenko
ca8eb7e076 Don't run the same signal handler twice. Catch os.kill errors. 
Else a Process Not Found error stops the killing loop and there are
still alive master subprocesses.
 2016-09-09 15:27:20 +03:00
Mike Place
1d5f97d36b Merge pull request #35907 from rallytime/fix-35819 
Catch CommandExecutionError when the group in group_installed doesn't exist
 2016-09-09 19:14:16 +09:00
Mike Place
40127b6bf3 Merge pull request #36068 from rallytime/fix-35972 
Remove grains type deprecation warning from 2016.3
 2016-09-09 19:00:50 +09:00
Mike Place
24bd03734d Merge pull request #36152 from cachedout/issue_36094 
Remove unnecessary unpack
 2016-09-09 18:13:46 +09:00
Nicole Thomas
dc3a68ed8c Merge pull request #36158 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-08 15:53:49 -06:00
Nicole Thomas
3445a333d5 Remove unclosed backticks in walkthrough doc (#36170) 2016-09-08 15:49:01 -06:00
Nicole Thomas
24b0387b92 Back-port #36070 to 2015.8 (#36169) 2016-09-08 15:48:44 -06:00
Jacob Hammons
4ccf8a841f Merge pull request #36161 from jacobhammons/relnotes 
Adds #36055 to release notes
 2016-09-08 11:11:36 -06:00
Jacob Hammons
ecb0979be7 Adds #36055 to release notes 2016-09-08 11:10:56 -06:00
David Boucha
116d7ac3e5 If windows pkg db hasn't been created yet, refresh the db instead of stacktracing (#36008) 
* Don't raise an exception. Just return empty dict

If the repo cache file doesn't exist, lets' just return
an empty dict rather than raising an exception.

* If repo cache file doesn't exist, refresh

* add logging message

* remove unused imports
 2016-09-08 10:57:57 -06:00
rallytime
7f955bda0a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/modules/puppet_test.py
 2016-09-08 10:55:57 -06:00
Mike Place
6242702288 Fix issue with cp.push (#36136) 
Incorrect handling of os.path.splitdrive()
 2016-09-08 09:27:28 -06:00
Denys Havrysh
0e13118f6e Document owner kwarg for postgres_schema.present state function (#36147) 2016-09-08 09:25:11 -06:00