Merge lp://staging/~suchvenu/charms/trusty/ibm-db2/db2 into lp://staging/~ibmcharmers/charms/trusty/ibm-db2/devel
Proposed by
Suchitra Venugopal
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~suchvenu/charms/trusty/ibm-db2/db2 |
| Merge into: | lp://staging/~ibmcharmers/charms/trusty/ibm-db2/devel |
| Diff against target: |
3545 lines (+3254/-0) (has conflicts) 48 files modified
Makefile (+24/-0) README.md (+253/-0) bin/layer_option (+24/-0) config.yaml (+62/-0) copyright (+13/-0) files/archives/db2inst1.INS (+119/-0) files/archives/db2installresfile/db2inst1.INS (+119/-0) files/archives/db2installresfile/db2server.rsp (+64/-0) files/archives/db2installresfile/db2server_ppcle.rsp (+64/-0) files/archives/db2server.rsp (+64/-0) files/archives/db2server_ppcle.rsp (+64/-0) files/sftp_get.sh (+19/-0) hooks/config-changed (+19/-0) hooks/db-relation-broken (+19/-0) hooks/db-relation-changed (+19/-0) hooks/db-relation-departed (+19/-0) hooks/db-relation-joined (+19/-0) hooks/hook.template (+19/-0) hooks/install (+19/-0) hooks/leader-elected (+18/-0) hooks/leader-settings-changed (+18/-0) hooks/relations/db2/@ (+75/-0) hooks/relations/db2/README.md (+51/-0) hooks/relations/db2/interface.yaml (+4/-0) hooks/relations/db2/provides.py (+83/-0) hooks/relations/db2/requires.py (+67/-0) hooks/start (+19/-0) hooks/stop (+19/-0) hooks/update-status (+19/-0) hooks/upgrade-charm (+28/-0) icon.svg (+29/-0) layer.yaml (+24/-0) lib/charms/__init__.py (+2/-0) lib/charms/apt.py (+180/-0) lib/charms/layer/__init__.py (+21/-0) lib/charms/layer/basic.py (+154/-0) lib/charms/layer/execd.py (+138/-0) lib/charms/leadership.py (+58/-0) metadata.yaml (+22/-0) reactive/apt.py (+98/-0) reactive/ibm-base.sh (+107/-0) reactive/ibm-db2.sh (+816/-0) reactive/leadership.py (+68/-0) requirements.txt (+2/-0) tests/00-setup (+17/-0) tests/10-bundles-test.py (+73/-0) tests/bundles.yaml (+10/-0) tox.ini (+12/-0) Conflict adding file Makefile. Moved existing file to Makefile.moved. Conflict adding file README.md. Moved existing file to README.md.moved. Conflict adding file bin. Moved existing file to bin.moved. Conflict adding file config.yaml. Moved existing file to config.yaml.moved. Conflict adding file copyright. Moved existing file to copyright.moved. Conflict adding file files. Moved existing file to files.moved. Conflict adding file hooks. Moved existing file to hooks.moved. Conflict adding file icon.svg. Moved existing file to icon.svg.moved. Conflict adding file layer.yaml. Moved existing file to layer.yaml.moved. Conflict adding file lib. Moved existing file to lib.moved. Conflict adding file metadata.yaml. Moved existing file to metadata.yaml.moved. Conflict adding file reactive. Moved existing file to reactive.moved. Conflict adding file requirements.txt. Moved existing file to requirements.txt.moved. Conflict adding file tests. Moved existing file to tests.moved. Conflict adding file tox.ini. Moved existing file to tox.ini.moved. Conflict adding file wheelhouse. Moved existing file to wheelhouse.moved. |
| To merge this branch: | bzr merge lp://staging/~suchvenu/charms/trusty/ibm-db2/db2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| shilpa | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| shilpa (shilkaul) | # |
review:
Approve
Unmerged revisions
- 10. By Suchitra Venugopal
-
Setting the pw only when required
- 9. By Suchitra Venugopal
-
DB2 stopping the apps before db2stop
- 8. By Suchitra Venugopal
-
Minor changes after changing the states in db2 Interface
- 7. By Suchitra Venugopal
-
DB2 layered charm final changes
- 6. By Suchitra Venugopal
-
DB2 Review Rework Changes
- 5. By Suchitra Venugopal
-
Readme changes
- 4. By Suchitra Venugopal
-
Interface changes
- 3. By Suchitra Venugopal
-
README pdates
- 2. By Suchitra Venugopal
-
README updates
- 1. By Suchitra Venugopal
-
IBM DB2 Layered charm
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
