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

[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 10a4872d41bc89f059cdbc38bb2c325855bc2f4b
Merge: 829c1e3 0fb4c15
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Oct 7 23:44:38 2014 +0200

    Merge tag 'upstream/2.10.3'
    
    Upstream version 2.10.3
    
    # gpg: Signature faite le mar. 07 oct. 2014 23:44:34 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 ++++++++---
 ext/oj/dump.c             | 21 ++++++++++++++++-----
 ext/oj/object.c           |  6 ++++++
 ext/oj/oj.c               | 10 +++++-----
 lib/oj/version.rb         |  2 +-
 metadata.yml              |  4 ++--
 test/_test_mimic_rails.rb | 14 ++++++++++++++
 test/isolated/shared.rb   |  4 ++--
 test/test_compat.rb       |  7 ++++---
 test/test_debian.rb       |  2 +-
 test/test_file.rb         |  4 ++--
 test/test_object.rb       | 18 ++++++++++++++++++
 test/test_various.rb      | 18 +++++++++++++-----
 13 files changed, 92 insertions(+), 29 deletions(-)

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