[01:19] <smoser> powersj: if you can rebase to trunk and squash i'll pull it. not shre whati'm doing wrong but... it didnt squash without conflicts.
[01:20] <powersj> ok
[01:23] <smoser> actually, i think ihave it.
[01:23] <powersj> there was a log message that conflicted during squash
[01:23] <smoser> not sure why my rebase with squash didnt work right, but i'm doing a tox on this and centos build and will push
[01:23] <smoser> and then there is one other.. but i didnt see what the error was.
[01:23] <smoser> i just rebased squashed and diffed against your branches tests/cloud_tests
[01:24] <smoser> and no changes, so i'm about to push if it passes tox and centos build