Author: svn-role
Date: Wed Jan 27 04:00:09 2021
New Revision: 1885930
URL: http://svn.apache.org/viewvc?rev=1885930&view=rev
Log:
Merge the r1874850 group from trunk:
* r1874850, r1885795
Update copyright year to 2020 and then to 2021.
Justification:
The future is here!
Votes:
+1: stsp, jcorvel, jamessan
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/NOTICE (contents, props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_subr/version.c (contents,
props changed)
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1874850,1885795
Modified: subversion/branches/1.10.x/NOTICE
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/NOTICE?rev=1885930&r1=1885929&r2=1885930&view=diff
==============================================================================
--- subversion/branches/1.10.x/NOTICE (original)
+++ subversion/branches/1.10.x/NOTICE Wed Jan 27 04:00:09 2021
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2019 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
Propchange: subversion/branches/1.10.x/NOTICE
------------------------------------------------------------------------------
Merged /subversion/trunk/NOTICE:r1874850,1885795
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1885930&r1=1885929&r2=1885930&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Wed Jan 27 04:00:09 2021
@@ -82,11 +82,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1874850, r1885795
- Update copyright year to 2020 and then to 2021.
- Justification:
- The future is here!
- Votes:
- +1: stsp, jcorvel, jamessan
-
Modified: subversion/branches/1.10.x/subversion/libsvn_subr/version.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_subr/version.c?rev=1885930&r1=1885929&r2=1885930&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_subr/version.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_subr/version.c Wed Jan 27
04:00:09 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) 2019 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 "
Propchange: subversion/branches/1.10.x/subversion/libsvn_subr/version.c
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/libsvn_subr/version.c:r1874850,1885795
