V1.1.4 release (#539)

* v1.1.4_release

* v1.1.4_release

* remove - shengling2008

* update version

diff --git a/docs/release-notes/release-notes-1.1.4.md b/docs/release-notes/release-notes-1.1.4.md
new file mode 100644 (file)
index 0000000..94f8811
--- /dev/null
+++ b/docs/release-notes/release-notes-1.1.4.md
@@ -0,0 +1,39 @@
+Vapor version 1.1.4 is now available from:
+
+  https://github.com/Bytom/vapor/releases/tag/v1.1.4
+
+
+Please report bugs using the issue tracker at github:
+
+  https://github.com/Bytom/vapor/issues
+
+
+
+1.1.4 changelog
+================
+__Vapor Node__
+
++ `PR #538`
+    - Add the height interval of the next round of block rewards.
++ `PR #536`
+    - Support cross-chain of USDC and DAI.
++ `PR #535`
+    - Fix the bug when the trader only received 1 unit of assets during the match transaction and the magnet contract report error.
+
+
+Credits
+--------
+
+Thanks to everyone who directly contributed to this release:
+
+- Colt-Z
+- HAOYUatHZ
+- ipqhjjybj
+- langyu
+- Paladz
+- shenao78
+- oysheng
+- zcc0721
+- ZhitingLin
+
+And everyone who helped test.
\ No newline at end of file

diff --git a/version/version.go b/version/version.go
index 1af5b07..035be9a 100644 (file)
--- a/version/version.go
+++ b/version/version.go
@@ -47,7 +47,7 @@ const (
 
 var (
        // The full version string
-       Version = "1.1.3"
+       Version = "1.1.4"
        // GitCommit is set with --ldflags "-X main.gitCommit=$(git rev-parse HEAD)"
        GitCommit string
        Status    *UpdateStatus