fix merge error

CHANGELOG.md

 - Role: edxapp
-<<<<<<< HEAD
   - Added creation of enterprise_worker user to provisioning. This user is used by the edx-enterprise package when making API requests to Open edX IDAs.
 
 - Role: forum
   - Added `FORUM_REBUILD_INDEX` to rebuild the ElasticSearch index from the database, when enabled.  Default: `False`.
 
-=======
   - Added `EDX_PLATFORM_REVISION` (set from `edx_platform_version`). This is for
   edx-platform debugging purposes, and replaces calling dealer.git at startup.
 
@@ -129,7 +127,6 @@
   - Added `NGINX_EDXAPP_CMS_APP_EXTRA`, which makes it possible to add custom settings to the site configuration for Studio.
   - Added `NGINX_EDXAPP_LMS_APP_EXTRA`, which makes it possible to add custom settings to the site configuration for the LMS.
 
->>>>>>> master
 - Role: edxapp
   - Let `confirm_email` in `EDXAPP_REGISTRATION_EXTRA_FIELDS` default to `"hidden"`.
   - Let `terms_of_service` in `EDXAPP_REGISTRATION_EXTRA_FIELDS` default to `"hidden"`.

playbooks/roles/edxapp/defaults/main.yml

@@ -722,8 +722,6 @@ EDXAPP_VIDEO_IMAGE_SETTINGS:
     location: "{{ edxapp_media_dir }}/"
     base_url: "{{ EDXAPP_MEDIA_URL }}/"
   DIRECTORY_PREFIX: 'video-images/'
-<<<<<<< HEAD
-=======
 
 EDXAPP_VIDEO_TRANSCRIPTS_MAX_AGE: 31536000
 
@@ -734,7 +732,7 @@ EDXAPP_VIDEO_TRANSCRIPTS_SETTINGS:
     location: "{{ edxapp_media_dir }}/"
     base_url: "{{ EDXAPP_MEDIA_URL }}/"
   DIRECTORY_PREFIX: 'video-transcripts/'
->>>>>>> master
+
 
 # Course Block Structures
 EDXAPP_BLOCK_STRUCTURES_SETTINGS:

playbooks/roles/edxapp/tasks/deploy.yml

@@ -419,7 +419,6 @@
   tags:
     - manage
 
-<<<<<<< HEAD
 - name: build service worker users list
   set_fact:
     service_worker_users: "{{ [SERVICE_WORKER_USERS] }}"
@@ -428,24 +427,16 @@
     - manage
     - manage:db
 
-=======
->>>>>>> master
 - name: create service worker users
   shell: "{{ edxapp_venv_bin }}/python ./manage.py lms --settings={{ edxapp_settings }} --service-variant lms manage_user {{ item.username}} {{ item.email }} --unusable-password {% if item.is_staff %} --staff{% endif %}"
   args:
     chdir: "{{ edxapp_code_dir }}"
   become_user: "{{ common_web_user }}"
-<<<<<<< HEAD
-  with_items: "{{ service_worker_users }}"
-=======
   with_items: "{{ SERVICE_WORKER_USERS }}"
->>>>>>> master
   when: CREATE_SERVICE_WORKER_USERS
   tags:
     - manage
     - manage:db
-<<<<<<< HEAD
-=======
 
 - name: reindex all courses
   shell: "{{ edxapp_venv_bin }}/python ./manage.py cms reindex_course --setup --settings={{ edxapp_settings }}"
@@ -456,4 +447,3 @@
   tags:
     - install
     - install:base
->>>>>>> master

playbooks/roles/forum/defaults/main.yml

@@ -48,11 +48,10 @@ FORUM_RESTART_DELAY: 60
 # Set to rebuild the forum ElasticSearch index from the database.
 FORUM_REBUILD_INDEX: false
 
-<<<<<<< HEAD
 forum_environment:
-=======
+
 forum_base_env: &forum_base_env
->>>>>>> master
+
   RBENV_ROOT: "{{ forum_rbenv_root }}"
   GEM_HOME: "{{ forum_gem_root }}"
   GEM_PATH: "{{ forum_gem_root }}"

playbooks/roles/forum/tasks/deploy.yml

@@ -76,11 +76,7 @@
   args:
     chdir: "{{ forum_code_dir }}"
   become_user: "{{ forum_user }}"
-<<<<<<< HEAD
-  environment: "{{ forum_environment }}"
-=======
   environment: "{{ forum_base_env }}"
->>>>>>> master
   when: migrate_db is defined and migrate_db|lower == "yes" and FORUM_REBUILD_INDEX|bool
   tags:
     - migrate

playbooks/roles/forum/tasks/main.yml

@@ -72,13 +72,10 @@
   tags:
     - install
     - install:base
-<<<<<<< HEAD
     - install:configuration
-=======
   when: devstack is defined and devstack
   with_items:
     - "{{ devstack_forum_env }}"
->>>>>>> master
 
 - name: create {{ forum_data_dir }}
   file:

playbooks/roles/mongo_3_0/defaults/main.yml

@@ -14,15 +14,12 @@ mongo_log_dir: "{{ COMMON_LOG_DIR }}/mongo"
 mongo_journal_dir: "{{ COMMON_DATA_DIR }}/mongo/mongodb/journal"
 mongo_user: mongodb
 
-<<<<<<< HEAD
+
 MONGODB_REPO: "deb http://mirrors.aliyun.com/mongodb/apt/ubuntu precise/mongodb-org/3.0 multiverse"
-=======
 # The MONGODB_REPO variable should use {{ ansible_distribution_release }}
 # instead of hard coding a release name. Since we are already accidentally
 # running precise binaries on trusty, we are going to leave this alone for
 # mongo 3.0 and remedy it when we upgrade to mongo 3.2
-MONGODB_REPO: "deb http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.0 multiverse"
->>>>>>> master
 MONGODB_APT_KEY: "7F0CEB10"
 MONGODB_APT_KEYSERVER: "keyserver.ubuntu.com"
 

util/vpc-tools/abbey.py

@@ -317,7 +317,7 @@ if [[ -z "$CONFIGURATION_REPO" ]]; then
 fi
 
 if [[ -z "$CONFIGURATION_VERSION" ]]; then
-  CONFIGURATION_VERSION="open-release-mongol/ginkgo.master"
+  CONFIGURATION_VERSION="master"
 fi
 
 if [[ -z "$UPGRADE_OS" ]]; then

vagrant/release/devstack/Vagrantfile

@@ -46,10 +46,7 @@ openedx_releases = {
   "open-release/ginkgo.master" => "ginkgo-devstack-2017-07-14",
   "open-release/ginkgo.1rc1" => "ginkgo-devstack-2017-07-14",
   "open-release/ginkgo.1" => "ginkgo-devstack-2017-07-14",
-<<<<<<< HEAD
   "open-release/ginkgo.2" => "ginkgo-devstack-2017-07-14",
-=======
->>>>>>> master
 
   "open-release/ficus.master" => "ficus-devstack-2017-02-07",
   "open-release/ficus.1rc1" => "ficus-devstack-2017-01-11",
@@ -74,11 +71,8 @@ openedx_releases = {
   # Cypress is deprecated and unsupported
   # Birch is deprecated and unsupported
 }
-<<<<<<< HEAD
+
 openedx_releases.default = "ginkgo-devstack-2017-07-14"
-=======
-openedx_releases.default = "master-devstack-2017-09-14"
->>>>>>> master
 
 openedx_release = ENV['OPENEDX_RELEASE']
 boxname = ENV['OPENEDX_BOXNAME']

vagrant/release/fullstack/Vagrantfile

@@ -14,10 +14,7 @@ CPU_COUNT = 2
 openedx_releases = {
   "open-release/ginkgo.1rc1" => "ginkgo-fullstack-2017-07-14",
   "open-release/ginkgo.1" => "ginkgo-fullstack-2017-08-14",
-<<<<<<< HEAD
   "open-release/ginkgo.2" => "ginkgo-fullstack-2017-12-14",
-=======
->>>>>>> master
 
   "open-release/ficus.1rc3" => "ficus-fullstack-2017-02-07",
   "open-release/ficus.1rc4" => "ficus-fullstack-2017-02-15",
@@ -48,11 +45,8 @@ openedx_releases = {
   # Cypress is deprecated and unsupported
   # Birch is deprecated and unsupported
 }
-<<<<<<< HEAD
+
 openedx_releases.default = "ginkgo-fullstack-2017-12-14"
-=======
-openedx_releases.default = "ginkgo-fullstack-2017-08-14"
->>>>>>> master
 
 openedx_release = ENV['OPENEDX_RELEASE']
 boxname = ENV['OPENEDX_BOXNAME']