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

support for Boost 1.69 #1587

Merged
merged 3 commits into from Mar 13, 2019

Conversation

Projects
None yet
4 participants
@jmjatlanta
Copy link
Contributor

commented Feb 15, 2019

Fixes documentation for #1557

This adjusts the documentation to show that Bitshares is now supported with compiled with Boost versions in the range of 1.57 - 1.69.

The wiki should be updated when this rolls into production. Pages that need adjusted:
https://github.com/bitshares/bitshares-core/wiki
https://github.com/bitshares/bitshares-core/wiki/BUILD_UBUNTU
https://github.com/bitshares/bitshares-core/wiki/BUILD_WIN32
https://github.com/bitshares/bitshares-core/wiki/Building-on-OS-X

Show resolved Hide resolved README.md Outdated
Show resolved Hide resolved README.md Outdated
@oxarbitrage

This comment has been minimized.

Copy link
Member

commented Feb 16, 2019

In order to include this update in the master fast we need to rebase this change to release. By what i can see FC is already bumped for this change in our current release branch.

Check: https://github.com/bitshares/bitshares-core/wiki/Git-Flow#how-to-update-the-readmemd

Doing in develop will land in master in the future release(maybe 2 months from now), i think we dont want that for this.

@abitmore abitmore changed the base branch from develop to release Feb 18, 2019

@abitmore
Copy link
Member

left a comment

As @oxarbitrage mentioned above, I've updated target branch of this PR to release but it seems there is a redundant commit. Better rebase.

@pmconrad pmconrad force-pushed the jmj_1557 branch from cf32b8b to f50a0ef Mar 1, 2019

@pmconrad

This comment has been minimized.

Copy link
Contributor

commented Mar 1, 2019

rebased

@abitmore abitmore added this to the Hotfix-201903-2 milestone Mar 13, 2019

@jmjatlanta jmjatlanta merged commit 3c5105e into release Mar 13, 2019

1 of 2 checks passed

continuous-integration/travis-ci/push The Travis CI build is in progress
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@abitmore abitmore deleted the jmj_1557 branch Mar 13, 2019

@oxarbitrage oxarbitrage referenced this pull request Mar 16, 2019

Merged

Merge hotfix #1657

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.