Erik Johnson
7a0fdd26de
salt/log/handlers/sentry_mod.py: remove raw string formatting
2015-08-26 23:26:06 -05:00
Erik Johnson
525d6eadd6
salt/loader.py: remove raw string formatting
2015-08-26 23:26:06 -05:00
Erik Johnson
beb366e944
salt/key.py: remove raw string formatting
2015-08-26 23:26:06 -05:00
Erik Johnson
1d3ed14edd
salt/grains/core.py: remove raw string formatting
2015-08-26 23:26:06 -05:00
Erik Johnson
de97332105
salt/fileserver/svnfs.py: remove raw string formatting
2015-08-26 23:26:06 -05:00
Erik Johnson
b34c178139
salt/fileserver/minionfs.py: remove raw string formatting
2015-08-26 23:26:06 -05:00
Erik Johnson
5d24e8e1e5
salt/fileserver/hgfs.py: remove raw string formatting
2015-08-26 23:26:06 -05:00
Erik Johnson
294bb3fe22
salt/fileclient.py: remove raw string formatting
2015-08-26 23:26:06 -05:00
Erik Johnson
9b4678276c
salt/daemons/flo/jobber.py: remove raw string formatting
2015-08-26 23:26:06 -05:00
Erik Johnson
0fa0cc003d
salt/config/__init__.py: remove raw string formatting
2015-08-26 23:26:06 -05:00
Colton Myers
09f3593625
Merge pull request #26686 from TheBigBear/patch-2
...
Standardize requirements files format
2015-08-26 17:05:40 -06:00
TheBigBear
66585a2636
Update zeromq.txt
2015-08-26 23:04:59 +01:00
TheBigBear
7adda23672
Update raet.txt
2015-08-26 23:04:42 +01:00
TheBigBear
6097034e3a
Update opt.txt
2015-08-26 23:04:23 +01:00
TheBigBear
e854031fd6
Update dev_python34.txt
2015-08-26 23:03:51 +01:00
TheBigBear
6a58ca351c
Update dev_python27.txt
2015-08-26 23:03:30 +01:00
TheBigBear
08af68727c
Update base.txt
2015-08-26 23:03:04 +01:00
TheBigBear
15e4d866cb
Update opt.txt
2015-08-26 22:19:50 +01:00
TheBigBear
0b39ef6acb
Update dev_python34.txt
2015-08-26 22:19:28 +01:00
TheBigBear
f8d1ba243d
Standardize requirements files format
2015-08-26 22:14:55 +01:00
Colton Myers
cf3219ac9e
Merge pull request #26661 from ashangit/fix-mem-params-moved-to-host_config-1.19
...
Correct issue with docker api 1.19
2015-08-26 12:53:02 -06:00
nfraison
e90fdf97ae
Used of salt.utils.version_cmp for string comparison and correct lint issue
2015-08-26 19:42:35 +02:00
Seth House
2030f7f8de
Merge pull request #26653 from dmyerscough/update-salt-api-doc
...
You can provide a X-Auth-Token when requesting jobs
2015-08-26 10:57:01 -06:00
Colton Myers
264ab9655a
Merge pull request #26660 from vitaliyf/haproxy-support-wildcard-backend
...
Support ability to pass "*" as wildcard backend in haproxyconn enabe/disable_server.
2015-08-26 10:04:38 -06:00
Vitaliy Fuks
8a2dd86c79
Merge branch 'haproxy-support-wildcard-backend' of https://github.com/vitaliyf/salt into haproxy-support-wildcard-backend
2015-08-26 14:52:36 +00:00
Vitaliy Fuks
730126958f
Changed output of haproxy commands to be more close to old behavior - except now it's a nested dictionary of {backend_name: server_list}.
2015-08-26 14:52:06 +00:00
Vitaliy Fuks
2b07cbeca7
Changed output of haproxy commands to be more close to old behaving - except now it's a nested dictionary of {backend_name: server_list}.
2015-08-26 14:50:00 +00:00
Vitaliy Fuks
3c88927f10
Re-establish haproxy socket connection before issuing each command.
2015-08-26 14:49:35 +00:00
jacobhammons
590847195a
Merge pull request #26664 from jacobhammons/develop-doc-version
...
update version for latest stable
2015-08-26 08:19:11 -06:00
Jacob Hammons
905a045b8d
update version for latest stable
2015-08-26 08:18:36 -06:00
nfraison
9f7ccc6645
Correct issue with docker api 1.19 due to move of mem parameters to host_config object
2015-08-26 15:04:56 +02:00
Damian Myerscough
6d9ac72360
You can provide a X-Auth-Token when requesting jobs
2015-08-25 16:56:10 -07:00
Vitaliy Fuks
eff874de1a
Support ability to pass "*" as wildcard backend in haproxyconn enable/disable_server modules.
2015-08-25 22:48:53 +00:00
Colton Myers
809a47f299
Merge pull request #26648 from whiteinge/fix-shadowed-fun-arg
...
Free 'fun' from the function signature namespace
2015-08-25 16:01:43 -06:00
Colton Myers
9b34335a20
Merge pull request #26359 from Akilesh1597/develop
...
Ini issues fixed
2015-08-25 15:47:48 -06:00
Colton Myers
9159800ce8
Merge pull request #26583 from jodv/zip_modules
...
Using .zip archives as self-contained Salt modules
2015-08-25 15:33:10 -06:00
Colton Myers
c09dd35a98
Merge pull request #26595 from gasmith-nutanix/augeas
...
Augeas: Improve command parsery.
2015-08-25 15:31:02 -06:00
Colton Myers
ecca40f4f0
Merge pull request #26606 from skizunov/develop2
...
Allow 'salt' command metadata to be a dict
2015-08-25 15:29:52 -06:00
Colton Myers
e8277f4c67
Merge pull request #26611 from lyft/include-duration-in-log-statement
...
Include duration in log statement.
2015-08-25 15:24:43 -06:00
Colton Myers
5f515c3295
Merge pull request #26627 from thatch45/state_redirect
...
Allow inline inject_globals to be... injected
2015-08-25 15:18:04 -06:00
Colton Myers
b20b4724ca
Merge pull request #26631 from PierreR/patch-1
...
Fix get_load in postgres returner
2015-08-25 15:17:18 -06:00
Colton Myers
6e72ae7f91
Merge pull request #26647 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-08-25 15:15:28 -06:00
Seth House
1eae953510
Free 'fun' from the function signature namespace
...
'fun' is a common argument in Salt. format_call will choke if you
attempt to call a function that uses this argment. I.e.,:
>>> __salt__.saltutil.runner('mine.get', tgt='*', fun='network.ip_addrs', tgt_type='glob')
Traceback (most recent call last):
File "<console>", line 1, in <module>
TypeError: runner() got multiple values for keyword argument 'fun'
2015-08-25 15:11:21 -06:00
Colton Myers
353ec1ba7a
Remove bad test
2015-08-25 14:08:04 -06:00
Colton Myers
615d3ec219
Merge branch 'fixws' of git://github.com/efficks/salt into efficks-fixws
2015-08-25 14:06:54 -06:00
Colton Myers
3d6f7b0e6a
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/utils/aws.py
2015-08-25 13:57:49 -06:00
David Boucha
bd6b9a62eb
Merge pull request #26625 from twangboy/fix_26097
...
Correctly detect packages with no version, docs
2015-08-25 14:52:33 -05:00
Joseph Hall
723734308b
Merge pull request #26575 from msteed/raasify-spm
...
Update spm for integration into raas
2015-08-25 12:51:42 -06:00
François-Xavier Choinière
8d9785d718
Fix function spacing
2015-08-25 13:39:12 -04:00
Gregory Smith
44baa5547e
Fix more pylint errors.
2015-08-25 10:30:59 -07:00
