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.

Sign up for GitHub

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

Jump to bottom

Merge development to master branch to publish Capri Milestone-2 #636

Merged
merged 81 commits into from
Mar 27, 2019
Merged

Merge development to master branch to publish Capri Milestone-2 #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
b03a7b8
Fix syntax error
hirokikmr Feb 6, 2019
a248046
Merge branch 'development' into development-bug-fix
hirokikmr Feb 6, 2019
564afc8
Merge pull request #610 from hirokikmr/development-bug-fix
xing-yang Feb 7, 2019
3f19ebb
Decouple api-server from controller framework (#574)
leonwanghui Feb 13, 2019
0c6954e
Password encryption and decryption (#611)
jackhaibo Feb 13, 2019
9d04ae9
Add model protobuf definition
leonwanghui Feb 14, 2019
5efb6b2
Merge branch 'second-part' of https://github.com/leonwanghui/opensds …
leonwanghui Feb 14, 2019
b4061bd
optimize configuration feature and remove some un-used code
xxwjj Feb 14, 2019
0cf6eef
remove un-used configuration item
xxwjj Feb 14, 2019
21d324f
Merge pull request #613 from xxwjj/config
leonwanghui Feb 14, 2019
56af655
Merge branch 'development' of https://github.com/opensds/opensds into…
leonwanghui Feb 14, 2019
3acb0c2
Pwd encrypter (#612)
jackhaibo Feb 14, 2019
9cccd46
Merge branch 'development' of https://github.com/opensds/opensds into…
leonwanghui Feb 14, 2019
464fb72
Merge branch 'development' of https://github.com/opensds/opensds into…
leonwanghui Feb 14, 2019
d1ab18b
Update model proto file
leonwanghui Feb 14, 2019
af2e57b
Merge branch 'second-part' of https://github.com/leonwanghui/opensds …
leonwanghui Feb 14, 2019
9800d65
Fix some bugs
leonwanghui Feb 14, 2019
3fe12a3
Update model protobuf file
leonwanghui Feb 15, 2019
75a6e04
Update model protobuf
leonwanghui Feb 15, 2019
d5a3b36
Fix some conflicts
leonwanghui Feb 15, 2019
8c529dc
Fix some bugs
leonwanghui Feb 15, 2019
d3b29aa
Generate new fake grpc client
leonwanghui Feb 15, 2019
de4bc1e
Debug the code
leonwanghui Feb 15, 2019
330e360
Fix some bugs
leonwanghui Feb 15, 2019
808ddf8
Fix some ci bugs
leonwanghui Feb 18, 2019
2d496d1
Add some test cases
leonwanghui Feb 19, 2019
a65f00f
Recheck the ci
leonwanghui Feb 19, 2019
589ad2a
Fix a ci error
leonwanghui Feb 20, 2019
78b0502
Restart the ci check
leonwanghui Feb 21, 2019
ed045cf
refactor the lvm driver, fixed some bugs
xxwjj Feb 22, 2019
ba0beba
Merge pull request #616 from xxwjj/lvm_bugs
leonwanghui Feb 22, 2019
7766f67
Fix some conflict errors
leonwanghui Feb 22, 2019
4382851
Remove some redundant code
leonwanghui Feb 22, 2019
254152f
hotpot iscsi enhancement (#615)
jackhaibo Feb 25, 2019
8878ef7
add voume extend auto-completion functionality
xxwjj Feb 27, 2019
a6bed09
Update swagger document and generate models automatically
leonwanghui Feb 27, 2019
ab2b8fa
Merge branch 'development' into auto-completion
leonwanghui Feb 27, 2019
cac50b9
Fix some conflict errors
leonwanghui Feb 27, 2019
9e13b95
Fix some conflict errors
leonwanghui Feb 27, 2019
91f2a2b
Fix some bugs
leonwanghui Feb 28, 2019
580b507
Update mock drivers
leonwanghui Feb 28, 2019
e91c38d
Merge pull request #617 from xxwjj/auto-completion
leonwanghui Mar 1, 2019
5848dd9
Fix some bugs
leonwanghui Feb 28, 2019
902307b
Fix some errors
leonwanghui Mar 1, 2019
c06232d
Improve some tests in e2e test
leonwanghui Mar 1, 2019
3b2321e
Fix some errors
leonwanghui Mar 1, 2019
aa33515
Merge branch 'development' of https://github.com/opensds/opensds into…
leonwanghui Mar 1, 2019
3f41f5e
Set default GOPATH to golang's default
stmcginnis Mar 1, 2019
9b1632b
Merge pull request #619 from stmcginnis/gopath
leonwanghui Mar 4, 2019
69b2ae9
Volume creation and deletion and pool inquiry for fusion storage vers…
jackhaibo Mar 6, 2019
2729a4a
fix bugs
jackhaibo Mar 6, 2019
a484444
Merge branch 'development' of https://github.com/opensds/opensds into…
leonwanghui Mar 13, 2019
e1a9c4a
Address some comments from reviewers
leonwanghui Mar 13, 2019
7f7d6c4
Implement TerminateConnection and InitializeConnection function of fu…
jackhaibo Mar 13, 2019
f7ab4d3
Implement ExtendVolume, CreateSnapshot, PullSnapshot, DeleteSnapshot …
jackhaibo Mar 14, 2019
453c372
Merge pull request #622 from jackhaibo/fusionstorage
leonwanghui Mar 14, 2019
ad93f69
Fix some conflict errors
leonwanghui Mar 14, 2019
6aa508d
Fix issue of volume metadata is not saved correctly
wisererik Mar 16, 2019
33ae9df
add unit test and fix some bugs
jackhaibo Mar 16, 2019
81937e6
fix bugs
jackhaibo Mar 16, 2019
8fd155b
Merge pull request #626 from wisererik/development
leonwanghui Mar 18, 2019
8809680
Merge branch 'development' into fusionstorage
leonwanghui Mar 18, 2019
3a29829
Merge pull request #627 from jackhaibo/fusionstorage
leonwanghui Mar 18, 2019
398148f
Fix some conflict errors
leonwanghui Mar 18, 2019
9e2b4d5
Merge pull request #614 from leonwanghui/second-part
xing-yang Mar 18, 2019
5cff7bc
Only test configuration file to make unit test more quickly.
jackhaibo Mar 18, 2019
b796c7a
Merge pull request #628 from jackhaibo/fusionstorage
leonwanghui Mar 18, 2019
512c413
fix some issues
jackhaibo Mar 19, 2019
c39ff25
Merge pull request #629 from jackhaibo/fusionstorage
leonwanghui Mar 19, 2019
c46ae98
Add some test cases in client package
leonwanghui Mar 20, 2019
df1121c
Merge pull request #630 from leonwanghui/leon-fixit
xing-yang Mar 20, 2019
7870b9f
Change the projectId to tenantId
wisererik Mar 22, 2019
f20659f
Merge pull request #634 from wisererik/development
leonwanghui Mar 22, 2019
ada8e46
Run go fmt to update the code
leonwanghui Mar 25, 2019
1cb69aa
Merge branch 'development' into development
leonwanghui Mar 25, 2019
933a400
Merge pull request #635 from leonwanghui/development
leonwanghui Mar 25, 2019
2e7d9f8
contrib: add NVMeoF support
qwren Mar 19, 2019
4c16983
Merge branch 'master' into development
leonwanghui Mar 27, 2019
770d820
Retest the CI build
leonwanghui Mar 27, 2019
b3c1855
Merge branch 'development' into nvmeof-support
leonwanghui Mar 27, 2019
ea275a7
Merge pull request #632 from qwren/nvmeof-support
leonwanghui Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ build/
*.log
.DS_Store
*.retry
.idea/
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ go_import_path: github.com/opensds/opensds
go:
- 1.9.x
- 1.11.x
- 1.12.x
- tip

env:
Expand Down
142 changes: 79 additions & 63 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@

[[constraint]]
name = "google.golang.org/grpc"
version = "1.7.5"
version = "1.17.0"

[[constraint]]
name = "github.com/golang/protobuf"
branch = "master"

[[constraint]]
name = "gopkg.in/yaml.v2"
Expand All @@ -65,6 +69,14 @@
branch = "master"
name = "github.com/howeyc/gopass"

[[constraint]]
name = "github.com/gophercloud/gophercloud"
revision = "754e57e7867bfa48062ff2a237caad538085700a"

[[constraint]]
name = "github.com/ceph/go-ceph"
revision = "81e4191e131b21e282a9289621383237677d2437"

[prune]
go-tests = true
non-go = true
Expand Down
Loading