You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ho...@apache.org on 2018/06/29 19:58:21 UTC
[incubator-openwhisk] branch master updated: Remove the copyright
of lightbend (#3827)
This is an automated email from the ASF dual-hosted git repository.
houshengbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new fbdd8ff Remove the copyright of lightbend (#3827)
fbdd8ff is described below
commit fbdd8ff2264f50f67532da9f3bda841604eed8b5
Author: Vincent <sh...@us.ibm.com>
AuthorDate: Fri Jun 29 15:58:17 2018 -0400
Remove the copyright of lightbend (#3827)
Closes: #3828
---
LICENSE.txt | 2 +-
.../src/main/scala/whisk/core/database/ConcurrentMapBackedCache.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index dc2f86c..027a172 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -211,4 +211,4 @@ Spray Caching 1.3.4 (io.spray:spray-caching_2.11:1.3.4 - http://spray.io/documen
ConcurrentMapBackedCache.scala under common/scala/src/main/scala/whisk/core/database contains implementation
from Spray's [[spray.caching.Cache]] and [[spray.caching.SimpleLruCache]] respectively.
License included at licenses/LICENSE-spray.txt, or https://github.com/spray/spray/blob/master/LICENSE
- Copyright (C) 2017 Lightbend Inc. <http://www.lightbend.com/>
+ Copyright (C) 2011-2015 the spray project <http://spray.io>
diff --git a/common/scala/src/main/scala/whisk/core/database/ConcurrentMapBackedCache.scala b/common/scala/src/main/scala/whisk/core/database/ConcurrentMapBackedCache.scala
index c3521b5..4133466 100644
--- a/common/scala/src/main/scala/whisk/core/database/ConcurrentMapBackedCache.scala
+++ b/common/scala/src/main/scala/whisk/core/database/ConcurrentMapBackedCache.scala
@@ -17,7 +17,7 @@
/*
* Cache base implementation:
- * Copyright (C) 2017 Lightbend Inc. <http://www.lightbend.com/>
+ * Copyright (C) 2011-2015 the spray project <http://spray.io>
*/
package whisk.core.database