Merge branch 'master' into ui-vpc-redesign
Conflicts:
ui/modules/modules.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ac67b85
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ac67b85
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ac67b85
Branch: refs/heads/ui-vpc-redesign
Commit: 9ac67b85461dd74477cec9a7d9e1b13aef19b052
Parents: 9be3660 35164fd
Author: Brian Federle <[email protected]>
Authored: Mon May 13 11:12:32 2013 -0700
Committer: Brian Federle <[email protected]>
Committed: Mon May 13 11:12:32 2013 -0700
----------------------------------------------------------------------
tools/apidoc/gen_toc.py | 1 +
ui/modules/infrastructure/infrastructure.js | 75 ++++
ui/modules/modules.js | 3 +
ui/modules/vnmcAsa1000v/vnmcAsa1000v.js | 183 ++++++++
.../vnmcNetworkProvider/vnmcNetworkProvider.js | 333 +++++++++++++++
ui/scripts/system.js | 8 +
6 files changed, 603 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ac67b85/ui/modules/modules.js
----------------------------------------------------------------------
diff --cc ui/modules/modules.js
index ee553fd,d4502a1..32c135e
--- a/ui/modules/modules.js
+++ b/ui/modules/modules.js
@@@ -16,6 -16,8 +16,9 @@@
// under the License.
(function($, cloudStack) {
cloudStack.modules = [
+ 'vpc'
+ 'infrastructure',
+ 'vnmcNetworkProvider',
+ 'vnmcAsa1000v'
];
}(jQuery, cloudStack));