Change in asterixdb[master]: [ASTERIXDB-1990][ASTERIXDB-1991][ASTERIXDB-2025][STO] Fix Merge

["abdullah alamoudi (Code Review)" <do...@asterixdb.incubator.apache.org>]

Hello Jenkins,

I'd like you to reexamine a change.  Please visit

    https://asterix-gerrit.ics.uci.edu/1930

to look at the new patch set (#4).

Change subject: [ASTERIXDB-1990][ASTERIXDB-1991][ASTERIXDB-2025][STO] Fix Merge
......................................................................

[ASTERIXDB-1990][ASTERIXDB-1991][ASTERIXDB-2025][STO] Fix Merge

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
- Complete merge operation after deletion of old components
  files.

Change-Id: I843de8b26c181205e43f4eabe22a7c43f3ebfcbc
---
M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java
M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
4 files changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/30/1930/4
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1930
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I843de8b26c181205e43f4eabe22a7c43f3ebfcbc
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <ba...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>