Chris Rebert
b76d8f8cef
apache module: rm unused import of os
...
************* Module salt.modules.apache
salt/modules/apache.py:12: [W0611(unused-import), ] Unused import os
2014-02-12 10:29:10 -08:00
Thomas S Hatch
c1be7caa08
Merge pull request #10393 from rallytime/dnsutil_test
...
Fixed Test
2014-02-12 11:26:16 -07:00
rallytime
2035e7d153
Added S0undt3ch's skipIf suggestion
2014-02-12 11:04:35 -07:00
Thomas S Hatch
19610afac0
Merge pull request #10376 from bemehow/skip_suggestions_pkg
...
added strick package name matching flag, skip_suggestions
2014-02-12 10:56:00 -07:00
Thomas S Hatch
b1e904d384
single quotes
2014-02-12 10:49:00 -07:00
Thomas S Hatch
546c5d1534
Merge pull request #10364 from johnnoone/yaml-dumper
...
added yaml dumper that renders OrderedDict to YAML map
2014-02-12 10:46:45 -07:00
Thomas S Hatch
a8b3b121b0
Merge pull request #10338 from bemehow/mount-fix
...
handling lack of fstab as not-error
2014-02-12 10:44:40 -07:00
Thomas S Hatch
0d9b9f2679
Merge pull request #10249 from Stelminator/minion_dry
...
DRY up a bunch of shared minion code.
2014-02-12 10:38:15 -07:00
Thomas S Hatch
72c763296c
Merge pull request #10390 from SmithSamuelM/sam_raet_3
...
Sam raet 3
2014-02-12 10:37:44 -07:00
rallytime
1b55edd4fb
We cannot use the requires_salt_modules decorator because we do not inherit from an integration test class.
2014-02-12 10:36:22 -07:00
Pedro Algarvio
88ed72ced5
Merge pull request #10392 from techhat/apache
...
Break out Debian-specific functions into deb_apache.py
2014-02-12 17:35:06 +00:00
Joseph Hall
e7344ad577
Fix docstrings for mod functions
2014-02-12 10:22:01 -07:00
Joseph Hall
e21cb98850
Break out Debian-specific functions into deb_apache.py
2014-02-12 10:12:04 -07:00
Thomas S Hatch
8f0032b1a6
Clean up and refactor mmodule over to saltutil per #10273
2014-02-12 10:03:15 -07:00
Samuel M Smith
ebae5afc64
Merge remote-tracking branch 'upstream/develop' into sam_raet_2
...
Conflicts:
salt/transport/road/raet/stacking.py
salt/transport/road/raet/test/test_stacking.py
2014-02-12 10:02:39 -07:00
Thomas S Hatch
93d56eb74b
Merge pull request #10273 from kenatbasis/master_module
...
Adds master module for populating pillars via external module
2014-02-12 10:00:09 -07:00
Samuel M Smith
f2644375fd
Basic raet handshake onto channel to get device id
2014-02-12 09:56:34 -07:00
Thomas S Hatch
9ac6c8a1e8
Merge pull request #9904 from mbirtwell/fix_saltenv_priority
...
Always give saltenv argument highest priority
2014-02-12 09:53:08 -07:00
Pedro Algarvio
9cbc4b5010
Merge pull request #10389 from techhat/docfix
...
libcloud is still a hard dep for salt-cloud, but not salt
2014-02-12 16:51:22 +00:00
Joseph Hall
b1695cef8d
libcloud is still a hard dep for salt-cloud, but not salt
2014-02-12 09:39:28 -07:00
Joseph Hall
36db5eb73a
Merge pull request #10386 from s0undt3ch/hotfix/cloud-docstring
...
"Obfuscate" and add a docstrign explaining purpose. Fixes #10341 .
2014-02-12 09:38:01 -07:00
Pedro Algarvio
75016a0f34
"Obfuscate" and add a docstrign explaining purpose. Fixes #10341 .
2014-02-12 16:35:04 +00:00
Christopher A. Stelma
2bb06d542a
use super in Syndic.__init__
2014-02-12 08:18:49 -08:00
Christopher A. Stelma
073bb0a492
factor out setsockopt of RECONNECT_IVL
2014-02-12 08:18:49 -08:00
Christopher A. Stelma
4ccb950caa
DRY Poller and Context init
2014-02-12 08:18:49 -08:00
Christopher A. Stelma
db4af8e365
DRY more self.socket.setsockopt
2014-02-12 08:18:49 -08:00
Christopher A. Stelma
fd23be9ac8
DRY _fire_master minion start
2014-02-12 08:18:49 -08:00
Christopher A. Stelma
301b43cdb1
DRY IPV4ONLY
2014-02-12 08:18:49 -08:00
Christopher A. Stelma
c892ff0289
DRY RECONNECT_IVL_MAX
2014-02-12 08:18:49 -08:00
Christopher A. Stelma
9a51a64764
DRY TCP_KEEPALIVE
2014-02-12 08:18:49 -08:00
Christopher A. Stelma
eda019b9ac
DRY up minion event system initialization
2014-02-12 08:18:49 -08:00
Joseph Hall
80965e0634
Merge pull request #10385 from s0undt3ch/hotfix/no-hardcoded-paths
...
Don't hardcode the cloud cache directory
2014-02-12 09:11:13 -07:00
Joseph Hall
baf9b7355f
Merge pull request #10375 from terminalmage/systemd-daemon-notify
...
On systemd hosts, notify systemd when master is started
2014-02-12 09:05:01 -07:00
Pedro Algarvio
a4df038aeb
.format() instead of concatenating.
2014-02-12 15:56:21 +00:00
Pedro Algarvio
e918b6e0ef
Don't hardcode the cloud cache directory
...
Use the setup configurable `salt.syspaths` module variables.
2014-02-12 15:53:38 +00:00
Joseph Hall
d99c8ebba5
Merge pull request #10384 from s0undt3ch/hotfix/lint
...
Lint Fixes
2014-02-12 08:51:47 -07:00
Pedro Algarvio
9452fa25a3
Skip tests if mock not available, make use of helpers
2014-02-12 15:42:51 +00:00
Pedro Algarvio
8fd30b97eb
Return True if not renaming the module.
2014-02-12 15:40:11 +00:00
Pedro Algarvio
cf2f989f83
Remove unused import
2014-02-12 15:38:13 +00:00
Pedro Algarvio
059ed16d02
Remove unused import
2014-02-12 15:37:15 +00:00
Pedro Algarvio
7465f0511f
Remove unused import
2014-02-12 15:36:17 +00:00
Pedro Algarvio
c15526852a
Remove unused imports
2014-02-12 15:35:14 +00:00
Pedro Algarvio
720a094142
Fix lint issues and make use of the helpers.
...
Double to single quotes.
2014-02-12 15:32:55 +00:00
Joseph Hall
0d652dcc0b
Merge pull request #10378 from hipikat/digitalocean-backups
...
Add backups_enabled for Digital Ocean salt-cloud provider
2014-02-12 07:39:03 -07:00
Adam Wright
43ce5be53b
Refactor without loop on tuple.
2014-02-12 21:58:42 +08:00
Joseph Hall
2b060fce5e
Merge pull request #10381 from ranl/develop
...
solr module: add support for username and password
2014-02-12 06:54:34 -07:00
ranl
4ebcdffcf8
solr module: add support for username and password
2014-02-12 15:12:08 +02:00
Joseph Hall
4732257530
Merge pull request #10377 from Stelminator/lint_fixes_2014_02_11
...
lint fixes
2014-02-12 05:32:15 -07:00
Adam Wright
1bb773a61e
Add private_networking and backups_enabled options to docs.
2014-02-12 16:26:17 +08:00
Adam Wright
60bf6ce776
Add backups_enabed option to Digital Ocean create().
...
- Group backups_enabled and private_networking, the two binary options.
- private_networking now absent if excluded rather than 'false'.
- Deal with non-binary arguments explicitly as other providers do.
Digital Ocean profiles can now take 'backups_enabled: [True|False]'. (As
of Jan 2014 this option must be specified on instance creation and can
no longer be enabled for already-created droplets, so it's fairly
necessary.)
An incidental change is that private_networking won't default to False
if not specified - by salt-cloud - but that is still the provider's
default, and where the default should be coming from if a profile isn't
explicit.
2014-02-12 16:17:26 +08:00
