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:
15 matches
Mail list logo