Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6bb019ab Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6bb019ab Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6bb019ab Branch: refs/heads/master Commit: 6bb019ab632c377652b77e88622764e65567b1c3 Parents: 01ec8e6 7c27bf3 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Fri Dec 9 00:34:26 2016 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Fri Dec 9 00:34:26 2016 +0530 ---------------------------------------------------------------------- .../src/com/cloud/api/query/QueryManagerImpl.java | 17 +++++++++++++++-- .../test_escalation_listTemplateDomainAdmin.py | 2 +- test/integration/component/test_templates.py | 3 +-- 3 files changed, 17 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
