配置还原zmcc配置
Merge branch 'master' into zmcc

Conflicts:
	config/database.yml
	config/indexer.yml
rake update Gemfile
fix:zmcc config sensu api auth
fix: config yaml file bug
fix: chef server api port to lib task
fix: 取出匹配精确bug
test task commend
fix: graphtie 性能图展示url链接
Merge branch 'zmcc'

Conflicts:
	lib/data_to_json.rb
fix: nodes_domain config json file
添加基于mcollective的任务管理模块v0.1
变更gem环境
变更环境数据库配置
变更资源路径，和服务环境
Merge branch 'zmcc' into dntmon

Conflicts:
	Gemfile
	Gemfile.lock
	config/config.yml
	config/database.yml
	config/indexer.yml