Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac0faeb091
							
						
					 | 
					
						
						
							
							Fix auto-merge caused issues
						
						
						
						
						
						
					 | 
					
						2014-01-09 14:29:12 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							0587382265
							
						
					 | 
					
						
						
							
							CLOUDSTACK-669: Finalize VM work dispatching mechanism to avoid big switch statement
						
						
						
						
						
						
					 | 
					
						2014-01-09 14:29:12 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6f126d24e
							
						
					 | 
					
						
						
							
							Fix a style-check problem after cherry-pick
						
						
						
						
						
						
					 | 
					
						2014-01-09 14:29:12 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c93bd6080
							
						
					 | 
					
						
						
							
							CLOUDSTACK-669: Convert volume snapshot orchestration flow to make it be serialized with other VM operations
						
						
						
						
						
						
					 | 
					
						2014-01-09 14:29:12 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf9a554522
							
						
					 | 
					
						
						
							
							CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations
						
						
						
						
						
						
					 | 
					
						2014-01-09 14:29:12 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mike Tutkowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							a298f6fce9
							
						
					 | 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-5468: Configuration property should be optional
						
						
						
						
						
						
					 | 
					
						2014-01-09 15:16:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mike Tutkowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							caf87ac5d9
							
						
					 | 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
						
						
						
						
						
						
					 | 
					
						2014-01-09 15:06:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mike Tutkowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							03118c2969
							
						
					 | 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
						
						
						
						
						
						
					 | 
					
						2014-01-09 14:44:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brian Federle
							
						 
					 | 
					
						
						
						
						
							
						
						
							09da5153df
							
						
					 | 
					
						
						
							
							Update infrastructure 'socket' icon
						
						
						
						
						
						
					 | 
					
						2014-01-09 10:51:32 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							c69a412c43
							
						
					 | 
					
						
						
							
							Remove old prepareSecondaryStorageForMigration from gen_toc.py.
						
						
						
						
						
						
					 | 
					
						2014-01-09 10:12:22 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kishan Kavala
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e315f16c0
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5656: Removed Filtering of revoked rules while listing. API returns state as Deleting for revoked rules.
						
						
						
						
						
						
					 | 
					
						2014-01-09 22:01:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c8facf3c9
							
						
					 | 
					
						
						
							
							Change checkstyle to run on every sub project, so it will also run when you build an individual module
						
						
						
						
						
						
					 | 
					
						2014-01-09 17:00:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b5f8e21a9
							
						
					 | 
					
						
						
							
							Fix typo
						
						
						
						
						
						
					 | 
					
						2014-01-09 14:42:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SrikanteswaraRao Talluri
							
						 
					 | 
					
						
						
						
						
							
						
						
							3baf61161a
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5846: added updateCloudToUseObjectStore to known_category dict in gen_toc.py
						
						
						
						
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 | 
					
						2014-01-09 18:44:04 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Wei Zhou
							
						 
					 | 
					
						
						
						
						
							
						
						
							f012a2655d
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5404: Fix timezone bug in network usage
						
						
						
						
						
						
						
						(cherry picked from commit d5277a81e644c6db30cff12878cd3708aa28cc86)
Conflicts:
	engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java 
						
						
					 | 
					
						2014-01-09 14:07:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							d56a962445
							
						
					 | 
					
						
						
							
							Radvd is needed in the template so we can start testing with IPv6
						
						
						
						
						
						
					 | 
					
						2014-01-09 12:33:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rajani Karuturi
							
						 
					 | 
					
						
						
						
						
							
						
						
							f741d99c80
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5790: decrypted ldap hostname and port during upgrade as they are not encrypted now.
						
						
						
						
						
						
						
						Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 | 
					
						2014-01-09 15:50:53 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rajani Karuturi
							
						 
					 | 
					
						
						
						
						
							
						
						
							001e67ab02
							
						
					 | 
					
						
						
							
							Revert "CLOUDSTACK-5435 enabled encryption for ldap params"
						
						
						
						
						
						
						
						This reverts commit 1d5051f60e0b302287f4fd806a84e65afc7494d0.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 | 
					
						2014-01-09 15:50:53 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Devdeep Singh
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dc4c5cb5d
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5795: Template.properties file wasn't created when a template
						
						
						
						
						
						
						
						was created from a volume. Added a post creation change to create the file
with the necessary information. 
						
						
					 | 
					
						2014-01-09 10:52:34 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nitin Mehta
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c1d639bc4
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5829:
						
						
						
						
						
						
						
						listvms should return the diskoffering id when deployed with an iso 
						
						
					 | 
					
						2014-01-08 18:32:51 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac8bc74269
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5840:Remove old API method.
						
						
						
						
						
						
					 | 
					
						2014-01-08 18:11:12 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							3223028fd6
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be
						
						
						
						
						
						
						
						used cross-zone. 
						
						
					 | 
					
						2014-01-08 17:43:06 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							649d9d927f
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5840:Migration from NFS to S3 should be done in one API
						
						
						
						
						
						
						
						(updateCloudToUseObjectStore) instead of two APIs. 
						
						
					 | 
					
						2014-01-08 17:25:13 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							858b9b1177
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5813: With S3 as secondary storage, snapshot taken in one
						
						
						
						
						
						
						
						zone cannot be used to create volume in another zone. zoneId parameter
in createVolumeCmd is not observed. 
						
						
					 | 
					
						2014-01-08 17:15:04 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brian Federle
							
						 
					 | 
					
						
						
						
						
							
						
						
							fefe82618c
							
						
					 | 
					
						
						
							
							Add icon for 'sockets'
						
						
						
						
						
						
					 | 
					
						2014-01-08 17:00:25 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ea02fed4a
							
						
					 | 
					
						
						
							
							Revert "CLOUDSTACK-4540: Set execute.in.sequence.network.element.commands=true by default"
						
						
						
						
						
						
						
						This reverts commit 3c68b9f850181802d3cbed359cc08352399f9116.
Refer to the latest comment in the bug. 
						
						
					 | 
					
						2014-01-08 16:03:21 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3680cc111
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5839: fixed xml serializer to process collection field when its elements are of String type
						
						
						
						
						
						
					 | 
					
						2014-01-08 15:38:50 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							7003f0b0df
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5733: UI > Virtual Routers > group by zone/pod/cluster > remove redundant code.
						
						
						
						
						
						
					 | 
					
						2014-01-08 15:23:20 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							da260d17f1
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5733: UI > Virtual Routers > group by zone/pod/cluster: fix a bug that "Total of Virtual Routers" in first row is blank.
						
						
						
						
						
						
					 | 
					
						2014-01-08 15:19:04 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							07557eb570
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5839 : return canEnableIndividualService in listNetworkServiceProvidersResponse
						
						
						
						
						
						
					 | 
					
						2014-01-08 14:40:10 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a9de59836
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5732: UI > Affinity Group > implement search, send keyword parameter to listAffinityGroups API.
						
						
						
						
						
						
					 | 
					
						2014-01-08 13:48:04 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brian Federle
							
						 
					 | 
					
						
						
						
						
							
						
						
							766dab64e8
							
						
					 | 
					
						
						
							
							Instance list view: Truncate long names to prevent misalignment
						
						
						
						
						
						
					 | 
					
						2014-01-08 10:37:17 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marcus Sorensen
							
						 
					 | 
					
						
						
						
						
							
						
						
							0911b73c83
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5430: NPE can be thrown in disconnectPhysicalDiskViaVmSpec in
						
						
						
						
						
						
						
						certain failure scenarios. This can only be triggered if other bugs allow
pools to be deleted while VMs are using them. 
						
						
					 | 
					
						2014-01-08 09:42:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							612a41e3f5
							
						
					 | 
					
						
						
							
							Add UI interface for managing the OpenDaylight provider and controllers.
						
						
						
						
						
						
						
						Fix several bugs in the code related to the api handling.
Conflicts:
	ui/scripts/system.js
ui 
						
						
					 | 
					
						2014-01-08 17:08:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4cb9ce8bc
							
						
					 | 
					
						
						
							
							Add opendaylight provider to system.js
						
						
						
						
						
						
					 | 
					
						2014-01-08 16:12:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							57da2bc784
							
						
					 | 
					
						
						
							
							Apply two small fixes to system.js
						
						
						
						
						
						
					 | 
					
						2014-01-08 16:08:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ba1abe262
							
						
					 | 
					
						
						
							
							Apply some formatting to system.js
						
						
						
						
						
						
					 | 
					
						2014-01-08 16:04:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ddcc9ba80
							
						
					 | 
					
						
						
							
							Set unique gre key for every network.
						
						
						
						
						
						
						
						Set interface id to nic uuid when creating the vif. 
						
						
					 | 
					
						2014-01-08 16:00:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wrodrigues
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3f93a96f5
							
						
					 | 
					
						
						
							
							Adding OpenDayLight Neutron API. It includes 24 unit tests and 3 integration tests. Everythin passed the build.
						
						
						
						
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 | 
					
						2014-01-08 16:00:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							850bc9fa82
							
						
					 | 
					
						
						
							
							Hook the OpenDaylight plugin into CloudStack
						
						
						
						
						
						
					 | 
					
						2014-01-08 15:58:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f9528bad3
							
						
					 | 
					
						
						
							
							Add a network plugin for OpenDaylight
						
						
						
						
						
						
						
						This plugin is a technology preview and designed to work with the OVSDB module 
						
						
					 | 
					
						2014-01-08 15:57:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Wei Zhou
							
						 
					 | 
					
						
						
						
						
							
						
						
							cbe2560a78
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage)
						
						
						
						
						
						
						
						(cherry picked from commit 4bb85cd7f921d66eabe72d00dcde817affd48732)
Conflicts:
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 | 
					
						2014-01-08 15:38:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ashutosh K
							
						 
					 | 
					
						
						
						
						
							
						
						
							e58c3c809d
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5619: Egress Firewall rules - Increased timeout for router to come up
						
						
						
						
						
						
					 | 
					
						2014-01-08 19:22:07 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kishan Kavala
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e45dfb942
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering.
						
						
						
						
						
						
					 | 
					
						2014-01-08 19:10:40 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bharat Kumar
							
						 
					 | 
					
						
						
						
						
							
						
						
							776b5059fb
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering.
						
						
						
						
						
						
						
						Conflicts:
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/UserVmStateListener.java 
						
						
					 | 
					
						2014-01-08 19:10:39 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Harikrishna Patnala
							
						 
					 | 
					
						
						
						
						
							
						
						
							00e67f57e7
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5827: [Automation] Destroy VM failed, while deleting account
						
						
						
						
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 | 
					
						2014-01-08 18:38:59 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gaurav Aradhye
							
						 
					 | 
					
						
						
						
						
							
						
						
							777ab14942
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5803: Fixed issues related to egress rule
						
						
						
						
						
						
					 | 
					
						2014-01-08 17:56:32 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gaurav Aradhye
							
						 
					 | 
					
						
						
						
						
							
						
						
							b98c0ee809
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5630: Fixed snapshots' test cases
						
						
						
						
						
						
					 | 
					
						2014-01-08 17:16:06 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							5dc0c60239
							
						
					 | 
					
						
						
							
							Fix missing / in api url
						
						
						
						
						
						
					 | 
					
						2014-01-08 11:01:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Girish Shilamkar
							
						 
					 | 
					
						
						
						
						
							
						
						
							393d437b26
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5627: Removed a validation which expected createVPCOffering to fail if SourceNAT not provided
						
						
						
						
						
						
						
						createVPCOffering API creates VPC with SourceNat even if not provided as param. So this validation
is not required any more. 
						
						
					 | 
					
						2014-01-08 12:05:39 +05:30 | 
					
					
						
						
							
							
							
						
					 |