Merge branch 'master' into test-feature1/test1

Author: MatheMatrix

.gitconfig/hooks/commit-msg

@@ -41,6 +41,15 @@ class bcolors:
 WARNS = 0
 REPO_NAME =""
 
+
+# default open function(python3)
+open = open
+# using python2 codecs.open func if python version is 2
+if sys.version_info.major == 2:
+    import codecs
+    open = codecs.open
+
+
 def main():
     try:
         if not check_commit_msg_enabled():
@@ -61,7 +70,7 @@ def backup_and_exit(file_path):
 
     lines = []
     useful = ["\n\n"]
-    with open(file_path, 'r') as f:
+    with open(file_path, 'r', encoding='utf8') as f:
         lines = f.readlines()
     for l in lines:
             if l.startswith("# Please enter the commit") or \
@@ -87,7 +96,7 @@ def fix_commit_msg(file_path):
     # see: https://superuser.com/questions/1367811/sometimes-git-includes-the-diff-to-commit-message-when-using-verbose
 
     fixed_commit_msg = []
-    with open(file_path, 'r') as f:
+    with open(file_path, 'r', encoding='utf8') as f:
         lines = f.readlines()
         for no, line in enumerate(lines):
             if "# Everything below it will be ignored." in line.strip() or \
@@ -96,7 +105,7 @@ def fix_commit_msg(file_path):
                 break
     if len(fixed_commit_msg) == 0:
         return
-    with open(file_path, 'w') as f:
+    with open(file_path, 'w', encoding='utf8') as f:
         f.writelines(fixed_commit_msg)
 
 
@@ -124,7 +133,7 @@ def check_commit_msg(file_path):
 
     jira_patterns = [r"\bZSTAC-\d+\b", r"\bZSTACK-\d+\b", r"\bMINI-\d+\b", 
                      r"\bZOPS-\d+\b", r"\bZHCI-\d+\b"]
-    with open(file_path, 'r') as f:
+    with open(file_path, 'r', encoding='utf8') as f:
         lines = f.readlines()
         full_lines = len(lines)
 

.gitconfig/hooks/prepare-commit-msg

@@ -31,6 +31,13 @@ import traceback
 from collections import Counter
 
 
+# default open function(python3)
+open = open
+# using python2 codecs.open func if python version is 2
+if sys.version_info.major == 2:
+    import codecs
+    open = codecs.open
+
 def main():
     try:
         if not auto_commit_msg_enabled():
@@ -73,7 +80,7 @@ def write_commit_msg(commit_msg_filepath, type, scope, tags, jiras):
 # 3. Are there any side effects?\n
 '''
 
-    with open(commit_msg_filepath, 'r+') as msg:
+    with open(commit_msg_filepath, 'r+', encoding='utf8') as msg:
         in_usable_content = False
         useable_contents = []
         for line in msg.readlines():
@@ -102,7 +109,7 @@ def write_commit_msg(commit_msg_filepath, type, scope, tags, jiras):
 
         real_commit_msg.append("\nChange-Id: %s\n" % get_change_id())
 
-    with open(commit_msg_filepath, 'w') as msg:
+    with open(commit_msg_filepath, 'w', encoding='utf8') as msg:
         real_commit_msg.extend(useable_contents)
         msg.writelines(real_commit_msg)
 
@@ -118,7 +125,7 @@ def process_metadata(commit_msg_filepath):
 
     changed_folders = []
     changed_paths = {}
-    with open(commit_msg_filepath, 'r+') as msg:
+    with open(commit_msg_filepath, 'r+', encoding='utf8') as msg:
         content = msg.readlines()
         for no, line in enumerate(content):
             line = line.strip()
@@ -222,6 +229,10 @@ def get_scope(changed_folders, changed_paths):
                 break
             if not found_magic:
                 scopes.append("conf")
+        elif "pom.xml" in p:
+            # eg. header/pom.xml
+            # eg. pom.xml
+            scopes.append("dependencies")
 
     scope_counter = Counter(scopes)
     most_common = scope_counter.most_common(1)[0][0]

README.md

@@ -88,7 +88,10 @@ Installation and upgrade are as simple as deploying a **Java WAR file**. A POC e
 a bootstrap script; A multi-node production environment can be deployed in **30 minutes** including the time you read the
 documentation.
 
-     >> [root@localhost ~]# curl http://download.zstack.org/install.sh |  bash -s -- -a
+Quick access:  
+
+* [Product download page(CN)](https://www.zstack.io/product/product_downloads/)
+* [Product download page(EN)](https://www.zstack-cloud.com/product/product_downloads/)
 
 #### Full automation
 
@@ -110,101 +113,105 @@ that adding or removing features will not impact the core orchestration, promisi
 Installation of ZStack is super easy; users can choose different methods depending on their needs to install the first
 ZStack environment:
 
-* For users wanting to try out quickly, see [Quick Installation](http://en.zstack.io/installation/index.html).
+* For users wanting to try out quickly, see [Quick Installation](https://www.zstack-cloud.com/help/en/tutorials/quick_install_guide/v4/).
 
-* For users wanting to deploy a production environment, see [Manual Installation](http://en.zstack.io/installation/manual.html).
+* For users wanting to deploy a production environment, see [Manual Installation](http://zstack.org/installation/manual.html).
 
-* For users wanting to deploy a multi-node environment, see [Multi-node Installation](http://en.zstack.io/installation/multi-node.html).
+* For users wanting to deploy a multi-node environment, see [Multi-node Installation](https://www.zstack-cloud.com/help/en/tutorials/double_mn_ha_solution/v4/).
 
 Once the installation is done, users can follow one of getting started guides:
 
-* [Getting Started With Quick Installation](http://en.zstack.io/documentation/getstart-quick.html).
+* [Getting Started With Quick Installation](https://www.zstack-cloud.com/help/en/tutorials/quick_install_guide/v4/3.html).
 
-* [Getting Started With Manual Installation](http://en.zstack.io/documentation/getstart-manual.html).
+* [Getting Started With Manual Installation](http://zstack.org/documentation/getstart-manual.html).
 
-* [Getting Started With Multi-node Installation](http://en.zstack.io/documentation/getstart-multi.html).
+* [Getting Started With Multi-node Installation](https://www.zstack-cloud.com/help/en/tutorials/double_mn_ha_solution/v4/2.html).
 
 ## Tutorials
 
 Six tutorials are prepared for your first journey in ZStack, building classic cloud deployments all on one single Linux machine:
 
-##### Amazon EC2 classic EIP zone:
+##### Elastic IP:
 
-* [Web UI](http://en.zstack.io/tutorials/ec2-ui.html)
-* [Command Line Tool](http://en.zstack.io/tutorials/ec2-cli.html)
+* [Web UI](https://www.zstack-cloud.com/help/en/tutorials/vpc_tutorial/v4/3.html#chapter-3-7-Elastic-IP)
+* [Command Line Tool](http://zstack.org/tutorials/ec2-cli.html)
 
 ##### Flat Network:
 
-* [Web UI](http://en.zstack.io/tutorials/flat-network-ui.html)
-* [Command Line Tool](http://en.zstack.io/tutorials/flat-network-cli.html)
+* [Web UI](https://www.zstack-cloud.com/help/en/tutorials/flat_tutorial/v4/)
+* [Command Line Tool](http://zstack.org/tutorials/flat-network-cli.html)
 
 ##### Three Tiered Network:
 
-* [Web UI](http://en.zstack.io/tutorials/three-tiered-ui.html)
-* [Command Line Tool](http://en.zstack.io/tutorials/three-tiered-cli.html)
+* [Web UI](http://zstack.org/tutorials/three-tiered-ui.html)
+* [Command Line Tool](http://zstack.org/tutorials/three-tiered-cli.html)
 
 ##### Security Group:
 
-* [Web UI](http://en.zstack.io/tutorials/security-group-ui.html)
-* [Command Line Tool](http://en.zstack.io/tutorials/security-group-cli.html)
+* [Web UI](https://www.zstack-cloud.com/help/en/tutorials/vpc_tutorial/v4/3.html#chapter-3-6-Security-Group)
+* [Command Line Tool](http://zstack.org/tutorials/security-group-cli.html)
 
-##### Elastic Port Forwarding:
+##### Port Forwarding:
 
-* [Web UI](http://en.zstack.io/tutorials/elastic-port-forwarding-ui.html)
-* [Command Line Tool](http://en.zstack.io/tutorials/elastic-port-forwarding-cli.html)
+* [Web UI](https://www.zstack-cloud.com/help/en/tutorials/vpc_tutorial/v4/3.html#chapter-3-8-Port-Forwarding)
+* [Command Line Tool](http://zstack.org/tutorials/elastic-port-forwarding-cli.html)
 
 ##### Snapshots:
 
-* [Web UI](http://en.zstack.io/tutorials/snapshot-ui.html)
-* [Command Line Tool](http://en.zstack.io/tutorials/snapshot-cli.html)
+* [Web UI](https://www-zstack-io.translate.goog/help/tutorials/volume_snapshot_tutorial/v4/1.html?_x_tr_sl=zh-CN&_x_tr_tl=en&_x_tr_hl=en&_x_tr_pto=wapp)
+* [Command Line Tool](http://zstack.org/tutorials/snapshot-cli.html)
 
 ## Under the hood 
 
 Under the hood, ZStack is built on an architecture explained by following articles:
 
 ##### Scalability:
 
-[ZStack's Scalability Secrets Part 1: Asynchronous Architecture](http://en.zstack.io/blog/asynchronous-architecture.html)
+[ZStack's Scalability Secrets Part 1: Asynchronous Architecture](http://zstack.org/blog/asynchronous-architecture.html)
 
-[ZStack's Scalability Secrets Part 2: Stateless Services](http://en.zstack.io/blog/stateless-clustering.html)
+[ZStack's Scalability Secrets Part 2: Stateless Services](http://zstack.org/blog/stateless-clustering.html)
 
-[ZStack's Scalability Secrets Part 3: Lock-free Architecture](http://en.zstack.io/blog/lock-free.html)
+[ZStack's Scalability Secrets Part 3: Lock-free Architecture](http://zstack.org/blog/lock-free.html)
 
 ##### Plugin Architecture:
 
-[The In-Process Microservices Architecture](http://en.zstack.io/blog/microservices.html)
+[The In-Process Microservices Architecture](http://zstack.org/blog/microservices.html)
 
-[The Versatile Plugin System](http://en.zstack.io/blog/plugin.html)
+[The Versatile Plugin System](http://zstack.org/blog/plugin.html)
 
-[The Tag System](http://en.zstack.io/blog/tag.html)
+[The Tag System](http://zstack.org/blog/tag.html)
 
-[The Workflow Engine](http://en.zstack.io/blog/workflow.html)
+[The Workflow Engine](http://zstack.org/blog/workflow.html)
 
-[The Cascade Framework](http://en.zstack.io/blog/cascade.html)
+[The Cascade Framework](http://zstack.org/blog/cascade.html)
 
 ##### Query API:
 
-[The Query API](http://en.zstack.io/blog/query.html)
+[The Query API](http://zstack.org/blog/query.html)
 
 ##### Automation:
 
-[Full Automation By Ansible](http://en.zstack.io/blog/ansible.html)
+[Full Automation By Ansible](http://zstack.org/blog/ansible.html)
 
 ##### Storage And Network:
 
-[Networking Model 1: L2 and L3 Network](http://en.zstack.io/blog/network-l2.html)
+[Networking Model 1: L2 and L3 Network](http://zstack.org/blog/network-l2.html)
 
-[Networking Model 2: Virtual Router Network Service Provider](http://en.zstack.io/blog/virtual-router.html)
+[Networking Model 2: Virtual Router Network Service Provider](http://zstack.org/blog/virtual-router.html)
 
-[Storage Model: Primary Storage and Backup Storage](http://en.zstack.io/blog/storage.html)
+[Storage Model: Primary Storage and Backup Storage](http://zstack.org/blog/storage.html)
 
 ##### Testing:
 
-[The Automation Testing System 1: Integration Testing](http://en.zstack.io/blog/integration-testing.html)
+[The Automation Testing System 1: Integration Testing](http://zstack.org/blog/integration-testing.html)
+
+[The Automation Testing System 2: System Testing](http://zstack.org/blog/system-testing.html)
+
+[The Automation Testing System 3: Model-based Testing](http://zstack.org/blog/model-based-testing.html)
 
-[The Automation Testing System 2: System Testing](http://en.zstack.io/blog/system-testing.html)
+## More Documentation Resources
 
-[The Automation Testing System 3: Model-based Testing](http://en.zstack.io/blog/model-based-testing.html)
+[ZStack documentation](https://www.zstack-cloud.com/help/en/product_manuals/index.html)
 
 ## License
 

VERSION

@@ -1,3 +1,3 @@
 MAJOR=4
-MINOR=4
-UPDATE=24
+MINOR=6
+UPDATE=31