Merged the crucible branch and Panorama to master

earthgecko · Jul 17, 2016 · 9a3beb3 · 9a3beb3
1 parent 5725e39
commit 9a3beb3
Show file tree

Hide file tree

Showing 51 changed files with 2,013 additions and 6,534 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *.pyc
 *.swp
 *.log
-settings.py
 dump.rdb
 nohup.out
+docs/_build/doctrees
+__pycache__/
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,9 @@ install:
   - PYTHONPATH= PATH=/home/travis/anaconda/bin:$PATH pip install -r requirements.txt --use-mirrors
   - PYTHONPATH= PATH=/home/travis/anaconda/bin:$PATH pip install patsy --use-mirrors
   - PYTHONPATH= PATH=/home/travis/anaconda/bin:$PATH pip install msgpack_python --use-mirrors
-  - cp src/settings.py.example src/settings.py
   - pip install pep8 --use-mirrors
 script:
   - PYTHONPATH= PATH=/home/travis/anaconda/bin:$PATH nosetests -v --nocapture
-  - pep8 --exclude=migrations --ignore=E501,E251,E265,E402 ./ 
+  - pep8 --exclude=migrations --ignore=E501,E251,E265,E402 ./
 notifications:
   email: false
diff --git a/bin/analyzer.d b/bin/analyzer.d
diff --git a/bin/boundary.d b/bin/boundary.d
diff --git a/bin/horizon.d b/bin/horizon.d
diff --git a/bin/mirage.d b/bin/mirage.d
diff --git a/bin/redis.conf b/bin/redis.conf