Changeset 861a1e2


Ignore:
Timestamp:
Jun 28, 2014 9:58:50 PM (7 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
91bc16ce
Parents:
b33284b (diff), a5b2f9a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '2542a527f53e4df3896ae26f5b0cf7d0a45128ff'

and '4944f31a9bec7dcacd3a97f6e451fd4eaf5f4096'

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

    rb33284b r861a1e2  
    9595              "https://netdb.i2p2.no/" + "," +
    9696              "https://reseed.info/"  + "," +
    97               "https://reseed.pkol.de/" + "," +
     97              //Temp disabled (ticket #1326)
     98              //"https://reseed.pkol.de/" + "," +
    9899               //Temp disabled (ticket #1276)
    99100              //"https://uk.reseed.i2p2.no/" + "," +
  • tests/scripts/checkremotecerts.sh

    rb33284b r861a1e2  
    55BASEDIR="$(dirname $0)/../../"
    66cd "$BASEDIR"
    7 RESEEDHOSTS=$(sed -e '/\s\+"https:\/\/[-a-z0-9.]/!d' -e 's/.*"https:\/\/\([-a-z0-9.]\+\).*/\1/' router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java)
     7RESEEDHOSTS=$(sed -e '/^\s\+"https:\/\/[-a-z0-9.]/!d' -e 's/.*"https:\/\/\([-a-z0-9.]\+\).*/\1/' router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java)
    88CERTHOME="installer/resources/certificates"
    99CACERTS=$(mktemp)
Note: See TracChangeset for help on using the changeset viewer.