Merge pull request #104 from ripienaar/040

(misc) Release 0.4.0
choria-legacy · May 14, 2019 · a81ee6b · a81ee6b
2 parents 8438822 + f544145
commit a81ee6b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 |Date      |Issue |Description                                                                                              |
 |----------|------|---------------------------------------------------------------------------------------------------------|
+|2019/05/14|      |Release 0.4.0                                                                                            |
+|2019/05/14|102   |Allow TLS to be disabled on only a specific side of the replication bridge                               |
 |2018/11/28|      |Release 0.3.1                                                                                            |
 |2018/11/02|97    |Fix permissions of the cache store directory                                                             |
 |2018/07/02|      |Release 0.3.0                                                                                            |

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -30,11 +30,17 @@ import:
 - package: github.com/fatih/color
   version: ^1.5.0
 - package: github.com/choria-io/go-choria
-  version: 684d9b00e1b5d35727bc46bffd3913b2ed45b8e6
+  version: '0.10.0'
   subpackages:
   - security
 - package: github.com/choria-io/go-security
   version: ^0.2.1
+- package: golang.org/x/sys
+  version: a5b02f93d862f065920dd6a40dddc66b60d0dec4
+  subpackages:
+  - unix
+- package: golang.org/x/crypto
+  version: 22d7a77e9e5f409e934ed268692e56707cd169e5
 testImport:
 - package: github.com/onsi/ginkgo
   version: ^1