Merge remote-tracking branch 'upstream/master' into decorator_coverage
added code coverage over decorators and removed unneeded functions
added code coverage over decorators and removed unneeded functions
Merge remote-tracking branch 'upstream/master' into decorator_coverage
Merge remote-tracking branch 'upstream/master' into decorator_coverage
Add code coverage for mock and mockdb && unittest base
[CDN-153] Avoid passing args to cdn server

This PR fixes a bug where the command line args were being passed
from the calling process (API tests) to the called process (CDN Server).
Merge remote-tracking branch 'upstream/master' into decorator_coverage
Merge remote-tracking branch 'upstream/master' into tox
Covering up bootstrap.py
Merge pull request #62 from malini-kamalambal/master

[CDN-153] Avoid passing args to cdn server
Merge pull request #61 from tonytan4ever/master

Add code coverage for mock and mockdb && unittest base
Merge pull request #59 from amitgandhinz/decorator_coverage

Decorator coverage
Merge remote-tracking branch 'upstream/master' into tox
added pypy to tox
Merge pull request #64 from amitgandhinz/tox

Tox
Models and unittests for models
Merge pull request #66 from obulpathi/models

Models and unittests for models
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:amitgandhinz/cdn