[Xen-changelog] [xen master] Merge XSA 206 branch

[patchbot@xxxxxxx]

commit 68a08e12c44435eb86600072b9e725e2387ce163
Merge: ac9ff74f39a734756af90ccbb7184551f7b1e22a 
6d969f128364509271773d6883694a432b8d961d
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Tue Mar 28 15:46:25 2017 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Tue Mar 28 15:46:25 2017 +0100

    Merge XSA 206 branch

 tools/ocaml/xenstored/Makefile           |   1 +
 tools/ocaml/xenstored/connection.ml      |   5 +
 tools/ocaml/xenstored/connections.ml     |  14 +-
 tools/ocaml/xenstored/define.ml          |   4 +
 tools/ocaml/xenstored/domain.ml          |  17 ++-
 tools/ocaml/xenstored/domains.ml         | 137 +++++++++++++++++-
 tools/ocaml/xenstored/history.ml         |  73 ++++++++++
 tools/ocaml/xenstored/oxenstored.conf.in |  32 +++++
 tools/ocaml/xenstored/process.ml         | 118 +++++++++++++--
 tools/ocaml/xenstored/store.ml           |   1 +
 tools/ocaml/xenstored/transaction.ml     |  55 +++++--
 tools/ocaml/xenstored/xenstored.ml       |  77 +++++++---
 tools/xenstore/Makefile                  |   3 +-
 tools/xenstore/xenstored_core.c          |  10 +-
 tools/xenstore/xenstored_core.h          |   6 +
 tools/xenstore/xenstored_domain.c        | 240 +++++++++++++++++++++++++++++++
 tools/xenstore/xenstored_domain.h        |  27 ++++
 tools/xenstore/xenstored_transaction.c   |   5 +
 18 files changed, 773 insertions(+), 52 deletions(-)

--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog