[05/50] [abbrv] ambari git commit: AMBARI-21690 Updating get_stack_version pattern match (mugdha)

2017-10-09 Thread jaimin 
AMBARI-21690 Updating get_stack_version pattern match (mugdha)

(cherry picked from commit ee87b6ab60edc43ef94a404ae2ab72da42f3549f)

Change-Id: I51379e33b421aff6c8bb4fa85f668870c0915d46


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

Branch: refs/heads/2.5-maint
Commit: ad88657754802bd5e078741581e22a1d5472a529
Parents: 7ced0c9
Author: Mugdha Varadkar 
Authored: Thu Aug 10 11:57:28 2017 +0530
Committer: mug...@apache.org 
Committed: Fri Aug 11 04:36:40 2017 +

--
 .../resource_management/libraries/functions/get_stack_version.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ad886577/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
index 7274a59..463d61f 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
@@ -85,7 +85,7 @@ def get_stack_version(package_name):
 
   stack_version = re.sub(package_name + ' - ', '', stack_output)
   stack_version = stack_version.rstrip()
-  match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+-[0-9]+', stack_version)
+  match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+(-[0-9]+)?', stack_version)
 
   if match is None:
 Logger.info('Failed to get extracted version with ' + stack_selector_path)

[07/50] [abbrv] ambari git commit: AMBARI-21690 Updating get_stack_version pattern match (mugdha)

2017-10-09 Thread jaimin 
AMBARI-21690 Updating get_stack_version pattern match (mugdha)

(cherry picked from commit ee87b6ab60edc43ef94a404ae2ab72da42f3549f)

Change-Id: I258779ad329a423cf43dbdbf9ff340697b6a10da


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

Branch: refs/heads/2.5-maint
Commit: b79e01b807801873968916f03d164bfcc68b7007
Parents: 591b406
Author: Mugdha Varadkar 
Authored: Thu Aug 10 11:57:28 2017 +0530
Committer: Zuul 
Committed: Thu Aug 10 22:28:53 2017 -0700

--

--

[06/50] [abbrv] ambari git commit: AMBARI-21690 Updating get_stack_version pattern match (mugdha)

2017-10-09 Thread jaimin 
AMBARI-21690 Updating get_stack_version pattern match (mugdha)

(cherry picked from commit ee87b6ab60edc43ef94a404ae2ab72da42f3549f)

Change-Id: If45e425a0b3e978842c43b1b18b4a4c7ac35c02e


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

Branch: refs/heads/2.5-maint
Commit: 591b4067256021dd9a30ac90bc01faff68263fad
Parents: ad88657
Author: Mugdha Varadkar 
Authored: Thu Aug 10 11:57:28 2017 +0530
Committer: Zuul 
Committed: Thu Aug 10 22:22:52 2017 -0700

--

--

[05/17] ambari git commit: AMBARI-21690 Updating get_stack_version pattern match (mugdha)

2017-08-14 Thread jonathanhurley 
AMBARI-21690 Updating get_stack_version pattern match (mugdha)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: abcf1ce8619bb0459c633f63fc2e2edaa7f04f64
Parents: 601cd7d
Author: Mugdha Varadkar 
Authored: Thu Aug 10 11:57:28 2017 +0530
Committer: Mugdha Varadkar 
Committed: Fri Aug 11 09:59:07 2017 +0530

--
 .../resource_management/libraries/functions/get_stack_version.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/abcf1ce8/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
index 7274a59..463d61f 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
@@ -85,7 +85,7 @@ def get_stack_version(package_name):
 
   stack_version = re.sub(package_name + ' - ', '', stack_output)
   stack_version = stack_version.rstrip()
-  match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+-[0-9]+', stack_version)
+  match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+(-[0-9]+)?', stack_version)
 
   if match is None:
 Logger.info('Failed to get extracted version with ' + stack_selector_path)

ambari git commit: AMBARI-21690 Updating get_stack_version pattern match (mugdha)

2017-08-10 Thread mugdha 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 601cd7dae -> abcf1ce86


AMBARI-21690 Updating get_stack_version pattern match (mugdha)


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

Branch: refs/heads/branch-2.6
Commit: abcf1ce8619bb0459c633f63fc2e2edaa7f04f64
Parents: 601cd7d
Author: Mugdha Varadkar 
Authored: Thu Aug 10 11:57:28 2017 +0530
Committer: Mugdha Varadkar 
Committed: Fri Aug 11 09:59:07 2017 +0530

--
 .../resource_management/libraries/functions/get_stack_version.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/abcf1ce8/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
index 7274a59..463d61f 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
@@ -85,7 +85,7 @@ def get_stack_version(package_name):
 
   stack_version = re.sub(package_name + ' - ', '', stack_output)
   stack_version = stack_version.rstrip()
-  match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+-[0-9]+', stack_version)
+  match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+(-[0-9]+)?', stack_version)
 
   if match is None:
 Logger.info('Failed to get extracted version with ' + stack_selector_path)

ambari git commit: AMBARI-21690 Updating get_stack_version pattern match (mugdha)

2017-08-10 Thread mugdha 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 bf51a82c9 -> ee87b6ab6


AMBARI-21690 Updating get_stack_version pattern match (mugdha)


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

Branch: refs/heads/branch-2.5
Commit: ee87b6ab60edc43ef94a404ae2ab72da42f3549f
Parents: bf51a82
Author: Mugdha Varadkar 
Authored: Thu Aug 10 11:57:28 2017 +0530
Committer: Mugdha Varadkar 
Committed: Fri Aug 11 09:56:53 2017 +0530

--
 .../resource_management/libraries/functions/get_stack_version.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ee87b6ab/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
index 7274a59..463d61f 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
@@ -85,7 +85,7 @@ def get_stack_version(package_name):
 
   stack_version = re.sub(package_name + ' - ', '', stack_output)
   stack_version = stack_version.rstrip()
-  match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+-[0-9]+', stack_version)
+  match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+(-[0-9]+)?', stack_version)
 
   if match is None:
 Logger.info('Failed to get extracted version with ' + stack_selector_path)