Merge remote-tracking branch 'origin/salt-27089' into salt-27089

Browse Source

Conflicts:
	.gitignore
	salt/config/__init__.py
	tests/integration/cloud/providers/virtualbox.py

...

This commit is contained in:

LoveIsGrief 2016-02-10 21:56:16 +01:00

parent 17735df82d d523b7316e

commit 69968f73ee

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available