Skip to content

Commit 91d61f6

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix_match_phrase_prefix_bug
2 parents 251bd44 + 89e4727 commit 91d61f6

File tree

94 files changed

+64
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+64
-49
lines changed

CHANGELOG.md

+2-1

buildSrc/version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jakarta_annotation = 1.3.5
2626
# when updating the JNA version, also update the version in buildSrc/build.gradle
2727
jna = 5.13.0
2828

29-
netty = 4.1.101.Final
29+
netty = 4.1.104.Final
3030
joda = 2.12.2
3131

3232
# project reactor

modules/transport-netty4/licenses/netty-buffer-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
756797174b94a3aee11ce83522473f3c18287a43

modules/transport-netty4/licenses/netty-codec-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f51fcfd3baac88b2c0b8dc715932ad5622d17429

modules/transport-netty4/licenses/netty-codec-http-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2db1556de1b8dc07695604bf51a0a133263ad63f

modules/transport-netty4/licenses/netty-codec-http2-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5bb757929f7c4d1bf12740a378a99643caaad1ac

modules/transport-netty4/licenses/netty-common-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ec5fc4a7c5475eb20805e14f7274aa28872b5ba1

modules/transport-netty4/licenses/netty-handler-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18c0e659950cdef5f12c36eccfa14cbd2ad2049d

modules/transport-netty4/licenses/netty-resolver-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dfa4fe5c3a6eabb7af09902eb63266829876d8a2

modules/transport-netty4/licenses/netty-transport-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
da7b263b6fedc5add70e78ee8927c8bd2b9bb589

modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d4da9f7237ac3ac292891e0b2d5364acbce128cf

plugins/repository-azure/licenses/netty-codec-dns-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8e237ce67ab230ed1ba749d6651b278333c21b3f

plugins/repository-azure/licenses/netty-codec-http2-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5bb757929f7c4d1bf12740a378a99643caaad1ac

plugins/repository-azure/licenses/netty-codec-socks-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5b126ceba61275f38297cacd5ea0cd6d3addee04

plugins/repository-azure/licenses/netty-handler-proxy-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
50a2d899a8f8a68daed1a9b6d7750184310cc45f

plugins/repository-azure/licenses/netty-resolver-dns-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f1210e5856fecb9182d58c0d33fa6e946b344b40

plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d4da9f7237ac3ac292891e0b2d5364acbce128cf

plugins/repository-hdfs/licenses/netty-all-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d75246285e5fac6f6dad47e387ed4f46f36e521d

plugins/repository-s3/licenses/netty-buffer-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
756797174b94a3aee11ce83522473f3c18287a43

plugins/repository-s3/licenses/netty-codec-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f51fcfd3baac88b2c0b8dc715932ad5622d17429

plugins/repository-s3/licenses/netty-codec-http-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2db1556de1b8dc07695604bf51a0a133263ad63f

plugins/repository-s3/licenses/netty-codec-http2-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5bb757929f7c4d1bf12740a378a99643caaad1ac

plugins/repository-s3/licenses/netty-common-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ec5fc4a7c5475eb20805e14f7274aa28872b5ba1

plugins/repository-s3/licenses/netty-handler-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18c0e659950cdef5f12c36eccfa14cbd2ad2049d

plugins/repository-s3/licenses/netty-resolver-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dfa4fe5c3a6eabb7af09902eb63266829876d8a2

plugins/repository-s3/licenses/netty-transport-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
da7b263b6fedc5add70e78ee8927c8bd2b9bb589

plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
700fdbabab44709b0eccffe8f91c4226a5787356

plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d4da9f7237ac3ac292891e0b2d5364acbce128cf

plugins/transport-nio/licenses/netty-buffer-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
756797174b94a3aee11ce83522473f3c18287a43

plugins/transport-nio/licenses/netty-codec-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f51fcfd3baac88b2c0b8dc715932ad5622d17429

plugins/transport-nio/licenses/netty-codec-http-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2db1556de1b8dc07695604bf51a0a133263ad63f

plugins/transport-nio/licenses/netty-common-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ec5fc4a7c5475eb20805e14f7274aa28872b5ba1

plugins/transport-nio/licenses/netty-handler-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18c0e659950cdef5f12c36eccfa14cbd2ad2049d

plugins/transport-nio/licenses/netty-resolver-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dfa4fe5c3a6eabb7af09902eb63266829876d8a2

plugins/transport-nio/licenses/netty-transport-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
da7b263b6fedc5add70e78ee8927c8bd2b9bb589

plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
756797174b94a3aee11ce83522473f3c18287a43

plugins/transport-reactor-netty4/licenses/netty-codec-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f51fcfd3baac88b2c0b8dc715932ad5622d17429

plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8e237ce67ab230ed1ba749d6651b278333c21b3f

plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2db1556de1b8dc07695604bf51a0a133263ad63f

plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5bb757929f7c4d1bf12740a378a99643caaad1ac

plugins/transport-reactor-netty4/licenses/netty-common-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ec5fc4a7c5475eb20805e14f7274aa28872b5ba1

plugins/transport-reactor-netty4/licenses/netty-handler-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18c0e659950cdef5f12c36eccfa14cbd2ad2049d

plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dfa4fe5c3a6eabb7af09902eb63266829876d8a2

plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f1210e5856fecb9182d58c0d33fa6e946b344b40

plugins/transport-reactor-netty4/licenses/netty-transport-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
da7b263b6fedc5add70e78ee8927c8bd2b9bb589

plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d4da9f7237ac3ac292891e0b2d5364acbce128cf

rest-api-spec/src/main/resources/rest-api-spec/test/search/340_doc_values_field.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
setup:
22
- skip:
33
features: [ "headers" ]
4-
version: " - 2.99.99"
5-
reason: "searching with only doc_values was added in 3.0.0"
4+
version: " - 2.11.99"
5+
reason: "searching with only doc_values was added in 2.12.0"
66
---
77
"search on fields with both index and doc_values enabled":
88
- do:

server/src/internalClusterTest/java/org/opensearch/cluster/allocation/AwarenessAllocationIT.java

+1
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ public void testAwarenessZonesIncrementalNodes() {
364364
assertThat(counts.get(noZoneNode), equalTo(2));
365365
}
366366

367+
@AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/5908")
367368
public void testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness() throws Exception {
368369
int nodeCountPerAZ = 5;
369370
int numOfShards = 30;

server/src/main/java/org/opensearch/common/settings/FeatureFlagSettings.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ protected FeatureFlagSettings(
4040
FeatureFlags.IDENTITY_SETTING,
4141
FeatureFlags.CONCURRENT_SEGMENT_SEARCH_SETTING,
4242
FeatureFlags.TELEMETRY_SETTING,
43-
FeatureFlags.DATETIME_FORMATTER_CACHING_SETTING
43+
FeatureFlags.DATETIME_FORMATTER_CACHING_SETTING,
44+
FeatureFlags.WRITEABLE_REMOTE_INDEX_SETTING
4445
)
4546
)
4647
);

server/src/main/java/org/opensearch/common/util/FeatureFlags.java

+12
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ public class FeatureFlags {
6060
*/
6161
public static final String DATETIME_FORMATTER_CACHING = "opensearch.experimental.optimization.datetime_formatter_caching.enabled";
6262

63+
/**
64+
* Gates the functionality of writeable remote index
65+
* Once the feature is ready for release, this feature flag can be removed.
66+
*/
67+
public static final String WRITEABLE_REMOTE_INDEX = "opensearch.experimental.feature.writeable_remote_index.enabled";
68+
6369
/**
6470
* Should store the settings from opensearch.yml.
6571
*/
@@ -122,4 +128,10 @@ public static boolean isEnabled(Setting<Boolean> featureFlag) {
122128
true,
123129
Property.NodeScope
124130
);
131+
132+
public static final Setting<Boolean> WRITEABLE_REMOTE_INDEX_SETTING = Setting.boolSetting(
133+
WRITEABLE_REMOTE_INDEX,
134+
false,
135+
Property.NodeScope
136+
);
125137
}

0 commit comments

Comments
 (0)