From b940693df4399cb84e73f1429c6b63eb4e8a2679 Mon Sep 17 00:00:00 2001
From: Zev Benjamin <zev@humbughq.com>
Date: Mon, 13 May 2013 13:48:00 -0400
Subject: [PATCH] puppet: Fix conflicting puppet declaration

(imported from commit da0ca23a9b8a0a7a6de7d12ef4d47f468075aeec)
---
 servers/puppet/modules/humbug/manifests/app_frontend.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers/puppet/modules/humbug/manifests/app_frontend.pp b/servers/puppet/modules/humbug/manifests/app_frontend.pp
index f61c8207b8..50ff7764fa 100644
--- a/servers/puppet/modules/humbug/manifests/app_frontend.pp
+++ b/servers/puppet/modules/humbug/manifests/app_frontend.pp
@@ -47,7 +47,7 @@ class humbug::app_frontend {
   }
   # TODO: I think we need to restart memcached after deploying this
 
-  exec {"pip6":
+  exec {"pip-django-pipeline":
     command  => "/usr/bin/pip install django-pipeline",
     creates  => "/usr/local/lib/python2.6/dist-packages/pipeline",
     require  => Package['python-pip'],