Merge branch 'master' into develop

Boy Baukema · Boy Baukema · commit 7addda0f90ca · 2015-10-28T11:32:13.000+01:00
diff --git a/composer.lock b/composer.lock
diff --git a/database/patch/patch-0022.sql b/database/patch/patch-0022.sql
@@ -0,0 +1,5 @@
+-- Create indexes on sso_provider_roles for PUSH metadata
+CREATE INDEX idx_sso_provider_roles_type ON sso_provider_roles (type);
+CREATE INDEX idx_sso_provider_roles_entity_id ON sso_provider_roles (entity_id);
+CREATE INDEX idx_sso_provider_roles_publish_in_edugain ON sso_provider_roles (publish_in_edugain);
+CREATE UNIQUE INDEX idx_sso_provider_roles_entity_id_type ON sso_provider_roles (type, entity_id);
diff --git a/docs/release_notes/4.5.5.md b/docs/release_notes/4.5.5.md
@@ -0,0 +1,5 @@
+# OpenConext EngineBlock v4.5.5 Release Notes #
+
+Bugfix release for push metadata.
+
+* Bugfix for [Tuple (entity_id,type) should be UNIQUE in sso_provider_roles #160](https://github.com/OpenConext/OpenConext-engineblock/issues/160).
