Merge remote-tracking branch 'remotes/origin/ui-granular-settings'

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

Branch: refs/heads/vmware-datamodel
Commit: 6e2ecff4f541d8295a27b1e2565b6cbde2ed89dd
Parents: 326bac7 c1de600
Author: Pranav Saxena <[email protected]>
Authored: Thu May 2 17:31:22 2013 +0530
Committer: Pranav Saxena <[email protected]>
Committed: Thu May 2 17:31:22 2013 +0530

----------------------------------------------------------------------
 ui/index.jsp                             |    1 +
 ui/scripts/accounts.js                   |   22 ++++++
 ui/scripts/system.js                     |   86 +++++++++++++++++++++++++
 ui/scripts/ui-custom/granularSettings.js |   46 +++++++++++++
 4 files changed, 155 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


Reply via email to