cache配置

whb
Commit 1272f4f6837cf95ba6f7514d128623d1b857ee00 1 parent c7f7edb7
Showing 1 changed file with 0 additions and 9 deletions
yohobuy/www.yohobuy.com/configs/core/cache.developer.config.ini
--- a/yohobuy/www.yohobuy.com/configs/core/cache.developer.config.ini
View file @1272f4f
+++ b/yohobuy/www.yohobuy.com/configs/core/cache.developer.config.ini
View file @1272f4f
- <<<<<<< HEAD
 [memcached]
 master.hosts = 192.168.102.161:11213
 slave.hosts = 192.168.102.161:11213
 session.hosts = 192.168.102.161:11213
 
 [redis]
- =======
- [memcached]
- master.hosts = 192.168.102.161:11213
- slave.hosts = 192.168.102.161:11213
- session.hosts = 192.168.102.161:11213
- 
- [redis]
- >>>>>>> 687eb8491b398c6ab714411b3c1bc0cf3c4ccbe8
 servers.hosts = 192.168.1.168:6379
\ No newline at end of file