summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorDan McDonald <danmcd@mnx.io>2022-10-30 23:34:48 -0400
committerDan McDonald <danmcd@mnx.io>2022-10-30 23:34:48 -0400
commit95c2a7d60701668efed9d53aa153487d0c7b1655 (patch)
tree1ac6fe3e7f97afed100dbbf7591a8387e1bce2a9 /manifest
parentf9f763d5983af381d2f56185852d90f603d519a6 (diff)
parentf117aa50f60d0a3e62bfa8cbddecd855d648a464 (diff)
downloadillumos-joyent-95c2a7d60701668efed9d53aa153487d0c7b1655.tar.gz
[illumos-gate merge]
commit f117aa50f60d0a3e62bfa8cbddecd855d648a464 15130 Update tzdata to 2022f commit cf56021bf3bfd6c5c3b246414ea6e6edfee73f49 15094 WPTS BVT_SMB2Basic_Query_FileAllInformation Conflicts: manifest
Diffstat (limited to 'manifest')
-rw-r--r--manifest6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifest b/manifest
index 119186f188..861ea00a08 100644
--- a/manifest
+++ b/manifest
@@ -11492,7 +11492,7 @@ h usr/share/lib/zoneinfo/America/Montreal=usr/share/lib/zoneinfo/America/Toronto
h usr/share/lib/zoneinfo/America/Montserrat=usr/share/lib/zoneinfo/America/Puerto_Rico
h usr/share/lib/zoneinfo/America/Nassau=usr/share/lib/zoneinfo/America/Toronto
f usr/share/lib/zoneinfo/America/New_York 0644 root bin
-f usr/share/lib/zoneinfo/America/Nipigon 0644 root bin
+h usr/share/lib/zoneinfo/America/Nipigon=usr/share/lib/zoneinfo/America/Toronto
f usr/share/lib/zoneinfo/America/Nome 0644 root bin
f usr/share/lib/zoneinfo/America/Noronha 0644 root bin
d usr/share/lib/zoneinfo/America/North_Dakota 0755 root bin
@@ -11511,7 +11511,7 @@ h usr/share/lib/zoneinfo/America/Porto_Acre=usr/share/lib/zoneinfo/America/Rio_B
f usr/share/lib/zoneinfo/America/Porto_Velho 0644 root bin
f usr/share/lib/zoneinfo/America/Puerto_Rico 0644 root bin
f usr/share/lib/zoneinfo/America/Punta_Arenas 0644 root bin
-f usr/share/lib/zoneinfo/America/Rainy_River 0644 root bin
+h usr/share/lib/zoneinfo/America/Rainy_River=usr/share/lib/zoneinfo/America/Winnipeg
f usr/share/lib/zoneinfo/America/Rankin_Inlet 0644 root bin
f usr/share/lib/zoneinfo/America/Recife 0644 root bin
f usr/share/lib/zoneinfo/America/Regina 0644 root bin
@@ -11535,7 +11535,7 @@ f usr/share/lib/zoneinfo/America/St_Vincent 0644 root bin
f usr/share/lib/zoneinfo/America/Swift_Current 0644 root bin
f usr/share/lib/zoneinfo/America/Tegucigalpa 0644 root bin
f usr/share/lib/zoneinfo/America/Thule 0644 root bin
-f usr/share/lib/zoneinfo/America/Thunder_Bay 0644 root bin
+h usr/share/lib/zoneinfo/America/Thunder_Bay=usr/share/lib/zoneinfo/America/Toronto
f usr/share/lib/zoneinfo/America/Tijuana 0644 root bin
f usr/share/lib/zoneinfo/America/Toronto 0644 root bin
h usr/share/lib/zoneinfo/America/Tortola=usr/share/lib/zoneinfo/America/Puerto_Rico