modify jvm options
Merge pull request #256 from leoliang/master

modify jvm options
context path
modify jvm option
Merge pull request #257 from leoliang/master

jvm option modification & context path
Merge pull request #258 from marsqing/master

add phoenix-agent and make it executable; remove log4j.xml in phoenix-container
Merge pull request #259 from marsqing/master

support d.dianping.com and add phoenix-byteman
auto refresh service-meta
Merge pull request #260 from marsqing/master

add phoenix-load-balancer
Merge pull request #261 from marsqing/master

bump dev version and init commit of load balancer
Merge pull request #262 from marsqing/master

use jetty 6.1.14; add load balancer console skeleton
Merge pull request #263 from marsqing/master

support s.dianping.com
Merge pull request #264 from marsqing/master

fix typo
Merge branch 'master' of https://github.com/dianping/phoenix
add deploy shell
Merge pull request #265 from leoliang/master

alpha env batch update script
modify auth before deploy
Merge pull request #266 from leoliang/master

modify auth before deploy
read .vm from git and bump version
support s.dianping