Merge branch 'develop' of http://github.com/ckochenower/salt into develop

Browse Source

Conflicts:
	salt/returners/cassandra_cql_return.py

...

This commit is contained in:

Corin Kochenower 2015-04-29 05:51:46 +00:00

parent a8235b3188 1803027572

commit b2d9189c9b

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