From cd03ebe49de7656a43d7a0c70ae89b7dbb673009 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Tue, 9 Jan 2018 17:55:07 +0100
Subject: [PATCH 1/6] fix(package): update xen-api to 0.16.2

---
 yarn.lock | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9a8eaa052..0c053042a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4762,10 +4762,14 @@ ltgt@~2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.1.3.tgz#10851a06d9964b971178441c23c9e52698eece34"
 
-make-error@^1, make-error@^1.0.2, make-error@^1.2.1, make-error@^1.2.3, make-error@^1.3.0:
+make-error@^1, make-error@^1.0.2, make-error@^1.2.1, make-error@^1.2.3:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96"
 
+make-error@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.2.tgz#8762ffad2444dd8ff1f7c819629fa28e24fea1c4"
+
 make-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.0.tgz#57bef5dc85d23923ba23767324d8e8f8f3d9694b"
@@ -7321,8 +7325,8 @@ xdg-basedir@^3.0.0:
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
 
 xen-api@^0.16.0:
-  version "0.16.0"
-  resolved "https://registry.yarnpkg.com/xen-api/-/xen-api-0.16.0.tgz#c59297e5ba5e8c73bb9a2d8ae36b77b2acd050d8"
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/xen-api/-/xen-api-0.16.2.tgz#1e29b4c11de8757780632346894f66ff564b193d"
   dependencies:
     babel-polyfill "^6.23.0"
     blocked "^1.2.1"

From 51504cc6a35dd385b7074c3a8057317d0ae4d352 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Tue, 9 Jan 2018 17:55:19 +0100
Subject: [PATCH 2/6] 5.15.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d26316c67..811e4a15f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xo-server",
-  "version": "5.15.2",
+  "version": "5.15.3",
   "license": "AGPL-3.0",
   "description": "Server part of Xen-Orchestra",
   "keywords": [

From 3df01cd0cfc65d1d519cddb9799319830e57cc8e Mon Sep 17 00:00:00 2001
From: Pierre Donias <pierre.donias@gmail.com>
Date: Wed, 10 Jan 2018 11:28:04 +0100
Subject: [PATCH 3/6] chore(patching/bulk): omit XS-upgrade patches (#645)

Fixes vatesfr/xo-web#2564
---
 src/xapi/mixins/patching.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/xapi/mixins/patching.js b/src/xapi/mixins/patching.js
index f4b0ba306..a5f954e8c 100644
--- a/src/xapi/mixins/patching.js
+++ b/src/xapi/mixins/patching.js
@@ -56,6 +56,7 @@ export default {
           return patch.requiredpatch.uuid
         }),
         paid: patch['update-stream'] === 'premium',
+        upgrade: /^XS\d{2,}$/.test(patch['name-label']),
         // TODO: what does it mean, should we handle it?
         // version: patch.version,
       }
@@ -421,7 +422,7 @@ export default {
 
     const installableByUuid = host.license_params.sku_type !== 'free'
       ? await this._listMissingPoolPatchesOnHost(host)
-      : filter(await this._listMissingPoolPatchesOnHost(host), [ 'paid', false ])
+      : filter(await this._listMissingPoolPatchesOnHost(host), { paid: false, upgrade: false })
 
     // List of all installable patches sorted from the newest to the
     // oldest.
@@ -451,7 +452,7 @@ export default {
         if (host.$type === 'host') {
           return this._listMissingPoolPatchesOnHost(host).then(patches => host.license_params.sku_type !== 'free'
             ? patches
-            : filter(patches, [ 'paid', false ])
+            : filter(patches, { paid: false, upgrade: false })
           )
         }
       }))

From 1b344b7d9c480d9ba4e809b4211862acefefdb4a Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Wed, 10 Jan 2018 11:32:01 +0100
Subject: [PATCH 4/6] 5.15.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 811e4a15f..55f8ba82e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xo-server",
-  "version": "5.15.3",
+  "version": "5.15.4",
   "license": "AGPL-3.0",
   "description": "Server part of Xen-Orchestra",
   "keywords": [

From d5f6b65861a389bafdc8ceca61b22ad04f621a37 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Fri, 19 Jan 2018 13:09:12 +0100
Subject: [PATCH 5/6] fix(Xapi#remoteCopyVm): fix VM renaming

---
 src/xapi/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/xapi/index.js b/src/xapi/index.js
index 921915858..c2ff7d72c 100644
--- a/src/xapi/index.js
+++ b/src/xapi/index.js
@@ -545,7 +545,6 @@ export default class Xapi extends XapiBase {
       await targetXapi._importVm(
         stream,
         sr,
-        false,
         onVmCreation
       )
     )

From 1406f1f8e530ab122e253c9acede784cdc9837a6 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Fri, 19 Jan 2018 13:11:03 +0100
Subject: [PATCH 6/6] 5.15.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 55f8ba82e..de7f99862 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xo-server",
-  "version": "5.15.4",
+  "version": "5.15.5",
   "license": "AGPL-3.0",
   "description": "Server part of Xen-Orchestra",
   "keywords": [