TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 108 Pull requests 3 Projects Releases 1 Activity Actions

Fix master problems after recent merges #422

Merged
fyrchik merged 1 commit from fyrchik/frostfs-node:fix-conflicts into master 2023-07-26 21:07:58 +00:00
Conversation 0 Commits 1 Files changed 2 +2 -2
fyrchik commented 2023-06-02 11:49:28 +00:00
Owner
Copy link

#417, #416

#417, #416
fyrchik requested review from storage-core-committers 2023-06-02 11:49:52 +00:00
fyrchik requested review from storage-core-developers 2023-06-02 11:49:52 +00:00
fyrchik force-pushed fix-conflicts from db364d1c9d to a770b89fd8 2023-06-02 11:49:54 +00:00 Compare
acid-ant approved these changes 2023-06-02 11:53:02 +00:00
fyrchik merged commit a770b89fd8 into master 2023-06-02 11:58:29 +00:00
fyrchik deleted branch fix-conflicts 2023-06-02 11:58:31 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
acid-ant
TrueCloudLab/storage-core-developers
Labels
Clear labels   
P0

Highest

  
P1

High

  
P2

Medium

  
P3

Low

  
badger

Badger DB related issues

  
frostfs-adm

   
frostfs-cli

   
frostfs-ir

   
frostfs-lens

   
frostfs-node

   
good first issue

Good for newcomers

  
triage
  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff

  
blocked

The issue or PR is blocked by something

  
bug

Something is not working

  
config

Configuration format update or breaking change

  
discussion

Talking about something in order to reach a decision or to exchange ideas

  
documentation

Documentation related

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
go

Language features adoption

  
help wanted

Extra attention is needed

  
internal

   
invalid

Something is wrong

  
kludge

This is a kludge and we know it

  
observability

Related to metrics, tracing and logs

  
perfomance

Perfomance related

  
question

More information is needed

  
refactoring

Refactoring

  
wontfix

This won't be fixed

No labels
P0
P1
P2
P3
badger
frostfs-adm
frostfs-cli
frostfs-ir
frostfs-lens
frostfs-node
good first issue
triage
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-node#422
No description provided.
Delete branch "fyrchik/frostfs-node:fix-conflicts"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?