[whimsy] branch master updated: Ignore conflict-of-interest current-year

[cl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 2d131d3  Ignore conflict-of-interest current-year
     new 377b523  Merge branch 'master' of github.com:apache/whimsy
2d131d3 is described below

commit 2d131d3ec66ec45e56f88cb381d2adcb38bfb234
Author: Craig L Russell <ap...@gmail.com>
AuthorDate: Sat Jun 20 10:07:29 2020 -0700

    Ignore conflict-of-interest current-year
---
 lib/whimsy/asf/documents.rb | 2 +-
 repository.yml              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/whimsy/asf/documents.rb b/lib/whimsy/asf/documents.rb
index 0a77053..535a974 100644
--- a/lib/whimsy/asf/documents.rb
+++ b/lib/whimsy/asf/documents.rb
@@ -149,7 +149,7 @@ module ASF
 
   class COIFiles < EmeritusFiles
     def self.listnames
-      _, list = ASF::SVN.getlisting('conflict-of-interest-current-year')
+      _, list = ASF::SVN.getlisting('conflict-of-interest')
       list
     end
   end
diff --git a/repository.yml b/repository.yml
index a3aa389..f5c5e83 100644
--- a/repository.yml
+++ b/repository.yml
@@ -106,8 +106,8 @@
     depth: delete
     list: true
 
-  conflict-of-interest-current-year:
-    url: private/documents/conflict-of-interest/current-year
+  conflict-of-interest:
+    url: private/documents/conflict-of-interest
     depth: delete
     list: true