You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/01/29 12:22:42 UTC

git commit: AMBARI-4452. unit test failures in ambari-server (aonishuk)

Updated Branches:
  refs/heads/trunk a2579c320 -> c6e65f534


AMBARI-4452. unit test failures in ambari-server (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c6e65f53
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c6e65f53
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c6e65f53

Branch: refs/heads/trunk
Commit: c6e65f534d930773d17f2d24becf9abf38d28083
Parents: a2579c3
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Wed Jan 29 03:21:20 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Wed Jan 29 03:22:26 2014 -0800

----------------------------------------------------------------------
 .../stacks/HDP/1.3.3/services/HBASE/package/scripts/params.py     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c6e65f53/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HBASE/package/scripts/params.py
index 01a8b2c..1d57fc9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HBASE/package/scripts/params.py
@@ -20,7 +20,6 @@ limitations under the License.
 
 from functions import calc_xmn_from_xms
 from resource_management import *
-import functions
 import status_params
 
 # server configurations
@@ -87,7 +86,7 @@ master_keytab_path = config['configurations']['hbase-site']['hbase.master.keytab
 regionserver_keytab_path = config['configurations']['hbase-site']['hbase.regionserver.keytab.file']
 smoke_user_keytab = config['configurations']['global']['smokeuser_keytab']
 hbase_user_keytab = config['configurations']['global']['hbase_user_keytab']
-kinit_path_local = get_kinit_path([default("kinit_path_local",None), "/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
+kinit_path_local = functions.get_kinit_path([default("kinit_path_local",None), "/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
 
 #log4j.properties
 if ('hbase-log4j' in config['configurations']):