Commit 093afed0 authored by junxiong's avatar junxiong
Browse files

Merge branch '2.0.0.M3-SNAPSHOT' of... 

Merge branch '2.0.0.M3-SNAPSHOT' of https://github.com/shardingjdbc/sharding-jdbc into sharding-jdbc-etcd

# Conflicts:
#	sharding-jdbc-orchestration/pom.xml
parents 1c4fa9b4 daab5351
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment