You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ma...@apache.org on 2015/11/20 02:26:57 UTC

[2/3] incubator-geode git commit: Merge PR #39 into feature/GEODE-53

Merge PR #39 into feature/GEODE-53


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

Branch: refs/heads/feature/GEODE-53
Commit: 1c5fb68512fb63970d44855057090089ff53e3f1
Parents: 1f20c3c 7292b23
Author: William Markito <wm...@pivotal.io>
Authored: Thu Nov 19 17:09:20 2015 -0800
Committer: William Markito <wm...@pivotal.io>
Committed: Thu Nov 19 17:09:20 2015 -0800

----------------------------------------------------------------------
 gemfire-site/content/community/index.html | 9 +++++----
 gemfire-site/website/README.md            | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1c5fb685/gemfire-site/content/community/index.html
----------------------------------------------------------------------
diff --cc gemfire-site/content/community/index.html
index f28a4a7,bf10e0a..6ae7977
--- a/gemfire-site/content/community/index.html
+++ b/gemfire-site/content/community/index.html
@@@ -20,7 -20,7 +20,7 @@@
      <link href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
      <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
  
--    
++
      <script type="text/javascript"
        src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBYSxyIKS22zC4wSLFXZGR8QKXbGWLFwYw&sensor=false">
      </script>
@@@ -189,7 -189,7 +189,7 @@@
              }
          };
      </script>
--    
++
  
      <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
      <!--[if lt IE 9]>
@@@ -317,7 -317,7 +317,8 @@@
        </div>
        <div class="col-md-3 done">
          	<h3><a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">Geode ClubHouse</a></h3>
-         	<p>We meet every 15 days online for discussions around specific features, detailing internals and discuss on-going issues on JIRA at the Geode Clubhouse. All meetings are recorded and videos are availabe in our <a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">YouTube</a> channel.<p>
++
+         	<p>We meet every 15 days online for discussions around specific features, detailing internals and discuss ongoing issues on JIRA at the Geode Clubhouse. All meetings are recorded and videos are availabe in our <a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">YouTube</a> channel.<p>
        </div>
  	  </div>
  </section>