|
Bing Zhang
|
423820b344c7bbc375357d2e17557384c150aa94
|
Merge branch 'mergeback2develop' of https://opensource.ncsa.illinois.edu/bitbucket/scm/pol/polyglot into mergeback2develop |
|
|
|
Bing Zhang
|
232771a104e9bf7dc94c050b1da4bc0d6ab7ca15
|
add extra empty line in /src/main/assembly/conf/mongo.properties |
|
|
|
Bing Zhang
|
e298d0245cbf21c8a0cc4e66b2c9d93793c0aab7
|
merge master branch back to develop. and set version 2.5.0 on develop branch |
|
|
|
Bing Zhang
|
d7b24443b1b08b713d8c4c4078c4a4b74bde8296
|
resolve conflicts |
|
|
|
Bing Zhang
|
b6ef1c736b51c6fd284939959ed5df39685ca74d
m |
merge master branch back to develop. and set version 2.5.0 on develop branch |
|
