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/7c27bf3c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c27bf3c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c27bf3c Branch: refs/heads/master Commit: 7c27bf3c90e0b664840eb00110fb98cee39cb06f Parents: 80724b0 8769597 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Fri Dec 9 00:33:46 2016 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Fri Dec 9 00:33:46 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c27bf3c/server/src/com/cloud/api/query/QueryManagerImpl.java ----------------------------------------------------------------------
