[nifi-minifi-cpp] branch master updated: MINIFICPP-766: Correct path for controller

[aldrin]

This is an automated email from the ASF dual-hosted git repository.

aldrin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new 760a92a  MINIFICPP-766: Correct path for controller
760a92a is described below

commit 760a92abc48329ee85fabeee0397dbdd4258ebc5
Author: Marc Parisi <phroc...@apache.org>
AuthorDate: Fri Mar 15 14:03:35 2019 -0400

    MINIFICPP-766: Correct path for controller
    
    MINIFICPP-767: Remove nanofi test failure
    
    This closes #514.
    
    Signed-off-by: Aldrin Piri <ald...@apache.org>
---
 controller/Controller.h        | 1 -
 nanofi/examples/CMakeLists.txt | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/controller/Controller.h b/controller/Controller.h
index b1fdb5a..92d863c 100644
--- a/controller/Controller.h
+++ b/controller/Controller.h
@@ -291,7 +291,6 @@ void printManifest(const std::shared_ptr<minifi::Configure> 
&configuration) {
   log_properties->set("logger.org::apache::nifi::minifi", "OFF,stdout");
   logging::LoggerConfiguration::getConfiguration().initialize(log_properties);
 
-  configuration->set(minifi::Configure::nifi_flow_configuration_file, 
"../conf/config.yml");
   configuration->get(minifi::Configure::nifi_provenance_repository_class_name, 
prov_repo_class);
   // Create repos for flow record and provenance
   std::shared_ptr<core::Repository> prov_repo = 
core::createRepository(prov_repo_class, true, "provenance");
diff --git a/nanofi/examples/CMakeLists.txt b/nanofi/examples/CMakeLists.txt
index a3db4d2..6a9779c 100644
--- a/nanofi/examples/CMakeLists.txt
+++ b/nanofi/examples/CMakeLists.txt
@@ -67,9 +67,9 @@ target_link_libraries(generate_flow nanofi 
${CMAKE_THREAD_LIBS_INIT} ${LINK_FLAG
 
 target_link_libraries(terminate_handler nanofi ${CMAKE_THREAD_LIBS_INIT} )
 
-add_executable(hash_file hash_file.c)
+#add_executable(hash_file hash_file.c)
 
-target_link_libraries(hash_file nanofi ${CMAKE_THREAD_LIBS_INIT} )
+#arget_link_libraries(hash_file nanofi ${CMAKE_THREAD_LIBS_INIT} )
 
 add_executable(transmit_flow transmit_flow.c)