streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sblack...@apache.org
Subject [3/3] incubator-streams git commit: Merge commit '14f4c4652e20751003fa3655070fb35865170f5a'
Date Fri, 19 Jun 2015 21:43:59 GMT
Merge commit '14f4c4652e20751003fa3655070fb35865170f5a'

* commit '14f4c4652e20751003fa3655070fb35865170f5a':
  improvements for STREAMS-333
  resolves STREAMS-333 #333 added parent support to EsUpdater more comprehensive testing

Conflicts:
	streams-contrib/streams-persist-elasticsearch/pom.xml


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

Branch: refs/heads/master
Commit: e7bf641d3cac55ad80e05e66c9ab405fee1a3c68
Parents: 0db84e4 14f4c46
Author: Steve Blackmon (@steveblackmon) <sblackmon@apache.org>
Authored: Fri Jun 19 16:42:51 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sblackmon@apache.org>
Committed: Fri Jun 19 16:42:51 2015 -0500

----------------------------------------------------------------------
 pom.xml                                         |   2 +
 .../streams-persist-elasticsearch/pom.xml       |  25 ++-
 .../ElasticsearchMetadataUtil.java              |  12 ++
 .../ElasticsearchPersistUpdater.java            |  22 ++-
 .../ElasticsearchPersistWriter.java             |  36 +++-
 .../test/TestDatumFromMetadataProcessorIT.java  |  99 ++++++++++
 .../test/TestElasticsearchPersistWriter.java    |  88 ---------
 .../test/TestElasticsearchPersistWriterIT.java  | 197 +++++++++++++++++++
 ...ElasticsearchPersistWriterParentChildIT.java | 183 +++++++++++++++++
 .../resources/ActivityChildObjectParent.json    |  21 ++
 10 files changed, 579 insertions(+), 106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e7bf641d/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e7bf641d/streams-contrib/streams-persist-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --cc streams-contrib/streams-persist-elasticsearch/pom.xml
index e830071,37d74d7..34f3b13
--- a/streams-contrib/streams-persist-elasticsearch/pom.xml
+++ b/streams-contrib/streams-persist-elasticsearch/pom.xml
@@@ -202,4 -222,4 +223,4 @@@
              </plugin>
          </plugins>
      </build>
--</project>
++</project>


Mime
View raw message