chenlw
							
						 | 
						
							
							
							
							
								
							
								d4cf015596
								
							
								
							
						 | 
						
							
							
								
								迁移数据的位置在原数据路径或者原数据父目录及其上,不允许迁移
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								83a10a1f45
								
							
								
							
						 | 
						
							
							
								
								volume路径为空时,修改
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 wu ming
							
						 | 
						
							
							
							
							
								
							
								591512730f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into develope
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 wu ming
							
						 | 
						
							
							
							
							
								
							
								564b286856
								
							
								
							
						 | 
						
							
							
								
								--nonthing
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								312eeeecda
								
							
								
							
						 | 
						
							
							
								
								迁移数据,目的数据无权限问题修复
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								7d4bec698f
								
							
								
							
						 | 
						
							
							
								
								版本查询问题修复
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								3829dabbbf
								
							
								
							
						 | 
						
							
							
								
								删除volume前,先stop volume,如果volume是stopped状态的,则返回0
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								a2b6affc16
								
							
								
							
						 | 
						
							
							
								
								volume是started状态的删除失败,删除前先stop,如果volume已经是stop状态,则返回0
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								86db77dd5c
								
							
								
							
						 | 
						
							
							
								
								迁移后数据赋权限
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								44260a720c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								bf7d7598b7
								
							
								
							
						 | 
						
							
							
								
								volume停用后导致df命令出错,停用的volume查询不出,volume路径查询出错问题
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								lily
							
						 | 
						
							
							
							
							
								
							
								ae98543e24
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								lily
							
						 | 
						
							
							
							
							
								
							
								8763777363
								
							
								
							
						 | 
						
							
							
								
								fix no peer
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								94a18d8258
								
							
								
							
						 | 
						
							
							
								
								shell命令获得正常输出流后就不再去获取异常流
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								df71293e0d
								
							
								
							
						 | 
						
							
							
								
								迁移数据时,源目录文件不存在时,迁移失败。
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								b803b3825c
								
							
								
							
						 | 
						
							
							
								
								删除数据,只删除该条数据目录的版本目录,不删除系统目录
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								1bbd61f8c0
								
							
								
							
						 | 
						
							
							
								
								volume变化后立即更新
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								84041726c4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								6aa31f96f5
								
							
								
							
						 | 
						
							
							
								
								修复gfs连接问题
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								lily
							
						 | 
						
							
							
							
							
								
							
								c647b81234
								
							
								
							
						 | 
						
							
							
								
								back
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								lily
							
						 | 
						
							
							
							
							
								
							
								9b311366a5
								
							
								
							
						 | 
						
							
							
								
								fix otherConn null
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								lily
							
						 | 
						
							
							
							
							
								
							
								4002c4d74d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								lily
							
						 | 
						
							
							
							
							
								
							
								39435520bf
								
							
								
							
						 | 
						
							
							
								
								lili
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								a9b94717c1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'web_backend_develope' of
							
							
							
							
							
							
							
							https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope
Conflicts:
	src/com/platform/utils/GanymedSSH.java 
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								9bd7a694df
								
							
								
							
						 | 
						
							
							
								
								合并
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								3f9a10d873
								
							
								
							
						 | 
						
							
							
								
								接收前端传入的gfs的volume相关信息,进行新建volume,删除volume,启用volume,停用volume,新增brick,删除brick,
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								lily
							
						 | 
						
							
							
							
							
								
							
								45bfd2eca8
								
							
								
							
						 | 
						
							
							
								
								add the connection pool
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								lily
							
						 | 
						
							
							
							
							
								
							
								984d6628f9
								
							
								
							
						 | 
						
							
							
								
								lili
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								lily
							
						 | 
						
							
							
							
							
								
							
								ad4620c43e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								40158bb583
								
							
								
							
						 | 
						
							
							
								
								放开spring内存监听
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								3ae6a6e38d
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								98ff0a1920
								
							
								
							
						 | 
						
							
							
								
								gfs的volume增删,启用停用,brick的增删
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								lily
							
						 | 
						
							
							
							
							
								
							
								b8f723d05d
								
							
								
							
						 | 
						
							
							
								
								lili
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								lily
							
						 | 
						
							
							
							
							
								
							
								ad07f0874f
								
							
								
							
						 | 
						
							
							
								
								alter config
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								d8732dee1f
								
							
								
							
						 | 
						
							
							
								
								配置文件修改,添加mapper文件扫入
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								f3b3b6dbf8
								
							
								
							
						 | 
						
							
							
								
								volume的增删,启动,停止
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								278c3d3aae
								
							
								
							
						 | 
						
							
							
								
								修改迁移时,volume的path未写入的bug
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 wu ming
							
						 | 
						
							
							
							
							
								
							
								caf65a0996
								
							
								
							
						 | 
						
							
							
								
								增加数据冷热分区
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								5837fb8a65
								
							
								
							
						 | 
						
							
							
								
								冷热区字段更改
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								e018bf658d
								
							
								
							
						 | 
						
							
							
								
								volumeType,冷热区的更改
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								5d38743d08
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'web_backend_develope' of
							
							
							
							
							
							
							
							https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope
Conflicts:
	src/com/platform/controller/DataModelController.java
	src/com/platform/utils/FileOperateHelper.java 
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								9c67da3c63
								
							
								
							
						 | 
						
							
							
								
								合并
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 wu ming
							
						 | 
						
							
							
							
							
								
							
								f645d6e119
								
							
								
							
						 | 
						
							
							
								
								完善抽取功能
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 wu ming
							
						 | 
						
							
							
							
							
								
							
								34e31fbc6d
								
							
								
							
						 | 
						
							
							
								
								解决抽取执行失败问题
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								ee7128c617
								
							
								
							
						 | 
						
							
							
								
								日志bug修改
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								191aecd828
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'web_backend_develope' of
							
							
							
							
							
							
							
							https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope
Conflicts:
	src/com/platform/controller/DataModelController.java
	src/com/platform/oracle/OracleConnector.java
	src/com/platform/service/OracleExtractHelper.java
	src/com/platform/service/impl/OracleExtractServiceImpl.java 
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								2cde2f47a1
								
							
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 wu ming
							
						 | 
						
							
							
							
							
								
							
								f791e9506a
								
							
								
							
						 | 
						
							
							
								
								修改--9.22
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 chenlw
							
						 | 
						
							
							
							
							
								
							
								9a8b55a674
								
							
								
							
						 | 
						
							
							
								
								读取日志
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 wu ming
							
						 | 
						
							
							
							
							
								
							
								983a2ce749
								
							
								
							
						 | 
						
							
							
								
								合并--9.22
							
							
							
							
							
						 | 
						
							9 years ago |