[openstack-dev] [TripleO] lists and merges

Robert Collins robertc at robertcollins.net
Tue Aug 12 22:21:48 UTC 2014

Just ran into a merge conflict with
https://review.openstack.org/#/c/105878/ which looks like this:

            - name: nova_osapi
              port: 8774
              net_binds: *public_binds
            - name: nova_metadata
              port: 8775
              net_binds: *public_binds
            - name: ceilometer
              port: 8777
              net_binds: *public_binds
            - name: swift_proxy_server
              port: 8080
              net_binds: *public_binds
<<<<<<< HEAD
            - name: rabbitmq
              port: 5672
                - timeout client 0
                - timeout server 0
            - name: mysql
              port: 3306
                - backup
>>>>>>> Change overcloud to use VIP for MySQL

I'd like to propose that we make it a standard - possibly lint on it,
certainly fixup things when we see its wrong - to alpha-sort such
structures: that avoids the textual-merge failure mode of 'append to
the end'.


Robert Collins <rbtcollins at hp.com>
Distinguished Technologist
HP Converged Cloud

More information about the OpenStack-dev mailing list