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

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

Branch: refs/heads/trunk
Commit: 1c8e9e876186c285e8a5716d7739fd0b2487bc3e
Parents: aa002bf 05b2ae8
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Apr 2 16:47:06 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Apr 2 16:47:06 2014 -0500

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


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

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

2014-01-31 Thread brandonwilliams 
Merge branch 'cassandra-2.0' into trunk

Conflicts:
build.xml


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

Branch: refs/heads/trunk
Commit: 9d41638ab4ce9f49c5378c8a6b0eec10ddaec294
Parents: 5200d45 d76ad2e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jan 31 09:40:48 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jan 31 09:40:48 2014 -0600

--
 debian/changelog   | 6 ++
 src/java/org/apache/cassandra/service/StorageService.java  | 2 +-
 .../apache/cassandra/locator/DynamicEndpointSnitchTest.java| 2 +-
 test/unit/org/apache/cassandra/service/InitClientTest.java | 2 +-
 .../org/apache/cassandra/service/StorageServiceClientTest.java | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)
--


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

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

2013-10-22 Thread brandonwilliams 
Merge branch 'cassandra-2.0' into trunk

Conflicts:
build.xml


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

Branch: refs/heads/trunk
Commit: 4d82ac9d29a2f329fa7236704b06464430d53f76
Parents: 0bff97a 8a06958
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Oct 22 15:30:07 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Oct 22 15:30:07 2013 -0500

--
 .rat-excludes   |  1 +
 CHANGES.txt |  1 +
 NEWS.txt|  2 --
 debian/changelog|  6 ++
 examples/triggers/build.xml | 19 +++
 examples/triggers/conf/InvertedIndex.properties | 19 ++-
 .../org/apache/cassandra/config/CFMetaData.java |  2 +-
 .../cassandra/db/HintedHandOffManager.java  |  8 ++--
 .../filter/TombstoneOverwhelmingException.java  | 18 ++
 .../cassandra/io/sstable/SSTableReader.java | 10 --
 .../cassandra/metrics/RestorableMeter.java  | 20 +++-
 .../apache/cassandra/net/WriteCallbackInfo.java | 18 ++
 .../cassandra/service/MigrationManager.java |  5 -
 .../cassandra/pig/CqlTableDataTypeTest.java | 18 ++
 .../pig/ThriftColumnFamilyDataTypeTest.java | 18 ++
 15 files changed, 151 insertions(+), 14 deletions(-)
--


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

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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d82ac9d/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
--

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

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

Branch: refs/heads/trunk
Commit: 17c7e9486a3608b5507cc4718e25a9fbe1b2fbaf
Parents: ef39357 65b1e36
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Sep 30 13:53:47 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Sep 30 13:53:47 2013 -0500

--
 CHANGES.txt |   1 +
 .../apache/cassandra/locator/TokenMetadata.java | 109 ++-
 2 files changed, 85 insertions(+), 25 deletions(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: 4677e940f18d677b6bc6253ab906a3d09c9aa681
Parents: fc0cc0e 7f117da
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Sep 11 10:18:51 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Sep 11 10:18:51 2013 -0500

--
 .../hadoop/pig/AbstractCassandraStorage.java| 170 +++
 .../cassandra/hadoop/pig/CassandraStorage.java  |   8 +-
 .../apache/cassandra/hadoop/pig/CqlStorage.java |  10 +-
 3 files changed, 147 insertions(+), 41 deletions(-)
--

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

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

Branch: refs/heads/trunk
Commit: e3308a1641eea3ce6af9932db7f22ee526448825
Parents: 633cfbc dd13281
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Aug 14 11:36:52 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Aug 14 11:36:52 2013 -0500

--
 NEWS.txt| 10 ++--
 .../org/apache/cassandra/tools/NodeCmd.java | 48 ++--
 2 files changed, 31 insertions(+), 27 deletions(-)
--

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

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

Branch: refs/heads/trunk
Commit: feacf603799934fd40c7cc4670011843ebce5980
Parents: bcd6a6b 0fc15e5
Author: Yuki Morishita yu...@apache.org
Authored: Tue Aug 13 14:54:12 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Aug 13 14:54:12 2013 -0500

--
 doc/native_protocol_v2.spec | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--

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

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

Branch: refs/heads/trunk
Commit: cb349d9e7cb808796b1f65984c92ccae28e566d9
Parents: d9a64a4 839cc33
Author: Yuki Morishita yu...@apache.org
Authored: Mon Aug 12 11:12:39 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Mon Aug 12 11:12:39 2013 -0500

--
 .../cassandra/streaming/StreamManager.java  |  40 -
 .../cassandra/streaming/StreamManagerMBean.java |   6 +-
 .../management/ProgressInfoCompositeData.java   | 103 
 .../SessionCompleteEventCompositeData.java  |  71 
 .../management/SessionInfoCompositeData.java| 163 +++
 .../management/StreamEventJMXNotifier.java  |  88 ++
 .../management/StreamStateCompositeData.java| 102 
 .../management/StreamSummaryCompositeData.java  |  82 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  12 +-
 9 files changed, 660 insertions(+), 7 deletions(-)
--