Commit Graph

10784 Commits

Author SHA1 Message Date
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
David Boucha
6bf6c720f0 Fix network.interfaces. use WMI not shell out 2013-02-06 04:21:12 +00:00
Pedro Algarvio
5022a1d48c Use an absolute import. 2013-02-06 03:56:47 +00:00
Joseph Hall
68a7191308 Fixing incorrect positional parameters 2013-02-05 20:14:37 -07:00
Thomas S Hatch
dd76691888 Merge pull request #3605 from baijum/doc
pillar is no more an experimental add on
2013-02-05 18:38:18 -08:00
Baiju Muthukadan
b135b88f6c pillar is no more an experimental add on 2013-02-06 07:37:46 +05:30
Pedro Algarvio
81f8f66547 Getting the additional version information should be a "one time" thing. 2013-02-06 00:27:07 +00:00
Thomas S Hatch
c054b208b1 Merge pull request #3604 from ydavid365/osx-install-updated
Osx install updated
2013-02-05 16:21:43 -08:00
ydavid365
462112464d removed first-person. added max_open_files directive. 2013-02-05 16:17:39 -08:00
Thomas S Hatch
d6968c9118 The backend code did not exist to make this easier before
But now this can be handled much more quickly, I expect that this
will be the solution for #3281 as well but I need @AlejandroTrev
to test since I don't have an AD enabled Linux server at my disposal!
2013-02-05 17:10:08 -07:00
Thomas S Hatch
34bc68d3a1 Merge pull request #3603 from ydavid365/rhel-fedora-install-docs
minion, not master.
2013-02-05 16:07:18 -08:00
ydavid365
a97ef17309 further instructions cleanup 2013-02-05 16:06:10 -08:00
ydavid365
291fbb5fe1 udpated osx instructions... 2013-02-05 15:54:22 -08:00
ydavid365
36a881a2ca minion, not master. 2013-02-05 15:44:13 -08:00
Thomas S Hatch
7ac5d5df9b Merge pull request #3591 from ydavid365/rhel-fedora-install-docs
split fedora and rhel documentation. updated index.
2013-02-05 15:25:12 -08:00
Thomas S Hatch
4c9ecfd674 Fix #3592 2013-02-05 15:54:56 -07:00
Thomas S Hatch
7a9b209e01 Merge pull request #3601 from techhat/iptables
Break the chain out from the rule
2013-02-05 14:24:22 -08:00
Thomas S Hatch
340066e51c Merge pull request #3600 from dahpgjgamgan/develop
additional info about building windows installer
2013-02-05 14:23:31 -08:00
Joseph Hall
e372a9a71d Break the chain out from the rule 2013-02-05 15:04:23 -07:00
Jan Duzinkiewicz
d53605b2a7 additional info about building windows installer 2013-02-05 23:00:10 +01:00
Thomas S Hatch
ce1f833a04 Merge pull request #3598 from giantlock/develop
Try to make some tests for sysctl module
2013-02-05 13:23:26 -08:00
Denis Generalov
9325ec7bba Try to make some tests for sysctl module 2013-02-06 00:57:53 +04:00
Jack Kuan
9bf7f72a43 Now calling a state(id declaration) at compile/render time executes it using salt['state.high']().
Also fixed a bug: Now we prevent the use of extend() after ordered execution was turned on once.
2013-02-05 14:50:40 -05:00
Thomas S Hatch
da942eada2 Merge pull request #3589 from Cerales/ipc_uri_error_reporting
Add a useful error message for IPC URI length failure
2013-02-05 11:49:35 -08:00
Cerales
a196b4119e Add a useful error message when the salt minion must exit because the
IPC URI is too long.

Using isinstance() is a bit messay, but I didn't want to step on the
toes of handling the KeyboardInterrupt.
2013-02-05 12:46:51 -07:00
Pedro Algarvio
6e5345d73c Import version info provided at install time. 2013-02-05 19:43:50 +00:00
Thomas S Hatch
3e093c2f2a Merge pull request #3595 from archtaku/quickfix
Fix "variable referenced before assignment" error
2013-02-05 10:46:27 -08:00