Skip to content

Conversation

@cbergamasco
Copy link

@cbergamasco cbergamasco commented Apr 7, 2016

#672 Add support to network extension API Metering labels and rules

@gondor
Copy link
Member

gondor commented May 14, 2016

Thanks for the contribution @cbergamasco . Could you checkout the merge conflicts

Rodolfo Ribeiro Silva added 2 commits May 16, 2016 12:23
Conflicts:
	core-test/pom.xml
	core/src/main/java/org/openstack4j/openstack/identity/v2/internal/RoleServiceImpl.java
	core/src/main/java/org/openstack4j/openstack/provider/DefaultAPIProvider.java
	distribution/pom.xml
	plugins/log4j/pom.xml
	plugins/pom.xml
	plugins/slf4j/pom.xml
	pom.xml
@cbergamasco
Copy link
Author

@gondor Conflicts resolved

@gondor
Copy link
Member

gondor commented May 17, 2016

Looks good. Can you do me a favor and create an Issue for this. Then update the PR with the Issue # in the description. We use this date on release to determine changes. As soon as its update I'll merge and a SNAPSHOT will be deployed

@cbergamasco cbergamasco changed the title Metering Service Metering Service Issue #672 May 17, 2016
@gondor gondor added the bug label May 26, 2016
@gondor gondor added this to the 3.0.1 Release milestone May 26, 2016
@gondor gondor merged commit a7f3a47 into ContainX:master May 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants