Skip to content

merge #8

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
Merged
zizhongwei merged 157 commits into from
May 23, 2017
Merged

merge #8

zizhongwei merged 157 commits into from
May 23, 2017

Conversation

@zizhongwei
Copy link
Member

@zizhongwei zizhongwei commented May 23, 2017

merge

ekasitk and others added 30 commits July 27, 2015 11:36
@ekasitk
Change Sahara date time format to ISO 8601
7599de4
Include the EndpointURLResolver in the services defined in the
e145a7a 
APIProvider. This allows for easy extending/overriding of the default
EndpointURLResolver logic.
@tongh-qtl
use Long insead of Integer
0ec788c
@tongh-qtl
use Long insead of Integer,fix test bug
3a5f002
@bcornelis
Merge branch 'master' into endpointurlresolver-api
6e7a4cd
@bcornelis
revert privious implementation using the API endpoint method
479afa7
@bcornelis
Update the Config class to allow for EndpointURLResvoler configuration
5c42f9a
@bcornelis
Remove unused imports
edccf7d
@tongh-qtl
fix bug and support
e79727b 
1.compute:#17 getImageId()
2.image:#1 out of range of int,should use Long
3.image:#2 “result” in GlanceTask should be a Map
4.image:#3 imageStatus in GlanceImage should be status
@tongh-qtl
avoid null pointer
d96b825
support snapshot_id in volume backups
816e262
@zhangjianweibj
telemetry_aodh support
41ea1da
@auhlig
Merge pull request #898 from aiionx/master
f21f188 
support snapshot_id in volume backups
@auhlig
Merge pull request #862 from bcornelis/endpointurlresolver-api
4c1fec6 
Include the EndpointURLResolver in the services defined in the
@zhangjianweibj
telemetry_aodh test cases
2256542
Kept the portsecurityenabled property as undefined
0550287
@vinodborole
Merge pull request #904 from vinodborole/#768
17617cb 
Kept the portsecurityenabled property as undefined
@zhangjianweibj
Initialization function of BaseTelemetryAodhServices code optimize
6589faf
@auhlig
Merge pull request #900 from inspur-iop/openstack_telemetry_aodh_support
41ea251 
Openstack telemetry aodh support
add fields in TroveInstanceFlavor class (+ updated tests)
94c7a6b
add a test file: DB Instance
8670b9d
update DBFlavorServiceImplTest
dbffc68
fix typo error
1676dbc
add getDatastoreType&Version in TroveInstance
14bf1c0
add toString in TroveInstance
d22c301
add missing annotation
6f78722
add ‘ip’ field in TroveInstance
cd1f1a5 
In API doc, ‘ip’ is not appeared but it’s actually used.
Please see line 46~51 of the link below.
https://github.com/openstack/trove/blob/stable/mitaka/trove/instance/views.py
Merge branch 'feature/trove'
8b851ac
@auhlig
Merge pull request #910 from suho-hahn/master
b7c7f84 
Trove Update
Add api for nova service list
7c3b2d4
Cherry522 and others added 29 commits May 8, 2017 22:46
@Cherry522 @auhlig
Solve the problem of hostAggregates creation failure
710dd00
@Cherry522 @auhlig
Add 'MTU' property to 'network'
08b56ad
@Cherry522 @auhlig
Add 'distributed' property to 'Router'.
cb2eaae
@Cherry522 @auhlig
Add 'state' and 'status' fields in 'ExtHypervisor'.
c1902e0
@auhlig
minor fixes, formatting
3a1f00e
@Cherry522 @auhlig
add a attaching volume funtion in Volumes
12b9bc7
@auhlig
fixing checkNotNull()
0d7cb67
@Cherry522 @auhlig
add os-hosts and os-services interface
423d377
@JackSunshine
Override equal and hashcode method of Neutron class
92c3435
@Cherry522 @auhlig
update method name from 'getAvaiablityZone()' to 'getAvailablityZone(…
97f296a 
…)' in 'HostAggregate.java' and 'NovaHostAggregate.java'.
@Cherry522 @auhlig
add hostAggregates list test
d109051
@Cherry522 @auhlig
add hostAggregates list create
6399cf3
@auhlig
Merge pull request #1017 from auhlig/cherry_dev
ac15d6c 
cherry-picking #932
@esommar
Api for glance image cache, list cached
78577a7
@JackSunshine
Override equal and hashcode method of Neutron class
1a3b86a
@JackSunshine
Merge branch 'master' into master
c98888f
@JackSunshine
Override equal and hashcode method of Neutron class
441d2d7
@esommar
Api for glance image cache, list cached
24e554e
@esommar
Merge remote-tracking branch 'origin/cached' into temp
7bb25a8
@esommar
Api for glance image cache, list cached
411f28b
@esommar
Merge remote-tracking branch 'origin/cached' into temp
22a7a05
@esommar
Fix unit test problem for resteasy connector
209cd93
@auhlig
Merge pull request #1015 from JackSunshine/master
e7279de 
Override equal and hashcode method of some Neutron classes
@sodre90
update guava version to 20.0 (21.0 supports only jdk8)
e6bc0b2
@auhlig
Merge pull request #1021 from sequenceiq/update-guava
d9a6417 
update guava version to 20.0
@esommar
Minor change, int to Integer
001d695
Add http headers for supporting keystone tokenless
102c48f 
Currently, keystone supports client certificate without having to issue a
token, so it is necessary to add http headers to support this feature.
@auhlig
Merge pull request #1020 from esommar/cached
c636ce4 
Api for glance image cache, list cached
@auhlig
Merge pull request #1002 from ningyougang/master
07fabdb 
Add http headers for supporting keystone tokenless
@zizhongwei zizhongwei merged commit a1fcaaa into inspur-iop:master May 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.