From 8d2ec1ea4469173b3754fd87c9a26e26e84d91e2 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Thu, 30 Jul 2020 14:53:18 -0700 Subject: [PATCH] Bring back master branch in preparation for merge This reverts commit b54fb41952ca8eb5f3a2df04643ffc24df4ef9b5. --- .github/workflows/continuous-integration-workflow.yml | 2 +- README.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 1d8119c7..76435db3 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - deploy-pipeline-test + - master schedule: - cron: '0 10 * * *' # Once per day at 10am UTC diff --git a/README.adoc b/README.adoc index c646dc44..579e6f60 100644 --- a/README.adoc +++ b/README.adoc @@ -2,7 +2,7 @@ image:https://badges.gitter.im/spring-projects/spring-session.svg[link="https://gitter.im/spring-projects/spring-session?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] -image:https://github.com/spring-projects/spring-session/workflows/CI/badge.svg?branch=deploy-pipeline-test["Build Status", link="https://github.com/spring-projects/spring-session/actions?query=workflow%3ACI"] +image:https://github.com/spring-projects/spring-session/workflows/CI/badge.svg?branch=master["Build Status", link="https://github.com/spring-projects/spring-session/actions?query=workflow%3ACI"] Spring Session provides an API and implementations for managing a user's session information, while also making it trivial to support clustered sessions without being tied to an application container specific solution. It also provides transparent integration with: