[PATCH] [Wok 0/6] Update man page content
Aline Manera (6): Remove --access-log and --error-log options from wokd command Use underscore in all wokd command options Update AUTHORS content according to git-log command Update COPYING file to reflect all the imported code Update man page document Fix typo in license header AUTHORS | 67 ++++++++++++++++--- COPYING | 114 +++++++++++++++++++++++++++++--- docs/wokd.8.in | 149 +++++++++++++++++++++++------------------- src/wokd.in | 20 +++--- tests/test_exception.py | 4 +- tests/test_objectstore.py | 4 +- tests/test_plugin.py | 4 +- tests/test_rollbackcontext.py | 4 +- tests/test_server.py | 6 +- tests/test_utils.py | 4 +- tests/utils.py | 4 +- 11 files changed, 268 insertions(+), 112 deletions(-) -- 2.7.4
Make it consistent with Wok configuration file options. There, the user may only specify the log directory instead of the log file. So do that while using the wokd command directly. Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- src/wokd.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/wokd.in b/src/wokd.in index 339e4e1..c2b34e1 100644 --- a/src/wokd.in +++ b/src/wokd.in @@ -2,7 +2,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -66,12 +66,7 @@ def main(options): "(default %s)" % session_timeout) parser.add_option('--log-level', default=logLevel, help="Logging level") - parser.add_option('--access-log', - default=os.path.join(logDir, ACCESS_LOG), - help="Access log file") - parser.add_option('--error-log', - default=os.path.join(logDir, ERROR_LOG), - help="Error log file") + parser.add_option('--log-dir', default=logDir, help="Log directory") parser.add_option('--environment', default=runningEnv, help="Running environment of wok server") parser.add_option('--test', action='store_true', @@ -80,6 +75,9 @@ def main(options): help="Relative path to server") (options, args) = parser.parse_args() + setattr(options, 'access_log', os.path.join(options.log_dir, ACCESS_LOG)) + setattr(options, 'error_log', os.path.join(options.log_dir, ERROR_LOG)) + # Update config.config with the command line values # So the whole application will have access to accurate values for sec in config.config.sections(): -- 2.7.4
Instead of mixing underscore and hifen among the wokd command options, use always underscore to keep consistence. Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- src/wokd.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wokd.in b/src/wokd.in index c2b34e1..b701f34 100644 --- a/src/wokd.in +++ b/src/wokd.in @@ -53,7 +53,7 @@ def main(options): logLevel = config.config.get("logging", "log_level") parser = OptionParser() - parser.add_option('--proxy-port', type="int", default=proxy_port, + parser.add_option('--proxy_port', type="int", default=proxy_port, help="Port to enable SSL (default %s)" % proxy_port) parser.add_option('--cherrypy_port', type="int", default=cherrypy_port, help="Cherrypy server port (default %s)" % cherrypy_port) @@ -64,15 +64,15 @@ def main(options): help="Number of minutes that a session can remain idle " "before the server terminates it automatically. " "(default %s)" % session_timeout) - parser.add_option('--log-level', default=logLevel, + parser.add_option('--log_level', default=logLevel, help="Logging level") - parser.add_option('--log-dir', default=logDir, help="Log directory") + parser.add_option('--log_dir', default=logDir, help="Log directory") parser.add_option('--environment', default=runningEnv, help="Running environment of wok server") - parser.add_option('--test', action='store_true', - help="Run server in mock model") parser.add_option('--server_root', type="string", default=server_root, help="Relative path to server") + parser.add_option('--test', action='store_true', + help="Run server in mock model") (options, args) = parser.parse_args() setattr(options, 'access_log', os.path.join(options.log_dir, ACCESS_LOG)) -- 2.7.4
The file was updated according to the command: git log --format='%aN <%aE>' | awk '{arr[$0]++} END{for (i in arr){printi;}}' | sort Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- AUTHORS | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/AUTHORS b/AUTHORS index 3f75332..0b10364 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,32 +1,81 @@ Adam King <rak@linux.vnet.ibm.com> +Adam Litke <adam.litke@gmail.com> Adam Litke <agl@linux.vnet.ibm.com> +Adam <rak@linux.vnet.ibm.com> +adriano <abotega@localhost.localdomain> Adriano Botega <abotega@linux.vnet.ibm.com> +agl@linux.vnet.ibm.com <agl@linux.vnet.ibm.com> +Alan Jenkins <alan.james.jenkins@gmail.com> Alexandre Tanaka Hirata <hirata@linux.vnet.ibm.com> Aline Manera <alinefm@br.ibm.com> -apporc <appleorchard2000@gmail.com> +Aline Manera <alinefm@linux.vnet.ibm.com> +Andre Teodoro <andreteodoro.work@gmail.com> Anthony Liguori <aliguori@us.ibm.com> +apporc <appleorchard2000@gmail.com> +Archana Singh <archus@linux.vnet.ibm.com> +Atreyee <atreyee@linux.vnet.ibm.com> +Atreyee Mukhopadhyay <atreyee@linux.vnet.ibm.com> +Bianca Carvalho <bianca@linux.vnet.ibm.com> Bing Bu Cao <mars@linux.vnet.ibm.com> +Brent Baude <bbaude@redhat.com> +Cédric Bosdonnat <cbosdonnat@suse.com> +Chandra Shekhar Reddy Potula <chandra@linux.vnet.ibm.com> +chandrureddy <chandra@linux.vnet.ibm.com> Christy Perez <christy@linux.vnet.ibm.com> Cole Robinson <crobinso@redhat.com> +Crístian Deives <cristiandeives@gmail.com> Crístian Viana <vianac@linux.vnet.ibm.com> -Daniel H Barboza <danielhb@linux.vnet.ibm.com> +Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> +Daniel Henrique Barboza <dhbarboza82@gmail.com> +Dinar Valeev <dvaleev@suse.com> Eduardo Elias Ferreira <edusf@linux.vnet.ibm.com> -Eli Qiao(Li Yong Qiao) <taget@linux.vnet.ibm.com> +Eli Qiao <taget@linux.vnet.ibm.com> +Frederic Bonnard <frediz@linux.vnet.ibm.com> +Frédéric Bonnard <frediz@linux.vnet.ibm.com> +Hong Liang L Wang <hlwanghl@cn.ibm.com> Hongliang Wang <hlwang@linux.vnet.ibm.com> +Jayavardhan Katta <jkatta@linux.vnet.ibm.com> +Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com> +Julien Goodwin <jgoodwin@studio442.com.au> +Kersten Richter <kersten@us.ibm.com> Leonardo Garcia <lagarcia@br.ibm.com> -Lise Noble <lwnoble@us.ibm.com> -Malcolm Yu <minghaoyusombie@gmail.com> +Lucio Correia <luciojhc@linux.vnet.ibm.com> +malcolm yu <minghaoyusombie@gmail.com> Mark Wu <wudxw@linux.vnet.ibm.com> -Mei Na Zhou <zhoumein@linux.vnet.ibm.com> +Paulo Vital <pvital@gmail.com> Paulo Vital <pvital@linux.vnet.ibm.com> -Pradeep K Surisetty<psuriset@linux.vnet.ibm.com> +peterpennings <peterpnns@gmail.com> +Peter Pennings <peterpnns@gmail.com> +peterpennings <peterpnsn@gmail.com> +Pooja Kulkarni <pkulkark@linux.vnet.ibm.com> +Pradeep K Surisetty <psuriset@linux.vnet.ibm.com> +Rajat Gupta <rajat.triumph@gmail.com> Ramon Medeiros <ramonn@linux.vnet.ibm.com> -Rodrigo Trujilo <rodrigo.trujillo@linux.vnet.ibm.com> +Rob Lemley <rob.lemley@rochester.edu> +Rodrigo Trujillo <rodrigo.trujillo@linux.vnet.ibm.com> Royce Lv <lvroyce@linux.vnet.ibm.com> +samhenri <samuel.guimaraes@eldorado.org.br> +Samuel Guimarães <sguimaraes943@gmail.com> ShaoHe Feng <shaohef@linux.vnet.ibm.com> Shu Ming <shuming@linux.vnet.ibm.com> -Toby Allsopp <toby@MI6.GEN.NZ> +Simon Jin <simonjin@linux.vnet.ibm.com> +Socorro Stoppler <socorrob@us.ibm.com> +Socorro Stoppler <socorro@linux.vnet.ibm.com> +ssdxiao <ssdxiao@163.com> +Stephan Conrad <stephan.conrad@gmail.com> +Suresh Babu Angadi <sureshab@in.ibm.com> +Thierry Fauck <thierry@linux.vnet.ibm.com> Tony Breeds <tonyb@au1.ibm.com> +Tony Breeds <tonyb@au1ibm.com> +Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> +Wang Wen <wenwang@linux.vnet.ibm.com> +Wen Wang <wenwang@linux.vnet.ibm.com> Xin BJ Ding <xinding@cn.ibm.com> +xinding@cn.ibm.com <xinding@cn.ibm.com> +Xin Ding <xinding@linux.vnet.ibm.com> Yu Xin Huo <huoyuxin@linux.vnet.ibm.com> +zhoumeina <zhmeina@cn.ibm.com> +zhoumeina <zhoumeina@oc5550100378.ibm.com> +zhoumeina <zhoumein@linux.vnet.ibm.com> Zhou Zheng Sheng <zhshzhou@linux.vnet.ibm.com> +Zongmei Gou <gouzongmei@ourfuture.cn> -- 2.7.4
Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- COPYING | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 104 insertions(+), 10 deletions(-) diff --git a/COPYING b/COPYING index 329dfa2..9359586 100644 --- a/COPYING +++ b/COPYING @@ -1,13 +1,107 @@ -Wok/Kimchi are distributed pursuant to the terms of two different licenses. -The user interface (located in ui/ and plugins/kimchi/ui in this distribution) -is governed by the Apache License version 2.0. - -Kimchi makes use of different projects and they are placed as below: -- the code under ui/spice-html5 is imported from spice-html5 project -(http://cgit.freedesktop.org/spice/spice-html5); -- the code under ui/libs which is imported from JQuery UI (http://jqueryui.com); -- the code under ui/base64 is imported from Jquery Base64 (https://plugins.jquery.com/base64/). -- the code under ui/fontello is imported from Fontello (http://fontello.com). +Wok are distributed pursuant to the terms of two different licenses. +The user interface (located in ui/ in this distribution) is governed by the +Apache License version 2.0. + +Wok makes use of different projects and they are placed as below: + +Files: ui/base64/jquery.base64.js +Source: https://plugins.jquery.com/base64 +License: MIT + +Files: ui/css/fontawesome/fontawesome.css +Source: http://fontawesome.io +License: MIT + +Files: ui/css/opensans/opensans.css +Source: https://fonts.google.com/specimen/Open+Sans +License: Apache-2.0 + +Files: ui/css/src/bootstrap.custom.scss + ui/css/src/vendor/bootstrap-sass/bootstrap/* +Source: https://github.com/twbs/bootstrap +License: MIT + +Files: ui/css/src/vendor/compass-mixins/* +Source: https://github.com/Igosuki/compass-mixins +License: MIT-with-addition + +Files: ui/css/src/datatables.bootstrap.scss +Source: http://datatables.net +License: MIT + +Files: ui/images/theme-default/edit-alt.svg +Source: http://elusiveicons.com +License: SIL-1.1 + +Files: ui/images/theme-default/spin5.svg +Source: http://fontello.com +License: CC-BY-3.0 + +Files: ui/libs/bootstrap/bootstrap.min.js +Source: http://getbootstrap.com +License: MIT + +Files: ui/libs/bootstrap-editable/* +Source: https://vitalets.github.io/bootstrap-editable +License: MIT + +Files: ui/libs/bootstrap-select/* +Source: https://github.com/silviomoreto/bootstrap-select +License: MIT + +Files: ui/libs/bootstrap-switch/* +Source: http://www.bootstrap-switch.org +License: MIT + +Files: ui/libs/datatables/* +Source: http://datatables.net +License: MIT + +Files: ui/libs/datatables/js/plugins/ip-address/ip-address.js +Source: https://datatables.net/plug-ins/sorting/ip-address +License: MIT + +Files: ui/libs/es5-shim/es5-shim.min.js +Source: https://github.com/es-shims/es5-shim +License: MIT + +Files: ui/libs/jquery/jquery.min.js +Source: http://jquery.com +License: GPL-2 or MIT + +Files: ui/libs/jquery-bootgrid/* +Source: http://www.jquery-bootgrid.com +License: MIT + +Files: ui/libs/jquery-containsNC/* +Source: https://github.com/friedolinfoerder/jquery.containsNC +License: MIT + +Files: ui/libs/jquery-i18n/jquery.i18n.min.js +Source: https://github.com/recurser/jquery-i18n +License: MIT + +Files: ui/libs/jquery-ui/jquery-ui.min.js + ui/libs/jquery-ui/jquery-ui-i18n.min.js + ui/libs/jquery-ui/themes/base/jquery-ui.min.css +Homepage: http://jqueryui.com/ +License: GPL-2 or MIT + +Files: ui/libs/list-js/list.min.js +Source: http://listjs.com +License: MIT + +Files: ui/libs/lodash/lodash.min.js +Source: https://lodash.com +License: MIT + +Files: ui/libs/moment/moment-with-locales.min.js +Source: http://momentjs.com +License: MIT + +Files: ui/libs/typeahead/typeahead.bundle.min.js +Source: https://twitter.github.io/typeahead.js +License: MIT The rest of this distribution is governed by the GNU Lesser General Public License version 2.1. -- 2.7.4
The man page was refering to Kimchi project yet. So update it and also correct the information about options, files and license. Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- docs/wokd.8.in | 149 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 82 insertions(+), 67 deletions(-) diff --git a/docs/wokd.8.in b/docs/wokd.8.in index 4dc0730..217d9f6 100644 --- a/docs/wokd.8.in +++ b/docs/wokd.8.in @@ -1,93 +1,108 @@ -.TH KIMCHI 8 "February 05, 2015" "Version @PACKAGE_VERSION@" "Kimchi Manual" +.TH WOKD 8 "February 05, 2015" "Version @PACKAGE_VERSION@" "Wok Manual" .SH NAME -Kimchi \- HTML5 based management tool for KVM +wokd - Launch Wok web server .SH SYNOPSIS -.B kimchid -[\fB-h\fP|\fB--help\fP] [\fB--proxy-port\fP \fIproxy_port\fP] -[\fB--cherrypy_port\fP \fIcherrypy_port\fP] [\fB--log-level\fP \fIlog_level\fP] -[\fB--access-log\fP \fIaccess_log\fP] [\fB--error-log\fP \fIerror_log\fP] -[\fB--environment\fP \fIenvironment\fP] +.B wokd +[\fB-h\fP|\fB--help\fP] [\fB--proxy_port\fP \fIPROXY_PORT\fP] +[\fB--cherrypy_port\fP \fICHERRYPY_PORT\fP] [\fB--websockets_port\fP \fIWEBSOCKETS_PORT\fP] +[\fB--session_timeout\fP \fISESSION_TIMEOUT\fP] [\fB--log_level\fP \fILOG_LEVEL\fP] +[\fB--log_dir\fP \fILOG_DIR\fP] [\fB--environment\fP \fIENV\fP] +[\fB--server_root\fP \fISERVER_ROOT\fP] [\fB--test\fP] .SH DESCRIPTION -\fBKimchi\fP is an HTML5 based management tool for KVM. It is designed to make -it as easy as possible to get started with KVM and create your first guest. -\fBkimchid\fP launches the daemon on the hypervisor host which manages KVM guests through -libvirt. The management interface is accessed over the web using a browser that -supports HTML5. +\fBWok\fP is a cherrypy-based web framework with HTML5 support originated from Kimchi. +It can be extended by plugins which expose functionality through REST APIs. + +\fBwokd\fP launches the web server and load all the installed plugins as part of an intuitive +web interface that can be accessible over HTTP or HTTPS according to the configuration specified in +/etc/wok/wok.conf and /etc/nginx/conf.d/wok.conf + +By default, Wok uses nginx as a reverse proxy and it launches a cherrypy process on localhost for +security matters. The nginx can be replaced by other proxy without problems. Just make sure to have +the configuration aligned in /etc/wok/wok.conf .SH OPTIONS +Most of the options provide mechanism to change the web server configuration and must be aligned with +the proxy configuration as well. So check /etc/nginx/conf.d/wok.conf + The following options are supported: .TP \fB\-h\fP , \fB\-\-help\fP Show this help message and exit. .TP -\fB\-\-proxy-port\fP \fIproxy_port\fP -Specify the HTTPS port (default \fI8001\fP). +\fB\-\-proxy_port\fP \fIPROXY_PORT\fP +Wok runs behind a reverse proxy so use this option to specify on which HTTPS +port the proxy is running (default \fI8001\fP). .TP -\fB\-\-cherrypy_port\fP \fIcherrypy_port\fP -Specify the Cherrypy server port (default \fI8010\fP). +\fB\-\-cherrypy_port\fP \fICHERRYPY_PORT\fP +Corresponds to the Cherrypy server port (default \fI8010\fP). +Cherrypy will run on localhost so no firewall configuration is needed for that. .TP -\fB\-\-log-level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | \fIerror\fP | \fIcritical\fP] -Specify the log level (default \fIdebug\fP). +\fB\-\-websockets_port\fP \fIWEBSOCKETS_PORT\fP +Corresponds to the Websockets port (default \fI64667\fP). .TP -\fB\-\-access-log\fP \fIaccess_log\fP -Specify the access log location where kimchi should create the access log file. +\fB\-\-session_timeout\fP \fISESSION_TIMEOUT\fP +Number of minutes that a session can remain idle before the server terminates it automatically (default \fI10\fP). .TP -\fB\-\-environment\fP [\fIdevelopment\fP | \fIproduction\fP] -Specify the running environment of kimchi server. Check cherrypy documentation for more details (default \fIproduction\fP). +\fB\-\-log_level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | \fIerror\fP | \fIcritical\fP] +Specify the application log level (default \fIdebug\fP). .TP -Register and discover Kimchi peers in the same network using OpenSLP. Check -below the \fBFEDERATION\fP section for more details (default \fIoff\fP). +\fB\-\-log_dir\fP [\fILOG_DIR\fP] +Specify the log files location (default \fI/var/log/wok/\fP). +.TP +\fB\-\-environment\fP [\fIdev\fP | \fIproduction\fP] +Specify the running environment of Wok server. +Check cherrypy documentation for more details (default \fIproduction\fP). +.TP +\fB\-\-server_root\fP [\fISERVER_ROOT\fP] +Relative path to Wok server. No value is specified by default, ie, Wok will run on '/'. .TP \fB\-\-test\fP -Run kimchi on a mock version that does not affect the system. For testing proposals. +Run Wok on a mock version that does not affect the system. For testing proposals. +It depends on how plugins implements the mock environment as well. +.SH SIGNALS +Wok relies on Cherrypy to handle system signals as below: + +\fBSIGTERM\fP: Stop all services and prepare to exit the process. + +\fBSIGHUP\fP: Restart if daemonized, else exit. + +\fBSIGUSR1\fP: Advise all services to reload. +.SH FILES +.I /etc/wok/wok.conf +.RS +The Wok server configuration file. +.RE +.I /etc/nginx/conf.d/wok.conf +.RS +The nginx configuration to server Wok server configuration. It must be aligned with /etc/wok/wok.conf content. +.RE +.I /etc/logrotate.d/wokd +.RS +The logrotate configuration file for Wok logs. +.RE +.I /usr/lib/firewalld/services/wokd.xml +.RS +The firewalld configuration file for Wok server. +.RE .SH LICENCE .br -Kimchi is distributed pursuant to the terms of two different licenses. +Wok is distributed pursuant to the terms of two different licenses. +.br The user interface (located in ui/ in this distribution) is governed by -the Apache License version 2.0. - -The code under ui/spice-html5 is imported from spice-html5 project -(http://cgit.freedesktop.org/spice/spice-html5) and the code under ui/libs which is -imported from JQuery UI (http://jqueryui.com) +the Apache License version 2.0. More details about all the imported code and +its correspondent license information can be found in COPYING file. The rest of this distribution is governed by the GNU Lesser General Public -License version 3. +License version 2.1+. -See COPYING.LGPL and COPYING.ASL2. +See COPYING, COPYING.LGPL and COPYING.ASL2. .SH BUGS -Current bugs can be found here : https://github.com/kimchi-project/kimchi/issues .br -If you find any, please open an issue : https://github.com/kimchi-project/kimchi/issues/new +Please report all bugs you find. +.br +This should be done on bug tracker <https://github.com/kimchi-project/wok/issues/new> +.br +You can also report bugs to your software distributor/vendor. .SH AUTHOR -\fBAdam King\fP <rak@linux.vnet.ibm.com>, -\fBAdam Litke\fP <agl@linux.vnet.ibm.com>, -\fBAdriano Botega\fP <abotega@linux.vnet.ibm.com>, -\fBAlexandre Tanaka Hirata\fP <hirata@linux.vnet.ibm.com>, -\fBAline Manera\fP <alinefm@br.ibm.com>, -\fBapporc\fP <appleorchard2000@gmail.com>, -\fBAnthony Liguori\fP <aliguori@us.ibm.com>, -\fBBing Bu Cao\fP <mars@linux.vnet.ibm.com>, -\fBChristy Perez\fP <christy@linux.vnet.ibm.com>, -\fBCole Robinson\fP <crobinso@redhat.com>, -\fBCrístian Viana\fP <vianac@linux.vnet.ibm.com>, -\fBDaniel H Barboza\fP <danielhb@linux.vnet.ibm.com>, -\fBEduardo Elias Ferreira\fP <edusf@linux.vnet.ibm.com>, -\fBEli Qiao(Li Yong Qiao)\fP <taget@linux.vnet.ibm.com>, -\fBHongliang Wang\fP <hlwang@linux.vnet.ibm.com>, -\fBLeonardo Garcia\fP <lagarcia@br.ibm.com>, -\fBLise Noble\fP <lwnoble@us.ibm.com>, -\fBMalcolm Yu\fP <minghaoyusombie@gmail.com>, -\fBMark Wu\fP <wudxw@linux.vnet.ibm.com>, -\fBMei Na Zhou\fP <zhoumein@linux.vnet.ibm.com>, -\fBPaulo Vital\fP <pvital@linux.vnet.ibm.com>, -\fBPradeep K Surisetty\fP <psuriset@linux.vnet.ibm.com>, -\fBRamon Medeiros\fP <ramonn@linux.vnet.ibm.com>, -\fBRodrigo Trujilo\fP <rodrigo.trujillo@linux.vnet.ibm.com>, -\fBRoyce Lv\fP <lvroyce@linux.vnet.ibm.com>, -\fBShaoHe Feng\fP <shaohef@linux.vnet.ibm.com>, -\fBShu Ming\fP <shuming@linux.vnet.ibm.com>, -\fBToby Allsopp\fP <toby@MI6.GEN.NZ>, -\fBTony Breeds\fP <tonyb@au1.ibm.com>, -\fBXin BJ Ding\fP <xinding@cn.ibm.com>, -\fBYu Xin Huo\fP <huoyuxin@linux.vnet.ibm.com>, -\fBZhou Zheng Sheng\fP <zhshzhou@linux.vnet.ibm.com>, +Please refer to the AUTHORS file distributed with Wok. .SH SEE ALSO +<https://github.com/kimchi-project/wok>, <http://kimchi-project.github.io/wok> -- 2.7.4
Some files were using "Code delivered from Kimchi project" instead of "Code derived from Kimchi project". So fix it. Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- tests/test_exception.py | 4 ++-- tests/test_objectstore.py | 4 ++-- tests/test_plugin.py | 4 ++-- tests/test_rollbackcontext.py | 4 ++-- tests/test_server.py | 6 +++--- tests/test_utils.py | 4 ++-- tests/utils.py | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/test_exception.py b/tests/test_exception.py index 8dd20d8..b2a4542 100644 --- a/tests/test_exception.py +++ b/tests/test_exception.py @@ -1,9 +1,9 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2016 +# Copyright IBM Corp, 2013-2017 # -# Code delivered from Project Kimchi +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/tests/test_objectstore.py b/tests/test_objectstore.py index 3ea7b70..a597054 100644 --- a/tests/test_objectstore.py +++ b/tests/test_objectstore.py @@ -2,9 +2,9 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # -# Code delivered from Project Kimchi +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/tests/test_plugin.py b/tests/test_plugin.py index 312412c..3cad36c 100644 --- a/tests/test_plugin.py +++ b/tests/test_plugin.py @@ -1,9 +1,9 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2016 +# Copyright IBM Corp, 2013-2017 # -# Code delivered from Project Kimchi +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/tests/test_rollbackcontext.py b/tests/test_rollbackcontext.py index 17607e5..2100634 100644 --- a/tests/test_rollbackcontext.py +++ b/tests/test_rollbackcontext.py @@ -1,9 +1,9 @@ # # Project Wok # -# Copyright IBM Corp, 2014-2016 +# Copyright IBM Corp, 2014-2017 # -# Code delivered from Project Kimchi +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/tests/test_server.py b/tests/test_server.py index f1950e0..5541a4a 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -1,9 +1,9 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2016 +# Copyright IBM Corp, 2013-2017 # -# Code delivered from Project Kimchi +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -198,7 +198,7 @@ class ServerTests(unittest.TestCase): self.assertEquals(401, resp.status) def test_auth_browser_no_httpba(self): - # Kimchi detects REST requests from the browser by looking for a + # Wok detects REST requests from the browser by looking for a # specific header hdrs = {"X-Requested-With": "XMLHttpRequest"} diff --git a/tests/test_utils.py b/tests/test_utils.py index bd00590..e7fd264 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,9 +1,9 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # -# Code delivered from Project Kimchi +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/tests/utils.py b/tests/utils.py index 0c10ccb..f26aeff 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,9 +1,9 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2016 +# Copyright IBM Corp, 2013-2017 # -# Code delivered from Project Kimchi +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public -- 2.7.4
Reviewed-By: Lucio Correia <luciojhc@linux.vnet.ibm.com> On 11/01/2017 15:27, Aline Manera wrote:
Aline Manera (6): Remove --access-log and --error-log options from wokd command Use underscore in all wokd command options Update AUTHORS content according to git-log command Update COPYING file to reflect all the imported code Update man page document Fix typo in license header
AUTHORS | 67 ++++++++++++++++--- COPYING | 114 +++++++++++++++++++++++++++++--- docs/wokd.8.in | 149 +++++++++++++++++++++++------------------- src/wokd.in | 20 +++--- tests/test_exception.py | 4 +- tests/test_objectstore.py | 4 +- tests/test_plugin.py | 4 +- tests/test_rollbackcontext.py | 4 +- tests/test_server.py | 6 +- tests/test_utils.py | 4 +- tests/utils.py | 4 +- 11 files changed, 268 insertions(+), 112 deletions(-)
-- Lucio Correia
participants (2)
-
Aline Manera -
Lucio Correia