m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
588 Commits 1 Branch 0 Tags 4.4 MiB
Commit Graph

588 Commits

Author SHA1 Message Date
Peidong Liu 2057f4535b now in /settings/, admin can input several email addreses instead of only one 
delete mail settings in /admin/ (need to reconfig the docklet.conf)
 2017-06-16 01:18:35 +08:00
Yujian Zhu 26b9c6cf81 Merge pull request #258 from FirmlyReality/devdocs 
Add APPROVAL_RBT to docklet.conf
 2017-06-14 16:10:22 +08:00
Firmlyzhu 09745ab8e1 Add APPROVAL_RBT to docklet.conf and user can turn on or off the robot by the field. 2017-06-14 15:45:51 +08:00
zhong yehong d7123625c6 Merge pull request #256 from zhongyehong/master 
change help url
 2017-06-07 13:34:15 +08:00
zhongyh16 551f2ffd16 change help url 
change the order of master start
 2017-06-07 13:32:13 +08:00
Cao, Donggang 1ffa2bb176 Merge pull request #255 from caodg/master 
update readme
 2017-06-06 20:41:03 +08:00
Donggang Cao 84e511acef update README 2017-06-06 20:39:45 +08:00
Donggang Cao 10b5b6e1c9 update README 2017-06-06 20:34:01 +08:00
zhong yehong e998ca6205 Merge pull request #254 from zhongyehong/master 
add OPEN_REGISTRY to control whether allow user to register a new
 2017-06-05 15:32:37 +08:00
zhongyh16 3cf3d482c9 add OPEN_REGISTRY to control whether allow user to register a new 
account.
 2017-06-05 15:30:27 +08:00
zhong yehong bcf65075f2 Merge pull request #253 from zhongyehong/master 
update README.md
 2017-06-05 13:45:00 +08:00
zhongyh16 54261247e6 change the default root password, it will be generate in 
FSPREFIX/local/generated_password.txt
 2017-06-05 13:36:43 +08:00
zhongyh16 69d3b1443f Merge remote-tracking branch 'upstream/master' 2017-06-05 13:12:04 +08:00
zhongyh16 0b5e5a07e4 update README.md 2017-06-05 13:11:48 +08:00
Yujian Zhu d5c340cf63 Merge pull request #252 from FirmlyReality/master 
update README.md
 2017-06-02 16:54:17 +08:00
Firmlyzhu e1d134f4c2 update README.md 2017-06-02 16:53:26 +08:00
Yujian Zhu d71ea855cf Merge pull request #251 from FirmlyReality/publicIP 
Public ip
 2017-05-29 23:35:39 +08:00
zhuyj17 6810e754c0 fix function name error 2017-05-29 23:33:02 +08:00
马俊明 e4962455bc Merge pull request #250 from JimmyMa520/master 
manage containers with standard lxc api
 2017-05-29 21:17:30 +08:00
majm16 af8383fa8d manage containers with standard lxc api 2017-05-29 21:06:26 +08:00
Firmlyzhu c78bf1c0c2 Add public IP 2017-05-29 16:45:35 +08:00
Firmlyzhu 9ad36595b9 Add public Ip 2017-05-29 15:19:45 +08:00
Firmlyzhu d81ccd1983 update README.md 2017-05-28 12:15:50 +08:00
Yujian Zhu 202fb7bdde Merge pull request #249 from FirmlyReality/network 
Fix a bug that remove gre when recovering usernet
 2017-05-22 17:23:22 +08:00
zhuyj17 fd3faee093 Fix a bug that remove gre when recovering usernet 2017-05-22 17:21:06 +08:00
Yujian Zhu 98df83c1b2 Merge pull request #248 from FirmlyReality/network 
Private OVS Network
 2017-05-22 14:22:23 +08:00
zhuyj17 221db0c1b0 fix conflict 2017-05-21 23:42:06 +08:00
Yujian Zhu eb347e9f56 Merge pull request #247 from FirmlyReality/master 
fill usrgws in check_usergw
 2017-05-21 20:39:29 +08:00
zhuyj17 a4fb1b8107 fill usrgws in check_usergw 2017-05-21 20:38:01 +08:00
zhong yehong 3785ff1cdb Merge pull request #246 from zhongyehong/master 
fill the proxy_server ip when recover a stopped cluster
 2017-05-21 16:15:01 +08:00
zhongyh16 7a29ec0437 Merge remote-tracking branch 'upstream/master' 2017-05-21 16:13:22 +08:00
zhongyh16 ebbbbee96b fill the proxy_server ip when recover a stopped cluster 2017-05-21 16:11:54 +08:00
zhong yehong 36d4813b3b Merge pull request #245 from zhongyehong/master 
add master description in dashboard and addcluster page
 2017-05-21 16:09:32 +08:00
zhongyh16 148fa72d2a add master description in dashboard and addcluster page 2017-05-21 16:08:12 +08:00
zhuyj17 589ebefc3c Delete old gre when moving gateway to master. 2017-05-21 13:47:58 +08:00
zhuyj17 7692fbb3ea build usernet for new node when adding nodes to running clusters 2017-05-21 13:40:59 +08:00
zhuyj17 5b6586a43e update update_con_network.py 2017-05-19 22:11:00 +08:00
zhuyj17 9651d05d47 replace vxlan with gre 2017-05-19 21:52:43 +08:00
zhuyj17 f97e424268 add ovscontrol to network 2017-05-17 19:47:29 +08:00
zhuyj17 bf026d4830 Merge branch 'master' of https://github.com/unias/docklet into network 2017-05-17 18:39:40 +08:00
zhong yehong addd928427 Merge pull request #243 from zhongyehong/master 
fix the bug of usage release
 2017-05-16 18:05:10 +08:00
zhongyh16 e91a6e9925 Merge remote-tracking branch 'upstream/master' 2017-05-16 18:02:52 +08:00
zhongyh16 951f45c63b add clean-usage 
fix the bug of usage release
change the interval and the logic of heartbeart
 2017-05-16 17:48:25 +08:00
Yujian Zhu 64cd79e680 Merge pull request #242 from FirmlyReality/master 
update baseurl and proxy_url when change from distributed gateway to non-distributed gateway
 2017-05-16 17:02:01 +08:00
zhuyj17 986f0ee243 update proxy_url 2017-05-16 16:59:48 +08:00
zhuyj17 92f15b26be update baseurl when change from distributed gateway to non-distributed gateway 2017-05-16 16:33:22 +08:00
Yujian Zhu 27df72e59e Merge pull request #241 from FirmlyReality/master 
add usrgws when user has been existed
 2017-05-16 15:32:15 +08:00
zhuyj17 fa5ce9e636 add usrgws when user has been existed 2017-05-16 15:30:50 +08:00
zhuyj17 a18398dfb6 add a script to update network in container config 2017-05-16 11:15:23 +08:00
zhuyj17 08c5c780c0 change network config in container.conf 2017-05-16 10:10:09 +08:00