You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/07/26 07:42:46 UTC
git commit: AMBARI-2742. Misc issues in the stack definition.
(smohanty)
Updated Branches:
refs/heads/trunk 8be5c1689 -> 23915a29e
AMBARI-2742. Misc issues in the stack definition. (smohanty)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/23915a29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/23915a29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/23915a29
Branch: refs/heads/trunk
Commit: 23915a29ec1942e6a7ae27ff3ecc7a26164b6211
Parents: 8be5c16
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Jul 25 16:10:12 2013 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Jul 25 22:41:58 2013 -0700
----------------------------------------------------------------------
.../main/python/ambari_agent/PackagesAnalyzer.py | 2 +-
.../resources/stacks/HDP/1.3.1/repos/repoinfo.xml | 16 ++++++++--------
.../stacks/HDPLocal/1.3.1/repos/repoinfo.xml | 16 ++++++++--------
.../resources/stacks/HDPLocal/2.0.3/metainfo.xml | 1 -
4 files changed, 17 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/23915a29/ambari-agent/src/main/python/ambari_agent/PackagesAnalyzer.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/PackagesAnalyzer.py b/ambari-agent/src/main/python/ambari_agent/PackagesAnalyzer.py
index 7cc8d75..d472954 100644
--- a/ambari-agent/src/main/python/ambari_agent/PackagesAnalyzer.py
+++ b/ambari-agent/src/main/python/ambari_agent/PackagesAnalyzer.py
@@ -31,7 +31,7 @@ logger = logging.getLogger()
class PackagesAnalyzer:
# default timeout for async invoked processes
- TIMEOUT_SECONDS = 30
+ TIMEOUT_SECONDS = 10
event = threading.Event()
def launch_subprocess(self, command):
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/23915a29/ambari-server/src/main/resources/stacks/HDP/1.3.1/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.1/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.1/repos/repoinfo.xml
index 311f87b..085ab6d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.1/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.1/repos/repoinfo.xml
@@ -19,56 +19,56 @@
<os type="centos6">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos6</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="centos5">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos5</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat6">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos6</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat5">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos5</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="oraclelinux6">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos6</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="oraclelinux5">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos5</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="suse11">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/suse11</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="sles11">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/suse11</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/23915a29/ambari-server/src/main/resources/stacks/HDPLocal/1.3.1/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/1.3.1/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/1.3.1/repos/repoinfo.xml
index 311f87b..085ab6d 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/1.3.1/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/1.3.1/repos/repoinfo.xml
@@ -19,56 +19,56 @@
<os type="centos6">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos6</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="centos5">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos5</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat6">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos6</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat5">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos5</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="oraclelinux6">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos6</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="oraclelinux5">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/centos5</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="suse11">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/suse11</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="sles11">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.1.0/repos/suse11</baseurl>
- <repoid>HDP-1.3.0</repoid>
+ <repoid>HDP-1.3.1</repoid>
<reponame>HDP</reponame>
</repo>
</os>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/23915a29/ambari-server/src/main/resources/stacks/HDPLocal/2.0.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.3/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.3/metainfo.xml
index ca45822..17e8e38 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.3/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.3/metainfo.xml
@@ -17,6 +17,5 @@
-->
<metainfo>
<versions>
- <active>true</active>
</versions>
</metainfo>