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

36027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Chen
c3d86fe44c also update other linode config doc 2014-08-27 23:27:52 -04:00
Jon Chen
f29fd0340e s/ssh_private_key/ssh_key_file 2014-08-27 23:25:08 -04:00
Jon Chen
33ddb0d451 document new ssh_private_key config value 2014-08-27 23:13:00 -04:00
Jon Chen
9eebbeeda6 remove extraneous )) 2014-08-27 23:09:43 -04:00
Jon Chen
27686af6f0 fix missing ) 2014-08-27 23:09:15 -04:00
Jon Chen
051f644519 add get_priv_key_filename() 2014-08-27 23:04:02 -04:00
Jon Chen
86a2808b34 document possibility of ssh_pubkey 2014-08-27 20:14:24 -04:00
Jon Chen
b79e73d613 fix missing newlines 2014-08-27 20:12:44 -04:00
Jon Chen
95325d865c init pubkey support for linode 2014-08-27 20:04:30 -04:00
Thomas S Hatch
8c5b3c3e83 Merge pull request #15287 from megaclite/patch-1 
Update to dockerio.import_image()
 2014-08-27 16:22:42 -06:00
Thomas S Hatch
0868b3c82b Merge pull request #15266 from thatch45/felskrone-add_fs_cache 
Merge #15230 with fixes
 2014-08-27 15:55:39 -06:00
Thomas S Hatch
4d8d8d2a8c Merge pull request #15293 from hulu/json-loads 
modules.boto_cloudwatch.create_or_update_alarm: use correct json func
 2014-08-27 15:54:52 -06:00
Thomas S Hatch
7f302190eb Merge pull request #15328 from thatch45/ajacoutot-obsd-groupadd 
Ajacoutot obsd groupadd
 2014-08-27 15:46:57 -06:00
Thomas S Hatch
b026f4956a fix lint errors 2014-08-27 15:46:26 -06:00
Thomas S Hatch
80c92842f6 Merge branch 'obsd-groupadd' of https://github.com/ajacoutot/salt into ajacoutot-obsd-groupadd 2014-08-27 15:45:36 -06:00
Thomas S Hatch
583bb97af3 Merge pull request #15319 from thatch45/lxc_start_fix 
Catch lxc failures and run without the new restart majic
 2014-08-27 15:44:06 -06:00
Thomas S Hatch
9d707f1dea Merge pull request #15326 from rfairburn/ec2_cloud_docs 
Specify the version that interface properties were added in doc/topics/cloud/aws.rst
 2014-08-27 15:14:33 -06:00
Thomas S Hatch
f61e925590 Merge pull request #15314 from steverweber/slspath_fix 
add slscolonpath
 2014-08-27 15:13:16 -06:00
Thomas S Hatch
2e4318132e Merge pull request #15306 from ajacoutot/obsd-bsd_shadow 
Implement password aging info for all BSDs.
 2014-08-27 15:12:30 -06:00
Thomas S Hatch
12903b4426 Merge pull request #15304 from rallytime/list_profiles_fix 
Make --list-profiles argument more inclusive
 2014-08-27 15:01:31 -06:00
Robert Fairburn
235695ee19 Specify the version that interface properties were added in doc/topics/cloud/aws.rst 2014-08-27 14:02:01 -06:00
Thomas S Hatch
6acb6c8483 Merge pull request #15310 from rominf/fish-completion 
Add fish shell completions for salt programs
 2014-08-27 13:56:05 -06:00
Thomas S Hatch
2bf5412b6d Catch lxc failures and run without the new restart majic 2014-08-27 11:21:21 -06:00
Thomas S Hatch
8228b64fdc Merge pull request #15313 from thatch45/runner_sreq_fix 
Set the route dst in the api maste_call interface
 2014-08-27 10:32:01 -06:00
Steve Weber
ee092de94c add slscolonpath 
added slscolonpath because this is helpfull in formulas as a shortcut to:
```
{% set vars = salt['pillar.get'](slsdotpath.replace('.',':'), default=vars, merge=True) %}
```
 2014-08-27 12:30:47 -04:00
Thomas S Hatch
21e7c62212 Set the route dst in the api maste_call interface 2014-08-27 10:00:21 -06:00
Roman Inflianskas
4fc7b4b1e4 add fish shell completions for salt programs 2014-08-27 18:59:15 +04:00
Joseph Hall
1fb0092d9d Merge pull request #15305 from ajacoutot/obsd-disk 
disk: /etc/mtab is only used on Linux.
 2014-08-27 06:22:22 -06:00
Antoine Jacoutot
abae84e9f8 groupadd: fix and implement missing functions for OpenBSD 
gpasswd is only available on Linux and groupadd(8) does not support `-r'
on OpenBSD.
Add OpenBSD support for deluser() and memebers().
 2014-08-27 12:23:20 +02:00
Antoine Jacoutot
0049a64d7a Implement password aging info for all BSDs. 2014-08-27 09:43:11 +02:00
Antoine Jacoutot
015fc51214 disk: /etc/mtab is only used on Linux. 2014-08-27 09:02:13 +02:00
rallytime
72dfa01e9e Pass in user-defined or salt-cloud profile name to --list-profiles 2014-08-26 19:32:21 -06:00
Seth House
c40cdcf803 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-26 19:21:07 -06:00
rallytime
2bf14442fc Make --list-profiles argument more intuitive 2014-08-26 19:19:25 -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
Chris Rebert
b687921b60 modules.boto_cloudwatch.create_or_update_alarm: use correct json function 
Fixup to #14923
 2014-08-26 13:48:15 -07: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