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

73671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kstreee
2605f34849 Fix missing first data in stream when subscribing stream using a function 'read_async'. 2016-09-08 11:36:17 +01:00
Pablo Suárez Hernández
305bab8be0 Fixed _interfaces_ifconfig output for SunOS test 2016-09-08 11:36:17 +01:00
Eric Radman
b5ca02c867 Fix tests that assert CommandExecutionError (#32485) 
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
 2016-09-08 11:36:17 +01:00
Mihai Dincă
1fb6340fef Fix tests (#35693) 
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

* Fix unit/pyobjects_test.py::MapTests::test_map

* Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

* Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
 2016-09-08 11:36:17 +01:00
Eric Radman
5977f1f54c Skip utils_test if timelib is not installed (#32699) 
date_cast() throws a RuntimeError, not an ImportError
 2016-09-08 11:36:17 +01:00
Pablo Suárez Hernández
d1b9a4061e Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-08 11:36:17 +01:00
Jonathan Ballet
035a212a9b doc: fix doc formatting for salt.states.mount 2016-09-08 11:53:34 +02:00
Dmitry Kuzmenko
34cfd0112f Print errors to stdout in salt-key as it's done in salt and salt-run. 2016-09-08 12:43:13 +03:00
David Boucha
64a576fc6e add windows core grain test 2016-09-07 21:22:24 -06:00
Mike Place
977957862c Merge pull request #35665 from sthrasher/cherrypy-jobs-endpoint-speedup 
Speed up /jobs for salt-api when run under cherrypy.
 2016-09-08 10:31:03 +09:00
Mike Place
ac944de55f Merge pull request #35726 from guettli/develop 
set HAS_PSUTIL=False for old versions of psutils
 2016-09-08 10:30:16 +09:00
Mike Place
e83e5d3ce7 Merge pull request #35957 from llua/zypper_db 
Ignore IndexError in refresh_db() for zypper.py. Fixing #33963
 2016-09-08 10:26:42 +09:00
Mike Place
c4ddfe3887 Merge pull request #35954 from morganwillcock/upgrade-on-batteries 
win_pkg: Allow minion upgrade on batteries and report launch failure
 2016-09-08 10:25:37 +09:00
Mike Place
8f918c933c Merge pull request #36029 from felix-deschamps/patch-1 
Fix for 35681: sdb paths are truncated.
 2016-09-08 10:24:17 +09:00
Mike Place
eac9935b58 Merge pull request #36044 from Ch3LL/add_test_state_event 
add salt-run state.event test
 2016-09-08 10:23:49 +09:00
Mike Place
b71b1ccdd7 Merge pull request #36058 from s-sebastian/develop 
Add functions to assign/unassign private IP addresses
 2016-09-08 10:21:44 +09:00
Mike Place
70da628018 Merge pull request #36070 from rallytime/fix-36057 
Use __utils__ instead of salt.utils.cloud in opennebula driver
 2016-09-08 10:18:45 +09:00
Mike Place
b7556a2aeb Merge pull request #36089 from terminalmage/issue35565 
Support running git states / remote exec funcs as a different user in Windows
 2016-09-08 10:17:22 +09:00
Mike Place
d08caafe9b Merge pull request #36110 from benediktwerner/fix-apache-module-suse 
Configuring Apache modules on SUSE systems
 2016-09-08 10:13:44 +09:00
Mike Place
956b5afa73 Merge pull request #36120 from mguegan/36112_bsd_shadow 
Fix retrieval of shadow password for OpenBSD (#36112)
 2016-09-08 10:12:25 +09:00
Mike Place
94b7659304 Merge pull request #36129 from terminalmage/pygit2-ssl_verify 
pygit2: Prevent traceback on initial gitfs setup
 2016-09-08 10:03:25 +09:00
Mike Place
a5b036962e Merge pull request #36091 from UtahDave/36087_pkg_stacktrace 
add missing imports and namespace them
 2016-09-08 09:15:15 +09:00
David Boucha
453e80c611 Add check for pwd module to the __virtual__ func 2016-09-07 18:03:40 -06:00
David Boucha
277939e0c3 don't stacktrace on import pwd on Windows 2016-09-07 18:03:40 -06:00
Mike Place
dcd993f91c Merge pull request #36130 from terminalmage/issue35876 
Make gitfs_env_whitelist and blacklist configurable per-remote
 2016-09-08 08:53:44 +09:00
Benedikt Werner
c9d0cdb2c8 Adjusted os_family name and removed unused import 
Changed os_family name from Suse to SUSE and removed unused `import os`
 2016-09-08 01:08:53 +02:00
Erik Johnson
640f0c17c6 pygit2: Prevent traceback on initial gitfs setup 
Newer pygit2 releases require that this value be a string, they will not
accept a bool here.
 2016-09-07 17:12:05 -05:00
Erik Johnson
72c13d3825 Make gitfs_env_whitelist and blacklist configurable per-remote 
Resolves #35876.
 2016-09-07 17:10:46 -05:00
Valentin Rosavitskiy
bcee34d676 Add support for new OS VZ7 (#35123) (#36115) 2016-09-07 16:03:38 -06:00
Nicole Thomas
d0bfbe8820 Fix Windows salt-master (#36119) 
The salt-master on Windows was broken by PR #35703 due to the change in
how the ReqServer object was started in a new process. The new way
failed to correctly pickle/unpickle the args/kwargs. To fix this, we
use `__setstate__` and `__getstate__` similar to how other objects in
the same file handle it (such as the `Maintenance` object).

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-09-07 16:02:45 -06:00
Nicole Thomas
760da9df6a Merge pull request #36117 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-07 16:01:46 -06:00
Nicole Thomas
7cdbc546f1 Back-port #36062 to 2015.8 (#36118) 
* Comment all lines in the minion config file

* Add unit tests to check for all files in conf/ to be commented out

* Make sure cont/cloud.profiles file is commented out

Matches the cloud.providers file format and other sample config files.

* Add unit tests for sample files in cloud.profiles.d, cloud.providers.d,
and cloud.maps.d

* Make sure all sample config files in cloud.maps.d are commented out

* Make sure all sample config files in cloud.profiles.d are commented out
 2016-09-07 16:01:34 -06:00
rallytime
07172cf371 Add some unit tests for the jid_queue functionality in minion.py 
Refs #35172 and #28785
 2016-09-07 14:15:35 -06:00
Thomas S Hatch
845e96ad81 Merge pull request #36111 from cachedout/sighup 
Minion config reload support
 2016-09-07 13:54:39 -06:00
ed lane
eefc895645 partially revert an overly zealous cut & paste 2016-09-07 13:37:30 -06:00
ed lane
40c89474aa add keepalive for sockets initiated by master. 2016-09-07 13:25:34 -06:00
twangboy
da2dded3c3 Use /etc instead of /root 2016-09-07 12:34:33 -06:00
twangboy
b4112247a4 Fix test not starting, skip broken functions 2016-09-07 12:01:38 -06:00
mguegan
08b636cc75 Fix retrieval of shadow password for OpenBSD (#36112) 
Tested with :
 - OpenBSD/amd64 5.9
 - OpenBSD/amd64 6.0

As the patch is inside the OpenBSD _and_ NetBSD condition, it would be
necessary to test with NetBSD too (which I didn't).
 2016-09-07 18:31:17 +02:00
Felix Deschamps
e5e330c159 Update sdb.py 2016-09-07 09:28:38 -07:00
Erik Johnson
796156c5f5 Add attribution 2016-09-07 11:17:56 -05:00
rallytime
40d0def479 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/states/archive.py
 2016-09-07 10:11:36 -06:00
Ch3LL
ee398a94b6 fix pylint 2016-09-07 10:05:44 -06:00
Erik Johnson
2e56527ead Move command logging to before win_runas 
With the addition of runas for Windows in 2016.3.0, commands run using
Windows runas would not be logged at all, as we would return from the
_run() function before we got to the line where this information was
logged. This commit moves the command logging up to before we enter the
if block where the win_runas code would be executed, restoring the
prior logging behavior.
 2016-09-07 10:36:13 -05:00
Mike Place
fd7f24d993 Merge pull request #36100 from cachedout/safe_gem_check 
Skip Ruby tests on exception in pre-req check
 2016-09-07 23:57:10 +09:00
Mike Place
2fddfe2887 Merge pull request #36101 from sitepoint/adjtime_fix_fix 
Check for RTC support via /dev/rtc (#4983)
 2016-09-07 23:56:44 +09:00
rallytime
de4f77cb68 Fixup failing test: need to mock __utils__ instead of salt.utils.cloud call 2016-09-07 08:46:47 -06:00
Mike Place
ac30edb57b Minion working 2016-09-07 23:34:46 +09:00
Benedikt Werner
e4ac1d1a42 Added apache module support for SUSE systems 2016-09-07 15:58:42 +02:00
Mike Place
45ba2e806b Merge pull request #35923 from kstreee/fix-cli-stalling 
Fixes a bug that Ctrl-c not working on Salt CLI.
 2016-09-07 20:47:50 +09:00