Merge branch 'merge_work' of /Users/carlosfrias/Google Drive/Client Workspaces/Verizon/OneAPI/vz-workspace/apigee-opdk-playbook-setup-ansible into merge_updates

control_server_bashrc.sh

diff --git a/control_server_bashrc.sh b/control_server_bashrc.sh
new file mode 100644
index 0000000..2d46677
--- /dev/null
+++ b/control_server_bashrc.sh
@@ -0,0 +1,16 @@
+# .bashrc
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
+
+# Uncomment the following line if you don't like systemctl's auto-paging feature:
+# export SYSTEMD_PAGER=
+
+# User specific aliases and functions
+HTTP_PROXY_HOST="{{ host:port }}"
+HTTPS_PROXY_HOST="{{ host:port }}"
+alias proxify="export http_proxy=$HTTP_PROXY_HOST; export https_proxy=$HTTPS_PROXY_HOST"
+alias unproxify="unset http_proxy https_proxy"
+

repository-mapping-name-folder.yml

diff --git a/repository-mapping-name-folder.yml b/repository-mapping-name-folder.yml
old mode 100644
new mode 100755