Authored by 胡古飞

Merge branch 'master' into 0110

... ... @@ -11,9 +11,9 @@ redis.notsync.twemproxy.addresses=${redis.notsync.twemproxy.addresses}
redis.notsync.twemproxy.auth=${redis.notsync.twemproxy.auth}
#bigData - redis servers
bigDataRedis-search.proxy.address=${bigDataRedis.proxy.address}
bigDataRedis-search.proxy.port=${bigDataRedis.proxy.port}
bigDataRedis-search.proxy.auth=${bigDataRedis.proxy.auth}
bigDataRedis-search.proxy.address=${bigDataRedis-search.proxy.address}
bigDataRedis-search.proxy.port=${bigDataRedis-search.proxy.port}
bigDataRedis-search.proxy.auth=${bigDataRedis-search.proxy.auth}
#mq
search.mq.server=${search.mq.server}
... ...