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,872 Commits 24 Branches 182 Tags 341 MiB
1b13d4d8b5
Commit Graph

37872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
1b13d4d8b5 Check for terminated (errored) processes in salt-ssh 
Fixes #20223
 2015-01-29 17:26:08 -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
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
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
Jille Timmermans
b9d2f5bdfa Fixed the Result of file.replace 2015-01-28 13:06:57 -07:00
Thomas S Hatch
eba8d9ec00 Merge pull request #20136 from kev009/sockstat-args 
Try to fix sockstat args for #20044
 2015-01-27 22:00:24 -07:00
Mike Place
a7462da8a8 Merge pull request #20138 from whiteinge/doc-log-granular-warning-syntax 
Fixed syntax error in log_granular_levels example
 2015-01-27 20:16:31 -07:00
Seth House
e3d29bf8ff Fixed syntax error in log_granular_levels example 2015-01-27 20:14:53 -07:00
Kevin Bowling
572865363f Try to fix sockstat args for #20044 2015-01-27 19:47:48 -07:00
Ahmed Kamal
db0047c468 Implementing freebsd-status.cpustats 2015-01-28 01:37:17 +02:00
Ahmed Kamal
95331bf786 pylint fixes 2015-01-28 00:30:12 +02:00
Ahmed Kamal
65f643e5ea Implement freebsd-status.cpuinfo 2015-01-28 00:29:45 +02:00
Thomas S Hatch
cc1e81ac1a Merge pull request #20112 from rallytime/pylint_7 
Pylint fixes for 2014.7 branch
 2015-01-27 11:18:36 -07:00
rallytime
2a5396ca81 Pylint fixes for 2014.7 branch 2015-01-27 11:17:17 -07:00
Thomas S Hatch
873fde30c4 Merge pull request #20097 from jfindlay/fix_locale_gen 
fix debian/ubuntu handling in locale.gen_locale
 2015-01-27 10:15:12 -07:00
Thomas S Hatch
b3ae619fe1 Merge pull request #20079 from kim0/freebsd-status.version-2014.7 
Implement Freebsd status.version merge to 2014.7
 2015-01-27 10:03:56 -07:00
Justin Findlay
4be92ed200 fix debian/ubuntu handling in locale.gen_locale 
fixes #18936; also handle user input gracefully in locale.avail
 2015-01-26 23:13:55 -07:00
Thomas S Hatch
d0bf8429dc Merge pull request #20080 from kim0/freebsd-status.nproc-2014.7 
Implement Freebsd status.nproc merge to 2014.7
 2015-01-26 20:39:21 -07:00
Thomas S Hatch
d199edde20 Merge pull request #20076 from rallytime/fix_states_file_tests 
Add some mocked variables to fix the file_test failures
 2015-01-26 20:38:53 -07:00
Nicole Thomas
9d82d0f9a7 Merge pull request #20091 from rallytime/fix_cloud_tests 
Change image name in rackspace profile config to a valid one
 2015-01-26 20:04:52 -07:00
Ahmed Kamal
34452f1d27 enchant pylint with spaces after commas 2015-01-27 01:59:35 +02:00
Ahmed Kamal
12222004ec KISS, get nproc value from grains 2015-01-27 01:52:07 +02:00
Thomas S Hatch
70b9370a96 Merge pull request #20087 from shanedlee/fix_docs_2 
Changed exe's to installers
 2015-01-26 15:52:01 -07:00
Shane D Lee
7c253f5ede Changed exe's to installers 2015-01-26 15:48:03 -07:00
Thomas S Hatch
efa3bd615a Merge pull request #20048 from s0undt3ch/features/use-saltpylint 
Make use of the SaltPyLint package separated from SaltTesting
 2015-01-26 15:37:09 -07:00
Thomas S Hatch
f254f1fb10 Merge pull request #20041 from rallytime/fix_dulwich_check 
dulwich.__version__ returns a tuple of ints instead of a string
 2015-01-26 15:27:42 -07:00
Thomas S Hatch
074c408a51 Add __instance_id__ to pylint checks as this has been added to 
the active state runs for state run tracking
 2015-01-26 15:22:18 -07:00
Erik Johnson
59e7481e2b Fix TestSaltCacheLoader tests 
Similar fixes as made for TestGetTemplate
 2015-01-26 16:04:21 -06:00
Ahmed Kamal
380ec1b4e2 Add error for unsupported OSs 2015-01-26 23:20:50 +02:00
Ahmed Kamal
edd6ee7a90 Implementing status.version on FreeBSD 2015-01-26 23:20:42 +02:00