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
36,051 Commits 24 Branches 182 Tags 341 MiB
c3d0d99721
Commit Graph

36051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
btibi
c3d0d99721 syslog_ng: use default False value when checking for __opts__['test'] 2014-08-30 11:11:51 +02:00
btibi
e47c18203c syslog_ng: remove unused pdb import 2014-08-30 11:11:26 +02:00
btibi
46b905f056 syslog_ng: add docstrings and examples 2014-08-29 23:43:36 +02:00
btibi
69b0deacf6 syslog_ng: add syslog-ng state and execution modules 2014-08-29 23:20:25 +02:00
Mike Place
a11a14f3dc Merge pull request #15387 from terminalmage/docs 
Clarify salt-minion restart example in FAQ
 2014-08-29 11:21:36 -06:00
Erik Johnson
aae0b3dcef Clarify salt-minion restart example in FAQ 2014-08-29 12:17:06 -05:00
Colton Myers
704180fd43 Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/cloud.py
 2014-08-28 12:18:07 -06:00
Colton Myers
ea4d44ce5d Merge pull request #15359 from cachedout/fix_15346 
Catch msgpack error
 2014-08-28 12:11:37 -06:00
Nicole Thomas
44c1517191 Merge pull request #15358 from s0undt3ch/hotfix/salt-cloud-regression 
Allow the test for an existing directory to fail
 2014-08-28 11:57:48 -06:00
Mike Place
c018c8df7a Catch msgpack error 2014-08-28 11:31:17 -06:00
Arseniy Pavlenko
0c8fdf7234 Allow the test for an existing directory to fail 2014-08-28 18:23:56 +01:00
Pedro Algarvio
ab67c2fb4b Merge pull request #15355 from saltstack/revert-15335-fix_cloud_regression 
Revert "Fix salt-cloud regression"
 2014-08-28 18:01:21 +01:00
Nicole Thomas
db8126498a Revert "Fix salt-cloud regression" 2014-08-28 09:25:24 -06:00
Joseph Hall
4ef7144ba3 Merge pull request #15335 from rallytime/fix_cloud_regression 
Fix salt-cloud regression
 2014-08-28 07:47:04 -06:00
Joseph Hall
8a9c338690 Merge pull request #15340 from gtmanfred/nova-agent-fix 
clean up the last of extension stuff in novaclient
 2014-08-28 07:00:21 -06:00
Joseph Hall
24e0e701f7 Merge pull request #15341 from gtmanfred/ssh-agent 
Ssh agent
 2014-08-28 06:59:41 -06:00
Daniel Wallace
14d45a25d2 document ssh_agent 2014-08-27 21:40:05 -05:00
Daniel Wallace
b9f0660a8a use ssh_agent 
If ssh_agent is True, and the SSH_AUTH_SOCK is a socket and exists, use
ssh_agent and you don't have to specify a keyfile or password.
 2014-08-27 21:40:05 -05:00
Daniel Wallace
89fda79d2e clean up the last of extension stuff in novaclient 2014-08-27 21:39:38 -05:00
rallytime
26d7404b66 Fix salt-cloud regression 2014-08-27 17:36:14 -06: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
55422ccc42 Merge pull request #15303 from whiteinge/fix-wheelclient-auth-tests 
Fix failing integration tests for the wheel client
 2014-08-27 15:50:25 -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
Colton Myers
206901bc2d Merge pull request #15318 from basepi/bp-15313 
Backport #15313 to 2014.7
 2014-08-27 15:13:42 -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
Pedro Algarvio
2efe247764 Merge pull request #15323 from terminalmage/fix-arch-pkg-test 
Remove reference to nonexistant function in pkg tests
 2014-08-27 20:52:58 +01:00
Colton Myers
af66fc207c Merge pull request #15315 from basepi/bp-15089 
Backport #15089 to 2014.7
 2014-08-27 13:37:20 -06:00
Thomas S Hatch
ce1f7bd0bb Merge pull request #15270 from cachedout/reauth 
Reduce missing returns during reauth
 2014-08-27 13:26:09 -06:00
Erik Johnson
ff6a228746 Remove reference to nonexistant function in pkg tests 
This fixes a ref that was missed in 7984a8c.
 2014-08-27 13:52:36 -05:00
Thomas S Hatch
2bf5412b6d Catch lxc failures and run without the new restart majic 2014-08-27 11:21:21 -06:00
Pedro Algarvio
2625b24d37 Merge pull request #15317 from rallytime/enable_wheel_tests 
Enable wheel integration tests in runtests.py
 2014-08-27 18:15:15 +01:00
Thomas S Hatch
9b57aa1473 Set the route dst in the api maste_call interface 2014-08-27 11:14:34 -06:00
Mike Place
17f8284fda Fix exception inside lxc 2014-08-27 11:07:58 -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
rallytime
e1dde7c574 Enable wheel integration tests in runtests.py 2014-08-27 09:34:44 -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