get rebase

SungJin1212 · SungJin1212 · commit 9933269e6fff · 2025-10-23T17:13:32.000+09:00
Signed-off-by: SungJin1212 &lt;tjdwls1201@gmail.com&gt;
diff --git a/docs/configuration/config-file-reference.md b/docs/configuration/config-file-reference.md
@@ -3135,11 +3135,6 @@ ha_tracker:
 # CLI flag: -distributor.sign-write-requests
 [sign_write_requests: <boolean> | default = false]
 
-# EXPERIMENTAL: If true, accept prometheus remote write v2 protocol push
-# request.
-# CLI flag: -distributor.remote-write2-enabled
-[remote_write2_enabled: <boolean> | default = false]
-
 # EXPERIMENTAL: If enabled, distributor would use stream connection to send
 # requests to ingesters.
 # CLI flag: -distributor.use-stream-push
diff --git a/integration/remote_write_v2_test.go b/integration/remote_write_v2_test.go
@@ -25,7 +25,7 @@ import (
 )
 
 func TestIngesterRollingUpdate(t *testing.T) {
-	// Test ingester rolling update situation: when -distributor.remote-write2-enabled is true, and ingester uses the v1.19.0 image.
+	// Test ingester rolling update situation: when -distributor.remote-writev2-enabled is true, and ingester uses the v1.19.0 image.
 	// Expected: remote write 2.0 push success
 	const blockRangePeriod = 5 * time.Second
 	ingesterImage := "quay.io/cortexproject/cortex:v1.19.0"

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func TestIngesterRollingUpdate(t *testing.T) {`
`28`		`- // Test ingester rolling update situation: when -distributor.remote-write2-enabled is true, and ingester uses the v1.19.0 image.`
	`28`	`+ // Test ingester rolling update situation: when -distributor.remote-writev2-enabled is true, and ingester uses the v1.19.0 image.`
`29`	`29`	`// Expected: remote write 2.0 push success`
`30`	`30`	`const blockRangePeriod = 5 * time.Second`
`31`	`31`	`ingesterImage := "quay.io/cortexproject/cortex:v1.19.0"`