Merge branch 'master' into staging

broadinstitute · Feb 14, 2017 · 9dd4bd9 · 9dd4bd9
2 parents 7d82898 + 622aa13
commit 9dd4bd9
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 778 deletions.
diff --git a/easy-deploy-virtualized/.vagrant/machines/default/aws/action_provision b/easy-deploy-virtualized/.vagrant/machines/default/aws/action_provision
diff --git a/easy-deploy-virtualized/.vagrant/machines/default/aws/creator_uid b/easy-deploy-virtualized/.vagrant/machines/default/aws/creator_uid
diff --git a/easy-deploy-virtualized/.vagrant/machines/default/aws/id b/easy-deploy-virtualized/.vagrant/machines/default/aws/id
diff --git a/easy-deploy-virtualized/.vagrant/machines/default/aws/index_uuid b/easy-deploy-virtualized/.vagrant/machines/default/aws/index_uuid
diff --git a/easy-deploy-virtualized/.vagrant/machines/default/aws/synced_folders b/easy-deploy-virtualized/.vagrant/machines/default/aws/synced_folders
diff --git a/easy-deploy-virtualized/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory b/easy-deploy-virtualized/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
diff --git a/easy-deploy-virtualized/Vagrantfile b/easy-deploy-virtualized/Vagrantfile
diff --git a/easy-deploy-virtualized/ansible-playbook.retry b/easy-deploy-virtualized/ansible-playbook.retry
diff --git a/easy-deploy-virtualized/ansible-playbook.yml b/easy-deploy-virtualized/ansible-playbook.yml
diff --git a/easy-deploy-virtualized/ansible.cfg b/easy-deploy-virtualized/ansible.cfg
diff --git a/easy-deploy-virtualized/conda_setup.sh b/easy-deploy-virtualized/conda_setup.sh