Merge branch 'bugfix/CID-1254835'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/302d5195 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/302d5195 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/302d5195 Branch: refs/heads/master Commit: 302d5195d4a1205d3364cad236039c2dc76027c2 Parents: fe0168f ef30300 Author: Hugo Trippaers <htrippa...@schubergphilis.com> Authored: Tue Nov 18 14:31:33 2014 +0100 Committer: Hugo Trippaers <htrippa...@schubergphilis.com> Committed: Tue Nov 18 14:31:33 2014 +0100 ---------------------------------------------------------------------- .../cloud/alert/ConsoleProxyAlertAdapter.java | 103 +++++++++--------- .../alert/SecondaryStorageVmAlertAdapter.java | 105 ++++++++++--------- 2 files changed, 109 insertions(+), 99 deletions(-) ----------------------------------------------------------------------
