Commit Graph

3 Commits

Author SHA1 Message Date
twangboy
e9febe4893 Fix unit.test_fileclient
Use os.sep instead of hard-coded, unix-style paths
2017-08-15 16:34:03 -06:00
rallytime
292f55600b Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/fileserver/s3fs.py
  - tests/unit/test_fileclient.py
2017-04-17 13:32:56 -06:00
rallytime
67d08f60ff Fixup fileclient_test file to conform to new standards 2017-04-10 14:09:41 -06:00