Merge PR47 branch 'rdouglas/STREAMS-105'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b7e4c346 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b7e4c346 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/b7e4c346 Branch: refs/heads/STREAMS-46 Commit: b7e4c34672238bbcd5a28cede7c4965e4e9ab49c Parents: 853ae3c fbb8ccf Author: mfranklin <[email protected]> Authored: Mon Jul 14 13:01:41 2014 -0400 Committer: mfranklin <[email protected]> Committed: Mon Jul 14 13:01:41 2014 -0400 ---------------------------------------------------------------------- .../serializer/DatasiftDefaultActivitySerializer.java | 7 +++++-- .../src/main/jsonschema/com/datasift/Datasift.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b7e4c346/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json ----------------------------------------------------------------------
