Commits · 87e20087d0746848ff5a8d9f3f8b1d00af15808a · Davide Di Croce / athena

Oct 06, 2023
- fix MR sweep rule · 45118fd5
  AtlasNightlyBuild authored 1 year ago
  
  45118fd5
Nov 18, 2022

Ignore build scripts in merges · a98986a3

Ignore changes to the build scripts in the "daily merges" from the production branch
to master. Just like changes to "Projects" these should be done explicitly for each
branch.

a98986a3

Jul 29, 2022
- SweepRule: remove trigger references from ignore list · 23c4a5d1
  Frank Winklmeier authored 2 years ago
  
  For the moment we still keep the trigger references in sync between 22.0 and master.
  23c4a5d1
- SweepRule: add git attributes file · 40976ac4
  Frank Winklmeier authored 2 years ago
  
  Add git `attributes` file for manual merges of 22.0 into master.
  40976ac4
May 26, 2022
- Revert "22.0 -> master sweeping rule" · 2c2bdc3d
  Adam Edward Barton authored 2 years ago
  
  This reverts commit a438e8ab.
  2c2bdc3d
May 23, 2022
- 22.0 -> master sweeping rule · a438e8ab
  Atlas-Software Librarian authored 2 years ago and Johannes Elmsheuser committed 2 years ago
  
  a438e8ab
May 17, 2022
- 22.0 -> master sweeping rule · aa437f5f
  Atlas-Software Librarian authored 2 years ago
  
  aa437f5f
Dec 11, 2017
- Revert "Revert "fix conflicts of KinkTrkSingleJetMetFilterTool"" · ae064298
  Toshiaki Kaji authored 7 years ago
  
  This reverts commit cdf718bf [formerly 9d67f5b8]. Former-commit-id: 008b62d0
  ae064298
Dec 08, 2017

Revert "fix conflicts of KinkTrkSingleJetMetFilterTool" · cdf718bf

Toshiaki Kaji authored 7 years ago

This reverts commit 9156e32ac88ebae9bf90ce0c19a40933a6fb097e [formerly f73d17d3f46239034e6ab596ed09b9aa922f4ad5], reversing
changes made to 27d106d1c78657e78ee8e51365e28572176cf185 [formerly 8f2f51887120a7b1cc2c7aff8c3101d0e69d4a2d].

Former-commit-id: 9d67f5b8a4078841f852715040f5a05bd7efc41b

cdf718bf

Nov 17, 2017
- CI/config.yaml -> SweepRule/config.yaml · 67b8190e
  Atlas-Software Librarian authored 7 years ago
  
  Former-commit-id: 2131f448
  67b8190e