apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,857 Commits 304 Branches 324 Tags
Commit Graph

12857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alena Prokharchyk
5a72044dc7 Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
Alena Prokharchyk
237d91d4c9 Removed @author tags in some classes 2012-08-03 14:25:17 -07:00
Alena Prokharchyk
3496a73878 VPC: CS-15812 - fixed listVPCs by projectId 2012-08-03 14:23:56 -07:00
Alena Prokharchyk
e7a1862867 VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java
 2012-08-03 14:23:45 -07:00
Alena Prokharchyk
6eba8a818a VPC: applyStaticRoutes - don't exclude static routes in Revoke state 2012-08-03 14:15:50 -07:00
anthony
e9a7495952 remove vhd-tools directory 2012-08-03 13:33:29 -07:00
Jessica Wang
6aee5f2aef cloudstack 3.0 UI - site to site VPN - VPN customer gateway - implement Edit mode. 
Conflicts:

	ui/scripts/network.js
 2012-08-03 13:24:34 -07:00
Chip Childers
e8f10b74a8 Devcloud build process fixes. 2012-08-03 16:21:05 -04:00
Brian Federle
9697860938 CS-15842: VPC gateway create form: Put 'VLAN' field at the top 2012-08-03 12:29:53 -07:00
Brian Federle
26a4132b11 CS-15841: Better add VPC gateway flow 
- Because only 1 gateway can exist per VPC, remove 'add' button from
  list view and immediately show create form on click if no gateway is
  present; show list view on successful creation. If there is a
  gateway, go to list view immediately.

- Rename "Gateways" -> "Private Gateway"
 2012-08-03 12:26:34 -07:00
Brian Federle
75242b49ce VPC details: Display 'restart required' field 2012-08-03 12:03:57 -07:00
Chip Childers
6f833d2414 License header updates for misc files 2012-08-03 14:51:41 -04:00
Brian Federle
5cb356024f CS-15802: Add VPC filter to instance wizard network select 
Adds drop-down select to filter networks by VPC.

-If no VPC is selected, only show non-VPC isolated networks

-If VPC is selected, show tiers from specified VPC. Note that only one
 tier/network can be checked at a time in this mode, and 'add network'
 text field is hidden
 2012-08-03 11:42:40 -07:00
Chip Childers
a0e815df46 License header updates for the vmware-base folder 2012-08-03 14:36:43 -04:00
Chip Childers
46e6482fc0 License header updates for the top level folder 2012-08-03 14:33:32 -04:00
Chip Childers
95ce55f0a1 License header updates for the utils folder 2012-08-03 14:15:09 -04:00
Brian Federle
20b0790753 CS-15809: Show account/domain fields on VPC detail view 
Conflicts:
	ui/scripts/network.js
 2012-08-03 11:13:32 -07:00
Brian Federle
7fb1e13957 CS-15793: Fix static NAT select when in a VPC network 
Conflicts:
	ui/scripts/network.js
 2012-08-03 11:07:06 -07:00
Chip Childers
1ba95ec373 License header updates for the usage folder. 2012-08-03 13:45:22 -04:00
Chip Childers
7998362b18 License header updates for the UI folder 2012-08-03 12:45:47 -04:00
Chip Childers
703a4e8dd1 License header updates for the tools folder. 2012-08-03 12:06:56 -04:00
Chip Childers
58c5a3b6b3 Corrected URL params in build_vagrant_basebox.sh. 2012-08-03 11:08:04 -04:00
Chip Childers
ad79ee9f26 License header updates for the test folder. 2012-08-03 10:39:05 -04:00
Chip Childers
2930eef00c License header updates for the setup folder. 2012-08-03 09:49:02 -04:00
Chip Childers
78764c8b6e License header updates for the server folder. 2012-08-03 09:41:27 -04:00
Chip Childers
09bdd3b6c3 License header updates for the scripts folder. 2012-08-03 09:38:28 -04:00
Chip Childers
955d91e51b License header updates for the python folder. 2012-08-03 09:27:08 -04:00
Chip Childers
3a882fa17c License header updates for the plugins folder. 2012-08-03 09:07:43 -04:00
Nitin Mehta
3c68f1f8e8 bug CS-15200: Introducing state transition when volume is getting copied from secondary storage and it is put into Creating state 
Reviewed-by: Kishan
 2012-08-03 17:18:13 +05:30
Prasanna Santhanam
6fd6d797b2 Implementing Migration and Maintenance for simulator hosts [Part 2] 2012-08-03 15:56:12 +05:30
Prasanna Santhanam
87bcd8e116 Implementing Migration and Maintenance mode for the simulator 2012-08-03 15:55:01 +05:30
Pranav Saxena
20407ec863 CS-15793:Enable static NAT for the public IP address screen is not showing VMs 2012-08-03 15:54:10 +05:30
anthony
9b43753399 VPC : handle Revoke rules for staticroute 2012-08-02 18:59:49 -07:00
anthony
0c9d5f5eb1 VPC : typo 2012-08-02 18:59:48 -07:00
Alena Prokharchyk
bda8fc1e0c Fixed api doc 2012-08-02 18:49:42 -07:00
Alena Prokharchyk
0e0b75a041 Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
 2012-08-02 18:45:37 -07:00
Alena Prokharchyk
befd6dd0c6 listVirtualMachines: implemented search by templateId/isoId 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/ListVMsCmd.java
 2012-08-02 18:15:13 -07:00
Alena Prokharchyk
d6df2fdc64 VPC: createPrivateGateway - added cleanup part happening in case when the gateway fails to be applied on the backend 
Conflicts:

	api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
	api/src/com/cloud/api/response/AsyncJobResponse.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-02 18:12:19 -07:00
Alena Prokharchyk
0588c9748c VPC: CS-15818 - don't allow having ICMP networkACLs with the same cidr and icmpType=-1 for rule1 and icmpType!=-1 for rule 2 as the rule1 covers rule2 in this case 
Conflicts:

	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	utils/src/com/cloud/utils/net/NetUtils.java
 2012-08-02 18:09:10 -07:00
Alena Prokharchyk
39485a4a56 VPC: CS-15821 - corrected mac address format for vpc private network 2012-08-02 18:07:15 -07:00
Chip Childers
c35153cefd Patch from Joe Brockmeier - Adding Apache license, DTD fixes, &product; 
entity and other misc fixes to d-named files under /doc.
 2012-08-02 19:44:45 -04:00
Jessica Wang
25b75c1bff cloudstack 3.0 UI - site to site VPN - (1) implement Add VPN connection action in VPN connection listView. (2) remove Add VPN connection action from VPN customer gateway detailView. 2012-08-02 16:01:34 -07:00
Jessica Wang
47f309af6d cloudstack 3.0 UI - site to site VPN - VPN customer gateway - add name field. 2012-08-02 15:30:15 -07:00
Pranav Saxena
95b6a5eeda CS-15807 :Network label for OVM support on UI : Reviewed-By - Brian Federle 2012-08-03 03:18:26 +05:30
Brian Federle
c12734eab6 CS-15798: Support editing of VPC resource limits 2012-08-02 14:22:45 -07:00
Wido den Hollander
1276aedd35 rbd: Remove debug line 
This is no longer needed. It was here for testing purposes, but it was actually a bug in libvirt which has been resolved.
 2012-08-02 23:05:00 +02:00
Chip Childers
d4be261f63 Patch from Joe Brockmeier - Adding Apache license headers, fixed DTD, 
added &PRODUCT; entity in place of CloudPlatform/CloudStack.
 2012-08-02 16:10:51 -04:00
Chip Childers
81be063882 Patch from Joe Brockmeier - Adding Apache license headers to all b*xml files, fixing 
the DTD to remove local C:/ drive reference, adding &product; entity to
replace CloudPlatform. Also some misc fixes.
 2012-08-02 16:05:41 -04:00
Chip Childers
0d339c94fb Patch from Joe Brockmeier - Adding Apache license headers to all a*xml A*xml files, fixing the DTD to remove local C:/ drive reference, adding &product; entity to replace CloudPlatform. Also some misc fixes. 2012-08-02 16:00:27 -04:00
Chip Childers
6747df6d32 Added devcloudbase provisioning logic 2012-08-02 15:58:32 -04:00