Merge pull request #1834 from Accelerite/CLOUDSTACK-9679

CLOUDSTACK-9679:Allow master user to manage subordinate user uploaded template

* pr/1834:
  CLOUDSTACK-9679:Allow master user to manage subordinate user uploaded template

Signed-off-by: Rajani Karuturi <rajani.karut...@accelerite.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/238046fd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/238046fd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/238046fd

Branch: refs/heads/master
Commit: 238046fdaae4b7e491e1c4f9c03b6f454ca43ede
Parents: c3c9b8f 87849c3
Author: Rajani Karuturi <rajani.karut...@accelerite.com>
Authored: Thu Feb 16 15:43:41 2017 +0530
Committer: Rajani Karuturi <rajani.karut...@accelerite.com>
Committed: Thu Feb 16 15:43:41 2017 +0530

----------------------------------------------------------------------
 server/src/com/cloud/api/query/QueryManagerImpl.java | 9 +++++++--
 ui/scripts/templates.js                              | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/238046fd/ui/scripts/templates.js
----------------------------------------------------------------------
diff --cc ui/scripts/templates.js
index 5d52dfd,204687a..09d797d
mode 100755,100644..100755
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js

Reply via email to