Skip to content
Snippets Groups Projects

GAUDI-978: merge hive branch into master

Merged Marco Clemencic requested to merge hive into master

fixes GAUDI-978

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Marco Clemencic Added 522 commits:

    Added 522 commits:

    • 85ab1e02...aa624e17 - 503 commits from branch master
    • 529030ba - made the test GaudiExamples.CloneWithPrivateTools a "qmt" test
    • e27f814a - Merge branch 'master' into hive
    • 7d202bb0 - Added a few missing "override".
    • fd7f1add - Merge branch 'master' into hive
    • db99c50b - added timouts to the GaudiHive tests
    • f9148555 - renamed (back) Makefile to Makefile-cmake.mk to simplify merge with master
    • fd6bdd86 - ugly fix for ToolHandleArray for ATLAS
    • 0d597c5c - Merge branch 'dev/hive/ToolHandleArray' into 'hive'
    • 746c77d9 - backward compatibility of ToolHandles
    • 335f8ef9 - add -DATLAS to compiler flags for ATLAS
    • 7881aad6 - Merge branch 'master' into hive
    • a9d9e8c9 - demoted "Loop Finished" message to debug
    • 72cc5c02 - renamed Input and Output properties to Data*
    • 290f4555 - updated reference files after rename of Inputs and Outputs
    • e099b6f8 - fixed problem with Python DataObjectDescriptorCollection
    • 0b5bc472 - fixes and clean up to DataObjectDescriptor Python classes
    • 62118d94 - more clean up in GaudiKernel.DataObjectDescriptor
    • db6359ce - updated reference files after fixes to DataObjectDescriptor
    • c7c787c7 - Merge remote branch 'master' into hive
  • Marco Clemencic Added 2 commits:

    Added 2 commits:

    • f4ee9116 - fixed some compilation warnings
    • 510fdd4d - minor fixes to build configuration
  • Marco Clemencic Title changed from [WIP] GAUDI-978: merge hive branch into master to GAUDI-978: merge hive branch into master

    Title changed from [WIP] GAUDI-978: merge hive branch into master to GAUDI-978: merge hive branch into master

  • Marco Clemencic Status changed to merged

    Status changed to merged

  • Marco Clemencic mentioned in commit 57f356c5

    mentioned in commit 57f356c5

  • Gerhard Raven Mentioned in commit 4ee0b957

    Mentioned in commit 4ee0b957

Please register or sign in to reply
Loading