Repository: cassandra
Updated Branches:
refs/heads/trunk 619954cd5 -> 113ba2a53
Fix merge error at 619954cd5cd2a4d41a95eef7c95fdca6333fb5d8
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/113ba2a5
Tree:
fix merge left-over
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/858cb25a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/858cb25a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/858cb25a
fix merge left-over
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/858cb25a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/858cb25a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/858cb25a
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 0e9e0a4a8 -> 858cb25a0
refs/heads/cassandra-3.X c5c7f82db -> dfd8dcf72
refs/heads/trunk 5ce08a728 -> 18f28c517
fix merge left-over
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.3 597729d9d -> dba2e16c9
fix merge issue
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dba2e16c
Tree:
Repository: cassandra
Updated Branches:
refs/heads/trunk 0c82f977a -> 6148f5214
fix merge issue
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dba2e16c
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 ebe18bb2f - 0f5dd225d
refs/heads/trunk a8bb75a7e - 9423109de
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f5dd225
Tree:
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f5dd225
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f5dd225
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f5dd225
Branch:
Repository: cassandra
Updated Branches:
refs/heads/trunk f698cc228 - 8f4c43db0
fix merge issue with ColumnInfo name change
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f4c43db
Tree:
Repository: cassandra
Updated Branches:
refs/heads/trunk b09e39295 - 1b0a59e2a
Fix merge from CASSANDRA-8359
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ba5f272
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 52191ebe3 - 0ba5f2721
Fix merge from CASSANDRA-8359
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ba5f272
Tree:
Repository: cassandra
Updated Branches:
refs/heads/trunk e473ce066 - 034e0179b
fix merge(s)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/034e0179
Tree:
Repository: cassandra
Updated Branches:
refs/heads/trunk a4221b721 - 7376f42fc
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7376f42f
Tree:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a167ea2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a167ea2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a167ea2
Branch:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 15c92c386 - 2a167ea21
refs/heads/trunk 51293ed08 - bd04feb65
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a167ea2
Tree:
Fix merge on test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6c9c35c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6c9c35c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6c9c35c
Repository: cassandra
Updated Branches:
refs/heads/trunk 6770d0ff8 - 50c27cca4
fix merge issue
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50c27cca
Tree:
fix merge of 7519
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a44d641e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a44d641e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a44d641e
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 77d0c1757 - a44d641e8
refs/heads/trunk eec381e0d - f203f0f3f
fix merge of 7519
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a44d641e
Tree:
Repository: cassandra
Updated Branches:
refs/heads/trunk fafcfc787 - da3fd5d7a
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da3fd5d7
Tree:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cde56662
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cde56662
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cde56662
Branch:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 3da7d9e25 - 40d7bdf80
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cde56662
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 c4d23e168 - cde566629
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cde56662
Tree:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc276fb1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc276fb1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc276fb1
Branch:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9baae7b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9baae7b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9baae7b8
Branch:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9baae7b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9baae7b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9baae7b8
Branch:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc276fb1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc276fb1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc276fb1
Branch:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 be79ba500 - cc276fb19
refs/heads/cassandra-2.1 30d3623bc - 9baae7b80
refs/heads/trunk 3aa030593 - 7765e0e41
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 e0502ea29 - f64dc4527
fix merge-created bad map key lookup type
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f64dc452
Tree:
Repository: cassandra
Updated Branches:
refs/heads/trunk deee02c53 - f5c54aac9
fix merge-created bad map key lookup type
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f64dc452
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 94f25ce15 - 82be86a56
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82be86a5
Tree:
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82be86a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82be86a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82be86a5
Branch:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47675ce7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47675ce7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47675ce7
Branch:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 e0718bcdf - 47675ce75
refs/heads/trunk 5011437b1 - 572731247
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47675ce7
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 e4437bc18 - 043953127
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04395312
Tree:
Repository: cassandra
Updated Branches:
refs/heads/trunk e80564f39 - 2c8100af2
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04395312
Tree:
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34235ad7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34235ad7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34235ad7
Branch:
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a5ebd6a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a5ebd6a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a5ebd6a
Branch:
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1334f94e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1334f94e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1334f94e
Branch:
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1334f94e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1334f94e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1334f94e
Branch:
Updated Branches:
refs/heads/cassandra-2.0 ab4cc9c00 - f15681b67
refs/heads/trunk a13c6dcbb - f15d6d591
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f15681b6
Tree:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f15681b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f15681b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f15681b6
Branch:
Updated Branches:
refs/heads/trunk a9d64ef86 - 6bcf28edc
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bcf28ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bcf28ed
Diff:
Updated Branches:
refs/heads/cassandra-2.0 ff5db5635 - 99bef9dfe
refs/heads/trunk 8e0aa710d - 50b08f2b2
fix merge again
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99bef9df
Tree:
Updated Branches:
refs/heads/cassandra-2.0 cb585ef9e - 4dc5d690f
refs/heads/trunk 8ec455d84 - a9d64ef86
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4dc5d690
Tree:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4dc5d690
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dc5d690
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dc5d690
Branch:
Updated Branches:
refs/heads/trunk a57981650 - 53f7c328a
fix merge from #6132
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6154
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53f7c328
Tree:
Updated Branches:
refs/heads/trunk 53f7c328a - b77fdcc3d
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b77fdcc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b77fdcc3
Diff:
fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76cb10ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76cb10ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76cb10ca
fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76cb10ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76cb10ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76cb10ca
Updated Branches:
refs/heads/cassandra-2.0 096f2bf92 - 1ff0d8e9f
Fix merge (s//= in CompositesSearcher)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ff0d8e9
Tree:
Updated Branches:
refs/heads/trunk 36610aaf7 - 382261218
Fix merge (s//= in CompositesSearcher)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ff0d8e9
Tree:
Updated Branches:
refs/heads/trunk 4439b4117 - 385ce13f5
fix merge issues
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/385ce13f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/385ce13f
Diff:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/344f5fa5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/344f5fa5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/344f5fa5
Branch:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/317ab72a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/317ab72a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/317ab72a
Branch:
Updated Branches:
refs/heads/trunk 3a3f612f8 - 1af5865ed
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1af5865e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1af5865e
Diff:
Updated Branches:
refs/heads/cassandra-1.2 d7a098250 - 344f5fa5a
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/344f5fa5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/344f5fa5
Diff:
Updated Branches:
refs/heads/cassandra-1.2 344f5fa5a - 317ab72a8
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/317ab72a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/317ab72a
Diff:
Updated Branches:
refs/heads/trunk 0aaf67a74 - eba27a641
fix merge failure
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eba27a64
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eba27a64
Diff:
Updated Branches:
refs/heads/trunk a751d04d7 - 162675983
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16267598
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16267598
Diff:
Updated Branches:
refs/heads/trunk 7005a7808 - 0b20e139d
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b20e139
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b20e139
Diff:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4f36930
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4f36930
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4f36930
Branch:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4f36930
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4f36930
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4f36930
Branch:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4f36930
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4f36930
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4f36930
Branch:
Updated Branches:
refs/heads/trunk 94e37b4e4 - 989dd44c0
Fix merge wonkiness.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/989dd44c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/989dd44c
Diff:
fix merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66001665
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66001665
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66001665
fix merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66001665
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66001665
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66001665
fix merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66001665
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66001665
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66001665
Updated Branches:
refs/heads/trunk 8cf1259b3 - 565c57684
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/565c5768
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/565c5768
Diff:
Updated Branches:
refs/heads/trunk db2c2999d - 1b8c47524
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b8c4752
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b8c4752
Diff:
Updated Branches:
refs/heads/trunk f5c19e84a - 70754af41
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70754af4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70754af4
Diff:
fix merge from 1.1 to use UUID instead of Integer for CF identifier.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/655a76fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/655a76fa
Diff:
Updated Branches:
refs/heads/trunk 34cd6912b - 655a76fac
fix merge from 1.1 to use UUID instead of Integer for CF identifier.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/655a76fa
Tree:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b29f91d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b29f91d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b29f91d
Branch:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/06b24679
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06b24679
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06b24679
Branch:
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/06b24679
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06b24679
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06b24679
Branch:
Updated Branches:
refs/heads/trunk b3b510262 - b4e520c3b
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4e520c3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4e520c3
Diff:
Updated Branches:
refs/heads/trunk 7c92fc52e - bce44ff32
fix merge error; recompile Cassandra.java with thrift 0.7.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bce44ff3
Tree:
78 matches
Mail list logo