From 103ae8eb39b598964b497601c73b7a6fc8c61ad5 Mon Sep 17 00:00:00 2001 From: Florian Frank Date: Thu, 29 Nov 2012 13:44:14 +0100 Subject: add merge alias for configure in jruby --- java/src/json/ext/GeneratorState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java') diff --git a/java/src/json/ext/GeneratorState.java b/java/src/json/ext/GeneratorState.java index 14d5431..58904ee 100644 --- a/java/src/json/ext/GeneratorState.java +++ b/java/src/json/ext/GeneratorState.java @@ -445,7 +445,7 @@ public class GeneratorState extends RubyObject { * @param vOpts The options hash * @return The receiver */ - @JRubyMethod + @JRubyMethod(alias = "merge") public IRubyObject configure(ThreadContext context, IRubyObject vOpts) { OptionsReader opts = new OptionsReader(context, vOpts); -- cgit v1.2.1