Merge pull request #235 from drozer/master

new talks by Gigaspaces

site/content/events/2013-amsterdam/proposals/JonathanWeiss_ContinuousDeploymentandIntegrationintheCloud/index.txt

@@ -8,7 +8,11 @@ proposal: true
 talk: true
 selected: false
 layout: event
+<<<<<<< HEAD:site/content/events/2013-amsterdam/proposals/KaminaAisola_ContinuousDeploymentandIntegrationintheCloud/index.txt
+author: Amazon Web Services Engineer
+=======
 author: Jonathan Weiss
+>>>>>>> a28361acdf4135ef4dd5d14c1f1b827524a09fea:site/content/events/2013-amsterdam/proposals/JonathanWeiss_ContinuousDeploymentandIntegrationintheCloud/index.txt
 title: "Continuous Deployment and Integration in the Cloud"
 ---
 
@@ -20,4 +24,9 @@ In this session we'll talk about some key concepts and design patterns for conti
 
 **Speaker:**
 
+<<<<<<< HEAD:site/content/events/2013-amsterdam/proposals/KaminaAisola_ContinuousDeploymentandIntegrationintheCloud/index.txt
+Contact: Kamini Aisola
+Speaker name of engineer not known yet
+=======
 Jonathan Weiss, AWS
+>>>>>>> a28361acdf4135ef4dd5d14c1f1b827524a09fea:site/content/events/2013-amsterdam/proposals/JonathanWeiss_ContinuousDeploymentandIntegrationintheCloud/index.txt

site/content/events/2013-amsterdam/proposals/MartinEnglund_AmazontimetravelorhowtolivewithAWSeventualconsistencytimewarps/index.txt

@@ -23,7 +23,15 @@ Martin Englund is a Principal Engineer at Pivotal, where he works on BOSH - the
 
 Martin has over twenty years of experience in security and automation, and has contributed to other automation tools, like Puppet. Prior to this role, he worked at Sun Microsystems as a Principal Security Engineer running Sun's external web presence, in Java Security Engineering and the Sun IT Security Office, where he was responsible for creating the standards and tools used by Sun IT to secure its servers. He has also authored numerous technical papers on security, including co-authoring the Solaris Security Essentials book.
 
+<<<<<<< HEAD
+twitter: @pmenglund
+
+blog: http://blog.codenursery.com/
+
+linkedin: http://www.linkedin.com/in/pmenglund
+=======
 Twitter: @pmenglund
 Blog: http://blog.codenursery.com/
 Linkedin: http://www.linkedin.com/in/pmenglund
+>>>>>>> a28361acdf4135ef4dd5d14c1f1b827524a09fea
 

site/content/events/2013-amsterdam/proposals/NatiShalom_Buildingcrossregionandcrosscloudhighavailabilityintoyourapp/index.txt

@@ -0,0 +1,23 @@
+---
+extension: html
+filter:
+- erb
+- markdown
+dirty: true
+proposal: true
+ignite: false
+selected: false
+layout: event
+author: Nati Shalom
+title: Building cross region and cross cloud high availability into your app
+---
+
+**Abstract:**
+
+A real life case: Achieving high levels of availability and disaster recovery in a cloud environment requires the implementation of patterns and practices that introduce redundancy through multi-zone, multi-region, and multi-cloud deployments. As we move towards implementing higher availability, we cannot escape the direct increase in the accidental complexity of the deployment architecture resulting from lack of cloud portability and deployment lifecycle automation. We present a solution approach implemented by a real-world user for achieving high availability and disaster recovery using the Cloudify open source framework. This approach applies to not just AWS, but also other public clouds and private cloud environments such as Eucalyptus . The resulting reference architecture provides portable PostgreSQL replication and disaster recovery as well as application tier scalability across zones, regions, and public/private clouds through a unified deployment workflow. 
+
+**Speaker:**
+
+Nati Shalom
+
+Nati is the Founder and CTO of GigaSpaces, he was recently recognized as a Top Cloud Computing Blogger for CIO’s by The CIO Magazine and he is also the founder of the IGTCLoud.  Nati is also a frequent presenter at industry conferences. He has spoken at IBM Information on Demand, Big Data Spain, DevOpsCon, NoSQL Now, UP Cloud, Computing Conference, OpenStack Israel, and Cloud Mafia San Francisco, among others.

site/content/events/2013-amsterdam/proposals/NatiShalom_ContinuousDeliverywithJenkinsandCloudify/index.txt

@@ -0,0 +1,23 @@
+---
+extension: html
+filter:
+- erb
+- markdown
+dirty: true
+proposal: true
+ignite: false
+selected: false
+layout: event
+author: Nati Shalom
+title: Continuous Delivery with Jenkins and Cloudify (FastConnect)
+---
+
+**Abstract:**
+
+Continuous delivery is not an option anymore for organizations and companies that implement online services and products. The ability to rollout new code changes quickly and as frequently as needed is an important business enabler. In this session we’ll review the current options for CD in the cloud, and learn how to implement an automated CD process using Cloudify and Jenkins. 
+
+**Speaker:**
+
+Nati Shalom
+
+Nati is the Founder and CTO of GigaSpaces, he was recently recognized as a Top Cloud Computing Blogger for CIO’s by The CIO Magazine and he is also the founder of the IGTCLoud.  Nati is also a frequent presenter at industry conferences. He has spoken at IBM Information on Demand, Big Data Spain, DevOpsCon, NoSQL Now, UP Cloud, Computing Conference, OpenStack Israel, and Cloud Mafia San Francisco, among others.

site/content/events/2013-amsterdam/proposals/UriCohen_BuildingyourownOpsWorkswithChefandCloudify/index.txt

@@ -0,0 +1,23 @@
+---
+extension: html
+filter:
+- erb
+- markdown
+dirty: true
+proposal: true
+ignite: false
+selected: false
+layout: event
+author: Uri Cohen
+title: Building your own OpsWorks with Chef and Cloudify
+---
+
+**Abstract:**
+
+AWS OpsWorks is a DevOps solution for managing applications of any scale or complexity on the AWS cloud. With OpsWorks you can manage your complete application lifecycle, including resource provisioning, configuration management, application deployment, software updates, monitoring, etc. However, OpsWorks is only applicable to AWS. What if you could create and manage a similar service on top of any cloud? In this session we will introduce Cloudify, a new open source PaaS framework. Cloudify takes a different approach by using recipes (as opposed to heavyweight coding and platform extension) as a means to introduce new application stacks to the PaaS layer. You can think of it as extending the recipe model of Chef to support application level concerns such as orchestration, dependency management, multi-tier and multi-host deployments, monitoring and auto-scaling. This session will introduce how Cloudify leverages Chef as a key enabler for an open PaaS framework.
+
+**Speaker:**
+
+Uri Cohen
+
+Uri heads the Product and Developer community efforts at GigaSpaces, and is a frequent speaker at various industry events and meetups. Most recently, Uri co-organized the first DevOps conference in Israel. Uri has spoken at QCon New York, Cassandra Summit, CloudStack Collaboration Conference, QCon London, QCon San Francisco, CloudBeat and Devoxx, among others.

site/content/events/2013-amsterdam/proposals/UriCohen_TestingasaServiceHowweusedOpenStacktoautomateourentiredevandtestingenvironment/index.txt

@@ -0,0 +1,23 @@
+---
+extension: html
+filter:
+- erb
+- markdown
+dirty: true
+proposal: true
+ignite: false
+selected: false
+layout: event
+author: Uri Cohen
+title: Testing as a Service - How we used OpenStack to automate our entire dev and testing environment.
+---
+
+**Abstract:**
+
+Building and testing distributed software platforms can be a tedious and daunting task. Achieving good coverage can be very hard since a lot of factors affect the overall testability and coverage of a system.  Some problems only become apparent on a distributed setup, such as timing and network issues, etc. In this session we’ll explain how we used OpenStack and Cloudify to implement and automate real integration testing (as in, no mocks) for our entire product suite, and how we significantly improved our overall coverage and reliability.
+
+**Speaker:**
+
+Uri Cohen
+
+Uri heads the Product and Developer community efforts at GigaSpaces, and is a frequent speaker at various industry events and meetups. Most recently, Uri co-organized the first DevOps conference in Israel. Uri has spoken at QCon New York, Cassandra Summit, CloudStack Collaboration Conference, QCon London, QCon San Francisco, CloudBeat and Devoxx, among others.

site/content/events/2013-paris/_sponsors.txt

@@ -36,9 +36,12 @@ filter:    erb
   { :image => "sfeir.png", :name => "Sfeir", :link => "http://www.sfeir.com/"},
   { :image => "dow.png", :name => "Days of Wonder", :link => "http://www.daysofwonder.com/"},
   { :image => "stanford.png", :name => "Stanford Ignite Paris", :link => "http://www.gsb.stanford.edu/ignite/paris"},
+<<<<<<< HEAD
+=======
   { :image => "mozilla.png", :name => "Mozilla", :link => "http://www.mozilla.org/"},
   { :image => "sqli.png", :name => "Sqli", :link => "http://www.sqli.com/"},
   { :image => "prologism.png", :name => "Prologism", :link => "http://www.prologism.fr"},
+>>>>>>> a28361acdf4135ef4dd5d14c1f1b827524a09fea
 ]%>
 
 <% unless @ssponsors.empty?  %><h1>Silver sponsors</h1><% end %>