Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4

Conflicts: jenkins/test.sh
2013-01-18 10:26:44 -05:00
parent 44cfcb88a3 aeee13ab91
commit 575ff02f8a
5 changed files with 46 additions and 19 deletions
--- a/jenkins/test.sh
+++ b/jenkins/test.sh
@@ -27,7 +27,6 @@ git submodule foreach 'git reset --hard HEAD'
 export PYTHONIOENCODING=UTF-8

 GIT_BRANCH=${GIT_BRANCH/HEAD/master}
-
 if [ ! -d /mnt/virtualenvs/"$JOB_NAME" ]; then
    mkdir -p /mnt/virtualenvs/"$JOB_NAME"
    virtualenv /mnt/virtualenvs/"$JOB_NAME"