Merge branch 'jwdev' of yeshijie/wlyy2.0.config into jwdev

svr-iot.yml

@@ -66,7 +66,7 @@ hadoop:
  hbase-properties:
    hbase.zookeeper.property.clientPort: 2181
    zookeeper.znode.parent: /hbase-unsecure
    hbase.zookeeper.quorum:  node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum:  172.19.103.103,172.19.103.104,172.19.103.105
  user:
    name: root