1. 21 9月, 2017 5 次提交
  2. 20 9月, 2017 26 次提交
  3. 19 9月, 2017 9 次提交
    • T
      remove doc from main repo · 2fae396c
      terrymanu 提交于
      2fae396c
    • T
      remove example from main repo · 5575c468
      terrymanu 提交于
      5575c468
    • H
      Yaml configuration for master-slave 6th. · b1a505dc
      haocao 提交于
      b1a505dc
    • T
      Merge remote-tracking branch 'origin/master' into 2.0.0.M1 · b3de7e12
      terrymanu 提交于
      # Conflicts:
      #	pom.xml
      #	sharding-jdbc-config-parent/sharding-jdbc-config-common/pom.xml
      #	sharding-jdbc-config/pom.xml
      #	sharding-jdbc-config/sharding-jdbc-config-spring/pom.xml
      #	sharding-jdbc-config/sharding-jdbc-config-yaml/pom.xml
      #	sharding-jdbc-core/pom.xml
      #	sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/ShardingRule.java
      #	sharding-jdbc-example/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-config-spring-masterslave/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-config-spring/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-config-yaml/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-jdbc-masterslave/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-jdbc-transaction/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-jdbc/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-jpa/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-mybatis/pom.xml
      #	sharding-jdbc-plugin/pom.xml
      #	sharding-jdbc-transaction-parent/pom.xml
      #	sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/pom.xml
      #	sharding-jdbc-transaction-parent/sharding-jdbc-transaction-storage/pom.xml
      #	sharding-jdbc-transaction-parent/sharding-jdbc-transaction/pom.xml
      b3de7e12
    • H
      Yaml configuration for master-slave 5th. · 7b2ebb45
      haocao 提交于
      7b2ebb45
    • G
      9f91cb1c
    • T
      Merge remote-tracking branch 'origin/master' into 2.0.0.M1 · 5d1ccf59
      terrymanu 提交于
      # Conflicts:
      #	pom.xml
      #	sharding-jdbc-config-parent/sharding-jdbc-config-common/pom.xml
      #	sharding-jdbc-config/pom.xml
      #	sharding-jdbc-config/sharding-jdbc-config-spring/pom.xml
      #	sharding-jdbc-config/sharding-jdbc-config-yaml/pom.xml
      #	sharding-jdbc-core/pom.xml
      #	sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/ShardingRule.java
      #	sharding-jdbc-example/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-config-spring-masterslave/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-config-spring/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-config-yaml/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-jdbc-masterslave/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-jdbc-transaction/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-jdbc/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-jpa/pom.xml
      #	sharding-jdbc-example/sharding-jdbc-example-mybatis/pom.xml
      #	sharding-jdbc-plugin/pom.xml
      #	sharding-jdbc-transaction-parent/pom.xml
      #	sharding-jdbc-transaction-parent/sharding-jdbc-transaction-async-job/pom.xml
      #	sharding-jdbc-transaction-parent/sharding-jdbc-transaction-storage/pom.xml
      #	sharding-jdbc-transaction-parent/sharding-jdbc-transaction/pom.xml
      5d1ccf59
    • G
      ca11a18e
    • T
      fix #382 · d86edb81
      terrymanu 提交于
      d86edb81