Skip to content

Commit

Permalink
Merge branch '1.x' into backport/backport-860-to-1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
owaiskazi19 authored Jul 9, 2023
2 parents 82d80cb + 2df6712 commit 8940447
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/sdk/api/ActionExtension.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.opensearch.action.support.ActionFilter;
import org.opensearch.action.support.TransportAction;
import org.opensearch.action.support.TransportActions;
import org.opensearch.common.Strings;
import org.opensearch.core.common.Strings;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.rest.RestHeaderDefinition;
import org.opensearch.sdk.Extension;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.opensearch.common.Strings;
import org.opensearch.core.common.Strings;

import java.security.Key;
import java.security.KeyStore;
Expand Down

0 comments on commit 8940447

Please sign in to comment.