valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,898 Commits 24 Branches 182 Tags 341 MiB
b37eda267f
Commit Graph

37898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
b37eda267f Merge pull request #20250 from Azidburn/2014.7 
Fix for feature request #10258
 2015-01-30 10:58:45 -07:00
Thomas S Hatch
d0a629e721 Merge pull request #20261 from thatch45/basepi-saltssh.errors.20223 
Merge #20229 with fixes
 2015-01-30 10:36:51 -07:00
Thomas S Hatch
a2a4722906 lint fixes 2015-01-30 10:35:50 -07:00
Thomas S Hatch
68b2773628 Merge branch 'saltssh.errors.20223' of https://github.com/basepi/salt into basepi-saltssh.errors.20223 2015-01-30 10:35:05 -07:00
Thomas S Hatch
9fafe41be0 Merge pull request #20218 from felskrone/fqdn_master_status_2014.7 
improved status.master to work with fqdns
 2015-01-30 10:31:08 -07:00
Thomas S Hatch
ad6cb8c976 Merge pull request #20260 from thatch45/Jiaion-2014.7 
Merge #20241 with fixes
 2015-01-30 10:29:12 -07:00
Thomas S Hatch
17829583de lint fixes 2015-01-30 10:27:04 -07:00
Thomas S Hatch
36283d2d65 Merge branch '2014.7' of https://github.com/Jiaion/salt into Jiaion-2014.7 2015-01-30 10:26:42 -07:00
Thomas S Hatch
5c94ea377f Merge pull request #20237 from joejulian/2014.7 
Issue #20235: blockdev.format fails when succeeding
 2015-01-30 10:18:06 -07:00
Thomas S Hatch
f9b01bf08e Merge pull request #20231 from whiteinge/rest_cherrypy-docs-examples 
Added several examples and clarifications to the rest_cherrypy docs
 2015-01-30 10:15:23 -07:00
Thomas S Hatch
bf80cf49bc Merge pull request #20225 from jfindlay/fix_svn_mod 
extend a list not a tuple
 2015-01-30 10:11:30 -07:00
Thomas S Hatch
ab5cf4b92c Merge pull request #20203 from basepi/archiveextract20195 
[2014.7] Iterate over the shortopts if there are more than one for archive.extracted
 2015-01-30 10:04:27 -07:00
Azidburn
6c9fd6d026 corrections from jenkins build 2015-01-30 14:34:15 +01:00
Marc Thomas
441e460a20 Fix for feature request #10258 2015-01-30 13:46:54 +01:00
linxiao.jz
97f863177e fix salt libs .systemd import error 2015-01-30 17:36:39 +08:00
Joe Julian
762c6228a2 Issue #20235: blockdev.format fails when succeeding 
After a mkfs is issued, an immediate lsblk will show the device as
unformatted. Issuing a sync before lsblk will allow the check to
succeed.
 2015-01-29 22:26:55 -08:00
Seth House
23745daa55 Replaced HTTP examples with HTTPS 
Lead by example!
 2015-01-29 18:36:01 -07:00
Seth House
538e80af04 Added a note about recommended CherryPy versions due to SSL errors 2015-01-29 18:32:01 -07:00
Seth House
8a74d90813 Added a better explanation of lowdata and more examples 2015-01-29 18:32:01 -07:00
Seth House
60c2959ef5 Added two authentication examples to rest_cherrypy docs 2015-01-29 18:32:00 -07:00
Colton Myers
1b13d4d8b5 Check for terminated (errored) processes in salt-ssh 
Fixes #20223
 2015-01-29 17:26:08 -07:00
Nicole Thomas
8598559bfd Merge pull request #20210 from rallytime/bp-20171 
Backport #20171 to 2014.7
 2015-01-29 16:26:57 -07:00
Justin Findlay
b40fedcc55 extend a list not a tuple 
fixes #20224
 2015-01-29 16:01:26 -07:00
Nicole Thomas
a72017d516 Merge pull request #20211 from rallytime/bp-20118 
Backport #20118 to 2014.7
 2015-01-29 15:08:16 -07:00
rallytime
132f364e10 Don't use salt.defaults.exitcodes, just use salt.exitcodes in 2014.7 2015-01-29 15:04:26 -07:00
vs
c8f734b909 improved status.master to work with fqdns 2015-01-29 21:44:52 +01:00
Nicole Thomas
4aeaec7a94 Merge pull request #20212 from saltstack/revert-20156-bp-19566 
Revert "Backport #19566 to 2014.7"
 2015-01-29 13:40:13 -07:00
Nicole Thomas
9fef292d3d Revert "Backport #19566 to 2014.7" 2015-01-29 13:39:58 -07:00
kitsemets
d6e70fdf9d salt.states.cmd: fixed 'unless' behaviour in case of multiple unless commands are given 2015-01-29 13:00:18 -07:00
Thayne Harbaugh
80dc5aedd7 Minor: Improve thin and shim warnings and comments. 2015-01-29 12:58:14 -07:00
Colton Myers
8f322c96c6 Iterate over the shortopts if there are more than one 
Fixes #20195
 2015-01-29 10:46:31 -07:00
Thomas S Hatch
eb19ccd99e Merge pull request #20174 from kim0/freebsd-status.meminfo 
Implement freebsd-status.meminfo
 2015-01-29 10:34:38 -07:00
Thomas S Hatch
d04999d741 Merge pull request #20163 from jfindlay/fix_sysctl 
fix sysctl test state comparison
 2015-01-29 10:29:46 -07:00
Ahmed Kamal
5a350c0f7a Implement freebsd-status.meminfo 2015-01-29 02:54:56 +02:00
Thomas S Hatch
c6a11643f9 Merge pull request #20128 from kim0/freebsd-status.cpuinfo 
Freebsd status.cpuinfo
 2015-01-28 15:45:09 -07:00
Thomas S Hatch
daba06fac2 Merge pull request #20162 from rallytime/bp-20062 
Backport #20062 to 2014.7
 2015-01-28 15:06:07 -07:00
Thomas S Hatch
02cbd7e2f8 Merge pull request #20159 from rallytime/bp-20115 
Backport #20115 to 2014.7
 2015-01-28 15:05:28 -07:00
Thomas S Hatch
39bdd3abe5 Merge pull request #20157 from rallytime/bp-19976 
Backport #19976 to 2014.7
 2015-01-28 15:04:54 -07:00
Thomas S Hatch
1295206c4b Merge pull request #20156 from rallytime/bp-19566 
Backport #19566 to 2014.7
 2015-01-28 15:04:38 -07:00
Thomas S Hatch
6511aacd24 Merge pull request #20154 from rallytime/bp-15701 
Backport #15701 to 2014.7
 2015-01-28 15:04:05 -07:00
Justin Findlay
6bdc355033 fix sysctl test state comparison 
Fixes #20145; sysctl, at least on linux, pads the output of its values
with extra spaces,

Example:
```
centos-7-main salt fix_sysctl # sysctl net.ipv4.ip_local_port_range
net.ipv4.ip_local_port_range = 48000    58000
centos-7-main salt fix_sysctl # cat /etc/sysctl.d/99-salt.conf
net.ipv4.ip_local_port_range = 48000  58000
```

insomuch that a comparison of '48000    58000' and '48000  58000' will
result in a false changed state with test=True.
 2015-01-28 14:58:59 -07:00
Thomas S Hatch
690d34c72f Merge pull request #20131 from kim0/freebsd-status.cpustats 
Implementing freebsd-status.cpustats
 2015-01-28 14:52:56 -07:00
Thomas S Hatch
0b47a56773 Merge pull request #20000 from terminalmage/fix-19552 
Better check for pillar for jinja templating
 2015-01-28 14:35:56 -07:00
rallytime
f874d8bbba Pylint fixes 2015-01-28 14:25:49 -07:00
Mike Place
7c066c38a0 Increae default runner timeout to 60s 2015-01-28 13:56:41 -07:00
Joseph Hall
4e93117849 Merge pull request #20155 from basepi/debianip19528 
Do not use 'is' for string comparison
 2015-01-28 13:47:06 -07:00
TaiSHiNet
2e58b07f4f DO APIv1 issue Closes #19306 
Cast backups_enabled/private_networking booleans to lowercase string, given that DO APIv1 will not recognize True with capitol T
All credits to @namcois, I merely edited the file
 2015-01-28 13:45:25 -07:00
Tait Clarridge
fe1f2603ac Add compatibility to mount by label 
Previously this would always force a remount as label was missing from the extended mount.active function.
 2015-01-28 13:33:20 -07:00
Flavian
0a28a462a9 #19162 added disks to Azure VM creation. Only new empty disks are 
supported. Add a line
volumes:
  - { size: 10 (default 100), lun: [0-15](default: 0), disk_label:
<label>(default: <role-name>-disk-<lun>) }
 2015-01-28 13:28:13 -07:00
Colton Myers
3222284235 Do not use 'is' for string comparison 2015-01-28 13:08:40 -07:00