Merge branch 'develop' into feature/issue-240-parse-messages-from-logs

praekeltfoundation · Apr 16, 2012 · a55930c · a55930c
2 parents eea47be + 5dc7463
commit a55930c
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 692 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -5,7 +5,6 @@ Vagrant::Config.run do |config|
 
   config.vm.provision :puppet do |puppet|
     puppet.options = "--verbose"
-    puppet.module_path = "puppet/modules"
     puppet.manifests_path = "puppet/manifests"
     puppet.manifest_file = "vumi.pp"
   end

diff --git a/puppet/modules/rabbitmq/manifests/init.pp b/puppet/modules/rabbitmq/manifests/init.pp
diff --git a/puppet/modules/rabbitmq/manifests/permissions.pp b/puppet/modules/rabbitmq/manifests/permissions.pp
diff --git a/puppet/modules/rabbitmq/manifests/plugin.pp b/puppet/modules/rabbitmq/manifests/plugin.pp
diff --git a/puppet/modules/rabbitmq/manifests/user.pp b/puppet/modules/rabbitmq/manifests/user.pp
diff --git a/puppet/modules/rabbitmq/manifests/vhost.pp b/puppet/modules/rabbitmq/manifests/vhost.pp
diff --git a/puppet/modules/redis/LICENSE b/puppet/modules/redis/LICENSE
diff --git a/puppet/modules/redis/README b/puppet/modules/redis/README
diff --git a/puppet/modules/redis/files/logrotate b/puppet/modules/redis/files/logrotate
diff --git a/puppet/modules/redis/manifests/defines/redis_server.pp b/puppet/modules/redis/manifests/defines/redis_server.pp
diff --git a/puppet/modules/redis/manifests/defines/redis_source.pp b/puppet/modules/redis/manifests/defines/redis_source.pp
diff --git a/puppet/modules/redis/manifests/init.pp b/puppet/modules/redis/manifests/init.pp