Repository: kylin Updated Branches: refs/heads/yang-m1 fb98f6435 -> b6c2f87d0
KYLIN-1534 bug fix Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b6c2f87d Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b6c2f87d Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b6c2f87d Branch: refs/heads/yang-m1 Commit: b6c2f87d02267dcb04457ea6e54c91fa3e5a6f2e Parents: fb98f64 Author: Li Yang <liy...@apache.org> Authored: Thu Apr 7 18:04:54 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu Apr 7 18:04:54 2016 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 2 +- .../src/main/java/org/apache/kylin/common/KylinConfigExt.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/b6c2f87d/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index 9db3081..314f24d 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -100,7 +100,7 @@ abstract public class KylinConfigBase implements Serializable { final public String getRequired(String prop) { String r = getOptional(prop); if (StringUtils.isEmpty(r)) { - throw new IllegalArgumentException("missing '" + prop + "' in conf/kylin_instance.properties"); + throw new IllegalArgumentException("missing '" + prop + "' in conf/kylin.properties"); } return r; } http://git-wip-us.apache.org/repos/asf/kylin/blob/b6c2f87d/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java index e34a58a..4cd1339 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java @@ -48,6 +48,7 @@ public class KylinConfigExt extends KylinConfig { } private KylinConfigExt(KylinConfigExt ext, Map<String, String> overrides) { + super(ext.base.getAllProperties()); this.base = ext.base; this.overrides = overrides; }
