From 18b05fe78f2f9c06025a3fb19877bd2271ce2561 Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Tue, 24 Jul 2012 21:50:45 -0400
Subject: [PATCH] enabled_features changed mitx_features

---
 lms/envs/aws.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 0ee4ac8c14..ca75e3baf5 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -32,8 +32,9 @@ LOG_DIR = ENV_TOKENS['LOG_DIR']
 
 CACHES = ENV_TOKENS['CACHES']
 
-for feature in ENV_TOKEN['ENABLED_FEATURE']:
-    MITX_FEATURES[feature] = True
+for feature,value in ENV_TOKENS.get('MITX_FEATURES', {}).items():
+    MITX_FEATURES[feature] = value
+
 
 LOGGING = get_logger_config(LOG_DIR, 
                             logging_env=ENV_TOKENS['LOGGING_ENV'],