Whamcloud - gitweb
fs/lustre-release.git
12 years agob:11171
jitendra [Wed, 22 Aug 2007 10:38:29 +0000 (10:38 +0000)]
b:11171
i:nathan@clusterfs.com
Added automatic ondecho module load support on client and server.
Added flexible OSS setup and cleanup

12 years agoImplement async OSC create to avoid the blocking unnecessarily.
shadow [Wed, 22 Aug 2007 10:13:32 +0000 (10:13 +0000)]
Implement async OSC create to avoid the blocking unnecessarily.
commit include all fixes from bugs 13143 and 13196.

b=4900
i=nathan
i=wangdi

port to HEAD inspected yury.

12 years agob=12633
kalpak [Wed, 22 Aug 2007 09:55:46 +0000 (09:55 +0000)]
b=12633

Update recommended e2fsprogs version as new e2fsprogs has been released.

12 years agob=11879
manoj [Mon, 20 Aug 2007 19:40:32 +0000 (19:40 +0000)]
b=11879
r=alex

New switch --with-dmu added to accomodate linking to a zfs dmu

12 years agoAdd journal checksum feature.
girish [Mon, 20 Aug 2007 12:36:11 +0000 (12:36 +0000)]
Add journal checksum feature.
b=10657
i=adilger
i=kalpak

12 years agoAdd ext3 part of Journal Checksum feature.
girish [Mon, 20 Aug 2007 10:25:23 +0000 (10:25 +0000)]
Add ext3 part of Journal Checksum feature.
b=10657
i=adilger
i=kalpak

12 years agob=13144
rupesh [Mon, 20 Aug 2007 07:27:18 +0000 (07:27 +0000)]
b=13144
r=Girish, Kalpak
Description: Blockbitmap validation patch for RHEL4.

12 years ago- use b1_8_iam in b1_6_head_sync
tappro [Sun, 19 Aug 2007 14:10:48 +0000 (14:10 +0000)]
- use b1_8_iam in b1_6_head_sync

12 years agob=13350
grev [Fri, 17 Aug 2007 17:49:32 +0000 (17:49 +0000)]
b=13350
i=Nathan

Abort runtests if $FILES is empty.

12 years agofix a typo.
bobijam [Fri, 17 Aug 2007 02:28:07 +0000 (02:28 +0000)]
fix a typo.

12 years agob=13283
grev [Fri, 17 Aug 2007 02:22:35 +0000 (02:22 +0000)]
b=13283
i=Adilger

Don't check if $MDSDEV is a file.
Set "fs2" real and loop devices correctly.

12 years agofile sec_config.c was initially added on branch b1_8_sptlrpc_conf.
ericm [Thu, 16 Aug 2007 18:19:19 +0000 (18:19 +0000)]
file sec_config.c was initially added on branch b1_8_sptlrpc_conf.

12 years agoBranch HEAD
yangsheng [Thu, 16 Aug 2007 08:23:38 +0000 (08:23 +0000)]
Branch HEAD
b=11248
i=scjody
i=adilger

Remove mnt_lustre_list from vfs_intent-2.6-rhel4.patch.

12 years agoBranch HEAD
liuy [Thu, 16 Aug 2007 05:44:53 +0000 (05:44 +0000)]
Branch HEAD
b=12192
i=adilger, green

add llapi_file_open()

12 years agoBranch HEAD
liuy [Thu, 16 Aug 2007 04:41:52 +0000 (04:41 +0000)]
Branch HEAD
b=12932
i=green, shadow

set obd_health_check_timeout as 1.5x of obd_timeout

12 years agoBranch HEAD
bobijam [Thu, 16 Aug 2007 04:08:45 +0000 (04:08 +0000)]
Branch HEAD
b=12836
i=adilger, komaln

Description: lfs find on -1 stripe looping in lsm_lmm_verify_common()
Details    : Avoid lov_verify_lmm_common() on directory with -1 stripe count.

12 years agoBranch HEAD
bobijam [Thu, 16 Aug 2007 03:45:30 +0000 (03:45 +0000)]
Branch HEAD
b=12743
i=adilger, shadow

Description: df doesn't work properly if diskfs blocksize != 4K
Details    : Choose biggest blocksize of OST's as the LOV's blocksize.

12 years agoBranch HEAD
bobijam [Thu, 16 Aug 2007 03:21:49 +0000 (03:21 +0000)]
Branch HEAD
b=12584
i=ericm, green

Description: sanity.sh failed test 103
Details    : RHEL mis-interpret setfacl "-X" param, so we won't test setfacl
             with param "-X".

12 years agoBranch b1_6
scjody [Thu, 16 Aug 2007 01:52:41 +0000 (01:52 +0000)]
Branch b1_6

Update for 1.6.3

12 years agob=13220
jxiong [Thu, 16 Aug 2007 00:38:32 +0000 (00:38 +0000)]
b=13220
r=alex,vitaly

Change the ldlm_lock's bitlock to a real spinlock to avoid it to be overwritten when operating on l_flags.

12 years agob=13149
jxiong [Thu, 16 Aug 2007 00:28:40 +0000 (00:28 +0000)]
b=13149
r=nathan,adilger

Fix the logic in class_del_uuid(). It will return the wrong result when an entry
 has been referenced over once.

12 years agoBranch HEAD
scjody [Tue, 14 Aug 2007 23:00:41 +0000 (23:00 +0000)]
Branch HEAD

Add commas; it just looks better, especially in HTML.

12 years agoBranch b1_6
scjody [Tue, 14 Aug 2007 22:58:50 +0000 (22:58 +0000)]
Branch b1_6

Add commas; it just looks better, especially in HTML.

12 years agoBranch HEAD
liuy [Tue, 14 Aug 2007 04:42:07 +0000 (04:42 +0000)]
Branch HEAD
b=11679
i=adilger, deen

fix lstripe failure with valid OST index

12 years agoremove redundant (lock->l_granted_mode == lock->l_req_mode) checks.
nikita [Mon, 13 Aug 2007 16:34:27 +0000 (16:34 +0000)]
remove redundant (lock->l_granted_mode == lock->l_req_mode) checks.

i=adilger
i=green

12 years agob=13173
grev [Mon, 13 Aug 2007 08:44:42 +0000 (08:44 +0000)]
b=13173
i=Adilger
i=Nathan

Skip test if nstripe gt OSTCOUNT.

12 years agofix compile time warning aboutuninitialised retval usage.
green [Sun, 12 Aug 2007 17:09:09 +0000 (17:09 +0000)]
fix compile time warning aboutuninitialised retval usage.

12 years agob=13276
green [Sun, 12 Aug 2007 00:46:58 +0000 (00:46 +0000)]
b=13276
r=shadow,wangdi

check return value of ll_node_from_inode in ll_file_read and ll_file_sendfile,
do not try to access uninitialised locks tree on error exit from
ll_file_write

12 years agob=13103
green [Sun, 12 Aug 2007 00:38:22 +0000 (00:38 +0000)]
b=13103
r=wangdi,huangwei

Teach ldlm_cli_enqueue_fini that flock locks could disappear immediately after
granting

12 years agob=11974
green [Sun, 12 Aug 2007 00:30:35 +0000 (00:30 +0000)]
b=11974
r=nikita,shadow

Do not replay locks that are being cancelled. Do not reference
locks by their address during replay, just by their handle.

12 years agoulnds/socklnd must close open socket after unsuccessful
deen [Fri, 10 Aug 2007 23:05:21 +0000 (23:05 +0000)]
ulnds/socklnd must close open socket after unsuccessful
'say hello' attempt.

b=13279
i=maxim
i=adilger

12 years agoAdd printing inode info into message about error in writepage.
shadow [Fri, 10 Aug 2007 07:44:34 +0000 (07:44 +0000)]
Add printing inode info into message about error in writepage.

b=11721
i=green
i=wangdi

12 years agob=12560
grev [Fri, 10 Aug 2007 05:02:55 +0000 (05:02 +0000)]
b=12560
i=Adilger
i=Nathan

Use skip() function instead of echo the skipped tests.

12 years agob=10762
nathan [Thu, 9 Aug 2007 15:41:30 +0000 (15:41 +0000)]
b=10762
i=adilger
i=green
prepare for variable watchdogs (will be in added in bug 3055)

12 years agob=13147
nathan [Thu, 9 Aug 2007 15:36:59 +0000 (15:36 +0000)]
b=13147
i=tappro
i=fanyong
block reactivating mgc import until all deactivates complete
Only an issue when failing back MDT/MGS to itself (testing)

12 years agoi=scjody
nathan [Thu, 9 Aug 2007 14:59:48 +0000 (14:59 +0000)]
i=scjody
include new dirs when landing/replacing

12 years agob=12955
kalpak [Thu, 9 Aug 2007 12:19:29 +0000 (12:19 +0000)]
b=12955
i=alex, johann

port old jbd-stats patch for sles10

12 years ago- copy of ldiskfs OSD to start with
alex [Thu, 9 Aug 2007 08:51:04 +0000 (08:51 +0000)]
- copy of ldiskfs OSD to start with

12 years agoBranch HEAD
tianzy [Thu, 9 Aug 2007 06:35:44 +0000 (06:35 +0000)]
Branch  HEAD
fix a bug in test_13 in sanity-quota.sh
b=13171
i=green, wangdi

12 years agoBranch HEAD
tianzy [Thu, 9 Aug 2007 06:18:03 +0000 (06:18 +0000)]
Branch HEAD
fix a bug in test_10 in sanity-quota.sh
b=13170
i=green, wangdi

12 years agoBranch HEAD
yangsheng [Thu, 9 Aug 2007 06:08:43 +0000 (06:08 +0000)]
Branch HEAD
b=13249
r=scjody

Update target/which_patch for SLES9 2.6.5-7.286 kernel.

12 years agoBranch HEAD
bobijam [Thu, 9 Aug 2007 03:34:20 +0000 (03:34 +0000)]
Branch HEAD
b=13177
i=green, wangdi

Description: sanity_quota fail test_1
Details    : There are multiple occurences of $TSTUSR in SLES's /etc/group
             file, which makes TSTID[2] inunique.

12 years agob=13290
cliffw [Wed, 8 Aug 2007 18:54:30 +0000 (18:54 +0000)]
b=13290
i=scjody
i=adilger

Fix syntax error in lfs_find.

12 years agoBranch HEAD
liangzhen [Wed, 8 Aug 2007 14:46:19 +0000 (14:46 +0000)]
Branch HEAD
Initialize cpumask before use
b=13288

12 years agoBranch HEAD
liuy [Wed, 8 Aug 2007 02:40:06 +0000 (02:40 +0000)]
Branch HEAD
b=13006
i=shadow, deen

fix init warnings caused by old ctl_table struct

12 years agoBranch HEAD
liuy [Wed, 8 Aug 2007 02:29:25 +0000 (02:29 +0000)]
Branch HEAD
b=12333
i=green, nathan

replace OBD_ALLOC/OBD_FREE with OBD_VMALLOC/OBD_VFREE

12 years agoMake up a changelog item attributed to 1.8.0.
bobijam [Wed, 8 Aug 2007 02:04:27 +0000 (02:04 +0000)]
Make up a changelog item attributed to 1.8.0.

12 years agoBranch HEAD
scjody [Tue, 7 Aug 2007 22:13:01 +0000 (22:13 +0000)]
Branch HEAD

version -> 1.7.90

12 years agoBranch HEAD
scjody [Tue, 7 Aug 2007 22:12:29 +0000 (22:12 +0000)]
Branch HEAD

Commit of latest gss_bulk.c.  Old revision history has been lost (but
contact me if you really need to know something.)

12 years agob=11171
cliffw [Tue, 7 Aug 2007 17:55:22 +0000 (17:55 +0000)]
b=11171
i=jedix
i=brian

Moves user-changeable variables up to the top of the script

12 years agob=11171
brian [Tue, 7 Aug 2007 17:51:05 +0000 (17:51 +0000)]
b=11171
i=cliffw,jitendra

Create a more portable way of remote shelling:
- set $DSH variable to either rsh or ssh (default)
The location of the results can be set with rslt_loc which defaults to /tmp.
Eliminate the "scp brutal hack" needed for non-shared filesystems.
A related work item could be to do a test to see if $rslt_loc is actually
shared between the nodes and not use remote_shell if it is indeed shared.
Specifically invoke gawk in obdfilter-survey where it uses gnu awk extensions

12 years agoLoad the sg module if needed and unload it when done, only if it was loaded
brian [Tue, 7 Aug 2007 17:28:07 +0000 (17:28 +0000)]
Load the sg module if needed and unload it when done, only if it was loaded
by sgpdd_survey.
Also warn the user about the need for the sg module if we are unable to find
an SG device for a block device.

12 years agoReduce a line to several < 80 char lines.
brian [Mon, 6 Aug 2007 19:57:12 +0000 (19:57 +0000)]
Reduce a line to several < 80 char lines.

12 years agoBranch HEAD
scjody [Mon, 6 Aug 2007 17:57:06 +0000 (17:57 +0000)]
Branch HEAD

Sort versions alphabetically.

12 years agoBranch HEAD
scjody [Mon, 6 Aug 2007 17:46:01 +0000 (17:46 +0000)]
Branch HEAD

Make b1_8 an alias for HEAD to prevent mistakes.

12 years ago* Landing 12014: ASSERTION failures when upgrading to the patchless zero-copy
eeb [Mon, 6 Aug 2007 11:46:18 +0000 (11:46 +0000)]
*  Landing 12014: ASSERTION failures when upgrading to the patchless zero-copy

*  fixed some initialiser struct formatting in socklnd_lib-linux.c

12 years agoBranch HEAD
johann [Fri, 3 Aug 2007 21:49:18 +0000 (21:49 +0000)]
Branch HEAD
b=12755

Rollback 12755 since it breaks the SLES9 build.

12 years agoBranch HEAD
johann [Fri, 3 Aug 2007 19:47:37 +0000 (19:47 +0000)]
Branch HEAD
b=12755
i=johann
i=shadow

Severity   : normal
Frequency  : when using more than 256 SCSI disks on a single server
Bugzilla   : 12755
Description: Kernel BUG: sd_iostats_bump: unexpected disk index
Details    : a kernel BUG is hit when using more than 256 SCSI disks.

12 years agoBranch HEAD
scjody [Fri, 3 Aug 2007 19:36:21 +0000 (19:36 +0000)]
Branch HEAD

Update ChangeLog: add 1.8.0 section, and update the 1.6.1 section based
on 1.6.1 RC2.

12 years agob=12421
nathan [Fri, 3 Aug 2007 18:26:32 +0000 (18:26 +0000)]
b=12421
Clean up the english in the README

12 years agoBranch b1_6
scjody [Fri, 3 Aug 2007 17:09:06 +0000 (17:09 +0000)]
Branch b1_6

libsysio: fix getdirentries for native fs

b=12949

12 years agoBranch b1_6
scjody [Fri, 3 Aug 2007 17:07:16 +0000 (17:07 +0000)]
Branch b1_6

Permission check update to libsysio.

b=12884

12 years ago* Added Changelog entry for "dropped message" CERROR->D_NETERROR fix
eeb [Fri, 3 Aug 2007 16:04:07 +0000 (16:04 +0000)]
*  Added Changelog entry for "dropped message" CERROR->D_NETERROR fix

12 years ago* Changed LNET "dropped message" CERRORs to D_NETERROR. This is to reduce
eeb [Fri, 3 Aug 2007 16:01:16 +0000 (16:01 +0000)]
*  Changed LNET "dropped message" CERRORs to D_NETERROR.  This is to reduce
   "console chatter" resulting from lustre timeouts racing with RPC
   completion (e.g. BUG 11223)

12 years ago* 12299 - fixed spurious timeout on userspace ptllnd NOOP messages.
eeb [Fri, 3 Aug 2007 14:16:27 +0000 (14:16 +0000)]
*   12299 - fixed spurious timeout on userspace ptllnd NOOP messages.
            This defect was introduced when userspace ptllnd timeouts were
            implemented.

12 years agob=13201
fanyong [Fri, 3 Aug 2007 11:11:45 +0000 (11:11 +0000)]
b=13201
i=ericm
i=vitaly

Fix compile warning and type error message when compiles the HEAD branch.

12 years agoBranch b1_6
johann [Fri, 3 Aug 2007 10:25:25 +0000 (10:25 +0000)]
Branch b1_6
b=11802
i=adilger
i=kalpak

Severity   : normal
Bugzilla   : 11802
Description: lustre support for RHEL5
Details    : Add support for RHEL5.

12 years agoBranch HEAD
yangsheng [Fri, 3 Aug 2007 06:17:47 +0000 (06:17 +0000)]
Branch HEAD
b=12839
i=shadow
i=adilger

Remove inode-nr_unused-2.6.9-rhel4.patch from 2.6-rhel4.series.
Update target file & kernel config for RHEL4(2.6.9-55.0.2.EL).

12 years agoBranch HEAD
liuy [Fri, 3 Aug 2007 03:06:06 +0000 (03:06 +0000)]
Branch HEAD
b=13006
i=shadow, deen

Description: warnings with build patchless client with vanila 2.6.19 and up
Details    : change the old ctl_table style and replace ctl_table/ctl_table_header
             with cfs_sysctl_table_t/cfs_sysctl_table_header_t

12 years agob=11171
brian [Thu, 2 Aug 2007 17:19:33 +0000 (17:19 +0000)]
b=11171
r=jitendra,cliffw

Some documentation (s/.pl//g) fixes.
Add a $rslt_loc variable to set the location of the $rslt file.  Defaults
to /tmp for backward compatibility.
Cleanup some syntax/style:
- put $ next to variable names in awk scriptlets
- one space on either side of |
Make sure the amount of data the sgp_dd is going to write actually fits in
the device and suggest reducing $size and exiting with an error if it does
not.

12 years agob=11171
nathan [Thu, 2 Aug 2007 16:29:53 +0000 (16:29 +0000)]
b=11171
fix rpm
rename libobd to libecho

12 years agoremove -x
nathan [Thu, 2 Aug 2007 16:10:26 +0000 (16:10 +0000)]
remove -x

12 years agob=13097
grev [Thu, 2 Aug 2007 13:38:57 +0000 (13:38 +0000)]
b=13097
i=Nathan

Perform sync not after but before OBD_FAIL_MDS_REINT_NET_REP to be sure
that client get the mds reply and kbytesfree was correctly updated.

12 years agoBranch HEAD
liuy [Thu, 2 Aug 2007 09:28:49 +0000 (09:28 +0000)]
Branch HEAD
b=13006
i=shadow, deen

Description: warnings with build patchless client with vanila 2.6.19 and up
Details    : change the old ctl_table style and replace ctl_table/ctl_table_header
             with cfs_sysctl_table_t/cfs_sysctl_table_header_t

12 years agoBranch b1_6
liuy [Thu, 2 Aug 2007 08:30:13 +0000 (08:30 +0000)]
Branch b1_6
b=13006
i=shadow, deen

Description: warnings with build patchless client with vanila 2.6.19 and up
Details    : change the old ctl_table style and replace ctl_table/ctl_table_header
             with cfs_sysctl_table_t/cfs_sysctl_table_header_t

12 years agoBranch HEAD
liuy [Thu, 2 Aug 2007 08:02:26 +0000 (08:02 +0000)]
Branch HEAD
b=12333
i=green, nathan

Description: obdclass is limited by single OBD_ALLOC(idarray)
Details    : replace OBD_ALLOC/OBD_FREE with OBD_VMALLOC/OBD_VFREE

12 years agoBranch b1_6
yangsheng [Thu, 2 Aug 2007 07:39:17 +0000 (07:39 +0000)]
Branch b1_6
b=12415
r=kalpak

Fixed the ext3-unlink-race.patch. It should be against the ext3.

12 years agoBranch HEAD
bobijam [Thu, 2 Aug 2007 07:00:50 +0000 (07:00 +0000)]
Branch HEAD
b=12606
i=shadow, nikita

Use cfs_alloc_* functions and CFS_* flags for code portability.

12 years agoBranch HEAD
johann [Thu, 2 Aug 2007 06:40:38 +0000 (06:40 +0000)]
Branch HEAD
b=11802
i=green
i=scjody

attachment 11752 / rely on AUTOCONF_INCLUDED instead of HAVE_KERNEL_CONFIG_H

12 years agoBranch b1_6
johann [Thu, 2 Aug 2007 06:12:08 +0000 (06:12 +0000)]
Branch b1_6
b=11802
i=green
i=scjody

attachment 11752 / rely on AUTOCONF_INCLUDED instead of HAVE_KERNEL_CONFIG_H

12 years agoBranch Head
bobijam [Thu, 2 Aug 2007 03:09:59 +0000 (03:09 +0000)]
Branch Head
b=12606
i=shadow, nikita

Description: don't use GFP_* in generic Lustre code.
Details    : Use cfs_alloc_* functions and CFS_* flags for code portability.

12 years agoBranch:b1_6
bobijam [Thu, 2 Aug 2007 02:26:30 +0000 (02:26 +0000)]
Branch:b1_6
b=12606
i=shadow, nikita

Description: don't use GFP_* in generic Lustre code.
Details    : Use cfs_alloc_* functions and CFS_* flags for code portability.

12 years agoBranch HEAD
vitaly [Wed, 1 Aug 2007 19:43:59 +0000 (19:43 +0000)]
Branch HEAD
b=<bug>
i=green
i=shadow

handling of zero connect flags in self export for ELC code

12 years agotypo fixed
maxim [Wed, 1 Aug 2007 14:41:35 +0000 (14:41 +0000)]
typo fixed

12 years agoDid improvements in README.obdfilter-survey as per new
jitendra [Wed, 1 Aug 2007 12:16:37 +0000 (12:16 +0000)]
Did improvements in README.obdfilter-survey as per new
obdfilter-survey and libobd scripts.
b:10961
i:nathan@clusterfs.com

12 years agob=6334
kalpak [Wed, 1 Aug 2007 08:18:03 +0000 (08:18 +0000)]
b=6334

The new MMP patches have rendered these old and crufty patches obsolete.

12 years agobranch: HEAD
ericm [Tue, 31 Jul 2007 15:45:34 +0000 (15:45 +0000)]
branch: HEAD
remove a duplicate definition.

12 years agoBranch HEAD
vitaly [Tue, 31 Jul 2007 11:17:54 +0000 (11:17 +0000)]
Branch HEAD
b=11829
i=huanghua
i=tappro

early lock cancel for cmd

12 years agob=6334
kalpak [Tue, 31 Jul 2007 10:05:51 +0000 (10:05 +0000)]
b=6334
i=adilger, girish

Changelog entry for MMP.

12 years agob=6334
kalpak [Tue, 31 Jul 2007 09:55:43 +0000 (09:55 +0000)]
b=6334
i=adilger
i=girish

Multiple mount protection patches for ldiskfs.

12 years agoBranch b1_6
johann [Tue, 31 Jul 2007 06:40:15 +0000 (06:40 +0000)]
Branch b1_6
b=10636
i=alex
i=adilger

attachment 11376 / use d_rehash_cond() and __d_move() in iopen-2.6-fc5.patch

12 years ago- modify ldiskfs tag for HEAD
tappro [Mon, 30 Jul 2007 21:13:27 +0000 (21:13 +0000)]
- modify ldiskfs tag for HEAD

12 years ago- make HEAD from b_post_cmd3
tappro [Mon, 30 Jul 2007 21:08:59 +0000 (21:08 +0000)]
- make HEAD from b_post_cmd3

12 years agoModified ChangeLog entry.
jitendra [Fri, 27 Jul 2007 09:59:41 +0000 (09:59 +0000)]
Modified ChangeLog entry.

12 years agoImproved obdfilter-survey.
jitendra [Fri, 27 Jul 2007 09:42:58 +0000 (09:42 +0000)]
Improved obdfilter-survey.
added libobd, a common library to setup, echo clients/servers,
cleanups and other common lctl related setups and cleanups etc.

b=11171
i:nathan

12 years agofix for problem where orphaned lstats processes can be left running on nodes
walter [Thu, 26 Jul 2007 19:37:09 +0000 (19:37 +0000)]
fix for problem where orphaned lstats processes can be left running on nodes
(which prevents subsequents stats gathering from working for new test cases).

also add debug macros for easier tracing/debugging in the future

12 years agob=12421
cliffw [Thu, 26 Jul 2007 18:37:28 +0000 (18:37 +0000)]
b=12421
i=brian
i=wangdi

Adds stats-collect to RPM build.

12 years agob=12302
maxim [Thu, 26 Jul 2007 15:14:52 +0000 (15:14 +0000)]
b=12302
the section is added to support "lustrecvs b_usocklnd" (lnet usocklnd development branch)

12 years agoBranch b1_6
scjody [Wed, 25 Jul 2007 02:51:15 +0000 (02:51 +0000)]
Branch b1_6

Add 1.6.2 to changelogs

12 years agoBranch b1_6
scjody [Tue, 24 Jul 2007 21:40:57 +0000 (21:40 +0000)]
Branch b1_6

Update for 1.6.1