Merge branch 'master' into ui-vpc-redesign
Conflicts:
ui/scripts/vpc.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/59a99848
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/59a99848
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/59a99848
Branch: refs/heads/ui-vpc-redesign
Commit: 59a99848b193836aba06384bda286529feb44693
Parents: cb31791 bfc5887
Author: Brian Federle <[email protected]>
Authored: Wed May 15 10:18:55 2013 -0700
Committer: Brian Federle <[email protected]>
Committed: Wed May 15 10:18:55 2013 -0700
----------------------------------------------------------------------
.../api/command/user/event/DeleteEventsCmd.java | 1 -
docs/en-US/delete-event-alerts.xml | 5 +-
engine/schema/src/com/cloud/dc/dao/VlanDao.java | 2 +
.../schema/src/com/cloud/dc/dao/VlanDaoImpl.java | 15 ++
.../schema/src/com/cloud/domain/dao/DomainDao.java | 9 +-
.../src/com/cloud/domain/dao/DomainDaoImpl.java | 18 ++-
.../schema/src/com/cloud/event/dao/EventDao.java | 2 +-
.../src/com/cloud/event/dao/EventDaoImpl.java | 27 ++--
.../com/cloud/network/vpc/dao/PrivateIpDao.java | 3 +-
.../cloud/network/vpc/dao/PrivateIpDaoImpl.java | 11 ++-
.../schema/src/com/cloud/user/dao/AccountDao.java | 1 +
.../src/com/cloud/user/dao/AccountDaoImpl.java | 19 +++-
.../kvm/resource/LibvirtComputingResource.java | 2 +
.../kvm/storage/LibvirtStorageAdaptor.java | 3 +-
.../xen/resource/CitrixResourceBase.java | 8 +-
.../xen/resource/XenServer56FP1Resource.java | 13 ++-
.../xen/resource/CitrixResourceBaseTest.java | 8 +-
.../network/cisco/CiscoVnmcConnectionImpl.java | 12 +-
.../cloud/network/resource/CiscoVnmcResource.java | 12 +-
.../com/cloud/network/element/MidoNetElement.java | 113 +++++++++------
.../network/guru/MidoNetGuestNetworkGuru.java | 13 ++-
.../network/guru/MidoNetPublicNetworkGuru.java | 9 +-
.../cloud/network/element/MidoNetElementTest.java | 31 +++--
.../xenserver/Add-To-VCPUs-Params-Live.sh | 33 -----
.../xenserver/add_to_vcpus_params_live.sh | 33 +++++
scripts/vm/hypervisor/xenserver/vmops | 4 +-
scripts/vm/hypervisor/xenserver/xcpserver/patch | 1 +
scripts/vm/hypervisor/xenserver/xenserver56/patch | 1 +
.../vm/hypervisor/xenserver/xenserver56fp1/patch | 1 +
scripts/vm/hypervisor/xenserver/xenserver60/patch | 1 +
.../configuration/ConfigurationManagerImpl.java | 10 ++-
.../src/com/cloud/network/NetworkManagerImpl.java | 16 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 53 ++++---
.../router/VirtualNetworkApplianceManagerImpl.java | 38 +++--
.../cloud/network/vpc/NetworkACLServiceImpl.java | 8 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 23 +++-
.../src/com/cloud/server/ManagementServerImpl.java | 24 +++-
.../cloud/uuididentity/dao/IdentityDaoImpl.java | 4 +-
.../com/cloud/event/EventControlsUnitTest.java | 3 +-
server/test/com/cloud/vm/UserVmManagerTest.java | 17 +--
.../test/com/cloud/vpc/NetworkACLServiceTest.java | 2 +-
setup/db/db/schema-410to420.sql | 2 +
tools/marvin/marvin/cloudstackConnection.py | 9 ++
ui/scripts/vpc.js | 16 ++-
44 files changed, 427 insertions(+), 209 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59a99848/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --cc ui/scripts/vpc.js
index 3235cd6,0c4a446..1d6160a
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@@ -101,9 -93,9 +101,9 @@@
}
},
- 'protocolnumber': {label:'Protocol
Number',isDisabled:true,isHidden:true,edit:true},
- 'startport': { edit: true, label: 'label.start.port' , isOptional:true
},
- 'endport': { edit: true, label: 'label.end.port' , isOptional:true},
+ 'protocolnumber': {label:'Protocol Number',edit:true},
- 'startport': { edit: true, label: 'label.start.port' },
- 'endport': { edit: true, label: 'label.end.port' },
++ 'startport': { edit: true, label: 'label.start.port', isOptional: true
},
++ 'endport': { edit: true, label: 'label.end.port', isOptional: true },
'networkid': {
label: 'Select Tier',
select: function(args) {
