Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d1cfd1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d1cfd1c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d1cfd1c Branch: refs/heads/trunk Commit: 3d1cfd1c91308a71d3f6aea7bb00f91db40e5784 Parents: aa55f3c fa7d87d Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat Jun 1 18:30:01 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat Jun 1 18:30:01 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +- build.xml | 64 +---- doc/native_protocol_v2.spec | 80 ++++- lib/avro-1.4.0-fixes.jar | Bin 596381 -> 0 bytes lib/avro-1.4.0-sources-fixes.jar | Bin 276425 -> 0 bytes lib/licenses/avro-1.4.0.txt | 202 ------------ src/avro/internode.genavro | 131 -------- .../cassandra/auth/ISaslAwareAuthenticator.java | 41 +++ .../cassandra/auth/PasswordAuthenticator.java | 81 +++++- src/java/org/apache/cassandra/config/Avro.java | 254 --------------- src/java/org/apache/cassandra/db/DefsTable.java | 93 ------ .../org/apache/cassandra/db/RangeSliceCommand.java | 2 +- .../apache/cassandra/db/marshal/CompositeType.java | 26 +- .../cassandra/io/sstable/ColumnNameHelper.java | 105 ++++-- .../locator/YamlFileNetworkTopologySnitch.java | 2 +- .../org/apache/cassandra/service/ClientState.java | 6 +- .../apache/cassandra/thrift/CassandraServer.java | 4 +- .../org/apache/cassandra/transport/CBUtil.java | 8 + .../org/apache/cassandra/transport/Client.java | 51 +++- .../org/apache/cassandra/transport/Message.java | 33 +- .../org/apache/cassandra/transport/Server.java | 14 +- .../cassandra/transport/ServerConnection.java | 33 ++- .../transport/messages/AuthChallenge.java | 67 ++++ .../cassandra/transport/messages/AuthResponse.java | 99 ++++++ .../cassandra/transport/messages/AuthSuccess.java | 71 ++++ .../transport/messages/CredentialsMessage.java | 10 +- .../apache/cassandra/config/CFMetaDataTest.java | 3 +- .../cassandra/config/DatabaseDescriptorTest.java | 1 - 28 files changed, 630 insertions(+), 854 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d1cfd1c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e4da98d,eec5ea7..2545434 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -55,9 -55,9 +55,10 @@@ * Binary protocol: allow batching already prepared statements (CASSANDRA-4693) * Allow preparing timestamp, ttl and limit in CQL3 queries (CASSANDRA-4450) * Support native link w/o JNA in Java7 (CASSANDRA-3734) + * Use SASL authentication in binary protocol v2 (CASSANDRA-5545) 1.2.6 + * Reduce SSTableLoader memory usage (CASSANDRA-5555) * Scale hinted_handoff_throttle_in_kb to cluster size (CASSANDRA-5272) * (Hadoop) Fix InputKeyRange in CFIF (CASSANDRA-5536) * Fix dealing with ridiculously large max sstable sizes in LCS (CASSANDRA-5589)