rallytime 29f45c192c Merge branch '2016.11' into 'develop' ... Conflicts: - salt/cloud/clouds/ec2.py - salt/modules/grains.py		2016-12-12 11:23:57 -07:00
..
helpers	Remove iteritems() references from integration tests	2016-07-19 10:15:23 -06:00
providers	Merge branch '2016.11' into 'develop'	2016-12-12 11:23:57 -07:00
__init__.py	salt-cloud tests for linode	2014-06-09 14:49:49 -06:00