Merge PR#72 'robdouglas/STREAMS-156'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/493f43a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/493f43a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/493f43a4
Branch: refs/heads/master
Commit: 493f43a46eebc988e0b7d430fabe63eb73bc59ab
Parents: 7404248 41991ee
Author: mfranklin <mfranklin@apache.org>
Authored: Mon Aug 25 15:54:05 2014 -0400
Committer: mfranklin <mfranklin@apache.org>
Committed: Mon Aug 25 15:54:05 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/streams/data/util/MoreoverUtils.java | 2 +-
.../main/jsonschema/org/apache/streams/pojo/json/activity.json | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
|