Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							d1642a489c 
							
						 
					 
					
						
						
							
							=initial changes  
						
						
						
						
					 
					
						2013-04-25 18:29:57 +05:30 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							eae22d2ffa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-741: Granular Global Parameters  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-04-19 10:36:52 +05:30 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							77ccc22723 
							
						 
					 
					
						
						
							
							Pulling back the changes to ServiceOffering to add a planner - these changes will be part of a separate feature branch  
						
						
						
						
					 
					
						2013-04-16 15:17:01 -07:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							8f865c5a90 
							
						 
					 
					
						
						
							
							Dedicate Public IP address range to an account  
						
						
						
						
					 
					
						2013-04-12 23:27:35 +05:30 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							c8ae2a9d25 
							
						 
					 
					
						
						
							
							API to list planners and set the planner in Service offering  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql 
						
						
					 
					
						2013-04-11 13:22:56 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							98bc240d2a 
							
						 
					 
					
						
						
							
							Revert "Dedicate Public IP range"  
						
						... 
						
						
						
						This reverts commit d6ed8d7cb53da08cacd04c3ac7435da5601e7f06.
Conflicts:
	server/test/com/cloud/configuration/ConfigurationManagerTest.java 
						
						
					 
					
						2013-04-08 17:15:51 -07:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							d6ed8d7cb5 
							
						 
					 
					
						
						
							
							Dedicate Public IP range  
						
						
						
						
					 
					
						2013-04-08 14:46:21 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1b408509d6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1332: Add IPv6 DNS for Zone  
						
						
						
						
					 
					
						2013-02-25 16:08:10 -08:00 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							7a3f072a50 
							
						 
					 
					
						
						
							
							CLOUDSTACK-745: Reset a VM on reboot. On every reboot of VM, the root disk state is reset. This is for the VMs created using service offering where an optional parameter isvolatile is set true.  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-02-21 14:59:35 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							f2b97db0f9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1172: LDAP enhancements  
						
						
						
						
					 
					
						2013-02-19 15:36:39 +05:30 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							296c20332d 
							
						 
					 
					
						
						
							
							Merge javelin into master  
						
						
						
						
					 
					
						2013-02-01 14:40:45 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7b75f0d990 
							
						 
					 
					
						
						
							
							Sync master to javelin one more time  
						
						
						
						
					 
					
						2013-02-01 11:37:33 -08:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							13ee8d1865 
							
						 
					 
					
						
						
							
							Persistent Networks support  
						
						... 
						
						
						
						Signed-off-by: Murali Reddy <murali.reddy@citrix.com> 
						
						
					 
					
						2013-02-01 15:10:06 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							9ea90c3359 
							
						 
					 
					
						
						
							
							Merge branch 'master' into regions  
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/components.xml.in
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2013-02-01 11:38:16 +05:30 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7bd8bec68a 
							
						 
					 
					
						
						
							
							Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a  
						
						
						
						
					 
					
						2013-01-31 17:20:19 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							176523254e 
							
						 
					 
					
						
						
							
							Improve component lifecycle management with system run-level concept  
						
						
						
						
					 
					
						2013-01-30 15:21:02 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							bd4bc025d1 
							
						 
					 
					
						
						
							
							IPv6: Accept IPv6 parameter for createNetworkCmd  
						
						... 
						
						
						
						Also ass public_ipv6_address for ipv6 address management.
Extend nics and vlans for ipv6 address.
Add dependency to com.googlecode.ipv6(java-ipv6).
Modify dhcpcommand for ipv6. 
						
						
					 
					
						2013-01-26 23:14:15 -08:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							1f57d925eb 
							
						 
					 
					
						
						
							
							Apply API refactoring changes. Make changes to Regions API to work with new code  
						
						
						
						
					 
					
						2013-01-25 18:41:59 +05:30 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							df5c4c3048 
							
						 
					 
					
						
						
							
							Fixing VPC unit test to use Spring  
						
						
						
						
					 
					
						2013-01-24 23:05:31 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							fe6f0457d5 
							
						 
					 
					
						
						
							
							fixed unit tests from merge  
						
						
						
						
					 
					
						2013-01-18 15:58:55 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							30f2565d98 
							
						 
					 
					
						
						
							
							Merge branch 'api_refactoring' into javelin  
						
						
						
						
					 
					
						2013-01-08 12:36:04 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							af28c06998 
							
						 
					 
					
						
						
							
							api: move and group all under command, org.apache.cloudstack.command.*  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-07 18:30:54 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							780eb95830 
							
						 
					 
					
						
						
							
							api_refactor: swift, ldap and vlan apis to admin pkg  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 11:13:46 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							6c2ed5cb66 
							
						 
					 
					
						
						
							
							api_refactor: move pod apis to admin pkg  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 11:02:57 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							1f1ac79a6c 
							
						 
					 
					
						
						
							
							api_refactor: move disk and service offering to admin pkg  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 10:53:42 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ecc8249365 
							
						 
					 
					
						
						
							
							api_refactor: move cfg admin apis  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 10:50:26 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							c3853677c5 
							
						 
					 
					
						
						
							
							api_refactor: move zone apis to admin pkg  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 10:41:10 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							2121fbd469 
							
						 
					 
					
						
						
							
							api_refactor: refactor network apis for admin pkg  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-04 11:38:40 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							47ae62e44a 
							
						 
					 
					
						
						
							
							api_refactor: refactor network apis  
						
						... 
						
						
						
						- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
- Fix trailing whitespaces for all *.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-03 22:47:07 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							5edfc2760a 
							
						 
					 
					
						
						
							
							refactor: remove redundant imports, fix trailing chars  
						
						
						
						
					 
					
						2012-12-03 13:54:37 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cea8f3bf37 
							
						 
					 
					
						
						
							
							Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation  
						
						
						
						
					 
					
						2012-11-07 15:03:22 -08:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							f0f33bf4da 
							
						 
					 
					
						
						
							
							Added Mock ApiServer, Regions API calls with api keys  
						
						
						
						
					 
					
						2012-10-17 14:16:36 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2307117a24 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						
						
						
					 
					
						2012-09-11 17:38:31 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c876a66b3f 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						
						
						
					 
					
						2012-09-11 17:26:20 -07:00 
						 
				 
			
				
					
						
							
							
								Gavin Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							d3921139ed 
							
						 
					 
					
						
						
							
							Patch from Gavin Lee: Change license to ASL2.0 in server and tools  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-08-30 10:36:29 -04:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bda1e2d08d 
							
						 
					 
					
						
						
							
							VPC: more unittests for VpcService  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java 
						
						
					 
					
						2012-08-07 11:37:36 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							cf64fda5d5 
							
						 
					 
					
						
						
							
							VPC: unittest preparation  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-08-07 11:23:52 -07:00