Re-structured the folder OracleTuxedo #481
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
DongHan2016
commented
Jul 17, 2017
DongHan2016
commented
- Moved the folder OracleTSAM to the folder OracleTuxedo and rename OracleTSAM to tsam. There is no change in the contents of Dockerfiles in OracleTSAM.
- Update OracleTuxedo/README.md for the new sub-folder
removed the useless file
removed the useless file
Updated following files: core/dockerfiles/12.1.3/Dockerfile core/dockerfiles/12.2.2/Dockerfile core/dockerfiles/buildDockerImage.sh core/dockerfiles/README.md core/README.md core/samples/mp/docker-compose.yml core/samples/mp/Dockerfile core/samples/mp/simpappmp_runme.sh core/samples/shm/build.sh core/samples/shm/Dockerfile core/samples/shm/simpapp_runme.sh Additions: core/dockerfiles/12.1.3: init.sh core/dockerfiles/12.2.2: init.sh core/samples/mp: simpappmp_build.sh Removals: core/dockerfiles/12.1.3: tuxedo12.1.3.rsp.template core/dockerfiles/12.1.3: tuxedo12.1.3_silent_install.sh.template core/dockerfiles: fix_locations.sh core/dockerfiles: tuxedo.docker
1. removed core/samples to tuxedo_full as the samples are dependent on TSAM which is not installed in the docker 2. removed dockerfiles and samples folders under the original Tuxedo folder (OracleTuxedo) 3. updated the files according to the new comments in PR455.
1. Moved the folder OracleTSAM to OracleTuxedo and renamed it to tsam, and without any changes in contents of those files. 2. Updated OracleTuxedo/README.md for the new sub-folder tsam.
Djelibeybi
previously approved these changes
Jul 17, 2017
|
I've approved this, but in future, please be more careful with your branches: there are a lot of commits in here that have already been merged. You need to rebase your master branch from the upstream master and then create a local branch for your changes before submitting a pull request. I recommend the Git and GitHub learning resources here: https://help.github.com/articles/git-and-github-learning-resources/ Particularly the bits on branching, forks and pull requests. |
brunoborges
approved these changes
Jul 17, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.