cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [3/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Wed, 20 Nov 2013 18:00:26 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	build.xml
	debian/changelog


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb7eb868
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb7eb868
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb7eb868

Branch: refs/heads/trunk
Commit: cb7eb8687d332debf1d1aa1fab9cba9c68638763
Parents: fcb2c65 5f79f53
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Nov 20 11:54:57 2013 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Nov 20 11:54:57 2013 -0600

----------------------------------------------------------------------
 examples/pig/example-script-cql.pig             | 11 ++++++++++
 examples/pig/example-script.pig                 | 14 +------------
 .../cassandra/pig/CqlTableDataTypeTest.java     | 21 ++++++++++++++++++++
 .../pig/ThriftColumnFamilyDataTypeTest.java     | 21 ++++++++++++++++++++
 4 files changed, 54 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb7eb868/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
index 352b2e2,c81ff07..1ae9806
--- a/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
+++ b/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
@@@ -1,22 -1,25 +1,43 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + *   http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
  package org.apache.cassandra.pig;
+ /*
+  * 
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  * 
+  *   http://www.apache.org/licenses/LICENSE-2.0
+  * 
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied.  See the License for the
+  * specific language governing permissions and limitations
+  * under the License.
+  * 
+  */
+ 
  
  import java.io.IOException;
  import java.nio.charset.CharacterCodingException;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb7eb868/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
index cc54620,2cf1c89..7bccc23
--- a/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
+++ b/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
@@@ -1,22 -1,25 +1,43 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + *   http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
  package org.apache.cassandra.pig;
+ /*
+  * 
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  * 
+  *   http://www.apache.org/licenses/LICENSE-2.0
+  * 
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied.  See the License for the
+  * specific language governing permissions and limitations
+  * under the License.
+  * 
+  */
+ 
  
  import java.io.IOException;
  import java.nio.charset.CharacterCodingException;


Mime
View raw message