openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From houshen...@apache.org
Subject [incubator-openwhisk-xcode] branch master updated: Fix scancode errors and add ASF Licenses. (#26)
Date Mon, 21 Aug 2017 14:19:25 GMT
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-xcode.git


The following commit(s) were added to refs/heads/master by this push:
     new 4b59794  Fix scancode errors and add ASF Licenses. (#26)
4b59794 is described below

commit 4b59794d7e9bae843eaa36c601b897c66ef82d68
Author: Matt Rutkowski <mrutkows@us.ibm.com>
AuthorDate: Mon Aug 21 09:19:23 2017 -0500

    Fix scancode errors and add ASF Licenses. (#26)
---
 swift-playground-action/add_dylib.py                   | 18 +++++++++---------
 whiskbot-demo-app/Pods/SwiftyJSON/README.md            |  6 +++---
 .../WhiskBot/OpenWhiskActions/PostToSlack.js           | 17 +++++++++--------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/swift-playground-action/add_dylib.py b/swift-playground-action/add_dylib.py
index 2f27b50..c2a6100 100755
--- a/swift-playground-action/add_dylib.py
+++ b/swift-playground-action/add_dylib.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 #
-# Copyright 2015-2016 IBM Corporation
+# 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
 #
-# 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
+#     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,13 +16,12 @@
 # limitations under the License.
 #
 
-
 import os
 import re
 import sys
 import json
 
-# 
+#
 # find all paclages
 # add dylib statements cusotmized ot package name
 # rebuild all packages
@@ -51,4 +51,4 @@ def main():
                 procesPackageFile(packageName, fullPath)
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/whiskbot-demo-app/Pods/SwiftyJSON/README.md b/whiskbot-demo-app/Pods/SwiftyJSON/README.md
index 6256c84..34aa190 100644
--- a/whiskbot-demo-app/Pods/SwiftyJSON/README.md
+++ b/whiskbot-demo-app/Pods/SwiftyJSON/README.md
@@ -91,7 +91,7 @@ platform :ios, '8.0'
 use_frameworks!
 
 target 'MyApp' do
-	pod 'SwiftyJSON'
+  pod 'SwiftyJSON'
 end
 ```
 
@@ -126,7 +126,7 @@ Note that the [Swift Package Manager](https://swift.org/package-manager)
is stil
 
 #### Manually (iOS 7+, OS X 10.9+)
 
-To use this library in your project manually you may:  
+To use this library in your project manually you may:
 
 1. for Projects, just drag SwiftyJSON.swift to the project tree
 2. for Workspaces, include the whole SwiftyJSON.xcodeproj
@@ -449,7 +449,7 @@ It is possible to merge one JSON into another JSON. Merging a JSON into
another
 
 If both JSONs contain a value for the same key, _mostly_ this value gets overwritten in the
original JSON, but there are two cases where it provides some special treatment:
 
-- In case of both values being a `JSON.Type.array` the values form the array found in the
`other` JSON getting appended to the original JSON's array value. 
+- In case of both values being a `JSON.Type.array` the values form the array found in the
`other` JSON getting appended to the original JSON's array value.
 - In case of both values being a `JSON.Type.dictionary` both JSON-values are getting merged
the same way the encapsulating JSON is merged.
 
 In case, where two fields in a JSON have a different types, the value will get always overwritten.
diff --git a/whiskbot-demo-app/WhiskBot/OpenWhiskActions/PostToSlack.js b/whiskbot-demo-app/WhiskBot/OpenWhiskActions/PostToSlack.js
index 35baf5a..3f0f0d8 100644
--- a/whiskbot-demo-app/WhiskBot/OpenWhiskActions/PostToSlack.js
+++ b/whiskbot-demo-app/WhiskBot/OpenWhiskActions/PostToSlack.js
@@ -1,11 +1,12 @@
 /*
- * Copyright 2015-2016 IBM Corporation
+ * 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
  *
- * 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
+ *     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,
@@ -96,9 +97,9 @@ function checkParams(params, reject) {
     reject('No text provided');
   }
   if (params.url === undefined) {
-	reject('No Webhook URL provided');
+    reject('No Webhook URL provided');
   }
   if (params.channel === undefined) {
-	reject('No channel provided');
+    reject('No channel provided');
   }
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].

Mime
View raw message