Updated Branches: refs/heads/trunk 903302d12 -> 6c05902ba
GIRAPH-650: Exception in GiraphConfiguration initialization (majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/6c05902b Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/6c05902b Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/6c05902b Branch: refs/heads/trunk Commit: 6c05902ba16de1e70dbf80da702492aeb32b5317 Parents: 903302d Author: Maja Kabiljo <[email protected]> Authored: Fri May 3 10:17:48 2013 -0700 Committer: Maja Kabiljo <[email protected]> Committed: Fri May 3 10:17:48 2013 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../apache/giraph/conf/GiraphConfiguration.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/6c05902b/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index db78bb1..765c234 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.0.1 - unreleased + GIRAPH-650: Exception in GiraphConfiguration initialization (majakabiljo) + GIRAPH-648: Allow IO formats to add parameters to Configuration (majakabiljo) GIRAPH-635: Website Documentation: Missing presentations (ssc) http://git-wip-us.apache.org/repos/asf/giraph/blob/6c05902b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java index 795cd0c..deb2069 100644 --- a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java +++ b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java @@ -60,8 +60,8 @@ public class GiraphConfiguration extends Configuration * Constructor that creates the configuration */ public GiraphConfiguration() { - configureHadoopSecurity(); giraphSetParameters = new Configuration(false); + configureHadoopSecurity(); } /** @@ -71,8 +71,8 @@ public class GiraphConfiguration extends Configuration */ public GiraphConfiguration(Configuration conf) { super(conf); - configureHadoopSecurity(); giraphSetParameters = new Configuration(false); + configureHadoopSecurity(); } /**
