Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							1c408dec37 
							
						 
					 
					
						
						
							
							Merge branch '4.5' after 4.5.1 vote passes  
						
						 
						
						
						
						
					 
					
						2015-05-07 16:03:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ramamurtis 
							
						 
					 
					
						
						
						
						
							
						
						
							5646a07513 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8427: Some messages are hard-coded in javascript after Volume upload branch merge(0b835592)  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
This closes  #208  
						
						
					 
					
						2015-04-29 15:00:11 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							35ddc49a2c 
							
						 
					 
					
						
						
							
							Update L10N resource files on master branch (with 4.6 translation strings from Transifex)  
						
						 
						
						
						
						
					 
					
						2015-04-25 23:36:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							445bc36ed9 
							
						 
					 
					
						
						
							
							Update L10N resource files on 4.5 branch (with 4.5 translation strings from Transifex)  
						
						 
						
						
						
						
					 
					
						2015-04-25 23:30:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							a95d4e1d6d 
							
						 
					 
					
						
						
							
							Fix some typos. Thanks Atalanttore (from Transifex)  
						
						 
						
						
						
						
					 
					
						2015-04-25 23:18:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							eb6df334fc 
							
						 
					 
					
						
						
							
							Fix some typos. Thanks Atalanttore (from Transifex)  
						
						 
						
						
						
						
					 
					
						2015-04-25 23:07:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							6a7a9caf62 
							
						 
					 
					
						
						
							
							Fix some typo  
						
						 
						
						... 
						
						
						
						Thanks Atalanttore from Transifex way 
						
						
					 
					
						2015-04-19 15:18:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							21ab28044e 
							
						 
					 
					
						
						
							
							Fix some typo  
						
						 
						
						... 
						
						
						
						Thanks Atalanttore from Transifex way 
						
						
					 
					
						2015-04-19 15:15:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							e0925a085c 
							
						 
					 
					
						
						
							
							Update L10N resource files on master branch (with 4.6 translation strings from Transifex)  
						
						 
						
						
						
						
					 
					
						2015-04-19 10:30:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							376b27a430 
							
						 
					 
					
						
						
							
							Update L10N resource files on 4.5 branch (with 4.5 translation strings from Transifex)  
						
						 
						
						
						
						
					 
					
						2015-04-19 10:09:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							208a5655be 
							
						 
					 
					
						
						
							
							Closed typo issue (from Transifex  by Atalanttore)  
						
						 
						
						... 
						
						
						
						No blank space between "Duration" and "(in sec)" 
						
						
					 
					
						2015-04-19 09:00:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							9560021f1f 
							
						 
					 
					
						
						
							
							Closed typo issue (from Transifex  by Atalanttore)  
						
						 
						
						... 
						
						
						
						No blank space between "Duration" and "(in sec)" 
						
						
					 
					
						2015-04-19 08:53:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KC Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							01864ef77c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6697: bigswitch networking plugin update  
						
						 
						
						... 
						
						
						
						1. provide compatibility with the Big Cloud Fabric (BCF) controller
   L2 Connectivity Service in both VPC and non-VPC modes
2. virtual network terminology updates: VNS --> BCF_SEGMENT
3. uses HTTPS with trust-always certificate handling
4. topology sync support with BCF controller
5. support multiple (two) BCF controllers with HA
6. support VM migration
7. support Firewall, Static NAT, and Source NAT with NAT enabled option
8. add VifDriver for Indigo Virtual Switch (IVS)
This closes  #151 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-04-09 13:02:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							fc9a4f66ca 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8094: Fixed incorrect label issue.  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 4e1284147e0f5489c25d275dd047854d17002691)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
	ui/dictionary2.jsp 
						
						
					 
					
						2015-03-23 16:44:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							6194b2c93e 
							
						 
					 
					
						
						
							
							Move the . to the right place.  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:40:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							dfa37b3159 
							
						 
					 
					
						
						
							
							Better message about making the VPC redundant  
						
						 
						
						... 
						
						
						
						Remove the labels in other languages: Hugo told me there is a team responsible for that 
						
						
					 
					
						2015-03-16 11:40:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							4c9f4fcdd3 
							
						 
					 
					
						
						
							
							Make virtual router id unique per redundant group  
						
						 
						
						... 
						
						
						
						Customise the messages showed during VPC restart based on redundancy
Do not show "Make Redundant" option if VPC is already redundant
Show on VPC details if a VPC is redundant 
						
						
					 
					
						2015-03-16 11:39:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							e350f1e76f 
							
						 
					 
					
						
						
							
							Turn a single VPC into a redundant VPC  
						
						 
						
						... 
						
						
						
						- when restarting a VPC, the user can check the option Make Redundant in order to change
    the VPC offering and make it redundant 
						
						
					 
					
						2015-03-16 11:39:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Funs 
							
						 
					 
					
						
						
						
						
							
						
						
							c27c69438b 
							
						 
					 
					
						
						
							
							hypervisors: add OVM3 plugin that supports OVM 3.2.1/3.3.x  
						
						 
						
						... 
						
						
						
						This is a plugin that puts in ovm3 support ranging from 3.3.1 to 3.3.2. Basic
functionality is in here, advanced networking etc..
Snapshots only work when a VM is stopped now due to the semantics of OVM's raw
image implementation (so snapshots should work on a storage level underneath the
hypervisor shrug)
This closes  #113 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-03-12 11:33:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NuxRo 
							
						 
					 
					
						
						
						
						
							
						
						
							f06dc56e6a 
							
						 
					 
					
						
						
							
							Update messages.properties  
						
						 
						
						
						
						
					 
					
						2015-02-25 10:31:57 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NuxRo 
							
						 
					 
					
						
						
						
						
							
						
						
							81378c49de 
							
						 
					 
					
						
						
							
							Update messages.properties  
						
						 
						
						... 
						
						
						
						Instances ca be scaled up or down, no only up. 
						
						
					 
					
						2015-02-23 16:01:42 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							db9a4f3648 
							
						 
					 
					
						
						
							
							fix CLOUDSTACK-8187 and CLOUDSTACK-8232: missing UI labels  
						
						 
						
						
						
						
					 
					
						2015-02-19 22:39:56 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							0c70d11bc3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8188: missing labe:label.password.reset.confirm  
						
						 
						
						
						
						
					 
					
						2015-02-19 22:37:12 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							177c190367 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8188: missing labe:label.password.reset.confirm. removed duplicate label.vlan.id from dictionary2.jsp removed duplicate label.vlan from message.properties  
						
						 
						
						
						
						
					 
					
						2015-02-19 22:12:32 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pierre-Luc Dion 
							
						 
					 
					
						
						
						
						
							
						
						
							34c75f296b 
							
						 
					 
					
						
						
							
							fix CLOUDSTACK-8187 and CLOUDSTACK-8232: missing UI labels  
						
						 
						
						
						
						
					 
					
						2015-02-19 21:00:33 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							552f2ae60c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8191: SAML users should have their own accounts  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 876c78fe1ba6abe132131b3449b21fd09f2c14e1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-02 19:58:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							876c78fe1b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8191: SAML users should have their own accounts  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-02-02 19:56:25 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							54db0d2a70 
							
						 
					 
					
						
						
							
							show Warning instead of Confirmation in confirm dialog if isWarning is set to true  
						
						 
						
						
						
						
					 
					
						2014-12-19 10:06:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							21d9f132ca 
							
						 
					 
					
						
						
							
							Fix 'add isolated guest network' label  
						
						 
						
						
						
						
					 
					
						2014-12-17 14:15:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							19e99848c8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7882: SSH Keypair Creation/Selection in UI  
						
						 
						
						... 
						
						
						
						Thanks Ilia Shakitko for the porting and testing. 
						
						
					 
					
						2014-12-12 14:30:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							dcb7fcc6df 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8063: list secondary Ips information in VM response  
						
						 
						
						
						
						
					 
					
						2014-12-12 09:47:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jean-Francois Vincent 
							
						 
					 
					
						
						
						
						
							
						
						
							068e508e3b 
							
						 
					 
					
						
						
							
							Add the Userdata setting to the UI on VM creation step  
						
						 
						
						
						
						
					 
					
						2014-12-09 11:32:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							4722fa3de9 
							
						 
					 
					
						
						
							
							Merge branch '4.5'  
						
						 
						
						... 
						
						
						
						Conflicts:
	client/WEB-INF/classes/resources/messages_ja_JP.properties
	client/WEB-INF/classes/resources/messages_zh_CN.properties
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/event-bus/rabbitmq/pom.xml
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/VolumeApiServiceImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	setup/db/db/schema-442to450.sql
	test/integration/component/test_persistent_networks.py
This closes  #53  
						
						
					 
					
						2014-12-08 15:27:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mihaela Stoica 
							
						 
					 
					
						
						
						
						
							
						
						
							a07938752a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8010: [UI] Fixed unlocalized string "label.add.private.gateway"  
						
						 
						
						
						
						
					 
					
						2014-12-04 12:55:46 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							9ce8a1cd00 
							
						 
					 
					
						
						
							
							Fixed label issue and externalized hardcoding issues  
						
						 
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com> 
						
						
					 
					
						2014-12-04 11:28:44 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Vega 
							
						 
					 
					
						
						
						
						
							
						
						
							93f8213412 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7915: Remove hard-coded values for Load Balancer algorithms in UI  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit ba6dfd84702eeef0362b94068add1328db84133a) 
						
						
					 
					
						2014-11-25 15:55:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Vega 
							
						 
					 
					
						
						
						
						
							
						
						
							ba6dfd8470 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7915: Remove hard-coded values for Load Balancer algorithms in UI  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com> 
						
						
					 
					
						2014-11-25 11:56:34 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							ebd42a8435 
							
						 
					 
					
						
						
							
							Fix missing 'add LDAP account' label  
						
						 
						
						
						
						
					 
					
						2014-11-21 09:16:41 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							66e805cba9 
							
						 
					 
					
						
						
							
							Fixes: Hardcoded strings externalized from various JS files.  
						
						 
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com> 
						
						
					 
					
						2014-11-21 08:02:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							5327038c16 
							
						 
					 
					
						
						
							
							Missing label id and removed duplicate label.ids.  
						
						 
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com> 
						
						
					 
					
						2014-11-18 14:03:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							317606859b 
							
						 
					 
					
						
						
							
							Update L10N resource files on master branch with 4.5 translation strings  
						
						 
						
						
						
						
					 
					
						2014-11-15 08:48:44 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							303fc90057 
							
						 
					 
					
						
						
							
							Update L10N resource files on master branch (with 4.5 translation strings)  
						
						 
						
						
						
						
					 
					
						2014-11-15 08:40:23 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							bdcaaca40e 
							
						 
					 
					
						
						
							
							Updated transaltions to JA & SC Files  
						
						 
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com> 
						
						
					 
					
						2014-11-14 08:09:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							03fa319473 
							
						 
					 
					
						
						
							
							Fixes: [UI] Added missing label to properties.file.  
						
						 
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com> 
						
						
					 
					
						2014-11-04 13:01:22 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							55264b24a6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7808: Typo in Zone Creation Wizard  
						
						 
						
						
						
						
					 
					
						2014-10-28 14:34:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							4e1284147e 
							
						 
					 
					
						
						
							
							Fixed incorrect label issue.  
						
						 
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com> 
						
						
					 
					
						2014-10-23 13:25:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3db112f75c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label.  
						
						 
						
						
						
						
					 
					
						2014-10-17 14:58:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e796d418b4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label.  
						
						 
						
						
						
						
					 
					
						2014-10-17 14:57:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mihaela Stoica 
							
						 
					 
					
						
						
						
						
							
						
						
							28f8c41a19 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7645: [UI] Fixing incorrect labels, including instances of "???label.*???"  
						
						 
						
						... 
						
						
						
						- removed duplicate entries in dictionary
- added dictionary entries that have been missed during the dictionary split
- added missing entries in messages.properties
- fixed other localization issues
(cherry picked from commit 0646588fc6d5cfc6d9b0da80d8e44697d72005d3) 
						
						
					 
					
						2014-10-13 00:23:20 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							3fd97ca3b8 
							
						 
					 
					
						
						
							
							Fixed Encoding issue to message_ja_JP & message_zh_CN properties files.  
						
						 
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
(cherry picked from commit 03e3a39ede5c7be485effa32b31598af3165b5f5) 
						
						
					 
					
						2014-10-13 00:00:19 -04:00