Repository: ambari
Updated Branches:
  refs/heads/trunk e154a1426 -> 1ca00e2e4


AMBARI-9661. Security enabling fails after ambari only upgrade (rlevas)


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

Branch: refs/heads/trunk
Commit: 1ca00e2e45a6b9c61aa78d2649709646142e2975
Parents: e154a14
Author: Robert Levas <rle...@hortonworks.com>
Authored: Tue Feb 17 12:59:32 2015 -0500
Committer: Robert Levas <rle...@hortonworks.com>
Committed: Tue Feb 17 12:59:37 2015 -0500

----------------------------------------------------------------------
 .../HDP/2.0.6/services/KERBEROS/metainfo.xml    | 26 ++++++++++++++++++++
 .../HDP/2.0/services/KERBEROS/metainfo.xml      | 26 --------------------
 2 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1ca00e2e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/KERBEROS/metainfo.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/KERBEROS/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/KERBEROS/metainfo.xml
new file mode 100644
index 0000000..25cfcc6
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/KERBEROS/metainfo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+   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.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>KERBEROS</name>
+      <extends>common-services/KERBEROS/1.10.3-10</extends>
+    </service>
+  </services>
+</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ca00e2e/ambari-server/src/main/resources/stacks/HDP/2.0/services/KERBEROS/metainfo.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0/services/KERBEROS/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.0/services/KERBEROS/metainfo.xml
deleted file mode 100644
index 25cfcc6..0000000
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0/services/KERBEROS/metainfo.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   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.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>KERBEROS</name>
-      <extends>common-services/KERBEROS/1.10.3-10</extends>
-    </service>
-  </services>
-</metainfo>

Reply via email to