Project

General

Profile

Actions
Copy link

Bug #13432

closed

Git merge issue between Rudder 4.3 and Rudder 5.0

Added by François ARMAND over 6 years ago. Updated over 6 years ago.

Status:
Released
Priority:
N/A
Assignee:
Vincent MEMBRÉ
Category:
Architecture - Code maintenance
Target version:
5.0.0~rc1
Pull Request:
https://github.com/Normation/rudder/p...
Severity:
UX impact:
User visibility:
Effort required:
Priority:
0
Name check:
Fix check:
Regression:

Description

Something goes wrong with some commit between Rudder 4.3 and Rudder 5.0.

We need to check that modification from #12621, #12629 and #12661 are correctly upmerged.

At least for #12621 beb105c9b4558002347a4326624caf02b8e20c85 we are sure that the modifications were not correctly upmerged.

Actions
Copy link
 #1

Updated by François ARMAND over 6 years ago

eeb3ef0c7778354801dcba89099f3c032db502e5 from #12629 seems to be correctly merged.
704d91702cd21678444f26a6fbe3171f87c3085a from #12661 is not merged correctly.

Actions
Copy link
 #2

Updated by François ARMAND over 6 years ago

  • Status changed from In progress to Pending technical review
  • Assignee changed from François ARMAND to Vincent MEMBRÉ
  • Pull Request set to https://github.com/Normation/rudder/pull/2027
Actions
Copy link
 #3

Updated by François ARMAND over 6 years ago

  • Status changed from Pending technical review to Pending release
Actions
Copy link
 #4

Updated by Vincent MEMBRÉ over 6 years ago

  • Status changed from Pending release to Released
This bug has been fixed in Rudder 5.0.0~rc1 which was released today. 
Changelog
Actions
Copy link

Also available in: Atom PDF