tree 89131c68484a8960e89891b664f1109c0c548876
parent e773c2573bba9a1d21a448fc00896b8dec6b58cd
parent 7e31eecc65f5328049373add2dd41def4d2caad8
author julien <julien@twitter.com> 1373692925 -0700
committer julien <julien@twitter.com> 1373692925 -0700

Merge branch 'master' into fsa_codegen2

Conflicts:
	parquet-column/pom.xml
	parquet-column/src/main/java/parquet/example/DummyRecordConverter.java
	parquet-column/src/main/java/parquet/schema/PrimitiveType.java
	parquet-column/src/test/java/parquet/io/PerfTest.java