Renelvon / OpenBazaar

17%

master: 76%

LAST BUILD ON BRANCH backmerge

branch: backmerge

CHANGE BRANCH

x

Reset

• backmerge
• add-image-link
• backmerge-0.2.3
• backmerge-0.3.0
• backmerge-0.3.1
• bandit_check
• bind_tornado
• bitcoin
• bump_pybitcointools
• bump_pyelliptic
• bump_requirements
• bump_tornado
• cachingkbucket
• check_newlines
• cleanup_1112
• code_cleanup
• code_quality
• connection_refactor
• cover_kbucket
• datadump_fix
• decouple2
• develop
• drop_tree_routingtable
• drop_twisted
• egg_pysqlcipher
• enable_maybe_no_member
• enable_thread_checks
• fix_STUN_check
• fix_bad_arg
• fix_launcher
• fix_unbound
• force_bandit_exit_status
• guid_is_unicode
• hotfix_1_backmerge
• keep_astroid_back
• launcher
• launcher_tidy
• less_reqs
• less_threading
• libyaml
• libzmq3
• makefilefy
• master
• membucket
• modern
• modern2
• move_tests
• multisig_test
• new_donation_address
• newdht
• no-iteritems
• no-long-suffix
• no_3rd_party
• no_bare_except
• no_features
• no_forums
• no_lost_exc
• no_port
• no_pybitmessage
• no_pylint_runtime_modules
• no_pysqlcipher
• no_redefinition
• no_six
• no_type_error
• no_wildcard_imports
• normalize-config
• proposal
• purge-launcher-bitmessage
• purge_cpp
• purge_lgpl
• pylint1.4
• pylint1.4.3
• refactor_crypto_util
• refactor_db_store
• refactor_routingtable
• refactor_routingtable2
• relative_imports
• release-0.3.0
• release-0.3.1
• remove_dead_code
• sane_backuptool
• sane_imports
• sane_migrations
• sane_network_util
• simple_setup_db
• test_dbstore
• test_network_util
• test_trust
• test_util
• thin_transport
• thin_transport2
• transport_cleanup_0
• transport_refactor
• travis2
• upgrade-dependencies
• waffle_badge

Build # 417

Build Type

push

travis-ci

Committed by Renelvon

Commit Message

Merge branch 'master' into develop

Conflicts:
	node/connection.py
	node/market.py
	node/transport.py

* Conflicts in connection.py and transport.py due to
  listener refactor at #678. In order to ensure the instantiation
  of a single zmq Context, the initializers of the listeners have been
  expanded with an additional `ctx` argument.
* Conflicts in market.py due to style fixes in #658.

Coverage Stats

637 of 3765 relevant lines covered (16.92%)

0.17 hits per line