This is an automated email from the ASF dual-hosted git repository. mattmann pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/oodt.git
commit f971cbeedb3874cbc178baebf6145e095bf7bdf8 Merge: eda5083 1ef641d Author: Chris Mattmann <[email protected]> AuthorDate: Sun Aug 19 18:20:19 2018 -0700 Merge branch 'OODT-992' of https://github.com/IMS94/oodt into merge-avro-dynworkflow core/pom.xml | 3 -- .../apache/oodt/cas/product/CASProductHandler.java | 3 -- .../cas/product/data/DatasetDeliveryServlet.java | 11 ++++++-- .../oodt/cas/product/rdf/RDFDatasetServlet.java | 30 ++++++++++++-------- workflow/pom.xml | 12 ++++++++ .../src/main/avro/types/AvroWorkflowInstance.avsc | 2 +- workflow/src/main/avro/types/protocol.avdl | 8 +++--- .../workflow/system/AvroRpcWorkflowManager.java | 33 ++++++++++++++-------- .../system/AvroRpcWorkflowManagerClient.java | 3 +- .../oodt/cas/workflow/util/AvroTypeFactory.java | 20 +++++++------ workflow/src/main/resources/log4j2.xml | 1 + 11 files changed, 81 insertions(+), 45 deletions(-)
