Code

Support pillar merging, generally#64

Code

Open

mikemol wants to merge 6 commits intosaltstack-formulas:mastersaltstack-formulas/zabbix-formula:masterfrom mikemol:mergable-lists-2mikemol/zabbix-formula:mergable-lists-2Copy head branch name to clipboard

+35-7

Commits

Commits on Jun 12, 2017

• Add flexjoin macro

  Show description for 1f00d0c
  mikemol

  committed
  1f00d0c

  Copy full SHA for 1f00d0c

• Support pillar merging for simple cases

  Show description for 37ed26e
  mikemol

  committed
  37ed26e

  Copy full SHA for 37ed26e

• Add flexcall macro

  Show description for c3564a0
  mikemol

  committed
  c3564a0

  Copy full SHA for c3564a0

Commits on Jun 14, 2017

• Support pillar merging of UserParameters

  Show description for 424fabf
  mikemol

  committed
  424fabf

  Copy full SHA for 424fabf

• Support pillar merging for per-line cases

  Show description for 86da726
  mikemol

  committed
  86da726

  Copy full SHA for 86da726

Commits on Jun 15, 2017

• Be specific about flexcall list case

  Show description for 95783f9
  mikemol

  committed
  95783f9

  Copy full SHA for 95783f9