Thomas S Hatch
6d9cde5ab1
Merge pull request #6066 from terminalmage/issue6052
...
Don't try to load git_pillar if not enabled in master config
2013-07-09 12:51:42 -07:00
Erik Johnson
29fbdb028b
Change gitpython to GitPython
...
Use the proper capitalization of GitPython.
2013-07-09 12:47:59 -05:00
Erik Johnson
4f62116c10
Correct innacuracy in log message
...
This log entry was apparently copied directly from the git fileserver
backend, but this isn't the git fileserver backend, it's the git
external pillar.
2013-07-09 12:47:06 -05:00
Erik Johnson
4225337e22
Don't try to load git_pillar if not enabled in master config
...
This fixes #6052 by doing a check for git-based external pillars in the
master config, and returning False when there are none. This suppresses
an error later on in the __virtual__() function which complains that the
git fileserver backend is configured (when it clearly is not).
2013-07-09 12:45:14 -05:00
Tomas Kral
744549da55
fix broken links on 'Modular System' page
2013-07-09 19:10:12 +02:00
David Boucha
e70c9188c2
Merge pull request #6062 from basepi/yamlidio
...
Add underscore stripping to YAML idiosyncrasies docs
2013-07-09 09:55:48 -07:00
David Boucha
ad1413dfdc
Merge pull request #6061 from Singletoned/develop
...
Renamed git-python to gitpython
2013-07-09 09:50:55 -07:00
Joseph Hall
1532939fb0
Merge pull request #6063 from basepi/keyregendoc
...
Add 60 second window to key_regen docs
2013-07-09 09:49:09 -07:00
Colton Myers
c499da0d93
Add 60 second window to key_regen docs
2013-07-09 10:45:08 -06:00
Joseph Hall
a71fcc7194
Merge pull request #6054 from mgwilliams/ddns
...
Execution and state modules for RFC 2136 dynamic DNS updates.
2013-07-09 09:13:57 -07:00
Colton Myers
57bd942725
Remove trailing whitespace
2013-07-09 10:12:38 -06:00
Colton Myers
1b9f3ff21c
Add underscore stripping to YAML idiosyncrasies
2013-07-09 10:11:43 -06:00
Ed Singleton
9d8f8e41e8
Renamed git-python to gitpython
2013-07-09 14:54:22 +01:00
Pedro Algarvio
72278e12e4
Merge pull request #6058 from terminalmage/docs
...
Clarify docs on custom types
2013-07-09 04:48:25 -07:00
Pedro Algarvio
6078bd0f50
Merge pull request #6055 from cvrebert/patch-1
...
ssh/shell.py: fix typos in comments
2013-07-09 04:43:00 -07:00
Pedro Algarvio
292c43afb1
Merge pull request #6059 from terminalmage/issue6053
...
Fix return statement in supervisord.running state
2013-07-09 02:53:02 -07:00
Erik Johnson
cadd842ed2
Fix return statement in supervisord.running state
...
When test=True is used, this state builts the return dict, and then runs
"return" instead of returning the dict, causing a traceback. This commit
fixes #6053 by fixing that return statement.
2013-07-08 21:51:29 -05:00
Erik Johnson
1b876fc53a
Clarify docs on custom types
2013-07-08 21:36:34 -05:00
Matthew Williams
98bf1c67b9
add ddns state module
2013-07-09 02:31:23 +00:00
Chris Rebert
683455937e
ssh/shell.py: fix typos in comments
2013-07-08 17:18:34 -07:00
Matthew Williams
6273864cee
ddns module: clarify docs
2013-07-08 23:13:53 +00:00
Matthew Williams
5ba4f32800
add ddns execution module
2013-07-08 23:09:59 +00:00
Erik Johnson
d3a5a1be74
Merge pull request #6051 from faulkner/fix-load-dynamic
...
Update state.load_dynamic to handle changes to saltutil.sync_all.
2013-07-08 13:42:55 -07:00
Chris Faulkner
48c4c7b0d7
Update state.load_dynamic to handle changes to saltutil.sync_all.
2013-07-08 13:27:35 -07:00
Thomas S Hatch
09bb5aa744
Merge pull request #6050 from terminalmage/issue6048
...
Fix issue with cp.get_dir copying more than intended
2013-07-08 12:58:35 -07:00
Thomas S Hatch
357d996d7f
Merge pull request #6047 from s0undt3ch/issues/5969-windows-non-blocking-reads
...
Allow `NonBlockingPopen` not to fail badly and also not to block on MS Windows
2013-07-08 12:53:59 -07:00
Erik Johnson
0092a88981
Fix issue with cp.get_dir copying more than intended
...
The get_dir member function of the salt fileclient was doing a simple
check to see if the path of a target file (or empty dir) started with
the specified salt:// path. As a result, salt://foo would match files
like salt://foo.sh or files within the directory salt://foobar/.
This commit adds a check to ensure that these undesired files/dirs are
not considered a match by the fileclient, and thus do not get
copied/replicated on the minion.
Fixes #6048 .
2013-07-08 14:46:17 -05:00
Thomas S Hatch
7b1f56a429
Refine the master state systems
2013-07-08 12:40:08 -06:00
Thomas S Hatch
90d9c3bd69
Bring back the master state function
2013-07-08 12:40:08 -06:00
Joseph Hall
ab78a2678e
Merge pull request #6044 from s0undt3ch/issues/5878-file-descriptors-leak
...
Try to narrow down used fds. Refs #5878 .
2013-07-08 10:16:09 -07:00
Joseph Hall
dc5f510331
Merge pull request #6046 from terminalmage/issue6033
...
Fix mode in salt.modules.file.mkdir()
2013-07-08 10:13:08 -07:00
Erik Johnson
6648e449eb
Fix mode in salt.modules.file.mkdir()
...
This removes the last remaining octal-specific code from the file
module. Fixes #6033 .
2013-07-08 11:43:11 -05:00
Pedro Algarvio
44e6998ab5
Try to narrow down used fds. Refs #5878 .
2013-07-08 17:22:20 +01:00
Pedro Algarvio
02ae653958
Merge pull request #6043 from terminalmage/issue6003
...
Pass __env__ to salt.modules.pip._get_cached_requirements
2013-07-08 09:14:05 -07:00
Erik Johnson
9e7b8d8db2
Pass __env__ to salt.modules.pip._get_cached_requirements
...
This fixes #6003 , and resolves a traceback caused by the environment not
being passed to the function.
2013-07-08 10:54:26 -05:00
Joseph Hall
bdbbfb2fb4
Merge pull request #6037 from terminalmage/issue6025
...
Do not specify "name" when using pip install --editable
2013-07-08 08:16:53 -07:00
Volker Schwicking
843a8b9a25
another varname fix
2013-07-08 17:09:57 +02:00
Volker Schwicking
a8e58a8aee
add randint import
2013-07-08 17:05:40 +02:00
Volker Schwicking
afd67d68aa
fixed wrong varname
2013-07-08 17:01:04 +02:00
Volker Schwicking
9c82c0e401
add new setting 'random_reauth_delay' which delays the re-auth attempts of a minion by random seconds to receive a changed master-key.
2013-07-08 16:58:29 +02:00
Oleg Anashkin
ae47668254
Virtualenv module uses external scripts to install distribute and pip
...
Fixes #6029
2013-07-08 07:58:17 -07:00
Oleg Anashkin
06ac67c84a
Fix pip module for python 3
...
Pip module now sets VIRTUAL_ENV environment before calling pip
2013-07-08 07:55:19 -07:00
Erik Johnson
d6b6572595
Do not specify "name" when using pip install --editable
...
This fixes #6025 by setting "name" to an empty string if the "editable"
param is used, like is already being done for the "requirements" param.
2013-07-08 09:53:48 -05:00
Volker Schwicking
8fbbede033
add new setting 'random_reauth_delay' which delays the re-auth attempts of a minion by random seconds to receive a changed master-key.
2013-07-08 16:47:13 +02:00
Xavier Barbosa
e951ae13c7
fixes and doc
2013-07-08 16:41:35 +02:00
Xavier Barbosa
3f49000ba2
unittesting for file.serialize and yaml & json filters
2013-07-08 16:19:19 +02:00
Xavier Barbosa
30c862a6f2
fixed jinja template helper
2013-07-08 15:04:09 +02:00
Xavier Barbosa
48334025f2
added file.serialize state
2013-07-08 14:59:56 +02:00
Xavier Barbosa
02f48b7480
added 2 jinja filters: yaml and json
2013-07-08 14:26:39 +02:00
Oleg Anashkin
8b840a9650
Enhance virtualenv module to install distribute/pip for pyvenv
2013-07-07 23:33:57 -07:00
