This is an automated email from the ASF dual-hosted git repository. cmorris pushed a commit to branch splitroles-blockchain in repository https://gitbox.apache.org/repos/asf/incubator-milagro-dta.git
commit d4f1756b55461592bb74b0ab0ce8428caa984d06 Merge: d0a78e5 5113c36 Author: Christopher Morris <[email protected]> AuthorDate: Mon Sep 23 12:01:41 2019 +0100 Merge branch 'tendermint' into splitroles-blockchain # Conflicts: # cmd/service/__debug_bin # go.mod # go.sum # pkg/bitcoinplugin/helpers.go # pkg/tendermint/tendermint.go # pkg/tendermint/websockets.go cmd/service/main.go | 1 + pkg/bitcoinplugin/service.go | 4 +- pkg/defaultservice/fulfill.go | 69 +++++++--- pkg/defaultservice/order.go | 288 ++++++++++++++++++++++++++++++++++++++++- pkg/defaultservice/plugable.go | 2 +- pkg/endpoints/endpoints.go | 113 ++++++++++++++++ pkg/safeguardsecret/service.go | 7 +- pkg/service/service.go | 9 +- 8 files changed, 463 insertions(+), 30 deletions(-)
