Jim Myers
7ae0105800efea0bcf314cf979a874a304e956f8
Merge branch 'develop' into feature/editable-metadata
Conflicts:
CHANGELOG.md
22 Mar 2018
Bing Zhang
a6384074b0714cd930246a5c557f398f5390ebed
m
Check rabbitmq, mongo, clowder are ready before creating default users.
16 Mar 2018
Luigi Marini
28fc7d7945d2ddbacb8c1139769036d98fafaf8d
m
Merge pull request #1225 in CATS/clowder from bugfix/BD-2042-bd-base-AccountNotActive to develop
* commit '653179aba078c72460cd6a9fc48d6be8e38789bc':
Fixed creating of default user when running docker-compose by properly enable status as Active.
02 Mar 2018
Bing Zhang
653179aba078c72460cd6a9fc48d6be8e38789bc
m
Fixed creating of default user when running docker-compose by properly enable status as Active.
02 Mar 2018
Indira Gutierrez Polo
0ee94cb298476cc4612ae891ea27b953d3eb7c77
m
Merge branch 'develop' of https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/clowder into master-to-develop-1.3.5
# Conflicts:
# CHANGELOG.md
# project/Build.scala
01 Mar 2018