[3/3] git commit: updated refs/heads/master to 99059e2

[ra...@apache.org]

Merge pull request #909 from DaanHoogland/RESMO-CLOUDSTACK-8848

CLOUDSTACK-8848 ensure power state is up to date for missing PowerState handlingadded a null guard to @resmo's #885 A unit test or two would be nice as well but as this is a blocker I want to get it to review asap.
@koushik-das @wilderrodrigues @anshul1886 @karuturi @remibergsma you all commented on the original, please have a look. @bhaisaab welcome to comment as well.

* pr/909:
  CLOUDSTACK-8848: added null pointer guard to new public method
  CLOUDSTACK-8848: ensure power state is up to date when handling missing VMs in powerReport

Signed-off-by: Rajani Karuturi <ra...@citrix.com>


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

Branch: refs/heads/master
Commit: 99059e2212833a13428bef93195e31a2641c644e
Parents: 78f7429 b128e56
Author: Rajani Karuturi <ra...@citrix.com>
Authored: Mon Oct 5 11:36:13 2015 +0530
Committer: Rajani Karuturi <ra...@citrix.com>
Committed: Mon Oct 5 11:36:15 2015 +0530

----------------------------------------------------------------------
 .../cloud/vm/VirtualMachinePowerStateSyncImpl.java  | 16 ++++++++++++++--
 .../schema/src/com/cloud/vm/dao/VMInstanceDao.java  |  2 ++
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java     |  9 +++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------