[ruby-cvs:57769] nagachika:r50621 (ruby_2_2): merge revision(s) 50071, 50088: [Backport #10998] [Backport #11000]

[nagachika at ruby-lang.org]

nagachika	2015-05-24 02:15:12 +0900 (Sun, 24 May 2015)

  New Revision: 50621

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50621

  Log:
    merge revision(s) 50071,50088: [Backport #10998] [Backport #11000]
    
    * ext/-test-/file/fs.c (get_fsname): return filesystem name by
      statfs/statvfs.  [ruby-core:68624] [Bug #10998]
    
    * ext/-test-/file/fs.c (get_fsname): try magic number only if
      f_type is included.  [ruby-dev:48913] [Bug #11000]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/-test-/file/extconf.rb
    branches/ruby_2_2/ext/-test-/file/fs.c
    branches/ruby_2_2/version.h