Commit Graph

Select branches

Hide Pull Requests

Web_Manager_Develope

glusterfs-api

master

presto-jd

web_backend_develope

web_gfs

Mono Color

• 312eeeecda 迁移数据，目的数据无权限问题修复 chenlw 2016-09-30 17:24:27 +0800
• e7114cb8f1 --9.30 wu ming 2016-09-30 13:31:31 +0800
• d5cde984f4 修改GFS配置界面 wu ming 2016-09-30 11:20:11 +0800
• 7d4bec698f 版本查询问题修复 chenlw 2016-09-30 08:59:24 +0800
• 3829dabbbf 删除volume前，先stop volume，如果volume是stopped状态的，则返回0 chenlw 2016-09-29 16:46:21 +0800
• a2b6affc16 volume是started状态的删除失败，删除前先stop,如果volume已经是stop状态，则返回0 chenlw 2016-09-29 16:45:07 +0800
• 86db77dd5c 迁移后数据赋权限 chenlw 2016-09-29 16:33:54 +0800
• b6411bc87b 修改volume添加页面确认按钮不生效的Bug wu ming 2016-09-29 15:42:48 +0800
• adb0638a4c --9.9 wu ming 2016-09-29 14:00:13 +0800
• a9f82ff247 修个volume状态按钮 wu ming 2016-09-29 10:19:39 +0800
• 44260a720c Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope chenlw 2016-09-29 09:43:12 +0800
• bf7d7598b7 volume停用后导致df命令出错，停用的volume查询不出，volume路径查询出错问题 chenlw 2016-09-29 09:37:59 +0800
• ae98543e24 Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope lily 2016-09-28 17:33:49 +0800
• 8763777363 fix no peer lily 2016-09-28 17:33:32 +0800
• 7268a3f121 功能完善 wu ming 2016-09-28 17:04:00 +0800
• 94a18d8258 shell命令获得正常输出流后就不再去获取异常流 chenlw 2016-09-28 16:46:54 +0800
• df71293e0d 迁移数据时，源目录文件不存在时，迁移失败。 chenlw 2016-09-28 16:45:09 +0800
• b803b3825c 删除数据，只删除该条数据目录的版本目录，不删除系统目录 chenlw 2016-09-28 16:44:24 +0800
• 1bbd61f8c0 volume变化后立即更新 chenlw 2016-09-28 16:43:35 +0800
• 84041726c4 Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope chenlw 2016-09-28 11:07:17 +0800
• 6aa31f96f5 修复gfs连接问题 chenlw 2016-09-28 11:06:53 +0800
• c647b81234 back lily 2016-09-28 10:56:57 +0800
• 9b311366a5 fix otherConn null lily 2016-09-28 09:10:33 +0800
• 091edca9cc 9.27 wu ming 2016-09-27 23:03:09 +0800
• 4002c4d74d Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope lily 2016-09-27 20:52:16 +0800
• 39435520bf lili lily 2016-09-27 20:52:08 +0800
• a9b94717c1 Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope chenlw 2016-09-27 20:06:32 +0800
• 9bd7a694df 合并 chenlw 2016-09-27 19:53:13 +0800
• 3f9a10d873 接收前端传入的gfs的volume相关信息，进行新建volume,删除volume,启用volume,停用volume，新增brick，删除brick， chenlw 2016-09-27 19:46:14 +0800
• 45bfd2eca8 add the connection pool lily 2016-09-27 17:54:54 +0800
• 1fe0e27d9f 完善gfs配置页面 wu ming 2016-09-27 10:32:01 +0800
• 9fba2532f1 修改gfs wu ming 2016-09-27 08:54:00 +0800
• 984d6628f9 lili lily 2016-09-27 08:42:48 +0800
• ad4620c43e Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope lily 2016-09-26 19:40:48 +0800
• db2884438d 修改gfs配置界面 wu ming 2016-09-26 19:39:18 +0800
• 40158bb583 放开spring内存监听 chenlw 2016-09-26 19:23:26 +0800
• 3ae6a6e38d . chenlw 2016-09-26 19:23:05 +0800
• 98ff0a1920 gfs的volume增删，启用停用，brick的增删 chenlw 2016-09-26 19:22:50 +0800
• b8f723d05d lili lily 2016-09-24 20:21:04 +0800
• ad07f0874f alter config lily 2016-09-24 17:27:03 +0800
• d8732dee1f 配置文件修改，添加mapper文件扫入 chenlw 2016-09-23 20:38:30 +0800
• f3b3b6dbf8 volume的增删，启动，停止 chenlw 2016-09-23 20:37:15 +0800
• 278c3d3aae 修改迁移时，volume的path未写入的bug chenlw 2016-09-23 19:49:53 +0800
• 669d2c84ab 添加gfs中brock的删增功能 wu ming 2016-09-23 16:55:53 +0800
• caf65a0996 增加数据冷热分区 wu ming 2016-09-23 09:21:09 +0800
• 5837fb8a65 冷热区字段更改 chenlw 2016-09-23 09:13:23 +0800
• ab2ccee7ff 增加过来冷热数据功能 wu ming 2016-09-22 19:44:12 +0800
• e018bf658d volumeType，冷热区的更改 chenlw 2016-09-22 19:43:04 +0800
• 5d38743d08 Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope chenlw 2016-09-22 17:21:56 +0800
• 9c67da3c63 合并 chenlw 2016-09-22 17:20:01 +0800
• f645d6e119 完善抽取功能 wu ming 2016-09-22 17:11:09 +0800
• 34e31fbc6d 解决抽取执行失败问题 wu ming 2016-09-22 16:00:14 +0800
• ee7128c617 日志bug修改 chenlw 2016-09-22 15:59:58 +0800
• 22902602ff 修改replicationController.ts wu ming 2016-09-22 15:24:49 +0800
• 191aecd828 Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope chenlw 2016-09-22 14:51:41 +0800
• 2cde2f47a1 修改 chenlw 2016-09-22 14:41:38 +0800
• f791e9506a 修改--9.22 wu ming 2016-09-22 14:37:47 +0800
• 9a8b55a674 读取日志 chenlw 2016-09-22 14:34:23 +0800
• 983a2ce749 合并--9.22 wu ming 2016-09-22 11:23:39 +0800
• 0a5b380ee7 for merge wu ming 2016-09-22 10:42:46 +0800
• 058a232cbb 抽取修改 chenlw 2016-09-22 10:40:28 +0800
• 0b37e589f9 抽取修改 chenlw 2016-09-22 10:39:03 +0800
• c13b64f287 抽取sql的bug修改 chenlw 2016-09-22 10:37:26 +0800
• bd81c5caa0 修改抽取时的bug chenlw 2016-09-22 08:42:02 +0800
• 30a2d220ef 完善 wu ming 2016-09-21 17:37:09 +0800
• cd70315dc7 chou qu oracle chenlw 2016-09-21 16:02:31 +0800
• 7ca8118466 chouqu chenlw 2016-09-21 15:59:53 +0800
• ec4dd98377 chou qu oracle chenlw 2016-09-21 15:58:54 +0800
• fead9d9371 Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope chenlw 2016-09-20 20:45:20 +0800
• 6c3d873e46 完善数据迁移进度页面 wu ming 2016-09-20 20:33:01 +0800
• 4d8078c6c1 调试修改代码-联调 chenlw 2016-09-20 20:32:46 +0800
• 8b01a83b0d 合并---9.20 wu ming 2016-09-20 19:01:29 +0800
• 25d67ad44e 功能调整和完善--9.20 wu ming 2016-09-20 19:00:09 +0800
• faadafadfd --完善功能 wu ming 2016-09-20 18:52:11 +0800
• a7d7f55c54 daily commit glusterfs-api lily 2016-09-20 15:43:57 +0800
• e42e9b9554 update .gitignore wu ming 2016-09-20 15:03:30 +0800
• a82a9b0397 update .gitignore wu ming 2016-09-20 15:03:20 +0800
• 0412d82278 合并--9.20 wu ming 2016-09-20 14:50:08 +0800
• 83170155be --合并 wu ming 2016-09-20 14:47:36 +0800
• b56e1a8deb 恢复test chenlw 2016-09-20 14:46:38 +0800
• a1310b127d 会略 chenlw 2016-09-20 14:19:04 +0800
• 172b1b512b Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform chenlw 2016-09-20 14:13:29 +0800
• d35115800d update .gitignore wu ming 2016-09-20 14:13:39 +0800
• e1e273fb1c update .gitignore wu ming 2016-09-20 14:12:08 +0800
• 19e9b502ec 接收请求方式修改 chenlw 2016-09-20 14:01:52 +0800
• b252d63312 联调之前测试后修改请求接收方式 chenlw 2016-09-20 13:54:51 +0800
• 57a2cd17af 修改oracle连接策略 wu ming 2016-09-20 11:30:32 +0800
• d4db086706 Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into develope wu ming 2016-09-20 09:10:15 +0800
• d3e79bd886 合并---- wu ming 2016-09-20 09:09:33 +0800
• 09064c9d9e 多字段模糊查询数据， chenlw 2016-09-19 18:49:33 +0800
• 5ba88b2d41 解决冲突---- wu ming 2016-09-19 13:58:47 +0800
• cf2cfd54d7 添加集群弹框样式调整 Linda 2016-09-19 13:45:10 +0800
• e317bfbacc nothing wu ming 2016-09-19 13:30:19 +0800
• e76717783e 合并-9.19 wu ming 2016-09-19 11:21:41 +0800
• d059c714ca 合并-9.19 wu ming 2016-09-19 11:21:06 +0800
• c832fb16f3 完善GFS配置页面 wu ming 2016-09-19 11:16:28 +0800
• 218a5c6bea GFS配置页面 Linda 2016-09-19 10:40:50 +0800
• f4d9113d4c 修改字段 chenlw 2016-09-18 18:53:21 +0800
• 267f87a09e 增加检索功能 wu ming 2016-09-18 18:51:04 +0800
• 51c06b3a8a Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform chenlw 2016-09-18 15:56:46 +0800