8000 merge revision(s) 44463: [Backport #9210] · github/ruby@bda92e9 · GitHub
[go: up one dir, main page]
Skip to content

Commit bda92e9

Browse files
nursenurse
committed
merge revision(s) 44463: [Backport ruby#9210]
 * variable.c: adding extra example in docs. patched by Steve Klabnik. [Bug ruby#9210] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 957bd76 commit bda92e9

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

‎ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Sat Feb 22 15:03:05 2014 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
2+
3+
* variable.c: adding extra example in docs.
4+
patched by Steve Klabnik. [Bug #9210]
5+
16
Sat Feb 22 15:01:21 2014 Tanaka Akira <akr@fsij.org>
27

38
* lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated

‎variable.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2517,8 +2517,9 @@ cvar_list(void *data)
25172517
* class Two < One
25182518
* @@var2 = 2
25192519
* end
2520-
* One.class_variables #=> [:@@var1]
2521-
* Two.class_variables #=> [:@@var2, :@@var1]
2520+
* One.class_variables #=> [:@@var1]
2521+
* Two.class_variables #=> [:@@var2, :@@var1]
2522+
* Two.class_variables(false) #=> [:@@var2]
25222523
*/
25232524

25242525
VALUE

‎version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.1.1"
22
#define RUBY_RELEASE_DATE "2014-02-22"
3-
#define RUBY_PATCHLEVEL 59
3+
#define RUBY_PATCHLEVEL 60
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 2

0 commit comments

Comments
 (0)
0