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 2018/02/11 11:10:11 UTC
[incubator-servicecomb-java-chassis] branch master updated: SCB-260
Clarify copyright of HystrixCommandPropertiesExt
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 <ya...@huawei.com>
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
ningjiang@apache.org.