Author: svn-role
Date: Sat Jan 23 04:00:42 2021
New Revision: 1885828
URL: http://svn.apache.org/viewvc?rev=1885828&view=rev
Log:
Merge r1885795 from trunk:
* r1885795
Update copyright year to 2021.
Justification:
The future is here!
Votes:
+1: stsp, futatuki, jcorvel
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/NOTICE
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_subr/version.c
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1885795
Modified: subversion/branches/1.14.x/NOTICE
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/NOTICE?rev=1885828&r1=1885827&r2=1885828&view=diff
==============================================================================
--- subversion/branches/1.14.x/NOTICE (original)
+++ subversion/branches/1.14.x/NOTICE Sat Jan 23 04:00:42 2021
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2020 The Apache Software Foundation
+Copyright 2021 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1885828&r1=1885827&r2=1885828&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jan 23 04:00:42 2021
@@ -61,13 +61,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1885795
- Update copyright year to 2021.
- Justification:
- The future is here!
- Votes:
- +1: stsp, futatuki, jcorvel
-
* r1884427, r1885557, r1885600, r1885656, r1885784, r1885785
Make mailer.py work properly with Python 3.
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_subr/version.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_subr/version.c?rev=1885828&r1=1885827&r2=1885828&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/libsvn_subr/version.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_subr/version.c Sat Jan 23
04:00:42 2021
@@ -143,7 +143,7 @@ svn_version_extended(svn_boolean_t verbo
info->build_time = __TIME__;
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
- (pool, _("Copyright (C) 2020 The Apache Software Foundation.\n"
+ (pool, _("Copyright (C) 2021 The Apache Software Foundation.\n"
"This software consists of contributions made by many people;\n"
"see the NOTICE file for more information.\n"
"Subversion is open source software, see "
