author | Danek Duvall <danek.duvall@oracle.com> |
Mon, 20 Apr 2015 12:35:51 -0700 | |
branch | s11u2-sru |
changeset 4156 | 4b1def16fe9b |
parent 2884 | 9ad800ee0577 |
permissions | -rw-r--r-- |
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
2884
diff
changeset
|
1 |
Remove 'ROC' from all_timezones. See |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
2884
diff
changeset
|
2 |
https://mm.icann.org/pipermail/tz/2001-March/011492.html for details |
2884
9ad800ee0577
PSARC 2013/318 pytz - Python timezone database module
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
|
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
2884
diff
changeset
|
4 |
--- pytz-2014.10/pytz/__init__.py.~2~ 2015-02-25 11:06:24.380394269 -0800 |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
2884
diff
changeset
|
5 |
+++ pytz-2014.10/pytz/__init__.py 2015-02-25 11:06:24.386963566 -0800 |
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
2884
diff
changeset
|
6 |
@@ -1050,7 +1050,6 @@ all_timezones = \ |
2884
9ad800ee0577
PSARC 2013/318 pytz - Python timezone database module
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
'Pacific/Yap', |
9ad800ee0577
PSARC 2013/318 pytz - Python timezone database module
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
'Poland', |
9ad800ee0577
PSARC 2013/318 pytz - Python timezone database module
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
'Portugal', |
9ad800ee0577
PSARC 2013/318 pytz - Python timezone database module
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
- 'ROC', |
9ad800ee0577
PSARC 2013/318 pytz - Python timezone database module
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
'ROK', |
9ad800ee0577
PSARC 2013/318 pytz - Python timezone database module
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
'Singapore', |
9ad800ee0577
PSARC 2013/318 pytz - Python timezone database module
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
'Turkey', |