Alena Prokharchyk 56d94fc074 Merge branch 'master' into internallb1 ... Conflicts: plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java server/src/com/cloud/network/vpc/VpcManagerImpl.java		2013-05-09 10:21:34 -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	Add UI 'module' API	2013-04-18 12:52:55 -07:00
plugins	rat: Fix license for file from recent ui-plugins merge	2013-02-14 17:18:22 +05:30
scripts	Merge branch 'master' into internallb1	2013-05-09 10:21:34 -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