Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Commit

Permalink
updated contributing guide and readme
Browse files Browse the repository at this point in the history
  • Loading branch information
apanicker-nflx committed Apr 1, 2021
1 parent e34c933 commit d32ad16
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Contributing to Conductor

We are following the Gitflow workflow. The active development branch is [dev](https://github.com/Netflix/conductor/tree/dev), the stable branch is [master](https://github.com/Netflix/conductor/tree/master).
The stable branch is [main](https://github.com/Netflix/conductor/tree/main).

Contributions will be accepted to the [dev](https://github.com/Netflix/conductor/tree/dev) only.
Please create pull requests for your contributions against [main](https://github.com/Netflix/conductor/tree/main) only.

## How to provide a patch for a new feature

Expand Down Expand Up @@ -33,7 +33,7 @@ If you are adding a new file it should have a header like this:

```
/**
* Copyright 2020 Netflix, Inc.
* Copyright 2021 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
Expand All @@ -48,4 +48,4 @@ If you are adding a new file it should have a header like this:

## Questions

If you have questions or want to report a bug please create an [Issue]( https://github.com/Netflix/conductor/issues ) or chat with us on [![Dev chat at https://gitter.im/Netflix/dynomite](https://badges.gitter.im/netflix-conductor/community.svg)](https://gitter.im/netflix-conductor/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
If you have questions or want to report a bug please create an [Issue]( https://github.com/Netflix/conductor/issues ) or chat with us on [!(https://badges.gitter.im/netflix-conductor/community.svg)](https://gitter.im/netflix-conductor/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Conductor builds are run on Travis CI [here](https://travis-ci.com/Netflix/condu

| Branch | Build |
|:------:|:-------------------------------------------------------------------------------------------------------------:|
| main | [![Build Status](https://travis-ci.com/Netflix/conductor.svg?branch=master)](https://travis-ci.com/Netflix/conductor) |
| main | [![Build Status](https://travis-ci.com/Netflix/conductor.svg?branch=main)](https://travis-ci.com/Netflix/conductor) |
| 2.31 | [![Build Status](https://travis-ci.com/Netflix/conductor.svg?branch=2.31)](https://travis-ci.com/Netflix/conductor) |

## Documentation & Getting Started
Expand All @@ -42,7 +42,6 @@ Below are the various artifacts published:
|conductor-cassandra-persistence|Persistence using Cassandra|
|conductor-mysql-persistence|Persistence and queue using MySQL|
|conductor-postgres-persistence|Persistence and queue using Postgres|
|conductor-es5-persistence|Indexing using Elasticsearch 5.X|
|conductor-es6-persistence|Indexing using Elasticsearch 6.X|
|conductor-rest|Spring MVC resources for the core services|
|conductor-ui|node.js based UI for Conductor|
Expand All @@ -56,7 +55,6 @@ To build the server, use the following dependencies in your classpath:

* conductor-common
* conductor-core
* conductor-jersey
* conductor-redis-persistence (_unless using your own persistence module_)
* conductor-es6-persistence (_unless using your own index module_)
* conductor-contribs (_optional_)
Expand Down

0 comments on commit d32ad16

Please sign in to comment.