[incubator-servicecomb-website] branch asf-site updated: Publish the website

2018-02-11 Thread ningjiang 
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/incubator-servicecomb-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 3a90a50  Publish the website
3a90a50 is described below

commit 3a90a504223d500c6415c6df31cbe73c44e027b8
Author: Willem Jiang 
AuthorDate: Mon Feb 12 14:07:42 2018 +0800

Publish the website
---
 .../20180208/Communications_Inside_Java_Chassis.pdf   | Bin 0 -> 2323621 bytes
 content/cn/slides/index.html  |   5 +
 content/feed.xml  |   2 +-
 content/sitemap.xml   |   4 
 content/slides/index.html |   5 +
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git 
a/content/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf 
b/content/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf
new file mode 100644
index 000..524216e
Binary files /dev/null and 
b/content/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf differ
diff --git a/content/cn/slides/index.html b/content/cn/slides/index.html
index 463580e..331a21b 100644
--- a/content/cn/slides/index.html
+++ b/content/cn/slides/index.html
@@ -332,6 +332,11 @@
   服务中心设计揭秘
 
 
+http://www.itdks.com/liveevent/detail/10012;>ServiceComb 直播第九期, 
20180208
+
+  Java 
Chassis通信机制详解
+
+
 
   
 
diff --git a/content/feed.xml b/content/feed.xml
index 4599c6e..430e382 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -1,4 +1,4 @@
-http://www.w3.org/2005/Atom; >https://jekyllrb.com/; 
version="3.4.3">Jekyll2018-02-06T16:24:43+08:00/Apache ServiceComb (incubating)The homepage of 
ServiceComb{name=nil, 
avatar= [...]
+http://www.w3.org/2005/Atom; >https://jekyllrb.com/; 
version="3.4.3">Jekyll2018-02-12T14:05:05+08:00/Apache ServiceComb (incubating)The homepage of 
ServiceComb{name=nil, 
avatar= [...]
 
 pJava Chassis uses zipkin as the default tracing 
implementation./p
 
diff --git a/content/sitemap.xml b/content/sitemap.xml
index b0491a1..9a0be43 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -561,4 +561,8 @@
 /assets/slides/20180127/ServiceComb_Overview.pdf
 2018-02-06T16:24:08+08:00
 
+
+/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf
+2018-02-12T14:04:34+08:00
+
 
diff --git a/content/slides/index.html b/content/slides/index.html
index 7bb1602..cd571ef 100644
--- a/content/slides/index.html
+++ b/content/slides/index.html
@@ -331,6 +331,11 @@
   Service Center 
Introduction
 
 
+http://www.itdks.com/liveevent/detail/10012;>ServiceComb live streaming 
phase IX, 20180208
+
+  Communications
 inside Java Chassis
+
+
 
   
 

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-website] branch master updated: SCB-312 added 9th live streaming materials (#35)

2018-02-11 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 62eff62  SCB-312 added 9th live streaming materials (#35)
62eff62 is described below

commit 62eff62b89104aa2b5200a4194fc77c8a74ca597
Author: Eric Lee 
AuthorDate: Mon Feb 12 14:02:26 2018 +0800

SCB-312 added 9th live streaming materials (#35)

Signed-off-by: Eric Lee 
---
 _pages/about-slides.md|   3 +++
 _pages/cn/about-slides.md |   3 +++
 .../20180208/Communications_Inside_Java_Chassis.pdf   | Bin 0 -> 2323621 bytes
 3 files changed, 6 insertions(+)

diff --git a/_pages/about-slides.md b/_pages/about-slides.md
index 6607d1c..af6685a 100644
--- a/_pages/about-slides.md
+++ b/_pages/about-slides.md
@@ -40,3 +40,6 @@ date: 2017-06-20T11:02:20+08:00
 
 ## [ServiceComb live streaming phase 
VIII](http://www.itdks.com/liveevent/detail/9558), 20180125
  * [Service Center Introduction]({{ site.url }}{{ site.baseurl 
}}/assets/slides/20180125/Service_Center_Introduction.pdf)
+
+## [ServiceComb live streaming phase 
IX](http://www.itdks.com/liveevent/detail/10012), 20180208
+ * [Communications inside Java Chassis]({{ site.url }}{{ site.baseurl 
}}/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf)
diff --git a/_pages/cn/about-slides.md b/_pages/cn/about-slides.md
index dcc572a..fec99f2 100644
--- a/_pages/cn/about-slides.md
+++ b/_pages/cn/about-slides.md
@@ -40,3 +40,6 @@ date: 2017-06-20T11:02:20+08:00
 
 ## [ServiceComb 直播第八期](http://www.itdks.com/liveevent/detail/9558), 20180125
  * [服务中心设计揭秘]({{ site.url }}{{ site.baseurl 
}}/assets/slides/20180125/Service_Center_Introduction.pdf)
+
+## [ServiceComb 直播第九期](http://www.itdks.com/liveevent/detail/10012), 20180208
+ * [Java Chassis通信机制详解]({{ site.url }}{{ site.baseurl 
}}/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf)
diff --git a/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf 
b/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf
new file mode 100644
index 000..524216e
Binary files /dev/null and 
b/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf differ

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-website] branch asf-site updated: SCB-312 added 9th live streaming materials (#35)

2018-02-11 Thread ningjiang 
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/incubator-servicecomb-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new ca2bd2b  SCB-312 added 9th live streaming materials (#35)
ca2bd2b is described below

commit ca2bd2bd4371c0e85adb22095034f9bbddeb3563
Author: Eric Lee 
AuthorDate: Mon Feb 12 14:02:26 2018 +0800

SCB-312 added 9th live streaming materials (#35)

Signed-off-by: Eric Lee 
---
 _pages/about-slides.md|   3 +++
 _pages/cn/about-slides.md |   3 +++
 .../20180208/Communications_Inside_Java_Chassis.pdf   | Bin 0 -> 2323621 bytes
 3 files changed, 6 insertions(+)

diff --git a/_pages/about-slides.md b/_pages/about-slides.md
index 6607d1c..af6685a 100644
--- a/_pages/about-slides.md
+++ b/_pages/about-slides.md
@@ -40,3 +40,6 @@ date: 2017-06-20T11:02:20+08:00
 
 ## [ServiceComb live streaming phase 
VIII](http://www.itdks.com/liveevent/detail/9558), 20180125
  * [Service Center Introduction]({{ site.url }}{{ site.baseurl 
}}/assets/slides/20180125/Service_Center_Introduction.pdf)
+
+## [ServiceComb live streaming phase 
IX](http://www.itdks.com/liveevent/detail/10012), 20180208
+ * [Communications inside Java Chassis]({{ site.url }}{{ site.baseurl 
}}/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf)
diff --git a/_pages/cn/about-slides.md b/_pages/cn/about-slides.md
index dcc572a..fec99f2 100644
--- a/_pages/cn/about-slides.md
+++ b/_pages/cn/about-slides.md
@@ -40,3 +40,6 @@ date: 2017-06-20T11:02:20+08:00
 
 ## [ServiceComb 直播第八期](http://www.itdks.com/liveevent/detail/9558), 20180125
  * [服务中心设计揭秘]({{ site.url }}{{ site.baseurl 
}}/assets/slides/20180125/Service_Center_Introduction.pdf)
+
+## [ServiceComb 直播第九期](http://www.itdks.com/liveevent/detail/10012), 20180208
+ * [Java Chassis通信机制详解]({{ site.url }}{{ site.baseurl 
}}/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf)
diff --git a/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf 
b/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf
new file mode 100644
index 000..524216e
Binary files /dev/null and 
b/assets/slides/20180208/Communications_Inside_Java_Chassis.pdf differ

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-java-chassis] branch master updated: SCB-260 Clarify copyright of HystrixCommandPropertiesExt

2018-02-11 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
 new 9720cfc  SCB-260 Clarify copyright of HystrixCommandPropertiesExt
9720cfc is described below

commit 9720cfc5c9f7ea2e7902a821ef031203ddfd8808
Author: Yang Bo 
AuthorDate: Sun Feb 11 18:18:38 2018 +0800

SCB-260 Clarify copyright of HystrixCommandPropertiesExt

The majority of the HystrixCommandPropertiesExt class is forked
from the base class. Thus we need to keep the original copyright.
---
 NOTICE   | 20 +++-
 .../bizkeeper/HystrixCommandPropertiesExt.java   | 18 ++
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/NOTICE b/NOTICE
index a31e77a..d2b6014 100644
--- a/NOTICE
+++ b/NOTICE
@@ -107,7 +107,7 @@ limitations under the License.
 
 
 For 
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestBodyHandler.java
-(Froked from 
https://github.com/vert-x3/vertx-web/blob/master/vertx-web/src/main/java/io/vertx/ext/web/handler/impl/BodyHandlerImpl.java)
+(Forked from 
https://github.com/vert-x3/vertx-web/blob/master/vertx-web/src/main/java/io/vertx/ext/web/handler/impl/BodyHandlerImpl.java)
 
 Copyright 2014 Red Hat, Inc.
 
@@ -122,3 +122,21 @@ Copyright 2014 Red Hat, Inc.
  http://www.opensource.org/licenses/apache2.0.php
 
  You may elect to redistribute this code under either of these licenses.
+
+
+For 
handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/HystrixCommandPropertiesExt.java
+(Forked from 
https://github.com/Netflix/Hystrix/blob/master/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommandProperties.java)
+
+   Copyright 2012 Netflix, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git 
a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/HystrixCommandPropertiesExt.java
 
b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/HystrixCommandPropertiesExt.java
index 6234021..0122d03 100644
--- 
a/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/HystrixCommandPropertiesExt.java
+++ 
b/handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/HystrixCommandPropertiesExt.java
@@ -1,12 +1,11 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+/**
+ * Copyright 2012 Netflix, Inc.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +14,9 @@
  * limitations under the License.
  */
 
+
+// This file is forked from 
https://github.com/Netflix/Hystrix/blob/master/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommandProperties.java
+
 package org.apache.servicecomb.bizkeeper;
 
 import static 
com.netflix.hystrix.strategy.properties.HystrixPropertiesChainedProperty.forBoolean;

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.