Michael Steed
c390fc5932
import ipaddress the same way as in other modules
...
Use 'import ipaddress' only in python 3. In python 2, import
salt.ext.ipaddress in order to avoid importing any third-party ipaddress
module from site-packages.
2015-06-10 09:39:58 -06:00
Nicole Thomas
eced487657
Merge pull request #24542 from msteed/py3-fix-arch
...
py3: fix arch failures
2015-06-09 17:49:52 -06:00
Colton Myers
b5c5fe306d
Merge pull request #24550 from basepi/six1.9upgrade
...
Update six to 1.9.0
2015-06-09 17:29:02 -06:00
Colton Myers
c9fc2479b0
Update six to 1.9.0
2015-06-09 15:24:12 -06:00
Colton Myers
359efdfc1c
Merge pull request #24539 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-06-09 15:15:13 -06:00
Michael Steed
ddde2e1e39
use a realistic service sid in test_getsid()
2015-06-09 14:50:30 -06:00
Michael Steed
454e86a3e0
py3: fix salt/modules/win_service.py
...
Don't rely on py2 behavior when comparing str/int
2015-06-09 14:43:52 -06:00
Thomas S Hatch
1023f9b03f
Merge pull request #24476 from thatch45/rpmbuild
...
Rpmbuild
2015-06-09 14:27:02 -06:00
Michael Steed
f9cf15ad46
fix new failures on ubuntu 14.04
2015-06-09 14:18:04 -06:00
Thomas S Hatch
dfef03f789
Merge pull request #24543 from rallytime/fix_centos_prkrepo_test
...
The first arg in a state should always be name, and unfreeze name from salt/state.py
2015-06-09 14:07:14 -06:00
Nicole Thomas
a10ccc567a
Merge pull request #24536 from lyft/route53-more-record-support
...
Support all route53 record types
2015-06-09 13:41:58 -06:00
Michael Steed
f725b8e4fe
lint
2015-06-09 13:14:54 -06:00
Colton Myers
6e87ad383a
lint
2015-06-09 12:45:36 -06:00
Colton Myers
52a694b9ac
Python 3 compat
2015-06-09 12:45:31 -06:00
rallytime
eb02eee05e
The first arg in a state should always be name, and unfreeze name from salt/state.py
...
This should fix the problems with the CentOS* test failures.
2015-06-09 12:39:12 -06:00
Michael Steed
0543f9aa0d
fix tests/unit/modules/network_test.py
...
Explicitly test salt.ext.ipaddress in test_is_private() and
test_is_loopback() as originally intended.
2015-06-09 12:13:04 -06:00
Thomas S Hatch
bd64e4dfa1
Add pylint disable
2015-06-09 11:53:38 -06:00
Michael Steed
8669dacaf1
likewise in test_render_with_utf8_syntax_error()
2015-06-09 11:48:13 -06:00
Michael Steed
4b34b60623
set encoding in test_render_with_unicode_syntax_error()
2015-06-09 11:43:23 -06:00
Colton Myers
94d6ef1d17
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.ipmi.rst
doc/ref/states/all/salt.states.tls.rst
doc/topics/cloud/index.rst
doc/topics/cloud/vsphere.rst
doc/topics/eauth/index.rst
salt/cli/batch.py
salt/modules/cmdmod.py
salt/modules/ipmi.py
salt/netapi/rest_cherrypy/app.py
salt/runners/http.py
salt/states/boto_elb.py
salt/states/dockerio.py
salt/states/linux_acl.py
salt/states/win_servermanager.py
salt/wheel/config.py
2015-06-09 11:41:07 -06:00
Colton Myers
485ed3cff9
Merge pull request #24538 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-06-09 11:27:20 -06:00
Colton Myers
6a8039d468
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
salt/states/rabbitmq_vhost.py
2015-06-09 11:26:09 -06:00
Michael Steed
ce5f14bb0e
set encoding in test__unicode_match()
2015-06-09 11:19:51 -06:00
Ryan Lane
d8bf25c8ed
Support all route53 record types
2015-06-09 10:18:03 -07:00
Michael Steed
f85a3e39da
specify encoding in test_to_str()
2015-06-09 11:13:19 -06:00
Nicole Thomas
a652bef60b
Merge pull request #24532 from makinacorpus/syntax_error2
...
[CRITICAL] Fix syntax error
2015-06-09 10:59:54 -06:00
Mathieu Le Marec - Pasquet
bff68cfec0
Fix syntax error
2015-06-09 17:55:37 +02:00
Justin Findlay
73e6388acd
Merge pull request #24495 from jayeshka/rabbitmq_vhost_states-unit-test
...
adding states/rabbitmq_vhost unit test case.
2015-06-09 09:33:23 -06:00
Justin Findlay
bf1abccebe
Merge pull request #24445 from jayeshka/pyrax_queues_states-unit-test
...
adding states/pyrax_queues unit test case.
2015-06-09 09:28:45 -06:00
Thomas S Hatch
0247e8d10d
Merge pull request #24490 from aneeshusa/fix-pacman-list-upgrades
...
Fix pacman.list_upgrades for new python_shell default.
2015-06-09 09:13:16 -06:00
Thomas S Hatch
2418b1ee93
Merge pull request #24492 from DSRCompany/keep_grains_in_opts
...
Don't remove grains from opts
2015-06-09 09:11:25 -06:00
Thomas S Hatch
06279dd9b0
Merge pull request #24514 from msteed/py3-unittests-3
...
More py3 unittest fixes
2015-06-09 09:10:35 -06:00
Thomas S Hatch
6268ddb43a
Merge pull request #24517 from steverweber/ipmi_doc
...
small fixes to the ipmi docs
2015-06-09 09:10:14 -06:00
Jayesh Kariya
31889e38eb
cosmetic change.
2015-06-09 19:44:16 +05:30
Nicole Thomas
3728b3f327
Merge pull request #24524 from jayeshka/rabbitmq_vhost_states-module
...
any() takes list oy tuple.
2015-06-09 07:49:42 -06:00
Jayesh Kariya
01c99ad767
any() takes list oy tuple.
2015-06-09 18:12:53 +05:30
Jayesh Kariya
cf501cf60d
resolved error.
2015-06-09 18:10:37 +05:30
Jayesh Kariya
4bb6087722
Merge branch '2015.5' of https://github.com/saltstack/salt into rabbitmq_vhost_states-unit-test
2015-06-09 18:09:05 +05:30
Nicole Thomas
88d2eeca00
Merge pull request #24518 from rallytime/merge-24448
...
Merge #24448 with Pylint Fixes
2015-06-08 23:48:14 -06:00
Nicole Thomas
dd23de885b
Merge pull request #24482 from eliasp/2015.5-states.dockerio-docker.running-doc
...
'docker.running' needs now the 'image' param.
2015-06-08 22:43:04 -06:00
Elias Probst
5de741d626
'docker.running' needs now the 'image' param.
2015-06-09 06:41:33 +02:00
Nicole Thomas
de8a08bbc0
Merge pull request #24356 from kev009/cmdmod-notimeout
...
ignore_timeout on cmd.run/watch
2015-06-08 22:40:09 -06:00
rallytime
28af2bfe2b
Pylint fix
2015-06-08 22:31:44 -06:00
Nicole Thomas
87e1c6008c
Merge pull request #24459 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-06-08 22:27:08 -06:00
Nicole Thomas
2a727c3f55
Merge pull request #24515 from basepi/susexml23503
...
[2015.5] Add xml library to the salt-thin
2015-06-08 22:10:06 -06:00
Nicole Thomas
6ebc476bb3
Merge pull request #24513 from jquast/2014.7-bugfix-iteritem
...
bugfix use of 'iteritem' in 2014.7 branch
2015-06-08 22:06:36 -06:00
Nicole Thomas
cadba530f1
Merge pull request #24509 from jdsieci/develop
...
BugFix in new RH route template
2015-06-08 22:02:36 -06:00
Nicole Thomas
274815b00b
Merge pull request #24505 from UtahDave/develop
...
Add missing string formatting
2015-06-08 21:57:49 -06:00
Nicole Thomas
18a09f4e61
Merge pull request #24503 from garethgreenaway/refactor_random_salt_utils_http
...
Fixes to random_org.py
2015-06-08 21:56:53 -06:00
Nicole Thomas
fce998a58b
Merge pull request #24497 from jayeshka/rbenv_states-unit-test
...
adding states/rbenv unit test case.
2015-06-08 21:56:09 -06:00
