vishalnayak c14235b206 Merge branch 'master-oss' into json-use-number ... Conflicts: http/handler.go logical/framework/field_data.go logical/framework/wal.go vault/logical_passthrough.go		2016-07-15 19:21:55 -04:00
..
audit	Add token accessor to wrap information if one exists	2016-06-13 23:58:17 +00:00
credential	Merge branch 'master-oss' into json-use-number	2016-07-15 19:21:55 -04:00
logical	Merge branch 'master-oss' into json-use-number	2016-07-15 19:21:55 -04:00