Skip to content

Commit

Permalink
Merge branch 'development' into development-bug-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
hirokikmr authored Feb 6, 2019
2 parents b03a7b8 + 266321d commit a248046
Show file tree
Hide file tree
Showing 473 changed files with 222,094 additions and 11,489 deletions.
34 changes: 17 additions & 17 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@ If you see someone who is making an extra effort to ensure our community is welc

The following behaviors are expected and requested of all community members:

* Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
* Exercise consideration and respect in your speech and actions.
* Attempt collaboration before conflict.
* Refrain from demeaning, discriminatory, or harassing behavior and speech.
* Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
* Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
* Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
* Exercise consideration and respect in your speech and actions.
* Attempt collaboration before conflict.
* Refrain from demeaning, discriminatory, or harassing behavior and speech.
* Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
* Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.

## 4. Unacceptable Behavior

The following behaviors are considered harassment and are unacceptable within our community:

* Violence, threats of violence or violent language directed against another person.
* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
* Posting or displaying sexually explicit or violent material.
* Posting or threatening to post other people’s personally identifying information ("doxing").
* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
* Inappropriate photography or recording.
* Inappropriate physical contact. You should have someone’s consent before touching them.
* Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
* Deliberate intimidation, stalking or following (online or in person).
* Advocating for, or encouraging, any of the above behavior.
* Sustained disruption of community events, including talks and presentations.
* Violence, threats of violence or violent language directed against another person.
* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
* Posting or displaying sexually explicit or violent material.
* Posting or threatening to post other people’s personally identifying information ("doxing").
* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
* Inappropriate photography or recording.
* Inappropriate physical contact. You should have someone’s consent before touching them.
* Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcome sexual advances.
* Deliberate intimidation, stalking or following (online or in person).
* Advocating for, or encouraging, any of the above behavior.
* Sustained disruption of community events, including talks and presentations.

## 5. Consequences of Unacceptable Behavior

Expand Down
18 changes: 9 additions & 9 deletions COMMUNITY.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# OpenSDS Controller Work Group
# OpenSDS Technical Meeting

Covers discussion of OpenSDS Controller architecture design and featrue development.
Covers discussion of OpenSDS architecture design and feature development.

## Meetings
## Meeting Time and Agenda

- The meeting are held [every other Tuesday](https://zoom.us/j/777978108) at
12:00 Easter Time US and [every other Thursday](https://zoom.us/j/297629570)
at 21:00 Eastern Time US.
- The meetings are held [every other Tuesday](https://zoom.us/j/777978108) at
11:00 Eastern Time US and [every other Thursday](https://zoom.us/j/229373941)
at 20:00 Eastern Time US.
- Meeting notes and agenda can be found [here](https://docs.google.com/document/d/1JlxAAOtvZvvf_KhVr8XQa6mUD7lkHOXlxuGruTKEukE/edit#).

If you are interested at work trackings on the meeting, please visit [WG Planning](https://docs.google.com/spreadsheets/d/1eFZsYCqTW8-zc8K6IMFUVhmzrZQKpOeO8Br0cCraPlU/edit#gid=1359957213).
If you are interested in project tracking, please visit [OpenSDS Planning Sheet](https://docs.google.com/spreadsheets/d/1OZat5p1Hz5Df7eCb30stPp112Wg8_pfnceVvATGgeVI/edit?usp=sharing).

## Leaders
## Organizers

- [Xing Yang](https://github.com/xing-yang), Huawei
- [Leon Wang](https://github.com/leonwanghui), Huawei

## Contact

- [Slack](https://opensds.slack.com)
- [Mailing List](https://lists.opensds.io/mailman/listinfo/opensds-tech-discuss)
- [Mailing List](https://lists.opensds.io/g/opensds/)
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ opensds is Apache 2.0 licensed and accepts contributions via GitHub pull request
## Email and chat

- Email: [opensds-dev](https://lists.opensds.io/mailman/listinfo)
- Slack: #[opensds](https://opensds.slack.com)
- Slack: #[opensds](https://opensds.slack.com)

Before you start, NOTICE that ```master``` branch is the relatively stable version
provided for customers and users. So all code modifications SHOULD be submitted to
```development``` branch.
`development` branch.

## Getting started

Expand Down Expand Up @@ -50,7 +50,7 @@ When reporting issues, refer to this format:

- Raise your idea as an [issue](https://github.com/opensds/opensds/issues)
- If it is a new feature that needs lots of design details, a design proposal should also be submitted [here](https://github.com/opensds/design-specs/pulls).
- After reaching consensus in the issue discussions and design proposal reviews, complete the development on the forked repo and submit a PR.
- After reaching consensus in the issue discussions and design proposal reviews, complete the development on the forked repo and submit a PR.
Here are the [PRs](https://github.com/opensds/opensds/pulls?q=is%3Apr+is%3Aclosed) that are already closed.
- If a PR is submitted by one of the core members, it has to be merged by a different core member.
- After PR is sufficiently discussed, it will get merged, abondoned or rejected depending on the outcome of the discussion.
Expand Down
Loading

0 comments on commit a248046

Please sign in to comment.