# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1343749514 -7200
# Node ID 30f0bf1d3f58574c16f9f180bd56b22c5853b571
# Parent  6fe56c8896e3f7a3e0e0421cdd29428826cfe182# Parent  2446fff2bea0dd8f373aa7a947c22d866454c4a8
Merge with 2446fff2bea0dd8f373aa7a947c22d866454c4a8

diff -r 2446fff2bea0 -r 30f0bf1d3f58 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Tue Jul 31 17:31:52 2012 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Tue Jul 31 17:45:14 2012 +0200
@@ -37,6 +37,7 @@
     'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz', 'local':'mercurial-2.2.2.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'HAYSTACK': {'setup': 'django-haystack', 'url': 'https://github.com/toastdriven/django-haystack/tarball/master', 'local': 'django-haystack-v2.0.0.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'REQUEST': {'setup': 'requests', 'url':'https://github.com/kennethreitz/requests/tarball/v0.13.3', 'local':'requests-v0.13.3.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
+    'PYELASTICSEARCH': {'setup': 'pyelasticsearch', 'url':'https://github.com/toastdriven/pyelasticsearch/tarball/master', 'local':'pyelasticsearch.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 }
 
 if system_str == 'Windows':
diff -r 2446fff2bea0 -r 30f0bf1d3f58 virtualenv/web/res/res_create_env.py
--- a/virtualenv/web/res/res_create_env.py	Tue Jul 31 17:31:52 2012 +0200
+++ b/virtualenv/web/res/res_create_env.py	Tue Jul 31 17:45:14 2012 +0200
@@ -23,6 +23,9 @@
     'SOCIAL_AUTH',
     'DJANGO_GUARDIAN',
     'SORL_THUMBNAIL',
+    'HAYSTACK',
+    'REQUESTS',
+    'PYELASTICSEARCH',
 ]
 
 if system_str == "Linux":