tree eb3421fb8738c42c4f52b3c188cad7ebbda13960
parent 920f6a8936acade540f360033383af928a1f413b
parent f974bf5dfaa206cf5fe185646c0a598c361c1114
author buyingyi <buyingyi@gmail.com> 1386391877 -0800
committer buyingyi <buyingyi@gmail.com> 1386391877 -0800

Merge branch 'zheilbron/asterix_msr_demo' of https://code.google.com/p/asterixdb into zheilbron/asterix_msr_demo