commit b3e8f30616eb6e462921bff8f2ec943ddda59255
author jenkins-mk jenkins-mk <jenkins-mk@gerrit.mcp.mirantis.net> Thu Mar 30 10:34:23 2017 +0000
committer Gerrit Code Review <gerrit2@8d47cb36f245> Thu Mar 30 10:34:24 2017 +0000
tree 84c5dddcfe1c02c4b364a09e1f0936c446ee4965
parent 0f96f93030f43bab3695ec48c19bd4f68945abe3
parent 380e2d0cfb55afc93119c58f9c70c1f99948d8c6

Merge "Add OSS Tooling git/pkg for salt-master"

salt/master/git.yml

diff --git a/salt/master/git.yml b/salt/master/git.yml
index 02d0b67..267bdb1 100644
--- a/salt/master/git.yml
+++ b/salt/master/git.yml
@@ -4,6 +4,7 @@
 - system.salt.master.formula.git.foundation
 - system.salt.master.formula.git.kubernetes
 - system.salt.master.formula.git.openstack
+- system.salt.master.formula.git.oss
 - system.salt.master.formula.git.saltstack
 - system.salt.master.formula.git.stacklight
 - system.salt.master.formula.git.monitoring

salt/master/pkg.yml

diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml
index b075138..1001d49 100644
--- a/salt/master/pkg.yml
+++ b/salt/master/pkg.yml
@@ -4,6 +4,7 @@
 - system.salt.master.formula.pkg.foundation
 - system.salt.master.formula.pkg.kubernetes
 - system.salt.master.formula.pkg.openstack
+- system.salt.master.formula.pkg.oss
 - system.salt.master.formula.pkg.saltstack
 - system.salt.master.formula.pkg.stacklight
 - system.salt.master.formula.pkg.monitoring