diff --git a/modules.env b/modules.env index 2e0b5bd6dd..04d1e7e641 100644 --- a/modules.env +++ b/modules.env @@ -24,21 +24,10 @@ # Source modules should use tags, explicit refs or remote branches because # we do not update local branches in this script. # Keep sorted -# freenode #puppet 2012-09-25: -# 18:25 < jeblair> i would like to use some code that someone wrote, -# but it's important that i understand how the author wants me to use -# it... -# 18:25 < jeblair> in the case of the vcsrepo module, there is -# ambiguity, and so we are trying to determine what the author(s) -# intent is -# 18:30 < jamesturnbull> jeblair: since we - being PL - are the author -# - our intent was not to limit it's use and it should be Apache -# licensed OPENSTACK_GIT_ROOT=https://git.openstack.org SOURCE_MODULES["https://git.drupal.org/project/puppet-drush"]="origin/1.0.x" -SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-vcsrepo"]="0.0.8" SOURCE_MODULES["https://github.com/biemond/biemond-wildfly"]="v1.2.4" SOURCE_MODULES["https://github.com/dalen/puppet-dnsquery"]="2.0.1" SOURCE_MODULES["https://github.com/deric/puppet-zookeeper"]="v0.5.5" @@ -144,6 +133,17 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-sudoers"]="origi INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-tmpreaper"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-ulimit"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-user"]="origin/master" +# freenode #puppet 2012-09-25: +# 18:25 < jeblair> i would like to use some code that someone wrote, +# but it's important that i understand how the author wants me to use +# it... +# 18:25 < jeblair> in the case of the vcsrepo module, there is +# ambiguity, and so we are trying to determine what the author(s) +# intent is +# 18:30 < jamesturnbull> jeblair: since we - being PL - are the author +# - our intent was not to limit it's use and it should be Apache +# licensed +INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-vcsrepo"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-zanata"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-zuul"]="origin/master"