Authored by ping

Merge branch 'dev'

@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <property name="jdbc.mysql.readonlyinslave" defaultValue="true" description="读操作是否只在从库" /> 9 <property name="jdbc.mysql.readonlyinslave" defaultValue="true" description="读操作是否只在从库" />
10 10
11 <!-- memcached --> 11 <!-- memcached -->
12 - <property name="cache.servers.union.address" defaultValue="192.168.102.211:11211" description="" /> 12 + <property name="cache.servers.union.address" defaultValue="memcache.union.yohoops.org:11211" description="" />
13 13
14 <!-- MQ --> 14 <!-- MQ -->
15 <property name="rabbit.mq.host" defaultValue="192.168.102.162" description="" /> 15 <property name="rabbit.mq.host" defaultValue="192.168.102.162" description="" />