[libio-async-perl] 03/04: Merge tag 'upstream/0.67'
Axel Beckert
abe at deuxchevaux.org
Sun Jun 7 14:00:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository libio-async-perl.
commit e22a60e28fee6cd553d43246e894ff49da2fa081
Merge: bf0692f ad76cc8
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sun Jun 7 15:46:23 2015 +0200
Merge tag 'upstream/0.67'
Upstream version 0.67
The following conflicts haven been resolved manually using the
"theirs" logic:
Conflicts:
Build.PL
Changes
META.json
META.yml
Makefile.PL
lib/IO/Async.pm
lib/IO/Async/Channel.pm
lib/IO/Async/ChildManager.pm
lib/IO/Async/File.pm
lib/IO/Async/FileStream.pm
lib/IO/Async/Function.pm
lib/IO/Async/Future.pm
lib/IO/Async/Handle.pm
lib/IO/Async/Internals/Connector.pm
lib/IO/Async/Listener.pm
lib/IO/Async/Loop.pm
lib/IO/Async/Loop/Poll.pm
lib/IO/Async/Loop/Select.pm
lib/IO/Async/LoopTests.pm
lib/IO/Async/MergePoint.pm
lib/IO/Async/Notifier.pm
lib/IO/Async/OS.pm
lib/IO/Async/OS/MSWin32.pm
lib/IO/Async/OS/cygwin.pm
lib/IO/Async/OS/linux.pm
lib/IO/Async/PID.pm
lib/IO/Async/Process.pm
lib/IO/Async/Protocol.pm
lib/IO/Async/Protocol/LineStream.pm
lib/IO/Async/Protocol/Stream.pm
lib/IO/Async/Resolver.pm
lib/IO/Async/Routine.pm
lib/IO/Async/Signal.pm
lib/IO/Async/Socket.pm
lib/IO/Async/Stream.pm
lib/IO/Async/Test.pm
lib/IO/Async/Timer.pm
lib/IO/Async/Timer/Absolute.pm
lib/IO/Async/Timer/Countdown.pm
lib/IO/Async/Timer/Periodic.pm
Build.PL | 8 +-
Changes | 47 +++++++++++
LICENSE | 6 +-
MANIFEST | 3 +-
META.json | 95 +++++++++++-----------
META.yml | 80 ++++++++++---------
Makefile.PL | 7 +-
examples/chat-server.pl | 8 +-
examples/echo-server.pl | 8 +-
examples/netcat-client.pl | 13 +--
examples/tcp-proxy.pl | 5 +-
examples/whoami-server.pl | 8 +-
lib/IO/Async.pm | 2 +-
lib/IO/Async/Channel.pm | 89 +++++++++++++++------
lib/IO/Async/ChildManager.pm | 12 ++-
lib/IO/Async/Debug.pm | 98 +++++++++++++++++++++++
lib/IO/Async/File.pm | 2 +-
lib/IO/Async/FileStream.pm | 2 +-
lib/IO/Async/Function.pm | 12 +--
lib/IO/Async/Future.pm | 2 +-
lib/IO/Async/Handle.pm | 47 ++++++++---
lib/IO/Async/Internals/Connector.pm | 10 +--
lib/IO/Async/Listener.pm | 70 ++++++++++++-----
lib/IO/Async/Loop.pm | 65 ++++++++++++++-
lib/IO/Async/Loop/Poll.pm | 153 ++++++++++++++++++++++++------------
lib/IO/Async/Loop/Select.pm | 6 +-
lib/IO/Async/LoopTests.pm | 28 ++++++-
lib/IO/Async/MergePoint.pm | 81 -------------------
lib/IO/Async/Notifier.pm | 69 +++-------------
lib/IO/Async/OS.pm | 42 +++++-----
lib/IO/Async/OS/MSWin32.pm | 2 +-
lib/IO/Async/OS/cygwin.pm | 2 +-
lib/IO/Async/OS/linux.pm | 7 +-
lib/IO/Async/PID.pm | 2 +-
lib/IO/Async/Process.pm | 19 +++--
lib/IO/Async/Protocol.pm | 2 +-
lib/IO/Async/Protocol/LineStream.pm | 2 +-
lib/IO/Async/Protocol/Stream.pm | 2 +-
lib/IO/Async/Resolver.pm | 17 ++--
lib/IO/Async/Routine.pm | 2 +-
lib/IO/Async/Signal.pm | 2 +-
lib/IO/Async/Socket.pm | 61 +++++++-------
lib/IO/Async/Stream.pm | 45 ++++++++++-
lib/IO/Async/Test.pm | 2 +-
lib/IO/Async/Timer.pm | 2 +-
lib/IO/Async/Timer/Absolute.pm | 6 +-
lib/IO/Async/Timer/Countdown.pm | 2 +-
lib/IO/Async/Timer/Periodic.pm | 9 ++-
t/02os.t | 9 +++
t/03loop-magic.t | 3 +-
t/19loop-future.t | 2 +-
t/20handle.t | 2 +-
t/21stream-1read.t | 23 ++++++
t/21stream-4encoding.t | 2 +-
t/22timer-periodic.t | 21 +++++
t/40channel.t | 29 +++++++
t/50resolver.t | 8 +-
t/51loop-connect.t | 2 +-
t/63handle-connect.t | 4 +-
t/64handle-bind.t | 36 +++++++++
60 files changed, 916 insertions(+), 489 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libio-async-perl.git
More information about the Pkg-perl-cvs-commits
mailing list