etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,101 Commits 321 Branches 325 Tags 941 MiB
Commit Graph

13101 Commits

Author SHA1 Message Date
Mice Xia aebf033358 Fix a bug: zoneWizard uses incorrect vlan parameter to create storage network 2012-08-15 14:03:43 -07:00
Anthony Xu 790f82be04 CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second 2012-08-15 14:01:38 -07:00
Kelven Yang 5bfc43bd50 Apply patch https://reviews.apache.org/r/6552/ 2012-08-15 14:00:17 -07:00
Sheng Yang c2ec3f728e S2S VPN: CS-15998: Fix wrong vpc id in Site2SiteVpnGatewayResponse 2012-08-15 12:15:42 -07:00
Sheng Yang 926ae265b4 S2S VPN: Add db upgrade 2012-08-13 17:47:52 -07:00
Alena Prokharchyk 7c47f3cb97 VPC: CS-15805 - guest cidr should be RFC1918 complient 2012-08-13 17:12:32 -07:00
Alena Prokharchyk 7120ce0717 Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2) 2012-08-13 16:50:06 -07:00
Alena Prokharchyk 62526a715a Fixed unitest 2012-08-13 16:20:09 -07:00
Alena Prokharchyk 4433c5a51a Database upgrade from 302 to 40 2012-08-13 16:20:09 -07:00
Jessica Wang cc2dec9fe1 cloudstack 3.0 UI - network page - LB listing - VM listing - VM name - no need to choose between id, displayname, name property in VM object. Always use displayname property in VM object. This also fixes a bug that VM name did not show right after an VM was assigned to a LB rule. 2012-08-13 16:09:06 -07:00
Jessica Wang 9a8089e02c cloudstack 3.0 UI - network page - LB listing - comment out obsolete unused code. 2012-08-13 14:46:02 -07:00
Alena Prokharchyk 71ead9ef4e VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-08-13 14:03:39 -07:00
Pranav Saxena dabb827922 CS-15961:InterVlan Box for Creation of ACL Rules on ICMP Protocol should convey User the default value and Tooltip description for ICMP Type and Code 2012-08-14 01:52:00 +05:30
Pranav Saxena 4da87bd9dd Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-08-14 01:16:50 +05:30
Pranav Saxena 6de089810d CS-15962: Inter VLAN Virtual router tab development under VPC section 2012-08-14 01:16:11 +05:30
Jessica Wang e002dd0998 CS-15957: cloudstack 3.0 UI - VPC - private gateway - if not root-admin, show private gateway listView instead of create private gateway dialog because only root-admin is allowed to create private gateway. 2012-08-13 12:45:50 -07:00
Brian Federle 9bf7d757e8 multiEdit: Support default value and description 
-If 'defaultValue' is specified for a text field, then put that value
 into the text field on load.

-If 'desc' is specified for any field, then use it as a 'title'
 attribute to show a tooltip description.

Example:

      'icmptype': {
        ...
        defaultValue: '-1',
        desc: 'Please specify -1 if you want to allow all'
        ...
      }
 2012-08-13 12:16:43 -07:00
Alena Prokharchyk e74969fdec VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan 
Conflicts:

	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-08-13 11:55:34 -07:00
Brian Federle 55e224f56d CS-15958: Fix ACL select box 
Give fixed width to ACL tier select box, to prevent overflow with long
network names
 2012-08-13 11:04:38 -07:00
Brian Federle 41a383f0f9 CS-15877: Fix static routes 
Fix static routes not being shown when viewed as a domain admin
 2012-08-13 10:56:59 -07:00
Sheng Yang 48b46fce5c S2S VPN: Fix db schema issue 2012-08-13 10:26:34 -07:00
Chip Childers ba61d7e027 Patch from Joe Brockmeier: Add Apache license to last of the files under doc 2012-08-13 11:35:51 -04:00
Chip Childers 97fe053e2e Removed ASF license header from network.conf, because XCP doesn't respect comment lines in this file 2012-08-13 11:12:01 -04:00
Chip Childers 7d5be64a58 Patch from Joe Brockmeier: Add license headers to u-named files, fix DTDs, etc. 2012-08-13 10:38:47 -04:00
Chip Childers f572bccc61 Patch from Joe Brockmeier: Fixes docs v, w, x, z 2012-08-13 10:08:45 -04:00
tomoe@midokura.jp ce12d0d70d Submit Midokura SDN controller stubs 2012-08-13 18:55:11 +05:30
Chip Childers 2c9e9eef0a Changed location where we set the root password in a devcloud build 2012-08-13 09:13:01 -04:00
Murali Reddy 1eec6fa262 fix to stop building plug-ins from the build-opensource target. 
All plug-ins get built-by target build-plugin. Only build-all depeneds on build-plugins target.
 2012-08-13 18:23:49 +05:30
Prasanna Santhanam 4161cea5df CS-15833: PrepareForMigrationCommand extends Command 
PrepareForMigrationCommand which was extending StartCommand wrongly now
extends the base Command only.

Signed-off-by: Prasanna Santhanam <Prasanna.Santhanam@citrix.com>
 2012-08-13 16:23:16 +05:30
Nitin Mehta a50cf618ec bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code. 2012-08-13 16:20:57 +05:30
Pranav Saxena 94d8eb71fb ACL restructuring label renaming 2012-08-13 14:29:21 +05:30
Pranav Saxena f285ce4ef0 ACL restructuring UI changes 2012-08-13 14:22:32 +05:30
Pranav Saxena caece12823 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-08-13 13:12:38 +05:30
Pranav Saxena 531cfa76f4 CS-15960:InterVlan - UI - Network-VPC view should list the status of the VPCs 2012-08-13 13:11:54 +05:30
Mice Xia 00b2a8040b Remove @author tag from non third-party source files in agent-simulator, cloud-cli, test, ui and utils folder 2012-08-13 15:30:42 +08:00
Mice Xia b25122bd4d Remove @author tag from non third-party source files in console-proxy folder and repalce tab indention with 4 spaces 2012-08-13 15:26:03 +08:00
Mice Xia 89015cbf3c Remove @author tag from non third-party source files in core folder 2012-08-13 15:20:10 +08:00
Mice Xia 42fbf24f86 Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
Mice Xia 17304b3910 Remove @author tag from non third-party source files in api folder 2012-08-13 15:17:22 +08:00
Mice Xia 3eda2b8c4b Remove @author tag from non third-party source files in plugins folder 2012-08-13 15:04:30 +08:00
Mice Xia 1894fb56cf Remove @author tag from non third-party source files in awsapi folder 2012-08-13 14:59:31 +08:00
Pranav Saxena 5111fee70c CS-15959:InterVlan - UI - Name Label changes required for Add VPC box parameters 2012-08-13 12:00:25 +05:30
anthony bf1123246a VPC : typo in CreateNetworkACLCmd.java 2012-08-12 11:00:16 -07:00
anthony 822cf3c9ee VPC : typo in FirewallRuleVO 2012-08-12 10:55:21 -07:00
Alena Prokharchyk 32f55f3e3c Merge branch 'master' into vpc 2012-08-12 10:22:54 -07:00
Koushik Das ff773a8122 CS-15621: Using migrateVolumes method which does not perform input validation. Some input validation in the migrateVolume method prevented migration of volume in READY state. Also using volume disk offering to check if it is a local or shared one. 
Verified on XS 6.0.2

Test scenario
- Created 2 shared primary storage pools
- Created data volume using shared disk offering
- Attached it to a running VM (created in one storage pool)
- Detached it (now it is in READY state)
- Created a new VM in stopped state (using deployVirtualMachine API with startVm=false)
- Attached the data volume to this new VM
- Started new VM (migrated volume scenario got hit when the planner assigned the other shared pool)
 2012-08-12 17:05:28 +05:30
Koushik Das 9adf91f7b9 CS-15879 Removed safe update flag as it is a client only setting 2012-08-12 16:34:02 +05:30
Alena Prokharchyk b61468d65c Merge branch 'master' into vpc 
Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 2012-08-11 18:27:18 -07:00
Wido den Hollander 6e33102df7 docs: Update Operating System requirements management server 2012-08-11 23:12:33 +02:00
Wido den Hollander dcfa5a50b7 docs: Fix indentation according to coding convention 
The coding convention requires:
* 4 spaces, no tabs
* Unix line endings
 2012-08-11 22:43:26 +02:00