Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5a72044dc7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						
						
						
					 
					
						2012-08-03 14:30:54 -07:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							2930eef00c 
							
						 
					 
					
						
						
							
							License header updates for the setup folder.  
						
						
						
						
					 
					
						2012-08-03 09:49:02 -04:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7706a9c32f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java 
						
						
					 
					
						2012-07-31 13:37:28 -07:00 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							3610401edc 
							
						 
					 
					
						
						
							
							Fail with non-zero exit code when toc category missing  
						
						
						
						
					 
					
						2012-07-31 17:23:41 +05:30 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							0829ee164a 
							
						 
					 
					
						
						
							
							removing lots of web tracking stuff from apidocs stylesheets  
						
						
						
						
					 
					
						2012-07-30 10:42:53 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							048bd2e498 
							
						 
					 
					
						
						
							
							fixing copyright notices on apidocs  
						
						
						
						
					 
					
						2012-07-30 10:32:07 -04:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1f01d923ca 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						
						
						
					 
					
						2012-06-28 17:44:08 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							634cd78baa 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript 
						
						
					 
					
						2012-06-28 17:41:40 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							fc3ac862dc 
							
						 
					 
					
						
						
							
							applying the commits from Chip Childers licensing cleanup  
						
						
						
						
					 
					
						2012-06-26 10:44:04 -04:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ce876e24de 
							
						 
					 
					
						
						
							
							VPC: intermidiate checkin to Static Routes  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java 
						
						
					 
					
						2012-06-25 21:00:57 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							11de5d4fbe 
							
						 
					 
					
						
						
							
							Fixed apidoc build  
						
						... 
						
						
						
						Conflicts:
	setup/apidoc/gen_toc.py 
						
						
					 
					
						2012-06-25 20:56:45 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ccec9192a2 
							
						 
					 
					
						
						
							
							VPC: implemented delete and list Network ACL(s)  
						
						
						
						
					 
					
						2012-06-20 17:20:04 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c653b22d94 
							
						 
					 
					
						
						
							
							Api docs: added category for resource tags commands  
						
						
						
						
					 
					
						2012-06-20 15:45:08 -07:00 
						 
				 
			
				
					
						
							
							
								Ewan Mellor 
							
						 
					 
					
						
						
						
						
							
						
						
							93ce302db3 
							
						 
					 
					
						
						
							
							Added a category declaration for CiscoNexus (I put it in the Network category)  
						
						... 
						
						
						
						and improved the exception. 
						
						
					 
					
						2012-05-23 12:06:45 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							4d517435b8 
							
						 
					 
					
						
						
							
							Update documentation headers for v3.0 in API Reference.  
						
						
						
						
					 
					
						2012-02-16 02:04:30 -08:00 
						 
				 
			
				
					
						
							
							
								Ewan Mellor 
							
						 
					 
					
						
						
						
						
							
						
						
							22119a33b5 
							
						 
					 
					
						
						
							
							Added build-apidocs-zip build target that generates HTML versions of the  
						
						... 
						
						
						
						API docs.  Uses XML/XSLT generation system originally by Abhinandan Prateek
(I think).  CSS updates from Jessica Tomechak.  gen_toc.py and build script
changes by me. 
						
						
					 
					
						2012-02-08 20:40:29 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							52610ffcb3 
							
						 
					 
					
						
						
							
							add copyright header to shell scripts  
						
						
						
						
					 
					
						2012-01-11 18:41:53 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							cd929e69fa 
							
						 
					 
					
						
						
							
							correct ant build-apidoc  
						
						... 
						
						
						
						use right script path 
						
						
					 
					
						2011-10-18 14:40:28 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							625a601615 
							
						 
					 
					
						
						
							
							correct ant build-apidoc  
						
						
						
						
					 
					
						2011-10-18 14:31:33 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							27d6020569 
							
						 
					 
					
						
						
							
							Ant target for apiDocs building  
						
						
						
						
					 
					
						2011-06-07 11:21:07 -07:00