honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix path_style_access after merge with master

This commit is contained in:
David Pilato 2016-07-21 09:45:12 +02:00
parent 98fd5833cc
commit 11ec3a4af6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceMetadataServiceImpl.java
View File

@ -41,7 +41,7 @@ import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction; import java.security.PrivilegedExceptionAction;
import java.util.function.Function; import java.util.function.Function;
public class GceMetadataServiceImpl extends AbstractLifecycleComponent<GceMetadataServiceImpl> { public class GceMetadataServiceImpl extends AbstractLifecycleComponent {
// Forcing Google Token API URL as set in GCE SDK to // Forcing Google Token API URL as set in GCE SDK to
// http://metadata/computeMetadata/v1/instance/service-accounts/default/token // http://metadata/computeMetadata/v1/instance/service-accounts/default/token

7
plugins/discovery-gce/src/main/java/org/elasticsearch/plugin/discovery/gce/GceDiscoveryPlugin.java
View File

@ -86,9 +86,10 @@ public class GceDiscoveryPlugin extends Plugin {
@SuppressWarnings("rawtypes") // Supertype uses raw type @SuppressWarnings("rawtypes") // Supertype uses raw type
public Collection<Class<? extends LifecycleComponent>> getGuiceServiceClasses() { public Collection<Class<? extends LifecycleComponent>> getGuiceServiceClasses() {
logger.debug("Register gce compute and metadata services"); logger.debug("Register gce compute and metadata services");
return Collections.singletonList( Collection<Class<? extends LifecycleComponent>> services = new ArrayList<>();
GceModule.getComputeServiceImpl(), services.add(GceModule.getComputeServiceImpl());
GceModule.getMetadataServiceImpl()); services.add(GceModule.getMetadataServiceImpl());
return services;
} }
public void onModule(DiscoveryModule discoveryModule) { public void onModule(DiscoveryModule discoveryModule) {