Commit History

Author SHA1 Message Date
  rallytime 19598d8802 Merge branch '2017.7' into '2018.3' 6 years ago
  Daniel A. Wozniak dbe40df7de Increase timeout for flaky git test 6 years ago
  rallytime b3a5aa49d7 Merge branch '2017.7' into '2018.3' 6 years ago
  Erik Johnson c61f75cb50 Fix failing git worktree tests 6 years ago
  Daniel A. Wozniak e8362adf71 fopen does not support encoding 6 years ago
  Daniel A. Wozniak 487161ba8f Fix file encoding on windows 6 years ago
  Daniel A Wozniak fc760685ee Fix multiple git module tests 6 years ago
  Erik Johnson f59cee28db Remove hacky workarounds to get encode/decode tests to pass on Windows 6 years ago
  twangboy 661a0687ec Fix git utf-8 issues for Windows 6 years ago
  Erik Johnson 9c86cd627a [PY3] Add unicode_literals to high-priority modules/states 6 years ago
  Erik Johnson 3184168365 Use explicit unicode strings + break up salt.utils 7 years ago
  rallytime 1f0b90aa57 Merge branch '2017.7' into 'develop' 7 years ago
  rallytime ccf790a83f Update all references for moved functions to use "files" util 7 years ago
  rallytime 7aa31ff030 Merge branch '2016.11' into '2017.7' 7 years ago
  Pedro Algarvio 61003bca0a Take care of resource leakage on tests 7 years ago
  Pedro Algarvio 2ee6d5d589 Import from the original modules not `tests.integration` 7 years ago
  Pedro Algarvio 6dcf7552a7 Py3 fixes. Tests are not destructive. 7 years ago
  Pedro Algarvio 0b41b92d7d Use `salt.utils.versions` instead of `distutils.version` 7 years ago
  Pedro Algarvio 07d0a5ed20 Cleanup after ourselves 7 years ago
  twangboy 2a6e61a42e Add encode for Py3 compatability 7 years ago
  twangboy 54891a57b1 Fix type in second worktree_path 7 years ago
  twangboy ef53ec7efe Fix test_worktree_add_rm test for Windows 7 years ago
  Pedro Algarvio 40a64191a1 Absolute imports and A LOT of code cleanup. 7 years ago
  Pedro Algarvio 3beb3fb801 Move whatever we need from salttesting to salt. 7 years ago
  Pedro Algarvio 15af4c9728 Test filenames conformity. Adjust for pytest. 7 years ago