Code

Fix file comment#51988

Code

Merged

twangboy merged 4 commits intosaltstack:developsaltstack/salt:developfrom mbunkus:fix-file-commentCopy head branch name to clipboardMar 6, 2019

+13-17

Commits

Commits on Mar 5, 2019

• file state: fix comment function if both commented & uncommented exist

  Show description for 50abd7f
  mbunkus

  committed
  50abd7f

• file state: fix uncomment function if both commented & uncommented exist

  Show description for 04e324e
  mbunkus

  committed
  04e324e

Commits on Mar 6, 2019

• tests: update for changes to file.(un)comment state functions

  mbunkus

  committed
  9b7ce29

• Merge branch 'develop' into fix-file-comment

  twangboy

  authored
  faf87cf