valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,811 Commits 24 Branches 182 Tags 341 MiB
0e3dc486a6
Commit Graph

45811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Jackson
9dd4d48ea9 Move "low" to separate line-- everything else is 2015-01-28 18:43:41 -08:00
Thomas Jackson
93eada584d Misc cleanup 2015-01-28 18:43:41 -08:00
Thomas Jackson
afc072a66c Consolidate the cmd() func to just use low(), since its all redundant (and most of the old arg parsing was redundant) 2015-01-28 18:43:40 -08:00
Thomas Jackson
05cf77617b Make Async really async-- and always create another process to execute the runner 2015-01-28 18:43:40 -08:00
Thomas Jackson
d8e8de2a19 Caste jid as str (its an int all over), and change runner tag to correct prefix 
Conflicts:

	salt/utils/event.py
 2015-01-28 18:43:40 -08:00
Thomas Jackson
1dc6784662 Remove local multiprocessing, and use the aync client mixin 2015-01-28 18:43:40 -08:00
Mathieu Le Marec - Pasquet
2820148b04 runner: Force mminion loading not to clutter output 2015-01-29 02:33:49 +01:00
Thomas Jackson
975dee5bdd Remove test as well 2015-01-28 17:25:35 -08:00
Thomas Jackson
1547906c95 Remove grains outputter 
Its been broken for ~8 months (or more), and its been falling back to nested. Since nested does (IMO) a better job displaying the data and is generic, there is no reason to get this working-- esp since we've already "deprecated" it, by it not working
 2015-01-28 17:07:45 -08:00
Thomas Jackson
aa8b694632 Some more cleanup to grains outputter, closer to working 2015-01-28 16:57:49 -08:00
Ahmed Kamal
5a350c0f7a Implement freebsd-status.meminfo 2015-01-29 02:54:56 +02:00
Thomas Jackson
79516222cc Fix for #20170 
fix bug introduced in e806ae98fc
 2015-01-28 16:44:05 -08: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
a71c06d334 Merge pull request #20098 from thatch45/journald_beacon 
Journald and WTMP beacons
 2015-01-28 15:44:53 -07:00
Thomas S Hatch
28b584a595 Merge pull request #20133 from gweis/develop 
webutil.useradd throws exception KeyError: 'out'
 2015-01-28 15:43:28 -07:00
Mike Place
64ced62848 Merge pull request #20166 from cachedout/reactor_exc_catch 
Catch all exceptions in reactor
 2015-01-28 15:28:46 -07:00
Mike Place
cd2aa33d8c Catch all exceptions in reactor 
There is a possible bug wherein uncaught exceptions seem to make zmq3
tip over when threading is involved. This is an attempt to prevent that
from happening. (The cause of the exceptions will need to be
investigated as well, most specifically wheel.key)
 2015-01-28 15:22:58 -07:00
Thayne Harbaugh
6fc4cd1c50 Minor: Improve thin and shim warnings and comments. 2015-01-28 15:15:38 -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
04288b341d Merge pull request #20161 from cachedout/api_runner_defaults 
Init default args/kwargs if none are supplied in netap
 2015-01-28 15:05:50 -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
de0f231469 Merge pull request #20158 from rallytime/bp-20042 
Backport #20042 to 2015.2
 2015-01-28 15:05:15 -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
Thomas S Hatch
97285aadd0 Merge pull request #20152 from techhat/httpupdate 
Add function to update CA cert bundle
 2015-01-28 15:03:55 -07:00
Thomas S Hatch
9432dc1d67 Merge pull request #20148 from pille/issue-16293 
support --only-upgrade option in apt
 2015-01-28 15:01:34 -07:00
Thomas S Hatch
29ac504a93 Merge pull request #20142 from quantonganh/tls-module-cert-extensions 
Allow to add extensions to a certificate
 2015-01-28 14:59:58 -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
d86e5dd7fb Merge pull request #20135 from kev009/remove-restart_on_error 
Remove unused restart_on_error config
 2015-01-28 14:58:20 -07:00
Thomas S Hatch
7cb71df473 Merge pull request #20134 from gerl1ng/extend-mysql-state-documentation 
Extended mysql_user and mysql_grants documentation
 2015-01-28 14:57:43 -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
328d7220e4 Merge pull request #20129 from whiteinge/events-token-regression-fix 
Fix regression with token handling in the /events URL
 2015-01-28 14:52:23 -07:00
Thomas S Hatch
89d47feb04 Merge pull request #20118 from kitsemets/fix-unless-in-cmd-state 
salt.states.cmd: fixed 'unless' behaviour in case of multiple commands are given
 2015-01-28 14:49:26 -07:00
Thomas S Hatch
54c472bf3a Merge pull request #20099 from matyunin/develop 
Code block start comment typo
 2015-01-28 14:47:29 -07:00
Nicole Thomas
545b5f3ff4 Merge pull request #20160 from rallytime/fifteen_pylint 
Pylint fix for 2015.2
 2015-01-28 14:46:50 -07:00
rallytime
bd4322360a Moar pylint 2015-01-28 14:46:28 -07:00
Thomas S Hatch
9466dc25f3 lint 2015-01-28 14:41:26 -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
Thomas S Hatch
f71714f212 Merge pull request #19729 from jacksontj/develop 
Runner compatibility
 2015-01-28 14:29:42 -07:00
rallytime
f874d8bbba Pylint fixes 2015-01-28 14:25:49 -07:00
Mike Place
b4c5b4fc94 Init default args/kwargs if none are supplied in netap 2015-01-28 14:10:15 -07:00
rallytime
e8144f57eb Pylint fix for 2015.2 2015-01-28 14:07:17 -07:00
Mike Place
7c066c38a0 Increae default runner timeout to 60s 2015-01-28 13:56:41 -07:00
Colton Myers
d912a845df Merge pull request #20075 from basepi/compound20074 
Finish out the matcher_args for compound matcher, Fixes #20074
 2015-01-28 13:49:53 -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
Jeremy Rosenbaum
5ba815e37f Allow relative paths for --config_dir with daemonized minions 2015-01-28 13:40:54 -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