Merge branch 'master' of https://github.com/basho-labs/the-riak-commu…

…nity into pr/56

Conflicts:
	code-of-conduct.md
Fix merge conflict.

CONTRIBUTING-basho-labs.md

@@ -35,7 +35,7 @@ Once you're ready to contribute code back to this repo, start with these steps:
 
 You can [read the full guidelines for bug reporting and code contributions](http://docs.basho.com/riak/latest/community/bugs/) on the Riak Docs. 
 
-And **thank you!** Your contribution is incredible important to us. It'd be great for you to add it to a current or past community release note [here](https://github.com/basho-labs/the-riak-community/tree/master/release-notes).
+And **thank you!** Your contribution is incredibly important to us. It'd be great for you to add it to a current or past community release note [here](https://github.com/basho-labs/the-riak-community/tree/master/release-notes).
 
 
 

CONTRIBUTING-basho.md

@@ -34,4 +34,4 @@ We encourages Issues and PRs to Riak from the community. Here’s how to get sta
 
 You can [read the full guidelines for bug reporting and code contributions](http://docs.basho.com/riak/latest/community/bugs/) on the Riak Docs. 
 
-And **thank you!** Your contribution is incredible important to us.
+And **thank you!** Your contribution is incredibly important to us.

README.md

@@ -1,7 +1,7 @@
 ##The Riak Community
 
 
-There are many components to a successful open source software project. Code (and code quality) is only the first of many, and lot of times it's not the most important (for better or for worse). **A Community** is built around the code to help foster its growth, maturity, and adoption. Like the code, it needs to evolve, and unless it's moving forward and being refined continuously, it ceases to be valuable. 
+There are many components to a successful open source software project. Code (and code quality) is only the first of many, and lot of times it's not the most important (for better or for worse). **A Community** is built around the code to help foster its growth, maturity, and adoption. Like the code, it **needs to evolve**, and unless it's moving forward and being refined continuously, it ceases to be valuable. 
 
 If you’re looking to get more involved in our community, we’d love to have you. You can connect with your fellow members [on IRC](http://webchat.freenode.net/#riak), on the [riak-user list](http://lists.basho.com/mailman/listinfo/riak-users_lists.basho.com) or [in-person at meetups](http://riak.meetup.com/). 
 
@@ -36,13 +36,14 @@ Since community as code will be driven by feel over functionality, we probably w
 
 * A new release of The Riak Community will happen on the first work day of each month (time and resource-permitting)
 * Each new version will be a minor version increase (i.e. "v0.2" will follow "v0.1")
+* A combination of new major programs and new processes may justify a major release (i.e. "v2.0" could follow "v1.6")
 
 ### Contributing
 
-1. Open a [pull request](https://github.com/basho-labs/the-riak-community/pull/new/master) with details on your (or someone else's) contribution. Your contribution should be added to the appropriate [release notes](https://github.com/basho-labs/the-riak-community/tree/master/release-notes) (they are all dated) and should be be a short description of what you're adding with a link to related materials
-2. Someone with commit rights to the repo will close the PR and you and your contribution will be added to the forthcoming Riak Community Release
+1. Open a [pull request](https://github.com/basho-labs/the-riak-community/pull/new/master) with details on your (or someone else's) contribution. Your contribution should be added to the appropriate [release notes](https://github.com/basho-labs/the-riak-community/tree/master/release-notes) (they are all dated) and should be a short description of what you're adding with a link to related materials.
+2. Someone with commit rights to the repo will close the PR and you and your contribution will be added to the forthcoming Riak Community Release.
 
 ## Thanks
-This project began with [Mark Phillips](https://twitter.com/pharkmillups) and I'm thankful for that. It was quiet for a few years after that. I would like to keep it in mind as we reflect on the next steps for the Riak Open Source community. Please send your thoughts to me [@mjbrender on Twitter](https://twitter.com/mjbrender) or to [mbrender@basho.com](mailto:mbrender@basho.com).
+This project began with [Mark Phillips](https://twitter.com/pharkmillups) and it was quiet for a few years after that. I would like to keep it in mind as we reflect on the next steps for the Open Source ecosystem that Riak is a part of. Please send your thoughts to me, [@mjbrender on Twitter](https://twitter.com/mjbrender) or to [mbrender@basho.com](mailto:mbrender@basho.com).
 
 We'll see how this goes. It might fail miserably, but I don't think it'll be a total disaster. Also, if you think this idea is ruining the internet, or if there is a way to do this more effectively, please share with us.

code-of-conduct.md

@@ -1,6 +1,6 @@
 #Code of Conduct
 
-As members of this Community, we recognize that our behavior is our choice and will result in our culture. 
+As members of this Community, we recognize that our behavior is our choice and this choice will result in our culture. 
 
 We are a mixture of professionals and volunteers from all over the world, working on every aspect of the mission - including mentorship, teaching, and connecting people. Because we come together from so many different places and positions, we would like a single document that sets communal expectations.
 
@@ -13,12 +13,15 @@ Participants are responsible for knowing and abiding by the following:
 
 * We **err on assuming contributors and users mean well**. This assumption enables us to discuss anything in the open in a mutually respectful way.
 * Whether you're a regular contributor or a newcomer, all members care about making this community a safe place for you and we've got your back.
-* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
-* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
 * We are committed to providing a friendly, safe, and welcoming environment for all, regardless of gender, sexual orientation, disability, ethnicity, religion, or similar personal characteristic.
 * We will exclude you from interaction if you insult, demean, or harass anyone. That is not welcome behavior. We interpret the term "harassment" as including the definition in the [Citizen Code of Conduct](http://citizencodeofconduct.org/); if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don't tolerate behavior that excludes people in socially marginalized groups.
 * Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops, event organizers, or any member of the Community team at Basho.
-* If you believe someone is violating the code of conduct, we ask that you report it by emailing (**proposing - Not yet made**) [conduct@basho.com](mailto:conduct@basho.com).
+* If you believe someone is violating the code of conduct, we ask that you report it by emailing [conduct@basho.com](mailto:conduct@basho.com). Your privacy will be respected.
+
+These notes help when discussing architecture: 
+
+* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
+* We respect data. If you have solid ideas you want to experiment with, make a fork and see how it works.
 
 ## Additional Community Beliefs
 

meetup-strategy.md

@@ -24,11 +24,11 @@ To host one of these events smoothly, you should schedule a Meetup **3 weeks ahe
 
 #### Meetup Kits
 
-We want to standardize on a Meetup kit so events become easy to run through. Standard: 
-* 2 table top signs
-* A pop up sign 
-* Little Riak books
-* Stickers 
+We want to standardize on a Meetup kit so events become easy to run through. These include: 
+
+* Signage (usually a pop-up stand)
+* More than enough stickers
+* A unique giveaway (i.e. Basho pint glass, stress ball, bobbleheads)
 
 #### Budget
 
@@ -37,7 +37,7 @@ We have between $200-$1,000 a month to support Meetup activities. Depending on t
 **Options**:  
 If you have a compelling, measurably-audience-grabbing idea for our Meetups, definitely share it. There are times that will be worth the extra effort and we're glad to get the idea. Open an Issue [here](https://github.com/basho-labs/the-riak-community/issues) or shoot me an [email](mailto:mbrender@basho.com).
 
-If you feel your local Meetup could benefit from more funds, you're welcome ot work on local sponsorships that Meetup.com allows.
+If you feel your local Meetup could benefit from more funds, you're welcome to work on local sponsorships that Meetup.com allows.
 
 
 ### 3+ Weeks Out
@@ -57,32 +57,33 @@ Other tips:
 ### 2 Weeks Out
 
 * If you haven't already, finalize settings and use the Announcement feature to broadcast it
-* Add your event to [this list](https://docs.google.com/a/basho.com/spreadsheets/d/1NgpH1doVeWi-38YLN07oTS-46vkRxEFx7gun0Npn0ss/edit?usp=sharing) (Basho only)
-* Post in the **Marketing HipChat channel** with Steve (copying Stephen) to receive a Meetup Kit
+* Add your event to the latest [release notes](https://github.com/basho-labs/the-riak-community/tree/master/release-notes)
+* Announce the event on IRC, over Twitter and/or elsewhere (Reddit, LinkedIn)
 * Make sure to have whatever cables you'll need for the presentation
-* If you're using slides, open them up to comments to the **Marketing HipChat channel (Basho only) and we're glad to help (especially Tyler & Dorothy)
+* If you're using slides, open them up to [comment to the community alias](mailto:community@basho.com) which includes individuals who volunteered to help internally to Basho
 
 
 ### 1 Week Out
 
 * If you're using slides, they're due back to you this week
 * Send an email to the Meetup list as a last hurrah ([here's an example](https://docs.google.com/a/basho.com/document/d/1WgO8OV-6_FAMdZVhknlbQJr56ySOfm-3p9rJYh7M8us/edit?usp=sharing))
-* Don't be shy about posting to your personal networks ([here's an example]()) << TBD
-* Send a note to our PR team (or post a reminder in the Marketing HipChat channel) confirming the time, date, location & link to go out of our Basho accounts
-* Confirm vendors are lined up for pizza & drinks
+* Don't be shy about posting to your personal networks
+* Let us know [over Twitter](http://twitter.com/basho) and we're happy to RT
+* Confirm vendors are lined up for food & drink
 
 ### Day of
 
 * Setup signage provided at least 30 minutes early
 * Make sure entering the facility is clearly marked
 * Have a projector setup and a connection ready with your laptop
-* Be ready to be the host - smiling, welcoming, open to new attendees
+* Be ready to *be the host* - smiling, welcoming, open to new attendees
 * Keep a tally of attendees and get business cards of people who would appreciate follow up
 * Keep an eye out for interested members who could help coordinate the event or speak in the future
 
 ### Day after
 
-* Append your meetup information to [here](https://docs.google.com/a/basho.com/document/d/1WgO8OV-6_FAMdZVhknlbQJr56ySOfm-3p9rJYh7M8us/edit?usp=sharing)
-* Send follow ups 
+* Send your results and other notes to [the community alias](mailto:community@basho.com) 
+* Send follow-ups 
 	* Thank you's to those who contributed (speakers, sponsors)
+	* Email to attendees with answers to open questions
 * Post notes to Meetup.com space

release-notes/riak-community-0.7.md

@@ -15,6 +15,7 @@ Jump to:
 ### Blog Posts and Podcasts 
 
 * 5/3/15 - [Comparison of Orleans to riak_core](http://christophermeiklejohn.com/papers/2015/05/03/orleans.html) by Christopher Meiklejohn
+* 5/12/15-5/19/15 Mark Allen wrote detailed blog posts on riak_core, starting with [the basis of handoff](http://basho.com/understanding-riak_core-handoff/) and ending with [writing handoff functionality](http://basho.com/understanding-riak_core-handoff/)
 
 
 ### Meetups
@@ -24,10 +25,14 @@ Jump to:
 ### Talks, Slide Decks, and Other Presos
 
 * **The Final Causal Frontier** - Sean Cribbs at CraftConf ([Slides](https://speakerdeck.com/seancribbs/the-final-causal-frontier) | [Video](http://www.ustream.tv/recorded/61448875))
-
+* Coding with Riak - Matt Brender at Velocity Conf ([Slides](http://www.slideshare.net/BashoTechnologies/coding-with-riak-from-velocity-2015))
+* 
 
 ### Other Awesome Things Riak Users Did
 
 * @tpjg let us fork his work on a Go client! ([Original](https://github.com/tpjg/goriakpbc) | [New Maintained](https://github.com/basho-labs/goriakpbc))
+* A lot of people jumped into updating the Ansible presence for Riak and a [dev-2.x branch](https://github.com/basho-labs/ansible-riak/tree/dev-2.x) is in development
+* [Mark Steele](https://github.com/marksteele) has [a cool PR merged](https://github.com/cmeiklejohn/riak_pg/pull/6) by Christopher that leverages CRDTs inside riak_pg
+* Customers at [OneTwoTrip](http://onetwotrip.com) created a [Riak plugin](https://github.com/bosun-monitor/bosun/blob/master/cmd/scollector/collectors/riak.go) for [Bosun](https://github.com/bosun-monitor/bosun) to monitor Riak. Thank you for sharing it!
 
 ### New Known Production Deployments