Tree: 99a2461785

2.0.7-release

2.0.8-release

2.0.9-release

3.0.0-release

3.0.0/version-upgrade

3.0.1-release

3.0.2-release

3.0.3-release

3.0.4-release

3.0.5-release

3.0.6-release

3.1.0-release

3.1.1-release

3.1.2-release

3.1.3-release

3.1.4-release

3.1.5-release

3.1.6-release

3.1.7-release

3.1.8-release

3.1.9-release

3.2.0-release

3.2.1-prepare

3.2.1-release

3.2.2-prepare

3.2.2-release

3.2.2-release-bak

dev

dev_wenjun_refactorMaster

upstream-dev

1.0.0

1.0.1

1.0.2

1.0.3

1.0.4

1.0.5

1.1.0

1.1.0-preview

1.2.0

1.2.1

1.3.0

1.3.1

1.3.2

1.3.3

1.3.4

1.3.5

1.3.6

1.3.8

1.3.9

2.0.0

2.0.0-alpha

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.0.6

2.0.7

2.0.8

2.0.9

3.0.0

3.0.0-alpha

3.0.0-beta-1

3.0.0-beta-2

3.0.1

3.0.2

3.0.3

3.0.4

3.0.5

3.0.6

3.1.0

3.1.1

3.1.2

3.1.3

3.1.4

3.1.5

3.1.6

3.1.7

3.1.8

3.1.9

3.2.0

3.2.1

3.2.2

test

v2.3.3

v2.3.4.202211081355

v2.3.4.202211091515

vdev-20220412-1028

vdev-20220414-1341

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '99a2461785'

${ noResults }

Commit Graph

894 Commits (99a246178566275979939e67e9d1b5f49b095889)

Author	SHA1	Message	Date
Shiwen Cheng	0f3eed9d00	[Fix-5386][Alert] Fix ERROR: relation t_ds_plugin_define does not exist (#5387)	4 years ago
JinyLeeChina	2a44cb9de6	[Feature][JsonSplit] update codeStyle for merge to dev (#5392) ... * update taskParams/add task delayTime/fix conditionType bug * update codeStyle for merge to dev Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
JinyLeeChina	c3558965c1	update taskParams/add task delayTime/fix conditionType bug (#5385) ... Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
Shiwen Cheng	6b8461e901	Revert "[Improvement][DAO] CreateDolphinScheduler (#5357) (#5358)" (#5383) ... This reverts commit b108ac43b8.	4 years ago
ruanwenjun	e6d8da484f	[Improvement][API] Create Datasource #5083 (#5116) ... * [Improvement][API] Create Datasource #5083 * Refact create/ update datasource API * fix Code Smells * fix code smell * resolve code smell * use ConnectionParam to replace BaseDatasource * solve license * add ut * code check * add ut * fix ut coverage * fix ut	4 years ago
ruanwenjun	b108ac43b8	[Improvement][DAO] CreateDolphinScheduler (#5357) (#5358) ... * [Improvement][DAO] Create CreateDolphinScheduler (#5357) * add ut * fix code smell	4 years ago
JinyLeeChina	862565a7c7	[Feature][JsonSplit] Fix dependTask bug (#5360) ... * update SnowFlake * update processDefinite from processInstance * update processDefinite from processInstance * Fix task logger path * Fix dependTask bug Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
Wenjun	5f1fc462c9	[Bug][server-api] copy the node ,the preTasks is error #5261 (#5264)	4 years ago
JinyLeeChina	49b234609a	update SnowFlake (#5321) ... Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
JinyLeeChina	f7a06a033d	[Feature][JsonSplit] Fix master/worker about shellTask (#5300) ... * Fix quoted bug about processDefineId of processInstance * Fix master/worker about shellTask * codeStyle * codeStyle * update taskType * codeStyle * update timeoutNotifyStrategy * codeStyle Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
wen-hemin	784b3550b2	fix: The instance page DAG does not display bug (#5298) ... Co-authored-by: wen-hemin <wenhemin@apache.com>	4 years ago
fanwq	87588ca9f7	fix bug:delete the user ,the project list of admin will lost the projects of this user #5301 (#5302)	4 years ago
mrproliu	b6453da298	Remove useless table fields (#5284) ... Co-authored-by: dalekliuhan <dalekliuhan@didiglobal.com>	4 years ago
JinyLeeChina	645847c096	Fix quoted bug about processDefineId of processInstance (#5263) ... Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
JinyLeeChina	31188ffca0	[Feature][JsonSplit] Fix taskInstance (#5246) ... * Fix dependency failure * Fix taskInstance * task instance list page * code review * fix logger path Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
wen-hemin	556c37155b	[Feature][JsonSplit] When create the process instance, save the field "locations" and "connects" (#5248) ... * fix: dag show bugs * fix: code format * fix: code format * fix: code format * fix: When create the process instance, save the field "locations" and "connects" Co-authored-by: wen-hemin <wenhemin@apache.com>	4 years ago
wen-hemin	cc82a98f50	[FixBug][JsonSplit] dag show bugs (#5226) ... * fix: dag show bugs * fix: code format * fix: code format * fix: code format Co-authored-by: wen-hemin <wenhemin@apache.com>	4 years ago
bao liang	86ce8f133a	[JsonSplit-4417][master/worker/api]json split- remove json in task instance. (#5160) ... * [json split] refactor json in task instance * add task_pramas in task_instance * feature #4417 refactor json split in task instance * code style * code style * code style * code style * code style * update * update * update unit test * update	4 years ago
wenjun	f20bb54896	[Improvement][API] Improvement query all project list (#5169) (#5192)	4 years ago
zhuangchong	e53369318b	[Fix-4721][worker]The shell background starts the YARN task scenario, and the kill function is abnormal (#4722) ... * fix the shell starts the yarn task in the background * update StringUtils code style. * solve code smell. * add method comment in StringUtils class. * update AlertGroupMapper code style. * update AlertGroupMapperTest * update sql script test.	4 years ago
JinyLeeChina	689106d114	transform taskCode from long to string (#5174) ... Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
wen-hemin	f960eacdcd	[FixBug][Jsonsplit] sql condition bug #4417 (#5171) ... * fix: task page, rename "description" to "desc" * fix: The default value of field dependence is null. * fix: frontend compile check * fix: When create process, the version button is set to unavailable * fix: sql condition bug Co-authored-by: wen-hemin <wenhemin@apache.com>	4 years ago
Simon	3c9b214da7	[Feature][jsonsplit]add ProcessServiceTest (#5097) ... * Modify Project and ProjectUser Mapper * Modify Project and ProjectUser Mapper * project_code is bigint(20) * modify ERROR name * modify saveProcessDefine, remove the duplicate code with createTaskAndRelation * modify import/export processdefinition, add genProcessData * fix ut and bug * code style * repalce project_id with code * conflicts solve * conflicts solve * conflicts solve * bugfix * modify listResources mothod and remove getResourceIds mothod * 1 * conflicts solve * modify listResources mothod and remove getResourceIds mothod * modify listResources mothod and remove getResourceIds mothod * replace processDefinitionVersion with processDefinitionLog * codestyle * codestyle * add mapper module ut * codestyle * fix ProcessInstanceMapperTest * codestyle * conflicts solve * conflicts solve * conflicts solve * conflicts solve * conflicts solve * fix ProcessInstanceMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest * fix TaskInstanceMapperTest * add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix * codestyle * codestyle * Refactor process lineage * Refactor process lineage * codestyle * codestyle * Refactor process lineage * Refactor process lineage * add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest * add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest * add ProcessServiceTest * 1 * 1	4 years ago
Simon	21b7b77d50	[Feature][JsonSplit]fix modifyBy field (#5112) ... * Modify Project and ProjectUser Mapper * Modify Project and ProjectUser Mapper * project_code is bigint(20) * modify ERROR name * modify saveProcessDefine, remove the duplicate code with createTaskAndRelation * modify import/export processdefinition, add genProcessData * fix ut and bug * code style * repalce project_id with code * conflicts solve * conflicts solve * conflicts solve * bugfix * modify listResources mothod and remove getResourceIds mothod * 1 * conflicts solve * modify listResources mothod and remove getResourceIds mothod * modify listResources mothod and remove getResourceIds mothod * replace processDefinitionVersion with processDefinitionLog * codestyle * codestyle * add mapper module ut * codestyle * fix ProcessInstanceMapperTest * codestyle * conflicts solve * conflicts solve * conflicts solve * conflicts solve * conflicts solve * fix ProcessInstanceMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest * fix TaskInstanceMapperTest * add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix * codestyle * codestyle * Refactor process lineage * Refactor process lineage * codestyle * codestyle * Refactor process lineage * Refactor process lineage * add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest * add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest * add ProcessServiceTest * 1 * 1 * fix modifyBy field * 1 * ut fix	4 years ago
wenjun	5d264c9f20	[Improvement][Api] Optimize query processInstanceList #5134 (#5135) ... * Batch query user rather than several query	4 years ago
Shiwen Cheng	0d065c0712	[Feature-5062][*] Create/Edit/Delete Worker Group in Web UI (#5113) ... * [Improvement][Server] Rename MASTER_PREFIX to MASTER_TYPE and WORKER_PREFIX to WORKER_TYPE * [Feature][Api&Dao] Support api and dao of worker group * [Feature][UI] Support to create, edit and delete worker group * [Feature][API&UI] Support work groups from database and zookeeper to display together in worker group management * [Feature][API&Dao] Support long ip list and check request parameters when saving worker group * [Feature][*] Refactor ipList to addrList * [Feature][Server] Support host manager to select worker host by worker group in database * [Improvement][Server] Improve the config of master and worker * [Improvement][*] Rename zkRegistered to systemDefault * [Improvement][Test] Fix unit test and improve ui * [Improvement][Server] Improve getServerMaps Co-authored-by: dailidong <dailidong66@gmail.com>	4 years ago
Kirs	f109a758f8	[Bug][PGSQL] Delete the stopped workflow without deleting the correspon… (#5066) ... * [Bug][Api] Delete the stopped workflow without deleting the corresponding sub process, the workflow instance name is not displayed in the sub process * fix ut * fix ut err * sql style * fix error	4 years ago
JinyLeeChina	d99934d0da	[Feature][JsonSplit] Fix api bug (#5102) ... * modify checkDAGRing and ProcessService method * merge * modify dagRing * modify process instance for project home page * fix save process bug * codeStyle * Fix logical bug in saving process definition * codeSytle * Fix bug in interface of queryProcessDefinitionList * codeSytle * Fix api bug" Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
zhuangchong	ba039dc252	[Improvement][dao] Resource features SQL slow query optimization. (#4947) ... * Resourse features SQL slow query optimization. * update resource mapper queryResourcePaging method. * split resource and resource_uesr sql statement. * determine the size of the collection. * update process service class code style. * update ResourceUserMapper java class code style. * add resourceUserMapper in the test config file. * solve code smell * split paging query join statement. * update ResourceUserMapper class. * remove sql join statement. * update resource test class code style. * update ResourcesServiceTest test class. * rerun ut. * update user service test class. * solve query resource list method code smell.	4 years ago
wenjun	086e716441	[Improvement][Dao] SQL optimization - check exist #5069 (#5070)	4 years ago
zhuangchong	705715c313	[Improvement-5059][API] Verify that the new workflow definition version is the current version before removing it #5059 (#5060) ... * this process definition version is used, not allowed to delete. * update ProcessDefinitionVersionServiceTest test class. * update check has associated process definition sql.	4 years ago
Ts686	6216817861	[Improvement-4971][alert|dao|service]Remove redundant PropertyUtils.class (#5020) ... * [Improvement][alert|dao|service] 1. Remove redundant PropertyUtils.class (#4971) 2. Remove useless import package. * [Improvement][alert|dao|service] 1. Remove redundant PropertyUtils.class (#4971) 2. Remove useless import package. * [Improvement][alert|dao|service] 1. Remove redundant PropertyUtils.class (#4971) 2. Remove useless import package. * [Improvement][alert|dao|service] 1. Remove redundant PropertyUtils.class (#4971) 2. Remove useless import package.	4 years ago
Simon	00dcc3f78e	[Feature][jsonsplit]add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest (#5047) ... * Modify Project and ProjectUser Mapper * Modify Project and ProjectUser Mapper * project_code is bigint(20) * modify ERROR name * modify saveProcessDefine, remove the duplicate code with createTaskAndRelation * modify import/export processdefinition, add genProcessData * fix ut and bug * code style * repalce project_id with code * conflicts solve * conflicts solve * conflicts solve * bugfix * modify listResources mothod and remove getResourceIds mothod * 1 * conflicts solve * modify listResources mothod and remove getResourceIds mothod * modify listResources mothod and remove getResourceIds mothod * replace processDefinitionVersion with processDefinitionLog * codestyle * codestyle * add mapper module ut * codestyle * fix ProcessInstanceMapperTest * codestyle * conflicts solve * conflicts solve * conflicts solve * conflicts solve * conflicts solve * fix ProcessInstanceMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest * fix TaskInstanceMapperTest * add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix * codestyle * codestyle * Refactor process lineage * Refactor process lineage * codestyle * codestyle * Refactor process lineage * Refactor process lineage * add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest * add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest	4 years ago
JinyLeeChina	d98c2c5cfe	[Feature][JsonSplit] Fix bug in interface of queryProcessDefinitionList (#5043) ... * modify checkDAGRing and ProcessService method * merge * modify dagRing * modify process instance for project home page * fix save process bug * codeStyle * Fix logical bug in saving process definition * codeSytle * Fix bug in interface of queryProcessDefinitionList * codeSytle Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
Kirs	6bf5031f45	[FIX] fix MySQL datasource jdbc connect parameters (#4851) ... * [FIX-CVE-2020-11974] fix MySQLDataSource Security * remove useless code * add ut * A more reasonable way * code style * fix test error * code style * update exception msg	4 years ago
Simon	22ec6c069d	[Feature][jsonsplit]Refactor process lineage (#5034) ... * Modify Project and ProjectUser Mapper * Modify Project and ProjectUser Mapper * project_code is bigint(20) * modify ERROR name * modify saveProcessDefine, remove the duplicate code with createTaskAndRelation * modify import/export processdefinition, add genProcessData * fix ut and bug * code style * repalce project_id with code * conflicts solve * conflicts solve * conflicts solve * bugfix * modify listResources mothod and remove getResourceIds mothod * 1 * conflicts solve * modify listResources mothod and remove getResourceIds mothod * modify listResources mothod and remove getResourceIds mothod * replace processDefinitionVersion with processDefinitionLog * codestyle * codestyle * add mapper module ut * codestyle * fix ProcessInstanceMapperTest * codestyle * conflicts solve * conflicts solve * conflicts solve * conflicts solve * conflicts solve * fix ProcessInstanceMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest * fix TaskInstanceMapperTest * add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix * codestyle * codestyle * Refactor process lineage * Refactor process lineage * codestyle * codestyle * Refactor process lineage * Refactor process lineage	4 years ago
Simon	c4d9ceffd1	[Feature][jsonsplit]add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix (#5012) ... * Modify Project and ProjectUser Mapper * Modify Project and ProjectUser Mapper * project_code is bigint(20) * modify ERROR name * modify saveProcessDefine, remove the duplicate code with createTaskAndRelation * modify import/export processdefinition, add genProcessData * fix ut and bug * code style * repalce project_id with code * conflicts solve * conflicts solve * conflicts solve * bugfix * modify listResources mothod and remove getResourceIds mothod * 1 * conflicts solve * modify listResources mothod and remove getResourceIds mothod * modify listResources mothod and remove getResourceIds mothod * replace processDefinitionVersion with processDefinitionLog * codestyle * codestyle * add mapper module ut * codestyle * fix ProcessInstanceMapperTest * codestyle * conflicts solve * conflicts solve * conflicts solve * conflicts solve * conflicts solve * fix ProcessInstanceMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest * fix TaskInstanceMapperTest * add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix * codestyle * codestyle	4 years ago
Simon	40bcb2e818	[Feature][jsonsplit]fix TaskInstanceMapperTest (#5010) ... * fix TaskInstanceMapperTest	4 years ago
JinyLeeChina	c010ac1f1d	[Feature][JsonSplit] Fix logical bug in saving process definition (#5009) ... * modify checkDAGRing and ProcessService method * modify process instance for project home page * fix save process bug * Fix logical bug in saving process definition Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
zhuangchong	d13fab7497	fix mybatis mapper sql judgment condition of foreach statement. (#4964)	4 years ago
JinyLeeChina	7f0678d3be	[Feature][JsonSplit] Fix save process bug (#5001) ... * modify checkDAGRing and ProcessService method * merge * modify dagRing * modify process instance for project home page * fix save process bug * codeStyle Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
Simon	ab18ca0acb	[Feature][jsonsplit]fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest (#5000) ... * Modify Project and ProjectUser Mapper * Modify Project and ProjectUser Mapper * project_code is bigint(20) * modify ERROR name * modify saveProcessDefine, remove the duplicate code with createTaskAndRelation * modify import/export processdefinition, add genProcessData * fix ut and bug * code style * repalce project_id with code * conflicts solve * conflicts solve * conflicts solve * bugfix * modify listResources mothod and remove getResourceIds mothod * 1 * conflicts solve * modify listResources mothod and remove getResourceIds mothod * modify listResources mothod and remove getResourceIds mothod * replace processDefinitionVersion with processDefinitionLog * codestyle * codestyle * add mapper module ut * codestyle * fix ProcessInstanceMapperTest * codestyle * conflicts solve * conflicts solve * conflicts solve * conflicts solve * conflicts solve * fix ProcessInstanceMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest * fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest	4 years ago
Simon	6111f05250	[Feature][jsonspilt]fix ProcessInstanceMapperTest (#4989) ... * Modify Project and ProjectUser Mapper * Modify Project and ProjectUser Mapper * project_code is bigint(20) * modify ERROR name * modify saveProcessDefine, remove the duplicate code with createTaskAndRelation * modify import/export processdefinition, add genProcessData * fix ut and bug * code style * repalce project_id with code * conflicts solve * conflicts solve * conflicts solve * bugfix * modify listResources mothod and remove getResourceIds mothod * 1 * conflicts solve * modify listResources mothod and remove getResourceIds mothod * modify listResources mothod and remove getResourceIds mothod * replace processDefinitionVersion with processDefinitionLog * codestyle * codestyle * add mapper module ut * codestyle * fix ProcessInstanceMapperTest * codestyle * conflicts solve * conflicts solve * conflicts solve * conflicts solve * conflicts solve * fix ProcessInstanceMapperTest	4 years ago
JinyLeeChina	39a9c0c392	[Feature][jsonspilt]modify process instance for project home page (#4991) ... * modify checkDAGRing and ProcessService method * merge * modify dagRing * modify process instance for project home page Co-authored-by: JinyLeeChina <297062848@qq.com>	4 years ago
Simon	f24ecff840	[Feature][jsonsplit]add mapper module ut and some bugfix (#4957) ... * Modify Project and ProjectUser Mapper * Modify Project and ProjectUser Mapper * project_code is bigint(20) * modify ERROR name * modify saveProcessDefine, remove the duplicate code with createTaskAndRelation * modify import/export processdefinition, add genProcessData * fix ut and bug * code style * repalce project_id with code * conflicts solve * conflicts solve * conflicts solve * bugfix * modify listResources mothod and remove getResourceIds mothod * 1 * conflicts solve * modify listResources mothod and remove getResourceIds mothod * modify listResources mothod and remove getResourceIds mothod * replace processDefinitionVersion with processDefinitionLog * codestyle * codestyle * add mapper module ut * codestyle	4 years ago
Simon	8b35e21390	[Feature][jsonsplit] replace processDefinitionVersion with processDefinitionLog (#4942) ... * Modify Project and ProjectUser Mapper * project_code is bigint(20) * modify saveProcessDefine, remove the duplicate code with createTaskAndRelation * modify import/export processdefinition, add genProcessData * modify listResources mothod and remove getResourceIds mothod * 1 * conflicts solve * modify listResources mothod and remove getResourceIds mothod * modify listResources mothod and remove getResourceIds mothod * replace processDefinitionVersion with processDefinitionLog	4 years ago
Simon	0c2b065db0	[Feature][jsonsplit]modify listResources mothod and remove getResourceIds mothod (#4928) ... * Modify Project and ProjectUser Mapper * Modify Project and ProjectUser Mapper * project_code is bigint(20) * modify ERROR name * modify saveProcessDefine, remove the duplicate code with createTaskAndRelation * modify import/export processdefinition, add genProcessData * fix ut and bug * code style * repalce project_id with code * conflicts solve * conflicts solve * conflicts solve * bugfix * modify listResources mothod and remove getResourceIds mothod * 1 * conflicts solve * modify listResources mothod and remove getResourceIds mothod * modify listResources mothod and remove getResourceIds mothod	4 years ago
zhuangchong	5bfe3fca67	[Fix][SqlTask] fix hive sqltask invalid connection parameters. (#4917) ... * fix hive sqltask invalid connection parameters. * add setConnParams test method. * update base datasource test class code style. * add BaseDataSourceTest in the pom xml. * update hive conf list jdbc url stitching. * update hive datasource test class.	4 years ago
JuFeng Li	397c78149c	[Fix-4929][dao]fix ClassCastException when run hive sql with udf (#4930) ... * ambari2.7.5+hdp3.1兼容ds1.3插件 * params.py * delete unuseless code * fix class cast exception Co-authored-by: 李巨丰 <lijf@2345.com>	4 years ago
Simon	c342980032	[Feature][jsonsplit] repalce project_id with code (#4904) ... * Modify Project and ProjectUser Mapper * Modify Project and ProjectUser Mapper * project_code is bigint(20) * modify ERROR name * modify saveProcessDefine, remove the duplicate code with createTaskAndRelation * modify import/export processdefinition, add genProcessData * fix ut and bug * code style * repalce project_id with code * conflicts solve * conflicts solve * conflicts solve * bugfix	4 years ago