This merge has completed successfully and builds.apache.org shows at least 1 build passing with no test failures. The alerts feature branch will be removed at some point today as future alert framework development will go directly in trunk.
- Jonathan On Oct 2, 2014, at 3:15 PM, Jonathan Hurley <[email protected]> wrote: > With the upcoming branch to 1.7.0, we plan to merge “branch-alerts-dev” into > trunk after "branch-1.7.0" has been created. This branch contains the work > for AMBARI-6354 which consists of the new alerts framework. The expected > release according to the Ambari Roadmap is Ambari 2.0.0, so this code will > not be a part of Ambari 1.7.0. > > "branch-alerts-dev" has been kept up-to-date with trunk through daily merges, > so we anticipate very little conflict going in. If there are other branches > that are being considered for merging into trunk post 1.7.0, I think that we > would need to coordinate the order of merging. In general, I would like > “branch-alerts-dev” to merge first. > > Please raise any questions or concerns about this merge through > [email protected]. If “branch-1.7.0” is being cut on Friday at 2PM PDT, I > am proposing merging in “branch-alerts-dev” on Monday at 2PM PDT. > > Thanks, > > - Jonathan -- CONFIDENTIALITY NOTICE NOTICE: This message is intended for the use of the individual or entity to which it is addressed and may contain information that is confidential, privileged and exempt from disclosure under applicable law. If the reader of this message is not the intended recipient, you are hereby notified that any printing, copying, dissemination, distribution, disclosure or forwarding of this communication is strictly prohibited. If you have received this communication in error, please contact the sender immediately and delete it from your system. Thank You.
