tree 63c4d73cd745f21774d9beb0c888781eed560164
parent c7389aca6e1cf4c1f6f0352776422c9232602934
parent 0d42cefc5b587bb45e017c45da1cab79e1005b2f
author zheilbron <zheilbron@gmail.com> 1382642728 -0700
committer zheilbron <zheilbron@gmail.com> 1382642728 -0700

Merge remote-tracking branch 'origin/raman/master_feeds' into zheilbron/hyracks_msr_demo

Conflicts:
	hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/job/JobRun.java
	hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/impls/AbstractTreeIndex.java