rallytime 95dbe1ade4 Merge branch '2016.3' into 'carbon' ... Conflicts: - salt/fileserver/__init__.py - setup.py - tests/integration/modules/git.py		2016-09-14 09:15:29 -06:00
..
helpers	Remove iteritems() references from integration tests	2016-07-19 10:15:23 -06:00
providers	Merge branch '2016.3' into 'carbon'	2016-09-14 09:15:29 -06:00
__init__.py	salt-cloud tests for linode	2014-06-09 14:49:49 -06:00