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/10/07 04:55:47 UTC

[1/2] git commit: [HELIX-266] Create an IRC channel for Helix, rb=14515

Updated Branches:
  refs/heads/master b1c80f44b -> 6513e4c0f


[HELIX-266] Create an IRC channel for Helix, rb=14515


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

Branch: refs/heads/master
Commit: d7140ffd6aac9d048e34d0771ebf7450f8eadf50
Parents: b9fe738
Author: Kanak Biscuitwala <ka...@hotmail.com>
Authored: Sun Oct 6 15:36:36 2013 -0700
Committer: Kanak Biscuitwala <ka...@hotmail.com>
Committed: Sun Oct 6 19:55:20 2013 -0700

----------------------------------------------------------------------
 src/site/markdown/IRC.md   | 29 +++++++++++++++++++++++++++++
 src/site/markdown/index.md | 12 +++++++-----
 src/site/site.xml          |  5 +++--
 3 files changed, 39 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/d7140ffd/src/site/markdown/IRC.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/IRC.md b/src/site/markdown/IRC.md
new file mode 100644
index 0000000..10dc4cc
--- /dev/null
+++ b/src/site/markdown/IRC.md
@@ -0,0 +1,29 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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.
+-->
+
+IRC
+---
+
+We're often available on the ```#apachehelix``` channel on the ```chat.freenode.net``` server. You can use your favorite IRC client or the web client below to connect.
+
+### Web IRC Client
+
+To connect to our channel, just enter a username below.
+
+<iframe src="http://webchat.freenode.net/?channels=apachehelix" style="width: 100%; height: 500px; border: none;" />

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/d7140ffd/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 163f559..70aba18 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -34,6 +34,8 @@ Navigating the Documentation
 
 [Javadocs](http://helix.incubator.apache.org/apidocs/index.html)
 
+[IRC](./IRC.html)
+
 ### Recipes
 
 [Distributed lock manager](./recipes/lock_manager.html)
@@ -51,7 +53,7 @@ Navigating the Documentation
 
 What Is Helix
 --------------
-Helix is a generic _cluster management_ framework used for the automatic management of partitioned, replicated and distributed resources hosted on a cluster of nodes. 
+Helix is a generic _cluster management_ framework used for the automatic management of partitioned, replicated and distributed resources hosted on a cluster of nodes.
 
 
 What Is Cluster Management
@@ -76,7 +78,7 @@ Key Features of Helix
 ---------------------
 1. Automatic assignment of resources and partitions to nodes
 2. Node failure detection and recovery
-3. Dynamic addition of resources 
+3. Dynamic addition of resources
 4. Dynamic addition of nodes to the cluster
 5. Pluggable distributed state machine to manage the state of a resource via state transitions
 6. Automatic load balancing and throttling of transitions
@@ -100,7 +102,7 @@ Requirements: JDK 1.6+, Maven 2.0.8+
 ```
     git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
     cd incubator-helix
-    mvn install package -DskipTests 
+    mvn install package -DskipTests
 ```
 
 Maven dependency
@@ -114,11 +116,11 @@ Maven dependency
 ```
 
 [Download](./download.html) Helix artifacts from here.
-   
+
 Publications
 -------------
 
-* Untangling cluster management using Helix at [SOCC Oct 2012](http://www.socc2012.org/home/program)  
+* Untangling cluster management using Helix at [SOCC Oct 2012](http://www.socc2012.org/home/program)
     - [paper](https://915bbc94-a-62cb3a1a-s-sites.googlegroups.com/site/acm2012socc/helix_onecol.pdf)
     - [presentation](http://www.slideshare.net/KishoreGopalakrishna/helix-socc-v10final)
 * Building distributed systems using Helix Apache Con Feb 2013

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/d7140ffd/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index e9a5cce..88a8a08 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -64,9 +64,10 @@
       <item name="Tutorial" href="./Tutorial.html"/>
       <item name="release ${currentRelease}" href="releasenotes/release-${currentRelease}.html"/>
       <item name="Download" href="./download.html"/>
+      <item name="IRC" href="./IRC.html"/>
     </menu>
-    
-    <menu name="Recipes">  
+
+    <menu name="Recipes">
       <item name="Distributed lock manager" href="./recipes/lock_manager.html"/>
       <item name="Rabbit MQ consumer group" href="./recipes/rabbitmq_consumer_group.html"/>
       <item name="Rsync replicated file store" href="./recipes/rsync_replicated_file_store.html"/>


[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


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

Branch: refs/heads/master
Commit: 6513e4c0f55c754c965273d6d5342bb216f7cc95
Parents: d7140ff b1c80f4
Author: Kanak Biscuitwala <ka...@hotmail.com>
Authored: Sun Oct 6 19:55:42 2013 -0700
Committer: Kanak Biscuitwala <ka...@hotmail.com>
Committed: Sun Oct 6 19:55:42 2013 -0700

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

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