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

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-oj.

commit 60be9b500bb6524345731e6ba94510887826dedc
Merge: 708d2dc ab2fdff
Author: Pirate Praveen <praveen at debian.org>
Date:   Fri Sep 23 15:53:14 2016 +0530

    Merge tag 'upstream/2.17.4'
    
    Upstream version 2.17.4
    
    # gpg: Signature made Friday 23 September 2016 03:53:14 PM IST using RSA key ID CE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 README.md                                  |  11 +-
 ext/oj/oj.c                                |  11 ++
 lib/oj/mimic.rb                            |  40 +++++-
 lib/oj/version.rb                          |   2 +-
 oj.gemspec                                 |  10 +-
 test/aaa.rb                                |  21 +++
 test/bug.rb                                |  87 +++++++-----
 test/bug2.rb                               |  10 --
 test/bug3.rb                               |  46 -------
 test/bug_fast.rb                           |  32 -----
 test/bug_load.rb                           |  24 ----
 test/crash.rb                              | 111 ---------------
 test/example.rb                            |  11 --
 test/io.rb                                 |  48 -------
 test/isolated/test_mimic_rails_datetime.rb |  27 ----
 test/pact.rb                               |  21 +++
 test/perf1.rb                              |  64 +++++++++
 test/perf2.rb                              |  76 ++++++++++
 test/perf_obj_old.rb                       | 213 +++++++++++++++++++++++++++++
 test/russian.rb                            |  18 ---
 test/struct.rb                             |  29 ----
 test/test_bigd.rb                          |  63 +++++++++
 test/{mod.rb => test_range.rb}             |  15 +-
 test/test_serializer.rb                    |  59 --------
 test/test_various.rb                       |   2 +-
 test/write_timebars.rb                     |  31 -----
 26 files changed, 576 insertions(+), 506 deletions(-)

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