valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,960 Commits 24 Branches 182 Tags 341 MiB
013453ef1f
Commit Graph

35960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
013453ef1f Merge pull request #15301 from cachedout/pillar_merge 
Docs on merging pillar keys
 2014-08-26 17:18:35 -06:00
Seth House
637d8b52fa Merge pull request #15294 from kellya/develop 
Added some very basic information about actually writing grains in the
 2014-08-26 17:11:54 -06:00
Mike Place
65f232e066 Docs on merging pillar keys 
Refs #14916
 2014-08-26 15:48:51 -06:00
Alex Kelly
1a943480e9 Added some very basic information about actually writing grains in the 
"writiing grains" section
 2014-08-26 16:45:31 -04:00
Colton Myers
17c67fd068 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/file.py
	salt/states/boto_cloudwatch_alarm.py
 2014-08-26 14:21:54 -06:00
Colton Myers
25648e5519 Merge pull request #15262 from saltstack/bp-15165 
Backport #15165 to 2014.7
 2014-08-26 14:08:31 -06:00
Colton Myers
b0f10e1d44 Merge pull request #15243 from saltstack/bp-14839 
Backport #14839 to 2014.7
 2014-08-26 14:07:33 -06:00
Colton Myers
82931076ed Add CLI example to convert_to_arn 2014-08-26 14:06:54 -06:00
Colton Myers
ad668d4da0 Merge pull request #15291 from basepi/botoarnexample 
Fix CLI example for convert_to_arn
 2014-08-26 14:05:34 -06:00
Colton Myers
7064ce944c Fix CLI example for convert_to_arn 2014-08-26 14:05:01 -06:00
Colton Myers
e5ef6f9574 Merge pull request #15264 from saltstack/bp-15206 
Backport #15206 to 2014.7
 2014-08-26 13:58:17 -06:00
Colton Myers
4e5082c75e Merge pull request #15263 from saltstack/bp-15179 
Backport #15179 to 2014.7
 2014-08-26 13:58:05 -06:00
Colton Myers
62919c096d Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/gem.py
	salt/modules/lxc.py
	salt/states/boto_elb.py
	salt/states/gem.py
	tests/unit/states/gem_test.py
 2014-08-26 13:35:01 -06:00
Colton Myers
bbc5ec1f98 Merge pull request #15241 from saltstack/bp-14552 
Backport #14552 to 2014.7
 2014-08-26 13:31:39 -06:00
Colton Myers
112acd7f58 Merge pull request #15253 from saltstack/bp-15029 
Backport #15029 to 2014.7
 2014-08-26 13:31:25 -06:00
Thomas S Hatch
9feb62718a Merge pull request #15284 from ajacoutot/obsd-useradd 
useradd: fix OpenBSD support
 2014-08-26 13:29:39 -06:00
Thomas S Hatch
edcea17892 Merge pull request #15283 from ajacoutot/obsd-sysctl 
Implement the sysctl state on OpenBSD.
 2014-08-26 13:29:30 -06:00
Thomas S Hatch
fa56c9166b Merge pull request #15276 from hvnsweeting/fix-file-diff 
bugfix: only create dict key if value is not empty
 2014-08-26 13:29:20 -06:00
Thomas S Hatch
e385b15e56 Merge pull request #15273 from rallytime/list_profiles 
Add --list-profiles to salt-cloud query options
 2014-08-26 13:29:05 -06:00
Thomas S Hatch
eaf0a39c22 Merge pull request #15272 from dmick/fix-15269 
salt/utils/process.py: fix order of args to os.kill()
 2014-08-26 13:28:55 -06:00
Thomas S Hatch
b377f433dc Merge pull request #15258 from saltstack/bp-15070 
Backport #15070 to 2014.7
 2014-08-26 13:28:50 -06:00
Thomas S Hatch
5595b10661 Merge pull request #15254 from saltstack/bp-15030 
Backport #15030 to 2014.7
 2014-08-26 13:28:46 -06:00
Thomas S Hatch
4fb2ebdb6b Merge pull request #15245 from saltstack/bp-14851 
Backport #14851 to 2014.7
 2014-08-26 13:28:40 -06:00
Pedro Algarvio
5ffffc66f2 Merge pull request #15288 from nmadhok/spelling 
Fixing typo
 2014-08-26 19:20:39 +01:00
Nitin Madhok
913057254d Fixing typo 2014-08-26 13:30:06 -04:00
Thomas S Hatch
f285b41707 Merge pull request #15247 from saltstack/bp-14882 
Backport #14882 to 2014.7
 2014-08-26 11:04:10 -06:00
rallytime
d90c409a29 Don't allow --list-providers to be passed in as arg for --list-profiles 2014-08-26 10:20:52 -06:00
Thomas S Hatch
8a34808d18 Merge pull request #15261 from saltstack/bp-15141 
Forward-port #15141 to 2014.7
 2014-08-26 10:18:24 -06:00
Thomas S Hatch
94894f5a6b Merge pull request #15259 from saltstack/bp-15073 
Backport #15073 to 2014.7
 2014-08-26 10:17:45 -06:00
Thomas S Hatch
2d5ab44ebe Merge pull request #15256 from saltstack/bp-15060 
Backport #15060 to 2014.7
 2014-08-26 10:17:22 -06:00
Thomas S Hatch
2652eadc95 Merge pull request #15255 from saltstack/bp-15045 
Backport #15045 to 2014.7
 2014-08-26 10:15:51 -06:00
Thomas S Hatch
d49f46786e Merge pull request #15250 from saltstack/bp-14975 
Backport #14975 to 2014.7
 2014-08-26 10:11:07 -06:00
Thomas S Hatch
10e433bd7c Merge pull request #15249 from saltstack/bp-14913 
Backport #14913 to 2014.7
 2014-08-26 10:10:15 -06:00
Antoine Jacoutot
780a17cea0 useradd: fix OpenBSD support 
OpenBSD useradd(8) command sligtly differ from Linux.
/etc/login.defs is used instead of /etc/login.defs, some options are
unsupported and some usermod switches are different.
 2014-08-26 18:10:05 +02:00
Antoine Jacoutot
c71270f232 Implement the sysctl state on OpenBSD. 2014-08-26 18:08:57 +02:00
Thomas S Hatch
9e4905d961 Merge pull request #15267 from thatch45/develop 
Fix missed lint issue in openbsdrcctrl
 2014-08-26 09:55:14 -06:00
Colton Myers
d50fdcb456 Merge pull request #15280 from techhat/issue15277 
Move set-mark after iptables jump
 2014-08-26 09:54:12 -06:00
Thomas S Hatch
1dff0bb59a Merge pull request #13716 from terminalmage/custom-delimiter 
RFC: Support for custom delimiter in target expressions
 2014-08-26 09:39:34 -06:00
Mike Place
8d50448e85 Merge pull request #15282 from cachedout/bsd_lint 
Lint fix
 2014-08-26 09:01:01 -06:00
Mike Place
6c000c0148 Lint fix 2014-08-26 09:00:20 -06:00
Thomas S Hatch
1eed866299 Merge pull request #15248 from saltstack/bp-14887 
Backport #14887 to 2014.7
 2014-08-26 08:59:47 -06:00
Thomas S Hatch
72197e1a3b Merge pull request #15246 from saltstack/bp-14861 
Backport #14861 to 2014.7
 2014-08-26 08:58:18 -06:00
Thomas S Hatch
1e6456dbcc Merge pull request #15244 from saltstack/bp-14845 
Backport #14845 to 2014.7
 2014-08-26 08:56:27 -06:00
Thomas S Hatch
f6d98539df Merge pull request #15242 from saltstack/bp-14781 
Backport #14781 to 2014.7
 2014-08-26 08:52:43 -06:00
Joseph Hall
17aa1f9049 Move set-mark after iptables jump 2014-08-26 08:21:06 -06:00
rallytime
cfcfb4bdac Change --list-profiles to accept an argument such as "linode" or "all" 2014-08-26 08:03:39 -06:00
Hung Nguyen Viet
81ee03b12a bugfix: only create dict key if value is not empty 2014-08-26 15:56:43 +07:00
rallytime
0f4f68eddf Add --list-providers and --list-profiles to cloud docs 2014-08-26 00:18:57 -06:00
rallytime
2e6529c9f7 Remove unused function 2014-08-26 00:01:54 -06:00
Erik Johnson
2059bfd356 Move --delimiter option to its own option group 2014-08-25 20:58:07 -05:00