radu-stefanache 
							
						 
					 
					
						
						
						
						
							
						
						
							c7a3ad4dc0 
							
						 
					 
					
						
						
							
							More typos  
						
						
						
						
					 
					
						2015-08-20 13:04:29 +01:00 
						 
				 
			
				
					
						
							
							
								Boris Schrijver 
							
						 
					 
					
						
						
						
						
							
						
						
							5db3371840 
							
						 
					 
					
						
						
							
							Refactored NicProfile.java for readability.  
						
						... 
						
						
						
						See issue CLOUDSTACK-8736 for ongoing effort to clean up network code. 
						
						
					 
					
						2015-08-17 14:12:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							b6f1d29e64 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8656: more logging instead of sysout  
						
						
						
						
					 
					
						2015-08-14 17:28:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							27960b4a7a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8656: console logging on asserted exceptions  
						
						
						
						
					 
					
						2015-08-04 13:28:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							e2b6237464 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8656: debug messages on interupted exceptions  
						
						
						
						
					 
					
						2015-07-30 16:03:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							520e0c8de0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8656: code in comment removed  
						
						
						
						
					 
					
						2015-07-30 15:52:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							85e002b230 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8656: filling empty catch block with info messages  
						
						... 
						
						
						
						using regexp "catch\s*\(\s*(Exception|Throwable)\s*\w*\)\s*\{\s*\}" 
						
						
					 
					
						2015-07-30 15:51:52 +02:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							9dbc99c608 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8648: Pass the proper storage layer when configuring  
						
						... 
						
						
						
						Signed-off-by: Pierre-Luc Dion <pdion891@apache.org> 
						
						
					 
					
						2015-07-26 10:25:06 -04:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							554f5f9fbb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8648: Do not configure the ImageFormat Processor when fetching filesize  
						
						... 
						
						
						
						It will throw an exception and that's needed.
Also, make the log show about which file we are talking about
Signed-off-by: Wido den Hollander <wido@widodh.nl>
Signed-off-by: Pierre-Luc Dion <pdion891@apache.org> 
						
						
					 
					
						2015-07-26 10:25:05 -04:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							df5f715090 
							
						 
					 
					
						
						
							
							coverity 1148416: auto close server socket  
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes  #578  
						
						
					 
					
						2015-07-14 11:53:22 +02:00 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							9ec2a6c29c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8623: CPVM fails to start after MS is restarted during its initial start-up process  
						
						... 
						
						
						
						If SSVM cannot be started then the existing entry is removed and a new SSVM gets created. Made similar changes for CPVM as well.
Also cleaned up some log messages in SSVM and CPVM manager code. 
						
						
					 
					
						2015-07-14 10:55:19 +05:30 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							bb2c02d144 
							
						 
					 
					
						
						
							
							coverity 1116693: properties template file creation unlikely but if repetitive, serious.  
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2015-07-09 21:30:24 +02:00 
						 
				 
			
				
					
						
							
							
								Rafael da Fonseca 
							
						 
					 
					
						
						
						
						
							
						
						
							949e97dec6 
							
						 
					 
					
						
						
							
							Fix findbugs warning in LibvirtConsoleProxyLoadCommandWrapper Encoding is now specified in both server and clients for the console proxy getstatus command For some reason, findbugs did not detect unsafe encoding issue in ConsoleProxyResource.java, is properly specified now though... CitrixConsoleProxyLoadCommandWrapper was specifying system default encoding for operation, should be ok because default for xenserver is UTF-8 since it's linux based, but it's best to specify exact encoding set on the server end to be consistent  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-06-15 12:04:18 +03:00 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							d423df66cc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8301: Enable configuring local storage use for system VMs at zone level  
						
						... 
						
						
						
						Code cleanup, added helper method to get default system offering based on "system.vm.use.local.storage". 
						
						
					 
					
						2015-05-19 21:32:14 +05:30 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							3f7e31ed05 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8301: Enable configuring local storage use for system VMs at zone level  
						
						... 
						
						
						
						Made system.vm.use.local.storage a zone level configuration. 
						
						
					 
					
						2015-05-19 21:32:14 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							069aa4e5f3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8433: remove awsapi db usage and add upgrade cleanup path  
						
						... 
						
						
						
						- Removes awsapi db properties usage across codebase
- Removes references from spring xmls, test cases and TransactionLegacy
- Adds sql command to drop database cloudbridge in schema-451to460-cleanup.sql
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-05-06 15:22:04 +02:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							df3dea58a2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6139: Fix regression, allow zone level systemvm localstorage config  
						
						... 
						
						
						
						From b3f18e7d74a0f09db9977554a6c7648b7edbc33d, the zone level systemvm local
storage setting never worked as it needed to be moved to config depot.
(cherry picked from commit 279efb04324249a2e1a5487b58b40a723baf4600)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2015-05-01 15:27:40 +02:00 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							d39b993512 
							
						 
					 
					
						
						
							
							Fixed a few findbugs issues after the merge 0b83559  
						
						... 
						
						
						
						HttpUploadServerHandler.java:142, DM_BOXED_PRIMITIVE_FOR_PARSING
NfsSecondaryStorageResource.java:2630, DM_BOXED_PRIMITIVE_FOR_PARSING
NfsSecondaryStorageResource.java:2775, DM_DEFAULT_ENCODING
EncryptionUtil.java:59, DM_DEFAULT_ENCODING 
						
						
					 
					
						2015-04-30 13:56:44 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							0b8355920e 
							
						 
					 
					
						
						
							
							Merge branch 'volume-upload' into master  
						
						... 
						
						
						
						This closes  #206  
						
						
					 
					
						2015-04-29 11:12:53 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							75ae90b073 
							
						 
					 
					
						
						
							
							volume-upload: added account level secondary storage resource limit checks  
						
						
						
						
					 
					
						2015-04-24 15:48:44 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							0525e4763b 
							
						 
					 
					
						
						
							
							volume-upload: refactored some error messages  
						
						
						
						
					 
					
						2015-04-24 15:45:29 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							a7e511c1a3 
							
						 
					 
					
						
						
							
							Added file exists check for onetime post url  
						
						... 
						
						
						
						also, fixed an issue where in the upload was going to error state in
case of parallel call to the same post url 
						
						
					 
					
						2015-04-17 18:08:23 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							9be70843fd 
							
						 
					 
					
						
						
							
							removed unused static main in ConsoleProxyPasswordBasedEncryptor  
						
						... 
						
						
						
						This closes  #11 
This closes  #10 
This closes  #176  
						
						
					 
					
						2015-04-17 12:07:04 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							ce823a3a26 
							
						 
					 
					
						
						
							
							Returning template/volume download percent in UploadStatusAnswer  
						
						... 
						
						
						
						Also updating the store ref entries on receiving the answer. 
						
						
					 
					
						2015-04-09 15:38:58 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							878b43bc64 
							
						 
					 
					
						
						
							
							volume-upload: removed hardcoded vhd for Image format check.  
						
						
						
						
					 
					
						2015-03-30 17:56:59 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							018023c1ef 
							
						 
					 
					
						
						
							
							volume upload: added validation for file formats  
						
						... 
						
						
						
						merged TemplateUtils and ImageStoreUtil to a singe ImageStoreUtil
also added a unittest for ImageStoreUtil 
						
						
					 
					
						2015-03-20 16:25:13 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							d5dffb5dc9 
							
						 
					 
					
						
						
							
							volume upload: added  md5 checksum validation  
						
						... 
						
						
						
						also fixed the issue wherein the successful uploads where also moving to
error state as the channelinactive is called after the end of successful
upload as well.
added a fileuploaded boolean to check when the channel is inactive. 
						
						
					 
					
						2015-03-18 12:20:51 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							6b8b4b92e6 
							
						 
					 
					
						
						
							
							handling tcp close event in netty server  
						
						... 
						
						
						
						while the file is in uploading state and connection is reset by peer,
volume upload request posted again shows the upload is IN_Progress
state. marking them as errored 
						
						
					 
					
						2015-03-17 15:21:25 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							3de5d9db5f 
							
						 
					 
					
						
						
							
							volume upload: Restart of MS leads to loss of browser uploaded templates  
						
						... 
						
						
						
						on restart of management server, template sync runs. It checks for
templates in ssvm using the uniquename. If it doesnt find any, cleans
the directory. In case of uploaded templates, these are getting saved
using name instead on uniquename and hence template sync cant find them
and does cleanup. Using uniquename in template.properties now. 
						
						
					 
					
						2015-03-16 12:45:24 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							c8901a7990 
							
						 
					 
					
						
						
							
							utils: use a better extended implementation of SSLSocketFactory  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b4a5a32a7488ecd93f295670e7f641fc32198aa7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-03-13 17:32:07 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							765622658a 
							
						 
					 
					
						
						
							
							Avoid distributing private key for realhostip.com  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d94a5720efbadb2e538dc68c45c88288486b68f6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-03-13 15:02:27 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							b16520bcec 
							
						 
					 
					
						
						
							
							volume upload: added max size check for temaplte/volume post upload  
						
						... 
						
						
						
						used the existing configuration variables max.template.iso.size and
storage.max.volume.upload.size for templates and volumes respectively. 
						
						
					 
					
						2015-03-03 17:27:40 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							58f2fb1bb1 
							
						 
					 
					
						
						
							
							volume upload: post response http error code is 200 even for error case  
						
						... 
						
						
						
						Returned appropriate error code(bad request, internal server error, ok) 
						
						
					 
					
						2015-02-17 12:31:38 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							643165a07e 
							
						 
					 
					
						
						
							
							volume upload: used netty server to do the file upload  
						
						
						
						
					 
					
						2015-02-17 12:31:27 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							01c41d09db 
							
						 
					 
					
						
						
							
							volume upload: returning the install path and size in UploadStatusCommand  
						
						
						
						
					 
					
						2015-02-17 11:28:32 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							1a6df6f978 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7908: Add user_id column to vm_instance table  
						
						... 
						
						
						
						Design Document:
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Allow+VM+listing+by+User+ID 
- Adds column to VMInstance DAO
- Adds column in vm_instance table
- Adds column in the UserVMJoinVO
- Adds default admin user which has UID = 2
- Adds migration path that sets user_id to first user of the accountId that
  owns the vm in vm_instance table
- Add arg on list VMs API to query by userId, add support in query layer
- Refactor VMInstanceVO and child classes to accept userId
- Add code to let service layer pass userId if loggedIn user belongs to same
  account as the owner executing an API call or use first user from owner account
- In case of CPVM and SSVM use system user ID
- Fix unit tests and spring injections
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-16 15:02:38 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							d5538fbe3b 
							
						 
					 
					
						
						
							
							Publish secstorage failure, removed by a12ab8a2b3a14d2fed2bca287823bb558d0501fb  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-05 15:55:13 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							7231daa71d 
							
						 
					 
					
						
						
							
							volume upload: fixed the post body parsing logic  
						
						... 
						
						
						
						as long as the boundary is completely in the byte buffer it works. 
						
						
					 
					
						2015-01-29 16:55:29 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							92669e314e 
							
						 
					 
					
						
						
							
							volume upload: modified parsing logic  
						
						... 
						
						
						
						vhd file download works fine. some open issues with parsing params 
						
						
					 
					
						2015-01-29 16:55:28 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							0d74d7bdea 
							
						 
					 
					
						
						
							
							use a preferable protocol that works on most infra  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f5f6c2d1a74444bbbf5a5f4565953b6410b87a5c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
	services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java
(cherry picked from commit 1bab1d0855f8813a54028aa58715db75d9c06ca0)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-01-29 16:03:29 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							607ac8f4f4 
							
						 
					 
					
						
						
							
							services, awsapi: use better string comparision  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d08369ad06b6d5ef801f79493c2aa4bdaeab1b83)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-01-22 18:10:23 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							664186f483 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8160: use preferable protocols  
						
						... 
						
						
						
						(cherry picked from commit debfcdef788ce0d51be06db0ef10f6815f9b563b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-01-21 18:04:45 +05:30 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							2a2d4364e1 
							
						 
					 
					
						
						
							
							made changes to move a file to the specified localtion  
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com> 
						
						
					 
					
						2015-01-20 16:02:33 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							a31e1bff33 
							
						 
					 
					
						
						
							
							volume upload: fixed build error from the commit b0a96c4c85f2d6dfe57ce3474ce95ebb3cec6d2a  
						
						
						
						
					 
					
						2015-01-20 12:44:05 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							b0a96c4c85 
							
						 
					 
					
						
						
							
							volume upload: fixed nio server blocking thread issue  
						
						
						
						
					 
					
						2015-01-20 12:27:26 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							15ae33a5b6 
							
						 
					 
					
						
						
							
							volume upload: refactored post upload command and used it during template registration  
						
						
						
						
					 
					
						2015-01-20 09:24:14 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							ad6b7b30cb 
							
						 
					 
					
						
						
							
							Volume upload: sending the nfsstore url in the metadata  
						
						... 
						
						
						
						decoding the metadata and deserialising it on receiving it 
						
						
					 
					
						2015-01-19 18:04:14 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							ca0f9de6c7 
							
						 
					 
					
						
						
							
							volume upload: parsing post body to get all the params  
						
						
						
						
					 
					
						2015-01-19 12:04:30 +05:30 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							7900ae5d9f 
							
						 
					 
					
						
						
							
							volume-upload: initializing state for volume and also setting the post url in volume_store_ref  
						
						
						
						
					 
					
						2015-01-19 11:03:42 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							c5be9d0b9b 
							
						 
					 
					
						
						
							
							volume upload: removed debug messages in post request handler.  
						
						
						
						
					 
					
						2015-01-17 04:23:44 +05:30