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

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

Branch: refs/heads/trunk
Commit: fbc0f447d17ba9237ed2f28101b8b0ae1b21b80d
Parents: 33cedda 7d84043
Author: Yuki Morishita yu...@apache.org
Authored: Fri Sep 5 10:29:56 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Fri Sep 5 10:29:56 2014 -0500

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbc0f447/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 7575936,fb4e6e6..6714be6
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2496,9 -2496,9 +2496,9 @@@ public class StorageService extends Not
  return forceRepairAsync(keyspace, isSequential, isLocal, ranges, 
fullRepair, columnFamilies);
  }
  
 -public int forceRepairAsync(String keyspace, boolean isSequential, 
boolean isLocal, CollectionRangeToken ranges, boolean fullRepair, String... 
columnFamilies)
 +public int forceRepairAsync(final String keyspace, final boolean 
isSequential, final boolean isLocal, final CollectionRangeToken ranges, 
final boolean fullRepair, final String... columnFamilies)
  {
- if (Keyspace.SYSTEM_KS.equals(keyspace) || ranges.isEmpty())
+ if (ranges.isEmpty() || 
Keyspace.open(keyspace).getReplicationStrategy().getReplicationFactor()  2)
  return 0;
  
  int cmd = nextRepairCommand.incrementAndGet();

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

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

Branch: refs/heads/trunk
Commit: b9e42dfa8b3642bef2bdfec952c56a806dba7910
Parents: 8462335 a15e11a
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 26 10:40:28 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 26 10:40:28 2014 -0500

--
 debian/init |  2 ++
 src/java/org/apache/cassandra/cql3/Lists.java   |  6 +++---
 src/java/org/apache/cassandra/cql3/Maps.java|  8 +++
 .../org/apache/cassandra/cql3/Operation.java| 22 ++--
 src/java/org/apache/cassandra/cql3/Sets.java|  8 +++
 5 files changed, 24 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9e42dfa/src/java/org/apache/cassandra/cql3/Lists.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9e42dfa/src/java/org/apache/cassandra/cql3/Maps.java
--

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

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

Branch: refs/heads/trunk
Commit: 82211f6987e58c2d74283252a0c6297ab57b3272
Parents: 2827af4 6b47853
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Jul 29 13:59:18 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Jul 29 13:59:18 2014 -0500

--

--

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

2014-07-23 Thread brandonwilliams 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: aeea401eefc19fff613257c76c2348e512df1f4f
Parents: 7ea7c5d 62e70d2
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jul 23 10:31:32 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jul 23 10:31:32 2014 -0500

--
 CHANGES.txt |   1 +
 .../cassandra/hadoop/pig/CqlNativeStorage.java  | 291 +++
 .../apache/cassandra/hadoop/pig/CqlStorage.java |  11 +-
 test/conf/cassandra.yaml|   2 +
 .../cassandra/pig/CqlTableDataTypeTest.java |  94 +-
 .../org/apache/cassandra/pig/CqlTableTest.java  | 101 ++-
 .../org/apache/cassandra/pig/PigTestBase.java   |   3 +
 .../cassandra/pig/ThriftColumnFamilyTest.java   |  53 +++-
 8 files changed, 518 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aeea401e/CHANGES.txt
--
diff --cc CHANGES.txt
index 01f4fd9,6914a84..d4dd5d9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 +3.0
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 +
 +
  2.1.1
+  * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add duration mode to cassandra-stress (CASSANDRA-7468)
   * Add listen_interface and rpc_interface options (CASSANDRA-7417)
   * Fail to start if commit log replay detects a problem (CASSANDRA-7125)
   * Improve schema merge performance (CASSANDRA-7444)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aeea401e/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
--

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

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

Branch: refs/heads/trunk
Commit: 2093270c7c51700996577fd679f644bcfb17239e
Parents: 8d8fed5 3b14f6a
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Jul 21 07:51:21 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Jul 21 07:51:21 2014 -0500

--
 CHANGES.txt   | 2 +-
 build.xml | 2 +-
 conf/cassandra-env.sh | 4 ++--
 debian/changelog  | 6 ++
 4 files changed, 10 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2093270c/build.xml
--

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

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

Branch: refs/heads/trunk
Commit: e69fee52b9b9664d4c4743db94e61b83a2330426
Parents: 287bea3 367a369
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Jul 16 16:18:01 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Jul 16 16:18:01 2014 -0500

--
 conf/cassandra.yaml | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)
--

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

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

Branch: refs/heads/trunk
Commit: 305132946d20c7c2e81f2eb80da50f7131031061
Parents: b47d8a8 a9da3fd
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jun 13 13:36:01 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jun 13 13:36:01 2014 -0500

--

--

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

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

Branch: refs/heads/trunk
Commit: a44ee2ad4a830ac85d87f04efe9741cb0aeafdd1
Parents: fef40a5 86cd423
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue May 20 11:14:30 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue May 20 11:14:30 2014 -0500

--
 .../cassandra/hadoop/cql3/CqlConfigHelper.java  | 20 ++--
 .../cassandra/hadoop/cql3/CqlRecordReader.java  |  8 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)
--

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

Branch: refs/heads/trunk
Commit: 949c5daea34d25487f42951df95d9a3ef5410fc7
Parents: ddd2ff7 b622411
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 5 11:49:34 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 5 11:49:34 2014 -0500

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


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

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

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

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

Branch: refs/heads/trunk
Commit: 2280416294992c5f241927f6b1326742d7055734
Parents: cf52eae 45a6373
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Mar 26 10:40:23 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Mar 26 10:40:23 2014 -0500

--

--

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

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

Branch: refs/heads/trunk
Commit: 5011437b1e8e82a42ea532e454c8df242e12a620
Parents: c54c618 e0718bc
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Mar 14 15:40:09 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Mar 14 15:40:09 2014 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/db/filter/SliceQueryFilter.java   | 20 ++--
 .../org/apache/cassandra/pig/CqlTableTest.java  | 16 
 3 files changed, 27 insertions(+), 10 deletions(-)
--


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

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

Branch: refs/heads/trunk
Commit: 97a529f0662f92b6539dbff426ca252ad1713954
Parents: 89b8b1a 8e101be
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Feb 19 10:01:19 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Feb 19 10:01:19 2014 -0600

--
 .../apache/cassandra/db/ColumnFamilyStore.java  | 30 +++-
 .../org/apache/cassandra/db/DataTracker.java| 21 --
 2 files changed, 23 insertions(+), 28 deletions(-)
--