Return-Path: 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 19DD0189A7 for ; Mon, 30 Nov 2015 21:43:00 +0000 (UTC) Received: (qmail 64741 invoked by uid 500); 30 Nov 2015 21:42:58 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 64617 invoked by uid 500); 30 Nov 2015 21:42:58 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 64160 invoked by uid 99); 30 Nov 2015 21:42:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Nov 2015 21:42:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6A811E2C51; Mon, 30 Nov 2015 21:42:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Mon, 30 Nov 2015 21:43:07 -0000 Message-Id: <00224779a553457989297785df7422c1@git.apache.org> In-Reply-To: <45225b108ae541b68cdfac87a7b54678@git.apache.org> References: <45225b108ae541b68cdfac87a7b54678@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/10] git commit: updated refs/heads/master to 4ecfc29 Merge release branch 4.6 to master * 4.6: Use version for RC branch name instead of branch make sure all files are updates with new version Update L10N resource files with 4.6 strings from Transifex (20151129) Fix secondary storage not working with swift CLOUDSTACK-9083: Add disk serial to kvm virt xml Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4ecfc292 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4ecfc292 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4ecfc292 Branch: refs/heads/master Commit: 4ecfc29267c7d796aca00826283c04302dafa4e3 Parents: 20dcc25 cb50eb8 Author: Remi Bergsma Authored: Mon Nov 30 22:30:52 2015 +0100 Committer: Remi Bergsma Committed: Mon Nov 30 22:30:52 2015 +0100 ---------------------------------------------------------------------- .../WEB-INF/classes/resources/messages_ar.properties | 4 ++-- .../classes/resources/messages_de_DE.properties | 1 + .../classes/resources/messages_fr_FR.properties | 5 +++-- .../classes/resources/messages_nb_NO.properties | 1 + .../classes/resources/messages_nl_NL.properties | 1 + .../classes/resources/messages_pt_BR.properties | 1 + .../classes/resources/messages_ru_RU.properties | 1 + .../kvm/resource/LibvirtComputingResource.java | 6 ++++++ .../cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 11 ++++++++++- .../hypervisor/kvm/storage/KVMStorageProcessor.java | 9 ++++++--- .../kvm/resource/LibvirtComputingResourceTest.java | 8 ++++++++ .../storage/resource/NfsSecondaryStorageResource.java | 12 ++++++++++-- tools/build/build_asf.sh | 13 +++++++------ tools/build/setnextversion.sh | 7 +++++++ 14 files changed, 64 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4ecfc292/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4ecfc292/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4ecfc292/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4ecfc292/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java ----------------------------------------------------------------------