Merge pull request #2220 from edx/feanil/update_ansible

Feanil/update ansible

Merge pull request #2220 from edx/feanil/update_ansible
Feanil/update ansible
14b88a91 · Feanil Patel · 0d212c79 · 747be574 · 14b88a91 · 14b88a91
Commit 14b88a91 authored Aug 18, 2015 by Feanil Patel
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

CHANGELOG.md
+3 -0

requirements.txt
+1 -1

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+- Updated ansible fork to be based on ansible 1.9.3rc1 instead of 1.9.1
+  - Ansible Changelog: https://github.com/ansible/ansible/blob/stable-1.9/CHANGELOG.md
+
 - Role: edxapp
  - Removed deprecated variables EDXAPP_PLATFORM_TWITTER_URL, EDXAPP_PLATFORM_MEETUP_URL, EDXAPP_PLATFORM_LINKEDIN_URL, and EDXAPP_PLATFORM_GOOGLE_PLUS_URL in favor of EDXAPP_SOCIAL_MEDIA_FOOTER_URLS.  These variables haven't been used in edx-platform since March 17, 2015 (when https://github.com/edx/edx-platform/pull/7383 was merged).  This change is backwards incompatible with versions of edx-platform from before March 17, 2015.
  - Added EDXAPP_MOBILE_STORE_URLS and EDXAPP_FOOTER_ORGANIZATION_IMAGE variables, used in https://github.com/edx/edx-platform/pull/8175 (v3 version of the edx.org footer).

--- a/requirements.txt
+++ b/requirements.txt
-git+https://github.com/edx/ansible.git@stable-1.9-plus-edx#egg=ansible==1.9.1-edx.2
+git+https://github.com/edx/ansible.git@stable-1.9.3-rc1-edx#egg=ansible==1.9.3-edx
 PyYAML==3.11
 Jinja2==2.7.3
 MarkupSafe==0.23