[DRE-commits] [ruby-activerecord-3.2] 02/06: Merge tag 'upstream/3.2.16'

[Ondrej Sury]

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

ondrej pushed a commit to annotated tag debian/3.2.16-1
in repository ruby-activerecord-3.2.

commit b6847f974e25cf1c939700690a53f0c59f310908
Merge: d32d0e7 a90ba05
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Dec 4 17:36:28 2013 +0100

    Merge tag 'upstream/3.2.16'
    
    Upstream version 3.2.16

 CHANGELOG.md                                       | 191 ++++++++++++++++++++-
 checksums.yaml.gz                                  | Bin 265 -> 269 bytes
 lib/active_record/associations/association.rb      |  12 +-
 .../associations/belongs_to_association.rb         |   2 +-
 .../belongs_to_polymorphic_association.rb          |   3 +-
 .../associations/builder/belongs_to.rb             |   5 +-
 .../associations/collection_association.rb         |   2 +-
 lib/active_record/associations/collection_proxy.rb |  10 +-
 .../associations/has_many_association.rb           |   4 +-
 lib/active_record/associations/join_dependency.rb  |   2 +-
 .../join_dependency/join_association.rb            |   7 +-
 .../associations/preloader/through_association.rb  |   3 +-
 .../associations/through_association.rb            |   2 +-
 lib/active_record/autosave_association.rb          |  17 +-
 .../abstract/schema_definitions.rb                 |   4 +-
 .../connection_adapters/mysql2_adapter.rb          |   8 +-
 .../connection_adapters/postgresql_adapter.rb      |  12 +-
 .../connection_adapters/schema_cache.rb            |   4 +-
 lib/active_record/explain_subscriber.rb            |   2 +-
 lib/active_record/fixtures.rb                      |   4 +-
 lib/active_record/locking/optimistic.rb            |   2 +-
 lib/active_record/model_schema.rb                  |   6 +-
 lib/active_record/nested_attributes.rb             |  58 +++++--
 lib/active_record/railtie.rb                       |  13 +-
 lib/active_record/railties/databases.rake          |   3 +-
 lib/active_record/relation/calculations.rb         |  11 +-
 lib/active_record/relation/finder_methods.rb       |   5 +-
 lib/active_record/relation/spawn_methods.rb        |  42 ++++-
 lib/active_record/store.rb                         |   2 +-
 lib/active_record/version.rb                       |   2 +-
 metadata.yml                                       |  29 ++--
 31 files changed, 367 insertions(+), 100 deletions(-)

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