Skip to content

IH-397: Replace async with lwt in xapi-storage-script #6019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ ff39018fd6d91985f9c893a56928771dfe9fa48d
cbb9edb17dfd122c591beb14d1275acc39492335
d6ab15362548b8fe270bd14d5153b8d94e1b15c0
b12cf444edea15da6274975e1b2ca6a7fce2a090
364c27f5d18ab9dd31825e67a93efabecad06823
d8b4de9076531dd13bdffa20cc10c72290a52356

# ocp-indent
d018d26d6acd4707a23288b327b49e44f732725e
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ install-extra:
DUNE_IU_PACKAGES1=-j $(JOBS) --destdir=$(DESTDIR) --prefix=$(PREFIX) --libdir=$(LIBDIR) --mandir=$(MANDIR)
DUNE_IU_PACKAGES1+=--libexecdir=$(XENOPSD_LIBEXECDIR) --datadir=$(SDKDIR)
DUNE_IU_PACKAGES1+=xapi-client xapi-schema xapi-consts xapi-cli-protocol xapi-datamodel xapi-types
DUNE_IU_PACKAGES1+=xen-api-client xen-api-client-lwt xen-api-client-async rrdd-plugin rrd-transport
DUNE_IU_PACKAGES1+=xen-api-client xen-api-client-lwt rrdd-plugin rrd-transport
DUNE_IU_PACKAGES1+=gzip http-lib pciutil sexpr stunnel uuid xml-light2 zstd xapi-compression safe-resources
DUNE_IU_PACKAGES1+=message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt
DUNE_IU_PACKAGES1+=message-switch message-switch-cli message-switch-core message-switch-lwt
DUNE_IU_PACKAGES1+=message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli
DUNE_IU_PACKAGES1+=xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-tracing-export xapi-expiry-alerts cohttp-posix
DUNE_IU_PACKAGES1+=xapi-rrd xapi-inventory clock xapi-sdk
Expand Down
8 changes: 0 additions & 8 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@
)


(package
(name xen-api-client-async)
)

(package
(name xen-api-client)
(synopsis "Xen-API client library for remotely-controlling a xapi host")
Expand Down Expand Up @@ -519,10 +515,6 @@ This package provides an Lwt compatible interface to the library.")
(name pciutil)
)

(package
(name message-switch-async)
)

(package
(name message-switch-lwt)
)
Expand Down
35 changes: 0 additions & 35 deletions message-switch-async.opam

This file was deleted.

33 changes: 0 additions & 33 deletions message-switch-async.opam.template

This file was deleted.

2 changes: 0 additions & 2 deletions message-switch.opam
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ depends: [
"dune" {>= "3.15"}
"odoc" {with-doc}
"cmdliner"
"cohttp-async" {with-test}
"cohttp-lwt-unix"
"io-page" {>= "2.4.0"}
"lwt_log"
"message-switch-async" {with-test}
"message-switch-lwt"
"message-switch-unix"
"mirage-block-unix" {>= "2.4.0"}
Expand Down
2 changes: 0 additions & 2 deletions message-switch.opam.template
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@ depends: [
"dune" {>= "3.15"}
"odoc" {with-doc}
"cmdliner"
"cohttp-async" {with-test}
"cohttp-lwt-unix"
"io-page" {>= "2.4.0"}
"lwt_log"
"message-switch-async" {with-test}
"message-switch-lwt"
"message-switch-unix"
"mirage-block-unix" {>= "2.4.0"}
Expand Down
17 changes: 0 additions & 17 deletions ocaml/message-switch/async/dune

This file was deleted.

141 changes: 0 additions & 141 deletions ocaml/message-switch/async/protocol_async.ml

This file was deleted.

23 changes: 0 additions & 23 deletions ocaml/message-switch/async/protocol_async.mli

This file was deleted.

Loading
Loading