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

142 Commits

Author SHA1 Message Date
ilya musayev 8794bb6346 Revert "Updating pom.xml version numbers for release 4.1.1" 
This reverts commit 8fe3505cba.
 2013-07-24 13:13:09 -04:00
ilya musayev 8fe3505cba Updating pom.xml version numbers for release 4.1.1 
Signed-off-by: ilya musayev <ilya@apache.org>
 2013-07-24 13:11:48 -04:00
Chip Childers 707f95dfa0 Updating pom.xml version numbers for release 4.1.1-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-06-15 13:14:40 -04:00
Chip Childers 780439e3bb Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit a5214bee99.
 2013-05-28 09:22:01 -04:00
Chip Childers a5214bee99 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-28 09:16:12 -04:00
Chip Childers aa29234ee0 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit d0da9f7f46.
 2013-05-28 09:09:22 -04:00
Chip Childers d0da9f7f46 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-28 09:03:41 -04:00
Chip Childers 8a99d19b34 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit db007da152.
 2013-05-26 10:36:16 -04:00
Chip Childers db007da152 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-26 10:32:45 -04:00
Chip Childers 2229727236 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit 873c1972c7.
 2013-05-24 12:37:59 -04:00
Chip Childers 873c1972c7 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-24 12:31:24 -04:00
Chip Childers 6ddd876e5b Fixing license headers for Nicira files 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-22 13:31:43 -04:00
Hugo Trippaers 79fd49c181 Update the Logical Router NatRules to be compatible with the NVP 3.x.x 
platform

Use the Gson adapters to serialize/deserialize the NatRules

Switch the NiciraNvpApi to a single gson Object with the proper adapters

Fix missing order setting for static nat rules and portforwarding rules

Return an error when a port range is passed in a portforwarding rule

The serializer is not required

Fix a bug where an ip address could be released even if it was still in
use for SourceNat

Throw a json parse exception when the type is unknown to the adapter
 2013-05-22 14:39:52 +01:00
Hiroaki KAWAI 95de7ea69b Fix typo 
Reported by Soheil Eizadi <seizadi@infoblox.com>
at dev@cloudstack.apache.org
 2013-05-08 10:31:40 +09:00
Chip Childers 29be94f3ba Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit 9d8c8f2042.
 2013-04-26 15:14:00 -04:00
Chip Childers 9d8c8f2042 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-26 15:09:47 -04:00
Chip Childers 3be1754626 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit ba7ba61671.
 2013-04-23 15:22:01 -04:00
Chip Childers ba7ba61671 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-23 15:18:19 -04:00
Chip Childers e3af51bfc5 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit 88098e0c81.
 2013-04-23 14:58:55 -04:00
Chip Childers 88098e0c81 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-23 14:55:22 -04:00
Chip Childers a5a7105b36 Updating pom.xml version numbers for release 4.1.0-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 19:51:20 -04:00
Chip Childers 7048baaa44 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 19:45:20 -04:00
Chip Childers 818a2c86d8 Revert "Updating pom.xml version numbers for release 4.1.0" 
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit b7abc3ca1e.
 2013-04-22 22:22:32 +01:00
Chip Childers a3c6ab58a1 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT" 
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit 8fe99e6453.
 2013-04-22 22:22:06 +01:00
Chip Childers 8fe99e6453 Updating pom.xml version numbers for release 4.1.1-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 12:46:11 -04:00
Chip Childers b7abc3ca1e Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 09:42:23 -04:00
Chip Childers d168119a89 Revert "Updating pom.xml version numbers for release 4.1.0" 
Reverting for yet another attempted RC

This reverts commit b654578bd5.
 2013-04-22 09:35:21 -04:00
Chip Childers ca3b515bad Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT" 
Reverting for yet another attempted RC.
This reverts commit 5a923ca44d.
 2013-04-22 09:35:06 -04:00
Chip Childers 5a923ca44d Updating pom.xml version numbers for release 4.1.1-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 09:20:20 -04:00
Chip Childers b654578bd5 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 08:55:21 -04:00
Chip Childers e119a53bfd Revert "Updating pom.xml version numbers for release 4.1.0" 
Reverting to re-spin 4.1.0 RC

This reverts commit b25d27d80b.
 2013-04-22 08:52:17 -04:00
Chip Childers 5755f6e3e8 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT" 
Reverting so that I can re-spin the 4.1.0 RC

This reverts commit c8c77f6b1c.
 2013-04-22 08:51:58 -04:00
Chip Childers c8c77f6b1c Updating pom.xml version numbers for release 4.1.1-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-21 16:26:50 -04:00
Chip Childers b25d27d80b Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-21 16:18:04 -04:00
Hugo Trippaers 44097eecef CLOUDSTACK-2092 Don't push IP to the Nicira Controller when it is about 
to be released.
 2013-04-19 16:13:05 +02:00
Hugo Trippaers aea5b268b4 Prachi's commit 20a747601c introduced a 
new call to network.getPhysicalNetworkId() which wasn't mocked yet in
the nvp plugin unittests.
 2013-02-21 12:27:53 +01:00
Prachi Damle 20a747601c CLOUDSTACK-1331: Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan 
Changes:
-We need to update the physical_network_id for public vlans.
-Physical network ID should be retrieved from the network if present.
 2013-02-20 11:25:36 -08:00
Kelven Yang 176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
Kelven Yang 45a92ba369 Fix the initialization of management server 2013-01-23 15:29:41 -08:00
Edison Su 4fbecf15ec add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00
Alex Huang 10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Koushik Das 070856affd CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version 
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-01-18 16:49:52 +05:30
Chiradeep Vittal 56cd809600 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Re-merge with network-refactor
 2013-01-17 11:32:49 -08:00
Min Chen 3dabd5fbf3 Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException 
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-16 22:36:34 -08:00
Chiradeep Vittal cadca5fc0c Merge branch 'master' into network-refactor-merge2 
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 2013-01-16 19:17:14 -08:00
Kelven Yang 497dcd5044 Get rid of PlugService annotation, replace it with Spring standard injection in command classes 2013-01-16 18:44:44 -08:00
Kelven Yang 2be270de89 Separate loadable components like Gurus, Elements, Adapters to componentContext.xml 2013-01-16 16:33:59 -08:00
Rohit Yadav bca2c928e8 PluggableService: Fix interface definition 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-14 19:01:26 -08:00
Kelven Yang f57dcaa820 Loadable components to be in separted Spring component bundling 2013-01-11 15:33:15 -08:00
Alex Huang 1294cdc701 pulled from master 2013-01-10 16:01:01 -08:00