Merge release branch
0d2c384ab68d
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Mar 15 2016, 21:47.

Description

Merge release branch

Committed

David Walend <david_walend@hms.harvard.edu>

Mar 15 2016, 21:47

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

David Walend <david_walend@hms.harvard.edu> committed R2664:0d2c384ab68d: Merge release branch (authored by David Walend <david_walend@hms.harvard.edu>).Mar 15 2016, 21:47

Commit	Author	Details	Committed
94c104a31659	David Walend	Updated a dashboard test, then commented it out. Needs VPN to work	Mar 15 2016
82b00fbbce97	David Walend	Merging 1.20.1 changes	Mar 15 2016
167d0df8cf68	David Walend	Overloaded toString in KeyStoreDescriptor to redact the password for SHRINE-1371	Mar 14 2016

				Path
	M			apps/dashboard-app/src/main/js/test/admin/status/summary.json
	M			apps/dashboard-app/src/test/resources/testhappy/all
	M			apps/dashboard-app/src/test/scala/net/shrine/dashboard/DashboardServiceTest.scala
	M			commons/crypto/src/main/scala/net/shrine/crypto/KeyStoreDescriptor.scala