summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gh/next' into wip-5672wip-5672Sage Weil2013-07-215-78/+35
|\
| * Merge remote-tracking branch 'gh/wip-swift' into nextSage Weil2013-07-193-75/+33
| |\
| | * mon/PaxosService: update on_active() docs to clarify calling rulesSage Weil2013-07-191-2/+3
| | * mon/OSDMonitor: discard failure waiters, info on shutdownSage Weil2013-07-192-11/+17
| | * mon: OSDMonitor: only thrash and propose if we are the leaderSage Weil2013-07-191-2/+8
| | * mon/OSDMonitor: do not wait for readable in send_latest()Sage Weil2013-07-192-59/+7
| | * Revert "mon/OSDMonitor: send_to_waiting() in on_active()"Sage Weil2013-07-191-5/+5
| | * Revert "mon: OSDMonitor: only thrash and propose if we are the leader"Sage Weil2013-07-191-8/+2
| | * Revert "mon/OSDMonitor: fix typo"Sage Weil2013-07-191-1/+1
| | * mon: improve osdmap subscription debug outputSage Weil2013-07-191-0/+3
| * | ceph_rest_api.py: remove unused importsDan Mick2013-07-191-3/+0
| * | ceph.in: better error message when daemon command returns nothingDan Mick2013-07-191-0/+2
| |/
* | src/*: make Context::finish private and switch all users to use completeSamuel Just2013-07-1918-115/+61
* | FileStore: use complete() instead of finish() and deleteSamuel Just2013-07-191-4/+2
* | Finisher: use complete() not finish() and deleteSamuel Just2013-07-191-4/+2
* | OSD::RemoveWQ: do not apply_transaction while blocking _try_resurrect_pgSamuel Just2013-07-192-19/+42
* | common/Cond.h: add a simpler C_SaferCond ContextSamuel Just2013-07-191-0/+32
|/
* Merge remote-tracking branch 'gh/wip-stats' into nextSage Weil2013-07-193-24/+79
|\
| * mon/PGMap: avoid negative pg stats when calculating ratesSage Weil2013-07-191-14/+25
| * mon/PGMap: use signed values for calculated ratesSage Weil2013-07-191-12/+12
| * osd: add floor() method to pg/osd stat structsSage Weil2013-07-191-0/+44
| * osd: make pool_stat_t *log_size fields signedSage Weil2013-07-192-4/+4
* | Merge branch 'wip-rgw-next-2' into nextGreg Farnum2013-07-1915-95/+158
|\ \
| * | rgw: remove extra unused param from RGWRados::get_attr()Yehuda Sadeh2013-07-194-12/+6
| * | cls_rgw: quiet down verbose log messageYehuda Sadeh2013-07-191-1/+1
| * | rgw: replace logic that compares regionsYehuda Sadeh2013-07-193-13/+14
| * | rgw-admin: link / unlink should report errorsYehuda Sadeh2013-07-191-2/+10
| * | rgw: fix time parsing in replica logYehuda Sadeh2013-07-191-6/+6
| * | rgw: bucket entry point object ver fixesYehuda Sadeh2013-07-1910-25/+70
| * | rgw: remove s->objv_trackerYehuda Sadeh2013-07-192-18/+14
| * | rgw: forward delete bucket request to master after removalYehuda Sadeh2013-07-191-8/+13
| * | rgw: adjust error for bucket removal on secondary regionYehuda Sadeh2013-07-191-1/+6
| * | rgw: forward x_amz_meta headers when forwarding a requestYehuda Sadeh2013-07-191-0/+5
| * | rgw: fix bucket re-creation on secondary regionYehuda Sadeh2013-07-191-15/+19
| * | mon/MonClient: fix small leakSage Weil2013-07-191-0/+1
| * | msgr: mark addr-based [lazy_]send_message and get_connection deprecatedSage Weil2013-07-191-0/+9
| * | client: mark_down by conSage Weil2013-07-191-1/+1
| * | mon: mark_down session by con, not addrSage Weil2013-07-191-5/+5
| * | mon: break con <-> session ref cycle in mon even if shutting downSage Weil2013-07-191-3/+6
| * | msg/SimpleMessenger: remove duplicated interface docsSage Weil2013-07-192-218/+17
| * | msgr: update docs for mark_down, mark_down_all semanticsSage Weil2013-07-191-16/+26
| * | msgr: generate reset event on mark_down to addr (not con)Sage Weil2013-07-191-3/+6
| * | osd/ReplicatedPG: fix obc leak on invalid LIST_SNAPS opSage Weil2013-07-191-0/+1
| * | osd: break con <-> session cycle when marking down old peersSage Weil2013-07-191-1/+3
| * | osd: make ms_handle_reset debug more usefulSage Weil2013-07-191-1/+1
* | | mon/PGMap: don't mangle stamp_delta in clear_delta()Sage Weil2013-07-191-1/+1
* | | osd: log PG state changes at level 5Sage Weil2013-07-191-2/+2
* | | ReplicatedPG: track temp collection contents, clear during on_changeSamuel Just2013-07-192-3/+34
* | | PG, ReplicatedPG: pass a transaction down to ReplicatedPG::on_changeSamuel Just2013-07-194-7/+10
| |/ |/|
* | mon/MonClient: better debugging on version requestsSage Weil2013-07-191-3/+8