Merge conflicts about AU mirror

At participants request, removed AU mirrors completely.
Conflicts:
	mirmon/exim_mirrors_ftp.lst

diff --git a/mirmon/exim_mirrors_ftp.lst b/mirmon/exim_mirrors_ftp.lst
index 9fd39d30208e90219979345b9e36c1ba9e3824e1..9ac53b856fe5530ae9d3d8368b94c9f0b9f0b7d6 100644 (file)
--- a/mirmon/exim_mirrors_ftp.lst
+++ b/mirmon/exim_mirrors_ftp.lst
@@ -5,10 +5,6 @@
 at  ftp://exim.inode.at/
 at  ftp://ftp.univie.ac.at/applications/exim/           # BZ1260 Wolfgang Breyha <wbreyha@gmx.net>
 at  http://ftp.univie.ac.at/applications/exim/          # BZ1260 Wolfgang Breyha <wbreyha@gmx.net>
-au  ftp://mirrors-au.go-parts.com/eximftp/              # BZ1508 Dan Derebenskiy <dderebenskiy@go-parts.com>
-au  http://mirrors-au.go-parts.com/eximftp/             # BZ1508 Dan Derebenskiy <dderebenskiy@go-parts.com>
-##-- down for a few days and generates mail on each failure :-(
-##au  rsync://mirrors-au.go-parts.com/mirrors/eximftp/    # BZ1508 Dan Derebenskiy <dderebenskiy@go-parts.com>
 ##be  ftp://ftp.easynet.be/exim/                          # Down 335 days
 ca  http://exim.mirror.gtcomm.net/                      # BZ1410 Globotech Communications <sysadmin@gtcomm.net>
 ch  ftp://mirror.switch.ch/mirror/exim/

diff --git a/mirmon/exim_mirrors_www.lst b/mirmon/exim_mirrors_www.lst
index 1f3ea3e66528807423d787fed0062ac472ab2441..60c4ad70b95accea5911a95bcf2a9467e9d8bbff 100644 (file)
--- a/mirmon/exim_mirrors_www.lst
+++ b/mirmon/exim_mirrors_www.lst
@@ -5,7 +5,6 @@ at  http://exim.inode.at/
 at  ftp://ftp.univie.ac.at/applications/www.exim.org/  # BZ1260 Wolfgang Breyha <wbreyha@gmx.net>
 at  http://ftp.univie.ac.at/applications/www.exim.org/ # BZ1260 Wolfgang Breyha <wbreyha@gmx.net>
 au  http://exim.mirror.uber.com.au/                    # BZ1261 Seamus <mirrors@uber.com.au>
-au  http://mirrors-au.go-parts.com/exim/               # BZ1508 Dan Derebenskiy <dderebenskiy@go-parts.com>
 bg  http://exim.fixity.net/         # jeronimo@fixity.net  BZ489
 ##ch  http://exim.direct-jobs.ch/                      # Down 959 days fs@neteducation.com BZ683
 ##cz  http://exim.kn.vutbr.cz/                         # Down 791 days
@@ -32,6 +31,7 @@ no  http://www.no.exim.org/
 ##no  http://exim.poboxes.info/   # BZ600 evert@meulie.net
 pt  http://mirrors.dominios.pt/www.exim.org/        # Carlos Santos <cjsantos@cajo.info> BZ1000
 ##ro  http://exim.tmp.ro/                             # Daniel Petre <dani@pain.ro> BZ1008
+ru  http://mirrors-ru.go-parts.com/exim/index.html    # BZ1508 Dan Derebenskiy <dderebenskiy@go-parts.com>
 ##si  http://www.fastmirrors.org/exim/                 # Down 752 days
 si  http://www.klevze.si/exim/
 ua  http://exim.telcom.net.ua/                      # Oleksandr(Alex) Panchuk <lxadm@telcom.net.ua> BZ983