* release/1.5.0:
  upgraded dependencies;
  upgraded version to 1.5.0.RELEASE;
  initialized the release 1.5.0 branch ;
  upgraded the version of parent project and the submodule projects;
  upgraded utils;

# Conflicts:
#	core
#	libs/bft-smart
#	libs/httpservice
#	libs/utils
#	samples/pom.xml
#	test

* master:
  upgraded the version of parent project and the submodule projects;
  upgraded utils;

# Conflicts:
#	core
#	deploy/pom.xml
#	framework
#	libs/bft-smart
#	libs/utils
#	samples/pom.xml
#	test

* master:
  upgraded core and framework;
  fixed bugs that no error detail is displayed while error occurred;

# Conflicts:
#	deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java

* commit '61ad0cd7bf5dd3d69e5c6b4cf358f1f08f651de4':
  gateway
  upgraded submodules;
  upgraded submodules;
  upgraded submodules and fixed bugs;
  upgraded submodules;
  refactored BlockchainQueryService;
  upgraded utils;
  update samples
  upgraded core module;
  upgraded explorer and utils;

* master:
  upgraded submodules;
  upgraded versions of modules;
  upgraded submodules;
  unified public key format
  upgraded framework, core and utils;

# Conflicts:
#	core
#	deploy/pom.xml
#	samples/pom.xml
#	test

* commit '5a895f61620c0666ac274b40764f57897c015ed2':
  add docker-sdk;
  add the docker's module to optimize the constructure of docker-demo;
  update the log4j2.xml;
  add docker-sdk;
  add docker-sdk;
  modify the md for: how to generate the image;
  check the zip and sdk.jar;
  add the dos2unix for win;
  add docker-sdk;
  add docker-sdk;
  add docker-sdk;
  add the docker-demo submodule;

* commit 'd3a7ebbf92742c26130447388c873256bc0dc438': (35 commits)
  fix sdk compile error
  fix merge develop code , compile error!
  update headers
  add auto node shell
  update header
  cancel sender thread config
  update headers
  update headers
  update headers
  update peer-startup.sh and headers
  modify consensus config file ,write state transfer log to disk
  update headers
  update headers
  update headers
  update headers
  update headers
  update headers
  update headers
  update headers
  modify shell of startup and shutdown
  ...

# Conflicts:
#	core
#	deploy/deploy-peer/src/main/resources/config/init/bftsmart.config
#	explorer
#	framework
#	test

* release/1.4.0:
  upgraded bft-mart module;
  upgraded version of core module and bft-smart module;
  modify sdk version,  compile, import package error
  optimized the default values of bftsmart.config;
  upgraded version of kvdb;
  upgraded versions of submodules;
  upgraded the version of core;
  upgraded version to 1.4.0.RELEASE;
  fix deactive node command line  error
  fix shell error
  modify version to 1.4.0 release, and add miss code
  init release 1.4.0;
  Update repo.sh
  Update repo.sh Fix remote config error in the first time.
  Renamed the types in ledger database for more appropriate expression;
  completed extracting crypto data types as interface;
  upgraded framework and core;
  updated framework;

# Conflicts:
#	deploy/deploy-peer/src/main/resources/scripts/active-parti.sh
#	deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh
#	explorer
#	samples/pom.xml
#	samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Tx_Persistance.java
#	samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_InsertData_Demo.java
#	samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_Contract_Test.java
#	samples/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java

* commit '388d9723af8b0308a730587b49529cd3ef84729c':
  modify sdk version,  compile, import package error
  fix deactive node command line  error

* 'feature/JIRA_399_gw2peer_networks' of git.jd.com:jd-blockchain/jdchain:
  update headers
  update headers
  update headers
  update peer-startup.sh and headers