diff options
| author | Christian S <christian@pix-art.de> | 2015-09-12 10:27:56 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-09-12 10:27:56 +0200 |
| commit | 58a07c4ca2652a4fb92fe7da7c3861b4ffbccab4 (patch) | |
| tree | 657fba8eebcc988c833a317834cdb30dddfd4b02 /src/main/java/eu/siacs/conversations/Config.java | |
| parent | c90ca66c58c37836c13075c794b1e7cad3813984 (diff) | |
| parent | 07c1571e1eb32c1c36fe80bdb96caf17c3824dc4 (diff) | |
Merge branch 'siacs-master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/Config.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index e5e15edd7..cddcd6d55 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -16,7 +16,7 @@ public final class Config { public static final int PING_MAX_INTERVAL = 300; public static final int PING_MIN_INTERVAL = 30; - public static final int PING_TIMEOUT = 10; + public static final int PING_TIMEOUT = 15; public static final int SOCKET_TIMEOUT = 15; public static final int CONNECT_TIMEOUT = 90; public static final int CARBON_GRACE_PERIOD = 90; |