Skip to content

Commit

Permalink
Merge branch 'rh/github-oidc-azure-auth' of github.com:databricks/dat…
Browse files Browse the repository at this point in the history
…abricks-sdk-java into rh/github-oidc-azure-auth
  • Loading branch information
renaudhartert-db committed Jul 11, 2024
2 parents 97c8991 + 38b2e1b commit ac6e0a2
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public static void setupProxy(ProxyConfig config, HttpClientBuilder builder) {
proxyPort = Integer.parseInt(System.getProperty(protocol + ".proxyPort"));
proxyUser = System.getProperty(protocol + ".proxyUser");
proxyPassword = System.getProperty(protocol + ".proxyPassword");
proxyAuthType = ProxyConfig.ProxyAuthType.BASIC;
proxyAuthType = config.getProxyAuthType();
}
// Override system properties if proxy configuration is explicitly set
if (config.getHost() != null) {
Expand Down

0 comments on commit ac6e0a2

Please sign in to comment.