This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 9660499 Merge branch 'cassandra-3.11' into trunk
new 4d1d024 jvm dtest is strict on properties which causes upgrade tests
to fail
new 22279a4 Merge branch 'cassandra-2.2' into cassandra-3.0
new 8ffa79f Merge branch 'cassandra-3.0' into cassandra-3.11
new 5373bd9 Merge branch 'cassandra-3.11' into trunk
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cassandra/config/YamlConfigurationLoader.java | 10 ++++++++--
.../apache/cassandra/distributed/Constants.java | 22 +++++++++-------------
.../cassandra/distributed/UpgradeableCluster.java | 1 +
.../distributed/impl/AbstractCluster.java | 4 ++--
.../cassandra/distributed/impl/Instance.java | 10 ++++++----
5 files changed, 26 insertions(+), 21 deletions(-)
copy src/java/org/apache/cassandra/batchlog/BatchlogManagerMBean.java =>
test/distributed/org/apache/cassandra/distributed/Constants.java (59%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
