From ff009f8d237d43da51503781567ec79a4a695702 Mon Sep 17 00:00:00 2001
From: Fred Smith <derf@edx.org>
Date: Fri, 10 Apr 2015 15:25:56 -0400
Subject: [PATCH] Merge pull request #425 from edx-solutions/release

Merge Release back into master
Conflicts:
	cms/envs/aws.py
	requirements/edx/custom.txt
---
 lms/djangoapps/social_engagement/engagement.py            | 8 ++++----
 lms/djangoapps/social_engagement/tests/test_engagement.py | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lms/djangoapps/social_engagement/engagement.py b/lms/djangoapps/social_engagement/engagement.py
index 53cfc7652a27..00e1b781baf9 100644
--- a/lms/djangoapps/social_engagement/engagement.py
+++ b/lms/djangoapps/social_engagement/engagement.py
@@ -113,11 +113,11 @@ def _compute_social_engagement_score(social_metrics):
         'SOCIAL_METRIC_POINTS',
         {
             'num_threads': 10,
-            'num_comments': 2,
-            'num_replies': 1,
-            'num_upvotes': 5,
+            'num_comments': 15,
+            'num_replies': 15,
+            'num_upvotes': 25,
             'num_thread_followers': 5,
-            'num_comments_generated': 1,
+            'num_comments_generated': 15,
         }
     )
 
diff --git a/lms/djangoapps/social_engagement/tests/test_engagement.py b/lms/djangoapps/social_engagement/tests/test_engagement.py
index 6739e2625a56..07b0adb35b75 100644
--- a/lms/djangoapps/social_engagement/tests/test_engagement.py
+++ b/lms/djangoapps/social_engagement/tests/test_engagement.py
@@ -215,7 +215,7 @@ def test_update_user_engagement_score(self):
 
             self.assertEqual(
                 leaderboard_position['score'],
-                24
+                85
             )
 
             self.assertEqual(
@@ -264,7 +264,7 @@ def test_multiple_users(self):
 
         self.assertEqual(
             leaderboard_position['score'],
-            24
+            85
         )
 
         # user should be in place #2
@@ -282,7 +282,7 @@ def test_multiple_users(self):
 
         self.assertEqual(
             leaderboard_position['score'],
-            48
+            170
         )
 
         # user2 should be in place #1