* commit '4f9b230e':
  fix formatting
  Add type check to Entity::mergeAndReset
  Test for Monitoring::Hub::Entity::mergeAndReset

Gitlab CI authored 3 years ago and Sebastien Ponce committed 3 years ago

patch generated by https://gitlab.cern.ch/gaudi/Gaudi/-/jobs/17780880

with additional tests of the different features : merging on one side (credits to Daniel Craig) and using non mergeable data on the other

See merge request !1270

See merge request !1273

See merge request !1274

See merge request !1269

See merge request !1268

See merge request !1267

Gitlab CI authored 3 years ago and Sebastien Ponce committed 3 years ago

patch generated by https://gitlab.cern.ch/gaudi/Gaudi/-/jobs/17286781

One can now write :
  Histogram<2, atomicity::full, float> hist{&algo, "Test2DHist", "Test 2D histogram", {64, 0., 64.}, {52, 0., 52.}};
while it used to be only
  Histogram<2, atomicity::full, float> hist{&algo, "Test2DHist", "Test 2D histogram", {{64, 0., 64.}, {52, 0., 52.}}};
with extra braces.

Prevent import of Gaudi.Configuration * from pulling ConfigurableUser
specializations.

last changes broke code using this

See merge request !1266

Closes #200

See merge request !1264

See merge request !1253

See merge request !1261

See merge request !1259

Closes #181

See merge request !1263