rallytime d83727fdf9 Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/cli/api.py - salt/client/ssh/wrapper/state.py - salt/config/__init__.py - salt/crypt.py - salt/daemons/masterapi.py - salt/key.py - salt/loader.py - salt/master.py - salt/modules/archive.py - salt/modules/hipchat.py - salt/modules/pip.py - salt/modules/state.py - salt/modules/virt.py - salt/modules/x509.py - salt/state.py - salt/transport/tcp.py - salt/transport/zeromq.py - salt/utils/__init__.py - salt/utils/event.py - salt/utils/extmods.py - salt/utils/files.py - salt/utils/parsers.py - salt/utils/verify.py - tests/integration/shell/test_call.py - tests/unit/utils/test_args.py		2018-03-06 13:45:59 -05:00
..
azure.conf	Use 'driver' instead of 'provider' in test cloud configs (#37547)	2016-11-08 09:50:39 -07:00
digitalocean.conf	fix digital ocean tests	2018-02-07 14:04:37 -07:00
dimensiondata.conf	Add integration tests for dimensiondata cloud provider.	2018-02-08 08:38:58 +11:00
ec2.conf	Use 'driver' instead of 'provider' in test cloud configs (#37547)	2016-11-08 09:50:39 -07:00
gce.conf	Use 'driver' instead of 'provider' in test cloud configs (#37547)	2016-11-08 09:50:39 -07:00
gogrid.conf	Use 'driver' instead of 'provider' in test cloud configs (#37547)	2016-11-08 09:50:39 -07:00
joyent.conf	Use 'driver' instead of 'provider' in test cloud configs (#37547)	2016-11-08 09:50:39 -07:00
linode.conf	Use 'driver' instead of 'provider' in test cloud configs (#37547)	2016-11-08 09:50:39 -07:00
oneandone.conf	Initial commit of oneandone salt cloud driver.	2017-08-17 08:03:01 +00:00
profitbricks.conf	Add username/password to profitbricks conf for cloud tests	2018-02-28 17:09:28 -05:00
rackspace.conf	update provider rackspace config	2018-01-12 12:02:01 -05:00
virtualbox.conf	Provider is getting deprecated in the config	2016-02-10 21:39:35 +01:00
vmware.conf	initial commit for vmware cloud test	2017-03-28 16:23:59 -06:00
vultr.conf	Use 'driver' instead of 'provider' in test cloud configs (#37547)	2016-11-08 09:50:39 -07:00