[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-19 Thread yukim
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/bebaf453
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bebaf453
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bebaf453

Branch: refs/heads/cassandra-1.2
Commit: bebaf453c8e0f21b1be6c2ed962ae2f3e3c77373
Parents: 0207bdf e7ae7c9
Author: Yuki Morishita yu...@apache.org
Authored: Wed Dec 19 12:43:33 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Dec 19 12:43:33 2012 -0600

--
 CHANGES.txt|1 +
 .../apache/cassandra/dht/Murmur3Partitioner.java   |   14 +++--
 .../apache/cassandra/dht/PartitionerTestCase.java  |   40 ++-
 3 files changed, 48 insertions(+), 7 deletions(-)
--


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



[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-18 Thread jbellis
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/a6d4f7a4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6d4f7a4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6d4f7a4

Branch: refs/heads/cassandra-1.2
Commit: a6d4f7a4e8d5d0d7829ab6659791125f56cd6a5c
Parents: 63c5a9e d67816b
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 18 14:32:25 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 18 14:32:25 2012 -0600

--
 CHANGES.txt|1 +
 .../apache/cassandra/service/StorageService.java   |   18 --
 2 files changed, 11 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6d4f7a4/CHANGES.txt
--
diff --cc CHANGES.txt
index 3e9f052,2e789fa..d27814d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 +1.2.1
 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
 + * 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-rc2
+  * fix nodetool ownership display with vnodes (CASSANDRA-5065)
   * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
   * Fix potential infinite loop when reloading CFS (CASSANDRA-5064)
   * Fix SimpleAuthorizer example (CASSANDRA-5072)



[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-10 Thread slebresne
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/df580d42
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df580d42
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df580d42

Branch: refs/heads/trunk
Commit: df580d426662e9f9d6be9aae9155ce571ce7979a
Parents: 90ce4f7 a399a56
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Dec 11 08:54:37 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Dec 11 08:54:37 2012 +0100

--
 CHANGES.txt|1 +
 .../cassandra/cql3/statements/SelectStatement.java |2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
--


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



[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-06 Thread brandonwilliams
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/12948f65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12948f65
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12948f65

Branch: refs/heads/cassandra-1.2
Commit: 12948f652623e47aac5e64e28815c0e787a0bd88
Parents: 4154434 7322f82
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Dec 6 08:25:43 2012 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Dec 6 08:25:43 2012 -0600

--
 .../org/apache/cassandra/config/CFMetaData.java|4 +-
 src/java/org/apache/cassandra/db/SystemTable.java  |   26 --
 .../apache/cassandra/service/StorageService.java   |4 ++-
 3 files changed, 27 insertions(+), 7 deletions(-)
--




[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-04 Thread jbellis
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/d25182f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d25182f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d25182f0

Branch: refs/heads/cassandra-1.2
Commit: d25182f0df0bca3c1815adbb2c28d4920693e2c0
Parents: b58e1b8 0d69901
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 4 14:49:14 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 4 14:49:14 2012 -0600

--
 .../apache/cassandra/service/MigrationManager.java |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
--




[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-04 Thread jbellis
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/6bd56cf0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bd56cf0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bd56cf0

Branch: refs/heads/cassandra-1.2
Commit: 6bd56cf04a0071ecd490b34aa004630b969830ff
Parents: d25182f ffb2eba
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 4 14:56:39 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 4 14:56:39 2012 -0600

--
 CHANGES.txt |   35 ++-
 1 files changed, 10 insertions(+), 25 deletions(-)
--


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



[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-04 Thread jbellis
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/07c6ff1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07c6ff1b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07c6ff1b

Branch: refs/heads/cassandra-1.2
Commit: 07c6ff1b3a288a186cfb813d0c5d80ca14751233
Parents: 6bd56cf aaf9409
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 4 16:19:31 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 4 16:19:31 2012 -0600

--
 CHANGES.txt |   18 ++
 1 files changed, 10 insertions(+), 8 deletions(-)
--


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



[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-12-04 Thread jbellis
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/dc682de2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc682de2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc682de2

Branch: refs/heads/cassandra-1.2
Commit: dc682de2e9470a3f77c47d29d50e02b99bdd9c58
Parents: 0f75215 2158131
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 4 23:18:09 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 4 23:18:09 2012 -0600

--
 CHANGES.txt|1 +
 .../org/apache/cassandra/config/CFMetaData.java|2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc682de2/CHANGES.txt
--
diff --cc CHANGES.txt
index 8d40f09,732cc5d..f77425f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,6 +1,14 @@@
 +1.2.1
 + * 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-rc1
   * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
+  * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
  
  
  1.2-beta3



[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-27 Thread jbellis
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/9a58e7e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a58e7e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a58e7e2

Branch: refs/heads/cassandra-1.2
Commit: 9a58e7e2ef4d9bdf1c733108b3a79a37bd0f6f25
Parents: 21f2094 7b4639a
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Nov 28 00:35:58 2012 +0900
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Nov 28 00:35:58 2012 +0900

--
 .../apache/cassandra/io/sstable/SSTableReader.java |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--




[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-26 Thread slebresne
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/6e21cad7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e21cad7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e21cad7

Branch: refs/heads/trunk
Commit: 6e21cad7115d7df3ee28832ac489b0fc5c529813
Parents: 2f7fbba b44abad
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Nov 26 19:22:58 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Nov 26 19:22:58 2012 +0100

--
 CHANGES.txt|2 ++
 .../statements/CreateColumnFamilyStatement.java|3 +++
 .../cassandra/cql3/statements/SelectStatement.java |5 +
 3 files changed, 10 insertions(+), 0 deletions(-)
--


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



[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-21 Thread jbellis
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/354cb093
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/354cb093
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/354cb093

Branch: refs/heads/cassandra-1.2
Commit: 354cb093d279d4fdbc69648d75b5651d3646e729
Parents: b960b2b ad36c8f
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Nov 21 16:45:33 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Nov 21 16:45:33 2012 -0600

--
 .../cassandra/io/LazilyCompactedRowTest.java   |6 --
 .../cassandra/io/sstable/SSTableReaderTest.java|5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)
--




[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-21 Thread yukim
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/c3acf269
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3acf269
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3acf269

Branch: refs/heads/cassandra-1.2
Commit: c3acf269f72b767a9eb6274f45868bb9d2aecb19
Parents: 354cb09 8c24d01
Author: Yuki Morishita yu...@apache.org
Authored: Wed Nov 21 17:06:26 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Nov 21 17:06:26 2012 -0600

--
 CHANGES.txt|1 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   24 -
 .../cassandra/db/ColumnFamilyStoreMBean.java   |6 +-
 .../org/apache/cassandra/service/PBSPredictor.java |   10 +-
 .../cassandra/service/PBSPredictorMBean.java   |2 +-
 .../apache/cassandra/service/StorageService.java   |   84 +++
 .../cassandra/service/StorageServiceMBean.java |   25 ++---
 src/java/org/apache/cassandra/tools/NodeCmd.java   |6 +-
 src/java/org/apache/cassandra/tools/NodeProbe.java |   13 +--
 9 files changed, 104 insertions(+), 67 deletions(-)
--


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



[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-21 Thread yukim
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/42fdf107
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42fdf107
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42fdf107

Branch: refs/heads/cassandra-1.2
Commit: 42fdf107d55a1ad920ae6909168401afce664a34
Parents: c3acf26 92f3339
Author: Yuki Morishita yu...@apache.org
Authored: Wed Nov 21 17:34:39 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Nov 21 17:34:39 2012 -0600

--
 .../serialization/1.2/db.RangeSliceCommand.bin |  Bin 733 - 735 bytes
 .../1.2/db.SliceByNamesReadCommand.bin |  Bin 367 - 373 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--




[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-20 Thread yukim
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/c235229e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c235229e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c235229e

Branch: refs/heads/cassandra-1.2
Commit: c235229e9cf9e59ef88cb8674c03b5b3c64e7cbb
Parents: efded00 553b9e8
Author: Yuki Morishita yu...@apache.org
Authored: Tue Nov 20 12:20:02 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Nov 20 12:20:02 2012 -0600

--
 .../apache/cassandra/service/StorageService.java   |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
--




[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-18 Thread jbellis
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/33ae0908
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33ae0908
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33ae0908

Branch: refs/heads/cassandra-1.2
Commit: 33ae0908a36221a862ae4b66a93271222abefda8
Parents: 1a93de3 6cdbb2d
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:20:13 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:20:13 2012 +0100

--
 doc/cql3/CQL.textile   |2 +-
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--




[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-18 Thread jbellis
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/2a41dcd0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a41dcd0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a41dcd0

Branch: refs/heads/cassandra-1.2
Commit: 2a41dcd007cfcf7048b8f7aa2599211e4c71b1bc
Parents: 33ae090 6e332e3
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:26:42 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:26:42 2012 +0100

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




[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-15 Thread brandonwilliams
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/2f3b8d4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f3b8d4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f3b8d4b

Branch: refs/heads/cassandra-1.2
Commit: 2f3b8d4b365ba333f088bff4dcbb7908beabb021
Parents: 275fae9 add2d2d
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Nov 15 11:57:59 2012 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Nov 15 11:57:59 2012 -0600

--
 .../apache/cassandra/db/HintedHandOffManager.java  |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--




[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-13 Thread yukim
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/a878a02f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a878a02f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a878a02f

Branch: refs/heads/cassandra-1.2
Commit: a878a02fb0c9d3abbcdd854039e5075793f861aa
Parents: 90d2f8e 901a54a
Author: Yuki Morishita yu...@apache.org
Authored: Tue Nov 13 16:18:27 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Nov 13 16:18:27 2012 -0600

--
 CHANGES.txt|1 +
 .../cassandra/net/OutboundTcpConnectionPool.java   |2 +-
 .../cassandra/streaming/AbstractStreamSession.java |   20 ++---
 .../apache/cassandra/streaming/FileStreamTask.java |4 +-
 .../cassandra/streaming/IncomingStreamReader.java  |9 +-
 .../apache/cassandra/streaming/StreamHeader.java   |   54 +++
 .../cassandra/streaming/StreamInSession.java   |   70 +--
 .../cassandra/streaming/StreamOutSession.java  |   53 ---
 .../apache/cassandra/streaming/StreamReply.java|   10 ++-
 .../streaming/StreamReplyVerbHandler.java  |2 +-
 .../apache/cassandra/streaming/StreamRequest.java  |   21 +++--
 .../serialization/1.2/streaming.StreamHeader.bin   |  Bin 175902 - 175917 
bytes
 .../serialization/1.2/streaming.StreamReply.bin|  Bin 73 - 89 bytes
 .../1.2/streaming.StreamRequestMessage.bin |  Bin 7167 - 7215 bytes
 .../cassandra/streaming/SerializationsTest.java|   27 +++---
 .../cassandra/streaming/StreamingTransferTest.java |6 +-
 16 files changed, 106 insertions(+), 173 deletions(-)
--


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



[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-13 Thread jbellis
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/4576ccba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4576ccba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4576ccba

Branch: refs/heads/cassandra-1.2
Commit: 4576ccba6e83dd0b007c25f484c3d91ff95d609f
Parents: a878a02 acda527
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 13 16:48:31 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 13 16:48:31 2012 -0600

--
 .../org/apache/cassandra/cql3/QueryProcessor.java  |3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
--




[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-13 Thread yukim
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/4208a3f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4208a3f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4208a3f5

Branch: refs/heads/cassandra-1.2
Commit: 4208a3f56c34723f83aa63dd5fd0f8f6a082b132
Parents: 4576ccb 9dffa57
Author: Yuki Morishita yu...@apache.org
Authored: Tue Nov 13 17:54:04 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Nov 13 17:54:04 2012 -0600

--
 CHANGES.txt|1 +
 .../apache/cassandra/io/sstable/SSTableLoader.java |2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)
--


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