From 198b2522df8d3b1e8a5d5b27a396afe100c3d317 Mon Sep 17 00:00:00 2001
From: Eric Fischer <efischer@edx.org>
Date: Thu, 3 Aug 2017 16:24:08 -0400
Subject: [PATCH] Finalize edx-ora2 2.0.x upgrade

Includes updated versions of edx-submissions, jsonfield.
---
 requirements/edx/base.txt   | 4 ++--
 requirements/edx/github.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 73fea462783..dd7dfcce07f 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -54,7 +54,7 @@ edx-opaque-keys==0.4.0
 edx-organizations==0.4.5
 edx-rest-api-client==1.7.1
 edx-search==1.1.0
-edx-submissions==2.0.9
+edx-submissions==2.0.11
 edxval==0.1.1
 event-tracking==0.2.4
 facebook-sdk==0.4.0
@@ -187,7 +187,7 @@ analytics-python==1.1.0
 
 # Needed for mailchimp(mailing djangoapp)
 mailsnake==1.6.2
-jsonfield==1.0.3
+jsonfield==2.0.2
 
 # Inlines CSS styles into HTML for email notifications.
 pynliner==0.5.2
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index 81b3617fd97..4b6105749d4 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -84,7 +84,7 @@ git+https://github.com/edx/django-celery.git@f87c6f914a1410463f54aebf68458c0653b
 -e git+https://github.com/edx/codejail.git@a320d43ce6b9c93b17636b2491f724d9e433be47#egg=codejail==0.0
 -e git+https://github.com/edx/django-splash.git@v0.2#egg=django-splash==0.2
 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
-git+https://github.com/edx/edx-ora2.git@1.4.11#egg=ora2==1.4.11
+git+https://github.com/edx/edx-ora2.git@2.0.1#egg=ora2==2.0.1
 git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3
 git+https://github.com/edx/RecommenderXBlock.git@0e744b393cf1f8b886fe77bc697e7d9d78d65cd6#egg=recommender-xblock==1.2
 git+https://github.com/solashirai/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1
-- 
GitLab