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 branch 1.1.0 to master branch #2772

Merged
merged 2 commits into from
Apr 22, 2019
Merged

Merge branch 1.1.0 to master branch #2772

merged 2 commits into from
Apr 22, 2019

Conversation

garyyu
Copy link
Contributor

@garyyu garyyu commented Apr 22, 2019

Merge branch 1.1.0 to master, to get the merged PR #2753 into master branch.

garyyu added 2 commits April 17, 2019 07:18
* use a grin specific tmp dir instead of a system tmp dir

* rustfmt

* using create_new instead of create

* switch the txhashset sandbox from system tmp dir to grin specific tmp dir

* rustfmt

* adapter get_tmp_dir delegate to chain implementation

* simply the logic of protolc for get_tmpfile_pathname

* rustfmt

* fix the merge mistake
@garyyu garyyu added this to the 1.1.0 milestone Apr 22, 2019
@ignopeverell ignopeverell merged commit 97e96e4 into mimblewimble:master Apr 22, 2019
@0xmichalis 0xmichalis mentioned this pull request Apr 23, 2019
@garyyu garyyu deleted the 2753-again branch December 11, 2019 06:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants