| commit | 44af376ab1269e5ea889843f5f5fba9112ba9328 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@localhost> | Wed Mar 22 15:14:22 2017 +0000 |
| committer | Jenkins <jenkins@localhost> | Wed Mar 22 15:14:22 2017 +0000 |
| tree | 8c24a7f1825c08306d9fa9d427bdde90bdee9ce6 | |
| parent | 511141ab958be632fc85e132c0777c2be8cdfe70 [diff] | |
| parent | 544a60d1c81ac0ddffe9096b7a59e49c0740d052 [diff] |
Merge remote-tracking branch 'target/master'
diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml index 046512f..b075138 100644 --- a/salt/master/pkg.yml +++ b/salt/master/pkg.yml
@@ -7,4 +7,4 @@ - system.salt.master.formula.pkg.saltstack - system.salt.master.formula.pkg.stacklight - system.salt.master.formula.pkg.monitoring -- system.linux.system.repo.tcp_salt +- system.linux.system.repo.mcp.salt