[DRE-commits] [ruby-oj] 01/03: Merge tag 'upstream/2.4.0'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-oj.

commit e6398dc6edcb0273a3d1448ab2c2c462b1a60217
Merge: c3c5540 3054731
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Dec 9 07:57:36 2013 +0100

    Merge tag 'upstream/2.4.0'
    
    Upstream version 2.4.0
    
    # gpg: Signature faite le lun. 09 déc. 2013 07:57:18 CET avec la clef RSA d'identifiant 8F9F8F09
    # 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           |  31 ++-
 checksums.yaml.gz   | Bin 270 -> 270 bytes
 ext/oj/compat.c     |  12 +-
 ext/oj/dump.c       | 397 +++++++++++++++++++++++++++-------
 ext/oj/extconf.rb   |   8 +-
 ext/oj/hash.c       |  37 ++--
 ext/oj/hash_test.c  |  16 +-
 ext/oj/object.c     | 111 +++++-----
 ext/oj/oj.c         | 609 +++++++++++++++++++++++++++++++++++++++++++++++++---
 ext/oj/oj.h         |  71 +++++-
 ext/oj/parse.c      | 182 +++++++++-------
 ext/oj/parse.h      |   5 +-
 ext/oj/resolve.c    |  10 +-
 ext/oj/saj.c        |  20 +-
 ext/oj/scp.c        |  23 +-
 ext/oj/strict.c     |  14 +-
 ext/oj/val_stack.c  |  46 ++++
 ext/oj/val_stack.h  |  65 +++---
 lib/oj/version.rb   |   2 +-
 metadata.yml        |  11 +-
 test/debian_test.rb |  90 ++++++++
 test/lots.rb        |  68 ++++++
 test/perf_object.rb |   5 +-
 test/struct.rb      |  29 +++
 test/test_fast.rb   |   1 +
 test/test_gc.rb     |  52 +++++
 test/test_mimic.rb  |   1 +
 test/test_saj.rb    |   3 +-
 test/test_scp.rb    |   3 +-
 test/test_writer.rb | 186 ++++++++++++++++
 test/tests.rb       | 142 ++++++++----
 31 files changed, 1862 insertions(+), 388 deletions(-)

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