Merge remote-tracking branch 'upstream/master'

AUTHORS

@@ -1,15 +1,16 @@
 # This file lists all individuals having contributed content to the repository.
 
-Amanda Zhang <amzhang@vmware.com>
-Ben Niu Ji <benniuji@gmail.com>
-Bobby Zhang <junzhang@vmware.com>
-Daniel Jiang <jiangd@vmware.com>
-Haining Henry Zhang <henryzhang@vmware.com>
-Hao Xia <haox@vmware.com>
-Jack Liu <ljack@vmware.com>
-Kun Wang <kunw@vmware.com>
-Shan Zhu <zhus@vmware.com>
-Victoria Zheng <vzheng@vmware.com>
-Wenkai Yin <yinw@vmware.com>
-Yan Wang <wangyan@vmware.com>
+Amanda Zhang <amzhang at vmware.com>
+Benniu Ji <benniuji at gmail.com>
+Bobby Zhang <junzhang at vmware.com>
+Chaofeng Wu <chaofengw at vmware.com>
+Daniel Jiang <jiangd at vmware.com>
+Haining Henry Zhang <henryzhang at vmware.com>
+Hao Xia <haox at vmware.com>
+Jack Liu <ljack at vmware.com>
+Kun Wang <kunw at vmware.com>
+Shan Zhu <zhus at vmware.com>
+Victoria Zheng <vzheng at vmware.com>
+Wenkai Yin <yinw at vmware.com>
+Yan Wang <wangyan at vmware.com>
 

README.md

@@ -57,7 +57,7 @@ To simplify the installation process, a pre-built installation package of Harbor
 For information on how to use Harbor, please see [User Guide](docs/user_guide.md) .
 
 ### Contribution
-We welcome contributions from the community.  If you wish to contribute code, we require that you first sign our [Contributor License Agreement](https://vmware.github.io/photon/assets/files/vmware_cla.pdf) and return a copy to osscontributions@vmware.com before we can merge your contribution.
+We welcome contributions from the community. If you wish to contribute code and you have not signed our contributor license agreement (CLA), our bot will update the issue when you open a pull request. For any questions about the CLA process, please refer to our [FAQ](https://cla.vmware.com/faq).
 
 ### License
 Harbor is available under the [Apache 2 license](LICENSE).