etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/ui
History
Sheng Yang 2d2c0c48cd Merge branch 'pvlan' 
Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
 		2013-05-15 16:08:08 -07:00
..
css VM wizard: fix select container overflow 2013-04-30 13:40:52 -07:00
images Update affinity icon 2013-04-25 13:21:15 -07:00
lib Add plugin loading functionality and basic framework 2012-12-19 15:47:25 -08:00
modules CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - physical network - network service providers - Cisco VNMC - fix a bug that detailView loads forever. 2013-05-10 11:54:17 -07:00
plugins rat: Fix license for file from recent ui-plugins merge 2013-02-14 17:18:22 +05:30
scripts Merge branch 'pvlan' 2013-05-15 16:08:08 -07:00
tests License header updates for the UI folder 2012-08-03 12:45:47 -04:00
dictionary.jsp VM wizard: Show message if no affinity groups are available. 2013-04-30 13:30:40 -07:00
index.jsp Merge branch 'master' into ui-granular-settings 2013-05-01 14:45:05 -07:00