From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 15 Dec 2006 16:54:43 +0000 (+0000)
Subject: Put JST back into the default set of timezone abbreviations;
X-Git-Tag: REL8_3_BETA1~1683
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=782d68e38dff6059288793756d97ccdeff804618;p=postgresql

Put JST back into the default set of timezone abbreviations;
was removed in an unexplainable moment of brain fade.
---

diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt
index c5aa41873a..dbb3b9aeca 100644
--- a/src/timezone/tznames/Asia.txt
+++ b/src/timezone/tznames/Asia.txt
@@ -4,7 +4,7 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
-# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.3 2006/12/15 16:54:43 tgl Exp $
 #
 
 # CONFLICT! ADT is not unique
@@ -156,6 +156,8 @@ IST     19800    # Indian Standard Time
 IST      7200    # Israel Standard Time
                  #     (this time zone is not contained in the ZIC database)
 JAYT    32400    # Jayapura Time (Indonesia) (not in zic)
+JST     32400    # Japan Standard Time
+                 #     (Asia/Tokyo)
 KDT     36000 D  # Korean Daylight Time (not in zic)
 KGST    21600 D  # Kyrgyzstan Summer Time
                  #     (Asia/Bishkek)
diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index ca956ea7a1..e805986d14 100644
--- a/src/timezone/tznames/Default
+++ b/src/timezone/tznames/Default
@@ -4,7 +4,7 @@
 # timezone_abbreviations to 'Default'.  See the `Date/Time Support'
 # appendix in the PostgreSQL documentation for more information.
 #
-# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.2 2006/07/25 13:49:21 tgl Exp $
+# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.3 2006/12/15 16:54:43 tgl Exp $
 
 
 #################### AFRICA ####################
@@ -283,6 +283,8 @@ IRT     12600    # Iran Time (not in zic)
 # - IST: Indian Standard Time (Asia)
 IST      7200    # Israel Standard Time (not in zic)
 JAYT    32400    # Jayapura Time (Indonesia) (not in zic)
+JST     32400    # Japan Standard Time
+                 #     (Asia/Tokyo)
 KDT     36000 D  # Korean Daylight Time (not in zic)
 KGST    21600 D  # Kyrgyzstan Summer Time
                  #     (Asia/Bishkek)