You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/06/23 18:17:07 UTC
[06/10] git commit: Merge branch 'master' into STREAMS-71
Merge branch 'master' into STREAMS-71
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/78066e6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/78066e6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/78066e6e
Branch: refs/heads/master
Commit: 78066e6e458b9977e93a7364531470282fbdcf1c
Parents: 899b2e2 16343c6
Author: mfranklin <mf...@apache.org>
Authored: Mon Jun 23 08:15:29 2014 -0400
Committer: mfranklin <mf...@apache.org>
Committed: Mon Jun 23 08:15:29 2014 -0400
----------------------------------------------------------------------
.../streams-provider-datasift/pom.xml | 18 ++-
.../streams/datasift/csdl/DatasiftCsdlUtil.java | 114 +++++++++++++++++++
.../streams/jackson/StreamsJacksonMapper.java | 4 +-
3 files changed, 133 insertions(+), 3 deletions(-)
----------------------------------------------------------------------