]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/wip-xattr'
authorSamuel Just <sam.just@inktank.com>
Wed, 7 Nov 2012 17:52:49 +0000 (09:52 -0800)
committerSamuel Just <sam.just@inktank.com>
Wed, 7 Nov 2012 17:52:54 +0000 (09:52 -0800)
Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge