diff options
| author | Florian Frank <flori@ping.de> | 2012-11-29 13:44:14 +0100 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2012-11-29 15:01:27 +0100 |
| commit | 103ae8eb39b598964b497601c73b7a6fc8c61ad5 (patch) | |
| tree | 8f83e3ebdc1ed69a9d59332ca3214d5e18a7e711 /java | |
| parent | e3c6a7c7fee695b45b9cd2bf062138bcc54b2d28 (diff) | |
| download | json-103ae8eb39b598964b497601c73b7a6fc8c61ad5.tar.gz | |
add merge alias for configure in jruby
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/json/ext/GeneratorState.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); |