Changeset 5f96067 for core


Ignore:
Timestamp:
Mar 3, 2017 2:00:47 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
74151b0, e20310d
Parents:
61e4e2a (diff), f7cdf22 (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 'bd4c9889786a280f8797cbdc6ca9cddb8c7260a2'

and 'fe4b2b6942b6c0dbe1efda4e2fa555289e74cbef'

Location:
core/java/src/net/i2p
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/client/naming/HostTxtEntry.java

    r61e4e2a r5f96067  
    397397        props.setProperty(PROP_NAME, name);
    398398        props.setProperty(PROP_DEST, dest);
     399        if (!props.containsKey(PROP_DATE))
     400            props.setProperty(PROP_DATE, Long.toString(System.currentTimeMillis() / 1000));
    399401        StringWriter buf = new StringWriter(1024);
    400402        try {
     
    419421        if (props.containsKey(sigprop))
    420422            throw new IllegalStateException();
     423        if (!props.containsKey(PROP_DATE))
     424            props.setProperty(PROP_DATE, Long.toString(System.currentTimeMillis() / 1000));
    421425        StringWriter buf = new StringWriter(1024);
    422426        buf.append(name);
  • core/java/src/net/i2p/util/SystemVersion.java

    r61e4e2a r5f96067  
    2121     */
    2222    public static final String DAEMON_USER = "i2psvc";
     23    /*
     24     *  @since 0.9.29
     25     */
    2326    public static final String GENTOO_USER = "i2p";
    2427
Note: See TracChangeset for help on using the changeset viewer.