> On Feb. 13, 2013, 7:54 a.m., Pranav Saxena wrote: > > Tried to cherry pick the same commit to 4.1 but it gives a merge conflict > > in networkOfferings.xml file. Could you please resolve them and send an > > updated patch for asf/4.1 . > > > > Regards, > > Pranav
Jessica had some commit on the 4.1 branch (on the file creating-network-offering.xml)because of which there was a merge conflict. I am attaching a new patch taken against 4.1 branch is attaching. Please merge. - Radhika ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/9421/#review16505 ----------------------------------------------------------- On Feb. 13, 2013, 8:18 a.m., Radhika PC wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/9421/ > ----------------------------------------------------------- > > (Updated Feb. 13, 2013, 8:18 a.m.) > > > Review request for cloudstack, David Nalley, Chip Childers, Jessica Tomechak, > Likitha Shetty, and Joe Brockmeier. > > > Description > ------- > > Documentation changes for the feature Persistent Network. The document > describes what is Persistent Networks, how to configure one, and the > advantages. > > > This addresses bug CLOUDSTACK-852. > > > Diffs > ----- > > docs/en-US/creating-network-offerings.xml 0269ce0 > docs/en-US/networks.xml a7b9ea1 > docs/en-US/persistent-network.xml PRE-CREATION > > Diff: https://reviews.apache.org/r/9421/diff/ > > > Testing > ------- > > Patch cleanly applies. The initial tech review is done by the developer. > > Build fine for both Admin and Install Guides. > > > Thanks, > > Radhika PC > >
