From notifications-return-5103-archive-asf-public=cust-asf.ponee.io@freemarker.incubator.apache.org Sat Mar 10 08:27:55 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 74408180651 for ; Sat, 10 Mar 2018 08:27:54 +0100 (CET) Received: (qmail 13511 invoked by uid 500); 10 Mar 2018 07:27:52 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 13502 invoked by uid 99); 10 Mar 2018 07:27:52 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Mar 2018 07:27:52 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id C68841A0806 for ; Sat, 10 Mar 2018 07:27:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.731 X-Spam-Level: X-Spam-Status: No, score=-3.731 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_NUMSUBJECT=0.5, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id we3_TOscxNO7 for ; Sat, 10 Mar 2018 07:27:50 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 5386D5F3B7 for ; Sat, 10 Mar 2018 07:27:50 +0000 (UTC) Received: (qmail 13452 invoked by uid 99); 10 Mar 2018 07:27:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Mar 2018 07:27:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 638BBEB4B2; Sat, 10 Mar 2018 07:27:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Sat, 10 Mar 2018 07:27:51 -0000 Message-Id: <04be12ff6f134654b77cf06913d15ddb@git.apache.org> In-Reply-To: <1c4b1d1b176f46bf89f9970777be0f2c@git.apache.org> References: <1c4b1d1b176f46bf89f9970777be0f2c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3 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/6442fd76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6442fd76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6442fd76 Branch: refs/heads/2.3 Commit: 6442fd7650b6ce84b1ddf70536c230e9942e1876 Parents: 9c8f7ab 5f821f1 Author: ddekany Authored: Sat Mar 10 08:26:22 2018 +0100 Committer: ddekany Committed: Sat Mar 10 08:26:22 2018 +0100 ---------------------------------------------------------------------- .../java/freemarker/core/BuiltinVariable.java | 17 +- src/main/java/freemarker/core/Environment.java | 6 +- src/main/java/freemarker/core/Macro.java | 4 +- src/main/java/freemarker/core/MethodCall.java | 2 +- src/manual/en_US/book.xml | 41 +++-- .../freemarker/core/CallerTemplateNameTest.java | 163 +++++++++++++++++++ .../core/MacroCallerTemplateNameTest.java | 157 ------------------ 7 files changed, 205 insertions(+), 185 deletions(-) ----------------------------------------------------------------------