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

[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 7161bcac480d574c76a774c664b3f18ba01b693b
Merge: 4656d55 817e0c2
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jun 24 09:59:11 2015 +0200

    Merge tag 'upstream/2.12.9'
    
    Upstream version 2.12.9
    
    # gpg: Signature made mer. 24 juin 2015 09:59:10 CEST using RSA key ID 39CD217A
    # gpg: Good signature from "Cédric Boutillier <boutil at debian.org>"
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at upmc.fr>"
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at polytechnique.org>"
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at gmail.com>"

 README.md                      |   7 ++
 ext/oj/extconf.rb              |   1 +
 ext/oj/object.c                |   4 +
 ext/oj/oj.c                    |   2 +-
 lib/oj/bag.rb                  |  16 ++--
 lib/oj/version.rb              |   2 +-
 metadata.yml                   | 100 +++++++++----------
 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/perf1.rb                  |  64 +++++++++++++
 test/perf2.rb                  |  76 +++++++++++++++
 test/perf_obj_old.rb           | 213 +++++++++++++++++++++++++++++++++++++++++
 test/struct.rb                 |  29 ------
 test/test_bigd.rb              |  63 ++++++++++++
 test/{mod.rb => test_range.rb} |  15 +--
 test/test_serializer.rb        |  59 ------------
 test/write_timebars.rb         |  31 ------
 test/zip.rb                    |  34 -------
 23 files changed, 547 insertions(+), 431 deletions(-)

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