merge revision(s) 674db715f5a141891a66e67004ca138696d3b0ad,1f1b9b0942ec12dde1af8000f8cb84692904fccc:

	[ruby/rdoc] test/rdoc/test_rdoc_generator_json_index.rb: Use
	 assert_equal instead of assert.

	It's better because assert_equal prints the values when it fails.

	https://github.com/ruby/rdoc/commit/91d40ce8f8
	---
	 test/rdoc/test_rdoc_generator_json_index.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)

	[ruby/rdoc] test/rdoc/test_rdoc_generator_json_index.rb: pend in
	 test_generate in ppc64le.

	We observed that this test randomly fails in the ruby/ruby Travis ppc64le case.
	This commit is to pend the test_generate if the assertion for the generated
	file's modified time fails in a ppc64le environment.

	Note that I didn't use the word "Travis CI" or Travis CI specific environment variables
	such as `TRAVIS` and `TRAVIS_CPU_ARCH`[1] in the code. Because I wanted to prioritize the
	rdoc's independence from the ruby/ruby.

	[1] https://docs.travis-ci.com/user/environment-variables/#default-environment-variables

	https://github.com/ruby/rdoc/commit/42cdad1cf2
	---
	 test/rdoc/test_rdoc_generator_json_index.rb | 12 ++++++++++++
	 1 file changed, 12 insertions(+)

0 files changed, 0 insertions, 0 deletions