cloudstack/engine/orchestration
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
..
src engine: fix NPE from fwd-merge 562a7db8df 2020-08-07 15:31:43 +05:30
pom.xml Updating pom.xml version numbers for release 4.15.0.0-SNAPSHOT 2020-05-23 10:18:39 +01:00