Partially merge revision 49195: [Bug #10717]

Support cmake 2.6 which is used by RHEL6/ CentOS 6
https://github.com/rubygems/rubygems/pull/1124


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 2 insertions, 2 deletions

diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb
index aaece6868b..a36be476be 100644
--- a/test/rubygems/test_gem_ext_cmake_builder.rb
+++ b/test/rubygems/test_gem_ext_cmake_builder.rb
@@ -20,7 +20,7 @@ class TestGemExtCmakeBuilder < Gem::TestCase
   def test_self_build
     File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
       cmakelists.write <<-eo_cmake
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.6)
 install (FILES test.txt DESTINATION bin)
       eo_cmake
     end
diff --git a/version.h b/version.h
index 2ec6444b6a..ae17b004d8 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.7"
 #define RUBY_RELEASE_DATE "2015-05-29"
-#define RUBY_PATCHLEVEL 359
+#define RUBY_PATCHLEVEL 360
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5