Code

[master] Porting #50005 to master#54651

Code

Merged

dwoz merged 7 commits intosaltstack:mastersaltstack/salt:masterfrom garethgreenaway:2019_2_1_port_50005garethgreenaway/salt:2019_2_1_port_50005Copy head branch name to clipboardJan 6, 2020

+187

Commits

Commits on Sep 19, 2019

• Porting PR saltstack#50005 to 2019.2.1

  garethgreenaway

  committed
  d253b90

  Copy full SHA for d253b90

Commits on Sep 25, 2019

• Merge branch 'master' into 2019_2_1_port_50005

  

  Bryce Larson

  authored
  a7ed049

  Copy full SHA for a7ed049

Commits on Dec 3, 2019

• Merge branch 'master' into 2019_2_1_port_50005

  garethgreenaway

  authored
  46c097b

  Copy full SHA for 46c097b

Commits on Dec 26, 2019

• Merge branch 'master' into 2019_2_1_port_50005

  dwoz

  authored
  e1b5417

  Copy full SHA for e1b5417

Commits on Dec 27, 2019

• Merge branch 'master' into 2019_2_1_port_50005

  dwoz

  authored
  3c1e218

  Copy full SHA for 3c1e218

Commits on Jan 2, 2020

• Fix linter

  dwoz

  authored
  96ec6eb

  Copy full SHA for 96ec6eb

Commits on Jan 3, 2020

• Merge branch 'master' into 2019_2_1_port_50005

  dwoz

  authored
  bbccb62

  Copy full SHA for bbccb62