Alena Prokharchyk 048c5e50cf Merge branch 'master' into vpc ... Conflicts: utils/test/com/cloud/utils/component/MockComponentLocator.java		2012-08-08 11:50:39 -07:00
..
css	CS-15891: Add view console action to VPC instances list view	2012-08-07 16:00:35 -07:00
images	multiEdit: better handling for tag widget	2012-08-06 14:15:41 -07:00
lib	(1) CS-15057: Remove jquery.timer.js from source code. Replace it with native JavaScript functions.	2012-06-21 12:13:41 -07:00
scripts	Merge branch 'master' into vpc	2012-08-08 11:50:39 -07:00
tests	License header updates for the UI folder	2012-08-03 12:45:47 -04:00
.classpath	License header updates for the UI folder	2012-08-03 12:45:47 -04:00
.project	License header updates for the UI folder	2012-08-03 12:45:47 -04:00
index.jsp	CS-15892: Tier detail view: Show 'tier details' instead of 'details'	2012-08-07 16:02:07 -07:00