summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-10 06:47:23 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-10 06:47:23 +0000
commit1511ef08ef72e17f648599cf6fddc2ea6d17d27e (patch)
tree9d71d0698b8910e6cebcb050fd5ecd93e2f53a95
parentddc47a94756381c9bc56a918728631209099669d (diff)
merge revision(s) 54898: [Backport #12339]
* bignum.c: [DOC] Update result of 123456789 ** -2. [ruby-dev:49606] [Bug #12339] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--bignum.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 229f8612d5..a266ab0c8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 10 15:46:24 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * bignum.c: [DOC] Update result of 123456789 ** -2.
+ [ruby-dev:49606] [Bug #12339]
+
Fri Jun 10 15:37:25 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org>
* internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
diff --git a/bignum.c b/bignum.c
index dfbe2ecec9..95dc6ca2cd 100644
--- a/bignum.c
+++ b/bignum.c
@@ -6248,7 +6248,7 @@ rb_big_fdiv(VALUE x, VALUE y)
*
* 123456789 ** 2 #=> 15241578750190521
* 123456789 ** 1.2 #=> 5126464716.09932
- * 123456789 ** -2 #=> 6.5610001194102e-17
+ * 123456789 ** -2 #=> (1/15241578750190521)
*/
VALUE
diff --git a/version.h b/version.h
index 183542e2a9..eb2b6374b5 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.6"
#define RUBY_RELEASE_DATE "2016-06-10"
-#define RUBY_PATCHLEVEL 325
+#define RUBY_PATCHLEVEL 326
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 6