From 3e2057542da6a0f182243b527bc7f1fd43d1fd3c Mon Sep 17 00:00:00 2001 From: Varun Shastry Date: Tue, 11 Sep 2012 16:34:54 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/3940 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Anand Avati --- extras/benchmarking/glfs-bm.c | 13 ++++++------- extras/benchmarking/rdd.c | 13 ++++++------- extras/glusterfs.vim | 3 ++- extras/gnfs-loganalyse.py | 3 ++- extras/profiler/glusterfs-profiler | 8 ++++++-- extras/test/gluster_commands.sh | 21 +++++++++++---------- extras/test/ld-preload-test/ld-preload-lib.c | 13 ++++++------- extras/test/ld-preload-test/ld-preload-test.c | 13 ++++++------- extras/test/run.sh | 2 +- extras/test/stop_glusterd.sh | 2 +- 10 files changed, 47 insertions(+), 44 deletions(-) (limited to 'extras') diff --git a/extras/benchmarking/glfs-bm.c b/extras/benchmarking/glfs-bm.c index 1da20541..dc717f33 100644 --- a/extras/benchmarking/glfs-bm.c +++ b/extras/benchmarking/glfs-bm.c @@ -1,13 +1,12 @@ /* - Copyright (c) 2008-2012 Red Hat, Inc. - This file is part of GlusterFS. + Copyright (c) 2008-2012 Red Hat, Inc. + 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. */ - #define _GNU_SOURCE #define __USE_FILE_OFFSET64 #define _FILE_OFFSET_BITS 64 diff --git a/extras/benchmarking/rdd.c b/extras/benchmarking/rdd.c index 6f1a246b..a667c6a1 100644 --- a/extras/benchmarking/rdd.c +++ b/extras/benchmarking/rdd.c @@ -1,13 +1,12 @@ /* - Copyright (c) 2008-2012 Red Hat, Inc. - This file is part of GlusterFS. + Copyright (c) 2008-2012 Red Hat, Inc. + 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 #include #include diff --git a/extras/glusterfs.vim b/extras/glusterfs.vim index f240750f..899cc655 100644 --- a/extras/glusterfs.vim +++ b/extras/glusterfs.vim @@ -1,11 +1,12 @@ " glusterfs.vim: GNU Vim Syntax file for GlusterFS .vol specification -" Copyright (c) 2008-2012 Red Hat, Inc. +" Copyright (c) 2007777777Red Hat, Inc. " 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. +" " Last Modified: Wed Aug 1 00:47:10 IST 2007 " Version: 0.8 diff --git a/extras/gnfs-loganalyse.py b/extras/gnfs-loganalyse.py index 1d7858bc..71e79b6b 100644 --- a/extras/gnfs-loganalyse.py +++ b/extras/gnfs-loganalyse.py @@ -1,12 +1,13 @@ #!/bin/python """ -Copyright (c) 2008-2012 Red Hat, Inc. + Copyright (c) 2006-2012 Red Hat, Inc. 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. + """ import os diff --git a/extras/profiler/glusterfs-profiler b/extras/profiler/glusterfs-profiler index 1eafcda4..65d44586 100755 --- a/extras/profiler/glusterfs-profiler +++ b/extras/profiler/glusterfs-profiler @@ -1,7 +1,6 @@ #!/usr/bin/env python -# texttable - module for creating simple ASCII tables -# Copyright (c) 2008-2012 Red Hat, Inc. +# Copyright (c) 2006-2012 Red Hat, Inc. # This file is part of GlusterFS. # # This file is licensed to you under your choice of the GNU Lesser @@ -9,6 +8,11 @@ # later), or the GNU General Public License, version 2 (GPLv2), in all # cases as published by the Free Software Foundation. + +# texttable - module for creating simple ASCII tables +# Incorporated from texttable.py downloaded from +# http://jefke.free.fr/stuff/python/texttable/texttable-0.7.0.tar.gz + import sys import string diff --git a/extras/test/gluster_commands.sh b/extras/test/gluster_commands.sh index 1e2c86fd..cb2a55fd 100755 --- a/extras/test/gluster_commands.sh +++ b/extras/test/gluster_commands.sh @@ -1,6 +1,7 @@ #!/bin/bash -# Copyright (c) 2008-2012 Red Hat, Inc. + +# Copyright (c) 2006-2012 Red Hat, Inc. # This file is part of GlusterFS. # # This file is licensed to you under your choice of the GNU Lesser @@ -45,13 +46,13 @@ gluster volume start vol gluster volume info sleep 1 mount -t glusterfs `hostname`:vol /mnt/client -sleep 1 +sleep 1 df -h echo "adding-brick......." gluster volume add-brick vol `hostname`:/exports/exp2 gluster volume info -sleep 1 +sleep 1 umount /mnt/client mount -t glusterfs `hostname`:vol /mnt/client df -h @@ -93,7 +94,7 @@ sleep 1 echo "removing brick......." gluster --mode=script volume remove-brick vol `hostname`:/exports/exp2 gluster volume info -sleep 1 +sleep 1 df -h sleep 1 @@ -118,7 +119,7 @@ sleep 1 echo "starting replicate volume......" gluster volume start mirror gluster volume info -sleep 1 +sleep 1 mount -t glusterfs `hostname`:mirror /mnt/client sleep 1 df -h @@ -127,7 +128,7 @@ sleep 1 echo "adding-brick......." gluster volume add-brick mirror `hostname`:/exports/exp3 `hostname`:/exports/exp4 gluster volume info -sleep 1 +sleep 1 df -h sleep 1 @@ -169,14 +170,14 @@ sleep 1 echo "removeing-brick....." gluster --mode=script volume remove-brick mirror `hostname`:/exports/exp3 `hostname`:/exports/exp4 gluster volume info -sleep 1 +sleep 1 df -h sleep 1 echo "stopping replicate volume....." gluster --mode=script volume stop mirror gluster volume info -sleep 1 +sleep 1 umount /mnt/client df -h @@ -197,14 +198,14 @@ gluster volume start str gluster volume info sleep 1 mount -t glusterfs `hostname`:str /mnt/client -sleep 1 +sleep 1 df -h sleep 1 echo "adding brick...." gluster volume add-brick str `hostname`:/exports/exp3 `hostname`:/exports/exp4 gluster volume info -sleep 1 +sleep 1 df -h sleep 1 diff --git a/extras/test/ld-preload-test/ld-preload-lib.c b/extras/test/ld-preload-test/ld-preload-lib.c index dc282536..88afd14c 100644 --- a/extras/test/ld-preload-test/ld-preload-lib.c +++ b/extras/test/ld-preload-test/ld-preload-lib.c @@ -1,14 +1,13 @@ /* - Copyright (c) 2008-2012 Red Hat, Inc. - This file is part of GlusterFS. + Copyright (c) 2007-2012 Red Hat, Inc. + 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. */ - /* LD PRELOAD'able library * A very simple library that intercepts booster supported system calls * and prints a log message to stdout. diff --git a/extras/test/ld-preload-test/ld-preload-test.c b/extras/test/ld-preload-test/ld-preload-test.c index 75f30117..78772f59 100644 --- a/extras/test/ld-preload-test/ld-preload-test.c +++ b/extras/test/ld-preload-test/ld-preload-test.c @@ -1,14 +1,13 @@ /* - Copyright (c) 2008-2012 Red Hat, Inc. - This file is part of GlusterFS. + Copyright (c) 2007-2012 Red Hat, Inc. + 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. */ - /* * LD PRELOAD Test Tool * diff --git a/extras/test/run.sh b/extras/test/run.sh index 7be50815..4b3839cf 100755 --- a/extras/test/run.sh +++ b/extras/test/run.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2008-2012 Red Hat, Inc. +# Copyright (c) 2006-2012 Red Hat, Inc. # This file is part of GlusterFS. # # This file is licensed to you under your choice of the GNU Lesser diff --git a/extras/test/stop_glusterd.sh b/extras/test/stop_glusterd.sh index 8b670cdf..a2db13f4 100755 --- a/extras/test/stop_glusterd.sh +++ b/extras/test/stop_glusterd.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2008-2012 Red Hat, Inc. +# Copyright (c) 2006-2012 Red Hat, Inc. # This file is part of GlusterFS. # # This file is licensed to you under your choice of the GNU Lesser -- cgit