Skip to content
Permalink
Browse files
Merge pull request #142 from cbek/JENKINS-26414
JENKINS-26414 - Add support for new C4 instance types
  • Loading branch information
francisu committed Mar 31, 2015
2 parents b59267e + d34b4ae commit 2c5aa2462f72c34082a3d2dcd2e9806b300bdd3a
Showing 1 changed file with 1 addition and 0 deletions.
@@ -474,6 +474,7 @@ public synchronized AmazonEC2 connect() throws AmazonClientException {
public synchronized static AmazonEC2 connect(AWSCredentialsProvider credentialsProvider, URL endpoint) {
awsCredentialsProvider = credentialsProvider;
ClientConfiguration config = new ClientConfiguration();
config.setSignerOverride("QueryStringSignerType");
ProxyConfiguration proxyConfig = Jenkins.getInstance().proxy;
Proxy proxy = proxyConfig == null ? Proxy.NO_PROXY : proxyConfig.createProxy(endpoint.getHost());
if (! proxy.equals(Proxy.NO_PROXY) && proxy.address() instanceof InetSocketAddress) {

0 comments on commit 2c5aa24

Please sign in to comment.