tree e254bbefed861b21cec63466fa3db99b26726c83
parent 938bcd8dde47a180315166d0508448a5f1c597c2
parent 7ec10c1640fd072cabc985dc42c2b176a0439ddf
author zheilbron <zheilbron@gmail.com> 1377283540 -0700
committer zheilbron <zheilbron@gmail.com> 1377283540 -0700

Merge branch 'master' into dev/hyracks_msr

Conflicts:
	hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/LSMHarness.java