From 0f0b8048b4616d64c9f519d78f37a170e40a0927 Mon Sep 17 00:00:00 2001
From: bmedx <bmesick@edx.org>
Date: Mon, 11 Dec 2017 10:34:00 -0500
Subject: [PATCH] Changes to fix various Django 1.11 errors

---
 cms/envs/common.py        | 3 +++
 openedx/tests/settings.py | 1 +
 2 files changed, 4 insertions(+)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 32310f9c24..f905b99d8b 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1125,6 +1125,9 @@ INSTALLED_APPS = [
     # DRF filters
     'django_filters',
     'cms.djangoapps.api',
+
+    # Entitlements, used in openedx tests
+    'entitlements',
 ]
 
 
diff --git a/openedx/tests/settings.py b/openedx/tests/settings.py
index 5ff68cf990..ee145a53f4 100644
--- a/openedx/tests/settings.py
+++ b/openedx/tests/settings.py
@@ -23,6 +23,7 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'openedx.core.djangoapps.video_config',
+    'openedx.core.djangoapps.video_pipeline',
     'edxval',
 )