Merge pull request #5 from apache/master Merge From Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/d71b159d Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/d71b159d Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/d71b159d Branch: refs/heads/STREAMS-46 Commit: d71b159d1996a939cccede70b509c1767478aa72 Parents: 2ee3157 34c95a6 Author: Robert Douglas <[email protected]> Authored: Fri Jun 27 16:43:57 2014 -0500 Committer: Robert Douglas <[email protected]> Committed: Fri Jun 27 16:43:57 2014 -0500 ---------------------------------------------------------------------- pom.xml | 2 +- streams-contrib/streams-provider-google/google-gmail/pom.xml | 2 +- .../apache/streams/sysomos/provider/SysomosHeartbeatStream.java | 4 +++- streams-contrib/streams-provider-twitter/pom.xml | 5 +++-- 4 files changed, 8 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
