valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,374 Commits 24 Branches 182 Tags 341 MiB
873ca1e0b1
Commit Graph

36374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Frank
066d054780 Merge branch 'develop' of https://github.com/saltstack/salt into feature-ext_pillar-file_tree-nodegroups 2014-09-02 12:32:35 -04:00
Thomas S Hatch
af6f374db5 Merge pull request #15412 from ajacoutot/obsd-shadow-exp 
bsd_shadow: implement account and password expiration
 2014-09-02 09:46:26 -06:00
Thomas S Hatch
795ab71617 Merge pull request #15408 from sylphid8/target_pillar_from_ext_pillar 
add ability to target pillar from ext pillar
 2014-09-02 09:45:46 -06:00
Thomas S Hatch
4b828176f9 Merge pull request #15404 from rallytime/cloud_nightly_tests 
First pass at allowing jenkins.py to only run cloud tests
 2014-09-02 09:41:25 -06:00
Thomas S Hatch
81857ea074 Merge pull request #15403 from ajacoutot/obsd-rcctl 
openbsd_rcctl: improve performance of available() and missing()
 2014-09-02 09:38:37 -06:00
Thomas S Hatch
dd0d496a30 Merge pull request #15394 from mkotzev/develop 
Modified `docker.absent` to remove the container after stopping it.
 2014-09-02 09:37:55 -06:00
Gareth J. Greenaway
b154eda71d Checkout that kwargs exists in clear_load before attempting to pull out a kwarg. 2014-09-02 08:17:17 -07:00
Gareth J. Greenaway
d05afd394e more lint fixes. 2014-09-02 08:17:17 -07:00
Gareth J. Greenaway
0cb6ebe4fd fixing lint issues. 2014-09-02 08:17:17 -07:00
Gareth J. Greenaway
ba354624e9 Adding an additional CLI argument, ret_config, which can be used to 
override configuration options passed to the returner.

Adding support for ret_config to all returners.

Adding _get_options to all returners that use configurable options.

Adding return_config support to the scheduler and scheduler related management module & state.
 2014-09-02 08:17:17 -07:00
Thomas S Hatch
e7df337b55 Merge pull request #15385 from ajacoutot/obsd-loginclass 
Implement user login class on OpenBSD.
 2014-09-02 08:53:04 -06:00
Thomas S Hatch
0d052da221 Merge pull request #15382 from felskrone/minions_connected_cache 
Minions connected cache
 2014-09-02 08:52:02 -06:00
Thomas S Hatch
8ff839d1d6 Merge pull request #15364 from terminalmage/fix-zmq-warning-2014.7 
Fix ZMQ warning (2014.7 branch)
 2014-09-02 08:45:03 -06:00
Thomas S Hatch
118e884253 Merge pull request #15362 from hulu/cache-tests 
caches.fs{cache,worker}: put main code into funcs to avoid shadowing
 2014-09-02 08:44:01 -06:00
Thomas S Hatch
b438e60469 Merge pull request #15339 from whiteinge/doc-back-ports 
Added instructions on how to back-port fixes to release branches
 2014-09-02 08:36:13 -06:00
Thomas S Hatch
2c3d2bbbed Merge pull request #15332 from cachedout/cmmod_squelch_warning 
Turn down warning.
 2014-09-02 08:35:39 -06:00
Thomas S Hatch
b2023c918e Merge pull request #15330 from cachedout/mine_args 
Fix missing args issue in mine.send
 2014-09-02 08:34:59 -06:00
Thomas S Hatch
f521979da6 Merge pull request #15327 from s0undt3ch/2014.7 
Fix esky builds when using setuptools
 2014-09-02 08:34:35 -06:00
Joseph Hall
e28468d930 Merge pull request #15342 from fly/li-pubkey 
add support for ssh pubkey deployments using Linode
 2014-09-02 08:30:52 -06:00
Joseph Hall
1191c8180d Merge pull request #15429 from southquist/debian-osfinger-grain 
set the osfinger grain for Debian
 2014-09-02 08:30:06 -06:00
Joseph Hall
309bd3d02e Merge pull request #15413 from Jille/2014.7-fix-text 
Small fixes in the comments in conf/minion
 2014-09-02 08:29:25 -06:00
Joseph Hall
cd29e59829 Merge pull request #15427 from ajacoutot/obsd-timezone 
timezone: fix get_zone() on BSDs
 2014-09-02 08:28:33 -06:00
Antoine Jacoutot
e7c210e4cf network: fix mod_hostname() and arp() to work on OpenBSD. 
arp(8) output has recently changed on OpenBSD and the hostname
is set under /etc/myname.
 2014-09-02 15:57:14 +02:00
Antoine Jacoutot
a8aebf37da Use lscript() instead of replace(). 2014-09-02 15:29:14 +02:00
Antoine Jacoutot
8e7f0e5bf1 Use strip() instead of replace(). 2014-09-02 15:28:11 +02:00
Sebastian Soderqvist
11741aac62 set the osfinger grain for Debian 2014-09-02 13:47:46 +02:00
Jille Timmermans
4064a8cf4c Fix some documentation inconsistencies 2014-09-02 11:38:23 +02:00
Antoine Jacoutot
191dfeac1d timezone: fix get_zone() on BSDs 2014-09-02 11:12:47 +02:00
Antoine Jacoutot
146b5463ea postgres: fix default "runas" value on OpenBSD 2014-09-02 10:38:59 +02:00
Erik Johnson
892a78ea1c Double-backticks for formatting consistency 2014-09-01 15:07:03 -05:00
Erik Johnson
036e1cbeb7 Merge pull request #15414 from Jille/fix-docs 
Small documentation fix in pillars
 2014-09-01 15:01:27 -05:00
Erik Johnson
2faf52d358 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-09-01 14:42:58 -05:00
Mike Place
de884cf7eb Use netstat on sunos. 
Fixes #14184
 2014-09-01 15:41:33 -04:00
Erik Johnson
6f3d381029 Merge pull request #15337 from eliasp/2014.7-grains.osmajorrelease 
Don't return multiple elements for grain 'osmajorrelease'.
 2014-09-01 14:23:45 -05:00
Erik Johnson
515fbd6e8b Merge pull request #15421 from simonschmidt/doc-refresh-pillar 
Fix saltutil.refresh_pillar reference in Pillar tutorial
 2014-09-01 14:19:52 -05:00
Simon Schmidt
f4c9ec24de Fix saltutil.refresh_pillar reference in Pillar tutorial 
It used to reference `saltutil.pillar_refresh` which gives the error:

    'saltutil.pillar_refresh' is not available.
 2014-09-01 20:38:50 +02:00
Nahum Shalman
df7736b530 SmartOS esky: fix odd problem with zeromq linking 2014-09-01 12:50:07 -04:00
Antoine Jacoutot
8ae7edcff0 mount: add support for OpenBSD 
Add support for missing functions that make sense on OpenBSD.
 2014-09-01 16:53:53 +02:00
Jille Timmermans
6de9cb9b3c Small fixes in the comments in conf/minion 2014-09-01 15:18:46 +02:00
Jille Timmermans
30bce1dafa Small documentation fix in pillars 2014-09-01 13:13:12 +02:00
Antoine Jacoutot
90c89fcfea bsd_shadow: implement account and password expiration 2014-09-01 12:01:14 +02:00
Pedro Algarvio
442ca77510 Merge pull request #15409 from nmadhok/patch-1 
Fixing sphinx errors and violations
 2014-09-01 09:06:09 +01:00
Pedro Algarvio
2268c00ab3 Merge pull request #15410 from nmadhok/develop 
Fix sphinx errors and violations
 2014-09-01 08:08:33 +01:00
Nitin Madhok
b526ee2aab Fixing more sphinx errors and violations 2014-09-01 02:44:27 -04:00
Nitin Madhok
938d8e90ee More sphinx errors and violations 2014-09-01 02:33:15 -04:00
Nitin Madhok
410d6488a6 Fixing sphinx errors and violations 2014-09-01 02:10:38 -04:00
Scott Coil
6770ce314e add ability to target pillar from ext pillar 2014-08-31 16:46:22 -05:00
Erik Johnson
170490482b lint fixes 2014-08-31 13:56:43 -05:00
ror6ax
6f1399281c resize2fs added & lvm excluded to another branch 2014-08-31 13:56:43 -05:00
ror6ax
1678d66350 lvresize initial commit 2014-08-31 13:56:43 -05:00