Updated conf files. Merge from trunk.

diff --git a/PlanetLabConf/ntp/ntp.conf.au b/PlanetLabConf/ntp/ntp.conf.au
index aa14dd3..b939b79 100755 (executable)
--- a/PlanetLabConf/ntp/ntp.conf.au
+++ b/PlanetLabConf/ntp/ntp.conf.au
@@ -3,4 +3,3 @@ server time.apple.com
 server pool.ntp.org
 server ntp.saard.net
 server ucsd.ron.lcs.mit.edu
-server ntp1.linux.medialabs.com

diff --git a/PlanetLabConf/ntp/ntp.conf.ch b/PlanetLabConf/ntp/ntp.conf.ch
index 62b478e..386b7c9 100755 (executable)
--- a/PlanetLabConf/ntp/ntp.conf.ch
+++ b/PlanetLabConf/ntp/ntp.conf.ch
@@ -1,4 +1,2 @@
-server ntp1.theinternetone.net
-server ntp2.theinternetone.net
-server ntp3.theinternetone.net
-server time.alcanet.no
+server tock.fh-augsburg.de
+server tack.fh-augsburg.de

diff --git a/PlanetLabConf/ntp/ntp.conf.cn b/PlanetLabConf/ntp/ntp.conf.cn
index 3217953..d37ad09 100755 (executable)
--- a/PlanetLabConf/ntp/ntp.conf.cn
+++ b/PlanetLabConf/ntp/ntp.conf.cn
@@ -1,5 +1,3 @@
-server s2a.time.edu.cn
-server s2b.time.edu.cn
 server clock.redhat.com
 server time.apple.com
 server pool.ntp.org

diff --git a/PlanetLabConf/ntp/ntp.conf.de b/PlanetLabConf/ntp/ntp.conf.de
index bb193ea..386b7c9 100755 (executable)
--- a/PlanetLabConf/ntp/ntp.conf.de
+++ b/PlanetLabConf/ntp/ntp.conf.de
@@ -1,4 +1,2 @@
 server tock.fh-augsburg.de
 server tack.fh-augsburg.de
-server ntp2.theinternetone.net
-server ntp3.theinternetone.net

diff --git a/PlanetLabConf/ntp/ntp.conf.dk b/PlanetLabConf/ntp/ntp.conf.dk
index ab41c82..a58a691 100755 (executable)
--- a/PlanetLabConf/ntp/ntp.conf.dk
+++ b/PlanetLabConf/ntp/ntp.conf.dk
@@ -1,6 +1,2 @@
-server ntp1.theinternetone.net
-server ntp2.theinternetone.net
-server ntp3.theinternetone.net
-server time.alcanet.no
 server clock.netcetera.dk
 server clock2.netcetera.dk

diff --git a/PlanetLabConf/ntp/ntp.conf.eurecom.fr b/PlanetLabConf/ntp/ntp.conf.eurecom.fr
index 1b66d3f..648bbeb 100755 (executable)
--- a/PlanetLabConf/ntp/ntp.conf.eurecom.fr
+++ b/PlanetLabConf/ntp/ntp.conf.eurecom.fr
@@ -1,6 +1,3 @@
 server ntp.univ-lyon1.fr minpoll 5
 server ntp1.tuxfamily.net minpoll 5
 server ntp2.tuxfamily.net minpoll 5
-server ntp1.theinternetone.net minpoll 5
-server ntp2.theinternetone.net minpoll 5
-server ntp3.theinternetone.net minpoll 5

diff --git a/PlanetLabConf/ntp/ntp.conf.fr b/PlanetLabConf/ntp/ntp.conf.fr
index 3041606..449dd1f 100755 (executable)
--- a/PlanetLabConf/ntp/ntp.conf.fr
+++ b/PlanetLabConf/ntp/ntp.conf.fr
@@ -1,6 +1,3 @@
 server ntp.univ-lyon1.fr
 server ntp1.tuxfamily.net
 server ntp2.tuxfamily.net
-server ntp1.theinternetone.net
-server ntp2.theinternetone.net
-server ntp3.theinternetone.net

diff --git a/PlanetLabConf/ntp/ntp.conf.ipv6.lip6.fr b/PlanetLabConf/ntp/ntp.conf.ipv6.lip6.fr
index 3a5e610..449dd1f 100755 (executable)
--- a/PlanetLabConf/ntp/ntp.conf.ipv6.lip6.fr
+++ b/PlanetLabConf/ntp/ntp.conf.ipv6.lip6.fr
@@ -1,7 +1,3 @@
-server 132.227.74.33
 server ntp.univ-lyon1.fr
 server ntp1.tuxfamily.net
 server ntp2.tuxfamily.net
-server ntp1.theinternetone.net
-server ntp2.theinternetone.net
-server ntp3.theinternetone.net