[9/9] git commit: merge

2014-08-07 Thread jbellis 
merge


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

Branch: refs/heads/trunk
Commit: 56141aee857eb81109531b92029bd827e6976d76
Parents: f95b40c 46193d7
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Aug 7 09:27:54 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Aug 7 09:27:54 2014 -0500

--

--

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

2014-08-06 Thread brandonwilliams 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 94cfec89b8bf9401a7f4f1b49d59679e4c50f598
Parents: 774f3ac 7fc89ad
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Aug 6 09:08:42 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Aug 6 09:08:42 2014 -0500

--
 CHANGES.txt  |  2 ++
 .../cassandra/hadoop/cql3/CqlInputFormat.java| 19 +++
 2 files changed, 13 insertions(+), 8 deletions(-)
--


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

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

2014-07-25 Thread jbellis 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: aa25f67eaff3b620d635a07e1f6b60466dac3c10
Parents: 6477fa9 ef9473a
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Jul 25 17:26:05 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Jul 25 17:26:05 2014 -0500

--
 CHANGES.txt|   1 +
 bin/cassandra-cli.bat  |  21 +-
 bin/cassandra-shuffle.bat  |  20 +-
 bin/cassandra.bat  |   3 +-
 bin/cassandra.ps1  | 839 
 bin/cqlsh.bat  |  68 +--
 bin/debug-cql.bat  | 100 ++---
 bin/nodetool.bat   |  20 +-
 bin/source-conf.ps1| 114 ++---
 bin/sstablekeys.bat|  26 +-
 bin/sstableloader.bat  | 102 ++---
 bin/sstablescrub.bat   | 102 ++---
 bin/sstableupgrade.bat | 102 ++---
 bin/stop-server.bat| 110 ++---
 bin/stop-server.ps1| 356 +++
 conf/cassandra-env.ps1 | 648 ++--
 tools/bin/cassandra-stress.bat |  21 +-
 tools/bin/json2sstable.bat |  25 +-
 tools/bin/sstable2json.bat |  25 +-
 tools/bin/sstablemetadata.bat  |  15 +-
 tools/bin/sstablesplit.bat | 102 ++---
 21 files changed, 1435 insertions(+), 1385 deletions(-)
--


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

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

2014-06-19 Thread yukim 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 65b19cae328d61b73fd7b0a12d7b107acd29e704
Parents: 7d8ba3b 40f8eba
Author: Yuki Morishita yu...@apache.org
Authored: Thu Jun 19 11:33:34 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Thu Jun 19 11:33:34 2014 -0500

--
 .../apache/cassandra/db/RangeTombstoneList.java |  2 +
 .../cassandra/service/ActiveRepairService.java  |  3 -
 .../cassandra/service/StorageService.java   | 64 +++-
 .../org/apache/cassandra/tools/NodeTool.java|  3 +
 4 files changed, 54 insertions(+), 18 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/65b19cae/src/java/org/apache/cassandra/tools/NodeTool.java
--

[9/9] git commit: merge from 2.1

2014-05-28 Thread jbellis 
merge from 2.1


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

Branch: refs/heads/trunk
Commit: 3e91cb6d75974159342ab6f16f66bb3a70106606
Parents: fc7ccb8 4a65256
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed May 28 11:52:45 2014 +0200
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed May 28 11:52:45 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e91cb6d/src/java/org/apache/cassandra/service/ClientState.java
--

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

2014-05-02 Thread jbellis 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b8c0199c33567184043afeff83924a313e69d22f
Parents: a44ba68 8e897de
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri May 2 22:49:44 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri May 2 22:49:44 2014 -0500

--
 CHANGES.txt |   4 +-
 build.xml   |   2 +
 .../service/BatchlogEndpointSelector.java   | 110 ++
 .../apache/cassandra/service/StorageProxy.java  |  21 +---
 .../service/BatchlogEndpointSelectorTest.java   | 116 +++
 5 files changed, 236 insertions(+), 17 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8c0199c/build.xml
--
diff --cc build.xml
index 1f67aa3,898b141..8b47e4e
--- a/build.xml
+++ b/build.xml
@@@ -190,9 -190,10 +190,10 @@@
  target name=gen-cli-grammar depends=check-gen-cli-grammar 
unless=cliUpToDate
echoBuilding Grammar ${build.src.java}/org/apache/cassandra/cli/Cli.g 
 /echo
java classname=org.antlr.Tool
 -classpath=${build.lib}/antlr-3.2.jar
 +
classpath=${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/stringtemplate-4.0.2.jar
  fork=true
  failonerror=true
+  jvmarg value=-Xmx512M /
   arg value=${build.src.java}/org/apache/cassandra/cli/Cli.g /
   arg value=-fo /
   arg value=${build.src.gen-java}/org/apache/cassandra/cli/ /
@@@ -211,9 -217,21 +212,10 @@@
  target name=gen-cql3-grammar depends=check-gen-cql3-grammar 
unless=cql3current
echoBuilding Grammar 
${build.src.java}/org/apache/cassandra/cql3/Cql.g  .../echo
java classname=org.antlr.Tool
 -classpath=${build.lib}/antlr-3.2.jar
 +
classpath=${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/stringtemplate-4.0.2.jar
  fork=true
  failonerror=true
+  jvmarg value=-Xmx512M /
   arg value=-Xconversiontimeout /
   arg value=1 /
   arg value=${build.src.java}/org/apache/cassandra/cql3/Cql.g /

[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.1' into trunk

2014-03-25 Thread jbellis 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b96adb995efeda8c21c3fb7983a016a7e0819f79
Parents: e03a256 0cd1769
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Mar 25 13:28:58 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Mar 25 13:28:58 2014 -0500

--
 conf/cassandra.yaml | 60 
 1 file changed, 25 insertions(+), 35 deletions(-)
--

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

2014-03-24 Thread yukim 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 5f6e780d8bde7c88960e05e8f96192762137bc4c
Parents: 6838790 874a341
Author: Yuki Morishita yu...@apache.org
Authored: Mon Mar 24 07:55:11 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Mon Mar 24 07:55:11 2014 -0500

--

--

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

2014-03-21 Thread jbellis 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 0493da933d272ece0c46a9f646ea096c48706ead
Parents: e2bef98 fdae99d
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Mar 21 21:52:07 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Mar 21 21:52:07 2014 -0500

--
 CHANGES.txt |  1 +
 .../apache/cassandra/service/ReadCallback.java  | 20 ++--
 .../apache/cassandra/service/StorageProxy.java  |  3 ++-
 3 files changed, 9 insertions(+), 15 deletions(-)
--


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

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

2014-03-21 Thread jbellis 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 699189f197ec93606492d03d93917884471bc216
Parents: 0493da9 2574f05
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Mar 21 22:00:26 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Mar 21 22:00:26 2014 -0500

--
 src/java/org/apache/cassandra/db/DataTracker.java | 6 ++
 1 file changed, 6 insertions(+)
--

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

2014-03-04 Thread jbellis 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c946cbf18c7eac60062acc75d8d4c5c412ffdd8a
Parents: 9eb01ae 0851fd7
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Mar 4 17:10:48 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Mar 4 17:10:48 2014 -0600

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


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

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

2014-02-28 Thread jbellis 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 3c186bef82e61331951b79df4cce05c0a0f11ebb
Parents: b23d6ba b41eb4a
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Feb 28 10:08:36 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Feb 28 10:08:36 2014 -0600

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


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

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

2014-02-17 Thread yukim 
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: c9a4bffee6b76fe340695403886ae18027972bf9
Parents: 73dcdbd 4b50b2b
Author: Yuki Morishita yu...@apache.org
Authored: Mon Feb 17 11:12:38 2014 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Mon Feb 17 11:12:38 2014 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9a4bffe/CHANGES.txt
--
diff --cc CHANGES.txt
index d9d0f20,bdfec11..d7bc77e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -62,8 -25,8 +62,9 @@@ Merged from 1.2
   * Use real node messaging versions for schema exchange decisions 
(CASSANDRA-6700)
   * IN on the last clustering columns + ORDER BY DESC yield no results 
(CASSANDRA-6701)
   * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
+  * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713)
  
 +
  2.0.5
   * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
   * Add ks.cf names to tombstone logging (CASSANDRA-6597)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9a4bffe/src/java/org/apache/cassandra/repair/RepairJob.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 remote-tracking branch 'origin/trunk' into trunk

2013-11-20 Thread jbellis 
Merge remote-tracking branch 'origin/trunk' into trunk


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

Branch: refs/heads/trunk
Commit: 256da638594d84010a1cb5131db0c05cfce2d1eb
Parents: ac3afd3 03e3d15
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Nov 20 20:57:54 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Nov 20 20:57:54 2013 -0600

--
 .../cassandra/db/ColumnFamilyStoreTest.java | 56 +++-
 1 file changed, 20 insertions(+), 36 deletions(-)
--

[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 from 2.0

2013-10-13 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 2531424c0050196512b3f8f785f9041eab1c2ef3
Parents: ca7ba14 53b2d9d
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Oct 13 11:13:55 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Oct 13 11:13:55 2013 -0500

--
 CHANGES.txt  |  1 +
 .../org/apache/cassandra/config/CFMetaData.java  | 10 --
 .../apache/cassandra/db/ColumnFamilyStore.java   |  8 ++--
 .../AbstractSimplePerColumnSecondaryIndex.java   | 19 ---
 .../org/apache/cassandra/utils/StatusLogger.java |  2 +-
 5 files changed, 12 insertions(+), 28 deletions(-)
--


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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2531424c/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.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 from 2.0

2013-09-24 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 3a9120bbd9318b9cc8c647920bfb0d348fcf104c
Parents: 2fea9fa a06a138
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Sep 24 20:51:26 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Sep 24 20:51:26 2013 -0500

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/db/Memtable.java | 4 +---
 src/java/org/apache/cassandra/utils/Allocator.java | 2 --
 src/java/org/apache/cassandra/utils/HeapAllocator.java | 5 -
 src/java/org/apache/cassandra/utils/SlabAllocator.java | 8 
 5 files changed, 2 insertions(+), 18 deletions(-)
--


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

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

[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(-)
--

[9/9] git commit: Merge remote-tracking branch 'origin/trunk' into trunk

2013-06-06 Thread jbellis 
Merge remote-tracking branch 'origin/trunk' into trunk


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

Branch: refs/heads/trunk
Commit: 2e9f51d16d29782b55aa2b9a10b23849c01b9a61
Parents: c1dfc8f 6da1cbb
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Jun 6 17:01:02 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Jun 6 17:01:02 2013 -0500

--
 .../cassandra/thrift/TFramedTransportFactory.java  |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
--

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

2013-01-25 Thread brandonwilliams 
Updated Branches:
  refs/heads/cassandra-1.1 9c8d94930 - 3298c2f19
  refs/heads/cassandra-1.2 8540974db - f4a941e49
  refs/heads/trunk 6a15bb37b - b7ba0a917


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: b7ba0a917736088c2c6e94396487d28008f71b18
Parents: 6a15bb3 f4a941e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jan 25 14:27:44 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jan 25 14:27:44 2013 -0600

--
 CHANGES.txt|4 +++
 build.xml  |2 +-
 debian/changelog   |6 +
 .../cassandra/io/util/PoolingSegmentedFile.java|   17 +++
 .../apache/cassandra/thrift/ThriftValidation.java  |2 +-
 .../apache/cassandra/utils/SemanticVersion.java|2 +-
 .../cassandra/utils/SemanticVersionTest.java   |2 +-
 7 files changed, 31 insertions(+), 4 deletions(-)
--


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

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

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