Author: toad
Date: 2005-10-12 13:45:10 +0000 (Wed, 12 Oct 2005)
New Revision: 7422
Modified:
branches/legacy/stable/README
branches/legacy/stable/src/freenet/Version.java
Log:
5106:
- 0.5 and 0.6 are now in maintenance mode.
- 0.5 and 0.6 are now effectively a single network; they can talk to each other.
Modified: branches/legacy/stable/README
===================================================================
--- branches/legacy/stable/README 2005-10-12 13:41:52 UTC (rev 7421)
+++ branches/legacy/stable/README 2005-10-12 13:45:10 UTC (rev 7422)
@@ -1,3 +1,7 @@
+Freenet 0.5 and 0.6 are now in maintenance mode. All major
+development is occurring on 0.7. As a result, the previously
+incompatible 0.5 and 0.6 branches have been merged.
+
Fred 0.5
========
"It's kind of a mix of Usenet, the Web, and a RAID disk system, all fudged
Modified: branches/legacy/stable/src/freenet/Version.java
===================================================================
--- branches/legacy/stable/src/freenet/Version.java 2005-10-12 13:41:52 UTC
(rev 7421)
+++ branches/legacy/stable/src/freenet/Version.java 2005-10-12 13:45:10 UTC
(rev 7422)
@@ -20,7 +20,7 @@
public static String protocolVersion = "STABLE-1.51";
/** The build number of the current revision */
- public static final int buildNumber = 5105;
+ public static final int buildNumber = 5106;
/** Oldest build of Fred we will talk to */
public static final int lastGoodBuild = 5099;
@@ -71,8 +71,7 @@
*/
private static boolean goodProtocol(String prot) {
if (prot.equals(protocolVersion)
-// uncomment next line to accept unstable, see also explainBadVersion() below
-// || prot.equals(unstableProtocolVersion)
+ || prot.equals(unstableProtocolVersion)
)
return true;
return false;
@@ -149,8 +148,7 @@
if (v.length < 3 || !goodProtocol(v[2])) {
return "Required protocol version is "
+ protocolVersion
-// uncomment next line if accepting unstable, see also goodProtocol() above
-// + " or " +
unstableProtocolVersion
+ + " or " +
unstableProtocolVersion
;
}
if (sameVersion(v)) {
