Pedro Algarvio
c6c04b0bd5
Merge pull request #9544 from cvrebert/patch-1
...
remotes_on_local_tcp_port(): trivial simplification of condition
2014-01-02 16:49:12 -08:00
Pedro Algarvio
e55fa8e82f
Merge pull request #9542 from cachedout/unit-tests
...
Unit tests
2014-01-02 16:43:53 -08:00
Pedro Algarvio
baa3a4b8cf
Remove hardcoded version, we're regex matching.
2014-01-03 00:40:45 +00:00
Pedro Algarvio
daecfde60c
Merge pull request #9545 from cvrebert/patch-2
...
modules.mount.active(): fix FreeBSD check
2014-01-02 16:14:28 -08:00
Pedro Algarvio
6fb99b3d8a
Merge pull request #9546 from hulu/network-tuples-fix
...
utils.network._interfaces_ipconfig(): fix botched singleton tuples
2014-01-02 16:12:33 -08:00
Chris Rebert
8eab92027f
utils.network._interfaces_ipconfig(): fix botched singleton tuples
...
Python 2.7.6 (default, Nov 11 2013, 11:11:46)
>>> # Parentheses don't make tuples. Commas do that.
>>> ('Subnet Mask') == 'Subnet Mask' != ('Subnet Mask',)
True
>>> x = ('Subnet Mask')
>>> type(x)
<type 'str'>
>>> y = ('Subnet Mask',)
>>> type(y)
<type 'tuple'>
>>> # Why this went unnoticed:
>>> key = 'Subnet Mask'
>>> key in ('Subnet Mask')
True
>>> # Why this is problematic:
>>> key = 'Mask'
>>> key in ('Subnet Mask')
True
2014-01-02 15:56:50 -08:00
Chris Rebert
a4b925e71c
modules.mount.active(): fix FreeBSD check
2014-01-02 15:48:10 -08:00
Chris Rebert
fb191ddafd
utils.network.remotes_on_local_tcp_port: trivial simplification of condition
2014-01-02 15:45:17 -08:00
Mike Place
cb2abcb796
Pylint fixes.
2014-01-02 16:28:19 -07:00
Mike Place
2e20bf99a3
Client testing
...
* Minor spelling and doc fixes to client module
* Unit testing client module.
2014-01-02 16:23:16 -07:00
Seth House
d6dd60af3a
Added note that docs are for the development version
2014-01-02 15:40:57 -07:00
Seth House
fd099aaa50
Removed old/unused rST substitution
2014-01-02 15:40:57 -07:00
Seth House
4c0798052f
Merge pull request #9536 from whiteinge/npm-version-examples
...
Added explicit examples of how to use versions with npm
2014-01-02 14:40:35 -08:00
Thomas S Hatch
a48bf4e5a3
Merge pull request #9538 from makinacorpus/jenkins-stuff
...
configurable salt git url for jenkins
2014-01-02 13:47:14 -08:00
Mathieu Le Marec - Pasquet
0e430e531d
configurable salt git url for jenkins
2014-01-02 22:46:12 +01:00
Thomas S Hatch
e9c7038b3c
Merge pull request #9537 from s0undt3ch/develop
...
Update regex to new versioning scheme.
2014-01-02 13:14:01 -08:00
Pedro Algarvio
77e74caf3a
Update regex to new versioning scheme.
2014-01-02 21:08:57 +00:00
Thomas S Hatch
15c99f37c0
Set version to 2014.1.0
2014-01-02 13:57:31 -07:00
Pedro Algarvio
20dc11be48
Convert file from dos line endings to unix line endings
2014-01-02 20:52:20 +00:00
Seth House
80a45950e3
Added explicit examples of how to use versions with npm
2014-01-02 13:46:23 -07:00
Joseph Hall
b45a594f6b
Merge pull request #9533 from timoguin/develop
...
Added info about DigitalOcean "Applications" to cloud docs
2014-01-02 12:33:38 -08:00
Thomas S Hatch
78b009537a
Merge pull request #9534 from s0undt3ch/hotfix/virtualenv-know-binaries
...
The virtualenv binary can have multiple CLI names.
2014-01-02 12:33:10 -08:00
Pedro Algarvio
2cab3227fd
The virtualenv binary can have multiple CLI names.
2014-01-02 20:27:18 +00:00
Tim O'Guin
7d0b02ae27
added a note about DigitalOcean's concept of applications to the cloud docs
2014-01-02 14:07:33 -06:00
Thomas S Hatch
b4a8edcc4c
Merge pull request #9532 from s0undt3ch/develop
...
Mostly white-space lint fixes
2014-01-02 12:05:02 -08:00
Pedro Algarvio
f9598ba1c2
Remove trainling white-space.
2014-01-02 20:02:37 +00:00
Pedro Algarvio
2976377e4b
Mostly white-space related lint fixes.
...
No tabs please!
2014-01-02 20:01:37 +00:00
Thomas S Hatch
0ff27f94d5
it is 2014 now
2014-01-02 12:59:16 -07:00
Thomas S Hatch
1ef832d093
update man pages to 2014.1.0
2014-01-02 12:59:16 -07:00
Pedro Algarvio
d3923455af
White space related lint fixes
2014-01-02 19:58:07 +00:00
Thomas S Hatch
68c7e39593
Merge pull request #9519 from syphernl/develop
...
Allow pillars for minions to be retrieved from MySQL
2014-01-02 11:05:12 -08:00
Thomas S Hatch
8a8318c249
Merge pull request #9515 from grayj/develop
...
Made destroy always scrub_data.
2014-01-02 11:04:46 -08:00
Thomas S Hatch
ae7e1d0cc1
Merge pull request #9529 from terminalmage/docs
...
Add some links to the fileserver backends docs
2014-01-02 10:54:29 -08:00
Thomas S Hatch
210de9e119
Merge pull request #9518 from techhat/filemod
...
Wrap os.lstat in a try/except block
2014-01-02 10:53:56 -08:00
Thomas S Hatch
5e8b5c1dd6
Merge pull request #9523 from techhat/fileutil
...
Adding some more missing file functions
2014-01-02 10:53:43 -08:00
Frank Klaassen
0045f46f18
Do not raise the exception, Salt doesn't appear to like that when we do that with pillar modules
2014-01-02 18:45:46 +01:00
Frank Klaassen
514a9d66b5
Merge remote-tracking branch 'upstream/develop' into develop
2014-01-02 18:45:12 +01:00
Erik Johnson
1c442f7c4e
Add some links to the fileserver backends docs
...
This commit turns some of the config file parameters into links to the
master config file docs, and also links to the pages for the fileserver
backends being described.
2014-01-02 10:33:50 -06:00
Mike Place
3351517433
Merge pull request #9528 from tmartinfr/fix-doc-docker
...
Fix broken hyperlink in the docker state docstring
2014-01-02 08:29:52 -08:00
Thomas Martin
bfb3ca4830
Fix broken hyperlink in the docker state docstring
2014-01-02 16:53:29 +01:00
Joseph Hall
612dde73bf
Adding some more missing file functions
2014-01-02 05:30:49 -07:00
Frank Klaassen
a60ffdb356
Merge remote-tracking branch 'upstream/develop' into develop
2014-01-02 07:59:20 +01:00
Pedro Algarvio
48bb22cb34
Merge pull request #9521 from terminalmage/sphinx
...
Fix various docs build errors and warnings
2014-01-01 15:05:14 -08:00
Erik Johnson
366f6bdaaa
Fix hyperlinks in hydrogen release notes
2014-01-01 16:39:14 -06:00
Erik Johnson
2a22f51b06
Fix sphinx build errors/warnings
2014-01-01 16:38:39 -06:00
Erik Johnson
cd9c0ffe66
Normalize line length
2014-01-01 16:37:41 -06:00
Erik Johnson
2a37739f39
clarify that file_recv is a master config option
2014-01-01 16:36:54 -06:00
Erik Johnson
4cb0faba5e
Fix sphinx warning due to mismatched header lines
2014-01-01 16:34:54 -06:00
Frank Klaassen
6a6cb42fce
Docblock tweaks / minor logging improvements
2014-01-01 17:47:44 +01:00
Frank Klaassen
e958f91a77
Allow pillars for minions to be retrieved from a MySQL table
2014-01-01 17:37:23 +01:00
