Merge 3ebac60 into f33e2df

obspy · Jul 8, 2016 · cd6cde9 · cd6cde9
2 parents f33e2df + 3ebac60
commit cd6cde9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -6,6 +6,8 @@
  - obspy.clients.fdsn:
    * Fixing issue with location codes potentially resulting in unwanted data
      to be requested. (see #1422)
+   * The ISC mapping now directly points to the ISC implementation. The IRIS
+     mirror	has been moved to a separate mapping (see #1470).
  - obspy.db:
    * Fixed a bug in obspy-indexer command line script (see #1369,
      command line script was not working, probably since 0.10.0)

diff --git a/obspy/clients/fdsn/header.py b/obspy/clients/fdsn/header.py
@@ -43,7 +43,8 @@ class FDSNRedirectException(FDSNException):
     "INGV": "http://webservices.rm.ingv.it",
     "IPGP": "http://eida.ipgp.fr",
     "IRIS": "http://service.iris.edu",
-    "ISC": "http://isc-mirror.iris.washington.edu",
+    "ISC": "http://www.isc.ac.uk",
+    "ISC-MIRROR": "http://isc-mirror.iris.washington.edu",
     "KOERI": "http://eida.koeri.boun.edu.tr",
     "LMU": "http://erde.geophysik.uni-muenchen.de",
     "NCEDC": "http://service.ncedc.org",