You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2013/12/16 14:38:09 UTC
git commit: AMBARI-4078. Remove few issues caused by 3-way merges on
Fri 13 (dlysnichenko)
Updated Branches:
refs/heads/trunk eb80c2b7e -> bf536d1a8
AMBARI-4078. Remove few issues caused by 3-way merges on Fri 13 (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bf536d1a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf536d1a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf536d1a
Branch: refs/heads/trunk
Commit: bf536d1a8af6f5ebf448e9030205ec714c781f4a
Parents: eb80c2b
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Dec 16 15:08:11 2013 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Dec 16 15:37:46 2013 +0200
----------------------------------------------------------------------
.../libraries/script/config_dictionary.py.orig | 59 --------------------
.../libraries/script/config_dictionary.py.rej | 13 -----
.../org/apache/ambari/server/RoleCommand.java | 2 -
3 files changed, 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf536d1a/ambari-agent/src/main/python/resource_management/libraries/script/config_dictionary.py.orig
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/libraries/script/config_dictionary.py.orig b/ambari-agent/src/main/python/resource_management/libraries/script/config_dictionary.py.orig
deleted file mode 100644
index 577f78b..0000000
--- a/ambari-agent/src/main/python/resource_management/libraries/script/config_dictionary.py.orig
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env python2.6
-
-'''
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-'''
-from resource_management.core.exceptions import Fail
-
-class ConfigDictionary(dict):
- """
- Immutable config dictionary
- """
-
- def __init__(self, dictionary):
- """
- Recursively turn dict to ConfigDictionary
- """
- for k, v in dictionary.iteritems():
- if isinstance(v, dict):
- dictionary[k] = ConfigDictionary(v)
-
- super(ConfigDictionary, self).__init__(dictionary)
-
- def __setitem__(self, name, value):
- raise Fail("Configuration dictionary is immutable!")
-
- def __getitem__(self, name):
- """
- Use Python types
- """
- value = super(ConfigDictionary, self).__getitem__(name)
-
- if value == "true":
- value = True
- elif value == "false":
- value = False
- else:
- try:
- value = int(value)
- except (ValueError, TypeError):
- try:
- value = float(value)
- except (ValueError, TypeError):
- pass
-
- return value
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf536d1a/ambari-agent/src/main/python/resource_management/libraries/script/config_dictionary.py.rej
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/resource_management/libraries/script/config_dictionary.py.rej b/ambari-agent/src/main/python/resource_management/libraries/script/config_dictionary.py.rej
deleted file mode 100644
index 6b5e5e0..0000000
--- a/ambari-agent/src/main/python/resource_management/libraries/script/config_dictionary.py.rej
+++ /dev/null
@@ -1,13 +0,0 @@
---- ambari-agent/src/main/python/resource_management/libraries/script/config_dictionary.py
-+++ ambari-agent/src/main/python/resource_management/libraries/script/config_dictionary.py
-@@ -72,4 +72,10 @@
- self.name = name
-
- def __getattr__(self, name):
-- raise Fail("Configuration parameter '"+self.name+"' was not found in configurations dictionary!")+ raise Fail("Configuration parameter '"+self.name+"' was not found in configurations dictionary!")
-+
-+ def __getitem__(self, name):
-+ """
-+ Allow []
-+ """
-+ return self
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf536d1a/ambari-server/src/main/java/org/apache/ambari/server/RoleCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/RoleCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/RoleCommand.java
index 4824ee9..be5f591 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/RoleCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/RoleCommand.java
@@ -25,8 +25,6 @@ public enum RoleCommand {
* files
*/
-
-public enum RoleCommand {
INSTALL,
UNINSTALL,
START,