| commit | 38059d90ccb3711cde323a651835e21f62764308 | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Mon Nov 25 18:29:28 2013 -0800 |
| committer | zheilbron <zheilbron@gmail.com> | Mon Nov 25 18:29:28 2013 -0800 |
| tree | e706860cbfd288b7e0ad3ddb8dbef4f0e2c3fdfd | |
| parent | a8a928f0b6c60f8ffc7aad47a78ee572a1300f64 [diff] | |
| parent | 1ac2408859eed6a1efa75ff8777e86ef53c64e64 [diff] |
Merge branch 'master' into zheilbron/asterix_msr_demo Conflicts: asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/ConcurrentLockManager.java