Skip to content
This repository has been archived by the owner on Dec 7, 2022. It is now read-only.

Added docs from the pulp-2.4 branch. #1168

Merged
merged 1 commit into from Sep 22, 2014

Conversation

bowlofeggs
Copy link
Contributor

This commit adds in the documentation changes that were present in the
pulp-2.4 branch that were not present in the 2.4-release branch. This
commit was generated using this command:

$ git diff 2.4-release..pulp-2.4 docs/

This commit adds in the documentation changes that were present in the
pulp-2.4 branch that were not present in the 2.4-release branch. This
commit was generated using this command:

$ git diff 2.4-release..pulp-2.4 docs/
@beav beav self-assigned this Sep 22, 2014
development branch. A bugzilla bug fix branch name should contain the
developer's username and a bugzilla bug number, separated by a hyphen. For
example, "mhrivnak-876543". Optionally, a short description may follow the BZ
number.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we change this to the "fork in your own github account" style?

Also I am fine with leaving this as-is for now and changing later if we want to discuss more on the email list.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't want this PR to have any changes to the docs from what was in pulp-2.4. I just wanted to make sure the 2.4-release branch wasn't going to lose any of the changes that are currently live on RTD.

@beav
Copy link
Contributor

beav commented Sep 22, 2014

LGTM. I'm fine with this as-is and doing the changes mentioned above in a different PR (if we decide on that style)

@bowlofeggs bowlofeggs merged commit d972d51 into pulp:2.4-release Sep 22, 2014
@bowlofeggs bowlofeggs deleted the pulp-2.4_docs branch September 22, 2014 18:45
bmbouter pushed a commit to bmbouter/pulp that referenced this pull request Aug 4, 2015
If login_method is set, the value is used to configure the
BROKER_LOGIN_METHOD Celery option. login_method defaults
to '' which allows Celery to use its default values.

This change includes docs updates on practical usage of the new
setting and a release note.

Fixes pulp#1168
bmbouter pushed a commit to bmbouter/pulp that referenced this pull request Aug 4, 2015
If login_method is set, the value is used to configure the
BROKER_LOGIN_METHOD Celery option. login_method defaults
to '' which allows Celery to use its default values.

This change includes docs updates on practical usage of the new
setting and a release note.

closes pulp#1168
https://pulp.plan.io/issues/1168
bmbouter pushed a commit to bmbouter/pulp that referenced this pull request Aug 5, 2015
If login_method is set, the value is used to configure the
BROKER_LOGIN_METHOD Celery option. login_method defaults
to '' which allows Celery to use its default values.

This change includes docs updates on practical usage of the new
setting and a release note.

closes pulp#1168
https://pulp.plan.io/issues/1168
bmbouter pushed a commit to bmbouter/pulp that referenced this pull request Aug 19, 2015
This does not bump the release because the -9 version has not
yet been built in Koji so it can still be edited.

re pulp#1168
https://pulp.plan.io/issues/1168
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants