[Pkg-ceph-commits] [ceph] 02/10: Merge tag 'upstream/0.94.2' into experimental
James Downing Page
jamespage at moszumanska.debian.org
Tue Jun 16 10:32:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch experimental
in repository ceph.
commit cf82eab9342c6672ea8d9902210470e05c47e429
Merge: 866ee83 b5c18f6
Author: James Page <james.page at ubuntu.com>
Date: Mon Jun 15 10:02:36 2015 +0100
Merge tag 'upstream/0.94.2' into experimental
Upstream version 0.94.2
Conflicts:
debian/ceph-common.install
debian/ceph-mds.install
debian/ceph-mds.postinst
debian/ceph-mds.prerm
debian/ceph-resource-agents.install
debian/ceph-test.install
debian/ceph.dirs
debian/ceph.install
debian/ceph.lintian-overrides
debian/ceph.postinst
debian/ceph.postrm
debian/ceph.prerm
debian/changelog
debian/compat
debian/control
debian/copyright
debian/libcephfs-dev.install
debian/libcephfs-jni.install
debian/libcephfs1.install
debian/librados-dev.install
debian/librados2.install
debian/libradosstriper-dev.install
debian/libradosstriper1.install
debian/librbd-dev.install
debian/librbd1.install
debian/radosgw.dirs
debian/radosgw.postinst
debian/radosgw.prerm
debian/rules
debian/source/format
debian/watch
AUTHORS | 5 +-
ChangeLog | 84 +-
Makefile.in | 339 +-
aclocal.m4 | 747 ++--
ar-lib | 15 +-
ceph.spec | 5 +-
ceph.spec.in | 3 +-
compile | 99 +-
config.guess | 184 +-
config.sub | 106 +-
configure | 1035 +++--
configure.ac | 2 +-
depcomp | 487 ++-
install-sh | 14 +-
ltmain.sh | 4 +-
m4/libtool.m4 | 52 +-
man/Makefile.in | 131 +-
missing | 414 +-
py-compile | 23 +-
src/.git_version | 4 +-
src/Makefile.in | 5070 +++++++++++++----------
src/acconfig.h.in | 3 -
src/ceph-disk | 48 +-
src/civetweb/src/civetweb.c | 2 +-
src/client/Client.cc | 105 +
src/client/Client.h | 4 +
src/cls/rgw/cls_rgw.cc | 3 +-
src/cls/rgw/cls_rgw_types.h | 2 +-
src/common/Cycles.h | 9 +-
src/common/ceph_json.h | 29 +
src/common/config_opts.h | 7 +
src/gmock/Makefile.in | 973 +++--
src/gmock/aclocal.m4 | 775 ++--
compile => src/gmock/build-aux/compile | 99 +-
src/gmock/build-aux/config.guess | 184 +-
src/gmock/build-aux/config.sub | 106 +-
src/gmock/build-aux/depcomp | 487 ++-
src/gmock/build-aux/install-sh | 14 +-
src/gmock/build-aux/ltmain.sh | 4 +-
src/gmock/build-aux/missing | 414 +-
src/gmock/build-aux/test-driver | 139 +
src/gmock/configure | 640 +--
src/gmock/gtest/Makefile.in | 897 ++--
src/gmock/gtest/aclocal.m4 | 723 ++--
compile => src/gmock/gtest/build-aux/compile | 99 +-
src/gmock/gtest/build-aux/config.guess | 184 +-
src/gmock/gtest/build-aux/config.sub | 106 +-
src/gmock/gtest/build-aux/depcomp | 487 ++-
src/gmock/gtest/build-aux/install-sh | 14 +-
src/gmock/gtest/build-aux/ltmain.sh | 4 +-
src/gmock/gtest/build-aux/missing | 414 +-
src/gmock/gtest/build-aux/test-driver | 139 +
src/gmock/gtest/configure | 638 +--
src/gmock/gtest/m4/libtool.m4 | 52 +-
src/init-radosgw | 2 +-
src/init-radosgw.sysv | 2 +-
src/java/Makefile.in | 101 +-
src/librbd/AsyncRequest.h | 6 +-
src/librbd/ImageCtx.cc | 8 +-
src/librbd/ImageWatcher.cc | 55 +-
src/librbd/ImageWatcher.h | 5 +-
src/librbd/ObjectMap.h | 6 +-
src/librbd/internal.cc | 304 +-
src/librbd/internal.h | 5 +-
src/librbd/librbd.cc | 6 +-
src/libs3/debian/changelog | 5 -
src/libs3/debian/changelog.Debian | 6 -
src/libs3/debian/control | 12 -
src/libs3/debian/control.dev | 26 -
src/libs3/debian/postinst | 3 -
src/mds/Capability.h | 7 +-
src/mds/Makefile-client.am | 4 +
src/mds/{Makefile.am => Makefile-server.am} | 35 +-
src/mds/Makefile.am | 75 +-
src/mon/OSDMonitor.cc | 2 +-
src/msg/simple/Pipe.cc | 10 +-
src/ocf/Makefile.in | 103 +-
src/osd/OSD.cc | 23 +-
src/osd/ReplicatedPG.cc | 13 +-
src/osdc/Objecter.cc | 18 +-
src/osdc/Objecter.h | 12 +-
src/perfglue/Makefile.am | 5 +
src/rgw/Makefile.am | 17 +-
src/rgw/rgw_admin.cc | 125 +-
src/rgw/rgw_common.h | 10 +
src/rgw/rgw_main.cc | 34 +-
src/rgw/rgw_op.cc | 68 +-
src/rgw/rgw_op.h | 10 +-
src/rgw/rgw_rados.cc | 241 +-
src/rgw/rgw_rados.h | 34 +-
src/rgw/rgw_rest.cc | 8 +-
src/rgw/rgw_rest.h | 8 +-
src/rgw/rgw_rest_s3.cc | 8 +-
src/rgw/rgw_rest_swift.cc | 131 +-
src/rgw/rgw_rest_swift.h | 3 +
src/rgw/rgw_swift.cc | 2 +
src/rocksdb/m4/libtool.m4 | 52 +-
src/test/Makefile-client.am | 24 +
src/test/Makefile-server.am | 24 -
src/test/centos-6/ceph.spec.in | 3 +-
src/test/centos-7/ceph.spec.in | 3 +-
src/test/librados_test_stub/TestIoCtxImpl.cc | 29 +-
src/test/librados_test_stub/TestMemIoCtxImpl.cc | 22 +-
src/test/librados_test_stub/TestMemIoCtxImpl.h | 1 +
src/test/librados_test_stub/TestRadosClient.cc | 25 +-
src/test/librados_test_stub/TestRadosClient.h | 3 +-
src/test/librbd/test_ImageWatcher.cc | 2 +-
src/test/librbd/test_internal.cc | 13 +-
src/test/msgr/test_async_driver.cc | 2 +-
src/test/os/TestLFNIndex.cc | 54 +-
src/tracing/Makefile.in | 204 +-
test-driver | 139 +
112 files changed, 11335 insertions(+), 7450 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list