From 928d1ff9d123aebfc853142684e700d9794b4a1c Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 28 Jun 2017 12:09:12 +0800 Subject: [PATCH 1/5] Create CONTRIBUTING.md --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..64b7bf87e --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1 @@ +First of all, thank you for considering contributing to SRS. It's people like you that make SRS a great live streaming cluster. From e64a21ef0c960b01f9f205acd7041fbd6b089fd3 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 28 Jun 2017 12:11:17 +0800 Subject: [PATCH 2/5] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..a8d5e24b7 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at winlin@vip.126.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ From 2d8399230e75d95685e86eae167df337951a0d60 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 28 Jun 2017 12:13:28 +0800 Subject: [PATCH 3/5] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64b7bf87e..f5de7090b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1,3 @@ First of all, thank you for considering contributing to SRS. It's people like you that make SRS a great live streaming cluster. + +Pelease read https://github.com/activeadmin/activeadmin/blob/master/CONTRIBUTING.md From fe7c1a3e719e7ff385ba573d45436628d73bf98a Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 28 Jun 2017 12:14:23 +0800 Subject: [PATCH 4/5] Update circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 828ea325e..34c81598c 100644 --- a/circle.yml +++ b/circle.yml @@ -13,7 +13,7 @@ general: dependencies: override: - - sudo apt-get install -y valgrind + - echo "ok" test: override: From baa55f14b9cabbad2f42feb6a6874ba74dc9321b Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 19 Aug 2017 20:19:35 +0800 Subject: [PATCH 5/5] Change stable release to SRS2 --- trunk/src/core/srs_core.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 1ffc55580..2b6f31fbb 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION"("RTMP_SIG_SRS_CODE")" // stable major version -#define VERSION_STABLE 1 +#define VERSION_STABLE 2 #define VERSION_STABLE_BRANCH SRS_XSTR(VERSION_STABLE)".0release" // internal macros, covert macro values to str,