Skip to content

Commit

Permalink
Merge branch 'master' into undo-mongo-hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
rtprio authored Jul 17, 2018
2 parents b55c0ef + 8e7d5cb commit 7c32066
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Lagoon solves what developers are dreaming about: A system that allows developer

## Help?

Questions? Ideas? Meet the maintainers and contributors: `#lagoon` in amazee.io RocketChat [https://amazeeio.rocket.chat]()
Questions? Ideas? Meet the maintainers and contributors: `#lagoon` in amazee.io RocketChat [https://amazeeio.rocket.chat](https://amazeeio.rocket.chat)

## A couple of things about Lagoon
1. Lagoon is based on microservices. A whole deployment and build workflow is very complex; not only do we have multiple sources (like Github, Bitbucket, Gitlab, etc.), multiple OpenShift servers and multiple notification systems (Slack, Rocketchat, etc.), but each deployment is unique and can take from seconds to hours. So it's built with flexibility and robustness in mind. Having microservices that all communicate through a messaging system (RabbitMQ) allows us to scale individual services up and down, survive down times of individual services and also to try out new parts of Lagoon in production without affecting others.
Expand Down
2 changes: 1 addition & 1 deletion docs/using_lagoon/backups.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Backups

Lagoon differentiates between three backup solutions: Short-, Mid- and Long-Term Backups.
Lagoon differentiates between three backup categories: Short-, Mid- and Long-Term Backups.

## Short-Term Backups

Expand Down
1 change: 1 addition & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ pages:
- Workflows: using_lagoon/workflows.md
- Backups: using_lagoon/backups.md
- Logging: using_lagoon/logging.md
- Remote Shell: using_lagoon/remote_shell.md
- GraphQL API: using_lagoon/graphql_api.md
- Drupal:
- Lagoonize: using_lagoon/drupal/lagoonize.md
Expand Down

0 comments on commit 7c32066

Please sign in to comment.