Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java	(revision 1793617)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java	(working copy)
@@ -22,6 +22,7 @@
 import static org.apache.jackrabbit.oak.api.Type.NAMES;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.MIX_ATOMIC_COUNTER;
 
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ScheduledExecutorService;
@@ -31,13 +32,16 @@
 import javax.annotation.Nullable;
 
 import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterators;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.core.SimpleCommitContext;
 import org.apache.jackrabbit.oak.plugins.memory.LongPropertyState;
 import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
+import org.apache.jackrabbit.oak.spi.commit.CommitContext;
 import org.apache.jackrabbit.oak.spi.commit.CommitHook;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.commit.DefaultEditor;
@@ -407,7 +411,7 @@
                 if (isConsolidate(b)) {
                     LOG.trace("[{}] consolidating.", name);
                     consolidateCount(b);
-                    s.merge(root, hook, CommitInfo.EMPTY);                    
+                    s.merge(root, hook, createCommitInfo());
                 } else {
                     LOG.debug("[{}] Someone else consolidated. Skipping any operation.", name);
                 }
@@ -532,4 +536,9 @@
         
         return counter.getValue(LONG).longValue() != hiddensum;
     }
+
+    private static CommitInfo createCommitInfo() {
+        Map<String, Object> info = ImmutableMap.<String, Object>of(CommitContext.NAME, new SimpleCommitContext());
+        return new CommitInfo(CommitInfo.OAK_UNKNOWN, CommitInfo.OAK_UNKNOWN, info);
+    }
 }
Index: oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java
===================================================================
--- oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java	(revision 1793618)
+++ oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java	(working copy)
@@ -45,7 +45,6 @@
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -61,7 +60,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
-@Ignore("OAK-6149")
 public class AtomicCounterIT {
 
     @Rule