Merge branch '4.8' into 4.9
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b931b798 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b931b798 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b931b798 Branch: refs/heads/4.9 Commit: b931b798f8909f01f3cde7b9354c583132c662dd Parents: f03015b f8c9f45 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Fri Dec 9 13:32:21 2016 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Fri Dec 9 13:32:21 2016 +0530 ---------------------------------------------------------------------- test/integration/component/test_templates.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
