merge upstream

Author: hhermanwang

CHANGELOG.md

@@ -5,7 +5,7 @@ FEATURES:
 * **New Resource**: `tencentcloud_sqlserver_basic_instance`
 * **New Data Source**: `tencentcloud_sqlserver_basic_instances` 
 
-## 1.47.0 (Unreleased)
+## 1.47.0 (November 13, 2020)
 
 ENHANCEMENTS:
 * Resource: `tencentcloud_clb_listener` support import.
@@ -14,7 +14,7 @@ ENHANCEMENTS:
 * Resource: `tencentcloud_cdn_domain` add example that use COS bucket url as origin.
 * Resource: `tencentcloud_sqlserver_instance` add new argument `tags`.
 * Resource: `tencentcloud_sqlserver_readonly_instance` add new argument `tags`.
-* Resource: `tencentcloud_elasticsearch_instance` support nodeType and diskSize modification.
+* Resource: `tencentcloud_elasticsearch_instance` support `node_type` and `disk_size` modification.
 * Data Source: `tencentcloud_instance_types` add argument `exclude_sold_out` to support filtering sold out instance types. 
 * Data Source: `tencentcloud_sqlserver_instances` add new argument `tags`.