Commit Graph

220 Commits

Author SHA1 Message Date
zhongyh16 fdbde29934 modify the addcluster page
change the ttl of heartbeat
create a new rpc client when execute a rpc call
2017-05-07 15:47:21 +08:00
zhongyh16 fb78cdff48 fix a billing bug 2017-04-10 16:06:11 +08:00
zhongyh16 974cb13811 Merge remote-tracking branch 'upstream/master' 2017-04-10 15:27:00 +08:00
zhongyh16 0bdc313258 monitor part of multiple master 2017-04-09 18:18:12 +08:00
zhongyh16 21cb80346d multiple master 2017-04-07 16:25:57 +08:00
zhuyj17 58c9a5178b Fix a bug of rpc when worker is stopped 2017-03-25 17:50:42 +08:00
zhongyehong e714049d54 Merge remote-tracking branch 'upstream/multimaster' 2017-03-19 20:47:55 +08:00
zhongyehong 48689cb1ff fix a bug 2016-12-18 00:49:11 +08:00
zhongyehong d8629cb454 make admin email address config can be change in admin page
don't compress when save image
2016-12-17 17:52:10 +08:00
zhongyehong 0e4b206d29 Merge branch 'external_login' 2016-12-04 17:42:27 +08:00
zhongyehong f09b2a1674 Merge remote-tracking branch 'upstream/master' into external_login 2016-12-04 17:37:04 +08:00
zhongyehong a729034525 save the image as a archived file
all admins' email can receive remind mail
2016-12-04 17:35:10 +08:00
zhuyj17 e01f9c1f1c Seperate monitor from users' databases. 2016-11-19 17:39:10 +08:00
zhongyehong e9403f1c3e fix some errors from merge 2016-11-17 15:40:58 +08:00
zhongyehong 80aaa0f4e2 Merge remote-tracking branch 'upstream/master' into multimaster 2016-11-17 14:43:24 +08:00
zhongyehong 1a8eef9867 change the user module to an independent http server. 2016-11-17 14:22:40 +08:00
zhuyj17 f6bce94d63 Change billing parameters 2016-11-13 14:40:48 +08:00
zhuyj17 b64716ba96 Add annotation to beansapplicationmgr.py 2016-11-13 14:36:04 +08:00
zhuyj17 f5d29ef751 Fix a little bug 2016-11-13 13:57:48 +08:00
zhuyj17 9bd64ac3c2 Add annotation to monitor.py 2016-11-13 13:46:12 +08:00
zhuyj17 1cc6c4e8e9 Add annotations. 2016-11-12 17:52:09 +08:00
zhuyj17 bc6d5a5c9c Change billing parameters. 2016-10-31 23:49:56 +08:00
zhuyj17 76622e3ed9 Fix the bug that can't send mail to remind users of beans. 2016-10-31 23:46:40 +08:00
zhuyj17 78ef75b75f Fix a billing bug that avemem is not correct. 2016-10-31 10:45:33 +08:00
zhuyj17 a55a2db6e1 Fix the billing this hour bug 2016-10-30 17:29:23 +08:00
zhuyj17 2b5383dd76 Fix billing this hour bug. 2016-10-30 17:05:16 +08:00
zhuyj17 ae5d9b9fd5 Fix a bug that reason can't input a new line. 2016-10-30 16:53:23 +08:00
zhuyj17 950d533036 Billing this hour will display 0 when container is stopped. 2016-10-30 15:54:22 +08:00
zhongyehong c41771e0b7 Merge remote-tracking branch 'upstream/master' into external_login 2016-10-29 17:47:02 +08:00
zhongyehong ae3453ee39 Merge remote-tracking branch 'upstream/master' 2016-10-29 17:43:36 +08:00
zhuyj17 f1db20c8ee Add billing this hour. 2016-10-23 23:42:29 +08:00
zhuyj17 ed6d0d6486 Modify some error message. 2016-10-23 22:36:02 +08:00
zhuyj17 48424e7bf5 Modify billing parameters and let docklet send email to remind users of their beans. 2016-10-23 17:47:08 +08:00
Firmlyzhu eec5310c6a Fix the bug of stop all cluster. 2016-10-15 17:38:39 +08:00
Peidong Liu 299d98850c Merge branch 'scripts-operation' 2016-10-10 01:48:36 +08:00
Peidong Liu 563f5620ae add chpassword in /user/info
toggle some test codes
2016-10-10 01:32:50 +08:00
Peidong Liu 89786e4b8d script operation test 2016-10-09 14:45:04 +08:00
zhuyj17 b03e6efe28 Fix a bug. 2016-10-07 00:06:09 +08:00
zhuyj17 b03018374a Fix a bug in monitor.py 2016-10-06 15:23:59 +08:00
zhuyj17 dcb85ef739 Fix little bugs. 2016-09-26 09:33:12 +08:00
zhuyj17 fad3beecfc Fix little bugs. 2016-09-26 09:31:23 +08:00
zhuyj17 ea4ba5c1cf Fix some little bugs. 2016-09-26 09:28:05 +08:00
zhuyj17 f24f38ead4 Add approval robot. 2016-09-25 21:06:46 +08:00
zhuyj17 8dfe21acd4 Add submission time to applymsg. 2016-09-25 17:17:34 +08:00
zhongyehong becb8306ee Merge branch 'master' of https://github.com/zhongyehong/docklet 2016-09-23 17:21:05 +08:00
zhongyehong a3c04cb5bd Merge remote-tracking branch 'upstream/master' 2016-09-23 17:14:00 +08:00
zhongyehong e1f9c24b15 change the image from directory to an archive 2016-09-23 17:11:37 +08:00
zhongyehong 95177efb19 Merge remote-tracking branch 'upstream/master' 2016-09-23 16:20:28 +08:00
Bao Li b6792f6632 Merge pull request #188 from PedroLiu/master
Now chpassword is a independent button
2016-09-19 09:47:32 +08:00
zhuyj17 6853d39055 Administrator can agree or reject beans applications on user list page. 2016-09-17 17:50:09 +08:00