Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5

Browse source

Conflicts:
    salt/minion.py

...

This commit is contained in:

Colton Myers 2015-07-20 13:26:44 -06:00

parent 50c257b1d5 09ebaceca8

commit 3bf2f1a722

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 is not available