355 Commits

Author	SHA1	Message	Date
ssallam	fc40685304	update aquarius default version.	2020-09-11 18:05:39 +02:00
ssallam	b61407d9c5	Update readme file, fix error in setting default ocean-contracts version.	2020-09-11 11:31:47 +02:00
ssallam	7ee85c9503	Use aquarius latest tag.	2020-09-11 11:19:41 +02:00
ssallam	da93e10841	set contracts version in start_ocean	2020-09-11 10:00:59 +02:00
ssallam	1b5deda9be	fix errors, remove ganache blockTime option.	2020-09-11 08:25:55 +02:00
ssallam	99640d206e	add ocean-contracts compose file.	2020-09-09 18:25:24 +02:00
Matthias Kretschmann	09c97c7d21	script cleanup, sync script and docs	2020-09-08 18:23:10 +02:00
ssallam	07131ceddc	Support decentralized ddo	2020-09-08 10:39:52 +02:00
alexcos20	b623171cac	temporary provider will use one worker	2020-07-29 22:24:22 -07:00
ssallam	c148e447ca	Fix provider issue, remove references to keeper	2020-07-15 10:28:54 +02:00
Alex Coseru	5118cbe8b4	Update start_ocean.sh	2020-07-15 10:31:55 +03:00
Alex Coseru	fbf261ef22	Update start_ocean.sh	2020-07-14 13:54:05 +03:00
alexcos20	10e29cce8f	more ganache options	2020-07-06 23:29:50 -07:00
alexcos20	90839158ab	more ganache options	2020-07-06 10:18:07 -07:00
Alex Coseru	1b5acb5971	Update start_ocean.sh	2020-07-01 19:20:33 +03:00
Alex	13733f21de	fix elastic	2020-06-28 15:33:29 +03:00
Alex	96a0df677b	make dashboard optional	2020-06-28 15:22:44 +03:00
Alex	b6df4459ff	add ganache	2020-06-28 15:15:53 +03:00
alexcos20	c9a32edff8	fix provider	2020-06-26 08:39:52 -07:00
alexcos20	a4e32d3f9a	first cut	2020-06-26 08:37:46 -07:00
Matthias Kretschmann	9ca73d8711	bump Commons	2020-05-20 10:48:12 +02:00
Matthias Kretschmann	63c056c9a2	bump Commons	2020-05-19 15:27:55 +02:00
Matthias Kretschmann	e5ddbcd79d	bump faucet	2020-05-19 12:56:04 +02:00
Matthias Kretschmann	516c66e60b	bump Aquarius & Brizo	2020-05-19 12:52:56 +02:00
Alex Coseru	036b811b86	Update start_ocean.sh	2020-04-15 15:51:59 +03:00
Matthias Kretschmann	b20fd9b4cb	bump Brizo	2020-03-24 09:18:02 +01:00
Matthias Kretschmann	06f3474f2d	Bump Commons & Faucet	2020-03-24 09:16:26 +01:00
Alex Coseru	b4ec8a5e6c	Update start_ocean.sh	2020-03-12 23:18:55 +02:00
Alex Coseru	ea174f0b63	Update start_ocean.sh	2020-03-11 17:00:40 +02:00
Alex Coseru	b625a75fd9	Update start_ocean.sh	2020-02-20 18:10:26 +02:00
Alex Coseru	17c4184b2b	Update start_ocean.sh	2020-02-20 18:09:01 +02:00
ssallam	8bbd324f51	Update the default operator service url.	2020-02-17 09:04:29 +01:00
Alex Coseru	3390f68b94	bump brizo to 0.9.1	2020-02-10 14:35:14 +02:00
Alex Coseru	50979e5f00	Update start_ocean.sh	2020-02-10 14:33:41 +02:00
Matthias Kretschmann	1cd49e6788	bump to Commons v2.2.0	2020-02-03 11:02:42 +01:00
Alex Coseru	530426b6aa	Update start_ocean.sh	2020-01-31 12:22:05 +02:00
Matthias Kretschmann	3d9630e118	bump to Commons v2.1.0	2020-01-23 13:33:16 +01:00
ssallam	1f294589ad	Revert brizo uri to use "localhost"	2020-01-23 09:20:15 +01:00
ssallam	7d47c17ace	Update events-handler to v0.4.4	2020-01-22 17:04:23 +01:00
ssallam	82d7d6268d	Update default versions to work with keeper-contracts v0.13.2	2020-01-17 12:59:14 +01:00
alexcos20	e774822870	fixed agent & downgraded aquarius	2019-12-20 11:53:03 +02:00
alexcos20	2030c5ed51	add agent	2019-12-10 15:48:40 +02:00
Matthias Kretschmann	62f7ba6f45	bump Commons	2019-12-09 14:30:19 +01:00
Matthias Kretschmann	af5c91a267	bump components	2019-12-06 15:44:21 +01:00
Matthias Kretschmann	a57cf1d0ac	Merge branch 'master' into v2	2019-12-05 13:21:18 +01:00
MarcusJones	33b2a86993	update option is now explicit for spree	2019-12-05 10:43:07 +01:00
MarcusJones	1685d13fc1	add option --no-deployment	2019-12-05 10:01:27 +01:00
Matthias Kretschmann	d6ccf5de3d	bump components	2019-11-22 12:54:32 +01:00
ssallam	cd0ee51081	Add operator service envvar for brizo compute.	2019-11-20 17:31:58 +01:00
Matthias Kretschmann	96878d6c51	bump Commons	2019-11-15 12:48:37 +01:00
Matthias Kretschmann	0ee4407fca	bump to Brizo v0.7.0	2019-11-15 12:08:46 +01:00
Matthias Kretschmann	e1002741de	bump to Commons v2.0.0-beta.1	2019-11-15 00:58:37 +01:00
Matthias Kretschmann	a095b00cb0	bump to Aquarius v1.0.2	2019-11-14 14:15:32 +01:00
Matthias Kretschmann	c21e165e37	switch to latest v2 components	2019-11-08 14:51:24 +01:00
Matthias Kretschmann	d755cc9992	bump components	2019-11-07 15:46:01 +01:00
Alex Coseru	d7d4024902	Update start_ocean.sh	2019-10-19 12:40:25 +03:00
Alex Coseru	0eee9857d6	Update start_ocean.sh	2019-10-15 14:10:14 +03:00
Matthias Kretschmann	08fc37fb5f	bump commons & brizo	2019-10-15 13:03:20 +02:00
Matthias Kretschmann	69301acd3c	add and set IPFS-related env vars	2019-10-15 13:03:20 +02:00
Alex Coseru	5966442b3f	Update start_ocean.sh	2019-10-11 08:25:26 +03:00
Alex Coseru	ddc012bf2a	Merge branch 'master' into with_ipaddress	2019-10-11 08:16:52 +03:00
Alex Coseru	9c9941d265	Update start_ocean.sh	2019-10-11 08:12:56 +03:00
root	256cafde21	add exposeip	2019-10-10 03:28:19 -07:00
Sebastian Gerske	52777923e3	update parity	2019-10-09 19:39:33 +02:00
Sebastian Gerske	f340b447b3	Merge remote-tracking branch 'origin/master' into fix/acl_documentation ... # Conflicts: # README.md # start_ocean.sh	2019-10-09 15:48:37 +02:00
Sebastian Gerske	6a8c479430	fix no-acl-contract documentation	2019-10-09 15:36:45 +02:00
Sebastian Gerske	99fca7a0c6	added dashboard	2019-10-09 15:29:02 +02:00
Alex Coseru	50c903c83e	Merge pull request #193 from oceanprotocol/fix/secret_store ... fix secret store	2019-10-09 14:21:07 +03:00
Sebastian Gerske	dbfac86af5	fix secret store	2019-10-09 12:29:32 +02:00
Matthias Kretschmann	b0ca03763f	fix /etc/hosts editing	2019-10-09 10:36:01 +02:00
Matthias Kretschmann	9653fcbefa	bump Commons to v1.1.3	2019-10-08 15:56:35 +02:00
Alex Coseru	bc5f35245d	Update start_ocean.sh	2019-10-07 10:50:09 +03:00
root	f7da7f1665	back to local URL	2019-10-02 07:21:09 -07:00
root	9fe0191f35	add sudo	2019-10-02 07:07:49 -07:00
root	394d587983	fix AQUA URI	2019-10-02 06:20:06 -07:00
root	f1eedaed4e	remove all pleuston	2019-10-02 05:53:46 -07:00
root	21739eb0e2	fixed URLs	2019-10-02 04:23:40 -07:00
alexcos20	97488f42b0	fix commons	2019-10-01 13:36:22 +00:00
alexcos20	9d359f65fa	fix commons versions	2019-10-01 13:01:48 +00:00
alexcos20	e9593ebbf6	add commons,remove pleuston	2019-10-01 10:40:56 +00:00
Matthias Kretschmann	15cac395ec	Merge branch 'master' into feature/faucet	2019-09-17 16:40:24 +02:00
ssallam	976e2daf7a	Add --debug option to enable debug log level in brizo and events-handler, other components can be added to this later.	2019-09-17 16:00:30 +02:00
ssallam	afe72132e2	Update brizo version to v0.4.4	2019-09-17 15:50:52 +02:00
Matthias Kretschmann	3176a974a8	rename events-handler-py -> events-handler	2019-09-12 13:57:00 +02:00
Matthias Kretschmann	813c8ecc40	Merge branch 'master' into feature/faucet	2019-09-11 14:02:35 +02:00
Matthias Kretschmann	100124e683	Merge branch 'master' into feature/new-brizo	2019-09-11 13:34:14 +02:00
Matthias Kretschmann	a38f711d92	set specific events handler version, with actually existing version	2019-09-11 13:27:19 +02:00
Matthias Kretschmann	0e24bb6746	set specific events handler version	2019-09-11 13:26:01 +02:00
Matthias Kretschmann	555c7053ad	bump to Brizo v0.4.2	2019-09-11 11:33:01 +02:00
Matthias Kretschmann	42d7ff6411	bump faucet to v0.3.1	2019-09-10 15:26:16 +02:00
ssallam	6452111ddd	Set default Brizo workers to 5 workers, add consumer account to duero local node keys and secret-store signer node.	2019-09-09 10:08:12 +02:00
Sebastian Gerske	8583be7901	update keeper	2019-09-04 14:17:34 +02:00
Matthias Kretschmann	79c394aae0	remove Kovan	2019-09-03 13:40:29 +02:00
ssallam	120eb690c9	Update default version of keeper-contracts and brizo.	2019-09-02 16:58:18 +02:00
ssallam	8b640d374f	Update readme file and env vars.	2019-09-02 09:50:09 +02:00
Sebastian Gerske	68127e2870	bump keeper	2019-08-29 13:33:16 +02:00
ssallam	c4fc4d8166	Update some env-var names to improve clarity, add accounts folder with a specific provider keyfile. Revert provider/publisher address to previous value.	2019-08-29 11:16:13 +02:00
ssallam	48b35c0454	Set log level to info, use version env var for events-handler image.	2019-08-28 22:07:46 +02:00
ssallam	6ce139e801	Update compose files to match new style in feature/optimize branch and introduce a new env var for setting log level in both brizo and ocean_events_handler	2019-08-28 15:10:30 +02:00
ssallam	e534c815fb	Merge branch 'feature/new-brizo-support' into feature/new-brizo ... # Conflicts: # compose-files/brizo.yml	2019-08-28 14:55:51 +02:00
ssallam	d64c794880	Update brizo and events_handler docker-compose files	2019-08-28 14:50:58 +02:00
Sebastian Gerske	b2eaa5f04a	moved the structural configuration out of the brizo environment so we can use the same values for configuring pleuston as well	2019-08-28 11:16:16 +02:00
Sebastian Gerske	5d294c06ce	update pleuston	2019-08-28 11:08:09 +02:00
Sebastian Gerske	edaf8d6fd3	fix output	2019-08-28 11:07:48 +02:00
Sebastian Gerske	d8dc9310f3	bring back secret store for nile	2019-08-27 15:08:54 +02:00
Sebastian Gerske	49da094576	bring back secret store account	2019-08-27 11:50:50 +02:00
Sebastian Gerske	1ac810dd5d	- update parity node	2019-08-26 13:34:50 +02:00
ssallam	0785ba7028	Add support for new brizo version and stand-alone events monitor.	2019-08-26 13:19:17 +02:00
Sebastian Gerske	9ffd42544e	- bring back signing node to --only-secret-store	2019-08-26 13:02:06 +02:00
Sebastian Gerske	ccbde9e08f	- disable secret store on ganache node (ganache cannot be used as target for the secret store) ... - disable secret store signing node on ganache node (there can not be an secret store at all, so we do not need to sign at all)	2019-08-26 12:45:13 +02:00
Sebastian Gerske	27002abe9c	- disable faucet on kovan, it is not our ether	2019-08-26 12:44:14 +02:00
Sebastian Gerske	598c25f109	- start the sign node all the time, even when no local secret store is started ... - added duero as a target for the signing node as well, so we can run the singing node even when running against duero that already has a secret store	2019-08-26 12:43:48 +02:00
Sebastian Gerske	0fc7149cc5	preview the default action on purge	2019-08-26 12:32:40 +02:00
Javier Cortejoso	78646a8ef3	Eval command	2019-08-26 09:14:05 +02:00
Javier Cortejoso	db011c7a78	Remove killing quotes	2019-08-26 09:11:04 +02:00
Javier Cortejoso	835a8e91a0	Added new volumes to clean	2019-08-26 08:33:23 +02:00
Sebastian Gerske	20ba45b256	fixed force pull	2019-08-08 10:18:49 +02:00
Matthias Kretschmann	ebe66dd2d9	bump to pleuston v0.5.0	2019-07-29 12:09:13 +02:00
Matthias Kretschmann	ad59dd3a09	set default faucet timespan	2019-07-18 17:53:24 +02:00
Matthias Kretschmann	13defcaf82	bump default Aquarius to v0.3.8	2019-07-18 14:16:02 +02:00
Matthias Kretschmann	1a5f9129f5	add faucet	2019-07-18 12:17:59 +02:00
Javier Cortejoso	1716eaac2d	Merge pull request #164 from oceanprotocol/fix/update-tags ... Updated stable tags	2019-07-12 11:49:29 +02:00
Javier Cortejoso	33ec868ad0	Hotfix for non-interactive environments	2019-07-12 08:37:45 +02:00
ssallam	99206cabde	Update to latest brizo version (v0.3.13)	2019-07-11 03:58:28 +02:00
Jernej Pregelj	d7f7069b1b	update pleuston to latest release	2019-07-10 16:06:09 +02:00
Javier Cortejoso	d27152ffa8	Check elastic requirement kernel max files open	2019-06-28 16:27:28 +02:00
Jernej Pregelj	38bf69362b	updated tags	2019-06-28 14:11:45 +02:00
Javier Cortejoso	f210a8b89e	Merge branch 'develop' of github.com:oceanprotocol/barge into feature/pacific	2019-06-26 14:50:01 +02:00
Troy McConaghy	ae6e34d18f	Make Elasticsearch the default & MongoDB an option (#161)	2019-06-26 11:47:01 +02:00
Matthias Kretschmann	75eda67ea7	bump default versions (#156) ... * bump default versions * bump to Brizo v0.3.10	2019-06-13 11:06:03 +02:00
Javier Cortejoso	7267adf10c	Added pacific network	2019-06-06 15:24:00 +02:00
Matthias Kretschmann	2dcff4c205	remove stable flag ... * closes #157	2019-06-05 14:18:35 +02:00
Matthias Kretschmann	cde2689051	specifically set latest & stable versions	2019-06-04 16:49:58 +02:00
ssallam	2ce1c2d738	Add option to run a duero node.	2019-05-09 22:37:25 +02:00
Javier Cortejoso	7b5f95b0aa	Parity Image from variable. Updated due to old version removed from dockerhub	2019-05-06 09:05:04 +02:00
Sebastian Gerske	ad573b8c83	update aquarius to be compatible with squid 0.5.14	2019-04-13 14:55:20 +02:00
Aitor	cacdf0f45a	Merge pull request #119 from oceanprotocol/add-squid-py-v0.4.2-compatible-option ... Soft-pin the default versions of Aquarius, Brizo, Keeper Contracts & Pleuston. Add new --stable option	2019-04-03 15:05:29 +02:00
Troy McConaghy	0720dbaaef	Change default versions & tell them run Pleuston	2019-04-03 14:52:15 +02:00
Troy McConaghy	80d0bf93b0	not specifying network == --local-spree-node (#136) ... * not specifying network == --local-spree-node * Clean local artifacts when deploying contracts * In clean_local_contracts, rm *.development.json	2019-04-03 09:26:06 +02:00
Tom Marble	6a5180a31a	Resets secret store config on startup ... Now networks/secret-store/config/config.toml may be mutated, but is always reset when running start_ocean.sh Fixes #126 Signed-off-by: Tom Marble <tmarble@info9.net>	2019-03-28 17:07:20 -05:00
Troy McConaghy	98a285bc26	Merge branch 'develop' into add-squid-py-v0.4.2-compatible-option	2019-03-28 12:26:49 +01:00
Troy McConaghy	f3c3378125	Default KEEPER_NETWORK_NAME="nile" --> "spree"	2019-03-28 11:30:22 +01:00
Troy McConaghy	4b7ff1c270	Change default network from nile to spree	2019-03-26 09:27:49 +01:00
Javier Cortejoso	b50b25f6e7	Disable secret-store in Nile and Kovan	2019-03-15 16:12:01 +01:00
Javier Cortejoso	c5e2e1591c	Merge pull request #118 from oceanprotocol/feature/compose_3 ... Elaticsearch and Compose v3	2019-03-14 09:41:16 +01:00
Tom Marble	530f0d56ca	Warn user if ~/.ocean is owned by root (#122) ... * Warn user if ~/.ocean is owned by root Reminder that #100 is not yet fixed * Updates start_ocean.sh Adds copyright notice (per @ttmc) Changes function name for file ownership to check_if_owned_by_root (per @aaitor) - adds a check for the KEEPER_ARTIFACTS_FOLDER (as required by --purge) Signed-off-by: Tom Marble <tmarble@info9.net>	2019-03-11 15:47:16 +01:00
Pedro Gutiérrez	ff27bca33e	Added owner role address environment variable on Keeper contracts compose	2019-03-06 12:16:13 +01:00
Troy McConaghy	366ae58640	Removed new option, changed default vers, added --stable	2019-02-28 16:49:30 +01:00
Troy McConaghy	aed7ca68a0	Added the --squid-py-v0.4.2-compatible option ... and updated README.md accordingly	2019-02-28 12:18:53 +01:00
Javier Cortejoso	fb1afb8620	Merge branch 'feature/compose_3' of github.com:oceanprotocol/barge into feature/compose_3	2019-02-27 17:06:02 +01:00
Troy McConaghy	77fac0f3e6	No more OCEAN_VERSION ... The OCEAN_VERSION environment variable only occurred in the start_ocean.sh script (and in no other Barge files). It was set to stable by default but that never got used by anything. If the `--latest` option occurs, then it got changed to `latest` but we don't need to use an environment variable for that.	2019-02-25 14:03:50 +01:00
Javier Cortejoso	9bcef9eca9	ES 6.4.1	2019-02-12 19:54:41 +01:00
eruizgar91	1b3805d3fe	Add module variable and upgrade version to 6.4.1	2019-02-11 12:13:29 +01:00
Javier Cortejoso	b977d39a2f	Two files for aquarius	2019-02-08 16:15:01 +01:00
Javier Cortejoso	231b13103c	Added elasticsearch	2019-02-08 10:57:56 +01:00
Javier Cortejoso	07f2296a4f	Fix acl address	2019-01-28 11:45:47 +01:00
Javier Cortejoso	1629f1449d	Added acl contract addresses for nile and kovan	2019-01-28 11:36:00 +01:00
Sebastian Gerske	280c142b77	Merge pull request #107 from oceanprotocol/fix/keeper_spree_deployment ... Fix/keeper spree deployment	2019-01-25 08:50:47 +01:00
Aitor	def6075864	Merge pull request #102 from oceanprotocol/fix/aquarius_url ... Fix/aquarius url	2019-01-24 15:10:21 +01:00
Sebastian Gerske	237bf81627	avoid empty var message	2019-01-24 12:03:09 +01:00
Sebastian Gerske	42f12c950e	use correct network, fix typo	2019-01-24 09:20:49 +01:00
Sebastian Gerske	17a61336f9	add nmemoric to start of spree node	2019-01-24 08:31:40 +01:00
Javier Cortejoso	f7ea285804	Delete ready file when keeper deploys contracts	2019-01-22 11:41:21 +01:00
Javier Cortejoso	3be9180ef0	Pass UID and GID to keeper-contracts	2019-01-22 11:38:11 +01:00
Javier Cortejoso	8a79ca06bf	Added --no-ansi and --only-secret-store	2019-01-16 16:06:27 +01:00
Javier Cortejoso	fc73b512a4	Patch if project dir has spaces	2018-12-28 12:22:39 +01:00
Javier Cortejoso	7fd3270002	Added option acl_contract	2018-12-27 15:14:20 +01:00
Javier Cortejoso	6ed7bdd1b8	Merge pull request #87 from oceanprotocol/feature/custom_version_independent ... Add custom env variables for each ocean component version	2018-12-19 11:21:19 +01:00
Javier Cortejoso	ae4fc7aa01	Add custom env variables for each ocean component version	2018-12-19 10:52:44 +01:00
Sebastian Gerske	c0297ab483	fix force pull	2018-12-18 10:34:06 +01:00
Sebastian Gerske	8152b32c8d	added --froce-pull ... fixed --purge	2018-12-17 10:22:39 +01:00
eruizgar91	ac28f415f4	Rename variable in the start_ocean file	2018-12-12 11:54:00 +01:00
Sebastian Gerske	10fbe08448	updated readme	2018-12-11 11:54:06 +01:00
Sebastian Gerske	958448d27d	remove logging	2018-12-10 12:44:54 +01:00
Sebastian Gerske	6ded4c8d50	try to fix brizo	2018-12-10 12:44:29 +01:00
Javier Cortejoso	1246faec54	Comment clean old contracts	2018-12-07 13:37:26 +01:00
Javier Cortejoso	22d0dfd42c	Fix brizo	2018-12-07 12:25:28 +01:00
Sebastian Gerske	daec6778fe	set deploy contracts to false	2018-12-06 13:06:02 +01:00
Sebastian Gerske	b094bc782c	remove orphans	2018-12-06 11:42:53 +01:00
Sebastian Gerske	d6577aa692	renamed pond -> spree, lake -> nile	2018-12-06 10:58:28 +01:00
Sebastian Gerske	306585118b	refactor more	2018-12-06 09:16:50 +01:00
Sebastian Gerske	e10d515d8f	refactor more	2018-12-05 14:03:41 +01:00
Sebastian Gerske	dbdd0c355f	fix brizo env	2018-12-05 12:16:18 +01:00
Sebastian Gerske	1695301c26	made node exclusive	2018-12-05 10:56:31 +01:00
Sebastian Gerske	91499da37b	refactored to use different blockchain nodes underneath	2018-12-05 10:46:50 +01:00
Javier Cortejoso	c917328e54	Exposed keeper port to localhost (pleuston)	2018-12-04 11:36:41 +01:00
Javier Cortejoso	18c52bb61f	Merge branch 'develop' of github.com:oceanprotocol/docker-images into feature/refactor	2018-11-30 16:28:27 +01:00
Javier Cortejoso	502d556389	Deploy contracts enable again	2018-11-30 16:22:10 +01:00
Javier Cortejoso	47c6f26f30	Merge branch 'develop' of github.com:oceanprotocol/docker-images into feature/clean_env	2018-11-30 10:55:15 +01:00
Javier Cortejoso	4947c0f0fa	Added missing export	2018-11-30 10:45:58 +01:00
Javier Cortejoso	cfc4ca2b0b	Fix keeper-contracts/brizo as ethereum rpc provider	2018-11-30 10:36:55 +01:00
Javier Cortejoso	d62df2afc0	Merge branch 'develop' of github.com:oceanprotocol/docker-images into feature/refactor	2018-11-30 10:31:38 +01:00
ssallam	73ff958e90	Group brizo's env vars in its own .env file and load it into the docker-compose file.	2018-11-30 02:27:10 +01:00
aitor@oceanprotocol.com	b965e9977a	making latest default option	2018-11-29 14:51:15 +01:00
Javier Cortejoso	565fe241c9	Added individual compose files	2018-11-29 12:32:38 +01:00
Javier Cortejoso	1b058f812a	Added --clean-all option to clean volumes and network	2018-11-15 11:04:42 +01:00
Sebastian Gerske	70fbca857d	added reuse-database to readme and added log to start ocean	2018-10-11 14:33:30 +02:00
Sebastian Gerske	2dc94460e9	moved reuse_database to own switch	2018-10-10 15:49:10 +02:00
Matthias Kretschmann	d510167707	start script rewrite with options, banner, and colors	2018-10-10 12:21:56 +02:00
Matthias Kretschmann	3035d83273	Merge branch 'develop' into feature/default-stable	2018-10-10 11:21:19 +02:00