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
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
François-Xavier Choinière
233774623e
Fix detection of powershell in win_service module.
2015-08-25 13:00:44 -04:00
Shane Lee
99755e525d
Merge pull request #26635 from cro/proxy_grains_on_windows
...
Don't report windows as a proxy.
2015-08-25 10:54:38 -06:00
Gregory Smith
8ecb55f9e1
Fix pylint errors.
2015-08-25 09:49:35 -07:00
Justin Findlay
859801f2b6
Merge pull request #26564 from lyft/add-netaddress-module
...
Add netaddress module for getting info about IP networks
2015-08-25 10:38:27 -06:00
C. R. Oldham
ec209110f4
Don't report proxy on windows.
2015-08-25 10:17:31 -06:00
Justin Findlay
d073ac45ec
Merge pull request #26623 from terminalmage/zh107
...
Remove raw string formatting in doc/, salt/auth/, and salt/cloud/
2015-08-25 10:04:11 -06:00
Pi3r
89f9033a32
Fix get_load
...
The function `fetchone` always return a tuple (or None):
http://initd.org/psycopg/docs/cursor.html?highlight=fetchone#cursor.fetchone
2015-08-25 15:13:40 +02:00
Akilesh
a3eb181e31
Merge pull request #1 from jfindlay/ini
...
update unit tests for ini state
2015-08-25 11:41:14 +05:30
Thomas S Hatch
045e9a7c0b
Add reset_run_num
2015-08-24 22:59:08 -06:00
Thomas S Hatch
3e77b20b80
Allow for the state object to inject new objects into the loader
2015-08-24 22:55:29 -06:00
twangboy
27112c7441
Fixed some lint
2015-08-24 18:23:43 -06:00
Pedro Algarvio
226ef73863
Merge pull request #26609 from s0undt3ch/develop
...
Allow supplying an alternate mod_dict class
2015-08-25 01:02:02 +01:00
twangboy
020b20ec41
Correctly detect packages with no version, docs
2015-08-24 17:52:30 -06:00
Erik Johnson
9051706b64
Remove raw string formatting in doc/, salt/auth/, and salt/cloud/
2015-08-24 17:48:10 -05:00
Nicole Thomas
e36ba77bf5
Merge pull request #26622 from rallytime/cloud_test_fix
...
[2015.8] Also add -Z to script args for cloud tests
2015-08-24 16:45:36 -06:00
rallytime
e14931ff2d
Also add -Z to script args for cloud tests
2015-08-24 16:11:01 -06:00
Nicole Thomas
2964700609
Merge pull request #26619 from rallytime/cloud-test-fixes
...
Apply cloud test fixes from 2015.5 to 2015.8
2015-08-24 15:49:33 -06:00
David Boucha
5522d87a11
Merge pull request #26603 from terminalmage/issue13550
...
Fixes for git.latest, git module integration tests, etc.
2015-08-24 16:47:16 -05:00
rallytime
0d6eebf3c3
Extra lines
2015-08-24 15:12:31 -06:00
rallytime
c69c918b46
Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests
2015-08-24 15:12:25 -06:00
rallytime
7b594ef6d6
Use an available image to test against
2015-08-24 15:12:19 -06:00
Michael Steed
79a76c5cfe
fixes
...
- improve unit test coverage & fix bugs exposed thereby
- lint
2015-08-24 14:11:55 -06:00
Justin Findlay
60087d0861
update unit tests for ini state
2015-08-24 12:08:10 -06:00
