You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ch...@apache.org on 2015/09/10 00:32:33 UTC

[45/50] [abbrv] incubator-apex-malhar git commit: Merge branch 'ilooner_pull' into devel-3.1

Merge branch 'ilooner_pull' 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/30ddf4cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/30ddf4cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/30ddf4cc

Branch: refs/heads/master
Commit: 30ddf4cc74fd6665394a026bd7f61cb8abff405d
Parents: c4a6d8d fb8e486
Author: David Yan <da...@datatorrent.com>
Authored: Fri Aug 28 19:54:02 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Fri Aug 28 19:54:02 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(-)
----------------------------------------------------------------------