apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.5'

Browse Source 
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
This commit is contained in:
Rajani Karuturi 2014-11-13 14:45:59 +05:30
commit 8c9093b1df
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/dictionary2.jsp
View File

@ -1012,6 +1012,6 @@ $.extend(dictionary, {
'state.detached': '<fmt:message key="state.detached" />',
'label.na': '<fmt:message key="label.na" />',
'label.added.network.offering': '<fmt:message key="label.added.network.offering" />',
'label.no': '<fmt:message key="label.no" />',
'label.no': '<fmt:message key="label.no" />'
});
</script>