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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-02-10 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 861d9960d0659a8b77734d448a777c982ff9030b
Parents: de9be79 b5321d5
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Feb 10 09:37:56 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Feb 10 09:37:56 2014 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/861d9960/src/java/org/apache/cassandra/service/MigrationManager.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-02-07 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: ef6d42cfc522b555d9b1c20a418e90d83f7a29a3
Parents: d69529c 56a615d
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Feb 7 10:18:48 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Feb 7 10:18:48 2014 -0600

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java   | 2 +-
 src/java/org/apache/cassandra/db/DataTracker.java  | 5 +++--
 src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)
--


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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef6d42cf/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-02-07 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 65e09fa5ba071f6e72987a4967b2470c9337
Parents: ef6d42c fe57142
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Feb 7 10:30:56 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Feb 7 10:30:56 2014 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/db/HintedHandOffManager.java  | 26 
 2 files changed, 17 insertions(+), 10 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/65e09fa5/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-02-07 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 4c0b4fa2e5a65be804d8179c376d672a42f4882b
Parents: 65e09fa 7407cf9
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Feb 7 10:38:10 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Feb 7 10:38:10 2014 -0600

--
 test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c0b4fa2/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-02-07 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 01cf29c3e9dac62495d360905323dd0dc4f9b47a
Parents: 4c0b4fa 130d135
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Feb 7 13:19:50 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Feb 7 13:19:50 2014 -0600

--
 build.xml | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/01cf29c3/build.xml
--
diff --cc build.xml
index d36b39e,bfbd8b2..d91e0e0
--- a/build.xml
+++ b/build.xml
@@@ -1116,10 -1084,18 +1117,21 @@@
jvmarg value=-Dcassandra.ring_delay_ms=1000/
jvmarg value=-Dcassandra.tolerate_sstable_size=true/
  /testmacro
 +fileset dir=${test.unit.src}
 +exclude name=**/pig/*.java /
 +/fileset
/target
+ 
+   target name=testsome depends=build-test description=Execute specific 
unit tests 
+ testmacro suitename=unit inputdir=${test.unit.src} 
exclude=**/pig/*.java timeout=${test.timeout}
+   test name=${test.name} methods=${test.methods}/
+   jvmarg value=-Dlegacy-sstable-root=${test.data}/legacy-sstables/
+   jvmarg value=-Dcorrupt-sstable-root=${test.data}/corrupt-sstables/
+   jvmarg 
value=-Dmigration-sstable-root=${test.data}/migration-sstables/
+   jvmarg value=-Dcassandra.ring_delay_ms=1000/
+   jvmarg value=-Dcassandra.tolerate_sstable_size=true/
+ /testmacro
+   /target
  
target name=test-compression depends=build-test description=Execute 
unit tests with sstable compression enabled
testmacro suitename=unit inputdir=${test.unit.src} 
exclude=**/pig/*.java timeout=${test.timeout}

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-01-29 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: fe967f9a111a294074d88663dad2b7b228647e0e
Parents: 1a24611 63059a8
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jan 29 08:56:35 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jan 29 08:56:35 2014 -0600

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-01-29 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: bc03437fe0ff0d95b599c0143bacb9056bd6a516
Parents: fe967f9 2f86648
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Jan 29 09:53:11 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Jan 29 09:53:11 2014 -0600

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-01-29 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5afc79b27eb3cba7862266dad9f6e74a39c5da85
Parents: 7dec15b 39bdb2b
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jan 29 17:35:32 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jan 29 17:35:32 2014 -0600

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


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5afc79b2/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index b5b2445,9eb4e92..fe04b81
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1436,18 -1438,31 +1436,24 @@@ public class StorageService extends Not
   * in reads.
   *
   * @param endpoint node
 - * @param pieces STATE_NORMAL,token
   */
 -private void handleStateNormal(final InetAddress endpoint, String[] 
pieces)
 +private void handleStateNormal(final InetAddress endpoint)
  {
 -assert pieces.length = 2;
 -
 -// Parse versioned values according to end-point version:
 -//   versions   1.2 .: STATUS,TOKEN
 -//   versions = 1.2 .: uses HOST_ID/TOKENS app states
 -
  CollectionToken tokens;
  
 -tokens = getTokensFor(endpoint, pieces[1]);
 +tokens = getTokensFor(endpoint);
  
+ SetToken tokensToUpdateInMetadata = new HashSetToken();
+ SetToken tokensToUpdateInSystemKeyspace = new HashSetToken();
+ SetToken localTokensToRemove = new HashSetToken();
+ SetInetAddress endpointsToRemove = new HashSetInetAddress();
+ 
+ 
  if (logger.isDebugEnabled())
 -logger.debug(Node  + endpoint +  state normal, token  + 
tokens);
 +logger.debug(Node {} state normal, token {}, endpoint, tokens);
  
  if (tokenMetadata.isMember(endpoint))
 -logger.info(Node  + endpoint +  state jump to normal);
 +logger.info(Node {} state jump to normal, endpoint);
  
  // Order Matters, TM.updateHostID() should be called before 
TM.updateNormalToken(), (see CASSANDRA-4300).
  if (Gossiper.instance.usesHostId(endpoint))

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-01-22 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: d86e1dd61df7475501e3ab41bdb9a79002fa2ebc
Parents: 7822733 9c98818
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jan 22 13:42:39 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jan 22 13:42:39 2014 -0600

--
 CHANGES.txt |  1 +
 .../apache/cassandra/gms/FailureDetector.java   | 30 ++--
 2 files changed, 29 insertions(+), 2 deletions(-)
--


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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-01-22 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 4c8a8812cf311d2f814987519d06e1d584c44f09
Parents: b926009 f7f9de5
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jan 22 17:12:41 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jan 22 17:12:41 2014 -0600

--
 NEWS.txt | 16 
 1 file changed, 4 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c8a8812/NEWS.txt
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-01-17 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: bf1428922937033e16f792d453b7987d64bf3f73
Parents: c8a0a3a 14c6f70
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jan 17 10:07:34 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jan 17 10:07:34 2014 -0600

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-01-16 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: fac3042db80ff4129c04bc54204f5e02458e81e8
Parents: c17fb60 90f661e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Jan 16 18:19:02 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Jan 16 18:19:02 2014 -0600

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-01-15 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 6abe16d36733363709d478a1ab65b9d1ff0cb6a1
Parents: 8b09061 27488a5
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jan 15 16:02:24 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jan 15 16:02:24 2014 -0600

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-01-14 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9dc585413ac308cd32daa9fea6da6a34ec9d04a0
Parents: eb354fb 4f50406
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Jan 14 15:20:07 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Jan 14 15:20:07 2014 -0600

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2014-01-10 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: ebc712aeb9f8730c5b5a73eba6261f566d79956e
Parents: b5e2a01 87c6ec1
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jan 10 13:05:01 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jan 10 13:05:01 2014 -0600

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-12-28 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 35c2f9285f6ef310910888780dfef9908997cf7e
Parents: e085e82 bbc0891
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Dec 28 20:49:11 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sat Dec 28 20:49:11 2013 -0600

--
 .../org/apache/cassandra/io/compress/CompressionMetadata.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-12-26 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 30afda36822a5d4783fe22ad93a65337e2b32bf7
Parents: 7c18281 1365749
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Dec 26 10:56:16 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Dec 26 10:56:16 2013 -0600

--
 .gitignore | 55 +++
 1 file changed, 55 insertions(+)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-12-19 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 81f8c75d3ecbdfb2d88a2f2cf6909d9aac110f08
Parents: 4b72dae d8062cd
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Dec 19 17:44:26 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Dec 19 17:44:26 2013 -0600

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


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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-12-13 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 6fdff70f48e3c1142200afc527359ac1b402fb21
Parents: 343a647 54c1ed3
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Dec 13 12:12:50 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Dec 13 12:12:50 2013 -0600

--
 .../org/apache/cassandra/hadoop/pig/CassandraStorage.java| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-12-13 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 14ebfbf7f8b5091ba2d9a5f6cbb34a00cdb5dbc3
Parents: fe58dff a3796f5
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Dec 13 22:11:35 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Dec 13 22:11:35 2013 -0600

--
 CHANGES.txt  |  3 ++-
 .../cassandra/locator/AbstractReplicationStrategy.java   | 11 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-12-12 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 448e4d46f0e050ddbb7b43aace463ff881eff7c5
Parents: 56e4842 ca7335e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Dec 12 12:05:07 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Dec 12 12:05:07 2013 -0600

--
 bin/cassandra.in.sh | 7 +++
 bin/json2sstable| 2 +-
 bin/nodetool| 2 +-
 bin/sstable2json| 2 +-
 bin/sstablekeys | 2 +-
 bin/sstableloader   | 2 +-
 bin/sstablescrub| 2 +-
 bin/sstablesplit| 2 +-
 bin/sstableupgrade  | 2 +-
 9 files changed, 15 insertions(+), 8 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-12-05 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5ad8a3d3aa94b864f72ca587d9117f1458a47f34
Parents: 6772247 667e3db
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Dec 5 09:44:18 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Dec 5 09:44:18 2013 -0600

--
 CHANGES.txt |  5 -
 .../apache/cassandra/cache/AutoSavingCache.java | 22 
 2 files changed, 13 insertions(+), 14 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-12-02 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: f281a837bdd699545ea849c70dc5ce228c0b42c0
Parents: 22e18f5 41d64cd
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Dec 2 20:56:49 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Dec 2 20:56:49 2013 -0600

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-12-02 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: ab9fe1ae892826e59c926ef66e796c729d2f27a2
Parents: f281a83 ef768a5
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Dec 2 21:16:41 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Dec 2 21:16:41 2013 -0600

--
 CHANGES.txt   | 1 -
 src/java/org/apache/cassandra/gms/VersionedValue.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-27 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: ed0c91ee424f61d59874519d4bf84979d7e8bad4
Parents: 7ea5b40 2af0764
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Nov 27 11:38:14 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Nov 27 11:38:14 2013 -0600

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


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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-26 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 1bfd062fdc9daa35fbabcebb3ac31e726504f1ff
Parents: 9f3a7f8 504f66d
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:13:06 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:13:06 2013 -0600

--
 CHANGES.txt |  1 +
 .../locator/AbstractReplicationStrategy.java| 58 +---
 .../apache/cassandra/locator/TokenMetadata.java | 49 +++--
 3 files changed, 60 insertions(+), 48 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bfd062f/src/java/org/apache/cassandra/locator/TokenMetadata.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-26 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: c384d31b8b6289f896625a9fc5777bac62ebbbe8
Parents: 1bfd062 e68d466
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:28:16 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:28:16 2013 -0600

--
 src/java/org/apache/cassandra/db/Keyspace.java | 3 ---
 1 file changed, 3 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-26 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: a13c6dcbb7a6ba74b27e50eef4bfd0f80eaea121
Parents: c384d31 ab4cc9c
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 26 14:34:50 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 26 14:34:50 2013 -0600

--
 src/java/org/apache/cassandra/locator/PropertyFileSnitch.java | 2 +-
 src/java/org/apache/cassandra/locator/TokenMetadata.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a13c6dcb/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a13c6dcb/src/java/org/apache/cassandra/locator/TokenMetadata.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-22 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 40598efa6344333d4d4deee2c1ec3e71bd931066
Parents: 23e7744 8e0523e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Nov 22 12:02:57 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Nov 22 12:02:57 2013 -0600

--
 debian/init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-22 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 87b39c8af3477c3b80f124da23b46de350a259e7
Parents: dbd1a72 4fd322f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Nov 22 13:23:04 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Nov 22 13:23:04 2013 -0600

--
 src/java/org/apache/cassandra/dht/BootStrapper.java |  2 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  2 +-
 .../org/apache/cassandra/service/StorageService.java| 12 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/87b39c8a/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 5dabb42,e91ac8c..2dc7ad8
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -3046,10 -3046,10 +3046,10 @@@ public class StorageService extends Not
  
  // A leaving endpoint that is dead is already being removed.
  if (tokenMetadata.isLeaving(endpoint))
 -logger.warn(Node  + endpoint +  is already being removed, 
continuing removal anyway);
 +logger.warn(Node {} is already being removed, continuing removal 
anyway, endpoint);
  
  if (!replicatingNodes.isEmpty())
- throw new UnsupportedOperationException(This node is already 
processing a removal. Wait for it to complete, or use 'removetoken force' if 
this has failed.);
+ throw new UnsupportedOperationException(This node is already 
processing a removal. Wait for it to complete, or use 'removenode force' if 
this has failed.);
  
  // Find the endpoints that are going to become responsible for data
  for (String keyspaceName : Schema.instance.getNonSystemKeyspaces())

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-20 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 10a2089739dc19022777be6445ce3385ab25dce9
Parents: f424e58 26d1b68
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Nov 20 12:53:32 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Nov 20 12:53:32 2013 -0600

--
 CHANGES.txt |  1 +
 .../apache/cassandra/gms/FailureDetector.java   | 12 ---
 src/java/org/apache/cassandra/gms/Gossiper.java |  2 +-
 .../apache/cassandra/gms/IFailureDetector.java  |  7 
 .../cassandra/utils/BoundedStatsDeque.java  | 35 
 .../apache/cassandra/dht/BootStrapperTest.java  |  1 -
 .../cassandra/utils/BoundedStatsDequeTest.java  |  6 
 7 files changed, 15 insertions(+), 49 deletions(-)
--


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

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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-19 Thread slebresne

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 723792d64961340945c4d2f28965da7b0e3eaa42
Parents: 3958a00 6b1fb2c
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Nov 19 18:27:15 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Nov 19 18:27:15 2013 +0100

--
 .../apache/cassandra/locator/TokenMetadata.java | 22 +-
 .../unit/org/apache/cassandra/db/ScrubTest.java |  4 +++
 .../cassandra/locator/TokenMetadataTest.java| 30 ++--
 .../service/LeaveAndBootstrapTest.java  |  6 
 4 files changed, 40 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/723792d6/src/java/org/apache/cassandra/locator/TokenMetadata.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/723792d6/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-19 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: b01b67a00d7caae87ded86e8109b14a57c5f
Parents: 723792d 41358f6
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 19 16:30:24 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 19 16:30:24 2013 -0600

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-19 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: b1db33175774517a0294a3ebbaadfc3d2006a192
Parents: 22b9e08 2cb95d6
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 19 16:42:45 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 19 16:42:45 2013 -0600

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-16 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: e50d89dd2b4a87eae7eaa5639dc1852769af4460
Parents: 414ba40 a7a7ede
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Nov 16 11:11:03 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sat Nov 16 11:11:03 2013 -0600

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 --
 2 files changed, 9 insertions(+), 2 deletions(-)
--


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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-12 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: fa86ce88c481ee193be39d7a32f9b9536d171dfe
Parents: c20dd29 91f976c
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 12 15:51:08 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 12 15:51:08 2013 -0600

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-11 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 16cf7f3e876674bdd398ad09b9d1a801f432c03d
Parents: e9c595b 2d1085d
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Nov 11 11:43:43 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Nov 11 11:43:43 2013 -0600

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-11 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9a59d250aca108d766f05b08d351df25910a2f9b
Parents: 16cf7f3 2cc4670
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Nov 11 11:54:17 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Nov 11 11:54:17 2013 -0600

--
 bin/cqlsh.bat | 1 +
 1 file changed, 1 insertion(+)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-06 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: c65c15cc0583164ffd724d1008397f9380fd7a89
Parents: a4fc13c b402097
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Nov 6 12:33:59 2013 -0800
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Nov 6 12:33:59 2013 -0800

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/net/MessagingService.java | 12 +---
 2 files changed, 10 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c65c15cc/src/java/org/apache/cassandra/net/MessagingService.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-05 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5909b5f87ec5fe3cea55402ccd618eb491d1c4f2
Parents: 470e3fe d38ca32
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Nov 5 13:41:58 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Nov 5 13:41:58 2013 -0600

--
 .../cassandra/hadoop/AbstractColumnFamilyInputFormat.java| 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5909b5f8/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-05 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 2d6ab6fb50aebfb48e51e040a346731b5b1ff602
Parents: 5909b5f 3a4d6be
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Nov 5 15:27:48 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Nov 5 15:27:48 2013 -0600

--
 .../hadoop/cql3/CqlPagingRecordReader.java  | 32 ++--
 1 file changed, 23 insertions(+), 9 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-04 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: d86b7e3ff446eaf1722e1f7f98218c98c6df0b76
Parents: 2bbabe1 424fb48
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Nov 4 09:49:08 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Nov 4 09:49:08 2013 -0600

--
 CHANGES.txt |  7 +++
 .../apache/cassandra/cql3/QueryProcessor.java   | 49 +++-
 src/java/org/apache/cassandra/db/Memtable.java  |  6 +--
 3 files changed, 47 insertions(+), 15 deletions(-)
--


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

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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-04 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 8fc6f5bcee48945880c6c68d278242f6f1e0571f
Parents: d86b7e3 fc1fc93
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Nov 4 12:56:11 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Nov 4 12:56:11 2013 -0600

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-04 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 67c2c2851c468041ec9d2e22477966ea2b1dc3a5
Parents: 8fc6f5b 9a1d2cc
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Nov 4 13:14:40 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Nov 4 13:14:40 2013 -0600

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-11-04 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 70e89bd04984ca1973cdc8ae35755b995ac46d27
Parents: 67c2c28 e0eb517
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Nov 4 15:26:22 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Nov 4 15:26:22 2013 -0600

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


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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-30 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 91d60fbce0723a96feb76b7fafcea0d5355b54bc
Parents: d39ec22 392be16
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Oct 30 10:46:13 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Oct 30 10:46:13 2013 -0500

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


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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-30 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 58e2706d3d66095802c3a03dee0bdfae0045b324
Parents: 45bb924 89911c8
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Oct 30 14:10:00 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Oct 30 14:10:00 2013 -0500

--
 .../cassandra/io/sstable/SSTableReaderTest.java | 37 
 1 file changed, 37 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/58e2706d/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-30 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 04984ab2751790a2b3b1d16d46fdd3cee29f1274
Parents: 58e2706 830711c
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Oct 30 15:05:46 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Oct 30 15:05:46 2013 -0500

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-28 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 4f5edb6479ebb1c8f667bbed984803460ec766a8
Parents: e5f4fd6 9e47591
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Oct 28 11:52:25 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Oct 28 11:52:25 2013 -0500

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-28 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 8f6e6526053d75e129bc8865d89bb514f1993410
Parents: 4e5ed3a 2e84ab1
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Oct 28 14:37:40 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Oct 28 14:37:40 2013 -0500

--
 src/java/org/apache/cassandra/utils/FBUtilities.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-25 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 8d1bb07530390128c1ec5d48daf438380a7cce8e
Parents: 2faac19 9385cfd
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Oct 25 09:47:21 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Oct 25 09:47:21 2013 -0500

--
 src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-25 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 0dccea4f3600ea29bf4e146ed2c2a49b615187c3
Parents: 8d1bb07 2f248b3
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 25 11:11:41 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 25 11:11:41 2013 -0500

--
 .../cassandra/hadoop/pig/AbstractCassandraStorage.java   | 4 +++-
 .../org/apache/cassandra/hadoop/pig/CassandraStorage.java| 6 +-
 src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 8 
 3 files changed, 16 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0dccea4f/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-22 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: aca45fe99503aba03dae813da9af3267f214f69b
Parents: 6cb5da8 bee0b4b
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Oct 22 16:58:45 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Oct 22 16:58:45 2013 -0500

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-22 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: d963e9b29917322a1408b77627e20734ef81fbb5
Parents: aca45fe ebd50ff
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Oct 22 17:09:02 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Oct 22 17:09:02 2013 -0500

--
 CHANGES.txt | 20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-18 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5433525f5ecda967a755dbff9f54ed96ce8bb81c
Parents: 3f8a90a cf3bd6f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 18 09:45:36 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 18 09:45:36 2013 -0500

--
 .../apache/cassandra/hadoop/pig/CqlStorage.java |  15 +-
 .../cassandra/pig/CqlTableDataTypeTest.java | 422 +++
 .../pig/ThriftColumnFamilyDataTypeTest.java | 181 
 3 files changed, 614 insertions(+), 4 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-18 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 3017dd34f7adaf4bdb0a0aace0f92da351376de8
Parents: 5433525 718e3ec
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 18 10:08:45 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 18 10:08:45 2013 -0500

--
 lib/cql-internal-only-1.4.0.zip | Bin 92738 - 0 bytes
 lib/cql-internal-only-1.4.1.zip | Bin 0 - 92738 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-17 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 78cad84aee38c4682a6badb5c482e4fb84dc2df5
Parents: 712615e 229da37
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Oct 17 23:11:41 2013 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Oct 17 23:11:41 2013 +0100

--
 CHANGES.txt |  4 +---
 build.xml   |  3 +++
 .../compaction/LeveledCompactionStrategy.java   | 20 
 3 files changed, 24 insertions(+), 3 deletions(-)
--


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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-17 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 659296b927cc992061410a037bd2fba7fc1c7057
Parents: 99c9315 f084119
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Oct 17 21:04:43 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Oct 17 21:04:43 2013 -0500

--
 NEWS.txt|   5 +-
 .../cassandra/config/DatabaseDescriptor.java|  17 ++-
 .../org/apache/cassandra/db/SystemKeyspace.java |   9 +-
 .../gms/GossipDigestAckVerbHandler.java |  10 +-
 .../gms/GossipDigestSynVerbHandler.java |   2 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  71 +++-
 .../cassandra/service/StorageService.java   | 115 ---
 7 files changed, 182 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/659296b9/NEWS.txt
--

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

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

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

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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-17 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 8ec455d848281cf5d900da673a501e370926ac1e
Parents: 659296b cb585ef
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Oct 17 21:57:00 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Oct 17 21:57:00 2013 -0500

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-16 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: b685e11186dd4fa404b2b621eda78b8f2eb69a15
Parents: 3f14657 2ab1370
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Oct 16 07:33:05 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Oct 16 07:33:05 2013 -0500

--
 src/java/org/apache/cassandra/tools/NodeCmd.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-16 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 832c4e98b6e6e310f062bf518e849d237c59e106
Parents: b685e11 96c0256
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Oct 16 13:45:48 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Oct 16 13:45:48 2013 -0500

--
 src/java/org/apache/cassandra/config/CFMetaData.java | 4 
 1 file changed, 4 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-15 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 0c34fa8e9750a64e82e5fd392a0be48c2f84e9e1
Parents: d143206 bd45c4c
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Oct 15 11:18:31 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Oct 15 11:18:31 2013 -0500

--
 CHANGES.txt |   3 +
 .../org/apache/cassandra/tools/NodeCmd.java | 104 +--
 .../apache/cassandra/tools/NodeToolHelp.yaml|   4 +-
 3 files changed, 102 insertions(+), 9 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-15 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 3f1465779de511ba2351bdf514e5dbab34e16e1b
Parents: 0c34fa8 a1e594b
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Oct 15 23:43:25 2013 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Oct 15 23:43:25 2013 +0100

--
 CHANGES.txt |  2 ++
 .../db/commitlog/CommitLogAllocator.java| 34 +---
 2 files changed, 25 insertions(+), 11 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-14 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: bb13b803cde71b8d05371f0291d212c996342ea1
Parents: 0b3a0a6 3a29c74
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Oct 14 13:34:26 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Oct 14 13:34:26 2013 -0500

--
 examples/pig/example-populate-cql.txt  |  24 
 examples/pig/example-script.pig|  13 ++
 examples/pig/libdata.csv   | 200 
 examples/pig/test/populate-cql.txt |  33 +
 examples/pig/test/test_cql_storage.pig |  14 ++
 5 files changed, 284 insertions(+)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-14 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk

Conflicts:
build.xml
test/conf/log4j-junit.properties


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

Branch: refs/heads/trunk
Commit: 0f13031023ea588b8b71f3aab3108797c3a114d6
Parents: bb13b80 fe598e7
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Oct 14 14:19:20 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Oct 14 14:19:20 2013 -0500

--
 build.xml   |   8 +
 .../hadoop/pig/AbstractCassandraStorage.java|   4 +-
 .../cassandra/hadoop/pig/CassandraStorage.java  |  25 +-
 .../apache/cassandra/hadoop/pig/CqlStorage.java |  25 +-
 test/conf/log4j-junit.properties|  40 +
 .../org/apache/cassandra/pig/CqlTableTest.java  | 236 ++
 .../org/apache/cassandra/pig/PigTestBase.java   | 167 
 .../cassandra/pig/ThriftColumnFamilyTest.java   | 809 +++
 test/unit/org/apache/pig/test/MiniCluster.java  |  78 ++
 .../org/apache/pig/test/MiniGenericCluster.java | 122 +++
 10 files changed, 1507 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f130310/build.xml
--
diff --cc build.xml
index 6e22525,5e7f269..fe1a5f7
--- a/build.xml
+++ b/build.xml
@@@ -363,13 -360,12 +363,14 @@@
  
dependency groupId=junit artifactId=junit version=4.6 /
dependency groupId=commons-logging artifactId=commons-logging 
version=1.1.1/
 -  dependency groupId=org.apache.rat artifactId=apache-rat 
version=0.6
 +  dependency groupId=org.apache.rat artifactId=apache-rat 
version=0.10
   exclusion groupId=commons-lang artifactId=commons-lang/
/dependency
 -  dependency groupId=org.apache.hadoop artifactId=hadoop-core 
version=1.0.3/
 +  dependency groupId=org.apache.hadoop artifactId=hadoop-core 
version=1.0.3
 +  exclusion groupId=org.mortbay.jetty 
artifactId=servlet-api/
 +  /dependency
+   dependency groupId=org.apache.hadoop 
artifactId=hadoop-minicluster version=1.0.3/
 -  dependency groupId=org.apache.pig artifactId=pig 
version=0.10.0/
 +  dependency groupId=org.apache.pig artifactId=pig 
version=0.11.1/
dependency groupId=net.java.dev.jna artifactId=jna 
version=3.2.7/
  
dependency groupId=net.sourceforge.cobertura 
artifactId=cobertura version=${cobertura.version}/

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-14 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: dfa7c58d0bb2890f08ce4b21e17956a3c1b3eccc
Parents: 0f13031 f557a77
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Oct 14 20:26:09 2013 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Oct 14 20:26:09 2013 +0100

--
 CHANGES.txt |  1 +
 .../db/commitlog/CommitLogReplayer.java | 26 +---
 2 files changed, 23 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfa7c58d/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-14 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk

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


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

Branch: refs/heads/trunk
Commit: 5c408af2e5075b8100eb67b7549bdb1cdb57412c
Parents: ccbf921 4eaca39
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Oct 14 16:37:16 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Oct 14 16:37:16 2013 -0500

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-09 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9a1212328b066e57f11424153b9a3ed5eeaa0345
Parents: 152da3c d0fae09
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Oct 9 07:36:21 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Oct 9 07:36:21 2013 -0500

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a121232/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-09 Thread yukim

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: a6f7d07a443ec07ef790f7566f588a90a25e4c70
Parents: 4100cf2 ecee395
Author: Yuki Morishita yu...@apache.org
Authored: Wed Oct 9 10:36:49 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Oct 9 10:36:49 2013 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/tools/NodeProbe.java   | 57 ++--
 2 files changed, 42 insertions(+), 16 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-09 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 0ef1304cb5a38f36607e79635eab4962c2077481
Parents: a6f7d07 4d9fc03
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Oct 9 11:31:52 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Oct 9 11:31:52 2013 -0500

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-09 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: facb81dc43ba8a205b0509c3f3d41e1f8c16963a
Parents: 0ef1304 7502474
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Oct 9 13:36:03 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Oct 9 13:36:03 2013 -0500

--
 CHANGES.txt| 1 +
 .../cassandra/hadoop/AbstractColumnFamilyInputFormat.java  | 6 --
 2 files changed, 5 insertions(+), 2 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-08 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: cfac7fbc1a649469fd8a2be539715e473b871f7b
Parents: 3f918e2 690dac3
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Oct 8 05:28:13 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Oct 8 05:28:13 2013 -0500

--
 .../apache/cassandra/gms/FailureDetector.java   | 22 
 .../cassandra/gms/FailureDetectorMBean.java |  4 
 2 files changed, 26 insertions(+)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-06 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: d34d84223379a38c92d9a2ab8fc3c1efd6dcc64d
Parents: 8d9b5fd e9b624a
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Oct 6 11:29:13 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Oct 6 11:29:13 2013 -0500

--
 CHANGES.txt |  3 +-
 .../apache/cassandra/cql3/QueryProcessor.java   | 49 
 2 files changed, 43 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d34d8422/CHANGES.txt
--
diff --cc CHANGES.txt
index 5256edf,94fa927..4ec387c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +2.1
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 +
 +
  2.0.2
+  * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
   * Fix race conditions in bulk loader (CASSANDRA-6129)
   * Add configurable metrics reporting (CASSANDRA-4430)
   * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-06 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: a2edbede57e7d335d5d9b56509189449b6d50286
Parents: d34d842 6a60304
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Oct 6 13:35:30 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Oct 6 13:35:30 2013 -0500

--
 .../cassandra/exceptions/PreparedQueryNotFoundException.java| 5 ++---
 src/java/org/apache/cassandra/thrift/CassandraServer.java   | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2edbede/src/java/org/apache/cassandra/thrift/CassandraServer.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-04 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: d75e63f17b58ddebf58b5ccfaaf1876e493d5a37
Parents: b746087 27967f9
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Oct 4 21:53:10 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Oct 4 21:53:10 2013 -0500

--
 CHANGES.txt |  1 +
 .../apache/cassandra/metrics/ClientMetrics.java | 35 ++
 .../cassandra/thrift/CassandraServer.java   | 18 --
 .../cassandra/thrift/ThriftSessionManager.java  |  5 +++
 .../org/apache/cassandra/transport/Server.java  | 37 ++--
 5 files changed, 84 insertions(+), 12 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d75e63f1/src/java/org/apache/cassandra/thrift/CassandraServer.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-03 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 188a8b36eff4d6e206ccd99fa226bfa54833b522
Parents: 9b06e48 ff7d341
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Oct 3 22:07:46 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Oct 3 22:07:46 2013 -0500

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-03 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 53ac6b20348c1c291536fa183ba2bb9611ca93fa
Parents: 188a8b3 ef69bd5
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Oct 3 22:17:55 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Oct 3 22:17:55 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/53ac6b20/src/java/org/apache/cassandra/service/StorageProxy.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-03 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 6dda6f2d8a0975a38f5c321805f0695928b77791
Parents: 53ac6b2 213f6bb
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Oct 3 22:19:41 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Oct 3 22:19:41 2013 -0500

--

--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-02 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 8bdba79f978a56dd5b717d271ced5c0f0cf8
Parents: 040e67e 02d5ef3
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Oct 2 10:38:57 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Oct 2 10:38:57 2013 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/KSMetaData.java |  2 +-
 .../apache/cassandra/tracing/TraceState.java| 16 +---
 .../org/apache/cassandra/tracing/Tracing.java   | 40 
 4 files changed, 45 insertions(+), 14 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-10-02 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: bcbcff3e6deafe1f4ab4bf9e1c88407ad70fd9c5
Parents: 70dc320 4bd8626
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Oct 2 19:11:45 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Oct 2 19:11:45 2013 -0500

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-30 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: a36436fc3f3c9f71307427ec344ba2474e47a1a2
Parents: 359d566 00f6173
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Sep 30 13:01:30 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Sep 30 13:01:30 2013 -0500

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-26 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 246fefabfbae20b6c17a1898bb838d7463ccad0a
Parents: 2c7b61b 006eec4
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Sep 26 13:53:58 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Sep 26 13:53:58 2013 -0500

--
 .../hadoop/pig/AbstractCassandraStorage.java| 151 ++-
 .../cassandra/hadoop/pig/CassandraStorage.java  |   2 +-
 .../apache/cassandra/hadoop/pig/CqlStorage.java | 144 +-
 3 files changed, 153 insertions(+), 144 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-26 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: bce594f38b2507266610e092058bd08095e56255
Parents: 2520f2f 2fb089e
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Sep 26 17:10:51 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Sep 26 17:10:51 2013 -0500

--
 conf/cassandra.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-25 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: edc90bfbdfaeea48dad23cbed01bdac6448b1e20
Parents: be236ea b3b7508
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Sep 25 10:09:02 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Sep 25 10:09:02 2013 -0500

--
 .../org/apache/cassandra/config/DatabaseDescriptor.java  | 11 +++
 1 file changed, 11 insertions(+)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-25 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: fa2453558e05fe3d2eeeab217e79215703e1437c
Parents: d5f7ba5 8845ad6
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Sep 25 16:08:53 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Sep 25 16:08:53 2013 -0500

--
 .../hadoop/pig/AbstractCassandraStorage.java| 97 
 1 file changed, 36 insertions(+), 61 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-25 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: e2a3456e214aff24147339fc99f5ebe9c7c4cd00
Parents: fa24535 83da4bd
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Sep 25 16:27:49 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Sep 25 16:27:49 2013 -0500

--
 .../hadoop/pig/AbstractCassandraStorage.java| 30 ++--
 .../cassandra/hadoop/pig/CassandraStorage.java  | 18 ++--
 .../apache/cassandra/hadoop/pig/CqlStorage.java |  8 +++---
 3 files changed, 28 insertions(+), 28 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-24 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 99691be14f0bfcba71a2b75343332126c6e749e8
Parents: 08e3346 7c6e552
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Sep 24 08:41:23 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Sep 24 08:41:23 2013 -0500

--
 src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-23 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: eb125ad78b57da38026c1f7775744de53d1676a4
Parents: 74e710a 52b4fc3
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Sep 23 13:33:46 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Sep 23 13:33:46 2013 -0500

--
 CHANGES.txt |  1 +
 conf/cassandra.yaml |  5 
 .../org/apache/cassandra/config/Config.java |  2 ++
 .../cassandra/config/DatabaseDescriptor.java| 14 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 31 
 .../cassandra/db/ColumnFamilyStoreMBean.java|  9 ++
 .../cassandra/db/filter/SliceQueryFilter.java   | 20 +
 .../cassandra/metrics/ColumnFamilyMetrics.java  |  8 +
 .../cassandra/service/StorageService.java   | 10 +++
 .../cassandra/service/StorageServiceMBean.java  |  5 
 10 files changed, 93 insertions(+), 12 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb125ad7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 36fe7f9,ec9570a..6d27625
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -69,9 -66,9 +66,8 @@@ import org.apache.cassandra.io.util.Fil
  import org.apache.cassandra.metrics.ColumnFamilyMetrics;
  import org.apache.cassandra.service.CacheService;
  import org.apache.cassandra.service.StorageService;
 -import org.apache.cassandra.thrift.IndexExpression;
  import org.apache.cassandra.tracing.Tracing;
  import org.apache.cassandra.utils.*;
- import org.cliffc.high_scale_lib.NonBlockingHashMap;
  
  import static org.apache.cassandra.config.CFMetaData.Caching;
  

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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-19 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 388e1b2363c1c5857a6ad58472677e26ca692867
Parents: 1257868 f9f5af0
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Sep 19 17:45:41 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Sep 19 17:45:41 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/388e1b23/CHANGES.txt
--
diff --cc CHANGES.txt
index 578da35,7f30117..72488e8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +2.1
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 +
 +
  2.0.1
+  * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
   * Improve memory use defaults (CASSANDRA-5069)
   * Make ThriftServer more easlly extensible (CASSANDRA-6058)
   * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-18 Thread yukim

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: a7820f9cb5932bbcee263b9bb56227c57148ccc4
Parents: 0eca165 e9c027a
Author: Yuki Morishita yu...@apache.org
Authored: Wed Sep 18 14:24:58 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Sep 18 14:24:58 2013 -0500

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionManager.java| 14 +++--
 .../cassandra/io/sstable/SSTableReader.java | 30 ++--
 3 files changed, 34 insertions(+), 11 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7820f9c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-18 Thread yukim

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 0cec93c4fb7fd133c5f3a2a4af3828fad8a73fe4
Parents: 2ea405e 6e3a241
Author: Yuki Morishita yu...@apache.org
Authored: Thu Sep 19 00:50:18 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Thu Sep 19 00:50:18 2013 -0500

--
 .../apache/cassandra/metrics/CacheMetrics.java  | 18 +++--
 .../cassandra/metrics/ClientRequestMetrics.java | 10 +--
 .../cassandra/metrics/CommitLogMetrics.java | 10 ++-
 .../cassandra/metrics/CompactionMetrics.java| 12 ++--
 .../cassandra/metrics/ConnectionMetrics.java| 32 -
 .../cassandra/metrics/DefaultNameFactory.java   | 71 
 .../metrics/DroppedMessageMetrics.java  |  7 +-
 .../cassandra/metrics/HintedHandoffMetrics.java |  8 +--
 .../cassandra/metrics/LatencyMetrics.java   | 30 ++---
 .../cassandra/metrics/ReadRepairMetrics.java| 37 +-
 .../cassandra/metrics/StorageMetrics.java   | 11 +--
 .../cassandra/metrics/StreamingMetrics.java | 13 ++--
 .../cassandra/scheduler/WeightedQueue.java  |  2 +-
 13 files changed, 148 insertions(+), 113 deletions(-)
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-17 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 889ca1f504113c90b0ffc6700a1e80635d6cb13e
Parents: 62cedd3 83b0b2f
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Sep 17 12:14:18 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Sep 17 12:14:18 2013 -0500

--
 CHANGES.txt |   3 +-
 conf/cassandra.yaml |   6 +-
 .../org/apache/cassandra/config/Config.java |   1 +
 .../cassandra/config/DatabaseDescriptor.java|   8 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  |   4 +-
 src/java/org/apache/cassandra/db/Memtable.java  | 133 ++-
 .../org/apache/cassandra/db/MeteredFlusher.java |  22 ++-
 .../PeriodicCommitLogExecutorService.java   |   2 +-
 .../apache/cassandra/utils/StatusLogger.java|   9 +-
 9 files changed, 107 insertions(+), 81 deletions(-)
--


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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/889ca1f5/src/java/org/apache/cassandra/db/Memtable.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-17 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 494ba4582b9be1a391f9bcd7ac0924c3d0dcb76e
Parents: 3700e01 1e0d951
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Sep 17 16:57:59 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Sep 17 16:57:59 2013 -0500

--
 CHANGES.txt |   1 +
 conf/cassandra.yaml |   4 +
 .../org/apache/cassandra/config/Config.java |   6 +-
 .../cassandra/config/DatabaseDescriptor.java|   8 ++
 .../cassandra/io/util/PoolingSegmentedFile.java |  14 +-
 .../cassandra/io/util/RandomAccessReader.java   |   5 +
 .../cassandra/metrics/FileCacheMetrics.java |  64 +
 .../cassandra/service/FileCacheService.java | 139 +++
 8 files changed, 231 insertions(+), 10 deletions(-)
--


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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-13 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 19c9a1ef4bdef527bd160f3b304e0576a92d9d77
Parents: d141daa c9f4f0d
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Sep 13 12:18:54 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Sep 13 12:18:54 2013 -0500

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-13 Thread yukim

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: d141daa202e2fab3b6ef89243e36be14253ced1b
Parents: 76acc80 1daf191
Author: Yuki Morishita yu...@apache.org
Authored: Fri Sep 13 11:55:10 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Fri Sep 13 11:55:10 2013 -0500

--
 CHANGES.txt|  1 +
 .../apache/cassandra/metrics/StorageMetrics.java   |  3 +++
 .../apache/cassandra/service/CassandraDaemon.java  |  5 ++---
 .../org/apache/cassandra/service/StorageProxy.java | 17 -
 .../apache/cassandra/service/StorageService.java   |  3 ++-
 .../cassandra/service/StorageServiceMBean.java |  1 +
 6 files changed, 17 insertions(+), 13 deletions(-)
--


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

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

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

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

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-13 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 02eacf93a518636802dfb16ad1b45fa1a5b61e7b
Parents: 19c9a1e ab7fed6
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Sep 13 13:54:05 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Sep 13 13:54:05 2013 -0500

--
 src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02eacf93/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
--

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-12 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 3634eab1dec4be2e403822d3d1f3ef85907e89fe
Parents: f3430d3 c788117
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Sep 12 20:25:26 2013 +0200
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Sep 12 20:25:26 2013 +0200

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


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-10 Thread brandonwilliams

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 7246502e7f6cd1e98b5199412541b621d7f12ffa
Parents: 3822612 678aa37
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Sep 10 13:45:13 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Sep 10 13:45:13 2013 -0500

--
 CHANGES.txt |  1 +
 .../hadoop/pig/AbstractCassandraStorage.java| 78 +++-
 .../apache/cassandra/hadoop/pig/CqlStorage.java | 78 +++-
 3 files changed, 135 insertions(+), 22 deletions(-)
--


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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-09 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 3b8690db5e78e3c8bec6f07a2c9a151212412a70
Parents: 5fd4631 ce9d303
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Sep 9 08:57:52 2013 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Sep 9 08:57:52 2013 +0100

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-05 Thread jbellis

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: a6f03617860453f7658980f3f11d6f448c163f31
Parents: a9005cb 85be04b
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Sep 5 11:04:42 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Sep 5 11:04:42 2013 -0500

--

--

1 2 >

1 - 100 of 111 matches

Mail list logo