etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/engine
History
Rohit Yadav 7707d3fd92 engine: fix NPE from fwd-merge 562a7db8df 
This fixes NPE caused due to merge conflict fix from the forward merge
commit 562a7db8df and fixes travis test
regression:

    === TestName: test_01_reset_vm_on_reboot | Status : SUCCESS ===

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 		2020-08-07 15:31:43 +05:30
..
api Merge remote-tracking branch 'origin/4.14' 2020-08-05 23:59:16 +05:30
components-api Merge remote-tracking branch 'origin/4.14' 2020-07-07 12:53:05 +05:30
network Updating pom.xml version numbers for release 4.15.0.0-SNAPSHOT 2020-05-23 10:18:39 +01:00
orchestration engine: fix NPE from fwd-merge 562a7db8df 2020-08-07 15:31:43 +05:30
schema Merge remote-tracking branch 'origin/4.14' 2020-08-04 11:28:43 +05:30
service Updating pom.xml version numbers for release 4.15.0.0-SNAPSHOT 2020-05-23 10:18:39 +01:00
storage Merge branch '4.14' 2020-07-18 14:17:43 -03:00
pom.xml Updating pom.xml version numbers for release 4.15.0.0-SNAPSHOT 2020-05-23 10:18:39 +01:00