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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c9093b1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c9093b1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c9093b1
Branch: refs/heads/master
Commit: 8c9093b1dff811803e48561b86a90731f2d4e8cb
Parents: b8fdda0 8b7c1d7
Author: Rajani Karuturi <[email protected]>
Authored: Thu Nov 13 14:45:59 2014 +0530
Committer: Rajani Karuturi <[email protected]>
Committed: Thu Nov 13 14:53:05 2014 +0530
----------------------------------------------------------------------
ui/dictionary2.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c9093b1/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --cc ui/dictionary2.jsp
index a755ebc,28b4f05..a76ba3b
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@@ -1012,6 -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>
