Merge release branch 4.7 to 4.8 * 4.7: CLOUDSTACK-9376: Restrict listTemplates API with filter=all for root admin CLOUDSTACK-9369: Restrict default login to ldap/native users Add lsb-release dependency to mgmt server and agent on Debian/Ubuntu. Emit template UUID and class type over event bus when deleting templates.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/744f9d56 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/744f9d56 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/744f9d56 Branch: refs/heads/master Commit: 744f9d56156455b428f567d634d3c5ae9fe6a94f Parents: 7974bfd 9275ba2 Author: Will Stevens <williamstev...@gmail.com> Authored: Fri May 27 15:03:42 2016 -0400 Committer: Will Stevens <williamstev...@gmail.com> Committed: Fri May 27 15:03:42 2016 -0400 ---------------------------------------------------------------------- api/src/com/cloud/user/DomainService.java | 10 + debian/control | 4 +- server/src/com/cloud/api/ApiServer.java | 16 +- .../auth/DefaultLoginAPIAuthenticatorCmd.java | 13 + .../com/cloud/api/query/QueryManagerImpl.java | 4 +- .../template/HypervisorTemplateAdapter.java | 2 +- .../src/com/cloud/user/DomainManagerImpl.java | 20 ++ .../template/HypervisorTemplateAdapterTest.java | 285 +++++++++++++++++++ .../com/cloud/user/DomainManagerImplTest.java | 137 +++++++++ .../com/cloud/user/MockDomainManagerImpl.java | 5 + test/integration/component/test_templates.py | 76 +++++ test/integration/smoke/test_login.py | 145 ++++++++++ 12 files changed, 701 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
