Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ejb security to branch #2

Closed
wants to merge 1,339 commits into from

Conversation

sgilda
Copy link
Contributor

@sgilda sgilda commented Oct 15, 2013

@pmuir: I couldn't get the read-tree to work because it seems to be trying to add the remote to a subdirectory of the jboss-sandbox-quickstarts.

This is how I did the merge:

  1. cd to my jboss-eap-quickstarts directory
  2. git fetch upstream
  3. git checkout -b save-ejb-security-quickstarts upstream/master
  4. remove everything but the ejb-security-plus and ejb-security-propagation quickstarts and commit.
  5. git push sgilda HEAD
  6. cd to my jboss-sandbox-quickstarts directory
  7. git remote add -f sgilda-eap-qs https://github.com/sgilda/jboss-as-quickstart.git
  8. git checkout -b ejb-security-from-branch sgilda-eap-qs/save-ejb-security-quickstarts (branch with 2 quickstarts)
  9. git fetch upstream
  10. git checkout -b ejb-security-to-branch upstream/master
  11. git merge ejb-security-from-branch
  12. git push sgilda HEAD

Please verify, but it looks like this merge contains the history for all the merged files. For example, when I view the History for the following, it shows all the changes made to that file:

https://github.com/sgilda/jboss-sandbox-quickstarts/blob/ejb-security-to-branch/ejb-security-plus/README.md

sgilda and others added 30 commits February 21, 2013 08:41
…eltaspike/beanbuilder/model/Person.java

Fix typo in comment.
…ltaspike-beanbuilder, deltaspike-deactivatable, cdi-add-interceptor-binding, kitchensink-deltaspike
- use [[anchor]] macro instead of anchor:name[]
- asciidoctor-specific rendering options
- set path to icons and enable them

- also fix two invalid image references
rafabene and others added 27 commits September 27, 2013 12:06
Adopted use of @insequence annotation to order tests for TaskDao.

Converted the Resources bean in tasks-jsf to a @RequestScoped one
to ensure that Arquillian injects a valid EntityManager instance
in the test instances.
@sgilda
Copy link
Contributor Author

sgilda commented Oct 15, 2013

This looks odd, but if you look at the files changed, it only seems to include the new files for the ejb-security-plus and ejb-security-propagation quickstarts.

I assume the other commits are for the history of those files?

@sgilda
Copy link
Contributor Author

sgilda commented Oct 15, 2013

@pmuir, rbenevides: I don't think this is right. The end result is correct, but there are too many unrelated commits. The only reason it looks right is because of the commit that removes the other quickstarts. Closing this out to start over.

@sgilda sgilda closed this Oct 15, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet