Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B95FB200B3B for ; Mon, 11 Jul 2016 22:13:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B7DC4160A78; Mon, 11 Jul 2016 20:13:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0BEC0160A5E for ; Mon, 11 Jul 2016 22:13:52 +0200 (CEST) Received: (qmail 50314 invoked by uid 500); 11 Jul 2016 20:13:52 -0000 Mailing-List: contact commits-help@iota.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@iota.incubator.apache.org Delivered-To: mailing list commits@iota.incubator.apache.org Received: (qmail 50302 invoked by uid 99); 11 Jul 2016 20:13: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; Mon, 11 Jul 2016 20:13: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 DA73B1A541D for ; Mon, 11 Jul 2016 20:13:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id OPWa5ZJKgZlo for ; Mon, 11 Jul 2016 20:13:51 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 705605FAC9 for ; Mon, 11 Jul 2016 20:13:50 +0000 (UTC) Received: (qmail 50287 invoked by uid 99); 11 Jul 2016 20:13: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; Mon, 11 Jul 2016 20:13:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8925FDFFF8; Mon, 11 Jul 2016 20:13:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tonyfaustini@apache.org To: commits@iota.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-iota git commit: typesafe config : resolving substitution variables Date: Mon, 11 Jul 2016 20:13:49 +0000 (UTC) archived-at: Mon, 11 Jul 2016 20:13:53 -0000 Repository: incubator-iota Updated Branches: refs/heads/master acd517d64 -> 244502ee0 typesafe config : resolving substitution variables Project: http://git-wip-us.apache.org/repos/asf/incubator-iota/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-iota/commit/244502ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/244502ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/244502ee Branch: refs/heads/master Commit: 244502ee0cce6db01efc6d551a01feb26df772cc Parents: acd517d Author: tonyfaustini Authored: Mon Jul 11 13:13:42 2016 -0700 Committer: tonyfaustini Committed: Mon Jul 11 13:13:42 2016 -0700 ---------------------------------------------------------------------- fey-core/src/main/scala/org/apache/iota/fey/Utils.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/244502ee/fey-core/src/main/scala/org/apache/iota/fey/Utils.scala ---------------------------------------------------------------------- diff --git a/fey-core/src/main/scala/org/apache/iota/fey/Utils.scala b/fey-core/src/main/scala/org/apache/iota/fey/Utils.scala index 026bf89..fd24955 100644 --- a/fey-core/src/main/scala/org/apache/iota/fey/Utils.scala +++ b/fey-core/src/main/scala/org/apache/iota/fey/Utils.scala @@ -211,7 +211,7 @@ object CONFIG{ log.warn(s"No user configuration defined. Check if your configuration path $path is right.") ConfigFactory.load() } - }.getConfig("fey-global-configuration") + }.getConfig("fey-global-configuration").resolve() CHECKPOINT_DIR = app.getString("checkpoint-directory") JSON_REPOSITORY = app.getString("json-repository")