20170323_jeffrey - silenceuncrio/diary GitHub Wiki
0910
çšźçş dmz
1620
cgi ĺ web äšĺ弽äş
尹塎富é渏芌äş
1640
dmz ĺ ä¸ĺ° git ĺ§
â prosrc git:(feature/dmz) â git checkout develop
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
â prosrc git:(develop) â git pull
remote: Counting objects: 50, done.
remote: Compressing objects: 100% (49/49), done.
remote: Total 50 (delta 17), reused 0 (delta 0)
Unpacking objects: 100% (50/50), done.
From 192.168.0.242:RD/M300
671445e..aed2ff3 develop -> origin/develop
First, rewinding head to replay your work on top of it...
Fast-forwarded develop to aed2ff3c6fb6c41630bf6633bc8d3e68a0337463.
â prosrc git:(develop) â git checkout feature/dmz
Switched to branch 'feature/dmz'
[42/1888]
â prosrc git:(feature/dmz) â git rebase develop
First, rewinding head to replay your work on top of it...
Applying: add dmz feature
Applying: first step of dmz implementation
Applying: implement dmz icos module
Applying: add cgi and web for dmz module
â prosrc git:(feature/dmz) â git flow feature finish
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
Merge made by the 'recursive' strategy.
proscend/base_fs/default/rootfs/home/factory/icos/dmz/dmzcfg.ini | 2 +
proscend/mconfig/Config.in | 1 +
proscend/mconfig/configs/M300/0_GENERIC/defconfig | 1 +
proscend/mconfig/configs/M300/1_GPS/defconfig | 1 +
proscend/prosrc/icos/icoslib/Makefile | 3 +
proscend/prosrc/icos/icoslib/dmz/dmzcfg.c | 586 ++++++++++++++++++++---------------------
proscend/prosrc/icos/icoslib/entry.c | 156 ++++++++---
proscend/prosrc/icos/icoslib/web/webcfg.c | 24 +-
proscend/prosrc/icos/include/module_dmz.h | 56 ++--
proscend/prosrc/webcgi/Makefile | 2 +-
proscend/prosrc/webcgi/dmz.c | 106 ++++++++
proscend/prosrc/www/app/app.controller.js | 0
proscend/prosrc/www/app/feature/configuration.js | 0
proscend/prosrc/www/app/feature/dmz.html | 48 ++++
proscend/prosrc/www/app/feature/dmz.js | 58 ++++
proscend/prosrc/www/app/feature/dynamicDns.js | 0
proscend/prosrc/www/app/feature/login.html | 0
proscend/prosrc/www/app/feature/openvpn.js | 0
proscend/prosrc/www/app/feature/status.js | 0
proscend/prosrc/www/app/locale-en.json | 10 +
proscend/prosrc/www/app/locale-fr.json | 9 +
proscend/prosrc/www/app/locale-zh-tw.json | 9 +
proscend/prosrc/www/app/services/icos.service.js | 11 +
proscend/prosrc/www/app/views/menu.html | 2 +
proscend/prosrc/www/index.html.src | 2 +
25 files changed, 726 insertions(+), 361 deletions(-)
create mode 100755 proscend/base_fs/default/rootfs/home/factory/icos/dmz/dmzcfg.ini
mode change 100644 => 100755 proscend/prosrc/icos/icoslib/Makefile
mode change 100755 => 100644 proscend/prosrc/icos/icoslib/web/webcfg.c
mode change 100644 => 100755 proscend/prosrc/icos/include/module_dmz.h
mode change 100644 => 100755 proscend/prosrc/webcgi/Makefile
create mode 100644 proscend/prosrc/webcgi/dmz.c
mode change 100755 => 100644 proscend/prosrc/www/app/app.controller.js
mode change 100755 => 100644 proscend/prosrc/www/app/feature/configuration.js
create mode 100755 proscend/prosrc/www/app/feature/dmz.html
create mode 100755 proscend/prosrc/www/app/feature/dmz.js
mode change 100755 => 100644 proscend/prosrc/www/app/feature/dynamicDns.js
mode change 100755 => 100644 proscend/prosrc/www/app/feature/login.html
mode change 100755 => 100644 proscend/prosrc/www/app/feature/openvpn.js
mode change 100755 => 100644 proscend/prosrc/www/app/feature/status.js
mode change 100755 => 100644 proscend/prosrc/www/app/services/icos.service.js
Deleted branch feature/dmz (was 9a2bc3b).
Summary of actions:
- The feature branch 'feature/dmz' was merged into 'develop'
- Feature branch 'feature/dmz' has been removed
- You are now on branch 'develop'
â prosrc git:(develop) â git pull
First, rewinding head to replay your work on top of it...
Applying: add dmz feature
Applying: first step of dmz implementation
Applying: implement dmz icos module
Applying: add cgi and web for dmz module
â prosrc git:(develop) â git log
â prosrc git:(develop) â git push
warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the traditional behavior, use:
git config --global push.default matching
To squelch this message and adopt the new behavior now, use:
git config --global push.default simple
When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.
Since Git 2.0, Git defaults to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.
See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)
Counting objects: 67, done.
Compressing objects: 100% (58/58), done.
Writing objects: 100% (67/67), 9.52 KiB | 0 bytes/s, done.
Total 67 (delta 39), reused 0 (delta 0)
remote:
remote: Create merge request for develop:
remote: http://192.168.0.242/RD/M300/merge_requests/new?merge_request%5Bsource_branch%5D=develop
remote:
To [email protected]:RD/M300.git
aed2ff3..6b9ed4e develop -> develop