[DRE-commits] [ruby-ffi-yajl] 01/06: Merge tag 'upstream/2.2.3'

[Tiago Ilieve]

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

myhro-guest pushed a commit to branch master
in repository ruby-ffi-yajl.

commit f2896a2e9ddb74753d8f8c2a5fdfe7988ae07389
Merge: 0cd88a1 4b186f5
Author: Tiago Ilieve <tiago.myhro at gmail.com>
Date:   Wed May 4 18:09:24 2016 -0300

    Merge tag 'upstream/2.2.3'
    
    Upstream version 2.2.3

 README.md                                         |   3 +-
 Rakefile                                          |  29 ++--
 bin/ffi-yajl-bench                                |   9 +-
 ext/ffi_yajl/ext/dlopen/extconf.rb                |   1 +
 ext/ffi_yajl/ext/encoder/encoder.c                |  13 +-
 ext/ffi_yajl/ext/encoder/extconf.rb               |   3 +-
 ext/ffi_yajl/ext/parser/extconf.rb                |   3 +-
 ext/ffi_yajl/ext/parser/parser.c                  |   1 +
 lib/ffi_yajl/benchmark.rb                         |   1 -
 lib/ffi_yajl/benchmark/encode.rb                  | 122 ++++----------
 lib/ffi_yajl/benchmark/encode_json_and_marshal.rb |  28 ++--
 lib/ffi_yajl/benchmark/encode_json_and_yaml.rb    |  32 ++--
 lib/ffi_yajl/benchmark/encode_profile.rb          |  26 ++-
 lib/ffi_yajl/benchmark/http.rb                    |  22 +--
 lib/ffi_yajl/benchmark/parse.rb                   | 195 ++++++++--------------
 lib/ffi_yajl/benchmark/parse_json_and_marshal.rb  |  34 ++--
 lib/ffi_yajl/benchmark/parse_json_and_yaml.rb     |  38 ++---
 lib/ffi_yajl/benchmark/parse_profile.rb           |  24 ++-
 lib/ffi_yajl/benchmark/parse_profile_ruby_prof.rb |  27 ++-
 lib/ffi_yajl/benchmark/parse_stream.rb            |  34 ++--
 lib/ffi_yajl/encoder.rb                           |  19 ++-
 lib/ffi_yajl/ext.rb                               |   4 +
 lib/ffi_yajl/ffi.rb                               |  47 +++---
 lib/ffi_yajl/ffi/encoder.rb                       |  61 ++++---
 lib/ffi_yajl/ffi/parser.rb                        |  67 ++++----
 lib/ffi_yajl/map_library_name.rb                  |   1 -
 lib/ffi_yajl/parser.rb                            |  11 +-
 lib/ffi_yajl/version.rb                           |   2 +-
 metadata.yml                                      |   8 +-
 spec/ffi_yajl/encoder_spec.rb                     |  62 ++++---
 spec/ffi_yajl/map_library_name_spec.rb            |   2 -
 spec/ffi_yajl/parser_spec.rb                      | 110 ++++++------
 spec/spec_helper.rb                               |  17 +-
 33 files changed, 472 insertions(+), 584 deletions(-)

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