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
39,074 Commits 24 Branches 182 Tags 341 MiB
f5903dfe6d
Commit Graph

39074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Inflianskas
f5903dfe6d modules.parted: tests: fixed probe deprecation testing #2 2014-11-03 13:12:46 +03:00
Roman Inflianskas
d04abdf91a modules.parted: tests: fixed probe deprecation testing 2014-11-03 12:30:13 +03:00
Roman Inflianskas
70e4062cf9 Actually testing parted 
called_once_with didn't work, changed to assert_called_once_with
 2014-11-03 11:52:01 +03:00
Erik Johnson
1bee2a2d89 Fix lint 
Also fix a bunch of bad grammar
 2014-11-02 22:26:16 -06:00
Erik Johnson
92daa45619 Merge branch 'ashb-patch-2' into develop 2014-11-02 22:16:29 -06:00
Erik Johnson
d995cfcfee Merge branch 'patch-2' of https://github.com/ashb/salt into ashb-patch-2 2014-11-02 22:16:12 -06:00
Joseph Hall
6d7a20681a Merge pull request #17096 from dmyerscough/sms 
Twilio SMS returner
 2014-11-02 12:48:18 -07:00
Damian Myerscough
4c1fc85b93 Twilio SMS returner 2014-11-02 09:16:54 -08:00
Ash Berlin
8da1bc05c8 Improve docs clearer for mongodb_user state - passwd vs password 
The docs were unclear about which of password and passwd are used for the user, and which are used for the connection.

This makes the param names clearer and adds an example
 2014-11-02 10:27:46 +00:00
Erik Johnson
1f73e73273 Merge branch 'AnneTheAgile-develop' into develop 2014-11-01 20:21:56 -05:00
Erik Johnson
1570d01ffa Merge branch 'develop' of https://github.com/AnneTheAgile/salt into AnneTheAgile-develop 
Conflicts:
	salt/state.py
 2014-11-01 20:21:18 -05:00
Damian Myerscough
0d35cdb274 Initial Twilio SMS returner 2014-11-01 10:00:49 -07:00
AnneTheAgile
1e33a6a82c [DOC] Fix Cryptic Error: "State git.latest found in sls php is unavailable" #15520 
Per discussion in  Cryptic Error: "State git.latest found in sls php is unavailable" #15520 .
 2014-10-31 22:21:56 -04:00
Samuel Smith
f5e12ed025 Merge pull request #17083 from SmithSamuelM/sam_dev1 
Raet Minion now defaults to first available master and recognizes random_master
 2014-10-31 18:07:28 -06:00
Samuel M Smith
406dc1fe69 Merge remote-tracking branch 'upstream/develop' into sam_dev1 2014-10-31 18:04:02 -06:00
Samuel M Smith
d5e0efe3f1 Support for random_master opt for raet minion with multiple masters 
Also bootstrap default (if not random_master) now uses first available master to
get pillar information
 2014-10-31 18:02:34 -06:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
Thomas S Hatch
3e2b366cd6 Merge pull request #17081 from lyft/fix-state-verbose 
Fix state_verbose: False output
 2014-10-31 15:47:40 -06:00
Thomas S Hatch
4f5cff68a8 Merge pull request #17078 from dmyerscough/drac-network-state 
DRAC Network State
 2014-10-31 15:44:55 -06:00
Thomas S Hatch
a947047538 Merge pull request #17077 from feth/display_pkg_version 
Display the package version in pkg.latest when a package is up to date
 2014-10-31 15:42:42 -06:00
Thomas S Hatch
1f1f2193fb Merge pull request #17064 from opdude/hg-quotations 
Quotations are not necessary when passing cmd arguments in as an array
 2014-10-31 15:37:39 -06:00
Thomas S Hatch
60f90e2084 Merge pull request #17060 from luckenbach/fix_win_ntp 
Updated win_ntp.py to catch the ValueError that would occur when
 2014-10-31 15:36:54 -06:00
Thomas S Hatch
999777d001 Merge pull request #17052 from hulu/unsafe-default-arg 
utils.error.fire_exception: fix unsafe mutable default argument value
 2014-10-31 15:35:05 -06:00
Thomas S Hatch
b8eda43883 Merge pull request #17046 from jacksontj/develop 
Fix for issue where master comm errors cause minions to delete all modules
 2014-10-31 15:34:38 -06:00
Thomas S Hatch
15a51935fa Merge pull request #17073 from jfindlay/jmoney/linux_sysctl_test 
Jmoney/linux_sysctl_test
 2014-10-31 15:25:35 -06:00
Ryan Lane
53d8304b15 Fix state_verbose: False output 2014-10-31 14:08:20 -07:00
Damian Myerscough
bf454a4afa DRAC Network State 2014-10-31 13:12:27 -07:00
Feth AREZKI
029700e4ab Display the package version in pkg.latest when a package is up to date 
fixes: #16121
 2014-10-31 21:02:05 +01:00
Justin Findlay
26094b39b4 pylint fix on linux_sysctl_test.py 2014-10-31 12:41:04 -06:00
Samuel M Smith
575b7da4c4 Added some more informative log messages for routing salt-call and default routing 
attempt to fix salt-call for multi-master raet
Not fix
 2014-10-31 11:05:50 -06:00
Justin Findlay
f09b8e3873 remove redundant mock_open() in darwin_sysctl_test.py 2014-10-31 10:42:57 -06:00
Justin Findlay
31f2dbaa91 change linux_sysctl.py to fail properly on misassign 
The original check (4e1c367) for sysctl assign failure queries the
format returned by sysctl on stdout.  It was added evidently for some
container system called Virtuozzo.  A later commit (4e1c367) strengthens
the check into a full regex on sysctl stdout.

Unfortunately, it appears that on a contemporary conventional distro,
CentOS 7, sysctl repeats the config it is given on stdout whether or not
the config requested is valid.  Furthermore, an invalid config request
will not cause sysctl to return a nonzero status.  It does print an
error on stderr, so I've added an optional additional check of stderr.
Examples:

centos-7 # sysctl net.ipv4.ip_forward=1 ; echo $?
net.ipv4.ip_forward = 1
0

centos-7 # sysctl net.ipv4.ip_forward=backward ; echo $?
sysctl: setting key "net.ipv4.ip_forward": Invalid argument
net.ipv4.ip_forward = backward
0
 2014-10-31 10:25:24 -06:00
Justin Findlay
106f645c9e adding tests for modules/linux_sysctl.py 2014-10-31 10:16:41 -06:00
Nicole Thomas
573390d8ad Merge pull request #17054 from jacksontj/2014.7 
Fix for #17051
 2014-10-31 10:14:16 -06:00
Joseph Hall
7afb06d332 Merge pull request #17071 from steverweber/develop 
removed unused place holder
 2014-10-31 09:25:21 -06:00
Steve Weber
f8556451e5 removed unused place holder 
removed unused string place holder
 2014-10-31 11:22:25 -04:00
Nicole Thomas
febd925453 Merge pull request #17069 from cachedout/issue_17055 
Fix failing tests
 2014-10-31 09:16:55 -06:00
Mike Place
a0a0512cf5 Fix failing tests 2014-10-31 08:35:23 -06:00
Daniel Hobley
3edf142290 Quotations are not necessary when passing cmd arguments in as an array 
- This also fixes the inability to clone mercurial repos on Ubuntu 12.04
 2014-10-31 13:49:13 +01:00
Zach Hilliard
1afe234042 Updated win_ntp.py to catch the ValueError that would occur when 
a windows machine is attached to a domain and not using NTP for
time
 2014-10-31 00:56:18 -05:00
Pedro Algarvio
8e00178a88 Merge pull request #17049 from terminalmage/quickfix 
Fix nonsense language in error message
 2014-10-31 04:13:26 +00:00
Pedro Algarvio
543b2d5dc7 Merge pull request #17053 from hulu/assertion-shadowing 
avoid shadowing in salt.modules.test.assertion
 2014-10-31 04:12:14 +00:00
C. R. Oldham
d44a4739c7 Merge pull request #17059 from cro/nssm_update 
Update nssm to latest 2.24 (2014-08-31 release)
 2014-10-30 22:16:47 -04:00
C. R. Oldham
6c9be002c5 Update nssm to 2.24 2014-10-30 22:15:26 -04:00
Samuel Smith
06ba3ab1d7 Merge pull request #17058 from SmithSamuelM/sam_dev1 
Better support (but not complete) for Mult-Masters on Salt Raet
 2014-10-30 19:11:38 -06:00
Samuel M Smith
99f02b1424 Merge remote-tracking branch 'upstream/develop' into sam_dev1 2014-10-30 19:06:16 -06:00
Samuel M Smith
4dbd303300 Reinstate salt-call RAETChannel dst 2014-10-30 18:50:47 -06:00
Samuel M Smith
ec227845f9 Revert salt-call usage change for RAETChannel as it didn't fix completely and normal targeting was wonky 2014-10-30 18:32:41 -06:00
Samuel M Smith
91c5b613a0 salt-call usage of RaetChannel also needs to go to master that motivated the call 
Fixed
 2014-10-30 18:23:17 -06:00
Colton Myers
8237ae6b19 Merge pull request #17057 from basepi/mergeforward 
Merge 2014.7 into develop
 2014-10-30 18:17:10 -06:00