Merge branch 'master' into dev

ping
Commit c7e60381468bfcf67594adff872805be736c6b0f 2 parents 3d6d7f07 25825ed7
Showing 1 changed file with 1 additions and 1 deletions
web/src/main/webapp/META-INF/autoconf/config.properties
--- a/web/src/main/webapp/META-INF/autoconf/config.properties
View file @c7e6038
+++ b/web/src/main/webapp/META-INF/autoconf/config.properties
View file @c7e6038
 
 #memcached
- cache.servers.memcached.address=${cache.servers.gateway.level1.address}
+ cache.servers.memcached.address=${cache.servers.union.address}
 
 #MQ
 rabbit.mq.host=${rabbit.mq.host}