Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge #1

Merged
merged 92 commits into from
May 18, 2017
Merged

merge #1

merged 92 commits into from
May 18, 2017

Conversation

kimmking
Copy link
Owner

No description provided.

banyeliangzhong and others added 29 commits June 28, 2016 13:31
修改lucene-config的配置
时间修改为24小时制
Update service-top200.html
当多实例的时候,同时往application表插数据(this.applicationMapper.addApplication(applicationInfo); )导致DuplicateKeyException异常。增加异常处理,当出现该异常的时候,直接跳过。
# Conflicts:
#	conf/logback.xml
#	dubbokeeper-admin/pom.xml
#	dubbokeeper-server/pom.xml
#	dubbokeeper-ui/pom.xml
adjust dependencies
Update ApplicationStatisticsStorage.java
ignore integration test
@kimmking kimmking merged commit 9c69c8e into kimmking:master May 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.