[SERVER-86177] Remove extra lines added during backport Created: 02/Feb/24  Updated: 08/Feb/24  Resolved: 08/Feb/24

Status: Closed
Project: Core Server
Component/s: None
Affects Version/s: 6.0.0-rc13
Fix Version/s: 6.0.14

Type: Bug Priority: Major - P3
Reporter: Adrian Gonzalez Montemayor Assignee: Dan Larkin-York
Resolution: Fixed Votes: 0
Labels: None
Remaining Estimate: Not Specified
Time Spent: Not Specified
Original Estimate: Not Specified

Assigned Teams:
Storage Execution
Backwards Compatibility: Fully Compatible
Operating System: ALL
Sprint: Execution Team 2024-02-19
Participants:

 Description   

During SERVER-77694  backport to v6.0 some extra lines where added here https://github.com/10gen/mongo/commit/8651ee570081d7fa33a44a53207494a4d390fcdf#diff-1ee50f1cea0b02bfc0789164533d9540a543e5305e14d063f4e49d47ee4fc2fd

 

README.third_party.md in v6.0 should also be updated with d98a68c + changes.



 Comments   
Comment by Githook User [ 08/Feb/24 ]

Author:

{'name': 'Dan Larkin-York', 'email': 'dan.larkin-york@mongodb.com', 'username': 'dhly-etc'}

Message: SERVER-86177 Clean up cherry-pick conflict in immer import script

GitOrigin-RevId: ce261f19592a525fad378a1a0f9a39a98a6687d6
Branch: v6.0
https://github.com/mongodb/mongo/commit/58047bbb02e7a73d3283cb39a6ec04c68ed911ac

Generated at Thu Feb 08 06:59:35 UTC 2024 using Jira 9.7.1#970001-sha1:2222b88b221c4928ef0de3161136cc90c8356a66.