Repository: incubator-pirk Updated Branches: refs/heads/master 0912bb658 -> 697913a06
pushing hotfix for bug in SystemConfiguration local properties dir parsing Project: http://git-wip-us.apache.org/repos/asf/incubator-pirk/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-pirk/commit/697913a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-pirk/tree/697913a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-pirk/diff/697913a0 Branch: refs/heads/master Commit: 697913a0665af7bedb438bbfb595e14741e8340f Parents: 0912bb6 Author: eawilliams <[email protected]> Authored: Mon Aug 1 13:35:26 2016 -0400 Committer: eawilliams <[email protected]> Committed: Mon Aug 1 13:35:26 2016 -0400 ---------------------------------------------------------------------- src/main/java/org/apache/pirk/utils/SystemConfiguration.java | 2 +- src/main/resources/pirk.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/697913a0/src/main/java/org/apache/pirk/utils/SystemConfiguration.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/utils/SystemConfiguration.java b/src/main/java/org/apache/pirk/utils/SystemConfiguration.java index c71e64f..9b230af 100755 --- a/src/main/java/org/apache/pirk/utils/SystemConfiguration.java +++ b/src/main/java/org/apache/pirk/utils/SystemConfiguration.java @@ -69,7 +69,7 @@ public class SystemConfiguration loadPropsFromStream(RESPONDER_PROPERTIES_FILE); // Try to load the local properties files, if they exists - loadPropsFromDir(LOCAL_PROPERTIES_DIR); + loadPropsFromDir(getProperty(LOCAL_PROPERTIES_DIR)); } /** http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/697913a0/src/main/resources/pirk.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/pirk.properties b/src/main/resources/pirk.properties index aee87ad..94379d5 100755 --- a/src/main/resources/pirk.properties +++ b/src/main/resources/pirk.properties @@ -23,7 +23,7 @@ #Name of the local properties file - used when running with the #hadoop jar command -local.pirk.properties=/root/ +local.pirk.properties.dir=/root/ ## ##Spark path for SparkLauncher
