Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix version semantic errors #83 #86

Merged
merged 3 commits into from
Dec 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## Contributing to agollo

Apollo is released under Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.

### Sign the Contributor License Agreement

Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests.

### Code Conventions

Our code style as below

* Make sure all new .go files have a simple comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for.

* Add yourself as an @author to the .go files that you modify substantially (more than cosmetic changes).

* A few unit tests should be added for a new feature or an important bug fix.

* If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project).

* When writing a commit message please follow these conventions: if you are fixing an existing issue, please add Fixes #XXX at the end of the commit message (where XXX is the issue number).

* Use ```go fmt``` to format your code , For intellij you can use **File Watching** to trigger format , If you use other IDEs, then you may use command(```go fmt ./...```) before commit.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/zouyx/agollo
module github.com/zouyx/agollo/v2

require github.com/tevid/gohamcrest v1.1.1
require github.com/tevid/gohamcrest v1.1.1
2 changes: 1 addition & 1 deletion parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package agollo

import (
"fmt"
"github.com/zouyx/agollo/agcache"
"github.com/zouyx/agollo/v2/agcache"
)

const propertiesFormat ="%s=%s\n"
Expand Down
2 changes: 1 addition & 1 deletion repository.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package agollo

import (
"github.com/zouyx/agollo/agcache"
"github.com/zouyx/agollo/v2/agcache"
"strconv"
"sync"
)
Expand Down
2 changes: 1 addition & 1 deletion start.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package agollo

import (
"github.com/zouyx/agollo/agcache"
"github.com/zouyx/agollo/v2/agcache"
)

func init() {
Expand Down