You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2013/09/24 01:15:18 UTC

[1/2] git commit: [HELIX-250] Add Kanak as committer to website, rb=14287

Updated Branches:
  refs/heads/master f90e0d8bb -> 963c2bf7e


[HELIX-250] Add Kanak as committer to website, rb=14287


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

Branch: refs/heads/master
Commit: 8a39b8a9916df10b569117a34ede5b79c0ffb6cb
Parents: 84fb26b
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Mon Sep 23 13:15:10 2013 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Mon Sep 23 16:13:17 2013 -0700

----------------------------------------------------------------------
 pom.xml | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 78 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/8a39b8a9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6840410..6c1cf4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@ under the License.
       <name>Olivier Lamy</name>
       <email>olamy@apache.org</email>
       <roles>
-        <role>PMC Member</role>
+        <role>Mentor</role>
       </roles>
       <timezone>Australia/Melbourne</timezone>
     </developer>
@@ -53,16 +53,16 @@ under the License.
       <name>Patrick Hunt</name>
       <email>phunt@apache.org</email>
       <roles>
-        <role>PMC Member</role>
+        <role>Mentor</role>
       </roles>
       <timezone>-8</timezone>
     </developer>
     <developer>
-      <id>Mahadev</id>
+      <id>mahadev</id>
       <name>Mahadev Konar</name>
       <email>mahadev@apache.org</email>
       <roles>
-        <role>PMC Member</role>
+        <role>Mentor</role>
       </roles>
       <timezone>-8</timezone>
     </developer>
@@ -71,7 +71,7 @@ under the License.
       <name>Owen O'Malley</name>
       <email>omalley@apache.org</email>
       <roles>
-        <role>PMC Member</role>
+        <role>Mentor</role>
       </roles>
       <timezone>-8</timezone>
     </developer>
@@ -103,6 +103,15 @@ under the License.
       <timezone>-8</timezone>
     </developer>
     <developer>
+      <id>TBA</id>
+      <name>Adam Silberstein</name>
+      <email>TBA@apache.org</email>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>-8</timezone>
+    </developer>
+    <developer>
       <id>ksurlaker</id>
       <name>Kapil Surlaker</name>
       <email>ksurlaker@apache.org</email>
@@ -110,7 +119,70 @@ under the License.
         <role>Committer</role>
       </roles>
       <timezone>-8</timezone>
-    </developer>                                     
+    </developer>
+    <developer>
+      <id>rms</id>
+      <name>Bob Schulman</name>
+      <email>rms@apache.org</email>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>-8</timezone>
+    </developer>
+    <developer>
+      <id>rahula</id>
+      <name>Rahul Aggarwal</name>
+      <email>rahula@apache.org</email>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>-8</timezone>
+    </developer>
+    <developer>
+      <id>chtyim</id>
+      <name>Terence Yim</name>
+      <email>chtyim@apache.org</email>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>-8</timezone>
+    </developer>
+    <developer>
+      <id>santip</id>
+      <name>Santiago Perez</name>
+      <email>santip@apache.org</email>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>-8</timezone>
+    </developer>
+    <developer>
+      <id>vinayakb</id>
+      <name>Vinayak Borkar</name>
+      <email>vinayakb@apache.org</email>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>-8</timezone>
+    </developer>
+    <developer>
+      <id>sdas</id>
+      <name>Shirshanka Das</name>
+      <email>sdas@apache.org</email>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>-8</timezone>
+    </developer>
+    <developer>
+      <id>kanak</id>
+      <name>Kanak Biscuitwala</name>
+      <email>kanak@apache.org</email>
+      <roles>
+        <role>Committer</role>
+      </roles>
+      <timezone>-8</timezone>
+    </developer>
   </developers>
   <modules>
     <module>helix-core</module>


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix

Posted by ka...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix

Conflicts:
	pom.xml


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

Branch: refs/heads/master
Commit: 963c2bf7e02566f4e8475b73d1314e3aa4443bd1
Parents: 8a39b8a f90e0d8
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Mon Sep 23 16:14:59 2013 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Mon Sep 23 16:14:59 2013 -0700

----------------------------------------------------------------------

----------------------------------------------------------------------