4 commits

Author	SHA1	Message	Date
Jeff Mitchell	d1803098ae	Merge branch 'master-oss' into sethvargo/cli-magic	2018-01-03 14:02:31 -05:00
Laura Uva	3b5cbe54fd	Added clarification to KV documentation about default CLI behavior and how to preserve non-string type values (#3596)	2017-11-27 11:43:49 -05:00
Seth Vargo	51a27b758b	Resolve the most painful merge conflict known on earth	2017-10-24 09:34:12 -04:00
Chris Hoffman	1029ad3b33	Rename "generic" secret backend to "kv" (#3292)	2017-09-15 09:02:29 -04:00