vishalnayak 5b458db104 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.go

Speling police

2016-05-15 09:58:36 -07:00

format_json_test.go

Added JSON Decode and Encode helpers.

2016-07-06 12:25:40 -04:00

format_json.go

Revert 'risky' changes

2016-07-12 16:38:07 -04:00

formatter.go

Logging authentication errors and bad token usage

2015-06-18 18:30:18 -07:00

hashstructure_test.go

Remove Unix() invocations on 'time.Time' objects and removed conversion of time to UTC

2016-07-08 18:30:18 -04:00

hashstructure.go

Add token accessor to wrap information if one exists

2016-06-13 23:58:17 +00:00