Merge branch 'master' into master

This commit is contained in:
Chris Aniszczyk 2018-02-01 11:46:13 +00:00 committed by GitHub
commit 93e0515418
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 472 additions and 7 deletions

View file

@ -21,7 +21,7 @@ List below is the official list of TOC contributors, in alphabetical order:
* Alex Chircop, StorageOS (alex.chircop@storageos.com)
* Andy Santosa, Ebay (asantosa@ebay.com)
* Ara Pulido, Bitnami (ara@bitnami.com)
* Bassam Tabbara, Quantum (bassam@tabbara.com)
* Bassam Tabbara, Upbound (bassam@upbound.io)
* Bob Wise, Samsung SDS (bob@bobsplanet.com)
* Cathy Zhang, Huawei (cathy.h.zhang@huawei.com)
* Chase Pettet, Wikimedia Foundation (cpettet@wikimedia.org)
@ -29,6 +29,7 @@ List below is the official list of TOC contributors, in alphabetical order:
* Clinton Kitson, Dell (Clinton.Kitson@dell.com)
* Dan Wilson, Concur (danw@concur.com)
* Darren Ratcliffe, Atos (darren.ratcliffe@atos.net)
* Deyuan Deng, Caicloud (deyuan@caicloud.io)
* Doug Davis, IBM (dug@us.ibm.com)
* Drew Rapenchuk, Bloomberg (drapenchuk@bloomberg.net)
* Dustin Kirkland, Canonical (kirkland@canonical.com)
@ -38,6 +39,7 @@ List below is the official list of TOC contributors, in alphabetical order:
* Ghe Rivero, Independent (ghe.rivero@gmail.com)
* Gou Rao, Portworx (gou@portworx.com)
* Ian Crosby, Container Solutions (ian.crosby@container-solutions.com)
* Jeyappragash JJ, Independent (pragashjj@gmail.com)
* Jonghyuk Jong Choi, NCSoft (jongchoi@ncsoft.com)
* Joseph Jacks, Independent (jacks.joe@gmail.com)
* Josh Bernstein, Dell (Joshua.Bernstein@dell.com)
@ -53,8 +55,10 @@ List below is the official list of TOC contributors, in alphabetical order:
* Quinton Hoole, Huawei (quinton.hoole@huawei.com)
* Randy Abernethy, RX-M LLC (randy.abernethy@rx-m.com)
* Rick Spencer, Bitnami (rick@bitnamni.com)
* Sarah Allen, Google (sarahallen@google.com)
* Timothy Chen, Hyperpilot (tim@hyperpilot.io)
* Xu Wang, Hyper (xu@hyper.sh)
* Yaron Haviv, iguazio (yaronh@iguaz.io)
* Yong Tang, Infoblox (ytang@infoblox.com)
* Yuri Shkuro, Uber (ys@uber.com)