[DRE-commits] [ruby-activerecord-import] 01/03: Merge tag 'upstream/0.7.0'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-activerecord-import.

commit ed14ea68479ea92aa3541935eeeeda988ca3b479
Merge: 181f1f0 9bb7fb6
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Apr 2 20:36:55 2015 +0530

    Merge tag 'upstream/0.7.0'
    
    Upstream version 0.7.0
    
    # gpg: Signature made Thursday 02 April 2015 08:36:49 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"

 Gemfile                                            |  8 ++-
 gemfiles/4.1.gemfile                               |  4 ++
 gemfiles/4.2.gemfile                               |  4 ++
 lib/activerecord-import/import.rb                  | 84 +++++++++++++++++++---
 lib/activerecord-import/synchronize.rb             | 11 ++-
 lib/activerecord-import/version.rb                 |  2 +-
 metadata.yml                                       |  9 +--
 test/import_test.rb                                | 58 ++++++++++++---
 test/models/topic.rb                               |  4 +-
 .../support/active_support/test_case_extensions.rb |  2 +-
 test/support/mysql/assertions.rb                   | 24 +++----
 test/support/mysql/import_examples.rb              |  2 +-
 test/test_helper.rb                                | 13 +++-
 test/travis/build.sh                               | 41 +++++++----
 14 files changed, 204 insertions(+), 62 deletions(-)

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