[DRE-commits] [ruby-oj] 01/04: Merge tag 'upstream/2.17.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 90138c0fed1f034dc5722824d5d7df013449f7dc
Merge: 8c4bea1 a5248a3
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Jul 9 08:39:30 2016 +0200

    Merge tag 'upstream/2.17.1'
    
    Upstream version 2.17.1
    
    # gpg: Signature faite le sam. 09 juil. 2016 08:39:24 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                                  | 12 ++++++++
 ext/oj/dump.c                              | 25 +++++++++++++++--
 ext/oj/fast.c                              |  1 +
 ext/oj/oj.c                                | 43 +++++++++++++++++++++++++++--
 ext/oj/oj.h                                |  3 ++
 ext/oj/parse.c                             | 11 ++------
 ext/oj/sparse.c                            |  2 +-
 ext/oj/strict.c                            |  3 ++
 lib/oj.rb                                  |  1 +
 lib/oj/easy_hash.rb                        | 44 ++++++++++++++++++++++++++++++
 lib/oj/mimic.rb                            |  8 ++++--
 lib/oj/version.rb                          |  2 +-
 oj.gemspec                                 |  8 +++---
 test/isolated/shared.rb                    |  2 +-
 test/isolated/test_mimic_rails_datetime.rb | 27 ++++++++++++++++++
 test/test_hash.rb                          | 29 ++++++++++++++++++++
 test/test_various.rb                       | 26 ++++++++++++++++--
 17 files changed, 220 insertions(+), 27 deletions(-)

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