Commits · db6a8e8298eba5f29dcb3293cad84b091edbcadb · atlas / athena

Oct 16, 2017
- Merge branch 'trigAnalysisTestART-v1' into '21.0' · db6a8e82
  Tamara Vazquez Schroeder authored 7 years ago
  
  add initial TrigAnalysisTest ART tests ATR-17172 See merge request !5323
  db6a8e82
- Merge branch 'triggerTestARTInitialTest-v6' into '21.0' · 00244fa9
  Tamara Vazquez Schroeder authored 7 years ago
  
  Updates to TriggerTest ART. ATR-17046 See merge request !5324
  00244fa9
- Merge branch 'revert_revert_of_MR_12_of_12' into '21.0' · 99588763
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch '21.0-missing-ztap-dev' into '21.0'"" See merge request !5449
  99588763
- Revert "Revert "Merge branch '21.0-missing-ztap-dev' into '21.0'"" · 122364ce
  James Beacham authored 7 years ago
  
  This reverts commit 93b85443.
  122364ce
- Merge branch 'revert_revert_of_MR_11_of_12' into '21.0' · 3573f857
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch 'dropTrkTrackLinkFromAthSimulation_21.0' into '21.0'"" See merge request !5448
  3573f857
- Revert "Revert "Merge branch 'dropTrkTrackLinkFromAthSimulation_21.0' into '21.0'"" · 380b0630
  James Beacham authored 7 years ago
  
  This reverts commit 1df083b5.
  380b0630
- Merge branch 'revert_revert_of_MR_10_of_12' into '21.0' · f568a70c
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch 'calo-containers' into '21.0'"" See merge request !5447
  f568a70c
- Revert "Revert "Merge branch 'calo-containers' into '21.0'"" · e6be9705
  James Beacham authored 7 years ago
  
  This reverts commit 6ee0d719.
  e6be9705
- Merge branch 'revert_revert_of_MR_9_of_12' into '21.0' · d575c1ce
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch '21.0-gene-trf' into '21.0'"" See merge request !5446
  d575c1ce
- Revert "Revert "Merge branch '21.0-gene-trf' into '21.0'"" · af7af939
  James Beacham authored 7 years ago
  
  This reverts commit 278a8b65.
  af7af939
- Merge branch 'revert_revert_of_MR_8_of_12' into '21.0' · 9b863883
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch '21.0' into '21.0'"" See merge request !5445
  9b863883
- Revert "Revert "Merge branch '21.0' into '21.0'"" · b694d8d9
  James Beacham authored 7 years ago
  
  This reverts commit 070e7907.
  b694d8d9
- Merge branch 'revert_revert_of_MR_7_of_12' into '21.0' · 6a1d65a9
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch '21.0-OverlayRTT' into '21.0'"" See merge request !5444
  6a1d65a9
- Revert "Revert "Merge branch '21.0-OverlayRTT' into '21.0'"" · 15359531
  James Beacham authored 7 years ago
  
  This reverts commit 212e989e.
  15359531
- Merge branch 'revert_revert_of_MR_6_of_12' into '21.0' · e776bafb
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch 'FCS_StepInfoSDs_ATLASSIM-3443_21.0' into '21.0'"" See merge request !5443
  e776bafb
- Revert "Revert "Merge branch 'FCS_StepInfoSDs_ATLASSIM-3443_21.0' into '21.0'"" · 1454cd5a
  James Beacham authored 7 years ago
  
  This reverts commit 1acee860.
  1454cd5a
- Merge branch 'revert_revert_of_MR_5_of_12' into '21.0' · 8845d1e9
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch '21.0_Loose-Selection-2' into '21.0'"" See merge request !5442
  8845d1e9
- Revert "Revert "Merge branch '21.0_Loose-Selection-2' into '21.0'"" · 9608e85b
  James Beacham authored 7 years ago
  
  This reverts commit 42f7d3de.
  9608e85b
- Merge branch 'revert_revert_of_MR_4_of_12' into '21.0' · 2ca54fae
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch 'tauhistutils-update-atltau-1368' into '21.0'"" See merge request !5441
  2ca54fae
- Revert "Revert "Merge branch 'tauhistutils-update-atltau-1368' into '21.0'"" · 14384b1b
  James Beacham authored 7 years ago
  
  This reverts commit c0c84f17.
  14384b1b
- Merge branch 'revert_revert_of_MR_3_of_12' into '21.0' · 5736def6
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch '21.0-UpdateRuntTier0Tests-SimTf' into '21.0'"" See merge request !5440
  5736def6
- Revert "Revert "Merge branch '21.0-UpdateRuntTier0Tests-SimTf' into '21.0'"" · 411ed010
  James Beacham authored 7 years ago
  
  This reverts commit 3fac6ee1.
  411ed010
- Merge branch 'revert_revert_of_MR_2_of_12' into '21.0' · e6dd019a
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch '21.0-PyJobTransforms-ATLASJT-370' into '21.0'"" See merge request !5439
  e6dd019a
- Revert "Revert "Merge branch '21.0-PyJobTransforms-ATLASJT-370 ' into '21.0'"" · 8bfe511a
  James Beacham authored 7 years ago
  
  This reverts commit ec540e4f.
  8bfe511a
- Merge branch 'revert_revert_of_MR_1_of_12' into '21.0' · 89a550ec
  James Beacham authored 7 years ago
  
  Revert "Revert "Merge branch '21.0' into '21.0'"" See merge request !5438
  89a550ec
- Revert "Revert "Merge branch '21.0' into '21.0'"" · 56a7354b
  James Beacham authored 7 years ago
  
  This reverts commit e0b3f47d.
  56a7354b
Oct 14, 2017
- Merge branch 'revert_to_good_nightly' into '21.0' · 75e594cd
  James Beacham authored 7 years ago
  
  Revert 21.0 to r2017-10-05T2151 See merge request !5430
  75e594cd
- Revert "Merge branch '21.0' into '21.0'" · e0b3f47d
  James Beacham authored 7 years ago
  
  This reverts commit 22969e11, reversing changes made to f71c4f2b.
  e0b3f47d
- Revert "Merge branch '21.0-PyJobTransforms-ATLASJT-370 ' into '21.0'" · ec540e4f
  James Beacham authored 7 years ago
  
  This reverts commit 6b05cc73, reversing changes made to 22969e11.
  ec540e4f
- Revert "Merge branch '21.0-UpdateRuntTier0Tests-SimTf' into '21.0'" · 3fac6ee1
  James Beacham authored 7 years ago
  
  This reverts commit f1906efb, reversing changes made to 6b05cc73.
  3fac6ee1
- Revert "Merge branch 'tauhistutils-update-atltau-1368' into '21.0'" · c0c84f17
  James Beacham authored 7 years ago
  
  This reverts commit 0389d6a7, reversing changes made to f1906efb.
  c0c84f17
- Revert "Merge branch '21.0_Loose-Selection-2' into '21.0'" · 42f7d3de
  James Beacham authored 7 years ago
  
  This reverts commit d57d58cd, reversing changes made to 0389d6a7.
  42f7d3de
- Revert "Merge branch 'FCS_StepInfoSDs_ATLASSIM-3443_21.0' into '21.0'" · 1acee860
  James Beacham authored 7 years ago
  
  This reverts commit c946c5c2, reversing changes made to d57d58cd.
  1acee860
- Revert "Merge branch '21.0-OverlayRTT' into '21.0'" · 212e989e
  James Beacham authored 7 years ago
  
  This reverts commit f1968b3e, reversing changes made to c946c5c2.
  212e989e
- Revert "Merge branch '21.0' into '21.0'" · 070e7907
  James Beacham authored 7 years ago
  
  This reverts commit 0752891b, reversing changes made to f1968b3e.
  070e7907
- Revert "Merge branch '21.0-gene-trf' into '21.0'" · 278a8b65
  James Beacham authored 7 years ago
  
  This reverts commit 66157e9a, reversing changes made to 0752891b.
  278a8b65
- Revert "Merge branch 'calo-containers' into '21.0'" · 6ee0d719
  James Beacham authored 7 years ago
  
  This reverts commit 5c17579c, reversing changes made to 66157e9a.
  6ee0d719
- Revert "Merge branch 'dropTrkTrackLinkFromAthSimulation_21.0' into '21.0'" · 1df083b5
  James Beacham authored 7 years ago
  
  This reverts commit 58d81c0e, reversing changes made to 5c17579c.
  1df083b5
- Revert "Merge branch '21.0-missing-ztap-dev' into '21.0'" · 93b85443
  James Beacham authored 7 years ago
  
  This reverts commit 8814e168, reversing changes made to 58d81c0e.
  93b85443
Oct 11, 2017
- Update version.txt · 6ce7ecd8
  James Beacham authored 7 years ago
  
  6ce7ecd8