m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 003d6ccd05 Merge pull request #268 from zhongyehong/master zhong yehong 2017-07-24 15:36:59 +0800
  • 7d5ec47dbb remove ip address from port mapping command zhongyh16 2017-07-24 15:33:24 +0800
  • f987ad2d5b Merge pull request #267 from FirmlyReality/portmapping Yujian Zhu 2017-07-17 11:32:23 +0800
  • 642374082d Remove ports mapping when scaleing in the cluster. zhuyj17 2017-07-17 11:30:21 +0800
  • a0387fce44 remove proxy & fix some bugs on config.html Firmlyzhu 2017-07-16 12:24:58 +0800
  • 3597ef7b08 Add recovery mode into ports mapping & stop cluster will delete ports mappings. zhuyj17 2017-07-14 13:01:36 +0800
  • 05317336de Add Port Mapping zhuyj17 2017-07-10 23:48:06 +0800
  • 072e74a658 Merge pull request #266 from zhongyehong/master zhong yehong 2017-07-05 12:48:27 +0800
  • 53403b01ee Update README.md zhong yehong 2017-07-05 12:47:57 +0800
  • f8b4459db8 Merge pull request #265 from JimmyMa520/master 马俊明 2017-07-03 14:49:24 +0800
  • b20e86a2c6 update docklet-arch.png Junming Ma 2017-07-03 14:43:57 +0800
  • b7d78044d1 Merge pull request #264 from FirmlyReality/devdocs Yujian Zhu 2017-06-30 11:41:28 +0800
  • 41ce0cabf0 Update network-arch.md Yujian Zhu 2017-06-30 11:39:18 +0800
  • d747937574 Add files via upload Yujian Zhu 2017-06-30 10:36:09 +0800
  • 355e832971 Delete workspace_requests.png Yujian Zhu 2017-06-30 10:35:43 +0800
  • efa6cfe25f update ovs_arch.png Yujian Zhu 2017-06-30 10:15:23 +0800
  • 3d35b187a8 Delete ovs_arch.png Yujian Zhu 2017-06-30 10:13:55 +0800
  • 1afa2b5fa7 Merge pull request #263 from zhongyehong/master zhong yehong 2017-06-26 18:49:37 +0800
  • 1eab9e5b5d Merge remote-tracking branch 'upstream/master' zhongyh16 2017-06-26 18:48:35 +0800
  • 58bda3c0f9 change the format of url, place the masterip on the second field zhongyh16 2017-06-26 18:46:01 +0800
  • 28b82819b4 Merge pull request #262 from JimmyMa520/master 马俊明 2017-06-21 21:06:04 +0800
  • fd0874bef3 add a docklet-arch image in README.md Junming Ma 2017-06-21 21:01:12 +0800
  • 1c5ee98794 Merge pull request #261 from FirmlyReality/devdocs Yujian Zhu 2017-06-19 00:32:54 +0800
  • 5874edbf81 add dev doc on architecture of network Yujian Zhu 2017-06-19 00:29:36 +0800
  • 43e9a35839 add images of processing users' requests Yujian Zhu 2017-06-19 00:25:35 +0800
  • 4b6a1802ce del Yujian Zhu 2017-06-19 00:24:52 +0800
  • dc11815bba del Yujian Zhu 2017-06-19 00:24:43 +0800
  • 8aac3d6c54 add images on processing users' requests Yujian Zhu 2017-06-19 00:23:34 +0800
  • 4a17c518dc add ovs_arch.png Yujian Zhu 2017-06-18 23:34:09 +0800
  • 7395222bea Merge pull request #260 from zhongyehong/master zhong yehong 2017-06-16 16:11:11 +0800
  • 8602b9b34d change some field in the settings page zhongyh16 2017-06-16 16:07:00 +0800
  • 082f28ca69 remove APPROVAL_RBT from docklet.conf.template zhongyh16 2017-06-16 16:04:32 +0800
  • 28f5a05cd7 change the admin page to settings page move editable setting to settings page change the settings request from master to user add 2 editable settings:OPEN_REGISTRY and APPROVAL_RBT remove some setting from docklet.conf.template zhongyh16 2017-06-16 16:01:46 +0800
  • 652f8fa504 Merge pull request #259 from PedroLiu/master PedroLiu 2017-06-16 01:21:13 +0800
  • 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) Peidong Liu 2017-06-16 01:18:35 +0800
  • 26b9c6cf81 Merge pull request #258 from FirmlyReality/devdocs Yujian Zhu 2017-06-14 16:10:22 +0800
  • 09745ab8e1 Add APPROVAL_RBT to docklet.conf and user can turn on or off the robot by the field. Firmlyzhu 2017-06-14 15:45:51 +0800
  • d7123625c6 Merge pull request #256 from zhongyehong/master zhong yehong 2017-06-07 13:34:15 +0800
  • 551f2ffd16 change help url change the order of master start zhongyh16 2017-06-07 13:32:13 +0800
  • 1ffa2bb176 Merge pull request #255 from caodg/master Cao, Donggang 2017-06-06 20:41:03 +0800
  • 84e511acef update README Donggang Cao 2017-06-06 20:39:45 +0800
  • 10b5b6e1c9 update README Donggang Cao 2017-06-06 20:34:01 +0800
  • e998ca6205 Merge pull request #254 from zhongyehong/master zhong yehong 2017-06-05 15:32:37 +0800
  • 3cf3d482c9 add OPEN_REGISTRY to control whether allow user to register a new account. zhongyh16 2017-06-05 15:30:27 +0800
  • bcf65075f2 Merge pull request #253 from zhongyehong/master zhong yehong 2017-06-05 13:45:00 +0800
  • 54261247e6 change the default root password, it will be generate in FSPREFIX/local/generated_password.txt zhongyh16 2017-06-05 13:36:43 +0800
  • 69d3b1443f Merge remote-tracking branch 'upstream/master' zhongyh16 2017-06-05 13:12:04 +0800
  • 0b5e5a07e4 update README.md zhongyh16 2017-06-05 13:11:48 +0800
  • d5c340cf63 Merge pull request #252 from FirmlyReality/master Yujian Zhu 2017-06-02 16:54:17 +0800
  • e1d134f4c2 update README.md Firmlyzhu 2017-06-02 16:53:26 +0800
  • d71ea855cf Merge pull request #251 from FirmlyReality/publicIP Yujian Zhu 2017-05-29 23:35:39 +0800
  • 6810e754c0 fix function name error zhuyj17 2017-05-29 23:33:02 +0800
  • e4962455bc Merge pull request #250 from JimmyMa520/master 马俊明 2017-05-29 21:17:30 +0800
  • af8383fa8d manage containers with standard lxc api majm16 2017-05-29 21:06:26 +0800
  • c78bf1c0c2 Add public IP Firmlyzhu 2017-05-29 16:45:35 +0800
  • 9ad36595b9 Add public Ip Firmlyzhu 2017-05-29 15:19:45 +0800
  • d81ccd1983 update README.md Firmlyzhu 2017-05-28 12:15:50 +0800
  • 202fb7bdde Merge pull request #249 from FirmlyReality/network Yujian Zhu 2017-05-22 17:23:22 +0800
  • fd3faee093 Fix a bug that remove gre when recovering usernet zhuyj17 2017-05-22 17:21:06 +0800
  • 98df83c1b2 Merge pull request #248 from FirmlyReality/network Yujian Zhu 2017-05-22 14:22:23 +0800
  • 221db0c1b0 fix conflict zhuyj17 2017-05-21 23:42:06 +0800
  • eb347e9f56 Merge pull request #247 from FirmlyReality/master Yujian Zhu 2017-05-21 20:39:29 +0800
  • a4fb1b8107 fill usrgws in check_usergw zhuyj17 2017-05-21 20:38:01 +0800
  • 3785ff1cdb Merge pull request #246 from zhongyehong/master zhong yehong 2017-05-21 16:15:01 +0800
  • 7a29ec0437 Merge remote-tracking branch 'upstream/master' zhongyh16 2017-05-21 16:13:22 +0800
  • ebbbbee96b fill the proxy_server ip when recover a stopped cluster zhongyh16 2017-05-21 16:11:54 +0800
  • 36d4813b3b Merge pull request #245 from zhongyehong/master zhong yehong 2017-05-21 16:09:32 +0800
  • 148fa72d2a add master description in dashboard and addcluster page zhongyh16 2017-05-21 16:08:12 +0800
  • 589ebefc3c Delete old gre when moving gateway to master. zhuyj17 2017-05-21 13:47:58 +0800
  • 7692fbb3ea build usernet for new node when adding nodes to running clusters zhuyj17 2017-05-21 13:40:59 +0800
  • 5b6586a43e update update_con_network.py zhuyj17 2017-05-19 22:11:00 +0800
  • 9651d05d47 replace vxlan with gre zhuyj17 2017-05-19 21:52:43 +0800
  • f97e424268 add ovscontrol to network zhuyj17 2017-05-17 19:47:29 +0800
  • bf026d4830 Merge branch 'master' of https://github.com/unias/docklet into network zhuyj17 2017-05-17 18:39:40 +0800
  • addd928427 Merge pull request #243 from zhongyehong/master zhong yehong 2017-05-16 18:05:10 +0800
  • e91a6e9925 Merge remote-tracking branch 'upstream/master' zhongyh16 2017-05-16 18:02:52 +0800
  • 951f45c63b add clean-usage fix the bug of usage release change the interval and the logic of heartbeart zhongyh16 2017-05-16 17:48:25 +0800
  • 64cd79e680 Merge pull request #242 from FirmlyReality/master Yujian Zhu 2017-05-16 17:02:01 +0800
  • 986f0ee243 update proxy_url zhuyj17 2017-05-16 16:59:48 +0800
  • 92f15b26be update baseurl when change from distributed gateway to non-distributed gateway zhuyj17 2017-05-16 16:33:22 +0800
  • 27df72e59e Merge pull request #241 from FirmlyReality/master Yujian Zhu 2017-05-16 15:32:15 +0800
  • fa5ce9e636 add usrgws when user has been existed zhuyj17 2017-05-16 15:30:50 +0800
  • a18398dfb6 add a script to update network in container config zhuyj17 2017-05-16 11:15:23 +0800
  • 08c5c780c0 change network config in container.conf zhuyj17 2017-05-16 10:10:09 +0800
  • e3cb5c63a3 fix conflict zhuyj17 2017-05-16 09:15:45 +0800
  • c146248a58 Merge pull request #240 from FirmlyReality/master Yujian Zhu 2017-05-16 09:11:52 +0800
  • e7edb1024d add if status in usrgw zhuyj17 2017-05-16 09:10:14 +0800
  • 3a25964b0b Merge pull request #239 from FirmlyReality/master Yujian Zhu 2017-05-16 00:46:49 +0800
  • 0b2c408349 remove in nginx_docklet.conf when nginx_port=80 zhuyj17 2017-05-16 00:45:46 +0800
  • 787e95ef5f Merge pull request #238 from FirmlyReality/master Yujian Zhu 2017-05-15 23:59:20 +0800
  • 8b992483cb add self to write_clusterinfo zhuyj17 2017-05-15 23:58:35 +0800
  • e84a7e35aa Merge pull request #237 from FirmlyReality/master Yujian Zhu 2017-05-15 23:39:11 +0800
  • 9eced464fd 1.check usrgw when call has_user. 2.update base_url in container zhuyj17 2017-05-15 23:37:07 +0800
  • 04f6c9c923 Merge pull request #236 from zhongyehong/master zhong yehong 2017-05-15 17:31:02 +0800
  • 90d8098849 fix a bug of user directory not exists zhongyh16 2017-05-15 17:29:46 +0800
  • 6590458591 fix a bug when user directory not exists zhongyh16 2017-05-15 17:24:31 +0800
  • b0c7d91e72 Merge pull request #235 from zhongyehong/master zhong yehong 2017-05-15 16:17:42 +0800
  • 1f38e62421 update etcd-multi-nodes.sh zhongyh16 2017-05-15 16:16:15 +0800
  • 59f8738bd5 Merge pull request #234 from zhongyehong/master zhong yehong 2017-05-15 16:04:21 +0800
  • 2d51406fdd update etcd-multi-nodes.sh zhongyh16 2017-05-15 15:26:25 +0800