[DRE-commits] [ruby-oj] 01/06: Merge tag 'upstream/2.15.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 489a4ceef4b6840ae0cd0916e763c004d15b349f
Merge: a03869c dd2118c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jun 1 23:43:57 2016 +0200

    Merge tag 'upstream/2.15.1'
    
    Upstream version 2.15.1
    
    # gpg: Signature faite le mer. 01 juin 2016 23:43:57 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                           | 281 ++++++++-----
 ext/oj/compat.c                     |   2 +
 ext/oj/dump.c                       | 468 ++++++++++++++--------
 ext/oj/extconf.rb                   |   6 +-
 ext/oj/fast.c                       |  13 +
 ext/oj/hash_test.c                  |   3 +-
 ext/oj/object.c                     |  23 +-
 ext/oj/odd.c                        |  25 +-
 ext/oj/odd.h                        |   8 +-
 ext/oj/oj.c                         | 770 ++++++++++++++++++++----------------
 ext/oj/oj.h                         |  66 ++--
 ext/oj/parse.c                      | 152 ++++---
 ext/oj/parse.h                      |   5 +-
 ext/oj/reader.c                     |   5 +-
 ext/oj/scp.c                        |   1 +
 ext/oj/sparse.c                     |  63 +--
 ext/oj/strict.c                     |   2 +
 lib/oj/version.rb                   |   2 +-
 metadata.yml                        | 190 ---------
 oj.gemspec                          |  44 +++
 test/bug.rb                         |  91 +++--
 test/bug2.rb                        |  10 -
 test/bug3.rb                        |  46 ---
 test/bug_fast.rb                    |  32 --
 test/bug_load.rb                    |  24 --
 test/example.rb                     |  11 -
 test/io.rb                          |  48 ---
 test/isolated/test_mimic_as_json.rb |  45 +++
 test/perf1.rb                       |  64 +++
 test/perf2.rb                       |  76 ++++
 test/perf_compat.rb                 |   4 +-
 test/perf_obj_old.rb                | 213 ++++++++++
 test/struct.rb                      |  29 --
 test/test_bigd.rb                   |  63 +++
 test/test_object.rb                 |  56 +++
 test/{mod.rb => test_range.rb}      |  15 +-
 test/test_scp.rb                    |  22 +-
 test/test_serializer.rb             |  59 ---
 test/test_various.rb                | 169 +++++---
 test/write_timebars.rb              |  31 --
 test/zip.rb                         |  34 --
 41 files changed, 1920 insertions(+), 1351 deletions(-)

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