diff --git a/apps/routerconsole/jsp/exportfamily.jsp b/apps/routerconsole/jsp/exportfamily.jsp index 00ce9dc556..d4ff62792c 100644 --- a/apps/routerconsole/jsp/exportfamily.jsp +++ b/apps/routerconsole/jsp/exportfamily.jsp @@ -1,4 +1,11 @@ <% +/* + * USE CAUTION WHEN EDITING + * Trailing whitespace OR NEWLINE on the last line will cause + * IllegalStateExceptions !!! + * + * Do not tag this file for translation. + */ try { net.i2p.I2PAppContext ctx = net.i2p.I2PAppContext.getGlobalContext(); String family = ctx.getProperty("netdb.family.name"); @@ -31,5 +38,4 @@ try { throw ioe; } } -// don't worry about a newline after this -%> +%> \ No newline at end of file diff --git a/history.txt b/history.txt index 8e9fee6846..fef4a3fa92 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2017-07-01 zzz + * Fix family key export (ticket #2011) + 2017-06-19 str4d * Console: - Welcome page readmes: diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 7f4edb9752..affa6f41b1 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,10 +18,10 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 13; + public final static long BUILD = 14; /** for example "-test" */ - public final static String EXTRA = ""; + public final static String EXTRA = "-rc"; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION);