Merge release branch 4.7 to master * 4.7: Implement CheckHealthCommand for NSX controllers Fix log message that refers to agent, not host Prevent NullPointerException when host does not belong to a pod
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b8c464e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b8c464e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b8c464e Branch: refs/heads/master Commit: 1b8c464e6b224bc50e749ba8b3170d19816e3e1c Parents: 24818af a767407 Author: Remi Bergsma <[email protected]> Authored: Sat Jan 16 21:38:28 2016 +0100 Committer: Remi Bergsma <[email protected]> Committed: Sat Jan 16 21:38:28 2016 +0100 ---------------------------------------------------------------------- .../cloud/agent/manager/AgentManagerImpl.java | 142 +++++++++---------- .../NiciraCheckHealthCommandWrapper.java | 63 ++++++++ .../NiciraCheckHealthCommandWrapperTest.java | 80 +++++++++++ 3 files changed, 214 insertions(+), 71 deletions(-) ----------------------------------------------------------------------
