This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e74bd9fa264b863ccc5221020b8aa7ec4b70406e
Merge: fa9bbd4 f293376
Author: David Capwell <dcapw...@apache.org>
AuthorDate: Thu Nov 5 14:43:54 2020 -0800
Merge branch 'cassandra-2.2' into cassandra-3.0
.../cassandra/config/YamlConfigurationLoader.java | 4 +++-
.../cassandra/distributed/impl/InstanceConfig.java | 20 +++++++++++++++-----
2 files changed, 18 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
