svn commit: r1659148 [1/3] - in /hive/branches/parquet: ./ ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/orc/ ql/src/java/org/apache/hadoop/hive/ql/exec/ ql/src/java/org/apache/hadoop/hive/ql/exec/tez/ ql/src/java/org/apache/hadoop/hive/ql/...

[brock]

Author: brock
Date: Thu Feb 12 04:56:42 2015
New Revision: 1659148

URL: http://svn.apache.org/r1659148
Log:
Merge from trunk to parquet

Added:
    
hive/branches/parquet/serde/src/java/org/apache/hadoop/hive/serde2/io/ParquetHiveRecord.java
      - copied unchanged from r1659147, 
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/ParquetHiveRecord.java
Modified:
    hive/branches/parquet/   (props changed)
    
hive/branches/parquet/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/orc/OrcProto.java
    
hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
    
hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java
    
hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/MapredParquetOutputFormat.java
    
hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/serde/ParquetHiveSerDe.java
    
hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/write/DataWritableWriteSupport.java
    
hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/write/DataWritableWriter.java
    
hive/branches/parquet/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/write/ParquetRecordWriterWrapper.java
    
hive/branches/parquet/ql/src/protobuf/org/apache/hadoop/hive/ql/io/orc/orc_proto.proto
    
hive/branches/parquet/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/TestDataWritableWriter.java
    
hive/branches/parquet/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/TestMapredParquetOutputFormat.java
    
hive/branches/parquet/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/TestParquetSerDe.java
    
hive/branches/parquet/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
    
hive/branches/parquet/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java

Propchange: hive/branches/parquet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 04:56:42 2015
@@ -4,4 +4,4 @@
 /hive/branches/spark:1608589-1657401
 /hive/branches/tez:1494760-1622766
 /hive/branches/vectorization:1466908-1527856
-/hive/trunk:1656617-1659011
+/hive/trunk:1656617-1659147