| commit | f974bf5dfaa206cf5fe185646c0a598c361c1114 | [log] [tgz] |
|---|---|---|
| author | salsubaiee <salsubaiee@gmail.com> | Fri Dec 06 15:30:19 2013 -0800 |
| committer | salsubaiee <salsubaiee@gmail.com> | Fri Dec 06 15:30:19 2013 -0800 |
| tree | b85566f317686265b090636d709a2f8259790630 | |
| parent | 0e196482e7d7b255cdcbaa168b2914c503f147e9 [diff] | |
| parent | 8c7bcf1323cbcd9941abfc0972179df677a62eff [diff] |
Merge branch 'zheilbron/asterix_msr_demo' of https://code.google.com/p/asterixdb into zheilbron/asterix_msr_demo