cassandra git commit: fix merge issue

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.3 597729d9d -> dba2e16c9


fix merge issue


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

Branch: refs/heads/cassandra-3.3
Commit: dba2e16c95951216d401358180b309eec34eb7e5
Parents: 597729d
Author: T Jake Luciani 
Authored: Fri Jan 15 10:14:07 2016 -0500
Committer: T Jake Luciani 
Committed: Fri Jan 15 10:14:07 2016 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dba2e16c/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 7466556..0ce25cb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -98,9 +98,11 @@ import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.CounterMutationVerbHandler;
 import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.db.DefinitionsUpdateVerbHandler;
+import org.apache.cassandra.db.Directories;
 import org.apache.cassandra.db.Keyspace;
 import org.apache.cassandra.db.MigrationRequestVerbHandler;
 import org.apache.cassandra.db.MutationVerbHandler;
+import org.apache.cassandra.db.PartitionPosition;
 import org.apache.cassandra.db.RangeSliceVerbHandler;
 import org.apache.cassandra.db.ReadCommandVerbHandler;
 import org.apache.cassandra.db.ReadRepairVerbHandler;

[1/2] cassandra git commit: fix merge issue

[jake]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 0c82f977a -> 6148f5214


fix merge issue


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

Branch: refs/heads/trunk
Commit: dba2e16c95951216d401358180b309eec34eb7e5
Parents: 597729d
Author: T Jake Luciani 
Authored: Fri Jan 15 10:14:07 2016 -0500
Committer: T Jake Luciani 
Committed: Fri Jan 15 10:14:07 2016 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dba2e16c/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 7466556..0ce25cb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -98,9 +98,11 @@ import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.CounterMutationVerbHandler;
 import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.db.DefinitionsUpdateVerbHandler;
+import org.apache.cassandra.db.Directories;
 import org.apache.cassandra.db.Keyspace;
 import org.apache.cassandra.db.MigrationRequestVerbHandler;
 import org.apache.cassandra.db.MutationVerbHandler;
+import org.apache.cassandra.db.PartitionPosition;
 import org.apache.cassandra.db.RangeSliceVerbHandler;
 import org.apache.cassandra.db.ReadCommandVerbHandler;
 import org.apache.cassandra.db.ReadRepairVerbHandler;

cassandra git commit: fix merge issue with ColumnInfo name change

[dbrosius]

Repository: cassandra
Updated Branches:
  refs/heads/trunk f698cc228 - 8f4c43db0


fix merge issue with ColumnInfo name change


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

Branch: refs/heads/trunk
Commit: 8f4c43db021c75a8d790f0fa2f93282952fffb71
Parents: f698cc2
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue May 5 22:01:15 2015 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue May 5 22:01:15 2015 -0400

--
 src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f4c43db/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java 
b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
index 91cdd02..0b833b7 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
@@ -499,8 +499,8 @@ public class CqlNativeStorage extends LoadFunc implements 
StoreFuncInterface, Lo
 for (ColumnInfo cdef : cfInfo.getColumns())
 {
 ResourceFieldSchema valSchema = new ResourceFieldSchema();
-AbstractType validator = validators.get(cdef.getName());
-valSchema.setName(new String(cdef.getName()));
+AbstractType? validator = 
validators.get(ByteBufferUtil.bytes(cdef.getName()));
+valSchema.setName(cdef.getName());
 valSchema.setType(StorageHelper.getPigType(validator));
 allSchemaFields.add(valSchema);
 }
@@ -901,7 +901,7 @@ public class CqlNativeStorage extends LoadFunc implements 
StoreFuncInterface, Lo
 String[] partitionKeys = new 
String[tableMetadata.getPartitionKey().size()];
 for (int i = 0; i  tableMetadata.getPartitionKey().size(); i++)
 {
-partitionKeys[i] = new 
String(tableMetadata.getPartitionKey().get(i).getName());
+partitionKeys[i] = 
tableMetadata.getPartitionKey().get(i).getName();
 }
 return partitionKeys;
 }