[This is probably only interesting to SUSE folks, but I'm posting it on the Crowbar list to alert everyone to the fact that we'll probably be pushing git-notes(1) refs to the crowbar github repos in order to collaborate on upstreaming blacklists ...]
https://github.com/SUSE-Cloud/automation/blob/master/scripts/compare-crowbar-upstream.sh is now ready for convenient reporting of how far Crowbar branches have diverged. By default it compares essex-hack-suse with pebbles. It needs my git-icing hack: https://github.com/aspiers/git-config/blob/master/bin/git-icing Just download and place that somewhere on your $PATH first. Here's some sample output: Comparing crowbar barclamp: release/essex-hack-suse/master with crowbar/release/pebbles/master ... + 2949781c761dbf5b3ce42ef10138f4c78f33424d Add new attribute "group" + 7aa2b41188ca6d26c9be0a2f82cf7a440e6289de Bring apache cookbook into a shape that allow openstack deployment on SUSE + 951b345d87b7a0673ecd2234f80a5388aaad754c Fix re-adding a role to a node. + 96eeeda0862c0a3b6dea3c6adb5271789103b993 Add SUSE specific mappings for the apache2 service + 0c79b7ff7f34f774ed2cf1fa48749d641445227e Fixed typo + 58288c2755cebe125182abe59d8fb4e2ac0d6bc6 Install rabbitmq package before touching any of its files [snipped] Comparing tempest barclamp: release/essex-hack-suse/master with crowbar/release/pebbles/master ... release/essex-hack-suse/master does not exist in tempest barclamp Comparing test barclamp: release/essex-hack-suse/master with crowbar/release/pebbles/master ... + 361fa8d0d0b453c5e1ded1592f94d8d7b7b83032 Add crowbar-status and crowbar-failed in schema Comparing ubuntu-install barclamp: release/essex-hack-suse/master with crowbar/release/pebbles/master ... crowbar/release/pebbles/master does not exist in ubuntu-install barclamp Comparing zookeeper barclamp: release/essex-hack-suse/master with crowbar/release/pebbles/master ... Total patches to upstream ------------------------- 99 crowbar barclamp 93 nova barclamp 86 provisioner barclamp 39 glance barclamp 36 nova_dashboard barclamp 32 keystone barclamp 31 swift barclamp 16 network barclamp 8 nagios barclamp 8 dns barclamp 7 deployer barclamp 3 ntp barclamp 3 mysql barclamp 3 logging barclamp 3 ipmi barclamp 1 test barclamp 1 ganglia barclamp You can also see from the git-icing comments that blacklisting of commits which should never be upstreamed is now supported, e.g. git notes --ref=upstreaming add -m'skip: all' $sha Sharing git notes across repositories isn't the most convenient thing in the world, but it shouldn't be hard. I think we can push notes via: git push crowbar 'refs/notes/*:refs/notes/*' and then pull / merge via: http://vmiklos.hu/blog/git-notes-merge.html but I'm still trying to wrap my head around that bit. _______________________________________________ Crowbar mailing list Crowbar@dell.com https://lists.us.dell.com/mailman/listinfo/crowbar For more information: http://crowbar.github.com/
