commit 44af376ab1269e5ea889843f5f5fba9112ba9328
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
parent 544a60d1c81ac0ddffe9096b7a59e49c0740d052

Merge remote-tracking branch 'target/master'

linux/system/repo/glusterfs.yml

diff --git a/linux/system/repo/glusterfs.yml b/linux/system/repo/glusterfs.yml
new file mode 100644
index 0000000..da4cddf
--- /dev/null
+++ b/linux/system/repo/glusterfs.yml
@@ -0,0 +1,9 @@
+parameters:
+  linux:
+    system:
+      repo:
+        glusterfs-ppa:
+          source: "deb http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu trusty main"
+          architectures: amd64
+          key_id: 3FE869A9
+          key_server: keyserver.ubuntu.com
\ No newline at end of file

openssh/server/team/mmo_devops.yml

diff --git a/openssh/server/team/mmo_de.yml b/openssh/server/team/mmo_devops.yml
similarity index 100%
rename from openssh/server/team/mmo_de.yml
rename to openssh/server/team/mmo_devops.yml