Gareth J. Greenaway
c11cf22abe
fixing ipset unit tests based on changes. Adding additional tests for when ip set type is hash:net
2015-08-27 08:28:23 -07:00
Gareth J. Greenaway
0a499bd0fa
Fixes to ipset module when using hash:net set types for both IP ranges, networks with prefix length and single hosts with prefix length
2015-08-26 20:35:19 -07:00
Colton Myers
0360994b38
Merge pull request #26679 from rallytime/bp-26661
...
Back-port #26661 to 2015.8
2015-08-26 16:52:41 -06:00
Colton Myers
735aa8eb5e
Merge pull request #26684 from techhat/spmreactor
...
Add reactor formulas to spm
2015-08-26 16:45:47 -06:00
Colton Myers
6fb7b15cf2
Merge pull request #26682 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-26 16:02:03 -06:00
Joseph Hall
2eef80414a
Document reactor packages
2015-08-26 14:59:01 -06:00
Joseph Hall
d1e25f9194
Add reactor formulas to spm
2015-08-26 14:57:48 -06:00
Colton Myers
ef76404def
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/releases/2015.5.5.rst
2015-08-26 14:32:03 -06:00
nfraison
fe5f1e2828
Used of salt.utils.version_cmp for string comparison and correct lint issue
2015-08-26 14:05:11 -06:00
nfraison
9f8aaedf46
Correct issue with docker api 1.19 due to move of mem parameters to host_config object
2015-08-26 14:05:11 -06:00
Colton Myers
75675a6ba9
Merge pull request #26676 from rallytime/bp-26648
...
Back-port #26648 to 2015.5
2015-08-26 13:46:01 -06:00
Colton Myers
d7f682cb5b
Merge pull request #26677 from rallytime/bp-26653
...
Back-port #26653 to 2015.5
2015-08-26 13:45:54 -06:00
Joseph Hall
03235a3fde
Merge pull request #26671 from rallytime/fix-10075
...
Warn users if cloud driver dependencies are missing.
2015-08-26 13:45:53 -06:00
Colton Myers
960dbba7ed
Merge pull request #26675 from rallytime/bp-26631
...
Back-port #26631 to 2015.5
2015-08-26 13:44:59 -06:00
Colton Myers
09d0602d04
Merge pull request #26674 from rallytime/bp-26583
...
Back-port #26583 to 2015.8
2015-08-26 13:01:47 -06:00
Colton Myers
53ef35cea5
Merge pull request #26670 from techhat/confpkgs
...
Set up SPM to install -conf packages
2015-08-26 12:58:52 -06:00
rallytime
46075ca2e1
Pylint fix
2015-08-26 12:35:20 -06:00
Damian Myerscough
497ca96039
You can provide a X-Auth-Token when requesting jobs
2015-08-26 12:30:52 -06:00
Seth House
1af42eed36
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-26 12:29:25 -06:00
Pi3r
20eecdc7be
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-26 12:28:10 -06:00
Joseph Hall
ff6f29f1f7
Use syspaths
2015-08-26 12:24:08 -06:00
Joseph Hall
e4dcef5048
Document SPM package types
2015-08-26 12:21:28 -06:00
Jeremy Rosenbaum
dbbadc62de
add enable_zip_modules conig option
2015-08-26 12:21:26 -06:00
Jeremy Rosenbaum
92a9bd47a1
add zipimport functionality for module loading
2015-08-26 12:20:56 -06:00
Jeremy Rosenbaum
763ee20713
documentation for zip archive modules
2015-08-26 12:18:57 -06:00
Jeremy Rosenbaum
59e85fb402
Add zip to suffixes used for module sync
2015-08-26 12:18:51 -06:00
Jeremy Rosenbaum
f1f5184434
add enable_zip_modules conig option
2015-08-26 12:18:45 -06:00
Jeremy Rosenbaum
01775ea8d1
add zipimport functionality for module loading
2015-08-26 12:18:38 -06:00
rallytime
f07e8ca60d
dependencies should not be a kwarg
2015-08-26 12:09:35 -06:00
Joseph Hall
5733abca3a
Set up SPM to install -conf packages
2015-08-26 12:06:35 -06:00
rallytime
966bbfad09
Warn users if cloud driver dependencies are missing.
...
Fixes #10075
2015-08-26 12:03:01 -06:00
Colton Myers
db30926ac9
Merge pull request #26655 from cheng0919/2015.5
...
Update win_dns_client.py
2015-08-26 10:05:26 -06:00
Mike Place
d129bf4961
Merge pull request #26657 from jfindlay/top_lint
...
top file compilation fixes
2015-08-26 10:00:34 -06:00
Damon Zheng
fdebc01def
Update win_dns_client.py
...
remove trailing witespace
2015-08-26 23:21:01 +08:00
Justin Findlay
0cfe821680
Merge pull request #26659 from TheBigBear/patch-13
...
minor doc edits - spelling
2015-08-26 08:10:01 -06:00
jacobhammons
a04d243471
Merge pull request #26662 from jacobhammons/version
...
update version to 2015.5
2015-08-26 07:45:44 -06:00
Jacob Hammons
4e5766fdde
update version to 2015.5
2015-08-26 07:45:08 -06:00
TheBigBear
1d5395b27a
minor doc edits - spelling
2015-08-26 12:11:50 +01:00
Justin Findlay
1d404bd561
remove trailing whitespace in state top docs
2015-08-26 01:44:33 -06:00
Justin Findlay
a288962ac2
change md code quoting to rst in state top docs
2015-08-26 01:44:33 -06:00
Justin Findlay
ecc6ca2ab2
warn users about undefined top file merge ordering
2015-08-26 01:44:33 -06:00
Justin Findlay
81535bd5a7
check mopts and opts for top file configs
2015-08-26 01:44:33 -06:00
Justin Findlay
9ea49545bf
add default_top config to mopts
2015-08-26 01:44:33 -06:00
Justin Findlay
473170ecd6
remove unused top file configs, add comments
2015-08-26 01:44:33 -06:00
Justin Findlay
559512b0a6
add default_top description to docs
2015-08-26 01:44:33 -06:00
Damon Zheng
1d23d5e797
Update win_dns_client.py
...
remove the + diff chars and add the TypeError exception
2015-08-26 14:12:43 +08:00
Damon Zheng
1a45db0fb7
Update win_dns_client.py
...
If there is no dns address setted in the windows client, the iface_config.DNSServerSearchOrder method will return None, therefore this module will generate TypeError, 'NoneType' object is not iterable.
2015-08-26 09:49:39 +08:00
Justin Findlay
8a9a076ad4
Merge pull request #26651 from jfindlay/2015.5
...
add 2015.5.4 notes to 2015.5.5 notes
2015-08-25 18:25:28 -06:00
Justin Findlay
7386e59087
Merge pull request #26654 from jfindlay/comp_doc
...
merge #26650
2015-08-25 18:22:02 -06:00
Justin Findlay
6cee6c104f
add doc to win_pkg.compare_versions
2015-08-25 18:20:38 -06:00
