[DRE-commits] [ruby-eventmachine] 01/05: Merge tag 'upstream/1.2.0.1'

[zeha at debian.org]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository ruby-eventmachine.

commit f237f7a6a86fde703762c4b09e3425c453a6ac7a
Merge: 8676ddf ecef93d
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Sun Jul 31 20:09:11 2016 +0000

    Merge tag 'upstream/1.2.0.1'
    
    Upstream version 1.2.0.1

 .gitignore                                        |  21 -
 .travis.yml                                       |  22 -
 .yardopts                                         |   7 -
 CHANGELOG.md                                      |  58 ++
 Gemfile                                           |   2 -
 README.md                                         |   6 +-
 Rakefile                                          |  20 -
 eventmachine.gemspec                              |  63 +-
 ext/binder.cpp                                    |  18 +-
 ext/binder.h                                      |  10 +-
 ext/cmain.cpp                                     | 203 +++++--
 ext/ed.cpp                                        | 354 +++++++----
 ext/ed.h                                          |  72 ++-
 ext/em.cpp                                        | 678 +++++++++++-----------
 ext/em.h                                          |  87 +--
 ext/eventmachine.h                                | 117 ++--
 ext/extconf.rb                                    | 145 +++--
 ext/fastfilereader/extconf.rb                     |   9 +-
 ext/fastfilereader/mapper.cpp                     |   2 +
 ext/fastfilereader/rubymain.cpp                   |  14 +-
 ext/kb.cpp                                        |   2 +-
 ext/pipe.cpp                                      |  15 +-
 ext/project.h                                     |  19 +-
 ext/rubymain.cpp                                  | 576 +++++++++++-------
 ext/ssl.cpp                                       | 186 +++++-
 ext/ssl.h                                         |   9 +-
 lib/em/channel.rb                                 |   5 +
 lib/em/completion.rb                              |   4 +-
 lib/em/connection.rb                              |  64 +-
 lib/em/iterator.rb                                |  31 +-
 lib/em/pool.rb                                    |   2 +-
 lib/em/protocols/line_and_text.rb                 |   3 +-
 lib/em/protocols/linetext2.rb                     |  82 +--
 lib/em/protocols/smtpclient.rb                    |  91 ++-
 lib/em/pure_ruby.rb                               |   7 +-
 lib/em/queue.rb                                   |  23 +-
 lib/em/resolver.rb                                |  69 ++-
 lib/em/threaded_resource.rb                       |   4 +-
 lib/em/version.rb                                 |   2 +-
 lib/eventmachine.rb                               | 118 ++--
 metadata.yml                                      | 307 ----------
 rakelib/cpp.rake_example                          |  77 ---
 rakelib/package.rake                              |  24 +-
 tests/dhparam.pem                                 |  13 +
 tests/em_test_helper.rb                           |  83 +++
 tests/test_basic.rb                               |  43 +-
 tests/test_channel.rb                             |  15 +-
 tests/test_connection_write.rb                    |   4 +-
 tests/test_defer.rb                               |  17 +
 tests/test_epoll.rb                               |   2 +-
 tests/test_file_watch.rb                          |   1 +
 tests/test_fork.rb                                |  75 +++
 tests/test_ipv4.rb                                | 125 ++++
 tests/test_ipv6.rb                                | 131 +++++
 tests/test_iterator.rb                            |  18 +
 tests/test_ltp2.rb                                |  20 +
 tests/test_many_fds.rb                            |   2 +-
 tests/test_queue.rb                               |  14 +
 tests/test_resolver.rb                            |  23 +
 tests/test_set_sock_opt.rb                        |   2 +
 tests/test_smtpclient.rb                          |  20 +
 tests/{test_ssl_verify.rb => test_ssl_dhparam.rb} |  59 +-
 tests/test_ssl_ecdh_curve.rb                      |  79 +++
 tests/test_ssl_extensions.rb                      |  49 ++
 tests/test_ssl_methods.rb                         |  19 +
 tests/test_ssl_protocols.rb                       | 246 ++++++++
 tests/test_ssl_verify.rb                          |  44 ++
 tests/test_system.rb                              |   4 +
 tests/test_unbind_reason.rb                       |   6 +-
 69 files changed, 3098 insertions(+), 1644 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-eventmachine.git