cms-gem-daq-project / xhal

XHAL interface library
0 stars 10 forks source link

[feature] templated rpc methods #143

Closed jsturdy closed 4 years ago

jsturdy commented 4 years ago

Description

Merge in preliminary templated RPC changes WIP because commits added to the develop branch were incorporated independently into the templated branch and a decision on how to proceed should be made (order of preference): 1) Rebase feature/templated-rpc-methods onto develop skipping duplicated commits (straightforward fix for two conflicts) 1) Revert 76c67ae "Merge pull request #117 from cms-gem-daq-project/bugfix/log4cplus-2.0", then merge this PR 1) ~Merge without action (conflict resolution addition/deletion of previously moved file)~

Types of changes

Motivation and Context

It's the way of the future

How Has This Been Tested?

In testing

lpetre-ulb commented 4 years ago

WIP because commits added to the develop branch were incorporated independently into the templated branch and a decision on how to proceed should be made (order of preference):

1. Rebase `feature/templated-rpc-methods` onto `develop` skipping duplicated commits (straightforward fix for two conflicts)
2. Revert  [76c67ae](https://github.com/cms-gem-daq-project/xhal/commit/76c67ae5a73c447f64c5faee0346ef56f70105fd) "Merge pull request #117 from cms-gem-daq-project/bugfix/log4cplus-2.0", then merge this PR

I'd go for the first proposal, although I have not a strong opinion against the second one.

jsturdy commented 4 years ago

Forced option 1