Merge branch 'master' into ui-vpc-redesign
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d019359d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d019359d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d019359d Branch: refs/heads/master Commit: d019359d59a3b6bb017045727fd21c21d60bad1b Parents: 3c2be57 0a44369 Author: Brian Federle <bfede...@gmail.com> Authored: Tue May 21 16:02:12 2013 -0700 Committer: Brian Federle <bfede...@gmail.com> Committed: Tue May 21 16:02:12 2013 -0700 ---------------------------------------------------------------------- .../router/VirtualNetworkApplianceManagerImpl.java | 2 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- .../internalLbProvider/internalLbProvider.js | 182 +++++++++++++++ ui/modules/modules.js | 3 +- 4 files changed, 186 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d019359d/ui/modules/modules.js ---------------------------------------------------------------------- diff --cc ui/modules/modules.js index 1e4cd45,3170122..1ff69ef --- a/ui/modules/modules.js +++ b/ui/modules/modules.js @@@ -16,9 -16,9 +16,10 @@@ // under the License. (function($, cloudStack) { cloudStack.modules = [ + 'vpc', 'infrastructure', 'vnmcNetworkProvider', - 'vnmcAsa1000v' + 'vnmcAsa1000v', + 'internalLbProvider' ]; }(jQuery, cloudStack));
