[DRE-commits] [ruby-json] 01/05: Merge tag 'upstream/1.8.2'

[Sebastien Badia]

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

sbadia-guest pushed a commit to branch master
in repository ruby-json.

commit 3d97d1938eea1bd5618a11d01a120e5246890700
Merge: 82fc1cd 414d5cf
Author: Sebastien Badia <seb at sebian.fr>
Date:   Thu Apr 9 15:02:33 2015 +0200

    Merge tag 'upstream/1.8.2'
    
    Upstream version 1.8.2

 .gitignore                         |   3 +
 .travis.yml                        |  14 +--
 CHANGES                            |   9 ++
 Gemfile                            |   1 -
 VERSION                            |   2 +-
 checksums.yaml.gz                  | Bin 267 -> 0 bytes
 ext/json/ext/fbuffer/fbuffer.h     |  11 ++-
 ext/json/ext/generator/extconf.rb  |  10 ---
 ext/json/ext/generator/generator.c |  65 ++++++++++----
 ext/json/ext/generator/generator.h |  20 +++--
 ext/json/ext/parser/extconf.rb     |  10 ---
 ext/json/ext/parser/parser.c       |  31 +++++--
 ext/json/ext/parser/parser.h       |  15 +++-
 ext/json/ext/parser/parser.rl      |  31 +++++--
 ext/json/extconf.rb                |   3 +
 java/src/json/ext/Parser.java      | 171 +++++++++++++++++++------------------
 java/src/json/ext/Parser.rl        |  11 +--
 json-java.gemspec                  |   2 +-
 json.gemspec                       | Bin 4869 -> 5008 bytes
 json_pure.gemspec                  |  12 +--
 lib/json/add/complex.rb            |   8 +-
 lib/json/add/rational.rb           |   5 ++
 lib/json/add/time.rb               |   2 +-
 lib/json/common.rb                 |  10 +--
 lib/json/version.rb                |   2 +-
 metadata.yml                       |  60 ++++++-------
 tests/test_json.rb                 |   8 ++
 tests/test_json_generate.rb        |  31 +++++--
 28 files changed, 338 insertions(+), 209 deletions(-)

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