Merge remote-tracking branch 'ClusterLabs/master' into VirtualDomain-whitespace-cleanup
- Conflicts:
- heartbeat/VirtualDomain
Description
Description
Details
Details
- Provenance
Mathieu Grzybek <mathieu.grzybek@gmail.com> Authored on Oct 23 2016, 2:50 PM - Parents
- rR7c61b3596cac: Merge pull request #864 from krig/travis-warnings
rR52e3209ed2ec: Whitespace cleanup - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- f84cdaa6ecf0 oracle: fix issue with C## in monprofileAuthor
- aac9db959152 Merge pull request #812 from xals/patch-1Author