Signed-off-by: zhouzhd <zzd338@163.com>
Signed-off-by: zhouzhd <zzd338@163.com>
Merge branch 'master' of
https://github.com/SeekerResource/HBaseSolrTool.git

Conflicts:
	README.md