This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository lwt.
commit 3f057d7b9284937900e5de27d8fe301659fd6bf8 Merge: 1a9381c 63a5140 Author: Stephane Glondu <[email protected]> Date: Wed Oct 14 11:09:14 2015 +0200 Merge tag 'upstream/2.5.0' Upstream version 2.5.0 #opam# | 41 ++++ .#opam | 1 + .merlin | 9 + CHANGES | 23 +++ Makefile | 2 +- README.md | 3 +- _oasis | 5 +- discover.ml | 82 +++++++- manual/Makefile | 2 +- manual/manual.wiki | 2 +- ppx/.merlin | 4 + ppx/ppx_lwt.mli | 20 +- ppx/ppx_lwt_ex.ml | 19 +- setup-dev.exe | Bin 3510736 -> 3534912 bytes setup.ml | 13 +- src/core/META | 26 +-- src/core/lwt.ml | 11 +- src/core/lwt.mli | 9 +- src/core/lwt_mutex.ml | 4 +- src/core/lwt_mutex.mli | 4 +- src/core/lwt_mvar.ml | 4 +- src/core/lwt_pool.ml | 6 +- src/core/lwt_pool.mli | 6 +- src/core/lwt_pqueue.ml | 4 +- src/core/lwt_pqueue.mli | 4 +- src/core/lwt_stream.mli | 6 +- src/logger/lwt_log_core.ml | 4 + src/logger/lwt_log_core.mli | 13 +- src/preemptive/lwt_preemptive.ml | 6 +- src/preemptive/lwt_preemptive.mli | 6 +- src/react/lwt_react.ml | 2 +- src/react/lwt_react.mli | 2 +- src/ssl/lwt_ssl.ml | 20 +- src/ssl/lwt_ssl.mli | 8 +- src/unix/lwt_bytes.mli | 32 +-- src/unix/lwt_chan.ml | 6 +- src/unix/lwt_chan.mli | 4 +- src/unix/lwt_daemon.mli | 6 +- src/unix/lwt_engine.ml | 7 +- src/unix/lwt_engine.mli | 12 +- src/unix/lwt_gc.mli | 8 +- src/unix/lwt_io.ml | 65 ++++--- src/unix/lwt_io.mli | 83 ++++---- src/unix/lwt_process_stubs.c | 2 - src/unix/lwt_throttle.ml | 4 +- src/unix/lwt_throttle.mli | 4 +- src/unix/lwt_timeout.ml | 4 +- src/unix/lwt_timeout.mli | 4 +- src/unix/lwt_unix.h | 3 + src/unix/lwt_unix.ml | 86 +++++++-- src/unix/lwt_unix.mli | 22 ++- src/unix/lwt_unix_stubs.c | 5 - src/unix/lwt_unix_unix.c | 397 +++++++++++++++++++++++++++++++++++++- src/unix/lwt_unix_windows.c | 7 + tests/META | 4 +- tests/ppx/main.ml | 13 ++ tests/unix/main.ml | 1 + tests/unix/test_lwt_io.ml | 4 +- tests/unix/test_mcast.ml | 76 ++++++++ 59 files changed, 1003 insertions(+), 227 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lwt.git _______________________________________________ Pkg-ocaml-maint-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
