Skip to content
This repository has been archived by the owner on Feb 10, 2018. It is now read-only.

Merging develop into master for the new testing framework #79

Merged
merged 40 commits into from
Dec 10, 2016
Merged

Merging develop into master for the new testing framework #79

merged 40 commits into from
Dec 10, 2016

Conversation

mirceaulinic
Copy link
Member

@mirceaulinic mirceaulinic commented Nov 17, 2016 •
edited
Loading

No description provided.

@mirceaulinic mirceaulinic added this to the py.test milestone Nov 17, 2016
@mirceaulinic mirceaulinic self-assigned this Nov 17, 2016
@coveralls
Copy link

Coverage Status

Coverage increased (+2.06%) to 86.443% when pulling f88676a on develop into dd1587d on master.

@dbarrosop
Copy link
Member

Same here, why merge into master without releasing?

@coveralls
Copy link

Coverage Status

Coverage increased (+2.0%) to 86.337% when pulling bf5ed17 on develop into dd1587d on master.

@mirceaulinic
Copy link
Member Author

Only to reduce the size of the PR when merged, as the testing framework migration is pretty big - but we can leave it open right now and commits pushed into develop will be here as well.

@mirceaulinic mirceaulinic modified the milestones: 0.5.0, py.test Nov 22, 2016
@dbarrosop
Copy link
Member

Let's leave it open, when merging devel into master i mostly care about the tests passing anyway. The actual PR validates are done incrementally with each new addition anyway so no need of checking the base code yet again : )

@dbarrosop
Copy link
Member

Is this one ready for merge and release?

@mirceaulinic
Copy link
Member Author

Mm not yet - I would like to fix #84 firstly and eventually try an implementation for #81 (if I can't do it today, I'll leave it for next week).

@mirceaulinic
Merge pull request #85 from mirceaulinic/JINJA-TPL
2fcee28 
Jinja templates for NTP servers and SNMP config
@coveralls
Copy link

Coverage Status

Coverage increased (+2.0%) to 86.357% when pulling 2fcee28 on develop into dd1587d on master.

@mirceaulinic
protocol arg not mandatory
08abe5c 
but if specified, will select only routes
learned via the specified protocol,
otherwise will display all possible routes
to a certain destination
dbarrosop
dbarrosop previously approved these changes Dec 10, 2016
View reviewed changes
@dbarrosop dbarrosop dismissed their stale review December 10, 2016 10:53

I realized we are the call to RTD on success

@dbarrosop
Copy link
Member

Let's merge #89 first.

@coveralls
Copy link

Coverage Status

Coverage increased (+1.8%) to 86.169% when pulling cef6b23 on develop into dd1587d on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+1.8%) to 86.169% when pulling cef6b23 on develop into dd1587d on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+1.8%) to 86.169% when pulling cef6b23 on develop into dd1587d on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+1.8%) to 86.169% when pulling cef6b23 on develop into dd1587d on master.

@mirceaulinic mirceaulinic merged commit 16cbdb8 into master Dec 10, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dbarrosop dbarrosop dbarrosop left review comments

@ktbyers ktbyers Awaiting requested review from ktbyers

Assignees

@mirceaulinic mirceaulinic

Labels
release
Projects
None yet
Milestone
0.5.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mirceaulinic @coveralls @dbarrosop