aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/shell.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 35869687f7..87a86e0cbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 19 10:09:58 2016 Sho Hashimoto <sho-h@ruby-lang.org>
+
+ * lib/shell.rb (Shell.debug_output_exclusive_unlock): remove
+ because Mutex#exclusive_unlock was already deleted. [fix GH-1185]
+
Tue Jan 19 09:38:27 2016 Nick Cox <nick@nickcox.me>
* vm_method.c: fix grammar in respond_to? warning.
diff --git a/lib/shell.rb b/lib/shell.rb
index bf389795b7..8216eb2862 100644
--- a/lib/shell.rb
+++ b/lib/shell.rb
@@ -168,7 +168,7 @@ class Shell
end
# os resource mutex
- mutex_methods = ["unlock", "lock", "locked?", "synchronize", "try_lock", "exclusive_unlock"]
+ mutex_methods = ["unlock", "lock", "locked?", "synchronize", "try_lock"]
for m in mutex_methods
def_delegator("@debug_output_mutex", m, "debug_output_"+m.to_s)
end