Return-Path: 
 <commits-return-46100-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 33575F9A4
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Thu, 13 Nov 2014 09:42:57 +0000 (UTC)
Received: (qmail 3572 invoked by uid 500); 13 Nov 2014 09:42:47 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 3529 invoked by uid 500); 13 Nov 2014 09:42:47 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 2978 invoked by uid 99); 13 Nov 2014 09:42:47 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Nov 2014 09:42:47 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id CA663A13931; Thu, 13 Nov 2014 09:42:46 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: rajani@apache.org
To: commits@cloudstack.apache.org
Date: Thu, 13 Nov 2014 09:43:13 -0000
Message-Id: <f2d4eb32f3b74b22918c4c9aab0d7582@git.apache.org>
In-Reply-To: <76999f67ce664ec6ae94b2aefe4f51eb@git.apache.org>
References: <76999f67ce664ec6ae94b2aefe4f51eb@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [28/28] git commit: updated refs/heads/master to 8c9093b

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 <rajanikaruturi@gmail.com>
Authored: Thu Nov 13 14:45:59 2014 +0530
Committer: Rajani Karuturi <rajanikaruturi@gmail.com>
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>