subject:"\[10\/10\] git commit\: Merge branch 'cassandra\-2.1' into trunk"

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-10-20 Thread yukim

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/repair/StreamingRepairTask.java
src/java/org/apache/cassandra/streaming/StreamCoordinator.java
src/java/org/apache/cassandra/streaming/StreamSession.java
test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java


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

Branch: refs/heads/trunk
Commit: c6de882968bc3b4d77a59fd9b1df0e99a6a07636
Parents: b6b08f2 6cca24f
Author: Yuki Morishita yu...@apache.org
Authored: Mon Oct 20 10:45:40 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Mon Oct 20 10:45:40 2014 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/SystemKeyspace.java |  8 -
 .../org/apache/cassandra/dht/RangeStreamer.java |  4 ++-
 .../net/OutboundTcpConnectionPool.java  | 12 
 .../apache/cassandra/repair/LocalSyncTask.java  |  6 ++--
 .../cassandra/repair/StreamingRepairTask.java   |  9 --
 .../cassandra/service/StorageService.java   | 17 +++
 .../apache/cassandra/streaming/SessionInfo.java |  3 ++
 .../cassandra/streaming/StreamCoordinator.java  | 20 ++---
 .../apache/cassandra/streaming/StreamPlan.java  | 31 ++--
 .../cassandra/streaming/StreamResultFuture.java |  2 +-
 .../cassandra/streaming/StreamSession.java  | 24 +++
 .../management/SessionInfoCompositeData.java| 30 +++
 .../org/apache/cassandra/tools/NodeTool.java|  8 -
 .../cassandra/streaming/SessionInfoTest.java|  2 +-
 .../streaming/StreamTransferTaskTest.java   |  4 ++-
 .../streaming/StreamingTransferTest.java|  2 +-
 17 files changed, 123 insertions(+), 60 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6de8829/src/java/org/apache/cassandra/dht/RangeStreamer.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6de8829/src/java/org/apache/cassandra/repair/LocalSyncTask.java
--
diff --cc src/java/org/apache/cassandra/repair/LocalSyncTask.java
index b34c508,000..a43d326
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/repair/LocalSyncTask.java
+++ b/src/java/org/apache/cassandra/repair/LocalSyncTask.java
@@@ -1,81 -1,0 +1,83 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * License); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an AS IS BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.cassandra.repair;
 +
 +import java.net.InetAddress;
 +import java.util.List;
 +
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
++import org.apache.cassandra.db.SystemKeyspace;
 +import org.apache.cassandra.dht.Range;
 +import org.apache.cassandra.dht.Token;
 +import org.apache.cassandra.streaming.StreamEvent;
 +import org.apache.cassandra.streaming.StreamEventHandler;
 +import org.apache.cassandra.streaming.StreamPlan;
 +import org.apache.cassandra.streaming.StreamState;
 +import org.apache.cassandra.utils.FBUtilities;
 +
 +/**
 + * LocalSyncTask performs streaming between local(coordinator) node and 
remote replica.
 + */
 +public class LocalSyncTask extends SyncTask implements StreamEventHandler
 +{
 +private static final Logger logger = 
LoggerFactory.getLogger(LocalSyncTask.class);
 +
 +private final long repairedAt;
 +
 +public LocalSyncTask(RepairJobDesc desc, TreeResponse r1, TreeResponse 
r2,

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-09-08 Thread mishail

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 9288159898605f8f160b040dab46be2c089b30c8
Parents: d641053 ad9f51f
Author: Mikhail Stepura mish...@apache.org
Authored: Mon Sep 8 12:21:36 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Mon Sep 8 12:21:36 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-20 Thread yukim

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/streaming/StreamReceiveTask.java


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

Branch: refs/heads/trunk
Commit: c158efdf6e3c0cb35321be01c3774e5e2b609f6c
Parents: 7036e39 cc79fe1
Author: Yuki Morishita yu...@apache.org
Authored: Wed Aug 20 10:10:01 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Aug 20 10:10:01 2014 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/streaming/StreamReceiveTask.java  | 56 
 2 files changed, 35 insertions(+), 22 deletions(-)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-20 Thread jbellis

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 753ccff524a45519c9e63da755aa16a384ca4bb8
Parents: 0f53041 ab45a78
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Aug 20 10:01:47 2014 -0700
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Aug 20 10:01:47 2014 -0700

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/753ccff5/src/java/org/apache/cassandra/config/CFMetaData.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-18 Thread yukim

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: ddeb496ee74f4a4aeea0ad28123d855d8446f842
Parents: e98a40f 77f6c25
Author: Yuki Morishita yu...@apache.org
Authored: Mon Aug 18 13:27:29 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Mon Aug 18 13:27:29 2014 -0500

--

--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-12 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 7f1671c37c5585c2c5bbe2f914f9361497c085e9
Parents: c1de8ee 712f54f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 12 12:35:16 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 12 12:35:16 2014 -0500

--
 .../cassandra/hadoop/cql3/CqlRecordReader.java  | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f1671c3/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-12 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 26bde8dfef5bbd9909cdab1dc31a988ea1c1fe22
Parents: 0cf2e14 70f277f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 12 13:34:02 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 12 13:34:02 2014 -0500

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26bde8df/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-12 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 51c535ac8b3ffabf7d463902ad06bff47b6c5306
Parents: 696acc9 b896f4d
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 12 20:11:02 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 12 20:11:02 2014 -0500

--
 .../cassandra/pig/CqlRecordReaderTest.java  | 132 +++
 1 file changed, 132 insertions(+)
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-12 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: df8b5687f537154a49f3643874a1d5c5094c3933
Parents: 51c535a 42f2f80
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 12 20:52:02 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 12 20:52:02 2014 -0500

--
 .../cassandra/hadoop/cql3/CqlRecordReader.java  |  2 +-
 .../cassandra/pig/CqlRecordReaderTest.java  | 33 +++-
 2 files changed, 33 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df8b5687/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-08-04 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c709d98b68141be3314220a08f7519b2459cf16b
Parents: 55e874f 5331900
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Aug 4 12:13:22 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Aug 4 12:13:22 2014 -0500

--

--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-07-31 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: cf46e4454b8ac0c74328bda23142e1f3c4914f00
Parents: 9aeae58 da1f2db
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Jul 31 15:13:57 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Jul 31 15:13:57 2014 -0500

--
 bin/cassandra-shuffle.bat | 37 -
 1 file changed, 37 deletions(-)
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-07-30 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/service/StorageService.java


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

Branch: refs/heads/trunk
Commit: c37322097c1a9c2534942ea0ef002e1ee24411b4
Parents: bdffd3c 4333976
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jul 30 16:55:32 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jul 30 16:55:32 2014 -0500

--
 .../cassandra/service/StorageService.java   | 45 +---
 1 file changed, 2 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3732209/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 9a30305,18148b7..946204d
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -833,51 -833,10 +833,10 @@@ public class StorageService extends Not
  }
  else
  {
- // if we were already bootstrapped with 1 token but 
num_tokens is set higher in the config,
- // then we need to migrate to multi-token
- if (bootstrapTokens.size() == 1  
DatabaseDescriptor.getNumTokens()  1)
- {
- // wait for ring info
- logger.info(Sleeping for ring delay ({}ms), delay);
- Uninterruptibles.sleepUninterruptibly(delay, 
TimeUnit.MILLISECONDS);
- logger.info(Calculating new tokens);
- // calculate num_tokens tokens evenly spaced in the range 
(left, right]
- Token right = bootstrapTokens.iterator().next();
- TokenMetadata clone = tokenMetadata.cloneOnlyTokenMap();
- clone.updateNormalToken(right, 
FBUtilities.getBroadcastAddress());
- Token left = clone.getPredecessor(right);
- 
- // get (num_tokens - 1) tokens spaced evenly, and the 
last token will be our current token (right)
- for (int tok = 1; tok  
DatabaseDescriptor.getNumTokens(); ++tok)
- {
- Token l = left;
- Token r = right;
- // iteratively calculate the location of the token 
using midpoint
- // num iterations is number of bits in IEE754 
mantissa (including implicit leading 1)
- // we stop early for terminating fractions
- // TODO: alternatively we could add an interpolate() 
method to IPartitioner
- double frac = (double)tok / 
(double)DatabaseDescriptor.getNumTokens();
- Token midpoint = getPartitioner().midpoint(l, r);
- for (int i = 0; i  53; ++i)
- {
- frac *= 2;
- if (frac == 1.0) /* not a bug */
- break;
- else if (frac  1.0)
- {
- l = midpoint;
- frac -= 1.0;
- }
- else
- r = midpoint;
- midpoint = getPartitioner().midpoint(l, r);
- }
- bootstrapTokens.add(midpoint);
- }
- logger.info(Split previous range ({}, {}] into {}, 
left, right, bootstrapTokens);
- }
+ if (bootstrapTokens.size() != 
DatabaseDescriptor.getNumTokens())
+ throw new ConfigurationException(Cannot change the 
number of tokens from  + bootstrapTokens.size() +  to  + 
DatabaseDescriptor.getNumTokens());
  else
 -logger.info(Using saved tokens  + bootstrapTokens);
 +logger.info(Using saved tokens {}, bootstrapTokens);
  }
  }

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-07-25 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 1440caea12b6068b90a5e55f16afe99e149b3c18
Parents: 1f58592 34c030b
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jul 25 10:47:23 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jul 25 10:47:23 2014 -0500

--
 .../cassandra/db/RecoveryManagerTest.java   | 36 
 1 file changed, 36 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1440caea/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-07-25 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: dcf9585f8d885f165ed6581b532457f07ca922f4
Parents: 1440cae b6d24bb
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jul 25 10:58:59 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jul 25 10:58:59 2014 -0500

--

--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-07-25 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 01d51d5a3b50d62dcc647b45ce68c08a61c6d57b
Parents: 4598349 b2a37c7
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jul 25 13:11:28 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jul 25 13:11:28 2014 -0500

--
 conf/commitlog_archiving.properties | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-07-22 Thread yukim

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 6bc7f76510c498d5570d99be01a169d2207a08a3
Parents: 5b8a6b6 e19431a
Author: Yuki Morishita yu...@apache.org
Authored: Tue Jul 22 16:17:40 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Jul 22 16:17:40 2014 -0500

--

--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-07-17 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c996a36d7a1528e33c3dd80d9e6af8248dbd4eb9
Parents: d087133 f873a32
Author: Brandon Williams bran...@datastax.com
Authored: Thu Jul 17 15:49:44 2014 -0500
Committer: Brandon Williams bran...@datastax.com
Committed: Thu Jul 17 15:49:44 2014 -0500

--

--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-07-16 Thread yukim

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 287bea327d02adbd722b466835a4f2777a9bc92f
Parents: 07ea172 4b2e946
Author: Yuki Morishita yu...@apache.org
Authored: Wed Jul 16 15:59:32 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Jul 16 15:59:32 2014 -0500

--

--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-07-15 Thread jbellis

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 3966935b43d4007123869e18d93bab4808e0efbe
Parents: 8243b6a 52c6dfb
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Jul 15 09:57:34 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Jul 15 09:57:34 2014 -0500

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 5 +
 2 files changed, 6 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3966935b/src/java/org/apache/cassandra/service/StorageService.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-07-10 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 0b89ae2601d6a97734087e4e3e05c5750bc5d545
Parents: bb2fdd0 6cc03b9
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Jul 10 12:10:56 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Jul 10 12:10:56 2014 -0500

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/security/SSLFactory.java| 19 +++
 2 files changed, 20 insertions(+)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-07-02 Thread benedict

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 89463a567e29ef1c33708511fdfd7e5b72b2f1b3
Parents: e90c493 b48d0da
Author: Benedict Elliott Smith bened...@apache.org
Authored: Wed Jul 2 23:43:00 2014 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Wed Jul 2 23:43:00 2014 +0100

--
 CHANGES.txt|  2 ++
 src/java/org/apache/cassandra/db/DefsTables.java   | 17 +++--
 src/java/org/apache/cassandra/db/Keyspace.java |  4 
 .../apache/cassandra/db/commitlog/CommitLog.java   | 17 +
 .../cassandra/db/commitlog/CommitLogSegment.java   |  6 ++
 .../db/commitlog/CommitLogSegmentManager.java  | 11 +--
 .../apache/cassandra/utils/concurrent/OpOrder.java |  7 +++
 7 files changed, 44 insertions(+), 20 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/89463a56/src/java/org/apache/cassandra/db/Keyspace.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/89463a56/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/89463a56/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-06-30 Thread jbellis

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 36640fcac9e855aeec8029d5f9e54fe0e17c747b
Parents: 5fe16c0 ba3a1ba
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Jun 30 21:13:17 2014 -0700
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Jun 30 21:13:17 2014 -0700

--
 CHANGES.txt |   2 ++
 lib/snappy-java-1.0.5.1.jar | Bin 1280090 - 0 bytes
 lib/snappy-java-1.0.5.2.jar | Bin 0 - 1339383 bytes
 3 files changed, 2 insertions(+)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-06-19 Thread mishail

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 6f3f5fbdf3b04a647f0391e8dc724c1edbaf333d
Parents: 23c2fa8 0cdf2b3
Author: Mikhail Stepura mish...@apache.org
Authored: Fri Jun 20 14:04:39 2014 +1100
Committer: Mikhail Stepura mish...@apache.org
Committed: Fri Jun 20 14:04:39 2014 +1100

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-06-19 Thread mishail

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 3d0fc85108469b4d5ccc5cb9751a40baec18498a
Parents: 6f3f5fb 9a6298e
Author: Mikhail Stepura mish...@apache.org
Authored: Fri Jun 20 14:15:51 2014 +1100
Committer: Mikhail Stepura mish...@apache.org
Committed: Fri Jun 20 14:15:51 2014 +1100

--
 CHANGES.txt   | 1 +
 .../apache/cassandra/io/util/FastByteArrayOutputStream.java   | 7 +--
 2 files changed, 6 insertions(+), 2 deletions(-)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-06-18 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 219ab71fe036d485779564397fc8a976a9661c36
Parents: cf4f2dd 197d439
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jun 18 15:24:33 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jun 18 15:24:33 2014 -0500

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/219ab71f/src/java/org/apache/cassandra/gms/FailureDetector.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-06-18 Thread mishail

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: ee749e253ed9b8385e7fa133533ed48ca2877ad2
Parents: 93c99a6 03f76a9
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Jun 19 14:56:45 2014 +1100
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Jun 19 14:56:45 2014 +1100

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-06-18 Thread mishail

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 640c9d4a3899edbd6486db6bfa4cff21b490755c
Parents: ee749e2 c4e0946
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Jun 19 15:16:52 2014 +1100
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Jun 19 15:16:52 2014 +1100

--
 CHANGES.txt | 1 +
 bin/cqlsh   | 5 -
 2 files changed, 5 insertions(+), 1 deletion(-)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-06-12 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 8fb393ec3e54d73fd51ff8a827fe6c87d487e98e
Parents: 34e6bd5 6c8271f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Jun 12 14:46:24 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Jun 12 14:46:24 2014 -0500

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fb393ec/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-06-12 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 7349ec2aa327bb0fabb7702003308dae5fd4d6c1
Parents: 8fb393e b4b3d80
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Jun 12 14:54:05 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Jun 12 14:54:05 2014 -0500

--
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7349ec2a/src/java/org/apache/cassandra/gms/FailureDetector.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-06-09 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: cd0cbd3b1ed3f1779e50a79f6b33af1e9a8f41a1
Parents: 4698b8f 9adb31c
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Jun 9 14:18:31 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Jun 9 14:18:31 2014 -0500

--
 CHANGES.txt |  1 +
 .../gms/GossipDigestAckVerbHandler.java |  1 -
 .../gms/GossipDigestSynVerbHandler.java |  1 -
 src/java/org/apache/cassandra/gms/Gossiper.java | 25 
 4 files changed, 16 insertions(+), 12 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd0cbd3b/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd0cbd3b/src/java/org/apache/cassandra/gms/Gossiper.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-06-03 Thread mishail

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: eb19354aaf28a1d701d44baf7091c7d90c0c17ef
Parents: f28bc63 fbe4df5
Author: Mikhail Stepura mish...@apache.org
Authored: Tue Jun 3 14:16:59 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Tue Jun 3 14:16:59 2014 -0700

--

--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-05-27 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 707eabdc9a4d464408629a571086285dd2c9af5d
Parents: 1b62f3d 8cb5058
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue May 27 18:12:43 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue May 27 18:12:43 2014 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/707eabdc/src/java/org/apache/cassandra/service/StorageService.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-05-11 Thread mishail

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 310d6e4efba63a809fac6237660545aad4009a40
Parents: 28497fd a0d096b
Author: Mikhail Stepura mish...@apache.org
Authored: Thu May 8 13:33:00 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu May 8 13:33:00 2014 -0700

--
 CHANGES.txt | 2 +-
 bin/cqlsh   | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-05-05 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c7fb27abc449f8cecc92089cb96f97c138095086
Parents: 949c5da 07dfb58
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 14:23:51 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 14:23:51 2014 -0500

--
 bin/sstablemetadata.bat | 33 -
 1 file changed, 33 deletions(-)
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-05-02 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 909fd5bc929d6558167661ee7c9acd49f7ddce22
Parents: 46539e1 baee086
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri May 2 16:40:04 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri May 2 16:40:04 2014 -0500

--

--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-04-30 Thread jbellis

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: ad3424707fec9cecad3e5c9a18582cd9933d07ac
Parents: dbf3e1c ece3864
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Apr 30 12:50:20 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Apr 30 12:50:20 2014 -0500

--
 README.asc |  99 ++
 README.txt | 102 
 2 files changed, 99 insertions(+), 102 deletions(-)
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-04-24 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 7fe5503f21b478a57625eb98ba3b242619b457b1
Parents: 417ebf0 11827f0
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Apr 24 10:22:46 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Apr 24 10:22:46 2014 -0500

--

--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-04-22 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b7a1eb4ce846e39bb834ebe5b094f85cd8762166
Parents: 47e81bf c531f53
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Apr 22 09:43:11 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Apr 22 09:43:11 2014 -0500

--
 .../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java   | 2 +-
 .../apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-04-18 Thread mishail

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 894d6f67a0a6338dcb516bbd91bd918c17ad8339
Parents: c65973d 477a0a2
Author: Mikhail Stepura mish...@apache.org
Authored: Fri Apr 18 18:17:04 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Fri Apr 18 18:17:04 2014 -0700

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/cql3handling.py | 24 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-04-08 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 05a457574ccdc2309231e27bf864e3f990bde21a
Parents: cd74a6d ffc8dae
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Apr 8 14:30:43 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Apr 8 14:30:43 2014 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/service/MigrationManager.java  | 12 +++-
 .../org/apache/cassandra/service/StorageService.java|  2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/05a45757/src/java/org/apache/cassandra/service/StorageService.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-04-08 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e1e91bebdf4a2aa457d53b3a1c5c95b252b4f98b
Parents: 05a4575 da2acdd
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Apr 8 14:42:52 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Apr 8 14:42:52 2014 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1e91beb/src/java/org/apache/cassandra/service/StorageService.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-04-03 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 9757e8ec4d2cbf81c5edb085aec4086cc5bf8da1
Parents: 4ebf82c 4717d27
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Apr 3 12:42:55 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Apr 3 12:42:55 2014 -0500

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/gms/Gossiper.java | 6 --
 2 files changed, 5 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9757e8ec/src/java/org/apache/cassandra/gms/Gossiper.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-04-03 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 0c727b53281fc491d22b1b2e8bb78fbcc9b3354f
Parents: 9eb16ae d71b59e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Apr 3 17:55:47 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Apr 3 17:55:47 2014 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c727b53/src/java/org/apache/cassandra/service/StorageService.java
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-03-19 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 51e41a7fbd7b5f740e3f4a73e485323012e99619
Parents: fcd791a 0ccee7f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Mar 19 09:01:17 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Mar 19 09:01:17 2014 -0500

--
 debian/cassandra.conf | 2 ++
 1 file changed, 2 insertions(+)
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-03-17 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 69cadca33fa86fe9df5fe78c936ff34250d2054a
Parents: c3d9280 ceddff5
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Mar 17 12:08:24 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Mar 17 12:08:24 2014 -0500

--
 CHANGES.txt | 7 +++
 conf/cassandra.yaml | 5 +++--
 src/java/org/apache/cassandra/config/EncryptionOptions.java | 6 +-
 3 files changed, 15 insertions(+), 3 deletions(-)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-02-28 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e449450b8a18eabe0d2a3e62a2978c13199302af
Parents: 2766711 bbad16b
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Feb 28 15:15:17 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Feb 28 15:15:17 2014 -0600

--
 CHANGES.txt   | 1 +
 conf/cassandra-env.sh | 3 +++
 2 files changed, 4 insertions(+)
--


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

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-02-21 Thread mishail

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: febd6e159d8c02e06f4f4025297b9dbd04ee71ec
Parents: a896d0f 0508a15
Author: Mikhail Stepura mish...@apache.org
Authored: Fri Feb 21 15:40:30 2014 -0800
Committer: Mikhail Stepura mish...@apache.org
Committed: Fri Feb 21 15:40:30 2014 -0800

--
 pylib/cqlshlib/cql3handling.py | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--

[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

2014-02-19 Thread jbellis

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 916e57b4a192b0a7abbf4041af8c51a2c4860099
Parents: 22ab026 ddaddf6
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Feb 19 16:15:25 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Feb 19 16:15:25 2014 -0600

--
 CHANGES.txt   |  1 +
 src/java/org/apache/cassandra/service/StorageService.java | 10 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
--

48 matches

Mail list logo