Rajani Karuturi 8c9093b1df Merge branch '4.5' ... Conflicts: framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java setup/db/db/schema-441to450.sql test/integration/component/test_escalations_instances.py ui/dictionary2.jsp ui/scripts/cloudStack.js This closes #38		2014-11-13 14:53:05 +05:30
..
css	Merge branch '4.5'	2014-11-05 16:26:08 +05:30
images	CLOUDSTACK-6227 (Add copy-paste support for detail view fields):	2014-03-28 10:15:19 -07:00
lib	CLOUDSTACK-7659: UI: Upgrade jquery-validate lib to the latest 1.13.0 version with the additional-methods included.	2014-10-28 14:20:56 -07:00
modules	Fix Externalization of hard-coded label strings	2014-09-17 13:59:13 -07:00
plugins	Remove file added by accident in previous commit.	2013-09-30 10:08:16 -07:00
scripts	CLOUDSTACK-7896: UI > network > Add Guest Network > when zone dropdown is empty, do not make API call to get physical networks.	2014-11-12 16:25:41 -08:00
tests	List view: tests for filter dropdown	2014-01-28 15:48:44 -08:00
dictionary.jsp	Fixed incorrect label issue.	2014-10-23 13:25:20 -07:00
dictionary2.jsp	Merge branch '4.5'	2014-11-13 14:53:05 +05:30
index.jsp	CLOUDSTACK-7659: UI: Upgrade jquery-validate lib to the latest 1.13.0 version with the additional-methods included.	2014-10-28 14:20:56 -07:00