Merge pull request #708 from edx/cg/no_more_hash_merge_ever

Remove hash_behaviour=merge

Merge pull request #708 from edx/cg/no_more_hash_merge_ever
Remove hash_behaviour=merge
9ae8b0ca · Carson Gee · 757fbcb1 · 3b419370 · 9ae8b0ca · 9ae8b0ca
Commit 9ae8b0ca authored Jan 30, 2014 by Carson Gee
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

playbooks/ansible.cfg
+0 -1

playbooks/edx-east/ansible.cfg
+0 -1

No files found.
--- a/playbooks/ansible.cfg
+++ b/playbooks/ansible.cfg
@@ -5,6 +5,5 @@
 [defaults]

 jinja2_extensions=jinja2.ext.do
-hash_behaviour=merge
 host_key_checking = False
 roles_path=../../../ansible-roles
--- a/playbooks/edx-east/ansible.cfg
+++ b/playbooks/edx-east/ansible.cfg
@@ -5,6 +5,5 @@
 [defaults]

 jinja2_extensions=jinja2.ext.do
-hash_behaviour=merge
 host_key_checking=False
 roles_path=../../../ansible-roles