| commit | ddb4d485a2e52b050fd336311ebcdeb0338d1ccb | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Fri Aug 30 17:46:48 2013 -0700 |
| committer | zheilbron <zheilbron@gmail.com> | Fri Aug 30 17:46:48 2013 -0700 |
| tree | e3b8a820992fb4e24723acd51e98ff0bba1069a5 | |
| parent | 195318adac454c9ca012d14d52a7a084cfad2bd6 [diff] | |
| parent | 5eba6a0795f2278f4ea7747f8b54c858529b5502 [diff] |
Merge branch 'master' into zheilbron/asterix_msr_demo Conflicts: asterix-common/src/main/java/edu/uci/ics/asterix/common/api/AsterixThreadExecutor.java asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/logging/LogManager.java