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
73,798 Commits 24 Branches 182 Tags 341 MiB
7bcbf8dc36
Commit Graph

73798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitry Kuzmenko
411cbb373f Fixed the changed salt-key output on accept/reject/delete actions. 2016-09-13 16:31:40 +03: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
3e2375c829 Merge pull request #36176 from twangboy/mac_service_tests 
Fix test_launchctl test in mac_service
 2016-09-13 16:31:46 +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
Mike Place
3833c9e095 Merge pull request #36247 from terminalmage/issue36150 
Add a runner function to clear fileserver list caches
 2016-09-13 09:17:05 +09:00
Mike Place
5063cd0335 Merge pull request #36248 from Ch3LL/fix_archive_test 
fix archive test to only run on redhat
 2016-09-13 09:15:24 +09:00
Ch3LL
9ede50b451 fix archive test to only run on redhat 2016-09-12 15:43:06 -06:00
Erik Johnson
38e700c977 Reduce fileserver_list_cache_time default to 20 sec 2016-09-12 16:29:10 -05:00
Erik Johnson
b7a1a67828 Improve accuracy of fileserver runner tests 
The tests that return files, symlinks, directories, and empty dirs were
all only testing that the type of the return data was the same as what
was expected. By not testing the content, we overlooked a corner case in
which backends passed into the fileserver as a Python list would not be
handled properly. This has since been fixed in PR #36244, but these
tests will help keep this sort of issue from regressing.
 2016-09-12 16:29:10 -05:00
Erik Johnson
ae973a14fb roots backend: Don't include '.' or '..' in empty_dirs 2016-09-12 16:29:10 -05:00
Erik Johnson
322047a844 Add integration tests for fileserver.clear_file_list_cache 2016-09-12 16:29:10 -05:00
Erik Johnson
d3e9c4c5fb Couple fixes to _gen_back 
1. Wasn't properly handling the backend being passed in as a Python list
2. Didn't work properly in the test suite due to the backend being an
   ImmutableList instead of a list. This is because of how the opts are
   loaded in the test suite, all mutable types are immutable versions of
   themselves from salt.utils.immutabletypes.
 2016-09-12 16:29:10 -05:00
Erik Johnson
6722ad9ecf Add runner function to remove file list caches 2016-09-12 16:29:10 -05:00
Erik Johnson
26c426f22a Add function to remove fileserver list caches to fileserver class 2016-09-12 16:29:09 -05:00
Erik Johnson
37c48472d6 Add documentation for fileserver_list_cache_time 2016-09-12 16:29:09 -05: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
twangboy
4ae8a43435 Fix test_issue_6833_pip_upgrade_pip test on OSX 2016-09-12 12:17:30 -06:00
Shane Lee
d9bbba9b24 Add missing documentation for the mac_package module (#36192) 
* Add missing documentation for the mac_package module

* Standardize ID in docstrings
 2016-09-12 11:57:41 -06: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
Shane Lee
019ef1c47c Remove invalid JSON for Mac OS X (#36167) 
* Remove invalid JSON for Mac OS X

* Check for fsevents line and remove
 2016-09-12 11:42:43 -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
Nicole Thomas
9ce4abefcd Merge pull request #36234 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-12 11:40:30 -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
rallytime
c3dcbb5906 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
  - salt/utils/process.py
 2016-09-12 09:47:33 -06:00
Hengyang Hu
3c694a371b make a centralized master_event func, replace the hardcoded ones across the codebase (#36221) 2016-09-12 09:22:20 -06:00
Mike Place
1b12940a1f Docs clarification for module sync and state.apply (#36217) 
Closes #35340
 2016-09-12 08:42:12 -06:00
Erik Johnson
b83c0b9238 salt.utils.gitfs: Fix ref to self.root (#36215) 
This regressed during a recent merge-forward. See here for more info:

https://github.com/saltstack/salt/commit/2b1ad9e#diff-2c34a66e40db8ce28e251f98de56ce31L406

Resolves #36095.
 2016-09-12 08:39:22 -06:00
Mike Place
5a7a72346a Merge pull request #36202 from hu-dabao/add-36049 
for 36049, log current connected master and make status module more useful and efficient
 2016-09-12 08:18:24 +09:00
Mike Place
5ddf0af23e Merge pull request #36166 from jfindlay/parallels 
modules.parallels.delete: allow multiple IDs for same name
 2016-09-12 08:00:56 +09: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
1eb67df61e Merge pull request #36198 from gtmanfred/carbon 
add keystone state integration tests
 2016-09-11 18:16:38 +09: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