You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2020/06/10 01:05:06 UTC

[servicecomb-website] branch asf-site updated (825264c -> 765400e)

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git.


    from 825264c  Publish the website
     add ea0b1a1   add summer 2020 license
     add a089994  Update the release information
     add bbd3f98  Added a new task of summer 2020
     new b34dc99  Merge branch 'master' into asf-site
     new 765400e  Publish the website

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 _pages/cn/summer2020.md    | 4 ++--
 content/cn/summer2020.html | 4 ++--
 content/feed.xml           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)


[servicecomb-website] 01/02: Merge branch 'master' into asf-site

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git

commit b34dc99f4e6774b61e654f35b603ea6611b6b953
Merge: 825264c bbd3f98
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Wed Jun 10 09:01:30 2020 +0800

    Merge branch 'master' into asf-site

 _pages/cn/summer2020.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


[servicecomb-website] 02/02: Publish the website

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git

commit 765400e3ec326942e6775b9d682b89ca98160da2
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Wed Jun 10 09:04:40 2020 +0800

    Publish the website
---
 content/cn/summer2020.html | 4 ++--
 content/feed.xml           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/cn/summer2020.html b/content/cn/summer2020.html
index 4353570..873ba41 100644
--- a/content/cn/summer2020.html
+++ b/content/cn/summer2020.html
@@ -316,7 +316,7 @@
 
 <p><img src="/assets/images/summer2020/summer2020_detail.png" alt="summer2020 gains" /></p>
 
-<h3 id="servicecomb-summer2020项目如下">ServiceComb summer2020项目如下:</h3>
+<h3 id="servicecomb-summer2020项目如下以下项目均采用-apache-license-20-协议">ServiceComb summer2020项目如下:以下项目均采用 <a href="https://www.apache.org/licenses/LICENSE-2.0.txt">Apache License 2.0 协议</a></h3>
 <ol>
   <li>微服务一键部署工具
     <ul>
@@ -356,7 +356,7 @@
 
 <h3 id="如何参与">如何参与</h3>
 <ul>
-  <li>直接跟导师发邮件。导师将知道你完成后续工作。</li>
+  <li>直接跟导师发邮件。导师将指导你完成后续工作。</li>
   <li>了解更多如何参与的信息: <a href="https://isrc.iscas.ac.cn/summer2020/help/student.html#%E5%AD%A6%E7%94%9F%E5%A6%82%E4%BD%95%E6%8A%A5%E5%90%8D">如何报名</a></li>
 </ul>
 
diff --git a/content/feed.xml b/content/feed.xml
index 9d0ef62..70372e8 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.5">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2020-05-29T08:13:13+08:00</updated><id>/feed.xml</id><title type="html">Apache ServiceComb</title><subtitle>The homepage of ServiceComb</subtitle><author><name>{&quot;name&quot;=&gt;nil, &quot;avatar&quot;=&gt;&quot [...]
+<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.5">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2020-06-10T09:02:12+08:00</updated><id>/feed.xml</id><title type="html">Apache ServiceComb</title><subtitle>The homepage of ServiceComb</subtitle><author><name>{&quot;name&quot;=&gt;nil, &quot;avatar&quot;=&gt;&quot [...]
 
 &lt;p&gt;本次讲座得到广东工业大学计算机院学生会同学们的鼎力支持和参与。报名通道开放后,报名人数迅速达到150+,活动放在学校报告厅举办。即便在周日,同学们的热情仍然很高,给广东工业大学的同学们点赞。&lt;/p&gt;