[DRE-commits] [ruby-oj] 02/07: Merge tag 'upstream/2.9.6'

[Cédric Boutillier]

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

boutil pushed a commit to annotated tag debian/2.9.6-1
in repository ruby-oj.

commit 8ea89e83211a78ef3e8478c80157207db9687c83
Merge: 0f72738 a3764a1
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jun 20 21:37:29 2014 +0200

    Merge tag 'upstream/2.9.6'
    
    Upstream version 2.9.6
    
    # gpg: Signature faite le ven. 20 juin 2014 21:37:24 CEST avec la clef RSA d'identifiant 39CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 README.md                                  |  11 +-
 checksums.yaml.gz                          | Bin 267 -> 270 bytes
 ext/oj/dump.c                              |   3 +-
 ext/oj/oj.c                                |  75 +++++++++-
 ext/oj/parse.c                             |  23 ++-
 ext/oj/parse.h                             |   1 +
 ext/oj/reader.c                            |   5 +-
 ext/oj/scp.c                               |  11 +-
 lib/oj/mimic.rb                            |   4 +-
 lib/oj/schandler.rb                        |  56 ++++++-
 lib/oj/version.rb                          |   2 +-
 metadata.yml                               |  76 +++++++---
 test/_test_mimic_rails.rb                  |  31 ++++
 test/a.rb                                  |  38 -----
 test/bug.rb                                |  23 ++-
 test/debian_test.rb                        |  90 ------------
 test/e.rb                                  |  12 --
 test/foo.rb                                |  24 ---
 test/helper.rb                             |  27 ++++
 test/io.rb                                 |  48 ++++++
 test/{test_mimic.rb => isolated/shared.rb} | 119 ++++++++-------
 test/isolated/test_mimic_after.rb          |  13 ++
 test/isolated/test_mimic_alone.rb          |  12 ++
 test/isolated/test_mimic_before.rb         |  13 ++
 test/isolated/test_mimic_define.rb         |  28 ++++
 test/isolated/test_mimic_rails_after.rb    |  19 +++
 test/isolated/test_mimic_rails_before.rb   |  19 +++
 test/lots.rb                               |  68 ---------
 test/mj.rb                                 |  48 ------
 test/perf_str.rb                           |  38 -----
 test/perf_strictx.rb                       |  97 -------------
 test/test_compat.rb                        | 114 +++++++--------
 test/test_debian.rb                        |  53 +++++++
 test/test_fast.rb                          |  26 ++--
 test/test_file.rb                          | 103 ++++++-------
 test/test_gc.rb                            |  46 +++---
 test/test_mimic_after.rb                   |  35 -----
 test/test_object.rb                        | 214 +++++++++++++--------------
 test/test_saj.rb                           |  30 ++--
 test/test_scp.rb                           |  35 +++--
 test/test_strict.rb                        |  32 ++--
 test/test_strictx.rb                       |  58 --------
 test/{tests.rb => test_various.rb}         | 225 ++++++++++++-----------------
 test/test_writer.rb                        |  22 ++-
 test/write_fake_log.rb                     |  63 --------
 test/x.rb                                  |  59 --------
 test/zip.rb                                |  34 +++++
 47 files changed, 978 insertions(+), 1205 deletions(-)

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