[DRE-commits] [ruby-multi-json] 01/02: Merge tag 'upstream/1.10.0'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-multi-json.

commit 4411371910aaa46d59284e8d12b1835afd751727
Merge: 7704b63 dd243a4
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon May 19 12:04:45 2014 -0300

    Merge tag 'upstream/1.10.0'
    
    Upstream version 1.10.0
    
    # gpg: Signature made Seg 19 Mai 2014 12:04:42 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at cs.ubc.ca>"

 .rspec                                  |   1 -
 .travis.yml                             |  18 +++++--
 CHANGELOG.md                            |  46 ++++++++++++++++++
 Gemfile                                 |  22 ++++-----
 README.md                               |  26 ++++++----
 checksums.yaml.gz                       | Bin 268 -> 266 bytes
 checksums.yaml.gz.sig                   | Bin 256 -> 256 bytes
 data.tar.gz.sig                         |   5 +-
 lib/multi_json.rb                       |  43 ++++++++---------
 lib/multi_json/adapter.rb               |  26 ++--------
 lib/multi_json/adapter_error.rb         |  15 ++++++
 lib/multi_json/adapters/gson.rb         |   1 +
 lib/multi_json/adapters/jr_jackson.rb   |   2 +
 lib/multi_json/adapters/oj.rb           |   3 +-
 lib/multi_json/adapters/ok_json.rb      |   2 +
 lib/multi_json/convertible_hash_keys.rb |  34 ++++++-------
 lib/multi_json/load_error.rb            |  11 -----
 lib/multi_json/options.rb               |  24 +++-------
 lib/multi_json/parse_error.rb           |  17 +++++++
 lib/multi_json/version.rb               |   8 ++--
 metadata.gz.sig                         | Bin 256 -> 256 bytes
 metadata.yml                            |  57 +++++++++++-----------
 spec/gson_adapter_spec.rb               |   2 +-
 spec/multi_json_spec.rb                 |  32 ++++++-------
 spec/oj_adapter_spec.rb                 |  12 ++++-
 spec/shared/adapter.rb                  |  82 ++++++++++++++++----------------
 spec/spec_helper.rb                     |  30 +++++++-----
 27 files changed, 297 insertions(+), 222 deletions(-)

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