[DRE-commits] [ruby-deep-merge] 01/07: Merge tag 'upstream/1.1.1'

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository ruby-deep-merge.

commit e33807c5179ce2308b9baf28eac756c704a9c4f9
Merge: 0ccabdc 90c6e71
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Sun Sep 11 21:07:54 2016 +0300

    Merge tag 'upstream/1.1.1'
    
    Upstream version 1.1.1
    
    # gpg: Signature made Κυρ 11 Σεπ 2016 09:07:50 μμ EEST
    # gpg:                using RSA key DBADC9EBEEA7C60E
    # gpg: Good signature from "Apollon Oikonomopoulos <apoikos at dmesg.gr>"
    # gpg:                 aka "Apollon Oikonomopoulos <apoikos at gmail.com>"
    # gpg:                 aka "Apollon Oikonomopoulos <apoikos at debian.org>"

 .gitignore              |   4 --
 .travis.yml             |   8 ----
 CHANGELOG               |  21 ++++++++++
 Gemfile                 |   3 --
 LICENSE                 |   2 +-
 README.md               |  24 ++++++++++-
 deep_merge.gemspec      |  55 ++++++++++++------------
 lib/deep_merge/core.rb  | 108 ++++++++++++++++++++++++++++--------------------
 test/test_deep_merge.rb |  18 ++++++++
 9 files changed, 155 insertions(+), 88 deletions(-)

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