Commit History

Author SHA1 Message Date
  Ali Rizvi-Santiago 7a3f6964af Re-fixed the copy-pasta error in the wempy_variable test from unit.utils.test_templates so it doesn't check for xml that wasn't defined in the template. 5 years ago
  Ali Rizvi-Santiago 56143af938 Fixed a copy-pasta error in the unit.utils.test_templates test that resulted in rendering with genshi for a test that should've been against wempy. 5 years ago
  Ali Rizvi-Santiago a944de483c Added all of the available template packages (Cheetah3, Genshi, Mako, wempy) to the requirements/base.txt file with the hope that the unit-tests will pick them up properly. 5 years ago
  Ali Rizvi-Santiago c6fd7ca554 Revert "Added all of the template packages (Cheetah3, Genshi, Mako, wempy) to the requirements.txt file with the hope that the unit-tests will pick them up." 5 years ago
  Ali Rizvi-Santiago d95774e71e Added all of the template packages (Cheetah3, Genshi, Mako, wempy) to the requirements.txt file with the hope that the unit-tests will pick them up. 5 years ago
  Ali Rizvi-Santiago 8734cd945b Revert "Added all of the template packages (Cheetah3, Genshi, Mako, wempy) to all of the files under requirements/static/py* with the hopes that the unit-tests pick them up." 5 years ago
  Ali Rizvi-Santiago be70b9d805 Added all of the template packages (Cheetah3, Genshi, Mako, wempy) to all of the files under requirements/static/py* with the hopes that the unit-tests pick them up. 5 years ago
  Ali Rizvi-Santiago b93200c28b Fixed lint issues in the new unit tests for tests.unit.utils.test_templates. 5 years ago
  Ali Rizvi-Santiago 0e6e793ce2 Ugh..Added unit tests for rendering all of the template types as unit.utils.test_templates since nobody has done this. 5 years ago
  Ali Rizvi-Santiago bd60898929 Modified the render_cheetah_tmpl() function in salt.util.templates to call the correct methods depending on Python2 vs Python3. 5 years ago
  Ali Rizvi-Santiago 50cd57d030 Fix the Cheetah template renderer in salt.utils.templates. 5 years ago
  Daniel Wozniak 7b5fa8401b Merge branch 'master' into 2019_2_1_port_50374 5 years ago
  Daniel Wozniak d5ff9a5b17 Merge branch 'master' into 2019_2_1_port_52749 5 years ago
  Daniel Wozniak 2f4bfcc165 Merge branch 'master' into virt_pool_delete_fix 5 years ago
  MichaelSaah f562c53d82 Merge branch 'master' into patch-1 5 years ago
  MichaelSaah c475f9e760 remove trailing whitespace 5 years ago
  Tyler Johnson 6e3523d009 isolated salt.utils.json changes to #55660 5 years ago
  Tyler Johnson 8c99fe9b67 Allow msgpack to be accessed easily by reference 5 years ago
  Tyler Johnson 89b01b565c Consistently use msgpack module, added tests 5 years ago
  Sebastian Marsching 3fe5deda93 Use original msgpack module where needed. 6 years ago
  Sebastian Marsching 9c7d98e732 Consistently use salt.utils.json and salt.utils.msgpack. 6 years ago
  rallytime 42dcfeab31 Master Port #49779 6 years ago
  Megan Wilhite 59673bdbe2 Merge branch 'master' into issue_49414 5 years ago
  Tyler Johnson a01f842ee6 Merge branch 'master' of https://github.com/saltstack/salt into use_packaged_jsonlibs 5 years ago
  Tyler Johnson 2e28cd5638 Do not import json functions directly 5 years ago
  Pedro Algarvio 44fbc4004a Tell PyTest tests were skipped by a mark 5 years ago
  Pedro Algarvio c4712e3b78 Add some pylint disables 5 years ago
  Pedro Algarvio 7de939f6b2 All salt imports should be done at the global module level 5 years ago
  Pedro Algarvio b539b561e0 The `skip_if_not_root` pytest marker is now windows compatible 5 years ago
  Pedro Algarvio 64a3739d00 Use `salt.serializers.yaml.deserialize()` to avoid deprecation warnings 5 years ago