Code

[master] Porting #51074 to master#54613

Code

Merged

dwoz merged 9 commits intosaltstack:mastersaltstack/salt:masterfrom garethgreenaway:2019_2_1_port_51074garethgreenaway/salt:2019_2_1_port_51074Copy head branch name to clipboardJan 2, 2020

+21

Commits

Commits on Sep 19, 2019

• Porting PR saltstack#51074 to 2019.2.1

  garethgreenaway

  committed
  4e95bdc

  Copy full SHA for 4e95bdc

Commits on Dec 3, 2019

• Add disk test for fat argument

  Ch3LL

  committed
  05983ce

  Copy full SHA for 05983ce

• Merge pull request #3 from Ch3LL/add_disk_test

  Show description for e9f0e00
  garethgreenaway

  authored
  e9f0e00

  Copy full SHA for e9f0e00

• Merge branch 'master' into 2019_2_1_port_51074

  Ch3LL

  authored
  865e59b

  Copy full SHA for 865e59b

• Fix mock tuple call_args_list

  Ch3LL

  committed
  9437276

  Copy full SHA for 9437276

• Merge branch 'master' into 2019_2_1_port_51074

  Ch3LL

  authored
  9bc7cef

  Copy full SHA for 9bc7cef

• Merge pull request #4 from Ch3LL/add_disk_test

  Show description for 8e9bfac
  garethgreenaway

  authored
  8e9bfac

  Copy full SHA for 8e9bfac

• Merge branch 'master' into 2019_2_1_port_51074

  Ch3LL

  authored
  008cf0e

  Copy full SHA for 008cf0e

Commits on Dec 21, 2019

• Merge branch 'master' into 2019_2_1_port_51074

  Ch3LL

  authored
  b74465f

  Copy full SHA for b74465f