Merge lp://staging/~yogesh-srikrishnan/openstack-manuals/yogirackspace into lp://staging/~annegentle/openstack-manuals/trunk
Proposed by
Yogeshwar
| Status: | Merged |
|---|---|
| Merge reported by: | Anne Gentle |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~yogesh-srikrishnan/openstack-manuals/yogirackspace |
| Merge into: | lp://staging/~annegentle/openstack-manuals/trunk |
| Diff against target: |
4870 lines (+4800/-1) (has conflicts) 9 files modified
doc/source/docbkx/incubation/keystone/devguide/pom.xml (+32/-1) doc/source/docbkx/incubation/keystone/devguide/src/docbkx/OS-KSEC2-service-devguide.xml (+271/-0) doc/source/docbkx/incubation/keystone/devguide/src/docbkx/RAX-KSGRP-service-devguide.xml (+300/-0) doc/source/docbkx/incubation/keystone/devguide/src/docbkx/RAX-KSKEY-service-devguide.xml (+270/-0) doc/source/docbkx/incubation/keystone/devguide/src/docbkx/identity-client-devguide.xml.OTHER (+899/-0) doc/source/docbkx/incubation/keystone/devguide/target/docbkx/pdf/identity-OS-devguide.fo.OTHER (+15/-0) doc/source/docbkx/incubation/keystone/devguide/target/docbkx/pdf/identity-RAX-devguide.fo.OTHER (+12/-0) doc/source/docbkx/incubation/keystone/devguide/target/docbkx/pdf/identity-client-devguide.fo.OTHER (+1297/-0) doc/source/docbkx/incubation/keystone/devguide/target/docbkx/pdf/identity-service-devguide.fo.OTHER (+1704/-0) Text conflict in doc/source/docbkx/incubation/keystone/devguide/pom.xml Contents conflict in doc/source/docbkx/incubation/keystone/devguide/src/docbkx/identity-client-devguide.xml Conflict adding files to doc/source/docbkx/incubation/keystone/devguide/target. Created directory. Conflict because doc/source/docbkx/incubation/keystone/devguide/target is not versioned, but has versioned children. Versioned directory. Conflict adding files to doc/source/docbkx/incubation/keystone/devguide/target/docbkx. Created directory. Conflict because doc/source/docbkx/incubation/keystone/devguide/target/docbkx is not versioned, but has versioned children. Versioned directory. Conflict adding files to doc/source/docbkx/incubation/keystone/devguide/target/docbkx/pdf. Created directory. Conflict because doc/source/docbkx/incubation/keystone/devguide/target/docbkx/pdf is not versioned, but has versioned children. Versioned directory. Contents conflict in doc/source/docbkx/incubation/keystone/devguide/target/docbkx/pdf/identity-OS-devguide.fo Contents conflict in doc/source/docbkx/incubation/keystone/devguide/target/docbkx/pdf/identity-RAX-devguide.fo Contents conflict in doc/source/docbkx/incubation/keystone/devguide/target/docbkx/pdf/identity-client-devguide.fo Contents conflict in doc/source/docbkx/incubation/keystone/devguide/target/docbkx/pdf/identity-service-devguide.fo |
| To merge this branch: | bzr merge lp://staging/~yogesh-srikrishnan/openstack-manuals/yogirackspace |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Anne Gentle | Needs Resubmitting | ||
|
Review via email:
|
|||
Description of the change
Added documents specific to extensions.
Pl let me know if you want me to make any other changes.These are draft documents and would undergo changes.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi Yogi - Let's hold off on putting the extension docs into this repo and get them into the Git repo that we'll set up after we get guidance from all the PTLs on the direction here.