Authored by 周少峰

Merge branch 'master' of git.dev.yoho.cn:web/yohobuy

1 [memcached] 1 [memcached]
2 -master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111  
3 -slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112  
4 -session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111 2 +master.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  3 +slave.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  4 +session.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
5 5
6 [redis] 6 [redis]
7 servers.hosts=127.0.0.1:6379 7 servers.hosts=127.0.0.1:6379
  1 +[memcached]
  2 +master.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  3 +slave.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  4 +session.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379
1 [memcached] 1 [memcached]
2 -master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111  
3 -slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112  
4 -session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111 2 +master.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  3 +slave.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  4 +session.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
5 5
6 [redis] 6 [redis]
7 servers.hosts=127.0.0.1:6379 7 servers.hosts=127.0.0.1:6379
  1 +[memcached]
  2 +master.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  3 +slave.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  4 +session.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379