Merge branch 'bugfix/CS-7665'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d46251fa Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d46251fa Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d46251fa Branch: refs/heads/master Commit: d46251fab654540f9ec59686eaed58adc3deded8 Parents: fe325ab 47ac3e4 Author: Hugo Trippaers <[email protected]> Authored: Thu Oct 2 09:59:08 2014 +0200 Committer: Hugo Trippaers <[email protected]> Committed: Thu Oct 2 09:59:08 2014 +0200 ---------------------------------------------------------------------- .../storage/image/TemplateServiceImpl.java | 29 ++++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
