Merge lp://staging/~semiosis/ubuntu/trusty/glusterfs/fix-for-1268064 into lp://staging/ubuntu/trusty/glusterfs

Proposed by Louis Zuckerman
Status: Merged
Approved by: James Page
Approved revision: 31
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp://staging/~semiosis/ubuntu/trusty/glusterfs/fix-for-1268064
Merge into: lp://staging/ubuntu/trusty/glusterfs
Diff against target: 17170 lines (+7414/-7666)
93 files modified
.pc/.quilt_patches (+0/-1)
.pc/.quilt_series (+0/-1)
.pc/.version (+0/-1)
.pc/01-spelling-error.diff/rpc/rpc-transport/rdma/src/rdma.c (+0/-4578)
.pc/01-spelling-error.diff/xlators/mgmt/glusterd/src/glusterd-store.c (+0/-2530)
.pc/applied-patches (+0/-1)
ChangeLog (+1978/-4)
api/Makefile.am (+1/-1)
api/Makefile.in (+1/-1)
api/examples/Makefile.am (+6/-0)
api/examples/Makefile.in (+555/-0)
api/examples/README (+19/-0)
api/examples/gfapi.py (+402/-0)
api/examples/glfsxmp.c (+1601/-0)
api/examples/setup.py.in (+29/-0)
api/src/Makefile.am (+3/-2)
api/src/Makefile.in (+15/-3)
api/src/glfs-fops.c (+91/-32)
api/src/glfs-handleops.c (+1278/-0)
api/src/glfs-handles.h (+143/-0)
api/src/glfs-internal.h (+59/-0)
api/src/glfs-mem-types.h (+2/-1)
api/src/glfs-resolve.c (+70/-3)
api/src/glfs.c (+22/-4)
api/src/glfs.h (+26/-0)
cli/src/cli-cmd-parser.c (+36/-4)
cli/src/cli-cmd-volume.c (+68/-3)
cli/src/cli-rpc-ops.c (+22/-14)
cli/src/cli-xml-output.c (+81/-4)
configure (+13/-11)
configure.ac (+3/-1)
debian/changelog (+16/-0)
debian/glusterfs-client.mounting-glusterfs.upstart (+9/-0)
debian/glusterfs-server.mounting-glusterfs.upstart (+0/-7)
debian/rules (+3/-2)
debian/source.lintian-overrides (+1/-0)
doc/glusterd.vol (+1/-0)
glusterfs.spec (+41/-16)
glusterfs.spec.in (+33/-8)
glusterfsd/src/glusterfsd-mgmt.c (+5/-0)
libglusterfs/src/globals.c (+56/-1)
libglusterfs/src/globals.h (+4/-0)
libglusterfs/src/mem-types.h (+2/-1)
libglusterfs/src/syncop.c (+154/-0)
libglusterfs/src/syncop.h (+63/-19)
rpc/rpc-transport/rdma/src/rdma.c (+4/-4)
xlators/cluster/afr/src/afr-inode-read.c (+1/-1)
xlators/cluster/afr/src/afr.c (+10/-0)
xlators/cluster/dht/src/dht-common.c (+16/-6)
xlators/cluster/dht/src/dht-common.h (+1/-0)
xlators/cluster/dht/src/dht-inode-read.c (+4/-0)
xlators/cluster/dht/src/dht-inode-write.c (+2/-0)
xlators/cluster/dht/src/dht-layout.c (+11/-3)
xlators/cluster/dht/src/dht-rebalance.c (+29/-14)
xlators/cluster/dht/src/dht-selfheal.c (+7/-0)
xlators/mgmt/glusterd/src/glusterd-brick-ops.c (+9/-3)
xlators/mgmt/glusterd/src/glusterd-op-sm.c (+71/-4)
xlators/mgmt/glusterd/src/glusterd-pmap.c (+5/-5)
xlators/mgmt/glusterd/src/glusterd-replace-brick.c (+8/-3)
xlators/mgmt/glusterd/src/glusterd-store.c (+3/-4)
xlators/mgmt/glusterd/src/glusterd-utils.c (+148/-14)
xlators/mgmt/glusterd/src/glusterd-utils.h (+7/-2)
xlators/mgmt/glusterd/src/glusterd-volume-ops.c (+12/-4)
xlators/mgmt/glusterd/src/glusterd.c (+10/-2)
xlators/mgmt/glusterd/src/glusterd.h (+1/-0)
xlators/mount/fuse/src/fuse-bridge.h (+14/-7)
xlators/nfs/server/src/mount3.c (+5/-14)
xlators/nfs/server/src/mount3.h (+4/-13)
xlators/nfs/server/src/mount3udp_svc.c (+4/-13)
xlators/nfs/server/src/nfs-common.c (+4/-13)
xlators/nfs/server/src/nfs-common.h (+4/-13)
xlators/nfs/server/src/nfs-fops.c (+4/-13)
xlators/nfs/server/src/nfs-fops.h (+4/-13)
xlators/nfs/server/src/nfs-generics.c (+4/-13)
xlators/nfs/server/src/nfs-generics.h (+4/-13)
xlators/nfs/server/src/nfs-inodes.c (+4/-13)
xlators/nfs/server/src/nfs-inodes.h (+4/-13)
xlators/nfs/server/src/nfs-mem-types.h (+4/-13)
xlators/nfs/server/src/nfs.c (+4/-13)
xlators/nfs/server/src/nfs.h (+4/-13)
xlators/nfs/server/src/nfs3-fh.c (+4/-13)
xlators/nfs/server/src/nfs3-fh.h (+4/-13)
xlators/nfs/server/src/nfs3-helpers.c (+4/-13)
xlators/nfs/server/src/nfs3-helpers.h (+4/-13)
xlators/nfs/server/src/nfs3.c (+4/-13)
xlators/nfs/server/src/nfs3.h (+4/-13)
xlators/nfs/server/src/nlm4.c (+4/-13)
xlators/nfs/server/src/nlm4.h (+4/-13)
xlators/nfs/server/src/nlmcbk_svc.c (+4/-13)
xlators/protocol/auth/addr/src/addr.c (+4/-13)
xlators/protocol/auth/login/src/login.c (+4/-13)
xlators/protocol/client/src/client-handshake.c (+1/-0)
xlators/storage/posix/src/posix.c (+27/-10)
To merge this branch: bzr merge lp://staging/~semiosis/ubuntu/trusty/glusterfs/fix-for-1268064
Reviewer Review Type Date Requested Status
James Page Pending
Review via email: mp+201280@code.staging.launchpad.net

Description of the change

Update glusterfs version & fix bug

To post a comment you must log in.
31. By Louis Zuckerman

adding debian/glusterfs-client.mounting-glusterfs.upstart which was missed in the last commit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches