Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge HTLC changes from hardfork to testnet #1538

Merged
merged 2 commits into from Jan 25, 2019

Conversation

Projects
3 participants
@jmjatlanta
Copy link
Contributor

commented Jan 24, 2019

A minor change (uint8_t changed to char) in HTLC makes the output clearer and easier to use. This will merge that change into the testnet branch.

jmjatlanta added some commits Jan 18, 2019

Merge pull request #1535 from bitshares/jmj_uint8_switch
Switch uin8_t for char for clearer serialization
@abitmore

This comment has been minimized.

Copy link
Member

commented Jan 24, 2019

Need to merge to testnet_release then merge to testnet, unless we want to abandon testnet_release branch.

@jmjatlanta

This comment has been minimized.

Copy link
Contributor Author

commented Jan 24, 2019

Need to merge to testnet_release then merge to testnet, unless we want to abandon testnet_release branch.

That didn't sound right, so I reviewed the Git Flow doc. Yep, you're right. I will attempt a rebase.

@jmjatlanta jmjatlanta changed the base branch from testnet to testnet_release Jan 24, 2019

@oxarbitrage
Copy link
Member

left a comment

looks good.

@oxarbitrage oxarbitrage merged commit f2bebb5 into testnet_release Jan 25, 2019

2 of 3 checks passed

ci/dockercloud Your image failed to build in Docker Cloud
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@abitmore abitmore added this to In Development in Protocol Upgrade Release (3.0.0) via automation Feb 5, 2019

@ryanRfox ryanRfox moved this from In Development to Done in Protocol Upgrade Release (3.0.0) Feb 12, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.