[ARVADOS] updated: ad77601bb4c911f4f02797ade7daafce8fcf16e3

[Git user]

Summary of changes:
 .licenseignore                                              | 2 ++
 sdk/cwl/tests/noreuse.cwl                                   | 4 ++++
 sdk/cwl/tests/stdout.cwl                                    | 4 ++++
 services/api/Rakefile                                       | 2 +-
 services/api/db/migrate/20170628185847_jobs_yaml_to_json.rb | 4 ++++
 services/api/lib/migrate_yaml_to_json.rb                    | 4 ++++
 6 files changed, 19 insertions(+), 1 deletion(-)

       via  ad77601bb4c911f4f02797ade7daafce8fcf16e3 (commit)
       via  94b75d06930701ccbc9b3100c6a2ae9dd6ca1f67 (commit)
       via  20dfea763e114e4be677e0ba698261fa349f47cd (commit)
      from  02b3b0a005156173a970728cf6a32b55c8ca67b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ad77601bb4c911f4f02797ade7daafce8fcf16e3
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jul 5 09:24:28 2017 -0400

    Add missing copyright headers.
    
    refs #2411
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/sdk/cwl/tests/noreuse.cwl b/sdk/cwl/tests/noreuse.cwl
index 46771d1..4c95eb6 100644
--- a/sdk/cwl/tests/noreuse.cwl
+++ b/sdk/cwl/tests/noreuse.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 cwlVersion: v1.0
 class: Workflow
 $namespaces:
diff --git a/sdk/cwl/tests/stdout.cwl b/sdk/cwl/tests/stdout.cwl
index c76a6ed..2100c37 100644
--- a/sdk/cwl/tests/stdout.cwl
+++ b/sdk/cwl/tests/stdout.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 cwlVersion: v1.0
 class: CommandLineTool
 baseCommand: echo
diff --git a/services/api/db/migrate/20170628185847_jobs_yaml_to_json.rb b/services/api/db/migrate/20170628185847_jobs_yaml_to_json.rb
index 705ec55..2c90c9a 100644
--- a/services/api/db/migrate/20170628185847_jobs_yaml_to_json.rb
+++ b/services/api/db/migrate/20170628185847_jobs_yaml_to_json.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'migrate_yaml_to_json'
 
 class JobsYamlToJson < ActiveRecord::Migration
diff --git a/services/api/lib/migrate_yaml_to_json.rb b/services/api/lib/migrate_yaml_to_json.rb
index fbfc603..1db7ed0 100644
--- a/services/api/lib/migrate_yaml_to_json.rb
+++ b/services/api/lib/migrate_yaml_to_json.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 module MigrateYAMLToJSON
   def self.migrate(table, column)
     conn = ActiveRecord::Base.connection

commit 94b75d06930701ccbc9b3100c6a2ae9dd6ca1f67
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jul 5 09:23:49 2017 -0400

    Update .licenseignore.
    
    refs #2411
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/.licenseignore b/.licenseignore
index 1d0356b..51980b1 100644
--- a/.licenseignore
+++ b/.licenseignore
@@ -1,7 +1,9 @@
 *agpl-3.0.html
 *agpl-3.0.txt
+apache-2.0.txt
 apps/workbench/app/assets/javascripts/list.js
 apps/workbench/public/webshell/*
+AUTHORS
 */bootstrap.css
 */bootstrap.js
 *bootstrap-theme.css

commit 20dfea763e114e4be677e0ba698261fa349f47cd
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jul 5 09:21:53 2017 -0400

    Fix regex usage.
    
    refs #2411
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/services/api/Rakefile b/services/api/Rakefile
index 3136cdd..fad803c 100644
--- a/services/api/Rakefile
+++ b/services/api/Rakefile
@@ -43,7 +43,7 @@ namespace :db do
         origfile = File.new origfnm
         origfile.each_line do |line|
           if !copyright_done
-            if !/Copyright .* Arvados/
+            if !/Copyright .* Arvados/.match(line)
                tmpfile.write "-- Copyright (C) The Arvados Authors. All rights reserved.\n--\n-- SPDX-License-Identifier: AGPL-3.0\n\n"
             end
             copyright_done = true

-----------------------------------------------------------------------


hooks/post-receive
--