Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 ccc56918b -> eb06cff41


AMBARI-12600. Update latest url to work for Ubuntu/Debian (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: eb06cff4144280547b82548c3b373f24df9614e6
Parents: ccc5691
Author: Andrew Onishuk <[email protected]>
Authored: Fri Jul 31 11:24:44 2015 +0300
Committer: Andrew Onishuk <[email protected]>
Committed: Fri Jul 31 11:24:44 2015 +0300

----------------------------------------------------------------------
 .../resources/stacks/HDP/2.3/repos/repoinfo.xml |  8 +-
 .../stacks/HDP/2.3/repos/repoinfo.xml.orig      | 92 ++++++++++++++++++++
 .../stacks/HDP/2.3/repos/repoinfo.xml.rej       | 11 +++
 3 files changed, 107 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/eb06cff4/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml
index 5c845f1..142b87d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 <reposinfo>
-  <latest>http://public-repo-1.hortonworks.com/HDP/hdp_urlinfo.json</latest>
+  
<latest>http://s3.amazonaws.com/dev.hortonworks.com/HDP/hdp_urlinfo.json</latest>
   <os family="redhat6">
     <repo>
       
<baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.0.0</baseurl>
@@ -55,7 +55,7 @@
   </os>
   <os family="ubuntu12">
     <repo>
-      
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/updates/2.3.0.0</baseurl>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP/ubuntu12/2.x/updates/2.3.0.0</baseurl>
       <repoid>HDP-2.3</repoid>
       <reponame>HDP</reponame>
     </repo>
@@ -67,7 +67,7 @@
   </os>
   <os family="debian7">
     <repo>
-      
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/debian7/2.x/updates/2.3.0.0</baseurl>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP/debian7/2.x/updates/2.3.0.0</baseurl>
       <repoid>HDP-2.3</repoid>
       <reponame>HDP</reponame>
     </repo>
@@ -79,7 +79,7 @@
   </os>
   <os family="ubuntu14">
     <repo>
-      
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/updates/2.3.0.0</baseurl>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP/ubuntu14/2.x/updates/2.3.0.0</baseurl>
       <repoid>HDP-2.3</repoid>
       <reponame>HDP</reponame>
     </repo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb06cff4/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml.orig
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml.orig 
b/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml.orig
new file mode 100644
index 0000000..5c845f1
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml.orig
@@ -0,0 +1,92 @@
+<?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.
+-->
+<reposinfo>
+  <latest>http://public-repo-1.hortonworks.com/HDP/hdp_urlinfo.json</latest>
+  <os family="redhat6">
+    <repo>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.0.0</baseurl>
+      <repoid>HDP-2.3</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+    <repo>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6</baseurl>
+      <repoid>HDP-UTILS-1.1.0.20</repoid>
+      <reponame>HDP-UTILS</reponame>
+    </repo>
+  </os>
+  <os family="redhat7">
+    <repo>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP/centos7/2.x/updates/2.3.0.0</baseurl>
+      <repoid>HDP-2.3</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+    <repo>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos7</baseurl>
+      <repoid>HDP-UTILS-1.1.0.20</repoid>
+      <reponame>HDP-UTILS</reponame>
+    </repo>
+  </os>
+  <os family="suse11">
+    <repo>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP/suse11sp3/2.x/updates/2.3.0.0</baseurl>
+      <repoid>HDP-2.3</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+    <repo>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/suse11sp3</baseurl>
+      <repoid>HDP-UTILS-1.1.0.20</repoid>
+      <reponame>HDP-UTILS</reponame>
+    </repo>
+  </os>
+  <os family="ubuntu12">
+    <repo>
+      
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/updates/2.3.0.0</baseurl>
+      <repoid>HDP-2.3</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+    <repo>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/ubuntu12</baseurl>
+      <repoid>HDP-UTILS-1.1.0.20</repoid>
+      <reponame>HDP-UTILS</reponame>
+    </repo>
+  </os>
+  <os family="debian7">
+    <repo>
+      
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/debian7/2.x/updates/2.3.0.0</baseurl>
+      <repoid>HDP-2.3</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+    <repo>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/debian6</baseurl>
+      <repoid>HDP-UTILS-1.1.0.20</repoid>
+      <reponame>HDP-UTILS</reponame>
+    </repo>
+  </os>
+  <os family="ubuntu14">
+    <repo>
+      
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/updates/2.3.0.0</baseurl>
+      <repoid>HDP-2.3</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+    <repo>
+      
<baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/ubuntu12</baseurl>
+      <repoid>HDP-UTILS-1.1.0.20</repoid>
+      <reponame>HDP-UTILS</reponame>
+    </repo>
+  </os>
+</reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb06cff4/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml.rej
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml.rej 
b/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml.rej
new file mode 100644
index 0000000..507e902
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml.rej
@@ -0,0 +1,11 @@
+--- ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml
++++ ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml
+@@ -79,7 +79,7 @@
+   </os>
+   <os family="ubuntu14">
+     <repo>
+-      
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu14/2.x/updates/2.3.0.0</baseurl>
++      
<baseurl>http://public-repo-1.hortonworks.com/HDP/ubuntu14/2.x/updates/2.3.0.0</baseurl>
+       <repoid>HDP-2.3</repoid>
+       <reponame>HDP</reponame>
+     </repo>

Reply via email to