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

Vendor fc #2145

Merged
merged 4 commits into from
Feb 21, 2018
Merged

Vendor fc #2145

merged 4 commits into from
Feb 21, 2018

Conversation

mvandeberg
Copy link
Contributor

Closes #1301

@mvandeberg
Copy link
Contributor Author

I checked out fc separately and ran diff between Steem's vendored fc and standalon fc. Here is my output:

Files ./fc/.DS_Store and ../../fc/.DS_Store differ
Files ./fc/vendor/.DS_Store and ../../fc/vendor/.DS_Store differ
Files ./fc/vendor/diff-match-patch-cpp-stl/.git and ../../fc/vendor/diff-match-patch-cpp-stl/.git differ
Files ./fc/vendor/secp256k1-zkp/.git and ../../fc/vendor/secp256k1-zkp/.git differ
Files ./fc/vendor/websocketpp/.git and ../../fc/vendor/websocketpp/.git differ

.DS_Store is an OS X specific setting file and we would expect the .git files to be different. All of the source code is identical.

youkaicountry
youkaicountry approved these changes Feb 21, 2018
View reviewed changes
Copy link
Contributor

@youkaicountry youkaicountry left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I performed a diff, the only difference of note is that fc's submodules are vendored in, which is exactly as intended.
Approved.

@mvandeberg mvandeberg merged commit 2945196 into master Feb 21, 2018
@mvandeberg mvandeberg deleted the 1301-vendor-fc branch February 21, 2018 23:05
@abitmore abitmore mentioned this pull request Feb 22, 2018
Merged
@theoreticalbts theoreticalbts mentioned this pull request Mar 7, 2018
Closed
@mkochanowicz mkochanowicz mentioned this pull request Apr 12, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@youkaicountry youkaicountry youkaicountry approved these changes

@theoreticalbts theoreticalbts Awaiting requested review from theoreticalbts

Assignees

@youkaicountry youkaicountry

@theoreticalbts theoreticalbts

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mvandeberg @youkaicountry @theoreticalbts