[DRE-commits] [ruby-oj] 01/02: Merge tag 'upstream/2.17.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 7db0448da2af8f1106425840ed79f4a970059a39
Merge: 3d8f5c3 5daaed4
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Aug 24 12:13:00 2016 +0200

    Merge tag 'upstream/2.17.3'
    
    Upstream version 2.17.3
    
    # gpg: keyserver option 'ca-cert-file' is obsolete; please use 'hkp-cacert' in dirmngr.conf
    # gpg: Signature faite le mer. 24 août 2016 12:13:00 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                                |  18 ++----
 ext/oj/dump.c                            |   2 +-
 ext/oj/oj.c                              |  13 +++-
 lib/oj/active_support_helper.rb          |  26 +++++++-
 lib/oj/mimic.rb                          | 108 +++++++++++++++++++++++++++++++
 lib/oj/version.rb                        |   2 +-
 oj.gemspec                               |   8 +--
 test/activesupport_datetime_test.rb      |  23 +++++++
 test/isolated/shared.rb                  |  49 ++++++++++++--
 test/isolated/test_mimic_as_json.rb      |   0
 test/isolated/test_mimic_rails_after.rb  |   2 +
 test/isolated/test_mimic_rails_before.rb |   3 +-
 test/test_various.rb                     |   7 +-
 13 files changed, 228 insertions(+), 33 deletions(-)

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