add redis sentinel at server side
merge with master
change long to int when response to iget
bad commit
merge with master and fix conflict
auto recover when redis master down
merge with master
Merge remote-tracking branch 'origin/macan' into zhaoyang
Merge remote-tracking branch 'origin/macan' into zhaoyang
Merge remote-tracking branch 'origin/macan' into zhaoyang
merge with master
merge with master
Update client auto conf and URL.
Fix the jsp.jedis holding error; fix the concurrent jedis using bug in PhotoClient.
merge with master, close pc when clientapi quit
merge with master
fix error that client wait for a notify
add notifyAll in delFromSockets()
close socket when handler exits
add a type in MMSClient whether share ClientAPI among LPutThread or not