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.

Sign up for GitHub

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

Jump to bottom

commit cargo.lock #2875

Merged
merged 2 commits into from
Jun 6, 2019
Merged

commit cargo.lock #2875

merged 2 commits into from
Jun 6, 2019

Conversation

garyyu
Copy link
Contributor

@garyyu garyyu commented Jun 6, 2019

  • commit cargo.lock
  • add a log to check the possible difference between requested TxHashSet and response TxHashSet

@garyyu garyyu merged commit d03a81f into mimblewimble:master Jun 6, 2019
@garyyu garyyu deleted the log1 branch June 6, 2019 03:34
@antiochp
Copy link
Member

antiochp commented Jun 6, 2019

I'm not 100% sure this makes sense. We do not have a 1.1.1 release and ideally never will.

Ideally master at this point is identical to 1.1.0 and nothing is merged in here unless the decision is made to fix a critical issue.

(We should probably have had at least one other person reviewing this before merging to master).

@hashmap
Copy link
Contributor

hashmap commented Jun 6, 2019

@antiochp agree with the last point. Cargo.lock update was a leftover from dfb4d5a though

quentinlesceller added a commit that referenced this pull request Jun 25, 2019
@quentinlesceller
Revert "commit cargo.lock (#2875)"
87315bb 
This reverts commit d03a81f.
lehnberg pushed a commit to lehnberg/grin that referenced this pull request Jul 8, 2019
@garyyu @lehnberg
commit cargo.lock (mimblewimble#2875)
03bc51b 
* commit cargo.lock

* rustfmt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@garyyu @antiochp @hashmap