Joseph Hall
2240cbc0f7
Merge pull request #9427 from s0undt3ch/develop
...
Add a fake class to avoid problems when `sleekxmpp` is not available
2013-12-24 12:03:38 -08:00
Pedro Algarvio
8d90c0778d
Add a fake class to avoid problems when sleekxmpp is not available.
2013-12-24 20:00:15 +00:00
Pedro Algarvio
e7dd2ca653
Disabled the wrong Pylint code
2013-12-24 16:33:36 +00:00
Pedro Algarvio
41fe275443
Merge pull request #9423 from cachedout/pkg-doc-fix
...
Add note about refresh option to pkg state.
2013-12-24 08:29:41 -08:00
Pedro Algarvio
b439d2f85c
PyLint wrongly reports an error about calling super()
2013-12-24 16:17:20 +00:00
Pedro Algarvio
d0d5a2cb0b
Include the coding header
2013-12-24 16:13:09 +00:00
Pedro Algarvio
93881c899f
White-space related lint fixes.
2013-12-24 16:07:26 +00:00
Pedro Algarvio
ae05b982f8
Merge pull request #9422 from techhat/xmpp
...
Adding execution and state modules for xmpp
2013-12-24 08:05:31 -08:00
Mike Place
1c2f62385f
Add note about refresh option to pkg state.
...
Closes #9420 .
2013-12-24 08:58:24 -07:00
Joseph Hall
93f52c06d6
We don't need to pull the roster
2013-12-24 08:27:43 -07:00
Joseph Hall
16e20837d1
Adding execution and state modules for xmpp
2013-12-24 08:00:45 -07:00
Seth House
3bb46ee78f
Added note about not authenticating as root when using the PAM module
...
Closes #4046 , refs saltstack/halite#108 .
2013-12-23 20:26:18 -07:00
Mike Place
a31b202675
Merge pull request #9419 from cachedout/unit-tests
...
More aggressive IPC fix.
2013-12-23 18:38:37 -08:00
Mike Place
f8b772f970
More aggressive IPC fix.
2013-12-23 19:36:57 -07:00
Mike Place
86cef99d64
Merge pull request #9418 from cachedout/unit-tests
...
PEP8 fix.
2013-12-23 18:22:56 -08:00
Mike Place
698dd9c132
PEP8 fix.
2013-12-23 19:21:37 -07:00
Seth House
f5a3d5e0a4
Merge remote-tracking branch 'upstream/pr/9416' into develop
2013-12-23 18:51:03 -07:00
Thomas S Hatch
77cf7d4bbf
Merge pull request #9417 from cachedout/unit-tests
...
Unit tests
2013-12-23 16:19:30 -08:00
Mike Place
8efa385291
More unit tests. Many, many more.
2013-12-23 17:16:05 -07:00
Mike Place
ae4fdc1066
Raise IPC check even higher to resolve failing tests in Jenkins.
2013-12-23 17:11:24 -07:00
Mike Place
d15bd31b9c
Unit testing and utils refinements
...
* More unit tests against utils module
* Minor modifications to utils module for formatting.
* Remove case which could not be reached inside utils module.
2013-12-23 17:10:29 -07:00
Mike Place
83b08df07d
Clarify len of line.
2013-12-23 17:06:22 -07:00
Pedro Algarvio
4eaa2e0f41
Don't ignore config file sock_dir setting. Fixes #8365 .
...
Only afterwards try the system default path.
2013-12-24 00:04:12 +00:00
Thomas S Hatch
1c15314ecf
Merge pull request #9415 from terminalmage/file-makedirs-mode
...
Make sure execute bit set on dirs created by file.managed with makedirs==True
2013-12-23 15:47:57 -08:00
Erik Johnson
9b3586e2eb
Make sure execute bit set on dirs created by file.managed with makedirs==True
...
When a file.managed state is created with makedirs == True and no
dir_mode specified, the file mode is used as the mode for any parent
directories created by the state. However, this means that if you have a
file mode of 600, the parent dirs are also created with that mode,
making them unable to be traversed via CLI by the owner of the
file/directory that is being managed.
This commit checks each digit of the mode and adds the execute bit if
the digit is nonzero, making the mode 700 if the mode of the file is
600. 640 becomes 750, 644 becomes 755, etc.
2013-12-23 17:36:41 -06:00
Pedro Algarvio
971cc9802a
Merge pull request #9414 from whiteinge/syspaths-doc
...
Added explanatory docstring text to the syspaths module
2013-12-23 15:07:39 -08:00
Seth House
bb2dd942ef
Added explanatory docstring text to the syspaths module
2013-12-23 16:03:02 -07:00
Joseph Hall
73b9b8c484
Merge pull request #9412 from terminalmage/docs
...
A couple docs cleanups
2013-12-23 12:10:18 -08:00
Erik Johnson
a625f75ce8
Fix line that was indented too far in code-block
2013-12-23 13:39:31 -06:00
Erik Johnson
a2271cb34c
Remove docs references to nzbget
...
This module was recently removed to salt-contrib.
2013-12-23 13:38:08 -06:00
Thomas S Hatch
55fee75340
Start work on #8555
...
Load dynamic should also be stubbed out for salt-ssh, should prevent
ingecting the wrong grains
2013-12-23 11:31:31 -07:00
Thomas S Hatch
fd3b9e2c09
Clean out old salt_cloud directory
...
This was created to preserve the git history of salt cloud, now
that the files have been moved into place and the files have
preserved respective git history we can safely remove this directory
2013-12-23 10:45:40 -07:00
Thomas S Hatch
747013feb6
Fix config passing when master pillar is turned off
2013-12-23 10:37:52 -07:00
Thomas S Hatch
cf839249c2
Some fixes for transport merge
...
A few lint fixes and some variable assignment fixes
2013-12-23 10:31:11 -07:00
Thomas S Hatch
ae9d127a99
Add salt.transport to installed packages
2013-12-23 10:27:53 -07:00
Thomas S Hatch
53128b1a3b
Merge pull request #9407 from whiteinge/lit-docs
...
Add Sphinx directives for documenting YAML files
2013-12-23 09:29:22 -08:00
Thomas S Hatch
a02e397dab
Merge pull request #9408 from terminalmage/cmd-watch-alias
...
Alias cmd.watch to cmd.wait
2013-12-23 09:28:31 -08:00
Thomas S Hatch
15764276fc
Merge pull request #9406 from cro/salt_transport
...
Salt transport
2013-12-23 09:27:33 -08:00
Erik Johnson
12c0df5123
Hide cmd.watch state alias from docs
2013-12-23 11:23:16 -06:00
Erik Johnson
f39e889621
Alias cmd.watch state to cmd.wait
2013-12-23 11:22:54 -06:00
Thomas S Hatch
fb0ca047d1
Fix lint errors in tests
2013-12-23 09:25:16 -07:00
Thomas S Hatch
8dad4cf85a
whitespace
2013-12-23 09:14:51 -07:00
Thomas S Hatch
f2e632cd9e
lint fixes for incron
2013-12-23 09:06:54 -07:00
Thomas S Hatch
b833e93256
Fix undefined variable
2013-12-23 09:04:28 -07:00
Thomas S Hatch
4e6096aab4
Merge pull request #9402 from gravyboat/develop
...
Typo fix in troubleshooting index, and more additions to master/minion troubleshooting.
2013-12-23 08:07:51 -08:00
C. R. Oldham
a49f8888b6
Merge pull request #9404 from techhat/nzbget
...
Moving nzbget module to salt-contrib
2013-12-23 07:50:44 -08:00
C. R. Oldham
c1ba9ecfd2
Fix config options
2013-12-23 08:48:35 -07:00
C. R. Oldham
81bae99e90
Merge with upstream, add transport config options back.
2013-12-23 08:47:03 -07:00
Joseph Hall
c2ca3429fe
Moving nzbget module to salt-contrib
2013-12-23 07:41:54 -07:00
Seth House
35d4b67fca
Output warning if file cannot be found
2013-12-23 06:42:04 -07:00
