Shark 141#97

Closed

haitaoyao wants to merge 7 commits intoamplab:masterfrom

haitaoyao:shark-141

Commits on Jan 22, 2013

add .ensime
haitaoyao
committed

Commits on Jan 28, 2013

Merge branch 'amplab'
haitaoyao
committed

Commits on Feb 5, 2013

Merge branch 'amplab'
haitaoyao
committed

Commits on Feb 16, 2013

Merge branch 'amplab'
haitaoyao
committed

Commits on May 7, 2013

Merge branch 'amplab'
haitaoyao
committed

Commits on May 20, 2013

merge amplab
haitaoyao
committed

Commits on May 23, 2013

no lock on Xml decode because of hive bug fix for HashMap
haitaoyao
committed