From a29b936d1d34787240d079f761f869cbc50afa97 Mon Sep 17 00:00:00 2001 From: bmedx Date: Wed, 7 Dec 2016 13:32:24 -0500 Subject: [PATCH 1/2] PLAT1122 - Upgrade Django to 1.8.17 --- requirements/edx/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index fe06e06566..a3e63551aa 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -38,7 +38,7 @@ django-user-tasks==0.1.2 # We need a fix to DRF 3.2.x, for now use it from our own cherry-picked repo #djangorestframework>=3.1,<3.2 git+https://github.com/edx/django-rest-framework.git@3c72cb5ee5baebc4328947371195eae2077197b0#egg=djangorestframework==3.2.3 -django==1.8.16 +django==1.8.17 djangorestframework-jwt==1.8.0 djangorestframework-oauth==1.1.0 edx-ccx-keys==0.2.1 From 3376089e5d5434c3883e3f7305b6de99ba4c3c34 Mon Sep 17 00:00:00 2001 From: bmedx Date: Thu, 8 Dec 2016 08:56:54 -0500 Subject: [PATCH 2/2] Adding myself to AUTHORS. --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 641b4fb7e8..7b9f399c83 100644 --- a/AUTHORS +++ b/AUTHORS @@ -277,3 +277,4 @@ Albert St. Aubin Jr. Casey Litton Jhony Avella Tanmay Mohapatra +Brian Mesick