You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/09/11 11:43:39 UTC
[shardingsphere] branch master updated (b3c6885 -> 78d53ff)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from b3c6885 Merge pull request #7409 from terrymanu/dev
new d82f17c remove blank space
new 57cc663 refactor for #7229
new 2942e87 fix examples
new 78d53ff Merge pull request #7410 from kimmking/dev
The 26840 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:
.../content/features/encrypt/principle.cn.md | 12 +++++------
.../content/features/encrypt/principle.en.md | 12 +++++------
.../governance/management/config-center.cn.md | 4 ++--
.../governance/management/config-center.en.md | 4 ++--
.../shardingsphere-jdbc/configuration/props.cn.md | 10 ++++-----
.../shardingsphere-jdbc/configuration/props.en.md | 10 ++++-----
.../shardingsphere-jdbc/usage/sharding/hint.cn.md | 2 +-
.../shardingsphere-jdbc/usage/sharding/hint.en.md | 2 +-
.../shardingsphere-proxy/configuration/props.cn.md | 24 +++++++++++-----------
.../shardingsphere-proxy/configuration/props.en.md | 24 +++++++++++-----------
.../shardingsphere-proxy/usage/sctl.cn.md | 2 +-
.../shardingsphere-proxy/usage/sctl.en.md | 2 +-
.../sharding-proxy/sharding/conf/server.yaml | 14 ++++++-------
.../resources/META-INF/nacos/local/encrypt.yaml | 4 ++--
.../META-INF/nacos/local/master-slave.yaml | 2 +-
.../resources/META-INF/nacos/local/shadow.yaml | 2 +-
.../nacos/local/sharding-databases-tables.yaml | 2 +-
.../META-INF/zookeeper/local/encrypt.yaml | 4 ++--
.../META-INF/zookeeper/local/master-slave.yaml | 2 +-
.../resources/META-INF/zookeeper/local/shadow.yaml | 2 +-
.../zookeeper/local/sharding-databases-tables.yaml | 2 +-
.../application-local-nacos-encrypt.properties | 2 +-
.../application-local-nacos-shadow.properties | 2 +-
.../application-local-zookeeper-encrypt.properties | 2 +-
.../application-local-zookeeper-shadow.properties | 2 +-
.../META-INF/nacos/local/application-encrypt.xml | 2 +-
.../zookeeper/local/application-encrypt.xml | 2 +-
.../jdbc/config/EncryptDatabasesConfiguration.java | 2 +-
.../main/resources/META-INF/encrypt-databases.yaml | 2 +-
.../META-INF/application-encrypt-databases.xml | 2 +-
.../resources/META-INF/hint-databases-only.yaml | 2 +-
.../resources/META-INF/hint-databases-tables.yaml | 2 +-
.../main/resources/META-INF/hint-master-only.yaml | 2 +-
.../EncryptShadowDatabasesConfiguration.java | 5 +++--
.../ShardingShadowDatabasesConfiguration.java | 3 ++-
.../META-INF/encrypt-shadow-databases.yaml | 4 ++--
.../META-INF/master-slave-shadow-databases.yaml | 2 +-
.../META-INF/sharding-shadow-databases.yaml | 2 +-
...application-encrypt-shadow-databases.properties | 2 +-
.../application-encrypt-shadow-databases.xml | 4 ++--
.../application-master-slave-shadow-databases.xml | 2 +-
.../META-INF/application-shadow-databases.xml | 2 +-
.../application-sharding-shadow-databases.xml | 2 +-
...dingDatabasesAndTablesConfigurationPrecise.java | 4 ++--
.../src/main/resources/META-INF/master-slave.yaml | 2 +-
.../META-INF/sharding-databases-range.yaml | 2 +-
.../META-INF/sharding-databases-tables-range.yaml | 2 +-
.../META-INF/sharding-databases-tables.yaml | 2 +-
.../resources/META-INF/sharding-databases.yaml | 2 +-
.../META-INF/sharding-master-slave-range.yaml | 2 +-
.../resources/META-INF/sharding-master-slave.yaml | 2 +-
.../resources/META-INF/sharding-tables-range.yaml | 2 +-
.../main/resources/META-INF/sharding-tables.yaml | 2 +-
.../application-sharding-databases-tables.xml | 2 +-
.../META-INF/application-sharding-master-slave.xml | 2 +-
.../application-sharding-databases-tables.xml | 2 +-
.../META-INF/application-sharding-master-slave.xml | 2 +-
.../META-INF/application-sharding-tables.xml | 2 +-
.../META-INF/sharding-databases-tables.yaml | 2 +-
.../META-INF/sharding-databases-tables.yaml | 2 +-
.../sharding-databases-tables-postgresql.yaml | 2 +-
.../META-INF/sharding-databases-tables.yaml | 2 +-
.../xa/raw/jdbc/XAOrderServiceTest.java | 2 ++
.../sharding-databases-tables-postgresql.yaml | 2 +-
.../META-INF/sharding-databases-tables.yaml | 2 +-
.../application-sharding-databases-tables.xml | 2 +-
.../META-INF/application-sharding-tables.xml | 2 +-
.../META-INF/sharding-databases-tables.yaml | 2 +-
.../src/main/resources/conf/server.yaml | 20 +++++++++---------
.../src/main/resources/conf/server.yaml | 20 +++++++++---------
.../src/main/resources/conf/server.yaml | 20 +++++++++---------
.../resources/yaml/encrypt/query-with-cipher.yaml | 2 +-
.../resources/yaml/encrypt/query-with-plain.yaml | 2 +-
...ationsForYamlShardingRuleConfigurationTest.java | 3 ++-
.../src/test/resources/yaml/sharding-rule.yaml | 2 +-
.../test/resources/yaml/mix/query-with-cipher.yaml | 2 +-
.../test/resources/yaml/mix/query-with-plain.yaml | 2 +-
.../governance/core/config/ConfigCenterTest.java | 2 +-
.../listener/PropertiesChangedListenerTest.java | 6 ++++--
.../schema/GovernanceSchemaContextsTest.java | 5 +++--
.../properties/ConfigurationPropertyKey.java | 22 ++++++++++----------
.../test/resources/docker/proxy/conf/server.yaml | 18 ++++++++--------
.../src/test/resources/encrypt-config.yaml | 4 ++--
.../GovernanceShardingSphereDataSourceTest.java | 5 +++--
.../src/test/resources/yaml/unit/sharding.yaml | 2 +-
.../test/resources/application-common.properties | 4 ++--
.../META-INF/spring/application-context.xml | 4 ++--
.../src/test/resources/conf/conf.properties | 2 +-
.../GovernanceSpringBootRegistryEncryptTest.java | 3 ++-
.../GovernanceSpringBootRegistryShardingTest.java | 4 ++--
.../test/resources/application-encrypt.properties | 2 +-
.../test/resources/application-sharding.properties | 4 ++--
.../resources/META-INF/rdb/encryptGovernance.xml | 4 ++--
.../META-INF/rdb/masterSlaveGovernance.xml | 4 ++--
.../resources/META-INF/rdb/shardingGovernance.xml | 4 ++--
.../src/main/resources/conf/server.yaml | 20 +++++++++---------
.../src/test/resources/conf/server.yaml | 4 ++--
97 files changed, 226 insertions(+), 216 deletions(-)