resolve setup.py after previous merge

3a379207 · Alain Takoudjou · 06ca0683 · 3a379207
Commit 3a379207 authored Feb 14, 2013 by Alain Takoudjou
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

setup.py setup.py +2 -1

No files found.
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@ setup(name=name,
          'agent = slapos.recipe.agent:Recipe',
          'apache.frontend = slapos.recipe.apache_frontend:Recipe',
          'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
-          'apacheperl = slapos.recipe.apacheperl:Recipe', 
+          'apacheperl = slapos.recipe.apacheperl:Recipe',
          'apachephp = slapos.recipe.apachephp:Recipe',
          'apacheproxy = slapos.recipe.apacheproxy:Recipe',
 	        'boinc = slapos.recipe.boinc:Recipe',
@@ -155,6 +155,7 @@ setup(name=name,
          'pwgen = slapos.recipe.pwgen:Recipe',
          'pwgen.stable = slapos.recipe.pwgen:StablePasswordGeneratorRecipe',
          'redis.server = slapos.recipe.redis:Recipe',
+          'request = slapos.recipe.request:Recipe',
          'requestoptional = slapos.recipe.request:RequestOptional',
          'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
          'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',