You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/02/27 23:28:03 UTC
ambari git commit: Revert "AMBARI-9839. Spark deployment fails"
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 6c02f0abf -> dbbded1d9
Revert "AMBARI-9839. Spark deployment fails"
This reverts commit 6c02f0abf951c3912a140a5ca552fd1d788d45dd.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dbbded1d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dbbded1d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dbbded1d
Branch: refs/heads/branch-2.0.0
Commit: dbbded1d9f1f6130be5febe90e99db206f676829
Parents: 6c02f0a
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri Feb 27 14:27:53 2015 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri Feb 27 14:27:53 2015 -0800
----------------------------------------------------------------------
ambari-server/ldap-password.dat | 1 -
.../common-services/SPARK/1.2.0.2.2/package/scripts/params.py | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dbbded1d/ambari-server/ldap-password.dat
----------------------------------------------------------------------
diff --git a/ambari-server/ldap-password.dat b/ambari-server/ldap-password.dat
deleted file mode 100644
index 7aa311a..0000000
--- a/ambari-server/ldap-password.dat
+++ /dev/null
@@ -1 +0,0 @@
-password
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dbbded1d/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index 0afefaf..3ad1098 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -1,3 +1,5 @@
+ bin_dir = hadoop_bin_dir
+)
#!/usr/bin/python
"""
Licensed to the Apache Software Foundation (ASF) under one
@@ -150,4 +152,4 @@ HdfsDirectory = functools.partial(
keytab = hdfs_user_keytab,
kinit_path_local = kinit_path_local,
bin_dir = hadoop_bin_dir
-)
+)
\ No newline at end of file