wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							ea9db195ed 
							
						 
					 
					
						
						
							
							Extracting local variable in order to make the code more readable.  
						
						 
						
						... 
						
						
						
						Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com> 
						
						
					 
					
						2015-06-29 09:59:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							4690c3d844 
							
						 
					 
					
						
						
							
							Formatting the code of the AgentManagerImpl class  
						
						 
						
						... 
						
						
						
						Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com> 
						
						
					 
					
						2015-06-29 09:59:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							5557ad5588 
							
						 
					 
					
						
						
							
							Offer a getDurationInMillis() method in the Profiler utility class  
						
						 
						
						... 
						
						
						
						- New implementation uses nanoseconds. Due to that, the places where the Profiler is used as a Monitor and/or
     a stopwatch will suffer with the difference in the return
   - Also added a getDuration(), which returns the time in nanoseconds in case someone wants to use it instead
   - Added an extra test to check if the getDuration() works fine with nanoseconds
   - Fixed the test that checks the time in milliseconds: I added an error margin to cover the test better
Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2015-06-24 09:36:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							c45c9bfeef 
							
						 
					 
					
						
						
							
							findbugs UC useless condition not sure what findbugs means yet, but this should at least turn both warnings into one.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net>
This closes  #490  
						
						
					 
					
						2015-06-19 15:53:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rafael da Fonseca 
							
						 
					 
					
						
						
						
						
							
						
						
							eaa4eba74d 
							
						 
					 
					
						
						
							
							Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in EngineHostVO.java Assert isn't used in prod runtime, null is checked in method  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes  #448  
						
						
					 
					
						2015-06-17 12:10:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rafael da Fonseca 
							
						 
					 
					
						
						
						
						
							
						
						
							a2129b2940 
							
						 
					 
					
						
						
							
							Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in VmWorkJobDispatcher.java Assert isn't used in prod runtime, null is properly checked in method  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes  #446  
						
						
					 
					
						2015-06-17 12:08:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rafael da Fonseca 
							
						 
					 
					
						
						
						
						
							
						
						
							d056c3d279 
							
						 
					 
					
						
						
							
							Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in VirtualMachineManagerImpl.java Removed two unnecessary null checks as this piece of code will only run if answer is not null, as satified in condition stated in line  #1253  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes  #445  
						
						
					 
					
						2015-06-17 12:07:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rafael da Fonseca 
							
						 
					 
					
						
						
						
						
							
						
						
							0dc25905d2 
							
						 
					 
					
						
						
							
							Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in NetworkOrchestrator.java If answer is null, method will throw ConnectionException in line 3016 as satisfied by condition stated in line 3014  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes  #449  
						
						
					 
					
						2015-06-15 12:27:54 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rafael da Fonseca 
							
						 
					 
					
						
						
						
						
							
						
						
							1b79a8e1d6 
							
						 
					 
					
						
						
							
							Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in EngineDataCenterVO.java Assert isn't used in prod runtime, null is checked in method  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes  #447  
						
						
					 
					
						2015-06-15 12:24:04 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rafael da Fonseca 
							
						 
					 
					
						
						
						
						
							
						
						
							0f4aac7359 
							
						 
					 
					
						
						
							
							Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in AgentManagerImpl.java Assert isn't used in runtime, null is properly checked in method  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes  #444  
						
						
					 
					
						2015-06-15 12:17:53 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							87d4086a64 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6181 Specify GB for the value of rootdisksize parameter. Add some Bytes/GB for log or exception messages. Fix Gb->GB.  
						
						 
						
						
						
						
					 
					
						2015-05-23 17:52:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							4222364bea 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8491: Host maintenance fails if a vm on it is running a custom service offering VM  
						
						 
						
						
						
						
					 
					
						2015-05-21 10:56:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							5f66679df3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8452: Exclude non-routing hosts from getting rebalanced as part of agent LB  
						
						 
						
						... 
						
						
						
						For agent LB, only routing hosts needs to be considered 
						
						
					 
					
						2015-05-08 10:48:39 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							1c408dec37 
							
						 
					 
					
						
						
							
							Merge branch '4.5' after 4.5.1 vote passes  
						
						 
						
						
						
						
					 
					
						2015-05-07 16:03:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							4ba72a877c 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.5.2-SNAPSHOT  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-05-07 15:33:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							0eb4eb2370 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.5.1  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-05-04 12:17:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							866cc41145 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8423: [Xenserver] Improved the performance for processing of ClusterVMMetaDataSync command which can cause slowness in DB if there are huge number of VMs  
						
						 
						
						... 
						
						
						
						this closes  #204  
						
						
					 
					
						2015-04-30 14:44:36 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							e1db982d6b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8410. ESXi host stuck disconnects frequently.  
						
						 
						
						... 
						
						
						
						During ping task, while scanning and updating status of all VMs on the host that are stuck in a transitional state
and are missing from the power report, do so only for VMs that are not removed.
(cherry picked from commit de7173a0ed6434d1809d0471fe8f28bd339f208e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-04-29 16:50:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							de7173a0ed 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8410. ESXi host stuck disconnects frequently.  
						
						 
						
						... 
						
						
						
						During ping task, while scanning and updating status of all VMs on the host that are stuck in a transitional state
and are missing from the power report, do so only for VMs that are not removed. 
						
						
					 
					
						2015-04-28 09:15:22 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							86943da26e 
							
						 
					 
					
						
						
							
							Fixed few coverity issues  
						
						 
						
						... 
						
						
						
						Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
(cherry picked from commit 0a9742f91462867cc9d5f9321a13a73483fcf149)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-04-27 14:43:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MS 
							
						 
					 
					
						
						
						
						
							
						
						
							b34202a84e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8387 - Close mgmt server peer socket on failure, without relying on autoclose  
						
						 
						
						
						
						
					 
					
						2015-04-15 09:50:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MS 
							
						 
					 
					
						
						
						
						
							
						
						
							42a8253993 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8387 - Close mgmt server peer socket on failure, without relying on autoclose  
						
						 
						
						
						
						
					 
					
						2015-04-15 09:49:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MS 
							
						 
					 
					
						
						
						
						
							
						
						
							fde2615c33 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8387 - Close mgmt server peer socket on failure, without relying on autoclose  
						
						 
						
						
						
						
					 
					
						2015-04-15 08:43:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MS 
							
						 
					 
					
						
						
						
						
							
						
						
							aab0bfc809 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8387 - Close mgmt server peer socket on failure, without relying on autoclose  
						
						 
						
						
						
						
					 
					
						2015-04-15 08:43:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MS 
							
						 
					 
					
						
						
						
						
							
						
						
							cb7bcf23fe 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8387 - Don't autoclose new mgmt server peer connections as soon as they open  
						
						 
						
						
						
						
					 
					
						2015-04-15 08:18:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MS 
							
						 
					 
					
						
						
						
						
							
						
						
							5506ec9936 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8387 - Don't autoclose new mgmt server peer connections as soon as they open  
						
						 
						
						
						
						
					 
					
						2015-04-15 08:16:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							37820e15f2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7593: allow nic type to be fetched from vm's details  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 43db75c319b425f3b39770d556df59333921bf92)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
						
						
					 
					
						2015-04-13 15:47:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							43db75c319 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7593: allow nic type to be fetched from vm's details  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-04-13 15:44:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							fa56045665 
							
						 
					 
					
						
						
							
							findbugs: wrapper object comparison (fixed)  
						
						 
						
						
						
						
					 
					
						2015-03-25 17:12:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							40eb579115 
							
						 
					 
					
						
						
							
							TK-3135 fixes for VPC restart  
						
						 
						
						... 
						
						
						
						* removed the "is redundant" flag form the addVpcRouterToGuestNetwork() method
* removed the "is redundant" flag from the removeVpcRouterFromGuestNetwork() method
* changed the path of the master.py file in the keepalived.conf.temp file
* the call to routerDao.addRouterToGuestNetwork() in the VpcRouterDeploymentDefinition is not needed. That step will be performed once a VM is created
  - In addition, when restarting a VPC the routers will have the guest net configured, if any exists.
* Pushing the POM.xml as well, to use the old Jetty for now. Could not fix the logging problem. Will replace the POM with master version after VPC is done. 
						
						
					 
					
						2015-03-16 11:39:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							8f9f39fa39 
							
						 
					 
					
						
						
							
							[TK-3119] Fix NPEs and improve exception handling + error messages  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:39:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							09bd847040 
							
						 
					 
					
						
						
							
							Vpc redundancy enabled. Including Vpc & Vpc Offering creation. Marvin tests and UI.  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							c198dfdb7a 
							
						 
					 
					
						
						
							
							Update pom and version usage to 4.5.1-SNAPSHOT  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-03-12 12:13:18 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							43a39d1eb0 
							
						 
					 
					
						
						
							
							findbugs: possible nullpointer  
						
						 
						
						
						
						
					 
					
						2015-02-19 10:27:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							0f8a055dff 
							
						 
					 
					
						
						
							
							findbugs: equals() call on Long instead of =-comparison  
						
						 
						
						
						
						
					 
					
						2015-02-19 10:23:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							8ad2e309a4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8238 handling of retry ping improved  
						
						 
						
						... 
						
						
						
						Fixed on 4.4 and master but not on 4.5, cherry-picked on 4.5 using commit
fbafc957dc4e9cdc83aceb2762c0b07296b1a3e6
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java 
						
						
					 
					
						2015-02-16 11:35:41 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							7e75f339bc 
							
						 
					 
					
						
						
							
							license and format  
						
						 
						
						
						
						
					 
					
						2015-02-12 14:47:12 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							a9c384fd17 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8238 mocked test to make sure xapi code is called in test for  
						
						 
						
						... 
						
						
						
						pingtask 
						
						
					 
					
						2015-02-10 16:15:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							78bfaa79cf 
							
						 
					 
					
						
						
							
							Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences  
						
						 
						
						... 
						
						
						
						(cherry picked from commit ef6ec7b27675ea44d45c68b30eb2f508655703be)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-06 16:50:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							4ea0dcda9b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7870: When Vm deployments fail and end in error state volume count should be decremented  
						
						 
						
						... 
						
						
						
						(cherry picked from commit a8b89bea4f37a54267694b9a49be6b5bec91f0b0)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-06 16:24:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							82eebab0ba 
							
						 
					 
					
						
						
							
							CID-1241966 Fix potential null deref  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 1c94017ff693fbff51553d0095aef4d9e0552098)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-05 18:27:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							fb1069ace9 
							
						 
					 
					
						
						
							
							agent: don't investigate if host is null, send alert instead  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-05 16:42:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							7c41a1184c 
							
						 
					 
					
						
						
							
							agent: don't investigate if host is null, send alert instead  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-05 16:42:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							419508b016 
							
						 
					 
					
						
						
							
							orchestration: allow storage migration  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a2547ed827c5fbb7d43181c8d3f84b81ffbeeeda)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-05 16:39:17 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							a2547ed827 
							
						 
					 
					
						
						
							
							orchestration: allow storage migration  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-05 16:38:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							7a397cd4ef 
							
						 
					 
					
						
						
							
							For volumes created from template, do not log offering ID in VOLUME.CREATE in usage_event. Moved offering type to DiskOffering interface  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 9eb8d538dd196f27e5194dd2e657afffdb9347eb)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-05 16:37:59 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							e40b06e9ca 
							
						 
					 
					
						
						
							
							AgentAttache: allow checkonhost command in maintenance, cancel if only allowed  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-05 16:29:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							61dfb2d625 
							
						 
					 
					
						
						
							
							AgentAttache: allow checkonhost command in maintenance, cancel if only allowed  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-05 16:29:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							c25263ba81 
							
						 
					 
					
						
						
							
							Fixed Coverity Issues  
						
						 
						
						
						
						
					 
					
						2015-02-05 15:59:29 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar 
							
						 
					 
					
						
						
						
						
							
						
						
							01cc1b816d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7792: Usage Events to be captured based on Volume State Machine  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 781648fb1003c8c32875e9ff7a6c4ef4694539f7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
						
						
					 
					
						2015-02-05 15:22:21 +05:30