ceph-disk: s/prefered/preferred/
diff mbox

Message ID 56FE1B91.2080108@suse.cz
State New
Headers show

Commit Message

Nathan Cutler April 1, 2016, 6:56 a.m. UTC
Hi,

Please pull the following Ceph updates from this mail.

There is not much here, just some overdue proofreading.

This patch is based on a recent merge of the jewel tree to avoid 
conflicts with a recent refactor.

Sincerely

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
---
  src/ceph-disk/ceph_disk/main.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

      executables *will* be found and will error nicely otherwise.

@@ -429,7 +429,7 @@ def command_check_call(arguments):
      Safely execute a ``subprocess.check_call`` call making sure that the
      executable exists and raising a helpful error message if it does not.

-    .. note:: This should be the prefered way of calling
+    .. note:: This should be the preferred way of calling
      ``subprocess.check_call`` since it provides the caller with the 
safety net
      of making sure that executables *will* be found and will error nicely
      otherwise.
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Dan van der Ster April 1, 2016, 7:22 a.m. UTC | #1
Good catch ;)

Tested-by: Dan van der Ster <daniel.vanderster@cern.ch>


On Fri, Apr 1, 2016 at 8:56 AM, Nathan Cutler <ncutler@suse.cz> wrote:
> Hi,
>
> Please pull the following Ceph updates from this mail.
>
> There is not much here, just some overdue proofreading.
>
> This patch is based on a recent merge of the jewel tree to avoid conflicts
> with a recent refactor.
>
> Sincerely
>
> Signed-off-by: Nathan Cutler <ncutler@suse.cz>
> ---
>  src/ceph-disk/ceph_disk/main.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/ceph-disk/ceph_disk/main.py
> b/src/ceph-disk/ceph_disk/main.py
> index d0ec596..a137967 100755
> --- a/src/ceph-disk/ceph_disk/main.py
> +++ b/src/ceph-disk/ceph_disk/main.py
> @@ -406,7 +406,7 @@ def command(arguments, **kwargs):
>      executable exists and raising a helpful error message
>      if it does not.
>
> -    .. note:: This should be the prefered way of calling
> ``subprocess.Popen``
> +    .. note:: This should be the preferred way of calling
> ``subprocess.Popen``
>      since it provides the caller with the safety net of making sure that
>      executables *will* be found and will error nicely otherwise.
>
> @@ -429,7 +429,7 @@ def command_check_call(arguments):
>      Safely execute a ``subprocess.check_call`` call making sure that the
>      executable exists and raising a helpful error message if it does not.
>
> -    .. note:: This should be the prefered way of calling
> +    .. note:: This should be the preferred way of calling
>      ``subprocess.check_call`` since it provides the caller with the safety
> net
>      of making sure that executables *will* be found and will error nicely
>      otherwise.
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Loic Dachary April 1, 2016, 9:07 a.m. UTC | #2
Once again, and with feeling: please PLEASE stop doing these idiotic things.

You should worry about *your* code. Don't worry about my merge. Don't
worry about other trees. Make sure YOUR code is well-tested and
stable, and make sure there is absolutely nothing questionable there.

This whole idiotic "let's rebase on top of something else because of a
tiny conflict" is a disease.

I'm simply not applying this. If you insist on sending me patches that
have been rebased in the last day, then I will insist on just waiting
for the next merge window.

It really is that simple.

This patch request came in very late in the merge window, and the code
clearly has had almost zero actual testing since it was recently
rebased.

The fact that it avoids a merge conflict is not worth it.

Stop doing this idiotic crazy thing. How many times do I have to tell
people? When  you rebase, you are throwing your old testing away, and
you're also making me get new commits that are different from the
ceph-jewel commits.

I'm not AT ALL interested in getting newly minted untested crap the
last day of the merge window.

Really.

                   Loic

On 01/04/2016 08:56, Nathan Cutler wrote:
> Hi,
> 
> Please pull the following Ceph updates from this mail.
> 
> There is not much here, just some overdue proofreading.
> 
> This patch is based on a recent merge of the jewel tree to avoid conflicts with a recent refactor.
> 
> Sincerely
> 
> Signed-off-by: Nathan Cutler <ncutler@suse.cz>
> ---
>  src/ceph-disk/ceph_disk/main.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
> index d0ec596..a137967 100755
> --- a/src/ceph-disk/ceph_disk/main.py
> +++ b/src/ceph-disk/ceph_disk/main.py
> @@ -406,7 +406,7 @@ def command(arguments, **kwargs):
>      executable exists and raising a helpful error message
>      if it does not.
> 
> -    .. note:: This should be the prefered way of calling ``subprocess.Popen``
> +    .. note:: This should be the preferred way of calling ``subprocess.Popen``
>      since it provides the caller with the safety net of making sure that
>      executables *will* be found and will error nicely otherwise.
> 
> @@ -429,7 +429,7 @@ def command_check_call(arguments):
>      Safely execute a ``subprocess.check_call`` call making sure that the
>      executable exists and raising a helpful error message if it does not.
> 
> -    .. note:: This should be the prefered way of calling
> +    .. note:: This should be the preferred way of calling
>      ``subprocess.check_call`` since it provides the caller with the safety net
>      of making sure that executables *will* be found and will error nicely
>      otherwise.
> -- 
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
John Hunter April 1, 2016, 10:19 a.m. UTC | #3
Is that from Linus?
I also think this is a good catch, there is no conflict AFAICS.
Is that because the patch description?

Reviewed-by: Zhao Junwang <zhjwpku@gmail.com>

On Fri, Apr 1, 2016 at 5:07 PM, Loic Dachary <loic@dachary.org> wrote:
> Once again, and with feeling: please PLEASE stop doing these idiotic things.
>
> You should worry about *your* code. Don't worry about my merge. Don't
> worry about other trees. Make sure YOUR code is well-tested and
> stable, and make sure there is absolutely nothing questionable there.
>
> This whole idiotic "let's rebase on top of something else because of a
> tiny conflict" is a disease.
>
> I'm simply not applying this. If you insist on sending me patches that
> have been rebased in the last day, then I will insist on just waiting
> for the next merge window.
>
> It really is that simple.
>
> This patch request came in very late in the merge window, and the code
> clearly has had almost zero actual testing since it was recently
> rebased.
>
> The fact that it avoids a merge conflict is not worth it.
>
> Stop doing this idiotic crazy thing. How many times do I have to tell
> people? When  you rebase, you are throwing your old testing away, and
> you're also making me get new commits that are different from the
> ceph-jewel commits.
>
> I'm not AT ALL interested in getting newly minted untested crap the
> last day of the merge window.
>
> Really.
>
>                    Loic
>
> On 01/04/2016 08:56, Nathan Cutler wrote:
>> Hi,
>>
>> Please pull the following Ceph updates from this mail.
>>
>> There is not much here, just some overdue proofreading.
>>
>> This patch is based on a recent merge of the jewel tree to avoid conflicts with a recent refactor.
>>
>> Sincerely
>>
>> Signed-off-by: Nathan Cutler <ncutler@suse.cz>
>> ---
>>  src/ceph-disk/ceph_disk/main.py | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
>> index d0ec596..a137967 100755
>> --- a/src/ceph-disk/ceph_disk/main.py
>> +++ b/src/ceph-disk/ceph_disk/main.py
>> @@ -406,7 +406,7 @@ def command(arguments, **kwargs):
>>      executable exists and raising a helpful error message
>>      if it does not.
>>
>> -    .. note:: This should be the prefered way of calling ``subprocess.Popen``
>> +    .. note:: This should be the preferred way of calling ``subprocess.Popen``
>>      since it provides the caller with the safety net of making sure that
>>      executables *will* be found and will error nicely otherwise.
>>
>> @@ -429,7 +429,7 @@ def command_check_call(arguments):
>>      Safely execute a ``subprocess.check_call`` call making sure that the
>>      executable exists and raising a helpful error message if it does not.
>>
>> -    .. note:: This should be the prefered way of calling
>> +    .. note:: This should be the preferred way of calling
>>      ``subprocess.check_call`` since it provides the caller with the safety net
>>      of making sure that executables *will* be found and will error nicely
>>      otherwise.
>> --
>> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
>
> --
> Loïc Dachary, Artisan Logiciel Libre
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/src/ceph-disk/ceph_disk/main.py 
b/src/ceph-disk/ceph_disk/main.py
index d0ec596..a137967 100755
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -406,7 +406,7 @@  def command(arguments, **kwargs):
      executable exists and raising a helpful error message
      if it does not.

-    .. note:: This should be the prefered way of calling 
``subprocess.Popen``
+    .. note:: This should be the preferred way of calling 
``subprocess.Popen``
      since it provides the caller with the safety net of making sure that