Repository: spark Updated Branches: refs/heads/branch-1.4 ca2f1c56c -> 3da5f8b71
[MINOR] [CORE] Allow History Server to read kerberos opts from config file. Order of initialization code was wrong. Author: Marcelo Vanzin <[email protected]> Closes #5998 from vanzin/hs-conf-fix and squashes the following commits: 00b6b6b [Marcelo Vanzin] [minor] [core] Allow History Server to read kerberos opts from config file. (cherry picked from commit 9042f8f3784f10f695cba6b80c054695b1c152c5) Signed-off-by: Andrew Or <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3da5f8b7 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3da5f8b7 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3da5f8b7 Branch: refs/heads/branch-1.4 Commit: 3da5f8b71ad2c1efbcf49466e080e4c62fef578e Parents: ca2f1c5 Author: Marcelo Vanzin <[email protected]> Authored: Fri May 8 14:10:27 2015 -0700 Committer: Andrew Or <[email protected]> Committed: Fri May 8 14:10:34 2015 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/deploy/history/HistoryServer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/3da5f8b7/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala index 50522e6..fc5182d 100644 --- a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala +++ b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala @@ -203,8 +203,8 @@ object HistoryServer extends Logging { def main(argStrings: Array[String]) { SignalLogger.register(log) - initSecurity() new HistoryServerArguments(conf, argStrings) + initSecurity() val securityManager = new SecurityManager(conf) val providerName = conf.getOption("spark.history.provider") --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
