You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2015/12/01 17:09:58 UTC

[3/3] incubator-streams git commit: Merge branch 'STREAMS-386'

Merge branch 'STREAMS-386'

* STREAMS-386:
  fix random new error
  resolves STREAMS-386


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/aa701e55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/aa701e55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/aa701e55

Branch: refs/heads/master
Commit: aa701e5553612b6e1bc1adca87a7e3ecb64c039f
Parents: 064d925 ee2d881
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Dec 1 10:03:30 2015 -0600
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Dec 1 10:03:30 2015 -0600

----------------------------------------------------------------------
 .../test/TestElasticsearchPersistWriterIT.java          |  2 +-
 streams-pojo/src/main/jsonschema/activity.json          | 12 ++++++++++++
 streams-pojo/src/main/jsonschema/collection.json        |  1 +
 streams-pojo/src/main/jsonschema/object.json            |  4 ++++
 streams-pojo/src/main/jsonschema/verbs/author.json      |  6 +++---
 5 files changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------