Changeset 2aee4376


Ignore:
Timestamp:
Aug 23, 2011 8:18:56 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
e728532
Parents:
73aade4 (diff), 010399d (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 '804bb87106b8e0129d06020ddf5f77ddc242d622'

and 'ebb90f58c9b8363abd9b1f7d8f61c81ca478d811'

Files:
10 edited
1 moved

Legend:

Unmodified
Added
Removed
  • apps/addressbook/java/src/net/i2p/addressbook/Daemon.java

    r73aade4 r2aee4376  
    202202                } catch (DataFormatException dfe) {
    203203                    if (log != null)
    204                         log.append("Invalid b64 for" + key + " From: " + sub.getLocation());
     204                        log.append("Invalid b64 for " + key + " From: " + sub.getLocation());
    205205                    invalid++;
    206206                }
  • apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java

    r73aade4 r2aee4376  
    516516    public String getJobLag() {
    517517        if (_context == null)
    518             return "0 ms";
     518            return "0";
    519519       
    520520        RateStat rs = _context.statManager().getRate("jobQueue.jobLag");
    521521        if (rs == null)
    522             return "0 ms";
     522            return "0";
    523523        Rate lagRate = rs.getRate(60*1000);
    524524        return DataHelper.formatDuration2((long)lagRate.getAverageValue());
     
    532532    public String getMessageDelay() {
    533533        if (_context == null)
    534             return "0 ms";
     534            return "0";
    535535       
    536536        return DataHelper.formatDuration2(_context.throttle().getMessageDelay());
     
    544544    public String getTunnelLag() {
    545545        if (_context == null)
    546             return "0 ms";
     546            return "0";
    547547       
    548548        return DataHelper.formatDuration2(_context.throttle().getTunnelLag());
  • core/java/src/net/i2p/CoreVersion.java

    r73aade4 r2aee4376  
    1717    /** deprecated */
    1818    public final static String ID = "Monotone";
    19     public final static String VERSION = "0.8.7";
     19    public final static String VERSION = "0.8.8";
    2020
    2121    public static void main(String args[]) {
  • core/java/src/net/i2p/util/LogConsoleBuffer.java

    r73aade4 r2aee4376  
    3737        // Add some extra room to minimize the chance of losing a message,
    3838        // since we are doing offer() below.
    39         _buffer = new LinkedBlockingQueue(limit + 4);
    40         _critBuffer = new LinkedBlockingQueue(limit + 4);
     39        _buffer = new LinkedBlockingQueue(lim + 4);
     40        _critBuffer = new LinkedBlockingQueue(lim + 4);
    4141    }
    4242
  • history.txt

    r73aade4 r2aee4376  
     1* 2011-08-23 0.8.8 released
     2
     32011-08-23 zzz
     4  * Tweaks after review
     5
    162011-08-21 zzz
    27  * RateStat: Cleanups and javadoc fixes
  • installer/install.xml

    r73aade4 r2aee4376  
    55    <info>
    66        <appname>i2p</appname>
    7         <appversion>0.8.7</appversion>
     7        <appversion>0.8.8</appversion>
    88        <authors>
    99            <author name="I2P" email="http://forum.i2p2.de/"/>
  • installer/resources/fix_logfile_path.cmd

    r73aade4 r2aee4376  
    2727::
    2828cd /d %~dp0
    29 find /V /I "wrapper.logfile=" wrapper.config > wrapper.new
     29findstr /V /R "^wrapper.logfile=" wrapper.config > wrapper.new
    3030echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new
    3131move wrapper.new wrapper.config
  • installer/resources/news.xml

    r73aade4 r2aee4376  
    11<!--
    22<i2p.news date="$Date: 2011-05-16 00:00:00 $">
    3 <i2p.release version="0.8.7" date="2011/06/27" minVersion="0.6" />
     3<i2p.release version="0.8.8" date="2011/08/23" minVersion="0.6" />
    44-->
    55<div lang="en">
    6 <h3>2011-06-27: <b>0.8.7 <a href="http://www.i2p2.i2p/release-0.8.7.html">Released</a></b></h3>
     6<h3>2011-08-23: <b>0.8.8 <a href="http://www.i2p2.i2p/release-0.8.8.html">Released</a></b></h3>
    77
    8 <p>I2P release 0.8.7 contains several upgrades to long-neglected components,
    9  including the Naming Services, graphing, the native CPU ID and BigInteger
    10  libraries, crypto implementations, and the wrapper.</p>
    11 
    12 <p>Thanks to new contributor KillYourTV who was instrumental in implementing
    13  and testing these upgrades, with additional support from sponge and hottuna.</p>
    14 
    15 <p>CPU ID enhancements are by hottuna, generously funded by
    16  <a href="http://relakks.com/">http://relakks.com/</a> and <a href="http://ipredator.se/">http://ipredator.se/</a> -
    17  thanks to Peter Sunde and Jan-Erik Fiske for their support.</p>
    18 
    19 <p>Also, for the first time, we now have an official
    20 <a href="https://launchpad.net/~i2p-maintainers/+archive/i2p">I2P Personal Package Archive (PPA) on launchpad.net</a>.
    21 For those of you using Ubuntu, this offers an easy way to install I2P and keep the
    22  various components up-to-date. The I2P package offers the option of installing as
    23  a service, or it may be started on-demand as usual. This PPA is currently maintained
    24  by KillYourTV with support by other members of the development team.
    25 The <a href="http://www.i2p2.i2p/debian">Ubuntu/Debian installation instructions</a> are on our website.
    26 </p>
    27 
    28 <p>For those updating over the network, this update is about 4 times the usual size,
    29  due to the inclusion of the jbigi updates. Please be patient while downloading the update over the network.
    30 
     8<p>I2P release 0.8.8 enables the new hosts.txt database to speed hostname lookups
     9 and store additional information on hostname entries.
     10 It also includes improvements to speed a router's integration on startup.
     11 There is new code to detect and react to large clock shifts that should help
     12 a router recover after suspend/resume of the computer.
     13</p><p>
     14 There are new translations for Danish and Ukranian and lots of updates in other languages.
     15 Also included are, of course, a large collection of bug fixes, performance improvements,
     16 and updates to deal with the continued rapid expansion of the network.
    3117
    3218</p><p>
  • installer/resources/postinstall.sh

    r73aade4 r2aee4376  
    9696rm -f ./lib/*.dll
    9797rm -f ./*.bat
     98rm -f ./fix_logfile_path.cmd
    9899rm -f ./*.exe
    99100rm -rf ./installer
  • router/java/src/net/i2p/router/RouterVersion.java

    r73aade4 r2aee4376  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 27;
     21    public final static long BUILD = 0;
    2222
    2323    /** for example "-test" */
    24     public final static String EXTRA = "-rc";
     24    public final static String EXTRA = "";
    2525    public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
    2626    public static void main(String args[]) {
Note: See TracChangeset for help on using the changeset viewer.