Julien Vehent
|
cb2340c150
|
Merge branch 'master' of github.com:mozilla/sops
3.0.0
|
2017-10-10 16:10:51 -04:00 |
|
Julien Vehent [:ulfr]
|
04420860c4
|
Merge pull request #250 from mozilla/sops3
Sops3
|
2017-10-10 16:10:17 -04:00 |
|
Julien Vehent [:ulfr]
|
1ca4fa23d4
|
Merge branch 'master' into sops3
|
2017-10-10 13:36:33 -04:00 |
|
Adrian Utrilla
|
f6fe0fe4d5
|
Merge pull request #265 from autrilla/pretty-errors
Improve error message for retrieving data key
|
2017-10-10 10:17:07 -07:00 |
|
Adrian Utrilla
|
9812314434
|
Merge branch 'master' into pretty-errors
|
2017-10-10 10:03:50 -07:00 |
|
Adrian Utrilla
|
0236ea865c
|
Update CHANGELOG.rst
|
2017-10-10 09:58:33 -07:00 |
|
Adrian Utrilla
|
b6c7baa437
|
Vendor dependencies
|
2017-10-10 09:52:53 -07:00 |
|
Adrian Utrilla
|
c69a3d4af5
|
Merge branch 'pretty-errors' of github.com:autrilla/sops into pretty-errors
|
2017-10-10 09:49:04 -07:00 |
|
Adrian Utrilla
|
500e11110c
|
Merge pull request #264 from autrilla/retrieve-gpg-keys
Support retrieving PGP keys from keyservers
|
2017-10-10 09:48:31 -07:00 |
|
Adrian Utrilla
|
e023490c82
|
Fix typo and clarify ignored errors
|
2017-10-10 09:48:00 -07:00 |
|
Julien Vehent
|
bb248fbdca
|
Merge branch 'master' of github.com:mozilla/sops
|
2017-10-10 11:37:06 -04:00 |
|
Adrian Utrilla
|
951c37c58a
|
Merge branch 'master' into pretty-errors
|
2017-10-10 08:30:48 -07:00 |
|
Adrian Utrilla
|
074ec0b6a2
|
Merge branch 'master' into retrieve-gpg-keys
|
2017-10-10 08:26:56 -07:00 |
|
Adrian Utrilla
|
160f0951a5
|
Merge pull request #263 from autrilla/fix-errors
Fix some errors not being shown and erroring when no config file is found
|
2017-10-10 08:25:35 -07:00 |
|
Adrian Utrilla
|
11c8237212
|
Wrap cli.NewExitError so we can show pretty messages to users
|
2017-10-09 09:37:08 -07:00 |
|
Julien Vehent
|
63d11bba1f
|
Merge branch 'master' of github.com:mozilla/sops
|
2017-10-09 10:31:28 -04:00 |
|
Adrian Utrilla
|
ca5429bb7e
|
Improve error message for retrieving data key
|
2017-10-06 13:49:22 -07:00 |
|
Adrian Utrilla
|
1847c6cdd6
|
Support retrieving PGP keys from keyservers
|
2017-10-05 13:26:10 -07:00 |
|
Adrian Utrilla
|
edae44ac2b
|
Fix some errors not being shown and erroring when no config file is
found
|
2017-10-05 11:59:23 -07:00 |
|
Adrian Utrilla
|
88f8d2f811
|
Merge pull request #261 from autrilla/makefile-improvements
Simplify testing in makefile
|
2017-10-05 09:27:03 -07:00 |
|
Julien Vehent
|
2805008408
|
Merge branch 'master' of github.com:mozilla/sops
|
2017-10-05 12:20:56 -04:00 |
|
Julien Vehent [:ulfr]
|
cd46d8405f
|
Merge branch 'master' into makefile-improvements
|
2017-10-05 08:39:51 -04:00 |
|
Adrian Utrilla
|
bddd84126d
|
Merge pull request #255 from autrilla/reconfigure-keys
Add command to reconfigure keys
|
2017-10-04 15:49:31 -07:00 |
|
Adrian Utrilla
|
dab6e45955
|
Merge branch 'master' into reconfigure-keys
|
2017-10-04 14:20:19 -07:00 |
|
Adrian Utrilla
|
1665db12a4
|
Wrap config file not found error for updatekeys in cli exiterror
|
2017-10-04 14:19:57 -07:00 |
|
Adrian Utrilla
|
df05ca05cf
|
Merge branch 'master' into makefile-improvements
|
2017-10-03 15:14:39 -07:00 |
|
Adrian Utrilla
|
b661f3ee31
|
Simplify testing in makefile
|
2017-10-03 15:14:00 -07:00 |
|
Julien Vehent
|
3d48907625
|
Merge branch 'master' of github.com:mozilla/sops
|
2017-10-03 17:58:07 -04:00 |
|
Julien Vehent [:ulfr]
|
d7c63ec1e2
|
Merge pull request #260 from autrilla/metadatanotfound-regression
Fix metadata not found returning the wrong error
|
2017-10-03 17:57:53 -04:00 |
|
Adrian Utrilla
|
14a55401d3
|
Fix metadata not found returning the wrong error
|
2017-10-03 14:51:59 -07:00 |
|
Adrian Utrilla
|
1f9980e45b
|
Merge branch 'reconfigure-keys' of github.com:autrilla/sops into reconfigure-keys
|
2017-10-02 11:22:57 -07:00 |
|
Adrian Utrilla
|
55624f82aa
|
Address review comments
|
2017-10-02 11:19:56 -07:00 |
|
Julien Vehent
|
d050d1cd43
|
Merge branch 'master' of github.com:mozilla/sops
|
2017-10-02 10:52:49 -04:00 |
|
Julien Vehent
|
387667a56c
|
CHANGELOG tweaks
|
2017-10-02 10:52:21 -04:00 |
|
Adrian Utrilla
|
376f80f59c
|
Merge branch 'master' into reconfigure-keys
|
2017-09-28 12:54:06 -07:00 |
|
Adrian Utrilla
|
df751be30f
|
updatekeys: load config individually for each file
|
2017-09-28 12:44:54 -07:00 |
|
Adrian Utrilla
|
208bdc505d
|
Allow updatekeys to run noninteractively
|
2017-09-28 12:44:31 -07:00 |
|
Adrian Utrilla
|
3dd0ef6b54
|
Merge pull request #253 from autrilla/logging
Improve logging
|
2017-09-26 17:34:06 -07:00 |
|
Adrian Utrilla
|
31785179ac
|
Vendor dependencies
|
2017-09-26 17:26:41 -07:00 |
|
Adrian Utrilla
|
fc4b91b2d9
|
Merge branch 'master' into reconfigure-keys
|
2017-09-25 10:49:15 -07:00 |
|
Adrian Utrilla
|
bd846afea9
|
Add new logging to GCP KMS
|
2017-09-25 10:05:40 -07:00 |
|
Adrian Utrilla
|
f638d40692
|
Merge remote-tracking branch 'origin/master' into logging
|
2017-09-25 09:51:54 -07:00 |
|
Adrian Utrilla
|
f34830ed77
|
Merge pull request #252 from JCepedaVillamayor/yaml-nil
Fixed bug when encrypting nil values
|
2017-09-20 12:46:54 -07:00 |
|
jcepedavillamayor
|
d251d0379e
|
Merge branch 'yaml-nil' of github.com:JCepedaVillamayor/sops into yaml-nil
|
2017-09-20 21:34:30 +02:00 |
|
jcepedavillamayor
|
64efc7ac5c
|
Merge branch 'master' of https://github.com/mozilla/sops into yaml-nil
|
2017-09-20 08:29:55 +02:00 |
|
jcepedavillamayor
|
31ec744a9c
|
Decrypting tests added
|
2017-09-20 08:28:52 +02:00 |
|
Adrian Utrilla
|
ec672ce38a
|
Merge pull request #245 from calind/gcloud-kms
Add google cloud KMS support
|
2017-09-19 15:11:00 -07:00 |
|
Adrian Utrilla
|
e5f5812f59
|
Merge branch 'master' into gcloud-kms
|
2017-09-19 14:35:48 -07:00 |
|
Julien Vehent [:ulfr]
|
7be91584f3
|
Merge branch 'master' into yaml-nil
|
2017-09-19 17:35:07 -04:00 |
|
Adrian Utrilla
|
cafbd2fdad
|
Merge pull request #251 from autrilla/json-error-message
Show error message when decrypting SOPS1 JSON files
|
2017-09-18 09:50:14 -07:00 |
|