Commit History

Autor SHA1 Mensaxe Data
  Pedro Algarvio f92b4d0bf9 Syntax/Lint fixes missed from merge forward %!s(int64=5) %!d(string=hai) anos
  Pedro Algarvio aaa399c7a7 Merge branch 'merge-forward/2018.3-to-2019.2' into merge-forward/2019.2-develop %!s(int64=5) %!d(string=hai) anos
  Ch3LL fc70884ca1 Reload matcher loader when ext_pillar_first set %!s(int64=5) %!d(string=hai) anos
  Dmitry Kuzmenko 8034033191 Merge branch '2019.2' into develop %!s(int64=5) %!d(string=hai) anos
  Wayne Werner ee3115fa94 Allow leading dots and / as pillar separators %!s(int64=5) %!d(string=hai) anos
  Wayne Werner 8342898763 Allow pillar relative includes %!s(int64=5) %!d(string=hai) anos
  Pedro Algarvio 0ac7520c67 Merge remote-tracking branch 'upstream/fluorine' into merge-forward/fluorine-develop %!s(int64=6) %!d(string=hai) anos
  Pedro Algarvio 0f5525dcc2 Fix mocking %!s(int64=6) %!d(string=hai) anos
  Pedro Algarvio 0545cb5c7a Point paths to RUNTIME_VARS %!s(int64=6) %!d(string=hai) anos
  rallytime 82e73fe49d Merge branch '2018.3' into 'fluorine' %!s(int64=6) %!d(string=hai) anos
  Erik Johnson f59506d4cc Update tests to reflect behavior changes %!s(int64=6) %!d(string=hai) anos
  Erik Johnson 0125185fdb lint %!s(int64=6) %!d(string=hai) anos
  Erik Johnson b829729fec Fix pillar unit tests to work properly with loader-based matchers %!s(int64=6) %!d(string=hai) anos
  C. R. Oldham 34d3ef0900 Remove Matcher class and use the bare loader. %!s(int64=6) %!d(string=hai) anos
  rallytime 18936bc5c1 Add optimization_order to unit test mocks %!s(int64=6) %!d(string=hai) anos
  rallytime 6e6091c3ba Merge branch '2018.3' into 'fluorine' %!s(int64=6) %!d(string=hai) anos
  rallytime 83a15cb623 Add optimization_order config to mocked opts %!s(int64=6) %!d(string=hai) anos
  rallytime 201031fa8a Merge branch '2017.7' into '2018.3' %!s(int64=6) %!d(string=hai) anos
  Erik Johnson 0441cd56ef Add optimization_order to mocking %!s(int64=6) %!d(string=hai) anos
  rallytime 7dc1e770c4 Merge branch '2018.3' into 'develop' %!s(int64=6) %!d(string=hai) anos
  rallytime 3273bbdab7 Merge branch '2017.7' into '2018.3' %!s(int64=6) %!d(string=hai) anos
  Erik Johnson 93ee5ee2b0 Fix all Sphinx warnings %!s(int64=6) %!d(string=hai) anos
  Erik Johnson d185f97a47 mocked file_roots and pillar_roots should be dicts %!s(int64=6) %!d(string=hai) anos
  Erik Johnson 3df82869d0 Mock __gather_avail in test_includes_override_sls %!s(int64=6) %!d(string=hai) anos
  Erik Johnson af83a5755d mocked file_roots and pillar_roots should be dicts %!s(int64=6) %!d(string=hai) anos
  Erik Johnson ba4ac60787 Remove trailing whitespace %!s(int64=6) %!d(string=hai) anos
  rallytime 5b50eaf6b0 Merge branch '2018.3' into 'develop' %!s(int64=6) %!d(string=hai) anos
  rallytime e312efb5e7 Merge branch '2017.7' into '2018.3' %!s(int64=6) %!d(string=hai) anos
  rallytime 2c4668a5cb Merge branch '2018.3' into 'develop' %!s(int64=6) %!d(string=hai) anos
  Nicole Thomas fadc5e4ba4 Merge pull request #46669 from terminalmage/pillar-merge-order %!s(int64=6) %!d(string=hai) anos