Skip to content

Commit

Permalink
Merge branch 'master' into doc-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
r0h4n committed Oct 28, 2016
2 parents 549be59 + fa19bed commit 8a89dbe
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion run_travis.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

tox -epep8 & tox -ecover
tox -epep8 && tox -ecover
2 changes: 1 addition & 1 deletion tendrl/gluster_bridge/manager/rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def stop(self):

def invoke_flow(self, flow_name, api_job):
# TODO(rohan) parse sds_operations_gluster.yaml and correlate here
flow_module = 'gluster_bridge.flows.%s' %\
flow_module = 'tendrl.gluster_bridge.flows.%s' %\
self.convert_flow_name(flow_name)
mod = __import__(flow_module, fromlist=[
flow_name])
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = py.test {posargs}
git+https://github.com/Tendrl/bridge_common.git

[testenv:pep8]
commands = flake8 {posargs}
Expand All @@ -36,4 +36,4 @@ commands =
show-source = True
ignore = E123,E125
builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build

0 comments on commit 8a89dbe

Please sign in to comment.