diff options
| author | Mark Spruiell <mes@zeroc.com> | 2015-12-17 11:45:27 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2015-12-17 11:45:27 -0800 |
| commit | 884e2be89b0cd997f372c59f05bf05a9a5372b60 (patch) | |
| tree | 53d2123abf22042f827d0e83b6093cea038c3b3a /java/test/controller/src/main/slice/Controller.ice | |
| parent | Merge branch '3.6' (diff) | |
| download | ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.bz2 ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.xz ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.zip | |
Fixes for Bluetooth plug-ins.
Updates to testsuite to support Bluetooth and remote servers.
Diffstat (limited to 'java/test/controller/src/main/slice/Controller.ice')
| -rw-r--r-- | java/test/controller/src/main/slice/Controller.ice | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/test/controller/src/main/slice/Controller.ice b/java/test/controller/src/main/slice/Controller.ice index 7e4c2b95eda..5178df68660 100644 --- a/java/test/controller/src/main/slice/Controller.ice +++ b/java/test/controller/src/main/slice/Controller.ice @@ -29,7 +29,8 @@ sequence<string> StringSeq; interface Controller { - Server* runServer(string lang, string name, string protocol, string host, bool winrt, StringSeq options); + Server* runServer(string lang, string name, string protocol, string host, bool winrt, string configName, + StringSeq options); }; }; |