You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/21 18:47:07 UTC
[1/3] git commit: updated refs/heads/master to d63c74a
Repository: cloudstack
Updated Branches:
refs/heads/master 61073ea51 -> d63c74a7d
CLOUDSTACK-9688: Fix failing smoke tests
Fixes failing smoke tests due to enviroment issues or corner cases:
- Fixes NPE in Template Manager
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6f98fcd3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6f98fcd3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6f98fcd3
Branch: refs/heads/master
Commit: 6f98fcd3a5b1b498a9c1f53e85522282b1cc2b28
Parents: 5e19e64
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Dec 21 11:45:20 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Dec 21 11:45:20 2016 +0530
----------------------------------------------------------------------
server/src/com/cloud/template/TemplateManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f98fcd3/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index ae1a649..7130042 100644
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1740,7 +1740,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
if (sourceTemplateId != null) {
VMTemplateVO sourceTemplate = _tmpltDao.findById(sourceTemplateId);
- if(sourceTemplate != null){
+ if (sourceTemplate != null && sourceTemplate.getDetails() != null) {
details.putAll(sourceTemplate.getDetails());
}
}
[2/3] git commit: updated refs/heads/master to d63c74a
Posted by bh...@apache.org.
Merge pull request #1846 from shapeblue/49smoketest-fixes
CLOUDSTACK-9688: Fix failing smoke testsFixes failing smoke tests due to enviroment issues or corner cases:
- Fixes NPE in Template Manager
@blueorangutan package
* pr/1846:
CLOUDSTACK-9688: Fix failing smoke tests
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f68b6e83
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f68b6e83
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f68b6e83
Branch: refs/heads/master
Commit: f68b6e831221a892f312fac380b39c8b18bc57d5
Parents: 5e19e64 6f98fcd
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 00:16:21 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 00:16:21 2016 +0530
----------------------------------------------------------------------
server/src/com/cloud/template/TemplateManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] git commit: updated refs/heads/master to d63c74a
Posted by bh...@apache.org.
Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d63c74a7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d63c74a7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d63c74a7
Branch: refs/heads/master
Commit: d63c74a7d9a7b63f8ad740289904d3ac8b3dc92c
Parents: 61073ea f68b6e8
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 00:16:41 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 00:16:41 2016 +0530
----------------------------------------------------------------------
server/src/com/cloud/template/TemplateManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------