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

472 Commits

Author SHA1 Message Date
Alex Huang db9cc97ab3 Brought over new changes from master 2012-09-13 11:43:22 -07:00
Manikanta Kattamuri cfc2b85651 Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-09-13 14:18:14 -04:00
Mice Xia 55bcfaf805 CLOUDSTACK-88 Cannot listVM by vpcId which is required by VPC UI 2012-09-13 11:21:11 +08:00
Mice Xia c86711a5a9 CLOUDSTACK-69 Hibernate jars should be removed 2012-09-11 17:37:10 -07:00
Mice Xia 0d02e33d31 CLOUDSTACK-69 Hibernate jars should be removed 2012-09-10 21:15:35 +08:00
Alex Huang 1d0a10c69e Merged master over to javelin to get new poms and maven build 2012-09-05 14:31:24 -07:00
Alex Huang e41cb9ff74 More changes 2012-09-05 13:39:32 -07:00
Rajesh Battala 39aa7d86af Moved Awsapi (EC2/S3) from Hibernate framework to CloudStack Generic Dao Framework 
Created/Modified new VO's and Dao Impl classes to use Generic Dao Framework
 2012-08-31 11:44:58 -07:00
Alex Huang 28982486e7 New String Util 2012-08-30 18:56:35 -07:00
Alex Huang b9ddcf8cfe Started an object model for the orchestration platform 2012-08-30 15:54:33 -07:00
Alex Huang 6309253de1 Deleted some useless files 2012-08-30 09:59:25 -07:00
Hugo Trippaers a6be8c76c3 Reverting part of commit ff7c964a66 (Add 
ability to do jetty:run in eclipse). This change breaks the ability to
upload scripts to XenServer (and possibly other places). Needs some
investigation before enabling this again.
 2012-08-30 16:10:28 +02:00
Kelven Yang 2300310243 Messaging facility initials for new architecture 2012-08-28 17:58:45 -07:00
Darren Shepherd ff7c964a66 Add ability to do jetty:run in eclipse 2012-08-28 09:16:44 -07:00
Darren Shepherd 43e4de429e Fix up some dependencies 2012-08-28 09:03:25 -07:00
Darren Shepherd 590f52df82 Include some missing resources in the jars 2012-08-28 08:59:20 -07:00
olivier lamy 40f9d84ea9 versions defined in parent pom 2012-08-27 21:54:27 +02:00
olivier lamy a06ed5728c remove intermediate parent poms 2012-08-27 16:43:24 +02:00
olivier lamy 3aa469da2a groupdId is now org.apache.cloudstack 2012-08-25 09:20:21 +02:00
olivier lamy 5ef60aceb1 %s/tab/ws/ 2012-08-25 00:03:23 +02:00
Darren Shepherd 4a4007e652 Add license 2012-08-24 11:18:54 -07:00
Darren Shepherd ebc0fa458a * Maven 3 support 
* Pretty Format POM's
* AWS API compiles now
 2012-08-24 11:18:54 -07:00
Darren Shepherd f826971fea Maven config, initial commit 2012-08-24 11:18:52 -07:00
Kelven Yang d06d6dae72 add maven eclipse project files from Darren 2012-08-23 17:55:20 -07:00
Kelven Yang 9a51ff3bfc Maven worksplace fixes/patches from Darren 2012-08-23 14:26:27 -07:00
Darren Shepherd 2f6cc4b0cb Add license 2012-08-23 14:26:26 -07:00
Darren Shepherd ad54ed1790 * Maven 3 support 
* Pretty Format POM's
* AWS API compiles now
 2012-08-23 14:26:26 -07:00
Darren Shepherd b8e95e435f Maven config, initial commit 2012-08-23 14:26:25 -07:00
Chiradeep Vittal 5b85edb961 bug CS-16034 getRandomIp can return -1 unexpectedly 
also fixes unit test failures
 2012-08-16 11:42:25 -07:00
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
Sheng Yang a4431b5740 S2S VPN: Use coma instead of semicolon for separating cidr list 2012-08-10 16:20:52 -07:00
Alena Prokharchyk ccac505944 Merge branch 'master' into vpc 2012-08-10 10:47:49 -07:00
Chip Childers 0ad8118562 Fixed three .classpath license header issues 2012-08-09 14:21:06 -04:00
Alena Prokharchyk c5e3493792 Merge branch 'master' into vpc 2012-08-08 18:38:35 -07:00
Alex Huang e83c60a057 added JoinType to remove the j2ee source code in CloudStack 2012-08-08 13:42:08 -07:00
Alex Huang f04c006f9a Added javax.persistence and javax.ejb jar packages to replace the files removed. Added a new annotation to replace the encrypt attributed added to the Column annotation. Removed join attribute added to SecondaryTable in previous commit 2012-08-08 12:58:24 -07:00
Alex Huang 457f3b3dc9 Removed all javax source code from utils package 2012-08-08 12:58:22 -07:00
Alena Prokharchyk 048c5e50cf Merge branch 'master' into vpc 
Conflicts:
	utils/test/com/cloud/utils/component/MockComponentLocator.java
 2012-08-08 11:50:39 -07:00
Alex Huang 57b57703eb fixed broken unit test 2012-08-07 17:38:05 -07:00
Alex Huang a617ccc898 Added missing file 2012-08-07 15:52:34 -07:00
Alex Huang a6a864a1a8 Removed Base64 file and use the apache version 2012-08-07 15:41:54 -07:00
Alex Huang 1d3a443237 Added support for component libraries in plugins 2012-08-07 15:40:01 -07:00
Alena Prokharchyk d38e9eebed VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-07 11:25:02 -07:00
Alena Prokharchyk cf64fda5d5 VPC: unittest preparation 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-08-07 11:23:52 -07:00
Sheng Yang 84a1a311f9 S2S VPN: CS-15511: Add PFS support for VPN connection 2012-08-06 15:27:13 -07:00
Alena Prokharchyk 5a72044dc7 Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
Chip Childers 95ce55f0a1 License header updates for the utils folder 2012-08-03 14:15:09 -04: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 8f797afd42 VPC: CS-15813 - ICMP type and code validation 
Conflicts:

	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	utils/src/com/cloud/utils/net/NetUtils.java
 2012-08-01 19:55:51 -07:00
Sheng Yang e8d2ca48b4 S2S VPN: Update the supported crypto list 
We would support 3DES, AES128, AES192, AES256.
 2012-07-30 16:43:55 -07:00