summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Hay <steve.m.hay@googlemail.com>2014-04-18 12:06:27 +0100
committerSteve Hay <steve.m.hay@googlemail.com>2014-04-18 12:06:27 +0100
commite2f9dcb2999dc671ac63388990a0177b7fb30f83 (patch)
tree7c382750e3da29c1b15d189340b440eec64a29bd
parent593366639d1e2fb5586f2f931d80e5e9b35d5a4b (diff)
downloadperl-e2f9dcb2999dc671ac63388990a0177b7fb30f83.tar.gz
Fill in perldelta for CPAN upgrade in commit 45a1388464
Also record that that commit actually upgraded CPAN to 2.05-TRIAL2, not 2.05-TRIAL.
-rwxr-xr-xPorting/Maintainers.pl2
-rw-r--r--pod/perldelta.pod5
2 files changed, 4 insertions, 3 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 475a40649e..92f7f6eadc 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -252,7 +252,7 @@ use File::Glob qw(:case);
},
'CPAN' => {
- 'DISTRIBUTION' => 'ANDK/CPAN-2.05-TRIAL.tar.gz',
+ 'DISTRIBUTION' => 'ANDK/CPAN-2.05-TRIAL2.tar.gz',
'FILES' => q[cpan/CPAN],
'EXCLUDED' => [
qr{^distroprefs/},
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 204e09c85d..44b5bcfd24 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -130,9 +130,10 @@ keep in sync with the latest CPAN release.
=item *
-L<CPAN> has been upgraded from version 2.04-TRIAL to 2.05-TRIAL.
+L<CPAN> has been upgraded from version 2.04-TRIAL to 2.05-TRIAL2.
-TODO
+This fixes L<local::lib> shell variable string output and prevents an endless
+loop when running "notest test Module" for some Module having dependencies.
=item *