rallytime
7dc1e770c4
Merge branch '2018.3' into 'develop'
...
Conflicts:
- doc/topics/installation/freebsd.rst
- salt/cloud/clouds/oneandone.py
- salt/grains/core.py
- salt/modules/napalm_ntp.py
- salt/modules/win_update.py
- salt/modules/win_wua.py
- salt/modules/zabbix.py
- salt/renderers/pass.py
- salt/states/vault.py
- tests/unit/states/test_win_update.py
2018-06-06 13:35:36 -04:00
Erik Johnson
a1ce0631fd
Use @property instead of @staticmethod for config_dir
...
We're not passing arguments and we're just getting back a string
contstant, so there's no need to make this a staticmethod.
2018-06-05 14:10:33 -05:00
rallytime
be8d34ec21
Merge branch '2018.3' into 'develop'
...
No conflicts.
2018-06-01 15:19:09 -04:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/ref/configuration/master.rst
- doc/ref/modules/all/index.rst
- doc/topics/grains/index.rst
- doc/topics/releases/2016.3.4.rst
- doc/topics/spm/spm_formula.rst
- doc/topics/tutorials/cron.rst
- doc/topics/tutorials/index.rst
- doc/topics/tutorials/stormpath.rst
- salt/engines/slack.py
- salt/log/handlers/fluent_mod.py
- salt/modules/cyg.py
- salt/modules/junos.py
- salt/modules/namecheap_dns.py
- salt/modules/namecheap_domains.py
- salt/modules/namecheap_ns.py
- salt/modules/namecheap_ssl.py
- salt/modules/namecheap_users.py
- salt/modules/reg.py
- salt/modules/tomcat.py
- salt/modules/vault.py
- salt/modules/win_file.py
- salt/modules/zpool.py
- salt/output/highstate.py
- salt/renderers/pass.py
- salt/runners/cache.py
- salt/states/boto_apigateway.py
- salt/states/boto_iam.py
- salt/states/boto_route53.py
- salt/states/msteams.py
- salt/states/reg.py
- salt/states/win_iis.py
- tests/integration/modules/test_cmdmod.py
- tests/integration/states/test_user.py
- tests/support/helpers.py
- tests/unit/cloud/clouds/test_openstack.py
- tests/unit/fileserver/test_gitfs.py
- tests/unit/modules/test_junos.py
- tests/unit/pillar/test_git.py
- tests/unit/states/test_win_path.py
- tests/unit/test_pillar.py
- tests/unit/utils/test_format_call.py
- tests/unit/utils/test_utils.py
- tests/unit/utils/test_warnings.py
2018-06-01 14:54:12 -04:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings
...
Well, all but one, which we expect to see
2018-05-31 15:28:25 -05:00
rallytime
d9096653f7
Merge branch '2018.3' into 'develop'
...
Conflicts:
- salt/cloud/__init__.py
- tests/integration/cloud/providers/test_ec2.py
- tests/support/paths.py
2018-05-29 11:28:06 -04:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/modules/win_snmp.py
- tests/integration/modules/test_saltutil.py
- tests/integration/states/test_pkg.py
- tests/support/helpers.py
- tests/support/runtests.py
- tests/unit/fileserver/test_gitfs.py
- tests/whitelist.txt
2018-05-29 11:14:39 -04:00
Daniel A. Wozniak
be8dcd21f1
Try an even bigger timeout
2018-05-23 11:08:14 -07:00
rallytime
4abfd26e86
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- requirements/dev_python27.txt
- requirements/dev_python34.txt
- salt/fileclient.py
- salt/output/__init__.py
- salt/serializers/configparser.py
- salt/states/pkg.py
- salt/states/zpool.py
- salt/transport/tcp.py
- tests/integration/cloud/providers/test_ec2.py
- tests/integration/modules/test_mac_user.py
- tests/integration/modules/test_pip.py
- tests/integration/modules/test_pkg.py
- tests/integration/modules/test_service.py
- tests/integration/states/test_pip_state.py
- tests/integration/states/test_user.py
- tests/unit/modules/test_cmdmod.py
2018-05-23 12:33:00 -04:00
Daniel A. Wozniak
d5eafe9d53
Use common timeout variable
2018-05-22 13:27:26 -07:00
Daniel A. Wozniak
7e948eb540
Increase ec2 cloud timeouts to 1000
2018-05-22 12:23:31 -07:00
Daniel A. Wozniak
f89668920a
Be explicit about winrm setting
2018-05-21 14:29:17 -07:00
Daniel A. Wozniak
e88833a07d
Cloud test fixup
...
- Increase winrm timeout
- Ignore winrm tests when dependencies are missing
2018-05-20 01:24:03 -07:00
Daniel A. Wozniak
f990a65ea6
Fix linter issues
2018-04-29 01:43:54 -07:00
Daniel A. Wozniak
86e25cf4f1
Add support for pypsexec and smbprotocol
...
- Removes the need for winexe which is not packaged for all platforms we
support. The replacement, pypsexec, is pure python so it will work
everywhere.
- Add support for smbprotocol to be used instead of impacket.
smbprotocol supports python 3 and is also used by pypsexec.
2018-04-29 00:36:27 -07:00
rallytime
1ad8ed89ac
Merge branch '2018.3' into 'develop'
...
Conflicts:
- salt/grains/core.py
- salt/renderers/gpg.py
2018-04-10 10:16:50 -04:00
rallytime
0a297e7319
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/grains/core.py
- salt/utils/__init__.py
2018-04-05 13:43:51 -04:00
rallytime
5b50eaf6b0
Merge branch '2018.3' into 'develop'
...
Conflicts:
- doc/ref/proxy/all/salt.proxy.cimc.rst
- doc/ref/proxy/all/salt.proxy.panos.rst
- doc/topics/releases/2018.3.0.rst
- salt/modules/cmdmod.py
- salt/modules/state.py
- salt/utils/schedule.py
- tests/integration/modules/test_state.py
2018-04-05 13:25:46 -04:00
Daniel A. Wozniak
dc54fc53c3
Fix multiple typos causing tests to fail
2018-04-04 14:20:51 -07:00
rallytime
4ad50bbdee
Update old utils paths to new paths
2018-04-03 14:46:56 -04:00
rallytime
893196d3e6
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/conf.py
- salt/loader.py
- salt/modules/dockermod.py
- salt/modules/sensehat.py
- salt/utils/parsers.py
- tests/integration/cloud/providers/test_ec2.py
- tests/integration/modules/test_cp.py
- tests/integration/modules/test_groupadd.py
- tests/integration/spm/test_man_spm.py
- tests/integration/states/test_npm.py
- tests/unit/states/test_environ.py
2018-04-03 14:33:11 -04:00
Daniel A. Wozniak
eabc234e5d
Fix config override name
2018-03-29 13:41:06 -07:00
Daniel A. Wozniak
810042710d
Set default cloud test timeout back to 500 seconds
2018-03-28 20:39:03 -07:00
Daniel A. Wozniak
5ac89ad307
Use winrm_verify_ssl option causing tests to pass
2018-03-28 20:21:40 -07:00
Daniel A. Wozniak
ba5f11476c
Adding windows minion tests for salt cloud
2018-03-28 15:16:54 -07:00
rallytime
2c4668a5cb
Merge branch '2018.3' into 'develop'
...
Conflicts:
- salt/modules/kubernetes.py
- salt/states/netconfig.py
- salt/states/zfs.py
- tests/integration/cloud/providers/test_profitbricks.py
- tests/integration/scheduler/test_eval.py
- tests/unit/grains/test_core.py
- tests/unit/test_pillar.py
2018-03-27 11:57:29 -04:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- .kitchen.yml
- Gemfile
- pkg/windows/build_env_2.ps1
- pkg/windows/build_env_3.ps1
- pkg/windows/req.txt
- salt/client/ssh/__init__.py
- salt/client/ssh/ssh_py_shim.py
- salt/modules/boto_vpc.py
- salt/modules/file.py
- salt/modules/heat.py
- salt/modules/smartos_vmadm.py
- salt/modules/win_dsc.py
- salt/returners/elasticsearch_return.py
- salt/runners/salt.py
- salt/states/module.py
- salt/utils/win_functions.py
- setup.py
- tests/integration/modules/test_state.py
- tests/unit/grains/test_core.py
- tests/unit/test_pillar.py
2018-03-15 17:22:05 -04:00
Nicole Thomas
98e3260b9a
Merge pull request #46548 from Ch3LL/profit_test
...
profitbrick test: check for foo,bar username,password set in profitbrick config
2018-03-15 10:25:27 -04:00
Ch3LL
bb338c464c
Fix dimensionsdata test random_name call
2018-03-14 15:28:06 -04:00
Ch3LL
db96c4e72e
check for foo,bar username,password set in profitbrick config
2018-03-14 14:57:48 -04:00
rallytime
6927642321
Merge branch '2018.3' into 'develop'
...
Conflicts:
- doc/conf.py
- salt/modules/cmdmod.py
- salt/utils/schedule.py
- tests/integration/scheduler/test_eval.py
2018-02-26 14:23:06 -05:00
rallytime
e060a74fd8
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/cloud/clouds/dimensiondata.py
- salt/config/__init__.py
- salt/modules/yumpkg.py
- salt/pillar/ec2_pillar.py
- salt/utils/docker/__init__.py
- salt/utils/vault.py
- tests/integration/states/test_docker_container.py
- tests/unit/modules/test_yumpkg.py
- tests/unit/templates/test_jinja.py
- tests/unit/utils/test_docker.py
2018-02-14 16:31:31 -05:00
Adam Friedman
1a75786b5a
Fix linter warnings.
...
saltstack/salt#45884
2018-02-09 05:16:59 +11:00
Adam Friedman
de26b03e2c
Fix copy/paste bug in dimensiondata provider integration test.
...
saltstack/salt#45884
2018-02-08 08:39:07 +11:00
Adam Friedman
6b1b6be427
Add integration tests for dimensiondata cloud provider.
...
saltstack/salt#45884
2018-02-08 08:38:58 +11:00
Daniel Wallace
57ab20308e
fix msazure cloud test
2018-02-06 14:50:20 -07:00
Daniel Wallace
f88ff75c19
fix gce tests
2018-02-06 13:27:11 -07:00
rallytime
c031a4b535
Merge branch 'oxygen' into 'develop'
...
Conflicts:
- salt/utils/cloud.py
2018-01-31 13:15:40 -05:00
Nicole Thomas
3cad6affbb
Lint: Add extra blank line
2018-01-31 09:29:33 -05:00
Gareth J. Greenaway
59fc7fcb34
Bumping up the timeout for integration.cloud.providers.test_ec2 tests.
2018-01-30 15:01:36 -08:00
rallytime
d76813d30d
Merge branch 'oxygen' into 'develop'
...
Conflicts:
- salt/modules/swarm.py
2018-01-14 10:47:45 -05:00
Ch3LL
40677cad21
migrate rackspace to openstack in cloud test
2018-01-12 11:08:28 -05:00
rallytime
ec50759409
Merge branch 'oxygen' into 'develop'
...
Conflicts:
- salt/cloud/clouds/profitbricks.py
2018-01-11 16:04:22 -05:00
Daniel Wallace
64d7cf165e
if check should be not
2018-01-05 14:43:13 -07:00
denza
b124fc2123
Merge branch 'develop' of github.com:saltstack/salt into profitbricks_cloudapi_v4
2018-01-05 19:43:55 +01:00
Erik Johnson
d3f8c13414
[PY3] Add unicode_literals to salt-cloud modules
2018-01-04 13:39:59 -06:00
denza
f21e04143b
Merge branch 'develop' of github.com:saltstack/salt into profitbricks_cloudapi_v4
2018-01-03 22:18:03 +01:00
Nicole Thomas
b3e0146ca1
Lint: 2 spaces before comment
2017-12-30 16:10:37 -05:00
Daniel Wallace
1182f250ca
fix up rackspace/openstack cloud test
2017-12-30 11:09:45 -07:00
Erik Johnson
7b13a7df8b
Replace json module usage with a helper to ensure unicode content is handled properly
...
This adds wrappers for json.dump{,s} which disable `ensure_ascii` by
default.
2017-12-27 09:30:58 -06:00
