RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'gh/stable'

Browse Source
This commit is contained in:
Sage Weil 2011-10-03 09:45:14 -07:00
commit a827f0400f
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -7,7 +7,7 @@ AC_PREREQ(2.59)
# NOTE: This version is _only_ used for naming the tarball. The
# VERSION define is not used by the code. It gets a version string
# from 'git describe'; see src/ceph_ver.[ch]
AC_INIT([ceph], [0.35], [ceph-devel@vger.kernel.org])
AC_INIT([ceph], [0.36], [ceph-devel@vger.kernel.org])
AC_CONFIG_SUBDIRS([src/gtest])

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
ceph (0.36-1) experimental; urgency=low
* New upstream release
-- Sage Weil <sage@newdream.net> Fri, 30 Sep 2011 09:29:29 -0700
ceph (0.35-1) experimental; urgency=low
* New upstream release

15
src/tools/ceph.cc
View File

@ -136,11 +136,9 @@ int main(int argc, const char **argv)
// output
int out_fd;
if (out_file.empty()) {
out_fd = ::open("/dev/null", O_WRONLY);
out_file = "/dev/null";
} else if (out_file == "-") {
out_fd = dup(STDOUT_FILENO);
bool close_out_fd = false;
if (out_file.empty() || out_file == "-") {
out_fd = STDOUT_FILENO;
} else {
out_fd = TEMP_FAILURE_RETRY(::open(out_file.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0644));
if (out_fd < 0) {
@ -149,6 +147,7 @@ int main(int argc, const char **argv)
<< cpp_strerror(ret) << dendl;
return 1;
}
close_out_fd = true;
}
CephToolCtx *ctx = ceph_tool_common_init(mode, concise);
@ -195,7 +194,8 @@ int main(int argc, const char **argv)
<< cpp_strerror(err) << dendl;
goto out;
}
derr << " wrote " << obl.length() << " byte payload to " << out_file << dendl;
if (!concise && !out_file.empty())
cerr << " wrote " << obl.length() << " byte payload to " << out_file << std::endl;
}
}
}
@ -212,7 +212,8 @@ int main(int argc, const char **argv)
}
out:
::close(out_fd);
if (close_out_fd)
::close(out_fd);
if (ceph_tool_common_shutdown(ctx))
ret = 1;
return ret;