Commit Graph

51683 Commits

Author SHA1 Message Date
Josh Durgin
c321c534e4 Merge pull request #8361 from liewegas/wip-test-port
test/test_pool_create.sh: fix port

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-29 11:34:54 -07:00
Josh Durgin
ef179eddde Merge remote-tracking branch 'origin/jewel' 2016-03-29 11:33:02 -07:00
Josh Durgin
5878c8ce9d Merge pull request #8356 from ceph/wip-cython-build-dir
pybind/Makefile.am: Prevent race creating CYTHON_BUILD_DIR

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-29 11:27:10 -07:00
Sage Weil
a21cc54b98 test/test_pool_create.sh: fix port
17108 is used by test/mon/test_pool_quota.sh

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-29 14:26:17 -04:00
Sage Weil
fc7942bfd0 Merge pull request #8359 from athanatos/wip-15205
os/ObjectStore: try_move_rename in transaction append and add coverage to store_test

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-29 14:22:51 -04:00
Samuel Just
9d6de8484b store_test: apply an appended transaction half the time
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-29 11:13:53 -07:00
Samuel Just
5bf281e92c Transaction: handle OP_TRY_RENAME in dump
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-29 11:13:53 -07:00
Samuel Just
9634cec809 store_test: add a TryMoveRename test
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-29 11:13:52 -07:00
Samuel Just
eb9e80c94f ObjectStore::Transaction::_update_op: handle OP_TRY_RENAME
Fixes: http://tracker.ceph.com/issues/15205
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-29 11:13:35 -07:00
Samuel Just
d2beb77760 Merge pull request #6317 from cxwshawn/wip-lost-fix
PG: pg down state blocked by osd.x, lost osd.x cannot solve peering stuck

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-29 10:56:55 -07:00
Sage Weil
c40d90df06 Merge pull request #8292 from vshankar/bluefs-tool-fix
os/bluestore: ceph-bluefs-tool fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-29 13:47:26 -04:00
branto1
8a83ec9904 Merge pull request #8334 from dachary/wip-subman-facts
script: subscription-manager support (part 3)

Reviewed-by: Boris Ranto <branto@redhat.com>
2016-03-29 19:37:02 +02:00
Orit Wasserman
48a823b359 Merge pull request #8351 from jcsp/wip-cmake-cython
cmake: Build cython modules and change paths to bin/, lib/
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-29 18:35:22 +02:00
Loic Dachary
668c8f965e script: subscription-manager support (part 3)
Renaming subman.py in subman is cute but does not prevent the generation
of the py[co].

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 18:12:40 +02:00
Samuel Just
b3bc2911c1 Merge pull request #8215 from dzafman/wip-14438
Wip 14438

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-29 08:02:41 -07:00
Jason Dillaman
385d973189 Merge pull request #8261 from rjfd/wip-15217
rbd-mirror: enabling/disabling pool mirroring should update the mirroring directory

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-29 10:22:09 -04:00
John Spray
ad2e6f442d ceph.in: update for cmake path changes
Signed-off-by: John Spray <john.spray@redhat.com>
2016-03-29 13:42:40 +01:00
John Spray
5da6ae8638 vstart: update for cmake build path changes
Cribbed this from Ali's wip-cmake-make-check branch.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-03-29 13:42:40 +01:00
Ali Maredia
f02f1d17a6 cmake: Cython modules building with cmake
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-03-29 12:23:31 +01:00
Loic Dachary
43d63ee456 Merge pull request #8228 from SUSE/wip-15218
doc/dev: add "Deploy a cluster for manual testing" section

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-29 13:01:23 +02:00
Loic Dachary
d24f6f4196 Merge pull request #8256 from dachary/wip-mailmap
mailmap updates

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2016-03-29 12:58:56 +02:00
Loic Dachary
44bbdb6b0c mailmap: Adam C. Emerson name normalization
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:56 +02:00
Loic Dachary
4a6f8b300f mailmap: Jenkins name normalization
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:56 +02:00
Loic Dachary
24d6c9a80b mailmap: Yan Jun affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:56 +02:00
Loic Dachary
64eaea2b70 mailmap: Zhao Junwang affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:56 +02:00
Loic Dachary
69d9a4b33b mailmap: Sarthak Munshi affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:56 +02:00
Loic Dachary
c502ee1234 mailmap: Rust Shen affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:55 +02:00
Loic Dachary
3205e0c000 mailmap: Eric Cook affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:55 +02:00
Loic Dachary
8445255f14 mailmap: Ricardo Dias affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:55 +02:00
Loic Dachary
5bbfa8adaf mailmap: Karol Mroz affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:55 +02:00
Loic Dachary
83cd4034cc mailmap: James Liu affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:55 +02:00
Loic Dachary
4e091e704b mailmap: Robert LeBlanc name normalization
Reviewed-by: Robert LeBlanc <robert.leblanc@endurance.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:55 +02:00
Loic Dachary
a2e6aa6925 mailmap: Yankun Li name normalization
Reviewed-by: Yankun Li <liyankun@unitedstack.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:57:42 +02:00
Loic Dachary
79aca70f86 mailmap: Josh Durgin name normalization
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-29 12:56:30 +02:00
Ricardo Dias
c61ae3e776 rbd: rbd-mirroring: Added unit tests to test enable/disable image mirroring when pool-level mirroring changes
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-29 09:45:48 +01:00
Ricardo Dias
490dc4f3d8 rbd: rbd-mirroring: Disable image mirroring when pool-level mirroring is disabled
Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15217
2016-03-29 09:45:48 +01:00
Ricardo Dias
5624323d7e rbd: rbd-mirroring: Enable image mirroring when pool-level mirroring is enabled
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-29 09:45:48 +01:00
Loic Dachary
7563a34709 Merge pull request #8345 from tchaikov/wip-release-notes-indents
doc/release-notes: fix indents

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-29 10:37:30 +02:00
Kefu Chai
bc07def18a Merge pull request #8342 from xiexingguo/xxg-wip-doc
doc: fix typo, duplicated content etc. for Jewel release notes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-29 11:21:23 +08:00
Kefu Chai
e5a4d218a2 doc/release-notes: fix indents
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-29 11:19:46 +08:00
xie xingguo
92d1857834 doc: fix typo, duplicated content etc. for Jewel release notes
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-29 09:38:23 +08:00
Dan Mick
1c9332bb57 pybind/Makefile.am: Prevent race creating CYTHON_BUILD_DIR
Fixes http://tracker.ceph.com/issues/15276

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-03-28 16:55:47 -07:00
Casey Bodley
7f441b1065 Merge pull request #8321 from linuxbox2/jewel-nfs-fixes-2
rgw_file: set owner uid, gid, and Unix mode on new objects
2016-03-28 15:29:41 -04:00
Casey Bodley
cab2b2d2d0 Merge pull request #8106 from linuxbox2/wip-cmake-ssl
cmake: add FindOpenSSL.cmake
2016-03-28 13:24:35 -04:00
Loic Dachary
7327b1ad3d Merge pull request #8312 from SUSE/wip-submittingpatches
doc: amend Fixes instructions in SubmittingPatches

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-28 19:13:02 +02:00
Matt Benjamin
13bd851840 rgw_file tests: allow override of owner_uid and owner_gid
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-28 12:05:38 -04:00
Casey Bodley
516ad93b2d Merge pull request #8284 from yehudasa/wip-rgw-sync-fixes-5
rgw: fix lockdep false positive
2016-03-28 11:42:05 -04:00
Sage Weil
b83f339f1d Merge pull request #7820 from yuyuyu101/remove-exper
msg/async: remove experiment feature

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-28 10:48:42 -04:00
Sage Weil
cd3385b59f Merge pull request #8308 from wido/cloudstack-docs
doc: Updated CloudStack RBD documentation
2016-03-28 08:28:45 -04:00
Sage Weil
f394486109 Merge pull request #8327 from vumrao/wip-vumrao-15288
doc: Remove Ceph Monitors do lots of fsync()
2016-03-28 08:23:58 -04:00