SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Spencer Gibb
2018-03-22 14:57:03 -04:00
parent 4cda66af3f 2d784ef775
commit 96b0bef765
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -13,4 +13,5 @@ _site/
*.ipr
.factorypath
*.swp
/consul
/consul
consul_*.zip

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistry.java
View File

@@ -83,7 +83,7 @@ public class ConsulServiceRegistry implements ServiceRegistry<ConsulRegistration
if (log.isInfoEnabled()) {
log.info("Deregistering service with consul: " + reg.getInstanceId());
}
client.agentServiceDeregister(reg.getInstanceId());
client.agentServiceDeregister(reg.getInstanceId(), properties.getAclToken());
}
@Override