Repository: cassandra
Updated Branches:
refs/heads/trunk 9ffb19569 - e48a00b6d
return all cpu values from BackgroundActivityMonitor.readAndCompute
patch by dbrosius reviewed by jbellis for cassandra-7183
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
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/e48a00b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e48a00b6
Diff:
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/e241319b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e241319b
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 5045d3ea8 - a16adba9b
fix cassandra stress errors on reads with native protocol
patch by belliottsmith; reviewed by jasobrown for CASSANDRA-7033
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git
Repository: cassandra
Updated Branches:
refs/heads/trunk 15e7ac7d3 - 5bbc54fe7
merged cassandra-2.1 to trunk (for CASSANDRA-7033)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5bbc54fe
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 97a6e36bc - d41c07572
Non-droppable verbs shouldn't be dropped from OTC
patch by jasobrown; reviewed by Richard Low for CASSANDRA-6980
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip
Merge remote-tracking branch 'apache/cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47ace44e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47ace44e
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 e99868ba6 - 47ace44e1
Non-droppable verbs shouldn't be dropped from OTC
patch by jasobrown; reviewed by Richard Low for CASSANDRA-6980
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/net/OutboundTcpConnection.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66b3b2bf
Tree:
Merge remote-tracking branch 'apache/cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47ace44e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47ace44e
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 76db70e9d - 66b3b2bf0
Non-droppable verbs shouldn't be dropped from OTC
patch by jasobrown; reviewed by Richard Low for CASSANDRA-6980
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip
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/bd961f3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd961f3f
Diff:
Merge remote-tracking branch 'apache/cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47ace44e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47ace44e
Diff:
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/net/OutboundTcpConnection.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66b3b2bf
Tree:
Repository: cassandra
Updated Branches:
refs/heads/trunk f1d5bf136 - bd961f3fa
Non-droppable verbs shouldn't be dropped from OTC
patch by jasobrown; reviewed by Richard Low for CASSANDRA-6980
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org
fix minor compilation problem on CFS
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/811de14e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/811de14e
Diff:
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
.rat-excludes
build.xml
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d70cf3b
Tree:
Fix IllegalArgumentException during statement preparation
patch by slebresne; reviewed by thobbs for CASSANDRA-6592
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8a12d9e
Tree:
Fix typo in changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df86e8fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df86e8fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df86e8fb
6503 followup, make sure we send CompleteMessage when streaming is done.
Patch by yukim, reviewed by marcuse for CASSANDRA-6503
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1141cdb0
Tree:
Switch stress to use ITransportFactory
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6641
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7b23cc7
Tree:
Updated Branches:
refs/heads/trunk 4b54b8acd - 811de14ec
sstables from stalled repair sessions become live after a reboot and can
resurrect deleted data
patch by jasobrown, reviewed by yukim for CASSANDRA-6503
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git
Update versions and licenses for 1.2.14 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a931440
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a931440
Diff:
Improve CQL3 documentation section on COMPACT STORAGE (CASSANDRA-6642)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4cb045a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4cb045a5
Diff:
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6a7a5be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6a7a5be
Diff:
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
tools/stress/src/org/apache/cassandra/stress/Session.java
Project:
Updated Branches:
refs/heads/cassandra-1.2 852e27f2e - 6ad995e8f
sstables from stalled repair sessions become live after a reboot and can
resurrect deleted data
patch by jasobrown, reviewed by yukim for CASSANDRA-6503
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit
Updated Branches:
refs/heads/cassandra-2.0 81fcc33d9 - b5a2b6507
sstables from stalled repair sessions become live after a reboot and can
resurrect deleted data
patch by jasobrown, reviewed by yukim for CASSANDRA-6503
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5a2b650
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5a2b650
Diff:
Updated Branches:
refs/heads/trunk b5a3303f3 - 00fc31868
sstables from stalled repair sessions become live after a reboot and can
resurrect deleted data
patch by jasobrown, reviewed by yukim for CASSANDRA-6503
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5a2b650
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5a2b650
Diff:
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/00fc3186
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00fc3186
Diff:
Updated Branches:
refs/heads/cassandra-2.0 b5a2b6507 - 36af40925
sstables from stalled repair sessions become live after a reboot and can
resurrect deleted data
patch by jasobrown, reviewed by yukim for CASSANDRA-6503
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit
Updated Branches:
refs/heads/cassandra-1.2 b78617b22 - 3de845426
skip blocking on streaming during drain
patch by jasobrown; reviewed by yukim for CASSANDRA-6603
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit
skip blocking on streaming during drain
patch by jasobrown; reviewed by yukim for CASSANDRA-6603
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3de84542
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree
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/4e9d1aca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e9d1aca
Diff:
Updated Branches:
refs/heads/trunk f64283569 - 4e9d1aca0
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24af3525
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24af3525
Diff:
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/886ac6ad
Tree:
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24af3525
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24af3525
Diff:
Updated Branches:
refs/heads/cassandra-2.0 886ac6adc - 24af3525f
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
skip blocking on streaming during drain
patch by jasobrown; reviewed by yukim for CASSANDRA-6603
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3de84542
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree
Updated Branches:
refs/heads/cassandra-1.2 13348c47a - 1b4c9b45c
ninja-correcting the the constant for LOCAL_ONE.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b4c9b45
Tree:
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3bd65965
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bd65965
Diff:
Updated Branches:
refs/heads/cassandra-2.0 22d87444c - 09c7dee25
ninja-correcting the the constant for LOCAL_ONE.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b4c9b45
Tree:
ninja-correcting the the constant for LOCAL_ONE in v2 of the native_protocol
doc.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09c7dee2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09c7dee2
Diff:
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3bd65965
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bd65965
Diff:
ninja-correcting the the constant for LOCAL_ONE in v2 of the native_protocol
doc.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09c7dee2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09c7dee2
Diff:
Updated Branches:
refs/heads/trunk 6e6730d87 - 216139ff6
ninja-correcting the the constant for LOCAL_ONE.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b4c9b45
Tree:
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/216139ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/216139ff
Diff:
Updated Branches:
refs/heads/trunk c550cc829 - fdbddc132
Batch read from OTC's queue and cleanup
patch by jasorown and belliotsmith for CASSANDRA-1632
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdbddc13
Tree:
Updated Branches:
refs/heads/cassandra-1.2 8c2404493 - e5715f4e9
Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleStrategy
patch by Alex Liu; reviewed by jasobrown for CASSANDRA-6238
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/db/ConsistencyLevel.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e9906e6
Tree:
Updated Branches:
refs/heads/cassandra-2.0 b4020979c - 0e9906e6d
Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleStrategy
patch by Alex Liu; reviewed by jasobrown for CASSANDRA-6238
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf
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/c2bd0d8d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2bd0d8d
Diff:
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/db/ConsistencyLevel.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e9906e6
Tree:
Updated Branches:
refs/heads/trunk c65c15cc0 - c2bd0d8d1
Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleStrategy
patch by Alex Liu; reviewed by jasobrown for CASSANDRA-6238
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf
Updated Branches:
refs/heads/cassandra-1.2 e655d62a4 - 5c0c84b3d
implementing CL.LOCAL_ONE
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c0c84b3
Tree:
add update cql-internal-only zip
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/20d91b0b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20d91b0b
Diff:
apply local_one changes to 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9528f9c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9528f9c
Diff:
Updated Branches:
refs/heads/cassandra-2.0 886f16ca1 - 20d91b0ba
implementing CL.LOCAL_ONE
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a0f26c1
Tree:
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0590c44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0590c44
Diff:
Merge branch '6202' into 6202_2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8b56c97
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8b56c97
Diff:
implementing CL.LOCAL_ONE
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c0c84b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c0c84b3
Diff:
Merge branch '6202_2.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23a530c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23a530c6
Diff:
Updated Branches:
refs/heads/trunk 4e53d1e75 - 231b345ff
implementing CL.LOCAL_ONE
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a0f26c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a0f26c1
add update cql-internal-only zip
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/20d91b0b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20d91b0b
Diff:
implementing CL.LOCAL_ONE
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c0c84b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c0c84b3
Diff:
apply local_one changes to 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9528f9c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9528f9c
Diff:
Merge branch '6202_2.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23a530c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23a530c6
Diff:
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0590c44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0590c44
Diff:
Merge branch '6202' into 6202_2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8b56c97
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8b56c97
Diff:
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/231b345f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/231b345f
Diff:
Updated Branches:
refs/heads/cassandra-1.2 5c0c84b3d - bcb9edcf5
updated news and changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcb9edcf
Tree:
Updated Branches:
refs/heads/cassandra-2.0 20d91b0ba - a15d57b7d
updated news and changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcb9edcf
Tree:
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
NEWS.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a15d57b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a15d57b7
Diff:
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/712615e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/712615e7
Diff:
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
NEWS.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a15d57b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a15d57b7
Diff:
Updated Branches:
refs/heads/trunk 231b345ff - 712615e71
updated news and changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcb9edcf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcb9edcf
Diff:
Updated Branches:
refs/heads/cassandra-1.2 ec673ac99 - 88bc4f237
compile stress classes with debug symbols (so you can see the line numbers on
stack traces)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Updated Branches:
refs/heads/trunk 532db4d24 - 98214bb6a
compile stress classes with debug symbols (so you can see the line numbers on
stack traces)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88bc4f23
Tree:
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/98214bb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98214bb6
Diff:
Updated Branches:
refs/heads/cassandra-1.2 5c2895881 - 579ed75c0
updating NEWS.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/579ed75c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/579ed75c
Merge branch 'cassandra-1.2' into trunk
Conflicts:
NEWS.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ab0db29
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ab0db29
Diff:
Updated Branches:
refs/heads/trunk 4cdd75a58 - 0ab0db292
updating NEWS.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/579ed75c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/579ed75c
Diff:
Updated Branches:
refs/heads/cassandra-1.2 1a4942583 - ba274adb7
nodetool history logging
patch by jasobrown; reviewed by Dave Brosius for CASSANDRA-5823
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba274adb
Updated Branches:
refs/heads/trunk 22bf2c40e - e01c238fa
nodetool history logging
patch by jasobrown; reviewed by Dave Brosius for CASSANDRA-5823
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba274adb
Tree: http
Merge branch 'cassandra-1.2' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/tools/NodeCmd.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e01c238f
Tree:
Updated Branches:
refs/heads/cassandra-1.2 97bc9c7e2 - 94d7cb411
Allow compacting 2Is via nodetool
patch by jasobrown; reviewed by jbellis for CASSANDRA-5670
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit
Updated Branches:
refs/heads/trunk 181f3736c - 968f6471a
changes.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/968f6471
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/968f6471
Diff:
Updated Branches:
refs/heads/trunk 626b0783c - 47ac42fdb
Expire entries out of ThriftSessionManager (round two, for THsHaDisruptorServer
on trunk)
patch by jasobrown; reviewed by jbellis for CASSANDRA-5719
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip
Updated Branches:
refs/heads/cassandra-1.2 56c9d2ff2 - cc9ac8277
Expire entries out of ThriftSessionManager
patch by jasobrown; reviewed by jbellis for CASSANDRA-5719
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/377da747
Tree:
Updated Branches:
refs/heads/trunk 8e003d842 - 377da747b
Expire entries out of ThriftSessionManager
patch by jasobrown; reviewed by jbellis for CASSANDRA-5719
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit
Updated Branches:
refs/heads/trunk 03ff26874 - ff339c58c
Refactor IESCS in Snitches, (part 2 - rework YFNTS)
patch by jasobrown; reviewed by jbellis for CASSANDRA-5681
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra
Updated Branches:
refs/heads/trunk 39355875f - e22de4316
Update scrub for single-pass compaction format
patch by jasobrown; reviewed by slebresne for CASSANDRA-5429
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit
Updated Branches:
refs/heads/cassandra-1.2 9668535de - 296da81fc
Race condition in detecting version on a mixed 1.1/1.2 cluster
patch by Sergio Bossa; reviewed by jasobrown for CASSANDRA-5692
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org
Updated Branches:
refs/heads/trunk b1f3fc00f - 4cda3622d
Race condition in detecting version on a mixed 1.1/1.2 cluster
patch by Sergio Bossa; reviewed by jasobrown for CASSANDRA-5692
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/net/OutboundTcpConnection.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4cda3622
Tree:
Updated Branches:
refs/heads/cassandra-1.2 296da81fc - 9837173d8
changes.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9837173d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9837173d
Diff:
801 - 900 of 959 matches
Mail list logo