Clone
Eldon Carman <ecarm002@ucr.edu>
committed
on 06 Feb 14
Merge branch 'master' into ecarm002/aggregate_sql_functions
* master: (23 commits)
Fixed a deadlock when stopping the dataset life cycle m… Show more
Merge branch 'master' into ecarm002/aggregate_sql_functions

* master: (23 commits)

 Fixed a deadlock when stopping the dataset life cycle manager.

 remove debug logging

 move print methods to the 'debugging section'

 generate methods to print a record as JSON

 updated the documentation for the transaction model on behalf of youngseok

 add unrestricted REST endpoint

 remove useless gitignores that Eclipse generates

 modified snapshot version of fuzzy join, fixed issue 703

 adding fuzzyjoin code to git

 disable debugging checks fix LockManagerDeterministicUnitTest some cleanup

 some more cleanup (mostly removal of debug/logging code)

 fix typo

 some cleanup

 remove duplicate

 revert temporary changes

 better attempt to fix the bug minor cleanup

 a fix and a bunch of debugging changes

 fix construction with allocId

 add DeadlockTracker

 temp change to avoid deleting the instance after the test run

 ...

Show less

master + 10 more