[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-20 Thread slebresne 
Updated Branches:
  refs/heads/cassandra-1.2 4e3d04915 - ead0662c2


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/ead0662c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ead0662c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ead0662c

Branch: refs/heads/cassandra-1.2
Commit: ead0662c2cab75a55b686272b6eec1aae237eb82
Parents: 4e3d049 cfe51fb
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Dec 20 10:08:21 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Dec 20 10:08:21 2012 +0100

--
 CHANGES.txt|1 +
 .../cassandra/db/compaction/CompactionManager.java |4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ead0662c/CHANGES.txt
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-19 Thread aleksey 
Updated Branches:
  refs/heads/cassandra-1.2 800b4f1f6 - fca00acb5


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/fca00acb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fca00acb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fca00acb

Branch: refs/heads/cassandra-1.2
Commit: fca00acb50eab46f133a5a17ddafe775f60bf604
Parents: 800b4f1 620a4b7
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Dec 19 16:08:40 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Dec 19 16:08:40 2012 +0300

--
 CHANGES.txt|3 +-
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   14 
 .../cassandra/db/ColumnFamilyStoreMBean.java   |5 ++
 .../io/compress/CompressedRandomAccessReader.java  |2 +-
 .../io/compress/CompressionParameters.java |   54 --
 .../streaming/compress/CompressedInputStream.java  |2 +-
 6 files changed, 69 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fca00acb/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fca00acb/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fca00acb/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-17 Thread aleksey 
Updated Branches:
  refs/heads/cassandra-1.2 10959ef3a - f7f01007b


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/f7f01007
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7f01007
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7f01007

Branch: refs/heads/cassandra-1.2
Commit: f7f01007bcfe06763845241e432ec8d72955fd40
Parents: 10959ef 63902c6
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Dec 17 18:40:48 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Dec 17 18:40:48 2012 +0300

--
 CHANGES.txt|2 ++
 bin/cqlsh  |   12 +---
 .../apache/cassandra/auth/SimpleAuthorizer.java|   10 +-
 pylib/cqlshlib/tracing.py  |6 --
 4 files changed, 20 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7f01007/CHANGES.txt
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-10 Thread aleksey 
Updated Branches:
  refs/heads/cassandra-1.2 9a01bc1a2 - 5f399cae1


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/5f399cae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f399cae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f399cae

Branch: refs/heads/cassandra-1.2
Commit: 5f399cae1480ab8e21f3249a46a488e7fa1456a3
Parents: 9a01bc1 24f95e0
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Dec 10 18:22:31 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Dec 10 18:22:31 2012 +0300

--
 CHANGES.txt  |1 +
 pylib/cqlshlib/formatting.py |2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f399cae/CHANGES.txt
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-08 Thread aleksey 
Updated Branches:
  refs/heads/cassandra-1.2 2828d28eb - ee0d178c6


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/cassandra-1.2
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
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-07 Thread slebresne 
Updated Branches:
  refs/heads/cassandra-1.2 8c1683345 - fc416fab0


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/fc416fab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc416fab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc416fab

Branch: refs/heads/cassandra-1.2
Commit: fc416fab0b21db5d9c9a14fb99f7c139cec64247
Parents: 8c16833 bac9794
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Dec 7 10:13:43 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Dec 7 10:13:43 2012 +0100

--
 CHANGES.txt|2 +
 .../org/apache/cassandra/config/CFMetaData.java|   52 +
 src/java/org/apache/cassandra/db/RowMutation.java  |2 +-
 .../org/apache/cassandra/db/marshal/UUIDType.java  |2 +-
 .../cassandra/hadoop/ColumnFamilyRecordReader.java |   14 +--
 .../cassandra/service/AntiEntropyService.java  |2 +-
 .../apache/cassandra/service/MigrationManager.java |2 +
 .../cassandra/streaming/StreamInSession.java   |2 +-
 .../cassandra/streaming/StreamOutSession.java  |2 +-
 .../cassandra/streaming/StreamingRepairTask.java   |2 +-
 .../apache/cassandra/thrift/CassandraServer.java   |2 +-
 .../org/apache/cassandra/tracing/TraceState.java   |2 +-
 .../transport/messages/ExecuteMessage.java |2 +-
 .../transport/messages/PrepareMessage.java |2 +-
 .../cassandra/transport/messages/QueryMessage.java |2 +-
 src/java/org/apache/cassandra/utils/CounterId.java |2 +-
 .../org/apache/cassandra/utils/FBUtilities.java|   21 +++
 src/java/org/apache/cassandra/utils/UUIDGen.java   |   99 +++
 .../apache/cassandra/cql/jdbc/ClientUtilsTest.java |2 +-
 .../cassandra/db/marshal/CompositeTypeTest.java|2 +-
 .../db/marshal/DynamicCompositeTypeTest.java   |2 +-
 .../apache/cassandra/db/marshal/RoundTripTest.java |4 +-
 .../cassandra/db/marshal/TimeUUIDTypeTest.java |   14 +-
 .../apache/cassandra/db/marshal/UUIDTypeTest.java  |   31 ++
 .../cassandra/io/LazilyCompactedRowTest.java   |2 +-
 .../cassandra/streaming/SerializationsTest.java|6 +-
 .../unit/org/apache/cassandra/utils/UUIDTests.java |   14 +-
 .../cassandra/stress/operations/CqlInserter.java   |2 +-
 .../apache/cassandra/stress/util/Operation.java|2 +-
 29 files changed, 148 insertions(+), 147 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc416fab/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc416fab/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc416fab/tools/stress/src/org/apache/cassandra/stress/util/Operation.java
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-05 Thread slebresne 
Updated Branches:
  refs/heads/cassandra-1.2 dc682de2e - f65e52007


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/f65e5200
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f65e5200
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f65e5200

Branch: refs/heads/cassandra-1.2
Commit: f65e5200736ca8f26b1ffb5854e779cd7a7b9a88
Parents: dc682de ba8dfe3
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Dec 5 09:02:50 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Dec 5 09:02:50 2012 +0100

--
 CHANGES.txt|2 +
 .../cql3/operations/PreparedOperation.java |4 +
 .../cassandra/cql3/statements/UpdateStatement.java |   99 ++-
 3 files changed, 45 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f65e5200/CHANGES.txt
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-27 Thread aleksey 
Updated Branches:
  refs/heads/cassandra-1.2 9a58e7e2e - fbd640063


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/fbd64006
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbd64006
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbd64006

Branch: refs/heads/cassandra-1.2
Commit: fbd6400636bec6af857d3575d298f1ef26cd1159
Parents: 9a58e7e 5a3eb1a
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Nov 27 20:32:23 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Nov 27 20:32:23 2012 +0300

--
 CHANGES.txt|1 +
 NEWS.txt   |   14 +
 conf/cassandra.yaml|4 +-
 examples/client_only/conf/cassandra.yaml   |4 +-
 examples/simple_authentication/README.txt  |4 +-
 .../simple_authentication/conf/access.properties   |2 +-
 .../org/apache/cassandra/auth/SimpleAuthority.java |  157 -
 .../apache/cassandra/auth/SimpleAuthorizer.java|  157 +
 pylib/cqlshlib/cql3handling.py |   61 ++--
 .../cassandra/auth/AllowAllAuthenticator.java  |   10 +-
 .../apache/cassandra/auth/AllowAllAuthority.java   |   36 --
 .../apache/cassandra/auth/AllowAllAuthorizer.java  |   70 
 .../apache/cassandra/auth/AuthenticatedUser.java   |   22 +-
 .../org/apache/cassandra/auth/DataResource.java|  248 +++
 src/java/org/apache/cassandra/auth/IAuthority.java |   63 
 .../org/apache/cassandra/auth/IAuthority2.java |   70 
 .../apache/cassandra/auth/IAuthorityContainer.java |   83 -
 .../org/apache/cassandra/auth/IAuthorizer.java |  122 +++
 src/java/org/apache/cassandra/auth/IResource.java  |   53 +++
 .../apache/cassandra/auth/LegacyAuthorizer.java|  111 +++
 .../apache/cassandra/auth/MigrationListener.java   |   53 +++
 src/java/org/apache/cassandra/auth/Permission.java |   57 ++--
 .../apache/cassandra/auth/PermissionDenied.java|   34 --
 .../apache/cassandra/auth/PermissionDetails.java   |   70 
 src/java/org/apache/cassandra/auth/Resources.java  |   28 ++-
 src/java/org/apache/cassandra/config/Config.java   |3 +-
 .../cassandra/config/DatabaseDescriptor.java   |   37 +--
 .../org/apache/cassandra/cql/DeleteStatement.java  |2 +-
 .../apache/cassandra/cql/DropIndexStatement.java   |   65 +++--
 .../org/apache/cassandra/cql/QueryProcessor.java   |   77 ++---
 .../org/apache/cassandra/cql/UpdateStatement.java  |   10 +-
 src/java/org/apache/cassandra/cql3/Cql.g   |  116 ---
 .../org/apache/cassandra/cql3/QueryProcessor.java  |2 +-
 .../cql3/statements/AuthorizationStatement.java|   66 
 .../cassandra/cql3/statements/BatchStatement.java  |2 +-
 .../statements/CreateColumnFamilyStatement.java|2 +-
 .../cql3/statements/CreateKeyspaceStatement.java   |2 +-
 .../cql3/statements/DropIndexStatement.java|   57 ++--
 .../cassandra/cql3/statements/GrantStatement.java  |   17 +-
 .../cql3/statements/ListGrantsStatement.java   |   42 ---
 .../cql3/statements/ListPermissionsStatement.java  |  106 ++
 .../cql3/statements/ModificationStatement.java |5 +-
 .../statements/PermissionAlteringStatement.java|   54 ++--
 .../cassandra/cql3/statements/RevokeStatement.java |   15 +-
 .../cql3/statements/TruncateStatement.java |2 +-
 .../apache/cassandra/service/CassandraDaemon.java  |6 +
 .../org/apache/cassandra/service/ClientState.java  |  175 ---
 .../apache/cassandra/thrift/CassandraServer.java   |  119 +++
 test/conf/access.properties|2 +-
 49 files changed, 1520 insertions(+), 998 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbd64006/CHANGES.txt
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-26 Thread slebresne 
Updated Branches:
  refs/heads/cassandra-1.2 49a067671 - 2f7fbbaae


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/2f7fbbaa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f7fbbaa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f7fbbaa

Branch: refs/heads/cassandra-1.2
Commit: 2f7fbbaaebc5d14bf8fd813b925a73589558c60d
Parents: 49a0676 eb738b0
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Nov 26 10:35:57 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Nov 26 10:35:57 2012 +0100

--
 CHANGES.txt|1 +
 .../cql3/statements/AlterTableStatement.java   |6 ++
 2 files changed, 7 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f7fbbaa/CHANGES.txt
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-19 Thread aleksey 
Updated Branches:
  refs/heads/cassandra-1.2 6acbc86dd - 707da4e82


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/707da4e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/707da4e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/707da4e8

Branch: refs/heads/cassandra-1.2
Commit: 707da4e8283aec93cf2769462dde32e03d51e81f
Parents: 6acbc86 4f28e6b
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Nov 19 13:10:22 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Nov 19 13:10:22 2012 +0300

--
 CHANGES.txt|1 +
 .../apache/cassandra/cql/AlterTableStatement.java  |9 +
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/707da4e8/CHANGES.txt
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-19 Thread slebresne 
Updated Branches:
  refs/heads/cassandra-1.2 707da4e82 - ead90d2ca


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/ead90d2c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ead90d2c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ead90d2c

Branch: refs/heads/cassandra-1.2
Commit: ead90d2ca878b03cded6ebdd20153978b4393a8d
Parents: 707da4e 83bbd75
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Nov 19 17:55:14 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Nov 19 17:55:14 2012 +0100

--
 CHANGES.txt  |1 +
 src/java/org/apache/cassandra/cql3/Cql.g |2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ead90d2c/CHANGES.txt
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-19 Thread aleksey 
Updated Branches:
  refs/heads/cassandra-1.2 6875c3bf8 - e329c3078


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/e329c307
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e329c307
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e329c307

Branch: refs/heads/cassandra-1.2
Commit: e329c3078c22111e648af5b91da6bbe3b4f25c76
Parents: 6875c3b 3957df1
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Nov 19 22:15:21 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Nov 19 22:15:21 2012 +0300

--

--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-14 Thread slebresne 
Updated Branches:
  refs/heads/cassandra-1.2 5dc145f44 - c176302bb


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/c176302b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c176302b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c176302b

Branch: refs/heads/cassandra-1.2
Commit: c176302bb718584cc8dd92431bdf60fd4b0152f6
Parents: 5dc145f 90de8d5
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Nov 14 10:39:45 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Nov 14 10:39:45 2012 +0100

--
 doc/cql3/CQL.textile |   14 +-
 1 files changed, 13 insertions(+), 1 deletions(-)
--

[1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-13 Thread slebresne 
Updated Branches:
  refs/heads/cassandra-1.2 e6e846c13 - 90d2f8e8e


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/90d2f8e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90d2f8e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90d2f8e8

Branch: refs/heads/cassandra-1.2
Commit: 90d2f8e8ec4a23b124760ebbf93926478bd76ae6
Parents: e6e846c 228d1cf
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Nov 13 20:13:13 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Nov 13 20:13:13 2012 +0100

--
 .../apache/cassandra/service/CassandraDaemon.java  |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)
--