Merge branch 'SPOI-6624-devel-3' into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/9656248c Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/9656248c Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/9656248c Branch: refs/heads/devel-3 Commit: 9656248cf63c3be12ba06d01c0caef9fd061664d Parents: 892355c d71473d Author: Timothy Farkas <[email protected]> Authored: Mon Nov 23 12:24:33 2015 -0800 Committer: Timothy Farkas <[email protected]> Committed: Mon Nov 23 12:24:33 2015 -0800 ---------------------------------------------------------------------- .../stram/util/SharedPubSubWebSocketClient.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
