7 commits

Author	SHA1	Message	Date
Jeff Mitchell	d6552a11cc	Merge branch 'master-oss' into sethvargo/cli-magic	2018-01-03 14:02:31 -05:00
Jeff Mitchell	14b43deb05	Update cassandra docs with consistency value. ... Fixes #3361	2017-12-02 14:18:23 -05:00
Seth Vargo	50caac0bb6	More naming cleanup	2017-10-24 09:35:03 -04:00
Seth Vargo	23d1d9a1ac	Resolve the most painful merge conflict known on earth	2017-10-24 09:34:12 -04:00
Cameron Stokes	6186fabcaf	[docs] Add notes about deprecated database backends. (#2835)	2017-06-07 23:45:01 -07:00
Seth Vargo	3d7dbf8a70	Fix typo	2017-03-20 01:50:45 -04:00
Seth Vargo	f64bf8d183	/docs/http -> /api	2017-03-17 14:06:03 -04:00