openstack/devstack
Code Issues Proposed changes

Remove trailing whitespaces in regular file

Browse Source 
Change-Id: I5faf840dd6649afcb53e91f1d033447f9729cee1
This commit is contained in:
Hengqing Hu 2012-03-09 16:03:00 +08:00
parent 165121f7b6
commit 3b719e50fb
9 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -9,6 +9,7 @@ Devin Carlen <devin.carlen@gmail.com>
Eddie Hebert <edhebert@gmail.com> Eddie Hebert <edhebert@gmail.com>
Eoghan Glynn <eglynn@redhat.com> Eoghan Glynn <eglynn@redhat.com>
Gabriel Hurley <gabriel@strikeawe.com> Gabriel Hurley <gabriel@strikeawe.com>
Hengqing Hu <hudayou@hotmail.com>
Jake Dahn <admin@jakedahn.com> Jake Dahn <admin@jakedahn.com>
James E. Blair <james.blair@rackspace.com> James E. Blair <james.blair@rackspace.com>
Jason Cannavale <jason.cannavale@rackspace.com> Jason Cannavale <jason.cannavale@rackspace.com>

2
tools/build_uec.sh
View File

@ -147,7 +147,7 @@ cat > $LIBVIRT_XML <<EOF
<interface type='network'> <interface type='network'>
<source network='$NET_NAME'/> <source network='$NET_NAME'/>
</interface> </interface>
<!-- The order is significant here. File must be defined first --> <!-- The order is significant here. File must be defined first -->
<serial type="file"> <serial type="file">
<source path='$vm_dir/console.log'/> <source path='$vm_dir/console.log'/>

2
tools/jenkins/jenkins_home/jobs/diablo-xs_ha/config.xml
View File

@ -78,7 +78,7 @@ set -o xtrace
. localrc . localrc
# Unlike kvm, ssh to the xen host to run tests, in case the test instance is launch with a host only network # Unlike kvm, ssh to the xen host to run tests, in case the test instance is launch with a host only network
ssh root@$XEN_IP &quot;cd devstack &amp;&amp; . localrc &amp;&amp; cd tools/jenkins &amp;&amp; ./run_test.sh $EXECUTOR_NUMBER $ADAPTER &apos;$RC&apos;&quot; ssh root@$XEN_IP &quot;cd devstack &amp;&amp; . localrc &amp;&amp; cd tools/jenkins &amp;&amp; ./run_test.sh $EXECUTOR_NUMBER $ADAPTER &apos;$RC&apos;&quot;
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>

2
tools/rfc.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh -e #!/bin/sh -e
# Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com> # Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
# This initial version of this file was taken from the source tree # This initial version of this file was taken from the source tree
# of GlusterFS. It was not directly attributed, but is assumed to be # of GlusterFS. It was not directly attributed, but is assumed to be
# Copyright (c) 2010-2011 Gluster, Inc and release GPLv3 # Copyright (c) 2010-2011 Gluster, Inc and release GPLv3

2
tools/warm_apts_and_pips_for_uec.sh
View File

@ -30,7 +30,7 @@ fi
if [ ! -d files/apts ]; then if [ ! -d files/apts ]; then
echo "Please run this script from devstack/tools/" echo "Please run this script from devstack/tools/"
exit 1 exit 1
fi fi
# Mount the image # Mount the image
STAGING_DIR=/tmp/`echo $1 | sed "s/\//_/g"`.stage STAGING_DIR=/tmp/`echo $1 | sed "s/\//_/g"`.stage

2
tools/xen/build_domU.sh
View File

@ -144,7 +144,7 @@ if [ ! -d $TOP_DIR/nova ]; then
env GIT_SSL_NO_VERIFY=true git clone $NOVA_REPO env GIT_SSL_NO_VERIFY=true git clone $NOVA_REPO
cd $TOP_DIR/nova cd $TOP_DIR/nova
git checkout $NOVA_BRANCH git checkout $NOVA_BRANCH
fi fi
# Install plugins # Install plugins
cp -pr $TOP_DIR/nova/plugins/xenserver/xenapi/etc/xapi.d /etc/ cp -pr $TOP_DIR/nova/plugins/xenserver/xenapi/etc/xapi.d /etc/

2
tools/xen/prepare_dom0.sh
View File

@ -21,7 +21,7 @@ if [ -e /usr/bin/vim ]; then
ln -s /usr/bin/vim /bin/vi ln -s /usr/bin/vim /bin/vi
fi fi
# Install git # Install git
if ! which git; then if ! which git; then
DEST=/tmp/ DEST=/tmp/
GITDIR=$DEST/git-1.7.7 GITDIR=$DEST/git-1.7.7

4
tools/xen/scripts/install-os-vpx.sh
View File

@ -88,7 +88,7 @@ EOF
get_params() get_params()
{ {
while getopts "hicwbf:d:v:m:p:k:r:l:" OPTION; while getopts "hicwbf:d:v:m:p:k:r:l:" OPTION;
do do
case $OPTION in case $OPTION in
h) usage h) usage
@ -246,7 +246,7 @@ create_management_vif()
# This installs the interface for public traffic, only if a bridge is specified # This installs the interface for public traffic, only if a bridge is specified
# The interface is not configured at this stage, but it will be, once the admin # The interface is not configured at this stage, but it will be, once the admin
# tasks are complete for the services of this VPX # tasks are complete for the services of this VPX
create_public_vif() create_public_vif()
{ {

12
tools/xen/scripts/mkxva
View File

@ -177,7 +177,7 @@ EOF
/sbin/mkfs.ext3 -I 128 -m0 -F "$partition" /sbin/mkfs.ext3 -I 128 -m0 -F "$partition"
/sbin/e2label "$partition" vpxroot /sbin/e2label "$partition" vpxroot
make_fs_inner "$staging" "$partition" "" make_fs_inner "$staging" "$partition" ""
# Now run grub on the image we've created # Now run grub on the image we've created
CLEAN_MOUNTPOINT=$(mktemp -d "$TMPDIR/mkfs-XXXXXX") CLEAN_MOUNTPOINT=$(mktemp -d "$TMPDIR/mkfs-XXXXXX")
@ -203,7 +203,7 @@ EOF
$SUDO umount "$CLEAN_MOUNTPOINT" $SUDO umount "$CLEAN_MOUNTPOINT"
CLEAN_MOUNTPOINT= CLEAN_MOUNTPOINT=
# Grub expects a disk with name /dev/xxxx with a first partition # Grub expects a disk with name /dev/xxxx with a first partition
# named /dev/xxxx1, so we give it what it wants using symlinks # named /dev/xxxx1, so we give it what it wants using symlinks
# Note: /dev is linked to the real /dev of the build machine, so # Note: /dev is linked to the real /dev of the build machine, so
@ -214,14 +214,14 @@ EOF
rm -f "$disk_part1_name" rm -f "$disk_part1_name"
ln -s "$CLEAN_LOSETUP" "$disk_name" ln -s "$CLEAN_LOSETUP" "$disk_name"
ln -s "$partition" "$disk_part1_name" ln -s "$partition" "$disk_part1_name"
# Feed commands into the grub shell to setup the disk # Feed commands into the grub shell to setup the disk
grub --no-curses --device-map=/dev/null <<EOF grub --no-curses --device-map=/dev/null <<EOF
device (hd0) $disk_name device (hd0) $disk_name
setup (hd0) (hd0,0) setup (hd0) (hd0,0)
quit quit
EOF EOF
# Cleanup # Cleanup
rm -f "$disk_name" rm -f "$disk_name"
rm -f "$disk_part1_name" rm -f "$disk_part1_name"
@ -253,7 +253,7 @@ splitvdi () {
local n_bytes=$(stat --printf=%s "$diskimg") local n_bytes=$(stat --printf=%s "$diskimg")
local n_meg=$((($n_bytes+$((1024*1024 -1)))/$((1024*1024)))) local n_meg=$((($n_bytes+$((1024*1024 -1)))/$((1024*1024))))
local i=0 local i=0
while [ $i -lt $n_meg ] ; do while [ $i -lt $n_meg ] ; do
if [ $rio -eq 0 ] ; then if [ $rio -eq 0 ] ; then
local file="$outputdir"/chunk-$(printf "%08d" $i) local file="$outputdir"/chunk-$(printf "%08d" $i)
dd if="$diskimg" of="$file" skip=$i bs=1M count=1 2>/dev/null dd if="$diskimg" of="$file" skip=$i bs=1M count=1 2>/dev/null
@ -359,7 +359,7 @@ done
# cleanup # cleanup
if [ -z "${DO_NOT_CLEANUP:-}" ] ; then if [ -z "${DO_NOT_CLEANUP:-}" ] ; then
rm -rf "$XVA_TARBALL_STAGING" rm -rf "$XVA_TARBALL_STAGING"
rm -f "$FS_TMPFILE" rm -f "$FS_TMPFILE"
fi fi