----- Original Message -----
From: "Einav Cohen" <ecohen(a)redhat.com>
To: "Sandro Bonazzola" <sbonazzo(a)redhat.com>, "Alexander Wels"
<awels(a)redhat.com>, "Vojtech Szocs"
<vszocs(a)redhat.com>
Cc: "devel" <devel(a)ovirt.org>, "Juan Antonio Hernandez
Fernandez" <juan.hernandez(a)redhat.com>, mmirecki(a)redhat.com,
"Tomas Jelinek" <tjelinek(a)redhat.com>
Sent: Wednesday, September 30, 2015 12:43:16 PM
Subject: Re: [ovirt-devel] oVirt 3.6.0 Branch
> ----- Original Message -----
> From: "Sandro Bonazzola" <sbonazzo(a)redhat.com>
> Sent: Wednesday, September 30, 2015 4:13:31 AM
>
> Hi,
> just to be sure everyone is aware, we branched vort-engine-3.6.0 on RC
> release.
> The following patches are in 3.6 branch and not in 3.6.0.
> please check if they need to be backported
>
>
> 18710 patches on origin/ovirt-engine-3.6
> 18701 patches on origin/ovirt-engine-3.6.0
> commit e0073e5ccfa856d945065eea8a86f5e44e09b3e2
> Author: Tomas Jelinek < tjelinek(a)redhat.com >
> Date: Tue Sep 15 14:38:04 2015 +0200
> restapi: instance types need to have only the subset of template fields
> Change-Id: Ice3af5199d8f31aa175719743479c0aba89b4f2a
^^^ Not needed in 3.6.0 branch
>
> commit 044b9a131d22496468cbc5e07909d6fbda1bed74
> Author: Juan Hernandez < juan.hernandez(a)redhat.com >
> Date: Wed Sep 23 14:29:39 2015 +0200
> restapi: Fix condition in "IconHelper"
> Change-Id: I329dc96c77cd91c175fea8cb70580605dc062782
>
> commit 0d185838f9ee559136db8d70b1802351fe6c1de9
> Author: Tomas Jelinek < tjelinek(a)redhat.com >
> Date: Thu Sep 10 14:13:20 2015 +0200
> core: balloon always reset when editing VM from REST
> Change-Id: I16adef671bc77e26f56657add59621a1aa9b1c4a
^^^ Not needed in 3.6.0 branch
>
> commit 90dcc1511efc6fbbe48789e704281c1abc51f232
> Author: Juan Hernandez < juan.hernandez(a)redhat.com >
> Date: Tue Sep 29 15:40:34 2015 +0200
> core: Don't replace Jackson provided by application server
> Change-Id: I4f003f68e74dadb7ae22a3ba2cd0d561a4f5eedd
>
> commit 9181a6caaf6d69ecfb95c00573db6485760700e9
> Author: Alexander Wels < awels(a)redhat.com >
> Date: Wed Sep 23 11:30:39 2015 -0400
> webadmin: new host provider error message
> Change-Id: Id39034fbed4753ed50a22fd1816af269a5f4729f
^^^ Not needed in 3.6.0 branch
>
> commit b1271403683ad0e9410a92a28cc92267ad164c3b
> Author: Vojtech Szocs < vszocs(a)redhat.com >
> Date: Fri Sep 18 21:07:26 2015 +0200
> webadmin,userportal: Fix IE image size quirk
> Change-Id: Ia17eb684cb08c0cb2cd610e38974bc9992e48285
^^^ Not needed in 3.6.0 branch
>
> commit 0f82a8fe922494eba89dd5fa3ab66364100c4298
> Author: Tomas Jelinek < tjelinek(a)redhat.com >
> Date: Thu Sep 10 14:15:41 2015 +0200
> restapi: added memory_policy to tempalte and instance type
> Change-Id: Ia7f1f6950d1433a1634c27d4cd933c8734bcb504
^^^ Not needed in 3.6.0 branch
>
> commit fb3274f19a5471f5107ea87cc4116c6a86ba50cc
> Author: Sandro Bonazzola < sbonazzo(a)redhat.com >
> Date: Thu Sep 24 16:16:59 2015 +0200
> build: post ovirt-engine-3.6.0 branching
> Change-Id: I68469dd773370cd390f126a2f009607abdbc9b36
>
>
> ^^^ Not needed in 3.6.0 branch
>
> commit df73869d85c7168409733e714defadea4baf109b
> Author: Juan Hernandez < juan.hernandez(a)redhat.com >
> Date: Tue Sep 29 16:02:19 2015 +0200
> core: Don't replace JAXB provided by application server
> Change-Id: I17370356dbf1bd614c96ff5fe4bf0af8486929c0
>
> commit 40f887fb8c45faecb8d9e4cdbd25dd6e2b93d9dc
> Author: Marcin Mirecki < mmirecki(a)redhat.com >
> Date: Tue Jul 21 12:27:39 2015 +0200
> core: Network utilisation is not shown for the VM
> Change-Id: I81100cc8369abe1ff8929478e1556c4e1ab81c2a
>
> commit 0a5f3ff964d33ff5eda69509bd2a45e7dfbf58b3
> Author: Tomas Jelinek < tjelinek(a)redhat.com >
> Date: Fri Sep 11 13:30:12 2015 +0200
> restapi: not possible to edit blank template using REST API
> Change-Id: I78cd46d8949dfe9eb3d7de207cc8646b7f1060ee
^^^ Already in 3.6.0 branch
>
> 11 Patches in origin/ovirt-engine-3.6 and not in origin/ovirt-engine-3.6.0
> branch according to Change-Id
>
> --
> Sandro Bonazzola
> Better technology. Faster innovation. Powered by community collaboration.
> See how it works at
redhat.com
>
> _______________________________________________
> Devel mailing list
> Devel(a)ovirt.org
>
http://lists.ovirt.org/mailman/listinfo/devel