valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,972 Commits 24 Branches 182 Tags 341 MiB
0049a64d7a
Commit Graph

35972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antoine Jacoutot
0049a64d7a Implement password aging info for all BSDs. 2014-08-27 09:43:11 +02:00
Seth House
c40cdcf803 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-26 19:21:07 -06:00
Seth House
7f9086459c Merge pull request #15299 from terminalmage/update-release-notes-2014.7 
Normalize the 2014.7.0 release notes
 2014-08-26 19:05:21 -06:00
Seth House
e1b39609c5 Merge pull request #15298 from terminalmage/update-release-notes 
Normalize the 2014.7.0 release notes
 2014-08-26 19:04:54 -06:00
Seth House
d0964f6e2d Merge pull request #15302 from s0undt3ch/hotfix/transifex-updates 
Hotfix/transifex updates
 2014-08-26 19:04:26 -06:00
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
Pedro Algarvio
19f7ef1a3a Update 'doc/.tx/config' - Build #152 
http://cookingwithsalt.org/job/salt/job/transifex/152/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-08-27 00:02:36 +01:00
Erik Johnson
35c9f40c5d fix bullet list 2014-08-26 17:58:32 -05:00
Erik Johnson
3388256da7 fix bullet list 2014-08-26 17:57:20 -05:00
Seth House
ab8d4cb3dc Merge pull request #15300 from whiteinge/salt-json-line-out 
Documented JSON outputter config options and fixed 'null' case
 2014-08-26 16:14:44 -06:00
Seth House
6c8d7d5456 Documented JSON outputter config options and fixed 'null' case 2014-08-26 16:11:51 -06:00
Erik Johnson
21d16a87fd Normalize the 2014.7.0 release notes 
Some parts of the release notes only existed in develop, some only in
2014.7. This commit normalizes develop's copy, as well as fixing some
formatting issues (chiefly among them replacing the use of markdown with
rST).
 2014-08-26 17:08:19 -05:00
Erik Johnson
4597487f2f Normalize the 2014.7.0 release notes 
Some parts of the release notes only existed in develop, some only in
2014.7. This commit normalizes 2014.7's copy.
 2014-08-26 17:06:14 -05: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