D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 12 Projects 2 Releases 2 Wiki Activity

[stats wf] indicators across stats dbs & updates in the org ids #248

Closed
dimitris.pierrakos wants to merge 1742 commits from beta into beta2master_sept_2022
pull from: beta
merge into: D-Net:beta2master_sept_2022
Conversation 3 Commits 1742 Files Changed 1525 -7
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0f96af5d56 - Show all commits

7
dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/oozie_app/workflow.xml
View File

@ -340,19 +340,12 @@
</action> </action>
<<<<<<< HEAD
<!-- Removed for ser --> <!-- Removed for ser -->
<!-- <!--
JOIN ITERATIVE METHODS AND THEN END = JOIN ITERATIVE METHODS AND THEN END =
<join name="join-iterative-rankings" to="end" /> <join name="join-iterative-rankings" to="end" />
to="get-file-names"/> to="get-file-names"/>
--> -->
=======
<!-- JOIN ITERATIVE METHODS AND THEN END -->
<join name="join-iterative-rankings" to="get-file-names" />
<!-- to="get-file-names"/> -->
>>>>>>> 60f25b780de1c456762003cbb8b0011c9c82f93d
<!-- This will be a shell action that will output key-value pairs for output files --> <!-- This will be a shell action that will output key-value pairs for output files -->
<action name="get-file-names"> <action name="get-file-names">