[DRE-commits] [ruby-activeldap] 02/06: Merge tag 'upstream/4.0.3'

[Marc Dequènes]

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

duck pushed a commit to branch master
in repository ruby-activeldap.

commit 9a8da71dafd623afb29d470dd7a1f4a100cd9469
Merge: 7cf499f 0a70e19
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Mon Aug 18 00:24:16 2014 +0200

    Merge tag 'upstream/4.0.3'
    
    Upstream version 4.0.3

 checksums.yaml.gz                                  | Bin 270 -> 270 bytes
 doc/text/news.textile                              |  37 +++++++++++
 doc/text/rails.textile                             |  12 ++--
 doc/text/tutorial.textile                          |   9 ---
 .../action_controller/ldap_benchmarking.rb         |  55 -----------------
 lib/active_ldap/adapter/base.rb                    |  68 +++++----------------
 lib/active_ldap/adapter/ldap.rb                    |  21 +++++--
 lib/active_ldap/adapter/ldap_ext.rb                |  57 ++++++++++++++---
 lib/active_ldap/adapter/net_ldap.rb                |  10 ++-
 lib/active_ldap/association/belongs_to_many.rb     |   8 ++-
 lib/active_ldap/association/collection.rb          |   5 ++
 lib/active_ldap/base.rb                            |   3 -
 lib/active_ldap/connection.rb                      |   7 ---
 lib/active_ldap/ldap_controls.rb                   |  11 ++++
 lib/active_ldap/log_subscriber.rb                  |  33 +++++-----
 lib/active_ldap/railtie.rb                         |   2 -
 lib/active_ldap/supported_control.rb               |  14 +++++
 lib/active_ldap/validations.rb                     |  15 ++++-
 lib/active_ldap/version.rb                         |   2 +-
 metadata.yml                                       |  61 +++++++++---------
 test/run-test.rb                                   |  13 ++--
 test/test_associations.rb                          |  18 ++++++
 test/test_connection.rb                            |   5 +-
 test/test_supported_control.rb                     |  23 +++++++
 test/test_validation.rb                            |  32 +++++++++-
 25 files changed, 322 insertions(+), 199 deletions(-)

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