Chiradeep Vittal cadca5fc0c Merge branch 'master' into network-refactor-merge2 ...

Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java

2013-01-16 19:17:14 -08:00

..

bindir

Improved handling of unknown OS, Distribution

2013-01-13 15:08:04 +05:30

distro

init: Explicitly set the HOME variable to the homedir of the user cloud

2013-01-09 13:11:21 +01:00

tomcatconf

Merge branch 'master' into network-refactor-merge2

2013-01-16 19:17:14 -08:00

WEB-INF

CLOUDSTACK-646: Cleaning up Citrix/eula/CloudPlatform references

2012-12-16 20:39:03 -08:00

cloudstack-ui.launch

client: Re-add missing license header in client/cloudstack-ui.launch

2012-12-23 02:47:27 -08:00

pom.xml

ApiDiscovery: New plugin to help discover apis on mgmt server

2013-01-08 18:54:29 -08:00