Merge branch 'devel-3.1' of https://git-wip-us.apache.org/repos/asf/incubator-apex-malhar into devel-3.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/9df821f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/9df821f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/9df821f8 Branch: refs/heads/devel-3.1 Commit: 9df821f879161cce27ac8a825078fb8dc4942ef0 Parents: 4645e84 30ddf4c Author: thomas <[email protected]> Authored: Sat Aug 29 15:59:44 2015 -0700 Committer: thomas <[email protected]> Committed: Sat Aug 29 15:59:44 2015 -0700 ---------------------------------------------------------------------- .../com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java | 6 +++--- .../com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java | 6 +++--- .../java/com/datatorrent/lib/io/WebSocketInputOperator.java | 2 +- .../java/com/datatorrent/lib/io/WebSocketOutputOperator.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
