Project

General

Profile

Actions
Copy link

Bug #24108

closed

Merge conflict error

Added by Elaad FURREEDAN 10 months ago. Updated 9 months ago.

Status:
Released
Priority:
N/A
Assignee:
Alexis Mousset
Target version:
Rudder plugins - 8.0
Pull Request:
https://github.com/Normation/rudder-p...
Severity:
Critical - prevents main use of Rudder | no workaround | data loss | security
UX impact:
User visibility:
Effort required:
Priority:
0
Name check:
To do
Fix check:
Checked
Regression:
No

Description

There is some merge which is still present

Actions
Copy link
 #1

Updated by Elaad FURREEDAN 10 months ago

  • Status changed from New to In progress
Actions
Copy link
 #2

Updated by Elaad FURREEDAN 10 months ago

  • Status changed from In progress to Pending technical review
  • Assignee changed from Elaad FURREEDAN to Vincent MEMBRÉ
  • Pull Request set to https://github.com/Normation/rudder-plugins/pull/638
Actions
Copy link
 #3

Updated by Elaad FURREEDAN 10 months ago

  • Pull Request changed from https://github.com/Normation/rudder-plugins/pull/638 to https://github.com/Normation/rudder-plugins/pull/639
Actions
Copy link
 #4

Updated by Elaad FURREEDAN 10 months ago

  • Target version changed from 1037 to 8.0
Actions
Copy link
 #5

Updated by Elaad FURREEDAN 10 months ago

  • Status changed from Pending technical review to In progress
  • Assignee changed from Vincent MEMBRÉ to Elaad FURREEDAN
Actions
Copy link
 #6

Updated by Elaad FURREEDAN 10 months ago

  • Status changed from In progress to Pending technical review
  • Assignee changed from Elaad FURREEDAN to Alexis Mousset
  • Pull Request changed from https://github.com/Normation/rudder-plugins/pull/639 to https://github.com/Normation/rudder-plugins/pull/640
Actions
Copy link
 #7

Updated by Anonymous 10 months ago

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

Updated by François ARMAND 10 months ago

  • Fix check changed from To do to Checked
Actions
Copy link
 #9

Updated by Vincent MEMBRÉ 10 months ago

  • Status changed from Pending release to Released

This bug has been fixed in Rudder plugin datasources v8.0.5-2.4

Actions
Copy link
 #10

Updated by Vincent MEMBRÉ 9 months ago

This bug has been fixed in Rudder plugin datasources v8.1.0.beta1-2.4

Actions
Copy link

Also available in: Atom PDF