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

Replace "Bitcoin" with "Zcash" in thread names and error messages #2548

Merged
merged 1 commit into from Oct 5, 2017

Conversation

Projects
4 participants
@jasondavies
Contributor

jasondavies commented Jul 21, 2017

Part of #1756.

@daira

This comment has been minimized.

Show comment
Hide comment
@daira

daira Aug 2, 2017

Contributor

See also #2150.

Contributor

daira commented Aug 2, 2017

See also #2150.

@str4d

This comment has been minimized.

Show comment
Hide comment
@str4d

str4d Aug 3, 2017

Contributor

I have opened #2564 to pull in bitcoin/bitcoin#6504; this PR should be rebased on master once that merges.

Contributor

str4d commented Aug 3, 2017

I have opened #2564 to pull in bitcoin/bitcoin#6504; this PR should be rebased on master once that merges.

@nathan-at-least nathan-at-least moved this from Proposed to Misc in Release planning Aug 15, 2017

@str4d str4d moved this from Misc to 1.0.13: Cleanups in Release planning Aug 21, 2017

@jasondavies

This comment has been minimized.

Show comment
Hide comment
@jasondavies

jasondavies Sep 4, 2017

Contributor

Rebased on master.

Contributor

jasondavies commented Sep 4, 2017

Rebased on master.

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Sep 18, 2017

Contributor

☔️ The latest upstream changes (presumably #2564) made this pull request unmergeable. Please resolve the merge conflicts.

Contributor

zkbot commented Sep 18, 2017

☔️ The latest upstream changes (presumably #2564) made this pull request unmergeable. Please resolve the merge conflicts.

@jasondavies jasondavies changed the title from Replace "bitcoin", "btc" with "Zcash", "ZEC". to Replace "bitcoin" with "Zcash". Sep 18, 2017

@jasondavies

This comment has been minimized.

Show comment
Hide comment
@jasondavies

jasondavies Sep 18, 2017

Contributor

Rebased on master.

Contributor

jasondavies commented Sep 18, 2017

Rebased on master.

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 5, 2017

Contributor

☔️ The latest upstream changes (presumably #2150) made this pull request unmergeable. Please resolve the merge conflicts.

Contributor

zkbot commented Oct 5, 2017

☔️ The latest upstream changes (presumably #2150) made this pull request unmergeable. Please resolve the merge conflicts.

@jasondavies

This comment has been minimized.

Show comment
Hide comment
@jasondavies

jasondavies Oct 5, 2017

Contributor

Rebased.

Contributor

jasondavies commented Oct 5, 2017

Rebased.

@str4d str4d changed the title from Replace "bitcoin" with "Zcash". to Replace "Bitcoin" with "Zcash" in thread names and errors Oct 5, 2017

@str4d str4d added this to the 1.0.13 milestone Oct 5, 2017

@str4d str4d changed the title from Replace "Bitcoin" with "Zcash" in thread names and errors to Replace "Bitcoin" with "Zcash" in thread names and error messages Oct 5, 2017

@str4d

This comment has been minimized.

Show comment
Hide comment
@str4d

str4d Oct 5, 2017

Contributor

ACK. Thanks for keeping up with the rebases @jasondavies 😄

@zkbot r+

Contributor

str4d commented Oct 5, 2017

ACK. Thanks for keeping up with the rebases @jasondavies 😄

@zkbot r+

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 5, 2017

Contributor

📌 Commit b30900a has been approved by str4d

Contributor

zkbot commented Oct 5, 2017

📌 Commit b30900a has been approved by str4d

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 5, 2017

Contributor

⌛️ Testing commit b30900a with merge 4485d5d...

Contributor

zkbot commented Oct 5, 2017

⌛️ Testing commit b30900a with merge 4485d5d...

zkbot added a commit that referenced this pull request Oct 5, 2017

Auto merge of #2548 - jasondavies:fix-bitcoin-mentions, r=str4d
Replace "Bitcoin" with "Zcash" in thread names and error messages

Part of #1756.
@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 5, 2017

Contributor

☀️ Test successful - pr-merge
Approved by: str4d
Pushing 4485d5d to master...

Contributor

zkbot commented Oct 5, 2017

☀️ Test successful - pr-merge
Approved by: str4d
Pushing 4485d5d to master...

@zkbot zkbot merged commit b30900a into zcash:master Oct 5, 2017

1 check passed

homu Test successful
Details

@jasondavies jasondavies deleted the jasondavies:fix-bitcoin-mentions branch Oct 5, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment