chenchao / YOHOBUYPC · Commits

Go to a project

Authored by whb
Commit 1272f4f6837cf95ba6f7514d128623d1b857ee00 1 parent c7f7edb7

cache配置

Inline Side-by-side
Showing 1 changed file with 0 additions and 9 deletions
1 -<<<<<<< HEAD  
2 [memcached] 1 [memcached]
3 master.hosts = 192.168.102.161:11213 2 master.hosts = 192.168.102.161:11213
4 slave.hosts = 192.168.102.161:11213 3 slave.hosts = 192.168.102.161:11213
5 session.hosts = 192.168.102.161:11213 4 session.hosts = 192.168.102.161:11213
6 5
7 [redis] 6 [redis]
8 -=======  
9 -[memcached]  
10 -master.hosts = 192.168.102.161:11213  
11 -slave.hosts = 192.168.102.161:11213  
12 -session.hosts = 192.168.102.161:11213  
13 -  
14 -[redis]  
15 ->>>>>>> 687eb8491b398c6ab714411b3c1bc0cf3c4ccbe8  
16 servers.hosts = 192.168.1.168:6379 7 servers.hosts = 192.168.1.168:6379