Commit 3430aed4 authored Jan 31, 2018 by Willi Rath

Merge branch 'develop' into 'master'

Develop

See merge request !69

parents 9ab15467 6bb3154b

_env_templates/monitoring.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ dependencies:
		- cf_units
		- cmocean
		- dask
		- git
		- ipython
		- jupyter
		- matplotlib=1.5.3

_env_templates/monitoring_gallery.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ channels:
		dependencies:
		- python=2.7
		- anaconda-client
		- git
		- ConfigParser
		- ffmpeg
		- pip:

_envs_hlrn/monitoring.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ dependencies:
		- cf_units
		- cmocean
		- dask
		- git
		- ipython
		- jupyter
		- matplotlib=1.5.3

_envs_hlrn/monitoring_gallery.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ channels:
		dependencies:
		- python=2.7
		- anaconda-client
		- git
		- ConfigParser
		- ffmpeg
		- pip:

_envs_nesh/monitoring.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ dependencies:
		- cf_units
		- cmocean
		- dask
		- git
		- ipython
		- jupyter
		- matplotlib=1.5.3