3 Commits (573ce7d0e7b7bfc9247c31b7a30c8881618293fa)

Author	SHA1	Message	Date
James Powis	a5cb2ce4b7	Change from regex matching default-token to prefix SA-token- ... Signed-off-by: James Powis <powisj@gmail.com>	2018-09-19 13:06:10 -06:00
Nolan Brubaker	ea50ebf2b5	Fix map merging logic ... Fixes #777 Signed-off-by: Nolan Brubaker <nolan@heptio.com>	2018-08-21 15:30:30 -04:00
Nolan Brubaker	e7d00cf5fd	Add merge support for serviceaccounts ... All properties from a backup will be merged into the ServiceAccount except for the default token secret. Signed-off-by: Nolan Brubaker <nolan@heptio.com>	2018-06-15 12:40:59 -04:00