valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,542 Commits 24 Branches 182 Tags 341 MiB
8466aa47d4
Commit Graph

10542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
8466aa47d4 Merge pull request #3635 from gthb/debian_service.enable-fix-failure-on-manual-init-scripts 
insserv before update-rc.d enable, on Debian 6+
 2013-02-07 10:05:10 -08:00
Gunnlaugur Þór Briem
d588127c61 insserv before update-rc.d enable, on Debian 6+ 
The `update-rc.d enable` fails if the init.d script is installed
manually by another salt state, because `update-rc.d enable` works only
on existing runlevel links. Running `insserv` first fixes that.

(I'm not entirely sure whether this is the correct fix. Possibly this is
out of scope for `debian_service.enable` and belongs in a separate
`debian_service.install` or somesuch, which the `service.managed` state
should call before calling `enable`. And possibly there should be
corresponding install-service support for Debian systems where
[DependencyBasedBoot] is not enabled. It is the default in Squeeze
upwards though.)

[DependencyBasedBoot]: http://wiki.debian.org/LSBInitScripts/DependencyBasedBoot
 2013-02-07 17:44:50 +00:00
Thomas S Hatch
fab5f79a59 Merge pull request #3634 from gthb/mod_repo.fix-architectures-crash 
Fix mod_repo crash on SourceEntry.architectures
 2013-02-07 09:29:29 -08:00
Gunnlaugur Þór Briem
c65cad4b0d Fix mod_repo crash on SourceEntry.architectures 
Fix failure when source entry object does not have the `architectures`
attribute; this attribute is tacked on if present in `kwargs`, but does
not exist on the SourceEntry class originally, and so mod_repo was
failing when `architectures` was not supplied.
 2013-02-07 17:16:44 +00:00
Thomas S Hatch
e7f610eae0 Merge pull request #3630 from gthb/git.managed-support-bare-and-mirror 
Support bare/mirror in git.managed state
 2013-02-07 07:51:31 -08:00
Thomas S Hatch
738d702520 Merge pull request #3631 from gthb/patch-1 
Fix obvious typo lurker (architecturess)
 2013-02-07 07:48:43 -08:00
Gunnlaugur Þór Briem
3730c96420 Support bare/mirror in git.managed state 2013-02-07 15:23:47 +00:00
Gunnlaugur Thor Briem
4386ae6473 Fix obvious typo lurker (architecturess) 2013-02-07 14:45:42 +00:00
Thomas S Hatch
fa8042dd53 Merge pull request #3627 from baijum/missing_import 
Added missing import
 2013-02-06 22:07:20 -08:00
Thomas S Hatch
a3af66780e Merge pull request #3626 from baijum/pkgng 
initialize variable -- avoid NameError
 2013-02-06 22:05:20 -08:00
Thomas S Hatch
cb307aa891 Merge pull request #3624 from l2ol33rt/develop 
Added Service support for Oracle Enterprise Linux
 2013-02-06 22:02:33 -08:00
Baiju Muthukadan
3951e720c2 Added missing import (salt.utils) 2013-02-07 09:40:09 +05:30
Baiju Muthukadan
5b1f8b6bd9 Added missing import (sys) 2013-02-07 09:37:20 +05:30
Baiju Muthukadan
d539d2afe8 Added missing import 2013-02-07 09:33:07 +05:30
Baiju Muthukadan
c618fd1db6 initialize variable -- avoid NameError 2013-02-07 09:10:30 +05:30
Robert Hernandez
37b1b7320c Added Service support for Oracle Enterprise Linux 2013-02-06 17:28:05 -08:00
Thomas S Hatch
2df4f3f231 Clean up the reactor proc 2013-02-06 14:43:02 -07:00
Thomas S Hatch
f81f4e7b79 The event handler was being created too soon 
This should cause a complete deadlock in the master and I am
stumped why it has not!
 2013-02-06 14:01:14 -07:00
Thomas S Hatch
3561118498 Some double quote death 2013-02-06 13:40:32 -07:00
Thomas S Hatch
9d19f60008 Version is not an option to the pip.present! Fix #3356 
Yes, we need to get explicit version support into this
 2013-02-06 13:22:29 -07:00
Thomas S Hatch
f513e3cbf0 Fix #3620 2013-02-06 13:19:18 -07:00
Thomas S Hatch
4ec6722103 revert cmd_yaml change that broke basic functionality 2013-02-06 13:03:34 -07:00
Thomas S Hatch
47e08fc4fa Remove failing test, I am not sure how it ever passed... 2013-02-06 12:48:33 -07:00
Thomas S Hatch
5faf423296 Merge pull request #3622 from techhat/iptables 
Merging in changes from #3594
 2013-02-06 11:09:56 -08:00
Joseph Hall
178a4a94af Merging in changes from #3594 2013-02-06 12:06:09 -07:00
Thomas S Hatch
24147d5d46 Merge pull request #3621 from ydavid365/patch-5 
hacking on osx. a few typos. more 1st person nuke.
 2013-02-06 11:03:58 -08:00
John Albietz
733a5b9825 hacking on osx. a few typos. more 1st person nuke. 
removed more of the first-person stuff. referred to the new osx docs for specific info.
 2013-02-06 10:37:20 -08:00
Thomas S Hatch
29ef77adf0 Merge pull request #3619 from ydavid365/patch-5 
corrected text formatting... rhel instructions.
 2013-02-06 09:52:52 -08:00
John Albietz
f8ce121a27 restructured text formatting... 
fixed invalid formatting.
 2013-02-06 09:51:16 -08:00
Thomas S Hatch
f0a79c1fff Merge pull request #3617 from giantlock/develop 
fix bug: mod_watch restart service in test mode
 2013-02-06 08:59:57 -08:00
Thomas S Hatch
34df148a37 Merge pull request #3616 from holmboe/patch-1 
Update Contributing.rst
 2013-02-06 08:56:55 -08:00
Thomas S Hatch
3c7b76e53f Merge pull request #3614 from holmboe/fix-selection-in-sysmod 
Allow matching of the sys module without also matching sysctl
 2013-02-06 08:56:04 -08:00
Thomas S Hatch
bd598bb1d0 Merge pull request #3613 from agjohnson/bug-2037-jinja-doc 
Add Jinja docs and examples
 2013-02-06 08:50:06 -08:00
Thomas S Hatch
da9a5ec69c Merge pull request #3611 from saltstack/fix_network 
Fix network.interfaces. use WMI not shell out
 2013-02-06 08:46:26 -08:00
Thomas S Hatch
59c4fdaf39 Merge pull request #3610 from s0undt3ch/develop 
Fix test case and skip message.
 2013-02-06 08:45:42 -08:00
Thomas S Hatch
5429a3215d Merge pull request #3609 from s0undt3ch/issues/3607 
Fix undefined name + PEP8. Fixes #3607.
 2013-02-06 08:44:59 -08:00
Thomas S Hatch
5f0fc3a230 Merge pull request #3608 from s0undt3ch/issues/2587 
Provide the information of git describe in a module when installing salt
 2013-02-06 08:43:21 -08:00
Denis Generalov
2099ad7fda fix bug: mod_watch restart service in test mode 
fix pep8
 2013-02-06 18:09:12 +04:00
holmboe
fadeb83044 Update Contributing.rst 
Fix path to http://docs.saltstack.org/en/latest/topics/community.html#sending-a-github-pull-request
 2013-02-06 13:50:52 +01:00
Henrik Holmboe
03d264b440 Allow matching of the sys module without also matching sysctl. 
Also specifying "sys." (ending dot) will work correctly.
 2013-02-06 11:24:18 +01:00
Anthony Johnson
73cfc00839 Add Jinja docs and examples 
* Adds if, for, macro, and import examples to salt.renderers.jinja
 2013-02-06 01:44:47 -08:00
Thomas S Hatch
737ecf53de Merge pull request #3612 from baijum/doc 
pillar can be used to store sensitive data
 2013-02-05 21:53:12 -08:00
Pedro Algarvio
e7b253906a Fix syntax error, arg after kwarg. 2013-02-06 05:45:30 +00:00
Baiju Muthukadan
ae1aa5a578 pillar can be used to store sensitive data 2013-02-06 11:02:14 +05:30
Pedro Algarvio
aa721e89cf Fix integration.shell.call.CallTest.test_default_output. 2013-02-06 05:13:39 +00:00
Pedro Algarvio
df2ac900c3 Fix pydsl unittest skip message + PEP8. 2013-02-06 05:10:47 +00:00
Pedro Algarvio
f43b21516a Fix salt version unittest. 2013-02-06 04:59:26 +00:00
Pedro Algarvio
8193a00900 Fix undefined name + PEP8. Fixes #3607. 2013-02-06 04:44:38 +00:00
David Boucha
3c8e996fba Merge pull request #3606 from techhat/iptables 
Fixing incorrect positional parameters
 2013-02-05 20:36:50 -08:00
Pedro Algarvio
5730b0bf42 Generate salt._version when installing so we can have the git describe information. Fixes #2587. 2013-02-06 04:23:56 +00:00