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

..

backend_test.go

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

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

backend.go

Revert 'risky' changes

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

field_data_test.go

logical/framework: handle nil duration value. Fixes #408

2015-07-08 16:55:52 -06:00

field_data.go

Merge branch 'master-oss' into json-use-number

2016-07-15 19:21:55 -04:00

field_type.go

logical/framework: adding a new duration type to convert to seconds

2015-06-17 15:56:26 -07:00

lease_test.go

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

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

lease.go

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

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

path_map_test.go

WriteOperation -> UpdateOperation

2016-01-08 13:03:03 -05:00

path_map.go

Create more granular ACL capabilities.

2016-01-08 13:05:14 -05:00

path_struct_test.go

WriteOperation -> UpdateOperation

2016-01-08 13:03:03 -05:00

path_struct.go

Added JSON Decode and Encode helpers.

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

path.go

Speling police

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

policy_map_test.go

logical/framework: more flexible Pathmap and PolicyMap

2015-04-17 09:35:49 -07:00

policy_map.go

logical/framework: more flexible Pathmap and PolicyMap

2015-04-17 09:35:49 -07:00

secret_test.go

vault: clean up VaultID duplications, make secret responses clearer

2015-03-19 23:11:42 +01:00

secret.go

Remove grace periods

2016-01-31 19:33:16 -05:00

template.go

logical/framework: make help look nicer

2015-04-03 21:00:23 -07:00

testing.go

logical/framework: PathMap allows hyphens in keys [GH-119]

2015-05-02 13:17:42 -07:00

wal_test.go

logical/framework: only rollback old enough WAL entries

2015-03-17 20:39:46 -05:00

wal.go

Merge branch 'master-oss' into json-use-number

2016-07-15 19:21:55 -04:00