Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							bf8507d564 
							
						 
					 
					
						
						
							
							VPC UI: Restore old 'router' icon  
						
						 
						
						
						
						
					 
					
						2014-03-06 14:45:28 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							48e08fe676 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-03-06 14:02:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							9b66866dc2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170  
						
						 
						
						
						
						
					 
					
						2014-03-06 13:01:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								miguelaferreira 
							
						 
					 
					
						
						
						
						
							
						
						
							ea0dec77d9 
							
						 
					 
					
						
						
							
							Refactor DbUpgradeUtils  
						
						 
						
						... 
						
						
						
						- Move database access code to new class DatabaseAccessObject.
    This was done to ease the effort of testing, since
    DbUpgradeUtils has a static API and it is harder to mock
    static things with Mockito.
  - Log exceptions even if ignored
  - Add unit tests for both DbUpgradeUtils and DatabaseAccessObject
  - DbUpgradeUtils.dropTableColumnsIfExist(...) no longer throws
CloudRuntimeException to make it consistent with the other methods in
the class
Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-03-06 14:48:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							370554e9d9 
							
						 
					 
					
						
						
							
							only ping timeout trigger host HA, otherwise there may be two threads try to HA the same VM  
						
						 
						
						
						
						
					 
					
						2014-03-05 16:50:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							830328b63d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6199:  Hide action events for Vm/Volume commands when the resources have display flag=0.  
						
						 
						
						... 
						
						
						
						Introduce generic BaseAsync(Vm/Volume)Cmd to make get the flag value for logging action events.
Rename the db field as display rather than display_event in keeping with the convention 
						
						
					 
					
						2014-03-05 16:40:44 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							38c0dd87a9 
							
						 
					 
					
						
						
							
							vbdmectics may not exist after host reboot  
						
						 
						
						
						
						
					 
					
						2014-03-05 16:04:34 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							ad88bbb684 
							
						 
					 
					
						
						
							
							Use seperate path to sync VM metadata for XS  
						
						 
						
						... 
						
						
						
						VM status sync only does VM status sync 
						
						
					 
					
						2014-03-05 15:44:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							ab1d3af460 
							
						 
					 
					
						
						
							
							Use seperate path to sync VM metadata for XS  
						
						 
						
						... 
						
						
						
						VM status sync only does VM status sync 
						
						
					 
					
						2014-03-05 15:44:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d1c0b81dc1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6205: VPC VR start - when create guest nics for the VR, consider networks not only in Implemented state, but in Setup state as well  
						
						 
						
						
						
						
					 
					
						2014-03-05 15:39:34 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							922cdc0dd1 
							
						 
					 
					
						
						
							
							Fix unapproved licens issue.  
						
						 
						
						
						
						
					 
					
						2014-03-05 14:31:28 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							182c31899b 
							
						 
					 
					
						
						
							
							Externalized the hardcodedstrings from UI JAVASCRIPT files.  
						
						 
						
						
						
						
					 
					
						2014-03-05 14:11:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e1e554277a 
							
						 
					 
					
						
						
							
							UI Dialog: Was passing wrong field data for makeFields event  
						
						 
						
						
						
						
					 
					
						2014-03-05 13:34:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							b06e66c50a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170  
						
						 
						
						
						
						
					 
					
						2014-03-05 13:55:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							bbaec7bae8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6203: Correct documentation for KVM migration tuneables  
						
						 
						
						
						
						
					 
					
						2014-03-05 12:41:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							e5449e29c9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6203: KVM Migration fixes. Moved migration to a thread  
						
						 
						
						... 
						
						
						
						so we can monitor it and potentially take action to make migration
complete if admin has defined such. 
						
						
					 
					
						2014-03-05 12:24:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							63e3eea790 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5920: enable build of IAM services in pom.xml.  
						
						 
						
						
						
						
					 
					
						2014-03-05 09:40:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c28450c1cd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5920: IAM service plugin.  
						
						 
						
						
						
						
					 
					
						2014-03-05 09:40:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							adb29b2140 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5920: IAM service server.  
						
						 
						
						
						
						
					 
					
						2014-03-05 09:40:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							793becf524 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5920: Add some interface methods and constants required by  
						
						 
						
						... 
						
						
						
						IAM. 
						
						
					 
					
						2014-03-05 09:40:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							d0ae4d9a9f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5920:Add interface to ControlledEntity to return IAM  
						
						 
						
						... 
						
						
						
						entity type. 
						
						
					 
					
						2014-03-05 09:40:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							b8413b9413 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6194: Failed to increase Shared network IP Range  
						
						 
						
						... 
						
						
						
						Submitted-by:Saksham Srivastava <saksham.srivastava@citrix.com> 
						
						
					 
					
						2014-03-04 22:19:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							f291951990 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6199: Add the column display_event to event table  
						
						 
						
						... 
						
						
						
						~ 
						
						
					 
					
						2014-03-04 18:26:09 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							695d689de5 
							
						 
					 
					
						
						
							
							Adding annotations for more admin APIs  
						
						 
						
						
						
						
					 
					
						2014-03-04 18:14:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							8b0e04be61 
							
						 
					 
					
						
						
							
							Dialog: Trigger event when createform fields are being drawn  
						
						 
						
						... 
						
						
						
						Trigger new event 'cloudStack.createForm.makeFields'
before field params are being passed to createForm for rendering.
This allows plugins to change and intepret fields before they are drawn. 
						
						
					 
					
						2014-03-04 16:11:26 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							4df897f4ab 
							
						 
					 
					
						
						
							
							Add hover states for nav icons  
						
						 
						
						
						
						
					 
					
						2014-03-04 16:04:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5a8d165afa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic  
						
						 
						
						... 
						
						
						
						Conflicts:
	engine/api/src/com/cloud/vm/VirtualMachineManager.java
	engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java 
						
						
					 
					
						2014-03-04 15:37:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							339c4f4c3f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6199: Action Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature.  
						
						 
						
						... 
						
						
						
						For root admin - s/he should be able to see all the events despite the value of the flag. 
						
						
					 
					
						2014-03-04 14:59:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							45fa91c490 
							
						 
					 
					
						
						
							
							Alerts UI: Remove left border pane  
						
						 
						
						
						
						
					 
					
						2014-03-04 13:50:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							952888ab84 
							
						 
					 
					
						
						
							
							Icons: make monochromatic  
						
						 
						
						
						
						
					 
					
						2014-03-04 13:31:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							fb0b2eb267 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6192: Return failure on StartCommand and PrepareForMigrationCommand  
						
						 
						
						... 
						
						
						
						when connectPhysicalDisk fails, rather than continuing on 
						
						
					 
					
						2014-03-04 14:18:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							690c5d4d2a 
							
						 
					 
					
						
						
							
							First time test_vm_iam.py is completely passed.  
						
						 
						
						
						
						
					 
					
						2014-03-04 11:17:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							056d21e14b 
							
						 
					 
					
						
						
							
							Fix bugs found from marvin test.  
						
						 
						
						
						
						
					 
					
						2014-03-04 11:16:45 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							1f9649bc3b 
							
						 
					 
					
						
						
							
							kvm: Fix a NullPointerException which occurs when storage pool creation fails  
						
						 
						
						... 
						
						
						
						Also make the logging around creating a RBD storage pool a bit better when creating
that fails. 
						
						
					 
					
						2014-03-04 16:03:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sbalineni 
							
						 
					 
					
						
						
						
						
							
						
						
							8dca59d4f9 
							
						 
					 
					
						
						
							
							mvn clean - cleanps up only target, dist directories; testclient.log file should be generated inside target directory  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-03-04 11:57:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							9be51e1961 
							
						 
					 
					
						
						
							
							added mock handlers for VpnUsersCfgCommand and RemoteAccessVpnCfgCommand in the simulator  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-03-04 14:31:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							8e2c4c8105 
							
						 
					 
					
						
						
							
							added delete iso api to the simulator in the smoke tests, this will fix test_03_delete_iso when run against a simulator  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-03-04 14:12:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							bb149fb77b 
							
						 
					 
					
						
						
							
							CLOUDSTACK:4840: Adding further test cases for Multiple IPs per NIC feature  
						
						 
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-03-04 12:25:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5dd4fb22ef 
							
						 
					 
					
						
						
							
							Remove cancelled jobs from job monitoring, correct mis-calculated time-unit in job cancellation.  
						
						 
						
						
						
						
					 
					
						2014-03-03 17:44:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							91882e26bf 
							
						 
					 
					
						
						
							
							List VM marvin test fix.  
						
						 
						
						
						
						
					 
					
						2014-03-03 17:26:16 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							61b47850f2 
							
						 
					 
					
						
						
							
							Bug fix identified by marvin test.  
						
						 
						
						
						
						
					 
					
						2014-03-03 17:26:16 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bbf5a912c6 
							
						 
					 
					
						
						
							
							list* APIs - added parameter helping to filter by "display" flag (available to ROOT admin only)  
						
						 
						
						
						
						
					 
					
						2014-03-03 14:37:46 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							a837ac8873 
							
						 
					 
					
						
						
							
							Adding Operate access check at service layer, since we are not checking access on the command parameter here  
						
						 
						
						
						
						
					 
					
						2014-03-03 13:35:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fd43cf1516 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-5872: Async response from addAccountToProject doesn't contain useful information"  
						
						 
						
						... 
						
						
						
						This reverts commit ebcaec8632dbd92c071317f3190915244a287afb.
Reverting as it breaks API compatibility 
						
						
					 
					
						2014-03-03 12:44:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							6726b7fee0 
							
						 
					 
					
						
						
							
							Dashboard: Restore colors/appearance for alert items  
						
						 
						
						
						
						
					 
					
						2014-03-03 11:56:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d71483f771 
							
						 
					 
					
						
						
							
							BUG-ID: CS-19426: UI > VPC > VM Wizard > change to send ipToNetworkList parameter instead of networkIds parameter to deployVM API.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Brian 
						
						
					 
					
						2014-03-03 11:49:42 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							f03263782f 
							
						 
					 
					
						
						
							
							Main UI layout: Tweak font sizes for better readability  
						
						 
						
						
						
						
					 
					
						2014-03-03 11:46:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							f45a5b231d 
							
						 
					 
					
						
						
							
							Update infrastructure icons  
						
						 
						
						
						
						
					 
					
						2014-03-03 11:38:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							0d688fec73 
							
						 
					 
					
						
						
							
							VM wizard: Add specify IP field when in VPC flow  
						
						 
						
						
						
						
					 
					
						2014-03-03 10:52:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							477902379e 
							
						 
					 
					
						
						
							
							Fix CLOUDSTACK-4563: Initial zone wizard UI label issue  
						
						 
						
						
						
						
					 
					
						2014-03-03 10:19:03 -08:00