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

Fix core #1935 #150

Merged
merged 1 commit into from
Aug 20, 2019
Merged

Fix core #1935 #150

merged 1 commit into from
Aug 20, 2019

Conversation

pmconrad
Copy link

@abitmore
Copy link
Member

abitmore commented Aug 19, 2019

One minor issue, current release/develop branch of bitshares-core repository has FC at 91d8772, but current master branch of FC has new commits about OpenBSD support. Do we want to bump FC in bitshares-core to include the OpenBSD commits as well?

@pmconrad
Copy link
Author

Hm. We have no clearly defined procedure for fc fixes during a release.
The point of working on the release branch is to uphold the feature freeze associated with entering release mode. Thus, after merging we should bump fc to 7b37cd6 instead of master.

@abitmore
Copy link
Member

Yes, I think so as well. Perhaps create a 3.3 branch in this repository, so we can add new commits to it if needed.

By the way, 3.2.1 release's FC points to fix-api-close branch in this repository. The branch is configured as protected to avoid accidental removal until next consensus release.

@pmconrad
Copy link
Author

By the way, 3.2.1 release's FC points to fix-api-close branch in this repository. The branch is configured as protected to avoid accidental removal until next consensus release.

Submodules never point to branch names but always to specific commits AFAIK. Removing the branch shouldn't hurt.

@abitmore
Copy link
Member

abitmore commented Aug 20, 2019

Removing the branch shouldn't hurt.

... as long as the commit isn't removed by GC due to potential "unreachable" state. You're correct that submodule doesn't point to a branch, I wrote "head of xx branch" at first, but forgot why removed the words when reviewing / editing. :/

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.

Build Error error: static assertion failed: Failed to reserve enough space in fc::fwd<T,S>
2 participants