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
62,798 Commits 24 Branches 182 Tags 341 MiB
9bc9ca78de
Commit Graph

62798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
9bc9ca78de Merge pull request #29496 from terminalmage/remove-repoquery 
Remove dependency on repoquery from yumpkg.py
 2015-12-08 14:28:08 -07:00
Mike Place
2ed1a85987 Merge pull request #29491 from alprs/fix-rename_grafana_dashboard_state 
Rename grafana dashboard state
 2015-12-08 14:13:25 -07:00
Mike Place
ef021dcf87 Merge pull request #29536 from Granjow/rstReformatting 
Compiler Ordering Docs: Use double backticks for highlighting inline …
 2015-12-08 14:09:22 -07:00
Mike Place
56be134ce1 Merge pull request #29534 from tbaker57/more_virtual_return_fixes 
More virtual return fixes
 2015-12-08 13:33:49 -07:00
Andreas Lutro
74b73050f6 single quotes for docstrings 2015-12-08 20:29:13 +01:00
Andreas Lutro
e357416c8d remove unnecessary __virtualname__ 2015-12-08 20:28:54 +01:00
Andreas Lutro
ca0098141c remove "2" from state name 2015-12-08 20:27:16 +01:00
Tim Baker
dfb04f5184 Sytax error - too many single quotes 2015-12-09 04:05:46 +10:00
Tim Baker
8f98c8cfb8 More virtual return fixes 2015-12-09 04:03:05 +10:00
Simon A. Eugster
eb04e54b38 Compiler Ordering Docs: Use double backticks for highlighting inline code 2015-12-08 19:02:57 +01:00
Tim Baker
da0276ca4d fix typos, add more returns 2015-12-09 03:45:45 +10:00
Tim Baker
b477cc7139 Yet more virtual return fixes. 2015-12-09 03:34:07 +10:00
Tim Baker
c77ae9e6ab More virtual return fixes as per Dec 2015 bugfix Sprint 2015-12-09 03:21:33 +10:00
Mike Place
45f283afa7 Merge pull request #29523 from AkhterAli/boto_ec2_fixes 
Adding parameter to execution module and fixing attributes parameter …
 2015-12-08 10:07:23 -07:00
Mike Place
6b20b8017f Merge pull request #29479 from The-Loeki/iostat 
contribution: disk.iostat info gathering
 2015-12-08 09:40:00 -07:00
Mike Place
d32f9f5c5e Merge pull request #29508 from michaelcoyote/develop-modcleanupXY 
Return statements for modules xapi, xmpp and yumpkg
 2015-12-08 09:11:54 -07:00
Mike Place
6619bcc448 Merge pull request #29509 from michaelcoyote/develop-modcleanupWin1 
Add return to modules win_wua win_useradd win_update
 2015-12-08 09:10:26 -07:00
Mike Place
95523312a0 Merge pull request #29512 from dr4Ke/fix_remount_cifs_uid_name 
Fix forced remount if uid/gid is provided as a name
 2015-12-08 09:08:33 -07:00
Mike Place
c2fd18622c Merge pull request #29506 from rallytime/fix-29227 
Fix breakage caused by #27708
 2015-12-08 09:05:49 -07:00
Akhter Ali
6b67712dda Adding parameter to execution module and fixing attributes parameter to include conditions 2015-12-08 11:02:09 -05:00
Christophe Drevet-Droguet
9a268e05d6 mount exec module: resolve user/group names in opts 
In relation to #25293, it solves the improbable case where the OS returns the
mount options as names instead of numeric ids. The module converts these names
to numeric ids before returning the opts.

This is done only for uid= and gid= opts, for now. It can be extended to others.
 2015-12-08 12:43:47 +01:00
Christophe Drevet-Droguet
7395a949e4 mount state module: uid/gid verification with names 
Should fix #25293
 2015-12-08 12:43:46 +01:00
Ronald van Zantvoort
459e0378b7 Add additional check to doubly surely prevent infinite loops. 2015-12-08 10:07:47 +01:00
Ronald van Zantvoort
24f8e0c7a2 PyLint fix 2015-12-08 10:05:44 +01:00
Ronald van Zantvoort
52d1933b61 contribute iostat functions to disk module 2015-12-08 10:05:44 +01:00
Ronald van Zantvoort
ba0f494392 no use checking a list with one item 2015-12-08 10:05:44 +01:00
Michael
2bdd8ea28c ficks spelung errior 
*available*
 2015-12-07 23:09:55 -08:00
michael guldan
65e5c7f101 Add return to modules win_wua win_useradd win_update 
Add return messages to __virtual__ on modules win_wua, win_useradd and win_update
 2015-12-07 23:03:11 -08:00
Mike Place
87fb8baad1 Merge pull request #29294 from skizunov/develop2 
ZeroMQ no longer required when transport is TCP
 2015-12-07 21:59:44 -07:00
Erik Johnson
7259069b51 import zip function from six 2015-12-07 22:27:25 -06:00
Erik Johnson
0e24bbb435 fix typo 2015-12-07 22:25:53 -06:00
michael guldan
fc6e3460b7 Return statements for modules xapi, xmpp and yumpkg 
Added return statements for __virtual__ on modules xapi, xmpp and yumpkg
 2015-12-07 19:17:45 -08:00
Nicole Thomas
df90c406ba Merge pull request #29462 from techhat/genesispart 
Create partitioned, bootable images
 2015-12-07 19:28:24 -07:00
Sergey Kizunov
a37a2700af ZeroMQ no longer required when transport is TCP 
salt/master.py:
- If ZMQ is not importable, use `tornado.ioloop.IOLoop` as the loop class.
- Check HAS_ZMQ before using any zmq.* content.
- Did not touch `FloMWorker` usage of zmq.*. This is only used when the
transport is RAET.

salt/minion.py:
- If ZMQ is not importable, use `tornado.ioloop.IOLoop` as the loop class.
- Check HAS_ZMQ before using any zmq.* content.

salt/transport/ipc.py:
- Added `IPCMessagePublisher`. This is intended to function much like
ZMQ's zmq.PUB sockets. Used in implementing utils/event.py to function
without ZMQ.
- Added `IPCMessageSubscriber`. This is intended to function much like
ZMQ's zmq.SUB sockets. Used in implementing utils/event.py to function
without ZMQ. What makes this class a bit different is that the associated
IO Loop is meant to not be running when it is used. Due to this, it is
recommended that the caller create a new IO Loop for this purpose. The
reason for this is that the `get_event()` API may be invoked from
anywhere, whether or not there is a current IO Loop that is running in
the thread of the invocation.

salt/utils/async.py:
- If ZMQ is not importable, use `tornado.ioloop.IOLoop` as the loop class.

salt/utils/event.py:
- Implemented using `salt.transport.ipc` instead of ZMQ.
- zmq.PUB ==> `IPCMessagePublisher`
- zmq.SUB ==> `IPCMessageSubscriber`
- zmq.PUSH ==> `IPCMessageClient`
- zmq.PULL ==> `IPCMessageServer`

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-12-07 20:22:16 -06:00
rallytime
75b6d5017b Fix breakage caused by #27708 
Fixes #29227
Refs #27708
 2015-12-07 18:38:34 -07:00
Mike Place
04e078ac48 Merge pull request #29495 from techhat/lddrecur 
Recursively resolve ldd
 2015-12-07 16:21:55 -07:00
Joseph Hall
52882cd1c3 Merge pull request #4 from jfindlay/boot_part 
modules.genesis: update unit tests for bootstrap
 2015-12-07 15:47:51 -07:00
Justin Findlay
99b229c9fe modules.genesis: update unit tests for bootstrap 2015-12-07 15:19:22 -07:00
C. R. Oldham
05ad93fd29 Merge pull request #29489 from techhat/ipcheck 
Check for ip command
 2015-12-07 14:43:04 -07:00
Joseph Hall
5d69de04db Validate img_format 2015-12-07 14:40:11 -07:00
Erik Johnson
3e9788276c Modify pkg.group_installed to reflect changes in yumpkg.py 2015-12-07 15:20:51 -06:00
Erik Johnson
47534b29b4 Remove dependency on repoquery from yumpkg.py 
This also makes some changes to group_info and group_diff to make them
work properly for environment groups.
 2015-12-07 15:20:51 -06:00
Erik Johnson
4255678efb move pkginfo namedtuple creation to its own function 2015-12-07 15:20:51 -06:00
Erik Johnson
2461552a06 Hide aliased function 2015-12-07 15:20:51 -06:00
Joseph Hall
76e1da2f44 Recursively resolve ldd 2015-12-07 14:19:21 -07:00
Mike Place
4e20b37d8d Merge pull request #29490 from s0undt3ch/develop 
Don't include the binary msgpack in the thin tarball
 2015-12-07 13:12:46 -07:00
Mike Place
319105480b Merge pull request #29447 from pass-by-value/lxc_module_vgname 
Remove extra kwarg and update option
 2015-12-07 12:56:37 -07:00
Mike Place
8359574f8b Merge pull request #29434 from pzipoy/dev/pzipoy/preserve_minions_fix 
Remove master caches if preserve_minions is false
 2015-12-07 12:51:10 -07:00
Mike Place
1f692ab9cb Merge pull request #29438 from jfindlay/ssh_timeout 
add timeout for ssh-keyscan
 2015-12-07 12:46:34 -07:00
Mike Place
a517c0c042 Merge pull request #29449 from AkhterAli/develop 
Adding message for null public IP
 2015-12-07 12:44:33 -07:00