summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2017-05-05 11:53:11 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2017-05-05 11:53:11 +0000
commit06dc3f934dd7f1f68f26942f097b791b9a2837f9 (patch)
treedbed885672f4f3e810355eb55d9123da7b8ac75e /manifest
parent1c420a51fb9c15ad8e94a2bfa07a28e464308b82 (diff)
parenta160fd9a3a7d4d2a7b2979af5e53de5d0ad961aa (diff)
downloadillumos-joyent-06dc3f934dd7f1f68f26942f097b791b9a2837f9.tar.gz
[illumos-gate merge]
commit a160fd9a3a7d4d2a7b2979af5e53de5d0ad961aa 8137 sun_fc: NULL pointer is used in wrong context commit dafc4501087bc6e730458ce2e0e4ad8e98be4f0d 8147 Update zoneinfo to 2017b
Diffstat (limited to 'manifest')
-rw-r--r--manifest6
1 files changed, 5 insertions, 1 deletions
diff --git a/manifest b/manifest
index 3535b07048..c7e6f77195 100644
--- a/manifest
+++ b/manifest
@@ -10997,6 +10997,7 @@ f usr/share/lib/zoneinfo/America/Port_of_Spain 0644 root bin
h usr/share/lib/zoneinfo/America/Porto_Acre=usr/share/lib/zoneinfo/Brazil/Acre
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
f usr/share/lib/zoneinfo/America/Rankin_Inlet 0644 root bin
f usr/share/lib/zoneinfo/America/Recife 0644 root bin
@@ -11055,6 +11056,7 @@ f usr/share/lib/zoneinfo/Asia/Aqtau 0644 root bin
f usr/share/lib/zoneinfo/Asia/Aqtobe 0644 root bin
f usr/share/lib/zoneinfo/Asia/Ashgabat 0644 root bin
f usr/share/lib/zoneinfo/Asia/Ashkhabad 0644 root bin
+f usr/share/lib/zoneinfo/Asia/Atyrau 0644 root bin
f usr/share/lib/zoneinfo/Asia/Baghdad 0644 root bin
h usr/share/lib/zoneinfo/Asia/Bahrain=usr/share/lib/zoneinfo/Asia/Qatar
f usr/share/lib/zoneinfo/Asia/Baku 0644 root bin
@@ -11075,6 +11077,7 @@ f usr/share/lib/zoneinfo/Asia/Dhaka 0644 root bin
f usr/share/lib/zoneinfo/Asia/Dili 0644 root bin
f usr/share/lib/zoneinfo/Asia/Dubai 0644 root bin
f usr/share/lib/zoneinfo/Asia/Dushanbe 0644 root bin
+f usr/share/lib/zoneinfo/Asia/Famagusta 0644 root bin
f usr/share/lib/zoneinfo/Asia/Gaza 0644 root bin
h usr/share/lib/zoneinfo/Asia/Harbin=usr/share/lib/zoneinfo/Asia/Shanghai
f usr/share/lib/zoneinfo/Asia/Hebron 0644 root bin
@@ -11288,6 +11291,7 @@ f usr/share/lib/zoneinfo/Europe/Prague 0644 root bin
f usr/share/lib/zoneinfo/Europe/Riga 0644 root bin
f usr/share/lib/zoneinfo/Europe/Rome 0644 root bin
f usr/share/lib/zoneinfo/Europe/Samara 0644 root bin
+f usr/share/lib/zoneinfo/Europe/Saratov 0644 root bin
h usr/share/lib/zoneinfo/Europe/San_Marino=usr/share/lib/zoneinfo/Europe/Rome
h usr/share/lib/zoneinfo/Europe/Sarajevo=usr/share/lib/zoneinfo/Europe/Belgrade
f usr/share/lib/zoneinfo/Europe/Simferopol 0644 root bin
@@ -11370,7 +11374,7 @@ f usr/share/lib/zoneinfo/Pacific/Gambier 0644 root bin
f usr/share/lib/zoneinfo/Pacific/Guadalcanal 0644 root bin
f usr/share/lib/zoneinfo/Pacific/Guam 0644 root bin
f usr/share/lib/zoneinfo/Pacific/Honolulu 0644 root bin
-f usr/share/lib/zoneinfo/Pacific/Johnston 0644 root bin
+h usr/share/lib/zoneinfo/Pacific/Johnston=usr/share/lib/zoneinfo/Pacific/Honolulu
f usr/share/lib/zoneinfo/Pacific/Kiritimati 0644 root bin
f usr/share/lib/zoneinfo/Pacific/Kosrae 0644 root bin
f usr/share/lib/zoneinfo/Pacific/Kwajalein 0644 root bin