zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject [09/10] zookeeper git commit: ZOOKEEPER-3184: Use the same method to generate website as documentation
Date Fri, 07 Dec 2018 11:00:15 GMT
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/releases.md
----------------------------------------------------------------------
diff --git a/releases.md b/releases.md
deleted file mode 100644
index ae4c5d4..0000000
--- a/releases.md
+++ /dev/null
@@ -1,210 +0,0 @@
----
-layout: page
-title: Releases
----
-# Apache ZooKeeper™ Releases
-
-The Apache ZooKeeper system for distributed coordination is a high-performance service for
building distributed applications.
-
-* [Download](#download)
-* [Release Notes](#releasenotes)
-* [News](#news)
-
-## Download {#download}
-
-Active releases may be downloaded from Apache mirrors: [Download](https://www.apache.org/dyn/closer.cgi/zookeeper/)
-
-On the mirror, all recent releases are available.
-
-Older releases are available in the [archive](https://archive.apache.org/dist/zookeeper/).
-
-You can verify the integrity of a downloaded release using the PGP signatures and hashes
(MD5 or SHA1) hosted at the main [Apache distro site](https://apache.org/dist/zookeeper/).
 For additional information, refer to the Apache documentation for [verifying the integrity
of Apache project releases](https://www.apache.org/dyn/closer.cgi#verify).
-
-## Release Notes {#releasenotes}
-
-Release notes for Apache Zookeeper releases are available in Jira: [Browse release notes](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
-
-## News {#news}
-
-### 15 July, 2018: release 3.4.13 available
-
-This is a bugfix release. It fixes 17 issues, including issues such as ZOOKEEPER-2959 that
could cause data loss when observer is used, and ZOOKEEPER-2184 that prevents ZooKeeper Java
clients working in dynamic IP (container / cloud) environment. See [ZooKeeper 3.4.13 Release
Notes](https://zookeeper.apache.org/doc/r3.4.13/releasenotes.html) for details.
-
-### 17 May, 2018: release 3.5.4-beta available
-
-3.5.4-beta is the second beta in the planned 3.5 release line leading up to a stable 3.5
release. It comprises 113 bug fixes and improvements.
-
-Release 3.5.3 added a new feature ZOOKEEPER-2169 "Enable creation of nodes with TTLs". There
was a major oversight when TTL nodes were implemented. The session ID generator for each server
is seeded with the configured Server ID in the high byte. TTL Nodes were using the highest
bit to denote a TTL node when used in the ephemeral owner. This meant that Server IDs >
127 that created ephemeral nodes would have those nodes always considered TTL nodes (with
the TTL being essentially a random number). ZOOKEEPER-2901 fixes the issue. By default TTL
is disabled and must now be enabled in zoo.cfg. When TTL Nodes are enabled, the max Server
ID changes from 255 to 254. See the documentation for TTL in the administrator guide (or the
referenced JIRAs) for more details.
-
-### 1 May, 2018: release 3.4.12 available
-
-This release fixes 22 issues, including issues that affect incorrect handling of the dataDir
and the dataLogDir.  See [ZooKeeper 3.4.12 Release Notes](https://zookeeper.apache.org/doc/r3.4.12/releasenotes.html)
for details.
-
-### 9 November, 2017: release 3.4.11 available
-
-This release fixes 53 issues, it includes support for Java 9 and other critical bug fixes.
 See [ZooKeeper 3.4.11 Release Notes](https://zookeeper.apache.org/doc/r3.4.11/releasenotes.html)
for details.
-
-**WARNING**: [ZOOKEEPER-2960](https://issues.apache.org/jira/browse/ZOOKEEPER-2960) was recently
identified as a regression in 3.4.11 affecting the specification of separate dataDir and dataLogDir
configuration parameters (vs the default which is a single directory for both). It will be
addressed in 3.4.12.
-
-### 17 April, 2017: release 3.5.3-beta available
-
-3.5.3-beta is the first beta in the planned 3.5 release line leading up to a stable 3.5 release.
It comprises 76 bug fixes and improvements. This release includes important security fix around
dynamic reconfigure API, improvements on test infrastructure, and new features such as TTL
node.
-
-### 30 March, 2017: release 3.4.10 available
-
-This release fixes 43 issues, including security feature QuorumPeer mutual authentication
via SASL and other critical bugs. See [ZooKeeper 3.4.10 Release Notes](https://zookeeper.apache.org/doc/r3.4.10/releasenotes.html)
for details.
-
-### 03 September, 2016: release 3.4.9 available
-
-This release fixes many critical bugs and improvements. See [ZooKeeper 3.4.9 Release Notes](https://zookeeper.apache.org/doc/r3.4.9/releasenotes.html)
for details.
-
-### 20 July, 2016: release 3.5.2-alpha available
-
-This is an alpha quality release that contains many bug fixes and improvements.
-
-### 20 February, 2016: release 3.4.8 available
-
-This release fixes 9 issues, most notably a deadlock when shutting down ZooKeeper. See [ZooKeeper
3.4.8 Release Notes](https://zookeeper.apache.org/doc/r3.4.8/releasenotes.html) for details.
-
-### 31 August, 2015: release 3.5.1-alpha available
-
-This is an alpha quality release that contains many bug fixes and improvements. It also introduces
a few new features, including container znodes and SSL support for client-server communication.
-
-See the [ZooKeeper 3.5.1-alpha Release Notes](https://zookeeper.apache.org/doc/r3.5.1-alpha/releasenotes.html)
for details.
-
-### 6 August, 2014: release 3.5.0-alpha available
-
-This release is alpha quality and contains many improvements, new features, bug fixes and
optimizations.
-
-See the [ZooKeeper 3.5.0-alpha Release Notes](https://zookeeper.apache.org/doc/r3.5.0-alpha/releasenotes.html)
for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-### 10 March, 2014: release 3.4.6 available
-
-The release fixes a critical bug that could prevent a server from joining an established
ensemble. See
-[ZooKeeper 3.4.6 Release Notes](https://zookeeper.apache.org/doc/r3.4.6/releasenotes.html)
for details.
-
-### 18 November, 2012: release 3.4.5 available
-
-The release fixes a critical bug that could cause client connection issues. See
-[ZooKeeper 3.4.5 Release Notes](https://zookeeper.apache.org/doc/r3.4.5/releasenotes.html)
for details.
-
-### 23 September, 2012: release 3.4.4 available
-
-The release fixes a critical bug that could cause data inconsistency. See
-[ZooKeeper 3.4.4 Release Notes](https://zookeeper.apache.org/doc/r3.4.4/releasenotes.html)
for details.
-
-
-### 02 August, 2012: release 3.3.6 available
-
-The release fixes a critical bug that could cause data loss. See
-[ZooKeeper 3.3.6 Release Notes](https://zookeeper.apache.org/doc/r3.3.6/releasenotes.html)
for details.
-
-### 20 March, 2012: release 3.3.5 available
-
-The release fixes a critical bug that could cause data corruption. See
-[ZooKeeper 3.3.5 Release Notes](https://zookeeper.apache.org/doc/r3.3.5/releasenotes.html)
for details.
-
-### 13 Feb, 2012: release 3.4.3 available
-
-This release fixes  critical bugs in 3.4.2. See
-[ZooKeeper 3.4.3 Release Notes](https://zookeeper.apache.org/doc/r3.4.3/releasenotes.html)
for details.
-
-We are now upgrading this release to a beta release given that we have had quite a few bug
fixes to 3.4 branch and 3.4 releases have been out for some time now.
-
-### 29 Dec, 2011: release 3.4.2 available
-
-This release fixes a critical bug in 3.4.1. See
-[ZooKeeper 3.4.2 Release Notes](https://zookeeper.apache.org/doc/r3.4.2/releasenotes.html)
for details.
-
-Please note that this is still an alpha release and we do not recommend this for production.
Please use the stable release line 3.3.* for production use. 
-
-
-### 16 Dec, 2011: release 3.4.1 available
-
-This release fixes a critical bug with data loss in 3.4.0. See
-[ZooKeeper 3.4.1 Release Notes](https://zookeeper.apache.org/doc/r3.4.1/releasenotes.html)
for details.
-In case you are already using 3.4.0 release please upgrade ASAP.
-
-Please note that this is an alpha release and not ready for production as of now.
-
-### 26 Nov, 2011: release 3.3.4 available
-
-The release fixes a number of critical bugs that could cause data corruption. See
-[ZooKeeper 3.3.4 Release Notes](https://zookeeper.apache.org/doc/r3.3.4/releasenotes.html)
for details.
-
-### 22 Nov, 2011: release 3.4.0 available
-
-Due to data loss issues, this release has been removed from the downloads page. Release 3.4.1
is now available. 
-
-### 27 Feb, 2011: release 3.3.3 available
-
-The release fixes two critical bugs that could cause data corruption. It also addresses 12
other issues. See
-[ZooKeeper 3.3.3 Release Notes](https://zookeeper.apache.org/doc/r3.3.3/releasenotes.html)
for details.
-
-### 11 Nov, 2010: release 3.3.2 available
-
-This release contains a number of critical bug fixes.
-
-See the [ZooKeeper 3.3.2 Release Notes](https://zookeeper.apache.org/doc/r3.3.2/releasenotes.html)
for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-### 17 May, 2010: release 3.3.1 available
-
-This release contains a number of critical bug fixes.
-
-See the [ZooKeeper 3.3.1 Release Notes](https://zookeeper.apache.org/doc/r3.3.1/releasenotes.html)
for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-### 25 March, 2010: release 3.3.0 available
-
-This release contains many improvements, new features, bug fixes and optimizations.
-
-See the [ZooKeeper 3.3.0 Release Notes](https://zookeeper.apache.org/doc/r3.3.0/releasenotes.html)
for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-### 14 December, 2009: release 3.2.2 available
-
-This release contains a number of critical bug fixes.
-
-See the [ZooKeeper 3.2.2 Release Notes](https://zookeeper.apache.org/doc/r3.2.2/releasenotes.html)
for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-### 14 December, 2009: release 3.1.2 available
-
-This release contains a number of critical bug fixes.
-
-See the [ZooKeeper 3.1.2 Release Notes](https://zookeeper.apache.org/doc/r3.1.2/releasenotes.html)
for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-### 4 September, 2009: release 3.2.1 available
-
-This release contains a number of critical bug fixes.
-
-See the [ZooKeeper 3.2.1 Release Notes](https://zookeeper.apache.org/doc/r3.2.1/releasenotes.html)
for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-### 8 July, 2009: release 3.2.0 available
-
-This release contains many improvements, new features, bug fixes and optimizations.
-
-See the [ZooKeeper 3.2.0 Release Notes](https://zookeeper.apache.org/doc/r3.2.0/releasenotes.html)
for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-### 27 March, 2009: release 3.1.1 available
-
-This release contains a small number of bug fixes.
-
-See the [ZooKeeper 3.1.1 Release Notes](https://zookeeper.apache.org/doc/r3.1.1/releasenotes.html)
for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-### 13 February, 2009: release 3.1.0 available
-
-This release contains many improvements, new features, bug fixes and optimizations.
-
-See the ZooKeeper 3.1.0 Release Notes for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-### 4 December, 2008: release 3.0.1 available
-
-This release contains many improvements, new features, bug fixes and optimizations.
-
-See the ZooKeeper 3.0.1 Release Notes for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-### 27 October, 2008: release 3.0.0 available
-
-This release contains many improvements, new features, bug fixes and optimizations.
-
-See the ZooKeeper 3.0.0 Release Notes for details. Alternatively, you can look at the [Jira](https://issues.apache.org/jira/browse/ZOOKEEPER?report=com.atlassian.jira.plugin.system.project:changelog-panel)
issue log for all releases.
-
-

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/security.md
----------------------------------------------------------------------
diff --git a/security.md b/security.md
deleted file mode 100644
index b2995da..0000000
--- a/security.md
+++ /dev/null
@@ -1,126 +0,0 @@
----
-layout: page
-title: Security
----
-# ZooKeeper Security
-
-The Apache Software Foundation takes security issues very seriously. Due to the infrastructure
nature of the Apache ZooKeeper project specifically, we haven't had many reports over time,
but it doesn't mean that we haven't had concerns over some bugs and vulnerabilities. If you
have any concern or believe you have uncovered a vulnerability, we suggest that you get in
touch via the e-mail address <a href="mailto:security@zookeeper.apache.org?Subject=[SECURITY]
My security issue" target="_top">security@zookeeper.apache.org</a>. In the message,
try to provide a description of the issue and ideally a way of reproducing it. Note that this
security address should be used only for undisclosed vulnerabilities. Dealing with known issues
should be handled regularly via jira and the mailing lists. **Please report any security problems
to the project security address before disclosing it publicly.**  
-
-The ASF Security team maintains a page with a description of how vulnerabilities are handled,
check their <a href="https://www.apache.org/security/">Web page</a> for more information.
-
-## Vulnerability reports
-
-* [CVE-2018-8012: Apache ZooKeeper Quorum Peer mutual authentication](#CVE-2018-8012)
-* [CVE-2017-5637: DOS attack on wchp/wchc four letter words (4lw)](#CVE-2017-5637)
-* [CVE-2016-5017: Buffer overflow vulnerability in ZooKeeper C cli shell](#CVE-2016-5017)
-
-
-
-### CVE-2018-8012: Apache ZooKeeper Quorum Peer mutual authentication
-
-Severity: Critical
-
-Vendor:
-The Apache Software Foundation
-
-Versions Affected:
-ZooKeeper prior to 3.4.10
-ZooKeeper 3.5.0-alpha through 3.5.3-beta
-The unsupported ZooKeeper 1.x through 3.3.x versions may be also affected
-
-Description:
-No authentication/authorization is enforced when a server attempts to join a quorum. As a
result an arbitrary end point could join the cluster and begin propagating counterfeit changes
to the leader.
-
-Mitigation:
-Upgrade to 3.4.10 or later (3.5.4-beta or later if on the 3.5 branch) and enable Quorum Peer
mutual authentication.
-
-Alternately ensure the ensemble election/quorum communication is protected by a firewall
as this will mitigate the issue.
-
-See the documentation for more details on correct cluster administration.
-
-Credit:
-This issue was identified by Földi Tamás and Eugene Koontz
-
-References:
-https://issues.apache.org/jira/browse/ZOOKEEPER-1045
-https://cwiki.apache.org/confluence/display/ZOOKEEPER/Server-Server+mutual+authentication
-http://zookeeper.apache.org/doc/current/zookeeperAdmin.html
-
-
-
-### CVE-2017-5637: DOS attack on wchp/wchc four letter words (4lw) {#CVE-2017-5637}
-
-Severity: moderate
-
-Vendor:
-The Apache Software Foundation
-
-Versions Affected:
-ZooKeeper 3.4.0 to 3.4.9
-ZooKeeper 3.5.0 to 3.5.2
-The unsupported ZooKeeper 1.x through 3.3.x versions may be also affected
-
-Note: The 3.5 branch is still beta at this time.
-
-Description:
-Two four letter word commands “wchp/wchc” are CPU intensive and could cause spike of
CPU utilization on ZooKeeper server if abused,
-which leads to the server unable to serve legitimate client requests. There is no known compromise
which takes advantage of this vulnerability.
-
-Mitigation:
-This affects ZooKeeper ensembles whose client port is publicly accessible, so it is recommended
to protect ZooKeeper ensemble with firewall.
-Documentation has also been updated to clarify on this point. In addition, a patch (ZOOKEEPER-2693)
is provided to disable "wchp/wchc” commands
-by default.
-- ZooKeeper 3.4.x users should upgrade to 3.4.10 or apply the patch.
-- ZooKeeper 3.5.x users should upgrade to 3.5.3 or apply the patch.
-
-References
-[1] https://issues.apache.org/jira/browse/ZOOKEEPER-2693
-
-
-
-### CVE-2016-5017: Buffer overflow vulnerability in ZooKeeper C cli shell {#CVE-2016-5017}
-
-Severity: moderate
-
-Vendor:
-The Apache Software Foundation
-
-Versions Affected:
-ZooKeeper 3.4.0 to 3.4.8
-ZooKeeper 3.5.0 to 3.5.2
-The unsupported ZooKeeper 1.x through 3.3.x versions may be also affected
-
-Note: The 3.5 branch is still alpha at this time.
-
-Description:
-The ZooKeeper C client shells "cli_st" and "cli_mt" have a buffer
-overflow vulnerability associated with parsing of the input command
-when using the "cmd:<cmd>" batch mode syntax. If the command string
-exceeds 1024 characters a buffer overflow will occur. There is no
-known compromise which takes advantage of this vulnerability, and if
-security is enabled the attacker would be limited by client level
-security constraints. The C cli shell is intended as a sample/example
-of how to use the C client interface, not as a production tool - the
-documentation has also been clarified on this point.
-
-Mitigation:
-It is important to use the fully featured/supported Java cli shell rather
-than the C cli shell independent of version.
-
-- ZooKeeper 3.4.x users should upgrade to 3.4.9 or apply this [patch](https://git-wip-us.apache.org/repos/asf?p=zookeeper.git;a=commitdiff;h=27ecf981a15554dc8e64a28630af7a5c9e2bdf4f)
-
-- ZooKeeper 3.5.x users should upgrade to 3.5.3 when released or apply
-this [patch](https://git-wip-us.apache.org/repos/asf?p=zookeeper.git;a=commitdiff;h=f09154d6648eeb4ec5e1ac8a2bacbd2f8c87c14a)
-
-The patch solves the problem reported here, but it does not make the
-client ready for production use. The community has no plan to make
-this client production ready at this time, and strongly recommends that
-users move to the Java cli and use the C cli for illustration purposes only.
-
-
-Credit:
-This issue was discovered by Lyon Yang (@l0Op3r)
-
-References:
-[Apache ZooKeeper Security Page](https://zookeeper.apache.org/security.html)
-

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/src/main/resources/.htaccess
----------------------------------------------------------------------
diff --git a/src/main/resources/.htaccess b/src/main/resources/.htaccess
new file mode 100644
index 0000000..cd6152d
--- /dev/null
+++ b/src/main/resources/.htaccess
@@ -0,0 +1,8 @@
+# .htaccess for ZooKeeper
+#
+# Old site had /docs while new site has /doc
+RedirectMatch Permanent ^/docs/(.+)$ /doc/$1
+# Old site had /mailing_lists.html while new site has /lists.html
+RedirectMatch Permanent ^/mailing_lists.html$ /lists.html
+# redirect bookkeeper site
+RedirectMatch Permanent ^/bookkeeper/(.+)$ http://bookkeeper.apache.org/$1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/src/main/resources/markdown/bylaws.md
----------------------------------------------------------------------
diff --git a/src/main/resources/markdown/bylaws.md b/src/main/resources/markdown/bylaws.md
new file mode 100644
index 0000000..6d1405c
--- /dev/null
+++ b/src/main/resources/markdown/bylaws.md
@@ -0,0 +1,205 @@
+<!--
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+//-->
+
+# Apache ZooKeeper Project Bylaws
+
+This is version 1 of the bylaws.
+
+# Introduction 
+
+This document defines the bylaws under which the Apache ZooKeeper 
+project operates. It defines the roles and responsibilities of the 
+project, who may vote, how voting works, how conflicts are resolved, etc. 
+
+ZooKeeper is a project of the [Apache Software Foundation](https://www.apache.org/foundation/)
The foundation 
+holds the copyright on Apache code including the code in the ZooKeeper 
+codebase. The [foundation FAQ](https://www.apache.org/foundation/faq.html) explains the operation
and background of 
+the foundation. 
+
+ZooKeeper is typical of Apache projects in that it operates under a set 
+of principles, known collectively as the Apache Way. If you are new to 
+Apache development, please refer to the [Incubator project](https://incubator.apache.org/)
for more 
+information on how Apache projects operate. 
+
+# 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 contributors start out as users and guide 
+their development efforts from the user's perspective. 
+
+Users contribute to the Apache projects by providing feedback to 
+contributors 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 ZooKeeper 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 a specified set of subproject's 
+repositories. Committers on subprojects may cast binding 
+votes on any technical discussion regarding that subproject. 
+
+Committer access is by invitation only and must be approved by lazy 
+consensus of the active PMC members. A Committer is considered emeritus 
+by his or her own declaration or by not reviewing patches or commiting 
+patches to the project for over six months. An emeritus committer may 
+request reinstatement of commit access from the PMC which must be 
+approved by lazy consensus of the active PMC members. 
+
+Commit access can be revoked by a unanimous vote of all the active PMC 
+members (except the committer in question if he or she is also a PMC 
+member). 
+
+All Apache committers are required to have a signed [Contributor License Agreement (CLA)](https://www.apache.org/licenses/icla.txt)
+ on file with the Apache Software Foundation. There is a 
+[Committer 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, etc. 
+
+## Project Management Committee 
+
+The PMC is responsible to the board and the ASF for the management and 
+oversight of the Apache ZooKeeper codebase. The responsibilities of the 
+PMC include: 
+
+* Deciding what is distributed as products of the Apache ZooKeeper 
+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 
+lazy consensus of active PMC members. A PMC member is considered 
+emeritus by his or her 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, which must be approved by a lazy consensus of 
+active PMC members. 
+
+Membership of the PMC can be revoked by an unanimous vote of all the 
+active PMC members other than the member in question. 
+
+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 
+ZooKeeper) and has primary responsibility to the board for the 
+management of the projects within the scope of the ZooKeeper PMC. The 
+chair reports to the board quarterly on developments within the 
+ZooKeeper project. 
+
+When the current chair of the PMC resigns, the PMC votes to recommend a 
+new chair using lazy consensus, but the decision must be ratified by the 
+Apache board. 
+
+# Decision Making 
+
+Within the ZooKeeper project, different types of decisions require 
+different forms of approval. For example, the previous section describes 
+several decisions which require 'lazy consensus' approval. This section 
+defines how voting is performed, the types of approvals, and which types 
+of decision require which type of approval. 
+
+## Voting 
+
+Decisions regarding the project are made by votes on the primary project 
+development mailing list dev@zookeeper.apache.org. Where necessary, PMC 
+voting may take place on the private ZooKeeper PMC mailing list 
+private@zookeeper.apache.org. 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.' In general, this vote also indicates
a willingness on the behalf of the voter in 'making it happen'.| 
+| +0 |This vote indicates a willingness for the action under consideration to go ahead. The
voter, however will not be able to help.| 
+| -0 |This vote indicates that the voter does not, in general, agree with the proposed action
but is not concerned enough to prevent the action going ahead.| 
+| -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 ZooKeeper 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 ZooKeeper community. For PMC 
+decisions, only the votes of PMC members are binding. 
+
+Voting can also be applied to changes already made to the ZooKeeper 
+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. 
+
+## Approvals 
+
+There are the types of approvals that can be sought. Different actions 
+require different types of approvals. 
+
+|Approval Type|Definition|
+|-------------|----------|
+|Consensus |For this to pass, all voters with binding votes must vote and there can be no
binding vetoes (-1). Consensus votes are rarely required due to the impracticality of getting
all eligible voters to cast a vote.| 
+|Lazy Consensus |Lazy consensus requires 3 binding +1 votes and no binding vetoes.| 
+|Lazy Majority |A lazy majority vote requires 3 binding +1 votes and more binding +1 votes
that -1 votes.| 
+|Lazy Approval |An action with lazy approval is implicitly allowed unless a -1 vote is received,
at which time, depending on the type of action, either lazy majority or lazy consensus approval
must be obtained.| 
+|2/3 Majority |Some actions require a 2/3 majority of active committers or PMC members to
pass. Such actions typically affect the foundation of the project (e.g. adopting a new codebase
to replace an existing product). The higher threshold is designed to ensure such changes are
strongly supported. To pass this vote requires at least 2/3 of binding vote holders to vote
+1.| 
+
+## 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 his or her veto. If a veto is not withdrawn, the 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. It also specifies the 
+minimum length of time that a vote must remain open, measured in 
+business days. In general votes should not be called at times when it is 
+known that interested members of the project will be unavailable. 
+
+|Action|Description|Approval|Binding Votes|Minimum Length (days)|
+|------|-----------|--------|-------------|---------------------|
+|Code Change |A change made to a codebase of the project and committed by a committer. This
includes source code, documentation, website content, etc. |Lazy approval (not counting the
vote of the contributor), moving to lazy majority if a -1 is received |Active committers |1|
+|Release Plan |Defines the timetable and actions for a release. The plan also nominates a
Release Manager. |Lazy majority |Active committers |3| 
+|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| 
+|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 within the project. |2/3
majority |Active PMC members| 6| 
+|New Committer or reinstatement |When a new committer is proposed for the project. |Lazy
consensus |Active PMC members |3| 
+|New PMC Member or reinstatement |When a committer is proposed for the PMC. |Lazy consensus
|Active PMC members |3| 
+|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 |Active PMC members (excluding
the committer in question if a member of the PMC). |6| 
+|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 |Active PMC members (excluding the
member in question). |6| 
+|Modifying Bylaws |Modifying this document. |2/3 majority |Active PMC members |6|

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/src/main/resources/markdown/credits.md
----------------------------------------------------------------------
diff --git a/src/main/resources/markdown/credits.md b/src/main/resources/markdown/credits.md
new file mode 100644
index 0000000..d29d3bc
--- /dev/null
+++ b/src/main/resources/markdown/credits.md
@@ -0,0 +1,73 @@
+<!--
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+//-->
+
+# ZooKeeper Credits
+
+* [PMC Members](#pmc)
+* [Committers](#committers)
+* [Contributors](#contributors)
+
+<a name="pmc"></a>
+## PMC Members
+
+ZooKeeper's active PMC members are
+
+|Username|Name|Organization|Time Zone|
+|--------|----|------------|--------|
+|tdunning|Ted Dunning|MapR Technologies|-8|
+|camille|Camille Fournier|RentTheRunway|-5|
+|phunt|Patrick Hunt|Cloudera Inc.|-8|
+|fpj|Flavio Junqueira|Confluent|+0|
+|ivank|Ivan Kelly|Midokura|+2|
+|mahadev|Mahadev Konar|Hortonworks Inc.|-8|
+|michim|Michi Mutsuzaki|Nicira|-8|
+|cnauroth|Chris Nauroth|Hortonworks Inc.|-8| 
+|breed|Benjamin Reed|Facebook|-8|
+|henry|Henry Robinson|Cloudera Inc.|-8|
+|rgs|Raul Gutierrez Segales|Pinterest|-8|
+|rakeshr|Rakesh Radhakrishnan|Intel|+5:30|
+|hanm|Michael Han|Twitter|-8|
+
+<a name="committers"></a>
+## Committers
+
+ZooKeeper's active committers are
+
+|Username|Name|Organization|Time Zone|
+|--------|----|------------|--------|
+|camille|Camille Fournier|RentTheRunway|-5|
+|phunt|Patrick Hunt|Cloudera Inc.|-8|
+|fpj|Flavio Junqueira|Confluent|+1|
+|cnauroth|Chris Nauroth|Hortonworks Inc.|-8|
+|mahadev|Mahadev Konar|Hortonworks Inc.|-8|
+|gkesavan|Giridharan Kesavan|Hortonworks Inc.|-8|
+|akornev|Andrew Kornev|||
+|michim|Michi Mutsuzaki|Nicira|-8|
+|breed|Benjamin Reed|Facebook|-8|
+|henry|Henry Robinson|Cloudera Inc.|-8|
+|shralex|Alex Shraer|Apple|-8|
+|thawan|Thawan Kooburat|Facebook|-8|
+|rakeshr|Rakesh Radhakrishnan|Intel|+5:30|
+|hdeng|Hongchao Deng|CoreOS|-8|
+|rgs|Raul Gutierrez Segales|Pinterest|-8|
+|hanm|Michael Han|Twitter|-8|
+|arshad|Mohammad Arshad|Huawei|+5:30|
+|afine|Abraham Fine|IFTTT|-8|
+|andor|Andor Molnar|Cloudera Inc.|+1|
+|fangmin|Fangmin Lyu|Facebook|-8|
+
+<a name="contributors"></a>
+## Contributors
+
+A list of ZooKeeper contributors and their contributions is available from [Jira](https://issues.apache.org/jira/browse/ZooKeeper)


Mime
View raw message