Before making these changes, I merged pivotal-cf:master into cyberark:master. There are still conflicts for some reason.
Please solicit my input before making any decisions about how to manage the conflicts. I am unable to see the conflicts, so I rely on you to advise me on what they are.
We have created an issue in Pivotal Tracker to manage this. Unfortunately, the Pivotal Tracker project is private so you may be unable to view the contents of the story.
The labels on this github issue will be updated when the story is started.
Before making these changes, I merged
pivotal-cf:master
intocyberark:master
. There are still conflicts for some reason.Please solicit my input before making any decisions about how to manage the conflicts. I am unable to see the conflicts, so I rely on you to advise me on what they are.