Commit Graph

29029 Commits

Author SHA1 Message Date
Erik Johnson
685b3a6b4f Fix traceback in docker.running state
This improves error reporting when invalidly-formatted input is
submitted from the docker.running state to the docker.start execution
fucntion.
2014-04-14 15:52:55 -05:00
Thomas S Hatch
2d7da41d62 Merge pull request #11921 from mtorromeo/systemd-units
Better handling of systemd parametrised and other special units not listed by list-unit-files.
2014-04-14 13:44:41 -06:00
Thomas S Hatch
244f4fddbf Merge pull request #11887 from makinacorpus/fl
Fix filelisting infinite loops
2014-04-14 13:40:53 -06:00
Mike Place
0c9f7eb356 Merge pull request #11983 from xenuser/fix_11961
Refs #11961: Add a short note regarding --show-timeout in the salt manpage
2014-04-14 13:15:10 -06:00
Valentin Hoebel
ff07ccac94 Refs #11961: Add a short note regarding --show-timeout in the salt manpage 2014-04-14 21:11:01 +02:00
Joseph Hall
d5a25a1814 Merge pull request #11982 from toumorokoshi/introspect
Adding introspection methods for yum and apt-get
2014-04-14 12:58:59 -06:00
Yusuke Tsutsumi
8e14e8b069 fixes for bugs that pylint found 2014-04-14 14:38:39 -04:00
Mike Place
c6653e33b1 Merge pull request #11981 from SeanZicari/11496_document_source_hash
Added short comment for source_hash
2014-04-14 12:12:34 -06:00
Yusuke Tsutsumi
f5b4ac2395 Adding introspection methods for yum and apt-get
* adding yumpkg:owner
* adding aptpkg:owner
* refactoring owner method to utils.pkg library
2014-04-14 14:05:43 -04:00
Sean Zicari
499bef4ee6 Added short comment for source_hash
I referenced the source_hash documentation in file.managed as well.

This is for https://github.com/saltstack/salt/issues/11496
2014-04-14 13:39:29 -04:00
Mike Place
fc37b13ac6 Merge pull request #11979 from terminalmage/docs
Be more explicit that pkgrepo states only work for APT/YUM
2014-04-14 10:23:17 -06:00
Erik Johnson
b898cedf52 Be more explicit that pkgrepo states only work for APT/YUM 2014-04-14 11:21:59 -05:00
Massimiliano Torromeo
9617d33927 Allow systemd parametrized services to be enabled by the service state.
This makes the systemd.get_all function return the combined output of
list-units and list-unit-files and the systemd.available function will
also check for the base unit name stripped of the user parameter
(e.g. dhcpcd@eth0 will be considered available if dhcpcd@.service exists)
2014-04-14 18:01:18 +02:00
Colton Myers
f3e283a771 Merge pull request #11974 from techhat/introspect
Add back in try/except for checking files
2014-04-14 08:47:23 -06:00
Joseph Hall
3cee1f9f79 Add back in try/except for checking files 2014-04-14 08:45:29 -06:00
Pedro Algarvio
eeea7b8b0e Merge pull request #11970 from techhat/introspect
Add Service Introspection
2014-04-14 15:02:39 +01:00
Joseph Hall
4fe87bf513 Merge pull request #11972 from s0undt3ch/hotfix/jenkins
Several Lint Fixes
2014-04-14 07:22:45 -06:00
Pedro Algarvio
6bb1fd5a9b Spaces not TABS!!! 2014-04-14 13:56:49 +01:00
Pedro Algarvio
75b5a1f86a Stop complaining PyLint 2014-04-14 13:55:41 +01:00
Pedro Algarvio
5918853b84 White space related lint fixes 2014-04-14 13:54:34 +01:00
Joseph Hall
ac28d1675d Try/Except block not needed here 2014-04-14 06:10:19 -06:00
Joseph Hall
df09d26724 Adding blank line for pylint 2014-04-14 05:23:07 -06:00
Joseph Hall
62fc1c90c2 Clarify docstring about dependencies 2014-04-14 05:13:25 -06:00
Pedro Algarvio
bdb40bdcf8 Merge pull request #11969 from holmboe/relnote-index
Update Release Notes index
2014-04-14 11:17:57 +01:00
Pedro Algarvio
ba96fbc159 Some sleeping between steps 2014-04-14 11:08:24 +01:00
Henrik Holmboe
2e67643a74 Update Release Notes index
http://salt.readthedocs.org/en/latest/topics/releases/ now points to
2014.1.1 as the latest release.
2014-04-14 10:14:25 +02:00
Joseph Hall
55ebfcb153 Adding missing import 2014-04-13 21:35:04 -06:00
Joseph Hall
29cbea2bee Highstate, not lowstate 2014-04-13 21:30:27 -06:00
Joseph Hall
e48690728e Dump service introspection as highstate data 2014-04-13 20:50:50 -06:00
Joseph Hall
b568877e42 Allow introspection of enabled services 2014-04-13 20:50:28 -06:00
Joseph Hall
78e1212554 Allow introspection of running services 2014-04-13 20:50:05 -06:00
Joseph Hall
1615090e24 Introspect information about a service from systemd 2014-04-13 20:45:04 -06:00
Joseph Hall
7db6be14fb Allow pacman to return the package that owns a file 2014-04-13 20:44:06 -06:00
Joseph Hall
bd51454c48 Add open_files function to file module 2014-04-13 20:43:06 -06:00
Pedro Algarvio
546dc2463d Only one forward slash 2014-04-13 23:32:27 +01:00
Joseph Hall
9074830783 Merge pull request #11959 from s0undt3ch/hotfix/doc-correction
Don't encourage bad `**kwargs` usage.
2014-04-13 10:19:39 -06:00
Pedro Algarvio
073bf3c971 Allow passing additional remote log file paths 2014-04-13 15:52:57 +01:00
Pedro Algarvio
2b2754d683 Don't encourage bad **kwargs usage. 2014-04-13 14:38:04 +01:00
Joseph Hall
5fa140844b Merge pull request #11950 from makinacorpus/ssh
fix: salt ssh args parsing
2014-04-13 06:28:38 -06:00
Joseph Hall
d8d1c2be68 Merge pull request #11951 from makinacorpus/lxc
cloud.lxc: autostart support
2014-04-13 06:27:51 -06:00
Joseph Hall
ff02cbdcb1 Merge pull request #11954 from allanparsons/develop
Added parameters to skip host checking when going through an ssh_gateway.
2014-04-13 06:25:49 -06:00
Pedro Algarvio
bb59d7a9db Don't let YAML split long lines 2014-04-13 13:17:12 +01:00
Pedro Algarvio
90ee9f4165 Merge pull request #11957 from s0undt3ch/hotfix/urllib3-import
Import the bundled packages in case of import errors.
2014-04-13 12:58:22 +01:00
Pedro Algarvio
e85bc09a63 Only check minion version if a specific commit is passed. 2014-04-13 12:49:00 +01:00
Pedro Algarvio
af12ce06b5 Don't fail badly at this stage if importing is not possible. 2014-04-13 12:42:24 +01:00
Pedro Algarvio
857078e68a Separate the salt and testing git URL and COMMIT values 2014-04-13 12:07:56 +01:00
Pedro Algarvio
5a42ca483c Allow bootstrapping a stable minion 2014-04-13 11:45:26 +01:00
Pedro Algarvio
7f8f1289a8 Import the bundled packages in case of import errors.
Refs #11931 and #11932.
2014-04-13 11:30:40 +01:00
Pedro Algarvio
91c0f90e1b Merge pull request #11956 from s0undt3ch/develop
Build pillar data while allowing extra pillar key/values
2014-04-13 11:10:27 +01:00
Pedro Algarvio
26570d5efc Build pillar data while allowing extra pillar key/values 2014-04-13 11:05:18 +01:00