[DRE-commits] [ruby-oj] 01/02: Merge tag 'upstream/2.16.1'

[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 12ec2b46fb5acad5305dcfb1c9be4bd2792cb78d
Merge: ff2ed81 2c5b17f
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Jun 23 16:20:47 2016 +0200

    Merge tag 'upstream/2.16.1'
    
    Upstream version 2.16.1
    
    # gpg: Signature faite le jeu. 23 juin 2016 16:20:46 CEST
    # gpg:                avec la clef RSA 0x89AF82B739CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> » [ultime]
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #    Empreinte de la sous-clef : 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 README.md                      |   4 +-
 ext/oj/fast.c                  |   4 +
 ext/oj/oj.c                    |  23 ++++-
 ext/oj/oj.h                    |   1 +
 ext/oj/parse.c                 |   9 +-
 ext/oj/sparse.c                |  10 +-
 lib/oj/version.rb              |   2 +-
 oj.gemspec                     |  10 +-
 test/bug.rb                    |  87 +++++++----------
 test/bug2.rb                   |  10 ++
 test/bug3.rb                   |  46 +++++++++
 test/bug_fast.rb               |  32 +++++++
 test/bug_load.rb               |  24 +++++
 test/crash.rb                  | 111 +++++++++++++++++++++
 test/example.rb                |  11 +++
 test/io.rb                     |  48 ++++++++++
 test/{test_range.rb => mod.rb} |  15 ++-
 test/perf1.rb                  |  64 -------------
 test/perf2.rb                  |  76 ---------------
 test/perf_obj_old.rb           | 213 -----------------------------------------
 test/russian.rb                |  18 ++++
 test/struct.rb                 |  29 ++++++
 test/test_bigd.rb              |  63 ------------
 test/test_serializer.rb        |  59 ++++++++++++
 test/test_various.rb           |  22 +++++
 test/write_timebars.rb         |  31 ++++++
 26 files changed, 534 insertions(+), 488 deletions(-)

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