Merge branch 'bugfix/CID-1230585'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ae4d4981 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ae4d4981 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ae4d4981 Branch: refs/heads/master Commit: ae4d49810e16081e65949a5bb959a139c92dacdd Parents: 9d7b851 d2aa1c4 Author: Hugo Trippaers <htrippa...@schubergphilis.com> Authored: Wed Aug 13 08:41:55 2014 +0200 Committer: Hugo Trippaers <htrippa...@schubergphilis.com> Committed: Wed Aug 13 08:41:55 2014 +0200 ---------------------------------------------------------------------- core/src/com/cloud/resource/ServerResourceBase.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
