You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2012/10/15 19:34:08 UTC
[1/2] git commit: [#5107] Changed jinja memcached config setting name
and moved pylibmc requirement
Updated Branches:
refs/heads/master fc974fa89 -> 19ecd406e
[#5107] Changed jinja memcached config setting name and moved pylibmc requirement
Signed-off-by: Cory Johns <jo...@geek.net>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/19ecd406
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/19ecd406
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/19ecd406
Branch: refs/heads/master
Commit: 19ecd406e897ba1758da9b9f53051391ac2915fa
Parents: 89e4555
Author: Cory Johns <jo...@geek.net>
Authored: Mon Oct 15 17:30:20 2012 +0000
Committer: Cory Johns <jo...@geek.net>
Committed: Mon Oct 15 17:30:20 2012 +0000
----------------------------------------------------------------------
Allura/allura/config/app_cfg.py | 2 +-
requirements-optional.txt | 2 --
requirements-sf.txt | 3 +++
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/19ecd406/Allura/allura/config/app_cfg.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/app_cfg.py b/Allura/allura/config/app_cfg.py
index 0493edd..aef1e6c 100644
--- a/Allura/allura/config/app_cfg.py
+++ b/Allura/allura/config/app_cfg.py
@@ -56,7 +56,7 @@ class ForgeConfig(AppConfig):
config['routes.map'] = map
def _setup_bytecode_cache(self):
- cache_type = config.get('bytecode_cache_type')
+ cache_type = config.get('jinja_bytecode_cache_type')
bcc = None
if cache_type == 'memcached' and config.get('memcached_host'):
try:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/19ecd406/requirements-optional.txt
----------------------------------------------------------------------
diff --git a/requirements-optional.txt b/requirements-optional.txt
index 5e01040..2730b42 100644
--- a/requirements-optional.txt
+++ b/requirements-optional.txt
@@ -4,5 +4,3 @@
# for ForgeWiki's mediawiki importer:
-e git://github.com/zikzakmedia/python-mediawiki.git#egg=python-mediawiki # GPL
MySQL-python # GPL
-# for a memcached-backed Jinja bytecode cache:
-pylibmc==1.2.3
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/19ecd406/requirements-sf.txt
----------------------------------------------------------------------
diff --git a/requirements-sf.txt b/requirements-sf.txt
index 0c91e95..f7c7801 100644
--- a/requirements-sf.txt
+++ b/requirements-sf.txt
@@ -14,6 +14,9 @@ sqlalchemy-migrate==0.7.1
pyzmq==2.1.7
html2text==3.200.3dev-20120920
+# for a memcached-backed Jinja bytecode cache:
+pylibmc==1.2.3
+
# for the migration scripts only
postmarkup==1.1.4
# suds needed for teamforge import script