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

Merging 'develop' changes to 'master' #72

Closed
eldiener opened this issue Jan 30, 2019 · 12 comments
Closed

Merging 'develop' changes to 'master' #72

eldiener opened this issue Jan 30, 2019 · 12 comments

Comments

@eldiener
Copy link
Collaborator

I would like to move forward with merging the 'develop' changes which Cromwell Enage has been making to improve the Parameter library to the 'master' branch, so that those changes can be part of the next release of Boost.

With what other Boost libraries do we need to sync in order to merge Parameter 'develop' to 'master' ? As I understand it we probably need to sync this merge with Accumulators, Log, and Convert. Are there other libraries with which we need to sync the changes as we go to the 'master' branch ?

@CromwellEnage
Copy link
Collaborator

Lockfree and Signals2 also need to be synced since they rely on BOOST_PARAMETER_TEMPLATE_KEYWORD, which was moved to <boost/parameter/template_keyword.hpp>. Graph also needs to be synced.

@CromwellEnage
Copy link
Collaborator

I have release notes for this library set up in HTML format. How shall I submit them?

@CromwellEnage
Copy link
Collaborator

With Boost 1.70 closed for major changes today, it looks like we'll have to wait until after release, then target Boost 1.71 instead.

@pdimov
Copy link
Member

pdimov commented Apr 27, 2019

FWIW, I noticed that @jzmaddock intends to merge Graph to master based on boostorg/graph#164, which by the look of the CI results seems to be blocked on Parameter being merged first.

@jzmaddock
Copy link
Contributor

Yep, can't merge anything from Graph really till this is merged.

@CromwellEnage
Copy link
Collaborator

CromwellEnage commented Apr 27, 2019 via email

@CromwellEnage
Copy link
Collaborator

Okay, I've merged the PR since all checks passed, so Graph should be good to go.

@jzmaddock
Copy link
Contributor

Many thanks for that - it's much appreciated!

@CromwellEnage
Copy link
Collaborator

CromwellEnage commented Apr 28, 2019

I've created pull requests boostorg/accumulators#30, boostorg/lockfree#50, and boostorg/signals2#35 to help complete the syncing process for the master branch.

@jzmaddock
Copy link
Contributor

Ping?????

Can we merge to master yet?

@CromwellEnage
Copy link
Collaborator

Sorry, merging the new documentation now.

@Lastique
Copy link
Member

Lastique commented Dec 8, 2021

Develop was merged a while ago.

@Lastique Lastique closed this as completed Dec 8, 2021
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

No branches or pull requests

5 participants