From e6de0037ae5c2a77170994c3f33b4a1b307359d7 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 31 Jul 2016 12:28:51 +0300
Subject: [PATCH] [no commit message]

---
 .../src/main/java/inr/numass/actions/MergeDataAction.java       | 2 +-
 .../main/java/inr/numass/actions/ReadNumassStorageAction.java   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java b/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java
index e2788c53..cd32c49b 100644
--- a/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java
+++ b/numass-main/src/main/java/inr/numass/actions/MergeDataAction.java
@@ -42,7 +42,7 @@ import java.util.Map;
  * @author Darksnake
  */
 @TypedActionDef(name = "merge", inputType = Table.class, outputType = Table.class, info = "Merge different numass data files into one.")
-@NodeDef(name = "grouping", info = "The defenition of grouping rule for this merge", target = "method::hep.dataforge.actions.GroupBuilder.byAnnotation")
+@NodeDef(name = "grouping", info = "The defenition of grouping rule for this merge", target = "method::hep.dataforge.actions.GroupBuilder.byMeta")
 public class MergeDataAction extends ManyToOneAction<Table, Table> {
 
     public static final String MERGE_NAME = "mergeName";
diff --git a/numass-main/src/main/java/inr/numass/actions/ReadNumassStorageAction.java b/numass-main/src/main/java/inr/numass/actions/ReadNumassStorageAction.java
index 30343620..66e13d09 100644
--- a/numass-main/src/main/java/inr/numass/actions/ReadNumassStorageAction.java
+++ b/numass-main/src/main/java/inr/numass/actions/ReadNumassStorageAction.java
@@ -41,6 +41,7 @@ public class ReadNumassStorageAction extends GenericAction<Void, NumassData> {
             boolean forwardOnly = actionMeta.getBoolean("forwardOnly", false);
             boolean reverseOnly = actionMeta.getBoolean("reverseOnly", false);
 
+            //FIXME make Work actually submitted only when calculation starts
             Work<DataSet<NumassData>> process = getContext().workManager()
                     .<DataSet<NumassData>>post(getName(), (Callback callback) -> {
                         //FIXME remove in later revisions