Thomas S Hatch
932712afb9
Merge pull request #8808 from cachedout/#8702
...
Passing unix_socket into MySQL exec module.
2013-11-25 13:08:08 -08:00
Thomas S Hatch
a0f33a2979
Merge pull request #8798 from regilero/requisites-tests
...
Requisites tests
2013-11-25 13:07:23 -08:00
Thomas S Hatch
9c3685387f
Merge pull request #8794 from wunki/pw_user-chhome
...
BUGFIX: Argument order `pw usermod` command.
2013-11-25 12:52:04 -08:00
Thomas S Hatch
08be9bd47d
Merge pull request #8790 from miroswan/fixed-launchctl-module
...
Fixed launchctl module
2013-11-25 12:51:23 -08:00
Thomas S Hatch
a98ff22348
Merge pull request #8776 from ewdurbin/ip_addrs_by_cidr
...
Obtain IP addresses only in a specified CIDR from network.ip_addrs
2013-11-25 12:48:31 -08:00
Joseph Hall
c2c41f04ac
Merge pull request #8812 from cachedout/#8807
...
Don't silently fail if hgfs can't be loaded.
2013-11-25 12:14:56 -08:00
Mike Place
1244adcbea
Don't silently fail if hgfs can't be loaded.
...
Refs #8807 .
2013-11-25 13:09:21 -07:00
Mike Place
04a1e70944
Typo fix.
2013-11-25 10:33:24 -07:00
Thomas S Hatch
654ccdeb7b
Merge pull request #8806 from UtahDave/develop
...
Don't define __opts__ and __pillar__ in the module
2013-11-25 09:10:23 -08:00
Mike Place
5ccad65a70
Add more unix_socket support, this time to user_chpass.
2013-11-25 10:02:14 -07:00
David Boucha
9925d9eab4
Don't define __opts__ and __pillar__ in the module
...
Also shorten a line
2013-11-25 09:57:07 -07:00
David Boucha
4aadb15f12
Merge pull request #8805 from UtahDave/develop
...
Add hard return to make pylint happy
2013-11-25 08:50:02 -08:00
David Boucha
1814d1a734
Add hard return to make pylint happy
2013-11-25 09:49:08 -07:00
Colton Myers
3988d4b514
Merge pull request #8804 from basepi/hwm
...
Set the default HWM to 1000
2013-11-25 08:46:20 -08:00
Colton Myers
2873a667f8
Set the default HWM to 1000
...
This is as suggested in the ZMQ documentation:
http://zguide.zeromq.org/page:all#High-Water-Marks
2013-11-25 09:41:44 -07:00
Thomas S Hatch
cc2021065f
Merge pull request #8764 from cachedout/#8750
...
Don't depend on the pecl return code because it's broken.
2013-11-25 08:24:52 -08:00
Mike Place
bda026406f
Merge pull request #8803 from holmboe/gce-copy-edits
...
Copy edit gce.rst
2013-11-25 07:03:29 -08:00
regilero
9b20a408a4
commented tests for issue 8802 use recursion undetected
2013-11-25 15:35:22 +01:00
Henrik Holmboe
d456a7eb53
Copy edit gce.rst
2013-11-25 15:31:16 +01:00
Joseph Hall
77b6b35629
Merge pull request #8793 from pengyao/develop
...
fix #8792
2013-11-25 06:19:18 -08:00
pengyao
e42e0c236f
adjust the comment line
2013-11-25 21:42:58 +08:00
Joseph Hall
5345982a4e
Typo fix
2013-11-25 06:21:25 -07:00
Joseph Hall
a0168584d3
Merge pull request #8800 from techhat/openstack
...
Changing Rackspace to Openstack in Openstack doc
2013-11-25 05:14:47 -08:00
Joseph Hall
c0cab8827a
Changing Rackspace to Openstack in Openstack doc
2013-11-25 06:13:37 -07:00
regilero
38bd6709f0
require vs require_in in not-list yamlsyntax: differences, still on #8235
2013-11-25 12:58:59 +01:00
regilero
58bfbff843
prereq tests for issue #8235 (yaml without lists) and error message difference in no-list mode
2013-11-25 12:46:02 +01:00
regilero
8024df8404
Add test for #8796 : use does not inherit require. False test actually
2013-11-25 11:06:37 +01:00
pengyao
409f0cf514
fixed file.sed module a security risk
2013-11-25 17:23:57 +08:00
Petar Radosevic
1aff68a361
BUGFIX: Argument order pw usermod command.
...
The argument order of `pw usermod` is[1]:
pw [-V etcdir] usermod [name|uid]
This was incorrect for the `chhome` function. The updated version is
tested on FreeBSD.
[1]: http://www.freebsd.org/cgi/man.cgi?query=pw&sektion=8
2013-11-25 10:22:58 +01:00
Erik Johnson
ec1f0f46e4
Clarify the usage of env/saltenv
2013-11-24 21:33:21 -06:00
Demitri Swan
c1a88f0182
fixed uncaught exception in _available_services in launchctl module. Now follows symlinks
2013-11-24 21:13:36 -05:00
Demitri Swan
8224e88e45
Added comment explaining the fix.
2013-11-24 21:07:47 -05:00
Demitri Swan
6af860bebb
Fixing _available_services in launchctl module
2013-11-24 19:30:28 -05:00
regilero
95556d8f97
Merge remote-tracking branch 'upstream/develop' into requisites-tests
2013-11-24 18:35:34 +01:00
regilero
5d248146df
Remove wrong comments on prereq working test
2013-11-24 18:33:15 +01:00
regilero
aaa6f44677
Missing states for the mixed require and prereq mixed tests
2013-11-24 18:30:44 +01:00
regilero
8177f2b609
Add another working prereq simple test
2013-11-24 18:30:15 +01:00
regilero
0354e408e3
Comments on require test example
2013-11-24 18:28:59 +01:00
regilero
ddb99a570d
require and prereq mixed tests, mostly failing, see #8785
2013-11-24 18:28:22 +01:00
Joseph Hall
fd99a2c468
Merge pull request #8783 from s0undt3ch/issues/8667-uninitialized-var
...
Fix uninitialized var error. Fixes #8667 .
2013-11-24 04:54:43 -08:00
Pedro Algarvio
9ae24829f5
Merge pull request #8775 from regilero/requisites-tests
...
Requisites tests
2013-11-24 03:07:09 -08:00
Pedro Algarvio
4d1c583323
We should be changing permissions, not ownership.
2013-11-24 10:56:07 +00:00
Pedro Algarvio
ae33af4f88
Fix uninitialized var error. Fixes #8667 .
2013-11-24 09:38:58 +00:00
Erik Johnson
6ae4332aac
Update master tops docs to play nicely with sphinx autosummary
2013-11-23 23:22:50 -06:00
Joseph Hall
20dc6917c2
Merge pull request #8782 from vhgroup/develop
...
OpenStack salt-cloud documented.
2013-11-23 18:24:30 -08:00
Diego Woitasen
60c3be36dd
OpenStack salt-cloud documented.
2013-11-23 22:36:43 -03:00
Joseph Hall
23b82cff18
Merge pull request #8780 from holmboe/doc-various-fixes
...
Doc various fixes
2013-11-23 16:06:51 -08:00
Henrik Holmboe
c1bb9d5619
Upcase SSH in Salt SSH.
2013-11-24 00:18:40 +01:00
Henrik Holmboe
2dcb3c2203
Fix typo.
2013-11-24 00:15:16 +01:00
Henrik Holmboe
d1963fb28d
Change header for the Table of Contents, in line with Salt API, etc
2013-11-24 00:02:47 +01:00
