Skip to content

Leader Follower initial commit#423

Closed
amit2103 wants to merge 58 commits into
iluwatar:masterfrom
amit2103:leader-follower-2
Closed

Leader Follower initial commit#423
amit2103 wants to merge 58 commits into
iluwatar:masterfrom
amit2103:leader-follower-2

Conversation

@amit2103
Copy link
Copy Markdown
Contributor

Pull request for issue #179 (Leader Follower Pattern). Made some changes as per feedback. In order to reduce merge conflicts making this new request

TylerMcConville and others added 20 commits February 7, 2016 17:05
Added two modules to demonstrate locks.

Mutex demonstrates a simple mutual exclusion lock. Semaphore
demonstrates a semaphore for controlling access to a pool of resources.

The main class of both programs is App.java.
- Added descriptions
- Added junit tests
- Added javadoc
- Added index.md
- Added class diagrams
basic implementation ++
Test/Doc added
Second type mapper is updated to use java.util.vector
@amit2103 amit2103 mentioned this pull request Apr 13, 2016
@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.03%) to 90.983% when pulling 3ed72c7 on amit2103:leader-follower-2 into b72214d on iluwatar:master.

@amit2103
Copy link
Copy Markdown
Contributor Author

@iluwatar Okay..Will update the branch

@iluwatar
Copy link
Copy Markdown
Owner

iluwatar commented May 1, 2016

@amit2103 the conflicts still persist.

@amit2103
Copy link
Copy Markdown
Contributor Author

amit2103 commented May 1, 2016

@iluwatar resolved..will update by Tuesday

@amit2103
Copy link
Copy Markdown
Contributor Author

amit2103 commented May 8, 2016

@iluwatar updated...please look at this now .

@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.6%) to 90.361% when pulling 47e5972 on amit2103:leader-follower-2 into b72214d on iluwatar:master.

@iluwatar
Copy link
Copy Markdown
Owner

iluwatar commented May 8, 2016

@amit2103 the Leader-Follower itself looks quite good but the changelist contains huge amount of changes to other patterns. Please revert the unnecessary changes.

@amit2103
Copy link
Copy Markdown
Contributor Author

amit2103 commented May 9, 2016

Is it possible to cherry pick? It seems the changes are added from the
rebase, as I Definitely didnt change the files

On Sun, May 8, 2016 at 11:02 PM, Ilkka Seppälä notifications@github.com
wrote:

@amit2103 https://github.com/amit2103 the Leader-Follower itself looks
quite good but the changelist contains huge amount of changes to other
patterns. Please revert the unnecessary changes.


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#423 (comment)

@iluwatar
Copy link
Copy Markdown
Owner

@amit2103 you can reset the files you didn't want to change by checking them out from master branch. For example git checkout master -- api-gateway/README.md would reset one file.

@amit2103
Copy link
Copy Markdown
Contributor Author

Okay...Will try this today.

On Thu, May 12, 2016 at 10:36 AM, Ilkka Seppälä notifications@github.com
wrote:

@amit2103 https://github.com/amit2103 you can reset the files you
didn't want to change by checking them out from master branch. For
example git checkout master -- api-gateway/README.md would reset one file.


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#423 (comment)

@iluwatar
Copy link
Copy Markdown
Owner

@amit2103 final call, I'm about to close this pull request due to inactivity.

@amit2103
Copy link
Copy Markdown
Contributor Author

Apologies for the delay..I will get this done by tomorrow...

@amit2103
Copy link
Copy Markdown
Contributor Author

@iluwatar Do you know why I keep getting this updates when I am rebasing the origin..I was trying to do it again..But saw some changes? Is there a way to avoid it

@iluwatar
Copy link
Copy Markdown
Owner

Hey @amit2103 what are trying to do? Maybe this helps https://help.github.com/articles/syncing-a-fork/

@amit2103
Copy link
Copy Markdown
Contributor Author

I tried to rebase , let me try merge

On Wed, Jun 29, 2016 at 12:15 AM, Ilkka Seppälä notifications@github.com
wrote:

Hey @amit2103 https://github.com/amit2103 what are trying to do? Maybe
this helps https://help.github.com/articles/syncing-a-fork/


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#423 (comment),
or mute the thread
https://github.com/notifications/unsubscribe/AHN1ZKSGYerRVj5inNJCXa2EkbExTr03ks5qQWvfgaJpZM4IGies
.

@iluwatar
Copy link
Copy Markdown
Owner

First merge master, then use the checkout command to reset the unwanted changes as I wrote before.

@iluwatar
Copy link
Copy Markdown
Owner

I'm closing this pull request due to inactivity.

@iluwatar iluwatar closed this Aug 20, 2016
@iluwatar
Copy link
Copy Markdown
Owner

@all-contributors please add @amit2103 for code

@allcontributors
Copy link
Copy Markdown
Contributor

@iluwatar

I've put up a pull request to add @amit2103! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants