You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2016/06/01 01:56:48 UTC
ambari git commit: AMBARI-16718: clean up import * for PIG service
scripts in common-services (Juanjo Marron via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 59b540ff5 -> 44b3a205a
AMBARI-16718: clean up import * for PIG service scripts in common-services (Juanjo Marron via jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/44b3a205
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/44b3a205
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/44b3a205
Branch: refs/heads/trunk
Commit: 44b3a205a0353c8a7674f9aa01f29b10c6e155d7
Parents: 59b540f
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Tue May 31 18:56:43 2016 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Tue May 31 18:56:43 2016 -0700
----------------------------------------------------------------------
.../PIG/0.12.0.2.0/package/scripts/params_windows.py | 2 +-
.../common-services/PIG/0.12.0.2.0/package/scripts/pig.py | 4 +++-
.../PIG/0.12.0.2.0/package/scripts/pig_client.py | 7 +++----
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/44b3a205/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_windows.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_windows.py
index 9cb0ce7..bd9654f 100644
--- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_windows.py
+++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_windows.py
@@ -18,7 +18,7 @@ limitations under the License.
Ambari Agent
"""
-from resource_management import *
+from resource_management.libraries.script.script import Script
# server configurations
config = Script.get_config()
http://git-wip-us.apache.org/repos/asf/ambari/blob/44b3a205/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig.py b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig.py
index 83f7048..b6825d5 100644
--- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig.py
+++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig.py
@@ -19,7 +19,9 @@ Ambari Agent
"""
import os
-from resource_management import *
+from resource_management.core.resources.system import Directory, File
+from resource_management.core.source import InlineTemplate
+from resource_management.libraries.functions.format import format
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
http://git-wip-us.apache.org/repos/asf/ambari/blob/44b3a205/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py
index 29be252..111f4d2 100644
--- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py
+++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig_client.py
@@ -21,10 +21,9 @@ Ambari Agent
import sys
import os
-from resource_management import *
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import stack_select
-from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions import conf_select, stack_select
+from resource_management.libraries.functions.constants import StackFeature
from resource_management.libraries.functions.stack_features import check_stack_feature
from pig import pig
from ambari_commons import OSConst