diff options
| author | unknown | 2014-04-10 13:15:13 +0200 |
|---|---|---|
| committer | unknown | 2014-04-10 13:15:13 +0200 |
| commit | 16627b382f7e2aecb296e6305553a02232527163 (patch) | |
| tree | ebbab3f0f34385b7bbdb008fee6826f8dec54ab7 | |
| parent | Update der Datenbank beim Update der Veranstaltung funktioniert nun (diff) | |
| parent | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff) | |
| download | tutor-module-16627b382f7e2aecb296e6305553a02232527163.tar.gz tutor-module-16627b382f7e2aecb296e6305553a02232527163.tar.xz tutor-module-16627b382f7e2aecb296e6305553a02232527163.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Conflicts:
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
| -rw-r--r-- | Dozentenmodul/bin/thrift/ThriftConnection.class | bin | 1590 -> 1590 bytes | |||
| -rw-r--r-- | Dozentenmodul/src/thrift/ThriftConnection.java | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Dozentenmodul/bin/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class Binary files differindex 7f087cc1..f378593f 100644 --- a/Dozentenmodul/bin/thrift/ThriftConnection.class +++ b/Dozentenmodul/bin/thrift/ThriftConnection.class diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 79f4a123..311125f5 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -10,7 +10,8 @@ import server.Server; import server.Server.Client; public class ThriftConnection { - final TTransport transport = new TSocket("141.79.128.121", 9090); + //final TTransport transport = new TSocket("141.79.128.121", 9090); + final TTransport transport = new TSocket("141.79.128.102", 9090); public Client getThriftConnection() { |