cross-domain deploy
cross-domain controls
cross-domain optimization && bug fixed
Merge pull request #310 from marsqing/master

functional after integration
support hdfs
Merge pull request #16 from dianping/master

pull NIUs' code
merge
conflict merge
add blackhole log4j by lantao.jin
Merge pull request #306 from songtong/master

cross-domain
add debug infos
speed ci
bug fixed
add blackhole dependency
Merge pull request #331 from songtong/master

add blackhole dependency
change phoenix-console's name in pom to phoenix-web for deploying
bug fixed
bug fixed
Merge pull request #332 from songtong/master

pom bug fixed
Merge branch 'master' of github.com:dianping/phoenix