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

[Caitlin Matos]

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

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

commit 1b087466c366c5a9d804b98c071642ac49633620
Merge: c725a3c fec0576
Author: Caitlin Matos <caitlin.matos at zoho.com>
Date:   Mon Aug 18 17:53:34 2014 -0400

    Merge tag 'upstream/2.10.1'
    
    Upstream version 2.10.1

 README.md               |  22 +++++--
 checksums.yaml.gz       | Bin 270 -> 268 bytes
 ext/oj/compat.c         |  24 ++++---
 ext/oj/dump.c           |  35 ++++++++--
 ext/oj/object.c         |  86 +++++++++++++++---------
 ext/oj/oj.c             |  72 ++++++++++++--------
 ext/oj/oj.h             |   7 ++
 ext/oj/parse.c          |  68 ++++++++++++-------
 ext/oj/parse.h          |   9 +--
 ext/oj/reader.c         |  39 +++++------
 ext/oj/saj.c            |  36 +++-------
 ext/oj/scp.c            | 172 +++++++++++++++---------------------------------
 ext/oj/sparse.c         |  22 ++++---
 ext/oj/strict.c         |  39 +++++++----
 ext/oj/val_stack.c      |   1 +
 ext/oj/val_stack.h      |   4 +-
 lib/oj/schandler.rb     |  68 +++++++++++++------
 lib/oj/version.rb       |   2 +-
 metadata.yml            |   6 +-
 test/bug.rb             |  47 +++++++++++--
 test/bug2.rb            |  10 +++
 test/isolated/shared.rb |   7 ++
 test/test_compat.rb     |   2 +
 test/test_file.rb       |   5 ++
 test/test_object.rb     |  12 ++++
 test/test_scp.rb        |  67 +++++++++++++++++--
 test/test_strict.rb     |   2 +
 test/test_various.rb    |  44 ++++++++++++-
 test/test_writer.rb     |  24 +++----
 test/write_timebars.rb  |  31 +++++++++
 30 files changed, 628 insertions(+), 335 deletions(-)

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