[2/10] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f2528422 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2528422 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2528422 Branch: refs/heads/cassandra-1.2 Commit: f25284220ca2ba0bd28e753b4a1d554e468b85b0 Parents: de2495c 45310c0 Author: Yuki Morishita yu...@apache.org Authored: Wed Dec 19 15:06:30 2012 -0600 Committer: Yuki Morishita yu...@apache.org Committed: Wed Dec 19 15:06:30 2012 -0600 -- build.xml |2 +- debian/changelog |6 ++ .../dht/OrderPreservingPartitionerTest.java|7 ++- 3 files changed, 13 insertions(+), 2 deletions(-) --
[2/10] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9fdccd76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fdccd76 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9fdccd76 Branch: refs/heads/cassandra-1.2 Commit: 9fdccd7683c7c950ff6dd48bad8739af6a4f2468 Parents: a6d4f7a fb9ad74 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Dec 18 14:54:18 2012 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Dec 18 14:54:18 2012 -0600 -- CHANGES.txt|1 + conf/cassandra.yaml| 15 ++- .../db/compaction/AbstractCompactedRow.java|3 ++- .../cassandra/db/compaction/CompactionTask.java|3 +++ .../db/compaction/LazilyCompactedRow.java |2 +- .../cassandra/db/compaction/PrecompactedRow.java |2 ++ 6 files changed, 15 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fdccd76/CHANGES.txt --
[2/10] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa8828a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa8828a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa8828a2 Branch: refs/heads/cassandra-1.2 Commit: aa8828a27bb1eb34c7ab2d2c4b534cb14515751d Parents: 1583769 3474613 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Dec 13 10:53:01 2012 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Dec 13 10:53:01 2012 -0600 -- CHANGES.txt |4 +++- src/java/org/apache/cassandra/db/DefsTable.java | 13 + 2 files changed, 16 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa8828a2/CHANGES.txt -- diff --cc CHANGES.txt index 8a93921,e09e925..804af51 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,7 +1,19 @@@ +1.2.1 + * apply disk_failure_policy to bad disks on initial directory creation + (CASSANDRA-4847) + * Optimize name-based queries to use ArrayBackedSortedColumns (CASSANDRA-5043) + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041) + * pool [Compressed]RandomAccessReader objects on the partitioned read path + (CASSANDRA-4942) + * Add debug logging to list filenames processed by Directories.migrateFile + method (CASSANDRA-4939) + * Expose black-listed directories via JMX (CASSANDRA-4848) + + 1.2.0 * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060) + Merged from 1.1: + * fix temporarily missing schema after upgrade from pre-1.1.5 (CASSANDRA-5061) 1.2-rc1
[2/10] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eeb7965d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eeb7965d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eeb7965d Branch: refs/heads/cassandra-1.2 Commit: eeb7965dbbdb680015abc8db9b91d3ff80396abb Parents: 956fa77 cb45b41 Author: Jonathan Ellis jbel...@apache.org Authored: Mon Dec 10 09:00:07 2012 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Dec 10 09:00:07 2012 -0600 -- .../apache/cassandra/io/sstable/SSTableReader.java |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --
[2/10] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee0d178c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee0d178c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee0d178c Branch: refs/heads/trunk Commit: ee0d178c6e9581bcb9f6d50924bdae53fc4155fa Parents: 2828d28 bddfa9e Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Dec 8 18:28:10 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Dec 8 18:28:10 2012 +0300 -- CHANGES.txt|1 + NEWS.txt | 14 ++ doc/native_protocol.spec |2 + .../simple_authentication/conf/passwd.properties |5 +- .../apache/cassandra/auth/SimpleAuthenticator.java | 24 +-- pylib/cqlshlib/cql3handling.py | 42 - .../cassandra/auth/AllowAllAuthenticator.java | 50 +- .../apache/cassandra/auth/AllowAllAuthorizer.java | 18 +- src/java/org/apache/cassandra/auth/Auth.java | 131 +++ .../apache/cassandra/auth/AuthenticatedUser.java | 38 +++- .../org/apache/cassandra/auth/IAuthenticator.java | 96 ++- .../org/apache/cassandra/auth/IAuthorizer.java | 18 +- src/java/org/apache/cassandra/auth/IResource.java |8 +- .../apache/cassandra/auth/LegacyAuthenticator.java | 92 ++ .../apache/cassandra/auth/LegacyAuthorizer.java| 15 +- .../org/apache/cassandra/config/CFMetaData.java|6 + .../cassandra/config/DatabaseDescriptor.java |4 +- .../org/apache/cassandra/config/KSMetaData.java|7 + src/java/org/apache/cassandra/config/Schema.java |5 +- src/java/org/apache/cassandra/cql3/Cql.g | 88 +-- .../org/apache/cassandra/cql3/QueryProcessor.java | 21 +++ .../org/apache/cassandra/cql3/UserOptions.java | 62 +++ .../cql3/statements/AlterUserStatement.java| 86 ++ .../cql3/statements/AuthenticationStatement.java | 57 +++ .../cql3/statements/AuthorizationStatement.java| 10 +- .../cql3/statements/CreateUserStatement.java | 64 +++ .../cql3/statements/DropUserStatement.java | 62 +++ .../cassandra/cql3/statements/GrantStatement.java |7 +- .../cql3/statements/ListPermissionsStatement.java | 25 ++- .../cql3/statements/ListUsersStatement.java| 48 ++ .../statements/PermissionAlteringStatement.java|7 +- .../cassandra/cql3/statements/RevokeStatement.java |7 +- .../exceptions/AuthenticationException.java| 26 +++ .../apache/cassandra/exceptions/ExceptionCode.java |2 + .../apache/cassandra/service/CassandraDaemon.java |8 +- .../org/apache/cassandra/service/ClientState.java | 60 +++ .../apache/cassandra/thrift/CassandraServer.java |9 +- .../apache/cassandra/thrift/ThriftConversion.java |5 + .../transport/messages/CredentialsMessage.java |3 +- .../cassandra/transport/messages/ErrorMessage.java |3 + .../transport/messages/StartupMessage.java |6 +- 41 files changed, 1079 insertions(+), 163 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee0d178c/CHANGES.txt --
[2/10] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0934bffa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0934bffa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0934bffa Branch: refs/heads/cassandra-1.2 Commit: 0934bffa107cb9c13062a1cfbff986339f622847 Parents: fc416fa 8581be8 Author: Yuki Morishita yu...@apache.org Authored: Fri Dec 7 11:42:45 2012 -0600 Committer: Yuki Morishita yu...@apache.org Committed: Fri Dec 7 11:42:45 2012 -0600 -- src/java/org/apache/cassandra/cli/CliClient.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --
[2/10] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32b842b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32b842b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32b842b1 Branch: refs/heads/cassandra-1.2 Commit: 32b842b13922c8462b8ebec01c34cf9ca0ca3e11 Parents: 12948f6 b537567 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Dec 6 16:15:23 2012 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Dec 6 16:15:23 2012 -0600 -- CHANGES.txt|2 + .../apache/cassandra/service/MigrationManager.java | 43 +++ 2 files changed, 34 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32b842b1/CHANGES.txt --
[2/10] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b58e1b85 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b58e1b85 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b58e1b85 Branch: refs/heads/cassandra-1.2 Commit: b58e1b85392a9bad36f3fcaaf70e9204b4db6d4d Parents: b475602 6602651 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Dec 4 14:39:26 2012 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Dec 4 14:39:26 2012 -0600 -- .../apache/cassandra/service/MigrationManager.java |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) --
