Merge PR#175 from 'eponvert/STREAMS-266'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/18d14f01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/18d14f01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/18d14f01 Branch: refs/heads/asf-master Commit: 18d14f0104473582ae509618daa8614e78f531a3 Parents: 1be37a0 5576a73 Author: Matt Franklin <mfrank...@apache.org> Authored: Thu Feb 12 12:31:50 2015 -0500 Committer: Matt Franklin <mfrank...@apache.org> Committed: Thu Feb 12 12:31:50 2015 -0500 ---------------------------------------------------------------------- .../streams/facebook/provider/FacebookFriendFeedProvider.java | 2 +- .../streams/facebook/provider/FacebookFriendUpdatesProvider.java | 2 +- .../facebook/provider/FacebookUserInformationProvider.java | 2 +- .../streams/facebook/provider/FacebookUserstreamProvider.java | 2 +- .../instagram/serializer/InstagramUserInfoSerializer.java | 2 +- .../streams/twitter/provider/TwitterUserInformationProvider.java | 2 +- .../java/org/apache/streams/local/queues/ThroughputQueue.java | 4 ++-- .../java/org/apache/streams/local/tasks/StreamsMergeTask.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
