There are some pep8 issues with this you'll need to fix before merge will succeed. Just run:
pep8 -r bin/* nova
bin/nova-combined:53:1: W293 blank line contains whitespace bin/nova-combined:66:1: W391 blank line at end of file bin/nova-combined:66:1: W293 blank line contains whitespace nova/service.py:102:1: W293 blank line contains whitespace nova/service.py:125:20: W291 trailing whitespace nova/service.py:195:1: W293 blank line contains whitespace nova/service.py:210:1: W293 blank line contains whitespace nova/service.py:230:1: W293 blank line contains whitespace nova/test.py:58:1: E302 expected 2 blank lines, found 1 nova/utils.py:236:9: E301 expected 1 blank line, found 0 nova/utils.py:247:1: W293 blank line contains whitespace nova/utils.py:251:1: W293 blank line contains whitespace nova/utils.py:254:1: W293 blank line contains whitespace nova/compute/manager.py:67:1: W293 blank line contains whitespace nova/tests/rpc_unittest.py:70:34: W291 trailing whitespace nova/tests/service_unittest.py:122:1: W293 blank line contains whitespace nova/virt/libvirt_conn.py:208:1: W293 blank line contains whitespace nova/virt/libvirt_conn.py:390:1: W293 blank line contains whitespace nova/virt/libvirt_conn.py:442:1: W293 blank line contains whitespace nova/virt/libvirt_conn.py:444:15: E111 indentation is not a multiple of four nova/virt/xenapi_conn.py:203:64: W291 trailing whitespace
« Back to merge proposal
There are some pep8 issues with this you'll need to fix before merge will succeed. Just run:
pep8 -r bin/* nova
bin/nova- combined: 53:1: W293 blank line contains whitespace combined: 66:1: W391 blank line at end of file combined: 66:1: W293 blank line contains whitespace py:102: 1: W293 blank line contains whitespace py:125: 20: W291 trailing whitespace py:195: 1: W293 blank line contains whitespace py:210: 1: W293 blank line contains whitespace py:230: 1: W293 blank line contains whitespace py:236: 9: E301 expected 1 blank line, found 0 py:247: 1: W293 blank line contains whitespace py:251: 1: W293 blank line contains whitespace py:254: 1: W293 blank line contains whitespace manager. py:67:1: W293 blank line contains whitespace rpc_unittest. py:70:34: W291 trailing whitespace service_ unittest. py:122: 1: W293 blank line contains whitespace libvirt_ conn.py: 208:1: W293 blank line contains whitespace libvirt_ conn.py: 390:1: W293 blank line contains whitespace libvirt_ conn.py: 442:1: W293 blank line contains whitespace libvirt_ conn.py: 444:15: E111 indentation is not a multiple of four xenapi_ conn.py: 203:64: W291 trailing whitespace
bin/nova-
bin/nova-
nova/service.
nova/service.
nova/service.
nova/service.
nova/service.
nova/test.py:58:1: E302 expected 2 blank lines, found 1
nova/utils.
nova/utils.
nova/utils.
nova/utils.
nova/compute/
nova/tests/
nova/tests/
nova/virt/
nova/virt/
nova/virt/
nova/virt/
nova/virt/