openstack
/
sahara-plugin-vanilla
Code Issues Proposed changes

Merge remote-tracking branch 'origin/master' into clusterops 

Conflicts:
	eho/server/api/v01.py
	eho/server/main.py
	eho/server/service/api.py
	eho/server/service/cluster_ops.py
This commit is contained in:
dmitryme 2013-02-28 13:26:21 +04:00
parent d5cee0db5a 0dd8bccfe0
commit 82deb546d6
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -28,3 +28,4 @@ doc/source/apidoc
*.db
.coverage
nosetests.xml
pylint-report.txt