Allows setting fixture_path to a Pathname
Merge pull request #9861 from pivotalcommon/master

Allow fixture_path to be a Pathname
Change Standard error when is required bcrypt-ruby and fails
Merge pull request #9863 from robertomiranda/require-bcrypt-ruby

Change Standard error when is required bcrypt-ruby and fails
Removed unused loop variable
Delete failing test

I don't think this is testing anything useful, and the test code is
exceedingly brittle. It is broken since
34c7e73c1def1312e59ef1f334586ff2f668246e because the test code makes
assumptions about the implementation of PostgreSQLAdapter#active? which
are incorrect after the commit.

I could fix this test but it would be even more brittle (by stubbing the
underlying @connection.connect_poll) and it doesn't test any complex
logic. I conclude that it's not worth it.
Send SIGTERM, not SIGQUIT.

SIGTERM is the correct signal for a graceful exit.

This will hopefully resolve #9761.
Removed unnecessary block
When we pass id to update_attributes it will try to set new id for that record
Merge pull request #9707 from route/updates_another_record

When strong_parameters had been included, this case of update became possible
StringIO is not required by default in JRuby
test-case to prevent resetting associations when preloading twice.

Conflicts:

	activerecord/lib/active_record/associations/preloader/through_association.rb
	activerecord/test/cases/associations/eager_test.rb
Merge pull request #9872 from senny/test_case_to_prevent_unnecessary_reset

test-case to prevent resetting associations when preloading twice.
Don't kill the console

Use the "quit" command instead. This seems to prevents some weirdness on
OS X. See #9761.
Merge pull request #9871 from arunagw/stringio-require-jruby

StringIO is not required by default in JRuby
Merge pull request #9867 from choudhuryanupam/fix_mysql2_active_schema_test

Removed unnecessary block
Merge pull request #9866 from choudhuryanupam/fix_connection_test

Removed unused loop variable
Remove exception variable from rescue block

Just raising from the rescue block will re-raise the exception, so the
variable is not necessary.
remove knowledge of SQL from the column definition object
stop depending on sql_type in pg