Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/odpi/egeria into foundati…
Browse files Browse the repository at this point in the history
…on-and-empire
  • Loading branch information
mandy-chessell committed Feb 27, 2020
2 parents 71d20c6 + 0376f6c commit 6fee9bb
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ startup.server.list=
################################################
### Logging
################################################
logging.level.root=OFF
logging.level.root=OFF
logging.level.org.springframework=ERROR
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#SPDX-License-Identifier: Apache-2.0
# SPDX-License-Identifier: Apache-2.0
# Copyright Contributors to the ODPi Egeria project.

server.port=8443
server.compression.enabled=true
server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,application/javascript,text/css
Expand Down Expand Up @@ -53,4 +55,10 @@ omas.server.name=omas
omas.server.url=http://localhost:8080
open.lineage.server.url=http://localhost:8082
open.lineage.server.name=open-lineage
open.lineage.graph.source=MAIN
open.lineage.graph.source=MAIN

################################################
### Logging
################################################
logging.level.root=OFF
logging.level.org.springframework=ERROR
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ apachezookeeper:
debug:
egeriaJVM: false

# Logging level - affects all spring components by setting LOG_LEVEL_ROOT. Default to no DEBUG - Auditlog only
# Logging level - affects all spring components by setting LOG_LEVEL_ROOT.
logging:
level: OFF

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
These technologies are needed in order to build and develop Egeria.

If you simply want to try out and explore Egeria, or if you find yourself lost in all of these technologies,
you will likely want to consider starting with a [self-contained environment](running-self-contained.md)
to explore Egeria (at least initially).
choose one of the [self-contained environments](README.md) instead.

## Git

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Running Egeria natively

These technologies are what Egeria itself uses to operate. They are included when using the
[self-contained environments](running-self-contained.md), but they can also be installed and run natively (directly)
self-contained environments, but they can also be installed and run natively (directly)
on your system.

Just be aware that running them natively on your system will require the additional effort of downloading, installing,
Expand Down

0 comments on commit 6fee9bb

Please sign in to comment.