diff options
author | Varun Shastry <vshastry@redhat.com> | 2012-09-11 16:34:54 +0530 |
---|---|---|
committer | Anand Avati <avati@redhat.com> | 2012-09-13 13:19:37 -0700 |
commit | 3e2057542da6a0f182243b527bc7f1fd43d1fd3c (patch) | |
tree | b6aa28447d614de14ab05a8e78f7b88ae35b1a99 /xlators/bindings | |
parent | 2564ab2bc8cd3aa2561e091f72278e480fcef33d (diff) |
All: License message change
License message changed for server-side, dual license GPLV2 and LGPLv3+.
Change-Id: Ia9e53061b9d2df3b3ef3bc9778dceff77db46a09
BUG: 852318
Signed-off-by: Varun Shastry <vshastry@redhat.com>
Reviewed-on: http://review.gluster.org/3940
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/bindings')
-rw-r--r-- | xlators/bindings/python/src/gluster.py | 17 | ||||
-rw-r--r-- | xlators/bindings/python/src/glusterstack.py | 15 | ||||
-rw-r--r-- | xlators/bindings/python/src/glustertypes.py | 17 | ||||
-rw-r--r-- | xlators/bindings/python/src/python.c | 23 | ||||
-rw-r--r-- | xlators/bindings/python/src/testxlator.py | 2 |
5 files changed, 35 insertions, 39 deletions
diff --git a/xlators/bindings/python/src/gluster.py b/xlators/bindings/python/src/gluster.py index 60bf3c9e569..337c983ecb9 100644 --- a/xlators/bindings/python/src/gluster.py +++ b/xlators/bindings/python/src/gluster.py @@ -1,12 +1,11 @@ -""" - Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com> - This file is part of GlusterFS. - - This file is licensed to you under your choice of the GNU Lesser - General Public License, version 3 or any later version (LGPLv3 or - later), or the GNU General Public License, version 2 (GPLv2), in all - cases as published by the Free Software Foundation. -""" + +# Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com> +# This file is part of GlusterFS. +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. from ctypes import * from glustertypes import * diff --git a/xlators/bindings/python/src/glusterstack.py b/xlators/bindings/python/src/glusterstack.py index 19da219fd46..0c071ae983a 100644 --- a/xlators/bindings/python/src/glusterstack.py +++ b/xlators/bindings/python/src/glusterstack.py @@ -1,12 +1,11 @@ -""" - Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com> - This file is part of GlusterFS. - This file is licensed to you under your choice of the GNU Lesser - General Public License, version 3 or any later version (LGPLv3 or - later), or the GNU General Public License, version 2 (GPLv2), in all - cases as published by the Free Software Foundation. -""" +# Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com> +# This file is part of GlusterFS. +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. from ctypes import * from glustertypes import * diff --git a/xlators/bindings/python/src/glustertypes.py b/xlators/bindings/python/src/glustertypes.py index a75b7d090c3..98437d22ee9 100644 --- a/xlators/bindings/python/src/glustertypes.py +++ b/xlators/bindings/python/src/glustertypes.py @@ -1,12 +1,11 @@ -""" - Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com> - This file is part of GlusterFS. - - This file is licensed to you under your choice of the GNU Lesser - General Public License, version 3 or any later version (LGPLv3 or - later), or the GNU General Public License, version 2 (GPLv2), in all - cases as published by the Free Software Foundation. -""" + +# Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com> +# This file is part of GlusterFS. +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. from ctypes import * import collections diff --git a/xlators/bindings/python/src/python.c b/xlators/bindings/python/src/python.c index 8ba008c232e..9b96790dec2 100644 --- a/xlators/bindings/python/src/python.c +++ b/xlators/bindings/python/src/python.c @@ -1,13 +1,12 @@ /* - Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com> - This file is part of GlusterFS. + Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com> + This file is part of GlusterFS. - This file is licensed to you under your choice of the GNU Lesser - General Public License, version 3 or any later version (LGPLv3 or - later), or the GNU General Public License, version 2 (GPLv2), in all - cases as published by the Free Software Foundation. + This file is licensed to you under your choice of the GNU Lesser + General Public License, version 3 or any later version (LGPLv3 or + later), or the GNU General Public License, version 2 (GPLv2), in all + cases as published by the Free Software Foundation. */ - #include <Python.h> #ifndef _CONFIG_H @@ -36,7 +35,7 @@ python_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vector, - int32_t count, + int32_t count, off_t offset) { python_private_t *priv = (python_private_t *)this->private; @@ -139,7 +138,7 @@ init (xlator_t *this) Py_InitializeEx(0); if (!this->children) { - gf_log ("python", GF_LOG_ERROR, + gf_log ("python", GF_LOG_ERROR, "FATAL: python should have exactly one child"); return -1; } @@ -157,7 +156,7 @@ init (xlator_t *this) } priv->pInterp = Py_NewInterpreter(); - + // Adjust python's path PyObject *syspath = PySys_GetObject("path"); PyObject *path = PyString_FromString(GLUSTER_PYTHON_PATH); @@ -179,7 +178,7 @@ init (xlator_t *this) priv->pVectorType = PyObject_GetAttrString(priv->pGlusterModule, "iovec"); gf_log("python", GF_LOG_DEBUG, "Loading script...%s", priv->scriptname); - + priv->pScriptModule = AnonModule_FromFile(priv->scriptname); if (!priv->pScriptModule || PyErr_Occurred()) { @@ -208,7 +207,7 @@ init (xlator_t *this) return 0; } -void +void fini (xlator_t *this) { python_private_t *priv = (python_private_t*)(this->private); diff --git a/xlators/bindings/python/src/testxlator.py b/xlators/bindings/python/src/testxlator.py index 7f6d9f5d8f4..59a991dcab9 100644 --- a/xlators/bindings/python/src/testxlator.py +++ b/xlators/bindings/python/src/testxlator.py @@ -1,5 +1,5 @@ """ - Copyright (c) 2008-2012 Red Hat, Inc. <http://www.redhat.com> + Copyright (c) 2007-2012 Red Hat, Inc. <http://www.redhat.com> This file is part of GlusterFS. This file is licensed to you under your choice of the GNU Lesser |