You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/10/03 09:05:00 UTC

[1/2] incubator-freemarker git commit: Fixed yet another binary compatibility mistake.

Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3 f57ccbae1 -> 1ff236c97


Fixed yet another binary compatibility mistake.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/66af2799
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/66af2799
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/66af2799

Branch: refs/heads/2.3
Commit: 66af279956f74c08779003e155a7eca4728beb02
Parents: 8222924
Author: ddekany <dd...@apache.org>
Authored: Tue Oct 3 11:03:26 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Tue Oct 3 11:03:26 2017 +0200

----------------------------------------------------------------------
 src/main/java/freemarker/template/utility/Constants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/66af2799/src/main/java/freemarker/template/utility/Constants.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/Constants.java b/src/main/java/freemarker/template/utility/Constants.java
index 056c8a8..2162ef6 100644
--- a/src/main/java/freemarker/template/utility/Constants.java
+++ b/src/main/java/freemarker/template/utility/Constants.java
@@ -96,7 +96,7 @@ public class Constants {
         
     }
     
-    public static final TemplateHashModelEx2 EMPTY_HASH = new EmptyHashModel();
+    public static final TemplateHashModelEx EMPTY_HASH = new EmptyHashModel();
     
     /**
      * An empty hash. Since 2.3.27, it implements {@link TemplateHashModelEx2}, before that it was only


[2/2] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

Posted by dd...@apache.org.
Merge remote-tracking branch 'origin/2.3-gae' into 2.3


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/1ff236c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/1ff236c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/1ff236c9

Branch: refs/heads/2.3
Commit: 1ff236c9723428610e6065cb2554812b7c86099f
Parents: f57ccba 66af279
Author: ddekany <dd...@apache.org>
Authored: Tue Oct 3 11:04:49 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Tue Oct 3 11:04:49 2017 +0200

----------------------------------------------------------------------
 src/main/java/freemarker/template/utility/Constants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------