commit 20c5de93f00fdf7fd4a06bc5b9e5fd8429419cfc
Author: Jenkins <dev-kitchen@cloudera.com>
Date:   Mon Mar 30 17:03:56 2015 -0700

    Branch for CDH5.3.3

commit df57ebe31a8c744a98e90afb84c6eebfe771ed5b
Author: Jenkins slave <kitchen-build@cloudera.com>
Date:   Wed Feb 11 13:04:02 2015 -0800

    Preparing for CDH5.3.3 development

commit 0e0b969a192819b770e7c5df7da4847134eb979c
Author: Jenkins slave <kitchen-build@cloudera.com>
Date:   Mon Jan 26 08:52:20 2015 -0800

    Preparing for CDH5.3.2 development

commit 756a4722d0a42e5defd523c4309ff5abac9d95b3
Author: Jenkins slave <kitchen-build@cloudera.com>
Date:   Mon Dec 1 17:57:47 2014 -0800

    Preparing for CDH5.3.1 development

commit bcddbeea23a6806c501c1fb7da2ad92771abc828
Author: Jacques Nadeau <jacques@apache.org>
Date:   Wed Jul 30 08:55:46 2014 -0700

    PARQUET-12: Add format support for additional converted types.
    
    Author: Jacques Nadeau <jacques@apache.org>
    
    Closes #3 from jacques-n/PARQUET-12 and squashes the following commits:
    
    7001502 [Jacques Nadeau] Remove micros implementations until everyone is agreed on micros versus nanos.
    b0e067c [Jacques Nadeau] PARQUET-12: Add format support for additional converted types.

commit 316f865135d4a2ef410993e5bd6c59913e6ef29c
Author: julien <julien@twitter.com>
Date:   Tue May 27 15:14:27 2014 -0700

    fix id
    
    Conflicts:
    	src/thrift/parquet.thrift
    Resolution:
            This fixes the conflict in the last commit.

commit e07d69898807244c3d8b3d744af518fc7b0215d3
Author: Julien Le Dem <julien@twitter.com>
Date:   Tue Mar 4 14:46:09 2014 -0800

    add field_id in SchemaElement
    Conflicts:
    	src/thrift/parquet.thrift
    Resolution:
            This is expected and was fixed upstream by merging master into
            the working branch.

commit 2fb0ee4a9e531ea9aaa5cbeafffc90af9583934e
Author: Jenkins slave <kitchen-build@cloudera.com>
Date:   Fri Sep 26 09:26:30 2014 -0700

    Preparing for CDH5.3.0 development

commit e319db54e2e2767d3d8d47a699941cfd1e6c5705
Author: Ryan Blue <rblue@cloudera.com>
Date:   Mon Jul 28 09:19:33 2014 -0700

    CLOUDERA-BUILD. Use CDH5 parent pom and repositories.