Permalink
Browse files

Merge pull request #204 from wraithan/master

Got pyes to build on readthedocs.org
  • Loading branch information...
2 parents b404f86 + 532d732 commit 12efcc2ecc145cde403ab89be14eb5423305cf77 @aparo aparo committed Aug 23, 2012
Showing with 3 additions and 2 deletions.
  1. +2 −2 docs/conf.py
  2. +1 −0 docs/requirements.txt
View
@@ -12,7 +12,8 @@
#import settings
#from django.core.management import setup_environ
-from django.conf import settings as dsettings
+# Commenting out the following line as it is not used.
+#from django.conf import settings as dsettings
#setup_environ(settings)
#dsettings.configure()
import pyes as info
@@ -80,4 +81,3 @@
('index', 'pyes.tex', ur'PyES Documentation',
ur'Elastic Search', 'manual'),
]
-
View
@@ -0,0 +1 @@
+thrift

0 comments on commit 12efcc2

Please sign in to comment.