cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 30 May 2014 18:26:14 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/auth/CassandraAuthorizer.java


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

Branch: refs/heads/cassandra-2.1
Commit: 9141f7ba737c46fe65279b84a09a8adfdae8a0dc
Parents: 8436ee6 8480fa7
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri May 30 21:24:24 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri May 30 21:24:24 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                                   | 5 +++++
 src/java/org/apache/cassandra/auth/Auth.java                  | 2 +-
 src/java/org/apache/cassandra/auth/CassandraAuthorizer.java   | 2 +-
 src/java/org/apache/cassandra/auth/PasswordAuthenticator.java | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9141f7ba/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 139c41c,14b43e5..5293580
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,20 +1,49 @@@
 -2.0.9
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
++2.1.0
+ Merged from 1.2:
 - * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
 - * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
++* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
+ 
+ 
 -2.0.8
 +2.1.0-rc1
 + * Revert flush directory (CASSANDRA-6357)
 + * More efficient executor service for fast operations (CASSANDRA-4718)
 + * Move less common tools into a new cassandra-tools package (CASSANDRA-7160)
 + * Support more concurrent requests in native protocol (CASSANDRA-7231)
 + * Add tab-completion to debian nodetool packaging (CASSANDRA-6421)
 + * Change concurrent_compactors defaults (CASSANDRA-7139)
 + * Add PowerShell Windows launch scripts (CASSANDRA-7001)
 + * Make commitlog archive+restore more robust (CASSANDRA-6974)
 + * Fix marking commitlogsegments clean (CASSANDRA-6959)
 + * Add snapshot "manifest" describing files included (CASSANDRA-6326)
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
 + * Upgrade NBHM lib (CASSANDRA-7128)
 + * Optimize netty server (CASSANDRA-6861)
 + * Fix repair hang when given CF does not exist (CASSANDRA-7189)
 + * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
 + * Add server side batching to native transport (CASSANDRA-5663)
 + * Make batchlog replay asynchronous (CASSANDRA-6134)
 + * remove unused classes (CASSANDRA-7197)
 + * Limit user types to the keyspace they are defined in (CASSANDRA-6643)
 + * Add validate method to CollectionType (CASSANDRA-7208)
 + * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261)
 + * Fix nodetool netstats (CASSANDRA-7270)
 + * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284)
 + * Use prepared statements internally (CASSANDRA-6975)
 + * Fix broken paging state with prepared statement (CASSANDRA-7120)
 + * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287)
 + * Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
 + * Backport Thrift MultiSliceRequest (CASSANDRA-7027)
 + * Handle overlapping MultiSlices (CASSANDRA-7279)
 + * Fix DataOutputTest on Windows (CASSANDRA-7265)
 + * Embedded sets in user defined data-types are not updating (CASSANDRA-7267)
 + * Add tuple type to CQL/native protocol (CASSANDRA-7248)
 + * Fix CqlPagingRecordReader on tables with few rows (CASSANDRA-7322)
 +Merged from 2.0:
 + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
   * Always reallocate buffers in HSHA (CASSANDRA-6285)
   * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
   * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9141f7ba/src/java/org/apache/cassandra/auth/Auth.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9141f7ba/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
index b37dee2,61ad9a4..9b22e22
--- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
+++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
@@@ -71,10 -73,10 +71,10 @@@ public class CassandraAuthorizer implem
          try
          {
              ResultMessage.Rows rows = authorizeStatement.execute(QueryState.forInternalCalls(),
-                                                                  QueryOptions.forInternalCalls(ConsistencyLevel.ONE,
 -                                                                 new QueryOptions(ConsistencyLevel.LOCAL_ONE,
 -                                                                                  Lists.newArrayList(ByteBufferUtil.bytes(user.getName()),
 -                                                                                       
             ByteBufferUtil.bytes(resource.getName()))));
 -            result = new UntypedResultSet(rows.result);
++                                                                 QueryOptions.forInternalCalls(ConsistencyLevel.LOCAL_ONE,
 +                                                                                       
       Lists.newArrayList(ByteBufferUtil.bytes(user.getName()),
 +                                                                                       
                          ByteBufferUtil.bytes(resource.getName()))));
 +            result = UntypedResultSet.create(rows.result);
          }
          catch (RequestValidationException e)
          {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9141f7ba/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
----------------------------------------------------------------------


Mime
View raw message