Merge remote-tracking branch 'origin/master'

dzungdo · May 28, 2013 · 2319200 · 2319200
2 parents 331d123 + c28365d
commit 2319200
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "installer_puppet/puppet-puppet"]
+ path = installer_puppet/puppet-puppet
+ url = git:https://github.com/cwolferh/puppet-puppet.git
+[submodule "installer_puppet/puppet-foreman"]
+ path = installer_puppet/puppet-foreman
+ url = git:https://github.com/cwolferh/puppet-foreman.git
+[submodule "installer_puppet/puppet-foreman_proxy"]
+ path = installer_puppet/puppet-foreman_proxy
+ url = git:https://github.com/cwolferh/puppet-foreman_proxy.git
+[submodule "installer_puppet/puppet-passenger"]
+ path = installer_puppet/puppet-passenger
+ url = git:https://github.com/cwolferh/puppet-passenger.git
diff --git a/installer_puppet/puppet-foreman b/installer_puppet/puppet-foreman
diff --git a/installer_puppet/puppet-foreman_proxy b/installer_puppet/puppet-foreman_proxy
diff --git a/installer_puppet/puppet-passenger b/installer_puppet/puppet-passenger
diff --git a/installer_puppet/puppet-puppet b/installer_puppet/puppet-puppet