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

13206 Commits

Author SHA1 Message Date
Prachi Damle 511e3cb235 [ASFCS40]CS-15373: Awsapi port change to 7080. 
Reviewed-By: Frank

Changes:
- Changes to deploy awsapi in separate webapps folder and listeining on 7080 port
- Revert changes which were done to open 7080 on CloudStack

Conflicts:

	awsapi/conf/cloud-bridge.properties
	client/tomcatconf/server-ssl.xml.in
 2012-08-21 16:27:55 -07:00
Prachi Damle 4bffd71d71 [ASFCS40]Db upgrade: merging changes from 303->304 upgrade to 3.0.2 -> 4.0 on master branch. 2012-08-21 16:27:54 -07:00
Alena Prokharchyk cd0004bb86 CS-16111 - DB upgrade; fixed foreign keys names 2012-08-21 15:38:17 -07:00
Alena Prokharchyk e252de4999 PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address 
Reviewed-by: Frank Zhang

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-21 15:35:40 -07:00
Alena Prokharchyk 2bf5c99bc6 CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed 
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-08-21 15:31:07 -07:00
Alena Prokharchyk 7d0ad98c93 More logging to lock operations on the network 2012-08-21 15:25:17 -07:00
Alena Prokharchyk 14dd3f07d7 Fixed line endings in VirtualNetworkApplianceManagerImpl 2012-08-21 15:24:44 -07:00
Brian Federle aa5aa30b44 Split JSP into 2 files 
Due to file size limit being reached on index.jsp, move dictionary JS
into separate file, dictionary.jsp

reviewed-by: Jessica Wang
 2012-08-21 13:43:30 -07:00
Brian Federle 5d94a8de8c VPC UI: Network ACL: Only show 'acl' tab on detail view 
reviewed-by: jessica
 2012-08-21 13:12:52 -07:00
Pranav Saxena b7f920b4c0 CS-16018:Resources tab not displaying the Resource limits in both in default view as well as projects view 2012-08-22 01:38:10 +05:30
Kelven Yang 3113f32f25 Commit for https://reviews.apache.org/r/6701/ 2012-08-21 11:55:06 -07:00
Brian Federle 93834ea6c6 CS-16007: Show tier name (associated network name) in place of VM name 
reviewed-by: jessica
 2012-08-21 11:33:03 -07:00
Brian Federle 3f8d9f6b1f VPC UI: Add hover state to virtual router box 2012-08-21 11:22:50 -07:00
Chip Childers 685e59b73d Added a more licensing info. 2012-08-21 13:34:20 -04:00
David Nalley ce54bfa7fa no idea why this config file keeps disappearing 2012-08-21 12:17:40 -04:00
Wido den Hollander 50ca603d04 debian: Protect agent and management configuration from being overwritten 
By adding these files to the *.conffiles file we prevent them from being overwritten by dpkg.

We don't want to overwrite these files, since they can contain very specific information regarding the setup.
 2012-08-21 14:57:26 +02:00
Pranav Saxena 568cc88c20 CS-15898:Change drop down options in vm tier for vpc 2012-08-21 15:51:41 +05:30
Nitin Mehta 7aa7d6e39f CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swift_id to go and download the snapshot from the swift. 
Reviewed-by: Kishan
 2012-08-21 13:46:18 +05:30
Sheng Yang 20ccb6c1cb S2S VPN: CS-16092: Add ESP rule to iptables 
Otherwise the other end cannot initiate connection.
 2012-08-20 17:28:46 -07:00
Brian Federle aa64dc5fdf Instance wizard: add VPC drop-down 
Select VPC drop-down was missing previously from the instance wizard,
add network step. This re-adds it.
 2012-08-20 15:16:06 -07:00
Wido den Hollander 48227b972a docs: Add network and firewall configuration for Hypervisor 2012-08-21 00:10:31 +02:00
Wido den Hollander 677204798c docs: Use language="Bash" for statements of execution. 
This seems to be the way with Publican and also makes C/P easier
 2012-08-21 00:10:31 +02:00
Brian Federle 7d934d1039 CS-16085: Fix networks checkboxes 
When both VPC and isolated networks are present, fix case where
unchecking first isolated networks triggers checkbox for VPC tier
network, thus making it appear as if no network is selected.

reviewed-by: jessica
 2012-08-20 15:00:44 -07:00
Chip Childers 5c924feba3 Added OpenStack Swift client and Google GSON complier to the license file. 2012-08-20 15:16:32 -04:00
David Nalley 8150098372 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-08-20 15:12:14 -04:00
David Nalley ec1e3058e9 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-08-20 15:10:59 -04:00
Chip Childers b77e26a9b1 Patch from Adam Grochowski: errorchecking for basebox build 2012-08-20 15:10:08 -04:00
Brian Federle ad2b8d7579 CS-16044: Zone wizard: Add 'use local storage' checkbox 
Add checkbox to zone wizard indicating whether zone will use local
storage. If checked, bypass add primary storage step and enable local
storage for zone on creation.

Conflicts:
	ui/index.jsp
 2012-08-20 11:36:57 -07:00
Chip Childers 991795bcc4 Correcting the gcc.sh license header from Citrix to ASF 2012-08-20 14:29:14 -04:00
Edison Su 5a1c2dad87 CS-15734 KVM Snapshots show incorrect disk usage. 
Changed the code to show virtual size (allocated size).
RB: https://reviews.apache.org/r/6699/
Send-by: saksham.srivastava@citrix.com
 2012-08-20 11:22:41 -07:00
David Nalley 16437df9bd commenting out the copy statement for mysql-connector-java so the test doesn't break 2012-08-20 14:19:37 -04:00
Edison Su 481aae1ebc add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -07:00
Brian Federle ba2b0c3974 CS-16050: Pass listAll=true to listTags API call, if admin 2012-08-20 10:40:37 -07:00
David Nalley ac9dee94ac fix from Pradeep Soundararajan for removing build dependency on mysql-connector-java https://reviews.apache.org/r/6180 2012-08-20 13:38:19 -04:00
Chip Childers aecaee2d17 Added license header back into the descriptor.xml file 2012-08-20 11:33:45 -04:00
Chip Childers 754d965fc9 Added license file tracking reference for the jQuery copy living in the console-proxy folder. 2012-08-20 11:27:50 -04:00
Chip Childers da45ae1150 Fixing license headers in the python folder 2012-08-20 11:23:41 -04:00
Chip Childers 1035da12ec Added jquery related license and notice information to the project 2012-08-20 11:18:58 -04:00
Hugo Trippaers c657962ece Small fix to add these files to the rpm, this was breaking the waf rpm build (ported from 4.0 branch) 2012-08-20 14:13:25 +02:00
Sheng Yang 86d49e7aa0 CS-16060: Firewall service should be excluded from conserve mode checking 2012-08-17 17:05:04 -07:00
Sheng Yang a8efbcda58 S2S VPN: Fix license headers 2012-08-17 16:52:06 -07:00
Sheng Yang 6ec5bdbab6 S2S VPN: CS-16035: Add missing global configuration items 2012-08-17 16:52:06 -07:00
Sheng Yang 1cfcefd2fb CS-16043: Using network based router rather than account for RVR detection 2012-08-17 16:52:06 -07:00
Sheng Yang ea6f3eb6f9 CS-14253: Apply IP when firewall rule is in place 2012-08-17 16:52:06 -07:00
Sheng Yang 4cb7a100c6 Revert "bug 14484: Apply existed firewall rules when associating IP" 
This reverts commit b409615a32.

In order to fix CS-15503. Fix of bug 14484(CS-14253) would be applied later.
 2012-08-17 16:52:06 -07:00
Chip Childers bc06fc07be Updated LICENSE header with a few more dependencies. 2012-08-17 16:40:46 -04:00
Edison Su 87378c3f3a add db upgrade for ha.workers 2012-08-17 13:15:49 -07:00
Edison Su 9059740dc1 HA worker thread needs to have its own worker thread configuration 2012-08-17 12:59:52 -07:00
Chip Childers 8c19caebf9 First pass of LICENSE and NOTICE files, along with the whisker descriptor.xml file that I'm using locally 2012-08-17 15:04:24 -04:00
Chip Childers 8eb11c0453 Latest license file 2012-08-17 15:04:24 -04:00