You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/07/10 22:50:48 UTC

[01/12] git commit: Proposed bylaws

Repository: incubator-storm
Updated Branches:
  refs/heads/master 1471cbd49 -> 9e77cd237


Proposed bylaws


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/133de77b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/133de77b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/133de77b

Branch: refs/heads/master
Commit: 133de77b27f003b9abd533a2bbd3b5c5961b7e77
Parents: 5c82b9f
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jun 20 07:53:04 2014 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jun 20 07:53:04 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/133de77b/BYLAWS.md
----------------------------------------------------------------------
diff --git a/BYLAWS.md b/BYLAWS.md
new file mode 100644
index 0000000..f34a8f4
--- /dev/null
+++ b/BYLAWS.md
@@ -0,0 +1,79 @@
+# Storm By-laws (Proposed)
+
+## Roles and Responsibilities
+
+Apache projects define a set of roles with associated rights and responsibilities. These roles govern what tasks an individual may perform within the project. The roles are defined in the following sections
+
+### Users:
+    The most important participants in the project are people who use our software. The majority of our developers start out as users and guide their development efforts from the user's perspective.
+
+    Users contribute to the Apache projects by providing feedback to developers in the form of bug reports and feature suggestions. As well, users participate in the Apache community by helping other users on mailing lists and user support forums.
+
+### Contributors:
+    All of the volunteers who are contributing time, code, documentation, or resources to the Storm Project. A contributor that makes sustained, welcome contributions to the project may be invited to become a Committer, though the exact timing of such invitations depends on many factors.
+
+### Committers:
+    The project's Committers are responsible for the project's technical management. Committers have access to all project source repositories. Committers may cast binding votes on any technical discussion regarding storm.
+
+    Committer access is by invitation only and must be approved by lazy consensus of the active PMC members. A Committer is considered emeritus by their own declaration or by not contributing in any form to the project for over six months. An emeritus committer may request reinstatement of commit access from the PMC. Such reinstatement is subject to lazy consensus approval of active PMC members.
+
+    All Apache committers are required to have a signed Contributor License Agreement (CLA) on file with the Apache Software Foundation. There is a Committer FAQ which provides more details on the requirements for Committers
+
+    A committer who makes a sustained contribution to the project may be invited to become a member of the PMC. The form of contribution is not limited to code. It can also include code review, helping out users on the mailing lists, documentation, testing, etc.
+
+### Project Management Committee(PMC):
+    The PMC is responsible to the board and the ASF for the management and oversight of the Apache Storm codebase. The responsibilities of the PMC include
+
+	    Deciding what is distributed as products of the Apache Storm project. In particular all releases must be approved by the PMC.
+	    Maintaining the project's shared resources, including the codebase repository, mailing lists, websites.
+	    Speaking on behalf of the project.
+	    Resolving license disputes regarding products of the project.
+	    Nominating new PMC members and committers.
+	    Maintaining these bylaws and other guidelines of the project.
+
+    Membership of the PMC is by invitation only and must be approved by a consensus approval of active PMC members. A PMC member is considered "emeritus" by their own declaration or by not contributing in any form to the project for over six months. An emeritus member may request reinstatement to the PMC. Such reinstatement is subject to consensus approval of the active PMC members.
+
+    The chair of the PMC is appointed by the ASF board. The chair is an office holder of the Apache Software Foundation (Vice President, Apache Storm) and has primary responsibility to the board for the management of the projects within the scope of the Storm PMC. The chair reports to the board quarterly on developments within the Storm project.
+
+    The chair of the PMC is rotated annually. When the chair is rotated or if the current chair of the PMC resigns, the PMC votes to recommend a new chair using Single Transferable Vote (STV) voting. See http://wiki.apache.org/general/BoardVoting for specifics. The decision must be ratified by the Apache board.
+
+## Voting
+	Decisions regarding the project are made by votes on the primary project development mailing list (dev@storm.incubator.apache.org). Where necessary, PMC voting may take place on the private Storm PMC mailing list. Votes are clearly indicated by subject line starting with [VOTE]. Votes may contain multiple items for approval and these should be clearly separated. Voting is carried out by replying to the vote mail. Voting may take four flavors
+	Vote
+	Meaning
+	+1
+	'Yes,' 'Agree,' or 'the action should be performed.'
+	+0
+	Neutral about the proposed action (or mildly negative but not enough so to want to block it). 
+	-1
+	This is a negative vote. On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action. 
+	All participants in the Storm project are encouraged to show their agreement with or against a particular action by voting. For technical decisions, only the votes of active committers are binding. Non-binding votes are still useful for those with binding votes to understand the perception of an action in the wider Storm community. For PMC decisions, only the votes of active PMC members are binding.
+	Voting can also be applied to changes already made to the Storm codebase. These typically take the form of a veto (-1) in reply to the commit message sent when the commit is made. Note that this should be a rare occurrence. All efforts should be made to discuss issues when they are still patches before the code is committed.
+	Only active (i.e. non-emeritus) committers and PMC members have binding votes.
+
+## Approvals
+	These are the types of approvals that can be sought. Different actions require different types of approvals
+	Consensus Approval - Consensus approval requires 3 binding +1 votes and no binding vetoes.
+	Lazy Consensus - Lazy consensus requires no -1 votes ('silence gives assent').
+	Lazy Majority - A lazy majority vote requires 3 binding +1 votes and more binding +1 votes than -1 votes.
+	Lazy 2/3 Majority - Lazy 2/3 majority votes requires at least 3 votes and twice as many +1 votes as -1 votes.
+### Vetoes
+	A valid, binding veto cannot be overruled. If a veto is cast, it must be accompanied by a valid reason explaining the reasons for the veto. The validity of a veto, if challenged, can be confirmed by anyone who has a binding vote. This does not necessarily signify agreement with the veto - merely that the veto is valid.
+	If you disagree with a valid veto, you must lobby the person casting the veto to withdraw their veto. If a veto is not withdrawn, any action that has been vetoed must be reversed in a timely manner.
+
+## Actions
+	This section describes the various actions which are undertaken within the project, the corresponding approval required for that action and those who have binding votes over the action.
+
+	| Actions | Description | Approval | Binding Votes | Minimum Length | Mailing List |
+	|---------|-------------|----------|---------------|----------------|--------------|
+	| Code Change | A change made to a codebase of the project and committed by a committer. This includes source code, documentation, website content, etc. | Two +1s from committers (at least one from someone who has not authored the patch). | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
+	| Release Plan | Defines the timetable and actions for a release. The plan also nominates a Release Manager. | Lazy majority | Active committers | 3 days | dev@storm.incubator.apache.org |
+	| Product Release | When a release of one of the project's products is ready, a vote is required to accept the release as an official release of the project. | Lazy Majority | Active PMC members | 3 days | dev@storm.incubator.apache.org |
+	| Adoption of New Codebase | When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects and submodules within the project. | Lazy 2/3 majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |
+	| New Committer | When a new committer is proposed for the project. | Lazy consensus | Active PMC members | 7 days | private@storm.incubator.apache.org |
+	| New PMC Member | When a committer is proposed for the PMC. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
+	| Emeritus PMC Member re-instatement | When an emeritus PMC member requests to be re-instated as an active PMC member. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
+	| Emeritus Committer re-instatement | When an emeritus committer requests to be re-instated as an active committer. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
+	| Committer Removal | When removal of commit privileges is sought. Note: Such actions will also be referred to the ASF board by the PMC chair. | Consensus Approval | Active PMC members (excluding the committer in question if a member of the PMC). | 7 Days | private@storm.incubator.apache.org |
+	| PMC Member Removal | When removal of a PMC member is sought. Note: Such actions will also be referred to the ASF board by the PMC chair. | Consensus Approval | Active PMC members (excluding the member in question). | 7 Days | private@storm.incubator.apache.org |
+	| Modifying Bylaws | Modifying this document. | Lazy 2/3 majority | Active PMC members | 7 Days | dev@storm.incubator.apache.org |


[06/12] git commit: Updated the bylaws following feedback from Nathan.

Posted by bo...@apache.org.
Updated the bylaws following feedback from Nathan.


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/b7d80848
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/b7d80848
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/b7d80848

Branch: refs/heads/master
Commit: b7d808485e331d4d0088ce4ec6bb976aaa5b9b77
Parents: afdc918
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jun 30 11:51:06 2014 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jun 30 11:51:06 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b7d80848/BYLAWS.md
----------------------------------------------------------------------
diff --git a/BYLAWS.md b/BYLAWS.md
index f8afaae..b9ca532 100644
--- a/BYLAWS.md
+++ b/BYLAWS.md
@@ -78,9 +78,9 @@ This section describes the various actions which are undertaken within the proje
 
 | Actions | Description | Approval | Binding Votes | Minimum Length | Mailing List |
 |---------|-------------|----------|---------------|----------------|--------------|
-| Code Change | A change made to a codebase of the project and committed by a committer. This includes source code, documentation, website content, etc. | Two +1s from committers other than the one who authored the patch, and no -1s. | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
-| Release Plan | Defines the timetable and actions for a release. The plan also nominates a Release Manager. | Lazy majority | Active committers | 3 days | dev@storm.incubator.apache.org |
-| Product Release | When a release of one of the project's products is ready, a vote is required to accept the release as an official release of the project. | Lazy Majority | Active PMC members | 3 days | dev@storm.incubator.apache.org |
+| Code Change | A change made to a source code of the project and committed by a committer. | One +1 from a committer other than the one who authored the patch, and no -1s. | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
+| Non-Code Change | A change made to a repository of the project and committed by a committer. This includes documentation, website content, etc., but not source code, unless only comments are being modified. | Lazy Consensus | Active committers | At the discression of the committer |JIRA or Github pull (with notification sent to dev@storm.incubator.apache.org) |
+| Product Release | A vote is required to accept a proposed release as an official release of the project. Any committer may call for a release vote at any point in time. | Lazy Majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |
 | Adoption of New Codebase | When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects and submodules within the project. | Lazy 2/3 majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |
 | New Committer | When a new committer is proposed for the project. | Lazy consensus | Active PMC members | 7 days | private@storm.incubator.apache.org |
 | New PMC Member | When a committer is proposed for the PMC. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |


[03/12] git commit: Updated Bylaws according to feedback.

Posted by bo...@apache.org.
Updated Bylaws according to feedback.


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/d38e7968
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/d38e7968
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/d38e7968

Branch: refs/heads/master
Commit: d38e7968388cb49ec0f393d54a885ce2bbb5e1cd
Parents: 84d297a
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 26 10:45:10 2014 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jun 26 10:45:10 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d38e7968/BYLAWS.md
----------------------------------------------------------------------
diff --git a/BYLAWS.md b/BYLAWS.md
index aa965dc..37bd55c 100644
--- a/BYLAWS.md
+++ b/BYLAWS.md
@@ -1,4 +1,4 @@
-# Storm By-laws (Proposed)
+# Proposed Storm By-laws to be accepted once storm graduates to a TLP.
 
 ## Roles and Responsibilities
 
@@ -78,7 +78,8 @@ This section describes the various actions which are undertaken within the proje
 
 | Actions | Description | Approval | Binding Votes | Minimum Length | Mailing List |
 |---------|-------------|----------|---------------|----------------|--------------|
-| Code Change | A change made to a codebase of the project and committed by a committer. This includes source code, documentation, website content, etc. | Two +1s from committers (at least one from someone who has not authored the patch). | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
+| Code Change | A change made to a codebase of the project and committed by a committer. This includes source code, documentation, website content, etc. | Two +1s from committers from committers other than the one who
+authored the patch, and no -1s. | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
 | Release Plan | Defines the timetable and actions for a release. The plan also nominates a Release Manager. | Lazy majority | Active committers | 3 days | dev@storm.incubator.apache.org |
 | Product Release | When a release of one of the project's products is ready, a vote is required to accept the release as an official release of the project. | Lazy Majority | Active PMC members | 3 days | dev@storm.incubator.apache.org |
 | Adoption of New Codebase | When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects and submodules within the project. | Lazy 2/3 majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |


[12/12] git commit: Merge branch 'bylaws' of https://github.com/revans2/incubator-storm into bylaws

Posted by bo...@apache.org.
Merge branch 'bylaws' of https://github.com/revans2/incubator-storm into bylaws


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/9e77cd23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/9e77cd23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/9e77cd23

Branch: refs/heads/master
Commit: 9e77cd23702e2170590af1d9eae6ae1546431312
Parents: 1471cbd fdbc5eb
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Thu Jul 10 15:50:00 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Thu Jul 10 15:50:00 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
----------------------------------------------------------------------



[09/12] git commit: Merge pull request #1 from d2r/style

Posted by bo...@apache.org.
Merge pull request #1 from d2r/style

style changes

Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/e3d951d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/e3d951d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/e3d951d6

Branch: refs/heads/master
Commit: e3d951d6e67b388d392d00b6793f8ae4ad839787
Parents: b7d8084 597b496
Author: Robert (Bobby) Evans <re...@gmail.com>
Authored: Mon Jul 7 14:28:13 2014 -0500
Committer: Robert (Bobby) Evans <re...@gmail.com>
Committed: Mon Jul 7 14:28:13 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)
----------------------------------------------------------------------



[08/12] git commit: fix up table style

Posted by bo...@apache.org.
fix up table style


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/597b4960
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/597b4960
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/597b4960

Branch: refs/heads/master
Commit: 597b496044c03af0f4b289b62953e52fae7ec510
Parents: 4bcda70
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Mon Jul 7 14:26:29 2014 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Jul 7 14:26:29 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/597b4960/BYLAWS.md
----------------------------------------------------------------------
diff --git a/BYLAWS.md b/BYLAWS.md
index a6cc4db..862e696 100644
--- a/BYLAWS.md
+++ b/BYLAWS.md
@@ -65,11 +65,8 @@ These are the types of approvals that can be sought. Different actions require d
 | Approval Type | Criteria |
 |---------------|----------|
 | Consensus Approval | Consensus approval requires 3 binding +1 votes and no binding vetoes. |
-|---------------|----------|
 | Lazy Consensus | Lazy consensus requires no -1 votes ('silence gives assent'). |
-|---------------|----------|
 | Lazy Majority | A lazy majority vote requires 3 binding +1 votes and more binding +1 votes than -1 votes. |
-|---------------|----------|
 | Lazy 2/3 Majority | Lazy 2/3 majority votes requires at least 3 votes and twice as many +1 votes as -1 votes. |
 
 ### Vetoes


[04/12] git commit: Fixed formatting issue.

Posted by bo...@apache.org.
Fixed formatting issue.


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/7cdf8f05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/7cdf8f05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/7cdf8f05

Branch: refs/heads/master
Commit: 7cdf8f05689a58656bb16b14c29b5998f042d8e0
Parents: d38e796
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 26 10:47:46 2014 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jun 26 10:47:46 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/7cdf8f05/BYLAWS.md
----------------------------------------------------------------------
diff --git a/BYLAWS.md b/BYLAWS.md
index 37bd55c..2d04537 100644
--- a/BYLAWS.md
+++ b/BYLAWS.md
@@ -78,8 +78,7 @@ This section describes the various actions which are undertaken within the proje
 
 | Actions | Description | Approval | Binding Votes | Minimum Length | Mailing List |
 |---------|-------------|----------|---------------|----------------|--------------|
-| Code Change | A change made to a codebase of the project and committed by a committer. This includes source code, documentation, website content, etc. | Two +1s from committers from committers other than the one who
-authored the patch, and no -1s. | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
+| Code Change | A change made to a codebase of the project and committed by a committer. This includes source code, documentation, website content, etc. | Two +1s from committers from committers other than the one who authored the patch, and no -1s. | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
 | Release Plan | Defines the timetable and actions for a release. The plan also nominates a Release Manager. | Lazy majority | Active committers | 3 days | dev@storm.incubator.apache.org |
 | Product Release | When a release of one of the project's products is ready, a vote is required to accept the release as an official release of the project. | Lazy Majority | Active PMC members | 3 days | dev@storm.incubator.apache.org |
 | Adoption of New Codebase | When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects and submodules within the project. | Lazy 2/3 majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |


[02/12] git commit: Updated formatting.

Posted by bo...@apache.org.
Updated formatting.


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/84d297a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/84d297a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/84d297a2

Branch: refs/heads/master
Commit: 84d297a23c05fef5164029bd4b697071aa349f9c
Parents: 133de77
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jun 20 07:59:29 2014 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jun 20 07:59:29 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 114 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 63 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/84d297a2/BYLAWS.md
----------------------------------------------------------------------
diff --git a/BYLAWS.md b/BYLAWS.md
index f34a8f4..aa965dc 100644
--- a/BYLAWS.md
+++ b/BYLAWS.md
@@ -5,75 +5,87 @@
 Apache projects define a set of roles with associated rights and responsibilities. These roles govern what tasks an individual may perform within the project. The roles are defined in the following sections
 
 ### Users:
-    The most important participants in the project are people who use our software. The majority of our developers start out as users and guide their development efforts from the user's perspective.
 
-    Users contribute to the Apache projects by providing feedback to developers in the form of bug reports and feature suggestions. As well, users participate in the Apache community by helping other users on mailing lists and user support forums.
+The most important participants in the project are people who use our software. The majority of our developers start out as users and guide their development efforts from the user's perspective.
+
+Users contribute to the Apache projects by providing feedback to developers in the form of bug reports and feature suggestions. As well, users participate in the Apache community by helping other users on mailing lists and user support forums.
 
 ### Contributors:
-    All of the volunteers who are contributing time, code, documentation, or resources to the Storm Project. A contributor that makes sustained, welcome contributions to the project may be invited to become a Committer, though the exact timing of such invitations depends on many factors.
+
+All of the volunteers who are contributing time, code, documentation, or resources to the Storm Project. A contributor that makes sustained, welcome contributions to the project may be invited to become a Committer, though the exact timing of such invitations depends on many factors.
 
 ### Committers:
-    The project's Committers are responsible for the project's technical management. Committers have access to all project source repositories. Committers may cast binding votes on any technical discussion regarding storm.
 
-    Committer access is by invitation only and must be approved by lazy consensus of the active PMC members. A Committer is considered emeritus by their own declaration or by not contributing in any form to the project for over six months. An emeritus committer may request reinstatement of commit access from the PMC. Such reinstatement is subject to lazy consensus approval of active PMC members.
+The project's Committers are responsible for the project's technical management. Committers have access to all project source repositories. Committers may cast binding votes on any technical discussion regarding storm.
 
-    All Apache committers are required to have a signed Contributor License Agreement (CLA) on file with the Apache Software Foundation. There is a Committer FAQ which provides more details on the requirements for Committers
+Committer access is by invitation only and must be approved by lazy consensus of the active PMC members. A Committer is considered emeritus by their own declaration or by not contributing in any form to the project for over six months. An emeritus committer may request reinstatement of commit access from the PMC. Such reinstatement is subject to lazy consensus approval of active PMC members.
 
-    A committer who makes a sustained contribution to the project may be invited to become a member of the PMC. The form of contribution is not limited to code. It can also include code review, helping out users on the mailing lists, documentation, testing, etc.
+All Apache committers are required to have a signed Contributor License Agreement (CLA) on file with the Apache Software Foundation. There is a Committer FAQ which provides more details on the requirements for Committers
+
+A committer who makes a sustained contribution to the project may be invited to become a member of the PMC. The form of contribution is not limited to code. It can also include code review, helping out users on the mailing lists, documentation, testing, etc.
 
 ### Project Management Committee(PMC):
-    The PMC is responsible to the board and the ASF for the management and oversight of the Apache Storm codebase. The responsibilities of the PMC include
 
-	    Deciding what is distributed as products of the Apache Storm project. In particular all releases must be approved by the PMC.
-	    Maintaining the project's shared resources, including the codebase repository, mailing lists, websites.
-	    Speaking on behalf of the project.
-	    Resolving license disputes regarding products of the project.
-	    Nominating new PMC members and committers.
-	    Maintaining these bylaws and other guidelines of the project.
+The PMC is responsible to the board and the ASF for the management and oversight of the Apache Storm codebase. The responsibilities of the PMC include
+
+ * Deciding what is distributed as products of the Apache Storm project. In particular all releases must be approved by the PMC.
+ * Maintaining the project's shared resources, including the codebase repository, mailing lists, websites.
+ * Speaking on behalf of the project.
+ * Resolving license disputes regarding products of the project.
+ * Nominating new PMC members and committers.
+ * Maintaining these bylaws and other guidelines of the project.
 
-    Membership of the PMC is by invitation only and must be approved by a consensus approval of active PMC members. A PMC member is considered "emeritus" by their own declaration or by not contributing in any form to the project for over six months. An emeritus member may request reinstatement to the PMC. Such reinstatement is subject to consensus approval of the active PMC members.
+Membership of the PMC is by invitation only and must be approved by a consensus approval of active PMC members. A PMC member is considered "emeritus" by their own declaration or by not contributing in any form to the project for over six months. An emeritus member may request reinstatement to the PMC. Such reinstatement is subject to consensus approval of the active PMC members.
 
-    The chair of the PMC is appointed by the ASF board. The chair is an office holder of the Apache Software Foundation (Vice President, Apache Storm) and has primary responsibility to the board for the management of the projects within the scope of the Storm PMC. The chair reports to the board quarterly on developments within the Storm project.
+The chair of the PMC is appointed by the ASF board. The chair is an office holder of the Apache Software Foundation (Vice President, Apache Storm) and has primary responsibility to the board for the management of the projects within the scope of the Storm PMC. The chair reports to the board quarterly on developments within the Storm project.
 
-    The chair of the PMC is rotated annually. When the chair is rotated or if the current chair of the PMC resigns, the PMC votes to recommend a new chair using Single Transferable Vote (STV) voting. See http://wiki.apache.org/general/BoardVoting for specifics. The decision must be ratified by the Apache board.
+The chair of the PMC is rotated annually. When the chair is rotated or if the current chair of the PMC resigns, the PMC votes to recommend a new chair using Single Transferable Vote (STV) voting. See http://wiki.apache.org/general/BoardVoting for specifics. The decision must be ratified by the Apache board.
 
 ## Voting
-	Decisions regarding the project are made by votes on the primary project development mailing list (dev@storm.incubator.apache.org). Where necessary, PMC voting may take place on the private Storm PMC mailing list. Votes are clearly indicated by subject line starting with [VOTE]. Votes may contain multiple items for approval and these should be clearly separated. Voting is carried out by replying to the vote mail. Voting may take four flavors
-	Vote
-	Meaning
-	+1
-	'Yes,' 'Agree,' or 'the action should be performed.'
-	+0
-	Neutral about the proposed action (or mildly negative but not enough so to want to block it). 
-	-1
-	This is a negative vote. On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action. 
-	All participants in the Storm project are encouraged to show their agreement with or against a particular action by voting. For technical decisions, only the votes of active committers are binding. Non-binding votes are still useful for those with binding votes to understand the perception of an action in the wider Storm community. For PMC decisions, only the votes of active PMC members are binding.
-	Voting can also be applied to changes already made to the Storm codebase. These typically take the form of a veto (-1) in reply to the commit message sent when the commit is made. Note that this should be a rare occurrence. All efforts should be made to discuss issues when they are still patches before the code is committed.
-	Only active (i.e. non-emeritus) committers and PMC members have binding votes.
+
+Decisions regarding the project are made by votes on the primary project development mailing list (dev@storm.incubator.apache.org). Where necessary, PMC voting may take place on the private Storm PMC mailing list. Votes are clearly indicated by subject line starting with [VOTE]. Votes may contain multiple items for approval and these should be clearly separated. Voting is carried out by replying to the vote mail. Voting may take four flavors
+	
+| Vote | Meaning |
+|------|---------|
+| +1 | 'Yes,' 'Agree,' or 'the action should be performed.' |
+| +0 | Neutral about the proposed action (or mildly negative but not enough so to want to block it). |
+| -1 |This is a negative vote. On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action. |
+
+All participants in the Storm project are encouraged to show their agreement with or against a particular action by voting. For technical decisions, only the votes of active committers are binding. Non-binding votes are still useful for those with binding votes to understand the perception of an action in the wider Storm community. For PMC decisions, only the votes of active PMC members are binding.
+
+Voting can also be applied to changes already made to the Storm codebase. These typically take the form of a veto (-1) in reply to the commit message sent when the commit is made. Note that this should be a rare occurrence. All efforts should be made to discuss issues when they are still patches before the code is committed.
+
+Only active (i.e. non-emeritus) committers and PMC members have binding votes.
 
 ## Approvals
-	These are the types of approvals that can be sought. Different actions require different types of approvals
-	Consensus Approval - Consensus approval requires 3 binding +1 votes and no binding vetoes.
-	Lazy Consensus - Lazy consensus requires no -1 votes ('silence gives assent').
-	Lazy Majority - A lazy majority vote requires 3 binding +1 votes and more binding +1 votes than -1 votes.
-	Lazy 2/3 Majority - Lazy 2/3 majority votes requires at least 3 votes and twice as many +1 votes as -1 votes.
+
+These are the types of approvals that can be sought. Different actions require different types of approvals
+
+* Consensus Approval - Consensus approval requires 3 binding +1 votes and no binding vetoes.
+* Lazy Consensus - Lazy consensus requires no -1 votes ('silence gives assent').
+* Lazy Majority - A lazy majority vote requires 3 binding +1 votes and more binding +1 votes than -1 votes.
+* Lazy 2/3 Majority - Lazy 2/3 majority votes requires at least 3 votes and twice as many +1 votes as -1 votes.
+
 ### Vetoes
-	A valid, binding veto cannot be overruled. If a veto is cast, it must be accompanied by a valid reason explaining the reasons for the veto. The validity of a veto, if challenged, can be confirmed by anyone who has a binding vote. This does not necessarily signify agreement with the veto - merely that the veto is valid.
-	If you disagree with a valid veto, you must lobby the person casting the veto to withdraw their veto. If a veto is not withdrawn, any action that has been vetoed must be reversed in a timely manner.
+
+A valid, binding veto cannot be overruled. If a veto is cast, it must be accompanied by a valid reason explaining the reasons for the veto. The validity of a veto, if challenged, can be confirmed by anyone who has a binding vote. This does not necessarily signify agreement with the veto - merely that the veto is valid.
+
+If you disagree with a valid veto, you must lobby the person casting the veto to withdraw their veto. If a veto is not withdrawn, any action that has been vetoed must be reversed in a timely manner.
 
 ## Actions
-	This section describes the various actions which are undertaken within the project, the corresponding approval required for that action and those who have binding votes over the action.
-
-	| Actions | Description | Approval | Binding Votes | Minimum Length | Mailing List |
-	|---------|-------------|----------|---------------|----------------|--------------|
-	| Code Change | A change made to a codebase of the project and committed by a committer. This includes source code, documentation, website content, etc. | Two +1s from committers (at least one from someone who has not authored the patch). | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
-	| Release Plan | Defines the timetable and actions for a release. The plan also nominates a Release Manager. | Lazy majority | Active committers | 3 days | dev@storm.incubator.apache.org |
-	| Product Release | When a release of one of the project's products is ready, a vote is required to accept the release as an official release of the project. | Lazy Majority | Active PMC members | 3 days | dev@storm.incubator.apache.org |
-	| Adoption of New Codebase | When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects and submodules within the project. | Lazy 2/3 majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |
-	| New Committer | When a new committer is proposed for the project. | Lazy consensus | Active PMC members | 7 days | private@storm.incubator.apache.org |
-	| New PMC Member | When a committer is proposed for the PMC. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
-	| Emeritus PMC Member re-instatement | When an emeritus PMC member requests to be re-instated as an active PMC member. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
-	| Emeritus Committer re-instatement | When an emeritus committer requests to be re-instated as an active committer. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
-	| Committer Removal | When removal of commit privileges is sought. Note: Such actions will also be referred to the ASF board by the PMC chair. | Consensus Approval | Active PMC members (excluding the committer in question if a member of the PMC). | 7 Days | private@storm.incubator.apache.org |
-	| PMC Member Removal | When removal of a PMC member is sought. Note: Such actions will also be referred to the ASF board by the PMC chair. | Consensus Approval | Active PMC members (excluding the member in question). | 7 Days | private@storm.incubator.apache.org |
-	| Modifying Bylaws | Modifying this document. | Lazy 2/3 majority | Active PMC members | 7 Days | dev@storm.incubator.apache.org |
+
+This section describes the various actions which are undertaken within the project, the corresponding approval required for that action and those who have binding votes over the action.
+
+| Actions | Description | Approval | Binding Votes | Minimum Length | Mailing List |
+|---------|-------------|----------|---------------|----------------|--------------|
+| Code Change | A change made to a codebase of the project and committed by a committer. This includes source code, documentation, website content, etc. | Two +1s from committers (at least one from someone who has not authored the patch). | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
+| Release Plan | Defines the timetable and actions for a release. The plan also nominates a Release Manager. | Lazy majority | Active committers | 3 days | dev@storm.incubator.apache.org |
+| Product Release | When a release of one of the project's products is ready, a vote is required to accept the release as an official release of the project. | Lazy Majority | Active PMC members | 3 days | dev@storm.incubator.apache.org |
+| Adoption of New Codebase | When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects and submodules within the project. | Lazy 2/3 majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |
+| New Committer | When a new committer is proposed for the project. | Lazy consensus | Active PMC members | 7 days | private@storm.incubator.apache.org |
+| New PMC Member | When a committer is proposed for the PMC. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
+| Emeritus PMC Member re-instatement | When an emeritus PMC member requests to be re-instated as an active PMC member. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
+| Emeritus Committer re-instatement | When an emeritus committer requests to be re-instated as an active committer. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
+| Committer Removal | When removal of commit privileges is sought. Note: Such actions will also be referred to the ASF board by the PMC chair. | Consensus Approval | Active PMC members (excluding the committer in question if a member of the PMC). | 7 Days | private@storm.incubator.apache.org |
+| PMC Member Removal | When removal of a PMC member is sought. Note: Such actions will also be referred to the ASF board by the PMC chair. | Consensus Approval | Active PMC members (excluding the member in question). | 7 Days | private@storm.incubator.apache.org |
+| Modifying Bylaws | Modifying this document. | Lazy 2/3 majority | Active PMC members | 7 Days | dev@storm.incubator.apache.org |


[05/12] git commit: Removed duplicate wording

Posted by bo...@apache.org.
Removed duplicate wording


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/afdc918c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/afdc918c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/afdc918c

Branch: refs/heads/master
Commit: afdc918cc17e583a6c4f596c18d2a532aedfacc3
Parents: 7cdf8f0
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 26 10:48:36 2014 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jun 26 10:48:36 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/afdc918c/BYLAWS.md
----------------------------------------------------------------------
diff --git a/BYLAWS.md b/BYLAWS.md
index 2d04537..f8afaae 100644
--- a/BYLAWS.md
+++ b/BYLAWS.md
@@ -78,7 +78,7 @@ This section describes the various actions which are undertaken within the proje
 
 | Actions | Description | Approval | Binding Votes | Minimum Length | Mailing List |
 |---------|-------------|----------|---------------|----------------|--------------|
-| Code Change | A change made to a codebase of the project and committed by a committer. This includes source code, documentation, website content, etc. | Two +1s from committers from committers other than the one who authored the patch, and no -1s. | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
+| Code Change | A change made to a codebase of the project and committed by a committer. This includes source code, documentation, website content, etc. | Two +1s from committers other than the one who authored the patch, and no -1s. | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
 | Release Plan | Defines the timetable and actions for a release. The plan also nominates a Release Manager. | Lazy majority | Active committers | 3 days | dev@storm.incubator.apache.org |
 | Product Release | When a release of one of the project's products is ready, a vote is required to accept the release as an official release of the project. | Lazy Majority | Active PMC members | 3 days | dev@storm.incubator.apache.org |
 | Adoption of New Codebase | When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects and submodules within the project. | Lazy 2/3 majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |


[07/12] git commit: style changes

Posted by bo...@apache.org.
style changes


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/4bcda700
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/4bcda700
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/4bcda700

Branch: refs/heads/master
Commit: 4bcda70018fb0977f6f2d96b17a6f948ce1d0344
Parents: b7d8084
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Mon Jul 7 12:04:04 2014 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Jul 7 12:04:04 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 50 ++++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/4bcda700/BYLAWS.md
----------------------------------------------------------------------
diff --git a/BYLAWS.md b/BYLAWS.md
index b9ca532..a6cc4db 100644
--- a/BYLAWS.md
+++ b/BYLAWS.md
@@ -2,7 +2,7 @@
 
 ## Roles and Responsibilities
 
-Apache projects define a set of roles with associated rights and responsibilities. These roles govern what tasks an individual may perform within the project. The roles are defined in the following sections
+Apache projects define a set of roles with associated rights and responsibilities. These roles govern what tasks an individual may perform within the project. The roles are defined in the following sections:
 
 ### Users:
 
@@ -12,27 +12,27 @@ Users contribute to the Apache projects by providing feedback to developers in t
 
 ### Contributors:
 
-All of the volunteers who are contributing time, code, documentation, or resources to the Storm Project. A contributor that makes sustained, welcome contributions to the project may be invited to become a Committer, though the exact timing of such invitations depends on many factors.
+Contributors are all of the volunteers who are contributing time, code, documentation, or resources to the Storm Project. A contributor that makes sustained, welcome contributions to the project may be invited to become a Committer, though the exact timing of such invitations depends on many factors.
 
 ### Committers:
 
 The project's Committers are responsible for the project's technical management. Committers have access to all project source repositories. Committers may cast binding votes on any technical discussion regarding storm.
 
-Committer access is by invitation only and must be approved by lazy consensus of the active PMC members. A Committer is considered emeritus by their own declaration or by not contributing in any form to the project for over six months. An emeritus committer may request reinstatement of commit access from the PMC. Such reinstatement is subject to lazy consensus approval of active PMC members.
+Committer access is by invitation only and must be approved by lazy consensus of the active PMC members. A Committer is considered emeritus by their own declaration or by not contributing in any form to the project for over six months. An emeritus Committer may request reinstatement of commit access from the PMC. Such reinstatement is subject to lazy consensus approval of active PMC members.
 
-All Apache committers are required to have a signed Contributor License Agreement (CLA) on file with the Apache Software Foundation. There is a Committer FAQ which provides more details on the requirements for Committers
+All Apache Committers are required to have a signed Contributor License Agreement (CLA) on file with the Apache Software Foundation. There is a [Committers' FAQ](https://www.apache.org/dev/committers.html) which provides more details on the requirements for Committers.
 
-A committer who makes a sustained contribution to the project may be invited to become a member of the PMC. The form of contribution is not limited to code. It can also include code review, helping out users on the mailing lists, documentation, testing, etc.
+A Committer who makes a sustained contribution to the project may be invited to become a member of the PMC. The form of contribution is not limited to code. It can also include code review, helping out users on the mailing lists, documentation, testing, etc.
 
 ### Project Management Committee(PMC):
 
-The PMC is responsible to the board and the ASF for the management and oversight of the Apache Storm codebase. The responsibilities of the PMC include
+The PMC is responsible to the board and the ASF for the management and oversight of the Apache Storm codebase. The responsibilities of the PMC include:
 
  * Deciding what is distributed as products of the Apache Storm project. In particular all releases must be approved by the PMC.
  * Maintaining the project's shared resources, including the codebase repository, mailing lists, websites.
  * Speaking on behalf of the project.
  * Resolving license disputes regarding products of the project.
- * Nominating new PMC members and committers.
+ * Nominating new PMC members and Committers.
  * Maintaining these bylaws and other guidelines of the project.
 
 Membership of the PMC is by invitation only and must be approved by a consensus approval of active PMC members. A PMC member is considered "emeritus" by their own declaration or by not contributing in any form to the project for over six months. An emeritus member may request reinstatement to the PMC. Such reinstatement is subject to consensus approval of the active PMC members.
@@ -43,28 +43,34 @@ The chair of the PMC is rotated annually. When the chair is rotated or if the cu
 
 ## Voting
 
-Decisions regarding the project are made by votes on the primary project development mailing list (dev@storm.incubator.apache.org). Where necessary, PMC voting may take place on the private Storm PMC mailing list. Votes are clearly indicated by subject line starting with [VOTE]. Votes may contain multiple items for approval and these should be clearly separated. Voting is carried out by replying to the vote mail. Voting may take four flavors
+Decisions regarding the project are made by votes on the primary project development mailing list (dev@storm.incubator.apache.org). Where necessary, PMC voting may take place on the private Storm PMC mailing list. Votes are clearly indicated by subject line starting with [VOTE]. Votes may contain multiple items for approval and these should be clearly separated. Voting is carried out by replying to the vote mail. Voting may take four flavors:
 	
 | Vote | Meaning |
 |------|---------|
 | +1 | 'Yes,' 'Agree,' or 'the action should be performed.' |
-| +0 | Neutral about the proposed action (or mildly negative but not enough so to want to block it). |
+| +0 | Neutral about the proposed action. |
+| -0 | Mildly negative, but not enough so to want to block it. |
 | -1 |This is a negative vote. On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action. |
 
-All participants in the Storm project are encouraged to show their agreement with or against a particular action by voting. For technical decisions, only the votes of active committers are binding. Non-binding votes are still useful for those with binding votes to understand the perception of an action in the wider Storm community. For PMC decisions, only the votes of active PMC members are binding.
+All participants in the Storm project are encouraged to show their agreement with or against a particular action by voting. For technical decisions, only the votes of active Committers are binding. Non-binding votes are still useful for those with binding votes to understand the perception of an action in the wider Storm community. For PMC decisions, only the votes of active PMC members are binding.
 
 Voting can also be applied to changes already made to the Storm codebase. These typically take the form of a veto (-1) in reply to the commit message sent when the commit is made. Note that this should be a rare occurrence. All efforts should be made to discuss issues when they are still patches before the code is committed.
 
-Only active (i.e. non-emeritus) committers and PMC members have binding votes.
+Only active (i.e. non-emeritus) Committers and PMC members have binding votes.
 
 ## Approvals
 
 These are the types of approvals that can be sought. Different actions require different types of approvals
 
-* Consensus Approval - Consensus approval requires 3 binding +1 votes and no binding vetoes.
-* Lazy Consensus - Lazy consensus requires no -1 votes ('silence gives assent').
-* Lazy Majority - A lazy majority vote requires 3 binding +1 votes and more binding +1 votes than -1 votes.
-* Lazy 2/3 Majority - Lazy 2/3 majority votes requires at least 3 votes and twice as many +1 votes as -1 votes.
+| Approval Type | Criteria |
+|---------------|----------|
+| Consensus Approval | Consensus approval requires 3 binding +1 votes and no binding vetoes. |
+|---------------|----------|
+| Lazy Consensus | Lazy consensus requires no -1 votes ('silence gives assent'). |
+|---------------|----------|
+| Lazy Majority | A lazy majority vote requires 3 binding +1 votes and more binding +1 votes than -1 votes. |
+|---------------|----------|
+| Lazy 2/3 Majority | Lazy 2/3 majority votes requires at least 3 votes and twice as many +1 votes as -1 votes. |
 
 ### Vetoes
 
@@ -78,14 +84,14 @@ This section describes the various actions which are undertaken within the proje
 
 | Actions | Description | Approval | Binding Votes | Minimum Length | Mailing List |
 |---------|-------------|----------|---------------|----------------|--------------|
-| Code Change | A change made to a source code of the project and committed by a committer. | One +1 from a committer other than the one who authored the patch, and no -1s. | Active committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
-| Non-Code Change | A change made to a repository of the project and committed by a committer. This includes documentation, website content, etc., but not source code, unless only comments are being modified. | Lazy Consensus | Active committers | At the discression of the committer |JIRA or Github pull (with notification sent to dev@storm.incubator.apache.org) |
-| Product Release | A vote is required to accept a proposed release as an official release of the project. Any committer may call for a release vote at any point in time. | Lazy Majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |
+| Code Change | A change made to a source code of the project and committed by a Committer. | One +1 from a Committer other than the one who authored the patch, and no -1s. | Active Committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
+| Non-Code Change | A change made to a repository of the project and committed by a Committer. This includes documentation, website content, etc., but not source code, unless only comments are being modified. | Lazy Consensus | Active Committers | At the discression of the Committer |JIRA or Github pull (with notification sent to dev@storm.incubator.apache.org) |
+| Product Release | A vote is required to accept a proposed release as an official release of the project. Any Committer may call for a release vote at any point in time. | Lazy Majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |
 | Adoption of New Codebase | When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects and submodules within the project. | Lazy 2/3 majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |
-| New Committer | When a new committer is proposed for the project. | Lazy consensus | Active PMC members | 7 days | private@storm.incubator.apache.org |
-| New PMC Member | When a committer is proposed for the PMC. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
+| New Committer | When a new Committer is proposed for the project. | Lazy consensus | Active PMC members | 7 days | private@storm.incubator.apache.org |
+| New PMC Member | When a Committer is proposed for the PMC. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
 | Emeritus PMC Member re-instatement | When an emeritus PMC member requests to be re-instated as an active PMC member. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
-| Emeritus Committer re-instatement | When an emeritus committer requests to be re-instated as an active committer. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
-| Committer Removal | When removal of commit privileges is sought. Note: Such actions will also be referred to the ASF board by the PMC chair. | Consensus Approval | Active PMC members (excluding the committer in question if a member of the PMC). | 7 Days | private@storm.incubator.apache.org |
+| Emeritus Committer re-instatement | When an emeritus Committer requests to be re-instated as an active Committer. | Consensus Approval | Active PMC members | 7 days | private@storm.incubator.apache.org |
+| Committer Removal | When removal of commit privileges is sought. Note: Such actions will also be referred to the ASF board by the PMC chair. | Consensus Approval | Active PMC members (excluding the Committer in question if a member of the PMC). | 7 Days | private@storm.incubator.apache.org |
 | PMC Member Removal | When removal of a PMC member is sought. Note: Such actions will also be referred to the ASF board by the PMC chair. | Consensus Approval | Active PMC members (excluding the member in question). | 7 Days | private@storm.incubator.apache.org |
 | Modifying Bylaws | Modifying this document. | Lazy 2/3 majority | Active PMC members | 7 Days | dev@storm.incubator.apache.org |


[10/12] git commit: Addressed review comments from Nathan.

Posted by bo...@apache.org.
Addressed review comments from Nathan.


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/2572ac33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/2572ac33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/2572ac33

Branch: refs/heads/master
Commit: 2572ac3365cb075fce316ce82ca42b015970fbd6
Parents: e3d951d
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jul 10 15:16:50 2014 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jul 10 15:22:38 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/2572ac33/BYLAWS.md
----------------------------------------------------------------------
diff --git a/BYLAWS.md b/BYLAWS.md
index 862e696..8b1a8d5 100644
--- a/BYLAWS.md
+++ b/BYLAWS.md
@@ -81,7 +81,7 @@ This section describes the various actions which are undertaken within the proje
 
 | Actions | Description | Approval | Binding Votes | Minimum Length | Mailing List |
 |---------|-------------|----------|---------------|----------------|--------------|
-| Code Change | A change made to a source code of the project and committed by a Committer. | One +1 from a Committer other than the one who authored the patch, and no -1s. | Active Committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
+| Code Change | A change made to a source code of the project and committed by a Committer. | One +1 from a Committer other than the one who authored the patch, and no -1s. Code changes to a release require a re-vote on that release, but non-code changes do not require a re-vote. | Active Committers | 2 days from initial patch |JIRA or Github pull ( with notification sent to dev@storm.incubator.apache.org) |
 | Non-Code Change | A change made to a repository of the project and committed by a Committer. This includes documentation, website content, etc., but not source code, unless only comments are being modified. | Lazy Consensus | Active Committers | At the discression of the Committer |JIRA or Github pull (with notification sent to dev@storm.incubator.apache.org) |
 | Product Release | A vote is required to accept a proposed release as an official release of the project. Any Committer may call for a release vote at any point in time. | Lazy Majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |
 | Adoption of New Codebase | When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects and submodules within the project. | Lazy 2/3 majority | Active PMC members | 7 days | dev@storm.incubator.apache.org |


[11/12] git commit: Addresed Taylor's comments.

Posted by bo...@apache.org.
Addresed Taylor's comments.


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/fdbc5ebd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/fdbc5ebd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/fdbc5ebd

Branch: refs/heads/master
Commit: fdbc5ebd081b6b8d6ed4da595ce6f0025343d0ee
Parents: 2572ac3
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jul 10 15:24:36 2014 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jul 10 15:24:36 2014 -0500

----------------------------------------------------------------------
 BYLAWS.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/fdbc5ebd/BYLAWS.md
----------------------------------------------------------------------
diff --git a/BYLAWS.md b/BYLAWS.md
index 8b1a8d5..2179908 100644
--- a/BYLAWS.md
+++ b/BYLAWS.md
@@ -1,4 +1,6 @@
-# Proposed Storm By-laws to be accepted once storm graduates to a TLP.
+# [DRAFT] Apache Storm Project Bylaws
+
+NOTE: This document is a work in progress and has not yet been formally adopted by the Storm (P)PMC. It is expected that a final version of this DRAFT be adopted once Storm has graduated to an Apache TLP. Until that time any guidelines listed below are subject to change.
 
 ## Roles and Responsibilities