naruse	2014-02-22 14:46:06 +0900 (Sat, 22 Feb 2014)

  New Revision: 45112

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

  Log:
    merge revision(s) 44586: [Backport #9152]
    
    * lib/xmlrpc/client.rb: [DOC] Remove note about SSL package on RAA
      Since RAA has been deprecated, and the SSL package has been replaced
      with net/https this statement is entirely false and should be
      deleted. [Bug #9152]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/xmlrpc/client.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45111)
+++ ruby_2_1/ChangeLog	(revision 45112)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Feb 22 14:45:36 2014  Zachary Scott  <e@z...>
+
+	* lib/xmlrpc/client.rb: [DOC] Remove note about SSL package on RAA
+	  Since RAA has been deprecated, and the SSL package has been replaced
+	  with net/https this statement is entirely false and should be
+	  deleted. [Bug #9152]
+
 Sat Feb 22 14:31:23 2014  Zachary Scott  <e@z...>
 
 	* lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis
Index: ruby_2_1/lib/xmlrpc/client.rb
===================================================================
--- ruby_2_1/lib/xmlrpc/client.rb	(revision 45111)
+++ ruby_2_1/lib/xmlrpc/client.rb	(revision 45112)
@@ -77,8 +77,6 @@ module XMLRPC # :nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/xmlrpc/client.rb#L77
     #
     # If +use_ssl+ is set to +true+, communication over SSL is enabled.
     #
-    # Note, that you need the SSL package from RAA installed.
-    #
     # Parameter +timeout+ is the time to wait for a XML-RPC response, defaults to 30.
     def initialize(host=nil, path=nil, port=nil, proxy_host=nil, proxy_port=nil,
                    user=nil, password=nil, use_ssl=nil, timeout=nil)
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45111)
+++ ruby_2_1/version.h	(revision 45112)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 56
+#define RUBY_PATCHLEVEL 57
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44586


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/