summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next'Gary Lowell2013-06-252-1/+7
|\
| * v0.65v0.65Gary Lowell2013-06-252-1/+7
* | Merge pull request #380 from dachary/wip-4907Josh Durgin2013-06-251-6/+11
|\ \
| * | get_xattr() can return more than 4KBLoic Dachary2013-06-251-6/+11
* | | Merge pull request #379 from dachary/wip-5312Sage Weil2013-06-251-0/+4
|\ \ \ | |/ / |/| |
| * | skip TEST(EXT4StoreTest, _detect_fs) if DISK or MOUNTPOINT are undefinedLoic Dachary2013-06-251-0/+4
|/ /
* | Merge remote-tracking branch 'gh/next'Sage Weil2013-06-246-5/+34
|\ \ | |/
| * mon/Elector: cancel election timer if we bootstrapSage Weil2013-06-241-0/+1
| * mon: cancel probe timeout on resetSage Weil2013-06-241-0/+1
| * mon/AuthMonitor: ensure initial rotating keys get encoded when create_initial...Sage Weil2013-06-241-3/+5
| * init-radosgw.sysv: remove -x debug modeSage Weil2013-06-241-1/+1
| * common/pick_addresses: behave even after internal_safe_to_start_threadsSage Weil2013-06-241-0/+24
| * Add python-argparse to dependencies (for pre-2.7 systems)Dan Mick2013-06-241-1/+2
* | osd: tolerate racing threads starting recovery opsSage Weil2013-06-241-1/+1
* | Merge pull request #376 from dalgaaf/wip-da-SCA-cppcheck-3Sage Weil2013-06-247-13/+12
|\ \
| * | test/librados/cmd.cc: use static_cast instead of C-Style castDanny Al-Gaaf2013-06-241-1/+1
| * | osdc/Objecter.cc: use static_cast instead of C-Style castDanny Al-Gaaf2013-06-241-1/+1
| * | mon/MonClient.cc: use static_cast instead of C-Style castDanny Al-Gaaf2013-06-241-1/+1
| * | common/cmdparse.cc: reduce scope of local variable 'pos'Danny Al-Gaaf2013-06-241-2/+1
| * | common/cmdparse.cc: remove unused variableDanny Al-Gaaf2013-06-241-1/+1
| * | osd/OSD.cc: prefer prefix ++operator for non-trivial iteratorDanny Al-Gaaf2013-06-241-1/+1
| * | OSDMonitor.cc: prefer prefix ++operator for non-trivial iteratorDanny Al-Gaaf2013-06-241-1/+1
| * | mon/MonCap.cc: use empty() instead of if(size())Danny Al-Gaaf2013-06-241-1/+1
| * | common/cmdparse.cc: prefer prefix ++operator for non-trivial iteratorDanny Al-Gaaf2013-06-241-4/+4
* | | debian, rpm: remove python-lockfile dependencySage Weil2013-06-242-2/+0
* | | Merge remote-tracking branch 'gh/next'Sage Weil2013-06-246-8/+27
|\ \ \ | |/ / |/| / | |/
| * mds: do not assume segment list is non-empty in standby_trim_segmentsSage Weil2013-06-242-2/+8
| * Merge pull request #374 from ceph/wip-5427Sage Weil2013-06-243-6/+11
| |\
| | * mon/AuthMonitor: make initial auth include rotating keysSage Weil2013-06-233-6/+11
| |/
| * mon: do not leak no_reply messagesSage Weil2013-06-231-1/+5
| * mon: fix leak of MOSDFailure messagesSage Weil2013-06-232-0/+10
| * debian: ceph-common requires matching version of python-cephSage Weil2013-06-221-1/+1
* | Merge pull request #375 from ceph/wip-msgrGregory Farnum2013-06-232-60/+71
|\ \
| * | msgr: clear_pipe+queue reset when replacing lossy connectionsSage Weil2013-06-232-3/+10
| * | msgr: reaper: make sure pipe has been cleared (under pipe_lock)Sage Weil2013-06-231-2/+5
| * | msg/Pipe: goto fail_unlocked on early failures in accept()Sage Weil2013-06-231-55/+46
| * | msgr: clear con->pipe inside pipe_lock on mark_downSage Weil2013-06-231-0/+10
| * | msgr: clear_pipe inside pipe_lock on mark_down_allSage Weil2013-06-231-1/+1
|/ /
* | Merge branch 'next'Dan Mick2013-06-215-941/+987
|\ \ | |/
| * Add header comments and Inktank copyrights to ceph.in/ceph_argparse.pyDan Mick2013-06-212-0/+25
| * ceph.in: rip out reusable code to pybind/ceph_argparse.pyDan Mick2013-06-214-928/+943
| * ceph: even shinierSage Weil2013-06-211-4/+2
| * ceph: do not busy-loop on ceph -wSage Weil2013-06-211-0/+2
| * librados: make cmd test tolerate NXIO for osd commandsSage Weil2013-06-211-3/+8
| * ceph.in: remove some TAB charsDan Mick2013-06-201-2/+2
| * ceph.in: fix ^C handling in watch (trap exception in while, too)Dan Mick2013-06-201-6/+7
| * ceph: --version as well as -vSage Weil2013-06-201-2/+2
* | Merge remote-tracking branch 'gh/wip-mds'Sage Weil2013-06-2114-224/+239
|\ \
| * | mds: rev protocolSage Weil2013-06-211-1/+1
| * | mds: kill Server::handle_client_lookup_hash()Yan, Zheng2013-06-212-144/+1