Merge ~slashd/ubuntu/+source/ceph/+git/ceph-1:h-mandeploy into ubuntu/+source/ceph:ubuntu/devel
Proposed by
Eric Desrochers
| Status: | Needs review |
|---|---|
| Proposed branch: | ~slashd/ubuntu/+source/ceph/+git/ceph-1:h-mandeploy |
| Merge into: | ubuntu/+source/ceph:ubuntu/devel |
| Diff against target: |
12083 lines (+11289/-0) (has conflicts) 66 files modified
debian/ceph-base.install (+3/-0) debian/changelog (+10/-0) src/civetweb/build.cmd (+869/-0) src/civetweb/mingw.cmd (+887/-0) src/civetweb/test/windows.cgi.cmd (+10/-0) src/civetweb/test/windows_fail.cgi.cmd (+5/-0) src/civetweb/test/windows_fail_silent.cgi.cmd (+6/-0) src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln (+35/-0) src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj (+194/-0) src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops (+18/-0) src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj (+190/-0) src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj (+204/-0) src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln (+35/-0) src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj (+85/-0) src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props (+22/-0) src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj (+91/-0) src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj (+104/-0) src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj (+140/-0) src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj (+56/-0) src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc (+41/-0) src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc (+43/-0) src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj (+85/-0) src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj (+90/-0) src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln (+48/-0) src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj (+129/-0) src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln (+48/-0) src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj (+129/-0) src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj (+132/-0) src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj (+132/-0) src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj (+167/-0) src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj (+167/-0) src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj (+150/-0) src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj (+150/-0) src/zstd/build/VS2008/fullbench/fullbench.vcproj (+552/-0) src/zstd/build/VS2008/fuzzer/fuzzer.vcproj (+588/-0) src/zstd/build/VS2008/zstd.sln (+59/-0) src/zstd/build/VS2008/zstd/zstd.vcproj (+668/-0) src/zstd/build/VS2008/zstdlib/zstdlib.vcproj (+638/-0) src/zstd/build/VS2010/datagen/datagen.vcxproj (+171/-0) src/zstd/build/VS2010/fullbench-dll/fullbench-dll.vcxproj (+192/-0) src/zstd/build/VS2010/fullbench/fullbench.vcxproj (+221/-0) src/zstd/build/VS2010/fuzzer/fuzzer.vcxproj (+226/-0) src/zstd/build/VS2010/libzstd-dll/libzstd-dll.rc (+54/-0) src/zstd/build/VS2010/libzstd-dll/libzstd-dll.vcxproj (+257/-0) src/zstd/build/VS2010/libzstd/libzstd.vcxproj (+250/-0) src/zstd/build/VS2010/zstd.sln (+92/-0) src/zstd/build/VS2010/zstd/zstd.rc (+54/-0) src/zstd/build/VS2010/zstd/zstd.vcxproj (+260/-0) src/zstd/build/VS_scripts/build.VS2010.cmd (+9/-0) src/zstd/build/VS_scripts/build.VS2012.cmd (+8/-0) src/zstd/build/VS_scripts/build.VS2013.cmd (+9/-0) src/zstd/build/VS_scripts/build.VS2015.cmd (+9/-0) src/zstd/build/VS_scripts/build.VS2017.cmd (+9/-0) src/zstd/build/VS_scripts/build.VS2017Community.cmd (+9/-0) src/zstd/build/VS_scripts/build.VS2017Enterprise.cmd (+9/-0) src/zstd/build/VS_scripts/build.VS2017Professional.cmd (+9/-0) src/zstd/build/VS_scripts/build.generic.cmd (+65/-0) src/zstd/contrib/VS2005/fullbench/fullbench.vcproj (+443/-0) src/zstd/contrib/VS2005/fuzzer/fuzzer.vcproj (+491/-0) src/zstd/contrib/VS2005/zstd.sln (+58/-0) src/zstd/contrib/VS2005/zstd/zstd.vcproj (+551/-0) src/zstd/contrib/VS2005/zstdlib/zstdlib.vcproj (+565/-0) src/zstd/lib/dll/example/build_package.bat (+23/-0) src/zstd/lib/dll/example/fullbench-dll.sln (+28/-0) src/zstd/lib/dll/example/fullbench-dll.vcxproj (+183/-0) src/zstd/programs/windres/zstd.rc (+54/-0) Conflict in debian/ceph-base.install Conflict in debian/changelog Conflict in src/civetweb/build.cmd Conflict in src/civetweb/mingw.cmd Conflict in src/civetweb/test/windows.cgi.cmd Conflict in src/civetweb/test/windows_fail.cgi.cmd Conflict in src/civetweb/test/windows_fail_silent.cgi.cmd Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj Conflict in src/zstd/build/VS2008/fullbench/fullbench.vcproj Conflict in src/zstd/build/VS2008/fuzzer/fuzzer.vcproj Conflict in src/zstd/build/VS2008/zstd.sln Conflict in src/zstd/build/VS2008/zstd/zstd.vcproj Conflict in src/zstd/build/VS2008/zstdlib/zstdlib.vcproj Conflict in src/zstd/build/VS2010/datagen/datagen.vcxproj Conflict in src/zstd/build/VS2010/fullbench-dll/fullbench-dll.vcxproj Conflict in src/zstd/build/VS2010/fullbench/fullbench.vcxproj Conflict in src/zstd/build/VS2010/fuzzer/fuzzer.vcxproj Conflict in src/zstd/build/VS2010/libzstd-dll/libzstd-dll.rc Conflict in src/zstd/build/VS2010/libzstd-dll/libzstd-dll.vcxproj Conflict in src/zstd/build/VS2010/libzstd/libzstd.vcxproj Conflict in src/zstd/build/VS2010/zstd.sln Conflict in src/zstd/build/VS2010/zstd/zstd.rc Conflict in src/zstd/build/VS2010/zstd/zstd.vcxproj Conflict in src/zstd/build/VS_scripts/build.VS2010.cmd Conflict in src/zstd/build/VS_scripts/build.VS2012.cmd Conflict in src/zstd/build/VS_scripts/build.VS2013.cmd Conflict in src/zstd/build/VS_scripts/build.VS2015.cmd Conflict in src/zstd/build/VS_scripts/build.VS2017.cmd Conflict in src/zstd/build/VS_scripts/build.VS2017Community.cmd Conflict in src/zstd/build/VS_scripts/build.VS2017Enterprise.cmd Conflict in src/zstd/build/VS_scripts/build.VS2017Professional.cmd Conflict in src/zstd/build/VS_scripts/build.generic.cmd Conflict in src/zstd/contrib/VS2005/fullbench/fullbench.vcproj Conflict in src/zstd/contrib/VS2005/fuzzer/fuzzer.vcproj Conflict in src/zstd/contrib/VS2005/zstd.sln Conflict in src/zstd/contrib/VS2005/zstd/zstd.vcproj Conflict in src/zstd/contrib/VS2005/zstdlib/zstdlib.vcproj Conflict in src/zstd/lib/dll/example/build_package.bat Conflict in src/zstd/lib/dll/example/fullbench-dll.sln Conflict in src/zstd/lib/dll/example/fullbench-dll.vcxproj Conflict in src/zstd/programs/windres/zstd.rc |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
