solr-code check in
Merge branch 'master' of https://github.com/homebrewcode/hadoop