From 6170de18d6b8ee868b986e7d1a4b89badf6b6871 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 11 Apr 2014 14:23:57 +1000 Subject: [PATCH 1/3] Switching gluster to master branch where RHS and other fixes have been merged --- gluster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluster b/gluster index 8139b8985..b948c83c5 160000 --- a/gluster +++ b/gluster @@ -1 +1 @@ -Subproject commit 8139b898583ddd6f1a71df235719faec8305d161 +Subproject commit b948c83c52c512bf1f1898c02bb4f03ce5a04148 From bb9442cdbbfa55b285845edb92d1c0b0790fc4ea Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 11 Apr 2014 14:56:11 +1000 Subject: [PATCH 2/3] Adding gluster extra common module --- .gitmodules | 3 +++ common | 1 + 2 files changed, 4 insertions(+) create mode 160000 common diff --git a/.gitmodules b/.gitmodules index 7141441cf..8c412d2c8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -100,3 +100,6 @@ [submodule "gluster"] path = gluster url = https://github.com/purpleidea/puppet-gluster +[submodule "common"] + path = common + url = git@github.com:purpleidea/puppet-common diff --git a/common b/common new file mode 160000 index 000000000..2c0ed2844 --- /dev/null +++ b/common @@ -0,0 +1 @@ +Subproject commit 2c0ed2844c606fd806bde0c02e47e79c88fab4a9 From 062d006a48c167ff853cd7f812c8704a8d6f0ef8 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 11 Apr 2014 14:58:13 +1000 Subject: [PATCH 3/3] Adding gluster extra puppet module --- .gitmodules | 3 +++ puppet | 1 + 2 files changed, 4 insertions(+) create mode 160000 puppet diff --git a/.gitmodules b/.gitmodules index 217d7a438..e3337f591 100644 --- a/.gitmodules +++ b/.gitmodules @@ -103,3 +103,6 @@ [submodule "common"] path = common url = git@github.com:purpleidea/puppet-common +[submodule "puppet"] + path = puppet + url = git@github.com:purpleidea/puppet-puppet diff --git a/puppet b/puppet new file mode 160000 index 000000000..07ec49d1f --- /dev/null +++ b/puppet @@ -0,0 +1 @@ +Subproject commit 07ec49d1f67a498b31b4f164678a76c464e129c4